From dc012dc704988fc82d5049fa74985b65ae89602d Mon Sep 17 00:00:00 2001 From: speedie Date: Sun, 26 Feb 2023 06:18:56 +0100 Subject: [PATCH] rename keys array --- keybinds.h | 8 ++++---- spmenu.c | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/keybinds.h b/keybinds.h index 6449a17..51223ff 100644 --- a/keybinds.h +++ b/keybinds.h @@ -26,7 +26,7 @@ */ #define MODIFIER1 Mod1Mask -static Key keys[] = { +static Key inskeys[] = { /* modifier key function argument */ { 0, XK_Escape, switchmode, {0} }, @@ -40,8 +40,10 @@ static Key keys[] = { { 0, XK_Return, selectitem, {.i = +1 } }, }; -static Key cmdkeys[] = { +static Key normkeys[] = { /* modifier key function argument */ + { 0, XK_i, switchmode, {0} }, + { 0, XK_k, move, {.i = 1 } }, { 0, XK_j, move, {.i = 2 } }, { 0, XK_h, move, {.i = 3 } }, @@ -65,6 +67,4 @@ static Key cmdkeys[] = { { MODIFIER1, XK_f, moveword, {.i = +1 } }, { MODIFIER1, XK_p, navhistory, {.i = -1 } }, { MODIFIER1, XK_n, navhistory, {.i = +1 } }, - - { 0, XK_i, switchmode, {0} }, }; diff --git a/spmenu.c b/spmenu.c index 20e811c..9fa3aed 100644 --- a/spmenu.c +++ b/spmenu.c @@ -1130,14 +1130,14 @@ keypress(XEvent *e) keysym = XkbKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0, 0); if (selkeys) { - for (i = 0; i < LENGTH(keys); i++) { - if (keysym == keys[i].keysym && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) && keys[i].func) - keys[i].func(&(keys[i].arg)); + for (i = 0; i < LENGTH(inskeys); i++) { + if (keysym == inskeys[i].keysym && CLEANMASK(inskeys[i].mod) == CLEANMASK(ev->state) && inskeys[i].func) + inskeys[i].func(&(inskeys[i].arg)); } } else { - for (i = 0; i < LENGTH(cmdkeys); i++) { - if (keysym == cmdkeys[i].keysym && CLEANMASK(cmdkeys[i].mod) == CLEANMASK(ev->state) && cmdkeys[i].func) - cmdkeys[i].func(&(cmdkeys[i].arg)); + for (i = 0; i < LENGTH(normkeys); i++) { + if (keysym == normkeys[i].keysym && CLEANMASK(normkeys[i].mod) == CLEANMASK(ev->state) && normkeys[i].func) + normkeys[i].func(&(normkeys[i].arg)); } }