gnome-shell r122 - trunk/src

[otaylor svn gnome org]

Author: otaylor
Date: Fri Dec  5 23:20:10 2008
New Revision: 122
URL: http://svn.gnome.org/viewvc/gnome-shell?rev=122&view=rev

Log:
Use CompositeRedirectManual for tray icons

We don't want the X server to draw the icons onto the screen, so
use pass automatic=FALSE to clutter_x11_texture_pixmap_set_window();
causing CompositeRedirectManual to be used.

Modified:
   trunk/src/shell-tray-manager.c

Modified: trunk/src/shell-tray-manager.c
==============================================================================
--- trunk/src/shell-tray-manager.c	(original)
+++ trunk/src/shell-tray-manager.c	Fri Dec  5 23:20:10 2008
@@ -291,7 +291,14 @@
   gdk_window_reparent (win->window, manager->priv->stage_window, 0, 0);
   gtk_widget_show_all (win);
 
-  icon = clutter_glx_texture_pixmap_new_with_window (GDK_WINDOW_XWINDOW (win->window));
+  icon = clutter_glx_texture_pixmap_new ();
+  /* Here automatic=FALSE  means to use CompositeRedirectManual - that is,
+   * the X server shouldn't draw the window onto the screen */
+  clutter_x11_texture_pixmap_set_window (CLUTTER_X11_TEXTURE_PIXMAP (icon),
+                                         GDK_WINDOW_XWINDOW (win->window),
+                                         FALSE);
+  /* Here automatic has a different meaning - whether ClutterX11TexturePixmap
+   * should process damage update and refresh the pixmap itself */
   clutter_x11_texture_pixmap_set_automatic (CLUTTER_X11_TEXTURE_PIXMAP (icon), TRUE);
   clutter_actor_set_size (icon, 24, 24);