Apple-2-Tools/apple2ix
1
0
Fork 0
mirror of https://github.com/mauiaaron/apple2.git synced 2024-11-19 11:31:13 +00:00
Code Issues Projects Releases Wiki Activity

Fix key input handling in GLUT/glvideo

Browse Source 
* TIL GLUT constants for certain special keys map to ascii (for example GLUT_KEY_ALT_L == 116/'t') ... of course
      this was playing hell with the emulator's key input handling
    * Now we directly convert regular keys rather than pushing them down the special path
    * Also separateds CAPS_LOCK hack into its own inline function
This commit is contained in:
Aaron Culliney 2014-09-21 15:37:38 -07:00
parent 5e9e98bf88
commit 804f60d6a0
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/video/glvideo.c
View File

@ -282,12 +282,10 @@ static void vdriver_init_common(void) {
// keyboard
//
// Map glut keys into Apple//ix internal-representation scancodes.
static int _glutkey_to_scancode(int key) {
static bool modified_caps_lock = false;
static inline void _capslock_hackaround(void) {
// NOTE : Unfortunately it appears that we cannot get a raw key down/up notification for CAPSlock, so hack that here
// ALSO : Emulator initially sets CAPS state based on a user preference, but sync to system state if user changes it
static bool modified_caps_lock = false;
int modifiers = glutGetModifiers();
if (!c_keys_is_shifted()) {
if (modifiers & GLUT_ACTIVE_SHIFT) {
@ -297,6 +295,10 @@ static int _glutkey_to_scancode(int key) {
caps_lock = false;
}
}
}
// Map glut keys into Apple//ix internal-representation scancodes.
static int _glutkey_to_scancode(int key) {
switch (key) {
case GLUT_KEY_F1:
@ -458,25 +460,28 @@ static int _glutkey_to_scancode(int key) {
#if !defined(TESTING)
static void vdriver_on_key_down(unsigned char key, int x, int y) {
// no input processing if test-driven ...
int scancode = _glutkey_to_scancode(key);
_capslock_hackaround();
int scancode = c_keys_ascii_to_scancode(key);
LOG("onKeyDown %02x '%c' -> %02X", key, key, scancode);
c_keys_handle_input(scancode, 1);
}
static void vdriver_on_key_up(unsigned char key, int x, int y) {
int scancode = _glutkey_to_scancode(key);
_capslock_hackaround();
int scancode = c_keys_ascii_to_scancode(key);
LOG("onKeyUp %02x '%c' -> %02X", key, key, scancode);
c_keys_handle_input(scancode, 0);
}
static void vdriver_on_key_special_down(int key, int x, int y) {
_capslock_hackaround();
int scancode = _glutkey_to_scancode(key);
LOG("onKeySpecialDown %08x -> %02X", key, scancode);
c_keys_handle_input(scancode, 1);
}
static void vdriver_on_key_special_up(int key, int x, int y) {
_capslock_hackaround();
int scancode = _glutkey_to_scancode(key);
LOG("onKeySpecialUp %08x -> %02X", key, scancode);
c_keys_handle_input(scancode, 0);