From 1505fe686a5683c2329d98a973b21f67554026bb Mon Sep 17 00:00:00 2001
From: Irmen de Jong <irmen@razorvine.net>
Date: Sun, 21 Mar 2021 19:55:54 +0100
Subject: [PATCH] updated vtui example

---
 examples/cx16/vtui/VTUI0.6.BIN | Bin 954 -> 0 bytes
 examples/cx16/vtui/VTUI0.8.BIN | Bin 0 -> 1008 bytes
 examples/cx16/vtui/testvtui.p8 |  69 ++++++++++++++++++++++++---------
 3 files changed, 50 insertions(+), 19 deletions(-)
 delete mode 100644 examples/cx16/vtui/VTUI0.6.BIN
 create mode 100644 examples/cx16/vtui/VTUI0.8.BIN

diff --git a/examples/cx16/vtui/VTUI0.6.BIN b/examples/cx16/vtui/VTUI0.6.BIN
deleted file mode 100644
index f5e7111c53bc739bcdee3b15785fd80b3038eee1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 954
zcmbtSJ%|%Q6rP!##Qa?X(IQyLZj$3Xu&_F=5Da$efM?;gx6P>${3-l_17V9iNO3u0
zDvQ8`BYQAlBuOQrg^f5@9E(^e3TokLnscoV8_&1dTsU%eF3aqD-}}D(-n<z?oH?;h
zM4yOPM7$;98Wkxjz7p|+h@V9KCSs0?dsG~wVup$a70;NMHv}Q-IWYAS3`K!M1Y+t1
zL=}T0%7(bf$oyat*y8~K!)3X$0o*mp1R^ck<36=>eeS20S%dfZvhj#Jqu4(hWI2})
z1(87Dyt6g&W19I~?|Fu~v}bqnvd-hwVY7c~d1)u`0fyjgCc*+BtjDmv8>F>@Tq_`2
zkWcXwW>s%@6m6Lj-yKU<y&Zeil8KrrZEe<5x>QeSyUPb>9i|p-UFycP*^QP<nBKR6
zw@8oqC*KtL>Fi-Tx_lvi1bv+kXpEa^TC!=%)<T81&QzjLOj%)Vwra{YA9sXJypDPU
zTT_p#tImpM-U)RJCwm9t>LDc5O-QN|q+m*&gEVBE>)P<L>O3;8Ambu3E<n=xq`8+@
z3y5AqbOlj?x(AR_w^4Z)(&`3kPw5D1mylIP)&N<bQTtv;{j4$}260G0GVltVI;O-4
zTM~>mue$M3$8Kuex*H3_@ig1fYSqn5fH-28;e1`=c+HYXanpwxTb6W_Asm=Zg&`hT
z_-{860yd5iFUI9{x;8Dt6W_lPicVgMkt>=ur{xCk6lAR^!*$d9wZZWm!r^~&W`^Yk
m+h!iyHjuL)ZhGGj5I_Exe^KHlI>YrJ{(Xkk(EmU<>HilyNQDUi

diff --git a/examples/cx16/vtui/VTUI0.8.BIN b/examples/cx16/vtui/VTUI0.8.BIN
new file mode 100644
index 0000000000000000000000000000000000000000..7202dac8961eb4e49e9ff76c595834fbbd59769f
GIT binary patch
literal 1008
zcma)4O-oc!7(Vx$bEo-GXZ*-aCC=zb7%f~H2udrn1J$AyZaf=fCg@`k1wwF%d0`MI
zMj>z^oLP9K6HS=(1A;#26vzz{B7`6+xC>*Th0r2<uTw_SqRU;p=Xsy!Ip_T##5*DH
z66q89n8@cu-gac4Bi|DFk;rdE#vC!>$ciJ6Ida4iHAh-1k1`2N5@PZ|%?vOz3EYf>
zYZSx;CBxx4po<{^=F_eM1Maf|0k`Tr;&n%@@qlB{+qK50=>mq+Y@YkPL3AUcx2Y_t
z$1SaMyAv=mwWDf%y22BVM+bkD`?N~p2Nc1<v`ZtPk&k13J35y8H6k_>usi))J^X!g
zXE9W>QF{DOK3@vH?t|8a#{X+pWA3w>%j#rVXk|quWydNBt5#V!s>}st$5szmvFaAa
zl)0gR7hNME1BdhXhQk(U&5vUf+7`PC9J=#ZSx=QbbL;6xG{=XSI7~!_y!5uzQdTbs
zT|Ham)sbTCfzU;|Oy`7N=J-%7pcHK5Q(nY^P+2G7=At)aX>i0`fw;K_33CgQ<}#$r
z7&Jk%ISDP0_VShmZRQj*&LiVAGA1D9ZCW1mnX`zVL39RDiMpH6WUiv}I<%Nes6B37
z)J`F*fUFQ%A5i<w#_DZGKpYZ~gj94_bklCZ?a&#O+`U)waM%GIyX7BT91dIIP#!zc
zRTCPgmes(PdC5;;`6a(ev=cv$;a<;|W2KUx7M;YW*ma+Em$Mo%zXhT7toBn#j`Yo_
zY>50MLJAuPZqCj07^gg-P3tN(8C-^6E@-kepjUXUU+3JR<O2Od1Nwz|ten&T!d?X%
zD;$T==)C<;_sDu}&$^b=IKh8m``wG&R2#!?R8%GJC&j0oneVo_e%f{fy-!Get7HUn
nu!$kV#_S4^?QJ~c^*8erxAQe_XAHOVX*k+2``h%TcVGPk+dhaU

literal 0
HcmV?d00001

diff --git a/examples/cx16/vtui/testvtui.p8 b/examples/cx16/vtui/testvtui.p8
index a0ba80728..67211dbd0 100644
--- a/examples/cx16/vtui/testvtui.p8
+++ b/examples/cx16/vtui/testvtui.p8
@@ -2,11 +2,16 @@
 %import textio
 %option no_sysinit
 
+
+; simple test program for the "VTUI" text user interface library
+; see:  https://github.com/JimmyDansbo/VTUIlib
+
 main {
     sub start() {
-        txt.lowercase()
-
         vtui.initialize()
+        store_logo()
+
+        txt.lowercase()
         vtui.screen_set(2)
         vtui.clr_scr('%', $50)
         vtui.gotoxy(5,5)
@@ -14,29 +19,42 @@ main {
         vtui.gotoxy(10,10)
         vtui.border(1, 40, 6, $47)
         vtui.gotoxy(12,12)
-        vtui.print_str(@"Hello, world! vtui from Prog8!", $f2, $80)
+        vtui.print_str2(@"Hello, world! vtui from Prog8!", $f2, $80)
         vtui.gotoxy(12,13)
-        vtui.print_str("Hello, world! vtui from Prog8!", $f2, $00)
+        vtui.print_str2("Hello, world! vtui from Prog8!", $f2, $00)
+
+        vtui.gotoxy(5,20)
+        vtui.print_str2(@"Enter your name: ", $e3, $80)
+        str inputbuffer = "?" * 20
+        ubyte length = vtui.input_str(inputbuffer, len(inputbuffer), $21)
+
+        vtui.gotoxy(8,22)
+        vtui.print_str2(@"Your name is: ", $e3, $80)
+        vtui.print_str(inputbuffer, length, $67, $00)
+
+        ; txt.uppercase()   ; kills vtui?
+        logo_mover()
 
         repeat {
         }
     }
 
+    sub store_logo() {
+        vtui.gotoxy(0, 0)
+        vtui.save_rect($80, 1, $0000, 7, 7)
+        vtui.gotoxy(0, 0)
+        vtui.save_rect($80, 1, $0100, 7, 7)
+    }
 
     sub logo_mover() {
-        ubyte xcoord
-        ubyte ycoord
-        ubyte newx
-        ubyte newy
+        ubyte xcoord = 0
+        ubyte ycoord = 0
+        ubyte newx = 0
+        ubyte newy = 0
 
-        vtui.initialize()
         ;vtui.screen_set(2)
         vtui.gotoxy(30, 32)
-        vtui.print_str("arrow keys to move!", $61, 0)
-        vtui.gotoxy(0, 0)
-        vtui.save_rect(1, 1, $0000, 7, 7)
-        vtui.gotoxy(0, 0)
-        vtui.save_rect(1, 1, $0100, 7, 7)
+        vtui.print_str2("arrow keys to move!", $61, 0)
 
 char_loop:
         ubyte char = c64.GETIN()
@@ -74,11 +92,11 @@ char_loop:
 
         sub move_logo() {
             vtui.gotoxy(xcoord, ycoord)
-            vtui.rest_rect(1, 1, $0100, 7, 7)
+            vtui.rest_rect($80, 1, $0100, 7, 7)
             vtui.gotoxy(newx, newy)
-            vtui.save_rect(1, 1, $0100, 7, 7)
+            vtui.save_rect($80, 1, $0100, 7, 7)
             vtui.gotoxy(newx, newy)
-            vtui.rest_rect(1, 1, $0000, 7, 7)
+            vtui.rest_rect($80, 1, $0000, 7, 7)
             xcoord = newx
             ycoord = newy
         }
@@ -89,7 +107,7 @@ char_loop:
 
 vtui $1000 {
 
-    %asmbinary "VTUI0.6.BIN", 2     ; skip the 2 dummy load address bytes
+    %asmbinary "VTUI0.8.BIN", 2     ; skip the 2 dummy load address bytes
 
     ; NOTE: base address $1000 here must be the same as the block's memory address, for obvious reasons!
     romsub $1000  =  initialize() clobbers(A, X, Y)
@@ -103,11 +121,24 @@ vtui $1000 {
     romsub $1017  =  scan_char() -> ubyte @A, ubyte @X
     romsub $101a  =  hline(ubyte char @A, ubyte length @Y, ubyte colors @X) clobbers(A)
     romsub $101d  =  vline(ubyte char @A, ubyte height @Y, ubyte colors @X) clobbers(A)
-    romsub $1020  =  print_str(str string @R0, ubyte colors @X, ubyte convertchars @A) clobbers(A, Y)
+    romsub $1020  =  print_str(str txtstring @R0, ubyte length @Y, ubyte colors @X, ubyte convertchars @A) clobbers(A, Y)
     romsub $1023  =  fill_box(ubyte char @A, ubyte width @R1, ubyte height @R2, ubyte colors @X) clobbers(A, Y)
     romsub $1026  =  pet2scr(ubyte char @A) -> ubyte @A
     romsub $1029  =  scr2pet(ubyte char @A) -> ubyte @A
     romsub $102c  =  border(ubyte mode @A, ubyte width @R1, ubyte height @R2, ubyte colors @X) clobbers(Y)       ; NOTE: mode 6 means 'custom' characters taken from r3 - r6
     romsub $102f  =  save_rect(ubyte ramtype @A, ubyte vbank @Pc, uword address @R0, ubyte width @R1, ubyte height @R2) clobbers(A, X, Y)
     romsub $1032  =  rest_rect(ubyte ramtype @A, ubyte vbank @Pc, uword address @R0, ubyte width @R1, ubyte height @R2) clobbers(A, X, Y)
+    romsub $1035  =  input_str(uword buffer @R0, ubyte buflen @Y, ubyte colors @X) clobbers (A) -> ubyte @Y
+
+    ; -- helper function to do string length counting for you internally
+    asmsub print_str2(str txtstring @R0, ubyte colors @X, ubyte convertchars @A) clobbers(A, Y) {
+        %asm {{
+            pha
+            lda  cx16.r0
+            ldy  cx16.r0+1
+            jsr  prog8_lib.strlen
+            pla
+            jmp  print_str
+        }}
+    }
 }