aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/mac.m69
-rw-r--r--src/win.c86
-rw-r--r--src/x11.c73
3 files changed, 131 insertions, 97 deletions
diff --git a/src/mac.m b/src/mac.m
index ce90b9a..fa5355f 100644
--- a/src/mac.m
+++ b/src/mac.m
@@ -379,31 +379,12 @@ keySymToSpecial(const NSEvent* const ev)
{
NSString* chars = [ev charactersIgnoringModifiers];
if ([chars length] == 1) {
- switch ([chars characterAtIndex:0]) {
- case NSF1FunctionKey:
- return PUGL_KEY_F1;
- case NSF2FunctionKey:
- return PUGL_KEY_F2;
- case NSF3FunctionKey:
- return PUGL_KEY_F3;
- case NSF4FunctionKey:
- return PUGL_KEY_F4;
- case NSF5FunctionKey:
- return PUGL_KEY_F5;
- case NSF6FunctionKey:
- return PUGL_KEY_F6;
- case NSF7FunctionKey:
- return PUGL_KEY_F7;
- case NSF8FunctionKey:
- return PUGL_KEY_F8;
- case NSF9FunctionKey:
- return PUGL_KEY_F9;
- case NSF10FunctionKey:
- return PUGL_KEY_F10;
- case NSF11FunctionKey:
- return PUGL_KEY_F11;
- case NSF12FunctionKey:
- return PUGL_KEY_F12;
+ const unichar sym = [chars characterAtIndex:0];
+ if (sym >= NSF1FunctionKey && sym <= NSF12FunctionKey) {
+ return (PuglKey)(PUGL_KEY_F1 + (sym - NSF1FunctionKey));
+ }
+
+ switch (sym) {
case NSDeleteCharacter:
return PUGL_KEY_BACKSPACE;
case NSDeleteFunctionKey:
@@ -439,6 +420,44 @@ keySymToSpecial(const NSEvent* const ev)
}
// SHIFT, CTRL, ALT, and SUPER are handled in [flagsChanged]
}
+
+ switch ([ev keyCode]) {
+ case 0x41:
+ return PUGL_KEY_PAD_DECIMAL;
+ case 0x43:
+ return PUGL_KEY_PAD_MULTIPLY;
+ case 0x45:
+ return PUGL_KEY_PAD_ADD;
+ case 0x4B:
+ return PUGL_KEY_PAD_DIVIDE;
+ case 0x4C:
+ return PUGL_KEY_PAD_ENTER;
+ case 0x4E:
+ return PUGL_KEY_PAD_SUBTRACT;
+ case 0x51:
+ return PUGL_KEY_PAD_EQUAL;
+ case 0x52:
+ return PUGL_KEY_PAD_0;
+ case 0x53:
+ return PUGL_KEY_PAD_1;
+ case 0x54:
+ return PUGL_KEY_PAD_2;
+ case 0x55:
+ return PUGL_KEY_PAD_3;
+ case 0x56:
+ return PUGL_KEY_PAD_4;
+ case 0x57:
+ return PUGL_KEY_PAD_5;
+ case 0x58:
+ return PUGL_KEY_PAD_6;
+ case 0x59:
+ return PUGL_KEY_PAD_7;
+ case 0x5B:
+ return PUGL_KEY_PAD_8;
+ case 0x5C:
+ return PUGL_KEY_PAD_9;
+ }
+
return (PuglKey)0;
}
diff --git a/src/win.c b/src/win.c
index ed78baa..e020b86 100644
--- a/src/win.c
+++ b/src/win.c
@@ -403,42 +403,35 @@ puglFreeWorldInternals(PuglWorld* world)
}
static PuglKey
+keyInRange(const WPARAM winSym,
+ const WPARAM winMin,
+ const WPARAM winMax,
+ const PuglKey puglMin)
+{
+ return (winSym >= winMin && winSym <= winMax)
+ ? (PuglKey)(puglMin + (winSym - winMin))
+ : (PuglKey)0;
+}
+
+static PuglKey
keySymToSpecial(const WPARAM sym, const bool ext)
{
+ PuglKey key = (PuglKey)0;
+ if ((key = keyInRange(sym, VK_F1, VK_F12, PUGL_KEY_F1)) ||
+ (key = keyInRange(sym,
+ VK_PRIOR,
+ VK_DOWN,
+ ext ? PUGL_KEY_PAGE_UP : PUGL_KEY_PAD_PAGE_UP)) ||
+ (key = keyInRange(sym, VK_NUMPAD0, VK_NUMPAD9, PUGL_KEY_PAD_0)) ||
+ (key = keyInRange(sym, VK_MULTIPLY, VK_DIVIDE, PUGL_KEY_PAD_MULTIPLY)) ||
+ (key = keyInRange(sym, VK_LSHIFT, VK_RMENU, PUGL_KEY_SHIFT_L))) {
+ return key;
+ }
+
// clang-format off
switch (sym) {
- case VK_F1: return PUGL_KEY_F1;
- case VK_F2: return PUGL_KEY_F2;
- case VK_F3: return PUGL_KEY_F3;
- case VK_F4: return PUGL_KEY_F4;
- case VK_F5: return PUGL_KEY_F5;
- case VK_F6: return PUGL_KEY_F6;
- case VK_F7: return PUGL_KEY_F7;
- case VK_F8: return PUGL_KEY_F8;
- case VK_F9: return PUGL_KEY_F9;
- case VK_F10: return PUGL_KEY_F10;
- case VK_F11: return PUGL_KEY_F11;
- case VK_F12: return PUGL_KEY_F12;
case VK_BACK: return PUGL_KEY_BACKSPACE;
- case VK_DELETE: return PUGL_KEY_DELETE;
- case VK_LEFT: return PUGL_KEY_LEFT;
- case VK_UP: return PUGL_KEY_UP;
- case VK_RIGHT: return PUGL_KEY_RIGHT;
- case VK_DOWN: return PUGL_KEY_DOWN;
- case VK_PRIOR: return PUGL_KEY_PAGE_UP;
- case VK_NEXT: return PUGL_KEY_PAGE_DOWN;
- case VK_HOME: return PUGL_KEY_HOME;
- case VK_END: return PUGL_KEY_END;
- case VK_INSERT: return PUGL_KEY_INSERT;
- case VK_SHIFT: return ext ? PUGL_KEY_SHIFT_L : PUGL_KEY_SHIFT_R;
- case VK_LSHIFT: return PUGL_KEY_SHIFT_L;
- case VK_RSHIFT: return PUGL_KEY_SHIFT_R;
- case VK_CONTROL: return ext ? PUGL_KEY_CTRL_L : PUGL_KEY_CTRL_R;
- case VK_LCONTROL: return PUGL_KEY_CTRL_L;
- case VK_RCONTROL: return PUGL_KEY_CTRL_R;
- case VK_MENU: return ext ? PUGL_KEY_ALT_L : PUGL_KEY_ALT_R;
- case VK_LMENU: return PUGL_KEY_ALT_L;
- case VK_RMENU: return PUGL_KEY_ALT_R;
+ case VK_CLEAR: return PUGL_KEY_PAD_CLEAR;
case VK_LWIN: return PUGL_KEY_SUPER_L;
case VK_RWIN: return PUGL_KEY_SUPER_R;
case VK_CAPITAL: return PUGL_KEY_CAPS_LOCK;
@@ -449,6 +442,29 @@ keySymToSpecial(const WPARAM sym, const bool ext)
}
// clang-format on
+ if (ext) {
+ // clang-format off
+ switch (sym) {
+ case VK_RETURN: return PUGL_KEY_PAD_ENTER;
+ case VK_INSERT: return PUGL_KEY_INSERT;
+ case VK_DELETE: return PUGL_KEY_DELETE;
+ case VK_SHIFT: return PUGL_KEY_SHIFT_L;
+ case VK_CONTROL: return PUGL_KEY_CTRL_L;
+ case VK_MENU: return PUGL_KEY_ALT_L;
+ }
+ // clang-format on
+ } else {
+ // clang-format off
+ switch (sym) {
+ case VK_INSERT: return PUGL_KEY_PAD_INSERT;
+ case VK_DELETE: return PUGL_KEY_PAD_DELETE;
+ case VK_SHIFT: return PUGL_KEY_SHIFT_R;
+ case VK_CONTROL: return PUGL_KEY_CTRL_R;
+ case VK_MENU: return PUGL_KEY_ALT_R;
+ }
+ // clang-format on
+ }
+
return (PuglKey)0;
}
@@ -561,13 +577,9 @@ initKeyEvent(PuglKeyEvent* event,
event->keycode = (uint32_t)((lParam & 0xFF0000) >> 16);
event->key = 0;
- const PuglKey special = keySymToSpecial(vkey);
+ const PuglKey special = keySymToSpecial(vkey, ext);
if (special) {
- if (ext && (special == PUGL_KEY_CTRL_L || special == PUGL_KEY_ALT_L)) {
- event->key = (uint32_t)special + 1U; // Right hand key
- } else {
- event->key = (uint32_t)special;
- }
+ event->key = (uint32_t)special;
} else if (!dead) {
// Translate unshifted key
BYTE keyboardState[256] = PUGL_INIT_STRUCT;
diff --git a/src/x11.c b/src/x11.c
index b389932..e1e948f 100644
--- a/src/x11.c
+++ b/src/x11.c
@@ -810,47 +810,48 @@ puglFreeWorldInternals(PuglWorld* const world)
}
static PuglKey
+keyInRange(const KeySym xSym,
+ const KeySym xMin,
+ const KeySym xMax,
+ const PuglKey puglMin)
+{
+ return (xSym >= xMin && xSym <= xMax) ? (PuglKey)(puglMin + (xSym - xMin))
+ : (PuglKey)0;
+}
+
+static PuglKey
keySymToSpecial(const KeySym sym)
{
+ PuglKey key = (PuglKey)0;
+ if ((key = keyInRange(sym, XK_F1, XK_F12, PUGL_KEY_F1)) ||
+ (key = keyInRange(sym, XK_Page_Up, XK_End, PUGL_KEY_PAGE_UP)) ||
+ (key = keyInRange(sym, XK_Home, XK_Down, PUGL_KEY_HOME)) ||
+ (key = keyInRange(sym, XK_Shift_L, XK_Control_R, PUGL_KEY_SHIFT_L)) ||
+ (key = keyInRange(sym, XK_Alt_L, XK_Super_R, PUGL_KEY_ALT_L)) ||
+ (key = keyInRange(sym, XK_KP_Home, XK_KP_Down, PUGL_KEY_PAD_HOME)) ||
+ (key = keyInRange(sym, XK_KP_0, XK_KP_9, PUGL_KEY_PAD_0)) ||
+ (key = keyInRange(sym, XK_KP_Begin, XK_KP_Delete, PUGL_KEY_PAD_CLEAR)) ||
+ (key = keyInRange(
+ sym, XK_KP_Multiply, XK_KP_Divide, PUGL_KEY_PAD_MULTIPLY))) {
+ return key;
+ }
+
// clang-format off
switch (sym) {
- case XK_F1: return PUGL_KEY_F1;
- case XK_F2: return PUGL_KEY_F2;
- case XK_F3: return PUGL_KEY_F3;
- case XK_F4: return PUGL_KEY_F4;
- case XK_F5: return PUGL_KEY_F5;
- case XK_F6: return PUGL_KEY_F6;
- case XK_F7: return PUGL_KEY_F7;
- case XK_F8: return PUGL_KEY_F8;
- case XK_F9: return PUGL_KEY_F9;
- case XK_F10: return PUGL_KEY_F10;
- case XK_F11: return PUGL_KEY_F11;
- case XK_F12: return PUGL_KEY_F12;
- case XK_Left: return PUGL_KEY_LEFT;
- case XK_Up: return PUGL_KEY_UP;
- case XK_Right: return PUGL_KEY_RIGHT;
- case XK_Down: return PUGL_KEY_DOWN;
- case XK_Page_Up: return PUGL_KEY_PAGE_UP;
- case XK_Page_Down: return PUGL_KEY_PAGE_DOWN;
- case XK_Home: return PUGL_KEY_HOME;
- case XK_End: return PUGL_KEY_END;
+ case XK_ISO_Level3_Shift: return PUGL_KEY_ALT_R;
+ case XK_Pause: return PUGL_KEY_PAUSE;
+ case XK_Scroll_Lock: return PUGL_KEY_SCROLL_LOCK;
+ case XK_Print: return PUGL_KEY_PRINT_SCREEN;
case XK_Insert: return PUGL_KEY_INSERT;
- case XK_Shift_L: return PUGL_KEY_SHIFT_L;
- case XK_Shift_R: return PUGL_KEY_SHIFT_R;
- case XK_Control_L: return PUGL_KEY_CTRL_L;
- case XK_Control_R: return PUGL_KEY_CTRL_R;
- case XK_Alt_L: return PUGL_KEY_ALT_L;
- case XK_ISO_Level3_Shift:
- case XK_Alt_R: return PUGL_KEY_ALT_R;
- case XK_Super_L: return PUGL_KEY_SUPER_L;
- case XK_Super_R: return PUGL_KEY_SUPER_R;
case XK_Menu: return PUGL_KEY_MENU;
- case XK_Caps_Lock: return PUGL_KEY_CAPS_LOCK;
- case XK_Scroll_Lock: return PUGL_KEY_SCROLL_LOCK;
case XK_Num_Lock: return PUGL_KEY_NUM_LOCK;
- case XK_Print: return PUGL_KEY_PRINT_SCREEN;
- case XK_Pause: return PUGL_KEY_PAUSE;
- default: break;
+ case XK_KP_Enter: return PUGL_KEY_PAD_ENTER;
+ case XK_KP_Page_Up: return PUGL_KEY_PAD_PAGE_UP;
+ case XK_KP_Page_Down: return PUGL_KEY_PAD_PAGE_DOWN;
+ case XK_KP_End: return PUGL_KEY_PAD_END;
+ case XK_KP_Equal: return PUGL_KEY_PAD_CLEAR;
+ case XK_Caps_Lock: return PUGL_KEY_CAPS_LOCK;
+ default: break;
}
// clang-format on
@@ -878,7 +879,9 @@ translateKey(PuglView* const view, XEvent* const xevent, PuglEvent* const event)
const bool filter = XFilterEvent(xevent, None);
event->key.keycode = xevent->xkey.keycode;
- xevent->xkey.state = 0;
+
+ // Mask off the shift bit to get the lowercase "main" symbol
+ xevent->xkey.state = xevent->xkey.state & ~(unsigned)ShiftMask;
// Lookup unshifted key
char ustr[8] = {0};
generated by cgit v1.2.1 (git 2.18.0) at 2024-11-21 23:07:03 +0000