[metacity] avoid moving and resizing override-redirect windows
- From: Alberts Muktupāvels <muktupavels src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [metacity] avoid moving and resizing override-redirect windows
- Date: Sun, 26 Feb 2017 22:24:12 +0000 (UTC)
commit 921042390c38edae54cc48dabc20c336dfd1c613
Author: Owen W. Taylor <otaylor fishsoup net>
Date: Mon Jun 15 18:25:07 2009 -0400
avoid moving and resizing override-redirect windows
Override-redirect windows should not be moved or resized by the
window manager.
- Mark override-redirect windows as already placed to avoid
placing them when first shown.
- Don't move-resize newly created override-redirect MetaWindow
- Don't queue a resize on override-redirect windows when reading
their WM_TRANSIENT_FOR hint.
- Add g_return_if_fail (!window->override_redirect) to catch
unexpected code paths that might result in override-redirect
windows being moved or resized.
http://bugzilla.gnome.org/show_bug.cgi?id=582639
src/core/window-props.c | 2 +-
src/core/window.c | 45 ++++++++++++++++++++++++++++++++-------------
2 files changed, 33 insertions(+), 14 deletions(-)
---
diff --git a/src/core/window-props.c b/src/core/window-props.c
index bd29af7..ba743af 100644
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -1572,7 +1572,7 @@ reload_transient_for (MetaWindow *window,
window->xtransient_for != window->xgroup_leader)
meta_window_group_leader_changed (window);
- if (!window->constructing)
+ if (!window->constructing && !window->override_redirect)
meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
}
diff --git a/src/core/window.c b/src/core/window.c
index 82f4984..d153abe 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -464,8 +464,10 @@ meta_window_new_with_attrs (MetaDisplay *display,
window->mapped = attrs->map_state != IsUnmapped;
/* if already mapped, no need to worry about focus-on-first-time-showing */
window->showing_for_first_time = !window->mapped;
- /* if already mapped we don't want to do the placement thing */
- window->placed = window->mapped;
+ /* if already mapped we don't want to do the placement thing;
+ * override-redirect windows are placed by the app
+ */
+ window->placed = (window->mapped || window->override_redirect);
if (window->placed)
meta_topic (META_DEBUG_PLACEMENT,
"Not placing window 0x%lx since it's already mapped\n",
@@ -736,13 +738,14 @@ meta_window_new_with_attrs (MetaDisplay *display,
*/
flags =
META_IS_CONFIGURE_REQUEST | META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION;
- meta_window_move_resize_internal (window,
- flags,
- window->size_hints.win_gravity,
- window->size_hints.x,
- window->size_hints.y,
- window->size_hints.width,
- window->size_hints.height);
+ if (!window->override_redirect)
+ meta_window_move_resize_internal (window,
+ flags,
+ window->size_hints.win_gravity,
+ window->size_hints.x,
+ window->size_hints.y,
+ window->size_hints.width,
+ window->size_hints.height);
/* Now try applying saved stuff from the session */
{
@@ -1679,6 +1682,9 @@ meta_window_unqueue (MetaWindow *window, guint queuebits)
{
gint queuenum;
+ /* Easier to debug by checking here rather than in the idle */
+ g_return_if_fail (!window->override_redirect || (queuebits & META_QUEUE_MOVE_RESIZE) == 0);
+
for (queuenum=0; queuenum<NUMBER_OF_QUEUES; queuenum++)
{
if ((queuebits & 1<<queuenum) /* they have asked to unqueue */
@@ -3402,6 +3408,8 @@ meta_window_move_resize_internal (MetaWindow *window,
MetaRectangle new_rect;
MetaRectangle old_rect;
+ g_return_if_fail (!window->override_redirect);
+
is_configure_request = (flags & META_IS_CONFIGURE_REQUEST) != 0;
do_gravity_adjust = (flags & META_DO_GRAVITY_ADJUST) != 0;
is_user_action = (flags & META_IS_USER_ACTION) != 0;
@@ -3806,6 +3814,8 @@ meta_window_resize (MetaWindow *window,
int x, y;
MetaMoveResizeFlags flags;
+ g_return_if_fail (!window->override_redirect);
+
meta_window_get_position (window, &x, &y);
flags = (user_op ? META_IS_USER_ACTION : 0) | META_IS_RESIZE_ACTION;
@@ -3821,8 +3831,12 @@ meta_window_move (MetaWindow *window,
int root_x_nw,
int root_y_nw)
{
- MetaMoveResizeFlags flags =
- (user_op ? META_IS_USER_ACTION : 0) | META_IS_MOVE_ACTION;
+ MetaMoveResizeFlags flags;
+
+ g_return_if_fail (!window->override_redirect);
+
+ flags = (user_op ? META_IS_USER_ACTION : 0) | META_IS_MOVE_ACTION;
+
meta_window_move_resize_internal (window,
flags,
NorthWestGravity,
@@ -3839,8 +3853,11 @@ meta_window_move_resize (MetaWindow *window,
int w,
int h)
{
- MetaMoveResizeFlags flags =
- (user_op ? META_IS_USER_ACTION : 0) |
+ MetaMoveResizeFlags flags;
+
+ g_return_if_fail (!window->override_redirect);
+
+ flags = (user_op ? META_IS_USER_ACTION : 0) |
META_IS_MOVE_ACTION | META_IS_RESIZE_ACTION;
meta_window_move_resize_internal (window,
flags,
@@ -6934,6 +6951,8 @@ meta_window_shove_titlebar_onscreen (MetaWindow *window)
int horiz_amount, vert_amount;
int newx, newy;
+ g_return_if_fail (!window->override_redirect);
+
/* If there's no titlebar, don't bother */
if (!window->frame)
return;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]