summaryrefslogtreecommitdiff
path: root/sly/input/keyboard.scm
diff options
context:
space:
mode:
Diffstat (limited to 'sly/input/keyboard.scm')
-rw-r--r--sly/input/keyboard.scm22
1 files changed, 7 insertions, 15 deletions
diff --git a/sly/input/keyboard.scm b/sly/input/keyboard.scm
index 574375e..370775c 100644
--- a/sly/input/keyboard.scm
+++ b/sly/input/keyboard.scm
@@ -22,7 +22,7 @@
;;; Code:
(define-module (sly input keyboard)
- #:use-module ((sdl sdl) #:prefix SDL:)
+ #:use-module ((sdl2 events) #:prefix sdl2:)
#:use-module (sly event)
#:use-module (sly signal)
#:use-module (sly math vector)
@@ -35,33 +35,25 @@
key-arrows
key-wasd))
-(define key-press-hook (make-hook 2))
+(define key-press-hook (make-hook 1))
(register-event-handler
'key-down
(lambda (e)
- (run-hook key-press-hook
- (SDL:event:key:keysym:sym e)
- (SDL:event:key:keysym:unicode e))))
+ (run-hook key-press-hook (sdl2:keyboard-event-key e))))
(define-signal key-last-down
- (hook->signal key-press-hook 'none
- (lambda (key unicode)
- key)))
+ (hook->signal key-press-hook 'none identity))
-(define key-release-hook (make-hook 2))
+(define key-release-hook (make-hook 1))
(register-event-handler
'key-up
(lambda (e)
- (run-hook key-release-hook
- (SDL:event:key:keysym:sym e)
- (SDL:event:key:keysym:unicode e))))
+ (run-hook key-release-hook (sdl2:keyboard-event-key e))))
(define-signal key-last-up
- (hook->signal key-release-hook 'none
- (lambda (key unicode)
- key)))
+ (hook->signal key-release-hook 'none identity))
(define (key-down? key)
"Create a signal for the state of KEY. The signal value is #t when