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 | 783b31821d87ea551457f4700f796a51f359cfd1 (patch) | |
| tree | 00ee2750f4ce1348b8661ffea760eca335648a66 /src/events.c | |
| parent | c5a63751f8b4eab72794e56365ead929023f2b94 (diff) | |
Remove global variables JunkWidth, JunkHeight, JunkBW, JunkDepth, JunkMask
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/events.c')
| -rw-r--r-- | src/events.c | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/src/events.c b/src/events.c index 3fd74d2..9b2daa9 100644 --- a/src/events.c +++ b/src/events.c @@ -736,6 +736,7 @@ HandlePropertyNotify(void) XSetWindowAttributes attributes; /* attributes for create windows */ Pixmap pm; int dummy = 0; + unsigned udummy = 0; Window wdummy = None; /* watch for standard colormap changes */ @@ -825,7 +826,7 @@ HandlePropertyNotify(void) XGetGeometry(dpy, Tmp_win->icon_w, &wdummy, &icon_x, &icon_y, - &JunkWidth, &JunkHeight, &JunkBW, &JunkDepth); + &udummy, &udummy, &udummy, &udummy); XSelectInput(dpy, Tmp_win->icon_w, None); XDeleteContext(dpy, Tmp_win->icon_w, TwmContext); XDeleteContext(dpy, Tmp_win->icon_w, ScreenContext); @@ -844,8 +845,8 @@ HandlePropertyNotify(void) * window to where the old one is. */ if (XGetGeometry(dpy, Tmp_win->icon_w, &wdummy, &icon_x, - &icon_y, &JunkWidth, &JunkHeight, &JunkBW, - &JunkDepth)) { + &icon_y, &udummy, &udummy, &udummy, + &udummy)) { /* * Move the new icon window to where the old one was. */ @@ -904,8 +905,8 @@ HandlePropertyNotify(void) if (!XGetGeometry(dpy, Tmp_win->wmhints->icon_pixmap, &wdummy, &dummy, &dummy, (unsigned int *) &Tmp_win->icon_width, - (unsigned int *) &Tmp_win->icon_height, &JunkBW, - &JunkDepth)) { + (unsigned int *) &Tmp_win->icon_height, &udummy, + &udummy)) { return; } @@ -1019,6 +1020,7 @@ void HandleClientMessage(void) { int dummy = 0; + unsigned udummy = 0; Window wdummy = None; if (Event.xclient.message_type == _XA_WM_CHANGE_STATE) { @@ -1029,7 +1031,7 @@ HandleClientMessage(void) XQueryPointer(dpy, Scr->Root, &wdummy, &wdummy, &(button.xmotion.x_root), &(button.xmotion.y_root), - &dummy, &dummy, &JunkMask); + &dummy, &dummy, &udummy); ExecuteFunction(F_ICONIFY, NULLSTR, Event.xany.window, Tmp_win, &button, FRAME, FALSE); @@ -1471,13 +1473,14 @@ void HandleMotionNotify(void) { XPointer context_data; + unsigned udummy = 0; Window wdummy = None; if (ResizeWindow != (Window) 0) { XQueryPointer(dpy, Event.xany.window, &(Event.xmotion.root), &wdummy, &(Event.xmotion.x_root), &(Event.xmotion.y_root), - &(Event.xmotion.x), &(Event.xmotion.y), &JunkMask); + &(Event.xmotion.x), &(Event.xmotion.y), &udummy); /* Set WindowMoved appropriately so that f.deltastop will work with resize as well as move. */ |