MetaWindowActor: Fix crashes when mapping and unmapping windows

The assumptions made when getting the size of the window for the
paint volume turned out not to be accurate in all cases -
get_paint_volume() could be called on windows without computed
bounds.

https://bugzilla.gnome.org/show_bug.cgi?id=592382

configure.in

@@ -1,7 +1,7 @@
 AC_PREREQ(2.50)
 
 m4_define([mutter_major_version], [2])
-m4_define([mutter_minor_version], [31])
+m4_define([mutter_minor_version], [91])
 m4_define([mutter_micro_version], [2])
 
 m4_define([mutter_version],
@@ -63,68 +63,75 @@ AC_C_BIGENDIAN
 
 #### Warnings
 
+# Stay command-line compatible with the gnome-common configure option. Here
+# minimum/yes/maximum are the same, however.
+AC_ARG_ENABLE(compile_warnings,
+  AS_HELP_STRING([--enable-compile-warnings=@<:@no/minimum/yes/maximum/error@:>@],[Turn on compiler warnings]),,
+  enable_compile_warnings=error)
+
 changequote(,)dnl
-if test "x$GCC" = "xyes"; then
-  case " $CFLAGS " in
-  *[\ \	]-Wall[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wall" ;;
-  esac
-
-#  case " $CFLAGS " in
-#  *[\ \	]-Wshadow[\ \	]*) ;;
-#  *) CFLAGS="$CFLAGS -Wshadow" ;;
-#  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wchar-subscripts[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wmissing-declarations[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wmissing-prototypes[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wnested-externs[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wnested-externs" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wpointer-arith[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wcast-align[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wcast-align" ;;
-  esac
-
-  case " $CFLAGS " in
-  *[\ \	]-Wsign-compare[\ \	]*) ;;
-  *) CFLAGS="$CFLAGS -Wsign-compare" ;;
-  esac
-
-  if test "x$enable_ansi" = "xyes"; then
+if test "$enable_compile_warnings" != no ; then
+  if test "x$GCC" = "xyes"; then
     case " $CFLAGS " in
-    *[\ \	]-ansi[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -ansi" ;;
+    *[\ \	]-Wall[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wall" ;;
+    esac
+
+#   case " $CFLAGS " in
+#   *[\ \	]-Wshadow[\ \	]*) ;;
+#   *) CFLAGS="$CFLAGS -Wshadow" ;;
+#   esac
+
+    case " $CFLAGS " in
+    *[\ \	]-Wchar-subscripts[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wchar-subscripts" ;;
     esac
 
     case " $CFLAGS " in
-    *[\ \	]-pedantic[\ \	]*) ;;
-    *) CFLAGS="$CFLAGS -pedantic" ;;
+    *[\ \	]-Wmissing-declarations[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wmissing-declarations" ;;
     esac
+
+    case " $CFLAGS " in
+    *[\ \	]-Wmissing-prototypes[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wmissing-prototypes" ;;
+    esac
+
+    case " $CFLAGS " in
+    *[\ \	]-Wnested-externs[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wnested-externs" ;;
+    esac
+
+    case " $CFLAGS " in
+    *[\ \	]-Wpointer-arith[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wpointer-arith" ;;
+    esac
+
+    case " $CFLAGS " in
+    *[\ \	]-Wcast-align[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wcast-align" ;;
+    esac
+
+    case " $CFLAGS " in
+    *[\ \	]-Wsign-compare[\ \	]*) ;;
+    *) CFLAGS="$CFLAGS -Wsign-compare" ;;
+    esac
+
+    if test "$enable_compile_warnings" = error; then
+      case " $CFLAGS " in
+      *[\ \	]-Werror[\ \	]*) ;;
+      *) CFLAGS="$CFLAGS -Werror" ;;
+      esac
+    fi
   fi
 fi
 changequote([,])dnl
 
-MUTTER_PC_MODULES='gtk+-2.0 >= 2.18 pango >= 1.2.0'
+GTK_MIN_VERSION=2.90.7
+CANBERRA_GTK=libcanberra-gtk3
+CANBERRA_GTK_VERSION=0.26
+
+MUTTER_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION pango >= 1.2.0 cairo >= 1.10.0"
 
 AC_ARG_ENABLE(gconf,
   AC_HELP_STRING([--disable-gconf],
@@ -184,8 +191,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+-2.0 >= 2.18)
-PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-2.0 >= 2.18)
+PKG_CHECK_MODULES(MUTTER_MESSAGE, gtk+-3.0 >= $GTK_MIN_VERSION)
+PKG_CHECK_MODULES(MUTTER_WINDOW_DEMO, gtk+-3.0 >= $GTK_MIN_VERSION)
 
 # Unconditionally use this dir to avoid a circular dep with gnomecc
 GNOME_KEYBINDINGS_KEYSDIR="${datadir}/gnome-control-center/keybindings"
@@ -222,10 +229,10 @@ AC_MSG_CHECKING([libcanberra-gtk])
 if test x$with_libcanberra = xno ; then
   AC_MSG_RESULT([disabled])
 else
-  if $PKG_CONFIG --exists libcanberra-gtk; then
+  if $PKG_CONFIG --exists $CANBERRA_GTK '>=' $CANBERRA_GTK_VERSION; then
     have_libcanberra=yes
     AC_MSG_RESULT(yes)
-    MUTTER_PC_MODULES="$MUTTER_PC_MODULES libcanberra-gtk"
+    MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CANBERRA_GTK"
     AC_DEFINE([HAVE_LIBCANBERRA], 1, [Building with libcanberra for playing sounds])
   else
     AC_MSG_RESULT(no)
@@ -274,7 +281,7 @@ else
 fi
 
 if test x$with_introspection != xno; then
-  PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0, have_introspection=yes, have_introspection=no)
+  PKG_CHECK_MODULES(INTROSPECTION, gobject-introspection-1.0 >= 0.9.5, have_introspection=yes, have_introspection=no)
   if test x$have_introspection=xyes; then
     MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
     AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
@@ -505,10 +512,8 @@ if test "x$enable_debug" = "xyes"; then
 	CFLAGS="$CFLAGS -g -O"
 fi
 
-# Warnings are there for a reason
-if test "x$GCC" = "xyes"; then
-  CFLAGS="$CFLAGS -Wall -Werror -ansi"
-fi
+# For fix-meta-rectangle.py
+AM_PATH_PYTHON([2.5])
 
 # Use gnome-doc-utils:
 GNOME_DOC_INIT([0.8.0])
@@ -545,7 +550,7 @@ fi
 
 dnl ==========================================================================
 echo "
-mutter-$VERSION:
+mutter-$VERSION
 
 	prefix:                   ${prefix}
 	source code location:	  ${srcdir}

po/nds.po

@@ -1,15 +1,15 @@
 # Low German translation for mutter.
 # Copyright (C) 2009 mutter's COPYRIGHT HOLDER
 # This file is distributed under the same license as the mutter package.
-# Nils-Christoph Fiedler <fiedler@medienkompanie.de>, 2009.
+# Nils-Christoph Fiedler <ncfiedler@gnome.org>, 2009.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: mutter master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=mutter&component=general\n"
 "POT-Creation-Date: 2009-11-24 21:04+0000\n"
-"PO-Revision-Date: 2010-02-25 16:58+0100\n"
-"Last-Translator: Nils-Christoph Fiedler <fiedler@medienkompanie.de>\n"
+"PO-Revision-Date: 2010-08-08 15:45+0100\n"
+"Last-Translator: Nils-Christoph Fiedler <ncfiedler@gnome.org>\n"
 "Language-Team: Low German <nds-lowgerman@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -163,7 +163,7 @@ msgstr ""
 #: ../src/core/main.c:704
 #, c-format
 msgid "Failed to restart: %s\n"
-msgstr ""
+msgstr "Künn nich nej starten: %s\n"
 
 #.
 #. * We found it, but it was invalid.  Complain.
@@ -376,7 +376,7 @@ msgstr ""
 
 #: ../src/core/util.c:452
 msgid "Window manager error: "
-msgstr ""
+msgstr "Finsteroppasserfehler:"
 
 #. Translators: This is the title used on dialog boxes
 #. eof all-keybindings.h
@@ -412,7 +412,7 @@ msgstr ""
 #: ../src/core/window-props.c:426
 #, c-format
 msgid "%s (on %s)"
-msgstr ""
+msgstr "%s (op %s)"
 
 #: ../src/core/window-props.c:1440
 #, c-format
@@ -569,11 +569,11 @@ msgstr ""
 
 #: ../src/include/all-keybindings.h:252
 msgid "Take a screenshot"
-msgstr ""
+msgstr "Billschirmbill scheten"
 
 #: ../src/include/all-keybindings.h:254
 msgid "Take a screenshot of a window"
-msgstr ""
+msgstr "Billschirmbill vun ee'm Finster scheten"
 
 #: ../src/include/all-keybindings.h:256
 msgid "Run a terminal"
@@ -581,7 +581,7 @@ msgstr "Een Terminal lööpen laten"
 
 #: ../src/include/all-keybindings.h:271
 msgid "Activate the window menu"
-msgstr ""
+msgstr "Finstermenü aktiveren"
 
 #: ../src/include/all-keybindings.h:274
 msgid "Toggle fullscreen mode"
@@ -814,7 +814,7 @@ msgstr ""
 
 #: ../src/ui/frames.c:1145
 msgid "Always On Visible Workspace"
-msgstr ""
+msgstr "Jümmers op opwiestem Schrievdisk"
 
 #: ../src/ui/frames.c:1148
 msgid "Put Window On Only One Workspace"
@@ -1220,7 +1220,7 @@ msgstr ""
 #: ../src/ui/theme.c:4764
 #, c-format
 msgid "Failed to load theme \"%s\": %s\n"
-msgstr ""
+msgstr "Künn Thema nich laden \"%s\": %s\n"
 
 #: ../src/ui/theme.c:4894
 #: ../src/ui/theme.c:4901

src/Makefile.am

@@ -19,30 +19,33 @@ mutter_SOURCES= 				\
 	core/bell.c				\
 	core/bell.h				\
 	core/boxes.c				\
+	core/boxes-private.h			\
 	include/boxes.h				\
 	compositor/compositor.c			\
 	compositor/compositor-private.h		\
-	compositor/mutter-module.c		\
-	compositor/mutter-module.h		\
-	compositor/mutter-plugin.c		\
-	compositor/mutter-plugin-manager.c	\
-	compositor/mutter-plugin-manager.h	\
-	compositor/mutter-shaped-texture.c	\
-	compositor/mutter-texture-tower.c	\
-	compositor/mutter-texture-tower.h	\
-	compositor/mutter-window.c		\
-	compositor/mutter-window-private.h	\
-	compositor/mutter-window-group.c	\
-	compositor/mutter-window-group.h	\
-	compositor/shadow.c			\
-	compositor/shadow.h			\
-	compositor/mutter-shaped-texture.h	\
-	compositor/tidy/tidy-texture-frame.c	\
-	compositor/tidy/tidy-texture-frame.h	\
-	gtk-compat.h				\
+	compositor/meta-module.c		\
+	compositor/meta-module.h		\
+	compositor/meta-plugin.c		\
+	compositor/meta-plugin-manager.c	\
+	compositor/meta-plugin-manager.h	\
+	compositor/meta-shadow-factory.c	\
+	compositor/meta-shadow-factory-private.h	\
+	compositor/meta-shaped-texture.c	\
+	compositor/meta-shaped-texture.h	\
+	compositor/meta-texture-tower.c		\
+	compositor/meta-texture-tower.h		\
+	compositor/meta-window-actor.c		\
+	compositor/meta-window-actor-private.h	\
+	compositor/meta-window-group.c		\
+	compositor/meta-window-group.h		\
+	compositor/meta-window-shape.c		\
+	compositor/meta-window-shape.h		\
+	compositor/region-utils.c		\
+	compositor/region-utils.h		\
 	include/compositor.h			\
-	include/mutter-plugin.h			\
-	include/mutter-window.h			\
+	include/meta-plugin.h			\
+	include/meta-shadow-factory.h		\
+	include/meta-window-actor.h		\
 	include/compositor-mutter.h 		\
 	core/constraints.c			\
 	core/constraints.h			\
@@ -74,7 +77,7 @@ mutter_SOURCES= 				\
 	core/keybindings.c			\
 	core/keybindings-private.h		\
 	core/main.c				\
-	core/mutter-Xatomtype.h		\
+	core/mutter-Xatomtype.h			\
 	core/place.c				\
 	core/place.h				\
 	core/prefs.c				\
@@ -116,12 +119,12 @@ mutter_SOURCES= 				\
 	include/resizepopup.h			\
 	ui/tabpopup.c				\
 	include/tabpopup.h				\
+	ui/tile-preview.c			\
+	include/tile-preview.h			\
 	ui/theme-parser.c			\
-	ui/theme-parser.h			\
 	ui/theme.c				\
 	ui/theme.h				\
-	ui/themewidget.c			\
-	ui/themewidget.h			\
+	ui/theme-private.h			\
 	ui/ui.c					\
 	include/all-keybindings.h               \
 	$(mutter_built_sources)
@@ -140,15 +143,12 @@ libmutter_private_la_SOURCES=			\
 	ui/preview-widget.c			\
 	ui/preview-widget.h			\
 	ui/theme-parser.c			\
-	ui/theme-parser.h			\
 	ui/theme.c				\
 	ui/theme.h
 
 libmutter_private_la_LDFLAGS = -no-undefined
 libmutter_private_la_LIBADD  = @MUTTER_LIBS@
 
-libmutterincludedir = $(includedir)/mutter/mutter-private
-
 # Headers installed for plugins; introspected information will
 # be extracted into Mutter-<version>.gir
 libmutterinclude_base_headers =		\
@@ -157,7 +157,6 @@ libmutterinclude_base_headers =		\
 	include/main.h				\
 	include/util.h				\
 	include/common.h			\
-	ui/theme-parser.h			\
 	ui/theme.h				\
 	include/prefs.h				\
 	include/window.h			\
@@ -170,8 +169,9 @@ libmutterinclude_base_headers =		\
 	include/display.h			\
 	include/group.h				\
 	include/keybindings.h			\
-	include/mutter-plugin.h			\
-	include/mutter-window.h
+	include/meta-plugin.h			\
+	include/meta-shadow-factory.h		\
+	include/meta-window-actor.h
 
 # Excluded from scanning for introspection but installed
 # preview-widget.h: only part of libmutter-private
@@ -180,6 +180,8 @@ libmutterinclude_extra_headers =		\
 	ui/preview-widget.h			\
 	include/atomnames.h
 
+libmutterincludedir = $(includedir)/mutter/mutter-private
+
 libmutterinclude_HEADERS =			\
 	$(libmutterinclude_base_headers)	\
 	$(libmutterinclude_extra_headers)
@@ -203,21 +205,24 @@ typelib_DATA = Meta-$(api_version).typelib
 
 # We need to strip out the attribute that would point back to libmutter-introspect
 # so that libgirepository looks for symbols in the executable instead
-Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mutter_SOURCES)
+Meta-$(api_version).gir: $(G_IR_SCANNER) mutter $(libmutterinclude_HEADERS) $(mutter_SOURCES) Makefile
 	$(AM_V_GEN) pwd=`pwd` ;				\
         cd $(srcdir) &&					\
 	$(G_IR_SCANNER)					\
 		--namespace=Meta			\
 		--nsversion=$(api_version)		\
+		--warn-all				\
+		--warn-error				\
 		--include=GObject-2.0			\
-		--include=Gdk-2.0			\
-		--include=Gtk-2.0			\
+		--include=Gdk-3.0			\
+		--include=Gtk-3.0			\
 		--include=Clutter-1.0			\
 		--pkg=clutter-1.0			\
-		--pkg=gtk+-2.0				\
+		--pkg=gtk+-3.0				\
 		--include=xlib-2.0			\
 		--include=xfixes-4.0			\
 		--program=$$pwd/mutter			\
+		mutter-enum-types.h			\
 		$(filter %.c,$(mutter_SOURCES))		\
 		$(libmutterinclude_base_headers)	\
 		$(INCLUDES)				\

src/compositor/compositor-private.h

@@ -7,7 +7,7 @@
 
 #include "compositor.h"
 #include "display.h"
-#include "mutter-plugin-manager.h"
+#include "meta-plugin-manager.h"
 #include <clutter/clutter.h>
 
 typedef struct _MetaCompScreen MetaCompScreen;
@@ -23,7 +23,7 @@ struct _MetaCompositor
 
   ClutterActor   *shadow_src;
 
-  MutterPlugin   *modal_plugin;
+  MetaPlugin     *modal_plugin;
 
   gboolean        show_redraw : 1;
   gboolean        debug       : 1;
@@ -45,24 +45,24 @@ struct _MetaCompScreen
 
   gint                   switch_workspace_in_progress;
 
-  MutterPluginManager *plugin_mgr;
+  MetaPluginManager *plugin_mgr;
 };
 
-void mutter_switch_workspace_completed (MetaScreen    *screen);
-void mutter_set_stage_input_region     (MetaScreen    *screen,
-                                        XserverRegion  region);
-void mutter_empty_stage_input_region   (MetaScreen    *screen);
+void meta_switch_workspace_completed (MetaScreen    *screen);
+void meta_set_stage_input_region     (MetaScreen    *screen,
+                                      XserverRegion  region);
+void meta_empty_stage_input_region   (MetaScreen    *screen);
 
-gboolean mutter_begin_modal_for_plugin (MetaScreen       *screen,
-                                        MutterPlugin     *plugin,
-                                        Window            grab_window,
-                                        Cursor            cursor,
-                                        MetaModalOptions  options,
-                                        guint32           timestamp);
-void     mutter_end_modal_for_plugin   (MetaScreen       *screen,
-                                        MutterPlugin     *plugin,
-                                        guint32           timestamp);
+gboolean meta_begin_modal_for_plugin (MetaScreen       *screen,
+                                      MetaPlugin       *plugin,
+                                      Window            grab_window,
+                                      Cursor            cursor,
+                                      MetaModalOptions  options,
+                                      guint32           timestamp);
+void     meta_end_modal_for_plugin   (MetaScreen       *screen,
+                                      MetaPlugin       *plugin,
+                                      guint32           timestamp);
 
-void mutter_check_end_modal (MetaScreen *screen);
+void meta_check_end_modal (MetaScreen *screen);
 
 #endif /* META_COMPOSITOR_PRIVATE_H */

src/compositor/compositor.c

@@ -11,8 +11,9 @@
 #include "compositor-mutter.h"
 #include "xprops.h"
 #include "prefs.h"
-#include "mutter-window-private.h"
-#include "mutter-window-group.h"
+#include "meta-shadow-factory.h"
+#include "meta-window-actor-private.h"
+#include "meta-window-group.h"
 #include "../core/window-private.h" /* to check window->hidden */
 #include "../core/display-private.h" /* for meta_display_lookup_x_window() */
 #include <X11/extensions/shape.h>
@@ -36,13 +37,13 @@ composite_at_least_version (MetaDisplay *display, int maj, int min)
 static void sync_actor_stacking (GList *windows);
 
 static void
-mutter_finish_workspace_switch (MetaCompScreen *info)
+meta_finish_workspace_switch (MetaCompScreen *info)
 {
   GList *l;
 
   /* Finish hiding and showing actors for the new workspace */
   for (l = info->windows; l; l = l->next)
-    mutter_window_sync_visibility (l->data);
+    meta_window_actor_sync_visibility (l->data);
 
   /*
    * Fix up stacking order in case the plugin messed it up.
@@ -54,7 +55,7 @@ mutter_finish_workspace_switch (MetaCompScreen *info)
 }
 
 void
-mutter_switch_workspace_completed (MetaScreen *screen)
+meta_switch_workspace_completed (MetaScreen *screen)
 {
   MetaCompScreen *info = meta_screen_get_compositor_data (screen);
 
@@ -67,7 +68,7 @@ mutter_switch_workspace_completed (MetaScreen *screen)
     }
 
   if (!info->switch_workspace_in_progress)
-    mutter_finish_workspace_switch (info);
+    meta_finish_workspace_switch (info);
 }
 
 void
@@ -84,7 +85,7 @@ add_win (MetaWindow *window)
 
   g_return_if_fail (info != NULL);
 
-  mutter_window_new (window);
+  meta_window_actor_new (window);
 
   sync_actor_stacking (info->windows);
 }
@@ -94,16 +95,16 @@ process_damage (MetaCompositor     *compositor,
                 XDamageNotifyEvent *event,
                 MetaWindow         *window)
 {
-  MutterWindow *cw;
+  MetaWindowActor *window_actor;
 
   if (window == NULL)
     return;
 
-  cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
-  if (cw == NULL)
+  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
+  if (window_actor == NULL)
     return;
 
-  mutter_window_process_damage (cw, event);
+  meta_window_actor_process_damage (window_actor, event);
 }
 
 #ifdef HAVE_SHAPE
@@ -112,18 +113,18 @@ process_shape (MetaCompositor *compositor,
                XShapeEvent    *event,
                MetaWindow     *window)
 {
-  MutterWindow *cw;
+  MetaWindowActor *window_actor;
 
   if (window == NULL)
     return;
 
-  cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
-  if (cw == NULL)
+  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
+  if (window_actor == NULL)
     return;
 
   if (event->kind == ShapeBounding)
     {
-      mutter_window_update_shape (cw, event->shaped);
+      meta_window_actor_update_shape (window_actor, event->shaped);
     }
 }
 #endif
@@ -133,30 +134,23 @@ process_property_notify (MetaCompositor	*compositor,
                          XPropertyEvent *event,
                          MetaWindow     *window)
 {
-  MetaDisplay *display = compositor->display;
-  MutterWindow *cw;
+  MetaWindowActor *window_actor;
 
   if (window == NULL)
     return;
 
-  cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
-  if (cw == NULL)
+  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
+  if (window_actor == NULL)
     return;
 
   /* Check for the opacity changing */
   if (event->atom == compositor->atom_net_wm_window_opacity)
     {
-      mutter_window_update_opacity (cw);
+      meta_window_actor_update_opacity (window_actor);
       DEBUG_TRACE ("process_property_notify: net_wm_window_opacity\n");
       return;
     }
-  else if (event->atom == meta_display_get_atom (display,
-					       META_ATOM__NET_WM_WINDOW_TYPE))
-    {
-      mutter_window_update_window_type (cw);
-      DEBUG_TRACE ("process_property_notify: net_wm_type\n");
-      return;
-    }
+
   DEBUG_TRACE ("process_property_notify: unknown\n");
 }
 
@@ -191,8 +185,14 @@ get_output_window (MetaScreen *screen)
   return output;
 }
 
+/**
+ * meta_get_stage_for_screen:
+ * @screen: a #MetaScreen
+ *
+ * Returns: (transfer none): The #ClutterStage for the screen
+ */
 ClutterActor *
-mutter_get_stage_for_screen (MetaScreen *screen)
+meta_get_stage_for_screen (MetaScreen *screen)
 {
   MetaCompScreen *info = meta_screen_get_compositor_data (screen);
 
@@ -202,8 +202,14 @@ mutter_get_stage_for_screen (MetaScreen *screen)
   return info->stage;
 }
 
+/**
+ * meta_get_overlay_group_for_screen:
+ * @screen: a #MetaScreen
+ *
+ * Returns: (transfer none): The overlay group corresponding to @screen
+ */
 ClutterActor *
-mutter_get_overlay_group_for_screen (MetaScreen *screen)
+meta_get_overlay_group_for_screen (MetaScreen *screen)
 {
   MetaCompScreen *info = meta_screen_get_compositor_data (screen);
 
@@ -213,8 +219,14 @@ mutter_get_overlay_group_for_screen (MetaScreen *screen)
   return info->overlay_group;
 }
 
+/**
+ * meta_get_window_group_for_screen:
+ * @screen: a #MetaScreen
+ *
+ * Returns: (transfer none): The window group corresponding to @screen
+ */
 ClutterActor *
-mutter_get_window_group_for_screen (MetaScreen *screen)
+meta_get_window_group_for_screen (MetaScreen *screen)
 {
   MetaCompScreen *info = meta_screen_get_compositor_data (screen);
 
@@ -224,8 +236,14 @@ mutter_get_window_group_for_screen (MetaScreen *screen)
   return info->window_group;
 }
 
+/**
+ * meta_get_window_actors:
+ * @screen: a #MetaScreen
+ *
+ * Returns: (transfer none) (element-type Clutter.Actor): The set of #MetaWindowActor on @screen
+ */
 GList *
-mutter_get_windows (MetaScreen *screen)
+meta_get_window_actors (MetaScreen *screen)
 {
   MetaCompScreen *info = meta_screen_get_compositor_data (screen);
 
@@ -236,7 +254,7 @@ mutter_get_windows (MetaScreen *screen)
 }
 
 static void
-do_set_stage_input_region (MetaScreen *screen,
+do_set_stage_input_region (MetaScreen   *screen,
                            XserverRegion region)
 {
   MetaCompScreen *info = meta_screen_get_compositor_data (screen);
@@ -249,8 +267,8 @@ do_set_stage_input_region (MetaScreen *screen,
 }
 
 void
-mutter_set_stage_input_region (MetaScreen *screen,
-                               XserverRegion region)
+meta_set_stage_input_region (MetaScreen   *screen,
+                             XserverRegion region)
 {
   MetaCompScreen *info = meta_screen_get_compositor_data (screen);
   MetaDisplay  *display = meta_screen_get_display (screen);
@@ -278,7 +296,7 @@ mutter_set_stage_input_region (MetaScreen *screen,
 }
 
 void
-mutter_empty_stage_input_region (MetaScreen *screen)
+meta_empty_stage_input_region (MetaScreen *screen)
 {
   /* Using a static region here is a bit hacky, but Metacity never opens more than
    * one XDisplay, so it works fine. */
@@ -291,16 +309,16 @@ mutter_empty_stage_input_region (MetaScreen *screen)
       region = XFixesCreateRegion (xdpy, NULL, 0);
     }
 
-  mutter_set_stage_input_region (screen, region);
+  meta_set_stage_input_region (screen, region);
 }
 
 gboolean
-mutter_begin_modal_for_plugin (MetaScreen       *screen,
-                               MutterPlugin     *plugin,
-                               Window            grab_window,
-                               Cursor            cursor,
-                               MetaModalOptions  options,
-                               guint32           timestamp)
+meta_begin_modal_for_plugin (MetaScreen       *screen,
+                             MetaPlugin       *plugin,
+                             Window            grab_window,
+                             Cursor            cursor,
+                             MetaModalOptions  options,
+                             guint32           timestamp)
 {
   /* To some extent this duplicates code in meta_display_begin_grab_op(), but there
    * are significant differences in how we handle grabs that make it difficult to
@@ -365,9 +383,9 @@ mutter_begin_modal_for_plugin (MetaScreen       *screen,
 }
 
 void
-mutter_end_modal_for_plugin (MetaScreen       *screen,
-                             MutterPlugin     *plugin,
-                             guint32           timestamp)
+meta_end_modal_for_plugin (MetaScreen     *screen,
+                           MetaPlugin     *plugin,
+                           guint32         timestamp)
 {
   MetaDisplay    *display    = meta_screen_get_display (screen);
   Display        *xdpy = meta_display_get_xdisplay (display);
@@ -391,15 +409,15 @@ mutter_end_modal_for_plugin (MetaScreen       *screen,
  * a left-over modal grab for this screen.
  */
 void
-mutter_check_end_modal (MetaScreen *screen)
+meta_check_end_modal (MetaScreen *screen)
 {
   MetaDisplay    *display    = meta_screen_get_display (screen);
   MetaCompositor *compositor = display->compositor;
 
   if (compositor->modal_plugin &&
-      mutter_plugin_get_screen (compositor->modal_plugin) == screen)
+      meta_plugin_get_screen (compositor->modal_plugin) == screen)
     {
-      mutter_end_modal_for_plugin (screen,
+      meta_end_modal_for_plugin (screen,
                                    compositor->modal_plugin,
                                    CurrentTime);
     }
@@ -427,7 +445,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   XCompositeRedirectSubwindows (xdisplay, xroot, CompositeRedirectManual);
   XSync (xdisplay, FALSE);
 
-  if (meta_error_trap_pop_with_return (display, FALSE))
+  if (meta_error_trap_pop_with_return (display))
     {
       g_warning ("Another compositing manager is running on screen %i",
                  screen_number);
@@ -475,7 +493,7 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
 
   XSelectInput (xdisplay, xwin, event_mask);
 
-  info->window_group = mutter_window_group_new (screen);
+  info->window_group = meta_window_group_new (screen);
   info->overlay_group = clutter_group_new ();
   info->hidden_group = clutter_group_new ();
 
@@ -488,18 +506,18 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   clutter_actor_hide (info->hidden_group);
 
   info->plugin_mgr =
-    mutter_plugin_manager_get (screen);
+    meta_plugin_manager_get (screen);
 
-  if (info->plugin_mgr != mutter_plugin_manager_get_default ())
+  if (info->plugin_mgr != meta_plugin_manager_get_default ())
     {
       /* The default plugin manager has been initialized during
        * global preferences load.
        */
-      if (!mutter_plugin_manager_load (info->plugin_mgr))
+      if (!meta_plugin_manager_load (info->plugin_mgr))
         g_critical ("failed to load plugins");
     }
 
-  if (!mutter_plugin_manager_initialize (info->plugin_mgr))
+  if (!meta_plugin_manager_initialize (info->plugin_mgr))
     g_critical ("failed to initialize plugins");
 
   /*
@@ -551,21 +569,21 @@ meta_compositor_add_window (MetaCompositor    *compositor,
 
   add_win (window);
 
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 }
 
 void
 meta_compositor_remove_window (MetaCompositor *compositor,
                                MetaWindow     *window)
 {
-  MutterWindow         *cw     = NULL;
+  MetaWindowActor         *window_actor     = NULL;
 
   DEBUG_TRACE ("meta_compositor_remove_window\n");
-  cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
-  if (!cw)
+  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
+  if (!window_actor)
     return;
 
-  mutter_window_destroy (cw);
+  meta_window_actor_destroy (window_actor);
 }
 
 void
@@ -592,7 +610,10 @@ is_grabbed_event (XEvent *event)
 
   return FALSE;
 }
-
+/**
+ * meta_compositor_process_event: (skip)
+ *
+ */
 gboolean
 meta_compositor_process_event (MetaCompositor *compositor,
                                XEvent         *event,
@@ -600,7 +621,7 @@ meta_compositor_process_event (MetaCompositor *compositor,
 {
   if (compositor->modal_plugin && is_grabbed_event (event))
     {
-      MutterPluginClass *klass = MUTTER_PLUGIN_GET_CLASS (compositor->modal_plugin);
+      MetaPluginClass *klass = META_PLUGIN_GET_CLASS (compositor->modal_plugin);
 
       if (klass->xevent_filter)
         klass->xevent_filter (compositor->modal_plugin, event);
@@ -618,7 +639,7 @@ meta_compositor_process_event (MetaCompositor *compositor,
       screen = meta_window_get_screen (window);
       info = meta_screen_get_compositor_data (screen);
 
-      if (mutter_plugin_manager_xevent_filter (info->plugin_mgr, event))
+      if (meta_plugin_manager_xevent_filter (info->plugin_mgr, event))
 	{
 	  DEBUG_TRACE ("meta_compositor_process_event (filtered,window==NULL)\n");
 	  return TRUE;
@@ -637,7 +658,7 @@ meta_compositor_process_event (MetaCompositor *compositor,
 
 	  info = meta_screen_get_compositor_data (screen);
 
-	  if (mutter_plugin_manager_xevent_filter (info->plugin_mgr, event))
+	  if (meta_plugin_manager_xevent_filter (info->plugin_mgr, event))
 	    {
 	      DEBUG_TRACE ("meta_compositor_process_event (filtered,window==NULL)\n");
 	      return TRUE;
@@ -695,12 +716,12 @@ meta_compositor_show_window (MetaCompositor *compositor,
 			     MetaWindow	    *window,
                              MetaCompEffect  effect)
 {
-  MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
   DEBUG_TRACE ("meta_compositor_show_window\n");
-  if (!cw)
+  if (!window_actor)
     return;
 
-  mutter_window_show (cw, effect);
+  meta_window_actor_show (window_actor, effect);
 }
 
 void
@@ -708,12 +729,12 @@ meta_compositor_hide_window (MetaCompositor *compositor,
                              MetaWindow     *window,
                              MetaCompEffect  effect)
 {
-  MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
   DEBUG_TRACE ("meta_compositor_hide_window\n");
-  if (!cw)
+  if (!window_actor)
     return;
 
-  mutter_window_hide (cw, effect);
+  meta_window_actor_hide (window_actor, effect);
 }
 
 void
@@ -722,12 +743,12 @@ meta_compositor_maximize_window (MetaCompositor    *compositor,
 				 MetaRectangle	   *old_rect,
 				 MetaRectangle	   *new_rect)
 {
-  MutterWindow	 *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
   DEBUG_TRACE ("meta_compositor_maximize_window\n");
-  if (!cw)
+  if (!window_actor)
     return;
 
-  mutter_window_maximize (cw, old_rect, new_rect);
+  meta_window_actor_maximize (window_actor, old_rect, new_rect);
 }
 
 void
@@ -736,12 +757,12 @@ meta_compositor_unmaximize_window (MetaCompositor    *compositor,
 				   MetaRectangle     *old_rect,
 				   MetaRectangle     *new_rect)
 {
-  MutterWindow	 *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
   DEBUG_TRACE ("meta_compositor_unmaximize_window\n");
-  if (!cw)
+  if (!window_actor)
     return;
 
-  mutter_window_unmaximize (cw, old_rect, new_rect);
+  meta_window_actor_unmaximize (window_actor, old_rect, new_rect);
 }
 
 void
@@ -754,7 +775,7 @@ meta_compositor_update_workspace_geometry (MetaCompositor *compositor,
    */
   MetaScreen     *screen = meta_workspace_get_screen (workspace);
   MetaCompScreen *info;
-  MutterPluginManager *mgr;
+  MetaPluginManager *mgr;
 
   DEBUG_TRACE ("meta_compositor_update_workspace_geometry\n");
   info = meta_screen_get_compositor_data (screen);
@@ -763,7 +784,7 @@ meta_compositor_update_workspace_geometry (MetaCompositor *compositor,
   if (!mgr || !workspace)
     return;
 
-  mutter_plugin_manager_update_workspace (mgr, workspace);
+  meta_plugin_manager_update_workspace (mgr, workspace);
 #endif
 }
 
@@ -789,8 +810,7 @@ meta_compositor_switch_workspace (MetaCompositor     *compositor,
   info->switch_workspace_in_progress++;
 
   if (!info->plugin_mgr ||
-      !mutter_plugin_manager_switch_workspace (info->plugin_mgr,
-					       (const GList **)&info->windows,
+      !meta_plugin_manager_switch_workspace (info->plugin_mgr,
 					       from_indx,
 					       to_indx,
 					       direction))
@@ -802,7 +822,7 @@ meta_compositor_switch_workspace (MetaCompositor     *compositor,
        * necessarily change during the window hiding/unhiding, only their
        * relative position toward the destkop window.
        */
-      mutter_finish_workspace_switch (info);
+      meta_finish_workspace_switch (info);
     }
 }
 
@@ -815,9 +835,9 @@ sync_actor_stacking (GList *windows)
 
   for (tmp = g_list_last (windows); tmp != NULL; tmp = tmp->prev)
     {
-      MutterWindow *cw = tmp->data;
+      MetaWindowActor *window_actor = tmp->data;
 
-      clutter_actor_lower_bottom (CLUTTER_ACTOR (cw));
+      clutter_actor_lower_bottom (CLUTTER_ACTOR (window_actor));
     }
 }
 
@@ -839,12 +859,12 @@ meta_compositor_sync_stack (MetaCompositor  *compositor,
 
   /* Sources: first window is the highest */
   stack = g_list_copy (stack); /* The new stack of MetaWindow */
-  old_stack = g_list_reverse (info->windows); /* The old stack of MutterWindow */
+  old_stack = g_list_reverse (info->windows); /* The old stack of MetaWindowActor */
   info->windows = NULL;
 
   while (TRUE)
     {
-      MutterWindow *old_actor = NULL, *stack_actor = NULL, *actor;
+      MetaWindowActor *old_actor = NULL, *stack_actor = NULL, *actor;
       MetaWindow *old_window = NULL, *stack_window = NULL, *window;
 
       /* Find the remaining top actor in our existing stack (ignoring
@@ -852,10 +872,10 @@ meta_compositor_sync_stack (MetaCompositor  *compositor,
       while (old_stack)
         {
           old_actor = old_stack->data;
-          old_window = mutter_window_get_meta_window (old_actor);
+          old_window = meta_window_actor_get_meta_window (old_actor);
 
           if (old_window->hidden &&
-              !mutter_window_effect_in_progress (old_actor))
+              !meta_window_actor_effect_in_progress (old_actor))
             old_stack = g_list_delete_link (old_stack, old_stack);
           else
             break;
@@ -865,10 +885,10 @@ meta_compositor_sync_stack (MetaCompositor  *compositor,
       while (stack)
         {
           stack_window = stack->data;
-          stack_actor = MUTTER_WINDOW (meta_window_get_compositor_private (stack_window));
+          stack_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (stack_window));
           if (!stack_actor)
             {
-              meta_verbose ("Failed to find corresponding MutterWindow "
+              meta_verbose ("Failed to find corresponding MetaWindowActor "
                             "for window %s\n", meta_window_get_description (stack_window));
               stack = g_list_delete_link (stack, stack);
             }
@@ -914,41 +934,41 @@ void
 meta_compositor_window_mapped (MetaCompositor *compositor,
                                MetaWindow     *window)
 {
-  MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
   DEBUG_TRACE ("meta_compositor_window_mapped\n");
-  if (!cw)
+  if (!window_actor)
     return;
 
-  mutter_window_mapped (cw);
+  meta_window_actor_mapped (window_actor);
 }
 
 void
 meta_compositor_window_unmapped (MetaCompositor *compositor,
                                  MetaWindow     *window)
 {
-  MutterWindow *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
+  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
   DEBUG_TRACE ("meta_compositor_window_unmapped\n");
-  if (!cw)
+  if (!window_actor)
     return;
 
-  mutter_window_unmapped (cw);
+  meta_window_actor_unmapped (window_actor);
 }
 
 void
 meta_compositor_sync_window_geometry (MetaCompositor *compositor,
 				      MetaWindow *window)
 {
-  MutterWindow	 *cw = MUTTER_WINDOW (meta_window_get_compositor_private (window));
-  MetaScreen	 *screen = meta_window_get_screen (window);
-  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+  MetaWindowActor *window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
+  MetaScreen      *screen = meta_window_get_screen (window);
+  MetaCompScreen  *info = meta_screen_get_compositor_data (screen);
 
   DEBUG_TRACE ("meta_compositor_sync_window_geometry\n");
   g_return_if_fail (info);
 
-  if (!cw)
+  if (!window_actor)
     return;
 
-  mutter_window_sync_actor_position (cw);
+  meta_window_actor_sync_actor_position (window_actor);
 }
 
 void
@@ -975,11 +995,11 @@ pre_paint_windows (MetaCompScreen *info)
   GList *l;
 
   for (l = info->windows; l; l = l->next)
-    mutter_window_pre_paint (l->data);
+    meta_window_actor_pre_paint (l->data);
 }
 
 static gboolean
-mutter_repaint_func (gpointer data)
+meta_repaint_func (gpointer data)
 {
   MetaCompositor *compositor = data;
   GSList *screens = meta_display_get_screens (compositor->display);
@@ -998,6 +1018,30 @@ mutter_repaint_func (gpointer data)
   return TRUE;
 }
 
+static void
+on_shadow_factory_changed (MetaShadowFactory *factory,
+                           MetaCompositor    *compositor)
+{
+  GSList *screens = meta_display_get_screens (compositor->display);
+  GList *l;
+  GSList *sl;
+
+  for (sl = screens; sl; sl = sl->next)
+    {
+      MetaScreen *screen = sl->data;
+      MetaCompScreen *info = meta_screen_get_compositor_data (screen);
+      if (!info)
+        continue;
+
+      for (l = info->windows; l; l = l->next)
+        meta_window_actor_invalidate_shadow (l->data);
+    }
+}
+
+/**
+ * meta_compositor_new: (skip)
+ *
+ */
 MetaCompositor *
 meta_compositor_new (MetaDisplay *display)
 {
@@ -1017,26 +1061,35 @@ meta_compositor_new (MetaDisplay *display)
 
   compositor->display = display;
 
-  if (g_getenv("MUTTER_DISABLE_MIPMAPS"))
+  if (g_getenv("META_DISABLE_MIPMAPS"))
     compositor->no_mipmaps = TRUE;
 
   meta_verbose ("Creating %d atoms\n", (int) G_N_ELEMENTS (atom_names));
   XInternAtoms (xdisplay, atom_names, G_N_ELEMENTS (atom_names),
                 False, atoms);
 
+  g_signal_connect (meta_shadow_factory_get_default (),
+                    "changed",
+                    G_CALLBACK (on_shadow_factory_changed),
+                    compositor);
+
   compositor->atom_x_root_pixmap = atoms[0];
   compositor->atom_x_set_root = atoms[1];
   compositor->atom_net_wm_window_opacity = atoms[2];
 
-  compositor->repaint_func_id = clutter_threads_add_repaint_func (mutter_repaint_func,
+  compositor->repaint_func_id = clutter_threads_add_repaint_func (meta_repaint_func,
                                                                   compositor,
                                                                   NULL);
 
   return compositor;
 }
 
+/**
+ * meta_get_overlay_window: (skip)
+ *
+ */
 Window
-mutter_get_overlay_window (MetaScreen *screen)
+meta_get_overlay_window (MetaScreen *screen)
 {
   MetaCompScreen *info = meta_screen_get_compositor_data (screen);
 

src/compositor/meta-module.c

@@ -21,8 +21,8 @@
  * 02111-1307, USA.
  */
 
-#include "mutter-plugin.h"
-#include "mutter-module.h"
+#include "meta-plugin.h"
+#include "meta-module.h"
 
 #include <gmodule.h>
 
@@ -32,23 +32,23 @@ enum
   PROP_PATH,
 };
 
-struct _MutterModulePrivate
+struct _MetaModulePrivate
 {
   GModule      *lib;
   gchar        *path;
   GType         plugin_type;
 };
 
-#define MUTTER_MODULE_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUTTER_TYPE_MODULE, MutterModulePrivate))
+#define META_MODULE_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_MODULE, MetaModulePrivate))
 
-G_DEFINE_TYPE (MutterModule, mutter_module, G_TYPE_TYPE_MODULE);
+G_DEFINE_TYPE (MetaModule, meta_module, G_TYPE_TYPE_MODULE);
 
 static gboolean
-mutter_module_load (GTypeModule *gmodule)
+meta_module_load (GTypeModule *gmodule)
 {
-  MutterModulePrivate  *priv = MUTTER_MODULE (gmodule)->priv;
-  MutterPluginVersion  *info = NULL;
+  MetaModulePrivate  *priv = META_MODULE (gmodule)->priv;
+  MetaPluginVersion  *info = NULL;
   GType                (*register_type) (GTypeModule *) = NULL;
 
   if (priv->lib && priv->plugin_type)
@@ -64,9 +64,9 @@ mutter_module_load (GTypeModule *gmodule)
       return FALSE;
     }
 
-  if (g_module_symbol (priv->lib, "mutter_plugin_version",
+  if (g_module_symbol (priv->lib, "meta_plugin_version",
                        (gpointer *)(void *)&info) &&
-      g_module_symbol (priv->lib, "mutter_plugin_register_type",
+      g_module_symbol (priv->lib, "meta_plugin_register_type",
 		       (gpointer *)(void *)&register_type) &&
       info && register_type)
     {
@@ -97,9 +97,9 @@ mutter_module_load (GTypeModule *gmodule)
 }
 
 static void
-mutter_module_unload (GTypeModule *gmodule)
+meta_module_unload (GTypeModule *gmodule)
 {
-  MutterModulePrivate *priv = MUTTER_MODULE (gmodule)->priv;
+  MetaModulePrivate *priv = META_MODULE (gmodule)->priv;
 
   g_module_close (priv->lib);
 
@@ -108,29 +108,29 @@ mutter_module_unload (GTypeModule *gmodule)
 }
 
 static void
-mutter_module_dispose (GObject *object)
+meta_module_dispose (GObject *object)
 {
-  G_OBJECT_CLASS (mutter_module_parent_class)->dispose (object);
+  G_OBJECT_CLASS (meta_module_parent_class)->dispose (object);
 }
 
 static void
-mutter_module_finalize (GObject *object)
+meta_module_finalize (GObject *object)
 {
-  MutterModulePrivate *priv = MUTTER_MODULE (object)->priv;
+  MetaModulePrivate *priv = META_MODULE (object)->priv;
 
   g_free (priv->path);
   priv->path = NULL;
 
-  G_OBJECT_CLASS (mutter_module_parent_class)->finalize (object);
+  G_OBJECT_CLASS (meta_module_parent_class)->finalize (object);
 }
 
 static void
-mutter_module_set_property (GObject      *object,
-			    guint         prop_id,
-			    const GValue *value,
-			    GParamSpec   *pspec)
+meta_module_set_property (GObject      *object,
+                          guint         prop_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
 {
-  MutterModulePrivate *priv = MUTTER_MODULE (object)->priv;
+  MetaModulePrivate *priv = META_MODULE (object)->priv;
 
   switch (prop_id)
     {
@@ -145,12 +145,12 @@ mutter_module_set_property (GObject      *object,
 }
 
 static void
-mutter_module_get_property (GObject    *object,
-			    guint       prop_id,
-			    GValue     *value,
-			    GParamSpec *pspec)
+meta_module_get_property (GObject    *object,
+                          guint       prop_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
 {
-  MutterModulePrivate *priv = MUTTER_MODULE (object)->priv;
+  MetaModulePrivate *priv = META_MODULE (object)->priv;
 
   switch (prop_id)
     {
@@ -164,18 +164,18 @@ mutter_module_get_property (GObject    *object,
 }
 
 static void
-mutter_module_class_init (MutterModuleClass *klass)
+meta_module_class_init (MetaModuleClass *klass)
 {
   GObjectClass     *gobject_class = G_OBJECT_CLASS (klass);
   GTypeModuleClass *gmodule_class = G_TYPE_MODULE_CLASS (klass);
 
-  gobject_class->finalize     = mutter_module_finalize;
-  gobject_class->dispose      = mutter_module_dispose;
-  gobject_class->set_property = mutter_module_set_property;
-  gobject_class->get_property = mutter_module_get_property;
+  gobject_class->finalize     = meta_module_finalize;
+  gobject_class->dispose      = meta_module_dispose;
+  gobject_class->set_property = meta_module_set_property;
+  gobject_class->get_property = meta_module_get_property;
 
-  gmodule_class->load         = mutter_module_load;
-  gmodule_class->unload       = mutter_module_unload;
+  gmodule_class->load         = meta_module_load;
+  gmodule_class->unload       = meta_module_unload;
 
   g_object_class_install_property (gobject_class,
 				   PROP_PATH,
@@ -186,22 +186,22 @@ mutter_module_class_init (MutterModuleClass *klass)
 							G_PARAM_READWRITE |
 						      G_PARAM_CONSTRUCT_ONLY));
 
-  g_type_class_add_private (gobject_class, sizeof (MutterModulePrivate));
+  g_type_class_add_private (gobject_class, sizeof (MetaModulePrivate));
 }
 
 static void
-mutter_module_init (MutterModule *self)
+meta_module_init (MetaModule *self)
 {
-  MutterModulePrivate *priv;
+  MetaModulePrivate *priv;
 
-  self->priv = priv = MUTTER_MODULE_GET_PRIVATE (self);
+  self->priv = priv = META_MODULE_GET_PRIVATE (self);
 
 }
 
 GType
-mutter_module_get_plugin_type (MutterModule *module)
+meta_module_get_plugin_type (MetaModule *module)
 {
-  MutterModulePrivate *priv = MUTTER_MODULE (module)->priv;
+  MetaModulePrivate *priv = META_MODULE (module)->priv;
 
   return priv->plugin_type;
 }

src/compositor/meta-module.h

@@ -21,37 +21,37 @@
  * 02111-1307, USA.
  */
 
-#ifndef MUTTER_MODULE_H_
-#define MUTTER_MODULE_H_
+#ifndef META_MODULE_H_
+#define META_MODULE_H_
 
 #include <glib-object.h>
 
-#define MUTTER_TYPE_MODULE            (mutter_module_get_type ())
-#define MUTTER_MODULE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MUTTER_TYPE_MODULE, MutterModule))
-#define MUTTER_MODULE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MUTTER_TYPE_MODULE, MutterModuleClass))
-#define MUTTER_IS_MODULE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MUTTER_MODULE_TYPE))
-#define MUTTER_IS_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MUTTER_TYPE_MODULE))
-#define MUTTER_MODULE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MUTTER_TYPE_MODULE, MutterModuleClass))
+#define META_TYPE_MODULE            (meta_module_get_type ())
+#define META_MODULE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_MODULE, MetaModule))
+#define META_MODULE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_MODULE, MetaModuleClass))
+#define META_IS_MODULE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_MODULE_TYPE))
+#define META_IS_MODULE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_MODULE))
+#define META_MODULE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_MODULE, MetaModuleClass))
 
-typedef struct _MutterModule        MutterModule;
-typedef struct _MutterModuleClass   MutterModuleClass;
-typedef struct _MutterModulePrivate MutterModulePrivate;
+typedef struct _MetaModule        MetaModule;
+typedef struct _MetaModuleClass   MetaModuleClass;
+typedef struct _MetaModulePrivate MetaModulePrivate;
 
-struct _MutterModule
+struct _MetaModule
 {
   GTypeModule parent;
 
-  MutterModulePrivate *priv;
+  MetaModulePrivate *priv;
 };
 
-struct _MutterModuleClass
+struct _MetaModuleClass
 {
   GTypeModuleClass parent_class;
 };
 
 
-GType mutter_module_get_type (void);
+GType meta_module_get_type (void);
 
-GType mutter_module_get_plugin_type (MutterModule *module);
+GType meta_module_get_plugin_type (MetaModule *module);
 
 #endif

src/compositor/meta-plugin-manager.c

@@ -23,11 +23,11 @@
 
 #include "config.h"
 #include "compositor-private.h"
-#include "mutter-plugin-manager.h"
+#include "meta-plugin-manager.h"
 #include "prefs.h"
 #include "errors.h"
 #include "workspace.h"
-#include "mutter-module.h"
+#include "meta-module.h"
 #include "../core/window-private.h"
 
 #include <string.h>
@@ -46,16 +46,16 @@ static GHashTable *plugin_modules = NULL;
  * have one plugin manager and only make the plugins per-screen.)
  */
 
-static MutterPluginManager *default_plugin_manager;
+static MetaPluginManager *default_plugin_manager;
 
-static gboolean mutter_plugin_manager_reload (MutterPluginManager *plugin_mgr);
+static gboolean meta_plugin_manager_reload (MetaPluginManager *plugin_mgr);
 
-struct MutterPluginManager
+struct MetaPluginManager
 {
   MetaScreen   *screen;
 
-  GList /* MutterPlugin */       *plugins;  /* TODO -- maybe use hash table */
-  GList                          *unload;  /* Plugins that are disabled and pending unload */
+  GList /* MetaPlugin */       *plugins;  /* TODO -- maybe use hash table */
+  GList                        *unload;  /* Plugins that are disabled and pending unload */
 
   guint         idle_unload_id;
 };
@@ -64,13 +64,13 @@ struct MutterPluginManager
  * Checks that the plugin is compatible with the WM and sets up the plugin
  * struct.
  */
-static MutterPlugin *
-mutter_plugin_load (MutterPluginManager *mgr,
-                    MutterModule        *module,
-                    const gchar         *params)
+static MetaPlugin *
+meta_plugin_load (MetaPluginManager *mgr,
+                  MetaModule        *module,
+                  const gchar       *params)
 {
-  MutterPlugin *plugin = NULL;
-  GType         plugin_type = mutter_module_get_plugin_type (module);
+  MetaPlugin *plugin = NULL;
+  GType         plugin_type = meta_module_get_plugin_type (module);
 
   if (!plugin_type)
     {
@@ -91,9 +91,9 @@ mutter_plugin_load (MutterPluginManager *mgr,
  * removal later.
  */
 static gboolean
-mutter_plugin_unload (MutterPlugin *plugin)
+meta_plugin_unload (MetaPlugin *plugin)
 {
-  if (mutter_plugin_running (plugin))
+  if (meta_plugin_running (plugin))
     {
       g_object_set (plugin, "disabled", TRUE, NULL);
       return FALSE;
@@ -109,16 +109,16 @@ mutter_plugin_unload (MutterPlugin *plugin)
  * pending for removal.
  */
 static gboolean
-mutter_plugin_manager_idle_unload (MutterPluginManager *plugin_mgr)
+meta_plugin_manager_idle_unload (MetaPluginManager *plugin_mgr)
 {
   GList *l = plugin_mgr->unload;
   gboolean dont_remove = TRUE;
 
   while (l)
     {
-      MutterPlugin *plugin = l->data;
+      MetaPlugin *plugin = l->data;
 
-      if (mutter_plugin_unload (plugin))
+      if (meta_plugin_unload (plugin))
         {
           /* Remove from list */
           GList *p = l->prev;
@@ -154,23 +154,23 @@ mutter_plugin_manager_idle_unload (MutterPluginManager *plugin_mgr)
  * Unloads all plugins
  */
 static void
-mutter_plugin_manager_unload (MutterPluginManager *plugin_mgr)
+meta_plugin_manager_unload (MetaPluginManager *plugin_mgr)
 {
   GList *plugins = plugin_mgr->plugins;
 
   while (plugins)
     {
-      MutterPlugin *plugin = plugins->data;
+      MetaPlugin *plugin = plugins->data;
 
       /* If the plugin could not be removed, move it to the unload list */
-      if (!mutter_plugin_unload (plugin))
+      if (!meta_plugin_unload (plugin))
         {
           plugin_mgr->unload = g_list_prepend (plugin_mgr->unload, plugin);
 
           if (!plugin_mgr->idle_unload_id)
             {
               plugin_mgr->idle_unload_id = g_idle_add ((GSourceFunc)
-                            mutter_plugin_manager_idle_unload,
+                            meta_plugin_manager_idle_unload,
                             plugin_mgr);
             }
         }
@@ -186,21 +186,21 @@ static void
 prefs_changed_callback (MetaPreference pref,
                         void          *data)
 {
-  MutterPluginManager *plugin_mgr = data;
+  MetaPluginManager *plugin_mgr = data;
 
   if (pref == META_PREF_CLUTTER_PLUGINS)
     {
-      mutter_plugin_manager_reload (plugin_mgr);
+      meta_plugin_manager_reload (plugin_mgr);
     }
 }
 
-static MutterModule *
-mutter_plugin_manager_get_module (const gchar *path)
+static MetaModule *
+meta_plugin_manager_get_module (const gchar *path)
 {
-  MutterModule *module = g_hash_table_lookup (plugin_modules, path);
+  MetaModule *module = g_hash_table_lookup (plugin_modules, path);
 
   if (!module &&
-      (module = g_object_new (MUTTER_TYPE_MODULE, "path", path, NULL)))
+      (module = g_object_new (META_TYPE_MODULE, "path", path, NULL)))
     {
       g_hash_table_insert (plugin_modules, g_strdup (path), module);
     }
@@ -212,7 +212,7 @@ mutter_plugin_manager_get_module (const gchar *path)
  * Loads all plugins listed in gconf registry.
  */
 gboolean
-mutter_plugin_manager_load (MutterPluginManager *plugin_mgr)
+meta_plugin_manager_load (MetaPluginManager *plugin_mgr)
 {
   const gchar *dpath = MUTTER_PLUGIN_DIR "/";
   GSList      *plugins, *fallback = NULL;
@@ -237,7 +237,7 @@ mutter_plugin_manager_load (MutterPluginManager *plugin_mgr)
 
       if (plugin_string)
         {
-          MutterModule *module;
+          MetaModule *module;
           gchar        *path;
 
           params = strchr (plugin_string, ':');
@@ -253,7 +253,7 @@ mutter_plugin_manager_load (MutterPluginManager *plugin_mgr)
           else
             path = g_strconcat (dpath, plugin_string, ".so", NULL);
 
-          module = mutter_plugin_manager_get_module (path);
+          module = meta_plugin_manager_get_module (path);
 
           if (module)
             {
@@ -270,7 +270,7 @@ mutter_plugin_manager_load (MutterPluginManager *plugin_mgr)
 
               if (use_succeeded)
                 {
-                  MutterPlugin *plugin = mutter_plugin_load (plugin_mgr, module, params);
+                  MetaPlugin *plugin = meta_plugin_load (plugin_mgr, module, params);
 
                   if (plugin)
                     plugin_mgr->plugins = g_list_prepend (plugin_mgr->plugins, plugin);
@@ -305,14 +305,14 @@ mutter_plugin_manager_load (MutterPluginManager *plugin_mgr)
 }
 
 gboolean
-mutter_plugin_manager_initialize (MutterPluginManager *plugin_mgr)
+meta_plugin_manager_initialize (MetaPluginManager *plugin_mgr)
 {
   GList *iter;
 
   for (iter = plugin_mgr->plugins; iter; iter = iter->next)
     {
-      MutterPlugin *plugin = (MutterPlugin*) iter->data;
-      MutterPluginClass *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+      MetaPlugin *plugin = (MetaPlugin*) iter->data;
+      MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
 
       g_object_set (plugin,
                     "screen", plugin_mgr->screen,
@@ -329,7 +329,7 @@ mutter_plugin_manager_initialize (MutterPluginManager *plugin_mgr)
  * Reloads all plugins
  */
 static gboolean
-mutter_plugin_manager_reload (MutterPluginManager *plugin_mgr)
+meta_plugin_manager_reload (MetaPluginManager *plugin_mgr)
 {
   /* TODO -- brute force; should we build a list of plugins to load and list of
    * plugins to unload? We are probably not going to have large numbers of
@@ -337,16 +337,16 @@ mutter_plugin_manager_reload (MutterPluginManager *plugin_mgr)
    */
 
   /* Prevent stale grabs on unloaded plugins */
-  mutter_check_end_modal (plugin_mgr->screen);
+  meta_check_end_modal (plugin_mgr->screen);
 
-  mutter_plugin_manager_unload (plugin_mgr);
-  return mutter_plugin_manager_load (plugin_mgr);
+  meta_plugin_manager_unload (plugin_mgr);
+  return meta_plugin_manager_load (plugin_mgr);
 }
 
-static MutterPluginManager *
-mutter_plugin_manager_new (MetaScreen *screen)
+static MetaPluginManager *
+meta_plugin_manager_new (MetaScreen *screen)
 {
-  MutterPluginManager *plugin_mgr;
+  MetaPluginManager *plugin_mgr;
 
   if (!plugin_modules)
     {
@@ -354,77 +354,91 @@ mutter_plugin_manager_new (MetaScreen *screen)
                                               NULL);
     }
 
-  plugin_mgr = g_new0 (MutterPluginManager, 1);
+  plugin_mgr = g_new0 (MetaPluginManager, 1);
 
   plugin_mgr->screen        = screen;
 
   if (screen)
-    g_object_set_data (G_OBJECT (screen), "mutter-plugin-manager", plugin_mgr);
+    g_object_set_data (G_OBJECT (screen), "meta-plugin-manager", plugin_mgr);
 
   return plugin_mgr;
 }
 
-MutterPluginManager *
-mutter_plugin_manager_get_default (void)
+MetaPluginManager *
+meta_plugin_manager_get_default (void)
 {
   if (!default_plugin_manager)
     {
-      default_plugin_manager = mutter_plugin_manager_new (NULL);
+      default_plugin_manager = meta_plugin_manager_new (NULL);
     }
 
   return default_plugin_manager;
 }
 
-MutterPluginManager *
-mutter_plugin_manager_get (MetaScreen *screen)
+MetaPluginManager *
+meta_plugin_manager_get (MetaScreen *screen)
 {
-  MutterPluginManager *plugin_mgr;
+  MetaPluginManager *plugin_mgr;
 
-  plugin_mgr = g_object_get_data (G_OBJECT (screen), "mutter-plugin-manager");
+  plugin_mgr = g_object_get_data (G_OBJECT (screen), "meta-plugin-manager");
   if (plugin_mgr)
     return plugin_mgr;
 
   if (!default_plugin_manager)
-    mutter_plugin_manager_get_default ();
+    meta_plugin_manager_get_default ();
 
   if (!default_plugin_manager->screen)
     {
       /* The default plugin manager is so far unused, we can recycle it */
       default_plugin_manager->screen = screen;
-      g_object_set_data (G_OBJECT (screen), "mutter-plugin-manager", default_plugin_manager);
+      g_object_set_data (G_OBJECT (screen), "meta-plugin-manager", default_plugin_manager);
 
       return default_plugin_manager;
     }
   else
     {
-      return mutter_plugin_manager_new (screen);
+      return meta_plugin_manager_new (screen);
     }
 }
 
 static void
-mutter_plugin_manager_kill_effect (MutterPluginManager *plugin_mgr,
-                                   MutterWindow        *actor,
-                                   unsigned long        events)
+meta_plugin_manager_kill_window_effects (MetaPluginManager *plugin_mgr,
+                                         MetaWindowActor   *actor)
 {
   GList *l = plugin_mgr->plugins;
 
   while (l)
     {
-      MutterPlugin        *plugin = l->data;
-      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+      MetaPlugin        *plugin = l->data;
+      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
 
-      if (!mutter_plugin_disabled (plugin)
-	  && (mutter_plugin_features (plugin) & events)
-	  && klass->kill_effect)
-        klass->kill_effect (plugin, actor, events);
+      if (!meta_plugin_disabled (plugin)
+	  && klass->kill_window_effects)
+        klass->kill_window_effects (plugin, actor);
+
+      l = l->next;
+    }
+}
+
+static void
+meta_plugin_manager_kill_switch_workspace (MetaPluginManager *plugin_mgr)
+{
+  GList *l = plugin_mgr->plugins;
+
+  while (l)
+    {
+      MetaPlugin        *plugin = l->data;
+      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
+
+      if (!meta_plugin_disabled (plugin)
+          && (meta_plugin_features (plugin) & META_PLUGIN_SWITCH_WORKSPACE)
+	  && klass->kill_switch_workspace)
+        klass->kill_switch_workspace (plugin);
 
       l = l->next;
     }
 }
 
-#define ALL_BUT_SWITCH \
-  MUTTER_PLUGIN_ALL_EFFECTS & \
-  ~MUTTER_PLUGIN_SWITCH_WORKSPACE
 /*
  * Public method that the compositor hooks into for events that require
  * no additional parameters.
@@ -435,9 +449,9 @@ mutter_plugin_manager_kill_effect (MutterPluginManager *plugin_mgr,
  * appropriate post-effect cleanup is carried out.
  */
 gboolean
-mutter_plugin_manager_event_simple (MutterPluginManager *plugin_mgr,
-                                    MutterWindow        *actor,
-                                    unsigned long        event)
+meta_plugin_manager_event_simple (MetaPluginManager *plugin_mgr,
+                                  MetaWindowActor   *actor,
+                                  unsigned long      event)
 {
   GList *l = plugin_mgr->plugins;
   gboolean retval = FALSE;
@@ -448,44 +462,42 @@ mutter_plugin_manager_event_simple (MutterPluginManager *plugin_mgr,
 
   while (l)
     {
-      MutterPlugin        *plugin = l->data;
-      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+      MetaPlugin        *plugin = l->data;
+      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
 
-      if (!mutter_plugin_disabled (plugin) &&
-          (mutter_plugin_features (plugin) & event))
+      if (!meta_plugin_disabled (plugin) &&
+          (meta_plugin_features (plugin) & event))
         {
           retval = TRUE;
 
           switch (event)
             {
-            case MUTTER_PLUGIN_MINIMIZE:
+            case META_PLUGIN_MINIMIZE:
               if (klass->minimize)
                 {
-                  mutter_plugin_manager_kill_effect (
+                  meta_plugin_manager_kill_window_effects (
 		      plugin_mgr,
-		      actor,
-		      ALL_BUT_SWITCH);
+		      actor);
 
-                  _mutter_plugin_effect_started (plugin);
+                  _meta_plugin_effect_started (plugin);
                   klass->minimize (plugin, actor);
                 }
               break;
-            case MUTTER_PLUGIN_MAP:
+            case META_PLUGIN_MAP:
               if (klass->map)
                 {
-                  mutter_plugin_manager_kill_effect (
+                  meta_plugin_manager_kill_window_effects (
 		      plugin_mgr,
-		      actor,
-		      ALL_BUT_SWITCH);
+		      actor);
 
-                  _mutter_plugin_effect_started (plugin);
+                  _meta_plugin_effect_started (plugin);
                   klass->map (plugin, actor);
                 }
               break;
-            case MUTTER_PLUGIN_DESTROY:
+            case META_PLUGIN_DESTROY:
               if (klass->destroy)
                 {
-                  _mutter_plugin_effect_started (plugin);
+                  _meta_plugin_effect_started (plugin);
                   klass->destroy (plugin, actor);
                 }
               break;
@@ -510,13 +522,13 @@ mutter_plugin_manager_event_simple (MutterPluginManager *plugin_mgr,
  * appropriate post-effect cleanup is carried out.
  */
 gboolean
-mutter_plugin_manager_event_maximize (MutterPluginManager *plugin_mgr,
-                                      MutterWindow        *actor,
-                                      unsigned long        event,
-                                      gint                 target_x,
-                                      gint                 target_y,
-                                      gint                 target_width,
-                                      gint                 target_height)
+meta_plugin_manager_event_maximize (MetaPluginManager *plugin_mgr,
+                                    MetaWindowActor   *actor,
+                                    unsigned long      event,
+                                    gint               target_x,
+                                    gint               target_y,
+                                    gint               target_width,
+                                    gint               target_height)
 {
   GList *l = plugin_mgr->plugins;
   gboolean retval = FALSE;
@@ -527,39 +539,37 @@ mutter_plugin_manager_event_maximize (MutterPluginManager *plugin_mgr,
 
   while (l)
     {
-      MutterPlugin        *plugin = l->data;
-      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+      MetaPlugin        *plugin = l->data;
+      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
 
-      if (!mutter_plugin_disabled (plugin) &&
-          (mutter_plugin_features (plugin) & event))
+      if (!meta_plugin_disabled (plugin) &&
+          (meta_plugin_features (plugin) & event))
         {
           retval = TRUE;
 
           switch (event)
             {
-            case MUTTER_PLUGIN_MAXIMIZE:
+            case META_PLUGIN_MAXIMIZE:
               if (klass->maximize)
                 {
-                  mutter_plugin_manager_kill_effect (
+                  meta_plugin_manager_kill_window_effects (
 		      plugin_mgr,
-		      actor,
-		      ALL_BUT_SWITCH);
+		      actor);
 
-                  _mutter_plugin_effect_started (plugin);
+                  _meta_plugin_effect_started (plugin);
                   klass->maximize (plugin, actor,
                                    target_x, target_y,
                                    target_width, target_height);
                 }
               break;
-            case MUTTER_PLUGIN_UNMAXIMIZE:
+            case META_PLUGIN_UNMAXIMIZE:
               if (klass->unmaximize)
                 {
-                  mutter_plugin_manager_kill_effect (
+                  meta_plugin_manager_kill_window_effects (
 		      plugin_mgr,
-		      actor,
-		      ALL_BUT_SWITCH);
+		      actor);
 
-                  _mutter_plugin_effect_started (plugin);
+                  _meta_plugin_effect_started (plugin);
                   klass->unmaximize (plugin, actor,
                                      target_x, target_y,
                                      target_width, target_height);
@@ -585,11 +595,10 @@ mutter_plugin_manager_event_maximize (MutterPluginManager *plugin_mgr,
  * appropriate post-effect cleanup is carried out.
  */
 gboolean
-mutter_plugin_manager_switch_workspace (MutterPluginManager *plugin_mgr,
-                                        const GList        **actors,
-                                        gint                 from,
-                                        gint                 to,
-                                        MetaMotionDirection  direction)
+meta_plugin_manager_switch_workspace (MetaPluginManager   *plugin_mgr,
+                                      gint                 from,
+                                      gint                 to,
+                                      MetaMotionDirection  direction)
 {
   GList *l = plugin_mgr->plugins;
   gboolean retval = FALSE;
@@ -600,23 +609,19 @@ mutter_plugin_manager_switch_workspace (MutterPluginManager *plugin_mgr,
 
   while (l)
     {
-      MutterPlugin        *plugin = l->data;
-      MutterPluginClass   *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+      MetaPlugin        *plugin = l->data;
+      MetaPluginClass   *klass = META_PLUGIN_GET_CLASS (plugin);
 
-      if (!mutter_plugin_disabled (plugin) &&
-          (mutter_plugin_features (plugin) & MUTTER_PLUGIN_SWITCH_WORKSPACE) &&
-          (actors && *actors))
+      if (!meta_plugin_disabled (plugin) &&
+          (meta_plugin_features (plugin) & META_PLUGIN_SWITCH_WORKSPACE))
         {
           if (klass->switch_workspace)
             {
               retval = TRUE;
-              mutter_plugin_manager_kill_effect (
-		  plugin_mgr,
-		  MUTTER_WINDOW ((*actors)->data),
-		  MUTTER_PLUGIN_SWITCH_WORKSPACE);
+              meta_plugin_manager_kill_switch_workspace (plugin_mgr);
 
-              _mutter_plugin_effect_started (plugin);
-              klass->switch_workspace (plugin, actors, from, to, direction);
+              _meta_plugin_effect_started (plugin);
+              klass->switch_workspace (plugin, from, to, direction);
             }
         }
 
@@ -635,8 +640,8 @@ mutter_plugin_manager_switch_workspace (MutterPluginManager *plugin_mgr,
  * appropriate post-effect cleanup is carried out.
  */
 gboolean
-mutter_plugin_manager_xevent_filter (MutterPluginManager *plugin_mgr,
-                                     XEvent              *xev)
+meta_plugin_manager_xevent_filter (MetaPluginManager *plugin_mgr,
+                                   XEvent            *xev)
 {
   GList *l;
   gboolean have_plugin_xevent_func;
@@ -666,8 +671,8 @@ mutter_plugin_manager_xevent_filter (MutterPluginManager *plugin_mgr,
 
   while (l)
     {
-      MutterPlugin      *plugin = l->data;
-      MutterPluginClass *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+      MetaPlugin      *plugin = l->data;
+      MetaPluginClass *klass = META_PLUGIN_GET_CLASS (plugin);
 
       if (klass->xevent_filter)
         {

src/compositor/meta-plugin-manager.h

@@ -0,0 +1,78 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (c) 2008 Intel Corp.
+ *
+ * Author: Tomas Frydrych <tf@linux.intel.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_PLUGIN_MANAGER_H_
+#define META_PLUGIN_MANAGER_H_
+
+#include "types.h"
+#include "screen.h"
+
+#define  META_PLUGIN_FROM_MANAGER_
+#include "meta-plugin.h"
+#undef   META_PLUGIN_FROM_MANAGER_
+
+#define META_PLUGIN_MINIMIZE         (1<<0)
+#define META_PLUGIN_MAXIMIZE         (1<<1)
+#define META_PLUGIN_UNMAXIMIZE       (1<<2)
+#define META_PLUGIN_MAP              (1<<3)
+#define META_PLUGIN_DESTROY          (1<<4)
+#define META_PLUGIN_SWITCH_WORKSPACE (1<<5)
+
+#define META_PLUGIN_ALL_EFFECTS      (~0)
+
+/**
+ * MetaPluginManager: (skip)
+ *
+ */
+typedef struct MetaPluginManager MetaPluginManager;
+
+MetaPluginManager * meta_plugin_manager_get         (MetaScreen *screen);
+MetaPluginManager * meta_plugin_manager_get_default (void);
+
+gboolean meta_plugin_manager_load         (MetaPluginManager *mgr);
+gboolean meta_plugin_manager_initialize   (MetaPluginManager *plugin_mgr);
+gboolean meta_plugin_manager_event_simple (MetaPluginManager *mgr,
+                                           MetaWindowActor   *actor,
+                                           unsigned long      event);
+
+gboolean meta_plugin_manager_event_maximize    (MetaPluginManager *mgr,
+                                                MetaWindowActor   *actor,
+                                                unsigned long      event,
+                                                gint               target_x,
+                                                gint               target_y,
+                                                gint               target_width,
+                                                gint               target_height);
+void     meta_plugin_manager_update_workspaces (MetaPluginManager *mgr);
+
+void meta_plugin_manager_update_workspace (MetaPluginManager *mgr,
+                                           MetaWorkspace     *w);
+
+gboolean meta_plugin_manager_switch_workspace (MetaPluginManager   *mgr,
+                                               gint                 from,
+                                               gint                 to,
+                                               MetaMotionDirection  direction);
+
+gboolean meta_plugin_manager_xevent_filter (MetaPluginManager *mgr,
+                                            XEvent            *xev);
+
+#endif

src/compositor/meta-plugin.c

@@ -21,7 +21,7 @@
  * 02111-1307, USA.
  */
 
-#include "mutter-plugin.h"
+#include "meta-plugin.h"
 #include "screen.h"
 #include "display.h"
 
@@ -32,12 +32,12 @@
 #include <clutter/x11/clutter-x11.h>
 
 #include "compositor-private.h"
-#include "mutter-window-private.h"
+#include "meta-window-actor-private.h"
 
-G_DEFINE_ABSTRACT_TYPE (MutterPlugin, mutter_plugin, G_TYPE_OBJECT);
+G_DEFINE_ABSTRACT_TYPE (MetaPlugin, meta_plugin, G_TYPE_OBJECT);
 
-#define MUTTER_PLUGIN_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUTTER_TYPE_PLUGIN, MutterPluginPrivate))
+#define META_PLUGIN_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_PLUGIN, MetaPluginPrivate))
 
 enum
 {
@@ -49,7 +49,7 @@ enum
   PROP_DEBUG_MODE,
 };
 
-struct _MutterPluginPrivate
+struct _MetaPluginPrivate
 {
   MetaScreen   *screen;
   gchar        *params;
@@ -62,51 +62,51 @@ struct _MutterPluginPrivate
 };
 
 static void
-mutter_plugin_dispose (GObject *object)
+meta_plugin_dispose (GObject *object)
 {
-  G_OBJECT_CLASS (mutter_plugin_parent_class)->dispose (object);
+  G_OBJECT_CLASS (meta_plugin_parent_class)->dispose (object);
 }
 
 static void
-mutter_plugin_finalize (GObject *object)
+meta_plugin_finalize (GObject *object)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (object)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (object)->priv;
 
   g_free (priv->params);
   priv->params = NULL;
 
-  G_OBJECT_CLASS (mutter_plugin_parent_class)->finalize (object);
+  G_OBJECT_CLASS (meta_plugin_parent_class)->finalize (object);
 }
 
 static void
-mutter_plugin_parse_params (MutterPlugin *plugin)
+meta_plugin_parse_params (MetaPlugin *plugin)
 {
   char                  *p;
   gulong                features = 0;
-  MutterPluginPrivate  *priv     = plugin->priv;
-  MutterPluginClass    *klass    = MUTTER_PLUGIN_GET_CLASS (plugin);
+  MetaPluginPrivate  *priv     = plugin->priv;
+  MetaPluginClass    *klass    = META_PLUGIN_GET_CLASS (plugin);
 
 /*
  * Feature flags: identify events that the plugin can handle; a plugin can
  * handle one or more events.
  */
   if (klass->minimize)
-    features |= MUTTER_PLUGIN_MINIMIZE;
+    features |= META_PLUGIN_MINIMIZE;
 
   if (klass->maximize)
-    features |= MUTTER_PLUGIN_MAXIMIZE;
+    features |= META_PLUGIN_MAXIMIZE;
 
   if (klass->unmaximize)
-    features |= MUTTER_PLUGIN_UNMAXIMIZE;
+    features |= META_PLUGIN_UNMAXIMIZE;
 
   if (klass->map)
-    features |= MUTTER_PLUGIN_MAP;
+    features |= META_PLUGIN_MAP;
 
   if (klass->destroy)
-    features |= MUTTER_PLUGIN_DESTROY;
+    features |= META_PLUGIN_DESTROY;
 
   if (klass->switch_workspace)
-    features |= MUTTER_PLUGIN_SWITCH_WORKSPACE;
+    features |= META_PLUGIN_SWITCH_WORKSPACE;
 
   if (priv->params)
     {
@@ -122,22 +122,22 @@ mutter_plugin_parse_params (MutterPlugin *plugin)
             *p = 0;
 
           if (strstr (d, "minimize"))
-            features &= ~ MUTTER_PLUGIN_MINIMIZE;
+            features &= ~ META_PLUGIN_MINIMIZE;
 
           if (strstr (d, "maximize"))
-            features &= ~ MUTTER_PLUGIN_MAXIMIZE;
+            features &= ~ META_PLUGIN_MAXIMIZE;
 
           if (strstr (d, "unmaximize"))
-            features &= ~ MUTTER_PLUGIN_UNMAXIMIZE;
+            features &= ~ META_PLUGIN_UNMAXIMIZE;
 
           if (strstr (d, "map"))
-            features &= ~ MUTTER_PLUGIN_MAP;
+            features &= ~ META_PLUGIN_MAP;
 
           if (strstr (d, "destroy"))
-            features &= ~ MUTTER_PLUGIN_DESTROY;
+            features &= ~ META_PLUGIN_DESTROY;
 
           if (strstr (d, "switch-workspace"))
-            features &= ~MUTTER_PLUGIN_SWITCH_WORKSPACE;
+            features &= ~META_PLUGIN_SWITCH_WORKSPACE;
 
           g_free (d);
         }
@@ -162,12 +162,12 @@ mutter_plugin_parse_params (MutterPlugin *plugin)
 }
 
 static void
-mutter_plugin_set_property (GObject      *object,
-			    guint         prop_id,
-			    const GValue *value,
-			    GParamSpec   *pspec)
+meta_plugin_set_property (GObject      *object,
+                          guint         prop_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (object)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (object)->priv;
 
   switch (prop_id)
     {
@@ -176,7 +176,7 @@ mutter_plugin_set_property (GObject      *object,
       break;
     case PROP_PARAMS:
       priv->params = g_value_dup_string (value);
-      mutter_plugin_parse_params (MUTTER_PLUGIN (object));
+      meta_plugin_parse_params (META_PLUGIN (object));
       break;
     case PROP_DISABLED:
       priv->disabled = g_value_get_boolean (value);
@@ -191,12 +191,12 @@ mutter_plugin_set_property (GObject      *object,
 }
 
 static void
-mutter_plugin_get_property (GObject    *object,
-			    guint       prop_id,
-			    GValue     *value,
-			    GParamSpec *pspec)
+meta_plugin_get_property (GObject    *object,
+                          guint       prop_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (object)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (object)->priv;
 
   switch (prop_id)
     {
@@ -223,14 +223,14 @@ mutter_plugin_get_property (GObject    *object,
 
 
 static void
-mutter_plugin_class_init (MutterPluginClass *klass)
+meta_plugin_class_init (MetaPluginClass *klass)
 {
   GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
 
-  gobject_class->finalize        = mutter_plugin_finalize;
-  gobject_class->dispose         = mutter_plugin_dispose;
-  gobject_class->set_property    = mutter_plugin_set_property;
-  gobject_class->get_property    = mutter_plugin_get_property;
+  gobject_class->finalize        = meta_plugin_finalize;
+  gobject_class->dispose         = meta_plugin_dispose;
+  gobject_class->set_property    = meta_plugin_set_property;
+  gobject_class->get_property    = meta_plugin_get_property;
 
   g_object_class_install_property (gobject_class,
                                    PROP_SCREEN,
@@ -273,53 +273,53 @@ mutter_plugin_class_init (MutterPluginClass *klass)
                                                       FALSE,
                                                       G_PARAM_READABLE));
 
-  g_type_class_add_private (gobject_class, sizeof (MutterPluginPrivate));
+  g_type_class_add_private (gobject_class, sizeof (MetaPluginPrivate));
 }
 
 static void
-mutter_plugin_init (MutterPlugin *self)
+meta_plugin_init (MetaPlugin *self)
 {
-  MutterPluginPrivate *priv;
+  MetaPluginPrivate *priv;
 
-  self->priv = priv = MUTTER_PLUGIN_GET_PRIVATE (self);
+  self->priv = priv = META_PLUGIN_GET_PRIVATE (self);
 }
 
 gulong
-mutter_plugin_features (MutterPlugin *plugin)
+meta_plugin_features (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
   return priv->features;
 }
 
 gboolean
-mutter_plugin_disabled (MutterPlugin *plugin)
+meta_plugin_disabled (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
   return priv->disabled;
 }
 
 gboolean
-mutter_plugin_running  (MutterPlugin *plugin)
+meta_plugin_running  (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
   return (priv->running > 0);
 }
 
 gboolean
-mutter_plugin_debug_mode (MutterPlugin *plugin)
+meta_plugin_debug_mode (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
   return priv->debug;
 }
 
-const MutterPluginInfo *
-mutter_plugin_get_info (MutterPlugin *plugin)
+const MetaPluginInfo *
+meta_plugin_get_info (MetaPlugin *plugin)
 {
-  MutterPluginClass  *klass = MUTTER_PLUGIN_GET_CLASS (plugin);
+  MetaPluginClass  *klass = META_PLUGIN_GET_CLASS (plugin);
 
   if (klass && klass->plugin_info)
     return klass->plugin_info (plugin);
@@ -328,50 +328,66 @@ mutter_plugin_get_info (MutterPlugin *plugin)
 }
 
 ClutterActor *
-mutter_plugin_get_overlay_group (MutterPlugin *plugin)
+meta_plugin_get_overlay_group (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
-  return mutter_get_overlay_group_for_screen (priv->screen);
+  return meta_get_overlay_group_for_screen (priv->screen);
 }
 
 ClutterActor *
-mutter_plugin_get_stage (MutterPlugin *plugin)
+meta_plugin_get_stage (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
-  return mutter_get_stage_for_screen (priv->screen);
+  return meta_get_stage_for_screen (priv->screen);
 }
 
 ClutterActor *
-mutter_plugin_get_window_group (MutterPlugin *plugin)
+meta_plugin_get_window_group (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
-  return mutter_get_window_group_for_screen (priv->screen);
+  return meta_get_window_group_for_screen (priv->screen);
 }
 
 /**
- * _mutter_plugin_effect_started:
+ * _meta_plugin_effect_started:
  * @plugin: the plugin
  *
  * Mark that an effect has started for the plugin. This is called
- * internally by MutterPluginManager.
+ * internally by MetaPluginManager.
  */
 void
-_mutter_plugin_effect_started (MutterPlugin *plugin)
+_meta_plugin_effect_started (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
   priv->running++;
 }
 
 void
-mutter_plugin_effect_completed (MutterPlugin *plugin,
-                                MutterWindow *actor,
-                                unsigned long event)
+meta_plugin_switch_workspace_completed (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
+
+  MetaScreen *screen = meta_plugin_get_screen (plugin);
+
+  if (priv->running-- < 0)
+    {
+      g_warning ("Error in running effect accounting, adjusting.");
+      priv->running = 0;
+    }
+
+  meta_switch_workspace_completed (screen);
+}
+
+static void
+meta_plugin_window_effect_completed (MetaPlugin      *plugin,
+                                     MetaWindowActor *actor,
+                                     unsigned long    event)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
   if (priv->running-- < 0)
     {
@@ -381,57 +397,82 @@ mutter_plugin_effect_completed (MutterPlugin *plugin,
 
   if (!actor)
     {
-      const MutterPluginInfo *info;
+      const MetaPluginInfo *info;
       const gchar            *name = NULL;
 
-      if (plugin && (info = mutter_plugin_get_info (plugin)))
+      if (plugin && (info = meta_plugin_get_info (plugin)))
         name = info->name;
 
       g_warning ("Plugin [%s] passed NULL for actor!",
                  name ? name : "unknown");
     }
 
-  if (event == MUTTER_PLUGIN_SWITCH_WORKSPACE)
-    {
-      /* The window is just used to identify the screen */
-      MetaWindow *window = mutter_window_get_meta_window (actor);
-      MetaScreen *screen = meta_window_get_screen (window);
-      mutter_switch_workspace_completed (screen);
-    }
-    else
-    {
-      mutter_window_effect_completed (actor, event);
-    }
+  meta_window_actor_effect_completed (actor, event);
 }
 
 void
-mutter_plugin_query_screen_size (MutterPlugin *plugin,
-                                 int          *width,
-                                 int          *height)
+meta_plugin_minimize_completed (MetaPlugin      *plugin,
+                                MetaWindowActor *actor)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  meta_plugin_window_effect_completed (plugin, actor, META_PLUGIN_MINIMIZE);
+}
+
+void
+meta_plugin_maximize_completed (MetaPlugin      *plugin,
+                                MetaWindowActor *actor)
+{
+  meta_plugin_window_effect_completed (plugin, actor, META_PLUGIN_MAXIMIZE);
+}
+
+void
+meta_plugin_unmaximize_completed (MetaPlugin      *plugin,
+                                  MetaWindowActor *actor)
+{
+  meta_plugin_window_effect_completed (plugin, actor, META_PLUGIN_UNMAXIMIZE);
+}
+
+void
+meta_plugin_map_completed (MetaPlugin      *plugin,
+                           MetaWindowActor *actor)
+{
+  meta_plugin_window_effect_completed (plugin, actor, META_PLUGIN_MAP);
+}
+
+void
+meta_plugin_destroy_completed (MetaPlugin      *plugin,
+                               MetaWindowActor *actor)
+{
+  meta_plugin_window_effect_completed (plugin, actor, META_PLUGIN_DESTROY);
+}
+
+void
+meta_plugin_query_screen_size (MetaPlugin *plugin,
+                               int        *width,
+                               int        *height)
+{
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
   meta_screen_get_size (priv->screen, width, height);
 }
 
 void
-mutter_plugin_set_stage_reactive (MutterPlugin *plugin,
-                                  gboolean      reactive)
+meta_plugin_set_stage_reactive (MetaPlugin *plugin,
+                                gboolean    reactive)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
   MetaScreen  *screen  = priv->screen;
 
   if (reactive)
-    mutter_set_stage_input_region (screen, None);
+    meta_set_stage_input_region (screen, None);
   else
-    mutter_empty_stage_input_region (screen);
+    meta_empty_stage_input_region (screen);
 }
 
 void
-mutter_plugin_set_stage_input_area (MutterPlugin *plugin,
-                                    gint x, gint y, gint width, gint height)
+meta_plugin_set_stage_input_area (MetaPlugin *plugin,
+                                  gint x, gint y, gint width, gint height)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
   MetaScreen   *screen  = priv->screen;
   MetaDisplay  *display = meta_screen_get_display (screen);
   Display      *xdpy    = meta_display_get_xdisplay (display);
@@ -444,43 +485,43 @@ mutter_plugin_set_stage_input_area (MutterPlugin *plugin,
   rect.height = height;
 
   region = XFixesCreateRegion (xdpy, &rect, 1);
-  mutter_set_stage_input_region (screen, region);
+  meta_set_stage_input_region (screen, region);
   XFixesDestroyRegion (xdpy, region);
 }
 
 void
-mutter_plugin_set_stage_input_region (MutterPlugin *plugin,
-                                      XserverRegion region)
+meta_plugin_set_stage_input_region (MetaPlugin   *plugin,
+                                    XserverRegion region)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
   MetaScreen  *screen  = priv->screen;
 
-  mutter_set_stage_input_region (screen, region);
+  meta_set_stage_input_region (screen, region);
 }
 
 /**
- * mutter_plugin_get_windows:
- * @plugin: A #MutterPlugin
+ * meta_plugin_get_window_actors:
+ * @plugin: A #MetaPlugin
  *
- * This function returns all of the #MutterWindow objects referenced by Mutter, including
+ * This function returns all of the #MetaWindowActor objects referenced by Mutter, including
  * override-redirect windows.  The returned list is a snapshot of Mutter's current
  * stacking order, with the topmost window last.
  *
  * The 'restacked' signal of #MetaScreen signals when this value has changed.
  *
- * Returns: (transfer none) (element-type MutterWindow): Windows in stacking order, topmost last
+ * Returns: (transfer none) (element-type MetaWindowActor): Windows in stacking order, topmost last
  */
 GList *
-mutter_plugin_get_windows (MutterPlugin *plugin)
+meta_plugin_get_window_actors (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
-  return mutter_get_windows (priv->screen);
+  return meta_get_window_actors (priv->screen);
 }
 
 /**
- * mutter_plugin_begin_modal:
- * @plugin: a #MutterPlugin
+ * meta_plugin_begin_modal:
+ * @plugin: a #MetaPlugin
  * @grab_window: the X window to grab the keyboard and mouse on
  * @cursor: the cursor to use for the pointer grab, or None,
  *          to use the normal cursor for the grab window and
@@ -491,7 +532,7 @@ mutter_plugin_get_windows (MutterPlugin *plugin)
  * This function is used to grab the keyboard and mouse for the exclusive
  * use of the plugin. Correct operation requires that both the keyboard
  * and mouse are grabbed, or thing will break. (In particular, other
- * passive X grabs in Mutter can trigger but not be handled by the normal
+ * passive X grabs in Meta can trigger but not be handled by the normal
  * keybinding handling code.) However, the plugin can establish the keyboard
  * and/or mouse grabs ahead of time and pass in the
  * %META_MODAL_POINTER_ALREADY_GRABBED and/or %META_MODAL_KEYBOARD_ALREADY_GRABBED
@@ -504,21 +545,21 @@ mutter_plugin_get_windows (MutterPlugin *plugin)
  *  mouse and made the plugin modal.
  */
 gboolean
-mutter_plugin_begin_modal (MutterPlugin      *plugin,
-                           Window             grab_window,
-                           Cursor             cursor,
-                           MetaModalOptions   options,
-                           guint32            timestamp)
+meta_plugin_begin_modal (MetaPlugin       *plugin,
+                         Window            grab_window,
+                         Cursor            cursor,
+                         MetaModalOptions  options,
+                         guint32           timestamp)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
-  return mutter_begin_modal_for_plugin (priv->screen, plugin,
-                                        grab_window, cursor, options, timestamp);
+  return meta_begin_modal_for_plugin (priv->screen, plugin,
+                                      grab_window, cursor, options, timestamp);
 }
 
 /**
- * mutter_plugin_end_modal
- * @plugin: a #MutterPlugin
+ * meta_plugin_end_modal
+ * @plugin: a #MetaPlugin
  * @timestamp: the time used for releasing grabs
  *
  * Ends the modal operation begun with meta_plugin_begin_modal(). This
@@ -528,27 +569,27 @@ mutter_plugin_begin_modal (MutterPlugin      *plugin,
  * when beginnning the modal operation.
  */
 void
-mutter_plugin_end_modal (MutterPlugin *plugin,
-                         guint32       timestamp)
+meta_plugin_end_modal (MetaPlugin *plugin,
+                       guint32     timestamp)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
-  mutter_end_modal_for_plugin (priv->screen, plugin, timestamp);
+  meta_end_modal_for_plugin (priv->screen, plugin, timestamp);
 }
 
 Display *
-mutter_plugin_get_xdisplay (MutterPlugin *plugin)
+meta_plugin_get_xdisplay (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv    = MUTTER_PLUGIN (plugin)->priv;
-  MetaDisplay         *display = meta_screen_get_display (priv->screen);
-  Display             *xdpy    = meta_display_get_xdisplay (display);
+  MetaPluginPrivate *priv    = META_PLUGIN (plugin)->priv;
+  MetaDisplay       *display = meta_screen_get_display (priv->screen);
+  Display           *xdpy    = meta_display_get_xdisplay (display);
 
   return xdpy;
 }
 
 /**
- * mutter_plugin_get_screen:
- * @plugin: a #MutterPlugin
+ * meta_plugin_get_screen:
+ * @plugin: a #MetaPlugin
  *
  * Gets the #MetaScreen corresponding to a plugin. Each plugin instance
  * is associated with exactly one screen; if Metacity is managing
@@ -557,9 +598,9 @@ mutter_plugin_get_xdisplay (MutterPlugin *plugin)
  * Return value: (transfer none): the #MetaScreen for the plugin
  */
 MetaScreen *
-mutter_plugin_get_screen (MutterPlugin *plugin)
+meta_plugin_get_screen (MetaPlugin *plugin)
 {
-  MutterPluginPrivate *priv = MUTTER_PLUGIN (plugin)->priv;
+  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
 
   return priv->screen;
 }

src/compositor/meta-shadow-factory-private.h

@@ -0,0 +1,65 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * MetaShadowFactory:
+ *
+ * Create and cache shadow textures for arbitrary window shapes
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __META_SHADOW_FACTORY_PRIVATE_H__
+#define __META_SHADOW_FACTORY_PRIVATE_H__
+
+#include <cairo.h>
+#include <clutter/clutter.h>
+#include "meta-window-shape.h"
+#include "meta-shadow-factory.h"
+
+/**
+ * MetaShadow:
+ * #MetaShadow holds a shadow texture along with information about how to
+ * apply that texture to draw a window texture. (E.g., it knows how big the
+ * unscaled borders are on each side of the shadow texture.)
+ */
+typedef struct _MetaShadow MetaShadow;
+
+MetaShadow *meta_shadow_ref         (MetaShadow            *shadow);
+void        meta_shadow_unref       (MetaShadow            *shadow);
+CoglHandle  meta_shadow_get_texture (MetaShadow            *shadow);
+void        meta_shadow_paint       (MetaShadow            *shadow,
+                                     int                    window_x,
+                                     int                    window_y,
+                                     int                    window_width,
+                                     int                    window_height,
+                                     guint8                 opacity,
+                                     cairo_region_t        *clip);
+void        meta_shadow_get_bounds  (MetaShadow            *shadow,
+                                     int                    window_x,
+                                     int                    window_y,
+                                     int                    window_width,
+                                     int                    window_height,
+                                     cairo_rectangle_int_t *bounds);
+
+MetaShadow *meta_shadow_factory_get_shadow (MetaShadowFactory *factory,
+                                            MetaWindowShape   *shape,
+                                            int                width,
+                                            int                height,
+                                            const char        *class_name,
+                                            gboolean           focused);
+
+#endif /* __META_SHADOW_FACTORY_PRIVATE_H__ */

src/compositor/meta-shaped-texture.c

@@ -25,102 +25,102 @@
 
 #include <config.h>
 
-#include "mutter-shaped-texture.h"
-#include "mutter-texture-tower.h"
+#include "meta-shaped-texture.h"
+#include "meta-texture-tower.h"
 
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
 #include <string.h>
 
-static void mutter_shaped_texture_dispose (GObject *object);
-static void mutter_shaped_texture_finalize (GObject *object);
-static void mutter_shaped_texture_notify (GObject *object,
+static void meta_shaped_texture_dispose  (GObject    *object);
+static void meta_shaped_texture_finalize (GObject    *object);
+static void meta_shaped_texture_notify   (GObject    *object,
 					  GParamSpec *pspec);
 
-static void mutter_shaped_texture_paint (ClutterActor *actor);
-static void mutter_shaped_texture_pick (ClutterActor *actor,
-					const ClutterColor *color);
+static void meta_shaped_texture_paint (ClutterActor       *actor);
+static void meta_shaped_texture_pick  (ClutterActor       *actor,
+				       const ClutterColor *color);
 
-static void mutter_shaped_texture_update_area (ClutterX11TexturePixmap *texture,
-                                               int                      x,
-                                               int                      y,
-                                               int                      width,
-                                               int                      height);
+static void meta_shaped_texture_update_area (ClutterX11TexturePixmap *texture,
+					     int                      x,
+					     int                      y,
+					     int                      width,
+					     int                      height);
 
-static void mutter_shaped_texture_dirty_mask (MutterShapedTexture *stex);
+static void meta_shaped_texture_dirty_mask (MetaShapedTexture *stex);
 
 #ifdef HAVE_GLX_TEXTURE_PIXMAP
-G_DEFINE_TYPE (MutterShapedTexture, mutter_shaped_texture,
+G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
                CLUTTER_GLX_TYPE_TEXTURE_PIXMAP);
 #else /* HAVE_GLX_TEXTURE_PIXMAP */
-G_DEFINE_TYPE (MutterShapedTexture, mutter_shaped_texture,
+G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
                CLUTTER_X11_TYPE_TEXTURE_PIXMAP);
 #endif /* HAVE_GLX_TEXTURE_PIXMAP */
 
-#define MUTTER_SHAPED_TEXTURE_GET_PRIVATE(obj) \
-  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUTTER_TYPE_SHAPED_TEXTURE, \
-                                MutterShapedTexturePrivate))
+#define META_SHAPED_TEXTURE_GET_PRIVATE(obj) \
+  (G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_SHAPED_TEXTURE, \
+                                MetaShapedTexturePrivate))
 
-struct _MutterShapedTexturePrivate
+struct _MetaShapedTexturePrivate
 {
-  MutterTextureTower *paint_tower;
+  MetaTextureTower *paint_tower;
   CoglHandle mask_texture;
   CoglHandle material;
   CoglHandle material_unshaped;
-#if 1 /* see workaround comment in mutter_shaped_texture_paint */
-  CoglHandle material_workaround;
-#endif
 
-  GdkRegion *clip_region;
+  cairo_region_t *clip_region;
 
   guint mask_width, mask_height;
 
   GArray *rectangles;
+
+  guint create_mipmaps : 1;
 };
 
 static void
-mutter_shaped_texture_class_init (MutterShapedTextureClass *klass)
+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 = mutter_shaped_texture_dispose;
-  gobject_class->finalize = mutter_shaped_texture_finalize;
-  gobject_class->notify = mutter_shaped_texture_notify;
+  gobject_class->dispose = meta_shaped_texture_dispose;
+  gobject_class->finalize = meta_shaped_texture_finalize;
+  gobject_class->notify = meta_shaped_texture_notify;
 
-  actor_class->paint = mutter_shaped_texture_paint;
-  actor_class->pick = mutter_shaped_texture_pick;
+  actor_class->paint = meta_shaped_texture_paint;
+  actor_class->pick = meta_shaped_texture_pick;
 
-  x11_texture_class->update_area = mutter_shaped_texture_update_area;
+  x11_texture_class->update_area = meta_shaped_texture_update_area;
 
-  g_type_class_add_private (klass, sizeof (MutterShapedTexturePrivate));
+  g_type_class_add_private (klass, sizeof (MetaShapedTexturePrivate));
 }
 
 static void
-mutter_shaped_texture_init (MutterShapedTexture *self)
+meta_shaped_texture_init (MetaShapedTexture *self)
 {
-  MutterShapedTexturePrivate *priv;
+  MetaShapedTexturePrivate *priv;
 
-  priv = self->priv = MUTTER_SHAPED_TEXTURE_GET_PRIVATE (self);
+  priv = self->priv = META_SHAPED_TEXTURE_GET_PRIVATE (self);
 
   priv->rectangles = g_array_new (FALSE, FALSE, sizeof (XRectangle));
 
-  priv->paint_tower = mutter_texture_tower_new ();
+  priv->paint_tower = meta_texture_tower_new ();
   priv->mask_texture = COGL_INVALID_HANDLE;
+  priv->create_mipmaps = TRUE;
 }
 
 static void
-mutter_shaped_texture_dispose (GObject *object)
+meta_shaped_texture_dispose (GObject *object)
 {
-  MutterShapedTexture *self = (MutterShapedTexture *) object;
-  MutterShapedTexturePrivate *priv = self->priv;
+  MetaShapedTexture *self = (MetaShapedTexture *) object;
+  MetaShapedTexturePrivate *priv = self->priv;
 
   if (priv->paint_tower)
-    mutter_texture_tower_free (priv->paint_tower);
+    meta_texture_tower_free (priv->paint_tower);
   priv->paint_tower = NULL;
 
-  mutter_shaped_texture_dirty_mask (self);
+  meta_shaped_texture_dirty_mask (self);
 
   if (priv->material != COGL_INVALID_HANDLE)
     {
@@ -132,36 +132,29 @@ mutter_shaped_texture_dispose (GObject *object)
       cogl_handle_unref (priv->material_unshaped);
       priv->material_unshaped = COGL_INVALID_HANDLE;
     }
-#if 1 /* see comment in mutter_shaped_texture_paint */
-  if (priv->material_workaround != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (priv->material_workaround);
-      priv->material_workaround = COGL_INVALID_HANDLE;
-    }
-#endif
 
-  mutter_shaped_texture_set_clip_region (self, NULL);
+  meta_shaped_texture_set_clip_region (self, NULL);
 
-  G_OBJECT_CLASS (mutter_shaped_texture_parent_class)->dispose (object);
+  G_OBJECT_CLASS (meta_shaped_texture_parent_class)->dispose (object);
 }
 
 static void
-mutter_shaped_texture_finalize (GObject *object)
+meta_shaped_texture_finalize (GObject *object)
 {
-  MutterShapedTexture *self = (MutterShapedTexture *) object;
-  MutterShapedTexturePrivate *priv = self->priv;
+  MetaShapedTexture *self = (MetaShapedTexture *) object;
+  MetaShapedTexturePrivate *priv = self->priv;
 
   g_array_free (priv->rectangles, TRUE);
 
-  G_OBJECT_CLASS (mutter_shaped_texture_parent_class)->finalize (object);
+  G_OBJECT_CLASS (meta_shaped_texture_parent_class)->finalize (object);
 }
 
 static void
-mutter_shaped_texture_notify (GObject    *object,
-			      GParamSpec *pspec)
+meta_shaped_texture_notify (GObject    *object,
+			    GParamSpec *pspec)
 {
-  if (G_OBJECT_CLASS (mutter_shaped_texture_parent_class)->notify)
-    G_OBJECT_CLASS (mutter_shaped_texture_parent_class)->notify (object, 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
@@ -170,18 +163,21 @@ mutter_shaped_texture_notify (GObject    *object,
    */
   if (strcmp (pspec->name, "cogl-texture") == 0)
     {
-      MutterShapedTexture *stex = (MutterShapedTexture *) object;
-      MutterShapedTexturePrivate *priv = stex->priv;
+      MetaShapedTexture *stex = (MetaShapedTexture *) object;
+      MetaShapedTexturePrivate *priv = stex->priv;
 
-      mutter_texture_tower_set_base_texture (priv->paint_tower,
-					     clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex)));
+      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
-mutter_shaped_texture_dirty_mask (MutterShapedTexture *stex)
+meta_shaped_texture_dirty_mask (MetaShapedTexture *stex)
 {
-  MutterShapedTexturePrivate *priv = stex->priv;
+  MetaShapedTexturePrivate *priv = stex->priv;
 
   if (priv->mask_texture != COGL_INVALID_HANDLE)
     {
@@ -196,13 +192,16 @@ mutter_shaped_texture_dirty_mask (MutterShapedTexture *stex)
 
       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);
     }
 }
 
 static void
-mutter_shaped_texture_ensure_mask (MutterShapedTexture *stex)
+meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
 {
-  MutterShapedTexturePrivate *priv = stex->priv;
+  MetaShapedTexturePrivate *priv = stex->priv;
   CoglHandle paint_tex;
   guint tex_width, tex_height;
 
@@ -218,7 +217,7 @@ mutter_shaped_texture_ensure_mask (MutterShapedTexture *stex)
      recreate it */
   if (priv->mask_texture != COGL_INVALID_HANDLE
       && (priv->mask_width != tex_width || priv->mask_height != tex_height))
-    mutter_shaped_texture_dirty_mask (stex);
+    meta_shaped_texture_dirty_mask (stex);
 
   /* If we don't have a mask texture yet then create one */
   if (priv->mask_texture == COGL_INVALID_HANDLE)
@@ -291,42 +290,44 @@ mutter_shaped_texture_ensure_mask (MutterShapedTexture *stex)
 }
 
 static void
-mutter_shaped_texture_paint (ClutterActor *actor)
+meta_shaped_texture_paint (ClutterActor *actor)
 {
-  MutterShapedTexture *stex = (MutterShapedTexture *) actor;
-  MutterShapedTexturePrivate *priv = stex->priv;
+  MetaShapedTexture *stex = (MetaShapedTexture *) actor;
+  MetaShapedTexturePrivate *priv = stex->priv;
   CoglHandle paint_tex;
   guint tex_width, tex_height;
   ClutterActorBox alloc;
+
+  static CoglHandle material_template = COGL_INVALID_HANDLE;
+  static CoglHandle material_unshaped_template = COGL_INVALID_HANDLE;
+
   CoglHandle material;
 
-  if (priv->clip_region && gdk_region_empty (priv->clip_region))
+  if (priv->clip_region && cairo_region_is_empty (priv->clip_region))
     return;
 
   if (!CLUTTER_ACTOR_IS_REALIZED (CLUTTER_ACTOR (stex)))
     clutter_actor_realize (CLUTTER_ACTOR (stex));
 
-  /* If mipmaps are supported, then the texture filter quality will
-   * still be HIGH here. In that case we just want to use the base
-   * texture. If mipmaps are not support then
-   * on_glx_texture_pixmap_pre_paint() will have reset the texture
-   * filter quality to MEDIUM, and we should use the MutterTextureTower
-   * mipmap emulation.
+  /* The GL EXT_texture_from_pixmap extension does allow for it to be
+   * used together with SGIS_generate_mipmap, however this is very
+   * rarely supported. Also, even when it is supported there
+   * are distinct performance implications from:
    *
-   * http://bugzilla.openedhand.com/show_bug.cgi?id=1877 is an RFE
-   * for a better way of handling this.
+   *  - Updating mipmaps that we don't need
+   *  - Having to reallocate pixmaps on the server into larger buffers
    *
-   * While it would be nice to have direct access to the 'can_mipmap'
-   * boolean in ClutterGLXTexturePixmap, since since MutterTextureTower
-   * creates the scaled down images on demand there is no substantial
-   * overhead from doing the work to create and update the tower and
-   * not using it, other than the memory allocated for the MutterTextureTower
-   * structure itself.
+   * So, we just unconditionally use our mipmap emulation code. If we
+   * wanted to use SGIS_generate_mipmap, we'd have to  query COGL to
+   * see if it was supported (no API currently), and then if and only
+   * if that was the case, set the clutter texture quality to HIGH.
+   * Setting the texture quality to high without SGIS_generate_mipmap
+   * support for TFP textures will result in fallbacks to XGetImage.
    */
-  if (clutter_texture_get_filter_quality (CLUTTER_TEXTURE (stex)) == CLUTTER_TEXTURE_QUALITY_HIGH)
-    paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));
+  if (priv->create_mipmaps)
+    paint_tex = meta_texture_tower_get_paint_texture (priv->paint_tower);
   else
-    paint_tex = mutter_texture_tower_get_paint_texture (priv->paint_tower);
+    paint_tex = clutter_texture_get_cogl_texture (CLUTTER_TEXTURE (stex));
 
   if (paint_tex == COGL_INVALID_HANDLE)
     return;
@@ -341,22 +342,29 @@ mutter_shaped_texture_paint (ClutterActor *actor)
     {
       /* If there are no rectangles use a single-layer texture */
 
-      if (priv->material_unshaped == COGL_INVALID_HANDLE)
-	priv->material_unshaped = cogl_material_new ();
+      if (priv->material_unshaped == COGL_INVALID_HANDLE) 
+        {
+          if (G_UNLIKELY (material_unshaped_template == COGL_INVALID_HANDLE))
+            material_unshaped_template = cogl_material_new ();
 
-      material = priv->material_unshaped;
+          priv->material_unshaped = cogl_material_copy (material_unshaped_template);
+        }
+        material = priv->material_unshaped;
     }
   else
     {
-      mutter_shaped_texture_ensure_mask (stex);
+      meta_shaped_texture_ensure_mask (stex);
 
       if (priv->material == COGL_INVALID_HANDLE)
 	{
-	  priv->material = cogl_material_new ();
-
-	  cogl_material_set_layer_combine (priv->material, 1,
+	   if (G_UNLIKELY (material_template == COGL_INVALID_HANDLE))
+	    {
+	      material_template =  cogl_material_new ();
+	      cogl_material_set_layer_combine (material_template, 1,
 					   "RGBA = MODULATE (PREVIOUS, TEXTURE[A])",
 					   NULL);
+	    }
+	  priv->material = cogl_material_copy (material_template);
 	}
       material = priv->material;
 
@@ -378,7 +386,6 @@ mutter_shaped_texture_paint (ClutterActor *actor)
 
   if (priv->clip_region)
     {
-      GdkRectangle *rects;
       int n_rects;
       int i;
 
@@ -386,31 +393,27 @@ mutter_shaped_texture_paint (ClutterActor *actor)
        * fall back and draw the whole thing */
 #     define MAX_RECTS 16
 
-      /* Would be nice to be able to check the number of rects first */
-      gdk_region_get_rectangles (priv->clip_region, &rects, &n_rects);
-      if (n_rects > MAX_RECTS)
-	{
-	  g_free (rects);
-	  /* Fall through to following code */
-	}
-      else
+      n_rects = cairo_region_num_rectangles (priv->clip_region);
+      if (n_rects <= MAX_RECTS)
 	{
 	  float coords[8];
           float x1, y1, x2, y2;
 
 	  for (i = 0; i < n_rects; i++)
 	    {
-	      GdkRectangle *rect = &rects[i];
+	      cairo_rectangle_int_t rect;
 
-	      x1 = rect->x;
-	      y1 = rect->y;
-	      x2 = rect->x + rect->width;
-	      y2 = rect->y + rect->height;
+	      cairo_region_get_rectangle (priv->clip_region, i, &rect);
 
-              coords[0] = rect->x / (alloc.x2 - alloc.x1);
-	      coords[1] = rect->y / (alloc.y2 - alloc.y1);
-	      coords[2] = (rect->x + rect->width) / (alloc.x2 - alloc.x1);
-	      coords[3] = (rect->y + rect->height) / (alloc.y2 - alloc.y1);
+	      x1 = rect.x;
+	      y1 = rect.y;
+	      x2 = rect.x + rect.width;
+	      y2 = rect.y + rect.height;
+
+	      coords[0] = rect.x / (alloc.x2 - alloc.x1);
+	      coords[1] = rect.y / (alloc.y2 - alloc.y1);
+	      coords[2] = (rect.x + rect.width) / (alloc.x2 - alloc.x1);
+	      coords[3] = (rect.y + rect.height) / (alloc.y2 - alloc.y1);
 
               coords[4] = coords[0];
               coords[5] = coords[1];
@@ -421,8 +424,6 @@ mutter_shaped_texture_paint (ClutterActor *actor)
                                                        &coords[0], 8);
             }
 
-	  g_free (rects);
-
 	  return;
 	}
     }
@@ -433,15 +434,15 @@ mutter_shaped_texture_paint (ClutterActor *actor)
 }
 
 static void
-mutter_shaped_texture_pick (ClutterActor *actor,
-			    const ClutterColor *color)
+meta_shaped_texture_pick (ClutterActor       *actor,
+			  const ClutterColor *color)
 {
-  MutterShapedTexture *stex = (MutterShapedTexture *) actor;
-  MutterShapedTexturePrivate *priv = stex->priv;
+  MetaShapedTexture *stex = (MetaShapedTexture *) actor;
+  MetaShapedTexturePrivate *priv = stex->priv;
 
   /* If there are no rectangles then use the regular pick */
   if (priv->rectangles->len < 1)
-    CLUTTER_ACTOR_CLASS (mutter_shaped_texture_parent_class)
+    CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)
       ->pick (actor, color);
   else if (clutter_actor_should_pick_paint (actor))
     {
@@ -460,7 +461,7 @@ mutter_shaped_texture_pick (ClutterActor *actor,
       if (tex_width == 0 || tex_height == 0) /* no contents yet */
         return;
 
-      mutter_shaped_texture_ensure_mask (stex);
+      meta_shaped_texture_ensure_mask (stex);
 
       cogl_set_source_color4ub (color->red, color->green, color->blue,
                                  color->alpha);
@@ -477,71 +478,130 @@ mutter_shaped_texture_pick (ClutterActor *actor,
 }
 
 static void
-mutter_shaped_texture_update_area (ClutterX11TexturePixmap *texture,
-                                   int                      x,
-                                   int                      y,
-                                   int                      width,
-                                   int                      height)
+meta_shaped_texture_update_area (ClutterX11TexturePixmap *texture,
+				 int                      x,
+				 int                      y,
+				 int                      width,
+				 int                      height)
 {
-  MutterShapedTexture *stex = (MutterShapedTexture *) texture;
-  MutterShapedTexturePrivate *priv = stex->priv;
+  MetaShapedTexture *stex = (MetaShapedTexture *) texture;
+  MetaShapedTexturePrivate *priv = stex->priv;
 
-  CLUTTER_X11_TEXTURE_PIXMAP_CLASS (mutter_shaped_texture_parent_class)->update_area (texture,
+  CLUTTER_X11_TEXTURE_PIXMAP_CLASS (meta_shaped_texture_parent_class)->update_area (texture,
                                                                                       x, y, width, height);
 
-  mutter_texture_tower_update_area (priv->paint_tower, x, y, width, height);
+  meta_texture_tower_update_area (priv->paint_tower, x, y, width, height);
 }
 
 ClutterActor *
-mutter_shaped_texture_new (void)
+meta_shaped_texture_new (void)
 {
-  ClutterActor *self = g_object_new (MUTTER_TYPE_SHAPED_TEXTURE, NULL);
+  ClutterActor *self = g_object_new (META_TYPE_SHAPED_TEXTURE, NULL);
 
   return self;
 }
 
 void
-mutter_shaped_texture_clear_rectangles (MutterShapedTexture *stex)
+meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
+					gboolean           create_mipmaps)
 {
-  MutterShapedTexturePrivate *priv;
+  MetaShapedTexturePrivate *priv;
 
-  g_return_if_fail (MUTTER_IS_SHAPED_TEXTURE (stex));
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
+
+  priv = stex->priv;
+
+  create_mipmaps = create_mipmaps != FALSE;
+
+  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;
+
+      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_clear_rectangles (MetaShapedTexture *stex)
+{
+  MetaShapedTexturePrivate *priv;
+
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
 
   priv = stex->priv;
 
   g_array_set_size (priv->rectangles, 0);
-  mutter_shaped_texture_dirty_mask (stex);
+  meta_shaped_texture_dirty_mask (stex);
   clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }
 
 void
-mutter_shaped_texture_add_rectangle (MutterShapedTexture *stex,
-				     const XRectangle *rect)
+meta_shaped_texture_add_rectangle (MetaShapedTexture *stex,
+				   const XRectangle  *rect)
 {
-  g_return_if_fail (MUTTER_IS_SHAPED_TEXTURE (stex));
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
 
-  mutter_shaped_texture_add_rectangles (stex, 1, rect);
+  meta_shaped_texture_add_rectangles (stex, 1, rect);
 }
 
 void
-mutter_shaped_texture_add_rectangles (MutterShapedTexture *stex,
-				      size_t num_rects,
-				      const XRectangle *rects)
+meta_shaped_texture_add_rectangles (MetaShapedTexture *stex,
+				    size_t             num_rects,
+				    const XRectangle  *rects)
 {
-  MutterShapedTexturePrivate *priv;
+  MetaShapedTexturePrivate *priv;
 
-  g_return_if_fail (MUTTER_IS_SHAPED_TEXTURE (stex));
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
 
   priv = stex->priv;
 
   g_array_append_vals (priv->rectangles, rects, num_rects);
 
-  mutter_shaped_texture_dirty_mask (stex);
+  meta_shaped_texture_dirty_mask (stex);
   clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }
 
 /**
- * mutter_shaped_texture_set_clip_region:
+ * meta_shaped_texture_set_clip_region:
  * @frame: a #TidyTextureframe
  * @clip_region: (transfer full): the region of the texture that
  *   is visible and should be painted. OWNERSHIP IS ASSUMED BY
@@ -556,18 +616,18 @@ mutter_shaped_texture_add_rectangles (MutterShapedTexture *stex,
  * painting its children, and then unset it afterwards.
  */
 void
-mutter_shaped_texture_set_clip_region (MutterShapedTexture *stex,
-				       GdkRegion           *clip_region)
+meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
+				     cairo_region_t    *clip_region)
 {
-  MutterShapedTexturePrivate *priv;
+  MetaShapedTexturePrivate *priv;
 
-  g_return_if_fail (MUTTER_IS_SHAPED_TEXTURE (stex));
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
 
   priv = stex->priv;
 
   if (priv->clip_region)
     {
-      gdk_region_destroy (priv->clip_region);
+      cairo_region_destroy (priv->clip_region);
       priv->clip_region = NULL;
     }
 

src/compositor/meta-shaped-texture.h

@@ -0,0 +1,92 @@
+/*
+ * shaped texture
+ *
+ * An actor to draw a texture clipped to a list of rectangles
+ *
+ * Authored By Neil Roberts  <neil@linux.intel.com>
+ *
+ * Copyright (C) 2008 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __META_SHAPED_TEXTURE_H__
+#define __META_SHAPED_TEXTURE_H__
+
+#include <config.h>
+
+#include <clutter/clutter.h>
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+#include <clutter/glx/clutter-glx.h>
+#endif /* HAVE_GLX_TEXTURE_PIXMAP */
+
+G_BEGIN_DECLS
+
+#define META_TYPE_SHAPED_TEXTURE            (meta_shaped_texture_get_type())
+#define META_SHAPED_TEXTURE(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj),META_TYPE_SHAPED_TEXTURE, MetaShapedTexture))
+#define META_SHAPED_TEXTURE_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_SHAPED_TEXTURE, MetaShapedTextureClass))
+#define META_IS_SHAPED_TEXTURE(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_SHAPED_TEXTURE))
+#define META_IS_SHAPED_TEXTURE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_SHAPED_TEXTURE))
+#define META_SHAPED_TEXTURE_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_SHAPED_TEXTURE, MetaShapedTextureClass))
+
+typedef struct _MetaShapedTexture        MetaShapedTexture;
+typedef struct _MetaShapedTextureClass   MetaShapedTextureClass;
+typedef struct _MetaShapedTexturePrivate MetaShapedTexturePrivate;
+
+struct _MetaShapedTextureClass
+{
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+  ClutterGLXTexturePixmapClass parent_class;
+#else
+  ClutterX11TexturePixmapClass parent_class;
+#endif
+};
+
+struct _MetaShapedTexture
+{
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+  ClutterGLXTexturePixmap parent;
+#else
+  ClutterX11TexturePixmap parent;
+#endif
+
+  MetaShapedTexturePrivate *priv;
+};
+
+GType meta_shaped_texture_get_type (void) G_GNUC_CONST;
+
+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_clear_rectangles (MetaShapedTexture *stex);
+
+void meta_shaped_texture_add_rectangle  (MetaShapedTexture *stex,
+					 const XRectangle  *rect);
+void meta_shaped_texture_add_rectangles (MetaShapedTexture *stex,
+					 size_t             num_rects,
+					 const XRectangle  *rects);
+
+/* Assumes ownership of clip_region */
+void meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
+					  cairo_region_t    *clip_region);
+
+G_END_DECLS
+
+#endif /* __META_SHAPED_TEXTURE_H__ */

src/compositor/meta-texture-tower.c

@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * MutterTextureTower
+ * MetaTextureTower
  *
  * Mipmap emulation by creation of scaled down images
  *
@@ -25,7 +25,7 @@
 #include <math.h>
 #include <string.h>
 
-#include "mutter-texture-tower.h"
+#include "meta-texture-tower.h"
 
 #ifndef M_LOG2E
 #define M_LOG2E 1.4426950408889634074
@@ -55,7 +55,7 @@ typedef struct
   guint16 y2;
 } Box;
 
-struct _MutterTextureTower
+struct _MetaTextureTower
 {
   int n_levels;
   CoglHandle textures[MAX_TEXTURE_LEVELS];
@@ -64,37 +64,37 @@ struct _MutterTextureTower
 };
 
 /**
- * mutter_texture_tower_new:
+ * meta_texture_tower_new:
  *
  * Creates a new texture tower. The base texture has to be set with
- * mutter_texture_tower_set_base_texture() before use.
+ * meta_texture_tower_set_base_texture() before use.
  *
- * Return value: the new texture tower. Free with mutter_texture_tower_free()
+ * Return value: the new texture tower. Free with meta_texture_tower_free()
  */
-MutterTextureTower *
-mutter_texture_tower_new (void)
+MetaTextureTower *
+meta_texture_tower_new (void)
 {
-  MutterTextureTower *tower;
+  MetaTextureTower *tower;
 
-  tower = g_slice_new0 (MutterTextureTower);
+  tower = g_slice_new0 (MetaTextureTower);
 
   return tower;
 }
 
 /**
- * mutter_texture_tower_free:
- * @tower: a #MutterTextureTower
+ * meta_texture_tower_free:
+ * @tower: a #MetaTextureTower
  *
- * Frees a texture tower created with mutter_texture_tower_new().
+ * Frees a texture tower created with meta_texture_tower_new().
  */
 void
-mutter_texture_tower_free (MutterTextureTower *tower)
+meta_texture_tower_free (MetaTextureTower *tower)
 {
   g_return_if_fail (tower != NULL);
 
-  mutter_texture_tower_set_base_texture (tower, COGL_INVALID_HANDLE);
+  meta_texture_tower_set_base_texture (tower, COGL_INVALID_HANDLE);
 
-  g_slice_free (MutterTextureTower, tower);
+  g_slice_free (MetaTextureTower, tower);
 }
 
 static gboolean
@@ -122,8 +122,8 @@ free_texture (CoglHandle texture)
 }
 
 /**
- * mutter_texture_tower_update_area:
- * @tower: a MutterTextureTower
+ * meta_texture_tower_update_area:
+ * @tower: a MetaTextureTower
  * @texture: the new texture used as a base for scaled down versions
  *
  * Sets the base texture that is the scaled texture that the
@@ -132,8 +132,8 @@ free_texture (CoglHandle texture)
  * unset or until the tower is freed.
  */
 void
-mutter_texture_tower_set_base_texture (MutterTextureTower *tower,
-                                       CoglHandle          texture)
+meta_texture_tower_set_base_texture (MetaTextureTower *tower,
+                                     CoglHandle        texture)
 {
   int i;
 
@@ -176,7 +176,7 @@ mutter_texture_tower_set_base_texture (MutterTextureTower *tower,
       tower->n_levels = 1 + MAX ((int)(M_LOG2E * log (width)), (int)(M_LOG2E * log (height)));
       tower->n_levels = MIN(tower->n_levels, MAX_TEXTURE_LEVELS);
 
-      mutter_texture_tower_update_area (tower, 0, 0, width, height);
+      meta_texture_tower_update_area (tower, 0, 0, width, height);
     }
   else
     {
@@ -185,8 +185,8 @@ mutter_texture_tower_set_base_texture (MutterTextureTower *tower,
 }
 
 /**
- * mutter_texture_tower_update_area:
- * @tower: a MutterTextureTower
+ * meta_texture_tower_update_area:
+ * @tower: a MetaTextureTower
  * @x: X coordinate of upper left of rectangle that changed
  * @y: Y coordinate of upper left of rectangle that changed
  * @width: width of rectangle that changed
@@ -197,11 +197,11 @@ mutter_texture_tower_set_base_texture (MutterTextureTower *tower,
  * the appropriate area of the scaled down texture will be updated.
  */
 void
-mutter_texture_tower_update_area (MutterTextureTower *tower,
-                                  int                 x,
-                                  int                 y,
-                                  int                 width,
-                                  int                 height)
+meta_texture_tower_update_area (MetaTextureTower *tower,
+                                int               x,
+                                int               y,
+                                int               width,
+                                int               height)
 {
   int texture_width, texture_height;
   Box invalid;
@@ -257,7 +257,7 @@ mutter_texture_tower_update_area (MutterTextureTower *tower,
  * If window is being painted at an angle from the viewer, then we have to
  * pick a point in the texture; we use the middle of the texture (which is
  * why the width/height are passed in.) This is not the normal case for
- * Mutter.
+ * Meta.
  */
 static int
 get_paint_level (int width, int height)
@@ -369,10 +369,10 @@ is_power_of_two (int x)
 }
 
 static void
-texture_tower_create_texture (MutterTextureTower *tower,
-                              int                 level,
-                              int                 width,
-                              int                 height)
+texture_tower_create_texture (MetaTextureTower *tower,
+                              int               level,
+                              int               width,
+                              int               height)
 {
   if ((!is_power_of_two (width) || !is_power_of_two (height)) &&
       texture_is_rectangle (tower->textures[level - 1]))
@@ -409,8 +409,8 @@ texture_tower_create_texture (MutterTextureTower *tower,
 }
 
 static gboolean
-texture_tower_revalidate_fbo (MutterTextureTower *tower,
-                              int                 level)
+texture_tower_revalidate_fbo (MetaTextureTower *tower,
+                              int               level)
 {
   CoglHandle source_texture = tower->textures[level - 1];
   int source_texture_width = cogl_texture_get_width (source_texture);
@@ -487,8 +487,8 @@ fill_scale_down (guchar       *buf,
 }
 
 static void
-texture_tower_revalidate_client (MutterTextureTower *tower,
-                                 int                 level)
+texture_tower_revalidate_client (MetaTextureTower *tower,
+                                 int               level)
 {
   CoglHandle source_texture = tower->textures[level - 1];
   int source_texture_width = cogl_texture_get_width (source_texture);
@@ -587,16 +587,16 @@ texture_tower_revalidate_client (MutterTextureTower *tower,
 }
 
 static void
-texture_tower_revalidate (MutterTextureTower *tower,
-                          int                 level)
+texture_tower_revalidate (MetaTextureTower *tower,
+                          int               level)
 {
   if (!texture_tower_revalidate_fbo (tower, level))
     texture_tower_revalidate_client (tower, level);
 }
 
 /**
- * mutter_texture_tower_get_paint_texture:
- * @tower: a MutterTextureTower
+ * meta_texture_tower_get_paint_texture:
+ * @tower: a MetaTextureTower
  *
  * Gets the texture from the tower that best matches the current
  * rendering scale. (On the assumption here the texture is going to
@@ -608,7 +608,7 @@ texture_tower_revalidate (MutterTextureTower *tower,
  *  %COGL_INVALID_HANDLE if no base texture has yet been set.
  */
 CoglHandle
-mutter_texture_tower_get_paint_texture (MutterTextureTower *tower)
+meta_texture_tower_get_paint_texture (MetaTextureTower *tower)
 {
   int texture_width, texture_height;
   int level;

src/compositor/meta-texture-tower.h

@@ -1,6 +1,6 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 /*
- * MutterTextureTower
+ * MetaTextureTower
  *
  * Mipmap emulation by creation of scaled down images
  *
@@ -22,18 +22,18 @@
  * 02111-1307, USA.
  */
 
-#ifndef __MUTTER_TEXTURE_TOWER_H__
-#define __MUTTER_TEXTURE_TOWER_H__
+#ifndef __META_TEXTURE_TOWER_H__
+#define __META_TEXTURE_TOWER_H__
 
 #include <clutter/clutter.h>
 
 G_BEGIN_DECLS
 
 /**
- * SECTION:MutterTextureTower
+ * SECTION:MetaTextureTower
  * @short_description: mipmap emulation by creation of scaled down images
  *
- * A #MutterTextureTower is used to get good looking scaled down images when
+ * A #MetaTextureTower is used to get good looking scaled down images when
  * we can't use the GL drivers mipmap support. There are two separate reasons
  *
  *  - Some cards (including radeon cards <= r5xx) only support
@@ -51,19 +51,19 @@ G_BEGIN_DECLS
  * scale for the entire texture.)
  */
 
-typedef struct _MutterTextureTower MutterTextureTower;
+typedef struct _MetaTextureTower MetaTextureTower;
 
-MutterTextureTower *mutter_texture_tower_new               (void);
-void                mutter_texture_tower_free              (MutterTextureTower *tower);
-void                mutter_texture_tower_set_base_texture  (MutterTextureTower *tower,
-                                                            CoglHandle          texture);
-void                mutter_texture_tower_update_area       (MutterTextureTower *tower,
-                                                            int                 x,
-                                                            int                 y,
-                                                            int                 width,
-                                                            int                 height);
-CoglHandle          mutter_texture_tower_get_paint_texture (MutterTextureTower *tower);
+MetaTextureTower *meta_texture_tower_new               (void);
+void              meta_texture_tower_free              (MetaTextureTower *tower);
+void              meta_texture_tower_set_base_texture  (MetaTextureTower *tower,
+                                                        CoglHandle        texture);
+void              meta_texture_tower_update_area       (MetaTextureTower *tower,
+                                                        int               x,
+                                                        int               y,
+                                                        int               width,
+                                                        int               height);
+CoglHandle        meta_texture_tower_get_paint_texture (MetaTextureTower *tower);
 
 G_BEGIN_DECLS
 
-#endif /* __MUTTER_TEXTURE_TOWER_H__ */
+#endif /* __META_TEXTURE_TOWER_H__ */

src/compositor/meta-window-actor-private.h

@@ -0,0 +1,53 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+#ifndef META_WINDOW_ACTOR_PRIVATE_H
+#define META_WINDOW_ACTOR_PRIVATE_H
+
+#include <config.h>
+
+#include <X11/extensions/Xdamage.h>
+#include "compositor-mutter.h"
+
+MetaWindowActor *meta_window_actor_new (MetaWindow *window);
+
+void meta_window_actor_destroy   (MetaWindowActor *self);
+
+void meta_window_actor_show (MetaWindowActor *self,
+                             MetaCompEffect   effect);
+void meta_window_actor_hide (MetaWindowActor *self,
+                             MetaCompEffect   effect);
+
+void meta_window_actor_maximize   (MetaWindowActor *self,
+                                   MetaRectangle   *old_rect,
+                                   MetaRectangle   *new_rect);
+void meta_window_actor_unmaximize (MetaWindowActor *self,
+                                   MetaRectangle   *old_rect,
+                                   MetaRectangle   *new_rect);
+
+void meta_window_actor_process_damage (MetaWindowActor    *self,
+                                       XDamageNotifyEvent *event);
+void meta_window_actor_pre_paint      (MetaWindowActor    *self);
+
+void meta_window_actor_invalidate_shadow (MetaWindowActor *self);
+
+gboolean meta_window_actor_effect_in_progress  (MetaWindowActor *self);
+void     meta_window_actor_sync_actor_position (MetaWindowActor *self);
+void     meta_window_actor_sync_visibility     (MetaWindowActor *self);
+void     meta_window_actor_update_shape        (MetaWindowActor *self,
+                                                gboolean         shaped);
+void     meta_window_actor_update_opacity      (MetaWindowActor *self);
+void     meta_window_actor_mapped              (MetaWindowActor *self);
+void     meta_window_actor_unmapped            (MetaWindowActor *self);
+
+cairo_region_t *meta_window_actor_get_obscured_region (MetaWindowActor *self);
+
+void meta_window_actor_set_visible_region         (MetaWindowActor *self,
+                                                   cairo_region_t  *visible_region);
+void meta_window_actor_set_visible_region_beneath (MetaWindowActor *self,
+                                                   cairo_region_t  *beneath_region);
+void meta_window_actor_reset_visible_regions      (MetaWindowActor *self);
+
+void meta_window_actor_effect_completed (MetaWindowActor *actor,
+                                         gulong           event);
+
+#endif /* META_WINDOW_ACTOR_PRIVATE_H */

src/compositor/meta-window-group.c

@@ -1,24 +1,26 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
+#include <config.h>
+
 #define _ISOC99_SOURCE /* for roundf */
 #include <math.h>
 
-#include "mutter-window-private.h"
-#include "mutter-window-group.h"
+#include "meta-window-actor-private.h"
+#include "meta-window-group.h"
 
-struct _MutterWindowGroupClass
+struct _MetaWindowGroupClass
 {
   ClutterGroupClass parent_class;
 };
 
-struct _MutterWindowGroup
+struct _MetaWindowGroup
 {
   ClutterGroup parent;
 
   MetaScreen *screen;
 };
 
-G_DEFINE_TYPE (MutterWindowGroup, mutter_window_group, CLUTTER_TYPE_GROUP);
+G_DEFINE_TYPE (MetaWindowGroup, meta_window_group, CLUTTER_TYPE_GROUP);
 
 /* We want to find out if the window is "close enough" to
  * 1:1 transform. We do that by converting the transformed coordinates
@@ -96,11 +98,11 @@ actor_is_untransformed (ClutterActor *actor,
 }
 
 static void
-mutter_window_group_paint (ClutterActor *actor)
+meta_window_group_paint (ClutterActor *actor)
 {
-  MutterWindowGroup *window_group = MUTTER_WINDOW_GROUP (actor);
-  GdkRegion *visible_region;
-  GdkRectangle screen_rect = { 0 };
+  MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
+  cairo_region_t *visible_region;
+  cairo_rectangle_int_t screen_rect = { 0 };
   GList *children, *l;
 
   /* We walk the list from top to bottom (opposite of painting order),
@@ -116,77 +118,77 @@ mutter_window_group_paint (ClutterActor *actor)
    * optimization, however.)
    */
   meta_screen_get_size (window_group->screen, &screen_rect.width, &screen_rect.height);
-  visible_region = gdk_region_rectangle (&screen_rect);
+  visible_region = cairo_region_create_rectangle (&screen_rect);
 
   for (l = children; l; l = l->next)
     {
-      MutterWindow *cw;
+      MetaWindowActor *window_actor;
       gboolean x, y;
 
-      if (!MUTTER_IS_WINDOW (l->data) || !CLUTTER_ACTOR_IS_VISIBLE (l->data))
+      if (!META_IS_WINDOW_ACTOR (l->data) || !CLUTTER_ACTOR_IS_VISIBLE (l->data))
         continue;
 
-      cw = l->data;
+      window_actor = l->data;
 
-      if (!actor_is_untransformed (CLUTTER_ACTOR (cw), &x, &y))
+      if (!actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
         continue;
 
       /* Temporarily move to the coordinate system of the actor */
-      gdk_region_offset (visible_region, - x, - y);
+      cairo_region_translate (visible_region, - x, - y);
 
-      mutter_window_set_visible_region (cw, visible_region);
+      meta_window_actor_set_visible_region (window_actor, visible_region);
 
-      if (clutter_actor_get_paint_opacity (CLUTTER_ACTOR (cw)) == 0xff)
+      if (clutter_actor_get_paint_opacity (CLUTTER_ACTOR (window_actor)) == 0xff)
         {
-          GdkRegion *obscured_region = mutter_window_get_obscured_region (cw);
+          cairo_region_t *obscured_region = meta_window_actor_get_obscured_region (window_actor);
           if (obscured_region)
-            gdk_region_subtract (visible_region, obscured_region);
+            cairo_region_subtract (visible_region, obscured_region);
         }
 
-      mutter_window_set_visible_region_beneath (cw, visible_region);
-      gdk_region_offset (visible_region, x, y);
+      meta_window_actor_set_visible_region_beneath (window_actor, visible_region);
+      cairo_region_translate (visible_region, x, y);
     }
 
-  gdk_region_destroy (visible_region);
+  cairo_region_destroy (visible_region);
 
-  CLUTTER_ACTOR_CLASS (mutter_window_group_parent_class)->paint (actor);
+  CLUTTER_ACTOR_CLASS (meta_window_group_parent_class)->paint (actor);
 
   /* Now that we are done painting, unset the visible regions (they will
    * mess up painting clones of our actors)
    */
   for (l = children; l; l = l->next)
     {
-      MutterWindow *cw;
+      MetaWindowActor *window_actor;
 
-      if (!MUTTER_IS_WINDOW (l->data))
+      if (!META_IS_WINDOW_ACTOR (l->data))
         continue;
 
-      cw = l->data;
-      mutter_window_reset_visible_regions (cw);
+      window_actor = l->data;
+      meta_window_actor_reset_visible_regions (window_actor);
     }
 
   g_list_free (children);
 }
 
 static void
-mutter_window_group_class_init (MutterWindowGroupClass *klass)
+meta_window_group_class_init (MetaWindowGroupClass *klass)
 {
   ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
 
-  actor_class->paint = mutter_window_group_paint;
+  actor_class->paint = meta_window_group_paint;
 }
 
 static void
-mutter_window_group_init (MutterWindowGroup *window_group)
+meta_window_group_init (MetaWindowGroup *window_group)
 {
 }
 
 ClutterActor *
-mutter_window_group_new (MetaScreen *screen)
+meta_window_group_new (MetaScreen *screen)
 {
-  MutterWindowGroup *window_group;
+  MetaWindowGroup *window_group;
 
-  window_group = g_object_new (MUTTER_TYPE_WINDOW_GROUP, NULL);
+  window_group = g_object_new (META_TYPE_WINDOW_GROUP, NULL);
 
   window_group->screen = screen;
 

src/compositor/meta-window-group.h

@@ -1,17 +1,17 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
 
-#ifndef MUTTER_WINDOW_GROUP_H
-#define MUTTER_WINDOW_GROUP_H
+#ifndef META_WINDOW_GROUP_H
+#define META_WINDOW_GROUP_H
 
 #include <clutter/clutter.h>
 
 #include "screen.h"
 
 /**
- * MutterWindowGroup:
+ * MetaWindowGroup:
  *
  * This class is a subclass of ClutterGroup with special handling for
- * MutterWindow when painting the group. When we are painting a stack
+ * MetaWindowActor when painting the group. When we are painting a stack
  * of 5-10 maximized windows, the standard bottom-to-top method of
  * drawing every actor results in a tremendous amount of overdraw
  * and can easily max out the available memory bandwidth on a low-end
@@ -21,7 +21,7 @@
  * The basic technique applied here is to do a pre-pass before painting
  * where we walk window from top to bottom and compute the visible area
  * at each step by subtracting out the windows above it. The visible
- * area is passed to MutterWindow which uses it to clip the portion of
+ * area is passed to MetaWindowActor which uses it to clip the portion of
  * the window which drawn and avoid redrawing the shadow if it is completely
  * obscured.
  *
@@ -34,19 +34,19 @@
  * we have lots of memory and bandwidth.)
  */
 
-#define MUTTER_TYPE_WINDOW_GROUP            (mutter_window_group_get_type ())
-#define MUTTER_WINDOW_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MUTTER_TYPE_WINDOW_GROUP, MutterWindowGroup))
-#define MUTTER_WINDOW_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MUTTER_TYPE_WINDOW_GROUP, MutterWindowGroupClass))
-#define MUTTER_IS_WINDOW_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MUTTER_TYPE_WINDOW_GROUP))
-#define MUTTER_IS_WINDOW_GROU_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), MUTTER_TYPE_WINDOW_GROUP))
-#define MUTTER_WINDOW_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MUTTER_TYPE_WINDOW_GROUP, MutterWindowGroupClass))
+#define META_TYPE_WINDOW_GROUP            (meta_window_group_get_type ())
+#define META_WINDOW_GROUP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_WINDOW_GROUP, MetaWindowGroup))
+#define META_WINDOW_GROUP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_WINDOW_GROUP, MetaWindowGroupClass))
+#define META_IS_WINDOW_GROUP(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_WINDOW_GROUP))
+#define META_IS_WINDOW_GROUP_CLASS(klass)  (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_WINDOW_GROUP))
+#define META_WINDOW_GROUP_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_WINDOW_GROUP, MetaWindowGroupClass))
 
-typedef struct _MutterWindowGroup        MutterWindowGroup;
-typedef struct _MutterWindowGroupClass   MutterWindowGroupClass;
-typedef struct _MutterWindowGroupPrivate MutterWindowGroupPrivate;
+typedef struct _MetaWindowGroup        MetaWindowGroup;
+typedef struct _MetaWindowGroupClass   MetaWindowGroupClass;
+typedef struct _MetaWindowGroupPrivate MetaWindowGroupPrivate;
 
-GType mutter_window_group_get_type (void);
+GType meta_window_group_get_type (void);
 
-ClutterActor *mutter_window_group_new (MetaScreen *screen);
+ClutterActor *meta_window_group_new (MetaScreen *screen);
 
-#endif /* MUTTER_WINDOW_GROUP_H */
+#endif /* META_WINDOW_GROUP_H */

src/compositor/meta-window-shape.c

@@ -0,0 +1,253 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * MetaWindowShape
+ *
+ * Extracted invariant window shape
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+#include <string.h>
+
+#include "meta-window-shape.h"
+#include "region-utils.h"
+
+struct _MetaWindowShape
+{
+  guint ref_count;
+
+  int top, right, bottom, left;
+  int n_rectangles;
+  cairo_rectangle_int_t *rectangles;
+  guint hash;
+};
+
+MetaWindowShape *
+meta_window_shape_new (cairo_region_t *region)
+{
+  MetaWindowShape *shape;
+  MetaRegionIterator iter;
+  cairo_rectangle_int_t extents;
+  int max_yspan_y1 = 0;
+  int max_yspan_y2 = 0;
+  int max_xspan_x1 = -1;
+  int max_xspan_x2 = -1;
+  guint hash;
+
+  shape = g_slice_new0 (MetaWindowShape);
+  shape->ref_count = 1;
+
+  cairo_region_get_extents (region, &extents);
+
+  shape->n_rectangles = cairo_region_num_rectangles (region);
+
+  if (shape->n_rectangles == 0)
+    {
+      shape->rectangles = NULL;
+      shape->top = shape->right = shape->bottom = shape->left = 0;
+      shape->hash = 0;
+      return shape;
+    }
+
+  for (meta_region_iterator_init (&iter, region);
+       !meta_region_iterator_at_end (&iter);
+       meta_region_iterator_next (&iter))
+    {
+      int max_line_xspan_x1 = -1;
+      int max_line_xspan_x2 = -1;
+
+      if (iter.rectangle.width > max_line_xspan_x2 - max_line_xspan_x1)
+        {
+          max_line_xspan_x1 = iter.rectangle.x;
+          max_line_xspan_x2 = iter.rectangle.x + iter.rectangle.width;
+        }
+
+      if (iter.line_end)
+        {
+          if (iter.rectangle.height > max_yspan_y2 - max_yspan_y1)
+            {
+              max_yspan_y1 = iter.rectangle.y;
+              max_yspan_y2 = iter.rectangle.y + iter.rectangle.height;
+            }
+
+          if (max_xspan_x1 < 0) /* First line */
+            {
+              max_xspan_x1 = max_line_xspan_x1;
+              max_xspan_x2 = max_line_xspan_x2;
+            }
+          else
+            {
+              max_xspan_x1 = MAX (max_xspan_x1, max_line_xspan_x1);
+              max_xspan_x2 = MIN (max_xspan_x2, max_line_xspan_x2);
+
+              if (max_xspan_x2 < max_xspan_x1)
+                max_xspan_x2 = max_xspan_x1;
+            }
+        }
+    }
+
+#if 0
+  g_print ("xspan: %d -> %d, yspan: %d -> %d\n",
+           max_xspan_x1, max_xspan_x2,
+           max_yspan_y1, max_yspan_y2);
+#endif
+
+  shape->top = max_yspan_y1 - extents.y;
+  shape->right = extents.x + extents.width - max_xspan_x2;
+  shape->bottom = extents.y + extents.height - max_yspan_y2;
+  shape->left = max_xspan_x1 - extents.x;
+
+  shape->rectangles = g_new (cairo_rectangle_int_t, shape->n_rectangles);
+
+  hash = 0;
+  for (meta_region_iterator_init (&iter, region);
+       !meta_region_iterator_at_end (&iter);
+       meta_region_iterator_next (&iter))
+    {
+      int x1, x2, y1, y2;
+
+      x1 = iter.rectangle.x;
+      x2 = iter.rectangle.x + iter.rectangle.width;
+      y1 = iter.rectangle.y;
+      y2 = iter.rectangle.y + iter.rectangle.height;
+
+      if (x1 > max_xspan_x1)
+        x1 -= MIN (x1, max_xspan_x2 - 1) - max_xspan_x1;
+      if (x2 > max_xspan_x1)
+        x2 -= MIN (x2, max_xspan_x2 - 1) - max_xspan_x1;
+      if (y1 > max_yspan_y1)
+        y1 -= MIN (y1, max_yspan_y2 - 1) - max_yspan_y1;
+      if (y2 > max_yspan_y1)
+        y2 -= MIN (y2, max_yspan_y2 - 1) - max_yspan_y1;
+
+      shape->rectangles[iter.i].x = x1 - extents.x;
+      shape->rectangles[iter.i].y = y1 - extents.y;
+      shape->rectangles[iter.i].width = x2 - x1;
+      shape->rectangles[iter.i].height = y2 - y1;
+
+#if 0
+      g_print ("%d: +%d+%dx%dx%d => +%d+%dx%dx%d\n",
+               i, iter.rectangle.x, iter.rectangle.y, iter.rectangle.width, iter.rectangle.height,
+               shape->rectangles[i].x, shape->rectangles[i].y, shape->rectangles[i].width, shape->rectangles[i].height);
+#endif
+
+      hash = hash * 31 + x1 * 17 + x2 * 27 + y1 * 37 + y2 * 43;
+    }
+
+  shape->hash = hash;
+
+#if 0
+  g_print ("%d %d %d %d: %#x\n\n", shape->top, shape->right, shape->bottom, shape->left, shape->hash);
+#endif
+
+  return shape;
+}
+
+MetaWindowShape *
+meta_window_shape_ref (MetaWindowShape *shape)
+{
+  shape->ref_count++;
+
+  return shape;
+}
+
+void
+meta_window_shape_unref (MetaWindowShape *shape)
+{
+  shape->ref_count--;
+  if (shape->ref_count == 0)
+    {
+      g_free (shape->rectangles);
+      g_slice_free (MetaWindowShape, shape);
+    }
+}
+
+guint
+meta_window_shape_hash (MetaWindowShape *shape)
+{
+  return shape->hash;
+}
+
+gboolean
+meta_window_shape_equal (MetaWindowShape *shape_a,
+                         MetaWindowShape *shape_b)
+{
+  if (shape_a->n_rectangles != shape_b->n_rectangles)
+    return FALSE;
+
+  return memcmp (shape_a->rectangles, shape_b->rectangles,
+                 sizeof (cairo_rectangle_int_t) * shape_a->n_rectangles) == 0;
+}
+
+void
+meta_window_shape_get_borders (MetaWindowShape *shape,
+                               int             *border_top,
+                               int             *border_right,
+                               int             *border_bottom,
+                               int             *border_left)
+{
+  if (border_top)
+    *border_top = shape->top;
+  if (border_right)
+    *border_right = shape->right;
+  if (border_bottom)
+    *border_bottom = shape->bottom;
+  if (border_left)
+    *border_left = shape->left;
+}
+
+/**
+ * meta_window_shape_to_region:
+ * @shape: a #MetaWindowShape
+ * @center_width: size of the central region horizontally
+ * @center_height: size of the central region vertically
+ *
+ * Converts the shape to to a cairo_region_t using the given width
+ * and height for the central scaled region.
+ *
+ * Return value: a newly created region
+ */
+cairo_region_t *
+meta_window_shape_to_region (MetaWindowShape *shape,
+                             int              center_width,
+                             int              center_height)
+{
+  cairo_region_t *region;
+  int i;
+
+  region = cairo_region_create ();
+
+  for (i = 0; i < shape->n_rectangles; i++)
+    {
+      cairo_rectangle_int_t rect = shape->rectangles[i];
+
+      if (rect.x <= shape->left && rect.x + rect.width >= shape->left + 1)
+        rect.width += center_width;
+      else if (rect.x >= shape->left + 1)
+        rect.x += center_width;
+
+      if (rect.y <= shape->top && rect.y + rect.height >= shape->top + 1)
+        rect.height += center_height;
+      else if (rect.y >= shape->top + 1)
+        rect.y += center_height;
+
+      cairo_region_union_rectangle (region, &rect);
+    }
+
+  return region;
+}
+

src/compositor/meta-window-shape.h

@@ -0,0 +1,60 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * MetaWindowShape
+ *
+ * Extracted invariant window shape
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __META_WINDOW_SHAPE_H__
+#define __META_WINDOW_SHAPE_H__
+
+#include <cairo.h>
+#include <glib.h>
+
+/**
+ * MetaWindowShape:
+ * #MetaWindowShape represents a 9-sliced region with borders on all sides that
+ * are unscaled, and a constant central region that is scaled. For example,
+ * if you the regions representing two windows that around rounded rectangles,
+ * with the same corner regions, but different sizes, they have the
+ * same MetaWindowShape.
+ *
+ * #MetaWindowShape is designed to be used as part of a hash table key, so has
+ * efficient hash and equal functions.
+ */
+typedef struct _MetaWindowShape MetaWindowShape;
+
+MetaWindowShape *  meta_window_shape_new         (cairo_region_t  *region);
+MetaWindowShape *  meta_window_shape_ref         (MetaWindowShape *shape);
+void               meta_window_shape_unref       (MetaWindowShape *shape);
+guint              meta_window_shape_hash        (MetaWindowShape *shape);
+gboolean           meta_window_shape_equal       (MetaWindowShape *shape_a,
+                                                  MetaWindowShape *shape_b);
+void               meta_window_shape_get_borders (MetaWindowShape *shape,
+                                                  int             *border_top,
+                                                  int             *border_right,
+                                                  int             *border_bottom,
+                                                  int             *border_left);
+cairo_region_t    *meta_window_shape_to_region   (MetaWindowShape *shape,
+                                                  int              center_width,
+                                                  int              center_height);
+
+#endif /* __META_WINDOW_SHAPE_H __*/
+

src/compositor/mutter-plugin-manager.h

@@ -1,65 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (c) 2008 Intel Corp.
- *
- * Author: Tomas Frydrych <tf@linux.intel.com>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef MUTTER_PLUGIN_MANAGER_H_
-#define MUTTER_PLUGIN_MANAGER_H_
-
-#include "types.h"
-#include "screen.h"
-
-#define  MUTTER_PLUGIN_FROM_MANAGER_
-#include "mutter-plugin.h"
-#undef   MUTTER_PLUGIN_FROM_MANAGER_
-
-typedef struct MutterPluginManager MutterPluginManager;
-
-MutterPluginManager * mutter_plugin_manager_get         (MetaScreen *screen);
-MutterPluginManager * mutter_plugin_manager_get_default (void);
-
-gboolean mutter_plugin_manager_load (MutterPluginManager *mgr);
-gboolean mutter_plugin_manager_initialize (MutterPluginManager *plugin_mgr);
-gboolean mutter_plugin_manager_event_simple (MutterPluginManager *mgr,
-					     MutterWindow  *actor,
-					     unsigned long    event);
-
-gboolean mutter_plugin_manager_event_maximize (MutterPluginManager *mgr,
-					       MutterWindow  *actor,
-					       unsigned long    event,
-					       gint             target_x,
-					       gint             target_y,
-					       gint             target_width,
-					       gint		target_height);
-void mutter_plugin_manager_update_workspaces (MutterPluginManager *mgr);
-
-void mutter_plugin_manager_update_workspace (MutterPluginManager *mgr, MetaWorkspace *w);
-
-gboolean mutter_plugin_manager_switch_workspace (MutterPluginManager *mgr,
-						 const GList **actors,
-						 gint          from,
-						 gint          to,
-						 MetaMotionDirection direction);
-
-gboolean mutter_plugin_manager_xevent_filter (MutterPluginManager *mgr,
-					      XEvent *xev);
-
-#endif

src/compositor/mutter-shaped-texture.h

@@ -1,101 +0,0 @@
-/*
- * shaped texture
- *
- * An actor to draw a texture clipped to a list of rectangles
- *
- * Authored By Neil Roberts  <neil@linux.intel.com>
- *
- * Copyright (C) 2008 Intel Corporation
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef __MUTTER_SHAPED_TEXTURE_H__
-#define __MUTTER_SHAPED_TEXTURE_H__
-
-#include <clutter/clutter.h>
-#ifdef HAVE_GLX_TEXTURE_PIXMAP
-#include <clutter/glx/clutter-glx.h>
-#endif /* HAVE_GLX_TEXTURE_PIXMAP */
-
-#include <gdk/gdkregion.h>
-
-G_BEGIN_DECLS
-
-#define MUTTER_TYPE_SHAPED_TEXTURE			    \
-  (mutter_shaped_texture_get_type())
-#define MUTTER_SHAPED_TEXTURE(obj)                          \
-  (G_TYPE_CHECK_INSTANCE_CAST ((obj),                       \
-                               MUTTER_TYPE_SHAPED_TEXTURE,  \
-                               MutterShapedTexture))
-#define MUTTER_SHAPED_TEXTURE_CLASS(klass)                  \
-  (G_TYPE_CHECK_CLASS_CAST ((klass),			    \
-                            MUTTER_TYPE_SHAPED_TEXTURE,	    \
-                            MutterShapedTextureClass))
-#define MUTTER_IS_SHAPED_TEXTURE(obj)                       \
-  (G_TYPE_CHECK_INSTANCE_TYPE ((obj),			    \
-                               MUTTER_TYPE_SHAPED_TEXTURE))
-#define MUTTER_IS_SHAPED_TEXTURE_CLASS(klass)		    \
-  (G_TYPE_CHECK_CLASS_TYPE ((klass),			    \
-                            MUTTER_TYPE_SHAPED_TEXTURE))
-#define MUTTER_SHAPED_TEXTURE_GET_CLASS(obj)                \
-  (G_TYPE_INSTANCE_GET_CLASS ((obj),                        \
-                              MUTTER_TYPE_SHAPED_TEXTURE,   \
-                              MutterShapedTextureClass))
-
-typedef struct _MutterShapedTexture        MutterShapedTexture;
-typedef struct _MutterShapedTextureClass   MutterShapedTextureClass;
-typedef struct _MutterShapedTexturePrivate MutterShapedTexturePrivate;
-
-struct _MutterShapedTextureClass
-{
-#ifdef HAVE_GLX_TEXTURE_PIXMAP
-  ClutterGLXTexturePixmapClass parent_class;
-#else
-  ClutterX11TexturePixmapClass parent_class;
-#endif
-};
-
-struct _MutterShapedTexture
-{
-#ifdef HAVE_GLX_TEXTURE_PIXMAP
-  ClutterGLXTexturePixmap parent;
-#else
-  ClutterX11TexturePixmap parent;
-#endif
-
-  MutterShapedTexturePrivate *priv;
-};
-
-GType mutter_shaped_texture_get_type (void) G_GNUC_CONST;
-
-ClutterActor *mutter_shaped_texture_new (void);
-
-void mutter_shaped_texture_clear_rectangles (MutterShapedTexture *stex);
-
-void mutter_shaped_texture_add_rectangle (MutterShapedTexture *stex,
-					  const XRectangle *rect);
-void mutter_shaped_texture_add_rectangles (MutterShapedTexture *stex,
-					   size_t num_rects,
-					   const XRectangle *rects);
-
-/* Assumes ownership of clip_region */
-void mutter_shaped_texture_set_clip_region (MutterShapedTexture *stex,
-					    GdkRegion           *clip_region);
-
-G_END_DECLS
-
-#endif /* __MUTTER_SHAPED_TEXTURE_H__ */

src/compositor/mutter-window-private.h

@@ -1,51 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#ifndef MUTTER_WINDOW_PRIVATE_H
-#define MUTTER_WINDOW_PRIVATE_H
-
-#include <X11/extensions/Xdamage.h>
-#include <gdk/gdk.h>
-#include "compositor-mutter.h"
-
-MutterWindow *mutter_window_new (MetaWindow *window);
-
-void mutter_window_destroy   (MutterWindow *cw);
-
-void mutter_window_show (MutterWindow   *cw,
-                         MetaCompEffect  effect);
-void mutter_window_hide (MutterWindow   *cw,
-                         MetaCompEffect  effect);
-
-void mutter_window_maximize   (MutterWindow  *cw,
-                               MetaRectangle *old_rect,
-                               MetaRectangle *new_rect);
-void mutter_window_unmaximize (MutterWindow  *cw,
-                               MetaRectangle *old_rect,
-                               MetaRectangle *new_rect);
-
-void     mutter_window_process_damage          (MutterWindow       *cw,
-                                                XDamageNotifyEvent *event);
-void     mutter_window_pre_paint               (MutterWindow       *self);
-
-gboolean mutter_window_effect_in_progress      (MutterWindow       *cw);
-void     mutter_window_sync_actor_position     (MutterWindow       *cw);
-void     mutter_window_sync_visibility         (MutterWindow       *cw);
-void     mutter_window_update_window_type      (MutterWindow       *cw);
-void     mutter_window_update_shape            (MutterWindow       *cw,
-                                                gboolean            shaped);
-void     mutter_window_update_opacity          (MutterWindow       *cw);
-void     mutter_window_mapped                  (MutterWindow       *cw);
-void     mutter_window_unmapped                (MutterWindow       *cw);
-
-GdkRegion *mutter_window_get_obscured_region   (MutterWindow       *cw);
-
-void mutter_window_set_visible_region          (MutterWindow       *cw,
-                                                GdkRegion          *visible_region);
-void mutter_window_set_visible_region_beneath  (MutterWindow       *cw,
-                                                GdkRegion          *beneath_region);
-void mutter_window_reset_visible_regions       (MutterWindow       *cw);
-
-void mutter_window_effect_completed (MutterWindow *actor,
-                                     gulong        event);
-
-#endif /* MUTTER_WINDOW_PRIVATE_H */

src/compositor/plugins/default.c

@@ -21,7 +21,8 @@
  * 02111-1307, USA.
  */
 
-#include "mutter-plugin.h"
+#include "meta-plugin.h"
+#include "window.h"
 
 #include <libintl.h>
 #define _(x) dgettext (GETTEXT_PACKAGE, x)
@@ -39,71 +40,78 @@
 
 #define ACTOR_DATA_KEY "MCCP-Default-actor-data"
 
-#define MUTTER_TYPE_DEFAULT_PLUGIN            (mutter_default_plugin_get_type ())
-#define MUTTER_DEFAULT_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MUTTER_TYPE_DEFAULT_PLUGIN, MutterDefaultPlugin))
-#define MUTTER_DEFAULT_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MUTTER_TYPE_DEFAULT_PLUGIN, MutterDefaultPluginClass))
-#define MUTTER_IS_DEFAULT_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MUTTER_DEFAULT_PLUGIN_TYPE))
-#define MUTTER_IS_DEFAULT_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MUTTER_TYPE_DEFAULT_PLUGIN))
-#define MUTTER_DEFAULT_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MUTTER_TYPE_DEFAULT_PLUGIN, MutterDefaultPluginClass))
+#define META_TYPE_DEFAULT_PLUGIN            (meta_default_plugin_get_type ())
+#define META_DEFAULT_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_DEFAULT_PLUGIN, MetaDefaultPlugin))
+#define META_DEFAULT_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_DEFAULT_PLUGIN, MetaDefaultPluginClass))
+#define META_IS_DEFAULT_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_DEFAULT_PLUGIN_TYPE))
+#define META_IS_DEFAULT_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_DEFAULT_PLUGIN))
+#define META_DEFAULT_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_DEFAULT_PLUGIN, MetaDefaultPluginClass))
 
-#define MUTTER_DEFAULT_PLUGIN_GET_PRIVATE(obj) \
-(G_TYPE_INSTANCE_GET_PRIVATE ((obj), MUTTER_TYPE_DEFAULT_PLUGIN, MutterDefaultPluginPrivate))
+#define META_DEFAULT_PLUGIN_GET_PRIVATE(obj) \
+(G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_DEFAULT_PLUGIN, MetaDefaultPluginPrivate))
 
-typedef struct _MutterDefaultPlugin        MutterDefaultPlugin;
-typedef struct _MutterDefaultPluginClass   MutterDefaultPluginClass;
-typedef struct _MutterDefaultPluginPrivate MutterDefaultPluginPrivate;
+typedef struct _MetaDefaultPlugin        MetaDefaultPlugin;
+typedef struct _MetaDefaultPluginClass   MetaDefaultPluginClass;
+typedef struct _MetaDefaultPluginPrivate MetaDefaultPluginPrivate;
 
-struct _MutterDefaultPlugin
+struct _MetaDefaultPlugin
 {
-  MutterPlugin parent;
+  MetaPlugin parent;
 
-  MutterDefaultPluginPrivate *priv;
+  MetaDefaultPluginPrivate *priv;
 };
 
-struct _MutterDefaultPluginClass
+struct _MetaDefaultPluginClass
 {
-  MutterPluginClass parent_class;
+  MetaPluginClass parent_class;
 };
 
 static GQuark actor_data_quark = 0;
 
-static void     minimize   (MutterPlugin *plugin,
-                            MutterWindow *actor);
-static void     map        (MutterPlugin *plugin,
-                            MutterWindow *actor);
-static void     destroy    (MutterPlugin *plugin,
-                            MutterWindow *actor);
-static void     maximize   (MutterPlugin *plugin,
-                            MutterWindow *actor,
-                            gint x, gint y, gint width, gint height);
-static void     unmaximize (MutterPlugin *plugin,
-                            MutterWindow *actor,
-                            gint x, gint y, gint width, gint height);
+static void minimize   (MetaPlugin      *plugin,
+                        MetaWindowActor *actor);
+static void map        (MetaPlugin      *plugin,
+                        MetaWindowActor *actor);
+static void destroy    (MetaPlugin      *plugin,
+                        MetaWindowActor *actor);
+static void maximize   (MetaPlugin      *plugin,
+                        MetaWindowActor *actor,
+                        gint             x,
+                        gint             y,
+                        gint             width,
+                        gint             height);
+static void unmaximize (MetaPlugin      *plugin,
+                        MetaWindowActor *actor,
+                        gint             x,
+                        gint             y,
+                        gint             width,
+                        gint             height);
 
-static void switch_workspace (MutterPlugin *plugin,
-                              const GList **actors, gint from, gint to,
-                              MetaMotionDirection direction);
+static void switch_workspace (MetaPlugin          *plugin,
+                              gint                 from,
+                              gint                 to,
+                              MetaMotionDirection  direction);
 
-static void kill_effect (MutterPlugin *plugin,
-                         MutterWindow *actor, gulong event);
+static void kill_window_effects   (MetaPlugin      *plugin,
+                                   MetaWindowActor *actor);
+static void kill_switch_workspace (MetaPlugin      *plugin);
 
-static const MutterPluginInfo * plugin_info (MutterPlugin *plugin);
+static const MetaPluginInfo * plugin_info (MetaPlugin *plugin);
 
-MUTTER_PLUGIN_DECLARE(MutterDefaultPlugin, mutter_default_plugin);
+META_PLUGIN_DECLARE(MetaDefaultPlugin, meta_default_plugin);
 
 /*
  * Plugin private data that we store in the .plugin_private member.
  */
-struct _MutterDefaultPluginPrivate
+struct _MetaDefaultPluginPrivate
 {
   /* Valid only when switch_workspace effect is in progress */
   ClutterTimeline       *tml_switch_workspace1;
   ClutterTimeline       *tml_switch_workspace2;
-  GList                **actors;
   ClutterActor          *desktop1;
   ClutterActor          *desktop2;
 
-  MutterPluginInfo       info;
+  MetaPluginInfo         info;
 
   gboolean               debug_mode : 1;
 };
@@ -128,26 +136,26 @@ typedef struct _ActorPrivate
 typedef struct
 {
   ClutterActor *actor;
-  MutterPlugin *plugin;
+  MetaPlugin *plugin;
 } EffectCompleteData;
 
 
 static void
-mutter_default_plugin_dispose (GObject *object)
+meta_default_plugin_dispose (GObject *object)
 {
-  /* MutterDefaultPluginPrivate *priv = MUTTER_DEFAULT_PLUGIN (object)->priv;
+  /* MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (object)->priv;
   */
-  G_OBJECT_CLASS (mutter_default_plugin_parent_class)->dispose (object);
+  G_OBJECT_CLASS (meta_default_plugin_parent_class)->dispose (object);
 }
 
 static void
-mutter_default_plugin_finalize (GObject *object)
+meta_default_plugin_finalize (GObject *object)
 {
-  G_OBJECT_CLASS (mutter_default_plugin_parent_class)->finalize (object);
+  G_OBJECT_CLASS (meta_default_plugin_parent_class)->finalize (object);
 }
 
 static void
-mutter_default_plugin_set_property (GObject      *object,
+meta_default_plugin_set_property (GObject      *object,
 			    guint         prop_id,
 			    const GValue *value,
 			    GParamSpec   *pspec)
@@ -161,7 +169,7 @@ mutter_default_plugin_set_property (GObject      *object,
 }
 
 static void
-mutter_default_plugin_get_property (GObject    *object,
+meta_default_plugin_get_property (GObject    *object,
 			    guint       prop_id,
 			    GValue     *value,
 			    GParamSpec *pspec)
@@ -175,9 +183,9 @@ mutter_default_plugin_get_property (GObject    *object,
 }
 
 static void
-start (MutterPlugin *plugin)
+start (MetaPlugin *plugin)
 {
-  MutterDefaultPluginPrivate *priv   = MUTTER_DEFAULT_PLUGIN (plugin)->priv;
+  MetaDefaultPluginPrivate *priv   = META_DEFAULT_PLUGIN (plugin)->priv;
 
   guint destroy_timeout  = DESTROY_TIMEOUT;
   guint minimize_timeout = MINIMIZE_TIMEOUT;
@@ -185,7 +193,7 @@ start (MutterPlugin *plugin)
   guint map_timeout      = MAP_TIMEOUT;
   guint switch_timeout   = SWITCH_TIMEOUT;
 
-  if (mutter_plugin_debug_mode (plugin))
+  if (meta_plugin_debug_mode (plugin))
     {
       g_debug ("Plugin %s: Entering debug mode.", priv->info.name);
 
@@ -203,15 +211,15 @@ start (MutterPlugin *plugin)
 }
 
 static void
-mutter_default_plugin_class_init (MutterDefaultPluginClass *klass)
+meta_default_plugin_class_init (MetaDefaultPluginClass *klass)
 {
   GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
-  MutterPluginClass *plugin_class  = MUTTER_PLUGIN_CLASS (klass);
+  MetaPluginClass *plugin_class  = META_PLUGIN_CLASS (klass);
 
-  gobject_class->finalize        = mutter_default_plugin_finalize;
-  gobject_class->dispose         = mutter_default_plugin_dispose;
-  gobject_class->set_property    = mutter_default_plugin_set_property;
-  gobject_class->get_property    = mutter_default_plugin_get_property;
+  gobject_class->finalize        = meta_default_plugin_finalize;
+  gobject_class->dispose         = meta_default_plugin_dispose;
+  gobject_class->set_property    = meta_default_plugin_set_property;
+  gobject_class->get_property    = meta_default_plugin_get_property;
 
   plugin_class->start            = start;
   plugin_class->map              = map;
@@ -220,18 +228,19 @@ mutter_default_plugin_class_init (MutterDefaultPluginClass *klass)
   plugin_class->unmaximize       = unmaximize;
   plugin_class->destroy          = destroy;
   plugin_class->switch_workspace = switch_workspace;
-  plugin_class->kill_effect      = kill_effect;
   plugin_class->plugin_info      = plugin_info;
+  plugin_class->kill_window_effects   = kill_window_effects;
+  plugin_class->kill_switch_workspace = kill_switch_workspace;
 
-  g_type_class_add_private (gobject_class, sizeof (MutterDefaultPluginPrivate));
+  g_type_class_add_private (gobject_class, sizeof (MetaDefaultPluginPrivate));
 }
 
 static void
-mutter_default_plugin_init (MutterDefaultPlugin *self)
+meta_default_plugin_init (MetaDefaultPlugin *self)
 {
-  MutterDefaultPluginPrivate *priv;
+  MetaDefaultPluginPrivate *priv;
 
-  self->priv = priv = MUTTER_DEFAULT_PLUGIN_GET_PRIVATE (self);
+  self->priv = priv = META_DEFAULT_PLUGIN_GET_PRIVATE (self);
 
   priv->info.name        = "Default Effects";
   priv->info.version     = "0.1";
@@ -251,7 +260,7 @@ free_actor_private (gpointer data)
 }
 
 static ActorPrivate *
-get_actor_private (MutterWindow *actor)
+get_actor_private (MetaWindowActor *actor)
 {
   ActorPrivate *priv = g_object_get_qdata (G_OBJECT (actor), actor_data_quark);
 
@@ -270,26 +279,18 @@ get_actor_private (MutterWindow *actor)
   return priv;
 }
 
-typedef struct SwitchWorkspaceData
-{
-  MutterPlugin  *plugin;
-  const GList  **actors;
-} SwitchWorkspaceData;
-
 static void
 on_switch_workspace_effect_complete (ClutterTimeline *timeline, gpointer data)
 {
-  SwitchWorkspaceData        *sw_data = data;
-  MutterPlugin               *plugin  = sw_data->plugin;
-  MutterDefaultPluginPrivate *priv = MUTTER_DEFAULT_PLUGIN (plugin)->priv;
-  GList        *l     = *((GList**)sw_data->actors);
-  MutterWindow *actor_for_cb = l->data;
+  MetaPlugin               *plugin  = META_PLUGIN (data);
+  MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (plugin)->priv;
+  GList        *l     = meta_plugin_get_window_actors (plugin);
 
   while (l)
     {
       ClutterActor *a = l->data;
-      MutterWindow *mc_window = MUTTER_WINDOW (a);
-      ActorPrivate *apriv = get_actor_private (mc_window);
+      MetaWindowActor *window_actor = META_WINDOW_ACTOR (a);
+      ActorPrivate *apriv = get_actor_private (window_actor);
 
       if (apriv->orig_parent)
         {
@@ -303,40 +304,32 @@ on_switch_workspace_effect_complete (ClutterTimeline *timeline, gpointer data)
   clutter_actor_destroy (priv->desktop1);
   clutter_actor_destroy (priv->desktop2);
 
-  priv->actors = NULL;
   priv->tml_switch_workspace1 = NULL;
   priv->tml_switch_workspace2 = NULL;
   priv->desktop1 = NULL;
   priv->desktop2 = NULL;
 
-  g_free (data);
-
-  mutter_plugin_effect_completed (plugin, actor_for_cb,
-                                  MUTTER_PLUGIN_SWITCH_WORKSPACE);
+  meta_plugin_switch_workspace_completed (plugin);
 }
 
 static void
-switch_workspace (MutterPlugin *plugin,
-                  const GList **actors, gint from, gint to,
+switch_workspace (MetaPlugin *plugin,
+                  gint from, gint to,
                   MetaMotionDirection direction)
 {
-  MutterDefaultPluginPrivate *priv = MUTTER_DEFAULT_PLUGIN (plugin)->priv;
+  MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (plugin)->priv;
   GList        *l;
   gint          n_workspaces;
   ClutterActor *workspace0  = clutter_group_new ();
   ClutterActor *workspace1  = clutter_group_new ();
   ClutterActor *stage;
   int           screen_width, screen_height;
-  MetaScreen   *screen = mutter_plugin_get_screen (plugin);
-  SwitchWorkspaceData *sw_data = g_new (SwitchWorkspaceData, 1);
+  MetaScreen   *screen = meta_plugin_get_screen (plugin);
   ClutterAnimation *animation;
 
-  sw_data->plugin = plugin;
-  sw_data->actors = actors;
+  stage = meta_plugin_get_stage (plugin);
 
-  stage = mutter_plugin_get_stage (plugin);
-
-  mutter_plugin_query_screen_size (plugin,
+  meta_plugin_query_screen_size (plugin,
 					      &screen_width,
 					      &screen_height);
   clutter_actor_set_anchor_point (workspace1,
@@ -353,32 +346,31 @@ switch_workspace (MutterPlugin *plugin,
 
   if (from == to)
     {
-      mutter_plugin_effect_completed (plugin, NULL,
-                           MUTTER_PLUGIN_SWITCH_WORKSPACE);
+      meta_plugin_switch_workspace_completed (plugin);
       return;
     }
 
   n_workspaces = meta_screen_get_n_workspaces (screen);
 
-  l = g_list_last (*((GList**) actors));
+  l = g_list_last (meta_plugin_get_window_actors (plugin));
 
   while (l)
     {
-      MutterWindow *mc_window	= l->data;
-      ActorPrivate *apriv	= get_actor_private (mc_window);
-      ClutterActor *window	= CLUTTER_ACTOR (mc_window);
-      gint          win_workspace;
+      MetaWindowActor *window_actor = l->data;
+      ActorPrivate    *apriv	    = get_actor_private (window_actor);
+      ClutterActor    *actor	    = CLUTTER_ACTOR (window_actor);
+      gint             win_workspace;
 
-      win_workspace = mutter_window_get_workspace (mc_window);
+      win_workspace = meta_window_actor_get_workspace (window_actor);
 
       if (win_workspace == to || win_workspace == from)
         {
-          apriv->orig_parent = clutter_actor_get_parent (window);
+          apriv->orig_parent = clutter_actor_get_parent (actor);
 
-          clutter_actor_reparent (window,
+          clutter_actor_reparent (actor,
 				  win_workspace == to ? workspace1 : workspace0);
-          clutter_actor_show_all (window);
-          clutter_actor_raise_top (window);
+          clutter_actor_show_all (actor);
+          clutter_actor_raise_top (actor);
         }
       else if (win_workspace < 0)
         {
@@ -388,14 +380,13 @@ switch_workspace (MutterPlugin *plugin,
       else
         {
           /* Window on some other desktop */
-          clutter_actor_hide (window);
+          clutter_actor_hide (actor);
           apriv->orig_parent = NULL;
         }
 
       l = l->prev;
     }
 
-  priv->actors   = (GList **)actors;
   priv->desktop1 = workspace0;
   priv->desktop2 = workspace1;
 
@@ -408,7 +399,7 @@ switch_workspace (MutterPlugin *plugin,
   g_signal_connect (priv->tml_switch_workspace1,
                     "completed",
                     G_CALLBACK (on_switch_workspace_effect_complete),
-                    sw_data);
+                    plugin);
 
   animation = clutter_actor_animate (workspace1, CLUTTER_EASE_IN_SINE,
                                      SWITCH_TIMEOUT,
@@ -430,11 +421,11 @@ on_minimize_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data
    * Must reverse the effect of the effect; must hide it first to ensure
    * that the restoration will not be visible.
    */
-  MutterPlugin *plugin = data->plugin;
+  MetaPlugin *plugin = data->plugin;
   ActorPrivate *apriv;
-  MutterWindow *mc_window = MUTTER_WINDOW (data->actor);
+  MetaWindowActor *window_actor = META_WINDOW_ACTOR (data->actor);
 
-  apriv = get_actor_private (MUTTER_WINDOW (data->actor));
+  apriv = get_actor_private (META_WINDOW_ACTOR (data->actor));
   apriv->tml_minimize = NULL;
 
   clutter_actor_hide (data->actor);
@@ -446,8 +437,7 @@ on_minimize_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data
                                                 CLUTTER_GRAVITY_NORTH_WEST);
 
   /* Now notify the manager that we are done with this effect */
-  mutter_plugin_effect_completed (plugin, mc_window,
-                                  MUTTER_PLUGIN_MINIMIZE);
+  meta_plugin_minimize_completed (plugin, window_actor);
 
   g_free (data);
 }
@@ -457,18 +447,20 @@ on_minimize_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data
  * completion).
  */
 static void
-minimize (MutterPlugin *plugin, MutterWindow *mc_window)
+minimize (MetaPlugin *plugin, MetaWindowActor *window_actor)
 {
-  MetaCompWindowType          type;
-  ClutterActor               *actor  = CLUTTER_ACTOR (mc_window);
+  MetaWindowType type;
+  MetaWindow *meta_window = meta_window_actor_get_meta_window (window_actor);
+  ClutterActor *actor  = CLUTTER_ACTOR (window_actor);
 
-  type = mutter_window_get_window_type (mc_window);
 
-  if (type == META_COMP_WINDOW_NORMAL)
+  type = meta_window_get_window_type (meta_window);
+
+  if (type == META_WINDOW_NORMAL)
     {
       ClutterAnimation *animation;
       EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
-      ActorPrivate *apriv = get_actor_private (mc_window);
+      ActorPrivate *apriv = get_actor_private (window_actor);
 
       apriv->is_minimized = TRUE;
 
@@ -490,8 +482,7 @@ minimize (MutterPlugin *plugin, MutterWindow *mc_window)
 
     }
   else
-    mutter_plugin_effect_completed (plugin, mc_window,
-                                    MUTTER_PLUGIN_MINIMIZE);
+    meta_plugin_minimize_completed (plugin, window_actor);
 }
 
 /*
@@ -504,9 +495,9 @@ on_maximize_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data
   /*
    * Must reverse the effect of the effect.
    */
-  MutterPlugin * plugin = data->plugin;
-  MutterWindow  *mc_window = MUTTER_WINDOW (data->actor);
-  ActorPrivate  *apriv     = get_actor_private (mc_window);
+  MetaPlugin *plugin = data->plugin;
+  MetaWindowActor *window_actor = META_WINDOW_ACTOR (data->actor);
+  ActorPrivate *apriv = get_actor_private (window_actor);
 
   apriv->tml_maximize = NULL;
 
@@ -516,8 +507,7 @@ on_maximize_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data
                                                 CLUTTER_GRAVITY_NORTH_WEST);
 
   /* Now notify the manager that we are done with this effect */
-  mutter_plugin_effect_completed (plugin, mc_window,
-                                  MUTTER_PLUGIN_MAXIMIZE);
+  meta_plugin_maximize_completed (plugin, window_actor);
 
   g_free (data);
 }
@@ -531,25 +521,26 @@ on_maximize_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data
  * (Something like a sound would be more appropriate.)
  */
 static void
-maximize (MutterPlugin *plugin,
-          MutterWindow *mc_window,
+maximize (MetaPlugin *plugin,
+          MetaWindowActor *window_actor,
           gint end_x, gint end_y, gint end_width, gint end_height)
 {
-  MetaCompWindowType  type;
-  ClutterActor	     *actor = CLUTTER_ACTOR (mc_window);
+  MetaWindowType type;
+  ClutterActor *actor = CLUTTER_ACTOR (window_actor);
+  MetaWindow *meta_window = meta_window_actor_get_meta_window (window_actor);
 
   gdouble  scale_x    = 1.0;
   gdouble  scale_y    = 1.0;
   gfloat   anchor_x   = 0;
   gfloat   anchor_y   = 0;
 
-  type = mutter_window_get_window_type (mc_window);
+  type = meta_window_get_window_type (meta_window);
 
-  if (type == META_COMP_WINDOW_NORMAL)
+  if (type == META_WINDOW_NORMAL)
     {
       ClutterAnimation *animation;
       EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
-      ActorPrivate *apriv = get_actor_private (mc_window);
+      ActorPrivate *apriv = get_actor_private (window_actor);
       gfloat width, height;
       gfloat x, y;
 
@@ -587,8 +578,7 @@ maximize (MutterPlugin *plugin,
       return;
     }
 
-  mutter_plugin_effect_completed (plugin, mc_window,
-                                  MUTTER_PLUGIN_MAXIMIZE);
+  meta_plugin_maximize_completed (plugin, window_actor);
 }
 
 /*
@@ -597,22 +587,22 @@ maximize (MutterPlugin *plugin,
  * (Just a skeleton code.)
  */
 static void
-unmaximize (MutterPlugin *plugin,
-            MutterWindow *mc_window,
+unmaximize (MetaPlugin *plugin,
+            MetaWindowActor *window_actor,
             gint end_x, gint end_y, gint end_width, gint end_height)
 {
-  MetaCompWindowType type = mutter_window_get_window_type (mc_window);
+  MetaWindow *meta_window = meta_window_actor_get_meta_window (window_actor);
+  MetaWindowType type = meta_window_get_window_type (meta_window);
 
-  if (type == META_COMP_WINDOW_NORMAL)
+  if (type == META_WINDOW_NORMAL)
     {
-      ActorPrivate *apriv = get_actor_private (mc_window);
+      ActorPrivate *apriv = get_actor_private (window_actor);
 
       apriv->is_maximized = FALSE;
     }
 
   /* Do this conditionally, if the effect requires completion callback. */
-  mutter_plugin_effect_completed (plugin, mc_window,
-                                  MUTTER_PLUGIN_UNMAXIMIZE);
+  meta_plugin_unmaximize_completed (plugin, window_actor);
 }
 
 static void
@@ -621,9 +611,9 @@ on_map_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data)
   /*
    * Must reverse the effect of the effect.
    */
-  MutterPlugin  *plugin = data->plugin;
-  MutterWindow  *mc_window = MUTTER_WINDOW (data->actor);
-  ActorPrivate  *apriv     = get_actor_private (mc_window);
+  MetaPlugin *plugin = data->plugin;
+  MetaWindowActor  *window_actor = META_WINDOW_ACTOR (data->actor);
+  ActorPrivate  *apriv = get_actor_private (window_actor);
 
   apriv->tml_map = NULL;
 
@@ -631,7 +621,7 @@ on_map_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data)
                                                 CLUTTER_GRAVITY_NORTH_WEST);
 
   /* Now notify the manager that we are done with this effect */
-  mutter_plugin_effect_completed (plugin, mc_window, MUTTER_PLUGIN_MAP);
+  meta_plugin_map_completed (plugin, window_actor);
 
   g_free (data);
 }
@@ -641,18 +631,19 @@ on_map_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data)
  * completion).
  */
 static void
-map (MutterPlugin *plugin, MutterWindow *mc_window)
+map (MetaPlugin *plugin, MetaWindowActor *window_actor)
 {
-  MetaCompWindowType  type;
-  ClutterActor       *actor = CLUTTER_ACTOR (mc_window);
+  MetaWindowType type;
+  ClutterActor *actor = CLUTTER_ACTOR (window_actor);
+  MetaWindow *meta_window = meta_window_actor_get_meta_window (window_actor);
 
-  type = mutter_window_get_window_type (mc_window);
+  type = meta_window_get_window_type (meta_window);
 
-  if (type == META_COMP_WINDOW_NORMAL)
+  if (type == META_WINDOW_NORMAL)
     {
       ClutterAnimation *animation;
       EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
-      ActorPrivate *apriv = get_actor_private (mc_window);
+      ActorPrivate *apriv = get_actor_private (window_actor);
 
       clutter_actor_move_anchor_point_from_gravity (actor,
                                                     CLUTTER_GRAVITY_CENTER);
@@ -677,8 +668,7 @@ map (MutterPlugin *plugin, MutterWindow *mc_window)
 
     }
   else
-    mutter_plugin_effect_completed (plugin, mc_window,
-                                    MUTTER_PLUGIN_MAP);
+    meta_plugin_map_completed (plugin, window_actor);
 }
 
 /*
@@ -688,32 +678,32 @@ map (MutterPlugin *plugin, MutterWindow *mc_window)
 static void
 on_destroy_effect_complete (ClutterTimeline *timeline, EffectCompleteData *data)
 {
-  MutterPlugin *plugin = data->plugin;
-  MutterWindow *mc_window = MUTTER_WINDOW (data->actor);
-  ActorPrivate *apriv = get_actor_private (mc_window);
+  MetaPlugin *plugin = data->plugin;
+  MetaWindowActor *window_actor = META_WINDOW_ACTOR (data->actor);
+  ActorPrivate *apriv = get_actor_private (window_actor);
 
   apriv->tml_destroy = NULL;
 
-  mutter_plugin_effect_completed (plugin, mc_window,
-                                  MUTTER_PLUGIN_DESTROY);
+  meta_plugin_destroy_completed (plugin, window_actor);
 }
 
 /*
  * Simple TV-out like effect.
  */
 static void
-destroy (MutterPlugin *plugin, MutterWindow *mc_window)
+destroy (MetaPlugin *plugin, MetaWindowActor *window_actor)
 {
-  MetaCompWindowType   type;
-  ClutterActor	      *actor = CLUTTER_ACTOR (mc_window);
+  MetaWindowType type;
+  ClutterActor *actor = CLUTTER_ACTOR (window_actor);
+  MetaWindow *meta_window = meta_window_actor_get_meta_window (window_actor);
 
-  type = mutter_window_get_window_type (mc_window);
+  type = meta_window_get_window_type (meta_window);
 
-  if (type == META_COMP_WINDOW_NORMAL)
+  if (type == META_WINDOW_NORMAL)
     {
       ClutterAnimation *animation;
       EffectCompleteData *data = g_new0 (EffectCompleteData, 1);
-      ActorPrivate *apriv = get_actor_private (mc_window);
+      ActorPrivate *apriv = get_actor_private (window_actor);
 
       clutter_actor_move_anchor_point_from_gravity (actor,
                                                     CLUTTER_GRAVITY_CENTER);
@@ -732,64 +722,59 @@ destroy (MutterPlugin *plugin, MutterWindow *mc_window)
                         data);
     }
   else
-    mutter_plugin_effect_completed (plugin, mc_window,
-                                    MUTTER_PLUGIN_DESTROY);
+    meta_plugin_destroy_completed (plugin, window_actor);
 }
 
 static void
-kill_effect (MutterPlugin *plugin, MutterWindow *mc_window, gulong event)
+kill_switch_workspace (MetaPlugin     *plugin)
+{
+  MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (plugin)->priv;
+
+  if (priv->tml_switch_workspace1)
+    {
+      clutter_timeline_stop (priv->tml_switch_workspace1);
+      clutter_timeline_stop (priv->tml_switch_workspace2);
+      g_signal_emit_by_name (priv->tml_switch_workspace1, "completed", NULL);
+    }
+}
+
+static void
+kill_window_effects (MetaPlugin      *plugin,
+                     MetaWindowActor *window_actor)
 {
   ActorPrivate *apriv;
 
-  if (event & MUTTER_PLUGIN_SWITCH_WORKSPACE)
-    {
-      MutterDefaultPluginPrivate *priv = MUTTER_DEFAULT_PLUGIN (plugin)->priv;
+  apriv = get_actor_private (window_actor);
 
-      if (priv->tml_switch_workspace1)
-        {
-          clutter_timeline_stop (priv->tml_switch_workspace1);
-          clutter_timeline_stop (priv->tml_switch_workspace2);
-          g_signal_emit_by_name (priv->tml_switch_workspace1, "completed", NULL);
-        }
-
-      if (!(event & ~MUTTER_PLUGIN_SWITCH_WORKSPACE))
-        {
-          /* Workspace switch only, nothing more to do */
-          return;
-        }
-    }
-
-  apriv = get_actor_private (mc_window);
-
-  if ((event & MUTTER_PLUGIN_MINIMIZE) && apriv->tml_minimize)
+  if (apriv->tml_minimize)
     {
       clutter_timeline_stop (apriv->tml_minimize);
       g_signal_emit_by_name (apriv->tml_minimize, "completed", NULL);
     }
 
-  if ((event & MUTTER_PLUGIN_MAXIMIZE) && apriv->tml_maximize)
+  if (apriv->tml_maximize)
     {
       clutter_timeline_stop (apriv->tml_maximize);
       g_signal_emit_by_name (apriv->tml_maximize, "completed", NULL);
     }
 
-  if ((event & MUTTER_PLUGIN_MAP) && apriv->tml_map)
+  if (apriv->tml_map)
     {
       clutter_timeline_stop (apriv->tml_map);
       g_signal_emit_by_name (apriv->tml_map, "completed", NULL);
     }
 
-  if ((event & MUTTER_PLUGIN_DESTROY) && apriv->tml_destroy)
+  if (apriv->tml_destroy)
     {
       clutter_timeline_stop (apriv->tml_destroy);
       g_signal_emit_by_name (apriv->tml_destroy, "completed", NULL);
     }
 }
 
-static const MutterPluginInfo *
-plugin_info (MutterPlugin *plugin)
+static const MetaPluginInfo *
+plugin_info (MetaPlugin *plugin)
 {
-  MutterDefaultPluginPrivate *priv = MUTTER_DEFAULT_PLUGIN (plugin)->priv;
+  MetaDefaultPluginPrivate *priv = META_DEFAULT_PLUGIN (plugin)->priv;
 
   return &priv->info;
 }

src/compositor/region-utils.c

@@ -0,0 +1,334 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Utilities for region manipulation
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include "region-utils.h"
+
+#include <math.h>
+
+/* MetaRegionBuilder */
+
+/* Various algorithms in this file require unioning together a set of rectangles
+ * that are unsorted or overlap; unioning such a set of rectangles 1-by-1
+ * using cairo_region_union_rectangle() produces O(N^2) behavior (if the union
+ * adds or removes rectangles in the middle of the region, then it has to
+ * move all the rectangles after that.) To avoid this behavior, MetaRegionBuilder
+ * creates regions for small groups of rectangles and merges them together in
+ * a binary tree.
+ *
+ * Possible improvement: From a glance at the code, accumulating all the rectangles
+ *  into a flat array and then calling the (not usefully documented)
+ *  cairo_region_create_rectangles() would have the same behavior and would be
+ *  simpler and a bit more efficient.
+ */
+
+/* Optimium performance seems to be with MAX_CHUNK_RECTANGLES=4; 8 is about 10% slower.
+ * But using 8 may be more robust to systems with slow malloc(). */
+#define MAX_CHUNK_RECTANGLES 8
+#define MAX_LEVELS 16
+
+typedef struct
+{
+  /* To merge regions in a binary tree, we need to keep track of The way these are filled is in the pattern:
+   *
+   * |a  |
+   * |b  |a  |
+   * |c  |   |ab |
+   * |d  |c  |ab |
+   * |e  |   |   |abcd|
+   */
+  cairo_region_t *levels[MAX_LEVELS];
+  int n_levels;
+} MetaRegionBuilder;
+
+static void
+meta_region_builder_init (MetaRegionBuilder *builder)
+{
+  int i;
+  for (i = 0; i < MAX_LEVELS; i++)
+    builder->levels[i] = NULL;
+  builder->n_levels = 1;
+}
+
+static void
+meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
+                                   int                x,
+                                   int                y,
+                                   int                width,
+                                   int                height)
+{
+  cairo_rectangle_int_t rect;
+  int i;
+
+  if (builder->levels[0] == NULL)
+    builder->levels[0] = cairo_region_create ();
+
+  rect.x = x;
+  rect.y = y;
+  rect.width = width;
+  rect.height = height;
+
+  cairo_region_union_rectangle (builder->levels[0], &rect);
+  if (cairo_region_num_rectangles (builder->levels[0]) >= MAX_CHUNK_RECTANGLES)
+    {
+      for (i = 1; i < builder->n_levels + 1; i++)
+        {
+          if (builder->levels[i] == NULL)
+            {
+              if (i < MAX_LEVELS)
+                {
+                  builder->levels[i] = builder->levels[i - 1];
+                  builder->levels[i - 1] = NULL;
+                  if (i == builder->n_levels)
+                    builder->n_levels++;
+                }
+
+              break;
+            }
+          else
+            {
+              cairo_region_union (builder->levels[i], builder->levels[i - 1]);
+              cairo_region_destroy (builder->levels[i - 1]);
+              builder->levels[i - 1] = NULL;
+            }
+        }
+    }
+}
+
+static cairo_region_t *
+meta_region_builder_finish (MetaRegionBuilder *builder)
+{
+  cairo_region_t *result = NULL;
+  int i;
+
+  for (i = 0; i < builder->n_levels; i++)
+    {
+      if (builder->levels[i])
+        {
+          if (result == NULL)
+            result = builder->levels[i];
+          else
+            {
+              cairo_region_union(result, builder->levels[i]);
+              cairo_region_destroy (builder->levels[i]);
+            }
+        }
+    }
+
+  if (result == NULL)
+    result = cairo_region_create ();
+
+  return result;
+}
+
+
+/* MetaRegionIterator */
+
+void
+meta_region_iterator_init (MetaRegionIterator *iter,
+                           cairo_region_t     *region)
+{
+  iter->region = region;
+  iter->i = 0;
+  iter->n_rectangles = cairo_region_num_rectangles (region);
+  iter->line_start = TRUE;
+
+  if (iter->n_rectangles > 1)
+    {
+      cairo_region_get_rectangle (region, 0, &iter->rectangle);
+      cairo_region_get_rectangle (region, 1, &iter->next_rectangle);
+
+      iter->line_end = iter->next_rectangle.y != iter->rectangle.y;
+    }
+  else if (iter->n_rectangles > 0)
+    {
+      cairo_region_get_rectangle (region, 0, &iter->rectangle);
+      iter->line_end = TRUE;
+    }
+}
+
+gboolean
+meta_region_iterator_at_end (MetaRegionIterator *iter)
+{
+  return iter->i >= iter->n_rectangles;
+}
+
+void
+meta_region_iterator_next (MetaRegionIterator *iter)
+{
+  iter->i++;
+  iter->rectangle = iter->next_rectangle;
+  iter->line_start = iter->line_end;
+
+  if (iter->i < iter->n_rectangles)
+    {
+      cairo_region_get_rectangle (iter->region, iter->i + 1, &iter->next_rectangle);
+      iter->line_end = iter->next_rectangle.y != iter->rectangle.y;
+    }
+  else
+    {
+      iter->line_end = TRUE;
+    }
+}
+
+static void
+add_expanded_rect (MetaRegionBuilder  *builder,
+                   int                 x,
+                   int                 y,
+                   int                 width,
+                   int                 height,
+                   int                 x_amount,
+                   int                 y_amount,
+                   gboolean            flip)
+{
+  if (flip)
+    meta_region_builder_add_rectangle (builder,
+                                         y - y_amount, x - x_amount,
+                                         height + 2 * y_amount, width + 2 * x_amount);
+  else
+    meta_region_builder_add_rectangle (builder,
+                                         x - x_amount, y - y_amount,
+                                         width + 2 * x_amount, height + 2 * y_amount);
+}
+
+static cairo_region_t *
+expand_region (cairo_region_t *region,
+               int             x_amount,
+               int             y_amount,
+               gboolean        flip)
+{
+  MetaRegionBuilder builder;
+  int n;
+  int i;
+
+  meta_region_builder_init (&builder);
+
+  n = cairo_region_num_rectangles (region);
+  for (i = 0; i < n; i++)
+    {
+      cairo_rectangle_int_t rect;
+
+      cairo_region_get_rectangle (region, i, &rect);
+      add_expanded_rect (&builder,
+                         rect.x, rect.y, rect.width, rect.height,
+                         x_amount, y_amount, flip);
+    }
+
+  return meta_region_builder_finish (&builder);
+}
+
+/* This computes a (clipped version) of the inverse of the region
+ * and expands it by the given amount */
+static cairo_region_t *
+expand_region_inverse (cairo_region_t *region,
+                       int             x_amount,
+                       int             y_amount,
+                       gboolean        flip)
+{
+  MetaRegionBuilder builder;
+  MetaRegionIterator iter;
+  cairo_rectangle_int_t extents;
+  cairo_region_t *chunk;
+
+  int last_x;
+
+  meta_region_builder_init (&builder);
+
+  cairo_region_get_extents (region, &extents);
+  add_expanded_rect (&builder,
+                     extents.x, extents.y - 1, extents.width, 1,
+                     x_amount, y_amount, flip);
+  add_expanded_rect (&builder,
+                     extents.x - 1, extents.y, 1, extents.height,
+                     x_amount, y_amount, flip);
+  add_expanded_rect (&builder,
+                     extents.x + extents.width, extents.y, 1, extents.height,
+                     x_amount, y_amount, flip);
+  add_expanded_rect (&builder,
+                     extents.x, extents.y + extents.height, extents.width, 1,
+                     x_amount, y_amount, flip);
+
+  chunk = NULL;
+
+  last_x = extents.x;
+  for (meta_region_iterator_init (&iter, region);
+       !meta_region_iterator_at_end (&iter);
+       meta_region_iterator_next (&iter))
+    {
+      if (chunk == NULL)
+        chunk = cairo_region_create ();
+
+      if (iter.rectangle.x > last_x)
+        add_expanded_rect (&builder,
+                           last_x, iter.rectangle.y,
+                           iter.rectangle.x - last_x, iter.rectangle.height,
+                           x_amount, y_amount, flip);
+
+      if (iter.line_end)
+        {
+          if (extents.x + extents.width > iter.rectangle.x + iter.rectangle.width)
+            add_expanded_rect (&builder,
+                               iter.rectangle.x + iter.rectangle.width, iter.rectangle.y,
+                               (extents.x + extents.width) - (iter.rectangle.x + iter.rectangle.width), iter.rectangle.height,
+                               x_amount, y_amount, flip);
+          last_x = extents.x;
+        }
+      else
+        last_x = iter.rectangle.x + iter.rectangle.width;
+    }
+
+  return meta_region_builder_finish (&builder);
+}
+
+/**
+ * meta_make_border_region:
+ * @region: a #cairo_region_t
+ * @x_amount: distance from the border to extend horizontally
+ * @y_amount: distance from the border to extend vertically
+ * @flip: if true, the result is computed with x and y interchanged
+ *
+ * Computes the "border region" of a given region, which is roughly
+ * speaking the set of points near the boundary of the region.  If we
+ * define the operation of growing a region as computing the set of
+ * points within a given manhattan distance of the region, then the
+ * border is 'grow(region) intersect grow(inverse(region))'.
+ *
+ * If we create an image by filling the region with a solid color,
+ * the border is the region affected by blurring the region.
+ *
+ * Return value: a new region which is the border of the given region
+ */
+cairo_region_t *
+meta_make_border_region (cairo_region_t *region,
+                         int             x_amount,
+                         int             y_amount,
+                         gboolean        flip)
+{
+  cairo_region_t *border_region;
+  cairo_region_t *inverse_region;
+
+  border_region = expand_region (region, x_amount, y_amount, flip);
+  inverse_region = expand_region_inverse (region, x_amount, y_amount, flip);
+  cairo_region_intersect (border_region, inverse_region);
+  cairo_region_destroy (inverse_region);
+
+  return border_region;
+}

src/compositor/region-utils.h

@@ -0,0 +1,76 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * Utilities for region manipulation
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __META_REGION_UTILS_H__
+#define __META_REGION_UTILS_H__
+
+#include <clutter/clutter.h>
+
+#include <cairo.h>
+#include <glib.h>
+
+/**
+ * MetaRegionIterator:
+ * @region: region being iterated
+ * @rectangle: current rectangle
+ * @line_start: whether the current rectangle starts a horizontal band
+ * @line_end: whether the current rectangle ends a horizontal band
+ *
+ * cairo_region_t is a yx banded region; sometimes its useful to iterate through
+ * such a region treating the start and end of each horizontal band in a distinct
+ * fashion.
+ *
+ * Usage:
+ *
+ *  MetaRegionIterator iter;
+ *  for (meta_region_iterator_init (&iter, region);
+ *       !meta_region_iterator_at_end (&iter);
+ *       meta_region_iterator_next (&iter))
+ *  {
+ *    [ Use iter.rectangle, iter.line_start, iter.line_end ]
+ *  }
+ */
+typedef struct _MetaRegionIterator MetaRegionIterator;
+
+struct _MetaRegionIterator {
+  cairo_region_t *region;
+  cairo_rectangle_int_t rectangle;
+  gboolean line_start;
+  gboolean line_end;
+  int i;
+
+  /*< private >*/
+  int n_rectangles;
+  cairo_rectangle_int_t next_rectangle;
+};
+
+void     meta_region_iterator_init      (MetaRegionIterator *iter,
+                                         cairo_region_t     *region);
+gboolean meta_region_iterator_at_end    (MetaRegionIterator *iter);
+void     meta_region_iterator_next      (MetaRegionIterator *iter);
+
+cairo_region_t *meta_make_border_region (cairo_region_t *region,
+                                         int             x_amount,
+                                         int             y_amount,
+                                         gboolean        flip);
+
+#endif /* __META_REGION_UTILS_H__ */

src/compositor/shadow.c

@@ -1,350 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#define _GNU_SOURCE /* For M_PI */
-
-#include <math.h>
-
-#include "compositor-private.h"
-#include "shadow.h"
-#include "tidy/tidy-texture-frame.h"
-
-#define SHADOW_RADIUS 8
-#define SHADOW_OPACITY	0.9
-#define SHADOW_OFFSET_X	(SHADOW_RADIUS)
-#define SHADOW_OFFSET_Y	(SHADOW_RADIUS)
-
-#define MAX_TILE_SZ 8 	/* Must be <= shaddow radius */
-#define TILE_WIDTH  (3*MAX_TILE_SZ)
-#define TILE_HEIGHT (3*MAX_TILE_SZ)
-
-static unsigned char* shadow_gaussian_make_tile (void);
-
-ClutterActor *
-mutter_create_shadow_frame (MetaCompositor *compositor)
-{
-  ClutterActor *frame;
-
-  if (!compositor->shadow_src)
-    {
-      guchar *data;
-
-      data = shadow_gaussian_make_tile ();
-
-      compositor->shadow_src = clutter_texture_new ();
-
-      clutter_texture_set_from_rgb_data (CLUTTER_TEXTURE (compositor->shadow_src),
-                                         data,
-                                         TRUE,
-                                         TILE_WIDTH,
-                                         TILE_HEIGHT,
-                                         TILE_WIDTH*4,
-                                         4,
-                                         0,
-                                         NULL);
-      g_free (data);
-    }
-
-  frame = tidy_texture_frame_new (CLUTTER_TEXTURE (compositor->shadow_src),
-                                  MAX_TILE_SZ,
-                                  MAX_TILE_SZ,
-                                  MAX_TILE_SZ,
-                                  MAX_TILE_SZ);
-
-  clutter_actor_set_position (frame,
-                              SHADOW_OFFSET_X , SHADOW_OFFSET_Y);
-
-  return frame;
-}
-
-typedef struct GaussianMap
-{
-  int	   size;
-  double * data;
-} GaussianMap;
-
-static double
-gaussian (double r, double x, double y)
-{
-  return ((1 / (sqrt (2 * M_PI * r))) *
-	  exp ((- (x * x + y * y)) / (2 * r * r)));
-}
-
-
-static GaussianMap *
-make_gaussian_map (double r)
-{
-  GaussianMap  *c;
-  int	          size = ((int) ceil ((r * 3)) + 1) & ~1;
-  int	          center = size / 2;
-  int	          x, y;
-  double          t = 0.0;
-  double          g;
-
-  c = g_malloc (sizeof (GaussianMap) + size * size * sizeof (double));
-  c->size = size;
-
-  c->data = (double *) (c + 1);
-
-  for (y = 0; y < size; y++)
-    for (x = 0; x < size; x++)
-      {
-	g = gaussian (r, (double) (x - center), (double) (y - center));
-	t += g;
-	c->data[y * size + x] = g;
-      }
-
-  for (y = 0; y < size; y++)
-    for (x = 0; x < size; x++)
-      c->data[y*size + x] /= t;
-
-  return c;
-}
-
-static unsigned char
-sum_gaussian (GaussianMap * map, double opacity,
-              int x, int y, int width, int height)
-{
-  int	           fx, fy;
-  double         * g_data;
-  double         * g_line = map->data;
-  int	           g_size = map->size;
-  int	           center = g_size / 2;
-  int	           fx_start, fx_end;
-  int	           fy_start, fy_end;
-  double           v;
-  unsigned int     r;
-
-  /*
-   * Compute set of filter values which are "in range",
-   * that's the set with:
-   *	0 <= x + (fx-center) && x + (fx-center) < width &&
-   *  0 <= y + (fy-center) && y + (fy-center) < height
-   *
-   *  0 <= x + (fx - center)	x + fx - center < width
-   *  center - x <= fx	fx < width + center - x
-   */
-
-  fx_start = center - x;
-  if (fx_start < 0)
-    fx_start = 0;
-  fx_end = width + center - x;
-  if (fx_end > g_size)
-    fx_end = g_size;
-
-  fy_start = center - y;
-  if (fy_start < 0)
-    fy_start = 0;
-  fy_end = height + center - y;
-  if (fy_end > g_size)
-    fy_end = g_size;
-
-  g_line = g_line + fy_start * g_size + fx_start;
-
-  v = 0;
-  for (fy = fy_start; fy < fy_end; fy++)
-    {
-      g_data = g_line;
-      g_line += g_size;
-
-      for (fx = fx_start; fx < fx_end; fx++)
-	v += *g_data++;
-    }
-  if (v > 1)
-    v = 1;
-
-  v *= (opacity * 255.0);
-
-  r = (unsigned int) v;
-
-  return (unsigned char) r;
-}
-
-static unsigned char *
-shadow_gaussian_make_tile ()
-{
-  unsigned char              * data;
-  int		               size;
-  int		               center;
-  int		               x, y;
-  unsigned char                d;
-  int                          pwidth, pheight;
-  double                       opacity = SHADOW_OPACITY;
-  static GaussianMap       * gaussian_map = NULL;
-
-  struct _mypixel
-  {
-    unsigned char r;
-    unsigned char g;
-    unsigned char b;
-    unsigned char a;
-  } * _d;
-
-
-  if (!gaussian_map)
-    gaussian_map =
-      make_gaussian_map (SHADOW_RADIUS);
-
-  size   = gaussian_map->size;
-  center = size / 2;
-
-  /* Top & bottom */
-
-  pwidth  = MAX_TILE_SZ;
-  pheight = MAX_TILE_SZ;
-
-  data = g_malloc0 (4 * TILE_WIDTH * TILE_HEIGHT);
-
-  _d = (struct _mypixel*) data;
-
-  /* N */
-  for (y = 0; y < pheight; y++)
-    {
-      d = sum_gaussian (gaussian_map, opacity,
-                        center, y - center,
-                        TILE_WIDTH, TILE_HEIGHT);
-      for (x = 0; x < pwidth; x++)
-	{
-	  _d[y*3*pwidth + x + pwidth].r = 0;
-	  _d[y*3*pwidth + x + pwidth].g = 0;
-	  _d[y*3*pwidth + x + pwidth].b = 0;
-	  _d[y*3*pwidth + x + pwidth].a = d;
-	}
-
-    }
-
-  /* S */
-  pwidth = MAX_TILE_SZ;
-  pheight = MAX_TILE_SZ;
-
-  for (y = 0; y < pheight; y++)
-    {
-      d = sum_gaussian (gaussian_map, opacity,
-                        center, y - center,
-                        TILE_WIDTH, TILE_HEIGHT);
-      for (x = 0; x < pwidth; x++)
-	{
-	  _d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + x + pwidth].r = 0;
-	  _d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + x + pwidth].g = 0;
-	  _d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + x + pwidth].b = 0;
-	  _d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + x + pwidth].a = d;
-	}
-
-    }
-
-
-  /* w */
-  pwidth = MAX_TILE_SZ;
-  pheight = MAX_TILE_SZ;
-
-  for (x = 0; x < pwidth; x++)
-    {
-      d = sum_gaussian (gaussian_map, opacity,
-                        x - center, center,
-                        TILE_WIDTH, TILE_HEIGHT);
-      for (y = 0; y < pheight; y++)
-	{
-	  _d[y*3*pwidth + 3*pwidth*pheight + x].r = 0;
-	  _d[y*3*pwidth + 3*pwidth*pheight + x].g = 0;
-	  _d[y*3*pwidth + 3*pwidth*pheight + x].b = 0;
-	  _d[y*3*pwidth + 3*pwidth*pheight + x].a = d;
-	}
-
-    }
-
-  /* E */
-  for (x = 0; x < pwidth; x++)
-    {
-      d = sum_gaussian (gaussian_map, opacity,
-					       x - center, center,
-					       TILE_WIDTH, TILE_HEIGHT);
-      for (y = 0; y < pheight; y++)
-	{
-	  _d[y*3*pwidth + 3*pwidth*pheight + (pwidth-x-1) + 2*pwidth].r = 0;
-	  _d[y*3*pwidth + 3*pwidth*pheight + (pwidth-x-1) + 2*pwidth].g = 0;
-	  _d[y*3*pwidth + 3*pwidth*pheight + (pwidth-x-1) + 2*pwidth].b = 0;
-	  _d[y*3*pwidth + 3*pwidth*pheight + (pwidth-x-1) + 2*pwidth].a = d;
-	}
-
-    }
-
-  /* NW */
-  pwidth = MAX_TILE_SZ;
-  pheight = MAX_TILE_SZ;
-
-  for (x = 0; x < pwidth; x++)
-    for (y = 0; y < pheight; y++)
-      {
-	d = sum_gaussian (gaussian_map, opacity,
-                          x-center, y-center,
-                          TILE_WIDTH, TILE_HEIGHT);
-
-	_d[y*3*pwidth + x].r = 0;
-	_d[y*3*pwidth + x].g = 0;
-	_d[y*3*pwidth + x].b = 0;
-	_d[y*3*pwidth + x].a = d;
-      }
-
-  /* SW */
-  for (x = 0; x < pwidth; x++)
-    for (y = 0; y < pheight; y++)
-      {
-	d = sum_gaussian (gaussian_map, opacity,
-                          x-center, y-center,
-                          TILE_WIDTH, TILE_HEIGHT);
-
-	_d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + x].r = 0;
-	_d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + x].g = 0;
-	_d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + x].b = 0;
-	_d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + x].a = d;
-      }
-
-  /* SE */
-  for (x = 0; x < pwidth; x++)
-    for (y = 0; y < pheight; y++)
-      {
-	d = sum_gaussian (gaussian_map, opacity,
-                          x-center, y-center,
-                          TILE_WIDTH, TILE_HEIGHT);
-
-	_d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + (pwidth-x-1) +
-	   2*pwidth].r = 0;
-	_d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + (pwidth-x-1) +
-	   2*pwidth].g = 0;
-	_d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + (pwidth-x-1) +
-	   2*pwidth].b = 0;
-	_d[(pheight-y-1)*3*pwidth + 6*pwidth*pheight + (pwidth-x-1) +
-	   2*pwidth].a = d;
-      }
-
-  /* NE */
-  for (x = 0; x < pwidth; x++)
-    for (y = 0; y < pheight; y++)
-      {
-	d = sum_gaussian (gaussian_map, opacity,
-                          x-center, y-center,
-                          TILE_WIDTH, TILE_HEIGHT);
-
-	_d[y*3*pwidth + (pwidth - x - 1) + 2*pwidth].r = 0;
-	_d[y*3*pwidth + (pwidth - x - 1) + 2*pwidth].g = 0;
-	_d[y*3*pwidth + (pwidth - x - 1) + 2*pwidth].b = 0;
-	_d[y*3*pwidth + (pwidth - x - 1) + 2*pwidth].a = d;
-      }
-
-  /* center */
-  pwidth = MAX_TILE_SZ;
-  pheight = MAX_TILE_SZ;
-
-  d = sum_gaussian (gaussian_map, opacity,
-                    center, center, TILE_WIDTH, TILE_HEIGHT);
-
-  for (x = 0; x < pwidth; x++)
-    for (y = 0; y < pheight; y++)
-      {
-	_d[y*3*pwidth + 3*pwidth*pheight + x + pwidth].r = 0;
-	_d[y*3*pwidth + 3*pwidth*pheight + x + pwidth].g = 0;
-	_d[y*3*pwidth + 3*pwidth*pheight + x + pwidth].b = 0;
-	_d[y*3*pwidth + 3*pwidth*pheight + x + pwidth].a = 0;
-      }
-
-  return data;
-}

src/compositor/shadow.h

@@ -1,9 +0,0 @@
-#ifndef SHADOW_H
-#define SHADOW_H
-
-#include <clutter/clutter.h>
-#include "compositor.h"
-
-ClutterActor *mutter_create_shadow_frame (MetaCompositor *compositor);
-
-#endif /* SHADOW_H */

src/compositor/tidy/tidy-texture-frame.c

@@ -1,641 +0,0 @@
-/* tidy-texture-frame.h: Expandible texture actor
- *
- * Copyright (C) 2007 OpenedHand
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-/**
- * SECTION:tidy-texture-frame
- * @short_description: Stretch a texture to fit the entire allocation
- *
- * #TidyTextureFrame
- *
- */
-
-#include <cogl/cogl.h>
-
-#include "tidy-texture-frame.h"
-
-#define TIDY_PARAM_READABLE     \
-        (G_PARAM_READABLE |     \
-         G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)
-
-#define TIDY_PARAM_READWRITE    \
-        (G_PARAM_READABLE | G_PARAM_WRITABLE | \
-         G_PARAM_STATIC_NICK | G_PARAM_STATIC_NAME | G_PARAM_STATIC_BLURB)
-
-enum
-{
-  PROP_0,
-
-  PROP_PARENT_TEXTURE,
-
-  PROP_LEFT,
-  PROP_TOP,
-  PROP_RIGHT,
-  PROP_BOTTOM
-};
-
-G_DEFINE_TYPE (TidyTextureFrame, tidy_texture_frame, CLUTTER_TYPE_ACTOR);
-
-#define TIDY_TEXTURE_FRAME_GET_PRIVATE(obj)     (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TIDY_TYPE_TEXTURE_FRAME, TidyTextureFramePrivate))
-
-struct _TidyTextureFramePrivate
-{
-  ClutterTexture *parent_texture;
-
-  gfloat left;
-  gfloat top;
-  gfloat right;
-  gfloat bottom;
-
-  CoglHandle material;
-
-  guint needs_paint : 1;
-};
-
-static void
-tidy_texture_frame_get_preferred_width (ClutterActor *self,
-                                        gfloat        for_height,
-                                        gfloat       *min_width_p,
-                                        gfloat       *natural_width_p)
-{
-  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (self)->priv;
-
-  if (G_UNLIKELY (priv->parent_texture == NULL))
-    {
-      if (min_width_p)
-        *min_width_p = 0;
-
-      if (natural_width_p)
-        *natural_width_p = 0;
-    }
-  else
-    {
-      ClutterActorClass *klass;
-
-      /* by directly querying the parent texture's class implementation
-       * we are going around any override mechanism the parent texture
-       * might have in place, and we ask directly for the original
-       * preferred width
-       */
-      klass = CLUTTER_ACTOR_GET_CLASS (priv->parent_texture);
-      klass->get_preferred_width (CLUTTER_ACTOR (priv->parent_texture),
-                                  for_height,
-                                  min_width_p,
-                                  natural_width_p);
-    }
-}
-
-static void
-tidy_texture_frame_get_preferred_height (ClutterActor *self,
-                                         gfloat        for_width,
-                                         gfloat       *min_height_p,
-                                         gfloat       *natural_height_p)
-{
-  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (self)->priv;
-
-  if (G_UNLIKELY (priv->parent_texture == NULL))
-    {
-      if (min_height_p)
-        *min_height_p = 0;
-
-      if (natural_height_p)
-        *natural_height_p = 0;
-    }
-  else
-    {
-      ClutterActorClass *klass;
-
-      /* by directly querying the parent texture's class implementation
-       * we are going around any override mechanism the parent texture
-       * might have in place, and we ask directly for the original
-       * preferred height
-       */
-      klass = CLUTTER_ACTOR_GET_CLASS (priv->parent_texture);
-      klass->get_preferred_height (CLUTTER_ACTOR (priv->parent_texture),
-                                   for_width,
-                                   min_height_p,
-                                   natural_height_p);
-    }
-}
-
-static void
-tidy_texture_frame_realize (ClutterActor *self)
-{
-  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (self)->priv;
-
-  if (priv->material != COGL_INVALID_HANDLE)
-    return;
-
-  priv->material = cogl_material_new ();
-
-  CLUTTER_ACTOR_SET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
-}
-
-static void
-tidy_texture_frame_unrealize (ClutterActor *self)
-{
-  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (self)->priv;
-
-  if (priv->material == COGL_INVALID_HANDLE)
-    return;
-
-  cogl_handle_unref (priv->material);
-  priv->material = COGL_INVALID_HANDLE;
-
-  CLUTTER_ACTOR_UNSET_FLAGS (self, CLUTTER_ACTOR_REALIZED);
-}
-
-static void
-tidy_texture_frame_paint (ClutterActor *self)
-{
-  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (self)->priv;
-  CoglHandle cogl_texture = COGL_INVALID_HANDLE;
-  ClutterActorBox box = { 0, };
-  gfloat width, height;
-  gfloat tex_width, tex_height;
-  gfloat ex, ey;
-  gfloat tx1, ty1, tx2, ty2;
-  guint8 opacity;
-
-  /* no need to paint stuff if we don't have a texture */
-  if (G_UNLIKELY (priv->parent_texture == NULL))
-    return;
-
-  if (!priv->needs_paint)
-    return;
-
-  /* parent texture may have been hidden, so need to make sure it gets
-   * realized
-   */
-  if (!CLUTTER_ACTOR_IS_REALIZED (priv->parent_texture))
-    clutter_actor_realize (CLUTTER_ACTOR (priv->parent_texture));
-
-  cogl_texture = clutter_texture_get_cogl_texture (priv->parent_texture);
-  if (cogl_texture == COGL_INVALID_HANDLE)
-    return;
-
-  tex_width  = cogl_texture_get_width (cogl_texture);
-  tex_height = cogl_texture_get_height (cogl_texture);
-
-  clutter_actor_get_allocation_box (self, &box);
-  width = box.x2 - box.x1;
-  height = box.y2 - box.y1;
-
-  tx1 = priv->left / tex_width;
-  tx2 = (tex_width - priv->right) / tex_width;
-  ty1 = priv->top / tex_height;
-  ty2 = (tex_height - priv->bottom) / tex_height;
-
-  ex = width - priv->right;
-  if (ex < 0)
-    ex = priv->right; 		/* FIXME ? */
-
-  ey = height - priv->bottom;
-  if (ey < 0)
-    ey = priv->bottom; 		/* FIXME ? */
-
-  opacity = clutter_actor_get_paint_opacity (self);
-
-  g_assert (priv->material != COGL_INVALID_HANDLE);
-
-  /* set the source material using the parent texture's COGL handle */
-  cogl_material_set_color4ub (priv->material, opacity, opacity, opacity, opacity);
-  cogl_material_set_layer (priv->material, 0, cogl_texture);
-  cogl_set_source (priv->material);
-
-  /* top left corner */
-  cogl_rectangle_with_texture_coords (0, 0, priv->left, priv->top,
-                                      0.0, 0.0,
-                                      tx1, ty1);
-
-  /* top middle */
-  cogl_rectangle_with_texture_coords (priv->left, 0, ex, priv->top,
-                                      tx1, 0.0,
-                                      tx2, ty1);
-
-  /* top right */
-  cogl_rectangle_with_texture_coords (ex, 0, width, priv->top,
-                                      tx2, 0.0,
-                                      1.0, ty1);
-
-  /* mid left */
-  cogl_rectangle_with_texture_coords (0, priv->top, priv->left, ey,
-                                      0.0, ty1,
-                                      tx1, ty2);
-
-  /* center */
-  cogl_rectangle_with_texture_coords (priv->left, priv->top, ex, ey,
-                                      tx1, ty1,
-                                      tx2, ty2);
-
-  /* mid right */
-  cogl_rectangle_with_texture_coords (ex, priv->top, width, ey,
-                                      tx2, ty1,
-                                      1.0, ty2);
-  
-  /* bottom left */
-  cogl_rectangle_with_texture_coords (0, ey, priv->left, height,
-                                      0.0, ty2,
-                                      tx1, 1.0);
-
-  /* bottom center */
-  cogl_rectangle_with_texture_coords (priv->left, ey, ex, height,
-                                      tx1, ty2,
-                                      tx2, 1.0);
-
-  /* bottom right */
-  cogl_rectangle_with_texture_coords (ex, ey, width, height,
-                                      tx2, ty2,
-                                      1.0, 1.0);
-}
-
-static inline void
-tidy_texture_frame_set_frame_internal (TidyTextureFrame *frame,
-                                       gfloat            left,
-                                       gfloat            top,
-                                       gfloat            right,
-                                       gfloat            bottom)
-{
-  TidyTextureFramePrivate *priv = frame->priv;
-  GObject *gobject = G_OBJECT (frame);
-  gboolean changed = FALSE;
-
-  g_object_freeze_notify (gobject);
-
-  if (priv->top != top)
-    {
-      priv->top = top;
-      g_object_notify (gobject, "top");
-      changed = TRUE;
-    }
-
-  if (priv->right != right)
-    {
-      priv->right = right;
-      g_object_notify (gobject, "right");
-      changed = TRUE;
-    }
-
-  if (priv->bottom != bottom)
-    {
-      priv->bottom = bottom;
-      g_object_notify (gobject, "bottom");
-      changed = TRUE;
-    }
-
-  if (priv->left != left)
-    {
-      priv->left = left;
-      g_object_notify (gobject, "left");
-      changed = TRUE;
-    }
-
-  if (changed && CLUTTER_ACTOR_IS_VISIBLE (frame))
-    clutter_actor_queue_redraw (CLUTTER_ACTOR (frame));
-
-  g_object_thaw_notify (gobject);
-}
-
-static void
-tidy_texture_frame_set_property (GObject      *gobject,
-                                 guint         prop_id,
-                                 const GValue *value,
-                                 GParamSpec   *pspec)
-{
-  TidyTextureFrame *frame = TIDY_TEXTURE_FRAME (gobject);
-  TidyTextureFramePrivate *priv = frame->priv;
-
-  switch (prop_id)
-    {
-    case PROP_PARENT_TEXTURE:
-      tidy_texture_frame_set_parent_texture (frame,
-                                             g_value_get_object (value));
-      break;
-
-    case PROP_TOP:
-      tidy_texture_frame_set_frame_internal (frame,
-                                             priv->left,
-                                             g_value_get_float (value),
-                                             priv->right,
-                                             priv->bottom);
-      break;
-
-    case PROP_RIGHT:
-      tidy_texture_frame_set_frame_internal (frame,
-                                             priv->top,
-                                             g_value_get_float (value),
-                                             priv->bottom,
-                                             priv->left);
-      break;
-
-    case PROP_BOTTOM:
-      tidy_texture_frame_set_frame_internal (frame,
-                                             priv->top,
-                                             priv->right,
-                                             g_value_get_float (value),
-                                             priv->left);
-      break;
-
-    case PROP_LEFT:
-      tidy_texture_frame_set_frame_internal (frame,
-                                             priv->top,
-                                             priv->right,
-                                             priv->bottom,
-                                             g_value_get_float (value));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-tidy_texture_frame_get_property (GObject    *gobject,
-                                 guint       prop_id,
-                                 GValue     *value,
-                                 GParamSpec *pspec)
-{
-  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (gobject)->priv;
-
-  switch (prop_id)
-    {
-    case PROP_PARENT_TEXTURE:
-      g_value_set_object (value, priv->parent_texture);
-      break;
-
-    case PROP_LEFT:
-      g_value_set_float (value, priv->left);
-      break;
-
-    case PROP_TOP:
-      g_value_set_float (value, priv->top);
-      break;
-
-    case PROP_RIGHT:
-      g_value_set_float (value, priv->right);
-      break;
-
-    case PROP_BOTTOM:
-      g_value_set_float (value, priv->bottom);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (gobject, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-tidy_texture_frame_dispose (GObject *gobject)
-{
-  TidyTextureFramePrivate *priv = TIDY_TEXTURE_FRAME (gobject)->priv;
-
-  if (priv->parent_texture)
-    {
-      g_object_unref (priv->parent_texture);
-      priv->parent_texture = NULL;
-    }
-
-  if (priv->material)
-    {
-      cogl_handle_unref (priv->material);
-      priv->material = COGL_INVALID_HANDLE;
-    }
-
-  G_OBJECT_CLASS (tidy_texture_frame_parent_class)->dispose (gobject);
-}
-
-static void
-tidy_texture_frame_class_init (TidyTextureFrameClass *klass)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
-  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
-  GParamSpec *pspec;
-
-  g_type_class_add_private (gobject_class, sizeof (TidyTextureFramePrivate));
-
-  actor_class->get_preferred_width =
-    tidy_texture_frame_get_preferred_width;
-  actor_class->get_preferred_height =
-    tidy_texture_frame_get_preferred_height;
-  actor_class->realize = tidy_texture_frame_realize;
-  actor_class->unrealize = tidy_texture_frame_unrealize;
-  actor_class->paint = tidy_texture_frame_paint;
-
-  gobject_class->set_property = tidy_texture_frame_set_property;
-  gobject_class->get_property = tidy_texture_frame_get_property;
-  gobject_class->dispose = tidy_texture_frame_dispose;
-
-  pspec = g_param_spec_object ("parent-texture",
-                               "Parent Texture",
-                               "The parent ClutterTexture",
-                               CLUTTER_TYPE_TEXTURE,
-                               TIDY_PARAM_READWRITE |
-                               G_PARAM_CONSTRUCT);
-  g_object_class_install_property (gobject_class, PROP_PARENT_TEXTURE, pspec);
-
-  pspec = g_param_spec_float ("left",
-                              "Left",
-                              "Left offset",
-			      0, G_MAXFLOAT,
-                              0,
-                              TIDY_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class, PROP_LEFT, pspec);
-
-  pspec = g_param_spec_float ("top",
-                              "Top",
-                              "Top offset",
-                              0, G_MAXFLOAT,
-                              0,
-                              TIDY_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class, PROP_TOP, pspec);
-
-  pspec = g_param_spec_float ("bottom",
-                              "Bottom",
-                              "Bottom offset",
-                              0, G_MAXFLOAT,
-                              0,
-                              TIDY_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class, PROP_BOTTOM, pspec);
-
-  pspec = g_param_spec_float ("right",
-                              "Right",
-                              "Right offset",
-                              0, G_MAXFLOAT,
-                              0,
-                              TIDY_PARAM_READWRITE);
-  g_object_class_install_property (gobject_class, PROP_RIGHT, pspec);
-}
-
-static void
-tidy_texture_frame_init (TidyTextureFrame *self)
-{
-  TidyTextureFramePrivate *priv;
-
-  self->priv = priv = TIDY_TEXTURE_FRAME_GET_PRIVATE (self);
-
-  priv->material = COGL_INVALID_HANDLE;
-}
-
-/**
- * tidy_texture_frame_new:
- * @texture: a #ClutterTexture or %NULL
- * @left: left margin preserving its content
- * @top: top margin preserving its content
- * @right: right margin preserving its content
- * @bottom: bottom margin preserving its content
- *
- * A #TidyTextureFrame is a specialized texture that efficiently clones
- * an area of the given @texture while keeping preserving portions of the
- * same texture.
- *
- * A #TidyTextureFrame can be used to make a rectangular texture fit a
- * given size without stretching its borders.
- *
- * Return value: the newly created #TidyTextureFrame
- */
-ClutterActor*
-tidy_texture_frame_new (ClutterTexture *texture, 
-			gfloat          left,
-			gfloat          top,
-			gfloat          right,
-			gfloat          bottom)
-{
-  g_return_val_if_fail (texture == NULL || CLUTTER_IS_TEXTURE (texture), NULL);
-
-  return g_object_new (TIDY_TYPE_TEXTURE_FRAME,
- 		       "parent-texture", texture,
-		       "left", left,
-		       "top", top,
-		       "right", right,
-		       "bottom", bottom,
-		       NULL);
-}
-
-ClutterTexture *
-tidy_texture_frame_get_parent_texture (TidyTextureFrame *frame)
-{
-  g_return_val_if_fail (TIDY_IS_TEXTURE_FRAME (frame), NULL);
-
-  return frame->priv->parent_texture;
-}
-
-void
-tidy_texture_frame_set_parent_texture (TidyTextureFrame *frame,
-                                       ClutterTexture   *texture)
-{
-  TidyTextureFramePrivate *priv;
-  gboolean was_visible;
-
-  g_return_if_fail (TIDY_IS_TEXTURE_FRAME (frame));
-  g_return_if_fail (texture == NULL || CLUTTER_IS_TEXTURE (texture));
-
-  priv = frame->priv;
-
-  was_visible = CLUTTER_ACTOR_IS_VISIBLE (frame);
-
-  if (priv->parent_texture == texture)
-    return;
-
-  if (priv->parent_texture)
-    {
-      g_object_unref (priv->parent_texture);
-      priv->parent_texture = NULL;
-
-      if (was_visible)
-        clutter_actor_hide (CLUTTER_ACTOR (frame));
-    }
-
-  if (texture)
-    {
-      priv->parent_texture = g_object_ref (texture);
-
-      if (was_visible && CLUTTER_ACTOR_IS_VISIBLE (priv->parent_texture))
-        clutter_actor_show (CLUTTER_ACTOR (frame));
-    }
-
-  clutter_actor_queue_relayout (CLUTTER_ACTOR (frame));
-
-  g_object_notify (G_OBJECT (frame), "parent-texture");
-}
-
-void
-tidy_texture_frame_set_frame (TidyTextureFrame *frame,
-                              gfloat            top,
-                              gfloat            right,
-                              gfloat            bottom,
-                              gfloat            left)
-{
-  g_return_if_fail (TIDY_IS_TEXTURE_FRAME (frame));
-
-  tidy_texture_frame_set_frame_internal (frame, top, right, bottom, left);
-}
-
-void
-tidy_texture_frame_get_frame (TidyTextureFrame *frame,
-                              gfloat           *top,
-                              gfloat           *right,
-                              gfloat           *bottom,
-                              gfloat           *left)
-{
-  TidyTextureFramePrivate *priv;
-
-  g_return_if_fail (TIDY_IS_TEXTURE_FRAME (frame));
-
-  priv = frame->priv;
-
-  if (top)
-    *top = priv->top;
-
-  if (right)
-    *right = priv->right;
-
-  if (bottom)
-    *bottom = priv->bottom;
-
-  if (left)
-    *left = priv->left;
-}
-
-/**
- * tidy_texture_frame_set_needs_paint:
- * @frame: a #TidyTextureframe
- * @needs_paint: if %FALSE, the paint will be skipped
- *
- * Provides a hint to the texture frame that it is totally obscured
- * and doesn't need to be painted. This would typically be called
- * by a parent container if it detects the condition prior to
- * painting its children and then unset afterwards.
- *
- * Since it is not supposed to have any effect on display, it does
- * not queue a repaint.
- */
-void
-tidy_texture_frame_set_needs_paint (TidyTextureFrame *frame,
-				    gboolean          needs_paint)
-{
-  TidyTextureFramePrivate *priv;
-
-  g_return_if_fail (TIDY_IS_TEXTURE_FRAME (frame));
-
-  priv = frame->priv;
-
-  priv->needs_paint = needs_paint;
-}

src/compositor/tidy/tidy-texture-frame.h

@@ -1,84 +0,0 @@
-/* tidy-texture-frame.h: Expandible texture actor
- *
- * Copyright (C) 2007, 2008 OpenedHand Ltd
- * Copyright (C) 2009 Intel Corp.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- */
-
-#ifndef _HAVE_TIDY_TEXTURE_FRAME_H
-#define _HAVE_TIDY_TEXTURE_FRAME_H
-
-#include <clutter/clutter.h>
-
-G_BEGIN_DECLS
-
-#define TIDY_TYPE_TEXTURE_FRAME                 (tidy_texture_frame_get_type ())
-#define TIDY_TEXTURE_FRAME(obj)                 (G_TYPE_CHECK_INSTANCE_CAST ((obj), TIDY_TYPE_TEXTURE_FRAME, TidyTextureFrame))
-#define TIDY_TEXTURE_FRAME_CLASS(klass)         (G_TYPE_CHECK_CLASS_CAST ((klass), TIDY_TYPE_TEXTURE_FRAME, TidyTextureFrameClass))
-#define TIDY_IS_TEXTURE_FRAME(obj)              (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TIDY_TYPE_TEXTURE_FRAME))
-#define TIDY_IS_TEXTURE_FRAME_CLASS(klass)      (G_TYPE_CHECK_CLASS_TYPE ((klass), TIDY_TYPE_TEXTURE_FRAME))
-#define TIDY_TEXTURE_FRAME_GET_CLASS(obj)       (G_TYPE_INSTANCE_GET_CLASS ((obj), TIDY_TYPE_TEXTURE_FRAME, TidyTextureFrameClass))
-
-typedef struct _TidyTextureFrame                TidyTextureFrame;
-typedef struct _TidyTextureFramePrivate         TidyTextureFramePrivate;
-typedef struct _TidyTextureFrameClass           TidyTextureFrameClass;
-
-struct _TidyTextureFrame
-{
-  /*< private >*/
-  ClutterActor parent_instance;
-  
-  TidyTextureFramePrivate    *priv;
-};
-
-struct _TidyTextureFrameClass
-{
-  ClutterActorClass parent_class;
-
-  /* padding for future expansion */
-  void (*_clutter_box_1) (void);
-  void (*_clutter_box_2) (void);
-  void (*_clutter_box_3) (void);
-  void (*_clutter_box_4) (void);
-};
-
-GType           tidy_texture_frame_get_type           (void) G_GNUC_CONST;
-ClutterActor *  tidy_texture_frame_new                (ClutterTexture   *texture,
-                                                       gfloat            top,
-                                                       gfloat            right,
-                                                       gfloat            bottom,
-                                                       gfloat            left);
-void            tidy_texture_frame_set_parent_texture (TidyTextureFrame *frame,
-                                                       ClutterTexture   *texture);
-ClutterTexture *tidy_texture_frame_get_parent_texture (TidyTextureFrame *frame);
-void            tidy_texture_frame_set_frame          (TidyTextureFrame *frame,
-                                                       gfloat            top,
-                                                       gfloat            right,
-                                                       gfloat            bottom,
-                                                       gfloat            left);
-void            tidy_texture_frame_get_frame          (TidyTextureFrame *frame,
-                                                       gfloat           *top,
-                                                       gfloat           *right,
-                                                       gfloat           *bottom,
-                                                       gfloat           *left);
-
-void            tidy_texture_frame_set_needs_paint    (TidyTextureFrame *frame,
-                                                       gboolean          needs_paint);
-
-G_END_DECLS
-
-#endif /* _HAVE_TIDY_TEXTURE_FRAME_H */

src/core/boxes-private.h

@@ -0,0 +1,220 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Simple box operations */
+
+/* 
+ * Copyright (C) 2005, 2006 Elijah Newren
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_BOXES_PRIVATE_H
+#define META_BOXES_PRIVATE_H
+
+#include <glib-object.h>
+#include "common.h"
+#include "boxes.h"
+
+#define BOX_LEFT(box)    ((box).x)                /* Leftmost pixel of rect */
+#define BOX_RIGHT(box)   ((box).x + (box).width)  /* One pixel past right   */
+#define BOX_TOP(box)     ((box).y)                /* Topmost pixel of rect  */
+#define BOX_BOTTOM(box)  ((box).y + (box).height) /* One pixel past bottom  */
+
+typedef enum
+{
+  FIXED_DIRECTION_NONE = 0,
+  FIXED_DIRECTION_X    = 1 << 0,
+  FIXED_DIRECTION_Y    = 1 << 1,
+} FixedDirections;
+
+/* Output functions -- note that the output buffer had better be big enough:
+ *   rect_to_string:   RECT_LENGTH
+ *   region_to_string: (RECT_LENGTH+strlen(separator_string)) *
+ *                     g_list_length (region)
+ *   edge_to_string:   EDGE_LENGTH
+ *   edge_list_to_...: (EDGE_LENGTH+strlen(separator_string)) * 
+ *                     g_list_length (edge_list)
+ */
+#define RECT_LENGTH 27
+#define EDGE_LENGTH 37
+char* meta_rectangle_to_string        (const MetaRectangle *rect,
+                                       char                *output);
+char* meta_rectangle_region_to_string (GList               *region,
+                                       const char          *separator_string,
+                                       char                *output);
+char* meta_rectangle_edge_to_string   (const MetaEdge      *edge,
+                                       char                *output);
+char* meta_rectangle_edge_list_to_string (
+                                       GList               *edge_list,
+                                       const char          *separator_string,
+                                       char                *output);
+
+/* Resize old_rect to the given new_width and new_height, but store the
+ * result in rect.  NOTE THAT THIS IS RESIZE ONLY SO IT CANNOT BE USED FOR
+ * A MOVERESIZE OPERATION (that simplies the routine a little bit as it
+ * means there's no difference between NorthWestGravity and StaticGravity.
+ * Also, I lied a little bit--technically, you could use it in a MoveResize
+ * operation if you muck with old_rect just right).
+ */
+void meta_rectangle_resize_with_gravity (const MetaRectangle *old_rect,
+                                         MetaRectangle       *rect,
+                                         int                  gravity,
+                                         int                  new_width,
+                                         int                  new_height);
+
+/* find a list of rectangles with the property that a window is contained
+ * in the given region if and only if it is contained in one of the
+ * rectangles in the list.
+ *
+ * In this case, the region is given by taking basic_rect, removing from
+ * it the intersections with all the rectangles in the all_struts list,
+ * then expanding all the rectangles in the resulting list by the given
+ * amounts on each side.
+ *
+ * See boxes.c for more details.
+ */
+GList*   meta_rectangle_get_minimal_spanning_set_for_region (
+                                         const MetaRectangle *basic_rect,
+                                         const GSList        *all_struts);
+
+/* Expand all rectangles in region by the given amount on each side */
+GList*   meta_rectangle_expand_region   (GList               *region,
+                                         const int            left_expand,
+                                         const int            right_expand,
+                                         const int            top_expand,
+                                         const int            bottom_expand);
+/* Same as for meta_rectangle_expand_region except that rectangles not at
+ * least min_x or min_y in size are not expanded in that direction
+ */
+GList*   meta_rectangle_expand_region_conditionally (
+                                         GList                *region,
+                                         const int            left_expand,
+                                         const int            right_expand,
+                                         const int            top_expand,
+                                         const int            bottom_expand,
+                                         const int            min_x,
+                                         const int            min_y);
+
+/* Expand rect in direction to the size of expand_to, and then clip out any
+ * overlapping struts oriented orthognal to the expansion direction.  (Think
+ * horizontal or vertical maximization)
+ */
+void     meta_rectangle_expand_to_avoiding_struts (
+                                         MetaRectangle       *rect,
+                                         const MetaRectangle *expand_to,
+                                         const MetaDirection  direction,
+                                         const GSList        *all_struts);
+
+/* Free the list created by
+ *   meta_rectangle_get_minimal_spanning_set_for_region()
+ * or
+ *   meta_rectangle_find_onscreen_edges ()
+ * or
+ *   meta_rectangle_find_nonintersected_monitor_edges()
+ */
+void     meta_rectangle_free_list_and_elements (GList *filled_list);
+
+/* could_fit_in_region determines whether one of the spanning_rects is
+ * big enough to contain rect.  contained_in_region checks whether one
+ * actually contains it.
+ */
+gboolean meta_rectangle_could_fit_in_region (
+                                         const GList         *spanning_rects,
+                                         const MetaRectangle *rect);
+gboolean meta_rectangle_contained_in_region (
+                                         const GList         *spanning_rects,
+                                         const MetaRectangle *rect);
+gboolean meta_rectangle_overlaps_with_region (
+                                         const GList         *spanning_rects,
+                                         const MetaRectangle *rect);
+
+/* Make the rectangle small enough to fit into one of the spanning_rects,
+ * but make it no smaller than min_size.
+ */
+void     meta_rectangle_clamp_to_fit_into_region (
+                                         const GList         *spanning_rects,
+                                         FixedDirections      fixed_directions,
+                                         MetaRectangle       *rect,
+                                         const MetaRectangle *min_size);
+
+/* Clip the rectangle so that it fits into one of the spanning_rects, assuming
+ * it overlaps with at least one of them
+ */
+void     meta_rectangle_clip_to_region  (const GList         *spanning_rects,
+                                         FixedDirections      fixed_directions,
+                                         MetaRectangle       *rect);
+
+/* Shove the rectangle into one of the spanning_rects, assuming it fits in
+ * one of them.
+ */
+void     meta_rectangle_shove_into_region(
+                                         const GList         *spanning_rects,
+                                         FixedDirections      fixed_directions,
+                                         MetaRectangle       *rect);
+
+/* Finds the point on the line connecting (x1,y1) to (x2,y2) which is closest
+ * to (px, py).  Useful for finding an optimal rectangle size when given a
+ * range between two sizes that are all candidates.
+ */
+void meta_rectangle_find_linepoint_closest_to_point (double x1,    double y1,
+                                                     double x2,    double y2,
+                                                     double px,    double py,
+                                                     double *valx, double *valy);
+
+/***************************************************************************/
+/*                                                                         */
+/* Switching gears to code for edges instead of just rectangles            */
+/*                                                                         */
+/***************************************************************************/
+
+/* Return whether an edge overlaps or is adjacent to the rectangle in the
+ * nonzero-width dimension of the edge.
+ */
+gboolean meta_rectangle_edge_aligns (const MetaRectangle *rect, 
+                                     const MetaEdge      *edge);
+
+/* Compare two edges, so that sorting functions can put a list of edges in
+ * canonical order.
+ */
+gint   meta_rectangle_edge_cmp (gconstpointer a, gconstpointer b);
+
+/* Compare two edges, so that sorting functions can put a list of edges in
+ * order.  This function doesn't separate left edges first, then right edges,
+ * etc., but rather compares only upon location.
+ */
+gint   meta_rectangle_edge_cmp_ignore_type (gconstpointer a, gconstpointer b);
+
+/* Removes an parts of edges in the given list that intersect any box in the
+ * given rectangle list.  Returns the result.
+ */
+GList* meta_rectangle_remove_intersections_with_boxes_from_edges (
+                                           GList *edges,
+                                           const GSList *rectangles);
+
+/* Finds all the edges of an onscreen region, returning a GList* of
+ * MetaEdgeRect's.
+ */
+GList* meta_rectangle_find_onscreen_edges (const MetaRectangle *basic_rect,
+                                           const GSList        *all_struts);
+
+/* Finds edges between adjacent monitors which are not covered by the given
+ * struts.
+ */
+GList* meta_rectangle_find_nonintersected_monitor_edges (
+                                           const GList         *monitor_rects,
+                                           const GSList        *all_struts);
+
+#endif /* META_BOXES_PRIVATE_H */

src/core/boxes.c

@@ -26,10 +26,39 @@
  * 02111-1307, USA.
  */
 
-#include "boxes.h"
+#include "boxes-private.h"
 #include "util.h"
 #include <X11/Xutil.h>  /* Just for the definition of the various gravities */
 
+/* It would make sense to use GSlice here, but until we clean up the
+ * rest of this file and the internal API to use these functions, we
+ * leave it using g_malloc()/g_free() for consistency.
+ */
+
+MetaRectangle *
+meta_rectangle_copy (const MetaRectangle *rect)
+{
+  return g_memdup (rect, sizeof (MetaRectangle));
+}
+
+void
+meta_rectangle_free (MetaRectangle *rect)
+{
+  g_free (rect);
+}
+
+GType
+meta_rectangle_get_type (void)
+{
+  static GType type_id = 0;
+
+  if (!type_id)
+    type_id = g_boxed_type_register_static (g_intern_static_string ("MetaRectangle"),
+					    (GBoxedCopyFunc) meta_rectangle_copy,
+					    (GBoxedFreeFunc) meta_rectangle_free);
+  return type_id;
+}
+
 char*
 meta_rectangle_to_string (const MetaRectangle *rect,
                           char                *output)
@@ -500,7 +529,12 @@ compare_rect_areas (gconstpointer a, gconstpointer b)
   return b_area - a_area; /* positive ret value denotes b > a, ... */
 }
 
-/* This function is trying to find a "minimal spanning set (of rectangles)"
+/**
+ * meta_rectangle_get_minimal_spanning_set_for_region:
+ * @basic_rect: Input rectangle
+ * @all_struts: (element-type Meta.Rectangle): List of struts
+ *
+ * This function is trying to find a "minimal spanning set (of rectangles)"
  * for a given region.
  *
  * The region is given by taking basic_rect, then removing the areas
@@ -513,10 +547,7 @@ compare_rect_areas (gconstpointer a, gconstpointer b)
  * the region if and only if it is contained within at least one of the
  * rectangles.
  *
- * The GList* returned will be a list of (allocated) MetaRectangles.
- * The list will need to be freed by calling
- * meta_rectangle_free_spanning_set() on it (or by manually
- * implementing that function...)
+ * Returns: (transfer full) (element-type Meta.Rectangle): Minimal spanning set
  */
 GList*
 meta_rectangle_get_minimal_spanning_set_for_region (
@@ -649,6 +680,10 @@ meta_rectangle_get_minimal_spanning_set_for_region (
   return ret;
 }
 
+/**
+ * meta_rectangle_expand_region: (skip)
+ *
+ */
 GList*
 meta_rectangle_expand_region (GList     *region,
                               const int  left_expand,
@@ -665,6 +700,10 @@ meta_rectangle_expand_region (GList     *region,
                                                      0);
 }
 
+/**
+ * meta_rectangle_expand_region_conditionally: (skip)
+ *
+ */
 GList*
 meta_rectangle_expand_region_conditionally (GList     *region,
                                             const int  left_expand,
@@ -1642,7 +1681,10 @@ fix_up_edges (MetaRectangle *rect,         MetaEdge *edge,
     }
 }
 
-/* This function removes intersections of edges with the rectangles from the
+/**
+ * meta_rectangle_remove_intersections_with_boxes_from_edges: (skip)
+ *
+ * This function removes intersections of edges with the rectangles from the
  * list of edges.
  */
 GList*
@@ -1708,7 +1750,11 @@ meta_rectangle_remove_intersections_with_boxes_from_edges (
   return edges;
 }
 
-/* This function is trying to find all the edges of an onscreen region. */
+/**
+ * meta_rectangle_find_onscreen_edges: (skip)
+ *
+ * This function is trying to find all the edges of an onscreen region.
+ */
 GList*
 meta_rectangle_find_onscreen_edges (const MetaRectangle *basic_rect,
                                     const GSList        *all_struts)
@@ -1791,6 +1837,10 @@ meta_rectangle_find_onscreen_edges (const MetaRectangle *basic_rect,
   return ret;
 }
 
+/**
+ * meta_rectangle_find_nonintersected_monitor_edges: (skip)
+ *
+ */
 GList*
 meta_rectangle_find_nonintersected_monitor_edges (
                                     const GList         *monitor_rects,

src/core/constraints.c

@@ -24,6 +24,7 @@
  */
 
 #include <config.h>
+#include "boxes-private.h"
 #include "constraints.h"
 #include "workspace-private.h"
 #include "place.h"
@@ -98,6 +99,7 @@ typedef enum
   PRIORITY_ENTIRELY_VISIBLE_ON_WORKAREA = 1,
   PRIORITY_SIZE_HINTS_INCREMENTS = 1,
   PRIORITY_MAXIMIZATION = 2,
+  PRIORITY_TILING = 2,
   PRIORITY_FULLSCREEN = 2,
   PRIORITY_SIZE_HINTS_LIMITS = 3,
   PRIORITY_TITLEBAR_VISIBLE = 4,
@@ -140,11 +142,18 @@ typedef struct
   GList  *usable_screen_region;
   GList  *usable_monitor_region;
 } ConstraintInfo;
-
+static gboolean constrain_modal_dialog       (MetaWindow         *window,
+                                              ConstraintInfo     *info,
+                                              ConstraintPriority  priority,
+                                              gboolean            check_only);
 static gboolean constrain_maximization       (MetaWindow         *window,
                                               ConstraintInfo     *info,
                                               ConstraintPriority  priority,
                                               gboolean            check_only);
+static gboolean constrain_tiling             (MetaWindow         *window,
+                                              ConstraintInfo     *info,
+                                              ConstraintPriority  priority,
+                                              gboolean            check_only);
 static gboolean constrain_fullscreen         (MetaWindow         *window,
                                               ConstraintInfo     *info,
                                               ConstraintPriority  priority,
@@ -210,7 +219,9 @@ typedef struct {
 } Constraint;
 
 static const Constraint all_constraints[] = {
+  {constrain_modal_dialog,       "constrain_modal_dialog"},
   {constrain_maximization,       "constrain_maximization"},
+  {constrain_tiling,             "constrain_tiling"},
   {constrain_fullscreen,         "constrain_fullscreen"},
   {constrain_size_increments,    "constrain_size_increments"},
   {constrain_size_limits,        "constrain_size_limits"},
@@ -726,6 +737,48 @@ get_size_limits (const MetaWindow        *window,
     }
 }
 
+static gboolean
+constrain_modal_dialog (MetaWindow         *window,
+                        ConstraintInfo     *info,
+                        ConstraintPriority  priority,
+                        gboolean            check_only)
+{
+  int x, y;
+  MetaWindow *parent = meta_window_get_transient_for (window);
+  gboolean constraint_already_satisfied;
+
+  if (!meta_prefs_get_attach_modal_dialogs ())
+    return TRUE;
+  if (window->type != META_WINDOW_MODAL_DIALOG || !parent || parent == window)
+    return TRUE;
+
+  x = parent->rect.x + (parent->rect.width / 2  - info->current.width / 2);
+  y = 0;
+  if (parent->frame)
+    {
+      MetaFrameGeometry fgeom;
+
+      x += parent->frame->rect.x;
+      y += parent->frame->rect.y;
+
+      meta_frame_calc_geometry (parent->frame, &fgeom);
+      y += fgeom.top_height;
+
+      y += info->fgeom->top_height;
+    }
+  else
+    y = parent->rect.y + info->fgeom->top_height;
+
+  constraint_already_satisfied = (x == info->current.x) && (y == info->current.y);
+
+  if (check_only || constraint_already_satisfied)
+    return constraint_already_satisfied;
+
+  info->current.y = y;
+  info->current.x = x;
+  return TRUE;
+}
+
 static gboolean
 constrain_maximization (MetaWindow         *window,
                         ConstraintInfo     *info,
@@ -742,7 +795,8 @@ constrain_maximization (MetaWindow         *window,
     return TRUE;
 
   /* Determine whether constraint applies; exit if it doesn't */
-  if (!window->maximized_horizontally && !window->maximized_vertically)
+  if ((!window->maximized_horizontally && !window->maximized_vertically) ||
+      META_WINDOW_TILED (window))
     return TRUE;
 
   /* Calculate target_size = maximized size of (window + frame) */
@@ -810,6 +864,59 @@ constrain_maximization (MetaWindow         *window,
   return TRUE;
 }
 
+static gboolean
+constrain_tiling (MetaWindow         *window,
+                  ConstraintInfo     *info,
+                  ConstraintPriority  priority,
+                  gboolean            check_only)
+{
+  MetaRectangle target_size;
+  MetaRectangle min_size, max_size;
+  gboolean hminbad, vminbad;
+  gboolean horiz_equal, vert_equal;
+  gboolean constraint_already_satisfied;
+
+  if (priority > PRIORITY_TILING)
+    return TRUE;
+
+  /* Determine whether constraint applies; exit if it doesn't */
+  if (!META_WINDOW_TILED (window))
+    return TRUE;
+
+  /* Calculate target_size - as the tile previews need this as well, we
+   * use an external function for the actual calculation
+   */
+  meta_window_get_current_tile_area (window, &target_size);
+  unextend_by_frame (&target_size, info->fgeom);
+
+  /* Check min size constraints; max size constraints are ignored as for
+   * maximized windows.
+   */
+  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
+  hminbad = target_size.width < min_size.width;
+  vminbad = target_size.height < min_size.height;
+  if (hminbad || vminbad)
+    return TRUE;
+
+  /* Determine whether constraint is already satisfied; exit if it is */
+  horiz_equal = target_size.x      == info->current.x &&
+                target_size.width  == info->current.width;
+  vert_equal  = target_size.y      == info->current.y &&
+                target_size.height == info->current.height;
+  constraint_already_satisfied = horiz_equal && vert_equal;
+  if (check_only || constraint_already_satisfied)
+    return constraint_already_satisfied;
+
+  /*** Enforce constraint ***/
+  info->current.x      = target_size.x;
+  info->current.width  = target_size.width;
+  info->current.y      = target_size.y;
+  info->current.height = target_size.height;
+
+  return TRUE;
+}
+
+
 static gboolean
 constrain_fullscreen (MetaWindow         *window,
                       ConstraintInfo     *info,
@@ -861,7 +968,7 @@ constrain_size_increments (MetaWindow         *window,
 
   /* Determine whether constraint applies; exit if it doesn't */
   if (META_WINDOW_MAXIMIZED (window) || window->fullscreen || 
-      info->action_type == ACTION_MOVE)
+      META_WINDOW_TILED (window) || info->action_type == ACTION_MOVE)
     return TRUE;
 
   /* Determine whether constraint is already satisfied; exit if it is */
@@ -992,7 +1099,7 @@ constrain_aspect_ratio (MetaWindow         *window,
   constraints_are_inconsistent = minr > maxr;
   if (constraints_are_inconsistent ||
       META_WINDOW_MAXIMIZED (window) || window->fullscreen || 
-      info->action_type == ACTION_MOVE)
+      META_WINDOW_TILED (window) || info->action_type == ACTION_MOVE)
     return TRUE;
 
   /* Determine whether constraint is already satisfied; exit if it is.  We

src/core/core.c

@@ -28,6 +28,7 @@
 #include "frame-private.h"
 #include "workspace-private.h"
 #include "prefs.h"
+#include "errors.h"
 
 /* Looks up the MetaWindow representing the frame of the given X window.
  * Used as a helper function by a bunch of the functions below.
@@ -116,65 +117,8 @@ meta_core_get (Display *xdisplay,
         *((MetaFrameFlags*)answer) = meta_frame_get_flags (window->frame);
         break; 
       case META_CORE_GET_FRAME_TYPE:
-          {
-          MetaFrameType base_type = META_FRAME_TYPE_LAST;
-
-          switch (window->type)
-            {
-            case META_WINDOW_NORMAL:
-              base_type = META_FRAME_TYPE_NORMAL;
-              break;
-
-            case META_WINDOW_DIALOG:
-              base_type = META_FRAME_TYPE_DIALOG;
-              break;
-
-            case META_WINDOW_MODAL_DIALOG:
-              base_type = META_FRAME_TYPE_MODAL_DIALOG;
-              break;
-
-            case META_WINDOW_MENU:
-              base_type = META_FRAME_TYPE_MENU;
-              break;
-
-            case META_WINDOW_UTILITY:
-              base_type = META_FRAME_TYPE_UTILITY;
-              break;
-
-            case META_WINDOW_DESKTOP:
-            case META_WINDOW_DOCK:
-            case META_WINDOW_TOOLBAR:
-            case META_WINDOW_SPLASHSCREEN:
-	    case META_WINDOW_DROPDOWN_MENU:
-	    case META_WINDOW_POPUP_MENU:
-	    case META_WINDOW_TOOLTIP:
-	    case META_WINDOW_NOTIFICATION:
-	    case META_WINDOW_COMBO:
-	    case META_WINDOW_DND:
-	    case META_WINDOW_OVERRIDE_OTHER:
-              /* No frame */
-              base_type = META_FRAME_TYPE_LAST;
-              break;
-
-            }
-
-          if (base_type == META_FRAME_TYPE_LAST)
-            {
-              /* can't add border if undecorated */
-              *((MetaFrameType*)answer) = META_FRAME_TYPE_LAST; 
-            }
-          else if (window->border_only)
-            {
-              /* override base frame type */
-              *((MetaFrameType*)answer) = META_FRAME_TYPE_BORDER; 
-            }
-          else
-            {
-              *((MetaFrameType*)answer) = base_type;
-            }
-
-          break; 
-          }
+        *((MetaFrameType*)answer) = meta_window_get_frame_type (window);
+        break;
       case META_CORE_GET_MINI_ICON:
         *((GdkPixbuf**)answer) = window->mini_icon;
         break;
@@ -260,15 +204,14 @@ meta_core_user_raise (Display *xdisplay,
   meta_window_raise (window);
 }
 
-void
-meta_core_user_lower_and_unfocus (Display *xdisplay,
-                                  Window   frame_xwindow,
-                                  guint32  timestamp)
+static gboolean
+lower_window_and_transients (MetaWindow *window,
+                             gpointer   data)
 {
-  MetaWindow *window = get_window (xdisplay, frame_xwindow);
-  
   meta_window_lower (window);
 
+  meta_window_foreach_transient (window, lower_window_and_transients, NULL);
+
   if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK &&
       meta_prefs_get_raise_on_click ())
     {
@@ -296,11 +239,59 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
         }
     }
 
-  /* focus the default window, if needed */
-  if (window->has_focus)
-    meta_workspace_focus_default_window (window->screen->active_workspace,
-                                         NULL,
-                                         timestamp);
+  return FALSE;
+}
+
+void
+meta_core_user_lower_and_unfocus (Display *xdisplay,
+                                  Window   frame_xwindow,
+                                  guint32  timestamp)
+{
+  MetaWindow *window = get_window (xdisplay, frame_xwindow);
+
+  lower_window_and_transients (window, NULL);
+
+ /* Rather than try to figure that out whether we just lowered
+  * the focus window, assume that's always the case. (Typically,
+  * this will be invoked via keyboard action or by a mouse action;
+  * in either case the window or a modal child will have been focused.) */
+  meta_workspace_focus_default_window (window->screen->active_workspace,
+                                       NULL,
+                                       timestamp);
+}
+
+void
+meta_core_lower_beneath_focus_window (Display *xdisplay,
+                                      Window   xwindow,
+                                      guint32  timestamp)
+{
+  XWindowChanges changes;
+  MetaDisplay *display;
+  MetaScreen *screen;
+  MetaWindow *focus_window;
+
+  display = meta_display_for_x_display (xdisplay);
+  screen = meta_display_screen_for_xwindow (display, xwindow);
+  focus_window = meta_stack_get_top (screen->stack);
+
+  if (focus_window == NULL)
+    return;
+
+  changes.stack_mode = Below;
+  changes.sibling = focus_window->frame ? focus_window->frame->xwindow
+                                        : focus_window->xwindow;
+
+  meta_stack_tracker_record_lower_below (screen->stack_tracker,
+                                         xwindow,
+                                         changes.sibling,
+                                         XNextRequest (screen->display->xdisplay));
+
+  meta_error_trap_push (display);
+  XConfigureWindow (xdisplay,
+                    xwindow,
+                    CWSibling | CWStackMode,
+                    &changes);
+  meta_error_trap_pop (display);
 }
 
 void

src/core/delete.c

@@ -22,8 +22,7 @@
  * 02111-1307, USA.
  */
 
-#define _GNU_SOURCE
-#define _SVID_SOURCE /* for gethostname() */
+#define _XOPEN_SOURCE /* for kill() */
 
 #include <config.h>
 #include "util.h"
@@ -137,7 +136,7 @@ meta_window_delete (MetaWindow  *window,
                   window->desc);
       XKillClient (window->display->xdisplay, window->xwindow);
     }
-  meta_error_trap_pop (window->display, FALSE);
+  meta_error_trap_pop (window->display);
 
   meta_display_ping_window (window->display,
                             window,
@@ -179,42 +178,29 @@ meta_window_delete (MetaWindow  *window,
 void
 meta_window_kill (MetaWindow *window)
 {
-  char buf[257];
-  
   meta_topic (META_DEBUG_WINDOW_OPS,
               "Killing %s brutally\n",
               window->desc);
 
-  if (window->wm_client_machine != NULL &&
+  if (!meta_window_is_remote (window) &&
       window->net_wm_pid > 0)
     {
-      if (gethostname (buf, sizeof(buf)-1) == 0)
-        {
-          if (strcmp (buf, window->wm_client_machine) == 0)
-            {
-              meta_topic (META_DEBUG_WINDOW_OPS,
-                          "Killing %s with kill()\n",
-                          window->desc);
+      meta_topic (META_DEBUG_WINDOW_OPS,
+                  "Killing %s with kill()\n",
+                  window->desc);
 
-              if (kill (window->net_wm_pid, 9) < 0)
-                meta_topic (META_DEBUG_WINDOW_OPS,
-                            "Failed to signal %s: %s\n",
-                            window->desc, strerror (errno));
-            }
-        }
-      else
-        {
-          meta_warning (_("Failed to get hostname: %s\n"),
-                        strerror (errno));
-        }
+      if (kill (window->net_wm_pid, 9) < 0)
+        meta_topic (META_DEBUG_WINDOW_OPS,
+                    "Failed to signal %s: %s\n",
+                    window->desc, strerror (errno));
     }
-  
+
   meta_topic (META_DEBUG_WINDOW_OPS,
               "Disconnecting %s with XKillClient()\n",
               window->desc);
   meta_error_trap_push (window->display);
   XKillClient (window->display->xdisplay, window->xwindow);
-  meta_error_trap_pop (window->display, FALSE);
+  meta_error_trap_pop (window->display);
 }
 
 void

src/core/display-private.h

@@ -83,10 +83,11 @@ struct _MetaDisplay
   
   char *name;
   Display *xdisplay;
+  char *hostname;
 
   Window leader_window;
   Window timestamp_pinging_window;
-  
+
   /* Pull in all the names of atoms as fields; we will intern them when the
    * class is constructed.
    */
@@ -184,6 +185,9 @@ struct _MetaDisplay
   guint       grab_have_pointer : 1;
   guint       grab_have_keyboard : 1;
   guint       grab_frame_action : 1;
+  /* During a resize operation, the directions in which we've broken
+   * out of the initial maximization state */
+  guint       grab_resize_unmaximize : 2; /* MetaMaximizeFlags */
   MetaRectangle grab_initial_window_pos;
   int         grab_initial_x, grab_initial_y;  /* These are only relevant for */
   gboolean    grab_threshold_movement_reached; /* raise_on_click == FALSE.    */

src/core/display.c

@@ -30,6 +30,8 @@
  * The display is represented as a MetaDisplay struct.
  */
 
+#define _XOPEN_SOURCE 600 /* for gethostname() */
+
 #include <config.h>
 #include "display-private.h"
 #include "util.h"
@@ -72,6 +74,7 @@
 #include <X11/extensions/Xdamage.h>
 #include <X11/extensions/Xfixes.h>
 #include <string.h>
+#include <unistd.h>
 
 #define GRAB_OP_IS_WINDOW_SWITCH(g)                     \
         (g == META_GRAB_OP_KEYBOARD_TABBING_NORMAL  ||  \
@@ -344,7 +347,7 @@ sn_error_trap_pop (SnDisplay *sn_display,
   MetaDisplay *display;
   display = meta_display_for_x_display (xdisplay);
   if (display != NULL)
-    meta_error_trap_pop (display, FALSE);
+    meta_error_trap_pop (display);
 }
 #endif
 
@@ -429,6 +432,7 @@ meta_display_open (void)
   GSList *tmp;
   int i;
   guint32 timestamp;
+  char buf[257];
 
   /* A list of all atom names, so that we can intern them in one go. */
   char *atom_names[] = {
@@ -463,6 +467,11 @@ meta_display_open (void)
    */
   the_display->name = g_strdup (XDisplayName (NULL));
   the_display->xdisplay = xdisplay;
+  if (gethostname (buf, sizeof(buf)-1) == 0)
+    {
+      buf[sizeof(buf)-1] = '\0';
+      the_display->hostname = g_strdup (buf);
+    }
   the_display->error_trap_synced_at_last_pop = TRUE;
   the_display->error_traps = 0;
   the_display->error_trap_handler = NULL;
@@ -881,7 +890,7 @@ meta_display_open (void)
                                                   timestamp);
       }
 
-    meta_error_trap_pop (the_display, FALSE);
+    meta_error_trap_pop (the_display);
   }
   
   meta_display_ungrab (the_display);  
@@ -1090,7 +1099,7 @@ meta_display_screen_for_xwindow (MetaDisplay *display,
   meta_error_trap_push (display);
   attr.screen = NULL;
   result = XGetWindowAttributes (display->xdisplay, xwindow, &attr);
-  meta_error_trap_pop (display, TRUE);
+  meta_error_trap_pop (display);
 
   /* Note, XGetWindowAttributes is on all kinds of crack
    * and returns 1 on success 0 on failure, rather than Success
@@ -1483,7 +1492,7 @@ window_raise_with_delay_callback (void *data)
 				   window->xwindow,
 				   &root, &child,
 				   &root_x, &root_y, &x, &y, &mask);
-      meta_error_trap_pop (window->display, TRUE);
+      meta_error_trap_pop (window->display);
 
       point_in_window = 
         (window->frame && POINT_IN_RECT (root_x, root_y, window->frame->rect)) ||
@@ -1726,7 +1735,8 @@ event_callback (XEvent   *event,
     }
 #endif /* HAVE_SHAPE */
 
-  if (window && ((event->type == KeyPress) || (event->type == ButtonPress)))
+  if (window && !window->override_redirect &&
+      ((event->type == KeyPress) || (event->type == ButtonPress)))
     {
       if (CurrentTime == display->current_time)
         {
@@ -2198,7 +2208,7 @@ event_callback (XEvent   *event,
                             window->frame->xwindow);
               meta_error_trap_push (display);
               meta_window_destroy_frame (window->frame->window);
-              meta_error_trap_pop (display, FALSE);
+              meta_error_trap_pop (display);
             }
           else
             {
@@ -2367,7 +2377,7 @@ event_callback (XEvent   *event,
           meta_error_trap_push (display);
           XConfigureWindow (display->xdisplay, event->xconfigurerequest.window,
                             xwcm, &xwc);
-          meta_error_trap_pop (display, FALSE);
+          meta_error_trap_pop (display);
         }
       else
         {
@@ -3138,7 +3148,7 @@ meta_spew_event (MetaDisplay *display,
         meta_error_trap_push (display);
         str = XGetAtomName (display->xdisplay,
                             event->xproperty.atom);
-        meta_error_trap_pop (display, TRUE);
+        meta_error_trap_pop (display);
 
         if (event->xproperty.state == PropertyNewValue)
           state = "PropertyNewValue";
@@ -3172,7 +3182,7 @@ meta_spew_event (MetaDisplay *display,
         meta_error_trap_push (display);
         str = XGetAtomName (display->xdisplay,
                             event->xclient.message_type);
-        meta_error_trap_pop (display, TRUE);
+        meta_error_trap_pop (display);
         extra = g_strdup_printf ("type: %s format: %d\n",
                                  str ? str : "(unknown atom)",
                                  event->xclient.format);
@@ -3450,7 +3460,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
       meta_topic (META_DEBUG_WINDOW_OPS,
                   "Changed pointer with XChangeActivePointerGrab()\n");
 
-      if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+      if (meta_error_trap_pop_with_return (display) != Success)
         {
           meta_topic (META_DEBUG_WINDOW_OPS,
                       "Error trapped from XChangeActivePointerGrab()\n");
@@ -3483,7 +3493,7 @@ meta_display_set_grab_op_cursor (MetaDisplay *display,
                       "XGrabPointer() failed time %u\n",
                       timestamp);
         }
-      meta_error_trap_pop (display, TRUE);
+      meta_error_trap_pop (display);
     }
 
 #undef GRAB_MASK
@@ -3600,6 +3610,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
   display->grab_last_user_action_was_snap = FALSE;
 #endif
   display->grab_frame_action = frame_action;
+  display->grab_resize_unmaximize = 0;
 
   if (display->grab_resize_timeout_id)
     {
@@ -3658,7 +3669,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
                                                          XSyncCAEvents,
                                                          &values);
 
-          if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+          if (meta_error_trap_pop_with_return (display) != Success)
 	    display->grab_sync_request_alarm = None;
 
           meta_topic (META_DEBUG_RESIZING,
@@ -3877,7 +3888,7 @@ meta_change_button_grab (MetaDisplay *display,
         {
           int result;
           
-          result = meta_error_trap_pop_with_return (display, FALSE);
+          result = meta_error_trap_pop_with_return (display);
           
           if (result != Success)
             meta_verbose ("Failed to %s button %d with mask 0x%x for window 0x%lx error code %d\n",
@@ -3888,7 +3899,7 @@ meta_change_button_grab (MetaDisplay *display,
       ++ignored_mask;
     }
 
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 }
 
 void
@@ -4072,7 +4083,7 @@ meta_display_update_active_window_hint (MetaDisplay *display)
                        XA_WINDOW,
                        32, PropModeReplace, (guchar*) data, 1);
 
-      meta_error_trap_pop (display, FALSE);
+      meta_error_trap_pop (display);
 
       tmp = tmp->next;
     }
@@ -4352,7 +4363,7 @@ process_request_frame_extents (MetaDisplay    *display,
                    display->atom__NET_FRAME_EXTENTS,
                    XA_CARDINAL,
                    32, PropModeReplace, (guchar*) data, 4);
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 
   meta_XFree (hints);
 }
@@ -4540,6 +4551,18 @@ find_tab_backward (MetaDisplay   *display,
   return NULL;
 }
 
+/**
+ * meta_display_get_tab_list:
+ * @display: a #MetaDisplay
+ * @type: type of tab list
+ * @screen: a #MetaScreen
+ * @workspace: origin workspace
+ *
+ * Determine the list of windows that should be displayed for Alt-TAB
+ * functionality.  The windows are returned in most recently used order.
+ *
+ * Returns: (transfer container) (element-type Meta.Window): List of windows
+ */
 GList*
 meta_display_get_tab_list (MetaDisplay   *display,
                            MetaTabList    type,
@@ -4617,6 +4640,21 @@ meta_display_get_tab_list (MetaDisplay   *display,
   return tab_list;
 }
 
+/**
+ * meta_display_get_tab_next:
+ * @display: a #MetaDisplay
+ * @type: type of tab list
+ * @screen: a #MetaScreen
+ * @workspace: origin workspace
+ * @window: (allow-none): starting window 
+ * @backward: If %TRUE, look for the previous window.  
+ *
+ * Determine the next window that should be displayed for Alt-TAB
+ * functionality.
+ *
+ * Returns: (transfer none): Next window
+ *
+ */
 MetaWindow*
 meta_display_get_tab_next (MetaDisplay   *display,
                            MetaTabList    type,
@@ -4667,6 +4705,18 @@ meta_display_get_tab_next (MetaDisplay   *display,
   return ret;
 }
 
+/**
+ * meta_display_get_tab_current:
+ * @display: a #MetaDisplay
+ * @type: type of tab list
+ * @screen: a #MetaScreen
+ * @workspace: origin workspace
+ *
+ * Determine the active window that should be displayed for Alt-TAB.
+ *
+ * Returns: (transfer none): Current window
+ *
+ */
 MetaWindow*
 meta_display_get_tab_current (MetaDisplay   *display,
                               MetaTabList    type,
@@ -4791,11 +4841,11 @@ convert_property (MetaDisplay *display,
 		     (unsigned char *)icccm_version, 2);
   else
     {
-      meta_error_trap_pop_with_return (display, FALSE);
+      meta_error_trap_pop_with_return (display);
       return FALSE;
     }
   
-  if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+  if (meta_error_trap_pop_with_return (display) != Success)
     return FALSE;
 
   /* Be sure the PropertyNotify has arrived so we
@@ -4827,7 +4877,7 @@ process_selection_request (MetaDisplay   *display,
       meta_error_trap_push (display);
       str = XGetAtomName (display->xdisplay,
                           event->xselectionrequest.selection);
-      meta_error_trap_pop (display, TRUE);
+      meta_error_trap_pop (display);
       
       meta_verbose ("Selection request with selection %s window 0x%lx not a WM_Sn selection we recognize\n",
                     str ? str : "(bad atom)", event->xselectionrequest.owner);
@@ -4861,11 +4911,11 @@ process_selection_request (MetaDisplay   *display,
                                   display->atom_ATOM_PAIR,
                                   &type, &format, &num, &rest, &data) != Success)
             {
-              meta_error_trap_pop_with_return (display, TRUE);
+              meta_error_trap_pop_with_return (display);
               return;
             }
           
-          if (meta_error_trap_pop_with_return (display, TRUE) == Success)
+          if (meta_error_trap_pop_with_return (display) == Success)
             {              
               /* FIXME: to be 100% correct, should deal with rest > 0,
                * but since we have 4 possible targets, we will hardly ever
@@ -4888,7 +4938,7 @@ process_selection_request (MetaDisplay   *display,
                                event->xselectionrequest.property,
                                display->atom_ATOM_PAIR,
                                32, PropModeReplace, data, num);
-              meta_error_trap_pop (display, FALSE);
+              meta_error_trap_pop (display);
               meta_XFree (data);
             }
         }
@@ -4944,7 +4994,7 @@ process_selection_clear (MetaDisplay   *display,
     meta_error_trap_push (display);
     str = XGetAtomName (display->xdisplay,
                         event->xselectionclear.selection);
-    meta_error_trap_pop (display, TRUE);
+    meta_error_trap_pop (display);
 
     meta_verbose ("Selection clear with selection %s window 0x%lx not a WM_Sn selection we recognize\n",
                   str ? str : "(bad atom)", event->xselectionclear.window);
@@ -5143,6 +5193,34 @@ prefs_changed_callback (MetaPreference pref,
       else
 	disable_compositor (display);
     }
+  else if (pref == META_PREF_ATTACH_MODAL_DIALOGS)
+    {
+      MetaDisplay *display = data;
+      GSList *windows;
+      GSList *tmp;
+
+      windows = meta_display_list_windows (display, META_LIST_DEFAULT);
+
+      for (tmp = windows; tmp != NULL; tmp = tmp->next)
+        {
+          MetaWindow *w = tmp->data;
+          MetaWindow *parent = meta_window_get_transient_for (w);
+          meta_window_recalc_features (w);
+
+          if (w->type == META_WINDOW_MODAL_DIALOG && parent && parent != w)
+            {
+              int x, y;
+              /* Forcing a call to move_resize() does two things: first, it handles
+               * resizing the dialog frame window to the correct size when we remove
+               * or add the decorations. Second, it will take care of positioning the
+               * dialog as "attached" to the parent when we turn the preference on
+               * via the constrain_modal_dialog() constraint.
+               **/
+              meta_window_get_position (w, &x, &y);
+              meta_window_move (w, FALSE, x, y);
+            }
+        }
+    }
 }
 
 void
@@ -5288,7 +5366,7 @@ meta_display_set_input_focus_window (MetaDisplay *display,
                   focus_frame ? window->frame->xwindow : window->xwindow,
                   RevertToPointerRoot,
                   timestamp);
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 
   display->expected_focus_window = window;
   display->last_focus_time = timestamp;
@@ -5343,18 +5421,32 @@ meta_display_get_compositor_version (MetaDisplay *display,
   *minor = display->composite_minor_version;
 }
 
+/**
+ * meta_display_get_xdisplay: (skip)
+ *
+ */
 Display *
 meta_display_get_xdisplay (MetaDisplay *display)
 {
   return display->xdisplay;
 }
 
+/**
+ * meta_display_get_compositor: (skip)
+ *
+ */
 MetaCompositor *
 meta_display_get_compositor (MetaDisplay *display)
 {
   return display->compositor;
 }
 
+/**
+ * meta_display_get_screens:
+ * @display: a #MetaDisplay
+ *
+ * Returns: (transfer none) (element-type Meta.Screen): Screens for this display
+ */
 GSList *
 meta_display_get_screens (MetaDisplay *display)
 {
@@ -5399,6 +5491,13 @@ meta_display_get_shape_event_base (MetaDisplay *display)
 }
 #endif
 
+/**
+ * meta_display_get_atom: (skip)
+ *
+ * Gets up an X atom that Mutter prefetched at startup.
+ *
+ * Return value: the X atom corresponding to the given atom enumeration
+ */
 Atom meta_display_get_atom (MetaDisplay *display, MetaAtom meta_atom)
 {
   Atom *atoms = & display->atom_WM_PROTOCOLS;

src/core/edge-resistance.c

@@ -23,7 +23,7 @@
 
 #include <config.h>
 #include "edge-resistance.h"
-#include "boxes.h"
+#include "boxes-private.h"
 #include "display-private.h"
 #include "workspace-private.h"
 

src/core/errors.c

@@ -29,221 +29,38 @@
 #include <stdlib.h>
 #include <gdk/gdk.h>
 
-static int x_error_handler    (Display     *display,
-                               XErrorEvent *error);
-static int x_io_error_handler (Display     *display);
-
-void
-meta_errors_init (void)
-{
-  XSetErrorHandler (x_error_handler);
-  XSetIOErrorHandler (x_io_error_handler);
-}
-
-static void
-meta_error_trap_push_internal (MetaDisplay *display,
-                               gboolean     need_sync)
-{
-  /* GDK resets the error handler on each push */
-  int (* old_error_handler) (Display     *,
-                             XErrorEvent *);
-
-  if (need_sync)
-    {
-      XSync (display->xdisplay, False);
-    }
-  
-  gdk_error_trap_push ();
-
-  /* old_error_handler will just be equal to x_error_handler
-   * for nested traps
-   */
-  old_error_handler = XSetErrorHandler (x_error_handler);
-  
-  /* Replace GDK handler, but save it so we can chain up */
-  if (display->error_trap_handler == NULL)
-    {
-      g_assert (display->error_traps == 0);
-      display->error_trap_handler = old_error_handler;
-      g_assert (display->error_trap_handler != x_error_handler);
-    }
-
-  display->error_traps += 1;
-
-  meta_topic (META_DEBUG_ERRORS, "%d traps remain\n", display->error_traps);
-}
-
-static int
-meta_error_trap_pop_internal  (MetaDisplay *display,
-                               gboolean     need_sync)
-{
-  int result;
-
-  g_assert (display->error_traps > 0);
-
-  if (need_sync)
-    {
-      XSync (display->xdisplay, False);
-    }
-
-  result = gdk_error_trap_pop ();
-
-  display->error_traps -= 1;
-  
-  if (display->error_traps == 0)
-    {
-      /* check that GDK put our handler back; this
-       * assumes that there are no pending GDK traps from GDK itself
-       */
-      
-      int (* restored_error_handler) (Display     *,
-                                      XErrorEvent *);
-
-      restored_error_handler = XSetErrorHandler (x_error_handler);
-
-      /* remove this */
-      display->error_trap_handler = NULL;
-    }
-
-  meta_topic (META_DEBUG_ERRORS, "%d traps\n", display->error_traps);
-  
-  return result;
-}
+/* In GTK+-3.0, the error trapping code was significantly rewritten. The new code
+ * has some neat features (like knowing automatically if a sync is needed or not
+ * and handling errors asynchronously when the error code isn't needed immediately),
+ * but it's basically incompatible with the hacks we played with GTK+-2.0 to
+ * use a custom error handler along with gdk_error_trap_push().
+ *
+ * Since the main point of our custom error trap was to get the error logged
+ * to the right place, with GTK+-3.0 we simply omit our own error handler and
+ * use the GTK+ handling straight-up.
+ * (See https://bugzilla.gnome.org/show_bug.cgi?id=630216 for restoring logging.)
+ */
 
 void
 meta_error_trap_push (MetaDisplay *display)
 {
-  meta_error_trap_push_internal (display, FALSE);
+  gdk_error_trap_push ();
 }
 
 void
-meta_error_trap_pop (MetaDisplay *display,
-                     gboolean     last_request_was_roundtrip)
+meta_error_trap_pop (MetaDisplay *display)
 {
-  gboolean need_sync;
-
-  /* we only have to sync when popping the outermost trap */
-  need_sync = (display->error_traps == 1 && !last_request_was_roundtrip);
-
-  if (need_sync)
-    meta_topic (META_DEBUG_SYNC, "Syncing on error_trap_pop, traps = %d, roundtrip = %d\n",
-                display->error_traps, last_request_was_roundtrip);
-
-  display->error_trap_synced_at_last_pop = need_sync || last_request_was_roundtrip;
-  
-  meta_error_trap_pop_internal (display, need_sync);
+  gdk_error_trap_pop_ignored ();
 }
 
 void
 meta_error_trap_push_with_return (MetaDisplay *display)
 {
-  gboolean need_sync;
-
-  /* We don't sync on push_with_return if there are no traps
-   * currently, because we assume that any errors were either covered
-   * by a previous pop, or were fatal.
-   *
-   * More generally, we don't sync if we were synchronized last time
-   * we popped. This is known to be the case if there are no traps,
-   * but we also keep a flag so we know whether it's the case otherwise.
-   */
-
-  if (!display->error_trap_synced_at_last_pop)
-    need_sync = TRUE;
-  else
-    need_sync = FALSE;
-
-  if (need_sync)
-    meta_topic (META_DEBUG_SYNC, "Syncing on error_trap_push_with_return, traps = %d\n",
-                display->error_traps);
-  
-  meta_error_trap_push_internal (display, FALSE);
+  gdk_error_trap_push ();
 }
 
 int
-meta_error_trap_pop_with_return  (MetaDisplay *display,
-                                  gboolean     last_request_was_roundtrip)
+meta_error_trap_pop_with_return  (MetaDisplay *display)
 {
-  if (!last_request_was_roundtrip)
-    meta_topic (META_DEBUG_SYNC, "Syncing on error_trap_pop_with_return, traps = %d, roundtrip = %d\n",
-                display->error_traps, last_request_was_roundtrip);
-
-  display->error_trap_synced_at_last_pop = TRUE;
-  
-  return meta_error_trap_pop_internal (display,
-                                       !last_request_was_roundtrip);
-}
-
-static int
-x_error_handler (Display     *xdisplay,
-                 XErrorEvent *error)
-{
-  int retval;
-  gchar buf[64];
-  MetaDisplay *display;
-
-  XGetErrorText (xdisplay, error->error_code, buf, 63);  
-
-  display = meta_display_for_x_display (xdisplay);
-
-  /* Display can be NULL here Xlib only has one global error handler; and
-   * there might be other displays open in the process.
-   */
-  if (display && display->error_traps > 0)
-    {
-      /* we're in an error trap, chain to the trap handler
-       * saved from GDK
-       */
-      meta_verbose ("X error: %s serial %ld error_code %d request_code %d minor_code %d)\n",
-                    buf,
-                    error->serial, 
-                    error->error_code, 
-                    error->request_code,
-                    error->minor_code);
-
-      g_assert (display->error_trap_handler != NULL);
-      g_assert (display->error_trap_handler != x_error_handler);
-      
-      retval = (* display->error_trap_handler) (xdisplay, error);
-    }
-  else
-    {
-      meta_bug ("Unexpected X error: %s serial %ld error_code %d request_code %d minor_code %d)\n",
-                buf,
-                error->serial, 
-                error->error_code, 
-                error->request_code,
-                error->minor_code);
-
-      retval = 1; /* compiler warning */
-    }
-
-  return retval;
-}
-
-static int
-x_io_error_handler (Display *xdisplay)
-{
-  MetaDisplay *display;
-
-  display = meta_display_for_x_display (xdisplay);
-
-  if (errno == EPIPE)
-    {
-      meta_warning (_("Lost connection to the display '%s';\n"
-                      "most likely the X server was shut down or you killed/destroyed\n"
-                      "the window manager.\n"),
-                    display ? display->name : DisplayString (xdisplay));
-    }
-  else
-    {
-      meta_warning (_("Fatal IO error %d (%s) on display '%s'.\n"),
-                    errno, g_strerror (errno),
-                    display ? display->name : DisplayString (xdisplay));
-    }
-
-  /* Xlib would force an exit anyhow */
-  exit (1);
-  
-  return 0;
+  return gdk_error_trap_pop ();
 }

src/core/frame.c

@@ -153,7 +153,7 @@ meta_window_ensure_frame (MetaWindow *window)
                    window->rect.x,
                    window->rect.y);
   /* FIXME handle this error */
-  meta_error_trap_pop (window->display, FALSE);
+  meta_error_trap_pop (window->display);
   
   /* stick frame to the window */
   window->frame = frame;
@@ -217,7 +217,7 @@ meta_window_destroy_frame (MetaWindow *window)
                     */
                    window->frame->rect.x,
                    window->frame->rect.y);
-  meta_error_trap_pop (window->display, FALSE);
+  meta_error_trap_pop (window->display);
 
   meta_ui_destroy_frame_window (window->screen->ui, frame->xwindow);
 
@@ -276,7 +276,7 @@ meta_frame_get_flags (MetaFrame *frame)
   if (META_WINDOW_ALLOWS_VERTICAL_RESIZE (frame->window))
     flags |= META_FRAME_ALLOWS_VERTICAL_RESIZE;
   
-  if (frame->window->has_focus)
+  if (meta_window_appears_focused (frame->window))
     flags |= META_FRAME_HAS_FOCUS;
 
   if (frame->window->shaded)

src/core/group.c

@@ -104,6 +104,10 @@ meta_group_unref (MetaGroup *group)
     }
 }
 
+/**
+ * meta_window_get_group: (skip)
+ *
+ */
 MetaGroup*
 meta_window_get_group (MetaWindow *window)
 {
@@ -198,6 +202,10 @@ meta_window_shutdown_group (MetaWindow *window)
   remove_window_from_group (window);
 }
 
+/**
+ * meta_display_lookup_group: (skip)
+ *
+ */
 MetaGroup*
 meta_display_lookup_group (MetaDisplay *display,
                            Window       group_leader)
@@ -213,6 +221,12 @@ meta_display_lookup_group (MetaDisplay *display,
   return group;
 }
 
+/**
+ * meta_group_list_windows:
+ * @group: A #MetaGroup
+ *
+ * Returns: (transfer container) (element-type Meta.Window): List of windows
+ */
 GSList*
 meta_group_list_windows (MetaGroup *group)
 {
@@ -263,6 +277,10 @@ meta_group_get_startup_id (MetaGroup *group)
   return group->startup_id;
 }
 
+/**
+ * meta_group_property_notify: (skip)
+ *
+ */
 gboolean
 meta_group_property_notify (MetaGroup  *group,
                             XEvent     *event)

src/core/iconcache.c

@@ -241,7 +241,7 @@ read_rgb_icon (MetaDisplay   *display,
 			       0, G_MAXLONG,
 			       False, XA_CARDINAL, &type, &format, &nitems,
 			       &bytes_after, &data);
-  err = meta_error_trap_pop_with_return (display, TRUE);
+  err = meta_error_trap_pop_with_return (display);
 
   if (err != Success ||
       result != Success)
@@ -394,21 +394,19 @@ try_pixmap_and_mask (MetaDisplay *display,
 
   get_pixmap_geometry (display, src_pixmap, &w, &h, NULL);
 
-  unscaled = meta_gdk_pixbuf_get_from_pixmap (NULL,
-                                              src_pixmap,
-                                              0, 0, 0, 0,
+  unscaled = meta_gdk_pixbuf_get_from_pixmap (src_pixmap,
+                                              0, 0,
                                               w, h);
 
   if (unscaled && src_mask != None)
     {
       get_pixmap_geometry (display, src_mask, &w, &h, NULL);
-      mask = meta_gdk_pixbuf_get_from_pixmap (NULL,
-                                              src_mask,
-                                              0, 0, 0, 0,
+      mask = meta_gdk_pixbuf_get_from_pixmap (src_mask,
+                                              0, 0,
                                               w, h);
     }
 
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 
   if (mask)
     {
@@ -484,7 +482,7 @@ get_kwm_win_icon (MetaDisplay *display,
 			       &bytes_after, &data);
   icons = (Pixmap *)data;
 
-  err = meta_error_trap_pop_with_return (display, TRUE);
+  err = meta_error_trap_pop_with_return (display);
   if (err != Success ||
       result != Success)
     return;

src/core/keybindings.c

@@ -470,7 +470,7 @@ regrab_key_bindings (MetaDisplay *display)
       
       tmp = tmp->next;
     }
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 
   g_slist_free (windows);
 }
@@ -502,21 +502,21 @@ display_get_keybinding (MetaDisplay  *display,
 /**
  * meta_display_get_keybinding_action:
  * @display: A #MetaDisplay
- * @keysym: Key symbol
  * @keycode: Raw keycode
  * @mask: Event mask
  *
- * Returns: The action that should be taken for the given key, or %META_KEYBINDING_ACTION_NONE.
- *
+ * Returns: The action that should be taken for the given key, or
+ * %META_KEYBINDING_ACTION_NONE.
  */
 MetaKeyBindingAction
 meta_display_get_keybinding_action (MetaDisplay  *display,
-                                    unsigned int  keysym,
                                     unsigned int  keycode,
                                     unsigned long mask)
 {
   MetaKeyBinding *binding;
+  KeySym keysym;
 
+  keysym = XKeycodeToKeysym (display->xdisplay, keycode, 0);
   mask = mask & 0xff & ~display->ignored_modifier_mask;
   binding = display_get_keybinding (display, keysym, keycode, mask);
 
@@ -700,7 +700,7 @@ meta_change_keygrab (MetaDisplay *display,
         {
           int result;
           
-          result = meta_error_trap_pop_with_return (display, FALSE);
+          result = meta_error_trap_pop_with_return (display);
           
           if (grab && result != Success)
             {      
@@ -716,7 +716,7 @@ meta_change_keygrab (MetaDisplay *display,
       ++ignored_mask;
     }
 
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 }
 
 static void
@@ -758,7 +758,7 @@ grab_keys (MetaKeyBinding *bindings,
       ++i;
     }
 
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 }
 
 static void
@@ -777,14 +777,14 @@ ungrab_all_keys (MetaDisplay *display,
     {
       int result;
       
-      result = meta_error_trap_pop_with_return (display, FALSE);
+      result = meta_error_trap_pop_with_return (display);
       
       if (result != Success)    
         meta_topic (META_DEBUG_KEYBINDINGS,
                     "Ungrabbing all keys on 0x%lx failed\n", xwindow);
     }
   else
-    meta_error_trap_pop (display, FALSE);
+    meta_error_trap_pop (display);
 }
 
 void
@@ -916,7 +916,7 @@ grab_keyboard (MetaDisplay *display,
   
   if (grab_status != GrabSuccess)
     {
-      meta_error_trap_pop_with_return (display, TRUE);
+      meta_error_trap_pop_with_return (display);
       meta_topic (META_DEBUG_KEYBINDINGS,
                   "XGrabKeyboard() returned failure status %s time %u\n",
                   grab_status_to_string (grab_status),
@@ -925,7 +925,7 @@ grab_keyboard (MetaDisplay *display,
     }
   else
     {
-      result = meta_error_trap_pop_with_return (display, TRUE);
+      result = meta_error_trap_pop_with_return (display);
       if (result != Success)
         {
           meta_topic (META_DEBUG_KEYBINDINGS,
@@ -948,7 +948,7 @@ ungrab_keyboard (MetaDisplay *display, guint32 timestamp)
               "Ungrabbing keyboard with timestamp %u\n",
               timestamp);
   XUngrabKeyboard (display->xdisplay, timestamp);
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 }
 
 gboolean
@@ -1373,8 +1373,7 @@ meta_display_process_key_event (MetaDisplay *display,
     return FALSE; /* event window is destroyed */
   
   /* ignore key events on popup menus and such. */
-  if (window == NULL &&
-      meta_ui_window_is_widget (screen->ui, event->xany.window))
+  if (meta_ui_window_is_widget (screen->ui, event->xany.window))
     return FALSE;
   
   /* window may be NULL */
@@ -2109,6 +2108,16 @@ process_tab_grab (MetaDisplay *display,
               return TRUE;
             }
           break;
+        case META_KEYBINDING_ACTION_NONE:
+          {
+            /*
+             * If this is simply user pressing the Shift key, we do not want
+             * to cancel the grab.
+             */
+            if (is_modifier (display, event->xkey.keycode))
+              return TRUE;
+          }
+
         default:
           break;
         }
@@ -2768,7 +2777,6 @@ process_workspace_switch_grab (MetaDisplay *display,
       MetaKeyBindingAction action;
 
       action = meta_display_get_keybinding_action (display,
-                                                   keysym,
                                                    event->xkey.keycode,
                                                    display->grab_mask);
 
@@ -2890,7 +2898,7 @@ handle_panel (MetaDisplay    *display,
 	      StructureNotifyMask,
 	      (XEvent*) &ev);
 
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 }
 
 static void
@@ -3537,6 +3545,10 @@ meta_keybindings_set_custom_handler (const gchar        *name,
   return TRUE;
 }
 
+/**
+ * meta_keybindings_switch_window: (skip)
+ *
+ */
 void
 meta_keybindings_switch_window (MetaDisplay    *display,
                                 MetaScreen     *screen,

src/core/main.c

@@ -75,7 +75,7 @@
 
 #ifdef HAVE_INTROSPECTION
 #include <girepository.h>
-#include "compositor/mutter-plugin-manager.h"
+#include "compositor/meta-plugin-manager.h"
 #endif
 
 /**
@@ -401,7 +401,7 @@ static GSourceFuncs event_funcs = {
 static void
 meta_clutter_init (GOptionContext *ctx, int *argc, char ***argv)
 {
-  clutter_x11_set_display (gdk_display);
+  clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
   clutter_x11_disable_event_retrieval ();
   
   if (CLUTTER_INIT_SUCCESS == clutter_init (argc, argv))
@@ -586,8 +586,8 @@ main (int argc, char **argv)
            * is initialized at this point, and we don't plan to run any real
            * plugin code.
            */
-          MutterPluginManager *mgr = mutter_plugin_manager_get_default ();
-          if (!mutter_plugin_manager_load (mgr))
+          MetaPluginManager *mgr = meta_plugin_manager_get_default ();
+          if (!meta_plugin_manager_load (mgr))
             g_critical ("failed to load plugins");
         }
       if (!g_irepository_dump (meta_args.introspect, &error))
@@ -623,9 +623,6 @@ main (int argc, char **argv)
 
   g_option_context_free (ctx);
 
-  /* must be after UI init so we can override GDK handlers */
-  meta_errors_init ();
-
   /* Load prefs */
   meta_prefs_init ();
   meta_prefs_add_listener (prefs_changed_callback, NULL);

src/core/place.c

@@ -26,6 +26,7 @@
 
 #include <config.h>
 
+#include "boxes-private.h"
 #include "place.h"
 #include "workspace.h"
 #include "prefs.h"

src/core/prefs.c

@@ -27,7 +27,7 @@
 #include "prefs.h"
 #include "ui.h"
 #include "util.h"
-#include "compositor/mutter-plugin-manager.h"
+#include "compositor/meta-plugin-manager.h"
 #ifdef HAVE_GCONF
 #include <gconf/gconf-client.h>
 #endif
@@ -86,6 +86,7 @@ static MetaVirtualModifier mouse_button_mods = Mod1Mask;
 static MetaFocusMode focus_mode = META_FOCUS_MODE_CLICK;
 static MetaFocusNewWindows focus_new_windows = META_FOCUS_NEW_WINDOWS_SMART;
 static gboolean raise_on_click = TRUE;
+static gboolean attach_modal_dialogs = FALSE;
 static char* current_theme = NULL;
 static int num_workspaces = 4;
 static MetaActionTitlebar action_double_click_titlebar = META_ACTION_TITLEBAR_TOGGLE_MAXIMIZE;
@@ -103,6 +104,7 @@ static char *cursor_theme = NULL;
 static int   cursor_size = 24;
 static gboolean compositing_manager = FALSE;
 static gboolean resize_with_right_button = FALSE;
+static gboolean side_by_side_tiling = FALSE;
 static gboolean force_fullscreen = TRUE;
 
 static MetaVisualBellType visual_bell_type = META_VISUAL_BELL_FULLSCREEN_FLASH;
@@ -361,6 +363,11 @@ static MetaEnumPreference preferences_enum[] =
 
 static MetaBoolPreference preferences_bool[] =
   {
+    { "/apps/mutter/general/attach_modal_dialogs",
+      META_PREF_ATTACH_MODAL_DIALOGS,
+      &attach_modal_dialogs,
+      TRUE,
+    },
     { "/apps/metacity/general/raise_on_click",
       META_PREF_RAISE_ON_CLICK,
       &raise_on_click,
@@ -416,6 +423,11 @@ static MetaBoolPreference preferences_bool[] =
       &resize_with_right_button,
       FALSE,
     },
+    { "/apps/metacity/general/side_by_side_tiling",
+      META_PREF_SIDE_BY_SIDE_TILING,
+      &side_by_side_tiling,
+      FALSE,
+    },
     { "/apps/mutter/general/live_hidden_windows",
       META_PREF_LIVE_HIDDEN_WINDOWS,
       &live_hidden_windows,
@@ -886,6 +898,10 @@ handle_preference_update_int (const gchar *key, GConfValue *value)
 /* Listeners.                                                               */
 /****************************************************************************/
 
+/**
+ * meta_prefs_add_listener: (skip)
+ *
+ */
 void
 meta_prefs_add_listener (MetaPrefsChangedFunc func,
                          gpointer             data)
@@ -899,6 +915,10 @@ meta_prefs_add_listener (MetaPrefsChangedFunc func,
   listeners = g_list_prepend (listeners, l);
 }
 
+/**
+ * meta_prefs_remove_listener: (skip)
+ *
+ */
 void
 meta_prefs_remove_listener (MetaPrefsChangedFunc func,
                             gpointer             data)
@@ -1038,7 +1058,7 @@ meta_prefs_init (void)
 #ifdef HAVE_GCONF
   GError *err = NULL;
   gchar **gconf_dir_cursor;
-  MutterPluginManager *plugin_manager;
+  MetaPluginManager *plugin_manager;
   
   if (default_client != NULL)
     return;
@@ -1067,8 +1087,8 @@ meta_prefs_init (void)
 
   /* We now initialize plugins so that they can override any preference locations */
 
-  plugin_manager = mutter_plugin_manager_get_default ();
-  mutter_plugin_manager_load (plugin_manager);
+  plugin_manager = meta_plugin_manager_get_default ();
+  meta_plugin_manager_load (plugin_manager);
 
   /* Pick up initial values. */
 
@@ -1485,6 +1505,12 @@ meta_prefs_get_focus_new_windows (void)
   return focus_new_windows;
 }
 
+gboolean
+meta_prefs_get_attach_modal_dialogs (void)
+{
+  return attach_modal_dialogs;
+}
+
 gboolean
 meta_prefs_get_raise_on_click (void)
 {
@@ -1906,6 +1932,9 @@ meta_preference_to_string (MetaPreference pref)
     case META_PREF_FOCUS_NEW_WINDOWS:
       return "FOCUS_NEW_WINDOWS";
 
+    case META_PREF_ATTACH_MODAL_DIALOGS:
+      return "ATTACH_MODAL_DIALOGS";
+
     case META_PREF_RAISE_ON_CLICK:
       return "RAISE_ON_CLICK";
       
@@ -1981,6 +2010,9 @@ meta_preference_to_string (MetaPreference pref)
     case META_PREF_RESIZE_WITH_RIGHT_BUTTON:
       return "RESIZE_WITH_RIGHT_BUTTON";
 
+    case META_PREF_SIDE_BY_SIDE_TILING:
+      return "SIDE_BY_SIDE_TILING";
+
     case META_PREF_FORCE_FULLSCREEN:
       return "FORCE_FULLSCREEN";
 
@@ -2086,6 +2118,8 @@ init_bindings (void)
   GConfValue *value;
   GHashTable *to_update;
 
+  g_assert (G_N_ELEMENTS (key_bindings) == META_KEYBINDING_ACTION_LAST + 1);
+
   to_update = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
 
   for (i = 0; prefix[i]; i++)
@@ -2891,6 +2925,12 @@ meta_prefs_get_gnome_animations ()
   return gnome_animations;
 }
 
+gboolean
+meta_prefs_get_side_by_side_tiling ()
+{
+  return side_by_side_tiling;
+}
+
 MetaKeyBindingAction
 meta_prefs_get_keybinding_action (const char *name)
 {
@@ -2998,6 +3038,11 @@ meta_prefs_set_compositing_manager (gboolean whether)
 #endif
 }
 
+/**
+ * meta_prefs_get_clutter_plugins:
+ *
+ * Returns: (transfer none) (element-type utf8): Plugin names to load
+ */
 GSList *
 meta_prefs_get_clutter_plugins (void)
 {

src/core/screen-private.h

@@ -82,6 +82,9 @@ struct _MetaScreen
   MetaRectangle rect;  /* Size of screen; rect.x & rect.y are always 0 */
   MetaUI *ui;
   MetaTabPopup *tab_popup, *ws_popup;
+  MetaTilePreview *tile_preview;
+
+  guint tile_preview_timeout_id;
 
   MetaWorkspace *active_workspace;
 
@@ -179,6 +182,9 @@ void          meta_screen_workspace_popup_select       (MetaScreen    *screen,
 MetaWorkspace*meta_screen_workspace_popup_get_selected (MetaScreen    *screen);
 void          meta_screen_workspace_popup_destroy      (MetaScreen    *screen);
 
+void          meta_screen_tile_preview_update          (MetaScreen    *screen,
+                                                        gboolean       delay);
+
 MetaWindow*   meta_screen_get_mouse_window     (MetaScreen                 *screen,
                                                 MetaWindow                 *not_this_one);
 

src/core/screen.c

@@ -601,7 +601,7 @@ meta_screen_new (MetaDisplay *display,
       attrs.event_mask = StructureNotifyMask;
       XChangeWindowAttributes (xdisplay,
                                current_wm_sn_owner, CWEventMask, &attrs);
-      if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+      if (meta_error_trap_pop_with_return (display) != Success)
         current_wm_sn_owner = None; /* don't wait for it to die later on */
     }
 
@@ -670,7 +670,7 @@ meta_screen_new (MetaDisplay *display,
                 KeyPressMask | KeyReleaseMask |
                 FocusChangeMask | StructureNotifyMask |
                 ExposureMask | attr.your_event_mask);
-  if (meta_error_trap_pop_with_return (display, FALSE) != Success)
+  if (meta_error_trap_pop_with_return (display) != Success)
     {
       meta_warning (_("Screen %d on display \"%s\" already has a window manager\n"),
                     number, display->name);
@@ -770,6 +770,9 @@ meta_screen_new (MetaDisplay *display,
 
   screen->tab_popup = NULL;
   screen->ws_popup = NULL;
+  screen->tile_preview = NULL;
+
+  screen->tile_preview_timeout_id = 0;
 
   screen->stack = meta_stack_new (screen);
   screen->stack_tracker = meta_stack_tracker_new (screen);
@@ -853,7 +856,7 @@ meta_screen_free (MetaScreen *screen,
 
   meta_error_trap_push_with_return (screen->display);
   XSelectInput (screen->display->xdisplay, screen->xroot, 0);
-  if (meta_error_trap_pop_with_return (screen->display, FALSE) != Success)
+  if (meta_error_trap_pop_with_return (screen->display) != Success)
     meta_warning (_("Could not release screen %d on display \"%s\"\n"),
                   screen->number, screen->display->name);
 
@@ -867,6 +870,12 @@ meta_screen_free (MetaScreen *screen,
 
   if (screen->monitor_infos)
     g_free (screen->monitor_infos);
+
+  if (screen->tile_preview_timeout_id)
+    g_source_remove (screen->tile_preview_timeout_id);
+
+  if (screen->tile_preview)
+    meta_tile_preview_free (screen->tile_preview);
   
   g_free (screen->screen_name);
 
@@ -904,7 +913,7 @@ list_windows (MetaScreen *screen)
       XGetWindowAttributes (screen->display->xdisplay,
                             children[i], &info->attrs);
 
-      if (meta_error_trap_pop_with_return (screen->display, TRUE))
+      if (meta_error_trap_pop_with_return (screen->display))
 	{
           meta_verbose ("Failed to get attributes for window 0x%lx\n",
                         children[i]);
@@ -1211,7 +1220,7 @@ set_number_of_spaces_hint (MetaScreen *screen,
                    screen->display->atom__NET_NUMBER_OF_DESKTOPS,
                    XA_CARDINAL,
                    32, PropModeReplace, (guchar*) data, 1);
-  meta_error_trap_pop (screen->display, FALSE);
+  meta_error_trap_pop (screen->display);
 }
 
 static void
@@ -1232,7 +1241,7 @@ set_desktop_geometry_hint (MetaScreen *screen)
                    screen->display->atom__NET_DESKTOP_GEOMETRY,
                    XA_CARDINAL,
                    32, PropModeReplace, (guchar*) data, 2);
-  meta_error_trap_pop (screen->display, FALSE);
+  meta_error_trap_pop (screen->display);
 }
 
 static void
@@ -1256,7 +1265,7 @@ set_desktop_viewport_hint (MetaScreen *screen)
                    screen->display->atom__NET_DESKTOP_VIEWPORT,
                    XA_CARDINAL,
                    32, PropModeReplace, (guchar*) data, 2);
-  meta_error_trap_pop (screen->display, FALSE);
+  meta_error_trap_pop (screen->display);
 }
 
 void
@@ -1743,6 +1752,69 @@ meta_screen_workspace_popup_destroy (MetaScreen *screen)
     }
 }
 
+static gboolean
+meta_screen_tile_preview_update_timeout (gpointer data)
+{
+  MetaScreen *screen = data;
+  MetaWindow *window = screen->display->grab_window;
+  gboolean composited = screen->display->compositor != NULL;
+
+  screen->tile_preview_timeout_id = 0;
+
+  if (!screen->tile_preview)
+    {
+      Window xwindow;
+      gulong create_serial;
+
+      screen->tile_preview = meta_tile_preview_new (screen->number,
+                                                    composited);
+      xwindow = meta_tile_preview_get_xwindow (screen->tile_preview,
+                                               &create_serial);
+      meta_stack_tracker_record_add (screen->stack_tracker,
+                                     xwindow,
+                                     create_serial);
+    }
+
+  if (window
+      && !META_WINDOW_TILED (window)
+      && window->tile_mode != META_TILE_NONE)
+    {
+      MetaRectangle tile_rect;
+
+      meta_window_get_current_tile_area (window, &tile_rect);
+      meta_tile_preview_show (screen->tile_preview, &tile_rect);
+    }
+  else
+    meta_tile_preview_hide (screen->tile_preview);
+
+  return FALSE;
+}
+
+#define TILE_PREVIEW_TIMEOUT_MS 200
+
+void
+meta_screen_tile_preview_update (MetaScreen *screen,
+                                 gboolean    delay)
+{
+  if (delay)
+    {
+      if (screen->tile_preview_timeout_id > 0)
+        return;
+
+      screen->tile_preview_timeout_id =
+        g_timeout_add (TILE_PREVIEW_TIMEOUT_MS,
+                       meta_screen_tile_preview_update_timeout,
+                       screen);
+    }
+  else
+    {
+      if (screen->tile_preview_timeout_id > 0)
+        g_source_remove (screen->tile_preview_timeout_id);
+
+      meta_screen_tile_preview_update_timeout ((gpointer)screen);
+    }
+}
+
 MetaWindow*
 meta_screen_get_mouse_window (MetaScreen  *screen,
                               MetaWindow  *not_this_one)
@@ -1767,7 +1839,7 @@ meta_screen_get_mouse_window (MetaScreen  *screen,
                  &win_x_return,
                  &win_y_return,
                  &mask_return);
-  meta_error_trap_pop (screen->display, TRUE);
+  meta_error_trap_pop (screen->display);
 
   window = meta_stack_get_default_focus_window_at_point (screen->stack,
                                                          screen->active_workspace,
@@ -2170,7 +2242,7 @@ set_workspace_names (MetaScreen *screen)
 		   screen->display->atom_UTF8_STRING,
                    8, PropModeReplace,
 		   (unsigned char *)flattened->str, flattened->len);
-  meta_error_trap_pop (screen->display, FALSE);
+  meta_error_trap_pop (screen->display);
   
   g_string_free (flattened, TRUE);
 }
@@ -2274,7 +2346,7 @@ set_work_area_hint (MetaScreen *screen)
 		   XA_CARDINAL, 32, PropModeReplace,
 		   (guchar*) data, num_workspaces*4);
   g_free (data);
-  meta_error_trap_pop (screen->display, FALSE);
+  meta_error_trap_pop (screen->display);
 
   g_signal_emit (screen, screen_signals[WORKAREAS_CHANGED], 0);
 }
@@ -2649,7 +2721,7 @@ meta_screen_update_showing_desktop_hint (MetaScreen *screen)
                    screen->display->atom__NET_SHOWING_DESKTOP,
                    XA_CARDINAL,
                    32, PropModeReplace, (guchar*) data, 1);
-  meta_error_trap_pop (screen->display, FALSE);
+  meta_error_trap_pop (screen->display);
 }
 
 static void
@@ -3122,6 +3194,10 @@ meta_screen_get_display (MetaScreen *screen)
   return screen->display;
 }
 
+/**
+ * meta_screen_get_xroot: (skip)
+ *
+ */
 Window
 meta_screen_get_xroot (MetaScreen *screen)
 {
@@ -3137,6 +3213,10 @@ meta_screen_get_size (MetaScreen *screen,
   *height = screen->rect.height;
 }
 
+/**
+ * meta_screen_get_compositor_data: (skip)
+ *
+ */
 gpointer
 meta_screen_get_compositor_data (MetaScreen *screen)
 {
@@ -3178,6 +3258,12 @@ meta_screen_unset_cm_selection (MetaScreen *screen)
                       None, screen->wm_cm_timestamp);
 }
 
+/**
+ * meta_screen_get_workspaces: (skip)
+ * @screen: a #MetaScreen
+ *
+ * Returns: (transfer none) (element-type Meta.Workspace): The workspaces for @screen
+ */
 GList *
 meta_screen_get_workspaces (MetaScreen *screen)
 {

src/core/stack-tracker.c

@@ -23,6 +23,7 @@
 
 #include <string.h>
 
+#include "frame-private.h"
 #include "screen-private.h"
 #include "stack-tracker.h"
 #include "util.h"
@@ -682,7 +683,15 @@ meta_stack_tracker_sync_stack (MetaStackTracker *tracker)
 
       meta_window = meta_display_lookup_x_window (tracker->screen->display,
                                                   windows[i]);
-      if (meta_window)
+      /* When mapping back from xwindow to MetaWindow we have to be a bit careful;
+       * children of the root could include unmapped windows created by toolkits
+       * for internal purposes, including ones that we have registered in our
+       * XID => window table. (Wine uses a toplevel for _NET_WM_USER_TIME_WINDOW;
+       * see window-prop.c:reload_net_wm_user_time_window() for registration.)
+       */
+      if (meta_window &&
+          (windows[i] == meta_window->xwindow ||
+           (meta_window->frame && windows[i] == meta_window->frame->xwindow)))
         meta_windows = g_list_prepend (meta_windows, meta_window);
     }
 

src/core/stack.c

@@ -1026,7 +1026,7 @@ raise_window_relative_to_managed_windows (MetaScreen *screen,
                                 xwindow,
                                 CWSibling | CWStackMode,
                                 &changes);
-              meta_error_trap_pop (screen->display, FALSE);
+              meta_error_trap_pop (screen->display);
 
               break;
             }
@@ -1046,7 +1046,7 @@ raise_window_relative_to_managed_windows (MetaScreen *screen,
                                        XNextRequest (screen->display->xdisplay));
       XLowerWindow (screen->display->xdisplay,
                     xwindow);
-      meta_error_trap_pop (screen->display, FALSE);
+      meta_error_trap_pop (screen->display);
     }
 }
 
@@ -1267,7 +1267,7 @@ stack_sync_to_server (MetaStack *stack)
 		   all_hidden->len);
   g_array_free (all_hidden, TRUE);
 
-  meta_error_trap_pop (stack->screen->display, FALSE);
+  meta_error_trap_pop (stack->screen->display);
   /* on error, a window was destroyed; it should eventually
    * get removed from the stacking list when we unmanage it
    * and we'll fix stacking at that time.

src/core/testboxes.c

@@ -21,7 +21,7 @@
  * 02111-1307, USA.
  */
 
-#include "boxes.h"
+#include "boxes-private.h"
 #include <glib.h>
 #include <stdlib.h>
 #include <stdio.h>

src/core/util.c

@@ -40,6 +40,13 @@
 #include <X11/Xlib.h>   /* must explicitly be included for Solaris; #326746 */
 #include <X11/Xutil.h>  /* Just for the definition of the various gravities */
 
+#ifdef WITH_VERBOSE_MODE
+static void
+meta_topic_real_valist (MetaDebugTopic topic,
+                        const char    *format,
+                        va_list        args);
+#endif
+
 #ifdef HAVE_BACKTRACE
 #include <execinfo.h>
 void
@@ -71,7 +78,7 @@ meta_print_backtrace (void)
 }
 #endif
 
-static gboolean is_verbose = FALSE;
+static gint verbose_topics = 0;
 static gboolean is_debugging = FALSE;
 static gboolean replace_current = FALSE;
 static int no_prefix = 0;
@@ -128,7 +135,7 @@ ensure_logfile (void)
 gboolean
 meta_is_verbose (void)
 {
-  return is_verbose;
+  return verbose_topics != 0;
 }
 
 void
@@ -141,8 +148,48 @@ meta_set_verbose (gboolean setting)
   if (setting)
     ensure_logfile ();
 #endif
-  
-  is_verbose = setting;
+
+  if (setting)
+    meta_add_verbose_topic (META_DEBUG_VERBOSE);
+  else
+    meta_remove_verbose_topic (META_DEBUG_VERBOSE);
+}
+
+/**
+ * meta_add_verbose_topic:
+ * @topic: Topic for which logging will be started
+ *
+ * Ensure log messages for the given topic @topic
+ * will be printed.
+ */
+void
+meta_add_verbose_topic (MetaDebugTopic topic)
+{
+  if (verbose_topics == META_DEBUG_VERBOSE)
+    return;
+  if (topic == META_DEBUG_VERBOSE)
+    verbose_topics = META_DEBUG_VERBOSE;
+  else
+    verbose_topics |= topic;
+}
+
+/**
+ * meta_remove_verbose_topic:
+ * @topic: Topic for which logging will be stopped
+ *
+ * Stop printing log messages for the given topic @topic.  Note
+ * that this method does not stack with meta_add_verbose_topic();
+ * i.e. if two calls to meta_add_verbose_topic() for the same
+ * topic are made, one call to meta_remove_verbose_topic() will
+ * remove it.
+ */
+void
+meta_remove_verbose_topic (MetaDebugTopic topic)
+{
+  if (topic == META_DEBUG_VERBOSE)
+    verbose_topics = 0;
+  else
+    verbose_topics &= ~topic;
 }
 
 gboolean
@@ -250,27 +297,10 @@ void
 meta_verbose_real (const char *format, ...)
 {
   va_list args;
-  gchar *str;
-  FILE *out;
 
-  g_return_if_fail (format != NULL);
-
-  if (!is_verbose)
-    return;
-  
   va_start (args, format);
-  str = g_strdup_vprintf (format, args);
+  meta_topic_real_valist (META_DEBUG_VERBOSE, format, args);
   va_end (args);
-
-  out = logfile ? logfile : stderr;
-  
-  if (no_prefix == 0)
-    utf8_fputs ("Window manager: ", out);
-  utf8_fputs (str, out);
-
-  fflush (out);
-  
-  g_free (str);
 }
 #endif /* WITH_VERBOSE_MODE */
 
@@ -324,6 +354,8 @@ topic_name (MetaDebugTopic topic)
       return "COMPOSITOR";
     case META_DEBUG_EDGE_RESISTANCE:
       return "EDGE_RESISTANCE";
+    case META_DEBUG_VERBOSE:
+      return "VERBOSE";
     }
 
   return "WM";
@@ -331,23 +363,22 @@ topic_name (MetaDebugTopic topic)
 
 static int sync_count = 0;
 
-void
-meta_topic_real (MetaDebugTopic topic,
-                 const char *format,
-                 ...)
+static void
+meta_topic_real_valist (MetaDebugTopic topic,
+                        const char    *format,
+                        va_list        args)
 {
-  va_list args;
   gchar *str;
   FILE *out;
 
   g_return_if_fail (format != NULL);
 
-  if (!is_verbose)
+  if (verbose_topics == 0
+      || (topic == META_DEBUG_VERBOSE && verbose_topics != META_DEBUG_VERBOSE)
+      || (!(verbose_topics & topic)))
     return;
-  
-  va_start (args, format);  
+
   str = g_strdup_vprintf (format, args);
-  va_end (args);
 
   out = logfile ? logfile : stderr;
 
@@ -366,6 +397,18 @@ meta_topic_real (MetaDebugTopic topic,
   
   g_free (str);
 }
+
+void
+meta_topic_real (MetaDebugTopic topic,
+                 const char *format,
+                 ...)
+{
+  va_list args;
+
+  va_start (args, format);
+  meta_topic_real_valist (topic, format, args);
+  va_end (args);
+}
 #endif /* WITH_VERBOSE_MODE */
 
 void

src/core/window-private.h

@@ -61,6 +61,12 @@ typedef enum {
 
 #define NUMBER_OF_QUEUES 3
 
+typedef enum {
+  META_TILE_NONE,
+  META_TILE_LEFT,
+  META_TILE_RIGHT
+} MetaTileMode;
+
 struct _MetaWindow
 {
   GObject parent_instance;
@@ -122,6 +128,11 @@ struct _MetaWindow
   guint maximize_vertically_after_placement : 1;
   guint minimize_after_placement : 1;
 
+  /* The current or requested tile mode. If maximized_vertically is true,
+   * this is the current mode. If not, it is the mode which will be
+   * requested after the window grab is released */
+  guint tile_mode : 2;
+
   /* Whether we're shaded */
   guint shaded : 1;
 
@@ -398,8 +409,11 @@ struct _MetaWindowClass
                                         (w)->maximized_vertically)
 #define META_WINDOW_MAXIMIZED_VERTICALLY(w)    ((w)->maximized_vertically)
 #define META_WINDOW_MAXIMIZED_HORIZONTALLY(w)  ((w)->maximized_horizontally)
+#define META_WINDOW_TILED(w)           ((w)->maximized_vertically && \
+                                        !(w)->maximized_horizontally && \
+                                        (w)->tile_mode != META_TILE_NONE)
 #define META_WINDOW_ALLOWS_MOVE(w)     ((w)->has_move_func && !(w)->fullscreen)
-#define META_WINDOW_ALLOWS_RESIZE_EXCEPT_HINTS(w)   ((w)->has_resize_func && !META_WINDOW_MAXIMIZED (w) && !(w)->fullscreen && !(w)->shaded)
+#define META_WINDOW_ALLOWS_RESIZE_EXCEPT_HINTS(w)   ((w)->has_resize_func && !META_WINDOW_MAXIMIZED (w) && !META_WINDOW_TILED(w) && !(w)->fullscreen && !(w)->shaded)
 #define META_WINDOW_ALLOWS_RESIZE(w)   (META_WINDOW_ALLOWS_RESIZE_EXCEPT_HINTS (w) &&                \
                                         (((w)->size_hints.min_width < (w)->size_hints.max_width) ||  \
                                          ((w)->size_hints.min_height < (w)->size_hints.max_height)))
@@ -422,6 +436,11 @@ void        meta_window_queue              (MetaWindow  *window,
 void        meta_window_maximize_internal  (MetaWindow        *window,
                                             MetaMaximizeFlags  directions,
                                             MetaRectangle     *saved_rect);
+void        meta_window_unmaximize_with_gravity (MetaWindow        *window,
+                                                 MetaMaximizeFlags  directions,
+                                                 int                new_width,
+                                                 int                new_height,
+                                                 int                gravity);
 void        meta_window_make_above         (MetaWindow  *window);
 void        meta_window_unmake_above       (MetaWindow  *window);
 void        meta_window_shade              (MetaWindow  *window,
@@ -561,6 +580,9 @@ void meta_window_get_work_area_for_monitor     (MetaWindow    *window,
 void meta_window_get_work_area_all_monitors    (MetaWindow    *window,
                                                 MetaRectangle *area);
 
+void meta_window_get_current_tile_area         (MetaWindow    *window,
+                                                MetaRectangle *tile_area);
+
 
 gboolean meta_window_same_application (MetaWindow *window,
                                        MetaWindow *other_window);

src/core/window-props.c

@@ -442,7 +442,7 @@ set_title_text (MetaWindow  *window,
       XDeleteProperty (window->display->xdisplay,
                        window->xwindow,
                        atom);
-      meta_error_trap_pop (window->display, FALSE);
+      meta_error_trap_pop (window->display);
     }
 
   return modified;

src/core/workspace.c

@@ -26,6 +26,7 @@
 #include <config.h>
 #include "workspace.h"
 #include "workspace-private.h"
+#include "boxes-private.h"
 #include "errors.h"
 #include "prefs.h"
 
@@ -706,7 +707,7 @@ meta_workspace_update_window_hints (MetaWorkspace *workspace)
 
 /**
  * meta_workspace_list_windows:
- * @display: a #MetaDisplay
+ * @workspace: a #MetaWorkspace
  *
  * Gets windows contained on the workspace, including workspace->windows
  * and also sticky windows. Override-redirect windows are not included.
@@ -764,7 +765,7 @@ set_active_space_hint (MetaScreen *screen)
                    screen->display->atom__NET_CURRENT_DESKTOP,
                    XA_CARDINAL,
                    32, PropModeReplace, (guchar*) data, 1);
-  meta_error_trap_pop (screen->display, FALSE);
+  meta_error_trap_pop (screen->display);
 }
 
 void
@@ -1048,7 +1049,7 @@ strut_lists_equal (GSList *l,
 /**
  * meta_workspace_set_builtin_struts:
  * @workspace: a #MetaWorkspace
- * @struts: (element-type Strut) (transfer none): list of #MetaStrut
+ * @struts: (element-type Meta.Strut) (transfer none): list of #MetaStrut
  *
  * Sets a list of struts that will be used in addition to the struts
  * of the windows in the workspace when computing the work area of

src/core/xprops.c

@@ -126,7 +126,7 @@ validate_or_free_results (GetPropertyResults *results,
   type_name = XGetAtomName (results->display->xdisplay, results->type);
   expected_name = XGetAtomName (results->display->xdisplay, expected_type);
   prop_name = XGetAtomName (results->display->xdisplay, results->xatom);
-  meta_error_trap_pop (results->display, TRUE);
+  meta_error_trap_pop (results->display);
 
   w = meta_display_lookup_x_window (results->display, results->xwindow);
 
@@ -204,11 +204,11 @@ get_property (MetaDisplay        *display,
     {
       if (results->prop)
         XFree (results->prop);
-      meta_error_trap_pop_with_return (display, TRUE);
+      meta_error_trap_pop_with_return (display);
       return FALSE;
     }
 
-  if (meta_error_trap_pop_with_return (display, TRUE) != Success)
+  if (meta_error_trap_pop_with_return (display) != Success)
     {
       if (results->prop)
         XFree (results->prop);
@@ -490,7 +490,7 @@ utf8_list_from_results (GetPropertyResults *results,
 
           meta_error_trap_push (results->display);
           name = XGetAtomName (results->display->xdisplay, results->xatom);
-          meta_error_trap_pop (results->display, TRUE);
+          meta_error_trap_pop (results->display);
           meta_warning (_("Property %s on window 0x%lx contained invalid UTF-8 for item %d in the list\n"),
                         name, results->xwindow, i);
           meta_XFree (name);
@@ -547,7 +547,7 @@ meta_prop_set_utf8_string_hint (MetaDisplay *display,
                    xwindow, atom,
                    display->atom_UTF8_STRING, 
                    8, PropModeReplace, (guchar*) val, strlen (val));
-  meta_error_trap_pop (display, FALSE);
+  meta_error_trap_pop (display);
 }
 
 static gboolean

src/gtk-compat.h

@@ -1,26 +0,0 @@
-#ifndef __GTK_COMPAT_H__
-#define __GTK_COMPAT_H__
-
-#include <gtk/gtk.h>
-
-/* Provide a compatibility layer for accessor function introduces
- * in GTK+ 2.20 which we need to build with GSEAL_ENABLE.
- * That way it is still possible to build with GTK+ 2.18 when not
- * using GSEAL_ENABLE
- */
-
-#if !GTK_CHECK_VERSION (2, 20, 0)
-
-#define gtk_widget_get_realized(w) GTK_WIDGET_REALIZED (w)
-#define gtk_widget_get_requisition(w,r) (*r = GTK_WIDGET (w)->requisition)
-#define gtk_widget_set_mapped(w,m)            \
-  G_STMT_START {                              \
-    if (m)                                    \
-      GTK_WIDGET_SET_FLAGS (w, GTK_MAPPED);   \
-    else                                      \
-      GTK_WIDGET_UNSET_FLAGS (w, GTK_MAPPED); \
-  } G_STMT_END
-
-#endif /* GTK_CHECK_VERSION */
-
-#endif /* __GTK_COMPAT_H__ */

src/include/boxes.h

@@ -24,9 +24,11 @@
 #ifndef META_BOXES_H
 #define META_BOXES_H
 
-#include <glib.h>
+#include <glib-object.h>
 #include "common.h"
 
+#define META_TYPE_RECTANGLE            (meta_rectangle_get_type ())
+
 typedef struct _MetaRectangle MetaRectangle;
 struct _MetaRectangle
 {
@@ -43,18 +45,6 @@ struct _MetaStrut
   MetaSide side;
 };
 
-#define BOX_LEFT(box)    ((box).x)                /* Leftmost pixel of rect */
-#define BOX_RIGHT(box)   ((box).x + (box).width)  /* One pixel past right   */
-#define BOX_TOP(box)     ((box).y)                /* Topmost pixel of rect  */
-#define BOX_BOTTOM(box)  ((box).y + (box).height) /* One pixel past bottom  */
-
-typedef enum
-{
-  FIXED_DIRECTION_NONE = 0,
-  FIXED_DIRECTION_X    = 1 << 0,
-  FIXED_DIRECTION_Y    = 1 << 1,
-} FixedDirections;
-
 typedef enum
 {
   META_EDGE_WINDOW,
@@ -70,27 +60,10 @@ struct _MetaEdge
   MetaEdgeType  edge_type;
 };
 
-/* Output functions -- note that the output buffer had better be big enough:
- *   rect_to_string:   RECT_LENGTH
- *   region_to_string: (RECT_LENGTH+strlen(separator_string)) *
- *                     g_list_length (region)
- *   edge_to_string:   EDGE_LENGTH
- *   edge_list_to_...: (EDGE_LENGTH+strlen(separator_string)) * 
- *                     g_list_length (edge_list)
- */
-#define RECT_LENGTH 27
-#define EDGE_LENGTH 37
-char* meta_rectangle_to_string        (const MetaRectangle *rect,
-                                       char                *output);
-char* meta_rectangle_region_to_string (GList               *region,
-                                       const char          *separator_string,
-                                       char                *output);
-char* meta_rectangle_edge_to_string   (const MetaEdge      *edge,
-                                       char                *output);
-char* meta_rectangle_edge_list_to_string (
-                                       GList               *edge_list,
-                                       const char          *separator_string,
-                                       char                *output);
+GType meta_rectangle_get_type (void);
+
+MetaRectangle *meta_rectangle_copy (const MetaRectangle *rect);
+void           meta_rectangle_free (MetaRectangle       *rect);
 
 /* Function to make initializing a rect with a single line of code easy */
 MetaRectangle                 meta_rect (int x, int y, int width, int height);
@@ -132,159 +105,4 @@ gboolean meta_rectangle_could_fit_rect  (const MetaRectangle *outer_rect,
 gboolean meta_rectangle_contains_rect   (const MetaRectangle *outer_rect,
                                          const MetaRectangle *inner_rect);
 
-/* Resize old_rect to the given new_width and new_height, but store the
- * result in rect.  NOTE THAT THIS IS RESIZE ONLY SO IT CANNOT BE USED FOR
- * A MOVERESIZE OPERATION (that simplies the routine a little bit as it
- * means there's no difference between NorthWestGravity and StaticGravity.
- * Also, I lied a little bit--technically, you could use it in a MoveResize
- * operation if you muck with old_rect just right).
- */
-void meta_rectangle_resize_with_gravity (const MetaRectangle *old_rect,
-                                         MetaRectangle       *rect,
-                                         int                  gravity,
-                                         int                  new_width,
-                                         int                  new_height);
-
-/* find a list of rectangles with the property that a window is contained
- * in the given region if and only if it is contained in one of the
- * rectangles in the list.
- *
- * In this case, the region is given by taking basic_rect, removing from
- * it the intersections with all the rectangles in the all_struts list,
- * then expanding all the rectangles in the resulting list by the given
- * amounts on each side.
- *
- * See boxes.c for more details.
- */
-GList*   meta_rectangle_get_minimal_spanning_set_for_region (
-                                         const MetaRectangle *basic_rect,
-                                         const GSList        *all_struts);
-
-/* Expand all rectangles in region by the given amount on each side */
-GList*   meta_rectangle_expand_region   (GList               *region,
-                                         const int            left_expand,
-                                         const int            right_expand,
-                                         const int            top_expand,
-                                         const int            bottom_expand);
-/* Same as for meta_rectangle_expand_region except that rectangles not at
- * least min_x or min_y in size are not expanded in that direction
- */
-GList*   meta_rectangle_expand_region_conditionally (
-                                         GList                *region,
-                                         const int            left_expand,
-                                         const int            right_expand,
-                                         const int            top_expand,
-                                         const int            bottom_expand,
-                                         const int            min_x,
-                                         const int            min_y);
-
-/* Expand rect in direction to the size of expand_to, and then clip out any
- * overlapping struts oriented orthognal to the expansion direction.  (Think
- * horizontal or vertical maximization)
- */
-void     meta_rectangle_expand_to_avoiding_struts (
-                                         MetaRectangle       *rect,
-                                         const MetaRectangle *expand_to,
-                                         const MetaDirection  direction,
-                                         const GSList        *all_struts);
-
-/* Free the list created by
- *   meta_rectangle_get_minimal_spanning_set_for_region()
- * or
- *   meta_rectangle_find_onscreen_edges ()
- * or
- *   meta_rectangle_find_nonintersected_monitor_edges()
- */
-void     meta_rectangle_free_list_and_elements (GList *filled_list);
-
-/* could_fit_in_region determines whether one of the spanning_rects is
- * big enough to contain rect.  contained_in_region checks whether one
- * actually contains it.
- */
-gboolean meta_rectangle_could_fit_in_region (
-                                         const GList         *spanning_rects,
-                                         const MetaRectangle *rect);
-gboolean meta_rectangle_contained_in_region (
-                                         const GList         *spanning_rects,
-                                         const MetaRectangle *rect);
-gboolean meta_rectangle_overlaps_with_region (
-                                         const GList         *spanning_rects,
-                                         const MetaRectangle *rect);
-
-/* Make the rectangle small enough to fit into one of the spanning_rects,
- * but make it no smaller than min_size.
- */
-void     meta_rectangle_clamp_to_fit_into_region (
-                                         const GList         *spanning_rects,
-                                         FixedDirections      fixed_directions,
-                                         MetaRectangle       *rect,
-                                         const MetaRectangle *min_size);
-
-/* Clip the rectangle so that it fits into one of the spanning_rects, assuming
- * it overlaps with at least one of them
- */
-void     meta_rectangle_clip_to_region  (const GList         *spanning_rects,
-                                         FixedDirections      fixed_directions,
-                                         MetaRectangle       *rect);
-
-/* Shove the rectangle into one of the spanning_rects, assuming it fits in
- * one of them.
- */
-void     meta_rectangle_shove_into_region(
-                                         const GList         *spanning_rects,
-                                         FixedDirections      fixed_directions,
-                                         MetaRectangle       *rect);
-
-/* Finds the point on the line connecting (x1,y1) to (x2,y2) which is closest
- * to (px, py).  Useful for finding an optimal rectangle size when given a
- * range between two sizes that are all candidates.
- */
-void meta_rectangle_find_linepoint_closest_to_point (double x1,    double y1,
-                                                     double x2,    double y2,
-                                                     double px,    double py,
-                                                     double *valx, double *valy);
-
-/***************************************************************************/
-/*                                                                         */
-/* Switching gears to code for edges instead of just rectangles            */
-/*                                                                         */
-/***************************************************************************/
-
-/* Return whether an edge overlaps or is adjacent to the rectangle in the
- * nonzero-width dimension of the edge.
- */
-gboolean meta_rectangle_edge_aligns (const MetaRectangle *rect, 
-                                     const MetaEdge      *edge);
-
-/* Compare two edges, so that sorting functions can put a list of edges in
- * canonical order.
- */
-gint   meta_rectangle_edge_cmp (gconstpointer a, gconstpointer b);
-
-/* Compare two edges, so that sorting functions can put a list of edges in
- * order.  This function doesn't separate left edges first, then right edges,
- * etc., but rather compares only upon location.
- */
-gint   meta_rectangle_edge_cmp_ignore_type (gconstpointer a, gconstpointer b);
-
-/* Removes an parts of edges in the given list that intersect any box in the
- * given rectangle list.  Returns the result.
- */
-GList* meta_rectangle_remove_intersections_with_boxes_from_edges (
-                                           GList *edges,
-                                           const GSList *rectangles);
-
-/* Finds all the edges of an onscreen region, returning a GList* of
- * MetaEdgeRect's.
- */
-GList* meta_rectangle_find_onscreen_edges (const MetaRectangle *basic_rect,
-                                           const GSList        *all_struts);
-
-/* Finds edges between adjacent monitors which are not covered by the given
- * struts.
- */
-GList* meta_rectangle_find_nonintersected_monitor_edges (
-                                           const GList         *monitor_rects,
-                                           const GSList        *all_struts);
-
 #endif /* META_BOXES_H */

src/include/common.h

@@ -195,6 +195,7 @@ typedef enum
   META_FRAME_TYPE_UTILITY,
   META_FRAME_TYPE_MENU,
   META_FRAME_TYPE_BORDER,
+  META_FRAME_TYPE_ATTACHED,
   META_FRAME_TYPE_LAST
 } MetaFrameType;
 

src/include/compositor-mutter.h

@@ -30,13 +30,13 @@
 
 #include "types.h"
 #include "compositor.h"
-#include "mutter-window.h"
+#include "meta-window-actor.h"
 
 /* Public compositor API */
-ClutterActor * mutter_get_stage_for_screen (MetaScreen *screen);
-ClutterActor * mutter_get_overlay_group_for_screen (MetaScreen *screen);
-Window         mutter_get_overlay_window (MetaScreen *screen);
-GList        * mutter_get_windows (MetaScreen *screen);
-ClutterActor * mutter_get_window_group_for_screen (MetaScreen *screen);
+ClutterActor *meta_get_stage_for_screen         (MetaScreen *screen);
+ClutterActor *meta_get_overlay_group_for_screen (MetaScreen *screen);
+Window        meta_get_overlay_window           (MetaScreen *screen);
+GList        *meta_get_window_actors            (MetaScreen *screen);
+ClutterActor *meta_get_window_group_for_screen  (MetaScreen *screen);
 
 #endif

src/include/compositor.h

@@ -30,29 +30,6 @@
 #include "window.h"
 #include "workspace.h"
 
-typedef enum _MetaCompWindowType
-{
-  META_COMP_WINDOW_NORMAL = META_WINDOW_NORMAL,
-  META_COMP_WINDOW_DESKTOP =  META_WINDOW_DESKTOP,
-  META_COMP_WINDOW_DOCK = META_WINDOW_DOCK,
-  META_COMP_WINDOW_DIALOG = META_WINDOW_DIALOG,
-  META_COMP_WINDOW_MODAL_DIALOG = META_WINDOW_MODAL_DIALOG,
-  META_COMP_WINDOW_TOOLBAR = META_WINDOW_TOOLBAR,
-  META_COMP_WINDOW_MENU = META_WINDOW_MENU,
-  META_COMP_WINDOW_UTILITY = META_WINDOW_UTILITY,
-  META_COMP_WINDOW_SPLASHSCREEN = META_WINDOW_SPLASHSCREEN,
-
-  /* override redirect window types, */
-  META_COMP_WINDOW_DROPDOWN_MENU = META_WINDOW_DROPDOWN_MENU,
-  META_COMP_WINDOW_POPUP_MENU = META_WINDOW_POPUP_MENU,
-  META_COMP_WINDOW_TOOLTIP = META_WINDOW_TOOLTIP,
-  META_COMP_WINDOW_NOTIFICATION = META_WINDOW_NOTIFICATION,
-  META_COMP_WINDOW_COMBO = META_WINDOW_COMBO,
-  META_COMP_WINDOW_DND = META_WINDOW_DND,
-  META_COMP_WINDOW_OVERRIDE_OTHER = META_WINDOW_OVERRIDE_OTHER
-
-} MetaCompWindowType;
-
 /**
  * MetaCompEffect:
  * @META_COMP_EFFECT_CREATE: The window is newly created

src/include/core.h

@@ -116,6 +116,10 @@ void meta_core_user_focus   (Display *xdisplay,
                              Window   frame_xwindow,
                              guint32  timestamp);
 
+void meta_core_lower_beneath_focus_window (Display *xdisplay,
+                                           Window   xwindow,
+                                           guint32  timestamp);
+
 void meta_core_minimize         (Display *xdisplay,
                                  Window   frame_xwindow);
 void meta_core_toggle_maximize  (Display *xdisplay,

src/include/display.h

@@ -125,7 +125,6 @@ void     meta_display_end_grab_op   (MetaDisplay *display,
 MetaGrabOp meta_display_get_grab_op (MetaDisplay *display);
 
 MetaKeyBindingAction meta_display_get_keybinding_action (MetaDisplay  *display,
-                                                         unsigned int  keysym,
                                                          unsigned int  keycode,
                                                          unsigned long mask);
 

src/include/errors.h

@@ -29,16 +29,12 @@
 #include "util.h"
 #include "display.h"
 
-void      meta_errors_init     (void);
-
 void      meta_error_trap_push (MetaDisplay *display);
-void      meta_error_trap_pop  (MetaDisplay *display,
-                                gboolean     last_request_was_roundtrip);
+void      meta_error_trap_pop  (MetaDisplay *display);
 
 void      meta_error_trap_push_with_return (MetaDisplay *display);
 /* returns X error code, or 0 for no error */
-int       meta_error_trap_pop_with_return  (MetaDisplay *display,
-                                            gboolean     last_request_was_roundtrip);
+int       meta_error_trap_pop_with_return  (MetaDisplay *display);
 
 
 #endif

src/include/keybindings.h

@@ -23,6 +23,10 @@
 #include "display.h"
 #include "common.h"
 
+/**
+ * MetaKeyHandlerFunc: (skip)
+ *
+ */
 typedef void (* MetaKeyHandlerFunc) (MetaDisplay    *display,
                                      MetaScreen     *screen,
                                      MetaWindow     *window,

src/include/meta-plugin.h

@@ -21,8 +21,8 @@
  * 02111-1307, USA.
  */
 
-#ifndef MUTTER_PLUGIN_H_
-#define MUTTER_PLUGIN_H_
+#ifndef META_PLUGIN_H_
+#define META_PLUGIN_H_
 
 #include "types.h"
 #include "compositor.h"
@@ -32,94 +32,87 @@
 #include <X11/extensions/Xfixes.h>
 #include <gmodule.h>
 
-/*
- * FIXME -- move these to a private include
- * Required by plugin manager.
+#define META_TYPE_PLUGIN            (meta_plugin_get_type ())
+#define META_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_PLUGIN, MetaPlugin))
+#define META_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_PLUGIN, MetaPluginClass))
+#define META_IS_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_PLUGIN))
+#define META_IS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_PLUGIN))
+#define META_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_PLUGIN, MetaPluginClass))
+
+/**
+ * MetaPlugin: (skip)
+ *
  */
-#define MUTTER_PLUGIN_MINIMIZE         (1<<0)
-#define MUTTER_PLUGIN_MAXIMIZE         (1<<1)
-#define MUTTER_PLUGIN_UNMAXIMIZE       (1<<2)
-#define MUTTER_PLUGIN_MAP              (1<<3)
-#define MUTTER_PLUGIN_DESTROY          (1<<4)
-#define MUTTER_PLUGIN_SWITCH_WORKSPACE (1<<5)
+typedef struct _MetaPlugin        MetaPlugin;
+/**
+ * MetaPluginClass: (skip)
+ *
+ */
+typedef struct _MetaPluginClass   MetaPluginClass;
+typedef struct _MetaPluginVersion MetaPluginVersion;
+typedef struct _MetaPluginInfo    MetaPluginInfo;
+typedef struct _MetaPluginPrivate MetaPluginPrivate;
 
-#define MUTTER_PLUGIN_ALL_EFFECTS      (~0)
-
-#define MUTTER_TYPE_PLUGIN            (mutter_plugin_get_type ())
-#define MUTTER_PLUGIN(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MUTTER_TYPE_PLUGIN, MutterPlugin))
-#define MUTTER_PLUGIN_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  MUTTER_TYPE_PLUGIN, MutterPluginClass))
-#define MUTTER_IS_PLUGIN(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MUTTER_TYPE_PLUGIN))
-#define MUTTER_IS_PLUGIN_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  MUTTER_TYPE_PLUGIN))
-#define MUTTER_PLUGIN_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  MUTTER_TYPE_PLUGIN, MutterPluginClass))
-
-typedef struct _MutterPlugin        MutterPlugin;
-typedef struct _MutterPluginClass   MutterPluginClass;
-typedef struct _MutterPluginVersion MutterPluginVersion;
-typedef struct _MutterPluginInfo    MutterPluginInfo;
-typedef struct _MutterPluginPrivate MutterPluginPrivate;
-
-struct _MutterPlugin
+struct _MetaPlugin
 {
   GObject parent;
 
-  MutterPluginPrivate *priv;
+  MetaPluginPrivate *priv;
 };
 
-struct _MutterPluginClass
+struct _MetaPluginClass
 {
   GObjectClass parent_class;
 
-  void (*start)            (MutterPlugin       *plugin);
+  void (*start)            (MetaPlugin         *plugin);
 
-  void (*minimize)         (MutterPlugin       *plugin,
-                            MutterWindow       *actor);
+  void (*minimize)         (MetaPlugin         *plugin,
+                            MetaWindowActor    *actor);
 
-  void (*maximize)         (MutterPlugin       *plugin,
-                            MutterWindow       *actor,
+  void (*maximize)         (MetaPlugin         *plugin,
+                            MetaWindowActor    *actor,
                             gint                x,
                             gint                y,
                             gint                width,
                             gint                height);
 
-  void (*unmaximize)       (MutterPlugin       *plugin,
-                            MutterWindow       *actor,
+  void (*unmaximize)       (MetaPlugin         *plugin,
+                            MetaWindowActor    *actor,
                             gint                x,
                             gint                y,
                             gint                width,
                             gint                height);
 
-  void (*map)              (MutterPlugin       *plugin,
-                            MutterWindow       *actor);
+  void (*map)              (MetaPlugin         *plugin,
+                            MetaWindowActor    *actor);
 
-  void (*destroy)          (MutterPlugin       *plugin,
-                            MutterWindow       *actor);
+  void (*destroy)          (MetaPlugin         *plugin,
+                            MetaWindowActor    *actor);
 
-  void (*switch_workspace) (MutterPlugin       *plugin,
-                            const GList       **actors,
+  void (*switch_workspace) (MetaPlugin         *plugin,
                             gint                from,
                             gint                to,
                             MetaMotionDirection direction);
 
   /*
-   * Called if an effect should be killed prematurely; the plugin must
+   * Called if an effects should be killed prematurely; the plugin must
    * call the completed() callback as if the effect terminated naturally.
-   * The events parameter is a bitmask indicating which effects are to be
-   * killed.
    */
-  void (*kill_effect)      (MutterPlugin     *plugin,
-                            MutterWindow     *actor,
-                            gulong            events);
+  void (*kill_window_effects)      (MetaPlugin      *plugin,
+                                    MetaWindowActor *actor);
 
-  /* General XEvent filter. This is fired *before* mutter itself handles
+  void (*kill_switch_workspace)    (MetaPlugin     *plugin);
+
+  /* General XEvent filter. This is fired *before* meta itself handles
    * an event. Return TRUE to block any further processing.
    */
-  gboolean (*xevent_filter) (MutterPlugin       *plugin,
-                             XEvent             *event);
+  gboolean (*xevent_filter) (MetaPlugin       *plugin,
+                             XEvent           *event);
 
-  const MutterPluginInfo * (*plugin_info) (MutterPlugin *plugin);
+  const MetaPluginInfo * (*plugin_info) (MetaPlugin *plugin);
 };
 
-struct _MutterPluginInfo
+struct _MetaPluginInfo
 {
   const gchar *name;
   const gchar *version;
@@ -128,18 +121,19 @@ struct _MutterPluginInfo
   const gchar *description;
 };
 
-GType mutter_plugin_get_type (void);
+GType meta_plugin_get_type (void);
 
-gulong        mutter_plugin_features            (MutterPlugin *plugin);
-gboolean      mutter_plugin_disabled            (MutterPlugin *plugin);
-gboolean      mutter_plugin_running             (MutterPlugin *plugin);
-gboolean      mutter_plugin_debug_mode          (MutterPlugin *plugin);
-const MutterPluginInfo * mutter_plugin_get_info (MutterPlugin *plugin);
+gulong        meta_plugin_features            (MetaPlugin *plugin);
+gboolean      meta_plugin_disabled            (MetaPlugin *plugin);
+gboolean      meta_plugin_running             (MetaPlugin *plugin);
+gboolean      meta_plugin_debug_mode          (MetaPlugin *plugin);
 
-struct _MutterPluginVersion
+const MetaPluginInfo * meta_plugin_get_info (MetaPlugin *plugin);
+
+struct _MetaPluginVersion
 {
   /*
-   * Version information; the first three numbers match the Mutter version
+   * Version information; the first three numbers match the Meta version
    * with which the plugin was compiled (see clutter-plugins/simple.c for sample
    * code).
    */
@@ -158,13 +152,13 @@ struct _MutterPluginVersion
 /*
  * Convenience macro to set up the plugin type. Based on GEdit.
  */
-#define MUTTER_PLUGIN_DECLARE(ObjectName, object_name)                  \
-  G_MODULE_EXPORT MutterPluginVersion mutter_plugin_version =           \
+#define META_PLUGIN_DECLARE(ObjectName, object_name)                    \
+  G_MODULE_EXPORT MetaPluginVersion meta_plugin_version =               \
     {                                                                   \
-      MUTTER_MAJOR_VERSION,                                           \
-      MUTTER_MINOR_VERSION,                                           \
-      MUTTER_MICRO_VERSION,                                           \
-      MUTTER_PLUGIN_API_VERSION                               \
+      MUTTER_MAJOR_VERSION,                                             \
+      MUTTER_MINOR_VERSION,                                             \
+      MUTTER_MICRO_VERSION,                                             \
+      MUTTER_PLUGIN_API_VERSION                                         \
     };                                                                  \
                                                                         \
   static GType g_define_type_id = 0;                                    \
@@ -177,7 +171,7 @@ struct _MutterPluginVersion
   GType object_name##_register_type (GTypeModule *type_module);         \
                                                                         \
   G_MODULE_EXPORT                                                       \
-  GType mutter_plugin_register_type (GTypeModule *type_module);         \
+  GType meta_plugin_register_type (GTypeModule *type_module);           \
                                                                         \
   GType                                                                 \
   object_name##_get_type ()                                             \
@@ -211,7 +205,7 @@ struct _MutterPluginVersion
       };                                                                \
                                                                         \
     g_define_type_id = g_type_module_register_type (type_module,        \
-                                                    MUTTER_TYPE_PLUGIN, \
+                                                    META_TYPE_PLUGIN,   \
                                                     #ObjectName,        \
                                                     &our_info,          \
                                                     0);                 \
@@ -221,41 +215,59 @@ struct _MutterPluginVersion
   }                                                                     \
                                                                         \
   G_MODULE_EXPORT GType                                                 \
-  mutter_plugin_register_type (GTypeModule *type_module)                \
+  meta_plugin_register_type (GTypeModule *type_module)                  \
   {                                                                     \
     return object_name##_register_type (type_module);                   \
   }                                                                     \
 
 void
-mutter_plugin_effect_completed (MutterPlugin  *plugin,
-                                MutterWindow  *actor,
-                                unsigned long  event);
+meta_plugin_switch_workspace_completed (MetaPlugin *plugin);
+
+void
+meta_plugin_minimize_completed (MetaPlugin      *plugin,
+                                MetaWindowActor *actor);
+
+void
+meta_plugin_maximize_completed (MetaPlugin      *plugin,
+                                MetaWindowActor *actor);
+
+void
+meta_plugin_unmaximize_completed (MetaPlugin      *plugin,
+                                  MetaWindowActor *actor);
+
+void
+meta_plugin_map_completed (MetaPlugin      *plugin,
+                           MetaWindowActor *actor);
+
+void
+meta_plugin_destroy_completed (MetaPlugin      *plugin,
+                               MetaWindowActor *actor);
 
 ClutterActor *
-mutter_plugin_get_overlay_group (MutterPlugin *plugin);
+meta_plugin_get_overlay_group (MetaPlugin *plugin);
 
 ClutterActor *
-mutter_plugin_get_window_group (MutterPlugin *plugin);
+meta_plugin_get_window_group (MetaPlugin *plugin);
 
 ClutterActor *
-mutter_plugin_get_stage (MutterPlugin *plugin);
+meta_plugin_get_stage (MetaPlugin *plugin);
 
 void
-mutter_plugin_query_screen_size (MutterPlugin *plugin,
-                                 int          *width,
-                                 int          *height);
+meta_plugin_query_screen_size (MetaPlugin *plugin,
+                               int        *width,
+                               int        *height);
 
 void
-mutter_plugin_set_stage_reactive (MutterPlugin *plugin,
-                                  gboolean      reactive);
+meta_plugin_set_stage_reactive (MetaPlugin *plugin,
+                                gboolean    reactive);
 
 void
-mutter_plugin_set_stage_input_area (MutterPlugin *plugin,
-                                    gint x, gint y, gint width, gint height);
+meta_plugin_set_stage_input_area (MetaPlugin *plugin,
+                                  gint x, gint y, gint width, gint height);
 
 void
-mutter_plugin_set_stage_input_region (MutterPlugin *plugin,
-                                      XserverRegion region);
+meta_plugin_set_stage_input_region (MetaPlugin   *plugin,
+                                    XserverRegion region);
 
 /**
  * MetaModalOptions:
@@ -264,7 +276,7 @@ mutter_plugin_set_stage_input_region (MutterPlugin *plugin,
  * @META_MODAL_KEYBOARD_ALREADY_GRABBED: if set the keyboard is already
  *   grabbed by the plugin and should not be grabbed again.
  *
- * Options that can be provided when calling mutter_plugin_begin_modal().
+ * Options that can be provided when calling meta_plugin_begin_modal().
  */
 typedef enum {
   META_MODAL_POINTER_ALREADY_GRABBED = 1 << 0,
@@ -272,26 +284,21 @@ typedef enum {
 } MetaModalOptions;
 
 gboolean
-mutter_plugin_begin_modal (MutterPlugin      *plugin,
-                           Window             grab_window,
-                           Cursor             cursor,
-                           MetaModalOptions   options,
-                           guint32            timestamp);
+meta_plugin_begin_modal (MetaPlugin      *plugin,
+                         Window           grab_window,
+                         Cursor           cursor,
+                         MetaModalOptions options,
+                         guint32          timestamp);
 
 void
-mutter_plugin_end_modal (MutterPlugin *plugin,
-                         guint32       timestamp);
+meta_plugin_end_modal (MetaPlugin *plugin,
+                       guint32     timestamp);
 
-GList *
-mutter_plugin_get_windows (MutterPlugin *plugin);
-
-Display *
-mutter_plugin_get_xdisplay (MutterPlugin *plugin);
-
-MetaScreen *
-mutter_plugin_get_screen (MutterPlugin *plugin);
+GList *     meta_plugin_get_window_actors (MetaPlugin *plugin);
+Display *   meta_plugin_get_xdisplay      (MetaPlugin *plugin);
+MetaScreen *meta_plugin_get_screen        (MetaPlugin *plugin);
 
 void
-_mutter_plugin_effect_started (MutterPlugin *plugin);
+_meta_plugin_effect_started (MetaPlugin *plugin);
 
-#endif /* MUTTER_PLUGIN_H_ */
+#endif /* META_PLUGIN_H_ */

src/include/meta-shadow-factory.h

@@ -0,0 +1,86 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+/*
+ * MetaShadowFactory:
+ *
+ * Create and cache shadow textures for arbitrary window shapes
+ *
+ * Copyright (C) 2010 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef __META_SHADOW_FACTORY_H__
+#define __META_SHADOW_FACTORY_H__
+
+#include <glib-object.h>
+
+/**
+ * MetaShadowParams:
+ * The #MetaShadowParams structure holds information about how to draw
+ * a particular style of shadow.
+ * @radius: the radius (gaussian standard deviation) of the shadow
+ * @top_fade: if >= 0, the shadow doesn't extend above the top
+ *  of the shape, and fades out over the given number of pixels
+ * @x_offset: horizontal offset of the shadow with respect to the
+ *  shape being shadowed, in pixels
+ * @y_offset: vertical offset of the shadow with respect to the
+ *  shape being shadowed, in pixels
+ * @opacity: opacity of the shadow, from 0 to 255
+ */
+
+typedef struct _MetaShadowParams MetaShadowParams;
+
+struct _MetaShadowParams
+{
+  int radius;
+  int top_fade;
+  int x_offset;
+  int y_offset;
+  guint8 opacity;
+};
+
+#define META_TYPE_SHADOW_FACTORY            (meta_shadow_factory_get_type ())
+#define META_SHADOW_FACTORY(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_SHADOW_FACTORY, MetaShadowFactory))
+#define META_SHADOW_FACTORY_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass),  META_TYPE_SHADOW_FACTORY, MetaShadowFactoryClass))
+#define META_IS_SHADOW_FACTORY(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_SHADOW_FACTORY))
+#define META_IS_SHADOW_FACTORY_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass),  META_TYPE_SHADOW_FACTORY))
+#define META_SHADOW_FACTORY_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj),  META_TYPE_SHADOW_FACTORY, MetaShadowFactoryClass))
+
+/**
+ * MetaShadowFactory:
+ * #MetaShadowFactory is used to create window shadows. It caches shadows internally
+ * so that multiple shadows created for the same shape with the same radius will
+ * share the same MetaShadow.
+ */
+typedef struct _MetaShadowFactory      MetaShadowFactory;
+typedef struct _MetaShadowFactoryClass MetaShadowFactoryClass;
+
+MetaShadowFactory *meta_shadow_factory_get_default (void);
+
+GType meta_shadow_factory_get_type (void);
+
+MetaShadowFactory *meta_shadow_factory_new        (void);
+
+void meta_shadow_factory_set_params (MetaShadowFactory *factory,
+                                     const char        *class_name,
+                                     gboolean           focused,
+                                     MetaShadowParams  *params);
+void meta_shadow_factory_get_params (MetaShadowFactory *factory,
+                                     const char        *class_name,
+                                     gboolean           focused,
+                                     MetaShadowParams  *params);
+
+#endif /* __META_SHADOW_FACTORY_H__ */

src/include/meta-window-actor.h

@@ -0,0 +1,69 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/*
+ * Copyright (C) 2008 Matthew Allum
+ * Copyright (C) 2007 Iain Holmes
+ * Based on xcompmgr - (c) 2003 Keith Packard
+ *          xfwm4    - (c) 2005-2007 Olivier Fourdan
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#ifndef META_WINDOW_ACTOR_H_
+#define META_WINDOW_ACTOR_H_
+
+#include <clutter/clutter.h>
+#include <X11/Xlib.h>
+
+#include "compositor.h"
+
+/*
+ * MetaWindowActor object (ClutterGroup sub-class)
+ */
+#define META_TYPE_WINDOW_ACTOR            (meta_window_actor_get_type ())
+#define META_WINDOW_ACTOR(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_WINDOW_ACTOR, MetaWindowActor))
+#define META_WINDOW_ACTOR_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_WINDOW_ACTOR, MetaWindowActorClass))
+#define META_IS_WINDOW_ACTOR(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_WINDOW_ACTOR))
+#define META_IS_WINDOW_ACTOR_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_WINDOW_ACTOR))
+#define META_WINDOW_ACTOR_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_WINDOW_ACTOR, MetaWindowActorClass))
+
+typedef struct _MetaWindowActor        MetaWindowActor;
+typedef struct _MetaWindowActorClass   MetaWindowActorClass;
+typedef struct _MetaWindowActorPrivate MetaWindowActorPrivate;
+
+struct _MetaWindowActorClass
+{
+  ClutterGroupClass parent_class;
+};
+
+struct _MetaWindowActor
+{
+  ClutterGroup           parent;
+
+  MetaWindowActorPrivate *priv;
+};
+
+GType meta_window_actor_get_type (void);
+
+Window             meta_window_actor_get_x_window         (MetaWindowActor *self);
+gint               meta_window_actor_get_workspace        (MetaWindowActor *self);
+MetaWindow *       meta_window_actor_get_meta_window      (MetaWindowActor *self);
+ClutterActor *     meta_window_actor_get_texture          (MetaWindowActor *self);
+gboolean           meta_window_actor_is_override_redirect (MetaWindowActor *self);
+const char *       meta_window_actor_get_description      (MetaWindowActor *self);
+gboolean       meta_window_actor_showing_on_its_workspace (MetaWindowActor *self);
+
+#endif /* META_WINDOW_ACTOR_H */

src/include/mutter-window.h

@@ -1,71 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/*
- * Copyright (C) 2008 Matthew Allum
- * Copyright (C) 2007 Iain Holmes
- * Based on xcompmgr - (c) 2003 Keith Packard
- *          xfwm4    - (c) 2005-2007 Olivier Fourdan
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.
- */
-
-#ifndef MUTTER_WINDOW_H_
-#define MUTTER_WINDOW_H_
-
-#include <clutter/clutter.h>
-#include <X11/Xlib.h>
-
-#include "compositor.h"
-
-/*
- * MutterWindow object (ClutterGroup sub-class)
- */
-#define MUTTER_TYPE_COMP_WINDOW       (mutter_window_get_type ())
-#define MUTTER_WINDOW(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), MUTTER_TYPE_COMP_WINDOW, MutterWindow))
-#define MUTTER_WINDOW_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), MUTTER_TYPE_COMP_WINDOW, MutterWindowClass))
-#define MUTTER_IS_WINDOW(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), MUTTER_TYPE_COMP_WINDOW))
-#define MUTTER_IS_WINDOW_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), MUTTER_TYPE_COMP_WINDOW))
-#define MUTTER_WINDOW_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), MUTTER_TYPE_COMP_WINDOW, MutterWindowClass))
-
-typedef struct _MutterWindow        MutterWindow;
-typedef struct _MutterWindowClass   MutterWindowClass;
-typedef struct _MutterWindowPrivate MutterWindowPrivate;
-
-struct _MutterWindowClass
-{
-  ClutterGroupClass parent_class;
-};
-
-struct _MutterWindow
-{
-  ClutterGroup           parent;
-
-  MutterWindowPrivate *priv;
-};
-
-GType mutter_window_get_type (void);
-
-Window             mutter_window_get_x_window         (MutterWindow *mcw);
-MetaCompWindowType mutter_window_get_window_type      (MutterWindow *mcw);
-gint               mutter_window_get_workspace        (MutterWindow *mcw);
-gboolean           mutter_window_is_hidden            (MutterWindow *mcw);
-MetaWindow *       mutter_window_get_meta_window      (MutterWindow *mcw);
-ClutterActor *     mutter_window_get_texture          (MutterWindow *mcw);
-gboolean           mutter_window_is_override_redirect (MutterWindow *mcw);
-const char *       mutter_window_get_description      (MutterWindow *mcw);
-gboolean       mutter_window_showing_on_its_workspace (MutterWindow *mcw);
-
-#endif /* MUTTER_WINDOW_H */

src/include/prefs.h

@@ -34,6 +34,7 @@ typedef enum
   META_PREF_MOUSE_BUTTON_MODS,
   META_PREF_FOCUS_MODE,
   META_PREF_FOCUS_NEW_WINDOWS,
+  META_PREF_ATTACH_MODAL_DIALOGS,
   META_PREF_RAISE_ON_CLICK,
   META_PREF_ACTION_DOUBLE_CLICK_TITLEBAR,
   META_PREF_ACTION_MIDDLE_CLICK_TITLEBAR,
@@ -59,6 +60,7 @@ typedef enum
   META_PREF_CURSOR_SIZE,
   META_PREF_COMPOSITING_MANAGER,
   META_PREF_RESIZE_WITH_RIGHT_BUTTON,
+  META_PREF_SIDE_BY_SIDE_TILING,
   META_PREF_FORCE_FULLSCREEN,
   META_PREF_CLUTTER_PLUGINS,
   META_PREF_LIVE_HIDDEN_WINDOWS,
@@ -85,6 +87,7 @@ guint                       meta_prefs_get_mouse_button_resize (void);
 guint                       meta_prefs_get_mouse_button_menu  (void);
 MetaFocusMode               meta_prefs_get_focus_mode         (void);
 MetaFocusNewWindows         meta_prefs_get_focus_new_windows  (void);
+gboolean                    meta_prefs_get_attach_modal_dialogs (void);
 gboolean                    meta_prefs_get_raise_on_click     (void);
 const char*                 meta_prefs_get_theme              (void);
 /* returns NULL if GTK default should be used */
@@ -96,6 +99,7 @@ gboolean                    meta_prefs_get_auto_raise         (void);
 int                         meta_prefs_get_auto_raise_delay   (void);
 gboolean                    meta_prefs_get_gnome_accessibility (void);
 gboolean                    meta_prefs_get_gnome_animations   (void);
+gboolean                    meta_prefs_get_side_by_side_tiling (void);
 
 const char*                 meta_prefs_get_command            (int i);
 
@@ -191,9 +195,12 @@ typedef enum _MetaKeyBindingAction
   META_KEYBINDING_ACTION_CYCLE_WINDOWS_BACKWARD,
   META_KEYBINDING_ACTION_CYCLE_PANELS,
   META_KEYBINDING_ACTION_CYCLE_PANELS_BACKWARD,
+  META_KEYBINDING_ACTION_TAB_POPUP_SELECT,
+  META_KEYBINDING_ACTION_TAB_POPUP_CANCEL,
   META_KEYBINDING_ACTION_SHOW_DESKTOP,
   META_KEYBINDING_ACTION_PANEL_MAIN_MENU,
   META_KEYBINDING_ACTION_PANEL_RUN_DIALOG,
+  META_KEYBINDING_ACTION_TOGGLE_RECORDING,
   META_KEYBINDING_ACTION_COMMAND_1,
   META_KEYBINDING_ACTION_COMMAND_2,
   META_KEYBINDING_ACTION_COMMAND_3,
@@ -205,7 +212,75 @@ typedef enum _MetaKeyBindingAction
   META_KEYBINDING_ACTION_COMMAND_9,
   META_KEYBINDING_ACTION_COMMAND_10,
   META_KEYBINDING_ACTION_COMMAND_11,
-  META_KEYBINDING_ACTION_COMMAND_12
+  META_KEYBINDING_ACTION_COMMAND_12,
+  META_KEYBINDING_ACTION_COMMAND_13,
+  META_KEYBINDING_ACTION_COMMAND_14,
+  META_KEYBINDING_ACTION_COMMAND_15,
+  META_KEYBINDING_ACTION_COMMAND_16,
+  META_KEYBINDING_ACTION_COMMAND_17,
+  META_KEYBINDING_ACTION_COMMAND_18,
+  META_KEYBINDING_ACTION_COMMAND_19,
+  META_KEYBINDING_ACTION_COMMAND_20,
+  META_KEYBINDING_ACTION_COMMAND_21,
+  META_KEYBINDING_ACTION_COMMAND_22,
+  META_KEYBINDING_ACTION_COMMAND_23,
+  META_KEYBINDING_ACTION_COMMAND_24,
+  META_KEYBINDING_ACTION_COMMAND_25,
+  META_KEYBINDING_ACTION_COMMAND_26,
+  META_KEYBINDING_ACTION_COMMAND_27,
+  META_KEYBINDING_ACTION_COMMAND_28,
+  META_KEYBINDING_ACTION_COMMAND_29,
+  META_KEYBINDING_ACTION_COMMAND_30,
+  META_KEYBINDING_ACTION_COMMAND_31,
+  META_KEYBINDING_ACTION_COMMAND_32,
+  META_KEYBINDING_ACTION_COMMAND_SCREENSHOT,
+  META_KEYBINDING_ACTION_COMMAND_WINDOW_SCREENSHOT,
+  META_KEYBINDING_ACTION_COMMAND_TERMINAL,
+  META_KEYBINDING_ACTION_SET_SPEW_MARK,
+  META_KEYBINDING_ACTION_ACTIVATE_WINDOW_MENU,
+  META_KEYBINDING_ACTION_TOGGLE_FULLSCREEN,
+  META_KEYBINDING_ACTION_TOGGLE_MAXIMIZED,
+  META_KEYBINDING_ACTION_TOGGLE_ABOVE,
+  META_KEYBINDING_ACTION_MAXIMIZE,
+  META_KEYBINDING_ACTION_UNMAXIMIZE,
+  META_KEYBINDING_ACTION_TOGGLE_SHADED,
+  META_KEYBINDING_ACTION_MINIMIZE,
+  META_KEYBINDING_ACTION_CLOSE,
+  META_KEYBINDING_ACTION_BEGIN_MOVE,
+  META_KEYBINDING_ACTION_BEGIN_RESIZE,
+  META_KEYBINDING_ACTION_TOGGLE_ON_ALL_WORKSPACES,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_1,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_2,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_3,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_4,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_5,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_6,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_7,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_8,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_9,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_10,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_11,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_12,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_LEFT,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_RIGHT,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_UP,
+  META_KEYBINDING_ACTION_MOVE_TO_WORKSPACE_DOWN,
+  META_KEYBINDING_ACTION_RAISE_OR_LOWER,
+  META_KEYBINDING_ACTION_RAISE,
+  META_KEYBINDING_ACTION_LOWER,
+  META_KEYBINDING_ACTION_MAXIMIZE_VERTICALLY,
+  META_KEYBINDING_ACTION_MAXIMIZE_HORIZONTALLY,
+  META_KEYBINDING_ACTION_MOVE_TO_CORNER_NW,
+  META_KEYBINDING_ACTION_MOVE_TO_CORNER_NE,
+  META_KEYBINDING_ACTION_MOVE_TO_CORNER_SW,
+  META_KEYBINDING_ACTION_MOVE_TO_CORNER_SE,
+  META_KEYBINDING_ACTION_MOVE_TO_SIDE_N,
+  META_KEYBINDING_ACTION_MOVE_TO_SIDE_S,
+  META_KEYBINDING_ACTION_MOVE_TO_SIDE_E,
+  META_KEYBINDING_ACTION_MOVE_TO_SIDE_W,
+  META_KEYBINDING_ACTION_MOVE_TO_CENTER,
+
+  META_KEYBINDING_ACTION_LAST
 } MetaKeyBindingAction;
 
 typedef struct

src/include/tile-preview.h

@@ -0,0 +1,39 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Meta tile preview */
+
+/*
+ * Copyright (C) 2010 Florian Müllner
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+#ifndef META_TILE_PREVIEW_H
+#define META_TILE_PREVIEW_H
+
+#include "boxes.h"
+
+typedef struct _MetaTilePreview MetaTilePreview;
+
+MetaTilePreview   *meta_tile_preview_new    (int                screen_number,
+                                             gboolean           composited);
+void               meta_tile_preview_free   (MetaTilePreview   *preview);
+void               meta_tile_preview_show   (MetaTilePreview   *preview,
+                                             MetaRectangle     *rect);
+void               meta_tile_preview_hide   (MetaTilePreview   *preview);
+Window             meta_tile_preview_get_xwindow (MetaTilePreview   *preview,
+                                                  gulong            *create_serial);
+
+#endif /* META_TILE_PREVIEW_H */

src/include/types.h

@@ -22,12 +22,20 @@
 #ifndef META_TYPES_H
 #define META_TYPES_H
 
+/**
+ * MetaCompositor: (skip)
+ *
+ */
 typedef struct _MetaCompositor  MetaCompositor;
 typedef struct _MetaDisplay     MetaDisplay;
 typedef struct _MetaFrame       MetaFrame;
 typedef struct _MetaScreen      MetaScreen;
 typedef struct _MetaWindow      MetaWindow;
 typedef struct _MetaWorkspace   MetaWorkspace;
+/**
+ * MetaGroup: (skip)
+ *
+ */
 typedef struct _MetaGroup       MetaGroup;
 typedef struct _MetaKeyBinding  MetaKeyBinding;
 

src/include/ui.h

@@ -33,8 +33,6 @@
 
 typedef struct _MetaUI MetaUI;
 
-typedef struct _MetaImageWindow MetaImageWindow;
-
 typedef gboolean (* MetaEventFunc) (XEvent *xevent, gpointer data);
 
 typedef enum
@@ -132,34 +130,10 @@ void            meta_ui_window_menu_popup (MetaWindowMenu     *menu,
 void            meta_ui_window_menu_free  (MetaWindowMenu     *menu);
 
 
-MetaImageWindow* meta_image_window_new          (Display         *xdisplay,
-                                                 int              screen_number,
-                                                 int              max_width,
-                                                 int              max_height);
-void             meta_image_window_free         (MetaImageWindow *iw);
-void             meta_image_window_set_showing  (MetaImageWindow *iw,
-                                                 gboolean         showing);
-void             meta_image_window_set          (MetaImageWindow *iw,
-                                                 GdkPixbuf       *pixbuf,
-                                                 int              x,
-                                                 int              y);
-
 /* FIXME these lack a display arg */
-GdkPixbuf* meta_gdk_pixbuf_get_from_window (GdkPixbuf   *dest,
-                                            Window       xwindow,
+GdkPixbuf* meta_gdk_pixbuf_get_from_pixmap (Pixmap       xpixmap,
                                             int          src_x,
                                             int          src_y,
-                                            int          dest_x,
-                                            int          dest_y,
-                                            int          width,
-                                            int          height);
-
-GdkPixbuf* meta_gdk_pixbuf_get_from_pixmap (GdkPixbuf   *dest,
-                                            Pixmap       xpixmap,
-                                            int          src_x,
-                                            int          src_y,
-                                            int          dest_x,
-                                            int          dest_y,
                                             int          width,
                                             int          height);
 
@@ -200,8 +174,7 @@ int      meta_ui_get_drag_threshold       (MetaUI *ui);
 
 MetaUIDirection meta_ui_get_direction (void);
 
-GdkPixbuf *meta_ui_get_pixbuf_from_pixmap (Pixmap   pmap);
-
 #include "tabpopup.h"
+#include "tile-preview.h"
 
 #endif