diff options
Diffstat (limited to 'src/menus.c')
| -rw-r--r-- | src/menus.c | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/src/menus.c b/src/menus.c index 528fb54..5450363 100644 --- a/src/menus.c +++ b/src/menus.c @@ -469,6 +469,7 @@ UpdateMenu(void) int done; MenuItem *badItem = NULL; XPointer context_data; + unsigned udummy = 0; Window wdummy = None; fromMenu = TRUE; @@ -508,7 +509,7 @@ UpdateMenu(void) done = FALSE; XQueryPointer(dpy, ActiveMenu->w, &wdummy, &wdummy, - &x_root, &y_root, &x, &y, &JunkMask); + &x_root, &y_root, &x, &y, &udummy); /* if we haven't received the enter notify yet, wait */ if (!ActiveMenu->entered) @@ -1121,6 +1122,7 @@ resizeFromCenter(Window w, TwmWindow *tmp_win) int lastx, lasty, bw2; XEvent event; int dummy = 0; + unsigned udummy = 0; Window wdummy = None; bw2 = tmp_win->frame_bw * 2; @@ -1128,10 +1130,10 @@ resizeFromCenter(Window w, TwmWindow *tmp_win) AddingH = tmp_win->attr.height + tmp_win->title_height + bw2; XGetGeometry(dpy, w, &wdummy, &origDragX, &origDragY, (unsigned int *) &DragWidth, (unsigned int *) &DragHeight, - &JunkBW, &JunkDepth); + &udummy, &udummy); XWarpPointer(dpy, None, w, 0, 0, 0, 0, DragWidth / 2, DragHeight / 2); XQueryPointer(dpy, Scr->Root, &wdummy, - &wdummy, &dummy, &dummy, &AddingX, &AddingY, &JunkMask); + &wdummy, &dummy, &dummy, &AddingX, &AddingY, &udummy); lastx = -10000; lasty = -10000; MenuStartResize(tmp_win, origDragX, origDragY, DragWidth, DragHeight); @@ -1165,7 +1167,7 @@ resizeFromCenter(Window w, TwmWindow *tmp_win) * grab the server. */ XQueryPointer(dpy, Scr->Root, &wdummy, &wdummy, - &dummy, &dummy, &AddingX, &AddingY, &JunkMask); + &dummy, &dummy, &AddingX, &AddingY, &udummy); if (lastx != AddingX || lasty != AddingY) { MenuDoResize(AddingX, AddingY, tmp_win); @@ -1222,6 +1224,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win, Bool fromtitlebar = False; unsigned bw = 0; int dummy = 0; + unsigned udummy = 0; Window wdummy = None; RootFunction = 0; @@ -1485,7 +1488,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win, XGetGeometry(dpy, w, &wdummy, &origDragX, &origDragY, (unsigned int *) &DragWidth, (unsigned int *) &DragHeight, - &bw, &JunkDepth); + &bw, &udummy); origX = eventp->xbutton.x_root; origY = eventp->xbutton.y_root; @@ -1519,7 +1522,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win, 0, 0, 0, 0, DragWidth / 2, DragHeight / 2); XQueryPointer(dpy, w, &wdummy, &wdummy, - &dummy, &dummy, &DragX, &DragY, &JunkMask); + &dummy, &dummy, &DragX, &DragY, &udummy); } last_time = eventp->xbutton.time; @@ -1635,7 +1638,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win, XQueryPointer(dpy, rootw, &(eventp->xmotion.root), &wdummy, &(eventp->xmotion.x_root), &(eventp->xmotion.y_root), - &dummy, &dummy, &JunkMask); + &dummy, &dummy, &udummy); if (DragWindow == None && abs(eventp->xmotion.x_root - origX) < Scr->MoveDelta && @@ -1660,7 +1663,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win, ConstMoveDir = MOVE_VERT; XQueryPointer(dpy, DragWindow, &wdummy, &wdummy, - &dummy, &dummy, &DragX, &DragY, &JunkMask); + &dummy, &dummy, &DragX, &DragY, &udummy); break; case MOVE_VERT: |