gered/libdgl
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix handling of numpad keys and other minor cleanups

Browse source
This commit is contained in:
Gered 2018-05-27 13:51:21 -04:00
parent fc44d4de73
commit 7816a7887b
1 changed files with 38 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
DGLKBRD.C
View file

@ -108,6 +108,25 @@ static char lookup_key_to_char_caps_shift[128] = {
}; };
static char lookup_key_to_char_numpad[128] = { static char lookup_key_to_char_numpad[128] = {
0, 0, 0, 0, 0, 0, 0, 0, // 00 - 07
0, 0, 0, 0, 0, 0, 0, 0, // 08 - 0F
0, 0, 0, 0, 0, 0, 0, 0, // 10 - 17
0, 0, 0, 0, 0, 0, 0, 0, // 18 - 1F
0, 0, 0, 0, 0, 0, 0, 0, // 20 - 27
0, 0, 0, 0, 0, 0, 0, 0, // 28 - 2F
0, 0, 0, 0, 0, 0, 0, 0, // 30 - 37
0, 0, 0, 0, 0, 0, 0, 0, // 38 - 3F
0, 0, 0, 0, 0, 0, 0, 0, // 40 - 47
0, 0, '-', 0, 0, 0, '+', 0, // 48 - 4F
0, 0, 0, 0, 0, 0, 0, 0, // 50 - 57
0, 0, 0, 0, 0, 0, 0, 0, // 58 - 5F
0, 0, 0, 0, 0, 0, 0, 0, // 60 - 67
0, 0, 0, 0, 0, 0, 0, 0, // 68 - 6F
0, 0, 0, 0, 0, 0, 0, 0, // 70 - 77
0, 0, 0, 0, 0, 0, 0, 0 // 78 - 7F
};
static char lookup_key_to_char_numpad_numlock[128] = {
0, 0, 0, 0, 0, 0, 0, 0, // 00 - 07 0, 0, 0, 0, 0, 0, 0, 0, // 00 - 07
0, 0, 0, 0, 0, 0, 0, 0, // 08 - 0F 0, 0, 0, 0, 0, 0, 0, 0, // 08 - 0F
0, 0, 0, 0, 0, 0, 0, 0, // 10 - 17 0, 0, 0, 0, 0, 0, 0, 0, // 10 - 17
@ -222,7 +241,7 @@ static boolean handler_filter_keys(void) {
if (BIT_ISSET(KEYBRD_MOD_EXTENDED, key_mod)) { if (BIT_ISSET(KEYBRD_MOD_EXTENDED, key_mod)) {
// extended key + leftshift comes with cursor key presses when // extended key + leftshift comes with cursor key presses when
// numlock is enabled // numlock is enabled
if ((_key_scan & 0x7f) == (KEY)KEY_LEFTSHIFT) if ((_key_scan & 0x7f) == KEY_LEFTSHIFT)
return TRUE; return TRUE;
} }
return FALSE; return FALSE;
@ -231,17 +250,17 @@ static boolean handler_filter_keys(void) {
// maintains BIOS keyboard flags/led toggle states (caps/num/scroll lock) // maintains BIOS keyboard flags/led toggle states (caps/num/scroll lock)
static void handler_update_flags_and_leds(void) { static void handler_update_flags_and_leds(void) {
switch (_key_scan) { switch (_key_scan) {
case (KEY)KEY_CAPSLOCK: case KEY_CAPSLOCK:
BIT_TOGGLE(KEYBRD_FLAGS_CAPSLOCK, key_flags); BIT_TOGGLE(KEYBRD_FLAGS_CAPSLOCK, key_flags);
update_kb_led(key_flags); update_kb_led(key_flags);
set_kb_flags(key_flags); set_kb_flags(key_flags);
break; break;
case (KEY)KEY_NUMLOCK: case KEY_NUMLOCK:
BIT_TOGGLE(KEYBRD_FLAGS_NUMLOCK, key_flags); BIT_TOGGLE(KEYBRD_FLAGS_NUMLOCK, key_flags);
update_kb_led(key_flags); update_kb_led(key_flags);
set_kb_flags(key_flags); set_kb_flags(key_flags);
break; break;
case (KEY)KEY_SCROLLLOCK: case KEY_SCROLLLOCK:
BIT_TOGGLE(KEYBRD_FLAGS_SCROLLOCK, key_flags); BIT_TOGGLE(KEYBRD_FLAGS_SCROLLOCK, key_flags);
update_kb_led(key_flags); update_kb_led(key_flags);
set_kb_flags(key_flags); set_kb_flags(key_flags);
@ -371,14 +390,25 @@ void keyboard_wait_for_key(KEY key) {
} }
char key_to_char(KEY key, uword modifiers) { char key_to_char(KEY key, uword modifiers) {
// this is really just here because of the stupid slash key on the numpad
// (but maybe it will be useful for other types of keyboards later...)
if (BIT_ISSET(KEYBRD_MOD_EXTENDED, modifiers)) { if (BIT_ISSET(KEYBRD_MOD_EXTENDED, modifiers)) {
return lookup_key_to_char_extended[(int)key]; return lookup_key_to_char_extended[(int)key];
} }
else if ((key >= (KEY)0x47) && (key <= (KEY)0x53)) { // handle numpad keys specially
if (BIT_ISSET(KEYBRD_MOD_NUMLOCK, modifiers) && else if ((key >= 0x47) && (key <= 0x53)) {
!BIT_ISSET(KEYBRD_MOD_SHIFT, modifiers)) if (BIT_ISSET(KEYBRD_MOD_NUMLOCK, modifiers)) {
if (BIT_ISSET(KEYBRD_MOD_SHIFT, modifiers))
return lookup_key_to_char_numpad[(int)key]; return lookup_key_to_char_numpad[(int)key];
else
return lookup_key_to_char_numpad_numlock[(int)key];
} else {
if (BIT_ISSET(KEYBRD_MOD_SHIFT, modifiers))
return lookup_key_to_char_numpad_numlock[(int)key];
else
return lookup_key_to_char_numpad[(int)key];
}
} else { } else {
if (BIT_ISSET(KEYBRD_MOD_CAPSLOCK, modifiers)) { if (BIT_ISSET(KEYBRD_MOD_CAPSLOCK, modifiers)) {