speedie/spmenu
2
0
Fork 1
Code Issues 1 Pull requests Packages Projects Releases 15 Wiki Activity

rename keys array

Browse source
This commit is contained in:
speedie 2023-02-26 06:18:56 +01:00
parent d7eb6dd350
commit dc012dc704
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
keybinds.h
View file

@ -26,7 +26,7 @@
*/ */
#define MODIFIER1 Mod1Mask #define MODIFIER1 Mod1Mask
static Key keys[] = { static Key inskeys[] = {
/* modifier key function argument */ /* modifier key function argument */
{ 0, XK_Escape, switchmode, {0} }, { 0, XK_Escape, switchmode, {0} },
@ -40,8 +40,10 @@ static Key keys[] = {
{ 0, XK_Return, selectitem, {.i = +1 } }, { 0, XK_Return, selectitem, {.i = +1 } },
}; };
static Key cmdkeys[] = { static Key normkeys[] = {
/* modifier key function argument */ /* modifier key function argument */
{ 0, XK_i, switchmode, {0} },
{ 0, XK_k, move, {.i = 1 } }, { 0, XK_k, move, {.i = 1 } },
{ 0, XK_j, move, {.i = 2 } }, { 0, XK_j, move, {.i = 2 } },
{ 0, XK_h, move, {.i = 3 } }, { 0, XK_h, move, {.i = 3 } },
@ -65,6 +67,4 @@ static Key cmdkeys[] = {
{ MODIFIER1, XK_f, moveword, {.i = +1 } }, { MODIFIER1, XK_f, moveword, {.i = +1 } },
{ MODIFIER1, XK_p, navhistory, {.i = -1 } }, { MODIFIER1, XK_p, navhistory, {.i = -1 } },
{ MODIFIER1, XK_n, navhistory, {.i = +1 } }, { MODIFIER1, XK_n, navhistory, {.i = +1 } },
{ 0, XK_i, switchmode, {0} },
}; };

12
spmenu.c
View file

@ -1130,14 +1130,14 @@ keypress(XEvent *e)
keysym = XkbKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0, 0); keysym = XkbKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0, 0);
if (selkeys) { if (selkeys) {
for (i = 0; i < LENGTH(keys); i++) { for (i = 0; i < LENGTH(inskeys); i++) {
if (keysym == keys[i].keysym && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) && keys[i].func) if (keysym == inskeys[i].keysym && CLEANMASK(inskeys[i].mod) == CLEANMASK(ev->state) && inskeys[i].func)
keys[i].func(&(keys[i].arg)); inskeys[i].func(&(inskeys[i].arg));
} }
} else { } else {
for (i = 0; i < LENGTH(cmdkeys); i++) { for (i = 0; i < LENGTH(normkeys); i++) {
if (keysym == cmdkeys[i].keysym && CLEANMASK(cmdkeys[i].mod) == CLEANMASK(ev->state) && cmdkeys[i].func) if (keysym == normkeys[i].keysym && CLEANMASK(normkeys[i].mod) == CLEANMASK(ev->state) && normkeys[i].func)
cmdkeys[i].func(&(cmdkeys[i].arg)); normkeys[i].func(&(normkeys[i].arg));
} }
} }