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

2008-07-07 Matthew Allum <mallum@openedhand.com>

Browse Source 
Bug 1016 - Changing window-redirect-automatic property after
                   creating ClutterX11TexturePixmap doesn't work.

        * clutter/x11/clutter-x11-texture-pixmap.c:
        (clutter_x11_texture_pixmap_set_window):
        Sync up redirection prop correctly (Jason Tackaberry)
This commit is contained in:
Matthew Allum 2008-07-07 22:28:13 +00:00
parent cc43d7a30d
commit 0a1ad0342e
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2008-07-07 Matthew Allum <mallum@openedhand.com>
Bug 1016 - Changing window-redirect-automatic property after
creating ClutterX11TexturePixmap doesn't work.
* clutter/x11/clutter-x11-texture-pixmap.c:
(clutter_x11_texture_pixmap_set_window):
Sync up redirection prop correctly (Jason Tackaberry)
2008-07-07 Matthew Allum <mallum@openedhand.com> 2008-07-07 Matthew Allum <mallum@openedhand.com>
Bug 1019 - clutter-frame-source.h not included by clutter.h Bug 1019 - clutter-frame-source.h not included by clutter.h

10
clutter/x11/clutter-x11-texture-pixmap.c
View File

@ -975,7 +975,7 @@ clutter_x11_texture_pixmap_set_window (ClutterX11TexturePixmap *texture,
if (!clutter_x11_has_composite_extension()) if (!clutter_x11_has_composite_extension())
return; return;
if (priv->window == window) if (priv->window == window && automatic == priv->window_redirect_automatic)
return; return;
if (priv->window) if (priv->window)
@ -983,17 +983,19 @@ clutter_x11_texture_pixmap_set_window (ClutterX11TexturePixmap *texture,
clutter_x11_trap_x_errors (); clutter_x11_trap_x_errors ();
XCompositeUnredirectWindow(clutter_x11_get_default_display (), XCompositeUnredirectWindow(clutter_x11_get_default_display (),
priv->window, priv->window,
priv->window_redirect_automatic); priv->window_redirect_automatic ?
CompositeRedirectAutomatic : CompositeRedirectManual);
clutter_x11_untrap_x_errors (); clutter_x11_untrap_x_errors ();
} }
if (window == None)
return;
priv->window = window; priv->window = window;
priv->window_redirect_automatic = automatic; priv->window_redirect_automatic = automatic;
if (window == None)
return;
clutter_x11_trap_x_errors (); clutter_x11_trap_x_errors ();
XCompositeRedirectWindow XCompositeRedirectWindow