steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SDL console fix

cvs
Slava Pestov 2005-02-12 00:35:50 +00:00
parent 96edb600fe
commit f5fe5fd692
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
library/sdl/sdl-utils.factor
View File

@ -137,6 +137,7 @@ global [
over str-length 0 = [ over str-length 0 = [
2drop 3drop 0 2drop 3drop 0
] [ ] [
>r >r lookup-font r> r>
TTF_RenderUNICODE_Blended TTF_RenderUNICODE_Blended
[ draw-surface ] keep [ draw-surface ] keep
[ surface-w ] keep [ surface-w ] keep

4
library/ui/console.factor
View File

@ -342,8 +342,8 @@ M: alien handle-event ( event -- ? )
] ifte ; ] ifte ;
: set-console-font ( font ptsize ) : set-console-font ( font ptsize )
cons lookup-font dup console-font set cons dup console-font set
TTF_FontHeight line-height set ; lookup-font TTF_FontHeight line-height set ;
: init-console ( -- ) : init-console ( -- )
TTF_Init TTF_Init

3
library/ui/fields.factor
View File

@ -11,7 +11,7 @@ TUPLE: editor line delegate ;
editor-line [ line-text get ] bind ; editor-line [ line-text get ] bind ;
: set-editor-text ( text editor -- ) : set-editor-text ( text editor -- )
editor-line [ line-text set ] bind ; editor-line [ set-line-text ] bind ;
C: editor ( text -- ) C: editor ( text -- )
0 0 0 0 <rectangle> <gadget> over set-editor-delegate 0 0 0 0 <rectangle> <gadget> over set-editor-delegate
@ -34,4 +34,5 @@ C: field ( text -- field )
[[ [ lose-focus ] [ dup black foreground set-paint-property redraw ] ]] [[ [ lose-focus ] [ dup black foreground set-paint-property redraw ] ]]
[[ [ button-down 1 ] [ my-hand request-focus ] ]] [[ [ button-down 1 ] [ my-hand request-focus ] ]]
[[ [ "RETURN" ] [ drop "foo!" USE: stdio print ] ]] [[ [ "RETURN" ] [ drop "foo!" USE: stdio print ] ]]
[[ [ "BACKSPACE" ] [ dup gadget-children car editor-line [ backspace ] bind redraw ] ]]
}} over set-gadget-gestures ; }} over set-gadget-gestures ;

2
library/ui/paint.factor
View File

@ -138,6 +138,6 @@ M: string shape-h ( text -- h )
drop font get lookup-font TTF_FontHeight ; drop font get lookup-font TTF_FontHeight ;
M: string draw-shape ( text -- ) M: string draw-shape ( text -- )
>r x get y get font get lookup-font r> >r x get y get font get r>
foreground get 3unlist make-color foreground get 3unlist make-color
draw-string drop ; draw-string drop ;