Mirrored_Repos/LookingGlass
1
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2024-11-22 13:37:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[client] x11: implement keyboard modifiers

Browse Source
This commit is contained in:
Quantum 2021-08-19 06:26:57 -04:00 committed by Geoffrey McRae
parent ce3f11fd40
commit 1021c9ce92
2 changed files with 70 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
client/displayservers/X11/x11.c
View File

@ -903,6 +903,32 @@ static int x11EventThread(void * unused)
return 0; return 0;
} }
static enum Modifiers keySymToModifier(KeySym sym)
{
switch (sym)
{
case XK_Control_L: return MOD_CTRL_LEFT;
case XK_Control_R: return MOD_CTRL_RIGHT;
case XK_Shift_L: return MOD_SHIFT_LEFT;
case XK_Shift_R: return MOD_SHIFT_RIGHT;
case XK_Alt_L: return MOD_ALT_LEFT;
case XK_Alt_R: return MOD_ALT_RIGHT;
case XK_Super_L: return MOD_SUPER_LEFT;
case XK_Super_R: return MOD_SUPER_RIGHT;
default: return -1;
}
}
static void updateModifiers(void)
{
app_handleKeyboardModifiers(
x11.modifiers[MOD_CTRL_LEFT] || x11.modifiers[MOD_CTRL_RIGHT],
x11.modifiers[MOD_SHIFT_LEFT] || x11.modifiers[MOD_SHIFT_RIGHT],
x11.modifiers[MOD_ALT_LEFT] || x11.modifiers[MOD_ALT_RIGHT],
x11.modifiers[MOD_SUPER_LEFT] || x11.modifiers[MOD_SUPER_RIGHT]
);
}
static void x11XInputEvent(XGenericEventCookie *cookie) static void x11XInputEvent(XGenericEventCookie *cookie)
{ {
static int button_state = 0; static int button_state = 0;
@ -1009,6 +1035,16 @@ static void x11XInputEvent(XGenericEventCookie *cookie)
buffer[count] = '\0'; buffer[count] = '\0';
app_handleKeyboardTyped(buffer); app_handleKeyboardTyped(buffer);
} }
if (status == XLookupKeySym || status == XLookupBoth)
{
int modifier = keySymToModifier(sym);
if (modifier >= 0)
{
x11.modifiers[modifier] = true;
updateModifiers();
}
}
return; return;
} }
@ -1019,6 +1055,25 @@ static void x11XInputEvent(XGenericEventCookie *cookie)
XIDeviceEvent *device = cookie->data; XIDeviceEvent *device = cookie->data;
app_handleKeyRelease(device->detail - 8); app_handleKeyRelease(device->detail - 8);
if (!x11.xic || !app_isOverlayMode())
return;
XKeyPressedEvent ev = {
.display = x11.display,
.window = x11.window,
.type = KeyRelease,
.keycode = device->detail,
.state = device->mods.effective,
};
KeySym sym = XLookupKeysym(&ev, 0);
int modifier = keySymToModifier(sym);
if (modifier >= 0)
{
x11.modifiers[modifier] = false;
updateModifiers();
}
return; return;
} }

15
client/displayservers/X11/x11.h
View File

@ -34,6 +34,20 @@
#include "common/thread.h" #include "common/thread.h"
#include "common/types.h" #include "common/types.h"
enum Modifiers
{
MOD_CTRL_LEFT = 0,
MOD_CTRL_RIGHT,
MOD_SHIFT_LEFT,
MOD_SHIFT_RIGHT,
MOD_ALT_LEFT,
MOD_ALT_RIGHT,
MOD_SUPER_LEFT,
MOD_SUPER_RIGHT,
};
#define MOD_COUNT (MOD_SUPER_RIGHT + 1)
struct X11DSState struct X11DSState
{ {
Display * display; Display * display;
@ -72,6 +86,7 @@ struct X11DSState
XIM xim; XIM xim;
XIC xic; XIC xic;
bool modifiers[MOD_COUNT];
// XFixes vars // XFixes vars
int eventBase; int eventBase;