iridium/neko
2
2
Fork 0
mirror of https://github.com/m1k1o/neko.git synced 2024-07-24 14:40:50 +12:00
Code Issues Packages Projects Releases Wiki Activity

switch to xkb.

Browse Source
This commit is contained in:
Miroslav Šedivý 2023-01-15 17:00:32 +01:00
parent eac9796c47
commit ba0dea8022
2 changed files with 45 additions and 89 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

125
pkg/xorg/xorg.c
View File

@ -149,98 +149,59 @@ KeyCode XkbKeysymToKeycode(Display* dpy, KeySym keysym) {
return keycode; return keycode;
} }
static xkeycode_t *xFreeKeycodesHead = NULL; // From https://github.com/TigerVNC/tigervnc/blob/a434ef3377943e89165ac13c537cd0f28be97f84/unix/x0vncserver/XDesktop.cxx#L401-L453
int xNumcodes = 0; KeyCode XkbAddKeyKeysym(Display* dpy, KeySym keysym) {
int types[1];
unsigned int key;
XkbDescPtr xkb;
XkbMapChangesRec changes;
KeySym *syms;
KeySym upper, lower;
void XFreeKeycodesInit(Display* dpy) { xkb = XkbGetMap(dpy, XkbAllComponentsMask, XkbUseCoreKbd);
if (xFreeKeycodesHead != NULL)
return;
KeyCode keycode; if (!xkb)
KeySym *keysyms;
int min, max, numcodes;
// get full keyboard mapping
XDisplayKeycodes(dpy, &min, &max);
keysyms = XGetKeyboardMapping(dpy, min, max-min, &numcodes);
xNumcodes = numcodes;
// loop through all keycodes
xkeycode_t *last = NULL;
for (int i = min; i <= max; ++i) {
// check if keycode is empty
int isEmpty = 1;
for (int j = 0; j < numcodes; ++j) {
int symindex = ((i - min) * numcodes) + j;
if (keysyms[symindex] != 0) {
isEmpty = 0;
break;
}
}
if (!isEmpty) continue;
xkeycode_t *entry = (xkeycode_t *) malloc(sizeof(xkeycode_t));
if (entry == NULL) return;
entry->keycode = i;
if (last == NULL) {
xFreeKeycodesHead = entry;
} else {
last->next = entry;
}
last = entry;
}
// no free keycodes, pick last two keycodes anyway
if (last == NULL) {
xkeycode_t *entry1 = (xkeycode_t *) malloc(sizeof(xkeycode_t));
if (entry1 == NULL) return;
entry1->keycode = max-1;
xkeycode_t *entry2 = (xkeycode_t *) malloc(sizeof(xkeycode_t));
if (entry2 == NULL) return;
entry2->keycode = max-2;
xFreeKeycodesHead = entry1;
entry1->next = entry2;
last = entry2;
}
// make as circular list
last->next = xFreeKeycodesHead;
XFree(keysyms);
}
// get free keycode from list
KeyCode XFreeKeycodeGet() {
if (xFreeKeycodesHead == NULL)
return 0; return 0;
// move head to next entry for (key = xkb->max_key_code; key >= xkb->min_key_code; key--) {
xkeycode_t *entry = xFreeKeycodesHead; if (XkbKeyNumGroups(xkb, key) == 0)
xFreeKeycodesHead = entry->next; break;
return entry->keycode;
} }
// map keysym to new keycode // no free keycodes
KeyCode XKeysymMapNew(Display* dpy, KeySym keysym) { if (key < xkb->min_key_code)
// initialize free keycodes list return 0;
if (xFreeKeycodesHead == NULL) {
XFreeKeycodesInit(dpy); // assign empty structure
changes = *(XkbMapChangesRec *) malloc(sizeof(XkbMapChangesRec));
for (int i = 0; i < sizeof(changes); i++) ((char *) &changes)[i] = 0;
XConvertCase(keysym, &lower, &upper);
if (upper == lower)
types[XkbGroup1Index] = XkbOneLevelIndex;
else
types[XkbGroup1Index] = XkbAlphabeticIndex;
XkbChangeTypesOfKey(xkb, key, 1, XkbGroup1Mask, types, &changes);
syms = XkbKeySymsPtr(xkb,key);
if (upper == lower)
syms[0] = keysym;
else {
syms[0] = lower;
syms[1] = upper;
} }
KeyCode keycode = XFreeKeycodeGet(); changes.changed |= XkbKeySymsMask;
changes.first_key_sym = key;
changes.num_key_syms = 1;
// no free keycodes, cannot map keysym if (XkbChangeMap(dpy, xkb, &changes)) {
if (keycode != 0) { return key;
KeySym keysym_list[xNumcodes];
for(int i=0;i<xNumcodes;i++) keysym_list[i] = keysym;
XChangeKeyboardMapping(dpy, keycode, xNumcodes, keysym_list, 1);
} }
return keycode; return 0;
} }
void XKey(KeySym keysym, int down) { void XKey(KeySym keysym, int down) {
@ -259,7 +220,7 @@ void XKey(KeySym keysym, int down) {
// Map non-existing keysyms to new keycodes // Map non-existing keysyms to new keycodes
if (keycode == 0) if (keycode == 0)
keycode = XKeysymMapNew(display, keysym); keycode = XkbAddKeyKeysym(display, keysym);
if (down) if (down)
XKeyEntryAdd(keysym, keycode); XKeyEntryAdd(keysym, keycode);

5
pkg/xorg/xorg.h
View File

@ -26,11 +26,6 @@ typedef struct xkeyentry_t {
struct xkeyentry_t *next; struct xkeyentry_t *next;
} xkeyentry_t; } xkeyentry_t;
typedef struct xkeycode_t {
KeyCode keycode;
struct xkeycode_t *next;
} xkeycode_t;
static void XKeyEntryAdd(KeySym keysym, KeyCode keycode); static void XKeyEntryAdd(KeySym keysym, KeyCode keycode);
static KeyCode XKeyEntryGet(KeySym keysym); static KeyCode XKeyEntryGet(KeySym keysym);
static KeyCode XkbKeysymToKeycode(Display *dpy, KeySym keysym); static KeyCode XkbKeysymToKeycode(Display *dpy, KeySym keysym);