brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

window: Centralize WM_STATE management

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-02-01 19:03:33 -05:00
parent ad1e23ce7d
commit c78089437d
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/core/window.c
View File

@ -77,8 +77,7 @@ static void invalidate_work_areas (MetaWindow *window);
static void set_wm_state_on_xwindow (MetaDisplay *display, static void set_wm_state_on_xwindow (MetaDisplay *display,
Window xwindow, Window xwindow,
int state); int state);
static void set_wm_state (MetaWindow *window, static void set_wm_state (MetaWindow *window);
int state);
static void set_net_wm_state (MetaWindow *window); static void set_net_wm_state (MetaWindow *window);
static void meta_window_set_above (MetaWindow *window, static void meta_window_set_above (MetaWindow *window,
gboolean new_value); gboolean new_value);
@ -1406,7 +1405,7 @@ meta_window_new (MetaDisplay *display,
/* FIXME we have a tendency to set this then immediately /* FIXME we have a tendency to set this then immediately
* change it again. * change it again.
*/ */
set_wm_state (window, window->iconic ? IconicState : NormalState); set_wm_state (window);
set_net_wm_state (window); set_net_wm_state (window);
} }
@ -1807,7 +1806,7 @@ meta_window_unmanage (MetaWindow *window,
XDeleteProperty (window->display->xdisplay, XDeleteProperty (window->display->xdisplay,
window->xwindow, window->xwindow,
window->display->atom__NET_WM_FULLSCREEN_MONITORS); window->display->atom__NET_WM_FULLSCREEN_MONITORS);
set_wm_state (window, WithdrawnState); set_wm_state (window);
meta_error_trap_pop (window->display); meta_error_trap_pop (window->display);
} }
else else
@ -1818,7 +1817,7 @@ meta_window_unmanage (MetaWindow *window,
if (!window->minimized) if (!window->minimized)
{ {
meta_error_trap_push (window->display); meta_error_trap_push (window->display);
set_wm_state (window, NormalState); set_wm_state (window);
meta_error_trap_pop (window->display); meta_error_trap_pop (window->display);
} }
@ -1968,11 +1967,16 @@ set_wm_state_on_xwindow (MetaDisplay *display,
} }
static void static void
set_wm_state (MetaWindow *window, set_wm_state (MetaWindow *window)
int state)
{ {
meta_verbose ("Setting wm state %s on %s\n", int state;
wm_state_to_string (state), window->desc);
if (window->withdrawn)
state = WithdrawnState;
else if (window->iconic)
state = IconicState;
else
state = NormalState;
set_wm_state_on_xwindow (window->display, window->xwindow, state); set_wm_state_on_xwindow (window->display, window->xwindow, state);
} }
@ -3087,7 +3091,7 @@ meta_window_show (MetaWindow *window)
if (!window->iconic) if (!window->iconic)
{ {
window->iconic = TRUE; window->iconic = TRUE;
set_wm_state (window, IconicState); set_wm_state (window);
} }
} }
else else
@ -3106,7 +3110,7 @@ meta_window_show (MetaWindow *window)
if (window->iconic) if (window->iconic)
{ {
window->iconic = FALSE; window->iconic = FALSE;
set_wm_state (window, NormalState); set_wm_state (window);
} }
} }
@ -3256,7 +3260,7 @@ meta_window_hide (MetaWindow *window)
if (!window->iconic) if (!window->iconic)
{ {
window->iconic = TRUE; window->iconic = TRUE;
set_wm_state (window, IconicState); set_wm_state (window);
} }
toplevel_now_mapped = meta_window_toplevel_is_mapped (window); toplevel_now_mapped = meta_window_toplevel_is_mapped (window);