Merge branch 'master' of git://factorcode.org/git/factor
commit
6c5e10e5fd
|
@ -354,7 +354,7 @@ H{ } clone wm-handlers set-global
|
||||||
|
|
||||||
: add-wm-handler ( quot wm -- )
|
: add-wm-handler ( quot wm -- )
|
||||||
dup array?
|
dup array?
|
||||||
[ [ execute add-wm-handler ] with each ]
|
[ [ execute( -- wm ) add-wm-handler ] with each ]
|
||||||
[ wm-handlers get-global set-at ] if ;
|
[ wm-handlers get-global set-at ] if ;
|
||||||
|
|
||||||
[ handle-wm-close 0 ] WM_CLOSE add-wm-handler
|
[ handle-wm-close 0 ] WM_CLOSE add-wm-handler
|
||||||
|
|
|
@ -832,7 +832,7 @@ SYMBOLS:
|
||||||
define-keyboard-format-constant
|
define-keyboard-format-constant
|
||||||
define-hid-keyboard-format-constant ;
|
define-hid-keyboard-format-constant ;
|
||||||
|
|
||||||
: define-constants
|
: define-constants ( -- )
|
||||||
define-guid-constants
|
define-guid-constants
|
||||||
define-format-constants ;
|
define-format-constants ;
|
||||||
|
|
||||||
|
|
|
@ -27,15 +27,15 @@ TYPEDEF: void* LPDIENUMEFFECTSCALLBACKW
|
||||||
[ "BOOL" { "LPCDIEFFECTINFOW" "LPVOID" } "stdcall" ]
|
[ "BOOL" { "LPCDIEFFECTINFOW" "LPVOID" } "stdcall" ]
|
||||||
dip alien-callback ; inline
|
dip alien-callback ; inline
|
||||||
TYPEDEF: void* LPDIENUMCREATEDEFFECTOBJECTSCALLBACK
|
TYPEDEF: void* LPDIENUMCREATEDEFFECTOBJECTSCALLBACK
|
||||||
: LPDIENUMCREATEDEFFECTOBJECTSCALLBACK
|
: LPDIENUMCREATEDEFFECTOBJECTSCALLBACK ( quot -- callback )
|
||||||
[ "BOOL" { "LPDIRECTINPUTEFFECT" "LPVOID" } "stdcall" ]
|
[ "BOOL" { "LPDIRECTINPUTEFFECT" "LPVOID" } "stdcall" ]
|
||||||
dip alien-callback ; inline
|
dip alien-callback ; inline
|
||||||
TYPEDEF: void* LPDIENUMEFFECTSINFILECALLBACK
|
TYPEDEF: void* LPDIENUMEFFECTSINFILECALLBACK
|
||||||
: LPDIENUMEFFECTSINFILECALLBACK
|
: LPDIENUMEFFECTSINFILECALLBACK ( quot -- callback )
|
||||||
[ "BOOL" { "LPCDIFILEEFFECT" "LPVOID" } "stdcall" ]
|
[ "BOOL" { "LPCDIFILEEFFECT" "LPVOID" } "stdcall" ]
|
||||||
dip alien-callback ; inline
|
dip alien-callback ; inline
|
||||||
TYPEDEF: void* LPDIENUMDEVICEOBJECTSCALLBACKW
|
TYPEDEF: void* LPDIENUMDEVICEOBJECTSCALLBACKW
|
||||||
: LPDIENUMDEVICEOBJECTSCALLBACKW
|
: LPDIENUMDEVICEOBJECTSCALLBACKW ( quot -- callback )
|
||||||
[ "BOOL" { "LPCDIDEVICEOBJECTINSTANCEW" "LPVOID" } "stdcall" ]
|
[ "BOOL" { "LPCDIDEVICEOBJECTINSTANCEW" "LPVOID" } "stdcall" ]
|
||||||
dip alien-callback ; inline
|
dip alien-callback ; inline
|
||||||
|
|
||||||
|
|
|
@ -2,10 +2,10 @@ USING: windows.dinput windows.dinput.constants parser
|
||||||
alien.c-types windows.ole32 namespaces assocs kernel arrays
|
alien.c-types windows.ole32 namespaces assocs kernel arrays
|
||||||
vectors windows.kernel32 windows.com windows.dinput shuffle
|
vectors windows.kernel32 windows.com windows.dinput shuffle
|
||||||
windows.user32 windows.messages sequences combinators locals
|
windows.user32 windows.messages sequences combinators locals
|
||||||
math.rectangles ui.windows accessors math windows alien
|
math.rectangles accessors math windows alien
|
||||||
alien.strings io.encodings.utf16 io.encodings.utf16n
|
alien.strings io.encodings.utf16 io.encodings.utf16n
|
||||||
continuations byte-arrays game-input.dinput.keys-array
|
continuations byte-arrays game-input.dinput.keys-array
|
||||||
game-input ;
|
game-input ui.backend.windows ;
|
||||||
IN: game-input.dinput
|
IN: game-input.dinput
|
||||||
|
|
||||||
SINGLETON: dinput-game-input-backend
|
SINGLETON: dinput-game-input-backend
|
||||||
|
|
|
@ -35,7 +35,7 @@ PRIVATE>
|
||||||
] when ;
|
] when ;
|
||||||
|
|
||||||
: with-game-input ( quot -- )
|
: with-game-input ( quot -- )
|
||||||
open-game-input [ close-game-input ] [ ] cleanup ;
|
open-game-input [ close-game-input ] [ ] cleanup ; inline
|
||||||
|
|
||||||
TUPLE: controller handle ;
|
TUPLE: controller handle ;
|
||||||
TUPLE: controller-state x y z rx ry rz slider pov buttons ;
|
TUPLE: controller-state x y z rx ry rz slider pov buttons ;
|
||||||
|
|
|
@ -45,7 +45,7 @@ multiply_overflow:
|
||||||
|
|
||||||
/* Note that the XT is passed to the quotation in r11 */
|
/* Note that the XT is passed to the quotation in r11 */
|
||||||
#define CALL_OR_JUMP_QUOT \
|
#define CALL_OR_JUMP_QUOT \
|
||||||
lwz r11,9(r3) /* load quotation-xt slot */ XX \
|
lwz r11,17(r3) /* load quotation-xt slot */ XX \
|
||||||
|
|
||||||
#define CALL_QUOT \
|
#define CALL_QUOT \
|
||||||
CALL_OR_JUMP_QUOT XX \
|
CALL_OR_JUMP_QUOT XX \
|
||||||
|
|
Loading…
Reference in New Issue