Fix android-key

Author: forthy42

minos2/widgets.fs

@@ -90,6 +90,12 @@ style-tex 1024 dup rgba-newtex
 
 \ glues
 
+begin-structure glue-s
+    cell +field glue-t \ typical size
+    cell +field glue-s \ shrink by
+    cell +field glue-a \ add by
+end-structure
+
 widget class
     3 cells +field hglue-c
     3 cells +field dglue-c
@@ -174,19 +180,20 @@ widget class
     field: text-string
     field: text-font
     field: text-color
+    field: text-border
 end-class text
 
 Variable glyphs$
 
 : text-init ( -- )
     text-font @ to font text-string $@ glyphs$ $+! ;
 : text-text ( -- )
-    x @ s>f penxy sf!  y @ s>f penxy sfloat+ sf!
+    x @ text-border @ + s>f penxy sf!  y @ s>f penxy sfloat+ sf!
     text-font @ to font  text-color @ color !
     text-string $@ render-string ;
 : text-!size ( -- )
     text-string $@ layout-string
-    f>s d ! f>s h ! f>s w ! ;
+    f>s text-border @ + d ! f>s text-border @ + h ! f>s text-border @ 2* + w ! ;
 ' text-init text to draw-init
 ' text-text text to draw-text
 ' text-!size text to !size
@@ -268,7 +275,12 @@ end-class vbox \ vertical alignment
 box class end-class zbox \ overlay alignment
 
 : 0glue ( -- t s a ) 0 0 0 ;
-: 1glue ( -- t s a ) 0 0 [ -1 1 rshift ]L ;
+: 1glue ( -- t s a ) 0 0 [ -1 8 rshift ]L ; \ can have 128 1glues in a row
+
+glue new Constant glue*1
+glue new Constant glue*2
+glue*1 >o 1glue hglue-c glue! 1glue dglue-c glue! 1glue vglue-c glue! o>
+glue*2 >o 1glue 2* hglue-c glue! 1glue 2* dglue-c glue! 1glue 2* vglue-c glue! o>
 
 : g3>2 ( t s a -- min a ) over + >r - r> ;
 

unix/android.fs

@@ -355,14 +355,15 @@ JValue cmanager
     dup to key-event >o
     ke_getMetaState meta-key# !
     getAction dup 2 = IF  drop
-	getKeyCode dup 0=
-	IF    drop getCharacters android-characters
-	ELSE  android-keycode
+	getKeyCode
+	?dup-IF  android-keycode
+	ELSE  getCharacters android-characters
 	THEN
     ELSE
-	0= IF  getKeyCode dup 0=
-	    IF    drop getUnicodeChar android-unicode
-	    ELSE  android-keycode
+	0= IF
+	    getUnicodeChar
+	    ?dup-IF  android-unicode
+	    ELSE  getKeyCode android-keycode
 	    THEN
 	THEN
     THEN o> ;