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

fix bootstrap issues, alt+key handling, function keys for win32

erg 2006-08-27 23:30:07 +00:00
parent b0b8693e5e
commit 53592d0f3c
4 changed files with 33 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/bootstrap/boot-stage2.factor
View File

@ -20,6 +20,10 @@ optimizer parser sequences sequences-internals words ;
] when ] when
"compile" get [ "compile" get [
windows? [
"/library/windows/dlls.factor" run-resource
] when
\ number= compile \ number= compile
\ + compile \ + compile
\ nth compile \ nth compile

21
library/ui/windows/ui.factor
View File

@ -1,7 +1,7 @@
! Copyright (C) 2005, 2006 Doug Coleman. ! Copyright (C) 2005, 2006 Doug Coleman.
! See http://factorcode.org/license.txt for BSD license. ! See http://factorcode.org/license.txt for BSD license.
USING: alien arrays errors freetype gadgets USING: alien arrays errors freetype gadgets gadgets-listener
gadgets-listener hashtables io kernel math namespaces prettyprint gadgets-workspace hashtables io kernel math namespaces prettyprint
sequences strings vectors words win32-api win32-api-messages ; sequences strings vectors words win32-api win32-api-messages ;
USING: inspector threads memory ; USING: inspector threads memory ;
IN: win32 IN: win32
@ -58,6 +58,18 @@ SYMBOL: class-name
{ 40 "DOWN" } { 40 "DOWN" }
{ 45 "INSERT" } { 45 "INSERT" }
{ 46 "DELETE" } { 46 "DELETE" }
{ 112 "F1" }
{ 113 "F2" }
{ 114 "F3" }
{ 115 "F4" }
{ 116 "F5" }
{ 117 "F6" }
{ 118 "F7" }
{ 119 "F8" }
{ 120 "F9" }
{ 121 "F10" }
{ 122 "F11" }
{ 123 "F12" }
} ; } ;
: key-state-down? : key-state-down?
@ -122,7 +134,7 @@ SYMBOL: hWnd
: handle-wm-char ( hWnd uMsg wParam lParam -- ) : handle-wm-char ( hWnd uMsg wParam lParam -- )
lParam set wParam set uMsg set hWnd set lParam set wParam set uMsg set hWnd set
wParam get exclude-key-wm-char? ctrl? or [ wParam get exclude-key-wm-char? ctrl? or alt? or [
wParam get ch>string wParam get ch>string
hWnd get window-focus user-input hWnd get window-focus user-input
] unless ; ] unless ;
@ -336,5 +348,6 @@ IN: shells
] [ cleanup-win32-ui ] cleanup ; ] [ cleanup-win32-ui ] cleanup ;
IN: io-internals IN: io-internals
! Temporary, until native io returns ! Allows use of the ui without native i/o.
! Overwritten when native i/o is loaded.
: io-multiplex ( ms -- ) 0 SleepEx drop ; : io-multiplex ( ms -- ) 0 SleepEx drop ;

12
library/windows/dlls.factor Normal file
View File

@ -0,0 +1,12 @@
IN: scratchpad
USING: alien sequences ;
{
{ "gdi32" "gdi32.dll" "stdcall" }
{ "user32" "user32.dll" "stdcall" }
{ "kernel32" "kernel32.dll" "stdcall" }
{ "winsock" "ws2_32.dll" "stdcall" }
{ "mswsock" "mswsock.dll" "stdcall" }
{ "libc" "msvcrt.dll" "cdecl" }
{ "libm" "msvcrt.dll" "cdecl" }
} [ first3 add-library ] each

9
library/windows/load.factor
View File

@ -1,15 +1,6 @@
IN: scratchpad IN: scratchpad
USING: alien compiler kernel namespaces parser sequences words ; USING: alien compiler kernel namespaces parser sequences words ;
{
{ "gdi32" "gdi32.dll" "stdcall" }
{ "user32" "user32.dll" "stdcall" }
{ "kernel32" "kernel32.dll" "stdcall" }
{ "winsock" "ws2_32.dll" "stdcall" }
{ "mswsock" "mswsock.dll" "stdcall" }
{ "libc" "msvcrt.dll" "cdecl" }
} [ first3 add-library ] each
{ {
"windows-messages" "windows-messages"
"types" "types"