Revert "fix weird french keyboards"

This reverts commit 64075b7af175e867e8e8d2d1ef280529bc303847.

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.

diff --git a/scrotwm.c b/scrotwm.c
index 740c3f2..f03445b 100644 (file)
--- a/scrotwm.c
+++ b/scrotwm.c
@@ -5428,15 +5428,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)