isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-21 23:50:41 -05:00
Code Issues Packages Projects Releases Wiki Activity

only set skip pager/tasklist if the app set it, don't set it again based

Browse Source 
2002-02-08  Havoc Pennington  <hp@pobox.com>

	* src/window.c (set_net_wm_state): only set skip pager/tasklist if
	the app set it, don't set it again based on semantic type.
This commit is contained in:
Havoc Pennington 2002-02-09 04:15:41 +00:00 committed by Havoc Pennington
parent 9d84a23cd1
commit bd712d7f8f
2 changed files with 10 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2002-02-08 Havoc Pennington <hp@pobox.com>
* src/window.c (set_net_wm_state): only set skip pager/tasklist if
the app set it, don't set it again based on semantic type.
2002-02-08 Anders Carlsson <andersca@gnu.org> 2002-02-08 Anders Carlsson <andersca@gnu.org>
* src/theme.c (scale_and_alpha_pixbuf): If we're only * src/theme.c (scale_and_alpha_pixbuf): If we're only

24
src/window.c
View File

@ -816,23 +816,6 @@ set_net_wm_state (MetaWindow *window)
{ {
int i; int i;
unsigned long data[10]; unsigned long data[10];
gboolean skip_pager;
gboolean skip_taskbar;
if (window->type == META_WINDOW_DESKTOP ||
window->type == META_WINDOW_DOCK ||
window->type == META_WINDOW_TOOLBAR ||
window->type == META_WINDOW_MENU)
skip_pager = TRUE;
else
skip_pager = FALSE;
if (window->type == META_WINDOW_DESKTOP ||
window->type == META_WINDOW_DOCK ||
window->type == META_WINDOW_MENU)
skip_taskbar = TRUE;
else
skip_taskbar = FALSE;
i = 0; i = 0;
if (window->shaded) if (window->shaded)
@ -845,12 +828,12 @@ set_net_wm_state (MetaWindow *window)
data[i] = window->display->atom_net_wm_state_modal; data[i] = window->display->atom_net_wm_state_modal;
++i; ++i;
} }
if (window->wm_state_skip_pager || skip_pager) if (window->wm_state_skip_pager)
{ {
data[i] = window->display->atom_net_wm_state_skip_pager; data[i] = window->display->atom_net_wm_state_skip_pager;
++i; ++i;
} }
if (window->wm_state_skip_taskbar || skip_pager) if (window->wm_state_skip_taskbar)
{ {
data[i] = window->display->atom_net_wm_state_skip_taskbar; data[i] = window->display->atom_net_wm_state_skip_taskbar;
++i; ++i;
@ -4143,6 +4126,7 @@ update_net_wm_type (MetaWindow *window)
/* We break as soon as we find one we recognize, /* We break as soon as we find one we recognize,
* supposed to prefer those near the front of the list * supposed to prefer those near the front of the list
*/ */
/* FIXME modal dialog (? see if it's in spec), utility, splashscreen */
if (atoms[i] == window->display->atom_net_wm_window_type_desktop || if (atoms[i] == window->display->atom_net_wm_window_type_desktop ||
atoms[i] == window->display->atom_net_wm_window_type_dock || atoms[i] == window->display->atom_net_wm_window_type_dock ||
atoms[i] == window->display->atom_net_wm_window_type_toolbar || atoms[i] == window->display->atom_net_wm_window_type_toolbar ||
@ -4981,6 +4965,8 @@ recalc_window_type (MetaWindow *window)
window->type = META_WINDOW_DIALOG; window->type = META_WINDOW_DIALOG;
else if (window->type_atom == window->display->atom_net_wm_window_type_normal) else if (window->type_atom == window->display->atom_net_wm_window_type_normal)
window->type = META_WINDOW_NORMAL; window->type = META_WINDOW_NORMAL;
else
meta_bug ("Set a type atom for %s that wasn't handled in recalc_window_type\n");
} }
else if (window->xtransient_for != None) else if (window->xtransient_for != None)
{ {