From 1493b723f23f785839b714a9a358caf86e517e7c Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Wed, 26 Apr 2023 12:31:17 -0700
Subject: [PATCH] (notepad) Display blinking cursor at position

---
 gui/notepad/notepad.tal | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/gui/notepad/notepad.tal b/gui/notepad/notepad.tal
index 041b73d..88efc1f 100644
--- a/gui/notepad/notepad.tal
+++ b/gui/notepad/notepad.tal
@@ -25,6 +25,8 @@
 	;on-frame .Screen/vector DEO2
 	;on-control .Controller/vector DEO2
 
+	;mem select-from
+
 	draw-header
 	draw-note
 
@@ -283,17 +285,27 @@ JMP2r
 			.Screen/y DEI2k #0010 ADD2 ROT DEO2
 			INC2 LDAk ?&while
 			&no-wrap
+
 		LDAk #20 SUB #00 SWP
 			DUP2 #50 SFT2 ;font/glyphs ADD2 .Screen/addr DEO2
 			;font ADD2 LDA #00 SWP .Screen/x DEI2 ADD2
+
 		OVR2 is-selected STH #0701 STHr JMP SWP POP .Screen/sprite DEOk DEO
+
+		( display cursor )
+		.selection/from LDZ2 .selection/to LDZ2 NEQ2 ?&block
+		OVR2 .selection/from LDZ2 NEQ2 ?&block
+		;on-frame/last LDA #01 AND ?&block
+			;blink-icn .Screen/addr DEO2
+			.Screen/x DEI2k #0010 SUB2 ROT DEO2
+			#05 .Screen/sprite DEO
+			&block
 		.Screen/x DEO2
+
 		INC2 LDAk ?&while
 	POP2
 
-	( draw cursor )
-	;blink-icn .Screen/addr DEO2
-	;on-frame/last LDA #01 AND .Screen/sprite DEO
+
 
 @draw-footer ( -- )
 
@@ -326,7 +338,7 @@ JMP2r
 @is-selected ( addr* -- f )
 
 	DUP2 .selection/from LDZ2 LTH2 ?&false
-	DUP2 .selection/to LDZ2 GTH2 ?&false
+	DUP2 .selection/to LDZ2 #0001 SUB2 GTH2 ?&false
 	POP2 #01
 
 JMP2r