summaryrefslogtreecommitdiff
path: root/src/util.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/util.c')
-rw-r--r--src/util.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/src/util.c b/src/util.c
index edf93a9..a3673e3 100644
--- a/src/util.c
+++ b/src/util.c
@@ -209,6 +209,7 @@ Zoom(Window wf, Window wt)
long dx, dy, dw, dh;
long z;
int j;
+ unsigned udummy = 0;
Window wdummy = None;
if (!Scr->DoZoom || Scr->ZoomCount < 1)
@@ -217,8 +218,8 @@ Zoom(Window wf, Window wt)
if (wf == None || wt == None)
return;
- XGetGeometry(dpy, wf, &wdummy, &fx, &fy, &fw, &fh, &JunkBW, &JunkDepth);
- XGetGeometry(dpy, wt, &wdummy, &tx, &ty, &tw, &th, &JunkBW, &JunkDepth);
+ XGetGeometry(dpy, wf, &wdummy, &fx, &fy, &fw, &fh, &udummy, &udummy);
+ XGetGeometry(dpy, wt, &wdummy, &tx, &ty, &tw, &th, &udummy, &udummy);
dx = ((long) (tx - fx)); /* going from -> to */
dy = ((long) (ty - fy)); /* going from -> to */
@@ -280,12 +281,13 @@ void
GetUnknownIcon(const char *name)
{
int dummy = 0;
+ unsigned udummy = 0;
Window wdummy = None;
if ((Scr->UnknownPm = GetBitmap(name)) != None) {
XGetGeometry(dpy, Scr->UnknownPm, &wdummy, &dummy, &dummy,
(unsigned int *) &Scr->UnknownWidth,
- (unsigned int *) &Scr->UnknownHeight, &JunkBW, &JunkDepth);
+ (unsigned int *) &Scr->UnknownHeight, &udummy, &udummy);
}
}
@@ -379,7 +381,9 @@ FindBitmap(const char *name, unsigned *widthp, unsigned *heightp)
Pixmap
GetBitmap(const char *name)
{
- return FindBitmap(name, &JunkWidth, &JunkHeight);
+ unsigned udummy = 0;
+
+ return FindBitmap(name, &udummy, &udummy);
}
void