Skip to content

Add support for X11 keypresses #16

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Atrix256 merged 1 commit into from
Feb 24, 2026
Merged

Add support for X11 keypresses #16

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 27 additions & 5 deletions thirteen.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1588,6 +1588,7 @@ namespace Thirteen
int (*XStoreName)(Display*, Window, const char*) = nullptr;
int (*XPending)(Display*) = nullptr;
int (*XNextEvent)(Display*, XEvent*) = nullptr;
int (*XLookupString)(XKeyEvent *, char *, int, KeySym *, XComposeStatus *);
int (*XDestroyWindow)(Display*, Window) = nullptr;
int (*XCloseDisplay)(Display*) = nullptr;
XSizeHints* (*XAllocSizeHints)() = nullptr;
Expand Down Expand Up @@ -1657,6 +1658,10 @@ namespace Thirteen
if (!XNextEvent)
return false;

XLookupString = (int(*)(XKeyEvent *, char *, int, KeySym *, XComposeStatus *)) dlsym(x11Library, "XLookupString");
if (!XLookupString)
return false;

XDestroyWindow = (int(*)(Display*,Window)) dlsym(x11Library, "XDestroyWindow");
if (!XDestroyWindow)
return false;
Expand Down Expand Up @@ -1833,6 +1838,20 @@ namespace Thirteen
}
}

int remapKeyEvent(XKeyEvent &event)
{
KeySym keysym = 0;
char buf[8] = {};
int rc = XLookupString(&event, buf, sizeof(buf), &keysym, NULL);

// rc == number of characters wruitten to `buf`. We expect
// exactly 1 for ASCII characters.
if (rc != 1)
return -1;

return buf[0];
}

void PumpMessages()
{
XEvent event;
Expand All @@ -1841,14 +1860,17 @@ namespace Thirteen
XNextEvent(x11Display, &event);
switch (event.type)
{
// TODO: these are hardware-dependent, need to unify key codes across platforms
case KeyPress:
// if (event.xkey.keycode < 256)
// keys[event.xkey.keycode] = true;
if (int keycode = remapKeyEvent(event.xkey); unsigned(keycode) < 256)
{
keys[keycode] = true;
}
break;
case KeyRelease:
// if (event.xkey.keycode < 256)
// keys[event.xkey.keycode] = true;
if (int keycode = remapKeyEvent(event.xkey); unsigned(keycode) < 256)
{
keys[keycode] = false;
}
break;
case ButtonPress:
mouseButtons[remapMouseButton(event.xbutton.button)] = true;
Expand Down