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

.gitignore

@@ -19,7 +19,6 @@ libtool
 ltmain.sh
 missing
 .deps
-src/50-mutter-windows.xml
 src/mutter-wm.desktop
 src/mutter.desktop
 *.o
@@ -41,16 +40,14 @@ stamp-h1
 stamp-it
 .intltool-merge-cache
 POTFILES
-po/*.pot
 50-metacity-desktop-key.xml
 50-metacity-key.xml
 inlinepixbufs.h
-libmutter.pc
+libmutter-private.pc
 mutter
 mutter-theme-viewer
 mutter.desktop
-org.gnome.mutter.gschema.valid
-org.gnome.mutter.gschema.xml
+mutter.schemas
 testasyncgetprop
 testboxes
 testgradient
@@ -59,13 +56,10 @@ mutter-mag
 mutter-message
 mutter-window-demo
 focus-window
-test-attached
 test-gravity
 test-resizing
 test-size-hints
-# We can't say just "wm-tester" here or it will ignore the directory
-# rather than the binary
-src/wm-tester/wm-tester
+wm-tester
 INSTALL
 mkinstalldirs
 src/mutter-enum-types.[ch]

HACKING

@@ -42,10 +42,10 @@ Minimal Building/Testing Environment
   build a development version of Metacity -- odds are, you may be able
   to build metacity from CVS without building any other modules.
 
-  As long as you have gtk+ >= 3.0 and GIO >= 2.25.10 with your distro
-  (gtk+ >= 2.6 if you manually revert the change from bug 348633), you
-  should be able to install your distro's development packages
-  (e.g. gtk2-devel, glib-devel, startup-notification-devel on
+  As long as you have gtk+ >= 2.10 and GConf with your distro (gtk+ >=
+  2.6 if you manually revert the change from bug 348633), you should
+  be able to install your distro's development packages
+  (e.g. gtk2-devel, GConf2-devel, startup-notification-devel on
   Fedora; also, remember to install the gnome-common package which is
   needed for building cvs versions of Gnome modules like Metacity) as
   well as the standard development tools (gcc, autoconf, automake,

README

@@ -18,7 +18,8 @@ COMPILING MUTTER
 You need GTK+ 2.2.  For startup notification to work you need
 libstartup-notification at
 http://www.freedesktop.org/software/startup-notification/ or on the
-GNOME ftp site.
+GNOME ftp site. You also need GConf 1.2 (unless building a funky
+extra-small embedded metacity with --disable-gconf, see below).
 You need Clutter 1.0. You need gobject-introspection 0.6.3.
 
 REPORTING BUGS AND SUBMITTING PATCHES
@@ -58,24 +59,25 @@ MUTTER FEATURES
    and should work with KWin, fvwm2, and other EWMH-compliant WMs.)
 
  - Has a simple theme system and a couple of extra themes come with it.
-   Change themes via gsettings:
-     gsettings set org.gnome.desktop.wm.preferences theme Crux
-     gsettings set org.gnome.desktop.wm.preferences theme Gorilla
-     gsettings set org.gnome.desktop.wm.preferences theme Atlanta
-     gsettings set org.gnome.desktop.wm.preferences theme Bright
+   Change themes via gconf-editor or gconftool or GNOME themes control
+   panel:
+     gconftool-2 --type=string --set /apps/metacity/general/theme Crux
+     gconftool-2 --type=string --set /apps/metacity/general/theme Gorilla
+     gconftool-2 --type=string --set /apps/metacity/general/theme Atlanta
+     gconftool-2 --type=string --set /apps/metacity/general/theme Bright
 
    See theme-format.txt for docs on the theme format. Use 
    metacity-theme-viewer to preview themes.
 
- - Change number of workspaces via gsettings:
-     gsettings set org.gnome.desktop.wm.preferences num-workspaces 5
+ - Change number of workspaces via gconf-editor or gconftool:
+     gconftool-2 --type=int --set /apps/metacity/general/num_workspaces 5
 
    Can also change workspaces from GNOME 2 pager.
 
  - Change focus mode:
-     gsettings set org.gnome.desktop.wm.preferences focus-mode mouse
-     gsettings set org.gnome.desktop.wm.preferences focus-mode sloppy
-     gsettings set org.gnome.desktop.wm.preferences focus-mode click
+     gconftool-2 --type=string --set /apps/metacity/general/focus_mode mouse
+     gconftool-2 --type=string --set /apps/metacity/general/focus_mode sloppy
+     gconftool-2 --type=string --set /apps/metacity/general/focus_mode click
 
  - Global keybinding defaults include:   
 
@@ -90,9 +92,10 @@ MUTTER FEATURES
 
    Change keybindings for example:
 
-     gsettings set org.gnome.desktop.wm.keybindings switch-to-workspace-1 '[<Alt>F1]'
+     unst gconftool-2 --type=string --set /apps/metacity/global_keybindings/switch_to_workspace_1 '<Alt>F1'
    
-   Also try the GNOME keyboard shortcuts control panel.
+   Also try the GNOME keyboard shortcuts control panel, or
+   gconf-editor.
 
  - Window keybindings:
 

configure.in

@@ -1,8 +1,8 @@
 AC_PREREQ(2.50)
 
-m4_define([mutter_major_version], [3])
-m4_define([mutter_minor_version], [3])
-m4_define([mutter_micro_version], [3])
+m4_define([mutter_major_version], [2])
+m4_define([mutter_minor_version], [91])
+m4_define([mutter_micro_version], [2])
 
 m4_define([mutter_version],
           [mutter_major_version.mutter_minor_version.mutter_micro_version])
@@ -15,9 +15,9 @@ AC_INIT([mutter], [mutter_version],
 AC_CONFIG_SRCDIR(src/core/display.c)
 AC_CONFIG_HEADERS(config.h)
 
-AM_INIT_AUTOMAKE([1.11 no-dist-gzip dist-xz tar-ustar])
+AM_INIT_AUTOMAKE([dist-bzip2 no-dist-gzip])
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])],)
-AM_MAINTAINER_MODE([enable])
+AM_MAINTAINER_MODE
 
 MUTTER_MAJOR_VERSION=mutter_major_version
 MUTTER_MINOR_VERSION=mutter_minor_version
@@ -61,14 +61,87 @@ AC_CHECK_SIZEOF(__int64)
 ## byte order
 AC_C_BIGENDIAN
 
-GTK_MIN_VERSION=3.3.3
-GIO_MIN_VERSION=2.25.10
+#### 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 "$enable_compile_warnings" != no ; then
+  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 "$enable_compile_warnings" = error; then
+      case " $CFLAGS " in
+      *[\ \	]-Werror[\ \	]*) ;;
+      *) CFLAGS="$CFLAGS -Werror" ;;
+      esac
+    fi
+  fi
+fi
+changequote([,])dnl
+
+GTK_MIN_VERSION=2.90.7
 CANBERRA_GTK=libcanberra-gtk3
 CANBERRA_GTK_VERSION=0.26
 
-MUTTER_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION gio-2.0 >= $GIO_MIN_VERSION pango >= 1.2.0 cairo >= 1.10.0 gsettings-desktop-schemas >= 3.3.0"
+MUTTER_PC_MODULES="gtk+-3.0 >= $GTK_MIN_VERSION pango >= 1.2.0 cairo >= 1.10.0"
 
-GLIB_GSETTINGS
+AC_ARG_ENABLE(gconf,
+  AC_HELP_STRING([--disable-gconf],
+                 [disable gconf usage, for embedded/size-sensitive non-GNOME builds]),,
+  enable_gconf=yes)
+
+if test x$enable_gconf = xyes; then
+    AC_DEFINE(HAVE_GCONF,1,[Build with gconf support])
+    MUTTER_PC_MODULES="$MUTTER_PC_MODULES gconf-2.0 >= 1.2.0"
+fi
 
 AC_ARG_ENABLE(verbose-mode,
   AC_HELP_STRING([--disable-verbose-mode],
@@ -89,6 +162,11 @@ AC_ARG_ENABLE(startup-notification,
                  [disable mutter's startup notification support, for embedded/size-sensitive custom non-GNOME builds]),,
   enable_startup_notification=auto)
 
+AC_ARG_WITH(introspection,
+  AC_HELP_STRING([--without-introspection],
+                 [disable the use of GObject introspection]),,
+  with_introspection=auto)
+
 AC_ARG_WITH(libcanberra,
   AC_HELP_STRING([--without-libcanberra],
                  [disable the use of libcanberra for playing sounds]),,
@@ -178,31 +256,48 @@ else
   AC_MSG_ERROR([no. Mutter requires the Xcomposite extension to build.])
 fi
 
-CLUTTER_VERSION=1.7.5
+CLUTTER_VERSION=1.2.0
 CLUTTER_PACKAGE=clutter-1.0
 AC_SUBST(CLUTTER_PACKAGE)
 if $PKG_CONFIG --atleast-version $CLUTTER_VERSION $CLUTTER_PACKAGE ; then
   MUTTER_PC_MODULES="$MUTTER_PC_MODULES $CLUTTER_PACKAGE "
   PKG_CHECK_MODULES(CLUTTER, $CLUTTER_PACKAGE)
   AC_DEFINE(WITH_CLUTTER, , [Building with Clutter compositor])
+
+  dnl Check for the clutter-glx-texture-pixmap header
+  mutter_save_cppflags="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $CLUTTER_CFLAGS"
+  AC_CHECK_HEADER([clutter/glx/clutter-glx-texture-pixmap.h],
+                  [have_glx_texture_pixmap=yes],
+                  [have_glx_texture_pixmap=no])
+  CPPFLAGS="$mutter_save_cppflags"
+
+  if test x$have_glx_texture_pixmap = xyes; then
+    AC_DEFINE(HAVE_GLX_TEXTURE_PIXMAP, ,
+              [Is ClutterGLXTexturePixmap available?])
+  fi
 else
   AC_MSG_ERROR([no. Mutter requires Clutter version $CLUTTER_VERSION.])
 fi
 
-INTROSPECTION_VERSION=0.9.5
-GOBJECT_INTROSPECTION_CHECK([$INTROSPECTION_VERSION])
-
-if test x$found_introspection != xno; then
-  AC_DEFINE(HAVE_INTROSPECTION, 1, [Define if GObject introspection is available])
-  MUTTER_PC_MODULES="$MUTTER_PC_MODULES gobject-introspection-1.0"
-  # Since we don't make any guarantees about stability and we don't support
-  # parallel install, there's no real reason to change directories, filenames,
-  # etc. as we change the Mutter tarball version. Note that this must match
-  # api_version in src/Makefile.am
-  META_GIR=Meta_3_0_gir
-  # META_GIR=[Meta_]mutter_major_version[_]mutter_minor_version[_gir]
-  AC_SUBST(META_GIR)
+if test x$with_introspection != xno; then
+  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])
+    G_IR_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0`
+    AC_SUBST(G_IR_SCANNER)
+    G_IR_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
+    AC_SUBST(G_IR_COMPILER)
+    G_IR_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
+    AC_SUBST(G_IR_GENERATE)
+    GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
+    AC_SUBST(GIRDIR)
+    TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+    AC_SUBST(TYPELIBDIR)
+  fi
 fi
+AM_CONDITIONAL(WITH_INTROSPECTION, test "$have_introspection" = "yes")
 
 AC_MSG_CHECKING([Xcursor])
 if $PKG_CONFIG xcursor; then
@@ -393,6 +488,18 @@ fi
 
 AC_SUBST(GDK_PIXBUF_CSOURCE)
 
+if test x$enable_gconf = xyes; then
+   AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
+   if test x"$GCONFTOOL" = xno; then
+     AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
+   fi
+
+   AM_GCONF_SOURCE_2
+else
+  GCONF_SCHEMAS_INSTALL_TRUE='#'
+  GCONF_SCHEMAS_INSTALL_FALSE=
+fi
+
 AC_PATH_PROG(ZENITY, zenity, no)
 if test x"$ZENITY" = xno; then
   AC_MSG_ERROR([zenity not found in your path - needed for dialogs])
@@ -411,79 +518,13 @@ AM_PATH_PYTHON([2.5])
 # Use gnome-doc-utils:
 GNOME_DOC_INIT([0.8.0])
 
-#### Warnings (last since -Werror can disturb other tests)
-
-# 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 "$enable_compile_warnings" != no ; then
-  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 "$enable_compile_warnings" = error; then
-      case " $CFLAGS " in
-      *[\ \	]-Werror[\ \	]*) ;;
-      *) CFLAGS="$CFLAGS -Werror" ;;
-      esac
-    fi
-  fi
-fi
-changequote([,])dnl
-
 AC_CONFIG_FILES([
 Makefile
 doc/Makefile
 doc/man/Makefile
 src/Makefile
 src/wm-tester/Makefile
-src/libmutter.pc
+src/libmutter-private.pc
 src/mutter-plugins.pc
 src/tools/Makefile
 src/compositor/plugins/Makefile
@@ -492,6 +533,13 @@ po/Makefile.in
 
 AC_OUTPUT
 
+if test x$enable_gconf = xno; then
+        echo "*** WARNING WARNING WARNING WARNING WARNING"
+        echo "*** Building without GConf.  This means there's no"
+        echo "*** way to change prefs except hacking source code."
+        echo "*** This is intended for embedded systems etc., not for normal use."
+fi
+
 if test x$enable_verbose_mode = xno; then
         echo "*** WARNING WARNING WARNING WARNING WARNING"
         echo "*** Building without verbose mode"
@@ -508,11 +556,12 @@ mutter-$VERSION
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}
 
+	GConf:                    ${enable_gconf}
 	XFree86 Xinerama:         ${use_xfree_xinerama}
 	Solaris Xinerama:         ${use_solaris_xinerama}
 	Startup notification:     ${have_startup_notification}
 	libcanberra:              ${have_libcanberra}
-	Introspection:            ${found_introspection}
+	Introspection:            ${have_introspection}
 	Session management:       ${found_sm}
 	Shape extension:          ${found_shape}
 	Xsync:                    ${found_xsync}
@@ -525,7 +574,7 @@ if expr $MUTTER_MINOR_VERSION % 2 > /dev/null ; then
    stable_version=`expr $MUTTER_MINOR_VERSION - 1`
    echo "This is the UNSTABLE branch of mutter"
    echo -n "Use 2.$stable_version.x for stable "
-   echo    "(gnome-2-$stable_version branch in git)"
+   echo    "(gnome-2-$stable_version branch in Subversion)"
 else
    echo "This is the stable branch of mutter"
 fi

doc/man/mutter-message.1

@@ -46,13 +46,13 @@ because the original program does not have a manual page.
 Restart \fBmutter\fP(1) which is running.
 .TP
 .B reload-theme
-Reload a theme which is specified on gsettings database.
+Reload a theme which is specified on gconf database.
 .TP
 .B enable-keybindings
-Enable all of keybindings which is specified on gsettings database.
+Enable all of keybindings which is specified on gconf database.
 .TP
 .B disable-keybindings
-Disable all of keybindings which is specified on gsettings database.
+Disable all of keybindings which is specified on gconf database.
 .SH SEE ALSO
 .BR mutter (1)
 .SH AUTHOR

doc/man/mutter.1

@@ -51,7 +51,7 @@ Print the version number.
 .B \-?, \-\-help
 Show summary of options.
 .SH CONFIGURATION
-\fBmutter\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gsettings.
+\fBmutter\fP configuration can be found under \fIPreferences\fP->\fIWindows\fP and \fIPreferences\fP->\fIKeyboard Shortcuts\fP on the menu-panel. Advanced configuration can be achieved directly through gconf editing (gconf-editor or gconftool-2).
 .SH SEE ALSO
 .BR mutter-message (1)
 .SH AUTHOR

doc/theme-format.txt

@@ -22,36 +22,6 @@ This document has separate sections for each format version. You may
 want to read the document in reverse order, since the base features
 are discussed under version 1.
 
-New Features in Theme Format Version 3.4
-========================================
-
-An additional color type is added to pick up custom colors defined
-in the GTK+ theme's CSS:
-
-  gtk:custom(name,fallback)
-
-where <name> refers to a custom color defined with @define-color in
-the GTK+ theme, and <fallback> provides an alternative color definition
-in case the color referenced by <name> is not found.
-
-New Features in Theme Format Version 3.3
-========================================
-
-Add two additional button background functions - left_single_background and
-right_single_background - for button groups with just a single button.
-
-There are now additional frame states to style left/right tiled windows
-differently ("tiled_left", "tiled_right", "tiled_left_and_shaded",
-"tiled_right_and_shaded").
-
-New Features in Theme Format Version 3.2
-========================================
-
-A new window type 'attached' is added for modal dialogs which are
-attached to their parent window. (When the attach_modal_dialogs preference
-is turned on.) If no style is defined for the 'attached' window type,
-the 'border' window type will be used instead.
-
 New Features in Theme Format Version 3.1
 ========================================
 

mutter.doap

@@ -6,16 +6,6 @@
 
   <name xml:lang="en">mutter</name>
   <shortdesc xml:lang="en">Window and compositing manager based on Clutter</shortdesc>
-  <description>Mutter is a window and compositing manager that displays and
-manages your desktop via OpenGL. Mutter combines a sophisticated display engine
-using the Clutter toolkit with solid window-management logic inherited from the
-Metacity window manager.
-
-While Mutter can be used stand-alone, it is primarily intended to be used as
-the display core of a larger system such as GNOME Shell. For this reason,
-Mutter is very extensible via plugins, which are used both to add fancy visual
-effects and to rework the window management behaviors to meet the needs of the
-environment.</description>
   <!--
   <homepage rdf:resource="http://www.gnome.org/" />
   -->

po/LINGUAS

@@ -22,7 +22,6 @@ dz
 el
 en_CA
 en_GB
-eo
 es
 et
 eu
@@ -83,7 +82,6 @@ te
 th
 tk
 tr
-ug 
 uk
 vi
 wa

po/POTFILES.in

@@ -1,7 +1,5 @@
 # List of source files containing translatable strings.
 # Please keep this file sorted alphabetically.
-src/50-mutter-windows.xml.in
-src/compositor/compositor.c
 src/core/bell.c
 src/core/core.c
 src/core/delete.c
@@ -9,7 +7,6 @@ src/core/display.c
 src/core/errors.c
 src/core/keybindings.c
 src/core/main.c
-src/core/mutter.c
 src/core/prefs.c
 src/core/screen.c
 src/core/session.c
@@ -17,9 +14,10 @@ src/core/util.c
 src/core/window.c
 src/core/window-props.c
 src/core/xprops.c
+src/include/all-keybindings.h
 src/mutter.desktop.in
 src/mutter-wm.desktop.in
-src/org.gnome.mutter.gschema.xml.in
+src/mutter.schemas.in
 src/tools/mutter-message.c
 src/ui/frames.c
 src/ui/menu.c

src/50-mutter-windows.xml.in

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<KeyListEntries schema="org.gnome.mutter.keybindings"
-                group="system"
-                _name="Windows"
-                wm_name="Mutter"
-                package="mutter">
-
-	<KeyListEntry name="toggle-tiled-left"
-                      _description="View split on left"/>
-
-	<KeyListEntry name="toggle-tiled-right"
-                      _description="View split on right"/>
-
-</KeyListEntries>
-

src/Makefile.am

@@ -1,49 +1,28 @@
 # Flag build for parallelism; see https://savannah.gnu.org/patch/?6905
 .AUTOPARALLEL:
 
-lib_LTLIBRARIES = libmutter.la
+lib_LTLIBRARIES = libmutter-private.la
 
 SUBDIRS=wm-tester tools compositor/plugins
 
-INCLUDES=								\
-	$(MUTTER_CFLAGS)						\
-	-I$(srcdir)							\
-	-I$(srcdir)/core						\
-	-I$(srcdir)/ui							\
-	-I$(srcdir)/compositor						\
-	-DMUTTER_LIBEXECDIR=\"$(libexecdir)\"				\
-	-DHOST_ALIAS=\"@HOST_ALIAS@\"					\
-	-DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"		\
-	-DMUTTER_PKGDATADIR=\"$(pkgdatadir)\"				\
-	-DMUTTER_DATADIR=\"$(datadir)\"					\
-	-DG_LOG_DOMAIN=\"mutter\"					\
-	-DSN_API_NOT_YET_FROZEN=1					\
-	-DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION)			\
-	-DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION)			\
-	-DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION)			\
-	-DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION)	\
-	-DMUTTER_PKGLIBDIR=\"$(pkglibdir)\"				\
-	-DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"			\
-	-DGETTEXT_PACKAGE=\"$(GETTEXT_PACKAGE)\"
+INCLUDES=@MUTTER_CFLAGS@ -I $(srcdir)/include -I$(srcdir)/compositor -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" -DMUTTER_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"mutter\" -DSN_API_NOT_YET_FROZEN=1 -DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION) -DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION) -DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION) -DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION) -DMUTTER_PKGLIBDIR=\"$(pkglibdir)\" -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"
 
 mutter_built_sources = \
+	mutter-marshal.h \
+	mutter-marshal.c \
 	mutter-enum-types.h \
 	mutter-enum-types.c
 
-libmutter_la_SOURCES =				\
+mutter_SOURCES= 				\
 	core/async-getprop.c			\
 	core/async-getprop.h			\
 	core/bell.c				\
 	core/bell.h				\
 	core/boxes.c				\
 	core/boxes-private.h			\
-	meta/boxes.h				\
-	compositor/cogl-utils.c			\
-	compositor/cogl-utils.h			\
+	include/boxes.h				\
 	compositor/compositor.c			\
 	compositor/compositor-private.h		\
-	compositor/meta-background-actor.c	\
-	compositor/meta-background-actor-private.h	\
 	compositor/meta-module.c		\
 	compositor/meta-module.h		\
 	compositor/meta-plugin.c		\
@@ -53,8 +32,6 @@ libmutter_la_SOURCES =				\
 	compositor/meta-shadow-factory-private.h	\
 	compositor/meta-shaped-texture.c	\
 	compositor/meta-shaped-texture.h	\
-	compositor/meta-texture-rectangle.c	\
-	compositor/meta-texture-rectangle.h	\
 	compositor/meta-texture-tower.c		\
 	compositor/meta-texture-tower.h		\
 	compositor/meta-window-actor.c		\
@@ -65,37 +42,36 @@ libmutter_la_SOURCES =				\
 	compositor/meta-window-shape.h		\
 	compositor/region-utils.c		\
 	compositor/region-utils.h		\
-	meta/compositor.h			\
-	meta/meta-background-actor.h		\
-	meta/meta-plugin.h			\
-	meta/meta-shadow-factory.h		\
-	meta/meta-window-actor.h		\
-	meta/compositor-mutter.h 		\
-	core/above-tab-keycode.c		\
+	include/compositor.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			\
 	core/core.c				\
 	core/delete.c				\
 	core/display.c				\
 	core/display-private.h			\
-	meta/display.h				\
+	include/display.h			\
 	ui/draw-workspace.c			\
 	ui/draw-workspace.h			\
 	core/edge-resistance.c			\
 	core/edge-resistance.h			\
 	core/errors.c				\
-	meta/errors.h				\
+	include/errors.h			\
 	core/eventqueue.c			\
 	core/eventqueue.h			\
 	core/frame.c				\
-	core/frame.h				\
+	core/frame-private.h			\
+	include/frame.h				\
 	ui/gradient.c				\
-	meta/gradient.h				\
+	ui/gradient.h				\
 	core/group-private.h			\
 	core/group-props.c			\
 	core/group-props.h			\
 	core/group.c				\
-	meta/group.h				\
+	include/group.h				\
 	core/iconcache.c			\
 	core/iconcache.h			\
 	core/keybindings.c			\
@@ -105,11 +81,11 @@ libmutter_la_SOURCES =				\
 	core/place.c				\
 	core/place.h				\
 	core/prefs.c				\
-	meta/prefs.h				\
+	include/prefs.h				\
 	core/screen.c				\
 	core/screen-private.h			\
-	meta/screen.h				\
-	meta/types.h				\
+	include/screen.h			\
+	include/types.h                         \
 	core/session.c				\
 	core/session.h				\
 	core/stack.c				\
@@ -117,19 +93,19 @@ libmutter_la_SOURCES =				\
 	core/stack-tracker.c			\
 	core/stack-tracker.h			\
 	core/util.c				\
-	meta/util.h				\
+	include/util.h				\
 	core/window-props.c			\
 	core/window-props.h			\
 	core/window.c				\
 	core/window-private.h			\
-	meta/window.h				\
+	include/window.h			\
 	core/workspace.c			\
 	core/workspace-private.h		\
 	core/xprops.c				\
-	core/xprops.h				\
-	meta/common.h				\
-	core/core.h				\
-	ui/ui.h					\
+	include/xprops.h			\
+	include/common.h			\
+	include/core.h				\
+	include/ui.h				\
 	inlinepixbufs.h				\
 	ui/fixedtip.c				\
 	ui/fixedtip.h				\
@@ -140,55 +116,71 @@ libmutter_la_SOURCES =				\
 	ui/metaaccellabel.c			\
 	ui/metaaccellabel.h			\
 	ui/resizepopup.c			\
-	ui/resizepopup.h			\
+	include/resizepopup.h			\
 	ui/tabpopup.c				\
-	ui/tabpopup.h				\
+	include/tabpopup.h				\
 	ui/tile-preview.c			\
-	ui/tile-preview.h			\
+	include/tile-preview.h			\
 	ui/theme-parser.c			\
 	ui/theme.c				\
-	meta/theme.h				\
+	ui/theme.h				\
 	ui/theme-private.h			\
 	ui/ui.c					\
-	meta/preview-widget.h			\
-	ui/preview-widget.c			\
+	include/all-keybindings.h               \
 	$(mutter_built_sources)
 
-libmutter_la_LDFLAGS = -no-undefined
-libmutter_la_LIBADD  = $(MUTTER_LIBS)
+# by setting libmutter_private_la_CFLAGS, the files shared with
+# mutter proper will be compiled with different names.
+libmutter_private_la_CFLAGS =
+libmutter_private_la_SOURCES=			\
+	core/boxes.c				\
+	include/boxes.h				\
+	ui/gradient.c				\
+	ui/gradient.h				\
+	core/util.c				\
+	include/util.h				\
+	include/common.h			\
+	ui/preview-widget.c			\
+	ui/preview-widget.h			\
+	ui/theme-parser.c			\
+	ui/theme.c				\
+	ui/theme.h
+
+libmutter_private_la_LDFLAGS = -no-undefined
+libmutter_private_la_LIBADD  = @MUTTER_LIBS@
 
 # Headers installed for plugins; introspected information will
 # be extracted into Mutter-<version>.gir
 libmutterinclude_base_headers =		\
-	meta/boxes.h				\
-	meta/common.h				\
-	meta/compositor-mutter.h		\
-	meta/compositor.h			\
-	meta/display.h				\
-	meta/errors.h				\
-	meta/gradient.h				\
-	meta/group.h				\
-	meta/keybindings.h			\
-	meta/main.h				\
-	meta/meta-background-actor.h		\
-	meta/meta-plugin.h			\
-	meta/meta-shadow-factory.h		\
-	meta/meta-window-actor.h		\
-	meta/prefs.h				\
-	meta/screen.h				\
-	meta/theme.h				\
-	meta/types.h				\
-	meta/util.h				\
-	meta/window.h				\
-	meta/workspace.h
+	include/boxes.h				\
+	ui/gradient.h				\
+	include/main.h				\
+	include/util.h				\
+	include/common.h			\
+	ui/theme.h				\
+	include/prefs.h				\
+	include/window.h			\
+	include/workspace.h			\
+	include/compositor.h			\
+	include/compositor-mutter.h		\
+	include/types.h				\
+	include/errors.h			\
+	include/screen.h			\
+	include/display.h			\
+	include/group.h				\
+	include/keybindings.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
 # atomnames.h: macros cause problems for scanning process
 libmutterinclude_extra_headers =		\
-	meta/preview-widget.h			\
-	meta/atomnames.h
+	ui/preview-widget.h			\
+	include/atomnames.h
 
-libmutterincludedir = $(includedir)/mutter/meta
+libmutterincludedir = $(includedir)/mutter/mutter-private
 
 libmutterinclude_HEADERS =			\
 	$(libmutterinclude_base_headers)	\
@@ -199,18 +191,9 @@ mutter_theme_viewer_SOURCES=  \
 
 bin_PROGRAMS=mutter mutter-theme-viewer
 
-mutter_SOURCES = core/mutter.c
-mutter_LDADD = $(MUTTER_LIBS) libmutter.la
-
-if HAVE_INTROSPECTION
-include $(INTROSPECTION_MAKEFILE)
-
-# Since we don't make any guarantees about stability and we don't support
-# parallel install, there's no real reason to change directories, filenames,
-# etc. as we change the Mutter tarball version.
-#api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)
-api_version = 3.0
+api_version = $(MUTTER_MAJOR_VERSION).$(MUTTER_MINOR_VERSION)
 
+if WITH_INTROSPECTION
 # These files are in package-private directories, even though they may be used
 # by plugins.  If you're writing a plugin, use g-ir-compiler --add-include-path
 # and g-ir-compiler --includedir.
@@ -220,32 +203,50 @@ gir_DATA = Meta-$(api_version).gir
 typelibdir = $(pkglibdir)
 typelib_DATA = Meta-$(api_version).typelib
 
-INTROSPECTION_GIRS = Meta-$(api_version).gir
-
-Meta-$(api_version).gir: libmutter.la
-@META_GIR@_INCLUDES = GObject-2.0 GDesktopEnums-3.0 Gdk-3.0 Gtk-3.0 Clutter-1.0 xlib-2.0 xfixes-4.0
-@META_GIR@_PACKAGES = clutter-1.0 gtk+-3.0
-@META_GIR@_CFLAGS = $(INCLUDES)
-@META_GIR@_LIBS = libmutter.la
-@META_GIR@_FILES =				\
-	mutter-enum-types.h			\
-	$(libmutterinclude_base_headers)	\
-	$(filter %.c,$(libmutter_la_SOURCES))
-@META_GIR@_SCANNERFLAGS = --warn-all --warn-error
+# 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) 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-3.0			\
+		--include=Gtk-3.0			\
+		--include=Clutter-1.0			\
+		--pkg=clutter-1.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)				\
+		-o $$pwd/$@
 
+Meta-$(api_version).typelib: $(G_IR_COMPILER) Meta-$(api_version).gir
+	$(AM_V_GEN) LD_LIBRARY_PATH=$${LD_LIBRARY_PATH:+$$LD_LIBRARY_PATH:}. $(G_IR_COMPILER) Meta-$(api_version).gir -o $@
 endif
 
-mutter_theme_viewer_LDADD= $(MUTTER_LIBS) libmutter.la
+EFENCE=
+mutter_LDADD=@MUTTER_LIBS@ $(EFENCE)
+mutter_LDFLAGS=-export-dynamic
 
-testboxes_SOURCES = core/testboxes.c
-testgradient_SOURCES = ui/testgradient.c
-testasyncgetprop_SOURCES = core/testasyncgetprop.c
+mutter_theme_viewer_LDADD= @MUTTER_LIBS@ libmutter-private.la
+
+testboxes_SOURCES=include/util.h core/util.c include/boxes.h core/boxes.c core/testboxes.c
+testgradient_SOURCES=ui/gradient.h ui/gradient.c ui/testgradient.c
+testasyncgetprop_SOURCES=core/async-getprop.h core/async-getprop.c core/testasyncgetprop.c
 
 noinst_PROGRAMS=testboxes testgradient testasyncgetprop
 
-testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
-testgradient_LDADD = $(MUTTER_LIBS) libmutter.la
-testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la
+testboxes_LDADD= @MUTTER_LIBS@
+testgradient_LDADD= @MUTTER_LIBS@
+testasyncgetprop_LDADD= @MUTTER_LIBS@
 
 @INTLTOOL_DESKTOP_RULE@
 
@@ -259,17 +260,20 @@ wmproperties_in_files=mutter-wm.desktop.in
 wmproperties_files=$(wmproperties_in_files:.desktop.in=.desktop)
 wmproperties_DATA = $(wmproperties_files)
 
-xmldir       = @GNOME_KEYBINDINGS_KEYSDIR@
-xml_in_files = \
-        50-mutter-windows.xml.in
-xml_DATA     = $(xml_in_files:.xml.in=.xml)
+schemadir   = @GCONF_SCHEMA_FILE_DIR@
+schema_in_files = mutter.schemas.in
+schema_DATA = $(schema_in_files:.schemas.in=.schemas)
 
-gsettings_SCHEMAS = org.gnome.mutter.gschema.xml
 @INTLTOOL_XML_NOMERGE_RULE@
-@GSETTINGS_RULES@
 
-convertdir = $(datadir)/GConf/gsettings
-convert_DATA = mutter-schemas.convert
+@INTLTOOL_SCHEMAS_RULE@
+
+if GCONF_SCHEMAS_INSTALL
+install-data-local:
+	GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_DATA)
+else
+install-data-local:
+endif
 
 IMAGES=stock_maximize.png stock_minimize.png stock_delete.png
 VARIABLES=stock_maximize_data $(srcdir)/stock_maximize.png \
@@ -281,8 +285,7 @@ CLEANFILES =					\
 	inlinepixbufs.h				\
 	mutter.desktop				\
 	mutter-wm.desktop			\
-	org.gnome.mutter.gschema.xml		\
-	$(xml_DATA)				\
+	mutter.schemas				\
 	$(mutter_built_sources)			\
 	$(typelib_DATA)				\
 	$(gir_DATA)
@@ -292,31 +295,50 @@ inlinepixbufs.h: $(IMAGES)
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-pkgconfig_DATA = libmutter.pc mutter-plugins.pc
+pkgconfig_DATA = libmutter-private.pc mutter-plugins.pc
 
 EXTRA_DIST=$(desktopfiles_files) 	\
 	$(wmproperties_files)		\
 	$(IMAGES) 			\
 	$(desktopfiles_in_files)	\
 	$(wmproperties_in_files)	\
-	$(xml_in_files)			\
-	org.gnome.mutter.gschema.xml.in \
-	mutter-schemas.convert \
-	libmutter.pc.in \
+	$(schema_in_files)		\
+	libmutter-private.pc.in	\
 	mutter-plugins.pc.in  \
 	mutter-enum-types.h.in \
-	mutter-enum-types.c.in
+	mutter-enum-types.c.in \
+	mutter-marshal.list
 
 BUILT_SOURCES += $(mutter_built_sources)
-MUTTER_STAMP_FILES = stamp-mutter-enum-types.h
+MUTTER_STAMP_FILES = stamp-mutter-marshal.h stamp-mutter-enum-types.h
 CLEANFILES += $(MUTTER_STAMP_FILES)
 
+mutter-marshal.h: stamp-mutter-marshal.h
+	@true
+stamp-mutter-marshal.h: Makefile mutter-marshal.list
+	$(AM_V_GEN) $(GLIB_GENMARSHAL) \
+		--prefix=_mutter_marshal \
+		--header \
+	$(srcdir)/mutter-marshal.list > xgen-tmh && \
+	(cmp -s xgen-tmh mutter-marshal.h || cp -f xgen-tmh mutter-marshal.h) && \
+	rm -f xgen-tmh && \
+	echo timestamp > $(@F)
+
+mutter-marshal.c: Makefile mutter-marshal.list
+	 $(AM_V_GEN) (echo "#include \"mutter-marshal.h\"" ; \
+	 $(GLIB_GENMARSHAL) \
+		--prefix=_mutter_marshal \
+		--body \
+	 $(srcdir)/mutter-marshal.list ) > xgen-tmc && \
+	cp -f xgen-tmc mutter-marshal.c && \
+	rm -f xgen-tmc
+
 mutter-enum-types.h: stamp-mutter-enum-types.h Makefile
 	@true
 stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.in
 	$(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template mutter-enum-types.h.in \
+	    --template $(srcdir)/mutter-enum-types.h.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-teth && \
 	(cmp -s xgen-teth mutter-enum-types.h || cp xgen-teth mutter-enum-types.h) && \
 	rm -f xgen-teth && \
@@ -325,7 +347,7 @@ stamp-mutter-enum-types.h: $(libmutterinclude_base_headers) mutter-enum-types.h.
 mutter-enum-types.c: stamp-mutter-enum-types.h mutter-enum-types.c.in
 	  $(AM_V_GEN) ( cd $(srcdir) && \
 	  $(GLIB_MKENUMS) \
-	    --template mutter-enum-types.c.in \
+	    --template $(srcdir)/mutter-enum-types.c.in \
 	  $(libmutterinclude_base_headers) ) >> xgen-tetc && \
 	cp xgen-tetc mutter-enum-types.c && \
 	rm -f xgen-tetc

src/compositor/cogl-utils.c

@@ -1,110 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * Utilities for use with Cogl
- *
- * Copyright 2010 Red Hat, Inc.
- * Copyright 2010 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.
- */
-
-#include "cogl-utils.h"
-
-/**
- * meta_create_color_texture_4ub:
- * @red:
- * @green:
- * @blue:
- * @alpha:
- * @flags: Optional flags for the texture, or %COGL_TEXTURE_NONE;
- *   %COGL_TEXTURE_NO_SLICING is useful if the texture will be
- *   repeated to create a constant color fill, since hardware
- *   repeat can't be used for a sliced texture.
- *
- * Creates a texture that is a single pixel with the specified
- * unpremultiplied color components.
- *
- * Return value: (transfer full): a newly created Cogl texture
- */
-CoglHandle
-meta_create_color_texture_4ub (guint8           red,
-                               guint8           green,
-                               guint8           blue,
-                               guint8           alpha,
-                               CoglTextureFlags flags)
-{
-  CoglColor color;
-  guint8 pixel[4];
-
-  cogl_color_set_from_4ub (&color, red, green, blue, alpha);
-  cogl_color_premultiply (&color);
-
-  pixel[0] = cogl_color_get_red_byte (&color);
-  pixel[1] = cogl_color_get_green_byte (&color);
-  pixel[2] = cogl_color_get_blue_byte (&color);
-  pixel[3] = cogl_color_get_alpha_byte (&color);
-
-  return cogl_texture_new_from_data (1, 1,
-                                     flags,
-                                     COGL_PIXEL_FORMAT_RGBA_8888_PRE,
-                                     COGL_PIXEL_FORMAT_ANY,
-                                     4, pixel);
-}
-
-
-/* Based on gnome-shell/src/st/st-private.c:_st_create_texture_material.c */
-
-/**
- * meta_create_texture_material:
- * @src_texture: (allow-none): texture to use initially for the layer
- *
- * Creates a material with a single layer. Using a common template
- * allows sharing a shader for different uses in Mutter. To share the same
- * shader with all other materials that are just texture plus opacity
- * would require Cogl fixes.
- * (See http://bugzilla.clutter-project.org/show_bug.cgi?id=2425)
- *
- * Return value: (transfer full): a newly created Cogl material
- */
-CoglHandle
-meta_create_texture_material (CoglHandle src_texture)
-{
-  static CoglHandle texture_material_template = COGL_INVALID_HANDLE;
-  CoglHandle material;
-
-  /* We use a material that has a dummy texture as a base for all
-     texture materials. The idea is that only the Cogl texture object
-     would be different in the children so it is likely that Cogl will
-     be able to share GL programs between all the textures. */
-  if (G_UNLIKELY (texture_material_template == COGL_INVALID_HANDLE))
-    {
-      CoglHandle dummy_texture;
-
-      dummy_texture = meta_create_color_texture_4ub (0xff, 0xff, 0xff, 0xff,
-                                                     COGL_TEXTURE_NONE);
-
-      texture_material_template = cogl_material_new ();
-      cogl_material_set_layer (texture_material_template, 0, dummy_texture);
-      cogl_handle_unref (dummy_texture);
-    }
-
-  material = cogl_material_copy (texture_material_template);
-
-  if (src_texture != COGL_INVALID_HANDLE)
-    cogl_material_set_layer (material, 0, src_texture);
-
-  return material;
-}

src/compositor/compositor-private.h

@@ -5,10 +5,9 @@
 
 #include <X11/extensions/Xfixes.h>
 
-#include <meta/compositor.h>
-#include <meta/display.h>
+#include "compositor.h"
+#include "display.h"
 #include "meta-plugin-manager.h"
-#include "meta-window-actor-private.h"
 #include <clutter/clutter.h>
 
 typedef struct _MetaCompScreen MetaCompScreen;
@@ -36,16 +35,11 @@ struct _MetaCompScreen
   MetaScreen            *screen;
 
   ClutterActor          *stage, *window_group, *overlay_group;
-  ClutterActor          *background_actor;
   ClutterActor		*hidden_group;
   GList                 *windows;
   GHashTable            *windows_by_xid;
   Window                 output;
 
-  /* Used for unredirecting fullscreen windows */
-  guint                   disable_unredirect_count;
-  MetaWindowActor             *unredirected_window;
-
   /* Before we create the output window */
   XserverRegion     pending_input_region;
 

src/compositor/compositor.c

@@ -4,20 +4,18 @@
 
 #include <clutter/x11/clutter-x11.h>
 
-#include <meta/screen.h>
-#include <meta/errors.h>
-#include <meta/window.h>
+#include "screen.h"
+#include "errors.h"
+#include "window.h"
 #include "compositor-private.h"
-#include <meta/compositor-mutter.h>
+#include "compositor-mutter.h"
 #include "xprops.h"
-#include <meta/prefs.h>
-#include <meta/main.h>
-#include <meta/meta-shadow-factory.h>
+#include "prefs.h"
+#include "meta-shadow-factory.h"
 #include "meta-window-actor-private.h"
 #include "meta-window-group.h"
-#include "meta-background-actor-private.h"
-#include "window-private.h" /* to check window->hidden */
-#include "display-private.h" /* for meta_display_lookup_x_window() */
+#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>
 #include <X11/extensions/Xcomposite.h>
 
@@ -36,7 +34,7 @@ composite_at_least_version (MetaDisplay *display, int maj, int min)
   return (major > maj || (major == maj && minor >= min));
 }
 
-static void sync_actor_stacking (MetaCompScreen *info);
+static void sync_actor_stacking (GList *windows);
 
 static void
 meta_finish_workspace_switch (MetaCompScreen *info)
@@ -50,7 +48,7 @@ meta_finish_workspace_switch (MetaCompScreen *info)
   /*
    * Fix up stacking order in case the plugin messed it up.
    */
-  sync_actor_stacking (info);
+  sync_actor_stacking (info->windows);
 
 /*   printf ("... FINISHED DESKTOP SWITCH\n"); */
 
@@ -89,7 +87,7 @@ add_win (MetaWindow *window)
 
   meta_window_actor_new (window);
 
-  sync_actor_stacking (info);
+  sync_actor_stacking (info->windows);
 }
 
 static void
@@ -109,6 +107,28 @@ process_damage (MetaCompositor     *compositor,
   meta_window_actor_process_damage (window_actor, event);
 }
 
+#ifdef HAVE_SHAPE
+static void
+process_shape (MetaCompositor *compositor,
+               XShapeEvent    *event,
+               MetaWindow     *window)
+{
+  MetaWindowActor *window_actor;
+
+  if (window == NULL)
+    return;
+
+  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
+  if (window_actor == NULL)
+    return;
+
+  if (event->kind == ShapeBounding)
+    {
+      meta_window_actor_update_shape (window_actor, event->shaped);
+    }
+}
+#endif
+
 static void
 process_property_notify (MetaCompositor	*compositor,
                          XPropertyEvent *event,
@@ -116,21 +136,6 @@ process_property_notify (MetaCompositor	*compositor,
 {
   MetaWindowActor *window_actor;
 
-  if (event->atom == compositor->atom_x_root_pixmap)
-    {
-      GSList *l;
-
-      for (l = meta_display_get_screens (compositor->display); l; l = l->next)
-        {
-	  MetaScreen  *screen = l->data;
-          if (event->window == meta_screen_get_xroot (screen))
-            {
-              meta_background_actor_update (screen);
-              return;
-            }
-        }
-    }
-
   if (window == NULL)
     return;
 
@@ -231,27 +236,6 @@ meta_get_window_group_for_screen (MetaScreen *screen)
   return info->window_group;
 }
 
-/**
- * meta_get_background_actor_for_screen:
- * @screen: a #MetaScreen
- *
- * Gets the actor that draws the root window background under the windows.
- * The root window background automatically tracks the image or color set
- * by the environment.
- *
- * Returns: (transfer none): The background actor corresponding to @screen
- */
-ClutterActor *
-meta_get_background_actor_for_screen (MetaScreen *screen)
-{
-  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-
-  if (!info)
-    return NULL;
-
-  return info->background_actor;
-}
-
 /**
  * meta_get_window_actors:
  * @screen: a #MetaScreen
@@ -279,12 +263,6 @@ do_set_stage_input_region (MetaScreen   *screen,
   Window        xstage = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));
 
   XFixesSetWindowShapeRegion (xdpy, xstage, ShapeInput, 0, 0, region);
-
-  /* It's generally a good heuristic that when a crossing event is generated because
-   * we reshape the overlay, we don't want it to affect focus-follows-mouse focus -
-   * it's not the user doing something, it's the environment changing under the user.
-   */
-  meta_display_add_ignored_crossing_serial (display, XNextRequest (xdpy));
   XFixesSetWindowShapeRegion (xdpy, info->output, ShapeInput, 0, 0, region);
 }
 
@@ -458,43 +436,20 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   gint            width, height;
   XWindowAttributes attr;
   long            event_mask;
-  guint           n_retries;
-  guint           max_retries;
 
   /* Check if the screen is already managed */
   if (meta_screen_get_compositor_data (screen))
     return;
 
-  if (meta_get_replace_current_wm ())
-    max_retries = 5;
-  else
-    max_retries = 1;
+  meta_error_trap_push_with_return (display);
+  XCompositeRedirectSubwindows (xdisplay, xroot, CompositeRedirectManual);
+  XSync (xdisplay, FALSE);
 
-  n_retries = 0;
-
-  /* Some compositors (like old versions of Mutter) might not properly unredirect
-   * subwindows before destroying the WM selection window; so we wait a while
-   * for such a compositor to exit before giving up.
-   */
-  while (TRUE)
+  if (meta_error_trap_pop_with_return (display))
     {
-      meta_error_trap_push_with_return (display);
-      XCompositeRedirectSubwindows (xdisplay, xroot, CompositeRedirectManual);
-      XSync (xdisplay, FALSE);
-
-      if (!meta_error_trap_pop_with_return (display))
-        break;
-
-      if (n_retries == max_retries)
-        {
-          /* This probably means that a non-WM compositor like xcompmgr is running;
-           * we have no way to get it to exit */
-          meta_fatal (_("Another compositing manager is already running on screen %i on display \"%s\"."),
-                      screen_number, display->name);
-        }
-
-      n_retries++;
-      g_usleep (G_USEC_PER_SEC);
+      g_warning ("Another compositing manager is running on screen %i",
+                 screen_number);
+      return;
     }
 
   info = g_new0 (MetaCompScreen, 1);
@@ -515,15 +470,13 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
 
   meta_screen_set_cm_selection (screen);
 
-  info->stage = clutter_stage_new ();
+  info->stage = clutter_stage_get_default ();
 
   meta_screen_get_size (screen, &width, &height);
-  clutter_actor_realize (info->stage);
+  clutter_actor_set_size (info->stage, width, height);
 
   xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));
 
-  XResizeWindow (xdisplay, xwin, width, height);
-
   event_mask = FocusChangeMask |
                ExposureMask |
                EnterWindowMask | LeaveWindowMask |
@@ -541,14 +494,9 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
   XSelectInput (xdisplay, xwin, event_mask);
 
   info->window_group = meta_window_group_new (screen);
-  info->background_actor = meta_background_actor_new_for_screen (screen);
   info->overlay_group = clutter_group_new ();
   info->hidden_group = clutter_group_new ();
 
-  clutter_container_add (CLUTTER_CONTAINER (info->window_group),
-                         info->background_actor,
-                         NULL);
-
   clutter_container_add (CLUTTER_CONTAINER (info->stage),
                          info->window_group,
                          info->overlay_group,
@@ -559,7 +507,18 @@ meta_compositor_manage_screen (MetaCompositor *compositor,
 
   info->plugin_mgr =
     meta_plugin_manager_get (screen);
-  meta_plugin_manager_initialize (info->plugin_mgr);
+
+  if (info->plugin_mgr != meta_plugin_manager_get_default ())
+    {
+      /* The default plugin manager has been initialized during
+       * global preferences load.
+       */
+      if (!meta_plugin_manager_load (info->plugin_mgr))
+        g_critical ("failed to load plugins");
+    }
+
+  if (!meta_plugin_manager_initialize (info->plugin_mgr))
+    g_critical ("failed to initialize plugins");
 
   /*
    * Delay the creation of the overlay window as long as we can, to avoid
@@ -596,55 +555,6 @@ void
 meta_compositor_unmanage_screen (MetaCompositor *compositor,
                                  MetaScreen     *screen)
 {
-  MetaDisplay    *display       = meta_screen_get_display (screen);
-  Display        *xdisplay      = meta_display_get_xdisplay (display);
-  Window          xroot         = meta_screen_get_xroot (screen);
-
-  /* This is the most important part of cleanup - we have to do this
-   * before giving up the window manager selection or the next
-   * window manager won't be able to redirect subwindows */
-  XCompositeUnredirectSubwindows (xdisplay, xroot, CompositeRedirectManual);
-}
-
-/*
- * Shapes the cow so that the given window is exposed,
- * when metaWindow is NULL it clears the shape again
- */
-static void
-meta_shape_cow_for_window (MetaScreen *screen,
-                           MetaWindow *metaWindow)
-{
-  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-  Display *xdisplay = meta_display_get_xdisplay (meta_screen_get_display (screen));
-
-  if (metaWindow == NULL)
-      XFixesSetWindowShapeRegion (xdisplay, info->output, ShapeBounding, 0, 0, None);
-  else
-    {
-      XserverRegion output_region;
-      XRectangle screen_rect, window_bounds;
-      int width, height;
-      MetaRectangle rect;
-
-      meta_window_get_outer_rect (metaWindow, &rect);
-
-      window_bounds.x = rect.x;
-      window_bounds.y = rect.y;
-      window_bounds.width = rect.width;
-      window_bounds.height = rect.height;
-
-      meta_screen_get_size (screen, &width, &height);
-      screen_rect.x = 0;
-      screen_rect.y = 0;
-      screen_rect.width = width;
-      screen_rect.height = height;
-
-      output_region = XFixesCreateRegion (xdisplay, &window_bounds, 1);
-
-      XFixesInvertRegion (xdisplay, output_region, &screen_rect, output_region);
-      XFixesSetWindowShapeRegion (xdisplay, info->output, ShapeBounding, 0, 0, output_region);
-      XFixesDestroyRegion (xdisplay, output_region);
-    }
 }
 
 void
@@ -667,25 +577,12 @@ meta_compositor_remove_window (MetaCompositor *compositor,
                                MetaWindow     *window)
 {
   MetaWindowActor         *window_actor     = NULL;
-  MetaScreen *screen;
-  MetaCompScreen *info;
 
   DEBUG_TRACE ("meta_compositor_remove_window\n");
   window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
   if (!window_actor)
     return;
 
-  screen = meta_window_get_screen (window);
-  info = meta_screen_get_compositor_data (screen);
-
-  if (window_actor == info->unredirected_window)
-    {
-      meta_window_actor_set_redirected (window_actor, TRUE);
-      meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (info->unredirected_window)),
-                                 NULL);
-      info->unredirected_window = NULL;
-    }
-
   meta_window_actor_destroy (window_actor);
 }
 
@@ -713,16 +610,6 @@ is_grabbed_event (XEvent *event)
 
   return FALSE;
 }
-
-void
-meta_compositor_window_shape_changed (MetaCompositor *compositor,
-                                      MetaWindow     *window)
-{
-  MetaWindowActor *window_actor;
-  window_actor = META_WINDOW_ACTOR (meta_window_get_compositor_private (window));
-  meta_window_actor_update_shape (window_actor);
-}
-
 /**
  * meta_compositor_process_event: (skip)
  *
@@ -802,6 +689,13 @@ meta_compositor_process_event (MetaCompositor *compositor,
 	  DEBUG_TRACE ("meta_compositor_process_event (process_damage)\n");
           process_damage (compositor, (XDamageNotifyEvent *) event, window);
         }
+#ifdef HAVE_SHAPE
+      else if (event->type == meta_display_get_shape_event_base (compositor->display) + ShapeNotify)
+	{
+	  DEBUG_TRACE ("meta_compositor_process_event (process_shape)\n");
+	  process_shape (compositor, (XShapeEvent *) event, window);
+	}
+#endif /* HAVE_SHAPE */
       break;
     }
 
@@ -933,73 +827,18 @@ meta_compositor_switch_workspace (MetaCompositor     *compositor,
 }
 
 static void
-sync_actor_stacking (MetaCompScreen *info)
+sync_actor_stacking (GList *windows)
 {
-  GList *children;
   GList *tmp;
-  GList *old;
-  gboolean reordered;
 
-  /* NB: The first entries in the lists are stacked the lowest */
+  /* NB: The first entry in the list is stacked the lowest */
 
-  /* Restacking will trigger full screen redraws, so it's worth a
-   * little effort to make sure we actually need to restack before
-   * we go ahead and do it */
-
-  children = clutter_container_get_children (CLUTTER_CONTAINER (info->window_group));
-  reordered = FALSE;
-
-  old = children;
-
-  /* We allow for actors in the window group other than the actors we
-   * know about, but it's up to a plugin to try and keep them stacked correctly
-   * (we really need extra API to make that reliable.)
-   */
-
-  /* Of the actors we know, the bottom actor should be the background actor */
-
-  while (old && old->data != info->background_actor && !META_IS_WINDOW_ACTOR (old->data))
-    old = old->next;
-  if (old == NULL || old->data != info->background_actor)
-    {
-      reordered = TRUE;
-      goto done_with_check;
-    }
-
-  /* Then the window actors should follow in sequence */
-
-  old = old->next;
-  for (tmp = info->windows; tmp != NULL; tmp = tmp->next)
-    {
-      while (old && !META_IS_WINDOW_ACTOR (old->data))
-        old = old->next;
-
-      /* old == NULL: someone reparented a window out of the window group,
-       * order undefined, always restack */
-      if (old == NULL || old->data != tmp->data)
-        {
-          reordered = TRUE;
-          goto done_with_check;
-        }
-
-      old = old->next;
-    }
-
- done_with_check:
-
-  g_list_free (children);
-
-  if (!reordered)
-    return;
-
-  for (tmp = g_list_last (info->windows); tmp != NULL; tmp = tmp->prev)
+  for (tmp = g_list_last (windows); tmp != NULL; tmp = tmp->prev)
     {
       MetaWindowActor *window_actor = tmp->data;
 
       clutter_actor_lower_bottom (CLUTTER_ACTOR (window_actor));
     }
-
-  clutter_actor_lower_bottom (info->background_actor);
 }
 
 void
@@ -1037,10 +876,7 @@ meta_compositor_sync_stack (MetaCompositor  *compositor,
 
           if (old_window->hidden &&
               !meta_window_actor_effect_in_progress (old_actor))
-            {
-              old_stack = g_list_delete_link (old_stack, old_stack);
-              old_actor = NULL;
-            }
+            old_stack = g_list_delete_link (old_stack, old_stack);
           else
             break;
         }
@@ -1091,7 +927,7 @@ meta_compositor_sync_stack (MetaCompositor  *compositor,
       old_stack = g_list_remove (old_stack, actor);
     }
 
-  sync_actor_stacking (info);
+  sync_actor_stacking (info->windows);
 }
 
 void
@@ -1141,20 +977,12 @@ meta_compositor_sync_screen_size (MetaCompositor  *compositor,
 				  guint		   width,
 				  guint		   height)
 {
-  MetaDisplay    *display = meta_screen_get_display (screen);
-  MetaCompScreen *info    = meta_screen_get_compositor_data (screen);
-  Display        *xdisplay;
-  Window          xwin;
+  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
 
   DEBUG_TRACE ("meta_compositor_sync_screen_size\n");
   g_return_if_fail (info);
 
-  xdisplay = meta_display_get_xdisplay (display);
-  xwin = clutter_x11_get_stage_window (CLUTTER_STAGE (info->stage));
-
-  XResizeWindow (xdisplay, xwin, width, height);
-
-  meta_background_actor_screen_size_changed (screen);
+  clutter_actor_set_size (info->stage, width, height);
 
   meta_verbose ("Changed size for stage on screen %d to %dx%d\n",
 		meta_screen_get_screen_number (screen),
@@ -1165,36 +993,6 @@ static void
 pre_paint_windows (MetaCompScreen *info)
 {
   GList *l;
-  MetaWindowActor *top_window;
-  MetaWindowActor *expected_unredirected_window = NULL;
-
-  if (info->windows == NULL)
-    return;
-
-  top_window = g_list_last (info->windows)->data;
-
-  if (meta_window_actor_should_unredirect (top_window) &&
-      info->disable_unredirect_count == 0)
-    expected_unredirected_window = top_window;
-
-  if (info->unredirected_window != expected_unredirected_window)
-    {
-      if (info->unredirected_window != NULL)
-        {
-          meta_window_actor_set_redirected (info->unredirected_window, TRUE);
-          meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (info->unredirected_window)),
-                                     NULL);
-        }
-
-      if (expected_unredirected_window != NULL)
-        {
-          meta_shape_cow_for_window (meta_window_get_screen (meta_window_actor_get_meta_window (top_window)),
-                                     meta_window_actor_get_meta_window (top_window));
-          meta_window_actor_set_redirected (top_window, FALSE);
-        }
-
-      info->unredirected_window = expected_unredirected_window;
-    }
 
   for (l = info->windows; l; l = l->next)
     meta_window_actor_pre_paint (l->data);
@@ -1297,78 +1095,3 @@ meta_get_overlay_window (MetaScreen *screen)
 
   return info->output;
 }
-
-/**
- * meta_disable_unredirect_for_screen:
- * @screen: a #MetaScreen
- *
- * Disables unredirection, can be usefull in situations where having
- * unredirected windows is undesireable like when recording a video.
- *
- */
-void
-meta_disable_unredirect_for_screen (MetaScreen *screen)
-{
-  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-  if (info != NULL)
-    info->disable_unredirect_count = info->disable_unredirect_count + 1;
-}
-
-/**
- * meta_enable_unredirect_for_screen:
- * @screen: a #MetaScreen
- *
- * Enables unredirection which reduces the overhead for apps like games.
- *
- */
-void
-meta_enable_unredirect_for_screen (MetaScreen *screen)
-{
-  MetaCompScreen *info = meta_screen_get_compositor_data (screen);
-  if (info != NULL)
-   info->disable_unredirect_count = MAX(0, info->disable_unredirect_count - 1);
-}
-
-#define FLASH_TIME_MS 50
-
-static void
-flash_out_completed (ClutterAnimation *animation,
-                     ClutterActor     *flash)
-{
-  clutter_actor_destroy (flash);
-}
-
-static void
-flash_in_completed (ClutterAnimation *animation,
-                    ClutterActor     *flash)
-{
-  clutter_actor_animate (flash, CLUTTER_EASE_IN_QUAD,
-                         FLASH_TIME_MS,
-                         "opacity", 0,
-                         "signal-after::completed", flash_out_completed, flash,
-                         NULL);
-}
-
-void
-meta_compositor_flash_screen (MetaCompositor *compositor,
-                              MetaScreen     *screen)
-{
-  ClutterActor *stage;
-  ClutterActor *flash;
-  ClutterColor black = { 0, 0, 0, 255 };
-  gfloat width, height;
-
-  stage = meta_get_stage_for_screen (screen);
-  clutter_actor_get_size (stage, &width, &height);
-
-  flash = clutter_rectangle_new_with_color (&black);
-  clutter_actor_set_size (flash, width, height);
-  clutter_actor_set_opacity (flash, 0);
-  clutter_container_add_actor (CLUTTER_CONTAINER (stage), flash);
-
-  clutter_actor_animate (flash, CLUTTER_EASE_OUT_QUAD,
-                         FLASH_TIME_MS,
-                         "opacity", 192,
-                         "signal-after::completed", flash_in_completed, flash,
-                         NULL);
-}

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

@@ -1,15 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-#ifndef META_BACKGROUND_ACTOR_PRIVATE_H
-#define META_BACKGROUND_ACTOR_PRIVATE_H
-
-#include <meta/screen.h>
-#include <meta/meta-background-actor.h>
-
-void meta_background_actor_set_visible_region  (MetaBackgroundActor *self,
-                                                cairo_region_t      *visible_region);
-
-void meta_background_actor_update              (MetaScreen *screen);
-void meta_background_actor_screen_size_changed (MetaScreen *screen);
-
-#endif /* META_BACKGROUND_ACTOR_PRIVATE_H */

src/compositor/meta-background-actor.c

@@ -1,614 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-/*
- * meta-background-actor.c: Actor for painting the root window background
- *
- * Copyright 2009 Sander Dijkhuis
- * Copyright 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.
- *
- * Portions adapted from gnome-shell/src/shell-global.c
- */
-
-#include <config.h>
-
-#define COGL_ENABLE_EXPERIMENTAL_API
-#include <cogl/cogl-texture-pixmap-x11.h>
-
-#include <X11/Xatom.h>
-
-#include "cogl-utils.h"
-#include "compositor-private.h"
-#include <meta/errors.h>
-#include "meta-background-actor-private.h"
-
-/* We allow creating multiple MetaBackgroundActors for the same MetaScreen to
- * allow different rendering options to be set for different copies.
- * But we want to share the same underlying CoglTexture for efficiency and
- * to avoid driver bugs that might occur if we created multiple CoglTexturePixmaps
- * for the same pixmap.
- *
- * This structure holds common information.
- */
-typedef struct _MetaScreenBackground MetaScreenBackground;
-
-struct _MetaScreenBackground
-{
-  MetaScreen *screen;
-  GSList *actors;
-
-  float texture_width;
-  float texture_height;
-  CoglHandle texture;
-  CoglMaterialWrapMode wrap_mode;
-  guint have_pixmap : 1;
-};
-
-struct _MetaBackgroundActorPrivate
-{
-  MetaScreenBackground *background;
-  CoglHandle material;
-  cairo_region_t *visible_region;
-  float dim_factor;
-};
-
-enum
-{
-  PROP_0,
-
-  PROP_DIM_FACTOR,
-
-  PROP_LAST
-};
-
-static GParamSpec *obj_props[PROP_LAST];
-
-G_DEFINE_TYPE (MetaBackgroundActor, meta_background_actor, CLUTTER_TYPE_ACTOR);
-
-static void set_texture                (MetaScreenBackground *background,
-                                        CoglHandle            texture);
-static void set_texture_to_stage_color (MetaScreenBackground *background);
-
-static void
-on_notify_stage_color (GObject              *stage,
-                       GParamSpec           *pspec,
-                       MetaScreenBackground *background)
-{
-  if (!background->have_pixmap)
-    set_texture_to_stage_color (background);
-}
-
-static void
-free_screen_background (MetaScreenBackground *background)
-{
-  set_texture (background, COGL_INVALID_HANDLE);
-
-  if (background->screen != NULL)
-    {
-      ClutterActor *stage = meta_get_stage_for_screen (background->screen);
-      g_signal_handlers_disconnect_by_func (stage,
-                                            (gpointer) on_notify_stage_color,
-                                            background);
-      background->screen = NULL;
-    }
-}
-
-static MetaScreenBackground *
-meta_screen_background_get (MetaScreen *screen)
-{
-  MetaScreenBackground *background;
-
-  background = g_object_get_data (G_OBJECT (screen), "meta-screen-background");
-  if (background == NULL)
-    {
-      ClutterActor *stage;
-
-      background = g_new0 (MetaScreenBackground, 1);
-
-      background->screen = screen;
-      g_object_set_data_full (G_OBJECT (screen), "meta-screen-background",
-                              background, (GDestroyNotify) free_screen_background);
-
-      stage = meta_get_stage_for_screen (screen);
-      g_signal_connect (stage, "notify::color",
-                        G_CALLBACK (on_notify_stage_color), background);
-
-      meta_background_actor_update (screen);
-    }
-
-  return background;
-}
-
-static void
-update_wrap_mode_of_actor (MetaBackgroundActor *self)
-{
-  MetaBackgroundActorPrivate *priv = self->priv;
-
-  cogl_material_set_layer_wrap_mode (priv->material, 0, priv->background->wrap_mode);
-}
-
-static void
-update_wrap_mode (MetaScreenBackground *background)
-{
-  GSList *l;
-  int width, height;
-
-  meta_screen_get_size (background->screen, &width, &height);
-
-  /* We turn off repeating when we have a full-screen pixmap to keep from
-   * getting artifacts from one side of the image sneaking into the other
-   * side of the image via bilinear filtering.
-   */
-  if (width == background->texture_width && height == background->texture_height)
-    background->wrap_mode = COGL_MATERIAL_WRAP_MODE_CLAMP_TO_EDGE;
-  else
-    background->wrap_mode = COGL_MATERIAL_WRAP_MODE_REPEAT;
-
-  for (l = background->actors; l; l = l->next)
-    update_wrap_mode_of_actor (l->data);
-}
-
-static void
-set_texture_on_actor (MetaBackgroundActor *self)
-{
-  MetaBackgroundActorPrivate *priv = self->priv;
-  MetaDisplay *display = meta_screen_get_display (priv->background->screen);
-
-  /* This may trigger destruction of an old texture pixmap, which, if
-   * the underlying X pixmap is already gone has the tendency to trigger
-   * X errors inside DRI. For safety, trap errors */
-  meta_error_trap_push (display);
-  cogl_material_set_layer (priv->material, 0, priv->background->texture);
-  meta_error_trap_pop (display);
-
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
-}
-
-static void
-set_texture (MetaScreenBackground *background,
-             CoglHandle            texture)
-{
-  MetaDisplay *display = meta_screen_get_display (background->screen);
-  GSList *l;
-
-  /* This may trigger destruction of an old texture pixmap, which, if
-   * the underlying X pixmap is already gone has the tendency to trigger
-   * X errors inside DRI. For safety, trap errors */
-  meta_error_trap_push (display);
-  if (background->texture != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (background->texture);
-      background->texture = COGL_INVALID_HANDLE;
-    }
-  meta_error_trap_pop (display);
-
-  if (texture != COGL_INVALID_HANDLE)
-    background->texture = cogl_handle_ref (texture);
-
-  background->texture_width = cogl_texture_get_width (background->texture);
-  background->texture_height = cogl_texture_get_height (background->texture);
-
-  for (l = background->actors; l; l = l->next)
-    set_texture_on_actor (l->data);
-
-  update_wrap_mode (background);
-}
-
-/* Sets our material to paint with a 1x1 texture of the stage's background
- * color; doing this when we have no pixmap allows the application to turn
- * off painting the stage. There might be a performance benefit to
- * painting in this case with a solid color, but the normal solid color
- * case is a 1x1 root pixmap, so we'd have to reverse-engineer that to
- * actually pick up the (small?) performance win. This is just a fallback.
- */
-static void
-set_texture_to_stage_color (MetaScreenBackground *background)
-{
-  ClutterActor *stage = meta_get_stage_for_screen (background->screen);
-  ClutterColor color;
-  CoglHandle texture;
-
-  clutter_stage_get_color (CLUTTER_STAGE (stage), &color);
-
-  /* Slicing will prevent COGL from using hardware texturing for
-   * the tiled 1x1 pixmap, and will cause it to draw the window
-   * background in millions of separate 1x1 rectangles */
-  texture = meta_create_color_texture_4ub (color.red, color.green,
-                                           color.blue, 0xff,
-                                           COGL_TEXTURE_NO_SLICING);
-  set_texture (background, texture);
-  cogl_handle_unref (texture);
-}
-
-static void
-meta_background_actor_dispose (GObject *object)
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
-  MetaBackgroundActorPrivate *priv = self->priv;
-
-  meta_background_actor_set_visible_region (self, NULL);
-
-  if (priv->background != NULL)
-    {
-      priv->background->actors = g_slist_remove (priv->background->actors, self);
-      priv->background = NULL;
-    }
-
-  if (priv->material != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (priv->material);
-      priv->material = COGL_INVALID_HANDLE;
-    }
-}
-
-static void
-meta_background_actor_get_preferred_width (ClutterActor *actor,
-                                           gfloat        for_height,
-                                           gfloat       *min_width_p,
-                                           gfloat       *natural_width_p)
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  MetaBackgroundActorPrivate *priv = self->priv;
-  int width, height;
-
-  meta_screen_get_size (priv->background->screen, &width, &height);
-
-  if (min_width_p)
-    *min_width_p = width;
-  if (natural_width_p)
-    *natural_width_p = width;
-}
-
-static void
-meta_background_actor_get_preferred_height (ClutterActor *actor,
-                                            gfloat        for_width,
-                                            gfloat       *min_height_p,
-                                            gfloat       *natural_height_p)
-
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  MetaBackgroundActorPrivate *priv = self->priv;
-  int width, height;
-
-  meta_screen_get_size (priv->background->screen, &width, &height);
-
-  if (min_height_p)
-    *min_height_p = height;
-  if (natural_height_p)
-    *natural_height_p = height;
-}
-
-static void
-meta_background_actor_paint (ClutterActor *actor)
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  MetaBackgroundActorPrivate *priv = self->priv;
-  guint8 opacity = clutter_actor_get_paint_opacity (actor);
-  guint8 color_component;
-  int width, height;
-
-  meta_screen_get_size (priv->background->screen, &width, &height);
-
-  color_component = (int)(0.5 + opacity * priv->dim_factor);
-
-  cogl_material_set_color4ub (priv->material,
-                              color_component,
-                              color_component,
-                              color_component,
-                              opacity);
-
-  cogl_set_source (priv->material);
-
-  if (priv->visible_region)
-    {
-      int n_rectangles = cairo_region_num_rectangles (priv->visible_region);
-      int i;
-
-      for (i = 0; i < n_rectangles; i++)
-        {
-          cairo_rectangle_int_t rect;
-          cairo_region_get_rectangle (priv->visible_region, i, &rect);
-
-          cogl_rectangle_with_texture_coords (rect.x, rect.y,
-                                              rect.x + rect.width, rect.y + rect.height,
-                                              rect.x / priv->background->texture_width,
-                                              rect.y / priv->background->texture_height,
-                                              (rect.x + rect.width) / priv->background->texture_width,
-                                              (rect.y + rect.height) / priv->background->texture_height);
-        }
-    }
-  else
-    {
-      cogl_rectangle_with_texture_coords (0.0f, 0.0f,
-                                          width, height,
-                                          0.0f, 0.0f,
-                                          width / priv->background->texture_width,
-                                          height / priv->background->texture_height);
-    }
-}
-
-static gboolean
-meta_background_actor_get_paint_volume (ClutterActor       *actor,
-                                        ClutterPaintVolume *volume)
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (actor);
-  MetaBackgroundActorPrivate *priv = self->priv;
-  int width, height;
-
-  meta_screen_get_size (priv->background->screen, &width, &height);
-
-  clutter_paint_volume_set_width (volume, width);
-  clutter_paint_volume_set_height (volume, height);
-
-  return TRUE;
-}
-
-static void
-meta_background_actor_set_dim_factor (MetaBackgroundActor *self,
-                                      gfloat               dim_factor)
-{
-  MetaBackgroundActorPrivate *priv = self->priv;
-
-  if (priv->dim_factor == dim_factor)
-    return;
-
-  priv->dim_factor = dim_factor;
-
-  clutter_actor_queue_redraw (CLUTTER_ACTOR (self));
-
-  g_object_notify_by_pspec (G_OBJECT (self), obj_props[PROP_DIM_FACTOR]);
-}
-
-static void
-meta_background_actor_get_property(GObject         *object,
-                                   guint            prop_id,
-                                   GValue          *value,
-                                   GParamSpec      *pspec)
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
-  MetaBackgroundActorPrivate *priv = self->priv;
-
-  switch (prop_id)
-    {
-    case PROP_DIM_FACTOR:
-      g_value_set_float (value, priv->dim_factor);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-meta_background_actor_set_property(GObject         *object,
-                                   guint            prop_id,
-                                   const GValue    *value,
-                                   GParamSpec      *pspec)
-{
-  MetaBackgroundActor *self = META_BACKGROUND_ACTOR (object);
-
-  switch (prop_id)
-    {
-    case PROP_DIM_FACTOR:
-      meta_background_actor_set_dim_factor (self, g_value_get_float (value));
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-meta_background_actor_class_init (MetaBackgroundActorClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  ClutterActorClass *actor_class = CLUTTER_ACTOR_CLASS (klass);
-  GParamSpec *pspec;
-
-  g_type_class_add_private (klass, sizeof (MetaBackgroundActorPrivate));
-
-  object_class->dispose = meta_background_actor_dispose;
-  object_class->get_property = meta_background_actor_get_property;
-  object_class->set_property = meta_background_actor_set_property;
-
-  actor_class->get_preferred_width = meta_background_actor_get_preferred_width;
-  actor_class->get_preferred_height = meta_background_actor_get_preferred_height;
-  actor_class->paint = meta_background_actor_paint;
-  actor_class->get_paint_volume = meta_background_actor_get_paint_volume;
-
-  /**
-   * MetaBackgroundActor:dim-factor:
-   *
-   * Factor to dim the background by, between 0.0 (black) and 1.0 (original
-   * colors)
-   */
-  pspec = g_param_spec_float ("dim-factor",
-                              "Dim factor",
-                              "Factor to dim the background by",
-                              0.0, 1.0,
-                              1.0,
-                              G_PARAM_READWRITE);
-  obj_props[PROP_DIM_FACTOR] = pspec;
-  g_object_class_install_property (object_class, PROP_DIM_FACTOR, pspec);
-}
-
-static void
-meta_background_actor_init (MetaBackgroundActor *self)
-{
-  MetaBackgroundActorPrivate *priv;
-
-  priv = self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self,
-                                                   META_TYPE_BACKGROUND_ACTOR,
-                                                   MetaBackgroundActorPrivate);
-  priv->dim_factor = 1.0;
-}
-
-/**
- * meta_background_actor_new:
- * @screen: the #MetaScreen
- *
- * Creates a new actor to draw the background for the given screen.
- *
- * Return value: the newly created background actor
- */
-ClutterActor *
-meta_background_actor_new_for_screen (MetaScreen *screen)
-{
-  MetaBackgroundActor *self;
-  MetaBackgroundActorPrivate *priv;
-
-  g_return_val_if_fail (META_IS_SCREEN (screen), NULL);
-
-  self = g_object_new (META_TYPE_BACKGROUND_ACTOR, NULL);
-  priv = self->priv;
-
-  priv->background = meta_screen_background_get (screen);
-  priv->background->actors = g_slist_prepend (priv->background->actors, self);
-
-  priv->material = meta_create_texture_material (NULL);
-
-  set_texture_on_actor (self);
-  update_wrap_mode_of_actor (self);
-
-  return CLUTTER_ACTOR (self);
-}
-
-/**
- * meta_background_actor_update:
- * @screen: a #MetaScreen
- *
- * Refetches the _XROOTPMAP_ID property for the root window and updates
- * the contents of the background actor based on that. There's no attempt
- * to optimize out pixmap values that don't change (since a root pixmap
- * could be replaced by with another pixmap with the same ID under some
- * circumstances), so this should only be called when we actually receive
- * a PropertyNotify event for the property.
- */
-void
-meta_background_actor_update (MetaScreen *screen)
-{
-  MetaScreenBackground *background;
-  MetaDisplay *display;
-  MetaCompositor *compositor;
-  Atom type;
-  int format;
-  gulong nitems;
-  gulong bytes_after;
-  guchar *data;
-  Pixmap root_pixmap_id;
-
-  background = meta_screen_background_get (screen);
-  display = meta_screen_get_display (screen);
-  compositor = meta_display_get_compositor (display);
-
-  root_pixmap_id = None;
-  if (!XGetWindowProperty (meta_display_get_xdisplay (display),
-                           meta_screen_get_xroot (screen),
-                           compositor->atom_x_root_pixmap,
-                           0, LONG_MAX,
-                           False,
-                           AnyPropertyType,
-                           &type, &format, &nitems, &bytes_after, &data) &&
-      type != None)
-  {
-     /* Got a property. */
-     if (type == XA_PIXMAP && format == 32 && nitems == 1)
-       {
-         /* Was what we expected. */
-         root_pixmap_id = *(Pixmap *)data;
-       }
-
-     XFree(data);
-  }
-
-  if (root_pixmap_id != None)
-    {
-      CoglHandle texture;
-
-      meta_error_trap_push (display);
-      texture = cogl_texture_pixmap_x11_new (root_pixmap_id, FALSE);
-      meta_error_trap_pop (display);
-
-      if (texture != COGL_INVALID_HANDLE)
-        {
-          set_texture (background, texture);
-          cogl_handle_unref (texture);
-
-          background->have_pixmap = True;
-          return;
-        }
-    }
-
-  background->have_pixmap = False;
-  set_texture_to_stage_color (background);
-}
-
-/**
- * meta_background_actor_set_visible_region:
- * @self: a #MetaBackgroundActor
- * @visible_region: (allow-none): the area of the actor (in allocate-relative
- *   coordinates) that is visible.
- *
- * Sets the area of the background that is unobscured by overlapping windows.
- * This is used to optimize and only paint the visible portions.
- */
-void
-meta_background_actor_set_visible_region (MetaBackgroundActor *self,
-                                          cairo_region_t      *visible_region)
-{
-  MetaBackgroundActorPrivate *priv;
-
-  g_return_if_fail (META_IS_BACKGROUND_ACTOR (self));
-
-  priv = self->priv;
-
-  if (priv->visible_region)
-    {
-      cairo_region_destroy (priv->visible_region);
-      priv->visible_region = NULL;
-    }
-
-  if (visible_region)
-    {
-      cairo_rectangle_int_t screen_rect = { 0 };
-      meta_screen_get_size (priv->background->screen, &screen_rect.width, &screen_rect.height);
-
-      /* Doing the intersection here is probably unnecessary - MetaWindowGroup
-       * should never compute a visible area that's larger than the root screen!
-       * but it's not that expensive and adds some extra robustness.
-       */
-      priv->visible_region = cairo_region_create_rectangle (&screen_rect);
-      cairo_region_intersect (priv->visible_region, visible_region);
-    }
-}
-
-/**
- * meta_background_actor_screen_size_changed:
- * @screen: a #MetaScreen
- *
- * Called by the compositor when the size of the #MetaScreen changes
- */
-void
-meta_background_actor_screen_size_changed (MetaScreen *screen)
-{
-  MetaScreenBackground *background = meta_screen_background_get (screen);
-  GSList *l;
-
-  update_wrap_mode (background);
-
-  for (l = background->actors; l; l = l->next)
-    clutter_actor_queue_relayout (l->data);
-}

src/compositor/meta-module.c

@@ -21,7 +21,7 @@
  * 02111-1307, USA.
  */
 
-#include <meta/meta-plugin.h>
+#include "meta-plugin.h"
 #include "meta-module.h"
 
 #include <gmodule.h>

src/compositor/meta-plugin-manager.c

@@ -24,18 +24,20 @@
 #include "config.h"
 #include "compositor-private.h"
 #include "meta-plugin-manager.h"
-#include <meta/prefs.h>
-#include <meta/errors.h>
-#include <meta/workspace.h>
+#include "prefs.h"
+#include "errors.h"
+#include "workspace.h"
 #include "meta-module.h"
-#include "window-private.h"
+#include "../core/window-private.h"
 
 #include <string.h>
-#include <stdlib.h>
 
 #include <clutter/x11/clutter-x11.h>
 
-static GSList *plugin_types;
+/*
+ * There is only one instace of each module per the process.
+ */
+static GHashTable *plugin_modules = NULL;
 
 /*
  * We have one "default plugin manager" that acts for the first screen,
@@ -43,79 +45,270 @@ static GSList *plugin_types;
  * plugin managers for each screen. (This is ugly. Probably we should
  * have one plugin manager and only make the plugins per-screen.)
  */
+
 static MetaPluginManager *default_plugin_manager;
 
+static gboolean meta_plugin_manager_reload (MetaPluginManager *plugin_mgr);
+
 struct MetaPluginManager
 {
   MetaScreen   *screen;
 
-  GList /* MetaPlugin */ *plugins;  /* TODO -- maybe use hash table */
+  GList /* MetaPlugin */       *plugins;  /* TODO -- maybe use hash table */
+  GList                        *unload;  /* Plugins that are disabled and pending unload */
+
+  guint         idle_unload_id;
 };
 
 /*
- * Loads the given plugin.
+ * Checks that the plugin is compatible with the WM and sets up the plugin
+ * struct.
  */
-void
-meta_plugin_manager_load (MetaPluginManager *plugin_mgr,
-                          const gchar       *plugin_name)
+static MetaPlugin *
+meta_plugin_load (MetaPluginManager *mgr,
+                  MetaModule        *module,
+                  const gchar       *params)
 {
-  const gchar *dpath = MUTTER_PLUGIN_DIR "/";
-  gchar       *path;
-  MetaModule  *module;
-  GType        plugin_type;
+  MetaPlugin *plugin = NULL;
+  GType         plugin_type = meta_module_get_plugin_type (module);
 
-  if (g_path_is_absolute (plugin_name))
-    path = g_strdup (plugin_name);
-  else
-    path = g_strconcat (dpath, plugin_name, ".so", NULL);
-
-  module = g_object_new (META_TYPE_MODULE, "path", path, NULL);
-  if (!module || !g_type_module_use (G_TYPE_MODULE (module)))
+  if (!plugin_type)
     {
-      /* This is fatal under the assumption that a monitoring
-       * process like gnome-session will take over and handle
-       * our untimely exit.
-       */
-      g_printerr ("Unable to load plugin module [%s]: %s",
-                  path, g_module_error());
-      exit (1);
+      g_warning ("Plugin type not registered !!!");
+      return NULL;
     }
 
-  plugin_type = meta_module_get_plugin_type (module);
-  meta_plugin_manager_register (plugin_mgr, plugin_type);
+  plugin = g_object_new (plugin_type,
+                         "params", params,
+                         NULL);
 
-  g_type_module_unuse (G_TYPE_MODULE (module));
-  g_free (path);
+  return plugin;
 }
 
 /*
- * Registers the given plugin type
+ * Attempst to unload a plugin; returns FALSE if plugin cannot be unloaded at
+ * present (e.g., and effect is in progress) and should be scheduled for
+ * removal later.
  */
-void
-meta_plugin_manager_register (MetaPluginManager *plugin_mgr,
-                              GType              plugin_type)
+static gboolean
+meta_plugin_unload (MetaPlugin *plugin)
 {
-  MetaPlugin  *plugin;
+  if (meta_plugin_running (plugin))
+    {
+      g_object_set (plugin, "disabled", TRUE, NULL);
+      return FALSE;
+    }
 
-  plugin_types = g_slist_prepend (plugin_types, GSIZE_TO_POINTER (plugin_type));
+  g_object_unref (plugin);
 
-  plugin = g_object_new (plugin_type, NULL);
-  plugin_mgr->plugins = g_list_prepend (plugin_mgr->plugins, plugin);
+  return TRUE;
 }
 
-void
+/*
+ * Iddle callback to remove plugins that could not be removed directly and are
+ * pending for removal.
+ */
+static gboolean
+meta_plugin_manager_idle_unload (MetaPluginManager *plugin_mgr)
+{
+  GList *l = plugin_mgr->unload;
+  gboolean dont_remove = TRUE;
+
+  while (l)
+    {
+      MetaPlugin *plugin = l->data;
+
+      if (meta_plugin_unload (plugin))
+        {
+          /* Remove from list */
+          GList *p = l->prev;
+          GList *n = l->next;
+
+          if (!p)
+            plugin_mgr->unload = n;
+          else
+            p->next = n;
+
+          if (n)
+            n->prev = p;
+
+          g_list_free_1 (l);
+
+          l = n;
+        }
+      else
+        l = l->next;
+    }
+
+  if (!plugin_mgr->unload)
+    {
+      /* If no more unloads are pending, remove the handler as well */
+      dont_remove = FALSE;
+      plugin_mgr->idle_unload_id = 0;
+    }
+
+  return dont_remove;
+}
+
+/*
+ * Unloads all plugins
+ */
+static void
+meta_plugin_manager_unload (MetaPluginManager *plugin_mgr)
+{
+  GList *plugins = plugin_mgr->plugins;
+
+  while (plugins)
+    {
+      MetaPlugin *plugin = plugins->data;
+
+      /* If the plugin could not be removed, move it to the unload list */
+      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)
+                            meta_plugin_manager_idle_unload,
+                            plugin_mgr);
+            }
+        }
+
+      plugins = plugins->next;
+    }
+
+  g_list_free (plugin_mgr->plugins);
+  plugin_mgr->plugins = NULL;
+}
+
+static void
+prefs_changed_callback (MetaPreference pref,
+                        void          *data)
+{
+  MetaPluginManager *plugin_mgr = data;
+
+  if (pref == META_PREF_CLUTTER_PLUGINS)
+    {
+      meta_plugin_manager_reload (plugin_mgr);
+    }
+}
+
+static MetaModule *
+meta_plugin_manager_get_module (const gchar *path)
+{
+  MetaModule *module = g_hash_table_lookup (plugin_modules, path);
+
+  if (!module &&
+      (module = g_object_new (META_TYPE_MODULE, "path", path, NULL)))
+    {
+      g_hash_table_insert (plugin_modules, g_strdup (path), module);
+    }
+
+  return module;
+}
+
+/*
+ * Loads all plugins listed in gconf registry.
+ */
+gboolean
+meta_plugin_manager_load (MetaPluginManager *plugin_mgr)
+{
+  const gchar *dpath = MUTTER_PLUGIN_DIR "/";
+  GSList      *plugins, *fallback = NULL;
+
+  plugins = meta_prefs_get_clutter_plugins ();
+
+  if (!plugins)
+    {
+      /*
+       * If no plugins are specified, try to load the default plugin.
+       */
+      fallback = g_slist_append (fallback, "default");
+      plugins = fallback;
+    }
+
+  while (plugins)
+    {
+      gchar   *plugin_string;
+      gchar   *params;
+
+      plugin_string = g_strdup (plugins->data);
+
+      if (plugin_string)
+        {
+          MetaModule *module;
+          gchar        *path;
+
+          params = strchr (plugin_string, ':');
+
+          if (params)
+            {
+              *params = 0;
+              ++params;
+            }
+
+          if (g_path_is_absolute (plugin_string))
+            path = g_strdup (plugin_string);
+          else
+            path = g_strconcat (dpath, plugin_string, ".so", NULL);
+
+          module = meta_plugin_manager_get_module (path);
+
+          if (module)
+            {
+              gboolean      use_succeeded;
+
+              /*
+               * This dlopens the module and registers the plugin type with the
+               * GType system, if the module is not already loaded.  When we
+               * create a plugin, the type system also calls g_type_module_use()
+               * to guarantee the module will not be unloaded during the plugin
+               * life time. Consequently we can unuse() the module again.
+               */
+              use_succeeded = g_type_module_use (G_TYPE_MODULE (module));
+
+              if (use_succeeded)
+                {
+                  MetaPlugin *plugin = meta_plugin_load (plugin_mgr, module, params);
+
+                  if (plugin)
+                    plugin_mgr->plugins = g_list_prepend (plugin_mgr->plugins, plugin);
+                  else
+                    g_warning ("Plugin load for [%s] failed", path);
+
+                  g_type_module_unuse (G_TYPE_MODULE (module));
+                }
+            }
+          else
+            g_warning ("Unable to load plugin module [%s]: %s",
+                       path, g_module_error());
+
+          g_free (path);
+          g_free (plugin_string);
+        }
+
+      plugins = plugins->next;
+    }
+
+
+  if (fallback)
+    g_slist_free (fallback);
+
+  if (plugin_mgr->plugins != NULL)
+    {
+      meta_prefs_add_listener (prefs_changed_callback, plugin_mgr);
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+gboolean
 meta_plugin_manager_initialize (MetaPluginManager *plugin_mgr)
 {
   GList *iter;
 
-  if (!plugin_mgr->plugins)
-    {
-      /*
-       * If no plugins are specified, load the default plugin.
-       */
-      meta_plugin_manager_load (plugin_mgr, "default");
-    }
-
   for (iter = plugin_mgr->plugins; iter; iter = iter->next)
     {
       MetaPlugin *plugin = (MetaPlugin*) iter->data;
@@ -128,6 +321,26 @@ meta_plugin_manager_initialize (MetaPluginManager *plugin_mgr)
       if (klass->start)
         klass->start (plugin);
     }
+
+  return TRUE;
+}
+
+/*
+ * Reloads all plugins
+ */
+static gboolean
+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
+   * plugins loaded at the same time, so it might not be worth it.
+   */
+
+  /* Prevent stale grabs on unloaded plugins */
+  meta_check_end_modal (plugin_mgr->screen);
+
+  meta_plugin_manager_unload (plugin_mgr);
+  return meta_plugin_manager_load (plugin_mgr);
 }
 
 static MetaPluginManager *
@@ -135,8 +348,15 @@ meta_plugin_manager_new (MetaScreen *screen)
 {
   MetaPluginManager *plugin_mgr;
 
+  if (!plugin_modules)
+    {
+      plugin_modules = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
+                                              NULL);
+    }
+
   plugin_mgr = g_new0 (MetaPluginManager, 1);
-  plugin_mgr->screen = screen;
+
+  plugin_mgr->screen        = screen;
 
   if (screen)
     g_object_set_data (G_OBJECT (screen), "meta-plugin-manager", plugin_mgr);
@@ -177,20 +397,7 @@ meta_plugin_manager_get (MetaScreen *screen)
     }
   else
     {
-      GSList *iter;
-      GType plugin_type;
-      MetaPlugin *plugin;
-
-      plugin_mgr = meta_plugin_manager_new (screen);
-
-      for (iter = plugin_types; iter; iter = iter->next)
-        {
-          plugin_type = (GType)GPOINTER_TO_SIZE (iter->data);
-          plugin = g_object_new (plugin_type, "screen", screen,  NULL);
-          plugin_mgr->plugins = g_list_prepend (plugin_mgr->plugins, plugin);
-        }
-
-      return plugin_mgr;
+      return meta_plugin_manager_new (screen);
     }
 }
 

src/compositor/meta-plugin-manager.h

@@ -24,11 +24,11 @@
 #ifndef META_PLUGIN_MANAGER_H_
 #define META_PLUGIN_MANAGER_H_
 
-#include <meta/types.h>
-#include <meta/screen.h>
+#include "types.h"
+#include "screen.h"
 
 #define  META_PLUGIN_FROM_MANAGER_
-#include <meta/meta-plugin.h>
+#include "meta-plugin.h"
 #undef   META_PLUGIN_FROM_MANAGER_
 
 #define META_PLUGIN_MINIMIZE         (1<<0)
@@ -49,12 +49,8 @@ typedef struct MetaPluginManager MetaPluginManager;
 MetaPluginManager * meta_plugin_manager_get         (MetaScreen *screen);
 MetaPluginManager * meta_plugin_manager_get_default (void);
 
-void     meta_plugin_manager_load         (MetaPluginManager *mgr,
-                                           const gchar       *plugin_name);
-void     meta_plugin_manager_register     (MetaPluginManager *mgr,
-                                           GType              plugin_type);
-void     meta_plugin_manager_initialize   (MetaPluginManager *mgr);
-
+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);

src/compositor/meta-plugin.c

@@ -21,10 +21,9 @@
  * 02111-1307, USA.
  */
 
-#include <meta/meta-plugin.h>
-#include "meta-plugin-manager.h"
-#include <meta/screen.h>
-#include <meta/display.h>
+#include "meta-plugin.h"
+#include "screen.h"
+#include "display.h"
 
 #include <string.h>
 #include <X11/Xlib.h>
@@ -44,6 +43,7 @@ enum
 {
   PROP_0,
   PROP_SCREEN,
+  PROP_PARAMS,
   PROP_FEATURES,
   PROP_DISABLED,
   PROP_DEBUG_MODE,
@@ -52,6 +52,7 @@ enum
 struct _MetaPluginPrivate
 {
   MetaScreen   *screen;
+  gchar        *params;
   gulong        features;
 
   gint          running;
@@ -60,46 +61,6 @@ struct _MetaPluginPrivate
   gboolean      debug    : 1;
 };
 
-static void
-meta_plugin_set_features (MetaPlugin *plugin)
-{
-  MetaPluginPrivate  *priv     = plugin->priv;
-  MetaPluginClass    *klass    = META_PLUGIN_GET_CLASS (plugin);
-
-  priv->features = 0;
-
-  /*
-   * Feature flags: identify events that the plugin can handle; a plugin can
-   * handle one or more events.
-   */
-  if (klass->minimize)
-    priv->features |= META_PLUGIN_MINIMIZE;
-
-  if (klass->maximize)
-    priv->features |= META_PLUGIN_MAXIMIZE;
-
-  if (klass->unmaximize)
-    priv->features |= META_PLUGIN_UNMAXIMIZE;
-
-  if (klass->map)
-    priv->features |= META_PLUGIN_MAP;
-
-  if (klass->destroy)
-    priv->features |= META_PLUGIN_DESTROY;
-
-  if (klass->switch_workspace)
-    priv->features |= META_PLUGIN_SWITCH_WORKSPACE;
-}
-
-static void
-meta_plugin_constructed (GObject *object)
-{
-  meta_plugin_set_features (META_PLUGIN (object));
-
-  if (G_OBJECT_CLASS (meta_plugin_parent_class)->constructed)
-      G_OBJECT_CLASS (meta_plugin_parent_class)->constructed (object);
-}
-
 static void
 meta_plugin_dispose (GObject *object)
 {
@@ -109,9 +70,97 @@ meta_plugin_dispose (GObject *object)
 static void
 meta_plugin_finalize (GObject *object)
 {
+  MetaPluginPrivate *priv = META_PLUGIN (object)->priv;
+
+  g_free (priv->params);
+  priv->params = NULL;
+
   G_OBJECT_CLASS (meta_plugin_parent_class)->finalize (object);
 }
 
+static void
+meta_plugin_parse_params (MetaPlugin *plugin)
+{
+  char                  *p;
+  gulong                features = 0;
+  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 |= META_PLUGIN_MINIMIZE;
+
+  if (klass->maximize)
+    features |= META_PLUGIN_MAXIMIZE;
+
+  if (klass->unmaximize)
+    features |= META_PLUGIN_UNMAXIMIZE;
+
+  if (klass->map)
+    features |= META_PLUGIN_MAP;
+
+  if (klass->destroy)
+    features |= META_PLUGIN_DESTROY;
+
+  if (klass->switch_workspace)
+    features |= META_PLUGIN_SWITCH_WORKSPACE;
+
+  if (priv->params)
+    {
+      gboolean debug = FALSE;
+
+      if ((p = strstr (priv->params, "disable:")))
+        {
+          gchar *d = g_strdup (p+8);
+
+          p = strchr (d, ';');
+
+          if (p)
+            *p = 0;
+
+          if (strstr (d, "minimize"))
+            features &= ~ META_PLUGIN_MINIMIZE;
+
+          if (strstr (d, "maximize"))
+            features &= ~ META_PLUGIN_MAXIMIZE;
+
+          if (strstr (d, "unmaximize"))
+            features &= ~ META_PLUGIN_UNMAXIMIZE;
+
+          if (strstr (d, "map"))
+            features &= ~ META_PLUGIN_MAP;
+
+          if (strstr (d, "destroy"))
+            features &= ~ META_PLUGIN_DESTROY;
+
+          if (strstr (d, "switch-workspace"))
+            features &= ~META_PLUGIN_SWITCH_WORKSPACE;
+
+          g_free (d);
+        }
+
+      if (strstr (priv->params, "debug"))
+        debug = TRUE;
+
+      if (debug != priv->debug)
+        {
+          priv->debug = debug;
+
+          g_object_notify (G_OBJECT (plugin), "debug-mode");
+        }
+    }
+
+  if (features != priv->features)
+    {
+      priv->features = features;
+
+      g_object_notify (G_OBJECT (plugin), "features");
+    }
+}
+
 static void
 meta_plugin_set_property (GObject      *object,
                           guint         prop_id,
@@ -125,6 +174,10 @@ meta_plugin_set_property (GObject      *object,
     case PROP_SCREEN:
       priv->screen = g_value_get_object (value);
       break;
+    case PROP_PARAMS:
+      priv->params = g_value_dup_string (value);
+      meta_plugin_parse_params (META_PLUGIN (object));
+      break;
     case PROP_DISABLED:
       priv->disabled = g_value_get_boolean (value);
       break;
@@ -150,6 +203,9 @@ meta_plugin_get_property (GObject    *object,
     case PROP_SCREEN:
       g_value_set_object (value, priv->screen);
       break;
+    case PROP_PARAMS:
+      g_value_set_string (value, priv->params);
+      break;
     case PROP_DISABLED:
       g_value_set_boolean (value, priv->disabled);
       break;
@@ -171,7 +227,6 @@ meta_plugin_class_init (MetaPluginClass *klass)
 {
   GObjectClass      *gobject_class = G_OBJECT_CLASS (klass);
 
-  gobject_class->constructed     = meta_plugin_constructed;
   gobject_class->finalize        = meta_plugin_finalize;
   gobject_class->dispose         = meta_plugin_dispose;
   gobject_class->set_property    = meta_plugin_set_property;
@@ -185,6 +240,15 @@ meta_plugin_class_init (MetaPluginClass *klass)
                                                         META_TYPE_SCREEN,
                                                         G_PARAM_READWRITE));
 
+  g_object_class_install_property (gobject_class,
+				   PROP_PARAMS,
+				   g_param_spec_string ("params",
+							"Parameters",
+							"Plugin Parameters",
+							NULL,
+							G_PARAM_READWRITE |
+                                                        G_PARAM_CONSTRUCT));
+
   g_object_class_install_property (gobject_class,
 				   PROP_FEATURES,
 				   g_param_spec_ulong ("features",
@@ -287,14 +351,6 @@ meta_plugin_get_window_group (MetaPlugin *plugin)
   return meta_get_window_group_for_screen (priv->screen);
 }
 
-ClutterActor *
-meta_plugin_get_background_actor (MetaPlugin *plugin)
-{
-  MetaPluginPrivate *priv = META_PLUGIN (plugin)->priv;
-
-  return meta_get_background_actor_for_screen (priv->screen);
-}
-
 /**
  * _meta_plugin_effect_started:
  * @plugin: the plugin
@@ -549,18 +605,3 @@ meta_plugin_get_screen (MetaPlugin *plugin)
   return priv->screen;
 }
 
-/**
- * meta_plugin_type_register:
- * @plugin_type: a #MetaPlugin type
- *
- * Register @plugin_type as a compositor plugin type to be used.
- * You must call this before calling meta_init().
- */
-void
-meta_plugin_type_register (GType plugin_type)
-{
-  MetaPluginManager *plugin_manager;
-
-  plugin_manager = meta_plugin_manager_get_default ();
-  meta_plugin_manager_register (plugin_manager, plugin_type);
-}

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

@@ -28,7 +28,7 @@
 #include <cairo.h>
 #include <clutter/clutter.h>
 #include "meta-window-shape.h"
-#include <meta/meta-shadow-factory.h>
+#include "meta-shadow-factory.h"
 
 /**
  * MetaShadow:
@@ -47,8 +47,7 @@ void        meta_shadow_paint       (MetaShadow            *shadow,
                                      int                    window_width,
                                      int                    window_height,
                                      guint8                 opacity,
-                                     cairo_region_t        *clip,
-                                     gboolean               clip_strictly);
+                                     cairo_region_t        *clip);
 void        meta_shadow_get_bounds  (MetaShadow            *shadow,
                                      int                    window_x,
                                      int                    window_y,
@@ -56,8 +55,6 @@ void        meta_shadow_get_bounds  (MetaShadow            *shadow,
                                      int                    window_height,
                                      cairo_rectangle_int_t *bounds);
 
-MetaShadowFactory *meta_shadow_factory_new (void);
-
 MetaShadow *meta_shadow_factory_get_shadow (MetaShadowFactory *factory,
                                             MetaWindowShape   *shape,
                                             int                width,

src/compositor/meta-shadow-factory.c

@@ -5,6 +5,7 @@
  * Create and cache shadow textures for abritrary window shapes
  *
  * Copyright 2010 Red Hat, Inc.
+ * Copyright 2010 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
@@ -25,7 +26,6 @@
 #include <math.h>
 #include <string.h>
 
-#include "cogl-utils.h"
 #include "meta-shadow-factory-private.h"
 #include "region-utils.h"
 
@@ -120,17 +120,17 @@ static guint signals[LAST_SIGNAL] = { 0 };
 /* The first element in this array also defines the default parameters
  * for newly created classes */
 MetaShadowClassInfo default_shadow_classes[] = {
-  { "normal",       { 6, -1, 0, 3, 255 }, { 3, -1, 0, 3, 128 } },
-  { "dialog",       { 6, -1, 0, 3, 255 }, { 3, -1, 0, 3, 128 } },
-  { "modal_dialog", { 6, -1, 0, 1, 255 }, { 3, -1, 0, 3, 128 } },
-  { "utility",      { 3, -1, 0, 1, 255 }, { 3, -1, 0, 1, 128 } },
-  { "border",       { 6, -1, 0, 3, 255 }, { 3, -1, 0, 3, 128 } },
-  { "menu",         { 6, -1, 0, 3, 255 }, { 3, -1, 0, 0, 128 } },
+  { "normal",       { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
+  { "dialog",       { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
+  { "modal_dialog", { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
+  { "utility",      { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
+  { "border",       { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
+  { "menu",         { 12, -1, 0, 8, 255 }, { 6, -1, 0, 4, 255 } },
 
-  { "popup-menu",    { 1, -1, 0, 1, 128 }, { 1, -1, 0, 1, 128 } },
+  { "popup-menu",    { 6, -1, 0, 4, 255 }, { 6, -1, 0, 4, 255 } },
 
-  { "dropdown-menu", { 1, 10, 0, 1, 128 }, { 1, 10, 0, 1, 128 } },
-  { "attached",      { 2, 50, 0, 1, 255 }, { 1, 50, 0, 1, 128 } }
+  { "dropdown-menu", { 6, 25, 0, 4, 255 }, { 6, 100, 0, 4, 255 } },
+  { "attached",      { 6, 25, 0, 4, 255 }, { 6, 100, 0, 4, 255 } }
 };
 
 G_DEFINE_TYPE (MetaShadowFactory, meta_shadow_factory, G_TYPE_OBJECT);
@@ -189,10 +189,8 @@ meta_shadow_unref (MetaShadow *shadow)
  * @window_width: actual width of the region to paint a shadow for
  * @window_height: actual height of the region to paint a shadow for
  * @clip: (allow-none): if non-%NULL specifies the visible portion
- *   of the shadow.
- * @clip_strictly: if %TRUE, drawing will be clipped strictly
- *   to @clip, otherwise, it will be only used to optimize
- *   drawing.
+ *   of the shadow. Drawing won't be strictly clipped to this region
+ *   but it will be used to optimize what is drawn.
  *
  * Paints the shadow at the given position, for the specified actual
  * size of the region. (Since a #MetaShadow can be shared between
@@ -206,8 +204,7 @@ meta_shadow_paint (MetaShadow     *shadow,
                    int             window_width,
                    int             window_height,
                    guint8          opacity,
-                   cairo_region_t *clip,
-                   gboolean        clip_strictly)
+                   cairo_region_t *clip)
 {
   float texture_width = cogl_texture_get_width (shadow->texture);
   float texture_height = cogl_texture_get_height (shadow->texture);
@@ -279,9 +276,6 @@ meta_shadow_paint (MetaShadow     *shadow,
       dest_rect.y = dest_y[j];
       dest_rect.height = dest_y[j + 1] - dest_y[j];
 
-      if (dest_rect.height == 0)
-        continue;
-
       for (i = 0; i < n_x; i++)
         {
           cairo_region_overlap_t overlap;
@@ -289,64 +283,16 @@ meta_shadow_paint (MetaShadow     *shadow,
           dest_rect.x = dest_x[i];
           dest_rect.width = dest_x[i + 1] - dest_x[i];
 
-          if (dest_rect.width == 0)
-            continue;
-
           if (clip)
             overlap = cairo_region_contains_rectangle (clip, &dest_rect);
           else
-            overlap = CAIRO_REGION_OVERLAP_IN;
+            overlap = CAIRO_REGION_OVERLAP_PART;
 
-          /* There's quite a bit of overhead from allocating a new
-           * region in order to find an exact intersection and
-           * generating more geometry - we make the assumption that
-           * unless we have to clip strictly it will be cheaper to
-           * just draw the entire rectangle.
-           */
-          if (overlap == CAIRO_REGION_OVERLAP_IN ||
-              (overlap == CAIRO_REGION_OVERLAP_PART && !clip_strictly))
-            {
-              cogl_rectangle_with_texture_coords (dest_x[i], dest_y[j],
-                                                  dest_x[i + 1], dest_y[j + 1],
-                                                  src_x[i], src_y[j],
-                                                  src_x[i + 1], src_y[j + 1]);
-            }
-          else if (overlap == CAIRO_REGION_OVERLAP_PART)
-            {
-              cairo_region_t *intersection;
-              int n_rectangles, k;
-
-              intersection = cairo_region_create_rectangle (&dest_rect);
-              cairo_region_intersect (intersection, clip);
-
-              n_rectangles = cairo_region_num_rectangles (intersection);
-              for (k = 0; k < n_rectangles; k++)
-                {
-                  cairo_rectangle_int_t rect;
-                  float src_x1, src_x2, src_y1, src_y2;
-
-                  cairo_region_get_rectangle (intersection, k, &rect);
-
-                  /* Separately linear interpolate X and Y coordinates in the source
-                   * based on the destination X and Y coordinates */
-
-                  src_x1 = (src_x[i] * (dest_rect.x + dest_rect.width - rect.x) +
-                            src_x[i + 1] * (rect.x - dest_rect.x)) / dest_rect.width;
-                  src_x2 = (src_x[i] * (dest_rect.x + dest_rect.width - (rect.x + rect.width)) +
-                            src_x[i + 1] * (rect.x + rect.width - dest_rect.x)) / dest_rect.width;
-
-                  src_y1 = (src_y[j] * (dest_rect.y + dest_rect.height - rect.y) +
-                            src_y[j + 1] * (rect.y - dest_rect.y)) / dest_rect.height;
-                  src_y2 = (src_y[j] * (dest_rect.y + dest_rect.height - (rect.y + rect.height)) +
-                            src_y[j + 1] * (rect.y + rect.height - dest_rect.y)) / dest_rect.height;
-
-                  cogl_rectangle_with_texture_coords (rect.x, rect.y,
-                                                      rect.x + rect.width, rect.y + rect.height,
-                                                      src_x1, src_y1, src_x2, src_y2);
-                }
-
-              cairo_region_destroy (intersection);
-            }
+          if (overlap != CAIRO_REGION_OVERLAP_OUT)
+            cogl_rectangle_with_texture_coords (dest_x[i], dest_y[j],
+                                                dest_x[i + 1], dest_y[j + 1],
+                                                src_x[i], src_y[j],
+                                                src_x[i + 1], src_y[j + 1]);
         }
     }
 }
@@ -360,7 +306,7 @@ meta_shadow_paint (MetaShadow     *shadow,
  * @window_height: actual height of the region to paint a shadow for
  *
  * Computes the bounds of the pixels that will be affected by
- * meta_shadow_paint()
+ * meta_shadow_paints()
  */
 void
 meta_shadow_get_bounds  (MetaShadow            *shadow,
@@ -371,7 +317,7 @@ meta_shadow_get_bounds  (MetaShadow            *shadow,
                          cairo_rectangle_int_t *bounds)
 {
   bounds->x = window_x - shadow->outer_border_left;
-  bounds->y = window_y - shadow->outer_border_top;
+  bounds->y = window_x - shadow->outer_border_top;
   bounds->width = window_width + shadow->outer_border_left + shadow->outer_border_right;
   bounds->height = window_height + shadow->outer_border_top + shadow->outer_border_bottom;
 }
@@ -442,7 +388,8 @@ meta_shadow_factory_class_init (MetaShadowFactoryClass *klass)
                   G_TYPE_FROM_CLASS (object_class),
                   G_SIGNAL_RUN_LAST,
                   0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                   G_TYPE_NONE, 0);
 }
 
@@ -694,6 +641,49 @@ flip_buffer (guchar *buffer,
 #undef BLOCK_SIZE
 }
 
+/* Creates a material with a single layer. Using a common template
+ * allows sharing a shader between all shadows. To share the same
+ * shader with all other materials that are just texture plus
+ * opacity would require cogl fixes. Based on
+ * gnome-shell/src/st/_st_create_texture_material.c
+ */
+static CoglHandle
+create_texture_material (CoglHandle src_texture)
+{
+  static CoglHandle texture_material_template = COGL_INVALID_HANDLE;
+  CoglHandle material;
+
+  g_return_val_if_fail (src_texture != COGL_INVALID_HANDLE,
+                        COGL_INVALID_HANDLE);
+
+  /* We use a material that has a dummy texture as a base for all
+     texture materials. The idea is that only the Cogl texture object
+     would be different in the children so it is likely that Cogl will
+     be able to share GL programs between all the textures. */
+  if (G_UNLIKELY (texture_material_template == COGL_INVALID_HANDLE))
+    {
+      static const guint8 white_pixel[] = { 0xff, 0xff, 0xff, 0xff };
+      CoglHandle dummy_texture;
+
+      dummy_texture =
+        cogl_texture_new_from_data (1, 1,
+                                    COGL_TEXTURE_NONE,
+                                    COGL_PIXEL_FORMAT_RGBA_8888_PRE,
+                                    COGL_PIXEL_FORMAT_ANY,
+                                    4, white_pixel);
+
+      texture_material_template = cogl_material_new ();
+      cogl_material_set_layer (texture_material_template, 0, dummy_texture);
+      cogl_handle_unref (dummy_texture);
+    }
+
+  material = cogl_material_copy (texture_material_template);
+
+  cogl_material_set_layer (material, 0, src_texture);
+
+  return material;
+}
+
 static void
 make_shadow (MetaShadow     *shadow,
              cairo_region_t *region)
@@ -785,7 +775,7 @@ make_shadow (MetaShadow     *shadow,
 
   /* We offset the passed in pixels to crop off the extra area we allocated at the top
    * in the case of top_fade >= 0. We also account for padding at the left for symmetry
-   * though that doesn't currently occur.
+   * though that doesn't currnetly occur.
    */
   shadow->texture = cogl_texture_new_from_data (shadow->outer_border_left + extents.width + shadow->outer_border_right,
                                                 shadow->outer_border_top + extents.height + shadow->outer_border_bottom,
@@ -801,7 +791,7 @@ make_shadow (MetaShadow     *shadow,
   cairo_region_destroy (column_convolve_region);
   g_free (buffer);
 
-  shadow->material = meta_create_texture_material (shadow->texture);
+  shadow->material = create_texture_material (shadow->texture);
 }
 
 static MetaShadowParams *

src/compositor/meta-shaped-texture.c

@@ -27,13 +27,13 @@
 
 #include "meta-shaped-texture.h"
 #include "meta-texture-tower.h"
-#include "meta-texture-rectangle.h"
 
 #include <clutter/clutter.h>
 #include <cogl/cogl.h>
 #include <string.h>
 
 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);
 
@@ -49,8 +49,13 @@ static void meta_shaped_texture_update_area (ClutterX11TexturePixmap *texture,
 
 static void meta_shaped_texture_dirty_mask (MetaShapedTexture *stex);
 
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
+               CLUTTER_GLX_TYPE_TEXTURE_PIXMAP);
+#else /* HAVE_GLX_TEXTURE_PIXMAP */
 G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
                CLUTTER_X11_TYPE_TEXTURE_PIXMAP);
+#endif /* HAVE_GLX_TEXTURE_PIXMAP */
 
 #define META_SHAPED_TEXTURE_GET_PRIVATE(obj) \
   (G_TYPE_INSTANCE_GET_PRIVATE ((obj), META_TYPE_SHAPED_TEXTURE, \
@@ -64,15 +69,11 @@ struct _MetaShapedTexturePrivate
   CoglHandle material_unshaped;
 
   cairo_region_t *clip_region;
-  cairo_region_t *shape_region;
-
-  cairo_region_t *overlay_region;
-  cairo_path_t *overlay_path;
-
-  cairo_region_t *visible_pixels_region;
 
   guint mask_width, mask_height;
 
+  GArray *rectangles;
+
   guint create_mipmaps : 1;
 };
 
@@ -84,6 +85,7 @@ meta_shaped_texture_class_init (MetaShapedTextureClass *klass)
   ClutterX11TexturePixmapClass *x11_texture_class = (ClutterX11TexturePixmapClass *) klass;
 
   gobject_class->dispose = meta_shaped_texture_dispose;
+  gobject_class->finalize = meta_shaped_texture_finalize;
   gobject_class->notify = meta_shaped_texture_notify;
 
   actor_class->paint = meta_shaped_texture_paint;
@@ -101,10 +103,8 @@ meta_shaped_texture_init (MetaShapedTexture *self)
 
   priv = self->priv = META_SHAPED_TEXTURE_GET_PRIVATE (self);
 
-  priv->shape_region = NULL;
-  priv->overlay_path = NULL;
-  priv->overlay_region = NULL;
-  priv->visible_pixels_region = NULL;
+  priv->rectangles = g_array_new (FALSE, FALSE, sizeof (XRectangle));
+
   priv->paint_tower = meta_texture_tower_new ();
   priv->mask_texture = COGL_INVALID_HANDLE;
   priv->create_mipmaps = TRUE;
@@ -133,13 +133,22 @@ meta_shaped_texture_dispose (GObject *object)
       priv->material_unshaped = COGL_INVALID_HANDLE;
     }
 
-  meta_shaped_texture_set_shape_region (self, NULL);
   meta_shaped_texture_set_clip_region (self, NULL);
-  meta_shaped_texture_set_overlay_path (self, NULL, NULL);
 
   G_OBJECT_CLASS (meta_shaped_texture_parent_class)->dispose (object);
 }
 
+static void
+meta_shaped_texture_finalize (GObject *object)
+{
+  MetaShapedTexture *self = (MetaShapedTexture *) object;
+  MetaShapedTexturePrivate *priv = self->priv;
+
+  g_array_free (priv->rectangles, TRUE);
+
+  G_OBJECT_CLASS (meta_shaped_texture_parent_class)->finalize (object);
+}
+
 static void
 meta_shaped_texture_notify (GObject    *object,
 			    GParamSpec *pspec)
@@ -170,139 +179,25 @@ meta_shaped_texture_dirty_mask (MetaShapedTexture *stex)
 {
   MetaShapedTexturePrivate *priv = stex->priv;
 
-  if (priv->visible_pixels_region != NULL)
+  if (priv->mask_texture != COGL_INVALID_HANDLE)
     {
-      cairo_region_destroy (priv->visible_pixels_region);
-      priv->visible_pixels_region = NULL;
+      GLuint mask_gl_tex;
+      GLenum mask_gl_target;
 
-      if (priv->mask_texture != COGL_INVALID_HANDLE)
-        {
-          cogl_handle_unref (priv->mask_texture);
-          priv->mask_texture = COGL_INVALID_HANDLE;
-        }
+      cogl_texture_get_gl_texture (priv->mask_texture,
+                                   &mask_gl_tex, &mask_gl_target);
+
+      if (mask_gl_target == GL_TEXTURE_RECTANGLE_ARB)
+        glDeleteTextures (1, &mask_gl_tex);
+
+      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
-scan_visible_region (MetaShapedTexture *stex,
-                     guchar            *mask_data,
-                     int                stride)
-{
-  MetaShapedTexturePrivate *priv = stex->priv;
-  cairo_region_t *visible_pixels_region;
-  cairo_region_t *overlay_region;
-  int i, n_rects;
-
-  /* The visible pixels region contains all pixel values above 0.
-   * This is somewhat complicated when there's an overlay: we
-   * need to scan all regions potentially modified by it.
-   */
-
-  if (priv->visible_pixels_region)
-    cairo_region_destroy (priv->visible_pixels_region);
-
-  priv->visible_pixels_region = cairo_region_copy (priv->shape_region);
-
-  visible_pixels_region = priv->visible_pixels_region;
-  overlay_region = priv->overlay_region;
-
-  /* With no overlay region, the visible region is defined
-   * by the mask region, so we don't need to scan anything. */
-  if (overlay_region == NULL)
-      return;
-
-  /* Subtract all the rectangles in the overlay region so that we can
-   * scan all the pixels potentially added by the overlay path. */
-  cairo_region_subtract (visible_pixels_region, overlay_region);
-
-  n_rects = cairo_region_num_rectangles (overlay_region);
-
-  for (i = 0; i < n_rects; i++)
-    {
-      int x, y;
-      cairo_rectangle_int_t rect;
-
-      cairo_region_get_rectangle (overlay_region, i, &rect);
-
-      for (y = rect.y; y < (rect.y + rect.height); y++)
-        {
-          for (x = rect.x; x < (rect.x + rect.width); x++)
-            {
-              int w = x;
-              while (mask_data[y * stride + w] > 0 && w < (rect.x + rect.width))
-                w++;
-
-              if (w > 0)
-                {
-                  cairo_rectangle_int_t tmp;
-                  tmp.x = x;
-                  tmp.y = y;
-                  tmp.width = w - x;
-                  tmp.height = 1;
-                  cairo_region_union_rectangle (visible_pixels_region, &tmp);
-                  x = w;
-                }
-            }
-        }
-    }
-}
-
-static void
-install_overlay_path (MetaShapedTexture *stex,
-                      guchar            *mask_data,
-                      int                tex_width,
-                      int                tex_height,
-                      int                stride)
-{
-  MetaShapedTexturePrivate *priv = stex->priv;
-  int i, n_rects;
-  cairo_t *cr;
-  cairo_rectangle_int_t rect;
-  cairo_surface_t *surface;
-
-  if (priv->overlay_region == NULL)
-    return;
-
-  surface = cairo_image_surface_create_for_data (mask_data,
-                                                 CAIRO_FORMAT_A8,
-                                                 tex_width,
-                                                 tex_height,
-                                                 stride);
-
-  cr = cairo_create (surface);
-  cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
-
-  n_rects = cairo_region_num_rectangles (priv->overlay_region);
-  for (i = 0; i < n_rects; i++)
-    {
-      cairo_region_get_rectangle (priv->overlay_region, i, &rect);
-      cairo_rectangle (cr, rect.x, rect.y, rect.width, rect.height);
-    }
-
-  cairo_fill_preserve (cr);
-  if (priv->overlay_path == NULL)
-    {
-      /* If we have an overlay region but not an overlay path, then we
-       * just need to clear the rectangles in the overlay region. */
-      goto out;
-    }
-
-  cairo_clip (cr);
-
-  cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
-  cairo_set_source_rgba (cr, 1, 1, 1, 1);
-
-  cairo_append_path (cr, priv->overlay_path);
-  cairo_fill (cr);
-
- out:
-  cairo_destroy (cr);
-  cairo_surface_destroy (surface);
-}
-
 static void
 meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
 {
@@ -325,42 +220,22 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
     meta_shaped_texture_dirty_mask (stex);
 
   /* If we don't have a mask texture yet then create one */
-  if (priv->visible_pixels_region == NULL)
+  if (priv->mask_texture == COGL_INVALID_HANDLE)
     {
       guchar *mask_data;
-      int i;
-      int n_rects;
-      int stride;
+      const XRectangle *rect;
       GLenum paint_gl_target;
 
-      /* If we have no shape region and no (or an empty) overlay region, we
-       * don't need to create a full mask texture, so quit early. */
-      if (priv->shape_region == NULL &&
-          (priv->overlay_region == NULL ||
-           cairo_region_num_rectangles (priv->overlay_region) == 0))
-        {
-          /* With no mask, the visible region is just
-           * {0, 0, tex_width, tex_height}. */
-          cairo_rectangle_int_t rect = { 0, 0, tex_width, tex_height };
-          priv->visible_pixels_region = cairo_region_create_rectangle (&rect);
-          return;
-        }
-
-      stride = cairo_format_stride_for_width (CAIRO_FORMAT_A8, tex_width);
-
       /* Create data for an empty image */
-      mask_data = g_malloc0 (stride * tex_height);
+      mask_data = g_malloc0 (tex_width * tex_height);
 
-      n_rects = cairo_region_num_rectangles (priv->shape_region);
-
-      /* Fill in each rectangle. */
-      for (i = 0; i < n_rects; i ++)
+      /* Cut out a hole for each rectangle */
+      for (rect = (XRectangle *) priv->rectangles->data
+             + priv->rectangles->len;
+           rect-- > (XRectangle *) priv->rectangles->data;)
         {
-          cairo_rectangle_int_t rect;
-          cairo_region_get_rectangle (priv->shape_region, i, &rect);
-
-          gint x1 = rect.x, x2 = x1 + rect.width;
-          gint y1 = rect.y, y2 = y1 + rect.height;
+          gint x1 = rect->x, x2 = x1 + rect->width;
+          gint y1 = rect->y, y2 = y1 + rect->height;
           guchar *p;
 
           /* Clip the rectangle to the size of the texture */
@@ -370,40 +245,41 @@ meta_shaped_texture_ensure_mask (MetaShapedTexture *stex)
           y2 = CLAMP (y2, y1, (gint) tex_height);
 
           /* Fill the rectangle */
-          for (p = mask_data + y1 * stride + x1;
+          for (p = mask_data + y1 * tex_width + x1;
                y1 < y2;
-               y1++, p += stride)
+               y1++, p += tex_width)
             memset (p, 255, x2 - x1);
         }
 
-      install_overlay_path (stex, mask_data, tex_width, tex_height, stride);
-      scan_visible_region (stex, mask_data, stride);
-
       cogl_texture_get_gl_texture (paint_tex, NULL, &paint_gl_target);
 
-#ifdef GL_TEXTURE_RECTANGLE_ARB
       if (paint_gl_target == GL_TEXTURE_RECTANGLE_ARB)
         {
+          GLuint tex;
+
+          glGenTextures (1, &tex);
+          glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
+          glPixelStorei (GL_UNPACK_ROW_LENGTH, tex_width);
+          glPixelStorei (GL_UNPACK_ALIGNMENT, 1);
+          glPixelStorei (GL_UNPACK_SKIP_ROWS, 0);
+          glPixelStorei (GL_UNPACK_SKIP_PIXELS, 0);
+          glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
+                        GL_ALPHA, tex_width, tex_height,
+                        0, GL_ALPHA, GL_UNSIGNED_BYTE, mask_data);
+
           priv->mask_texture
-            = meta_texture_rectangle_new (tex_width, tex_height,
-                                          0, /* flags */
-                                          /* data format */
-                                          COGL_PIXEL_FORMAT_A_8,
-                                          /* internal GL format */
-                                          GL_ALPHA,
-                                          /* internal cogl format */
-                                          COGL_PIXEL_FORMAT_A_8,
-                                          /* rowstride */
-                                          stride,
-                                          mask_data);
+            = cogl_texture_new_from_foreign (tex,
+                                             GL_TEXTURE_RECTANGLE_ARB,
+                                             tex_width, tex_height,
+                                             0, 0,
+                                             COGL_PIXEL_FORMAT_A_8);
         }
       else
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
         priv->mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
                                                          COGL_TEXTURE_NONE,
                                                          COGL_PIXEL_FORMAT_A_8,
                                                          COGL_PIXEL_FORMAT_ANY,
-                                                         stride,
+                                                         tex_width,
                                                          mask_data);
 
       g_free (mask_data);
@@ -462,9 +338,9 @@ meta_shaped_texture_paint (ClutterActor *actor)
   if (tex_width == 0 || tex_height == 0) /* no contents yet */
     return;
 
-  if (priv->shape_region == NULL)
+  if (priv->rectangles->len < 1)
     {
-      /* No region means an unclipped shape. Use a single-layer texture. */
+      /* If there are no rectangles use a single-layer texture */
 
       if (priv->material_unshaped == COGL_INVALID_HANDLE) 
         {
@@ -564,8 +440,8 @@ meta_shaped_texture_pick (ClutterActor       *actor,
   MetaShapedTexture *stex = (MetaShapedTexture *) actor;
   MetaShapedTexturePrivate *priv = stex->priv;
 
-  /* If there is no region then use the regular pick */
-  if (priv->shape_region == NULL)
+  /* If there are no rectangles then use the regular pick */
+  if (priv->rectangles->len < 1)
     CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)
       ->pick (actor, color);
   else if (clutter_actor_should_pick_paint (actor))
@@ -685,8 +561,7 @@ meta_shaped_texture_clear (MetaShapedTexture *stex)
 }
 
 void
-meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
-                                      cairo_region_t    *region)
+meta_shaped_texture_clear_rectangles (MetaShapedTexture *stex)
 {
   MetaShapedTexturePrivate *priv;
 
@@ -694,85 +569,40 @@ meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
 
   priv = stex->priv;
 
-  if (priv->shape_region != NULL)
-    {
-      cairo_region_destroy (priv->shape_region);
-      priv->shape_region = NULL;
-    }
+  g_array_set_size (priv->rectangles, 0);
+  meta_shaped_texture_dirty_mask (stex);
+  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
+}
 
-  if (region != NULL)
-    {
-      cairo_region_reference (region);
-      priv->shape_region = region;
-    }
+void
+meta_shaped_texture_add_rectangle (MetaShapedTexture *stex,
+				   const XRectangle  *rect)
+{
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
+
+  meta_shaped_texture_add_rectangles (stex, 1, rect);
+}
+
+void
+meta_shaped_texture_add_rectangles (MetaShapedTexture *stex,
+				    size_t             num_rects,
+				    const XRectangle  *rects)
+{
+  MetaShapedTexturePrivate *priv;
+
+  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
+
+  priv = stex->priv;
+
+  g_array_append_vals (priv->rectangles, rects, num_rects);
 
   meta_shaped_texture_dirty_mask (stex);
   clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }
 
-/**
- * meta_shaped_texture_get_visible_pixels_region:
- * @stex: a #MetaShapedTexture
- *
- * Return a region enclosing only visible pixels: those with
- * alpha values above 0.
- *
- * Returns: a #cairo_region_t
- */
-cairo_region_t *
-meta_shaped_texture_get_visible_pixels_region (MetaShapedTexture *stex)
-{
-  g_return_val_if_fail (META_IS_SHAPED_TEXTURE (stex), NULL);
-
-  meta_shaped_texture_ensure_mask (stex);
-  return stex->priv->visible_pixels_region;
-}
-
-/**
- * meta_shaped_texture_set_overlay_path:
- * @stex: a #MetaShapedTexture
- * @overlay_region: A region containing the parts of the mask to overlay.
- *   All rectangles in this region are wiped clear to full transparency,
- *   and the overlay path is clipped to this region.
- * @overlay_path (transfer full): This path will be painted onto the mask
- *   texture with a fully opaque source. Due to the lack of refcounting
- *   in #cairo_path_t, ownership of the path is assumed.
- */
-void
-meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
-                                      cairo_region_t    *overlay_region,
-                                      cairo_path_t      *overlay_path)
-{
-  MetaShapedTexturePrivate *priv;
-
-  g_return_if_fail (META_IS_SHAPED_TEXTURE (stex));
-
-  priv = stex->priv;
-
-  if (priv->overlay_region != NULL)
-    {
-      cairo_region_destroy (priv->overlay_region);
-      priv->overlay_region = NULL;
-    }
-
-  if (priv->overlay_path != NULL)
-    {
-      cairo_path_destroy (priv->overlay_path);
-      priv->overlay_path = NULL;
-    }
-
-  cairo_region_reference (overlay_region);
-  priv->overlay_region = overlay_region;
-
-  /* cairo_path_t does not have refcounting. */
-  priv->overlay_path = overlay_path;
-
-  meta_shaped_texture_dirty_mask (stex);
-}
-
 /**
  * meta_shaped_texture_set_clip_region:
- * @frame: a #MetaShapedTexture
+ * @frame: a #TidyTextureframe
  * @clip_region: (transfer full): the region of the texture that
  *   is visible and should be painted. OWNERSHIP IS ASSUMED BY
  *   THE FUNCTION (for efficiency to avoid a copy.)

src/compositor/meta-shaped-texture.h

@@ -29,7 +29,9 @@
 #include <config.h>
 
 #include <clutter/clutter.h>
-#include <clutter/x11/clutter-x11.h>
+#ifdef HAVE_GLX_TEXTURE_PIXMAP
+#include <clutter/glx/clutter-glx.h>
+#endif /* HAVE_GLX_TEXTURE_PIXMAP */
 
 G_BEGIN_DECLS
 
@@ -46,12 +48,20 @@ 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;
 };
@@ -65,14 +75,13 @@ void meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
 
 void meta_shaped_texture_clear (MetaShapedTexture *stex);
 
-void meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
-                                           cairo_region_t    *region);
+void meta_shaped_texture_clear_rectangles (MetaShapedTexture *stex);
 
-cairo_region_t *meta_shaped_texture_get_visible_pixels_region (MetaShapedTexture *stex);
-
-void meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
-                                           cairo_region_t    *overlay_region,
-                                           cairo_path_t      *overlay_path);
+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,

src/compositor/meta-texture-rectangle.c

@@ -1,118 +0,0 @@
-/*
- * texture rectangle
- *
- * A small utility function to help create a rectangle texture
- *
- * Authored By Neil Roberts  <neil@linux.intel.com>
- *
- * Copyright (C) 2011 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.
- */
-
-#include <config.h>
-
-#include "meta-texture-rectangle.h"
-
-#ifdef GL_TEXTURE_RECTANGLE_ARB
-
-static void (* pf_glGetIntegerv) (GLenum pname, GLint *params);
-static void (* pf_glTexImage2D) (GLenum target, GLint level,
-                                 GLint internalFormat,
-                                 GLsizei width, GLsizei height,
-                                 GLint border, GLenum format, GLenum type,
-                                 const GLvoid *pixels);
-static void (* pf_glGenTextures) (GLsizei n, GLuint *textures);
-static void (* pf_glDeleteTextures) (GLsizei n, const GLuint *texture);
-static void (* pf_glBindTexture) (GLenum target, GLuint texture);
-
-static void
-rectangle_texture_destroy_cb (void *user_data)
-{
-  GLuint tex = GPOINTER_TO_UINT (user_data);
-
-  pf_glDeleteTextures (1, &tex);
-}
-
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
-
-CoglHandle
-meta_texture_rectangle_new (unsigned int width,
-                            unsigned int height,
-                            CoglTextureFlags flags,
-                            CoglPixelFormat format,
-                            GLenum internal_gl_format,
-                            GLenum internal_format,
-                            unsigned int rowstride,
-                            const guint8 *data)
-{
-  CoglHandle cogl_tex = COGL_INVALID_HANDLE;
-
-#ifdef GL_TEXTURE_RECTANGLE_ARB
-
-  static CoglUserDataKey user_data_key;
-  GLint old_binding;
-  GLuint tex;
-
-  if (pf_glGenTextures == NULL)
-    {
-      pf_glGetIntegerv = (void *) cogl_get_proc_address ("glGetIntegerv");
-      pf_glTexImage2D = (void *) cogl_get_proc_address ("glTexImage2D");
-      pf_glGenTextures = (void *) cogl_get_proc_address ("glGenTextures");
-      pf_glDeleteTextures = (void *) cogl_get_proc_address ("glDeleteTextures");
-      pf_glBindTexture = (void *) cogl_get_proc_address ("glBindTexture");
-    }
-
-  pf_glGenTextures (1, &tex);
-  pf_glGetIntegerv (GL_TEXTURE_BINDING_RECTANGLE_ARB, &old_binding);
-  pf_glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
-  pf_glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
-                   internal_gl_format, width, height,
-                   0, internal_gl_format,
-                   GL_UNSIGNED_BYTE, NULL);
-  pf_glBindTexture (GL_TEXTURE_RECTANGLE_ARB, old_binding);
-
-  cogl_tex = cogl_texture_new_from_foreign (tex,
-                                            GL_TEXTURE_RECTANGLE_ARB,
-                                            width, height,
-                                            0, 0, /* no waste */
-                                            internal_format);
-
-  /* Cogl won't destroy the GL texture when a foreign texture is used
-     so we need to destroy it manually. We can set a destroy
-     notification callback to do this transparently */
-  cogl_object_set_user_data (cogl_tex,
-                             &user_data_key,
-                             GUINT_TO_POINTER (tex),
-                             rectangle_texture_destroy_cb);
-
-  /* Use cogl_texture_set_region instead of uploading the data
-     directly with GL calls so that we can let Cogl deal with setting
-     the pixel store parameters and handling format conversion */
-  if (data)
-    cogl_texture_set_region (cogl_tex,
-                             0, 0, /* src x/y */
-                             0, 0, /* dst x/y */
-                             width, height, /* dst width/height */
-                             width, height, /* src width/height */
-                             format,
-                             rowstride,
-                             data);
-
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
-
-  return cogl_tex;
-}

src/compositor/meta-texture-rectangle.h

@@ -1,45 +0,0 @@
-/*
- * texture rectangle
- *
- * A small utility function to help create a rectangle texture
- *
- * Authored By Neil Roberts  <neil@linux.intel.com>
- *
- * Copyright (C) 2011 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_TEXTURE_RECTANGLE_H__
-#define __META_TEXTURE_RECTANGLE_H__
-
-#include <cogl/cogl.h>
-
-G_BEGIN_DECLS
-
-CoglHandle
-meta_texture_rectangle_new (unsigned int width,
-                            unsigned int height,
-                            CoglTextureFlags flags,
-                            CoglPixelFormat format,
-                            GLenum internal_gl_format,
-                            GLenum internal_format,
-                            unsigned int rowstride,
-                            const guint8 *data);
-
-G_END_DECLS
-
-#endif /* __META_TEXTURE_RECTANGLE_H__ */

src/compositor/meta-texture-tower.c

@@ -26,7 +26,6 @@
 #include <string.h>
 
 #include "meta-texture-tower.h"
-#include "meta-texture-rectangle.h"
 
 #ifndef M_LOG2E
 #define M_LOG2E 1.4426950408889634074
@@ -98,7 +97,6 @@ meta_texture_tower_free (MetaTextureTower *tower)
   g_slice_free (MetaTextureTower, tower);
 }
 
-#ifdef GL_TEXTURE_RECTANGLE_ARB
 static gboolean
 texture_is_rectangle (CoglHandle texture)
 {
@@ -108,11 +106,24 @@ texture_is_rectangle (CoglHandle texture)
   cogl_texture_get_gl_texture (texture, &gl_tex, &gl_target);
   return gl_target == GL_TEXTURE_RECTANGLE_ARB;
 }
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
+
+static void
+free_texture (CoglHandle texture)
+{
+  GLuint gl_tex;
+  GLenum gl_target;
+
+  cogl_texture_get_gl_texture (texture, &gl_tex, &gl_target);
+
+  if (gl_target == GL_TEXTURE_RECTANGLE_ARB)
+    glDeleteTextures (1, &gl_tex);
+
+  cogl_handle_unref (texture);
+}
 
 /**
- * meta_texture_tower_set_base_texture:
- * @tower: a #MetaTextureTower
+ * 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
@@ -137,7 +148,7 @@ meta_texture_tower_set_base_texture (MetaTextureTower *tower,
         {
           if (tower->textures[i] != COGL_INVALID_HANDLE)
             {
-              cogl_handle_unref (tower->textures[i]);
+              free_texture (tower->textures[i]);
               tower->textures[i] = COGL_INVALID_HANDLE;
             }
 
@@ -175,7 +186,7 @@ meta_texture_tower_set_base_texture (MetaTextureTower *tower,
 
 /**
  * meta_texture_tower_update_area:
- * @tower: a #MetaTextureTower
+ * @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
@@ -198,9 +209,6 @@ meta_texture_tower_update_area (MetaTextureTower *tower,
 
   g_return_if_fail (tower != NULL);
 
-  if (tower->textures[0] == COGL_INVALID_HANDLE)
-    return;
-
   texture_width = cogl_texture_get_width (tower->textures[0]);
   texture_height = cogl_texture_get_height (tower->textures[0]);
 
@@ -354,13 +362,11 @@ get_paint_level (int width, int height)
     return (int)(0.5 + lambda);
 }
 
-#ifdef GL_TEXTURE_RECTANGLE_ARB
 static gboolean
 is_power_of_two (int x)
 {
   return (x & (x - 1)) == 0;
 }
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
 
 static void
 texture_tower_create_texture (MetaTextureTower *tower,
@@ -368,25 +374,28 @@ texture_tower_create_texture (MetaTextureTower *tower,
                               int               width,
                               int               height)
 {
-#ifdef GL_TEXTURE_RECTANGLE_ARB
   if ((!is_power_of_two (width) || !is_power_of_two (height)) &&
       texture_is_rectangle (tower->textures[level - 1]))
     {
-      tower->textures[level] =
-        meta_texture_rectangle_new (width, height,
-                                    0, /* flags */
-                                    /* data format */
-                                    TEXTURE_FORMAT,
-                                    /* internal GL format */
-                                    GL_RGBA,
-                                    /* internal cogl format */
-                                    TEXTURE_FORMAT,
-                                    /* rowstride */
-                                    width * 4,
-                                    NULL);
+      GLuint tex = 0;
+
+      glGenTextures (1, &tex);
+      glBindTexture (GL_TEXTURE_RECTANGLE_ARB, tex);
+      glTexImage2D (GL_TEXTURE_RECTANGLE_ARB, 0,
+                    GL_RGBA, width,height,
+#if TEXTURE_FORMAT == COGL_PIXEL_FORMAT_BGRA_8888_PRE
+                    0, GL_BGRA, GL_UNSIGNED_BYTE,
+#else /* assume big endian */
+                    0, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV,
+#endif
+                    NULL);
+
+      tower->textures[level] = cogl_texture_new_from_foreign (tex, GL_TEXTURE_RECTANGLE_ARB,
+                                                              width, height,
+                                                              0, 0,
+                                                              TEXTURE_FORMAT);
     }
   else
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
     {
       tower->textures[level] = cogl_texture_new_with_size (width, height,
                                                            COGL_TEXTURE_NO_AUTO_MIPMAP,
@@ -413,7 +422,12 @@ texture_tower_revalidate_fbo (MetaTextureTower *tower,
   CoglMatrix modelview;
 
   if (tower->fbos[level] == COGL_INVALID_HANDLE)
-    tower->fbos[level] = cogl_offscreen_new_to_texture (dest_texture);
+    {
+      /* Work around http://bugzilla.openedhand.com/show_bug.cgi?id=2110 */
+      cogl_flush();
+
+      tower->fbos[level] = cogl_offscreen_new_to_texture (dest_texture);
+    }
 
   if (tower->fbos[level] == COGL_INVALID_HANDLE)
     return FALSE;
@@ -582,7 +596,7 @@ texture_tower_revalidate (MetaTextureTower *tower,
 
 /**
  * meta_texture_tower_get_paint_texture:
- * @tower: a #MetaTextureTower
+ * @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

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

@@ -6,7 +6,7 @@
 #include <config.h>
 
 #include <X11/extensions/Xdamage.h>
-#include <meta/compositor-mutter.h>
+#include "compositor-mutter.h"
 
 MetaWindowActor *meta_window_actor_new (MetaWindow *window);
 
@@ -26,22 +26,15 @@ void meta_window_actor_unmaximize (MetaWindowActor *self,
 
 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);
 
-void meta_window_actor_set_redirected (MetaWindowActor *self, gboolean state);
-
-gboolean meta_window_actor_should_unredirect (MetaWindowActor *self);
-
-void meta_window_actor_get_shape_bounds (MetaWindowActor       *self,
-                                          cairo_rectangle_int_t *bounds);
-
 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);
+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);

src/compositor/meta-window-group.c

@@ -5,12 +5,8 @@
 #define _ISOC99_SOURCE /* for roundf */
 #include <math.h>
 
-#include <gdk/gdk.h> /* for gdk_rectangle_intersect() */
-
-#include "compositor-private.h"
 #include "meta-window-actor-private.h"
 #include "meta-window-group.h"
-#include "meta-background-actor-private.h"
 
 struct _MetaWindowGroupClass
 {
@@ -101,41 +97,13 @@ actor_is_untransformed (ClutterActor *actor,
   return TRUE;
 }
 
-#if CLUTTER_CHECK_VERSION(1, 9, 0)
-#define has_effects clutter_actor_has_effects
-#else
-
-static gboolean
-has_effects(ClutterActor *actor)
-{
-  GList *list;
-  gboolean ret;
-
-  list = clutter_actor_get_effects (actor);
-  ret = list != NULL;
-  g_list_free (list);
-
-  return ret;
-}
-
-#endif
-
 static void
 meta_window_group_paint (ClutterActor *actor)
 {
-  cairo_region_t *visible_region;
-  cairo_region_t *unredirected_window_region = NULL;
-  ClutterActor *stage;
-  cairo_rectangle_int_t visible_rect, unredirected_rect;
-  GList *children, *l;
-
   MetaWindowGroup *window_group = META_WINDOW_GROUP (actor);
-  MetaCompScreen *info = meta_screen_get_compositor_data (window_group->screen);
-  if (info->unredirected_window != NULL)
-    {
-      meta_window_actor_get_shape_bounds (META_WINDOW_ACTOR (info->unredirected_window), &unredirected_rect);
-      unredirected_window_region = cairo_region_create_rectangle (&unredirected_rect);
-    }
+  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),
    * and subtract the opaque area of each window out of the visible
@@ -144,80 +112,45 @@ meta_window_group_paint (ClutterActor *actor)
   children = clutter_container_get_children (CLUTTER_CONTAINER (actor));
   children = g_list_reverse (children);
 
-  /* Get the clipped redraw bounds from Clutter so that we can avoid
-   * painting shadows on windows that don't need to be painted in this
-   * frame. In the case of a multihead setup with mismatched monitor
-   * sizes, we could intersect this with an accurate union of the
-   * monitors to avoid painting shadows that are visible only in the
-   * holes. */
-  stage = clutter_actor_get_stage (actor);
-  clutter_stage_get_redraw_clip_bounds (CLUTTER_STAGE (stage),
-                                        &visible_rect);
-
-  visible_region = cairo_region_create_rectangle (&visible_rect);
-
-  if (unredirected_window_region)
-    cairo_region_subtract (visible_region, unredirected_window_region);
+  /* Start off with the full screen area (for a multihead setup, we
+   * might want to use a more accurate union of the monitors to avoid
+   * painting in holes from mismatched monitor sizes. That's just an
+   * optimization, however.)
+   */
+  meta_screen_get_size (window_group->screen, &screen_rect.width, &screen_rect.height);
+  visible_region = cairo_region_create_rectangle (&screen_rect);
 
   for (l = children; l; l = l->next)
     {
-      if (!CLUTTER_ACTOR_IS_VISIBLE (l->data))
+      MetaWindowActor *window_actor;
+      gboolean x, y;
+
+      if (!META_IS_WINDOW_ACTOR (l->data) || !CLUTTER_ACTOR_IS_VISIBLE (l->data))
         continue;
 
-      /* If an actor has effects applied, then that can change the area
-       * it paints and the opacity, so we no longer can figure out what
-       * portion of the actor is obscured and what portion of the screen
-       * it obscures, so we skip the actor.
-       *
-       * This has a secondary beneficial effect: if a ClutterOffscreenEffect
-       * is applied to an actor, then our clipped redraws interfere with the
-       * caching of the FBO - even if we only need to draw a small portion
-       * of the window right now, ClutterOffscreenEffect may use other portions
-       * of the FBO later. So, skipping actors with effects applied also
-       * prevents these bugs.
-       *
-       * Theoretically, we should check clutter_actor_get_offscreen_redirect()
-       * as well for the same reason, but omitted for simplicity in the
-       * hopes that no-one will do that.
-       */
-      if (has_effects (l->data))
+      window_actor = l->data;
+
+      if (!actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
         continue;
 
-      if (META_IS_WINDOW_ACTOR (l->data))
+      /* Temporarily move to the coordinate system of the actor */
+      cairo_region_translate (visible_region, - x, - y);
+
+      meta_window_actor_set_visible_region (window_actor, visible_region);
+
+      if (clutter_actor_get_paint_opacity (CLUTTER_ACTOR (window_actor)) == 0xff)
         {
-          MetaWindowActor *window_actor = l->data;
-          int x, y;
-
-          if (!actor_is_untransformed (CLUTTER_ACTOR (window_actor), &x, &y))
-            continue;
-
-          /* Temporarily move to the coordinate system of the actor */
-          cairo_region_translate (visible_region, - x, - y);
-
-          meta_window_actor_set_visible_region (window_actor, visible_region);
-
-          if (clutter_actor_get_paint_opacity (CLUTTER_ACTOR (window_actor)) == 0xff)
-            {
-              cairo_region_t *obscured_region = meta_window_actor_get_obscured_region (window_actor);
-              if (obscured_region)
-                cairo_region_subtract (visible_region, obscured_region);
-            }
-
-          meta_window_actor_set_visible_region_beneath (window_actor, visible_region);
-          cairo_region_translate (visible_region, x, y);
-        }
-      else if (META_IS_BACKGROUND_ACTOR (l->data))
-        {
-          MetaBackgroundActor *background_actor = l->data;
-          meta_background_actor_set_visible_region (background_actor, visible_region);
+          cairo_region_t *obscured_region = meta_window_actor_get_obscured_region (window_actor);
+          if (obscured_region)
+            cairo_region_subtract (visible_region, obscured_region);
         }
+
+      meta_window_actor_set_visible_region_beneath (window_actor, visible_region);
+      cairo_region_translate (visible_region, x, y);
     }
 
   cairo_region_destroy (visible_region);
 
-  if (unredirected_window_region)
-    cairo_region_destroy (unredirected_window_region);
-
   CLUTTER_ACTOR_CLASS (meta_window_group_parent_class)->paint (actor);
 
   /* Now that we are done painting, unset the visible regions (they will
@@ -225,17 +158,13 @@ meta_window_group_paint (ClutterActor *actor)
    */
   for (l = children; l; l = l->next)
     {
-      if (META_IS_WINDOW_ACTOR (l->data))
-        {
-          MetaWindowActor *window_actor = l->data;
-          window_actor = l->data;
-          meta_window_actor_reset_visible_regions (window_actor);
-        }
-      else if (META_IS_BACKGROUND_ACTOR (l->data))
-        {
-          MetaBackgroundActor *background_actor = l->data;
-          meta_background_actor_set_visible_region (background_actor, NULL);
-        }
+      MetaWindowActor *window_actor;
+
+      if (!META_IS_WINDOW_ACTOR (l->data))
+        continue;
+
+      window_actor = l->data;
+      meta_window_actor_reset_visible_regions (window_actor);
     }
 
   g_list_free (children);

src/compositor/meta-window-group.h

@@ -5,7 +5,7 @@
 
 #include <clutter/clutter.h>
 
-#include <meta/screen.h>
+#include "screen.h"
 
 /**
  * MetaWindowGroup:

src/compositor/meta-window-shape.c

@@ -141,9 +141,8 @@ meta_window_shape_new (cairo_region_t *region)
 
 #if 0
       g_print ("%d: +%d+%dx%dx%d => +%d+%dx%dx%d\n",
-               iter.i, iter.rectangle.x, iter.rectangle.y, iter.rectangle.width, iter.rectangle.height,
-               shape->rectangles[iter.i].x, shape->rectangles[iter.i].y,
-               hape->rectangles[iter.i].width, shape->rectangles[iter.i].height);
+               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;

src/compositor/meta-window-shape.h

@@ -32,8 +32,8 @@
  * 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,
- * the regions representing two windows that are rounded rectangles,
- * with the same corner radius but different sizes, have the
+ * 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

src/compositor/plugins/Makefile.am

@@ -1,7 +1,7 @@
 
 pkglibdir=@MUTTER_PLUGIN_DIR@
 
-INCLUDES=@MUTTER_CFLAGS@ -I $(top_srcdir)/src -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" -DMUTTER_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"mutter\" -DSN_API_NOT_YET_FROZEN=1 -DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION) -DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION) -DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION) -DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION) -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"
+INCLUDES=@MUTTER_CFLAGS@ -I $(top_srcdir)/src/include -DMUTTER_LIBEXECDIR=\"$(libexecdir)\" -DHOST_ALIAS=\"@HOST_ALIAS@\" -DMUTTER_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\" -DMUTTER_PKGDATADIR=\"$(pkgdatadir)\" -DMUTTER_DATADIR=\"$(datadir)\" -DG_LOG_DOMAIN=\"mutter\" -DSN_API_NOT_YET_FROZEN=1 -DMUTTER_MAJOR_VERSION=$(MUTTER_MAJOR_VERSION) -DMUTTER_MINOR_VERSION=$(MUTTER_MINOR_VERSION) -DMUTTER_MICRO_VERSION=$(MUTTER_MICRO_VERSION) -DMUTTER_PLUGIN_API_VERSION=$(MUTTER_PLUGIN_API_VERSION) -DMUTTER_PLUGIN_DIR=\"@MUTTER_PLUGIN_DIR@\"
 
 default_la_CFLAGS   = -fPIC
 default_la_SOURCES  = default.c

src/compositor/plugins/README

@@ -0,0 +1,41 @@
+
+Plugins implement effects associated with WM events, such as window map,
+minimizing, maximizing, unmaximizing, destruction and workspace switching. The
+plugin API is documented in src/include/compositor-clutter-plugin.h; in
+addition the simple plugin can be used as a reference implementation.
+
+The API is intended to be generic, exposing no implementation details of the WM
+to the plugins; this will facilitate reuse without modification with another WM
+(there are plans to use the same plugin API with Matchbox 2).
+
+Multiple plugins can implement the same effect and be loaded at the same time;
+however, stacking arbitrary effects in this way might not work as expected;
+this is particularly true of more complex effects, such as those for workspace
+switching.
+
+Plugins are installed in ${prefix}/lib/metacity/plugins/clutter; from there the
+WM will load plugins listed in the clutter_plugins key in the Metacity gconf
+general preferences group. Each entry in preferences has the format
+
+  'name: optional parameters'
+
+where 'name' is the name of the library without the .so suffix.
+
+As noted above, additional parameters can be passed to the plugin via the
+preference key. In such case, the plugin name is immediately followed by a
+colon, separating it from the parameters. Two common parameters should be
+handled by all plugins:
+
+  'debug'   indicates that the plugin is run in a debug mode (what exactly that
+            means is left to the plugin to determine).
+
+  'disable' parameter indicates which effects within the plugin should be
+            disabled; the format of the disable parameter is
+
+              'disable: effect1[, effect2];'
+
+            where effect1, etc., matches the effects listed in the
+            compositor-clutter-plugin.h file (currently one of 'map', 'destroy',
+            'maximize', 'unmaximize', 'switch-workspace'). Example 'disable:
+            minimize, maximize;'.
+

src/compositor/plugins/default.c

@@ -21,8 +21,8 @@
  * 02111-1307, USA.
  */
 
-#include <meta/meta-plugin.h>
-#include <meta/window.h>
+#include "meta-plugin.h"
+#include "window.h"
 
 #include <libintl.h>
 #define _(x) dgettext (GETTEXT_PACKAGE, x)
@@ -319,10 +319,12 @@ switch_workspace (MetaPlugin *plugin,
 {
   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 = meta_plugin_get_screen (plugin);
   ClutterAnimation *animation;
 
   stage = meta_plugin_get_stage (plugin);
@@ -348,6 +350,8 @@ switch_workspace (MetaPlugin *plugin,
       return;
     }
 
+  n_workspaces = meta_screen_get_n_workspaces (screen);
+
   l = g_list_last (meta_plugin_get_window_actors (plugin));
 
   while (l)

src/compositor/region-utils.c

@@ -47,9 +47,7 @@
 
 typedef struct
 {
-  /* To merge regions in binary tree order, we need to keep track of
-   * the regions that we've already merged together at different
-   * levels of the tree. We fill in an array in the pattern:
+  /* 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  |
@@ -180,7 +178,7 @@ meta_region_iterator_next (MetaRegionIterator *iter)
   iter->rectangle = iter->next_rectangle;
   iter->line_start = iter->line_end;
 
-  if (iter->i + 1 < iter->n_rectangles)
+  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;
@@ -203,12 +201,12 @@ add_expanded_rect (MetaRegionBuilder  *builder,
 {
   if (flip)
     meta_region_builder_add_rectangle (builder,
-                                       y - y_amount, x - x_amount,
-                                       height + 2 * y_amount, width + 2 * x_amount);
+                                         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);
+                                         x - x_amount, y - y_amount,
+                                         width + 2 * x_amount, height + 2 * y_amount);
 }
 
 static cairo_region_t *
@@ -248,6 +246,7 @@ expand_region_inverse (cairo_region_t *region,
   MetaRegionBuilder builder;
   MetaRegionIterator iter;
   cairo_rectangle_int_t extents;
+  cairo_region_t *chunk;
 
   int last_x;
 
@@ -267,11 +266,16 @@ expand_region_inverse (cairo_region_t *region,
                      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,

src/core/above-tab-keycode.c

@@ -1,243 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Find the keycode for the key above the tab key */
-/*
- * Copyright 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.
- */
-
-/* The standard cycle-windows keybinding should be the key above the
- * tab key. This will have a different keysym on different keyboards -
- * it's the ` (grave) key on US keyboards but something else on many
- * other national layouts. So we need to figure out the keycode for
- * this key without reference to key symbol.
- *
- * The "correct" way to do this is to get the XKB geometry from the
- * X server, find the Tab key, find the key above the Tab key in the
- * same section and use the keycode for that key. This is what I
- * implemented here, but unfortunately, fetching the geometry is rather
- * slow (It could take 20ms or more.)
- *
- * If you looking for a way to optimize Mutter startup performance:
- * On all Linux systems using evdev the key above TAB will have
- * keycode 49. (KEY_GRAVE=41 + the 8 code point offset between
- * evdev keysyms and X keysyms.) So a configure option
- * --with-above-tab-keycode=49 could be added that bypassed this
- * code. It wouldn't work right for displaying Mutter remotely
- * to a non-Linux X server, but that is pretty rare.
- */
-
-#include <config.h>
-
-#include <string.h>
-
-#include "display-private.h"
-
-#include <X11/keysym.h>
-
-#ifdef HAVE_XKB
-#include <X11/XKBlib.h>
-#include <X11/extensions/XKBgeom.h>
-
-static guint
-compute_above_tab_keycode (Display *xdisplay)
-{
-  XkbDescPtr keyboard;
-  XkbGeometryPtr geometry;
-  int i, j, k;
-  int tab_keycode;
-  char *tab_name;
-  XkbSectionPtr tab_section;
-  XkbBoundsRec tab_bounds;
-  XkbKeyPtr best_key = NULL;
-  guint best_keycode = (guint)-1;
-  int best_x_dist = G_MAXINT;
-  int best_y_dist = G_MAXINT;
-
-  /* We need only the Names and the Geometry, but asking for these results
-   * in the Keyboard information retrieval failing for unknown reasons.
-   * (Testing with xorg-1.9.1.) So we ask for a part that we don't need
-   * as well.
-   */
-  keyboard = XkbGetKeyboard (xdisplay,
-                             XkbGBN_ClientSymbolsMask | XkbGBN_KeyNamesMask | XkbGBN_GeometryMask,
-                             XkbUseCoreKbd);
-  if (!keyboard)
-    return best_keycode;
-
-  geometry = keyboard->geom;
-
-  /* There could potentially be multiple keys with the Tab keysym on the keyboard;
-   * but XKeysymToKeycode() returns us the one that the alt-Tab binding will
-   * use which is good enough
-   */
-  tab_keycode = XKeysymToKeycode (xdisplay, XK_Tab);
-  if (tab_keycode == 0 || tab_keycode < keyboard->min_key_code || tab_keycode > keyboard->max_key_code)
-    goto out;
-
-  /* The keyboard geometry is stored by key "name" rather than keycode.
-   * (Key names are 4-character strings like like TAB or AE01.) We use the
-   * 'names' part of the keyboard description to map keycode to key name.
-   *
-   * XKB has a "key aliases" feature where a single keyboard key can have
-   * multiple names (with separate sets of aliases in the 'names' part and
-   * in the 'geometry' part), but I don't really understand it or how it is used,
-   * so I'm ignoring it here.
-   */
-
-  tab_name = keyboard->names->keys[tab_keycode].name; /* Not NULL terminated! */
-
-  /* First, iterate through the keyboard geometry to find the tab key; the keyboard
-   * geometry has a three-level heirarchy of section > row > key
-   */
-  for (i = 0; i < geometry->num_sections; i++)
-    {
-      XkbSectionPtr section = &geometry->sections[i];
-      for (j = 0; j < section->num_rows; j++)
-        {
-          int x = 0;
-          int y = 0;
-
-          XkbRowPtr row = &section->rows[j];
-          for (k = 0; k < row->num_keys; k++)
-            {
-              XkbKeyPtr key = &row->keys[k];
-              XkbShapePtr shape = XkbKeyShape (geometry, key);
-
-              if (row->vertical)
-                y += key->gap;
-              else
-                x += key->gap;
-
-              if (strncmp (key->name.name, tab_name, XkbKeyNameLength) == 0)
-                {
-                  tab_section = section;
-                  tab_bounds = shape->bounds;
-                  tab_bounds.x1 += row->left + x;
-                  tab_bounds.x2 += row->left + x;
-                  tab_bounds.y1 += row->top + y;
-                  tab_bounds.y2 += row->top + y;
-
-                  goto found_tab;
-                }
-
-              if (row->vertical)
-                y += (shape->bounds.y2 - shape->bounds.y1);
-              else
-                x += (shape->bounds.x2 - shape->bounds.x1);
-            }
-        }
-    }
-
-  /* No tab key found */
-  goto out;
-
- found_tab:
-
-  /* Now find the key that:
-   *  - Is in the same section as the Tab key
-   *  - Has a horizontal center in the Tab key's horizonal bounds
-   *  - Is above the Tab key at a distance closer than any other key
-   *  - In case of ties, has its horizontal center as close as possible
-   *    to the Tab key's horizontal center
-   */
-  for (j = 0; j < tab_section->num_rows; j++)
-    {
-      int x = 0;
-      int y = 0;
-
-      XkbRowPtr row = &tab_section->rows[j];
-      for (k = 0; k < row->num_keys; k++)
-        {
-          XkbKeyPtr key = &row->keys[k];
-          XkbShapePtr shape = XkbKeyShape(geometry, key);
-          XkbBoundsRec bounds = shape->bounds;
-          int x_center;
-          int x_dist, y_dist;
-
-          if (row->vertical)
-            y += key->gap;
-          else
-            x += key->gap;
-
-          bounds.x1 += row->left + x;
-          bounds.x2 += row->left + x;
-          bounds.y1 += row->top + y;
-          bounds.y2 += row->top + y;
-
-          y_dist = tab_bounds.y1 - bounds.y2;
-          if (y_dist < 0)
-            continue;
-
-          x_center = (bounds.x1 + bounds.x2) / 2;
-          if (x_center < tab_bounds.x1 || x_center > tab_bounds.x2)
-            continue;
-
-          x_dist = ABS (x_center - (tab_bounds.x1 + tab_bounds.x2) / 2);
-
-          if (y_dist < best_y_dist ||
-              (y_dist == best_y_dist && x_dist < best_x_dist))
-            {
-              best_key = key;
-              best_x_dist = x_dist;
-              best_y_dist = y_dist;
-             }
-
-          if (row->vertical)
-            y += (shape->bounds.y2 - shape->bounds.y1);
-          else
-            x += (shape->bounds.x2 - shape->bounds.x1);
-        }
-    }
-
-  if (best_key == NULL)
-    goto out;
-
-  /* Now we need to resolve the name of the best key back to a keycode */
-  for (i = keyboard->min_key_code; i < keyboard->max_key_code; i++)
-    {
-      if (strncmp (best_key->name.name, keyboard->names->keys[i].name, XkbKeyNameLength) == 0)
-        {
-          best_keycode = i;
-          break;
-        }
-    }
-
- out:
-  XkbFreeKeyboard (keyboard, 0, True);
-
-  return best_keycode;
-}
-#else /* !HAVE_XKB */
-static guint
-compute_above_tab_keycode (Display *xdisplay)
-{
-  return XKeysymToKeycode (xdisplay, XK_grave);
-}
-#endif /* HAVE_XKB */
-
-guint
-meta_display_get_above_tab_keycode (MetaDisplay *display)
-{
-  if (display->above_tab_keycode == 0) /* not yet computed */
-    display->above_tab_keycode = compute_above_tab_keycode (display->xdisplay);
-
-  if (display->above_tab_keycode == (guint)-1) /* failed to compute */
-    return 0;
-  else
-    return display->above_tab_keycode;
-}

src/core/bell.c

@@ -51,7 +51,7 @@
 #include <config.h>
 #include "bell.h"
 #include "screen-private.h"
-#include <meta/prefs.h>
+#include "prefs.h"
 #ifdef HAVE_LIBCANBERRA
 #include <canberra-gtk.h>
 #endif
@@ -130,7 +130,7 @@ bell_flash_screen (MetaDisplay *display,
       XFreeGC (display->xdisplay, gc);
     }
 
-  if (meta_prefs_get_focus_mode () != G_DESKTOP_FOCUS_MODE_CLICK &&
+  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK &&
       !display->mouse_mode)
     meta_display_increment_focus_sentinel (display);
   XFlush (display->xdisplay);
@@ -149,7 +149,7 @@ bell_flash_screen (MetaDisplay *display,
 #ifdef HAVE_XKB
 static void
 bell_flash_fullscreen (MetaDisplay *display, 
-                       XkbAnyEvent *xkb_ev)
+			    XkbAnyEvent *xkb_ev)
 {
   XkbBellNotifyEvent *xkb_bell_ev = (XkbBellNotifyEvent *) xkb_ev;
   MetaScreen *screen;
@@ -159,12 +159,7 @@ bell_flash_fullscreen (MetaDisplay *display,
     {
       screen = meta_display_screen_for_xwindow (display, xkb_bell_ev->window);
       if (screen)
-        {
-          if (display->compositor)
-            meta_compositor_flash_screen (display->compositor, screen);
-          else
-            bell_flash_screen (display, screen);
-        }
+	bell_flash_screen (display, screen);
     }
   else 
     {
@@ -172,10 +167,7 @@ bell_flash_fullscreen (MetaDisplay *display,
       while (screen_list) 
 	{
 	  screen = (MetaScreen *) screen_list->data;
-          if (display->compositor)
-            meta_compositor_flash_screen (display->compositor, screen);
-          else
-            bell_flash_screen (display, screen);
+	  bell_flash_screen (display, screen);
 	  screen_list = screen_list->next;
 	}
     }
@@ -277,12 +269,15 @@ bell_visual_notify (MetaDisplay *display,
 {
   switch (meta_prefs_get_visual_bell_type ()) 
     {
-    case G_DESKTOP_VISUAL_BELL_FULLSCREEN_FLASH:
+    case META_VISUAL_BELL_FULLSCREEN_FLASH:
       bell_flash_fullscreen (display, xkb_ev);
       break;
-    case G_DESKTOP_VISUAL_BELL_FRAME_FLASH:
+    case META_VISUAL_BELL_FRAME_FLASH:
       bell_flash_frame (display, xkb_ev); /* does nothing yet */
       break;
+    case META_VISUAL_BELL_INVALID:
+      /* do nothing */
+      break;
     }
 }
 
@@ -291,7 +286,7 @@ meta_bell_notify (MetaDisplay *display,
 		  XkbAnyEvent *xkb_ev)
 {
   /* flash something */
-  if (meta_prefs_get_visual_bell ())
+  if (meta_prefs_get_visual_bell ()) 
     bell_visual_notify (display, xkb_ev);
 
 #ifdef HAVE_LIBCANBERRA

src/core/bell.h

@@ -36,7 +36,7 @@
 #include <X11/XKBlib.h>
 #endif
 #include "display-private.h"
-#include "frame.h"
+#include "frame-private.h"
 
 #ifdef HAVE_XKB
 /**

src/core/boxes-private.h

@@ -25,8 +25,8 @@
 #define META_BOXES_PRIVATE_H
 
 #include <glib-object.h>
-#include <meta/common.h>
-#include <meta/boxes.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   */

src/core/boxes.c

@@ -27,7 +27,7 @@
  */
 
 #include "boxes-private.h"
-#include <meta/util.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
@@ -179,16 +179,6 @@ meta_rectangle_area (const MetaRectangle *rect)
   return rect->width * rect->height;
 }
 
-/**
- * meta_rectangle_intersect:
- * @src1: a #MetaRectangle
- * @src2: another #MetaRectangle
- * @dest: (out caller-allocates): an empty #MetaRectangle, to be filled
- *   with the coordinates of the intersection.
- *
- * Returns: TRUE is some intersection exists and is not degenerate, FALSE
- *   otherwise.
- */
 gboolean
 meta_rectangle_intersect (const MetaRectangle *src1,
 			  const MetaRectangle *src2,
@@ -236,13 +226,6 @@ meta_rectangle_equal (const MetaRectangle *src1,
           (src1->height == src2->height));
 }
 
-/**
- * meta_rectangle_union:
- * @rect1: a #MetaRectangle
- * @rect2: another #MetaRectangle
- * @dest: (out caller-allocates): an empty #MetaRectangle, to be filled
- *   with the coordinates of the bounding box.
- */
 void
 meta_rectangle_union (const MetaRectangle *rect1,
                       const MetaRectangle *rect2,
@@ -357,6 +340,7 @@ meta_rectangle_resize_with_gravity (const MetaRectangle *old_rect,
    */
 
   /* First, the x direction */
+  int adjust = 0;
   switch (gravity)
     {
     case NorthWestGravity:
@@ -389,6 +373,7 @@ meta_rectangle_resize_with_gravity (const MetaRectangle *old_rect,
   rect->width = new_width;
   
   /* Next, the y direction */
+  adjust = 0;
   switch (gravity)
     {
     case NorthWestGravity:

src/core/constraints.c

@@ -28,7 +28,7 @@
 #include "constraints.h"
 #include "workspace-private.h"
 #include "place.h"
-#include <meta/prefs.h>
+#include "prefs.h"
 
 #include <stdlib.h>
 #include <math.h>
@@ -118,7 +118,7 @@ typedef struct
 {
   MetaRectangle        orig;
   MetaRectangle        current;
-  MetaFrameBorders    *borders;
+  MetaFrameGeometry   *fgeom;
   ActionType           action_type;
   gboolean             is_user_action;
 
@@ -142,11 +142,6 @@ typedef struct
   GList  *usable_screen_region;
   GList  *usable_monitor_region;
 } ConstraintInfo;
-
-static gboolean do_screen_and_monitor_relative_constraints (MetaWindow     *window,
-                                                            GList          *region_spanning_rectangles,
-                                                            ConstraintInfo *info,
-                                                            gboolean        check_only);
 static gboolean constrain_modal_dialog       (MetaWindow         *window,
                                               ConstraintInfo     *info,
                                               ConstraintPriority  priority,
@@ -194,7 +189,7 @@ static gboolean constrain_partially_onscreen (MetaWindow         *window,
 
 static void setup_constraint_info        (ConstraintInfo      *info,
                                           MetaWindow          *window,
-                                          MetaFrameBorders    *orig_borders,
+                                          MetaFrameGeometry   *orig_fgeom,
                                           MetaMoveResizeFlags  flags,
                                           int                  resize_gravity,
                                           const MetaRectangle *orig,
@@ -204,11 +199,11 @@ static void place_window_if_needed       (MetaWindow     *window,
 static void update_onscreen_requirements (MetaWindow     *window,
                                           ConstraintInfo *info);
 static void extend_by_frame              (MetaRectangle           *rect,
-                                          const MetaFrameBorders  *borders);
+                                          const MetaFrameGeometry *fgeom);
 static void unextend_by_frame            (MetaRectangle           *rect,
-                                          const MetaFrameBorders  *borders);
+                                          const MetaFrameGeometry *fgeom);
 static inline void get_size_limits       (const MetaWindow        *window,
-                                          const MetaFrameBorders  *borders,
+                                          const MetaFrameGeometry *fgeom,
                                           gboolean include_frame,
                                           MetaRectangle *min_size,
                                           MetaRectangle *max_size);
@@ -279,7 +274,7 @@ do_all_constraints (MetaWindow         *window,
 
 void
 meta_window_constrain (MetaWindow          *window,
-                       MetaFrameBorders    *orig_borders,
+                       MetaFrameGeometry   *orig_fgeom,
                        MetaMoveResizeFlags  flags,
                        int                  resize_gravity,
                        const MetaRectangle *orig,
@@ -302,7 +297,7 @@ meta_window_constrain (MetaWindow          *window,
 
   setup_constraint_info (&info,
                          window, 
-                         orig_borders,
+                         orig_fgeom, 
                          flags,
                          resize_gravity,
                          orig,
@@ -337,14 +332,14 @@ meta_window_constrain (MetaWindow          *window,
    * not gobject-style--gobject would be more pain than it's worth) or
    * smart pointers would be so much nicer here.  *shrug*
    */
-  if (!orig_borders)
-    g_free (info.borders);
+  if (!orig_fgeom)
+    g_free (info.fgeom);
 }
 
 static void
 setup_constraint_info (ConstraintInfo      *info,
                        MetaWindow          *window,
-                       MetaFrameBorders    *orig_borders,
+                       MetaFrameGeometry   *orig_fgeom,
                        MetaMoveResizeFlags  flags,
                        int                  resize_gravity,
                        const MetaRectangle *orig,
@@ -357,10 +352,10 @@ setup_constraint_info (ConstraintInfo      *info,
   info->current = *new;
 
   /* Create a fake frame geometry if none really exists */
-  if (orig_borders && !window->fullscreen)
-    info->borders = orig_borders;
+  if (orig_fgeom && !window->fullscreen)
+    info->fgeom = orig_fgeom;
   else
-    info->borders = g_new0 (MetaFrameBorders, 1);
+    info->fgeom = g_new0 (MetaFrameGeometry, 1);
 
   if (flags & META_IS_MOVE_ACTION && flags & META_IS_RESIZE_ACTION)
     info->action_type = ACTION_MOVE_AND_RESIZE;
@@ -439,13 +434,9 @@ setup_constraint_info (ConstraintInfo      *info,
                                          monitor_info->number);
 
   /* Workaround braindead legacy apps that don't know how to
-   * fullscreen themselves properly - don't get fooled by
-   * windows which hide their titlebar when maximized; that's
-   * not the same as fullscreen, even if there are no struts
-   * making the workarea smaller than the monitor.
+   * fullscreen themselves properly.
    */
   if (meta_prefs_get_force_fullscreen() &&
-      !window->hide_titlebar_when_maximized &&
       meta_rectangle_equal (new, &monitor_info->rect) &&
       window->has_fullscreen_func &&
       !window->fullscreen)
@@ -465,6 +456,7 @@ setup_constraint_info (ConstraintInfo      *info,
               "Setting up constraint info:\n"
               "  orig: %d,%d +%d,%d\n"
               "  new : %d,%d +%d,%d\n"
+              "  fgeom: %d,%d,%d,%d\n"
               "  action_type     : %s\n"
               "  is_user_action  : %s\n"
               "  resize_gravity  : %s\n"
@@ -474,6 +466,8 @@ setup_constraint_info (ConstraintInfo      *info,
               info->orig.x, info->orig.y, info->orig.width, info->orig.height,
               info->current.x, info->current.y, 
                 info->current.width, info->current.height,
+              info->fgeom->left_width, info->fgeom->right_width,
+                info->fgeom->top_height, info->fgeom->bottom_height,
               (info->action_type == ACTION_MOVE) ? "Move" :
                 (info->action_type == ACTION_RESIZE) ? "Resize" :
                 (info->action_type == ACTION_MOVE_AND_RESIZE) ? "Move&Resize" :
@@ -514,7 +508,7 @@ place_window_if_needed(MetaWindow     *window,
       MetaWorkspace *cur_workspace;
       const MetaMonitorInfo *monitor_info;
 
-      meta_window_place (window, info->borders, info->orig.x, info->orig.y,
+      meta_window_place (window, info->fgeom, info->orig.x, info->orig.y,
                          &placed_rect.x, &placed_rect.y);
       did_placement = TRUE;
 
@@ -574,7 +568,7 @@ place_window_if_needed(MetaWindow     *window,
 
           /* maximization may have changed frame geometry */
           if (window->frame && !window->fullscreen)
-            meta_frame_calc_borders (window->frame, info->borders);
+            meta_frame_calc_geometry (window->frame, info->fgeom);
 
           if (window->fullscreen_after_placement)
             {
@@ -635,7 +629,7 @@ update_onscreen_requirements (MetaWindow     *window,
   /* The require onscreen/on-single-monitor and titlebar_visible
    * stuff is relative to the outer window, not the inner
    */
-  extend_by_frame (&info->current, info->borders);
+  extend_by_frame (&info->current, info->fgeom);
 
   /* Update whether we want future constraint runs to require the
    * window to be on fully onscreen.
@@ -671,7 +665,7 @@ update_onscreen_requirements (MetaWindow     *window,
       MetaRectangle titlebar_rect;
 
       titlebar_rect = info->current;
-      titlebar_rect.height = info->borders->visible.top;
+      titlebar_rect.height = info->fgeom->top_height;
       old = window->require_titlebar_visible;
       window->require_titlebar_visible =
         meta_rectangle_overlaps_with_region (info->usable_screen_region,
@@ -684,32 +678,32 @@ update_onscreen_requirements (MetaWindow     *window,
     }
 
   /* Don't forget to restore the position of the window */
-  unextend_by_frame (&info->current, info->borders);
+  unextend_by_frame (&info->current, info->fgeom);
 }
 
 static void
 extend_by_frame (MetaRectangle           *rect,
-                 const MetaFrameBorders *borders)
+                 const MetaFrameGeometry *fgeom)
 {
-  rect->x -= borders->visible.left;
-  rect->y -= borders->visible.top;
-  rect->width  += borders->visible.left + borders->visible.right;
-  rect->height += borders->visible.top + borders->visible.bottom;
+  rect->x -= fgeom->left_width;
+  rect->y -= fgeom->top_height;
+  rect->width  += fgeom->left_width + fgeom->right_width;
+  rect->height += fgeom->top_height + fgeom->bottom_height;
 }
 
 static void
 unextend_by_frame (MetaRectangle           *rect,
-                   const MetaFrameBorders *borders)
+                   const MetaFrameGeometry *fgeom)
 {
-  rect->x += borders->visible.left;
-  rect->y += borders->visible.top;
-  rect->width  -= borders->visible.left + borders->visible.right;
-  rect->height -= borders->visible.top + borders->visible.bottom;
+  rect->x += fgeom->left_width;
+  rect->y += fgeom->top_height;
+  rect->width  -= fgeom->left_width + fgeom->right_width;
+  rect->height -= fgeom->top_height + fgeom->bottom_height;
 }
 
 static inline void
 get_size_limits (const MetaWindow        *window,
-                 const MetaFrameBorders *borders,
+                 const MetaFrameGeometry *fgeom,
                  gboolean                 include_frame,
                  MetaRectangle *min_size,
                  MetaRectangle *max_size)
@@ -724,8 +718,8 @@ get_size_limits (const MetaWindow        *window,
 
   if (include_frame)
     {
-      int fw = borders->visible.left + borders->visible.right;
-      int fh = borders->visible.top + borders->visible.bottom;
+      int fw = fgeom->left_width + fgeom->right_width;
+      int fh = fgeom->top_height + fgeom->bottom_height;
 
       min_size->width  += fw;
       min_size->height += fh;
@@ -753,25 +747,27 @@ constrain_modal_dialog (MetaWindow         *window,
   MetaWindow *parent = meta_window_get_transient_for (window);
   gboolean constraint_already_satisfied;
 
-  if (!meta_window_is_attached_dialog (window))
+  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)
     {
-      MetaFrameBorders borders;
+      MetaFrameGeometry fgeom;
 
       x += parent->frame->rect.x;
       y += parent->frame->rect.y;
 
-      meta_frame_calc_borders (parent->frame, &borders);
-      y += borders.total.top;
+      meta_frame_calc_geometry (parent->frame, &fgeom);
+      y += fgeom.top_height;
 
-      y += info->borders->visible.top;
+      y += info->fgeom->top_height;
     }
   else
-    y = parent->rect.y + info->borders->visible.top;
+    y = parent->rect.y + info->fgeom->top_height;
 
   constraint_already_satisfied = (x == info->current.x) && (y == info->current.y);
 
@@ -780,12 +776,7 @@ constrain_modal_dialog (MetaWindow         *window,
 
   info->current.y = y;
   info->current.x = x;
-  /* The calculated position above may need adjustment to make sure the
-   * dialog does not end up partially off-screen */
-  return do_screen_and_monitor_relative_constraints (window,
-                                                     info->usable_screen_region,
-                                                     info,
-                                                     check_only);
+  return TRUE;
 }
 
 static gboolean
@@ -805,18 +796,12 @@ constrain_maximization (MetaWindow         *window,
 
   /* Determine whether constraint applies; exit if it doesn't */
   if ((!window->maximized_horizontally && !window->maximized_vertically) ||
-      META_WINDOW_TILED_SIDE_BY_SIDE (window))
+      META_WINDOW_TILED (window))
     return TRUE;
 
   /* Calculate target_size = maximized size of (window + frame) */
-  if (META_WINDOW_TILED_MAXIMIZED (window))
-    {
-      meta_window_get_current_tile_area (window, &target_size);
-    }
-  else if (META_WINDOW_MAXIMIZED (window))
-    {
-      target_size = info->work_area_monitor;
-    }
+  if (window->maximized_horizontally && window->maximized_vertically)
+    target_size = info->work_area_monitor;
   else
     {
       /* Amount of maximization possible in a single direction depends
@@ -836,19 +821,19 @@ constrain_maximization (MetaWindow         *window,
       active_workspace_struts = window->screen->active_workspace->all_struts;
 
       target_size = info->current;
-      extend_by_frame (&target_size, info->borders);
+      extend_by_frame (&target_size, info->fgeom);
       meta_rectangle_expand_to_avoiding_struts (&target_size,
                                                 &info->entire_monitor,
                                                 direction,
                                                 active_workspace_struts);
    }
   /* Now make target_size = maximized size of client window */
-  unextend_by_frame (&target_size, info->borders);
+  unextend_by_frame (&target_size, info->fgeom);
 
   /* Check min size constraints; max size constraints are ignored for maximized
    * windows, as per bug 327543.
    */
-  get_size_limits (window, info->borders, FALSE, &min_size, &max_size);
+  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
   hminbad = target_size.width < min_size.width && window->maximized_horizontally;
   vminbad = target_size.height < min_size.height && window->maximized_vertically;
   if (hminbad || vminbad)
@@ -895,19 +880,19 @@ constrain_tiling (MetaWindow         *window,
     return TRUE;
 
   /* Determine whether constraint applies; exit if it doesn't */
-  if (!META_WINDOW_TILED_SIDE_BY_SIDE (window))
+  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->borders);
+  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->borders, FALSE, &min_size, &max_size);
+  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)
@@ -950,7 +935,7 @@ constrain_fullscreen (MetaWindow         *window,
 
   monitor = info->entire_monitor;
 
-  get_size_limits (window, info->borders, FALSE, &min_size, &max_size);
+  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
   too_big =   !meta_rectangle_could_fit_rect (&monitor, &min_size);
   too_small = !meta_rectangle_could_fit_rect (&max_size, &monitor);
   if (too_big || too_small)
@@ -983,8 +968,7 @@ constrain_size_increments (MetaWindow         *window,
 
   /* Determine whether constraint applies; exit if it doesn't */
   if (META_WINDOW_MAXIMIZED (window) || window->fullscreen || 
-      META_WINDOW_TILED_SIDE_BY_SIDE (window) ||
-      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 */
@@ -1059,7 +1043,7 @@ constrain_size_limits (MetaWindow         *window,
     return TRUE;
 
   /* Determine whether constraint is already satisfied; exit if it is */
-  get_size_limits (window, info->borders, FALSE, &min_size, &max_size);
+  get_size_limits (window, info->fgeom, FALSE, &min_size, &max_size);
   /* We ignore max-size limits for maximized windows; see #327543 */
   if (window->maximized_horizontally)
     max_size.width = MAX (max_size.width, info->current.width);
@@ -1115,8 +1099,7 @@ constrain_aspect_ratio (MetaWindow         *window,
   constraints_are_inconsistent = minr > maxr;
   if (constraints_are_inconsistent ||
       META_WINDOW_MAXIMIZED (window) || window->fullscreen || 
-      META_WINDOW_TILED_SIDE_BY_SIDE (window) ||
-      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
@@ -1251,8 +1234,8 @@ do_screen_and_monitor_relative_constraints (
 
   /* Determine whether constraint applies; exit if it doesn't */
   how_far_it_can_be_smushed = info->current;
-  get_size_limits (window, info->borders, TRUE, &min_size, &max_size);
-  extend_by_frame (&info->current, info->borders);
+  get_size_limits (window, info->fgeom, TRUE, &min_size, &max_size);
+  extend_by_frame (&info->current, info->fgeom);
 
   if (info->action_type != ACTION_MOVE)
     {
@@ -1272,7 +1255,7 @@ do_screen_and_monitor_relative_constraints (
                                         &info->current);
   if (exit_early || constraint_satisfied || check_only)
     {
-      unextend_by_frame (&info->current, info->borders);
+      unextend_by_frame (&info->current, info->fgeom);
       return constraint_satisfied;
     }
 
@@ -1296,7 +1279,7 @@ do_screen_and_monitor_relative_constraints (
                                       info->fixed_directions,
                                       &info->current);
 
-  unextend_by_frame (&info->current, info->borders);
+  unextend_by_frame (&info->current, info->fgeom);
   return TRUE;
 }
 
@@ -1409,8 +1392,8 @@ constrain_titlebar_visible (MetaWindow         *window,
    */
   if (window->frame)
     {
-      bottom_amount = info->current.height + info->borders->visible.bottom;
-      vert_amount_onscreen = info->borders->visible.top;
+      bottom_amount = info->current.height + info->fgeom->bottom_height;
+      vert_amount_onscreen = info->fgeom->top_height;
     }
   else
     bottom_amount = vert_amount_offscreen;
@@ -1484,8 +1467,8 @@ constrain_partially_onscreen (MetaWindow         *window,
    */
   if (window->frame)
     {
-      bottom_amount = info->current.height + info->borders->visible.bottom;
-      vert_amount_onscreen = info->borders->visible.top;
+      bottom_amount = info->current.height + info->fgeom->bottom_height;
+      vert_amount_onscreen = info->fgeom->top_height;
     }
   else
     bottom_amount = vert_amount_offscreen;

src/core/constraints.h

@@ -25,9 +25,9 @@
 #ifndef META_CONSTRAINTS_H
 #define META_CONSTRAINTS_H
 
-#include <meta/util.h>
+#include "util.h"
 #include "window-private.h"
-#include "frame.h"
+#include "frame-private.h"
 
 typedef enum
 {
@@ -39,7 +39,7 @@ typedef enum
 } MetaMoveResizeFlags;
 
 void meta_window_constrain (MetaWindow          *window,
-                            MetaFrameBorders    *orig_borders,
+                            MetaFrameGeometry   *orig_fgeom,
                             MetaMoveResizeFlags  flags,
                             int                  resize_gravity,
                             const MetaRectangle *orig,

src/core/core.c

@@ -25,10 +25,10 @@
 
 #include <config.h>
 #include "core.h"
-#include "frame.h"
+#include "frame-private.h"
 #include "workspace-private.h"
-#include <meta/prefs.h>
-#include <meta/errors.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.
@@ -107,6 +107,9 @@ meta_core_get (Display *xdisplay,
       case META_CORE_GET_CLIENT_HEIGHT:
         *((gint*)answer) = window->rect.height;
         break;
+      case META_CORE_IS_TITLEBAR_ONSCREEN:
+        *((gboolean*)answer) = meta_window_titlebar_is_onscreen (window);
+        break;
       case META_CORE_GET_CLIENT_XWINDOW:
         *((Window*)answer) = window->xwindow;
         break;
@@ -143,9 +146,6 @@ meta_core_get (Display *xdisplay,
       case META_CORE_GET_FRAME_HEIGHT:
         *((gint*)answer) = window->frame->rect.height;
         break;
-      case META_CORE_GET_THEME_VARIANT:
-        *((char**)answer) = window->gtk_theme_variant;
-        break;
       case META_CORE_GET_SCREEN_WIDTH:
         *((gint*)answer) = window->screen->rect.width;
         break;
@@ -212,7 +212,7 @@ lower_window_and_transients (MetaWindow *window,
 
   meta_window_foreach_transient (window, lower_window_and_transients, NULL);
 
-  if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
+  if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK &&
       meta_prefs_get_raise_on_click ())
     {
       /* Move window to the back of the focusing workspace's MRU list.
@@ -261,25 +261,25 @@ meta_core_user_lower_and_unfocus (Display *xdisplay,
 }
 
 void
-meta_core_lower_beneath_grab_window (Display *xdisplay,
-                                     Window   xwindow,
-                                     guint32  timestamp)
+meta_core_lower_beneath_focus_window (Display *xdisplay,
+                                      Window   xwindow,
+                                      guint32  timestamp)
 {
   XWindowChanges changes;
   MetaDisplay *display;
   MetaScreen *screen;
-  MetaWindow *grab_window;
+  MetaWindow *focus_window;
 
   display = meta_display_for_x_display (xdisplay);
   screen = meta_display_screen_for_xwindow (display, xwindow);
-  grab_window = display->grab_window;
+  focus_window = meta_stack_get_top (screen->stack);
 
-  if (grab_window == NULL)
+  if (focus_window == NULL)
     return;
 
   changes.stack_mode = Below;
-  changes.sibling = grab_window->frame ? grab_window->frame->xwindow
-                                       : grab_window->xwindow;
+  changes.sibling = focus_window->frame ? focus_window->frame->xwindow
+                                        : focus_window->xwindow;
 
   meta_stack_tracker_record_lower_below (screen->stack_tracker,
                                          xwindow,
@@ -538,70 +538,70 @@ meta_core_get_menu_accelerator (MetaMenuOp           menu_op,
       break;
     case META_MENU_OP_UNSTICK:
     case META_MENU_OP_STICK:
-      name = "toggle-on-all-workspaces";
+      name = "toggle_on_all_workspaces";
       break;
     case META_MENU_OP_ABOVE:
     case META_MENU_OP_UNABOVE:
-      name = "toggle-above";
+      name = "toggle_above";
       break;
     case META_MENU_OP_WORKSPACES:
       switch (workspace)
         {
         case 1:
-          name = "move-to-workspace-1";
+          name = "move_to_workspace_1";
           break;
         case 2:
-          name = "move-to-workspace-2";
+          name = "move_to_workspace_2";
           break;
         case 3:
-          name = "move-to-workspace-3";
+          name = "move_to_workspace_3";
           break; 
         case 4:
-          name = "move-to-workspace-4";
+          name = "move_to_workspace_4";
           break; 
         case 5:
-          name = "move-to-workspace-5";
+          name = "move_to_workspace_5";
           break; 
         case 6:
-          name = "move-to-workspace-6";
+          name = "move_to_workspace_6";
           break; 
         case 7:
-          name = "move-to-workspace-7";
+          name = "move_to_workspace_7";
           break; 
         case 8:
-          name = "move-to-workspace-8";
+          name = "move_to_workspace_8";
           break; 
         case 9:
-          name = "move-to-workspace-9";
+          name = "move_to_workspace_9";
           break; 
         case 10:
-          name = "move-to-workspace-10";
+          name = "move_to_workspace_10";
           break;
         case 11:
-          name = "move-to-workspace-11";
+          name = "move_to_workspace_11";
           break;
         case 12:
-          name = "move-to-workspace-12";
+          name = "move_to_workspace_12";
           break;
         }
       break;
     case META_MENU_OP_MOVE:
-      name = "begin-move";
+      name = "begin_move";
       break;
     case META_MENU_OP_RESIZE:
-      name = "begin-resize";
+      name = "begin_resize";
       break;
     case META_MENU_OP_MOVE_LEFT:
-      name = "move-to-workspace-left";
+      name = "move_to_workspace_left";
       break;
     case META_MENU_OP_MOVE_RIGHT:
-      name = "move-to-workspace-right";
+      name = "move_to_workspace_right";
       break;
     case META_MENU_OP_MOVE_UP:
-      name = "move-to-workspace-up";
+      name = "move_to_workspace_up";
       break;
     case META_MENU_OP_MOVE_DOWN:
-      name = "move-to-workspace-down";
+      name = "move_to_workspace_down";
       break;
     case META_MENU_OP_RECOVER:
       /* No keybinding for this one */

src/core/delete.c

@@ -25,10 +25,10 @@
 #define _XOPEN_SOURCE /* for kill() */
 
 #include <config.h>
-#include <meta/util.h>
+#include "util.h"
 #include "window-private.h"
-#include <meta/errors.h>
-#include <meta/workspace.h>
+#include "errors.h"
+#include "workspace.h"
 
 #include <sys/types.h>
 #include <sys/wait.h>
@@ -88,41 +88,23 @@ delete_ping_timeout_func (MetaDisplay *display,
       return;
     }
 
-  /* This is to get a better string if the title isn't representable
-   * in the locale encoding; actual conversion to UTF-8 is done inside
-   * meta_show_dialog */
-
-  if (window->title && window->title[0])
-    {
-      tmp = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL);
-      if (tmp == NULL)
-        window_title = NULL;
-      else
-        window_title = window->title;
-      g_free (tmp);
-    }
-  else
-    {
-      window_title = NULL;
-    }
+  window_title = g_locale_from_utf8 (window->title, -1, NULL, NULL, NULL);
 
   /* Translators: %s is a window title */
-  if (window_title)
-    tmp = g_markup_printf_escaped (_("<tt>%s</tt> is not responding."),
-                                   window_title);
-  else
-    tmp = g_strdup (_("Application is not responding."));
-
+  tmp = g_strdup_printf (_("<tt>%s</tt> is not responding."),
+                         window_title);
   window_content = g_strdup_printf (
       "<big><b>%s</b></big>\n\n<i>%s</i>",
       tmp,
       _("You may choose to wait a short while for it to "
         "continue or force the application to quit entirely."));
 
+  g_free (window_title);
+
   dialog_pid =
     meta_show_dialog ("--question",
-                      window_content, NULL,
-                      window->screen->screen_name,
+                      window_content, 0,
+                      window->screen->number,
                       _("_Wait"), _("_Force Quit"), window->xwindow,
                       NULL, NULL);
 

src/core/display-private.h

@@ -34,11 +34,11 @@
 #include <glib.h>
 #include <X11/Xlib.h>
 #include "eventqueue.h"
-#include <meta/common.h>
-#include <meta/boxes.h>
-#include <meta/display.h>
+#include "common.h"
+#include "boxes.h"
+#include "display.h"
 #include "keybindings-private.h"
-#include <meta/prefs.h>
+#include "prefs.h"
 
 #ifdef HAVE_STARTUP_NOTIFICATION
 #include <libsn/sn.h>
@@ -73,18 +73,9 @@ typedef enum {
 /* This is basically a bogus number, just has to be large enough
  * to handle the expected case of the alt+tab operation, where
  * we want to ignore serials from UnmapNotify on the tab popup,
- * and the LeaveNotify/EnterNotify from the pointer ungrab. It
- * also has to be big enough to hold ignored serials from the point
- * where we reshape the stage to the point where we get events back.
+ * and the LeaveNotify/EnterNotify from the pointer ungrab
  */
-#define N_IGNORED_CROSSING_SERIALS  10
-
-typedef enum {
-  META_TILE_NONE,
-  META_TILE_LEFT,
-  META_TILE_RIGHT,
-  META_TILE_MAXIMIZED
-} MetaTileMode;
+#define N_IGNORED_SERIALS           4
 
 struct _MetaDisplay
 {
@@ -101,7 +92,7 @@ struct _MetaDisplay
    * class is constructed.
    */
 #define item(x)  Atom atom_##x;
-#include <meta/atomnames.h>
+#include "atomnames.h"
 #undef item
 
   /* This is the actual window from focus events,
@@ -155,7 +146,7 @@ struct _MetaDisplay
    * correspond to an enter event we should
    * ignore
    */
-  unsigned long ignored_crossing_serials[N_IGNORED_CROSSING_SERIALS];
+  unsigned long ignored_serials[N_IGNORED_SERIALS];
   Window ungrab_should_not_cause_focus_window;
   
   guint32 current_time;
@@ -188,8 +179,6 @@ struct _MetaDisplay
   int         grab_anchor_root_x;
   int         grab_anchor_root_y;
   MetaRectangle grab_anchor_window_pos;
-  MetaTileMode  grab_tile_mode;
-  int           grab_tile_monitor_number;
   int         grab_latest_motion_x;
   int         grab_latest_motion_y;
   gulong      grab_mask;
@@ -232,7 +221,6 @@ struct _MetaDisplay
   KeySym *keymap;
   int keysyms_per_keycode;
   XModifierKeymap *modmap;
-  unsigned int above_tab_keycode;
   unsigned int ignored_modifier_mask;
   unsigned int num_lock_mask;
   unsigned int scroll_lock_mask;
@@ -344,6 +332,10 @@ MetaScreen*   meta_display_screen_for_xwindow  (MetaDisplay *display,
 void          meta_display_grab                (MetaDisplay *display);
 void          meta_display_ungrab              (MetaDisplay *display);
 
+void          meta_display_unmanage_screen     (MetaDisplay *display,
+                                                MetaScreen  *screen,
+                                                guint32      timestamp);
+
 void          meta_display_unmanage_windows_for_screen (MetaDisplay *display,
                                                         MetaScreen  *screen,
                                                         guint32      timestamp);
@@ -441,7 +433,4 @@ void meta_display_remove_autoraise_callback (MetaDisplay *display);
 
 void meta_display_overlay_key_activate (MetaDisplay *display);
 
-/* In above-tab-keycode.c */
-guint meta_display_get_above_tab_keycode (MetaDisplay *display);
-
 #endif

src/core/display.c

@@ -34,21 +34,21 @@
 
 #include <config.h>
 #include "display-private.h"
-#include <meta/util.h>
-#include <meta/main.h>
+#include "util.h"
+#include "main.h"
 #include "screen-private.h"
 #include "window-private.h"
 #include "window-props.h"
 #include "group-props.h"
-#include "frame.h"
-#include <meta/errors.h>
+#include "frame-private.h"
+#include "errors.h"
 #include "keybindings-private.h"
-#include <meta/prefs.h>
+#include "prefs.h"
 #include "resizepopup.h"
 #include "xprops.h"
 #include "workspace-private.h"
 #include "bell.h"
-#include <meta/compositor.h>
+#include "compositor.h"
 #include <X11/Xatom.h>
 #include <X11/cursorfont.h>
 #ifdef HAVE_SOLARIS_XINERAMA
@@ -230,7 +230,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__VOID,
                   G_TYPE_NONE, 0);
 
   display_signals[WINDOW_CREATED] =
@@ -238,7 +239,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
                   G_TYPE_NONE, 1, META_TYPE_WINDOW);
 
   display_signals[WINDOW_DEMANDS_ATTENTION] =
@@ -246,7 +248,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
                   G_TYPE_NONE, 1, META_TYPE_WINDOW);
 
   display_signals[WINDOW_MARKED_URGENT] =
@@ -254,7 +257,8 @@ meta_display_class_init (MetaDisplayClass *klass)
                   G_TYPE_FROM_CLASS (klass),
                   G_SIGNAL_RUN_LAST,
                   0,
-                  NULL, NULL, NULL,
+                  NULL, NULL,
+                  g_cclosure_marshal_VOID__OBJECT,
                   G_TYPE_NONE, 1,
                   META_TYPE_WINDOW);
 
@@ -383,6 +387,26 @@ enable_compositor (MetaDisplay *display,
     }
 }
 
+static void
+disable_compositor (MetaDisplay *display)
+{
+  GSList *list;
+  
+  if (!display->compositor)
+    return;
+  
+  for (list = display->screens; list != NULL; list = list->next)
+    {
+      MetaScreen *screen = list->data;
+      
+      meta_compositor_unmanage_screen (screen->display->compositor,
+				       screen);
+    }
+  
+  meta_compositor_destroy (display->compositor);
+  display->compositor = NULL;
+}
+
 static void
 meta_display_init (MetaDisplay *disp)
 {
@@ -413,7 +437,7 @@ meta_display_open (void)
   /* A list of all atom names, so that we can intern them in one go. */
   char *atom_names[] = {
 #define item(x) #x,
-#include <meta/atomnames.h>
+#include "atomnames.h"
 #undef item
   };
   Atom atoms[G_N_ELEMENTS(atom_names)];
@@ -486,7 +510,7 @@ meta_display_open (void)
   {
     int i = 0;    
 #define item(x) the_display->atom_##x = atoms[i++];
-#include <meta/atomnames.h>
+#include "atomnames.h"
 #undef item
   }
 
@@ -528,9 +552,9 @@ meta_display_open (void)
                                           meta_unsigned_long_equal);
   
   i = 0;
-  while (i < N_IGNORED_CROSSING_SERIALS)
+  while (i < N_IGNORED_SERIALS)
     {
-      the_display->ignored_crossing_serials[i] = 0;
+      the_display->ignored_serials[i] = 0;
       ++i;
     }
   the_display->ungrab_should_not_cause_focus_window = None;
@@ -549,8 +573,6 @@ meta_display_open (void)
   the_display->grab_window = NULL;
   the_display->grab_screen = NULL;
   the_display->grab_resize_popup = NULL;
-  the_display->grab_tile_mode = META_TILE_NONE;
-  the_display->grab_tile_monitor_number = -1;
 
   the_display->grab_edge_resistance_data = NULL;
 
@@ -817,7 +839,8 @@ meta_display_open (void)
   /* We don't composite the windows here because they will be composited 
      faster with the call to meta_screen_manage_all_windows further down 
      the code */
-  enable_compositor (the_display, FALSE);
+  if (1) /* meta_prefs_get_compositing_manager ()) FIXME */
+    enable_compositor (the_display, FALSE);
    
   meta_display_grab (the_display);
   
@@ -1380,48 +1403,37 @@ meta_display_get_current_time_roundtrip (MetaDisplay *display)
   return timestamp;
 }
 
-/**
- * meta_display_add_ignored_crossing_serial:
- * @display: a #MetaDisplay
- * @serial: the serial to ignore
- *
- * Save the specified serial and ignore crossing events with that
- * serial for the purpose of focus-follows-mouse. This can be used
- * for certain changes to the window hierarchy that we don't want
- * to change the focus window, even if they cause the pointer to
- * end up in a new window.
- */
-void
-meta_display_add_ignored_crossing_serial (MetaDisplay  *display,
-                                          unsigned long serial)
+static void
+add_ignored_serial (MetaDisplay  *display,
+                    unsigned long serial)
 {
   int i;
 
   /* don't add the same serial more than once */
-  if (display->ignored_crossing_serials[N_IGNORED_CROSSING_SERIALS-1] == serial)
+  if (display->ignored_serials[N_IGNORED_SERIALS-1] == serial)
     return;
   
   /* shift serials to the left */
   i = 0;
-  while (i < (N_IGNORED_CROSSING_SERIALS - 1))
+  while (i < (N_IGNORED_SERIALS - 1))
     {
-      display->ignored_crossing_serials[i] = display->ignored_crossing_serials[i+1];
+      display->ignored_serials[i] = display->ignored_serials[i+1];
       ++i;
     }
   /* put new one on the end */
-  display->ignored_crossing_serials[i] = serial;
+  display->ignored_serials[i] = serial;
 }
 
 static gboolean
-crossing_serial_is_ignored (MetaDisplay  *display,
-                            unsigned long serial)
+serial_is_ignored (MetaDisplay  *display,
+                   unsigned long serial)
 {
   int i;
 
   i = 0;
-  while (i < N_IGNORED_CROSSING_SERIALS)
+  while (i < N_IGNORED_SERIALS)
     {
-      if (display->ignored_crossing_serials[i] == serial)
+      if (display->ignored_serials[i] == serial)
         return TRUE;
       ++i;
     }
@@ -1429,14 +1441,14 @@ crossing_serial_is_ignored (MetaDisplay  *display,
 }
 
 static void
-reset_ignored_crossing_serials (MetaDisplay *display)
+reset_ignores (MetaDisplay *display)
 {
   int i;
 
   i = 0;
-  while (i < N_IGNORED_CROSSING_SERIALS)
+  while (i < N_IGNORED_SERIALS)
     {
-      display->ignored_crossing_serials[i] = 0;
+      display->ignored_serials[i] = 0;
       ++i;
     }
 
@@ -1611,7 +1623,7 @@ event_callback (XEvent   *event,
       if (meta_ui_window_should_not_cause_focus (display->xdisplay,
                                                  modified))
         {
-          meta_display_add_ignored_crossing_serial (display, event->xany.serial);
+          add_ignored_serial (display, event->xany.serial);
           meta_topic (META_DEBUG_FOCUS,
                       "Adding EnterNotify serial %lu to ignored focus serials\n",
                       event->xany.serial);
@@ -1621,7 +1633,7 @@ event_callback (XEvent   *event,
            event->xcrossing.mode == NotifyUngrab &&
            modified == display->ungrab_should_not_cause_focus_window)
     {
-      meta_display_add_ignored_crossing_serial (display, event->xany.serial);
+      add_ignored_serial (display, event->xany.serial);
       meta_topic (META_DEBUG_FOCUS,
                   "Adding LeaveNotify serial %lu to ignored focus serials\n",
                   event->xany.serial);
@@ -1705,9 +1717,12 @@ event_callback (XEvent   *event,
                               window->desc);
                 }
 
-              if (display->compositor)
-                meta_compositor_window_shape_changed (display->compositor,
-                                                      window);
+              if (window->frame)
+                {
+                  window->frame->need_reapply_frame_shape = TRUE;
+		  meta_warning("from event callback\n");		  
+                  meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
+                }
             }
         }
       else
@@ -1751,10 +1766,9 @@ event_callback (XEvent   *event,
        * we can get into a confused state. So if a keybinding is
        * handled (because it's one of our hot-keys, or because we are
        * in a keyboard-grabbed mode like moving a window, we don't
-       * want to pass the key event to the compositor or GTK+ at all.
+       * want to pass the key event to the compositor at all.
        */
-      if (meta_display_process_key_event (display, window, event))
-        filter_out_event = bypass_compositor = TRUE;
+      bypass_compositor = meta_display_process_key_event (display, window, event);
       break;
     case ButtonPress:
       if (display->grab_op == META_GRAB_OP_COMPOSITOR)
@@ -1917,7 +1931,7 @@ event_callback (XEvent   *event,
                * in application-based mode, and the different
                * app is not a dock or desktop, eat the focus click.
                */
-              if (meta_prefs_get_focus_mode () == G_DESKTOP_FOCUS_MODE_CLICK &&
+              if (meta_prefs_get_focus_mode () == META_FOCUS_MODE_CLICK &&
                   meta_prefs_get_application_based () &&
                   !window->has_focus &&
                   window->type != META_WINDOW_DOCK &&
@@ -1997,7 +2011,7 @@ event_callback (XEvent   *event,
       /* Check if we've entered a window; do this even if window->has_focus to
        * avoid races.
        */
-      if (window && !crossing_serial_is_ignored (display, event->xany.serial) &&
+      if (window && !serial_is_ignored (display, event->xany.serial) &&
                event->xcrossing.mode != NotifyGrab && 
                event->xcrossing.mode != NotifyUngrab &&
                event->xcrossing.detail != NotifyInferior &&
@@ -2005,8 +2019,8 @@ event_callback (XEvent   *event,
         {
           switch (meta_prefs_get_focus_mode ())
             {
-            case G_DESKTOP_FOCUS_MODE_SLOPPY:
-            case G_DESKTOP_FOCUS_MODE_MOUSE:
+            case META_FOCUS_MODE_SLOPPY:
+            case META_FOCUS_MODE_MOUSE:
               display->mouse_mode = TRUE;
               if (window->type != META_WINDOW_DOCK &&
                   window->type != META_WINDOW_DESKTOP)
@@ -2022,7 +2036,7 @@ event_callback (XEvent   *event,
                   meta_window_focus (window, event->xcrossing.time);
 
                   /* stop ignoring stuff */
-                  reset_ignored_crossing_serials (display);
+                  reset_ignores (display);
                   
                   if (meta_prefs_get_auto_raise ()) 
                     {
@@ -2044,7 +2058,7 @@ event_callback (XEvent   *event,
                * alternative mechanism works great.
                */
               if (window->type == META_WINDOW_DESKTOP &&
-                  meta_prefs_get_focus_mode() == G_DESKTOP_FOCUS_MODE_MOUSE &&
+                  meta_prefs_get_focus_mode() == META_FOCUS_MODE_MOUSE &&
                   display->expected_focus_window != NULL)
                 {
                   meta_topic (META_DEBUG_FOCUS,
@@ -2056,7 +2070,7 @@ event_callback (XEvent   *event,
                                                           event->xcrossing.time);
                 }
               break;
-            case G_DESKTOP_FOCUS_MODE_CLICK:
+            case META_FOCUS_MODE_CLICK:
               break;
             }
           
@@ -2291,8 +2305,11 @@ event_callback (XEvent   *event,
         screen = meta_display_screen_for_root (display,
                                                event->xconfigure.event);
         if (screen)
-          meta_stack_tracker_reparent_event (screen->stack_tracker,
-                                             &event->xreparent);
+          {
+            if (screen)
+              meta_stack_tracker_reparent_event (screen->stack_tracker,
+                                                 &event->xreparent);
+          }
       }
       break;
     case ConfigureNotify:
@@ -2526,6 +2543,12 @@ event_callback (XEvent   *event,
                       meta_workspace_focus_default_window (screen->active_workspace, NULL, timestamp);
                     }
                 }
+              else if (event->xclient.message_type ==
+                       display->atom__MUTTER_RESTART_MESSAGE)
+                {
+                  meta_verbose ("Received restart request\n");
+                  meta_restart ();
+                }
               else if (event->xclient.message_type ==
                        display->atom__MUTTER_RELOAD_THEME_MESSAGE)
                 {
@@ -2619,10 +2642,6 @@ event_callback (XEvent   *event,
                   meta_bell_notify (display, xkb_ev);
                 }
 	      break;
-            case XkbNewKeyboardNotify:
-            case XkbMapNotify:
-              meta_display_process_mapping_event (display, event);
-              break;
 	    }
 	}
 #endif
@@ -3496,7 +3515,6 @@ meta_display_begin_grab_op (MetaDisplay *display,
                             int          root_x,
                             int          root_y)
 {
-  MetaWindow *grab_window = NULL;
   Window grab_xwindow;
   
   meta_topic (META_DEBUG_WINDOW_OPS,
@@ -3526,24 +3544,14 @@ meta_display_begin_grab_op (MetaDisplay *display,
         }
     }
 
-  /* If window is a modal dialog attached to its parent,
-   * grab the parent instead for moving.
-   */
-  if (window && meta_window_is_attached_dialog (window) &&
-      meta_grab_op_is_moving (op))
-    grab_window = meta_window_get_transient_for (window);
-
-  if (grab_window == NULL)
-    grab_window = window;
-
   /* FIXME:
    *   If we have no MetaWindow we do our best
    *   and try to do the grab on the RootWindow.
    *   This will fail if anyone else has any
    *   key grab on the RootWindow.
    */
-  if (grab_window)
-    grab_xwindow = grab_window->frame ? grab_window->frame->xwindow : grab_window->xwindow;
+  if (window)
+    grab_xwindow = window->frame ? window->frame->xwindow : window->xwindow;
   else
     grab_xwindow = screen->xroot;
 
@@ -3555,7 +3563,7 @@ meta_display_begin_grab_op (MetaDisplay *display,
   meta_display_set_grab_op_cursor (display, screen, op, FALSE, grab_xwindow,
                                    timestamp);
 
-  if (!display->grab_have_pointer && !grab_op_is_keyboard (op))
+  if (!display->grab_have_pointer)
     {
       meta_topic (META_DEBUG_WINDOW_OPS,
                   "XGrabPointer() failed\n");
@@ -3565,9 +3573,9 @@ meta_display_begin_grab_op (MetaDisplay *display,
   /* Grab keys for keyboard ops and mouse move/resizes; see #126497 */
   if (grab_op_is_keyboard (op) || grab_op_is_mouse_only (op))
     {
-      if (grab_window)
+      if (window)
         display->grab_have_keyboard =
-                     meta_window_grab_all_keys (grab_window, timestamp);
+                     meta_window_grab_all_keys (window, timestamp);
 
       else
         display->grab_have_keyboard =
@@ -3584,21 +3592,11 @@ meta_display_begin_grab_op (MetaDisplay *display,
     }
   
   display->grab_op = op;
-  display->grab_window = grab_window;
+  display->grab_window = window;
   display->grab_screen = screen;
   display->grab_xwindow = grab_xwindow;
   display->grab_button = button;
   display->grab_mask = modmask;
-  if (window)
-    {
-      display->grab_tile_mode = window->tile_mode;
-      display->grab_tile_monitor_number = window->tile_monitor_number;
-    }
-  else
-    {
-      display->grab_tile_mode = META_TILE_NONE;
-      display->grab_tile_monitor_number = -1;
-    }
   display->grab_anchor_root_x = root_x;
   display->grab_anchor_root_y = root_y;
   display->grab_latest_motion_x = root_x;
@@ -3795,8 +3793,6 @@ meta_display_end_grab_op (MetaDisplay *display,
   display->grab_window = NULL;
   display->grab_screen = NULL;
   display->grab_xwindow = None;
-  display->grab_tile_mode = META_TILE_NONE;
-  display->grab_tile_monitor_number = -1;
   display->grab_op = META_GRAB_OP_NONE;
 
   if (display->grab_resize_popup)
@@ -3999,7 +3995,7 @@ meta_display_grab_focus_window_button (MetaDisplay *display,
    * focus window may not be raised, and who wants to think about
    * mouse focus anyway.
    */
-  if (meta_prefs_get_focus_mode () != G_DESKTOP_FOCUS_MODE_CLICK)
+  if (meta_prefs_get_focus_mode () != META_FOCUS_MODE_CLICK)
     {
       meta_verbose (" (well, not grabbing since not in click to focus mode)\n");
       return;
@@ -4108,6 +4104,8 @@ meta_display_queue_retheme_all_windows (MetaDisplay *display)
       meta_window_queue (window, META_QUEUE_MOVE_RESIZE);
       if (window->frame)
         {
+          window->frame->need_reapply_frame_shape = TRUE;
+          
           meta_frame_queue_draw (window->frame);
         }
       
@@ -4322,7 +4320,11 @@ process_request_frame_extents (MetaDisplay    *display,
                                          &hints);
   if ((hints_set && hints->decorations) || !hints_set)
     {
-      MetaFrameBorders borders;
+      int top = 0;
+      int bottom = 0;
+      int left = 0;
+      int right = 0;
+
       MetaScreen *screen;
 
       screen = meta_display_screen_for_xwindow (display,
@@ -4340,11 +4342,15 @@ process_request_frame_extents (MetaDisplay    *display,
       meta_ui_theme_get_frame_borders (screen->ui,
                                        META_FRAME_TYPE_NORMAL,
                                        0,
-                                       &borders);
-      data[0] = borders.visible.left;
-      data[1] = borders.visible.right;
-      data[2] = borders.visible.top;
-      data[3] = borders.visible.bottom;
+                                       &top,
+                                       &bottom,
+                                       &left,
+                                       &right);
+
+      data[0] = left;
+      data[1] = right;
+      data[2] = top;
+      data[3] = bottom;
     }
 
   meta_topic (META_DEBUG_GEOMETRY,
@@ -5070,7 +5076,7 @@ meta_display_stack_cmp (const void *a,
  * An example of using this would be to sort the list of transient dialogs for a
  * window into their current stacking order.
  *
- * Returns: (transfer container) (element-type MetaWindow): Input windows sorted by stacking order, from lowest to highest
+ * Returns: (transfer container): Input windows sorted by stacking order, from lowest to highest
  */
 GSList *
 meta_display_sort_windows_by_stacking (MetaDisplay *display,
@@ -5178,6 +5184,43 @@ prefs_changed_callback (MetaPreference pref,
     {
       meta_bell_set_audible (display, meta_prefs_bell_is_audible ());
     }
+  else if (pref == META_PREF_COMPOSITING_MANAGER)
+    {
+      gboolean cm = meta_prefs_get_compositing_manager ();
+
+      if (cm)
+        enable_compositor (display, TRUE);
+      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