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

window: Add a simple meta_window_get_toplevel_xwindow utility

Browse Source 
To replace all the places where we do:

  window->frame ? window->frame->xwindow : window->xwindow

or similar...
This commit is contained in:
Jasper St. Pierre 2013-12-06 00:57:11 -05:00
parent 1b600f5867
commit f0fa4d831a
6 changed files with 14 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/compositor/meta-window-actor.c
View File

@ -309,11 +309,9 @@ window_decorated_notify (MetaWindow *mw,
{ {
MetaWindowActor *self = META_WINDOW_ACTOR (data); MetaWindowActor *self = META_WINDOW_ACTOR (data);
MetaWindowActorPrivate *priv = self->priv; MetaWindowActorPrivate *priv = self->priv;
MetaFrame *frame = meta_window_get_frame (mw);
MetaScreen *screen = priv->screen; MetaScreen *screen = priv->screen;
MetaDisplay *display = meta_screen_get_display (screen); MetaDisplay *display = meta_screen_get_display (screen);
Display *xdisplay = meta_display_get_xdisplay (display); Display *xdisplay = meta_display_get_xdisplay (display);
Window new_xwindow;
/* /*
* Basically, we have to reconstruct the the internals of this object * Basically, we have to reconstruct the the internals of this object
@ -321,11 +319,6 @@ window_decorated_notify (MetaWindow *mw,
*/ */
priv->redecorating = TRUE; priv->redecorating = TRUE;
if (frame)
new_xwindow = meta_frame_get_xwindow (frame);
else
new_xwindow = meta_window_get_xwindow (mw);
if (!meta_is_wayland_compositor ()) if (!meta_is_wayland_compositor ())
{ {
meta_window_actor_detach_x11_pixmap (self); meta_window_actor_detach_x11_pixmap (self);
@ -343,7 +336,7 @@ window_decorated_notify (MetaWindow *mw,
} }
} }
priv->xwindow = new_xwindow; priv->xwindow = meta_window_get_toplevel_xwindow (priv->window);
/* /*
* Recreate the contents. * Recreate the contents.
@ -1677,18 +1670,12 @@ meta_window_actor_new (MetaWindow *window)
MetaCompScreen *info = meta_screen_get_compositor_data (screen); MetaCompScreen *info = meta_screen_get_compositor_data (screen);
MetaWindowActor *self; MetaWindowActor *self;
MetaWindowActorPrivate *priv; MetaWindowActorPrivate *priv;
MetaFrame *frame; Window top_window;
Window top_window = None;
ClutterActor *window_group; ClutterActor *window_group;
if (window->client_type == META_WINDOW_CLIENT_TYPE_X11) if (window->client_type == META_WINDOW_CLIENT_TYPE_X11)
{ {
frame = meta_window_get_frame (window); top_window = meta_window_get_toplevel_xwindow (window);
if (frame)
top_window = meta_frame_get_xwindow (frame);
else
top_window = meta_window_get_xwindow (window);
meta_verbose ("add window: Meta %p, xwin 0x%x\n", window, (guint)top_window); meta_verbose ("add window: Meta %p, xwin 0x%x\n", window, (guint)top_window);
} }
else else

3
src/core/core.c
View File

@ -283,8 +283,7 @@ meta_core_lower_beneath_grab_window (Display *xdisplay,
return; return;
changes.stack_mode = Below; changes.stack_mode = Below;
changes.sibling = grab_window->frame ? grab_window->frame->xwindow changes.sibling = meta_window_get_toplevel_xwindow (grab_window);
: grab_window->xwindow;
stack_window.any.type = META_WINDOW_CLIENT_TYPE_X11; stack_window.any.type = META_WINDOW_CLIENT_TYPE_X11;
stack_window.x11.xwindow = xwindow; stack_window.x11.xwindow = xwindow;

2
src/core/display.c
View File

@ -4204,7 +4204,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
* key grab on the RootWindow. * key grab on the RootWindow.
*/ */
if (grab_window) if (grab_window)
grab_xwindow = grab_window->frame ? grab_window->frame->xwindow : grab_window->xwindow; grab_xwindow = meta_window_get_toplevel_xwindow (grab_window);
else else
grab_xwindow = screen->xroot; grab_xwindow = screen->xroot;

4
src/core/keybindings.c
View File

@ -1277,7 +1277,7 @@ meta_window_grab_keys (MetaWindow *window)
} }
meta_window_change_keygrabs (window, meta_window_change_keygrabs (window,
window->frame ? window->frame->xwindow : window->xwindow, meta_window_get_toplevel_xwindow (window),
TRUE); TRUE);
window->keys_grabbed = TRUE; window->keys_grabbed = TRUE;
@ -1584,7 +1584,7 @@ meta_window_grab_all_keys (MetaWindow *window,
window->desc); window->desc);
meta_window_focus (window, timestamp); meta_window_focus (window, timestamp);
grabwindow = window->frame ? window->frame->xwindow : window->xwindow; grabwindow = meta_window_get_toplevel_xwindow (window);
meta_topic (META_DEBUG_KEYBINDINGS, meta_topic (META_DEBUG_KEYBINDINGS,
"Grabbing all keys on window %s\n", window->desc); "Grabbing all keys on window %s\n", window->desc);

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

@ -754,5 +754,6 @@ void meta_window_ping (MetaWindow *window,
void *user_data); void *user_data);
void meta_window_pong (MetaWindow *window, void meta_window_pong (MetaWindow *window,
guint32 timestamp); guint32 timestamp);
Window meta_window_get_toplevel_xwindow (MetaWindow *window);
#endif #endif

6
src/core/window.c
View File

@ -12343,3 +12343,9 @@ meta_window_ping (MetaWindow *window,
else else
meta_wayland_surface_ping (window->surface, timestamp); meta_wayland_surface_ping (window->surface, timestamp);
} }
Window
meta_window_get_toplevel_xwindow (MetaWindow *window)
{
return window->frame ? window->frame->xwindow : window->xwindow;
}