switch one remaining XUnmapWindow to xcb. Change a few Xlib defines to XCB

[spectrwm.git] / spectrwm.c

diff --git a/spectrwm.c b/spectrwm.c
index 92576fe..cdaaebc 100644 (file)
--- a/spectrwm.c
+++ b/spectrwm.c
@@ -194,13 +194,13 @@ u_int32_t         swm_debug = 0
 #define BORDER(w)              (w->bordered ? border_width : 0)
 #define MAX_X(r)               ((r)->g.x + (r)->g.w)
 #define MAX_Y(r)               ((r)->g.y + (r)->g.h)
-#define SH_MIN(w)              (w)->sh_mask & PMinSize
+#define SH_MIN(w)              (w)->sh.flags & XCB_SIZE_HINT_P_MIN_SIZE
 #define SH_MIN_W(w)            (w)->sh.min_width
 #define SH_MIN_H(w)            (w)->sh.min_height
-#define SH_MAX(w)              (w)->sh_mask & PMaxSize
+#define SH_MAX(w)              (w)->sh.flags & XCB_SIZE_HINT_P_MAX_SIZE
 #define SH_MAX_W(w)            (w)->sh.max_width
 #define SH_MAX_H(w)            (w)->sh.max_height
-#define SH_INC(w)              (w)->sh_mask & PResizeInc
+#define SH_INC(w)              (w)->sh.flags & XCB_SIZE_HINT_P_RESIZE_INC
 #define SH_INC_W(w)            (w)->sh.width_inc
 #define SH_INC_H(w)            (w)->sh.height_inc
 #define SWM_MAX_FONT_STEPS     (3)
@@ -388,8 +388,7 @@ struct ws_win {
        struct workspace        *ws;    /* always valid */
        struct swm_screen       *s;     /* always valid, never changes */
        xcb_get_geometry_reply_t        *wa;
-       XSizeHints              sh;
-       long                    sh_mask;
+       xcb_size_hints_t        sh;
        xcb_get_wm_class_reply_t        ch;
        xcb_wm_hints_t          hints;
 };
@@ -2045,8 +2044,9 @@ void
 drain_enter_notify(void)
 {
        int                     i = 0;
+       XEvent                  cne;
 
-       while (xcb_poll_for_event(conn))
+       while (XCheckMaskEvent(display, EnterWindowMask, &cne))
                i++;
 
        DNPRINTF(SWM_D_EVENT, "drain_enter_notify: drained: %d\n", i);
@@ -2147,10 +2147,10 @@ config_win(struct ws_win *win, XConfigureRequestEvent  *ev)
                ce.window = ev->window;
 
                /* make response appear more WM_SIZE_HINTS-compliant */
-               if (win->sh_mask)
+               if (win->sh.flags)
                        DNPRINTF(SWM_D_MISC, "config_win: hints: window: 0x%x,"
-                           " sh_mask: %ld, min: %d x %d, max: %d x %d, inc: "
-                           "%d x %d\n", win->id, win->sh_mask, SH_MIN_W(win),
+                           " sh.flags: %u, min: %d x %d, max: %d x %d, inc: "
+                           "%d x %d\n", win->id, win->sh.flags, SH_MIN_W(win),
                            SH_MIN_H(win), SH_MAX_W(win), SH_MAX_H(win),
                            SH_INC_W(win), SH_INC_H(win));
 
@@ -3305,7 +3305,6 @@ adjust_font(struct ws_win *win)
 void
 stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
 {
-       XWindowAttributes       wa;
        struct swm_geometry     win_g, r_g = *g;
        struct ws_win           *win, *fs_win = NULL;
        int                     i, j, s, stacks;
@@ -3314,6 +3313,7 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
        int                     split, colno, winno, mwin, msize, mscale;
        int                     remain, missing, v_slice, reconfigure;
        int                     bordered = 1;
+       xcb_get_window_attributes_reply_t *war;
 
        DNPRINTF(SWM_D_STACK, "stack_master: workspace: %d, rot: %s, "
            "flip: %s\n", ws->idx, YESNO(rot), YESNO(flip));
@@ -3476,9 +3476,14 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
                        update_window(win);
                }
 
-               if (XGetWindowAttributes(display, win->id, &wa))
-                       if (wa.map_state == IsUnmapped)
+               war = xcb_get_window_attributes_reply(conn,
+                       xcb_get_window_attributes(conn, win->id),
+                       NULL);
+               if (war) {
+                       if (war->map_state == XCB_MAP_STATE_UNMAPPED)
                                map_window_raised(win->id);
+                       free(war);
+               }
 
                last_h = win_g.h;
                i++;
@@ -6474,7 +6479,9 @@ manage_window(xcb_window_t id)
        win->wa = xcb_get_geometry_reply(conn,
                xcb_get_geometry(conn, id),
                NULL);  
-       XGetWMNormalHints(display, id, &win->sh, &win->sh_mask);
+       xcb_get_wm_normal_hints_reply(conn,
+               xcb_get_wm_normal_hints(conn, id),
+               &win->sh, NULL);
        xcb_icccm_get_wm_hints_reply(conn,
                xcb_icccm_get_wm_hints(conn, id),
                &win->hints, NULL);
@@ -6600,7 +6607,7 @@ manage_window(xcb_window_t id)
                        xcb_get_wm_class(conn, win->id),
                        &win->ch, NULL)) {
                DNPRINTF(SWM_D_CLASS, "manage_window: class: %s, name: %s\n",
-                   win->ch.class, win->ch.instance_name);
+                   win->ch.class_name, win->ch.instance_name);
 
                /* java is retarded so treat it special */
                if (strstr(win->ch.instance_name, "sun-awt")) {
@@ -6833,7 +6840,7 @@ configurerequest(XEvent *e)
 
                XConfigureWindow(display, ev->window, ev->value_mask, &wc);
        } else if ((!win->manual || win->quirks & SWM_Q_ANYWHERE) &&
-           !(win->sh_mask & EWMH_F_FULLSCREEN)) {
+           !(win->ewmh_flags & EWMH_F_FULLSCREEN)) {
                win->g_float.x = ev->x - X(win->ws->r);
                win->g_float.y = ev->y - Y(win->ws->r);
                win->g_float.w = ev->width;
@@ -6863,7 +6870,9 @@ configurenotify(XEvent *e)
 
        win = find_window(e->xconfigure.window);
        if (win) {
-               XGetWMNormalHints(display, win->id, &win->sh, &win->sh_mask);
+               xcb_get_wm_normal_hints_reply(conn,
+                       xcb_get_wm_normal_hints(conn, win->id),
+                       &win->sh, NULL);
                adjust_font(win);
                if (font_adjusted)
                        stack();
@@ -7132,15 +7141,28 @@ propertynotify(XEvent *e)
        struct ws_win           *win;
        XPropertyEvent          *ev = &e->xproperty;
 #ifdef SWM_DEBUG
-       xcb_get_atom_name_reply_t *r;
+       char                            *name;
+       size_t                          len;
+       xcb_get_atom_name_reply_t       *r;
 
        r = xcb_get_atom_name_reply(conn,
                xcb_get_atom_name(conn, ev->atom),
                NULL);
        if (r) {
-               DNPRINTF(SWM_D_EVENT,
-                        "propertynotify: window: 0x%x, atom: %s\n",
-                       ev->window, );
+               len = xcb_get_atom_name_name_length(r);
+               if (len > 0) {
+                       name = malloc(len + 1);
+                       if (name) {
+                               memcpy(name, xcb_get_atom_name_name(r), len);
+                               name[len] = '\0';
+                               
+                               DNPRINTF(SWM_D_EVENT,
+                                       "propertynotify: window: 0x%lx, "
+                                       "atom: %s\n",
+                                       ev->window, name);
+                               free(name);
+                       }
+               }
                free(r);
        }
 #endif
@@ -7163,7 +7185,7 @@ propertynotify(XEvent *e)
                long            mask;
                XGetWMNormalHints(display, win->id, &win->sh, &mask);
                warnx("normal hints: flag 0x%x", win->sh.flags);
-               if (win->sh.flags & PMinSize) {
+               if (win->sh.flags & XCB_SIZE_HINT_P_MIN_SIZE) {
                        WIDTH(win) = win->sh.min_width;
                        HEIGHT(win) = win->sh.min_height;
                        warnx("min %d %d", WIDTH(win), HEIGHT(win));
@@ -7171,8 +7193,8 @@ propertynotify(XEvent *e)
                XMoveResizeWindow(display, win->id,
                    X(win), Y(win), WIDTH(win), HEIGHT(win));
 #endif
-       case XA_WM_CLASS:
-       case XA_WM_NAME:
+       case XCB_ATOM_WM_CLASS:
+       case XCB_ATOM_WM_NAME:
                bar_update();
                break;
        default:
@@ -7209,7 +7231,7 @@ unmapnotify(XEvent *e)
                    SubstructureNotifyMask, &cne))
                        ;
                /* resend unmap because we ated it */
-               XUnmapWindow(display, e->xunmap.window);
+               xcb_unmap_window(conn, e->xunmap.window);
        }
 
        if (focus_mode == SWM_FOCUS_DEFAULT)