diff options
author | David Thompson <dthompson2@worcester.edu> | 2020-11-16 17:23:16 -0500 |
---|---|---|
committer | David Thompson <dthompson2@worcester.edu> | 2020-11-16 17:27:10 -0500 |
commit | ba0c8932395a05187824ce2835eb33331967a45a (patch) | |
tree | 22eaafd293bf1212fb969125e2162740bebf46a3 | |
parent | f2f23c968ccc3e16163ad561cb3395bd2e02f966 (diff) |
Remove scancode argument from key-press and key-release handlers.
-rw-r--r-- | chickadee.scm | 2 | ||||
-rw-r--r-- | doc/api.texi | 17 | ||||
-rw-r--r-- | examples/audio.scm | 2 | ||||
-rw-r--r-- | examples/model.scm | 2 | ||||
-rw-r--r-- | examples/tiled.scm | 2 |
5 files changed, 6 insertions, 19 deletions
diff --git a/chickadee.scm b/chickadee.scm index ad018be..10085ae 100644 --- a/chickadee.scm +++ b/chickadee.scm @@ -268,12 +268,10 @@ border is disabled, otherwise it is enabled.") (quit)) ((keyboard-down-event? event) (key-press (keyboard-event-key event) - (keyboard-event-scancode event) (keyboard-event-modifiers event) (keyboard-event-repeat? event))) ((keyboard-up-event? event) (key-release (keyboard-event-key event) - (keyboard-event-scancode event) (keyboard-event-modifiers event))) ((text-input-event? event) (text-input (text-input-event-text event))) diff --git a/doc/api.texi b/doc/api.texi index 70c3016..cf82b6f 100644 --- a/doc/api.texi +++ b/doc/api.texi @@ -75,15 +75,8 @@ the keyboard: @enumerate @item -@var{key}: The symbolic name of the ``virtual'' key that was pressed. -For example: @code{backspace}. It's called a virtual key because the -operating system may map a physical keyboard key to another key -entirely, such as how the author likes to bind the ``caps lock'' key -to mean ``control''. - -@item -@var{scancode}: The symbolic name of the physical key that was -pressed. +@var{key}: The symbolic name of the key that was pressed. For +example: @code{backspace}. @item @var{modifiers}: A list of the symbolic names of modifier keys that @@ -101,11 +94,7 @@ on the keyboard: @enumerate @item -@var{key}: The symbolic name of the ``virtual'' key that was released. - -@item -@var{scancode}: The symbolic name of the physical key that was -released. +@var{key}: The symbolic name of the key that was released. @item @var{modifiers}: A list of the symbolic names of modifier keys that diff --git a/examples/audio.scm b/examples/audio.scm index c9885a2..4ea697f 100644 --- a/examples/audio.scm +++ b/examples/audio.scm @@ -49,7 +49,7 @@ Q - quit") (draw-text status-message status-position)) (draw-text instructions instructions-position)) -(define (key-press key scancode modifiers repeat?) +(define (key-press key modifiers repeat?) (match key ('q (abort-game)) ('space (source-toggle music-source)) diff --git a/examples/model.scm b/examples/model.scm index d345988..f7ef9f7 100644 --- a/examples/model.scm +++ b/examples/model.scm @@ -56,7 +56,7 @@ (set! y-rotation (+ y-rotation 0.03)) (matrix4-rotate-y! model-matrix y-rotation)) -(define (key-press key scancode modifiers repeat?) +(define (key-press key modifiers repeat?) (cond ((eq? key 'q) (abort-game)) diff --git a/examples/tiled.scm b/examples/tiled.scm index e1bf22a..c64f7b6 100644 --- a/examples/tiled.scm +++ b/examples/tiled.scm @@ -20,7 +20,7 @@ (draw-text text text-position)) (define inc 8.0) -(define (key-press key scancode modifiers repeat?) +(define (key-press key modifiers repeat?) (match key ('up (set-vec2-y! camera (- (vec2-y camera) inc))) ('down (set-vec2-y! camera (+ (vec2-y camera) inc))) |