Salastil/ckb-next
1
0
Fork 0
mirror of https://github.com/ckb-next/ckb-next.git synced 2026-10-16 07:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix profswitch rebinding in mice

Browse Source 
There are two profswitch entries in the keymap, one for keyboards and
one for mice. This commit adds code to dynamically patch in the mouse
profswitch, disabling the keyboard one, if a mouse is detected.

Closes #786
This commit is contained in:
Tasos Sahanidis
2022-04-04 21:41:27 +03:00
parent 1b4db3c2b3
commit 19a25c5c71
2 changed files with 30 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/daemon/keymap.c
+2 -1
View File
@@ -262,7 +262,8 @@ const key keymap[N_KEYS_EXTENDED] = {
{ 0, -1, KEY_NONE },
{ 0, -1, KEY_NONE },
{ "profdn", -1, KEY_CORSAIR },
{ "profswitch", -1, KEY_CORSAIR },
{ 0, -1, KEY_NONE }, // "profswitch" lives here for mice, however it's patched in manually
// as the keyboard profswitch interferes and needs to be disabled first
// Extended mouse buttons (wheel is an axis in HW, 6-8 are recognized by the OS but not present in HW)
{ "wheelup", -1, SCAN_MOUSE | BTN_WHEELUP },
src/daemon/keymap_patch.c
+28
View File
@@ -106,9 +106,37 @@ keypatches mappatches[] = {
void patchkeys(usbdevice* kb){
// Copy the default keymap over
memcpy(kb->keymap, keymap, sizeof(keymap));
// Check if we need to patch the bragi base map
if(kb->protocol == PROTO_BRAGI)
memcpy(kb->keymap, keymap_bragi, sizeof(keymap_bragi));
// If it's a mouse, patch in profswitch
// This needs to be done after the bragi keymap patch
// as the position of profswitch differs
if(IS_MOUSE_DEV(kb)){
#define PROFSWITCH_M_IDX (MOUSE_BUTTON_FIRST + 24)
int profswitch_kb_idx = -1;
for(int i = 0; i < LED_GENERIC_FIRST; i++) {
if(!strcmp(kb->keymap[i].name, "profswitch")) {
profswitch_kb_idx = i;
break;
}
}
if(profswitch_kb_idx < 0) {
ckb_err("Could not find profswitch in base keymap. Not patching profswitch for mouse.");
} else {
kb->keymap[PROFSWITCH_M_IDX].name = kb->keymap[profswitch_kb_idx].name;
kb->keymap[PROFSWITCH_M_IDX].led = -1;
kb->keymap[PROFSWITCH_M_IDX].scan = KEY_CORSAIR;
// Clear the keyboard one
kb->keymap[profswitch_kb_idx].name = NULL;
kb->keymap[profswitch_kb_idx].led = 0;
kb->keymap[profswitch_kb_idx].scan = KEY_NONE;
}
}
// Iterate through the patches for all devices
for(size_t pos = 0; pos < KEYPATCHES_LEN; pos++){
if(mappatches[pos].vendor == kb->vendor && mappatches[pos].product == kb->product){