Zengtudor/glfw
1
0
Fork 0
mirror of https://github.com/glfw/glfw.git synced 2025-10-05 06:06:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Send control characters to CharMod callback on X11.

Browse Source 
Control A-Z were being inhibited, but other control characters were being
passed through. With this change, we pass all control characters that are
mapped via X*LookupString to the CharMod callback.
This commit is contained in:
Tor Andersson 2017-09-26 23:08:00 +02:00
parent 56ecd62f58
commit b37e589299
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/x11_window.c
View File

@ -1130,6 +1130,14 @@ static void releaseMonitor(_GLFWwindow* window)
} }
} }
static void _glfwInputCharX11(_GLFWwindow* window, unsigned int codepoint, int mods, GLFWbool plain)
{
/* Reverse the Ctl+[A-Z] bit-shifting that XLookupString has applied */
if (codepoint < 32 && (mods & GLFW_MOD_CONTROL))
codepoint += '@';
_glfwInputChar(window, codepoint, mods, plain);
}
// Process the specified X event // Process the specified X event
// //
static void processEvent(XEvent *event) static void processEvent(XEvent *event)
@ -1259,7 +1267,7 @@ static void processEvent(XEvent *event)
const char* c = chars; const char* c = chars;
chars[count] = '\0'; chars[count] = '\0';
while (c - chars < count) while (c - chars < count)
_glfwInputChar(window, decodeUTF8(&c), mods, plain); _glfwInputCharX11(window, decodeUTF8(&c), mods, plain);
} }
#else /*X_HAVE_UTF8_STRING*/ #else /*X_HAVE_UTF8_STRING*/
wchar_t buffer[16]; wchar_t buffer[16];
@ -1285,7 +1293,7 @@ static void processEvent(XEvent *event)
{ {
int i; int i;
for (i = 0; i < count; i++) for (i = 0; i < count; i++)
_glfwInputChar(window, chars[i], mods, plain); _glfwInputCharX11(window, chars[i], mods, plain);
} }
#endif /*X_HAVE_UTF8_STRING*/ #endif /*X_HAVE_UTF8_STRING*/
@ -1302,7 +1310,7 @@ static void processEvent(XEvent *event)
const long character = _glfwKeySym2Unicode(keysym); const long character = _glfwKeySym2Unicode(keysym);
if (character != -1) if (character != -1)
_glfwInputChar(window, character, mods, plain); _glfwInputCharX11(window, character, mods, plain);
} }
return; return;