Support additional special keys

4 files changed, 133 insertions, 79 deletions

diff --git a/pugl/pugl.h b/pugl/pugl.h
index 0f36bfe..33761f9 100644
--- a/pugl/pugl.h
+++ b/pugl/pugl.h
@@ -163,9 +163,23 @@ typedef enum {
 	PUGL_KEY_END,
 	PUGL_KEY_INSERT,
 	PUGL_KEY_SHIFT,
+	PUGL_KEY_SHIFT_L = PUGL_KEY_SHIFT,
+	PUGL_KEY_SHIFT_R,
 	PUGL_KEY_CTRL,
+	PUGL_KEY_CTRL_L = PUGL_KEY_CTRL,
+	PUGL_KEY_CTRL_R,
 	PUGL_KEY_ALT,
-	PUGL_KEY_SUPER
+	PUGL_KEY_ALT_L = PUGL_KEY_ALT,
+	PUGL_KEY_ALT_R,
+	PUGL_KEY_SUPER,
+	PUGL_KEY_SUPER_L = PUGL_KEY_SUPER,
+	PUGL_KEY_SUPER_R,
+	PUGL_KEY_MENU,
+	PUGL_KEY_CAPS_LOCK,
+	PUGL_KEY_SCROLL_LOCK,
+	PUGL_KEY_NUM_LOCK,
+	PUGL_KEY_PRINT_SCREEN,
+	PUGL_KEY_PAUSE
 } PuglKey;
 
 /**
diff --git a/pugl/pugl_osx.m b/pugl/pugl_osx.m
index 6f3d4bc..cede913 100644
--- a/pugl/pugl_osx.m
+++ b/pugl/pugl_osx.m
@@ -226,27 +226,32 @@ keySymToSpecial(PuglView* view, NSEvent* 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;
-		case NSLeftArrowFunctionKey:  return PUGL_KEY_LEFT;
-		case NSUpArrowFunctionKey:    return PUGL_KEY_UP;
-		case NSRightArrowFunctionKey: return PUGL_KEY_RIGHT;
-		case NSDownArrowFunctionKey:  return PUGL_KEY_DOWN;
-		case NSPageUpFunctionKey:     return PUGL_KEY_PAGE_UP;
-		case NSPageDownFunctionKey:   return PUGL_KEY_PAGE_DOWN;
-		case NSHomeFunctionKey:       return PUGL_KEY_HOME;
-		case NSEndFunctionKey:        return PUGL_KEY_END;
-		case NSInsertFunctionKey:     return PUGL_KEY_INSERT;
+		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;
+		case NSLeftArrowFunctionKey:   return PUGL_KEY_LEFT;
+		case NSUpArrowFunctionKey:     return PUGL_KEY_UP;
+		case NSRightArrowFunctionKey:  return PUGL_KEY_RIGHT;
+		case NSDownArrowFunctionKey:   return PUGL_KEY_DOWN;
+		case NSPageUpFunctionKey:      return PUGL_KEY_PAGE_UP;
+		case NSPageDownFunctionKey:    return PUGL_KEY_PAGE_DOWN;
+		case NSHomeFunctionKey:        return PUGL_KEY_HOME;
+		case NSEndFunctionKey:         return PUGL_KEY_END;
+		case NSInsertFunctionKey:      return PUGL_KEY_INSERT;
+		case NSMenuFunctionKey:        return PUGL_KEY_MENU;
+		case NSScrollLockFunctionKey:  return PUGL_KEY_SCROLL_LOCK;
+		case NSClearLineFunctionKey:   return PUGL_KEY_NUM_LOCK;
+		case NSPrintScreenFunctionKey: return PUGL_KEY_PRINT_SCREEN;
+		case NSPauseFunctionKey:       return PUGL_KEY_PAUSE;
 		}
 		// SHIFT, CTRL, ALT, and SUPER are handled in [flagsChanged]
 	}
diff --git a/pugl/pugl_win.c b/pugl/pugl_win.c
index afbae31..6c47789 100644
--- a/pugl/pugl_win.c
+++ b/pugl/pugl_win.c
@@ -401,32 +401,43 @@ static PuglKey
 keySymToSpecial(WPARAM sym)
 {
 	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_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 PUGL_KEY_SHIFT;
-	case VK_CONTROL: return PUGL_KEY_CTRL;
-	case VK_MENU:    return PUGL_KEY_ALT;
-	case VK_LWIN:    return PUGL_KEY_SUPER;
-	case VK_RWIN:    return PUGL_KEY_SUPER;
+	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_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:
+	case VK_LSHIFT:   return PUGL_KEY_SHIFT_L;
+	case VK_RSHIFT:   return PUGL_KEY_SHIFT_R;
+	case VK_CONTROL:
+	case VK_LCONTROL: return PUGL_KEY_CTRL_L;
+	case VK_RCONTROL: return PUGL_KEY_CTRL_R;
+	case VK_MENU:
+	case VK_LMENU:    return PUGL_KEY_ALT_L;
+	case VK_RMENU:    return PUGL_KEY_ALT_R;
+	case VK_LWIN:     return PUGL_KEY_SUPER_L;
+	case VK_RWIN:     return PUGL_KEY_SUPER_R;
+	case VK_CAPITAL:  return PUGL_KEY_CAPS_LOCK;
+	case VK_SCROLL:   return PUGL_KEY_SCROLL_LOCK;
+	case VK_NUMLOCK:  return PUGL_KEY_NUM_LOCK;
+	case VK_SNAPSHOT: return PUGL_KEY_PRINT_SCREEN;
+	case VK_PAUSE:    return PUGL_KEY_PAUSE;
 	}
 	return (PuglKey)0;
 }
@@ -516,10 +527,15 @@ initKeyEvent(PuglEventKey* event,
 	POINT cpos = { rpos.x, rpos.y };
 	ScreenToClient(view->impl->hwnd, &rpos);
 
-	const unsigned vkey  = (unsigned)wParam;
+	const unsigned scode = (uint32_t)((lParam & 0xFF0000) >> 16);
+	const unsigned vkey  = ((wParam == VK_SHIFT)
+	                        ? MapVirtualKey(scode, MAPVK_VSC_TO_VK_EX)
+	                        : (unsigned)wParam);
+
 	const unsigned vcode = MapVirtualKey(vkey, MAPVK_VK_TO_VSC);
 	const unsigned kchar = MapVirtualKey(vkey, MAPVK_VK_TO_CHAR);
 	const bool     dead  = kchar >> (sizeof(UINT) * 8 - 1) & 1;
+	const bool     ext   = lParam & 0x01000000;
 
 	event->type    = press ? PUGL_KEY_PRESS : PUGL_KEY_RELEASE;
 	event->time    = GetMessageTime() / 1e3;
@@ -533,7 +549,11 @@ initKeyEvent(PuglEventKey* event,
 
 	const PuglKey special = keySymToSpecial(vkey);
 	if (special) {
-		event->key = special;
+		if (ext && (special == PUGL_KEY_CTRL || special == PUGL_KEY_ALT)) {
+			event->key = special + 1u; // Right hand key
+		} else {
+			event->key = special;
+		}
 	} else if (!dead) {
 		// Translate unshifted key
 		BYTE    keyboardState[256] = {0};
@@ -749,6 +769,14 @@ handleMessage(PuglView* view, UINT message, WPARAM wParam, LPARAM lParam)
 	case WM_KILLFOCUS:
 		event.type = PUGL_FOCUS_OUT;
 		break;
+	case WM_SYSKEYDOWN:
+		initKeyEvent(&event.key, view, true, wParam, lParam);
+		break;
+	case WM_SYSKEYUP:
+		initKeyEvent(&event.key, view, false, wParam, lParam);
+		break;
+	case WM_SYSCHAR:
+		return TRUE;
 	case WM_QUIT:
 	case PUGL_LOCAL_CLOSE_MSG:
 		event.close.type = PUGL_CLOSE;
diff --git a/pugl/pugl_x11.c b/pugl/pugl_x11.c
index f10902f..e5b8098 100644
--- a/pugl/pugl_x11.c
+++ b/pugl/pugl_x11.c
@@ -219,35 +219,42 @@ static PuglKey
 keySymToSpecial(KeySym sym)
 {
 	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_Insert:    return PUGL_KEY_INSERT;
-	case XK_Shift_L:   return PUGL_KEY_SHIFT;
-	case XK_Shift_R:   return PUGL_KEY_SHIFT;
-	case XK_Control_L: return PUGL_KEY_CTRL;
-	case XK_Control_R: return PUGL_KEY_CTRL;
-	case XK_Alt_L:     return PUGL_KEY_ALT;
-	case XK_Alt_R:     return PUGL_KEY_ALT;
-	case XK_Super_L:   return PUGL_KEY_SUPER;
-	case XK_Super_R:   return PUGL_KEY_SUPER;
+	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_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;
 	}
 	return (PuglKey)0;