From d9b530495cab5facb9b044472fd7c4b9b565d176 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Sat, 10 Feb 2024 19:09:42 -0800
Subject: [PATCH] Drawing layout

---
 gui/shaviankb/assets.tal    |   2 +-
 gui/shaviankb/cream12.uf2   | Bin 0 -> 8448 bytes
 gui/shaviankb/shaviankb.tal |  52 ++++++++++++++++++------------------
 3 files changed, 27 insertions(+), 27 deletions(-)
 create mode 100644 gui/shaviankb/cream12.uf2

diff --git a/gui/shaviankb/assets.tal b/gui/shaviankb/assets.tal
index 64b18b5..e48077c 100644
--- a/gui/shaviankb/assets.tal
+++ b/gui/shaviankb/assets.tal
@@ -104,7 +104,7 @@
 &four    0000 0000 0000 0000 0000 0000 0000 0000 ={ "4 }
 &five    0000 0000 0000 0000 0000 0000 0000 0000 ={ "5 }
 &six     0000 0000 0000 0000 0000 0000 0000 0000 ={ "6 }
-&seven   0000 0000 0000 0000 0000 0000 0000 0000 ={ "7 }
+&seven   0000 00fc 0404 0808 1010 2020 0000 0000 ={ "7 }
 &eight   0000 0000 0000 0000 0000 0000 0000 0000 ={ "8 }
 &nine    0000 0000 0000 0000 0000 0000 0000 0000 ={ "9 }
 
diff --git a/gui/shaviankb/cream12.uf2 b/gui/shaviankb/cream12.uf2
new file mode 100644
index 0000000000000000000000000000000000000000..1c67710b9f733b925e03f7b49a545ed72de356ad
GIT binary patch
literal 8448
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

literal 0
HcmV?d00001

diff --git a/gui/shaviankb/shaviankb.tal b/gui/shaviankb/shaviankb.tal
index 0b708b5..3be1d0d 100644
--- a/gui/shaviankb/shaviankb.tal
+++ b/gui/shaviankb/shaviankb.tal
@@ -12,51 +12,51 @@
 	#f0ef .System/r DEO2
 	#f0e6 .System/g DEO2
 	#f0e2 .System/b DEO2
-	#0100 .Screen/width DEO2
-	#0080 .Screen/height DEO2
+	#0120 .Screen/width DEO2
+	#00c0 .Screen/height DEO2
 	<draw-keyboard>
 	( #010e DEO ) BRK
 
-@<push-pos> ( -- )
-	[ LITr -Screen/x ] DEI2r
-	( ) [ LITr -Screen/y ] DEI2r ROT2r JMP2r
-
-@<pop-pos> ( -- )
-	SWP2r STH2r .Screen/y DEO2
-	SWP2r STH2r .Screen/y DEO2
+@<set-position> ( id* -- )
+	DUP2 #0009 DIV2 #0030 MUL2 .Screen/y DEO2
+	DUP #1e NEQ ?{ POP2 #0007 }
+	DUP #1f NEQ ?{ POP2 #0008 }
+	#0009 DIV2k MUL2 SUB2 #0020 MUL2 .Screen/x DEO2
 	JMP2r
 
 @<draw-keyboard> ( -- )
-	( ;shavian ;shavian #0010 ADD2 ;shavian #0020 ADD2 <draw-key3>
-	;shavian ;shavian #0010 ADD2 ;shavian #0020 ADD2 <draw-key3> )
-	JMP2r
+	#0020 #0000
+	&l ( -- )
+		DUP2 <set-position>
+		DUP2 #0006 MUL2 ;layout ADD2
+		( ) STH2k #0004 ADD2 LDA2
+		( ) STH2kr #0002 ADD2 LDA2
+		( ) STH2r LDA2 <draw-key>
+		( ) INC2 GTH2k ?&l
+	POP2 POP2 JMP2r
 
 @<draw-glyph> ( addr* -- )
-	STH2k .Screen/addr DEO2
+	.Screen/addr DEO2
 	[ LIT2 15 -Screen/auto ] DEO
-	[ LIT2 05 -Screen/sprite ] DEOk
-	( ) STH2r .Screen/addr DEO2
-	( ) .Screen/x DEI2k #0007 SUB2 ROT DEO2
-	DEO
+	[ LIT2 05 -Screen/sprite ] DEO
 	JMP2r
 
-@<draw-key3> ( a* b* c* -- )
-	<push-pos>
+@<draw-key> ( a* b* c* -- )
 	<draw-button>
-	.Screen/x DEI2k #0004 ADD2 ROT DEO2
+	.Screen/x DEI2k #0006 ADD2 ROT DEO2
 	.Screen/y DEI2k #0004 ADD2 ROT DEO2
 	( | a )
 	<draw-glyph>
-	.Screen/x DEI2k #0004 SUB2 ROT DEO2
-	.Screen/y DEI2k #0008 ADD2 ROT DEO2
+	.Screen/x DEI2k #0002 SUB2 ROT DEO2
+	.Screen/y DEI2k #000c ADD2 ROT DEO2
 	( | b )
 	<draw-glyph>
-	.Screen/x DEI2k #0004 SUB2 ROT DEO2
-	.Screen/y DEI2k #0008 ADD2 ROT DEO2
+	.Screen/x DEI2k #0002 SUB2 ROT DEO2
+	.Screen/y DEI2k #000c ADD2 ROT DEO2
 	( | c )
 	<draw-glyph>
-	<pop-pos>
-	.Screen/x DEI2k #0008 ADD2 ROT DEO2
+	.Screen/x DEI2k #0006 ADD2 ROT DEO2
+	.Screen/y DEI2k #001c SUB2 ROT DEO2
 	JMP2r
 
 @<draw-button> ( -- )