mirror of
https://github.com/vale981/spectrwm
synced 2025-03-06 02:01:42 -05:00
Revert "fix weird french keyboards"
This reverts commit 64075b7af1
.
This causes crashes on spanish keyboards.
3364 if (!(win->transient != 0 || win->floating != 0))
(gdb) bt
) at scrotwm.c:6370
(gdb)
The real issue is in keypress though.
if ((keysym == keys[i].keysym || skeysym == keys[i].keysym)
evaluates to true when it shouldn't.
This commit is contained in:
parent
64075b7af1
commit
f31159407e
1 changed files with 2 additions and 3 deletions
|
@ -5428,15 +5428,14 @@ void
|
||||||
keypress(XEvent *e)
|
keypress(XEvent *e)
|
||||||
{
|
{
|
||||||
unsigned int i;
|
unsigned int i;
|
||||||
KeySym keysym, skeysym;
|
KeySym keysym;
|
||||||
XKeyEvent *ev = &e->xkey;
|
XKeyEvent *ev = &e->xkey;
|
||||||
|
|
||||||
DNPRINTF(SWM_D_EVENT, "keypress: window: %lu\n", ev->window);
|
DNPRINTF(SWM_D_EVENT, "keypress: window: %lu\n", ev->window);
|
||||||
|
|
||||||
keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0);
|
keysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 0);
|
||||||
skeysym = XKeycodeToKeysym(display, (KeyCode)ev->keycode, 1);
|
|
||||||
for (i = 0; i < keys_length; i++)
|
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)
|
&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
|
||||||
&& keyfuncs[keys[i].funcid].func) {
|
&& keyfuncs[keys[i].funcid].func) {
|
||||||
if (keys[i].funcid == kf_spawn_custom)
|
if (keys[i].funcid == kf_spawn_custom)
|
||||||
|
|
Loading…
Add table
Reference in a new issue