Add flag to display AM/PM state.

It was already on the board, but was never used, it was a filler,
but it can be useful and if it's already on the board, why not make
it visible with a flag?

Author: Balazs Nadasdi

main.go

@@ -17,6 +17,9 @@ import (
 var version = "development"
 
 func main() {
+	var showAMPMFlag bool
+	flag.BoolVar(&showAMPMFlag, "show-am-pm", false, "visualize AM/PM")
+
 	var compactFlag bool
 	flag.BoolVar(&compactFlag, "compact", false, "compact format")
 
@@ -29,6 +32,7 @@ func main() {
 	var versionFlag bool
 	flag.BoolVar(&versionFlag, "version", false, "print version and exit")
 
+
 	flag.Parse()
 
 	// If the -version flag was given, print the version and exit.
@@ -43,6 +47,7 @@ func main() {
 		color(onColorFlag),
 		color(offColorFlag),
 		compactFlag,
+		showAMPMFlag,
 	))
 	game.Start()
 }

qlock/board.go

@@ -15,6 +15,8 @@ const (
 	quarter = "QUARTER"
 	twenty  = "TWENTY"
 	half    = "HALF"
+	am      = "AM"
+	pm      = "PM"
 
 	one    = "ONE"
 	two    = "TWO"
@@ -31,7 +33,7 @@ const (
 
 	dot = "●"
 	f1  = "L"
-	f2  = "ASAMPM"
+	f2  = "AS"
 	f3  = "C"
 	f4  = "DC"
 	f5  = "X"

qlock/rules.go

@@ -21,9 +21,9 @@ func quickAbs(value int) int {
 	return value * ((value*2 + 1) % 2)
 }
 
-func entries(hour int, minute int) [][]entry {
+func entries(hour int, minute int, ampm bool) [][]entry {
 	board := [][]entry{
-		{e(it, true), e(f1, false), e(is, true), e(f2, false)},
+		{e(it, true), e(f1, false), e(is, true), e(f2, false), e(am, false), e(pm, false)},
 		{e(a, false), e(f3, false), e(quarter, false), e(f4, false)},
 		{e(twenty, false), e(five, false), e(f5, false)},
 		{e(half, false), e(f6, false), e(ten, false), e(f7, false), e(to, false)},
@@ -37,6 +37,14 @@ func entries(hour int, minute int) [][]entry {
 
 	minSection := minute - minute%5
 
+	if ampm {
+		if hour < 12 {
+			activate(board, 0, 4)
+		} else {
+			activate(board, 0, 5)
+		}
+	}
+
 	if minSection > 30 {
 		// Set: to.
 		activate(board, 3, 4)

qlock/widget.go

@@ -15,13 +15,15 @@ type clock struct {
 	colorOn  termloop.Attr
 	colorOff termloop.Attr
 	compact  bool
+	showAMPM bool
 }
 
-func New(colorOn, colorOff termloop.Attr, compact bool) termloop.Drawable {
+func New(colorOn, colorOff termloop.Attr, compact, ampm bool) termloop.Drawable {
 	return &clock{
 		colorOn:  colorOn,
 		colorOff: colorOff,
 		compact:  compact,
+		showAMPM: ampm,
 	}
 }
 
@@ -63,7 +65,7 @@ func (c *clock) Draw(s *termloop.Screen) {
 		originY = 0
 	}
 
-	board := entries(hour, minute)
+	board := entries(hour, minute, c.showAMPM)
 
 	minuteMarker := minute % 5