X-Git-Url: https://jasonwoof.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=scrotwm.c;h=9e4b7700aedf35be1b528184804b6333bc86a02c;hb=7d90b3de69af25bb789143ec5e3993f61a5f2b53;hp=740c3f23b748d551e633ea83540687a80dc7d4fe;hpb=64075b7af175e867e8e8d2d1ef280529bc303847;p=spectrwm.git diff --git a/scrotwm.c b/scrotwm.c index 740c3f2..9e4b770 100644 --- a/scrotwm.c +++ b/scrotwm.c @@ -4821,7 +4821,8 @@ setautorun(char *selector, char *value, int flags) int setlayout(char *selector, char *value, int flags) { - int ws_id, st, i, x, mg, ma, si, raise; + int ws_id, i, x, mg, ma, si, raise; + int st = SWM_V_STACK; char s[1024]; struct workspace *ws; @@ -5428,15 +5429,14 @@ void keypress(XEvent *e) { unsigned int i; - KeySym keysym, skeysym; + KeySym keysym; XKeyEvent *ev = &e->xkey; DNPRINTF(SWM_D_EVENT, "keypress: window: %lu\n", ev->window); keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0); - skeysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 1); for (i = 0; i < keys_length; i++) - if ((keysym == keys[i].keysym || skeysym == keys[i].keysym) + if (keysym == keys[i].keysym && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state) && keyfuncs[keys[i].funcid].func) { if (keys[i].funcid == kf_spawn_custom) @@ -5462,7 +5462,6 @@ buttonpress(XEvent *e) DNPRINTF(SWM_D_EVENT, "buttonpress: window: %lu\n", ev->window); - action = root_click; if ((win = find_window(ev->window)) == NULL) return;