JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
Revert "convert a XGetWindowAttributes"
authorDavid Hill <dhill@conformal.com>
Fri, 6 Jul 2012 06:17:09 +0000 (02:17 -0400)
committerReginald Kennedy <rk@rejii.com>
Fri, 20 Jul 2012 21:58:31 +0000 (05:58 +0800)
This reverts commit 4f87451a3ee933bae873789020054ba95d9626f4.

It is not doing what it is supposed to do :)

spectrwm.c

index 3367c2a..d63e6e8 100644 (file)
@@ -3223,6 +3223,7 @@ 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;
@@ -3231,8 +3232,6 @@ 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_cookie_t      wac;
-       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));
@@ -3395,13 +3394,10 @@ stack_master(struct workspace *ws, struct swm_geometry *g, int rot, int flip)
                        update_window(win);
                }
 
-               wac = xcb_get_window_attributes(conn, win->id);
-               war = xcb_get_window_attributes_reply(conn, wac, NULL);
-               if (war) {
-                       if (war->map_state == XCB_MAP_STATE_UNMAPPED)
+               if (XGetWindowAttributes(display, win->id, &wa))
+                       if (wa.map_state == IsUnmapped)
                                map_window_raised(win->id);
-                       free(war);
-               }
+
                last_h = win_g.h;
                i++;
                j++;