mirrors/looking-glass
2
0
Fork 0
mirror of https://github.com/gnif/LookingGlass.git synced 2025-01-09 22:03:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[client] x11: implement keyboard typing

Browse source
This commit is contained in:
Quantum 2021-08-19 05:52:45 -04:00 committed by Geoffrey McRae
parent bb91b41c64
commit ce3f11fd40
2 changed files with 65 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
client/displayservers/X11/x11.c
View file

@ -575,6 +575,38 @@ static bool x11Init(const LG_DSInitParams params)
XMapWindow(x11.display, x11.window); XMapWindow(x11.display, x11.window);
XFlush(x11.display); XFlush(x11.display);
XSetLocaleModifiers(""); // Load XMODIFIERS
x11.xim = XOpenIM(x11.display, 0, 0, 0);
if (!x11.xim)
{
// disable IME
XSetLocaleModifiers("@im=none");
x11.xim = XOpenIM(x11.display, 0, 0, 0);
}
if (x11.xim)
{
x11.xic = XCreateIC(
x11.xim,
XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
XNClientWindow, x11.window,
XNFocusWindow, x11.window,
NULL
);
}
else
DEBUG_WARN("Failed to initialize X Input Method");
if (x11.xic)
{
XSetICFocus(x11.xic);
XSelectInput(x11.display, x11.window, StructureNotifyMask | ExposureMask |
PropertyChangeMask | KeyPressMask);
}
else
DEBUG_WARN("Failed to initialize X Input Context, typing will not work");
if (!lgCreateThread("X11EventThread", x11EventThread, NULL, &x11.eventThread)) if (!lgCreateThread("X11EventThread", x11EventThread, NULL, &x11.eventThread))
{ {
DEBUG_ERROR("Failed to create the x11 event thread"); DEBUG_ERROR("Failed to create the x11 event thread");
@ -947,6 +979,36 @@ static void x11XInputEvent(XGenericEventCookie *cookie)
XIDeviceEvent *device = cookie->data; XIDeviceEvent *device = cookie->data;
app_handleKeyPress(device->detail - 8); app_handleKeyPress(device->detail - 8);
if (!x11.xic || !app_isOverlayMode())
return;
char buffer[128];
KeySym sym;
Status status;
int count;
XKeyPressedEvent ev = {
.display = x11.display,
.window = x11.window,
.type = KeyPress,
.keycode = device->detail,
.state = device->mods.effective,
};
count = Xutf8LookupString(x11.xic, &ev, buffer, sizeof(buffer),
&sym, &status);
if (status == XBufferOverflow || count >= sizeof(buffer))
{
DEBUG_WARN("Typing too many characters at once, ignoring");
return;
}
if (status == XLookupChars || status == XLookupBoth)
{
buffer[count] = '\0';
app_handleKeyboardTyped(buffer);
}
return; return;
} }

3
client/displayservers/X11/x11.h
View file

@ -70,6 +70,9 @@ struct X11DSState
Cursor cursors[LG_POINTER_COUNT]; Cursor cursors[LG_POINTER_COUNT];
XIM xim;
XIC xic;
// XFixes vars // XFixes vars
int eventBase; int eventBase;
int errorBase; int errorBase;