From 1ec57f912896bca6882bd3a8da2247100fdca84d Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Sat, 10 Feb 2024 12:57:38 -0800
Subject: [PATCH] Starting drawing

---
 gui/shaviankb/shaviankb.tal     | 131 +++++++++++++++++++++++++++++---
 gui/shaviankb/untitled10x10.chr | Bin 4096 -> 4096 bytes
 2 files changed, 121 insertions(+), 10 deletions(-)

diff --git a/gui/shaviankb/shaviankb.tal b/gui/shaviankb/shaviankb.tal
index ef93155..a014063 100644
--- a/gui/shaviankb/shaviankb.tal
+++ b/gui/shaviankb/shaviankb.tal
@@ -15,23 +15,69 @@
 	#0100 .Screen/width DEO2
 	#0080 .Screen/height DEO2
 	<draw-keyboard>
-	BRK
+	( #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
+	JMP2r
 
 @<draw-keyboard> ( -- )
+	;shavian ;shavian #0010 ADD2 ;shavian #0020 ADD2 <draw-key3>
+	;shavian ;shavian #0010 ADD2 ;shavian #0020 ADD2 <draw-key3>
+	JMP2r
+
+@<draw-glyph> ( addr* -- )
+	STH2k .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
+	JMP2r
+
+@<draw-key3> ( a* b* c* -- )
+	<push-pos>
 	<draw-button>
-	<draw-button>
+	.Screen/x DEI2k #0004 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
+	( | b )
+	<draw-glyph>
+	.Screen/x DEI2k #0004 SUB2 ROT DEO2
+	.Screen/y DEI2k #0008 ADD2 ROT DEO2
+	( | c )
+	<draw-glyph>
+	<pop-pos>
+	.Screen/x DEI2k #0008 ADD2 ROT DEO2
 	JMP2r
 
 @<draw-button> ( -- )
-	[ LIT2 26 -Screen/auto ] DEO
+	.Screen/x DEI2 .Screen/y DEI2
+	( | draw )
+	[ LIT2 36 -Screen/auto ] DEO
 	;button-icn/top .Screen/addr DEO2
 	[ LIT2 01 -Screen/sprite ] DEOk DEOk
 	( ) ;button-icn/middle .Screen/addr DEO2
+	DEOk
+	( ) ;button-icn/middle .Screen/addr DEO2
+	DEOk
+	( ) ;button-icn/middle .Screen/addr DEO2
 	DEOk DEO
-	.Screen/x DEI2k #0018 ADD2 ROT DEO2
-	.Screen/y DEI2k #0020 SUB2 ROT DEO2
+	.Screen/y DEO2
+	.Screen/x DEO2
 	JMP2r
 
+(
+@|stdlib )
+
 @<phex> ( short* -- )
 	SWP <phex>/b
 	&b ( -- )
@@ -39,17 +85,82 @@
 	&c ( -- )
 		#0f AND DUP #09 GTH #27 MUL ADD [ LIT "0 ] ADD #18 DEO
 		JMP2r
+	
+(
+@|assets )
+
+@layout ( > )
+	&row1 ={
+	( > ) =keys/peep =keys/peep =keys/peep
+	( > ) =shavian =shavian =shavian
+	( > ) =shavian =shavian =shavian
+	( > ) =shavian =shavian =shavian
+	( > ) =shavian =shavian =shavian
+	( > ) =shavian =shavian =shavian
+	( > ) =shavian =shavian =shavian
+	( > ) =shavian =shavian =shavian
+	( > ) =shavian =shavian =shavian }
+
+
+@keys ( sprite* length* values )
+	&peep [ =shavian/peep ] ={ f090 9190 }
+	&bib ( > )
+		&tot
+	&dead ( > )
+		&kick
+	&gag ( > )
+		&fee
+	&vow ( > )
+		&thigh
+	&they ( > )
+		&so
+	&zoo ( > )
+		&sure
+	&measure ( > )
+		&church
+	&judge ( > )
+		&yea
+	&woe ( > )
+		&hung
+	&haha ( > )
+		&loll
+	&ado ( > )
+		&roar
+	&up ( > )
+		&mime
+	&on ( > )
+		&nun
+	&oak ( > )
+		&if
+	&wool ( > )
+		&eat
+	&ooze ( > )
+		&egg
+	&out ( > )
+		&age
+	&oil ( > )
+		&ash
+	&ah ( > )
+		&ice
+	&awe ( > )
+		&are
+	&array ( > )
+		&or
+	&ear ( > )
+		&air
+	&ian ( > )
+		&err &yew
 
 @button-icn &top [
 	001f 2040 4040 4040 00ff 0000 0000 0000
-	00f8 0402 0202 0202 ] &middle [
+	00ff 0000 0000 0000 00f8 0402 0202 0202 ] &middle [
 	4040 4040 4040 4040 0000 0000 0000 0000
-	0202 0202 0202 0202 ] &bottom [
+	0000 0000 0000 0000 0202 0202 0202 0202 ] &bottom [
 	4040 4040 4020 1f00 0000 0000 0000 ff00
-	0202 0202 0204 f800 ]
+	0000 0000 0000 ff00 0202 0202 0204 f800 ]
 
-@shavian [
-	0000 0060 1008 0808 0808 0808 0000 0000
+@shavian &peep [
+	0000 0060 1008 0808 0808 0808 0000 0000 ] [
 	0000 0008 1868 0808 0808 0808 0000 0000
 	0000 0004 0404 3c40 4040 403c 0000 0000
 	0000 0008 0808 0808 0808 1060 0000 0000
diff --git a/gui/shaviankb/untitled10x10.chr b/gui/shaviankb/untitled10x10.chr
index 0b331b148c06030b3b5d0f8b13b23b8bfb2d5790..e7678951da85e3f73e26d897c44d5d71354e7102 100644
GIT binary patch
delta 27
jcmZorXi%7-I8pHaBu0ga4g!-E7%xm>QrIlO^ne!tftd*L

delta 33
lcmZorXi%7-IMML@!~lUwj0%$t7%zZWObVL~m@e=FnE=Fi3ljhU