remove commented out Xlib code

[spectrwm.git] / spectrwm.c

diff --git a/spectrwm.c b/spectrwm.c
index 7749d4f..54a3870 100644 (file)
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -4312,10 +4312,6 @@ resize(struct ws_win *win, union arg *args)
        xcb_flush(conn);
        resizing = 1;
        while ((evt = xcb_wait_for_event(conn)) && resizing) {
-               /*
-               XMaskEvent(display, MOUSEMASK | ExposureMask |
-                   SubstructureRedirectMask, &ev);
-               */
                switch (XCB_EVENT_RESPONSE_TYPE(evt)) {
                case XCB_BUTTON_RELEASE:
                        DNPRINTF(SWM_D_EVENT, "resize: BUTTON_RELEASE\n");
@@ -5116,7 +5112,7 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
                return (1);
        }
        cp = keystr;
-       *ks = NoSymbol;
+       *ks = XCB_NO_SYMBOL;
        *mod = 0;
        while ((name = strsep(&cp, SWM_KEY_WS)) != NULL) {
                DNPRINTF(SWM_D_KEY, "parsekeys: key [%s]\n", name);
@@ -5139,7 +5135,7 @@ parsekeys(char *keystr, unsigned int currmod, unsigned int *mod, KeySym *ks)
                else {
                        *ks = XStringToKeysym(name);
                        XConvertCase(*ks, ks, &uks);
-                       if (ks == NoSymbol) {
+                       if (ks == XCB_NO_SYMBOL) {
                                DNPRINTF(SWM_D_KEY,
                                    "parsekeys: invalid key %s\n",
                                    name);
@@ -6697,12 +6693,12 @@ expose(xcb_expose_event_t *e)
 void
 keypress(xcb_key_press_event_t *e)
 {
-       KeySym                  keysym;
+       xcb_keysym_t            keysym;
        struct key              *kp;
 
-       keysym = XkbKeycodeToKeysym(display, (KeyCode)e->detail, 0, 0);
+       keysym = xcb_key_press_lookup_keysym(syms, e, 0);
 
-       DNPRINTF(SWM_D_EVENT, "keypress: %u\n", e->detail);
+       DNPRINTF(SWM_D_EVENT, "keypress: %u %u\n", e->detail, keysym);
 
        if ((kp = key_lookup(CLEANMASK(e->state), keysym)) == NULL)
                return;