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

window: Move type_atom to window-x11

Browse Source
This commit is contained in:
Jasper St. Pierre 2014-03-18 21:15:49 -04:00
parent dfcefd3315
commit f05983be42
5 changed files with 25 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/core/window-private.h
View File

@ -97,7 +97,6 @@ struct _MetaWindow
Pixmap wm_hints_mask; Pixmap wm_hints_mask;
MetaWindowType type; MetaWindowType type;
Atom type_atom;
/* NOTE these five are not in UTF-8, we just treat them as random /* NOTE these five are not in UTF-8, we just treat them as random
* binary data * binary data

18
src/core/window.c
View File

@ -940,7 +940,6 @@ _meta_window_shared_new (MetaDisplay *display,
window->transient_parent_is_root_window = FALSE; window->transient_parent_is_root_window = FALSE;
window->type = META_WINDOW_NORMAL; window->type = META_WINDOW_NORMAL;
window->type_atom = None;
window->struts = NULL; window->struts = NULL;
@ -9417,23 +9416,6 @@ meta_window_get_window_type (MetaWindow *window)
return window->type; return window->type;
} }
/**
* meta_window_get_window_type_atom: (skip)
* @window: a #MetaWindow
*
* Gets the X atom from the _NET_WM_WINDOW_TYPE property used by the
* application to set the window type. (Note that this is constrained
* to be some value that Mutter recognizes - a completely unrecognized
* type atom will be returned as None.)
*
* Return value: the raw X atom for the window type, or None
*/
Atom
meta_window_get_window_type_atom (MetaWindow *window)
{
return window->type_atom;
}
/** /**
* meta_window_get_workspace: * meta_window_get_workspace:
* @window: a #MetaWindow * @window: a #MetaWindow

1
src/meta/window.h
View File

@ -125,7 +125,6 @@ MetaScreen *meta_window_get_screen (MetaWindow *window);
MetaDisplay *meta_window_get_display (MetaWindow *window); MetaDisplay *meta_window_get_display (MetaWindow *window);
Window meta_window_get_xwindow (MetaWindow *window); Window meta_window_get_xwindow (MetaWindow *window);
MetaWindowType meta_window_get_window_type (MetaWindow *window); MetaWindowType meta_window_get_window_type (MetaWindow *window);
Atom meta_window_get_window_type_atom (MetaWindow *window);
MetaWorkspace *meta_window_get_workspace (MetaWindow *window); MetaWorkspace *meta_window_get_workspace (MetaWindow *window);
int meta_window_get_monitor (MetaWindow *window); int meta_window_get_monitor (MetaWindow *window);
gboolean meta_window_is_on_all_workspaces (MetaWindow *window); gboolean meta_window_is_on_all_workspaces (MetaWindow *window);

2
src/x11/window-x11-private.h
View File

@ -50,6 +50,8 @@ struct _MetaWindowX11Private
guint using_net_wm_visible_name : 1; /* tracked so we can clear it */ guint using_net_wm_visible_name : 1; /* tracked so we can clear it */
guint using_net_wm_icon_name : 1; /* vs. plain wm_icon_name */ guint using_net_wm_icon_name : 1; /* vs. plain wm_icon_name */
guint using_net_wm_visible_icon_name : 1; /* tracked so we can clear it */ guint using_net_wm_visible_icon_name : 1; /* tracked so we can clear it */
Atom type_atom;
}; };
G_END_DECLS G_END_DECLS

42
src/x11/window-x11.c
View File

@ -199,11 +199,13 @@ meta_window_x11_set_net_wm_state (MetaWindow *window)
void void
meta_window_x11_update_net_wm_type (MetaWindow *window) meta_window_x11_update_net_wm_type (MetaWindow *window)
{ {
MetaWindowX11 *window_x11 = META_WINDOW_X11 (window);
MetaWindowX11Private *priv = meta_window_x11_get_instance_private (window_x11);
int n_atoms; int n_atoms;
Atom *atoms; Atom *atoms;
int i; int i;
window->type_atom = None; priv->type_atom = None;
n_atoms = 0; n_atoms = 0;
atoms = NULL; atoms = NULL;
@ -234,7 +236,7 @@ meta_window_x11_update_net_wm_type (MetaWindow *window)
atoms[i] == window->display->atom__NET_WM_WINDOW_TYPE_DND || atoms[i] == window->display->atom__NET_WM_WINDOW_TYPE_DND ||
atoms[i] == window->display->atom__NET_WM_WINDOW_TYPE_NORMAL) atoms[i] == window->display->atom__NET_WM_WINDOW_TYPE_NORMAL)
{ {
window->type_atom = atoms[i]; priv->type_atom = atoms[i];
break; break;
} }
@ -248,10 +250,10 @@ meta_window_x11_update_net_wm_type (MetaWindow *window)
char *str; char *str;
str = NULL; str = NULL;
if (window->type_atom != None) if (priv->type_atom != None)
{ {
meta_error_trap_push (window->display); meta_error_trap_push (window->display);
str = XGetAtomName (window->display->xdisplay, window->type_atom); str = XGetAtomName (window->display->xdisplay, priv->type_atom);
meta_error_trap_pop (window->display); meta_error_trap_pop (window->display);
} }
@ -1549,38 +1551,38 @@ meta_window_x11_recalc_window_type (MetaWindow *window)
MetaWindowX11Private *priv = meta_window_x11_get_instance_private (window_x11); MetaWindowX11Private *priv = meta_window_x11_get_instance_private (window_x11);
MetaWindowType type; MetaWindowType type;
if (window->type_atom != None) if (priv->type_atom != None)
{ {
if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_DESKTOP) if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_DESKTOP)
type = META_WINDOW_DESKTOP; type = META_WINDOW_DESKTOP;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_DOCK) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_DOCK)
type = META_WINDOW_DOCK; type = META_WINDOW_DOCK;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_TOOLBAR) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_TOOLBAR)
type = META_WINDOW_TOOLBAR; type = META_WINDOW_TOOLBAR;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_MENU) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_MENU)
type = META_WINDOW_MENU; type = META_WINDOW_MENU;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_UTILITY) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_UTILITY)
type = META_WINDOW_UTILITY; type = META_WINDOW_UTILITY;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_SPLASH) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_SPLASH)
type = META_WINDOW_SPLASHSCREEN; type = META_WINDOW_SPLASHSCREEN;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_DIALOG) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_DIALOG)
type = META_WINDOW_DIALOG; type = META_WINDOW_DIALOG;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_NORMAL) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_NORMAL)
type = META_WINDOW_NORMAL; type = META_WINDOW_NORMAL;
/* The below are *typically* override-redirect windows, but the spec does /* The below are *typically* override-redirect windows, but the spec does
* not disallow using them for managed windows. * not disallow using them for managed windows.
*/ */
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_DROPDOWN_MENU) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_DROPDOWN_MENU)
type = META_WINDOW_DROPDOWN_MENU; type = META_WINDOW_DROPDOWN_MENU;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_POPUP_MENU) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_POPUP_MENU)
type = META_WINDOW_POPUP_MENU; type = META_WINDOW_POPUP_MENU;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_TOOLTIP) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_TOOLTIP)
type = META_WINDOW_TOOLTIP; type = META_WINDOW_TOOLTIP;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_NOTIFICATION) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_NOTIFICATION)
type = META_WINDOW_NOTIFICATION; type = META_WINDOW_NOTIFICATION;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_COMBO) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_COMBO)
type = META_WINDOW_COMBO; type = META_WINDOW_COMBO;
else if (window->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_DND) else if (priv->type_atom == window->display->atom__NET_WM_WINDOW_TYPE_DND)
type = META_WINDOW_DND; type = META_WINDOW_DND;
else else
{ {
@ -1593,7 +1595,7 @@ meta_window_x11_recalc_window_type (MetaWindow *window)
meta_error_trap_push (window->display); meta_error_trap_push (window->display);
atom_name = XGetAtomName (window->display->xdisplay, atom_name = XGetAtomName (window->display->xdisplay,
window->type_atom); priv->type_atom);
meta_error_trap_pop (window->display); meta_error_trap_pop (window->display);
meta_warning ("Unrecognized type atom [%s] set for %s \n", meta_warning ("Unrecognized type atom [%s] set for %s \n",