diff options
| author | Tim Wiederhake <twied@gmx.net> | 2024-01-20 16:07:00 +0100 |
|---|---|---|
| committer | Tim Wiederhake <twied@gmx.net> | 2024-01-20 16:07:00 +0100 |
| commit | c5a63751f8b4eab72794e56365ead929023f2b94 (patch) | |
| tree | df13c5ec28b27bb1b02a06c214b0b889fe3f174e /src/menus.c | |
| parent | 6ea386bd98a737a9f54e2ca4216adf45868fd6e4 (diff) | |
Remove global variables JunkX, JunkY
Replace with a local variable following the naming scheme from
Identify() in src/menus.c.
Signed-off-by: Tim Wiederhake <twied@gmx.net>
Diffstat (limited to 'src/menus.c')
| -rw-r--r-- | src/menus.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/menus.c b/src/menus.c index 4ab2a30..528fb54 100644 --- a/src/menus.c +++ b/src/menus.c @@ -1120,6 +1120,7 @@ resizeFromCenter(Window w, TwmWindow *tmp_win) { int lastx, lasty, bw2; XEvent event; + int dummy = 0; Window wdummy = None; bw2 = tmp_win->frame_bw * 2; @@ -1130,7 +1131,7 @@ resizeFromCenter(Window w, TwmWindow *tmp_win) &JunkBW, &JunkDepth); XWarpPointer(dpy, None, w, 0, 0, 0, 0, DragWidth / 2, DragHeight / 2); XQueryPointer(dpy, Scr->Root, &wdummy, - &wdummy, &JunkX, &JunkY, &AddingX, &AddingY, &JunkMask); + &wdummy, &dummy, &dummy, &AddingX, &AddingY, &JunkMask); lastx = -10000; lasty = -10000; MenuStartResize(tmp_win, origDragX, origDragY, DragWidth, DragHeight); @@ -1164,7 +1165,7 @@ resizeFromCenter(Window w, TwmWindow *tmp_win) * grab the server. */ XQueryPointer(dpy, Scr->Root, &wdummy, &wdummy, - &JunkX, &JunkY, &AddingX, &AddingY, &JunkMask); + &dummy, &dummy, &AddingX, &AddingY, &JunkMask); if (lastx != AddingX || lasty != AddingY) { MenuDoResize(AddingX, AddingY, tmp_win); @@ -1220,6 +1221,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win, int moving_icon = FALSE; Bool fromtitlebar = False; unsigned bw = 0; + int dummy = 0; Window wdummy = None; RootFunction = 0; @@ -1517,7 +1519,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, - &JunkX, &JunkY, &DragX, &DragY, &JunkMask); + &dummy, &dummy, &DragX, &DragY, &JunkMask); } last_time = eventp->xbutton.time; @@ -1633,7 +1635,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), - &JunkX, &JunkY, &JunkMask); + &dummy, &dummy, &JunkMask); if (DragWindow == None && abs(eventp->xmotion.x_root - origX) < Scr->MoveDelta && @@ -1658,7 +1660,7 @@ ExecuteFunction(int func, const char *action, Window w, TwmWindow *tmp_win, ConstMoveDir = MOVE_VERT; XQueryPointer(dpy, DragWindow, &wdummy, &wdummy, - &JunkX, &JunkY, &DragX, &DragY, &JunkMask); + &dummy, &dummy, &DragX, &DragY, &JunkMask); break; case MOVE_VERT: @@ -2530,7 +2532,7 @@ Identify(TwmWindow *t) Info[n++][0] = '\0'; if (t) { - XGetGeometry(dpy, t->w, &wdummy, &JunkX, &JunkY, + XGetGeometry(dpy, t->w, &wdummy, &dummy, &dummy, &wwidth, &wheight, &bw, &depth); (void) XTranslateCoordinates(dpy, t->w, Scr->Root, 0, 0, &x, &y, &junk); snprintf(Info[n++], INFO_SIZE, |