This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project wmaker-crm.git.
The branch, next has been updated
via 3d470167882799fc38699ec22f5198450cfe5df0 (commit)
via b02a12b8c1f6c232229fe3cb191bf00259b36d18 (commit)
via f6f72acbdebd8b482c73528b44283b1ee438d42d (commit)
via ff52ef3996aac2b1abc1837f53e39e18ec199126 (commit)
from 0a461416e3dca9d4cd21259b6d1499f56b806133 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
http://repo.or.cz/w/wmaker-crm.git/commit/3d470167882799fc38699ec22f5198450cfe5df0
commit 3d470167882799fc38699ec22f5198450cfe5df0
Author: Carlos R. Mafra <[email protected]>
Date: Tue Dec 18 18:29:50 2012 +0000
Revert "Maximized windows appear misplaced"
This reverts commit b657f15344f193d70747689f96cefddc8baa2181.
diff --git a/src/window.c b/src/window.c
index 4051035..47d280c 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1140,29 +1140,6 @@ WWindow *wManageWindow(WScreen *scr, Window window)
y -= wwin->frame->top_width + wwin->frame->bottom_width;
}
- /* wWindowConfigure() will account for the window border
- * when placing so the window would be shifted without
- * the adjustment below
- */
- if (HAS_BORDER(wwin)) {
- WMRect rect;
- WArea usableArea;
- int head;
-
- rect.pos.x = x;
- rect.pos.y = y;
- rect.size.width = 1;
- rect.size.height = 1;
-
- head = wGetHeadForRect(scr, rect);
- usableArea = wGetUsableAreaForHead(scr, head, NULL, True);
-
- if (x >= usableArea.x1 + 2 * FRAME_BORDER_WIDTH)
- x -= 2 * FRAME_BORDER_WIDTH;
- if (y >= usableArea.y1 + 2 * FRAME_BORDER_WIDTH)
- y -= 2 * FRAME_BORDER_WIDTH;
- }
-
/*
* wWindowConfigure() will init the client window's size
* (wwin->client.{width,height}) and all other geometry
http://repo.or.cz/w/wmaker-crm.git/commit/b02a12b8c1f6c232229fe3cb191bf00259b36d18
commit b02a12b8c1f6c232229fe3cb191bf00259b36d18
Author: Carlos R. Mafra <[email protected]>
Date: Tue Dec 18 18:29:11 2012 +0000
Revert "Prevent windows from drifting on restart."
This reverts commit 3cd382bccc46b957c9a699fe5fa827f32704dfcd.
Conflicts:
src/window.c
diff --git a/src/window.c b/src/window.c
index f0df269..4051035 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1140,7 +1140,11 @@ WWindow *wManageWindow(WScreen *scr, Window window)
y -= wwin->frame->top_width + wwin->frame->bottom_width;
}
- {
+ /* wWindowConfigure() will account for the window border
+ * when placing so the window would be shifted without
+ * the adjustment below
+ */
+ if (HAS_BORDER(wwin)) {
WMRect rect;
WArea usableArea;
int head;
@@ -1153,21 +1157,10 @@ WWindow *wManageWindow(WScreen *scr, Window window)
head = wGetHeadForRect(scr, rect);
usableArea = wGetUsableAreaForHead(scr, head, NULL, True);
- /* wWindowConfigure() will account for the frame
- * when placing so the window would be shifted without
- * the adjustment below */
- if (y >= usableArea.y1 + wwin->frame->top_width)
- y -= wwin->frame->top_width;
-
- /* wWindowConfigure() will account for the window border
- * when placing so the window would be shifted without
- * the adjustment below */
- if (HAS_BORDER(wwin)) {
- if (x >= usableArea.x1 + FRAME_BORDER_WIDTH)
- x -= FRAME_BORDER_WIDTH;
- if (y >= usableArea.y1 + FRAME_BORDER_WIDTH)
- y -= FRAME_BORDER_WIDTH;
- }
+ if (x >= usableArea.x1 + 2 * FRAME_BORDER_WIDTH)
+ x -= 2 * FRAME_BORDER_WIDTH;
+ if (y >= usableArea.y1 + 2 * FRAME_BORDER_WIDTH)
+ y -= 2 * FRAME_BORDER_WIDTH;
}
/*
http://repo.or.cz/w/wmaker-crm.git/commit/f6f72acbdebd8b482c73528b44283b1ee438d42d
commit f6f72acbdebd8b482c73528b44283b1ee438d42d
Author: Carlos R. Mafra <[email protected]>
Date: Tue Dec 18 18:20:52 2012 +0000
Revert "Fixed regression when placing windows."
This reverts commit 4e193c172b79a742b9b3e72403fc1e1d579f7aa5.
Conflicts:
src/window.c
diff --git a/src/client.c b/src/client.c
index ea72476..c11f306 100644
--- a/src/client.c
+++ b/src/client.c
@@ -81,13 +81,6 @@ void wClientRestore(WWindow * wwin)
if (gy > 0)
wwin->frame_y += (wwin->frame->top_width +
wwin->frame->bottom_width);
#endif
- /* account for titlebar and border */
- wwin->frame_y += wwin->frame->top_width;
- if (HAS_BORDER(wwin)) {
- wwin->frame_x += FRAME_BORDER_WIDTH;
- wwin->frame_y += FRAME_BORDER_WIDTH;
- }
-
XSetWindowBorderWidth(dpy, wwin->client_win, wwin->old_border_width);
XReparentWindow(dpy, wwin->client_win, wwin->screen_ptr->root_win,
wwin->frame_x, wwin->frame_y);
diff --git a/src/placement.c b/src/placement.c
index 3d219d6..b30e0af 100644
--- a/src/placement.c
+++ b/src/placement.c
@@ -523,7 +523,6 @@ void PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
unsigned width, unsigned
WScreen *scr = wwin->screen_ptr;
int h = WMFontHeight(scr->title_font)
+ (wPreferences.window_title_clearance + TITLEBAR_EXTEND_SPACE)
* 2;
- int border_width;
if (h > wPreferences.window_title_max_height)
h = wPreferences.window_title_max_height;
@@ -578,14 +577,13 @@ void PlaceWindow(WWindow *wwin, int *x_ret, int *y_ret,
unsigned width, unsigned
* this will also take dock/clip etc.. into account
* aswell as being xinerama friendly
*/
- border_width = (HAS_BORDER(wwin)) ? 2 * FRAME_BORDER_WIDTH : 0;
- if (*x_ret + border_width + width > usableArea.x2)
- *x_ret = usableArea.x2 - border_width - width;
+ if (*x_ret + width > usableArea.x2)
+ *x_ret = usableArea.x2 - width;
if (*x_ret < usableArea.x1)
*x_ret = usableArea.x1;
- if (*y_ret + border_width + height > usableArea.y2)
- *y_ret = usableArea.y2 - border_width - height;
+ if (*y_ret + height > usableArea.y2)
+ *y_ret = usableArea.y2 - height;
if (*y_ret < usableArea.y1)
*y_ret = usableArea.y1;
}
diff --git a/src/window.c b/src/window.c
index b794b2b..f0df269 100644
--- a/src/window.c
+++ b/src/window.c
@@ -591,7 +591,6 @@ WWindow *wManageWindow(WScreen *scr, Window window)
char *title;
Bool withdraw = False;
Bool raise = False;
- Bool frame_adjustment = True;
/* mutex. */
XGrabServer(dpy);
@@ -992,7 +991,6 @@ WWindow *wManageWindow(WScreen *scr, Window window)
} else {
PlaceWindow(wwin, &x, &y, width, height);
- frame_adjustment = False;
}
if (wPreferences.window_placement == WPM_MANUAL)
@@ -1142,7 +1140,7 @@ WWindow *wManageWindow(WScreen *scr, Window window)
y -= wwin->frame->top_width + wwin->frame->bottom_width;
}
- if (frame_adjustment) {
+ {
WMRect rect;
WArea usableArea;
int head;
http://repo.or.cz/w/wmaker-crm.git/commit/ff52ef3996aac2b1abc1837f53e39e18ec199126
commit ff52ef3996aac2b1abc1837f53e39e18ec199126
Author: Carlos R. Mafra <[email protected]>
Date: Tue Dec 18 18:18:14 2012 +0000
Revert "Prevent border drifting."
This reverts commit df601267e640ce7eb171f2ce5044915a3cc358b2.
Conflicts:
src/window.c
diff --git a/src/client.c b/src/client.c
index 975adb1..ea72476 100644
--- a/src/client.c
+++ b/src/client.c
@@ -83,8 +83,6 @@ void wClientRestore(WWindow * wwin)
#endif
/* account for titlebar and border */
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)) {
wwin->frame_x += FRAME_BORDER_WIDTH;
wwin->frame_y += FRAME_BORDER_WIDTH;
diff --git a/src/window.c b/src/window.c
index 1cb384a..b794b2b 100644
--- a/src/window.c
+++ b/src/window.c
@@ -1172,17 +1172,8 @@ 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
* related variables (frame_x,frame_y) */
wWindowConfigure(wwin, x, y, width, height);
@@ -2222,9 +2213,7 @@ void wWindowConfigureBorders(WWindow *wwin)
{
if (wwin->frame) {
int flags;
- int newx, newy, oldh;
- int border_width;
- XWindowAttributes attr;
+ int newy, oldh;
flags = WFF_LEFT_BUTTON | WFF_RIGHT_BUTTON;
@@ -2242,17 +2231,13 @@ void wWindowConfigureBorders(WWindow *wwin)
if (wwin->flags.shaded)
flags |= WFF_IS_SHADED;
- 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;
+ oldh = wwin->frame->top_width;
wFrameWindowUpdateBorders(wwin->frame, flags);
- if (oldh != wwin->frame->top_width + border_width) {
- newx = wwin->frame_x + attr.border_width - border_width;
- newy = wwin->frame_y + oldh - border_width -
wwin->frame->top_width;
+ if (oldh != wwin->frame->top_width) {
+ newy = wwin->frame_y + oldh - wwin->frame->top_width;
XMoveWindow(dpy, wwin->client_win, 0,
wwin->frame->top_width);
- wWindowConfigure(wwin, newx, newy, wwin->client.width,
wwin->client.height);
+ wWindowConfigure(wwin, wwin->frame_x, newy,
wwin->client.width, wwin->client.height);
}
flags = 0;
-----------------------------------------------------------------------
Summary of changes:
src/client.c | 9 --------
src/placement.c | 10 +++-----
src/window.c | 61 ++++++------------------------------------------------
3 files changed, 11 insertions(+), 69 deletions(-)
repo.or.cz automatic notification. Contact project admin [email protected]
if you want to unsubscribe, or site admin [email protected] if you receive
no reply.
--
wmaker-crm.git ("The Window Maker window manager")
--
To unsubscribe, send mail to [email protected].
