gryf/wmaker
1
0
Fork 0
mirror of https://github.com/gryf/wmaker.git synced 2025-12-19 20:38:08 +01:00
Code Issues Projects Releases Wiki Activity

Prevent border drifting.

Browse Source 
Windows were drifting by FRAME_BORDER_WIDTH pixels when their
borders were toggled on or off.

Windows which had a border before we managed them were drifting
on shutdown and again at startup.  It happened because the absolute
upper-left co-ordinates of a bordered window would in fact be the
upper-left co-ordinates of the border itself, whereas we consider
the client window to have no border and co-ordinates offset by the
titlebar and frame border.
This commit is contained in:
Iain Patterson
2012-11-16 16:00:07 -08:00
committed by Carlos R. Mafra
parent 4e193c172b
commit df601267e6
2 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/client.c
View File

@@ -83,6 +83,8 @@ void wClientRestore(WWindow * wwin)
#endif #endif
/* account for titlebar and border */ /* account for titlebar and border */
wwin->frame_y += wwin->frame->top_width; wwin->frame_y += wwin->frame->top_width;
wwin->frame_x -= wwin->old_border_width;
wwin->frame_y -= wwin->old_border_width;
if (HAS_BORDER(wwin)) { if (HAS_BORDER(wwin)) {
wwin->frame_x += FRAME_BORDER_WIDTH; wwin->frame_x += FRAME_BORDER_WIDTH;
wwin->frame_y += FRAME_BORDER_WIDTH; wwin->frame_y += FRAME_BORDER_WIDTH;

27
src/window.c
View File

@@ -1178,6 +1178,17 @@ WWindow *wManageWindow(WScreen *scr, Window window)
} }
} }
/* If this is a newly-mapped window which had a border,
* the absolute co-ordinates reported to us are actually
* the co-ordinates of the border. We, however, track
* the absolute co-ordinates of the client window, offset
* by the title bar and frame border. As a result
* we need to offset placement of the client by the border
* size so its position matches what we expect.
*/
x += wwin->old_border_width;
y += wwin->old_border_width;
/* /*
* wWindowConfigure() will init the client window's size * wWindowConfigure() will init the client window's size
* (wwin->client.{width,height}) and all other geometry * (wwin->client.{width,height}) and all other geometry
@@ -2226,7 +2237,9 @@ void wWindowConfigureBorders(WWindow *wwin)
{ {
if (wwin->frame) { if (wwin->frame) {
int flags; int flags;
int newy, oldh; int newx, newy, oldh;
int border_width;
XWindowAttributes attr;
flags = WFF_LEFT_BUTTON | WFF_RIGHT_BUTTON; flags = WFF_LEFT_BUTTON | WFF_RIGHT_BUTTON;
@@ -2244,13 +2257,17 @@ void wWindowConfigureBorders(WWindow *wwin)
if (wwin->flags.shaded) if (wwin->flags.shaded)
flags |= WFF_IS_SHADED; flags |= WFF_IS_SHADED;
oldh = wwin->frame->top_width; if (!XGetWindowAttributes(dpy, wwin->frame->core->window, &attr))
attr.border_width = 0;
border_width = (flags & WFF_BORDER) ? FRAME_BORDER_WIDTH : 0;
oldh = wwin->frame->top_width + attr.border_width;
wFrameWindowUpdateBorders(wwin->frame, flags); wFrameWindowUpdateBorders(wwin->frame, flags);
if (oldh != wwin->frame->top_width) { if (oldh != wwin->frame->top_width + border_width) {
newy = wwin->frame_y + oldh - wwin->frame->top_width; newx = wwin->frame_x + attr.border_width - border_width;
newy = wwin->frame_y + oldh - border_width - wwin->frame->top_width;
XMoveWindow(dpy, wwin->client_win, 0, wwin->frame->top_width); XMoveWindow(dpy, wwin->client_win, 0, wwin->frame->top_width);
wWindowConfigure(wwin, wwin->frame_x, newy, wwin->client.width, wwin->client.height); wWindowConfigure(wwin, newx, newy, wwin->client.width, wwin->client.height);
} }
flags = 0; flags = 0;