[client] overlay: show layout-translated hotkey labels
Some checks failed
build / client (Debug, map[cc:clang cxx:clang++], libdecor) (push) Has been cancelled
build / client (Debug, map[cc:clang cxx:clang++], xdg-shell) (push) Has been cancelled
build / client (Debug, map[cc:gcc cxx:g++], libdecor) (push) Has been cancelled
build / client (Debug, map[cc:gcc cxx:g++], xdg-shell) (push) Has been cancelled
build / client (Release, map[cc:clang cxx:clang++], libdecor) (push) Has been cancelled
build / client (Release, map[cc:clang cxx:clang++], xdg-shell) (push) Has been cancelled
build / client (Release, map[cc:gcc cxx:g++], libdecor) (push) Has been cancelled
build / client (Release, map[cc:gcc cxx:g++], xdg-shell) (push) Has been cancelled
build / module (push) Has been cancelled
build / host-linux (push) Has been cancelled
build / host-windows-cross (push) Has been cancelled
build / host-windows-native (push) Has been cancelled
build / idd (push) Has been cancelled
build / obs (clang) (push) Has been cancelled
build / obs (gcc) (push) Has been cancelled
build / docs (push) Has been cancelled

Related to #1298
This commit is contained in:
Geoffrey McRae
2026-07-30 10:30:47 +10:00
parent e754f5841e
commit a9b8f437d4
7 changed files with 66 additions and 4 deletions

View File

@@ -39,6 +39,9 @@
#include <X11/extensions/Xinerama.h>
#include <X11/extensions/Xpresent.h>
#include <X11/Xcursor/Xcursor.h>
#include <X11/XKBlib.h>
#include <xkbcommon/xkbcommon.h>
#include <GL/glx.h>
#include <GL/glxext.h>
@@ -88,6 +91,7 @@ static void x11SetFullscreen(bool fs);
static int x11EventThread(void * unused);
static void x11XInputEvent(XGenericEventCookie *cookie);
static void x11XPresentEvent(XGenericEventCookie *cookie);
static void x11UpdateKeyboardGroup(void);
static void x11GrabPointer(void);
static void x11DoPresent(uint64_t msc)
@@ -568,8 +572,8 @@ static bool x11Init(const LG_DSInitParams params)
goto fail_window;
}
int maxKeycode;
XDisplayKeycodes(x11.display, &x11.minKeycode, &maxKeycode);
XDisplayKeycodes(x11.display, &x11.minKeycode, &x11.maxKeycode);
x11UpdateKeyboardGroup();
XIFreeDeviceInfo(devinfo);
@@ -1076,16 +1080,41 @@ static void updateModifiers(void)
);
}
static void x11UpdateKeyboardGroup(void)
{
XkbStateRec state;
if (XkbGetState(x11.display, XkbUseCoreKbd, &state) == Success)
atomic_store(&x11.keyboardGroup, state.group);
}
static void setFocus(bool focused, double x, double y)
{
if (x11.focused == focused)
return;
if (focused)
x11UpdateKeyboardGroup();
x11.focused = focused;
app_updateCursorPos(x, y);
app_handleFocusEvent(focused);
}
static bool x11GetKeyLabel(int sc, char * label, size_t size)
{
const int keycode = sc + x11.minKeycode;
if (keycode < x11.minKeycode || keycode > x11.maxKeycode)
return false;
xkb_keysym_t sym = XkbKeycodeToKeysym(
x11.display, keycode, atomic_load(&x11.keyboardGroup), 0);
sym = xkb_keysym_to_upper(sym);
const uint32_t codepoint = xkb_keysym_to_utf32(sym);
return codepoint > 0x20 && codepoint != 0x7F &&
xkb_keysym_to_utf8(sym, label, size) > 0;
}
static void x11XInputEvent(XGenericEventCookie *cookie)
{
static int button_state = 0;
@@ -1217,6 +1246,7 @@ static void x11XInputEvent(XGenericEventCookie *cookie)
return;
XIDeviceEvent *device = cookie->data;
atomic_store(&x11.keyboardGroup, device->group.effective);
app_handleKeyPress(device->detail - x11.minKeycode);
if (!x11.xic || !app_isOverlayMode())
@@ -2001,6 +2031,7 @@ struct LG_DisplayServerOps LGDS_X11 =
.ungrabPointer = x11UngrabPointer,
.capturePointer = x11CapturePointer,
.uncapturePointer = x11UncapturePointer,
.getKeyLabel = x11GetKeyLabel,
.grabKeyboard = x11GrabKeyboard,
.ungrabKeyboard = x11UngrabKeyboard,
.warpPointer = x11WarpPointer,