From 1e5df7fe01ea9b2cb5fd6d43c81c06bff8696573 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Mon, 26 Aug 2024 10:10:11 -0700
Subject: [PATCH] (m291) Joined timestamp redraw

---
 gui/m291/src/m291.tal | 35 +++++++++++++++--------------------
 1 file changed, 15 insertions(+), 20 deletions(-)

diff --git a/gui/m291/src/m291.tal b/gui/m291/src/m291.tal
index 9a59733..e3af692 100644
--- a/gui/m291/src/m291.tal
+++ b/gui/m291/src/m291.tal
@@ -21,6 +21,8 @@
 	@path $2 &null $80
 	@lines &folders $1 &roms $1 &misc $1
 	@playing $1
+	@secfrom $2
+	@secto $2
 
 |100
 
@@ -138,6 +140,7 @@
 
 @handle-status ( buf* char -- )
 	[ LIT2 01 -playing ] STZ
+	#ffff ;<draw-timestamp>/last STA2
 	fit-window POP <perr>
 	#0a19 DEO !message/<new>
 
@@ -147,11 +150,11 @@
 	( skip curr-frame ) #20 find-next INC2
 	( skip next-frame ) #20 find-next INC2
 	( | <curr-secs> )
-	parse-dec STH2k <draw-secfrom>
+	parse-dec STH2k .secfrom STZ2
 	INC2 LDAk [ LIT "5 ] LTH ?{ INC2r }
 	#20 find-next INC2
 	( | <remaining-secs> )
-	parse-dec STH2k <draw-secto>
+	parse-dec STH2k .secto STZ2
 	INC2 LDAk [ LIT "5 ] LTH ?{ INC2r }
 	POP2 STH2r STH2r SWP2 OVR2 ADD2 SWP2
 	( | print )
@@ -362,14 +365,6 @@
 	[ LIT2 36 -Screen/auto ] DEO
 	;button-icn .Screen/addr DEO2
 	[ LIT2 01 -Screen/sprite ] DEOk DEOk DEOk DEO
-	( | .. )
-	#0008 .Screen/x DEO2
-	#0070 .Screen/y DEO2
-	;placeholder/time-a #01 <draw-uf2>
-	( | .. )
-	.Screen/width DEI2 #0008 SUB2 .Screen/x DEO2
-	#0070 .Screen/y DEO2
-	;placeholder/time-b #01 <draw-uf2-right>
 	( fill width ) #00e7
 	( >> )
 
@@ -399,25 +394,25 @@
 		[ LIT2 05 -Screen/sprite ] DEO
 		.Screen/x DEI2 INC2 .Screen/x DEO2
 		INC2 GTH2k ?&>l
-	POP2 POP2 JMP2r
+	POP2 POP2
+	( >> )
 
-@<draw-secfrom> ( time* -- )
+@<draw-timestamp> ( -- )
+	.secfrom LDZ2
+	( | catch redraws )
 	DUP2 [ LIT2 &last $2 ] NEQ2 ?{ POP2 JMP2r }
 	DUP2 ,&last STR2
-	( | changed )
+	( | from )
 	[ LIT2 15 -Screen/auto ] DEO
 	#0008 .Screen/x DEO2
 	#0070 .Screen/y DEO2
-	#01 ;<draw-glyph>/color STA !<draw-time>
-
-@<draw-secto> ( time* -- )
-	DUP2 [ LIT2 &last $2 ] NEQ2 ?{ POP2 JMP2r }
-	DUP2 ,&last STR2
-	( | changed )
+	#01 ;<draw-glyph>/color STA
+	<draw-time>
+	( | to )
 	[ LIT2 15 -Screen/auto ] DEO
 	#8000 .Screen/x DEO2
 	#0070 .Screen/y DEO2
-	.Screen/width DEI2 OVR2 <draw-time>
+	.secto LDZ2 .Screen/width DEI2 OVR2 <draw-time>
 	.Screen/x DEI2 #7ff8 SUB2 SUB2 .Screen/x DEO2
 	#01 ;<draw-glyph>/color STA
 	( >> )