summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Bloomfield <PeterBloomfield@BellSouth.net>2010-01-20 10:59:07 -0500
committerThomas Thurman <tthurman@gnome.org>2010-01-20 10:59:07 -0500
commit4943d79d6844af3f7fc0a15ceadb69d95c4c5c61 (patch)
treedd0ce228d396340fe726e493d83b5dd5856398a1
parent767cb27f78b0cb6958a83255c6c3bc01dc951445 (diff)
downloadmetacity-4943d79d6844af3f7fc0a15ceadb69d95c4c5c61.tar.gz
metacity-4943d79d6844af3f7fc0a15ceadb69d95c4c5c61.tar.bz2
prevent window self-maximisation
-rw-r--r--src/core/constraints.c14
-rw-r--r--src/core/window-private.h6
-rw-r--r--src/core/window-props.c3
-rw-r--r--src/core/window.c16
4 files changed, 33 insertions, 6 deletions
diff --git a/src/core/constraints.c b/src/core/constraints.c
index a060d20..5606b76 100644
--- a/src/core/constraints.c
+++ b/src/core/constraints.c
@@ -528,10 +528,11 @@ place_window_if_needed(MetaWindow *window,
if (window->placed || did_placement)
{
if (window->maximize_horizontally_after_placement ||
- window->maximize_vertically_after_placement)
+ window->maximize_vertically_after_placement ||
+ window->fullscreen_after_placement)
{
- /* define a sane saved_rect so that the user can unmaximize to
- * something reasonable.
+ /* define a sane saved_rect so that the user can unmaximize or
+ * make unfullscreen to something reasonable.
*/
if (info->current.width >= info->work_area_xinerama.width)
{
@@ -558,6 +559,13 @@ place_window_if_needed(MetaWindow *window,
if (window->frame && !window->fullscreen)
meta_frame_calc_geometry (window->frame, info->fgeom);
+ if (window->fullscreen_after_placement)
+ {
+ window->saved_rect = info->current;
+ window->fullscreen = TRUE;
+ window->fullscreen_after_placement = FALSE;
+ }
+
window->maximize_horizontally_after_placement = FALSE;
window->maximize_vertically_after_placement = FALSE;
}
diff --git a/src/core/window-private.h b/src/core/window-private.h
index f5d890a..da3fc52 100644
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -144,6 +144,9 @@ struct _MetaWindow
/* Whether we're fullscreen */
guint fullscreen : 1;
+ /* Whether we have to fullscreen after placement */
+ guint fullscreen_after_placement : 1;
+
/* Area to cover when in fullscreen mode. If _NET_WM_FULLSCREEN_MONITORS has
* been overridden (via a client message), the window will cover the union of
* these monitors. If not, this is the single monitor which the window's
@@ -247,6 +250,9 @@ struct _MetaWindow
/* Have we placed this window? */
guint placed : 1;
+ /* Must we force_save_user_window_placement? */
+ guint force_save_user_rect : 1;
+
/* Is this not a transient of the focus window which is being denied focus? */
guint denied_focus_and_not_transient : 1;
diff --git a/src/core/window-props.c b/src/core/window-props.c
index df90eaa..370c9c4 100644
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -624,6 +624,7 @@ reload_net_wm_state (MetaWindow *window,
window->shaded = FALSE;
window->maximized_horizontally = FALSE;
window->maximized_vertically = FALSE;
+ window->fullscreen = FALSE;
window->wm_state_modal = FALSE;
window->wm_state_skip_taskbar = FALSE;
window->wm_state_skip_pager = FALSE;
@@ -652,7 +653,7 @@ reload_net_wm_state (MetaWindow *window,
else if (value->v.atom_list.atoms[i] == window->display->atom__NET_WM_STATE_SKIP_PAGER)
window->wm_state_skip_pager = TRUE;
else if (value->v.atom_list.atoms[i] == window->display->atom__NET_WM_STATE_FULLSCREEN)
- window->fullscreen = TRUE;
+ window->fullscreen_after_placement = TRUE;
else if (value->v.atom_list.atoms[i] == window->display->atom__NET_WM_STATE_ABOVE)
window->wm_state_above = TRUE;
else if (value->v.atom_list.atoms[i] == window->display->atom__NET_WM_STATE_BELOW)
diff --git a/src/core/window.c b/src/core/window.c
index f679dbe..4c6a20c 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -457,7 +457,7 @@ meta_window_new_with_attrs (MetaDisplay *display,
window->maximize_horizontally_after_placement = FALSE;
window->maximize_vertically_after_placement = FALSE;
window->minimize_after_placement = FALSE;
- window->fullscreen = FALSE;
+ window->fullscreen_after_placement = FALSE;
window->fullscreen_monitors[0] = -1;
window->require_fully_onscreen = TRUE;
window->require_on_single_xinerama = TRUE;
@@ -478,6 +478,7 @@ meta_window_new_with_attrs (MetaDisplay *display,
meta_topic (META_DEBUG_PLACEMENT,
"Not placing window 0x%lx since it's already mapped\n",
xwindow);
+ window->force_save_user_rect = TRUE;
window->denied_focus_and_not_transient = FALSE;
window->unmanaging = FALSE;
window->is_in_queues = 0;
@@ -2551,6 +2552,8 @@ meta_window_maximize_internal (MetaWindow *window,
window->maximized_horizontally || maximize_horizontally;
window->maximized_vertically =
window->maximized_vertically || maximize_vertically;
+ if (maximize_horizontally || maximize_vertically)
+ window->force_save_user_rect = FALSE;
/* Fix for #336850: If the frame shape isn't reapplied, it is
* possible that the frame will retains its rounded corners. That
@@ -2713,6 +2716,10 @@ meta_window_unmaximize (MetaWindow *window,
target_rect.width,
target_rect.height);
+ /* Make sure user_rect is current.
+ */
+ force_save_user_window_placement (window);
+
if (window->display->grab_wireframe_active)
{
window->display->grab_wireframe_rect = target_rect;
@@ -2762,6 +2769,7 @@ meta_window_make_fullscreen_internal (MetaWindow *window)
meta_window_save_rect (window);
window->fullscreen = TRUE;
+ window->force_save_user_rect = FALSE;
meta_stack_freeze (window->screen->stack);
meta_window_update_layer (window);
@@ -2811,6 +2819,10 @@ meta_window_unmake_fullscreen (MetaWindow *window)
target_rect.width,
target_rect.height);
+ /* Make sure user_rect is current.
+ */
+ force_save_user_window_placement (window);
+
meta_window_update_layer (window);
recalc_window_features (window);
@@ -3613,7 +3625,7 @@ meta_window_move_resize_internal (MetaWindow *window,
if (need_configure_notify)
send_configure_notify (window);
- if (!window->placed)
+ if (!window->placed && window->force_save_user_rect && !window->fullscreen)
force_save_user_window_placement (window);
else if (is_user_action)
save_user_window_placement (window);