From f7f8ec295f568313312bc4243150cb472cfe8a12 Mon Sep 17 00:00:00 2001
From: nsfisis <nsfisis@gmail.com>
Date: Fri, 10 Mar 2023 00:15:37 +0900
Subject: refactor: move common stuff to internal/term package

---
 cmd/timer.go | 62 ++++++++++++++++++++----------------------------------------
 1 file changed, 21 insertions(+), 41 deletions(-)

(limited to 'cmd/timer.go')

diff --git a/cmd/timer.go b/cmd/timer.go
index 3f46f92..ff11451 100644
--- a/cmd/timer.go
+++ b/cmd/timer.go
@@ -4,19 +4,19 @@ import (
 	"log"
 	"time"
 
-	"github.com/gdamore/tcell/v2"
 	"github.com/spf13/cobra"
+
+	"github.com/nsfisis/term-clock/internal/term"
 )
 
-func drawTimer(scr tcell.Screen, leftTime time.Duration, bgStyle, clockStyle tcell.Style) {
+func drawTimer(scr *term.Screen, leftTime time.Duration, bgStyle, fgStyle term.Style) {
 	if leftTime<=0{
 		leftTime=0
-		bgStyle, clockStyle = clockStyle, bgStyle
+		bgStyle, fgStyle = fgStyle, bgStyle
 	}
 
 	// Clear the entire screen.
-	scr.SetStyle(bgStyle)
-	scr.Clear()
+	scr.Clear(bgStyle)
 
 	// Calculate square width/height and offset.
 	scrW, scrH := scr.Size()
@@ -40,17 +40,17 @@ func drawTimer(scr tcell.Screen, leftTime time.Duration, bgStyle, clockStyle tce
 
 	// Minute
 	minute := leftTime.Minutes()
-	drawNumber(scr, int(minute)/10, xOffset+squareW*0, yOffset, squareW, squareH, clockStyle)
-	drawNumber(scr, int(minute)%10, xOffset+squareW*4, yOffset, squareW, squareH, clockStyle)
+	term.DrawNumber(scr, int(minute)/10, xOffset+squareW*0, yOffset, squareW, squareH, fgStyle)
+	term.DrawNumber(scr, int(minute)%10, xOffset+squareW*4, yOffset, squareW, squareH, fgStyle)
 
 	// Colon
-	drawSquare(scr, xOffset+squareW*8, yOffset+squareH*1, squareW, squareH, clockStyle)
-	drawSquare(scr, xOffset+squareW*8, yOffset+squareH*3, squareW, squareH, clockStyle)
+	term.DrawSquare(scr, xOffset+squareW*8, yOffset+squareH*1, squareW, squareH, fgStyle)
+	term.DrawSquare(scr, xOffset+squareW*8, yOffset+squareH*3, squareW, squareH, fgStyle)
 
 	// Second
 	second := leftTime.Seconds()
-	drawNumber(scr, int(second)/10, xOffset+squareW*10, yOffset, squareW, squareH, clockStyle)
-	drawNumber(scr, int(second)%10, xOffset+squareW*14, yOffset, squareW, squareH, clockStyle)
+	term.DrawNumber(scr, int(second)/10, xOffset+squareW*10, yOffset, squareW, squareH, fgStyle)
+	term.DrawNumber(scr, int(second)%10, xOffset+squareW*14, yOffset, squareW, squareH, fgStyle)
 }
 
 func cmdTimer(cmd *cobra.Command, args []string) {
@@ -59,51 +59,31 @@ func cmdTimer(cmd *cobra.Command, args []string) {
 	log.Fatalf("%+v", err)
 	}
 
-	bgStyle := tcell.StyleDefault.Background(tcell.ColorReset).Foreground(tcell.ColorReset)
-	clockStyle := tcell.StyleDefault.Foreground(tcell.ColorWhite).Background(tcell.ColorOlive)
-
-	scr, err := tcell.NewScreen()
+	scr, err := term.NewScreen()
 	if err != nil {
 		log.Fatalf("%+v", err)
 	}
-	if err := scr.Init(); err != nil {
-		log.Fatalf("%+v", err)
-	}
-	defer scr.Fini()
+	defer scr.Close()
 
 	startTime := time.Now()
 
-	drawTimer(scr, (timerTime - time.Now().Sub(startTime)).Round(time.Second), bgStyle, clockStyle)
+	drawTimer(scr, (timerTime - time.Now().Sub(startTime)).Round(time.Second), term.BgStyle, term.FgStyle)
 
-	quitC := make(chan struct{})
-
-	go func() {
-		for {
-			scr.Show()
-
-			ev := scr.PollEvent()
-			switch ev := ev.(type) {
-			case *tcell.EventResize:
-				drawTimer(scr, (timerTime - time.Now().Sub(startTime)).Round(time.Second), bgStyle, clockStyle)
-				scr.Sync()
-			case *tcell.EventKey:
-				if ev.Key() == tcell.KeyEscape || ev.Key() == tcell.KeyCtrlC || ev.Rune() == 'q' {
-					close(quitC)
-					return
-				}
-			}
-		}
-	}()
+	scr.OnResize(func() bool {
+		drawTimer(scr, (timerTime - time.Now().Sub(startTime)).Round(time.Second), term.BgStyle, term.FgStyle)
+		return false
+	})
+	go scr.DoEventLoop()
 
 	t := time.NewTicker(1 * time.Second)
 	defer t.Stop()
 
 	for {
 		select {
-		case <-quitC:
+		case <-scr.QuitC:
 			return
 		case now := <-t.C:
-			drawTimer(scr, (timerTime - now.Sub(startTime)).Round(time.Second), bgStyle, clockStyle)
+			drawTimer(scr, (timerTime - now.Sub(startTime)).Round(time.Second), term.BgStyle, term.FgStyle)
 			scr.Show()
 		}
 	}
-- 
cgit v1.2.3-70-g09d2