diff options
Diffstat (limited to 'src/icons.c')
| -rw-r--r-- | src/icons.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/icons.c b/src/icons.c index 296d3e3..4e406af 100644 --- a/src/icons.c +++ b/src/icons.c @@ -163,6 +163,7 @@ IconUp(TwmWindow *tmp_win) int x, y; int defx, defy; struct IconRegion *ir; + Window wdummy = None; /* * If the client specified a particular location, let's use it (this might @@ -176,7 +177,7 @@ IconUp(TwmWindow *tmp_win) unsigned width = 0; unsigned height = 0; - if (!XGetGeometry(dpy, tmp_win->icon_w, &JunkRoot, &defx, &defy, + if (!XGetGeometry(dpy, tmp_win->icon_w, &wdummy, &defx, &defy, &width, &height, &JunkBW, &JunkDepth)) return; @@ -319,6 +320,7 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y) XSetWindowAttributes attributes; /* attributes for create windows */ Pixmap pm = None; /* tmp pixmap variable */ int final_x, final_y; + Window wdummy = None; FB(tmp_win->iconc.fore, tmp_win->iconc.back); @@ -349,7 +351,7 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y) } if (bm != None) { - XGetGeometry(dpy, bm, &JunkRoot, &JunkX, &JunkY, + XGetGeometry(dpy, bm, &wdummy, &JunkX, &JunkY, (unsigned int *) &tmp_win->icon_width, (unsigned int *) &tmp_win->icon_height, &JunkBW, &JunkDepth); @@ -375,7 +377,7 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y) tmp_win->wmhints->flags & IconPixmapHint) { XGetGeometry(dpy, tmp_win->wmhints->icon_pixmap, - &JunkRoot, &JunkX, &JunkY, + &wdummy, &JunkX, &JunkY, (unsigned int *) &tmp_win->icon_width, (unsigned int *) &tmp_win->icon_height, &JunkBW, &JunkDepth); @@ -413,7 +415,7 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y) } if (bm != None) { - XGetGeometry(dpy, bm, &JunkRoot, &JunkX, &JunkY, + XGetGeometry(dpy, bm, &wdummy, &JunkX, &JunkY, (unsigned int *) &tmp_win->icon_width, (unsigned int *) &tmp_win->icon_height, &JunkBW, &JunkDepth); @@ -475,7 +477,7 @@ CreateIconWindow(TwmWindow *tmp_win, int def_x, int def_y) if (tmp_win->wmhints && tmp_win->wmhints->flags & IconWindowHint) { tmp_win->icon_w = tmp_win->wmhints->icon_window; if (tmp_win->forced || - XGetGeometry(dpy, tmp_win->icon_w, &JunkRoot, &JunkX, &JunkY, + XGetGeometry(dpy, tmp_win->icon_w, &wdummy, &JunkX, &JunkY, (unsigned int *) &tmp_win->icon_w_width, (unsigned int *) &tmp_win->icon_w_height, &JunkBW, &JunkDepth) == 0) { |