From 4f2345683d76e3031a60ef6b8ec3630a709d4071 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= Date: Sat, 30 May 2015 13:11:18 -0700 Subject: [PATCH] X11: Added key mapping. --- examples/common/entry/entry.cpp | 2 +- examples/common/entry/entry.h | 2 +- examples/common/entry/entry_osx.mm | 2 +- examples/common/entry/entry_windows.cpp | 2 +- examples/common/entry/entry_x11.cpp | 15 +++++++++++++-- 5 files changed, 17 insertions(+), 6 deletions(-) diff --git a/examples/common/entry/entry.cpp b/examples/common/entry/entry.cpp index 048573dbe..5dac1e39c 100644 --- a/examples/common/entry/entry.cpp +++ b/examples/common/entry/entry.cpp @@ -67,7 +67,7 @@ BX_PRAGMA_DIAGNOSTIC_POP(); "Period", "Slash", "Backslash", - "Tilda", + "Tilde", "F1", "F2", "F3", diff --git a/examples/common/entry/entry.h b/examples/common/entry/entry.h index 9a262244e..a583abfc3 100644 --- a/examples/common/entry/entry.h +++ b/examples/common/entry/entry.h @@ -101,7 +101,7 @@ namespace entry Period, Slash, Backslash, - Tilda, + Tilde, F1, F2, F3, diff --git a/examples/common/entry/entry_osx.mm b/examples/common/entry/entry_osx.mm index 2791dcfae..a43c47abc 100644 --- a/examples/common/entry/entry_osx.mm +++ b/examples/common/entry/entry_osx.mm @@ -97,7 +97,7 @@ namespace entry s_translateKey[uint8_t('-')] = Key::Minus; s_translateKey[uint8_t('~')] = - s_translateKey[uint8_t('`')] = Key::Tilda; + s_translateKey[uint8_t('`')] = Key::Tilde; s_translateKey[uint8_t(':')] = s_translateKey[uint8_t(';')] = Key::Semicolon; diff --git a/examples/common/entry/entry_windows.cpp b/examples/common/entry/entry_windows.cpp index 040a9fcb2..49e4b8d3b 100644 --- a/examples/common/entry/entry_windows.cpp +++ b/examples/common/entry/entry_windows.cpp @@ -358,7 +358,7 @@ namespace entry s_translateKey[VK_OEM_PERIOD] = Key::Period; s_translateKey[VK_OEM_2] = Key::Slash; s_translateKey[VK_OEM_5] = Key::Backslash; - s_translateKey[VK_OEM_3] = Key::Tilda; + s_translateKey[VK_OEM_3] = Key::Tilde; s_translateKey[VK_F1] = Key::F1; s_translateKey[VK_F2] = Key::F2; s_translateKey[VK_F3] = Key::F3; diff --git a/examples/common/entry/entry_x11.cpp b/examples/common/entry/entry_x11.cpp index 02d143169..c231b1ccf 100644 --- a/examples/common/entry/entry_x11.cpp +++ b/examples/common/entry/entry_x11.cpp @@ -202,13 +202,24 @@ namespace entry initTranslateKey(XK_Down, Key::Down); initTranslateKey(XK_Left, Key::Left); initTranslateKey(XK_Right, Key::Right); - initTranslateKey(XK_Page_Up, Key::PageUp); - initTranslateKey(XK_Page_Down, Key::PageUp); + initTranslateKey(XK_Insert, Key::Insert); + initTranslateKey(XK_Delete, Key::Delete); initTranslateKey(XK_Home, Key::Home); initTranslateKey(XK_KP_End, Key::End); + initTranslateKey(XK_Page_Up, Key::PageUp); + initTranslateKey(XK_Page_Down, Key::PageUp); initTranslateKey(XK_Print, Key::Print); initTranslateKey(XK_equal, Key::Plus); initTranslateKey(XK_minus, Key::Minus); + initTranslateKey(XK_bracketleft, Key::LeftBracket); + initTranslateKey(XK_bracketright, Key::RightBracket); + initTranslateKey(XK_semicolon, Key::Semicolon); + initTranslateKey(XK_apostrophe, Key::Quote); + initTranslateKey(XK_comma, Key::Comma); + initTranslateKey(XK_period, Key::Period); + initTranslateKey(XK_slash, Key::Slash); + initTranslateKey(XK_backslash, Key::Backslash); + initTranslateKey(XK_grave, Key::Tilde); initTranslateKey(XK_F1, Key::F1); initTranslateKey(XK_F2, Key::F2); initTranslateKey(XK_F3, Key::F3);