Bump version to 3.3.90

Update NEWS
configure.in: clean up version checks
2012-02-22 21:40:10 -05:00 · 2012-02-22 21:40:10 -05:00 · 2012-02-22 19:39:47 -05:00 · 2012-02-21 18:23:22 +00:00 · 2012-02-21 18:09:25 +01:00 · 2012-02-20 22:37:32 +01:00
26 changed files with 3296 additions and 5119 deletions
--- a/39
+++ b/39
@@ -1,3 +1,42 @@
+3.3.90
+======
+* Update for Cogl API changes [Robert]
+* Bug fixes [Adel, Jasper;  #659643]
+* Build fixes [Jasper, Owen]
+
+Contributors:
+ Robert Bragg, Adel Gadllah, Jasper St. Pierre, Owen Taylor
+
+Translations:
+ Ask H. Larsen [dk], Miroslav Nikolić [sr]
+
+3.3.5
+=====
+* MetaShapedTexture no longer is a ClutterTexture subclass [Jasper; #660941]
+* Add meta_shaped_texture_get_image() [Jasper; #660941]
+* Cleanups [Rui, Jasper; #657639]
+* Depend on GTK+ 3.3.7 [Rico]
+
+Contributors:
+ Rui Matos, Jasper St. Pierre, Rico Tzschichholz
+
+Translations:
+ Kjartan Maraas [nb], Chao-Hsiung Liao [zh_HK, zh_TW]
+
+3.3.4
+=====
+* Adapt to changes in GtkStateFlags [Owen]
+* Redo properties for applications menu corresponding to GTK+ changes -
+  they are now _GTK_* not DBUS_*. [Ryan]
+* Fix crash on gnome-shell restart when a modal dialog is open [Owen; #668299]
+* Code cleanup [Florian; #666039]
+
+Contributors:
+ Ryan Lortie, Florian Müllner, Owen Taylor
+
+Translations:
+ Alexander Shopov [bg], Fran Diéguez [gl]
+
 3.3.3
 =====
 * Add keybindings for tiling to left or right [Florian; #648700]
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)

 m4_define([mutter_major_version], [3])
 m4_define([mutter_minor_version], [3])
-m4_define([mutter_micro_version], [3])
+m4_define([mutter_micro_version], [90])

 m4_define([mutter_version],
          [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -61,12 +61,21 @@ AC_CHECK_SIZEOF(__int64)
 ## byte order
 AC_C_BIGENDIAN

-GTK_MIN_VERSION=3.3.3
-GIO_MIN_VERSION=2.25.10
 CANBERRA_GTK=libcanberra-gtk3
 CANBERRA_GTK_VERSION=0.26

-MUTTER_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 cairo >= 1.10.0 gsettings-desktop-schemas >= 3.3.0"
+CLUTTER_PACKAGE=clutter-1.0
+
+MUTTER_PC_MODULES="
+   gtk+-3.0 >= 3.3.7
+   gio-2.0 >= 2.5.10
+   pango >= 1.2.0
+   cairo >= 1.10.0
+   gsettings-desktop-schemas >= 3.3.0
+   xcomposite >= 0.2 xfixes xrender xdamage
+   $CLUTTER_PACKAGE >= 1.9.10
+   cogl-1.0 >= 1.9.6
+"

 GLIB_GSETTINGS

@@ -113,8 +122,8 @@ AM_GLIB_GNU_GETTEXT
 # GRegex requires Glib-2.14.0
 PKG_CHECK_MODULES(ALL, glib-2.0 >= 2.14.0)
 # gtk_window_set_icon_name requires gtk2+-2.6.0
-PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0 >= $GTK_MIN_VERSION)
-PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0 >= $GTK_MIN_VERSION)
+PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0)
+PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0)

 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@@ -164,31 +173,6 @@ else
  fi
 fi

-XCOMPOSITE_VERSION=0.2
-
-AC_MSG_CHECKING([Xcomposite >= $XCOMPOSITE_VERSION])
-if $PKG_CONFIG --atleast-version $XCOMPOSITE_VERSION xcomposite; then
-  MUTTER_PC_MODULES="$MUTTER_PC_MODULES xcomposite >= $XCOMPOSITE_VERSION xfixes xrender xdamage"
-  AC_DEFINE(HAVE_COMPOSITE_EXTENSIONS, 1, [Building with compositing manager support])
-  echo "Building with compositing manager"
-
-  ## force on render also
-  have_xrender=yes
-else
-  AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.])
-fi
-
-CLUTTER_VERSION=1.7.5
-CLUTTER_PACKAGE=clutter-1.0
-AC_SUBST(CLUTTER_PACKAGE)
-if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
-  MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
-  PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
-  AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
-else
-  AC_MSG_ERROR([no. Mutter requires Clutter version $CLUTTER_VERSION.])
-fi
-
 INTROSPECTION_VERSION=0.9.5
 GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])

@@ -220,6 +204,10 @@ fi

 PKG_CHECK_MODULES(MUTTER, $MUTTER_PC_MODULES)

+# This is used for plugins
+AC_SUBST(CLUTTER_PACKAGE)
+PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
+
 AC_PATH_XTRA

 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"
@@ -470,7 +458,7 @@ if test "$enable_compile_warnings" != no ; then
    if test "$enable_compile_warnings" = error; then
      case " $CFLAGS " in
      *[\ \	]-Werror[\ \	]*) ;;
-      *) CFLAGS="$CFLAGS -Werror" ;;
+      *) CFLAGS="$CFLAGS -Werror -Wno-error=deprecated-declarations" ;;
      esac
    fi
  fi
@@ -524,8 +512,8 @@ MUTTER_MINOR_VERSION=mutter_minor_version
 if expr $MUTTER_MINOR_VERSION % 2 > /dev/null ; then
   stable_version=`expr $MUTTER_MINOR_VERSION - 1`
   echo "This is the UNSTABLE branch of mutter"
-   echo -n "Use 2.$stable_version.x for stable "
-   echo    "(gnome-2-$stable_version branch in git)"
+   echo -n "Use 3.$stable_version.x for stable "
+   echo    "(gnome-3-$stable_version branch in git)"
 else
   echo "This is the stable branch of mutter"
 fi
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/gl.po
+++ b/po/gl.po
--- a/po/nb.po
+++ b/po/nb.po
@@ -1,13 +1,13 @@
-# Norwegian (bokmål) translation of mutter.
+# Norwegian bokmål translation of mutter.
 # Copyright © 2002-2004 Free Software Foundation, Inc.
-# Kjartan Maraas <kmaraas@gnome.org>, 2002-2011.
+# Kjartan Maraas <kmaraas@gnome.org>, 2002-2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter 3.3.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-14 22:59+0100\n"
-"PO-Revision-Date: 2011-12-14 22:59+0100\n"
+"POT-Creation-Date: 2012-01-28 17:38+0100\n"
+"PO-Revision-Date: 2012-01-28 17:38+0100\n"
 "Last-Translator: Kjartan Maraas <kmaraas@gnome.org>\n"
 "Language-Team: Norwegian bokmål <i18n-no@lister.ping.uio.no>\n"
 "Language: \n"
@@ -16,17 +16,17 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"

 #: ../src/50-mutter-windows.xml.in.h:1
+msgid "Windows"
+msgstr "Vinduer"
+
+#: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
 msgstr "Visning delt til venstre"

-#: ../src/50-mutter-windows.xml.in.h:2
+#: ../src/50-mutter-windows.xml.in.h:3
 msgid "View split on right"
 msgstr "Visning delt til høyre"

-#: ../src/50-mutter-windows.xml.in.h:3
-msgid "Windows"
-msgstr "Vinduer"
-
 #. This probably means that a non-WM compositor like xcompmgr is running;
 #. * we have no way to get it to exit
 #: ../src/compositor/compositor.c:492
@@ -126,7 +126,7 @@ msgstr ""
 "Kunne ikke finne et tema! Sjekk at %s eksisterer og inneholder de vanlige "
 "temaene.\n"

-#: ../src/core/mutter.c:42
+#: ../src/core/mutter.c:40
 #, c-format
 msgid ""
 "mutter %s\n"
@@ -140,15 +140,15 @@ msgstr ""
 "Dette er fri programvare; se i kildekoden for kopibetingelser.\n"
 "Det gis INGEN garanti.\n"

-#: ../src/core/mutter.c:56
+#: ../src/core/mutter.c:54
 msgid "Print version"
 msgstr "Skriv versjonsnummer"

-#: ../src/core/mutter.c:62
+#: ../src/core/mutter.c:60
 msgid "Comma-separated list of compositor plugins"
 msgstr "Kommaseparert liste av tillegg for compositor"

-#: ../src/core/prefs.c:1067
+#: ../src/core/prefs.c:1069
 msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
@@ -156,12 +156,12 @@ msgstr ""
 "Funksjonalitet for å gå rundt ødelagte programmer er deaktivert. Noen "
 "programmer vil kanskje ikke oppføre seg korrekt.\n"

-#: ../src/core/prefs.c:1142
+#: ../src/core/prefs.c:1144
 #, c-format
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
 msgstr "Kunne ikke tolke skriftbeskrivelsen «%s» fra GSettings-nøkkel %s\n"

-#: ../src/core/prefs.c:1208
+#: ../src/core/prefs.c:1210
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for mouse button "
@@ -170,7 +170,7 @@ msgstr ""
 "«%s» funnet i konfigurasjonsdatabasen er ikke en gyldig verdi for endring av "
 "musknapp\n"

-#: ../src/core/prefs.c:1720
+#: ../src/core/prefs.c:1722
 #, c-format
 msgid ""
 "\"%s\" found in configuration database is not a valid value for keybinding "
@@ -179,7 +179,7 @@ msgstr ""
 "«%s» funnet i konfigurasjonsdatabasen er ikke en gyldig verdi for "
 "tastaturbinding «%s»\n"

-#: ../src/core/prefs.c:1817
+#: ../src/core/prefs.c:1819
 #, c-format
 msgid "Workspace %d"
 msgstr "Arbeidsområde %d"
@@ -307,7 +307,7 @@ msgid "Window manager error: "
 msgstr "Feil i vindushåndterer: "

 #. first time through
-#: ../src/core/window.c:7141
+#: ../src/core/window.c:7219
 #, c-format
 msgid ""
 "Window %s sets SM_CLIENT_ID on itself, instead of on the WM_CLIENT_LEADER "
@@ -323,7 +323,7 @@ msgstr ""
 #. * MWM but not WM_NORMAL_HINTS are basically broken. We complain
 #. * about these apps but make them work.
 #.
-#: ../src/core/window.c:7804
+#: ../src/core/window.c:7882
 #, c-format
 msgid ""
 "Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
@@ -386,14 +386,40 @@ msgid "Mutter"
 msgstr "Mutter"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:1
+msgid "Modifier to use for extended window management operations"
+msgstr "Endringstast som skal brukes for utvidede vindushåndteringsoperasjoner"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:2
+msgid ""
+"This key will initiate the \"overlay\", which is a combination window "
+"overview and application launching system. The default is intended to be the "
+"\"Windows key\" on PC hardware. It's expected that this binding either the "
+"default or set to the empty string."
+msgstr ""
+"Denne tasten vil initiere «overlay», som er en kombinasjon av vindusoversikt "
+"og et system for å starte programmer. Forvalget er ment å være «Windows-"
+"tasten» på PC-maskinvare. Det forventes at denne bindingen er satt til "
+"forvalg eller en tom streng."
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:3
 msgid "Attach modal dialogs"
 msgstr "Fest modale dialoger"

-#: ../src/org.gnome.mutter.gschema.xml.in.h:2
-msgid "Cancel tab popup"
-msgstr "Avbryt tabulatordialog"
+#: ../src/org.gnome.mutter.gschema.xml.in.h:4
+msgid ""
+"When true, instead of having independent titlebars, modal dialogs appear "
+"attached to the titlebar of the parent window and are moved together with "
+"the parent window."
+msgstr ""
+"Hvis denne er satt til sann vil modale dialoger vises festet til "
+"tittellinjen på opphavsvinduet og flyttes sammen med dette i stedet for å ha "
+"individuelle tittellinjer."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:3
+#: ../src/org.gnome.mutter.gschema.xml.in.h:5
+msgid "Live Hidden Windows"
+msgstr "Levende skjulte vinduer"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:6
 msgid ""
 "Determines whether hidden windows (i.e., minimized windows and windows on "
 "other workspaces than the current one) should be kept alive."
@@ -401,26 +427,6 @@ msgstr ""
 "Bestemmer om skjulte vinduer, f.eks minimerte vinduer og vinduer på andre "
 "arbeidsområder enn aktivt arbeidsområde, skal holdes i live."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:4
-msgid ""
-"Determines whether the use of popup and highlight frame should be disabled "
-"for window cycling."
-msgstr ""
-"Bestemmer om bruk av dialog og uthevingsramme skal slås av for bytting "
-"mellom vinduer."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:5
-msgid ""
-"Determines whether workspace switching should happen for windows on all "
-"monitors or only for windows on the primary monitor."
-msgstr ""
-"Bestemmer om bytting mellom arbeidsområder skal skje for vinduer på alle "
-"skjermer eller kun på primær skjerm."
-
-#: ../src/org.gnome.mutter.gschema.xml.in.h:6
-msgid "Draggable border width"
-msgstr "Bredde på drakant"
-
 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
 msgid "Enable edge tiling when dropping windows on screen edges"
 msgstr "Slå på kantflising ved slipp av vinduer på skjermkantene"
@@ -437,22 +443,34 @@ msgstr ""
 "fullstendig."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:9
-msgid "Live Hidden Windows"
-msgstr "Levende skjulte vinduer"
+msgid "Workspaces only on primary"
+msgstr "Arbeidsområder kun på primær skjerm"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:10
-msgid "Modifier to use for extended window management operations"
-msgstr "Endringstast som skal brukes for utvidede vindushåndteringsoperasjoner"
+msgid ""
+"Determines whether workspace switching should happen for windows on all "
+"monitors or only for windows on the primary monitor."
+msgstr ""
+"Bestemmer om bytting mellom arbeidsområder skal skje for vinduer på alle "
+"skjermer eller kun på primær skjerm."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
 msgid "No tab popup"
 msgstr "Ingen tabulatordialog"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:12
-msgid "Select window from tab popup"
-msgstr "Fjern vindu fra tabulatordialog"
+msgid ""
+"Determines whether the use of popup and highlight frame should be disabled "
+"for window cycling."
+msgstr ""
+"Bestemmer om bruk av dialog og uthevingsramme skal slås av for bytting "
+"mellom vinduer."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
+msgid "Draggable border width"
+msgstr "Bredde på drakant"
+
+#: ../src/org.gnome.mutter.gschema.xml.in.h:14
 msgid ""
 "The amount of total draggable borders. If the theme's visible borders are "
 "not enough, invisible borders will be added to meet this value."
@@ -460,31 +478,13 @@ msgstr ""
 "Total mengde med drakant. Hvis temas synlige kanter ikke er nok vil usynlige "
 "kanter legges til for å imøtekomme denne verdien."

-#: ../src/org.gnome.mutter.gschema.xml.in.h:14
-msgid ""
-"This key will initiate the \"overlay\", which is a combination window "
-"overview and application launching system. The default is intended to be the "
-"\"Windows key\" on PC hardware. It's expected that this binding either the "
-"default or set to the empty string."
-msgstr ""
-"Denne tasten vil initiere «overlay», som er en kombinasjon av vindusoversikt "
-"og et system for å starte programmer. Forvalget er ment å være «Windows-"
-"tasten» på PC-maskinvare. Det forventes at denne bindingen er satt til "
-"forvalg eller en tom streng."
-
 #: ../src/org.gnome.mutter.gschema.xml.in.h:15
-msgid ""
-"When true, instead of having independent titlebars, modal dialogs appear "
-"attached to the titlebar of the parent window and are moved together with "
-"the parent window."
-msgstr ""
-"Hvis denne er satt til sann vil modale dialoger vises festet til "
-"tittellinjen på opphavsvinduet og flyttes sammen med dette i stedet for å ha "
-"individuelle tittellinjer."
+msgid "Select window from tab popup"
+msgstr "Fjern vindu fra tabulatordialog"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:16
-msgid "Workspaces only on primary"
-msgstr "Arbeidsområder kun på primær skjerm"
+msgid "Cancel tab popup"
+msgstr "Avbryt tabulatordialog"

 #: ../src/tools/mutter-message.c:123
 #, c-format
--- a/po/sr.po
+++ b/po/sr.po
--- a/po/sr@latin.po
+++ b/po/sr@latin.po
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -52,7 +52,6 @@ libmutter_la_SOURCES =				\
 	compositor/meta-shadow-factory.c	\
 	compositor/meta-shadow-factory-private.h	\
 	compositor/meta-shaped-texture.c	\
-	compositor/meta-shaped-texture.h	\
 	compositor/meta-texture-rectangle.c	\
 	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
@@ -172,6 +171,7 @@ libmutterinclude_base_headers =		\
 	meta/main.h				\
 	meta/meta-background-actor.h		\
 	meta/meta-plugin.h			\
+	meta/meta-shaped-texture.h		\
 	meta/meta-shadow-factory.h		\
 	meta/meta-window-actor.h		\
 	meta/prefs.h				\
--- a/src/compositor/meta-background-actor.c
+++ b/src/compositor/meta-background-actor.c
@@ -28,6 +28,9 @@
 #define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>

+#define CLUTTER_ENABLE_EXPERIMENTAL_API
+#include <clutter/clutter.h>
+
 #include <X11/Xatom.h>

 #include "cogl-utils.h"
@@ -252,6 +255,8 @@ meta_background_actor_dispose (GObject *object)
      cogl_handle_unref (priv->material);
      priv->material = COGL_INVALID_HANDLE;
    }
+
+  G_OBJECT_CLASS (meta_background_actor_parent_class)->dispose (object);
 }

 static void
@@ -537,9 +542,11 @@ meta_background_actor_update (MetaScreen *screen)
  if (root_pixmap_id != None)
    {
      CoglHandle texture;
+      CoglContext *ctx = clutter_backend_get_cogl_context (clutter_get_default_backend ());
+      GError *error = NULL;

      meta_error_trap_push (display);
-      texture = cogl_texture_pixmap_x11_new (root_pixmap_id, FALSE);
+      texture = cogl_texture_pixmap_x11_new (ctx, root_pixmap_id, FALSE, &error);
      meta_error_trap_pop (display);

      if (texture != COGL_INVALID_HANDLE)
@@ -550,6 +557,12 @@ meta_background_actor_update (MetaScreen *screen)
          background->have_pixmap = True;
          return;
        }
+      else
+        {
+          g_warning ("Failed to create background texture from pixmap: %s",
+                     error->message);
+          g_error_free (error);
+        }
    }

  background->have_pixmap = False;
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -25,32 +25,41 @@

 #include <config.h>

-#include "meta-shaped-texture.h"
+#define CLUTTER_ENABLE_EXPERIMENTAL_API
+#define COGL_ENABLE_EXPERIMENTAL_API
+
+#include <meta/meta-shaped-texture.h>
 #include "meta-texture-tower.h"
 #include "meta-texture-rectangle.h"

 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
+#include <cogl/cogl-texture-pixmap-x11.h>
+#include <gdk/gdk.h> /* for gdk_rectangle_intersect() */
 #include <string.h>

 static void meta_shaped_texture_dispose  (GObject    *object);
-static void meta_shaped_texture_notify   (GObject    *object,
-					  GParamSpec *pspec);

 static void meta_shaped_texture_paint (ClutterActor       *actor);
 static void meta_shaped_texture_pick  (ClutterActor       *actor,
 				       const ClutterColor *color);

-static void meta_shaped_texture_update_area (ClutterX11TexturePixmap *texture,
-					     int                      x,
-					     int                      y,
-					     int                      width,
-					     int                      height);
+static void meta_shaped_texture_get_preferred_width (ClutterActor *self,
+                                                     gfloat        for_height,
+                                                     gfloat       *min_width_p,
+                                                     gfloat       *natural_width_p);
+
+static void meta_shaped_texture_get_preferred_height (ClutterActor *self,
+                                                      gfloat        for_width,
+                                                      gfloat       *min_height_p,
+                                                      gfloat       *natural_height_p);

 static void meta_shaped_texture_dirty_mask (MetaShapedTexture *stex);

+static gboolean meta_shaped_texture_get_paint_volume (ClutterActor *self, ClutterPaintVolume *volume);
+
 G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
-               CLUTTER_X11_TYPE_TEXTURE_PIXMAP);
+               CLUTTER_TYPE_ACTOR);

 #define META_SHAPED_TEXTURE_GET_PRIVATE(obj) \
  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_SHAPED_TEXTURE, \
@@ -59,6 +68,8 @@ G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
 struct _MetaShapedTexturePrivate
 {
  MetaTextureTower *paint_tower;
+  Pixmap pixmap;
+  CoglHandle texture;
  CoglHandle mask_texture;
  CoglHandle material;
  CoglHandle material_unshaped;
@@ -69,8 +80,7 @@ struct _MetaShapedTexturePrivate
  cairo_region_t *overlay_region;
  cairo_path_t *overlay_path;

-  cairo_region_t *visible_pixels_region;
-
+  guint tex_width, tex_height;
  guint mask_width, mask_height;

  guint create_mipmaps : 1;
@@ -81,15 +91,14 @@ meta_shaped_texture_class_init (MetaShapedTextureClass *klass)
 {
  GObjectClass *gobject_class = (GObjectClass *) klass;
  ClutterActorClass *actor_class = (ClutterActorClass *) klass;
-  ClutterX11TexturePixmapClass *x11_texture_class = (ClutterX11TexturePixmapClass *) klass;

  gobject_class->dispose = meta_shaped_texture_dispose;
-  gobject_class->notify = meta_shaped_texture_notify;

+  actor_class->get_preferred_width = meta_shaped_texture_get_preferred_width;
+  actor_class->get_preferred_height = meta_shaped_texture_get_preferred_height;
  actor_class->paint = meta_shaped_texture_paint;
  actor_class->pick = meta_shaped_texture_pick;
-
-  x11_texture_class->update_area = meta_shaped_texture_update_area;
+  actor_class->get_paint_volume = meta_shaped_texture_get_paint_volume;

  g_type_class_add_private (klass, sizeof (MetaShapedTexturePrivate));
 }
@@ -104,8 +113,8 @@ meta_shaped_texture_init (MetaShapedTexture *self)
  priv->shape_region = NULL;
  priv->overlay_path = NULL;
  priv->overlay_region = NULL;
-  priv->visible_pixels_region = NULL;
  priv->paint_tower = meta_texture_tower_new ();
+  priv->texture = COGL_INVALID_HANDLE;
  priv->mask_texture = COGL_INVALID_HANDLE;
  priv->create_mipmaps = TRUE;
 }
@@ -132,6 +141,11 @@ meta_shaped_texture_dispose (GObject *object)
      cogl_handle_unref (priv->material_unshaped);
      priv->material_unshaped = COGL_INVALID_HANDLE;
    }
+  if (priv->texture != COGL_INVALID_HANDLE)
+    {
+      cogl_handle_unref (priv->texture);
+      priv->texture = COGL_INVALID_HANDLE;
+    }

  meta_shaped_texture_set_shape_region (self, NULL);
  meta_shaped_texture_set_clip_region (self, NULL);
@@ -140,114 +154,19 @@ meta_shaped_texture_dispose (GObject *object)
  G_OBJECT_CLASS (meta_shaped_texture_parent_class)->dispose (object);
 }

-static void
-meta_shaped_texture_notify (GObject    *object,
-			    GParamSpec *pspec)
-{
-  if (G_OBJECT_CLASS (meta_shaped_texture_parent_class)->notify)
-    G_OBJECT_CLASS (meta_shaped_texture_parent_class)->notify (object, pspec);
-
-  /* It seems like we could just do this out of update_area(), but unfortunately,
-   * clutter_glx_texture_pixmap() doesn't call through the vtable on the
-   * initial update_area, so we need to look for changes to the texture
-   * explicitly.
-   */
-  if (strcmp (pspec->name, "cogl-texture") == 0)
-    {
-      MetaShapedTexture *stex = (MetaShapedTexture *) object;
-      MetaShapedTexturePrivate *priv = stex->priv;
-
-      meta_shaped_texture_clear (stex);
-
-      if (priv->create_mipmaps)
-	meta_texture_tower_set_base_texture (priv->paint_tower,
-					       clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex)));
-    }
-}
-
 static void
 meta_shaped_texture_dirty_mask (MetaShapedTexture *stex)
 {
  MetaShapedTexturePrivate *priv = stex->priv;

-  if (priv->visible_pixels_region != NULL)
+  if (priv->mask_texture != COGL_INVALID_HANDLE)
    {
-      cairo_region_destroy (priv->visible_pixels_region);
-      priv->visible_pixels_region = NULL;
-
-      if (priv->mask_texture != COGL_INVALID_HANDLE)
-        {
-          cogl_handle_unref (priv->mask_texture);
-          priv->mask_texture = COGL_INVALID_HANDLE;
-        }
-
-      if (priv->material != COGL_INVALID_HANDLE)
-        cogl_material_set_layer (priv->material, 1, COGL_INVALID_HANDLE);
+      cogl_handle_unref (priv->mask_texture);
+      priv->mask_texture = COGL_INVALID_HANDLE;
    }
-}

-static void
-scan_visible_region (MetaShapedTexture *stex,
-                     guchar            *mask_data,
-                     int                stride)
-{
-  MetaShapedTexturePrivate *priv = stex->priv;
-  cairo_region_t *visible_pixels_region;
-  cairo_region_t *overlay_region;
-  int i, n_rects;
-
-  /* The visible pixels region contains all pixel values above 0.
-   * This is somewhat complicated when there's an overlay: we
-   * need to scan all regions potentially modified by it.
-   */
-
-  if (priv->visible_pixels_region)
-    cairo_region_destroy (priv->visible_pixels_region);
-
-  priv->visible_pixels_region = cairo_region_copy (priv->shape_region);
-
-  visible_pixels_region = priv->visible_pixels_region;
-  overlay_region = priv->overlay_region;
-
-  /* With no overlay region, the visible region is defined
-   * by the mask region, so we don't need to scan anything. */
-  if (overlay_region == NULL)
-      return;
-
-  /* Subtract all the rectangles in the overlay region so that we can
-   * scan all the pixels potentially added by the overlay path. */
-  cairo_region_subtract (visible_pixels_region, overlay_region);
-
-  n_rects = cairo_region_num_rectangles (overlay_region);
-
-  for (i = 0; i < n_rects; i++)
-    {
-      int x, y;
-      cairo_rectangle_int_t rect;
-
-      cairo_region_get_rectangle (overlay_region, i, &rect);
-
-      for (y = rect.y; y < (rect.y + rect.height); y++)
-        {
-          for (x = rect.x; x < (rect.x + rect.width); x++)
-            {
-              int w = x;
-              while (mask_data[y * stride + w] > 0 && w < (rect.x + rect.width))
-                w++;
-
-              if (w > 0)
-                {
-                  cairo_rectangle_int_t tmp;
-                  tmp.x = x;
-                  tmp.y = y;
-                  tmp.width = w - x;
-                  tmp.height = 1;
-                  cairo_region_union_rectangle (visible_pixels_region, &tmp);
-                  x = w;
-                }
-            }
-        }
-    }
+  if (priv->material != COGL_INVALID_HANDLE)
+    cogl_material_set_layer (priv->material, 1, COGL_INVALID_HANDLE);
 }

 static void
@@ -310,7 +229,7 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
  CoglHandle paint_tex;
  guint tex_width, tex_height;

-  paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));
+  paint_tex = priv->texture;

  if (paint_tex == COGL_INVALID_HANDLE)
    return;
@@ -325,7 +244,7 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
    meta_shaped_texture_dirty_mask (stex);

  /* If we don't have a mask texture yet then create one */
-  if (priv->visible_pixels_region == NULL)
+  if (priv->mask_texture == COGL_INVALID_HANDLE)
    {
      guchar *mask_data;
      int i;
@@ -339,10 +258,6 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
          (priv->overlay_region == NULL ||
           cairo_region_num_rectangles (priv->overlay_region) == 0))
        {
-          /* With no mask, the visible region is just
-           * {0, 0, tex_width, tex_height}. */
-          cairo_rectangle_int_t rect = { 0, 0, tex_width, tex_height };
-          priv->visible_pixels_region = cairo_region_create_rectangle (&rect);
          return;
        }

@@ -377,7 +292,6 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
        }

      install_overlay_path (stex, mask_data, tex_width, tex_height, stride);
-      scan_visible_region (stex, mask_data, stride);

      cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target);

@@ -451,13 +365,13 @@ meta_shaped_texture_paint (ClutterActor *actor)
  if (priv->create_mipmaps)
    paint_tex = meta_texture_tower_get_paint_texture (priv->paint_tower);
  else
-    paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));
+    paint_tex = priv->texture;

  if (paint_tex == COGL_INVALID_HANDLE)
    return;

-  tex_width = cogl_texture_get_width (paint_tex);
-  tex_height = cogl_texture_get_height (paint_tex);
+  tex_width = priv->tex_width;
+  tex_height = priv->tex_height;

  if (tex_width == 0 || tex_height == 0) /* no contents yet */
    return;
@@ -512,6 +426,7 @@ meta_shaped_texture_paint (ClutterActor *actor)
    {
      int n_rects;
      int i;
+      cairo_rectangle_int_t tex_rect = { 0, 0, tex_width, tex_height };

      /* Limit to how many separate rectangles we'll draw; beyond this just
       * fall back and draw the whole thing */
@@ -529,6 +444,9 @@ meta_shaped_texture_paint (ClutterActor *actor)

 	      cairo_region_get_rectangle (priv->clip_region, i, &rect);

+	      if (!gdk_rectangle_intersect (&tex_rect, &rect, &rect))
+		continue;
+
 	      x1 = rect.x;
 	      y1 = rect.y;
 	      x2 = rect.x + rect.width;
@@ -574,7 +492,7 @@ meta_shaped_texture_pick (ClutterActor       *actor,
      ClutterActorBox alloc;
      guint tex_width, tex_height;

-      paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));
+      paint_tex = priv->texture;

      if (paint_tex == COGL_INVALID_HANDLE)
        return;
@@ -602,19 +520,48 @@ meta_shaped_texture_pick (ClutterActor       *actor,
 }

 static void
-meta_shaped_texture_update_area (ClutterX11TexturePixmap *texture,
-				 int                      x,
-				 int                      y,
-				 int                      width,
-				 int                      height)
+meta_shaped_texture_get_preferred_width (ClutterActor *self,
+                                         gfloat        for_height,
+                                         gfloat       *min_width_p,
+                                         gfloat       *natural_width_p)
 {
-  MetaShapedTexture *stex = (MetaShapedTexture *) texture;
-  MetaShapedTexturePrivate *priv = stex->priv;
+  MetaShapedTexturePrivate *priv;

-  CLUTTER_X11_TEXTURE_PIXMAP_CLASS (meta_shaped_texture_parent_class)->update_area (texture,
-                                                                                      x, y, width, height);
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (self));

-  meta_texture_tower_update_area (priv->paint_tower, x, y, width, height);
+  priv = META_SHAPED_TEXTURE (self)->priv;
+
+  if (min_width_p)
+    *min_width_p = 0;
+
+  if (natural_width_p)
+    *natural_width_p = priv->tex_width;
+}
+
+static void
+meta_shaped_texture_get_preferred_height (ClutterActor *self,
+                                          gfloat        for_width,
+                                          gfloat       *min_height_p,
+                                          gfloat       *natural_height_p)
+{
+  MetaShapedTexturePrivate *priv;
+
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (self));
+
+  priv = META_SHAPED_TEXTURE (self)->priv;
+
+  if (min_height_p)
+    *min_height_p = 0;
+
+  if (natural_height_p)
+    *natural_height_p = priv->tex_height;
+}
+
+static gboolean
+meta_shaped_texture_get_paint_volume (ClutterActor *self,
+                                      ClutterPaintVolume *volume)
+{
+  return clutter_paint_volume_set_from_allocation (volume, self);
 }

 ClutterActor *
@@ -640,50 +587,13 @@ meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
  if (create_mipmaps != priv->create_mipmaps)
    {
      CoglHandle base_texture;
-
      priv->create_mipmaps = create_mipmaps;
-
      base_texture = create_mipmaps ?
-	clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex)) : COGL_INVALID_HANDLE;
-
+        priv->texture : COGL_INVALID_HANDLE;
      meta_texture_tower_set_base_texture (priv->paint_tower, base_texture);
    }
 }

-/* This is a workaround for deficiencies in the hack tower:
- *
- * When we call clutter_x11_texture_pixmap_set_pixmap(tp, None),
- * ClutterX11TexturePixmap knows that it has to get rid of the old texture, but
- * clutter_texture_set_cogl_texture(texture, COGL_INVALID_HANDLE) isn't allowed, so
- * it grabs the material for the texture and manually sets the texture in it. This means
- * that the "cogl-texture" property isn't notified, so we don't find out about it.
- *
- * And if we keep the CoglX11TexturePixmap around after the X pixmap is freed, then
- * we'll trigger X errors when we actually try to free it.
- *
- * The only correct thing to do here is to change our code to derive
- * from ClutterActor and get rid of the inheritance hack tower.  Once
- * we want to depend on Clutter-1.4 (which has CoglTexturePixmapX11),
- * that will be very easy to do.
- */
-void
-meta_shaped_texture_clear (MetaShapedTexture *stex)
-{
-  MetaShapedTexturePrivate *priv;
-
-  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
-
-  priv = stex->priv;
-
-  meta_texture_tower_set_base_texture (priv->paint_tower, COGL_INVALID_HANDLE);
-
-  if (priv->material != COGL_INVALID_HANDLE)
-    cogl_material_set_layer (priv->material, 0, COGL_INVALID_HANDLE);
-
-  if (priv->material_unshaped != COGL_INVALID_HANDLE)
-    cogl_material_set_layer (priv->material_unshaped, 0, COGL_INVALID_HANDLE);
-}
-
 void
 meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
                                      cairo_region_t    *region)
@@ -710,22 +620,119 @@ meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }

-/**
- * meta_shaped_texture_get_visible_pixels_region:
- * @stex: a #MetaShapedTexture
- *
- * Return a region enclosing only visible pixels: those with
- * alpha values above 0.
- *
- * Returns: a #cairo_region_t
- */
-cairo_region_t *
-meta_shaped_texture_get_visible_pixels_region (MetaShapedTexture *stex)
+void
+meta_shaped_texture_update_area (MetaShapedTexture *stex,
+				 int                x,
+				 int                y,
+				 int                width,
+				 int                height)
 {
-  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), NULL);
+  MetaShapedTexturePrivate *priv;
+  const cairo_rectangle_int_t clip = { x, y, width, height };

-  meta_shaped_texture_ensure_mask (stex);
-  return stex->priv->visible_pixels_region;
+  priv = stex->priv;
+
+  if (priv->texture == COGL_INVALID_HANDLE)
+    return;
+
+  cogl_texture_pixmap_x11_update_area (priv->texture, x, y, width, height);
+
+  meta_texture_tower_update_area (priv->paint_tower, x, y, width, height);
+
+  clutter_actor_queue_redraw_with_clip (CLUTTER_ACTOR (stex), &clip);
+}
+
+static void
+set_cogl_texture (MetaShapedTexture *stex,
+                  CoglHandle         cogl_tex)
+{
+  MetaShapedTexturePrivate *priv;
+  guint width, height;
+
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
+
+  priv = stex->priv;
+
+  if (priv->texture != COGL_INVALID_HANDLE)
+    cogl_handle_unref (priv->texture);
+
+  priv->texture = cogl_tex;
+
+  if (priv->material != COGL_INVALID_HANDLE)
+    cogl_material_set_layer (priv->material, 0, cogl_tex);
+
+  if (priv->material_unshaped != COGL_INVALID_HANDLE)
+    cogl_material_set_layer (priv->material_unshaped, 0, cogl_tex);
+
+  if (cogl_tex != COGL_INVALID_HANDLE)
+    {
+      width = cogl_texture_get_width (cogl_tex);
+      height = cogl_texture_get_height (cogl_tex);
+
+      if (width != priv->tex_width ||
+          height != priv->tex_height)
+        {
+          priv->tex_width = width;
+          priv->tex_height = height;
+
+          clutter_actor_queue_relayout (CLUTTER_ACTOR (stex));
+        }
+    }
+  else
+    {
+      /* size changed to 0 going to an invalid handle */
+      priv->tex_width = 0;
+      priv->tex_height = 0;
+      clutter_actor_queue_relayout (CLUTTER_ACTOR (stex));
+    }
+
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
+}
+
+/**
+ * meta_shaped_texture_set_pixmap:
+ * @stex: The #MetaShapedTexture
+ * @pixmap: The pixmap you want the stex to assume
+ */
+void
+meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
+                                Pixmap             pixmap)
+{
+  MetaShapedTexturePrivate *priv;
+
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
+
+  priv = stex->priv;
+
+  if (priv->pixmap == pixmap)
+    return;
+
+  priv->pixmap = pixmap;
+
+  if (pixmap != None)
+    {
+      CoglContext *ctx =
+        clutter_backend_get_cogl_context (clutter_get_default_backend ());
+      set_cogl_texture (stex, cogl_texture_pixmap_x11_new (ctx, pixmap, FALSE, NULL));
+    }
+  else
+    set_cogl_texture (stex, COGL_INVALID_HANDLE);
+
+  if (priv->create_mipmaps)
+    meta_texture_tower_set_base_texture (priv->paint_tower, priv->texture);
+}
+
+/**
+ * meta_shaped_texture_get_texture:
+ * @stex: The #MetaShapedTexture
+ *
+ * Returns: (transfer none): the unshaped texture
+ */
+CoglHandle
+meta_shaped_texture_get_texture (MetaShapedTexture *stex)
+{
+  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), COGL_INVALID_HANDLE);
+  return stex->priv->texture;
 }

 /**
@@ -734,7 +741,7 @@ meta_shaped_texture_get_visible_pixels_region (MetaShapedTexture *stex)
 * @overlay_region: A region containing the parts of the mask to overlay.
 *   All rectangles in this region are wiped clear to full transparency,
 *   and the overlay path is clipped to this region.
- * @overlay_path (transfer full): This path will be painted onto the mask
+ * @overlay_path: (transfer full): This path will be painted onto the mask
 *   texture with a fully opaque source. Due to the lack of refcounting
 *   in #cairo_path_t, ownership of the path is assumed.
 */
@@ -772,10 +779,9 @@ meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,

 /**
 * meta_shaped_texture_set_clip_region:
- * @frame: a #MetaShapedTexture
+ * @stex: a #MetaShapedTexture
 * @clip_region: (transfer full): the region of the texture that
- *   is visible and should be painted. OWNERSHIP IS ASSUMED BY
- *   THE FUNCTION (for efficiency to avoid a copy.)
+ *   is visible and should be painted.
 *
 * Provides a hint to the texture about what areas of the texture
 * are not completely obscured and thus need to be painted. This
@@ -801,5 +807,106 @@ meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
      priv->clip_region = NULL;
    }

-  priv->clip_region = clip_region;
+  if (clip_region)
+    priv->clip_region = cairo_region_copy (clip_region);
+  else
+    priv->clip_region = NULL;
+}
+
+/**
+ * meta_shaped_texture_get_image:
+ * @stex: A #MetaShapedTexture
+ * @clip: A clipping rectangle, to help prevent extra processing.
+ * In the case that the clipping rectangle is partially or fully
+ * outside the bounds of the texture, the rectangle will be clipped.
+ *
+ * Flattens the two layers of the shaped texture into one ARGB32
+ * image by alpha blending the two images, and returns the flattened
+ * image.
+ *
+ * Returns: (transfer full): a new cairo surface to be freed with
+ * cairo_surface_destroy().
+ */
+cairo_surface_t *
+meta_shaped_texture_get_image (MetaShapedTexture     *stex,
+                               cairo_rectangle_int_t *clip)
+{
+  CoglHandle texture, mask_texture;
+  cairo_rectangle_int_t texture_rect = { 0, 0, 0, 0 };
+  cairo_surface_t *surface;
+
+  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), NULL);
+
+  texture = stex->priv->texture;
+
+  if (texture == NULL)
+    return NULL;
+
+  texture_rect.width = cogl_texture_get_width (texture);
+  texture_rect.height = cogl_texture_get_height (texture);
+
+  if (clip != NULL)
+    {
+      /* GdkRectangle is just a typedef of cairo_rectangle_int_t,
+       * so we can use the gdk_rectangle_* APIs on these. */
+      if (!gdk_rectangle_intersect (&texture_rect, clip, clip))
+        return NULL;
+    }
+
+  if (clip != NULL)
+    texture = cogl_texture_new_from_sub_texture (texture,
+                                                 clip->x,
+                                                 clip->y,
+                                                 clip->width,
+                                                 clip->height);
+
+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
+                                        cogl_texture_get_width (texture),
+                                        cogl_texture_get_height (texture));
+
+  cogl_texture_get_data (texture, CLUTTER_CAIRO_FORMAT_ARGB32,
+                         cairo_image_surface_get_stride (surface),
+                         cairo_image_surface_get_data (surface));
+
+  cairo_surface_mark_dirty (surface);
+
+  if (clip != NULL)
+    cogl_object_unref (texture);
+
+  mask_texture = stex->priv->mask_texture;
+  if (mask_texture != COGL_INVALID_HANDLE)
+    {
+      cairo_t *cr;
+      cairo_surface_t *mask_surface;
+
+      if (clip != NULL)
+        mask_texture = cogl_texture_new_from_sub_texture (mask_texture,
+                                                          clip->x,
+                                                          clip->y,
+                                                          clip->width,
+                                                          clip->height);
+
+      mask_surface = cairo_image_surface_create (CAIRO_FORMAT_A8,
+                                                 cogl_texture_get_width (mask_texture),
+                                                 cogl_texture_get_height (mask_texture));
+
+      cogl_texture_get_data (mask_texture, COGL_PIXEL_FORMAT_A_8,
+                             cairo_image_surface_get_stride (mask_surface),
+                             cairo_image_surface_get_data (mask_surface));
+
+      cairo_surface_mark_dirty (mask_surface);
+
+      cr = cairo_create (surface);
+      cairo_set_source_surface (cr, mask_surface, 0, 0);
+      cairo_set_operator (cr, CAIRO_OPERATOR_DEST_IN);
+      cairo_paint (cr);
+      cairo_destroy (cr);
+
+      cairo_surface_destroy (mask_surface);
+
+      if (clip != NULL)
+        cogl_object_unref (mask_texture);
+    }
+
+  return surface;
 }
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -18,11 +18,11 @@
 #include <meta/errors.h>
 #include "frame.h"
 #include <meta/window.h>
+#include <meta/meta-shaped-texture.h>
 #include "xprops.h"

 #include "compositor-private.h"
 #include "meta-shadow-factory-private.h"
-#include "meta-shaped-texture.h"
 #include "meta-window-actor-private.h"

 enum {
@@ -944,26 +944,20 @@ static void
 meta_window_actor_damage_all (MetaWindowActor *self)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  ClutterX11TexturePixmap *texture_x11 = CLUTTER_X11_TEXTURE_PIXMAP (priv->actor);
-  guint pixmap_width = 0;
-  guint pixmap_height = 0;
+  CoglHandle texture;

  if (!priv->needs_damage_all)
    return;

-  g_object_get (texture_x11,
-                "pixmap-width", &pixmap_width,
-                "pixmap-height", &pixmap_height,
-                NULL);
+  texture = meta_shaped_texture_get_texture (META_SHAPED_TEXTURE (priv->actor));

  if (!priv->mapped || priv->needs_pixmap)
    return;

-  clutter_x11_texture_pixmap_update_area (texture_x11,
-                                          0,
-                                          0,
-                                          pixmap_width,
-                                          pixmap_height);
+  meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
+                                   0, 0,
+                                   cogl_texture_get_width (texture),
+                                   cogl_texture_get_height (texture));

  priv->needs_damage_all = FALSE;
 }
@@ -1202,9 +1196,8 @@ meta_window_actor_detach (MetaWindowActor *self)
   * you are supposed to be able to free a GLXPixmap after freeing the underlying
   * pixmap, but it certainly doesn't work with current DRI/Mesa
   */
-  clutter_x11_texture_pixmap_set_pixmap (CLUTTER_X11_TEXTURE_PIXMAP (priv->actor),
-                                         None);
-  meta_shaped_texture_clear (META_SHAPED_TEXTURE (priv->actor));
+  meta_shaped_texture_set_pixmap (META_SHAPED_TEXTURE (priv->actor),
+                                  None);
  cogl_flush();

  XFreePixmap (xdisplay, priv->back_pixmap);
@@ -1756,22 +1749,9 @@ meta_window_actor_set_visible_region (MetaWindowActor *self,
                                      cairo_region_t  *visible_region)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  cairo_region_t *texture_clip_region = NULL;

-  /* Get the area of the window texture that would be drawn if
-   * we weren't obscured at all
-   */
-  texture_clip_region = meta_shaped_texture_get_visible_pixels_region (META_SHAPED_TEXTURE (priv->actor));
-  texture_clip_region = cairo_region_copy (texture_clip_region);
-
-  /* Then intersect that with the visible region to get the region
-   * that we actually need to redraw.
-   */
-  cairo_region_intersect (texture_clip_region, visible_region);
-
-  /* Assumes ownership */
  meta_shaped_texture_set_clip_region (META_SHAPED_TEXTURE (priv->actor),
-                                       texture_clip_region);
+                                       visible_region);
 }

 /**
@@ -1823,19 +1803,6 @@ meta_window_actor_reset_visible_regions (MetaWindowActor *self)
  meta_window_actor_clear_shadow_clip (self);
 }

-static gboolean
-texture_pixmap_using_extension (ClutterX11TexturePixmap *texture)
-{
-  ClutterTexture *self = CLUTTER_TEXTURE (texture);
-  CoglHandle handle;
-
-  handle = clutter_texture_get_cogl_texture (self);
-
-  return handle != NULL &&
-         cogl_is_texture_pixmap_x11 (handle) &&
-         cogl_texture_pixmap_x11_is_using_tfp_extension (handle);
-}
-
 static void
 check_needs_pixmap (MetaWindowActor *self)
 {
@@ -1869,7 +1836,7 @@ check_needs_pixmap (MetaWindowActor *self)

  if (priv->back_pixmap == None)
    {
-      gint pxm_width, pxm_height;
+      CoglHandle texture;

      meta_error_trap_push (display);

@@ -1898,23 +1865,22 @@ check_needs_pixmap (MetaWindowActor *self)
        meta_shaped_texture_set_create_mipmaps (META_SHAPED_TEXTURE (priv->actor),
                                                FALSE);

-      clutter_x11_texture_pixmap_set_pixmap
-                       (CLUTTER_X11_TEXTURE_PIXMAP (priv->actor),
-                        priv->back_pixmap);
+      meta_shaped_texture_set_pixmap (META_SHAPED_TEXTURE (priv->actor),
+                                      priv->back_pixmap);
+
+      texture = meta_shaped_texture_get_texture (META_SHAPED_TEXTURE (priv->actor));
+
      /*
       * This only works *after* actually setting the pixmap, so we have to
       * do it here.
       * See: http://bugzilla.clutter-project.org/show_bug.cgi?id=2236
       */
-      if (G_UNLIKELY (!texture_pixmap_using_extension (CLUTTER_X11_TEXTURE_PIXMAP (priv->actor))))
+      if (G_UNLIKELY (!cogl_texture_pixmap_x11_is_using_tfp_extension (texture)))
        g_warning ("NOTE: Not using GLX TFP!\n");

-      g_object_get (priv->actor,
-                    "pixmap-width", &pxm_width,
-                    "pixmap-height", &pxm_height,
-                    NULL);
-
-      meta_window_actor_update_bounding_region_and_borders (self, pxm_width, pxm_height);
+      meta_window_actor_update_bounding_region_and_borders (self,
+                                                            cogl_texture_get_width (texture),
+                                                            cogl_texture_get_height (texture));
    }

  priv->needs_pixmap = FALSE;
@@ -2007,7 +1973,6 @@ meta_window_actor_process_damage (MetaWindowActor    *self,
                                  XDamageNotifyEvent *event)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  ClutterX11TexturePixmap *texture_x11 = CLUTTER_X11_TEXTURE_PIXMAP (priv->actor);

  priv->received_damage = TRUE;

@@ -2038,11 +2003,11 @@ meta_window_actor_process_damage (MetaWindowActor    *self,
  if (!priv->mapped || priv->needs_pixmap)
    return;

-  clutter_x11_texture_pixmap_update_area (texture_x11,
-                                          event->area.x,
-                                          event->area.y,
-                                          event->area.width,
-                                          event->area.height);
+  meta_shaped_texture_update_area (META_SHAPED_TEXTURE (priv->actor),
+                                   event->area.x,
+                                   event->area.y,
+                                   event->area.width,
+                                   event->area.height);
 }

 void
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@@ -101,25 +101,6 @@ actor_is_untransformed (ClutterActor *actor,
  return TRUE;
 }

-#if CLUTTER_CHECK_VERSION(1, 9, 0)
-#define has_effects clutter_actor_has_effects
-#else
-
-static gboolean
-has_effects(ClutterActor *actor)
-{
-  GList *list;
-  gboolean ret;
-
-  list = clutter_actor_get_effects (actor);
-  ret = list != NULL;
-  g_list_free (list);
-
-  return ret;
-}
-
-#endif
-
 static void
 meta_window_group_paint (ClutterActor *actor)
 {
@@ -180,7 +161,7 @@ meta_window_group_paint (ClutterActor *actor)
       * as well for the same reason, but omitted for simplicity in the
       * hopes that no-one will do that.
       */
-      if (has_effects (l->data))
+      if (clutter_actor_has_effects (l->data))
        continue;

      if (META_IS_WINDOW_ACTOR (l->data))
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -5025,12 +5025,21 @@ meta_display_unmanage_windows_for_screen (MetaDisplay *display,
  winlist = meta_display_list_windows (display,
                                       META_LIST_INCLUDE_OVERRIDE_REDIRECT);
  winlist = g_slist_sort (winlist, meta_display_stack_cmp);
+  g_slist_foreach (winlist, (GFunc)g_object_ref, NULL);

  /* Unmanage all windows */
  tmp = winlist;
  while (tmp != NULL)
    {
-      meta_window_unmanage (tmp->data, timestamp);
+      MetaWindow *window = tmp->data;
+
+      /* Check if already unmanaged for safety - in particular, catch
+       * the case where unmanaging a parent window can cause attached
+       * dialogs to be (temporarily) unmanaged.
+       */
+      if (!window->unmanaging)
+        meta_window_unmanage (window, timestamp);
+      g_object_unref (window);
      
      tmp = tmp->next;
    }
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -1925,7 +1925,6 @@ meta_screen_tile_preview_update_timeout (gpointer data)
 {
  MetaScreen *screen = data;
  MetaWindow *window = screen->display->grab_window;
-  gboolean composited = screen->display->compositor != NULL;
  gboolean needs_preview = FALSE;

  screen->tile_preview_timeout_id = 0;
@@ -1935,8 +1934,7 @@ meta_screen_tile_preview_update_timeout (gpointer data)
      Window xwindow;
      gulong create_serial;

-      screen->tile_preview = meta_tile_preview_new (screen->number,
-                                                    composited);
+      screen->tile_preview = meta_tile_preview_new (screen->number);
      xwindow = meta_tile_preview_get_xwindow (screen->tile_preview,
                                               &create_serial);
      meta_stack_tracker_record_add (screen->stack_tracker,
@@ -2982,7 +2980,7 @@ meta_screen_resize (MetaScreen *screen,
  g_free (old_monitor_infos);
  g_slist_free (windows);

-  g_signal_emit (screen, screen_signals[MONITORS_CHANGED], 0, index);
+  g_signal_emit (screen, screen_signals[MONITORS_CHANGED], 0);
 }

 void
--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -101,9 +101,12 @@ struct _MetaWindow
  char *startup_id;
  char *mutter_hints;
  char *gtk_theme_variant;
-  char *dbus_application_id;
-  char *dbus_unique_name;
-  char *dbus_object_path;
+  char *gtk_application_id;
+  char *gtk_unique_bus_name;
+  char *gtk_application_object_path;
+  char *gtk_window_object_path;
+  char *gtk_app_menu_object_path;
+  char *gtk_menubar_object_path;

  int hide_titlebar_when_maximized;
  int net_wm_pid;
--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -1617,71 +1617,30 @@ reload_gtk_hide_titlebar_when_maximized (MetaWindow    *window,
    }
 }

-static void
-reload_dbus_application_id (MetaWindow    *window,
-                            MetaPropValue *value,
-                            gboolean       initial)
-{
-  char *new_id = NULL;
-  char *current_id = window->dbus_application_id;
+#define RELOAD_STRING(var_name, propname) \
+  static void                                       \
+  reload_ ## var_name (MetaWindow    *window,       \
+                       MetaPropValue *value,        \
+                       gboolean       initial)      \
+  {                                                 \
+    g_free (window->var_name);                      \
+                                                    \
+    if (value->type != META_PROP_VALUE_INVALID)     \
+      window->var_name = g_strdup (value->v.str);   \
+    else                                            \
+      window->var_name = NULL;                      \
+                                                    \
+    g_object_notify (G_OBJECT (window), propname);  \
+  }

-  if (value->type != META_PROP_VALUE_INVALID)
-    new_id = value->v.str;
+RELOAD_STRING (gtk_unique_bus_name,         "gtk-unique-bus-name")
+RELOAD_STRING (gtk_application_id,          "gtk-application-id")
+RELOAD_STRING (gtk_application_object_path, "gtk-application-object-path")
+RELOAD_STRING (gtk_window_object_path,      "gtk-window-object-path")
+RELOAD_STRING (gtk_app_menu_object_path,    "gtk-app-menu-object-path")
+RELOAD_STRING (gtk_menubar_object_path,     "gtk-menubar-object-path")

-  if (g_strcmp0 (new_id, current_id) != 0)
-    {
-      g_free (current_id);
-
-      if (new_id)
-        window->dbus_application_id = g_strdup (new_id);
-      else
-        window->dbus_application_id = NULL;
-
-      g_object_notify ((GObject*)window, "dbus-application-id");
-    }
-}
-
-static void
-reload_dbus_unique_name (MetaWindow    *window,
-                         MetaPropValue *value,
-                         gboolean       initial)
-{
-  char *new_id = NULL;
-  char *current_id = window->dbus_unique_name;
-
-  if (value->type != META_PROP_VALUE_INVALID)
-    new_id = value->v.str;
-
-  if (g_strcmp0 (new_id, current_id) != 0)
-    {
-      g_free (current_id);
-
-      window->dbus_unique_name = g_strdup (new_id);
-
-      g_object_notify ((GObject*)window, "dbus-unique-name");
-    }
-}
-
-static void
-reload_dbus_object_path (MetaWindow    *window,
-                         MetaPropValue *value,
-                         gboolean       initial)
-{
-  char *new_path = NULL;
-  char *current_path = window->dbus_object_path;
-
-  if (value->type != META_PROP_VALUE_INVALID)
-    new_path = value->v.str;
-
-  if (g_strcmp0 (new_path, current_path) != 0)
-    {
-      g_free (current_path);
-
-      window->dbus_object_path = g_strdup (new_path);
-
-      g_object_notify ((GObject*)window, "dbus-object-path");
-    }
-}
+#undef RELOAD_STRING

 /**
 * Initialises the property hooks system.  Each row in the table named "hooks"
@@ -1737,9 +1696,12 @@ meta_display_init_window_prop_hooks (MetaDisplay *display)
    { XA_WM_TRANSIENT_FOR,             META_PROP_VALUE_WINDOW,    reload_transient_for,    TRUE,  FALSE },
    { display->atom__GTK_THEME_VARIANT, META_PROP_VALUE_UTF8,     reload_gtk_theme_variant, TRUE, FALSE },
    { display->atom__GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED, META_PROP_VALUE_CARDINAL,     reload_gtk_hide_titlebar_when_maximized, TRUE, FALSE },
-    { display->atom__DBUS_APPLICATION_ID, META_PROP_VALUE_UTF8,   reload_dbus_application_id, TRUE, FALSE },
-    { display->atom__DBUS_UNIQUE_NAME, META_PROP_VALUE_UTF8,      reload_dbus_unique_name, TRUE, FALSE },
-    { display->atom__DBUS_OBJECT_PATH, META_PROP_VALUE_UTF8,      reload_dbus_object_path, TRUE, FALSE },
+    { display->atom__GTK_APPLICATION_ID,               META_PROP_VALUE_UTF8,         reload_gtk_application_id,               TRUE, FALSE },
+    { display->atom__GTK_UNIQUE_BUS_NAME,              META_PROP_VALUE_UTF8,         reload_gtk_unique_bus_name,              TRUE, FALSE },
+    { display->atom__GTK_APPLICATION_OBJECT_PATH,      META_PROP_VALUE_UTF8,         reload_gtk_application_object_path,      TRUE, FALSE },
+    { display->atom__GTK_WINDOW_OBJECT_PATH,           META_PROP_VALUE_UTF8,         reload_gtk_window_object_path,           TRUE, FALSE },
+    { display->atom__GTK_APP_MENU_OBJECT_PATH,         META_PROP_VALUE_UTF8,         reload_gtk_app_menu_object_path,         TRUE, FALSE },
+    { display->atom__GTK_MENUBAR_OBJECT_PATH,          META_PROP_VALUE_UTF8,         reload_gtk_menubar_object_path,          TRUE, FALSE },
    { display->atom__NET_WM_USER_TIME_WINDOW, META_PROP_VALUE_WINDOW, reload_net_wm_user_time_window, TRUE, FALSE },
    { display->atom_WM_STATE,          META_PROP_VALUE_INVALID,  NULL,                     FALSE, FALSE },
    { display->atom__NET_WM_ICON,      META_PROP_VALUE_INVALID,  reload_net_wm_icon,       FALSE, FALSE },
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -165,9 +165,12 @@ enum {
  PROP_RESIZEABLE,
  PROP_ABOVE,
  PROP_WM_CLASS,
-  PROP_DBUS_APPLICATION_ID,
-  PROP_DBUS_UNIQUE_NAME,
-  PROP_DBUS_OBJECT_PATH
+  PROP_GTK_APPLICATION_ID,
+  PROP_GTK_UNIQUE_BUS_NAME,
+  PROP_GTK_APPLICATION_OBJECT_PATH,
+  PROP_GTK_WINDOW_OBJECT_PATH,
+  PROP_GTK_APP_MENU_OBJECT_PATH,
+  PROP_GTK_MENUBAR_OBJECT_PATH
 };

 enum
@@ -224,9 +227,12 @@ meta_window_finalize (GObject *object)
  g_free (window->icon_name);
  g_free (window->desc);
  g_free (window->gtk_theme_variant);
-  g_free (window->dbus_application_id);
-  g_free (window->dbus_unique_name);
-  g_free (window->dbus_object_path);
+  g_free (window->gtk_application_id);
+  g_free (window->gtk_unique_bus_name);
+  g_free (window->gtk_application_object_path);
+  g_free (window->gtk_window_object_path);
+  g_free (window->gtk_app_menu_object_path);
+  g_free (window->gtk_menubar_object_path);
 }

 static void
@@ -290,14 +296,23 @@ meta_window_get_property(GObject         *object,
    case PROP_ABOVE:
      g_value_set_boolean (value, win->wm_state_above);
      break;
-    case PROP_DBUS_APPLICATION_ID:
-      g_value_set_string (value, win->dbus_application_id);
+    case PROP_GTK_APPLICATION_ID:
+      g_value_set_string (value, win->gtk_application_id);
      break;
-    case PROP_DBUS_UNIQUE_NAME:
-      g_value_set_string (value, win->dbus_unique_name);
+    case PROP_GTK_UNIQUE_BUS_NAME:
+      g_value_set_string (value, win->gtk_unique_bus_name);
      break;
-    case PROP_DBUS_OBJECT_PATH:
-      g_value_set_string (value, win->dbus_object_path);
+    case PROP_GTK_APPLICATION_OBJECT_PATH:
+      g_value_set_string (value, win->gtk_application_object_path);
+      break;
+    case PROP_GTK_WINDOW_OBJECT_PATH:
+      g_value_set_string (value, win->gtk_window_object_path);
+      break;
+    case PROP_GTK_APP_MENU_OBJECT_PATH:
+      g_value_set_string (value, win->gtk_app_menu_object_path);
+      break;
+    case PROP_GTK_MENUBAR_OBJECT_PATH:
+      g_value_set_string (value, win->gtk_menubar_object_path);
      break;
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
@@ -466,26 +481,50 @@ meta_window_class_init (MetaWindowClass *klass)
                                                        G_PARAM_READABLE));

  g_object_class_install_property (object_class,
-                                   PROP_DBUS_APPLICATION_ID,
-                                   g_param_spec_string ("dbus-application-id",
-                                                        "DBusApplicationID",
-                                                        "Contents of the _DBUS_APPLICATION_ID property of this window",
+                                   PROP_GTK_APPLICATION_ID,
+                                   g_param_spec_string ("gtk-application-id",
+                                                        "_GTK_APPLICATION_ID",
+                                                        "Contents of the _GTK_APPLICATION_ID property of this window",
                                                        NULL,
                                                        G_PARAM_READABLE));

  g_object_class_install_property (object_class,
-                                   PROP_DBUS_UNIQUE_NAME,
-                                   g_param_spec_string ("dbus-unique-name",
-                                                        "_DBUS_UNIQUE_NAME",
-                                                        "Contents of the _DBUS_UNIQUE_NAME property of this window",
+                                   PROP_GTK_UNIQUE_BUS_NAME,
+                                   g_param_spec_string ("gtk-unique-bus-name",
+                                                        "_GTK_UNIQUE_BUS_NAME",
+                                                        "Contents of the _GTK_UNIQUE_BUS_NAME property of this window",
                                                        NULL,
                                                        G_PARAM_READABLE));

  g_object_class_install_property (object_class,
-                                   PROP_DBUS_OBJECT_PATH,
-                                   g_param_spec_string ("dbus-object-path",
-                                                        "_DBUS_OBJECT_PATH",
-                                                        "Contents of the _DBUS_OBJECT_PATH property of this window",
+                                   PROP_GTK_APPLICATION_OBJECT_PATH,
+                                   g_param_spec_string ("gtk-application-object-path",
+                                                        "_GTK_APPLICATION_OBJECT_PATH",
+                                                        "Contents of the _GTK_APPLICATION_OBJECT_PATH property of this window",
+                                                        NULL,
+                                                        G_PARAM_READABLE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_GTK_WINDOW_OBJECT_PATH,
+                                   g_param_spec_string ("gtk-window-object-path",
+                                                        "_GTK_WINDOW_OBJECT_PATH",
+                                                        "Contents of the _GTK_WINDOW_OBJECT_PATH property of this window",
+                                                        NULL,
+                                                        G_PARAM_READABLE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_GTK_APP_MENU_OBJECT_PATH,
+                                   g_param_spec_string ("gtk-app-menu-object-path",
+                                                        "_GTK_APP_MENU_OBJECT_PATH",
+                                                        "Contents of the _GTK_APP_MENU_OBJECT_PATH property of this window",
+                                                        NULL,
+                                                        G_PARAM_READABLE));
+
+  g_object_class_install_property (object_class,
+                                   PROP_GTK_MENUBAR_OBJECT_PATH,
+                                   g_param_spec_string ("gtk-menubar-object-path",
+                                                        "_GTK_MENUBAR_OBJECT_PATH",
+                                                        "Contents of the _GTK_MENUBAR_OBJECT_PATH property of this window",
                                                        NULL,
                                                        G_PARAM_READABLE));

@@ -5023,11 +5062,16 @@ meta_window_move_frame (MetaWindow  *window,

  if (window->frame)
    {
-      /* offset by the distance between the origin of the window
-       * and the origin of the enclosing window decorations
+      MetaFrameBorders borders;
+      meta_frame_calc_borders (window->frame, &borders);
+
+      /* root_x_nw and root_y_nw correspond to where the top of
+       * the visible frame should be. Offset by the distance between
+       * the origin of the window and the origin of the enclosing
+       * window decorations.
       */
-      x += window->frame->child_x;
-      y += window->frame->child_y;
+      x += window->frame->child_x - borders.invisible.left;
+      y += window->frame->child_y - borders.invisible.top;
    }
  meta_window_move (window, user_op, x, y);
 }
@@ -10251,39 +10295,75 @@ meta_window_get_wm_class_instance (MetaWindow *window)
 }

 /**
- * meta_window_get_dbus_application_id:
+ * meta_window_get_gtk_application_id:
 * @window: a #MetaWindow
 *
 * Return value: (transfer none): the application ID
 **/
 const char *
-meta_window_get_dbus_application_id (MetaWindow *window)
+meta_window_get_gtk_application_id (MetaWindow *window)
 {
-  return window->dbus_application_id;
+  return window->gtk_application_id;
 }

 /**
- * meta_window_get_dbus_unique_name:
+ * meta_window_get_gtk_unique_bus_name:
 * @window: a #MetaWindow
 *
 * Return value: (transfer none): the unique name
 **/
 const char *
-meta_window_get_dbus_unique_name (MetaWindow *window)
+meta_window_get_gtk_unique_bus_name (MetaWindow *window)
 {
-  return window->dbus_unique_name;
+  return window->gtk_unique_bus_name;
 }

 /**
- * meta_window_get_dbus_object_path:
+ * meta_window_get_gtk_application_object_path:
 * @window: a #MetaWindow
 *
 * Return value: (transfer none): the object path
 **/
 const char *
-meta_window_get_dbus_object_path (MetaWindow *window)
+meta_window_get_gtk_application_object_path (MetaWindow *window)
 {
-  return window->dbus_object_path;
+  return window->gtk_application_object_path;
+}
+
+/**
+ * meta_window_get_gtk_window_object_path:
+ * @window: a #MetaWindow
+ *
+ * Return value: (transfer none): the object path
+ **/
+const char *
+meta_window_get_gtk_window_object_path (MetaWindow *window)
+{
+  return window->gtk_window_object_path;
+}
+
+/**
+ * meta_window_get_gtk_app_menu_object_path:
+ * @window: a #MetaWindow
+ *
+ * Return value: (transfer none): the object path
+ **/
+const char *
+meta_window_get_gtk_app_menu_object_path (MetaWindow *window)
+{
+  return window->gtk_app_menu_object_path;
+}
+
+/**
+ * meta_window_get_gtk_menubar_object_path:
+ * @window: a #MetaWindow
+ *
+ * Return value: (transfer none): the object path
+ **/
+const char *
+meta_window_get_gtk_menubar_object_path (MetaWindow *window)
+{
+  return window->gtk_menubar_object_path;
 }

 /**
--- a/src/meta/atomnames.h
+++ b/src/meta/atomnames.h
@@ -60,9 +60,12 @@ item(_MUTTER_TOGGLE_VERBOSE)
 item(_MUTTER_HINTS)
 item(_GTK_THEME_VARIANT)
 item(_GTK_HIDE_TITLEBAR_WHEN_MAXIMIZED)
-item(_DBUS_APPLICATION_ID)
-item(_DBUS_UNIQUE_NAME)
-item(_DBUS_OBJECT_PATH)
+item(_GTK_APPLICATION_ID)
+item(_GTK_UNIQUE_BUS_NAME)
+item(_GTK_APPLICATION_OBJECT_PATH)
+item(_GTK_WINDOW_OBJECT_PATH)
+item(_GTK_APP_MENU_OBJECT_PATH)
+item(_GTK_MENUBAR_OBJECT_PATH)
 item(_GNOME_WM_KEYBINDINGS)
 item(_GNOME_PANEL_ACTION)
 item(_GNOME_PANEL_ACTION_MAIN_MENU)
--- a/src/compositor/meta-shaped-texture.h
+++ b/src/compositor/meta-shaped-texture.h
@@ -26,10 +26,8 @@
 #ifndef __META_SHAPED_TEXTURE_H__
 #define __META_SHAPED_TEXTURE_H__

-#include <config.h>
-
 #include <clutter/clutter.h>
-#include <clutter/x11/clutter-x11.h>
+#include <X11/Xlib.h>

 G_BEGIN_DECLS

@@ -46,12 +44,12 @@ typedef struct _MetaShapedTexturePrivate MetaShapedTexturePrivate;

 struct _MetaShapedTextureClass
 {
-  ClutterX11TexturePixmapClass parent_class;
+  ClutterActorClass parent_class;
 };

 struct _MetaShapedTexture
 {
-  ClutterX11TexturePixmap parent;
+  ClutterActor parent;

  MetaShapedTexturePrivate *priv;
 };
@@ -63,13 +61,20 @@ ClutterActor *meta_shaped_texture_new (void);
 void meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
 					     gboolean           create_mipmaps);

-void meta_shaped_texture_clear (MetaShapedTexture *stex);
+void meta_shaped_texture_update_area (MetaShapedTexture *stex,
+                                      int                x,
+                                      int                y,
+                                      int                width,
+                                      int                height);
+
+void meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,
+                                     Pixmap             pixmap);
+
+CoglHandle meta_shaped_texture_get_texture (MetaShapedTexture *stex);

 void meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
                                           cairo_region_t    *region);

-cairo_region_t *meta_shaped_texture_get_visible_pixels_region (MetaShapedTexture *stex);
-
 void meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
                                           cairo_region_t    *overlay_region,
                                           cairo_path_t      *overlay_path);
@@ -78,6 +83,9 @@ void meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
 void meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
 					  cairo_region_t    *clip_region);

+cairo_surface_t * meta_shaped_texture_get_image (MetaShapedTexture     *stex,
+                                                 cairo_rectangle_int_t *clip);
+
 G_END_DECLS

 #endif /* __META_SHAPED_TEXTURE_H__ */
--- a/src/meta/window.h
+++ b/src/meta/window.h
@@ -95,9 +95,12 @@ const char * meta_window_get_wm_class (MetaWindow *window);
 const char * meta_window_get_wm_class_instance (MetaWindow *window);
 gboolean    meta_window_showing_on_its_workspace (MetaWindow *window);

-const char * meta_window_get_dbus_application_id (MetaWindow *window);
-const char * meta_window_get_dbus_unique_name (MetaWindow *window);
-const char * meta_window_get_dbus_object_path (MetaWindow *window);
+const char * meta_window_get_gtk_application_id (MetaWindow *window);
+const char * meta_window_get_gtk_unique_bus_name (MetaWindow *window);
+const char * meta_window_get_gtk_application_object_path (MetaWindow *window);
+const char * meta_window_get_gtk_window_object_path (MetaWindow *window);
+const char * meta_window_get_gtk_app_menu_object_path (MetaWindow *window);
+const char * meta_window_get_gtk_menubar_object_path (MetaWindow *window);

 void meta_window_move(MetaWindow *window, gboolean user_op, int root_x_nw, int root_y_nw);
 void meta_window_move_frame(MetaWindow *window, gboolean user_op, int root_x_nw, int root_y_nw);
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
@@ -6403,8 +6403,8 @@ meta_gtk_state_from_string (const char *str)
    return GTK_STATE_FLAG_INCONSISTENT;
  else if (g_ascii_strcasecmp ("focused", str) == 0)
    return GTK_STATE_FLAG_FOCUSED;
-  else if (g_ascii_strcasecmp ("window-unfocused", str) == 0)
-    return GTK_STATE_FLAG_WINDOW_UNFOCUSED;
+  else if (g_ascii_strcasecmp ("backdrop", str) == 0)
+    return GTK_STATE_FLAG_BACKDROP;
  else
    return -1; /* hack */
 }
@@ -6428,8 +6428,8 @@ meta_gtk_state_to_string (GtkStateFlags state)
      return "INCONSISTENT";
    case GTK_STATE_FLAG_FOCUSED:
      return "FOCUSED";
-    case GTK_STATE_FLAG_WINDOW_UNFOCUSED:
-      return "WINDOW_UNFOCUSED";
+    case GTK_STATE_FLAG_BACKDROP:
+      return "BACKDROP";
    }

  return "<unknown>";
--- a/src/ui/tile-preview.c
+++ b/src/ui/tile-preview.c
@@ -39,8 +39,6 @@ struct _MetaTilePreview {
  GdkRGBA       *preview_color;

  MetaRectangle  tile_rect;
-
-  gboolean       has_alpha: 1;
 };

 static gboolean
@@ -52,30 +50,17 @@ meta_tile_preview_draw (GtkWidget *widget,

  cairo_set_line_width (cr, 1.0);

-  if (preview->has_alpha)
-    {
-      /* Fill the preview area with a transparent color */
-      gdk_cairo_set_source_rgba (cr, preview->preview_color);
+  /* Fill the preview area with a transparent color */
+  gdk_cairo_set_source_rgba (cr, preview->preview_color);

-      cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-      cairo_paint (cr);
+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+  cairo_paint (cr);

-      /* Use the opaque color for the border */
-      cairo_set_source_rgb (cr,
-                            preview->preview_color->red,
-                            preview->preview_color->green,
-                            preview->preview_color->blue);
-    }
-  else
-    {
-      cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
-
-      cairo_rectangle (cr,
-                       OUTLINE_WIDTH - 0.5, OUTLINE_WIDTH - 0.5,
-                       preview->tile_rect.width - 2 * (OUTLINE_WIDTH - 1) - 1,
-                       preview->tile_rect.height - 2 * (OUTLINE_WIDTH - 1) - 1);
-      cairo_stroke (cr);
-    }
+  /* Use the opaque color for the border */
+  cairo_set_source_rgb (cr,
+                        preview->preview_color->red,
+                        preview->preview_color->green,
+                        preview->preview_color->blue);

  cairo_rectangle (cr,
                   0.5, 0.5,
@@ -87,11 +72,13 @@ meta_tile_preview_draw (GtkWidget *widget,
 }

 MetaTilePreview *
-meta_tile_preview_new (int      screen_number,
-                       gboolean composited)
+meta_tile_preview_new (int      screen_number)
 {
  MetaTilePreview *preview;
  GdkScreen *screen;
+  GtkStyleContext *context;
+  GtkWidgetPath *path;
+  guchar selection_alpha = 0xFF;

  screen = gdk_display_get_screen (gdk_display_get_default (), screen_number);

@@ -107,44 +94,34 @@ meta_tile_preview_new (int      screen_number,
  preview->tile_rect.x = preview->tile_rect.y = 0;
  preview->tile_rect.width = preview->tile_rect.height = 0;

-  preview->has_alpha = composited &&
-                       (gdk_screen_get_rgba_visual (screen) != NULL);
+  gtk_widget_set_visual (preview->preview_window,
+                         gdk_screen_get_rgba_visual (screen));

-  if (preview->has_alpha)
-    {
-      GtkStyleContext *context;
-      GtkWidgetPath *path;
-      guchar selection_alpha = 0xFF;
+  path = gtk_widget_path_new ();
+  gtk_widget_path_append_type (path, GTK_TYPE_ICON_VIEW);

-      gtk_widget_set_visual (preview->preview_window,
-                             gdk_screen_get_rgba_visual (screen));
+  context = gtk_style_context_new ();
+  gtk_style_context_set_path (context, path);
+  gtk_style_context_add_class (context,
+                               GTK_STYLE_CLASS_RUBBERBAND);

-      path = gtk_widget_path_new ();
-      gtk_widget_path_append_type (path, GTK_TYPE_ICON_VIEW);
+  gtk_widget_path_free (path);

-      context = gtk_style_context_new ();
-      gtk_style_context_set_path (context, path);
-      gtk_style_context_add_class (context,
-                                   GTK_STYLE_CLASS_RUBBERBAND);
+  gtk_style_context_get (context, GTK_STATE_FLAG_SELECTED,
+                         "background-color", &preview->preview_color,
+                         NULL);

-      gtk_widget_path_free (path);
+  /* The background-color for the .rubberband class should probably
+   * contain the correct alpha value - unfortunately, at least for now
+   * it doesn't. Hopefully the following workaround can be removed
+   * when GtkIconView gets ported to GtkStyleContext.
+   */
+  gtk_style_context_get_style (context,
+                               "selection-box-alpha", &selection_alpha,
+                               NULL);
+  preview->preview_color->alpha = (double)selection_alpha / 0xFF;

-      gtk_style_context_get (context, GTK_STATE_FLAG_SELECTED,
-                             "background-color", &preview->preview_color,
-                             NULL);
-
-      /* The background-color for the .rubberband class should probably
-       * contain the correct alpha value - unfortunately, at least for now
-       * it doesn't. Hopefully the following workaround can be removed
-       * when GtkIconView gets ported to GtkStyleContext.
-       */
-      gtk_style_context_get_style (context,
-                                   "selection-box-alpha", &selection_alpha,
-                                   NULL);
-      preview->preview_color->alpha = (double)selection_alpha / 0xFF;
-
-      g_object_unref (context);
-    }
+  g_object_unref (context);

  /* We make an assumption that XCreateWindow will be the first operation
   * when calling gtk_widget_realize() (via gdk_window_new()), or that it
@@ -200,33 +177,6 @@ meta_tile_preview_show (MetaTilePreview *preview,
  gdk_window_move_resize (window,
                          preview->tile_rect.x, preview->tile_rect.y,
                          preview->tile_rect.width, preview->tile_rect.height);
-
-  if (!preview->has_alpha)
-    {
-      cairo_region_t *outer_region, *inner_region;
-      GdkRectangle outer_rect, inner_rect;
-      GdkRGBA black = { 0.0, 0.0, 0.0, 1.0 };
-
-      gdk_window_set_background_rgba (window, &black);
-
-      outer_rect.x = outer_rect.y = 0;
-      outer_rect.width = preview->tile_rect.width;
-      outer_rect.height = preview->tile_rect.height;
-
-      inner_rect.x = OUTLINE_WIDTH;
-      inner_rect.y = OUTLINE_WIDTH;
-      inner_rect.width = outer_rect.width - 2 * OUTLINE_WIDTH;
-      inner_rect.height = outer_rect.height - 2 * OUTLINE_WIDTH;
-
-      outer_region = cairo_region_create_rectangle (&outer_rect);
-      inner_region = cairo_region_create_rectangle (&inner_rect);
-
-      cairo_region_subtract (outer_region, inner_region);
-      cairo_region_destroy (inner_region);
-
-      gdk_window_shape_combine_region (window, outer_region, 0, 0);
-      cairo_region_destroy (outer_region);
-    }
 }

 void
--- a/src/ui/tile-preview.h
+++ b/src/ui/tile-preview.h
@@ -27,8 +27,7 @@

 typedef struct _MetaTilePreview MetaTilePreview;

-MetaTilePreview   *meta_tile_preview_new    (int                screen_number,
-                                             gboolean           composited);
+MetaTilePreview   *meta_tile_preview_new    (int                screen_number);
 void               meta_tile_preview_free   (MetaTilePreview   *preview);
 void               meta_tile_preview_show   (MetaTilePreview   *preview,
                                             MetaRectangle     *rect);
Author	SHA1	Message	Date
Owen W. Taylor	ca3dc2e876	Bump version to 3.3.90 Update NEWS	2012-02-22 21:40:10 -05:00
Owen W. Taylor	70d85049b1	configure.in: clean up version checks Consolidate and simplify checks for required depenencies, and require Cogl-1.9.6.	2012-02-22 21:40:10 -05:00
Owen W. Taylor	29f6f5e0ad	configure.in: update an old message	2012-02-22 19:39:47 -05:00
Robert Bragg	d249cfd040	Pass CoglContext to cogl_texture_pixmap_x11_new() The experimental Cogl api cogl_texture_pixmap_new() was recently changed so it now expects an explicit CoglContext argument and it can also return exceptions now via a GError. This patch updates mutters use of the api accordingly.	2012-02-21 18:23:22 +00:00
Adel Gadllah	3cb912aee2	MetaShapedTexture: Implement get_paint_volume Add a get_paint_volume implementation to MetaShapedTexture.	2012-02-21 18:09:25 +01:00
Ask H. Larsen	7df823132c	Updated Danish translation	2012-02-20 22:37:32 +01:00
Мирослав Николић	41353d642b	Updated Serbian translation	2012-02-20 11:59:40 +01:00
Jasper St. Pierre	c47039db82	window: Fix meta_window_move_frame in the context of the new invisible borders https://bugzilla.gnome.org/show_bug.cgi?id=659643	2012-02-16 16:46:10 -05:00
Jasper St. Pierre	0dab6df25a	configure: Require Clutter 1.9.10 We depend on API introduced in Clutter 1.9.10. Additionally, remove a compatibility fallback that isn't needed anymore.	2012-02-16 16:44:03 -05:00
Jasper St. Pierre	c844bab232	meta-background-actor: Chain up in dispose This was preventing Clutter from running its dispose, preventing it from being destroyed correctly. While a major bug and possibly big memory leak, the most obvious effect was the message that Clutter spat out: Clutter-CRITICAL **: clutter_actor_iter_next: assertion `ri->age == ri->root->priv->age' failed Since we never disposed the actor correctly, it was never removed from its parent, and the age wasn't updated correctly.	2012-02-16 16:29:33 -05:00
Owen W. Taylor	848f9d1399	Bump version to 3.3.5 Update NEWS	2012-02-07 18:30:01 -05:00
Owen W. Taylor	2e63de5c0a	Add -Wno-error=deprecated declarations Even with --enable-compile-warnings=error, avoid erroring out on deprecations for the moment, since we are hitting many Clutter deprecations and some are hard to fix.	2012-02-07 18:30:01 -05:00
Jasper St. Pierre	7319b10d72	MetaShapedTexture: Remove visible_pixels_region When we were shaping the window with a cairo region, there was an easy optimization to restrict painting only to the pixels we were going to actually draw. With rounded corners, the amount of work we have to do figure out what pixels isn't worth the small savings of not drawing the completely transparent parts of the corners, so remove this optimization, and the supporting meta_shaped_texture_get_visible_pixels_region() https://bugzilla.gnome.org/show_bug.cgi?id=657639	2012-02-03 19:58:21 -05:00
Jasper St. Pierre	1265efcf78	MetaShapedTexture: Add a new method to flatten the shaped texture into pixels This will be used by the Shell to implement a screenshot_window method. https://bugzilla.gnome.org/show_bug.cgi?id=660941	2012-02-03 19:57:38 -05:00
Jasper St. Pierre	3e0ef03fd9	MetaShapedTexture: Make public and directly derive from ClutterActor ClutterTexture has many features that we simply don't use and don't make sense for a subclass with custom drawing. Deriving directly from ClutterActor simplifies our code by avoiding workarounds and makes things more robust. Additionally, make it public. GNOME Shell was already assuming that any MetaShapedTexture was also a ClutterTexture, and we need to replace these bits with new API for GNOME Shell to use. https://bugzilla.gnome.org/show_bug.cgi?id=660941	2012-02-03 15:35:41 -05:00
Chao-Hsiung Liao	37076941ad	Updated Traditional Chinese translation(Hong Kong and Taiwan)	2012-01-29 23:38:40 +08:00
Kjartan Maraas	25e43618a4	Updated Norwegian bokmål translation	2012-01-28 17:38:35 +01:00
Rui Matos	fd404bafc8	screen: Remove harmless leftover argument It compiled because it was picking index(3) from strings.h.	2012-01-26 15:27:50 +00:00
Rico Tzschichholz	3b3b26b000	Bump dependency on gtk+ 3.3.7	2012-01-20 21:00:15 +01:00
Owen W. Taylor	33498f6b84	Bump version to 3.3.4 Update NEWS	2012-01-20 12:35:20 -05:00
Owen W. Taylor	c0a440b852	Fix crash when meta_display_close() is called with attached modal dialogs When meta_display_unmanage_window_for_screen() is called, it gets a list of windows and iterates over them and unmanages them, but unmanaging a window with attached modal dialogs also unmanages those attached modal dialogs (in the normal case, temporarily), so we need to guard against such cases by ref'ing the windows in the list and checking if they have already been unmanaged. https://bugzilla.gnome.org/show_bug.cgi?id=668299 https://bugzilla.redhat.com/show_bug.cgi?id=760918	2012-01-19 16:12:56 -05:00
Ryan Lortie	1772a2a59c	adjust to new Gtk properties for app menu https://bugzilla.gnome.org/show_bug.cgi?id=668118	2012-01-18 17:26:12 -05:00
Florian Müllner	44f362ad87	tile-preview: Remove non-composited case The main reason for handling the non-composited case was to keep code differences with metacity small, but the tiling patch[0] never got merged. In mutter itself, the compositor is not optional, so there's no good reason for keeping those untested code chunks around. [0] https://bugzilla.gnome.org/show_bug.cgi?id=607694 https://bugzilla.gnome.org/show_bug.cgi?id=666039	2012-01-17 12:53:33 +01:00
Fran Diéguez	478f1020a4	Updated Galician translations	2012-01-15 01:27:53 +01:00
Owen W. Taylor	e8209e7b22	Handle rename of GTK+'s window-unfocused state to backdrop GTK_STATE_FLAG_WINDOW_UNFOCUSED was renamed to GTK_STATE_FLAG_BACKDROP.	2012-01-09 19:03:27 -05:00
Alexander Shopov	2d20c9ecad	Updated Bulgarian translation	2012-01-08 15:18:52 +02:00