Remove legacy theming API

Since the move to GTK+ toplevels, it required removing the preview-widget and theme-viewer parts of the code. (They didn't work with the new CSS stuff anyway... shhh..)
uiframe: Make children respect border/padding
2012-05-07 20:37:09 -03:00 · 2012-05-07 20:33:00 -03:00 · 2012-05-07 20:21:13 -03:00 · 2012-05-07 20:20:51 -03:00 · 2012-05-07 20:19:51 -03:00 · 2012-05-05 02:11:34 -03:00
65 changed files with 2141 additions and 20595 deletions
--- a/configure.in
+++ b/configure.in
@@ -212,60 +212,31 @@ AC_PATH_XTRA

 ALL_X_LIBS="$X_LIBS $X_PRE_LIBS -lX11 $X_EXTRA_LIBS"

-# Check for Xinerama extension (Solaris impl or Xfree impl)
+# Check for Xinerama extension - we only support the "XFree86" style,
+# and not the older Solaris-only version; recent Solaris supports the
+# XFree86 style.
 mutter_save_cppflags="$CPPFLAGS"
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"

-AC_ARG_ENABLE(xinerama,
-  AC_HELP_STRING([--disable-xinerama],
-                 [disable mutter's use of the Xinerama extension]),
-  try_xinerama=$enable_xinerama,try_xinerama=yes)
-
-use_solaris_xinerama=no
-use_xfree_xinerama=no
-if test "${try_xinerama}" != no; then
-    case "$host" in
-        *-*-solaris*)
-            # Check for solaris
-            use_solaris_xinerama=yes
-            AC_CHECK_LIB(Xext, XineramaGetInfo,
-                         use_solaris_xinerama=yes, use_solaris_xinerama=no,
-                         $ALL_X_LIBS)
-            if test "x$use_solaris_xinerama" = "xyes"; then
-                AC_CHECK_HEADER(X11/extensions/xinerama.h,
-                                if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
-                                    X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
-                                fi
-                                AC_DEFINE(HAVE_SOLARIS_XINERAMA, , [Have Solaris-style Xinerama])
-                                AC_DEFINE(HAVE_XINERAMA, , [Have some version of Xinerama]),
-                                use_solaris_xinerama=no,
-                                [#include <X11/Xlib.h>])
-            fi
-            AC_MSG_CHECKING(for Xinerama support on Solaris)
-            AC_MSG_RESULT($use_solaris_xinerama);
-            ;;
-        *)
-            # Check for XFree
-            use_xfree_xinerama=yes
-            AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
-                [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
-                                 X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
-                                 if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
-                                     X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
-                                 fi
-                                 AC_DEFINE(HAVE_XFREE_XINERAMA, , [Have XFree86-style Xinerama])
-                                 AC_DEFINE(HAVE_XINERAMA,, [Have some version of Xinerama]),
-                                 use_xfree_xinerama=no,
-                                 [#include <X11/Xlib.h>])],
-                use_xfree_xinerama=no, -lXext $ALL_X_LIBS)
-            AC_MSG_CHECKING(for Xinerama support on XFree86)
-            AC_MSG_RESULT($use_xfree_xinerama);
-            ;;
-    esac
-fi
+have_xinerama=yes
+AC_CHECK_LIB(Xinerama, XineramaQueryExtension,
+    [AC_CHECK_HEADER(X11/extensions/Xinerama.h,
+		     [X_EXTRA_LIBS="-lXinerama $X_EXTRA_LIBS"
+		     if test -z "`echo $ALL_X_LIBS | grep "\-lXext" 2> /dev/null`"; then
+			 X_EXTRA_LIBS="-lXext $X_EXTRA_LIBS"
+		     fi],
+		     have_xinerama=no,
+		     [#include <X11/Xlib.h>])],
+    have_xinerama=no, -lXext $ALL_X_LIBS)
+AC_MSG_CHECKING(for Xinerama support)
+AC_MSG_RESULT($have_xinerama)

 CPPFLAGS="$mutter_save_cppflags"

+if test x$have_xinerama = xno; then
+   AC_MSG_ERROR([Xinerama extension was not found])
+fi
+
 SHAPE_LIBS=
 found_shape=no
 AC_CHECK_LIB(Xext, XShapeQueryExtension,
@@ -496,8 +467,6 @@ mutter-$VERSION
 	source code location:	  ${srcdir}
 	compiler:		  ${CC}

-	XFree86 Xinerama:         ${use_xfree_xinerama}
-	Solaris Xinerama:         ${use_solaris_xinerama}
 	Startup notification:     ${have_startup_notification}
 	libcanberra:              ${have_libcanberra}
 	Introspection:            ${found_introspection}
--- a/doc/theme-format.txt
+++ b/doc/theme-format.txt
@@ -259,8 +259,6 @@ Overview of Theme Format Version 1
    <!-- color obtained by a 0.5 alpha composite of the second color onto the first -->
    <color value="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.5"/>
  </gradient>
-  <!-- image has an optional colorize="#color" attribute to give the
-       image a certain color -->
  <image filename="foo.png" alpha="0.7"
         x="10" y="30" width="width / 3" height="height / 4"/>
  <gtk_arrow state="normal" shadow="in" arrow="up"
--- a/po/te.po
+++ b/po/te.po
@@ -4,14 +4,16 @@
 # Copyright (C) 2011 Swecha Telugu Localisation Team <localization@swecha.net>.
 # A Mohan Vamsee(Swecha Team)) <mohan.arza@ymail.com>, 2011, 2012.
 # Sasi Bhushan Boddepalli <sasi@swecha.net>, 2012
+# Praveen Illa <mail2ipn@gmail.com>, 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: metacity.gnome-2-26\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=mutter&keywords=I18N+L10N&component=general\n"
 "POT-Creation-Date: 2012-03-15 21:29+0000\n"
-"PO-Revision-Date: 2012-03-16 17:03+0530\n"
-"Last-Translator: Sasi Bhushan Boddepalli <sasi@swecha.net>\n"
+"PO-Revision-Date: 2012-04-28 22:10+0530\n"
+"Last-Translator: Praveen Illa <mail2ipn@gmail.com>\n"
 "Language-Team: Telugu <indlinux-telugu@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -24,7 +26,7 @@ msgstr ""
 #: ../src/50-mutter-windows.xml.in.h:1
 #| msgid "_Windows"
 msgid "Windows"
-msgstr "గవాక్షములు"
+msgstr "కిటికీలు"

 #: ../src/50-mutter-windows.xml.in.h:2
 msgid "View split on left"
@@ -45,7 +47,7 @@ msgstr "మరొక కూర్పునకు నిర్వహించే

 #: ../src/core/bell.c:307
 msgid "Bell event"
-msgstr "బెళ్ సన్నివేశము"
+msgstr "బెల్ సన్నివేశము"

 #: ../src/core/core.c:157
 #, c-format
@@ -55,27 +57,27 @@ msgstr "తెలియని విండో సమాచార మనవి: %
 #: ../src/core/delete.c:111
 #, c-format
 msgid "<tt>%s</tt> is not responding."
-msgstr "<tt>%s</tt> చలనంలేదు."
+msgstr "<tt>%s</tt> స్పందించుటలేదు."

 #: ../src/core/delete.c:114
 msgid "Application is not responding."
-msgstr "కార్యక్షేత్రం బదులు ఇవ్వడంలేదు."
+msgstr "అనువర్తనం స్పందించుటలేదు."

 #: ../src/core/delete.c:119
 msgid ""
 "You may choose to wait a short while for it to continue or force the "
 "application to quit entirely."
 msgstr ""
-"మీరు దానిని కొంత సమయము వరకు కొనసాగించుట ఇస్టపడవచును లేనిచో పూర్తి కార్యక్షేత్రమును బలవంతముగా "
+"మీరు దానిని కొంత సమయము వరకు కొనసాగించుట ఇస్టపడవచును లేనిచో పూర్తి అనువర్తనమును బలవంతముగా "
 "త్యజించుము"

 #: ../src/core/delete.c:126
 msgid "_Wait"
-msgstr "ఆగుము(_W)"
+msgstr "నిరీక్షించండి (_W)"

 #: ../src/core/delete.c:126
 msgid "_Force Quit"
-msgstr "బలవంతముగా త్యజించుము(_F)"
+msgstr "బలవంతముగా త్యజించు (_F)"

 #: ../src/core/display.c:387
 #, c-format
@@ -140,8 +142,8 @@ msgid ""
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
 msgstr ""
-"mutter %s\n"
-"Copyright (C) 2001-%d Havoc Pennington, Red Hat, Inc., and others\n"
+"మట్టర్ %s\n"
+"కాపీహక్కులు (C) 2001-%d హేవోక్ పెన్నింగ్టన్, రెడ్ హ్యాట్, Inc., and others\n"
 "This is free software; see the source for copying conditions.\n"
 "There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A "
 "PARTICULAR PURPOSE.\n"
@@ -159,14 +161,14 @@ msgid ""
 "Workarounds for broken applications disabled. Some applications may not "
 "behave properly.\n"
 msgstr ""
-"విరిగిన కార్యక్షేత్రములకు చుట్టుప్రక్కలపనిచేయువాటిని నిరుపయోగపరిచెను. కొన్ని కార్యక్షేత్రములు సరైన రీతిలో "
+"విరిగిన అనువర్తనములకు చుట్టుప్రక్కలపనిచేయువాటిని నిరుపయోగపరిచెను. కొన్ని అనువర్తనములు సరైన రీతిలో "
 "వ్యవహరించకపోవచ్చు.\n"

 #: ../src/core/prefs.c:1152
 #, c-format
 #| msgid "Could not parse font description \"%s\" from GConf key %s\n"
 msgid "Could not parse font description \"%s\" from GSettings key %s\n"
-msgstr "%s జికాన్‌ఫ్ కీ నుండి \"%s\" పార్స్ అక్షరశైలి వివరించలేకపోవుచున్నది\n"
+msgstr "%s జికాన్‌ఫ్ కీ నుండి \"%s\" పార్స్ ఖతి వివరించలేకపోవుచున్నది\n"

 #: ../src/core/prefs.c:1218
 #, c-format
@@ -185,7 +187,7 @@ msgstr "కీబంధించునదికి రూపకరించి
 #: ../src/core/prefs.c:1836
 #, c-format
 msgid "Workspace %d"
-msgstr "%d పనిప్రదేశము"
+msgstr "%d కార్యక్షేత్రము"

 #: ../src/core/screen.c:730
 #, c-format
@@ -295,19 +297,19 @@ msgstr "మట్టర్ వెర్‌బోస్ విధమునకు

 #: ../src/core/util.c:290
 msgid "Window manager: "
-msgstr "విండో నిర్వాహిక: "
+msgstr "కిటికీ నిర్వాహకం: "

 #: ../src/core/util.c:438
 msgid "Bug in window manager: "
-msgstr "విండో నిర్వాహికలో లోపము: "
+msgstr "కిటికీ నిర్వాహకంలో లోపము: "

 #: ../src/core/util.c:471
 msgid "Window manager warning: "
-msgstr "విండో నిర్వాహిక హెచ్చరిక: "
+msgstr "కిటికీ నిర్వాహకం హెచ్చరిక: "

 #: ../src/core/util.c:499
 msgid "Window manager error: "
-msgstr "విండో నిర్వాహిక దోషము: "
+msgstr "కిటికీ నిర్వాహకం దోషము: "

 #. first time through
 #: ../src/core/window.c:7269
@@ -329,16 +331,16 @@ msgstr ""
 #: ../src/core/window.c:7932
 #, c-format
 msgid ""
-"Window %s sets an MWM hint indicating it isn't resizable, but sets min size %"
-"d x %d and max size %d x %d; this doesn't make much sense.\n"
+"Window %s sets an MWM hint indicating it isn't resizable, but sets min size "
+"%d x %d and max size %d x %d; this doesn't make much sense.\n"
 msgstr ""
-"%s విండోని పునఃపరిమానించుట కుదరదని తెలియజేయుటకు MWM సూచనను అమర్చినది, కాని కనిష్ఠ పరిమాణం %d x %"
-"d మరియు గనిష్ఠ పరిమాణం %d x %d ను అమర్చినది; ఇది అర్దవంతమైనదికాదు.\n"
+"%s విండోని పునఃపరిమానించుట కుదరదని తెలియజేయుటకు MWM సూచనను అమర్చినది, కాని కనిష్ఠ పరిమాణం %d x "
+"%d మరియు గనిష్ఠ పరిమాణం %d x %d ను అమర్చినది; ఇది అర్దవంతమైనదికాదు.\n"

 #: ../src/core/window-props.c:309
 #, c-format
 msgid "Application set a bogus _NET_WM_PID %lu\n"
-msgstr "కార్యక్షేత్రమును నకిలీ _NET_WM_PID %luను అమర్చెను\n"
+msgstr "అనువర్తనమును నకిలీ _NET_WM_PID %luను అమర్చెను\n"

 #: ../src/core/window-props.c:426
 #, c-format
@@ -366,9 +368,9 @@ msgid ""
 msgstr ""
 "విండో 0x%lx నకు %s గుణము కలదు \n"
 " %s రూపకముతో కూడిన %d రకమును  పొందుటకు ఊహించబడినది\n"
-"మరియు నిజముగా %s రకము %d రూపకం %d న్ అంశములు(_i) కలిగివున్నవి.\n"
-"ఇది కార్యక్షేత్రపు తప్పిదముగా అనిపించుచున్నది, కాని విండో నిర్వాహిక తప్పిదము కాదు.\n"
-"విండోకి శీర్షిక=\"%s\" తరగతి=\"%s\" నామము=\"%s\" అని కలవు\n"
+"మరియు నిజముగా %s రకము %d రూపకం %d అంశములు(_i) కలిగివున్నవి.\n"
+"ఇది అనువర్తనపు తప్పిదముగా అనిపించుచున్నది, కాని కిటికీ నిర్వాహకం తప్పిదము కాదు.\n"
+"కిటికీ శీర్షిక=\"%s\" తరగతి=\"%s\" పేరు=\"%s\" అని కలవు\n"

 #: ../src/core/xprops.c:411
 #, c-format
@@ -397,7 +399,7 @@ msgid ""
 "\"Windows key\" on PC hardware. It's expected that this binding either the "
 "default or set to the empty string."
 msgstr ""
-"ఈ కీ విండో సంగ్రహముమరియు కార్యక్షేత్రముని ఉపయోగించు సిస్టమ్‌ల కలయికైన \"ఒవర్‌లే\"ను ప్రారంభించుతుంది."
+"ఈ కీ విండో సంగ్రహముమరియు అనువర్తనముని ఉపయోగించు సిస్టమ్‌ల కలయికైన \"ఒవర్‌లే\"ను ప్రారంభించుతుంది."
 "PC హార్డ్ వేర్ పై \"విండోస్ కీ\"అనునిది అప్రమేయముగా వుండుటకు ఆశ చూపుతున్నది.ఈ బంధనమును "
 "అప్రమేయముగా లేక ఖాళీ పదబంధముగా అమర్చుటకు ఊహించబడినది"

@@ -423,7 +425,7 @@ msgid ""
 "Determines whether hidden windows (i.e., minimized windows and windows on "
 "other workspaces than the current one) should be kept alive."
 msgstr ""
-"దాగివున్న విండోలను (అనగా చిన్నవిగా చేసిన విండోలు మరియువేరొక పనిప్రదేశముల పైనున్న విండోలు) వెలికి "
+"దాగివున్న విండోలను (అనగా చిన్నవిగా చేసిన విండోలు మరియువేరొక కార్యక్షేత్రముల పైనున్న విండోలు) వెలికి "
 "తీయవలయునోలేదో వివరిస్తుంది."

 #: ../src/org.gnome.mutter.gschema.xml.in.h:7
@@ -455,15 +457,15 @@ msgstr ""

 #: ../src/org.gnome.mutter.gschema.xml.in.h:11
 msgid "Workspaces only on primary"
-msgstr "పనిప్రదేశములు ప్రాథమికము పైనే వుండును"
+msgstr "కార్యక్షేత్రములు ప్రాథమికము పైనే వుండును"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:12
 msgid ""
 "Determines whether workspace switching should happen for windows on all "
 "monitors or only for windows on the primary monitor."
 msgstr ""
-"పనిప్రదేశములను మార్చుట ప్రాథమిక దర్శిని పై ఉన్న విండోలకు మాత్రమేన లేకఅన్ని పనిప్రదేశములపైనున్న విండోలకు "
-"కూడా అమలవుతుందో లేదో అనేది వివరిస్తుంది"
+"కార్యక్షేత్రములను మార్చుట ప్రాథమిక దర్శిని పై ఉన్న విండోలకు మాత్రమేన లేకఅన్ని కార్యక్షేత్రములపైనున్న "
+"విండోలకు కూడా అమలవుతుందో లేదో అనేది వివరిస్తుంది"

 #: ../src/org.gnome.mutter.gschema.xml.in.h:13
 msgid "No tab popup"
@@ -534,7 +536,7 @@ msgstr "జరుపు(_M)"
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:81
 msgid "_Resize"
-msgstr "పున: పరిమాణము(_R)"
+msgstr "పరిమాణం మార్చు (_R)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:83
@@ -550,57 +552,57 @@ msgstr "ఎల్లప్పుడూ పైనే"
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:90
 msgid "_Always on Visible Workspace"
-msgstr "ఎల్లప్పుడూ గోచరించు పనిప్రదేశముపైనే(_A)"
+msgstr "ఎల్లప్పుడూ గోచరించు కార్యక్షేత్రముపైనే(_A)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:92
 msgid "_Only on This Workspace"
-msgstr "ఈ పనిప్రదేశము మాత్రము పైనే(_O)"
+msgstr "ఈ కార్యక్షేత్రము మాత్రము పైనే(_O)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:94
 msgid "Move to Workspace _Left"
-msgstr "పనిచేస్తున్న చోటునుండీ ఎడమవైపుకు కదులు"
+msgstr "కార్యక్షేత్రం నుండి ఎడమవైపుకు కదులు (_L)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:96
 msgid "Move to Workspace R_ight"
-msgstr "పనిచేస్తున్న చోటునుండీ కుడివైపుకు కదులు"
+msgstr "కార్యక్షేత్రం నుండి కుడివైపుకు కదులు (_R)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:98
 msgid "Move to Workspace _Up"
-msgstr "పనిచేస్తున్న చోటునుండీ పైకి కదులు"
+msgstr "కార్యక్షేత్రం నుండి పైకి కదులు (_U)"

 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:100
 msgid "Move to Workspace _Down"
-msgstr "పనిచేస్తున్న చోటునుండీ కిందకు కదులు"
+msgstr "కార్యక్షేత్రం నుండి క్రిందికి కదులు (_D)"

 #. separator
 #. Translators: Translate this string the same way as you do in libwnck!
 #: ../src/ui/menu.c:104
 msgid "_Close"
-msgstr "మూయుము (_C)"
+msgstr "మూసివేయి (_C)"

 #: ../src/ui/menu.c:204
 #, c-format
 msgid "Workspace %d%n"
-msgstr "పనిప్రదేశము %d%n"
+msgstr "కార్యక్షేత్రము %d%n"

 #: ../src/ui/menu.c:214
 #, c-format
 msgid "Workspace 1_0"
-msgstr "పనిప్రదేశము 1_0"
+msgstr "కార్యక్షేత్రము 1_0"

 #: ../src/ui/menu.c:216
 #, c-format
 msgid "Workspace %s%d"
-msgstr "పనిప్రదేశము %s%d"
+msgstr "కార్యక్షేత్రము %s%d"

 #: ../src/ui/menu.c:397
 msgid "Move to Another _Workspace"
-msgstr "వేరే పనిచేసెచోటుకి కదులు"
+msgstr "వేరే కార్యక్షేత్రానికి కదులు (_W)"

 #. This is the text that should appear next to menu accelerators
 #. * that use the shift key. If the text on this key isn't typically
@@ -627,7 +629,7 @@ msgstr "Ctrl"
 #.
 #: ../src/ui/metaaccellabel.c:89
 msgid "Alt"
-msgstr "ఆల్ట్"
+msgstr "Alt"

 #. This is the text that should appear next to menu accelerators
 #. * that use the meta key. If the text on this key isn't typically
@@ -1056,7 +1058,7 @@ msgstr ""
 #: ../src/ui/theme-parser.c:1116 ../src/ui/theme-parser.c:1219
 #, c-format
 msgid "<%s> name \"%s\" used a second time"
-msgstr "<%s> నామము \"%s\" రెండోవసారి ఉపయోగించబడినది"
+msgstr "<%s> పేరు \"%s\" రెండోవసారి ఉపయోగించబడినది"

 #: ../src/ui/theme-parser.c:1031 ../src/ui/theme-parser.c:1128
 #: ../src/ui/theme-parser.c:1231
@@ -1113,17 +1115,17 @@ msgstr ""
 #: ../src/ui/theme-parser.c:1450
 #, c-format
 msgid "Distance \"%s\" is unknown"
-msgstr "\"%s\" దూరము అపరిచితము"
+msgstr "\"%s\" దూరము తెలియదు"

 #: ../src/ui/theme-parser.c:1495
 #, c-format
 msgid "Aspect ratio \"%s\" is unknown"
-msgstr "\"%s\" దృశ్య నిష్పత్తి అపరిచితము"
+msgstr "\"%s\" దృశ్య నిష్పత్తి తెలియదు"

 #: ../src/ui/theme-parser.c:1557
 #, c-format
 msgid "Border \"%s\" is unknown"
-msgstr "\"%s\"సరిహద్దు అపరిచితము"
+msgstr "\"%s\"సరిహద్దు తెలియదు"

 #: ../src/ui/theme-parser.c:1868
 #, c-format
@@ -1184,7 +1186,7 @@ msgstr "చట్రము శైలి %s స్థితి దగ్గర
 #: ../src/ui/theme-parser.c:2942 ../src/ui/theme-parser.c:3019
 #, c-format
 msgid "No <draw_ops> with the name \"%s\" has been defined"
-msgstr "\"%s\"అను నామముగల <డ్రా అప్>లను వివరించబడలేదు"
+msgstr "\"%s\"అను పేరుగల <draw_ops>లను వివరించబడలేదు"

 #: ../src/ui/theme-parser.c:2972
 #, c-format
@@ -1354,39 +1356,39 @@ msgstr "%s అను వైవిద్వాంశమునకు ఒక స్

 #: ../src/ui/theme-viewer.c:99
 msgid "_Windows"
-msgstr "గవాక్షములు(_W)"
+msgstr "కిటికీలు (_W)"

 #: ../src/ui/theme-viewer.c:100
 msgid "_Dialog"
-msgstr "వివరణ(_D)"
+msgstr "సంవాదం (_D)"

 #: ../src/ui/theme-viewer.c:101
 msgid "_Modal dialog"
-msgstr "మోడల్ వివరణ(_M)"
+msgstr "మోడల్ సంవాదం (_M)"

 #: ../src/ui/theme-viewer.c:102
 msgid "_Utility"
-msgstr "సౌలభ్యం(_U)"
+msgstr "సౌలభ్యం (_U)"

 #: ../src/ui/theme-viewer.c:103
 msgid "_Splashscreen"
-msgstr "చెదిరిన తెర(_S)"
+msgstr "చెదిరిన తెర (_S)"

 #: ../src/ui/theme-viewer.c:104
 msgid "_Top dock"
-msgstr "పైన డాక్(_T)"
+msgstr "పైన డాక్ (_T)"

 #: ../src/ui/theme-viewer.c:105
 msgid "_Bottom dock"
-msgstr "క్రింది డాక్(_B)"
+msgstr "క్రింది డాక్ (_B)"

 #: ../src/ui/theme-viewer.c:106
 msgid "_Left dock"
-msgstr "ఎడమ డాక్(_L)"
+msgstr "ఎడమ డాక్ (_L)"

 #: ../src/ui/theme-viewer.c:107
 msgid "_Right dock"
-msgstr "కుడి డాక్(_R)"
+msgstr "కుడి డాక్ (_R)"

 #: ../src/ui/theme-viewer.c:108
 msgid "_All docks"
@@ -1394,7 +1396,7 @@ msgstr "అన్ని డాక్‌లు(_A)"

 #: ../src/ui/theme-viewer.c:109
 msgid "Des_ktop"
-msgstr "రంగస్థలం(_k)"
+msgstr "డెస్క్‍టాప్ (_k)"

 #: ../src/ui/theme-viewer.c:115
 msgid "Open another one of these windows"
@@ -1480,15 +1482,15 @@ msgstr "\"%s\" అను  వైవిద్వాంశము %g సెకన

 #: ../src/ui/theme-viewer.c:870
 msgid "Normal Title Font"
-msgstr "సాధారణ శీర్షిక అక్షరశైలి"
+msgstr "సాధారణ శీర్షిక ఖతి"

 #: ../src/ui/theme-viewer.c:876
 msgid "Small Title Font"
-msgstr "చిన్న శీర్షిక అక్షరశైలి"
+msgstr "చిన్న శీర్షిక ఖతి"

 #: ../src/ui/theme-viewer.c:882
 msgid "Large Title Font"
-msgstr "పెద్ద శీర్షిక అక్షరశైలి"
+msgstr "పెద్ద శీర్షిక ఖతి"

 #: ../src/ui/theme-viewer.c:887
 msgid "Button Layouts"
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -88,8 +88,6 @@ libmutter_la_SOURCES =				\
 	core/eventqueue.h			\
 	core/frame.c				\
 	core/frame.h				\
-	ui/gradient.c				\
-	meta/gradient.h				\
 	core/group-private.h			\
 	core/group-props.c			\
 	core/group-props.h			\
@@ -130,8 +128,8 @@ libmutter_la_SOURCES =				\
 	core/core.h				\
 	ui/ui.h					\
 	inlinepixbufs.h				\
-	ui/frames.c				\
-	ui/frames.h				\
+	ui/uiframe.c				\
+	ui/uiframe.h				\
 	ui/menu.c				\
 	ui/menu.h				\
 	ui/metaaccellabel.c			\
@@ -142,13 +140,7 @@ libmutter_la_SOURCES =				\
 	ui/tabpopup.h				\
 	ui/tile-preview.c			\
 	ui/tile-preview.h			\
-	ui/theme-parser.c			\
-	ui/theme.c				\
-	meta/theme.h				\
-	ui/theme-private.h			\
 	ui/ui.c					\
-	meta/preview-widget.h			\
-	ui/preview-widget.c			\
 	$(mutter_built_sources)

 libmutter_la_LDFLAGS = -no-undefined
@@ -163,7 +155,6 @@ libmutterinclude_base_headers =		\
 	meta/compositor.h			\
 	meta/display.h				\
 	meta/errors.h				\
-	meta/gradient.h				\
 	meta/group.h				\
 	meta/keybindings.h			\
 	meta/main.h				\
@@ -174,7 +165,6 @@ libmutterinclude_base_headers =		\
 	meta/meta-window-actor.h		\
 	meta/prefs.h				\
 	meta/screen.h				\
-	meta/theme.h				\
 	meta/types.h				\
 	meta/util.h				\
 	meta/window.h				\
@@ -183,7 +173,6 @@ libmutterinclude_base_headers =		\
 # Excluded from scanning for introspection but installed
 # atomnames.h: macros cause problems for scanning process
 libmutterinclude_extra_headers =		\
-	meta/preview-widget.h			\
 	meta/atomnames.h

 libmutterincludedir = $(includedir)/mutter/meta
@@ -192,10 +181,7 @@ libmutterinclude_HEADERS =			\
 	$(libmutterinclude_base_headers)	\
 	$(libmutterinclude_extra_headers)

-mutter_theme_viewer_SOURCES=  \
-	ui/theme-viewer.c
-
-bin_PROGRAMS=mutter mutter-theme-viewer
+bin_PROGRAMS=mutter

 mutter_SOURCES = core/mutter.c
 mutter_LDADD = $(MUTTER_LIBS) libmutter.la
@@ -222,7 +208,7 @@ 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@_EXPORT_PACKAGES = libmutter
@META_GIR@_CFLAGS = $(INCLUDES)
@META_GIR@_LIBS = libmutter.la
@META_GIR@_FILES =				\
@@ -233,16 +219,12 @@ Meta-$(api_version).gir: libmutter.la

 endif

-mutter_theme_viewer_LDADD= $(MUTTER_LIBS) libmutter.la
-
 testboxes_SOURCES = core/testboxes.c
-testgradient_SOURCES = ui/testgradient.c
 testasyncgetprop_SOURCES = core/testasyncgetprop.c

-noinst_PROGRAMS=testboxes testgradient testasyncgetprop
+noinst_PROGRAMS=testboxes testasyncgetprop

 testboxes_LDADD = $(MUTTER_LIBS) libmutter.la
-testgradient_LDADD = $(MUTTER_LIBS) libmutter.la
 testasyncgetprop_LDADD = $(MUTTER_LIBS) libmutter.la

@INTLTOOL_DESKTOP_RULE@
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -871,29 +871,6 @@ meta_compositor_unmaximize_window (MetaCompositor    *compositor,
  meta_window_actor_unmaximize (window_actor, old_rect, new_rect);
 }

-void
-meta_compositor_update_workspace_geometry (MetaCompositor *compositor,
-                                           MetaWorkspace  *workspace)
-{
-#if 0
-  /* FIXME -- should do away with this function in favour of MetaWorkspace
-   * signal.
-   */
-  MetaScreen     *screen = meta_workspace_get_screen (workspace);
-  MetaCompScreen *info;
-  MetaPluginManager *mgr;
-
-  DEBUG_TRACE ("meta_compositor_update_workspace_geometry\n");
-  info = meta_screen_get_compositor_data (screen);
-  mgr  = info->plugin_mgr;
-
-  if (!mgr || !workspace)
-    return;
-
-  meta_plugin_manager_update_workspace (mgr, workspace);
-#endif
-}
-
 void
 meta_compositor_switch_workspace (MetaCompositor     *compositor,
                                  MetaScreen         *screen,
--- a/src/compositor/meta-plugin-manager.h
+++ b/src/compositor/meta-plugin-manager.h
@@ -66,10 +66,6 @@ gboolean meta_plugin_manager_event_maximize    (MetaPluginManager *mgr,
                                                gint               target_y,
                                                gint               target_width,
                                                gint               target_height);
-void     meta_plugin_manager_update_workspaces (MetaPluginManager *mgr);
-
-void meta_plugin_manager_update_workspace (MetaPluginManager *mgr,
-                                           MetaWorkspace     *w);

 gboolean meta_plugin_manager_switch_workspace (MetaPluginManager   *mgr,
                                               gint                 from,
--- a/src/compositor/meta-plugin.c
+++ b/src/compositor/meta-plugin.c
@@ -396,7 +396,7 @@ meta_plugin_begin_modal (MetaPlugin       *plugin,
 }

 /**
- * meta_plugin_end_modal
+ * meta_plugin_end_modal:
 * @plugin: a #MetaPlugin
 * @timestamp: the time used for releasing grabs
 *
--- a/src/compositor/meta-shaped-texture.c
+++ b/src/compositor/meta-shaped-texture.c
@@ -30,13 +30,11 @@

 #include <meta/meta-shaped-texture.h>
 #include "meta-texture-tower.h"
-#include "meta-texture-rectangle.h"

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

 static void meta_shaped_texture_dispose  (GObject    *object);

@@ -54,8 +52,6 @@ static void meta_shaped_texture_get_preferred_height (ClutterActor *self,
                                                      gfloat       *min_height_p,
                                                      gfloat       *natural_height_p);

-static void meta_shaped_texture_dirty_mask (MetaShapedTexture *stex);
-
 static gboolean meta_shaped_texture_get_paint_volume (ClutterActor *self, ClutterPaintVolume *volume);

 G_DEFINE_TYPE (MetaShapedTexture, meta_shaped_texture,
@@ -75,13 +71,8 @@ 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;

  guint tex_width, tex_height;
-  guint mask_width, mask_height;

  guint create_mipmaps : 1;
 };
@@ -110,9 +101,6 @@ 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->paint_tower = meta_texture_tower_new ();
  priv->texture = COGL_INVALID_HANDLE;
  priv->mask_texture = COGL_INVALID_HANDLE;
@@ -129,8 +117,6 @@ meta_shaped_texture_dispose (GObject *object)
    meta_texture_tower_free (priv->paint_tower);
  priv->paint_tower = NULL;

-  meta_shaped_texture_dirty_mask (self);
-
  if (priv->material != COGL_INVALID_HANDLE)
    {
      cogl_handle_unref (priv->material);
@@ -147,186 +133,11 @@ meta_shaped_texture_dispose (GObject *object)
      priv->texture = 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_dirty_mask (MetaShapedTexture *stex)
-{
-  MetaShapedTexturePrivate *priv = stex->priv;
-
-  if (priv->mask_texture != COGL_INVALID_HANDLE)
-    {
-      cogl_handle_unref (priv->mask_texture);
-      priv->mask_texture = COGL_INVALID_HANDLE;
-    }
-
-  if (priv->material != COGL_INVALID_HANDLE)
-    cogl_material_set_layer (priv->material, 1, COGL_INVALID_HANDLE);
-}
-
-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)
-{
-  MetaShapedTexturePrivate *priv = stex->priv;
-  CoglHandle paint_tex;
-  guint tex_width, tex_height;
-
-  paint_tex = priv->texture;
-
-  if (paint_tex == COGL_INVALID_HANDLE)
-    return;
-
-  tex_width = cogl_texture_get_width (paint_tex);
-  tex_height = cogl_texture_get_height (paint_tex);
-
-  /* If the mask texture we have was created for a different size then
-     recreate it */
-  if (priv->mask_texture != COGL_INVALID_HANDLE
-      && (priv->mask_width != tex_width || priv->mask_height != tex_height))
-    meta_shaped_texture_dirty_mask (stex);
-
-  /* If we don't have a mask texture yet then create one */
-  if (priv->mask_texture == COGL_INVALID_HANDLE)
-    {
-      guchar *mask_data;
-      int i;
-      int n_rects;
-      int stride;
-      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))
-        {
-          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);
-
-      n_rects = cairo_region_num_rectangles (priv->shape_region);
-
-      /* Fill in each rectangle. */
-      for (i = 0; i < n_rects; i ++)
-        {
-          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;
-          guchar *p;
-
-          /* Clip the rectangle to the size of the texture */
-          x1 = CLAMP (x1, 0, (gint) tex_width - 1);
-          x2 = CLAMP (x2, x1, (gint) tex_width);
-          y1 = CLAMP (y1, 0, (gint) tex_height - 1);
-          y2 = CLAMP (y2, y1, (gint) tex_height);
-
-          /* Fill the rectangle */
-          for (p = mask_data + y1 * stride + x1;
-               y1 < y2;
-               y1++, p += stride)
-            memset (p, 255, x2 - x1);
-        }
-
-      install_overlay_path (stex, mask_data, tex_width, tex_height, 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)
-        {
-          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);
-        }
-      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,
-                                                         mask_data);
-
-      g_free (mask_data);
-
-      priv->mask_width = tex_width;
-      priv->mask_height = tex_height;
-    }
-}
-
 static void
 meta_shaped_texture_paint (ClutterActor *actor)
 {
@@ -376,9 +187,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->mask_texture == COGL_INVALID_HANDLE)
    {
-      /* No region means an unclipped shape. Use a single-layer texture. */
+      /* Use a single-layer texture if we don't have a mask. */

      if (priv->material_unshaped == COGL_INVALID_HANDLE) 
        {
@@ -391,8 +202,6 @@ meta_shaped_texture_paint (ClutterActor *actor)
    }
  else
    {
-      meta_shaped_texture_ensure_mask (stex);
-
      if (priv->material == COGL_INVALID_HANDLE)
 	{
 	   if (G_UNLIKELY (material_template == COGL_INVALID_HANDLE))
@@ -483,7 +292,7 @@ meta_shaped_texture_pick (ClutterActor       *actor,
  MetaShapedTexturePrivate *priv = stex->priv;

  /* If there is no region then use the regular pick */
-  if (priv->shape_region == NULL)
+  if (priv->mask_texture == COGL_INVALID_HANDLE)
    CLUTTER_ACTOR_CLASS (meta_shaped_texture_parent_class)
      ->pick (actor, color);
  else if (clutter_actor_should_pick_paint (actor))
@@ -503,8 +312,6 @@ meta_shaped_texture_pick (ClutterActor       *actor,
      if (tex_width == 0 || tex_height == 0) /* no contents yet */
        return;

-      meta_shaped_texture_ensure_mask (stex);
-
      cogl_set_source_color4ub (color->red, color->green, color->blue,
                                 color->alpha);

@@ -595,8 +402,8 @@ meta_shaped_texture_set_create_mipmaps (MetaShapedTexture *stex,
 }

 void
-meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
-                                      cairo_region_t    *region)
+meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
+                                      CoglHandle         mask_texture)
 {
  MetaShapedTexturePrivate *priv;

@@ -604,19 +411,18 @@ meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,

  priv = stex->priv;

-  if (priv->shape_region != NULL)
+  if (priv->mask_texture != COGL_INVALID_HANDLE)
    {
-      cairo_region_destroy (priv->shape_region);
-      priv->shape_region = NULL;
+      cogl_handle_unref (priv->mask_texture);
+      priv->mask_texture = COGL_INVALID_HANDLE;
    }

-  if (region != NULL)
+  if (mask_texture != COGL_INVALID_HANDLE)
    {
-      cairo_region_reference (region);
-      priv->shape_region = region;
+      priv->mask_texture = mask_texture;
+      cogl_handle_ref (priv->mask_texture);
    }

-  meta_shaped_texture_dirty_mask (stex);
  clutter_actor_queue_redraw (CLUTTER_ACTOR (stex));
 }

@@ -735,48 +541,6 @@ meta_shaped_texture_get_texture (MetaShapedTexture *stex)
  return stex->priv->texture;
 }

-/**
- * 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:
 * @stex: a #MetaShapedTexture
--- a/src/compositor/meta-texture-rectangle.c
+++ b/src/compositor/meta-texture-rectangle.c
@@ -5,7 +5,7 @@
 *
 * Authored By Neil Roberts  <neil@linux.intel.com>
 *
- * Copyright (C) 2011 Intel Corporation
+ * Copyright (C) 2011, 2012 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,94 +25,77 @@

 #include <config.h>

+#define CLUTTER_ENABLE_EXPERIMENTAL_API
+#define COGL_ENABLE_EXPERIMENTAL_API
+
+#include <clutter/clutter.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
+CoglTexture *
 meta_texture_rectangle_new (unsigned int width,
                            unsigned int height,
-                            CoglTextureFlags flags,
                            CoglPixelFormat format,
-                            GLenum internal_gl_format,
-                            GLenum internal_format,
+                            CoglPixelFormat internal_format,
                            unsigned int rowstride,
-                            const guint8 *data)
+                            const guint8 *data,
+                            GError **error)
 {
-  CoglHandle cogl_tex = COGL_INVALID_HANDLE;
+  ClutterBackend *backend =
+    clutter_get_default_backend ();
+  CoglContext *context =
+    clutter_backend_get_cogl_context (backend);
+  CoglTextureRectangle *tex_rect;

-#ifdef GL_TEXTURE_RECTANGLE_ARB
+  tex_rect = cogl_texture_rectangle_new_with_size (context,
+                                                   width, height,
+                                                   internal_format,
+                                                   error);
+  if (tex_rect == NULL)
+    return NULL;

-  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 */
+    cogl_texture_set_region (COGL_TEXTURE (tex_rect),
+                             0, 0, /* src_x/y */
+                             0, 0, /* dst_x/y */
+                             width, height, /* dst_width/height */
+                             width, height, /* width/height */
                             format,
                             rowstride,
                             data);

-#endif /* GL_TEXTURE_RECTANGLE_ARB */
-
-  return cogl_tex;
+  return COGL_TEXTURE (tex_rect);
+}
+
+static void
+texture_rectangle_check_cb (CoglTexture *sub_texture,
+                            const float *sub_texture_coords,
+                            const float *meta_coords,
+                            void *user_data)
+{
+  gboolean *result = user_data;
+
+  if (cogl_is_texture_rectangle (sub_texture))
+    *result = TRUE;
+}
+
+/* Determines if the given texture is using a rectangle texture as its
+ * primitive texture type. Eventually this function could be replaced
+ * with cogl_texture_get_type if Cogl makes that public.
+ *
+ * http://git.gnome.org/browse/cogl/commit/?h=8012eee31
+ */
+gboolean
+meta_texture_rectangle_check (CoglTexture *texture)
+{
+  gboolean result = FALSE;
+
+  cogl_meta_texture_foreach_in_region (COGL_META_TEXTURE (texture),
+                                       0.0f, 0.0f, /* tx_1 / ty_1 */
+                                       1.0f, 1.0f, /* tx_2 / ty_2 */
+                                       COGL_PIPELINE_WRAP_MODE_REPEAT,
+                                       COGL_PIPELINE_WRAP_MODE_REPEAT,
+                                       texture_rectangle_check_cb,
+                                       &result);
+
+  return result;
 }
--- a/src/compositor/meta-texture-rectangle.h
+++ b/src/compositor/meta-texture-rectangle.h
@@ -30,15 +30,17 @@

 G_BEGIN_DECLS

-CoglHandle
+CoglTexture *
 meta_texture_rectangle_new (unsigned int width,
                            unsigned int height,
-                            CoglTextureFlags flags,
                            CoglPixelFormat format,
-                            GLenum internal_gl_format,
-                            GLenum internal_format,
+                            CoglPixelFormat internal_format,
                            unsigned int rowstride,
-                            const guint8 *data);
+                            const guint8 *data,
+                            GError **error);
+
+gboolean
+meta_texture_rectangle_check (CoglTexture *texture);

 G_END_DECLS

--- a/src/compositor/meta-texture-tower.c
+++ b/src/compositor/meta-texture-tower.c
@@ -98,18 +98,6 @@ meta_texture_tower_free (MetaTextureTower *tower)
  g_slice_free (MetaTextureTower, tower);
 }

-#ifdef GL_TEXTURE_RECTANGLE_ARB
-static gboolean
-texture_is_rectangle (CoglHandle texture)
-{
-  GLuint gl_tex;
-  GLenum gl_target;
-
-  cogl_texture_get_gl_texture (texture, &gl_tex, &gl_target);
-  return gl_target == GL_TEXTURE_RECTANGLE_ARB;
-}
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
-
 /**
 * meta_texture_tower_set_base_texture:
 * @tower: a #MetaTextureTower
@@ -354,13 +342,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 +354,23 @@ 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]))
+      meta_texture_rectangle_check (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,
+                                    /* data */
+                                    NULL,
+                                    /* error */
                                    NULL);
    }
  else
-#endif /* GL_TEXTURE_RECTANGLE_ARB */
    {
      tower->textures[level] = cogl_texture_new_with_size (width, height,
                                                           COGL_TEXTURE_NO_AUTO_MIPMAP,
@@ -562,7 +546,7 @@ texture_tower_revalidate_client (MetaTextureTower *tower,
                           4 * dest_width,
                           dest_data);

-  if (dest_height < source_texture_height)
+  if (dest_texture_height < source_texture_height)
    {
      g_free (source_tmp1);
      g_free (source_tmp2);
--- a/src/compositor/meta-window-actor.c
+++ b/src/compositor/meta-window-actor.c
@@ -13,6 +13,7 @@
 #define COGL_ENABLE_EXPERIMENTAL_API
 #include <cogl/cogl-texture-pixmap-x11.h>
 #include <gdk/gdk.h> /* for gdk_rectangle_union() */
+#include <string.h>

 #include <meta/display.h>
 #include <meta/errors.h>
@@ -24,6 +25,8 @@
 #include "compositor-private.h"
 #include "meta-shadow-factory-private.h"
 #include "meta-window-actor-private.h"
+#include "meta-texture-rectangle.h"
+#include "region-utils.h"

 enum {
  POSITION_CHANGED,
@@ -123,15 +126,10 @@ enum
  PROP_META_WINDOW = 1,
  PROP_META_SCREEN,
  PROP_X_WINDOW,
-  PROP_X_WINDOW_ATTRIBUTES,
  PROP_NO_SHADOW,
  PROP_SHADOW_CLASS
 };

-#define DEFAULT_SHADOW_RADIUS 12
-#define DEFAULT_SHADOW_X_OFFSET 0
-#define DEFAULT_SHADOW_Y_OFFSET 8
-
 static void meta_window_actor_dispose    (GObject *object);
 static void meta_window_actor_finalize   (GObject *object);
 static void meta_window_actor_constructed (GObject *object);
@@ -654,15 +652,14 @@ meta_window_actor_paint (ClutterActor *actor)
      /* The frame bounds are already subtracted from priv->shadow_clip
       * if that exists.
       */
-      if (!clip && clip_shadow_under_window (self))
+      if (!clip && clip_shadow_under_window (self) && priv->shape_region != NULL)
        {
-          cairo_region_t *frame_bounds = meta_window_get_frame_bounds (priv->window);
          cairo_rectangle_int_t bounds;

          meta_window_actor_get_shadow_bounds (self, appears_focused, &bounds);
          clip = cairo_region_create_rectangle (&bounds);

-          cairo_region_subtract (clip, frame_bounds);
+          cairo_region_subtract (clip, priv->shape_region);
        }

      meta_shadow_paint (shadow,
@@ -750,70 +747,41 @@ meta_window_actor_has_shadow (MetaWindowActor *self)
   * Always put a shadow around windows with a frame - This should override
   * the restriction about not putting a shadow around ARGB windows.
   */
-  if (priv->window)
-    {
-      if (meta_window_get_frame (priv->window))
-	{
-	  meta_verbose ("Window 0x%x has shadow because it has a frame\n",
-			(guint)priv->xwindow);
-	  return TRUE;
-	}
-    }
+  if (meta_window_get_frame (priv->window))
+    return TRUE;

  /*
   * Do not add shadows to ARGB windows; eventually we should generate a
   * shadow from the input shape for such windows.
   */
  if (priv->argb32 || priv->opacity != 0xff)
-    {
-      meta_verbose ("Window 0x%x has no shadow as it is ARGB\n",
-		    (guint)priv->xwindow);
-      return FALSE;
-    }
+    return FALSE;

  /*
   * Add shadows to override redirect windows (e.g., Gtk menus).
   */
  if (priv->window->override_redirect)
-    {
-      meta_verbose ("Window 0x%x has shadow because it is override redirect.\n",
-		    (guint)priv->xwindow);
-      return TRUE;
-    }
+    return TRUE;

  /*
   * Don't put shadow around DND icon windows
   */
  if (window_type == META_WINDOW_DND ||
      window_type == META_WINDOW_DESKTOP)
-    {
-      meta_verbose ("Window 0x%x has no shadow as it is DND or Desktop\n",
-		    (guint)priv->xwindow);
-      return FALSE;
-    }
+    return FALSE;

  if (window_type == META_WINDOW_MENU
 #if 0
      || window_type == META_WINDOW_DROPDOWN_MENU
 #endif
      )
-    {
-      meta_verbose ("Window 0x%x has shadow as it is a menu\n",
-		    (guint)priv->xwindow);
-      return TRUE;
-    }
+    return TRUE;

 #if 0
  if (window_type == META_WINDOW_TOOLTIP)
-    {
-      meta_verbose ("Window 0x%x has shadow as it is a tooltip\n",
-		    (guint)priv->xwindow);
-      return TRUE;
-    }
+    return TRUE;
 #endif

-  meta_verbose ("Window 0x%x has no shadow as it fell through\n",
-		(guint)priv->xwindow);
  return FALSE;
 }

@@ -1669,7 +1637,6 @@ meta_window_actor_update_shape_region (MetaWindowActor *self,

  /* region must be non-null */
  priv->shape_region = region;
-  cairo_region_reference (region);

  /* Our "shape_region" is called the "bounding region" in the X Shape
   * Extension Documentation.
@@ -1715,7 +1682,7 @@ meta_window_actor_get_obscured_region (MetaWindowActor *self)
 #if 0
 /* Print out a region; useful for debugging */
 static void
-dump_region (cairo_region_t *region)
+print_region (cairo_region_t *region)
 {
  int n_rects;
  int i;
@@ -1733,6 +1700,26 @@ dump_region (cairo_region_t *region)
 }
 #endif

+#if 0
+/* Dump a region to a PNG file; useful for debugging */
+static void
+see_region (cairo_region_t *region,
+            int             width,
+            int             height,
+            char           *filename)
+{
+  cairo_surface_t *surface = cairo_image_surface_create (CAIRO_FORMAT_A8, width, height);
+  cairo_t *cr = cairo_create (surface);
+
+  gdk_cairo_region (cr, region);
+  cairo_fill (cr);
+
+  cairo_surface_write_to_png (surface, filename);
+  cairo_destroy (cr);
+  cairo_surface_destroy (surface);
+}
+#endif
+
 /**
 * meta_window_actor_set_visible_region:
 * @self: a #MetaWindowActor
@@ -1777,11 +1764,8 @@ meta_window_actor_set_visible_region_beneath (MetaWindowActor *self,
      meta_window_actor_clear_shadow_clip (self);
      priv->shadow_clip = cairo_region_copy (beneath_region);

-      if (clip_shadow_under_window (self))
-        {
-          cairo_region_t *frame_bounds = meta_window_get_frame_bounds (priv->window);
-          cairo_region_subtract (priv->shadow_clip, frame_bounds);
-        }
+      if (clip_shadow_under_window (self) && priv->shape_region != NULL)
+        cairo_region_subtract (priv->shadow_clip, priv->shape_region);
    }
 }

@@ -2023,121 +2007,136 @@ meta_window_actor_sync_visibility (MetaWindowActor *self)
    }
 }

-static inline void
-set_integral_bounding_rect (cairo_rectangle_int_t *rect,
-                            double x, double y,
-                            double width, double height)
+static cairo_region_t *
+scan_visible_region (guchar         *mask_data,
+                     int             stride,
+                     cairo_region_t *scan_area)
 {
-  rect->x = floor(x);
-  rect->y = floor(y);
-  rect->width = ceil(x + width) - rect->x;
-  rect->height = ceil(y + height) - rect->y;
+  int i, n_rects = cairo_region_num_rectangles (scan_area);
+  MetaRegionBuilder builder;
+
+  meta_region_builder_init (&builder);
+
+  for (i = 0; i < n_rects; i++)
+    {
+      int x, y;
+      cairo_rectangle_int_t rect;
+
+      cairo_region_get_rectangle (scan_area, 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] == 255 && w < (rect.x + rect.width))
+                w++;
+
+              if (w > 0)
+                {
+                  meta_region_builder_add_rectangle (&builder, x, y, w - x, 1);
+                  x = w;
+                }
+            }
+        }
+    }
+
+  return meta_region_builder_finish (&builder);
 }

 static void
-update_corners (MetaWindowActor   *self,
-                MetaFrameBorders  *borders)
+build_and_scan_frame_mask (MetaWindowActor       *self,
+                           cairo_rectangle_int_t *client_area,
+                           cairo_region_t        *shape_region)
 {
  MetaWindowActorPrivate *priv = self->priv;
-  MetaRectangle outer;
-  cairo_rectangle_int_t corner_rects[4];
-  cairo_region_t *corner_region;
-  cairo_path_t *corner_path;
-  float top_left, top_right, bottom_left, bottom_right;
-  float x, y;
-
-  /* need these to build a path */
+  guchar *mask_data;
+  guint tex_width, tex_height;
+  CoglHandle paint_tex, mask_texture;
+  int stride;
  cairo_t *cr;
  cairo_surface_t *surface;

-  if (!priv->window->frame)
-    {
-      meta_shaped_texture_set_overlay_path (META_SHAPED_TEXTURE (priv->actor),
-                                            NULL, NULL);
-      return;
-    }
+  paint_tex = meta_shaped_texture_get_texture (META_SHAPED_TEXTURE (priv->actor));
+  if (paint_tex == COGL_INVALID_HANDLE)
+    return;

-  meta_window_get_outer_rect (priv->window, &outer);
+  tex_width = cogl_texture_get_width (paint_tex);
+  tex_height = cogl_texture_get_height (paint_tex);

-  meta_frame_get_corner_radiuses (priv->window->frame,
-                                  &top_left,
-                                  &top_right,
-                                  &bottom_left,
-                                  &bottom_right);
+  stride = cairo_format_stride_for_width (CAIRO_FORMAT_A8, tex_width);

-  /* Unfortunately, cairo does not allow us to create a context
-   * without a surface. Create a 0x0 image surface to "paint to"
-   * so we can get the path. */
-  surface = cairo_image_surface_create (CAIRO_FORMAT_A8,
-                                        0, 0);
+  /* Create data for an empty image */
+  mask_data = g_malloc0 (stride * tex_height);

+  surface = cairo_image_surface_create_for_data (mask_data,
+                                                 CAIRO_FORMAT_A8,
+                                                 tex_width,
+                                                 tex_height,
+                                                 stride);
  cr = cairo_create (surface);

-  /* top left */
-  x = borders->invisible.left;
-  y = borders->invisible.top;
+  gdk_cairo_region (cr, shape_region);
+  cairo_fill (cr);

-  set_integral_bounding_rect (&corner_rects[0],
-                              x, y, top_left, top_left);
+  if (priv->window->frame != NULL)
+    {
+      cairo_region_t *frame_paint_region, *scanned_region;
+      cairo_rectangle_int_t rect = { 0, 0, tex_width, tex_height };

-  cairo_arc (cr,
-             x + top_left,
-             y + top_left,
-             top_left,
-             0, M_PI*2);
+      /* Make sure we don't paint the frame over the client window. */
+      frame_paint_region = cairo_region_create_rectangle (&rect);
+      cairo_region_subtract_rectangle (frame_paint_region, client_area);

+      gdk_cairo_region (cr, frame_paint_region);
+      cairo_clip (cr);

-  /* top right */
-  x = borders->invisible.left + outer.width - top_right;
-  y = borders->invisible.top;
+      /* XXX: work around cairo bug. remove when released
+       * http://cgit.freedesktop.org/cairo/commit/?id=ec400daf9ec3bbd8403324db7fcdaf175e185e7b
+       */
+      cairo_push_group (cr);

-  set_integral_bounding_rect (&corner_rects[1],
-                              x, y, top_right, top_right);
+      meta_frame_render_background (priv->window->frame, cr);

-  cairo_arc (cr,
-             x,
-             y + top_right,
-             top_right,
-             0, M_PI*2);
+      cairo_pop_group_to_source (cr);
+      cairo_paint (cr);

-  /* bottom right */
-  x = borders->invisible.left + outer.width - bottom_right;
-  y = borders->invisible.top + outer.height - bottom_right;
+      cairo_surface_flush (surface);
+      scanned_region = scan_visible_region (mask_data, stride, frame_paint_region);
+      cairo_region_union (shape_region, scanned_region);
+      cairo_region_destroy (scanned_region);
+    }

-  set_integral_bounding_rect (&corner_rects[2],
-                              x, y, bottom_right, bottom_right);
-
-  cairo_arc (cr,
-             x,
-             y,
-             bottom_right,
-             0, M_PI*2);
-
-  /* bottom left */
-  x = borders->invisible.left;
-  y = borders->invisible.top + outer.height - bottom_left;
-
-  set_integral_bounding_rect (&corner_rects[3],
-                              x, y, bottom_left, bottom_left);
-
-  cairo_arc (cr,
-             x + bottom_left,
-             y,
-             bottom_left,
-             0, M_PI*2);
-
-  corner_path = cairo_copy_path (cr);
-
-  cairo_surface_destroy (surface);
  cairo_destroy (cr);
+  cairo_surface_destroy (surface);

-  corner_region = cairo_region_create_rectangles (corner_rects, 4);
+  if (meta_texture_rectangle_check (paint_tex))
+    {
+      mask_texture = meta_texture_rectangle_new (tex_width, tex_height,
+                                                 COGL_PIXEL_FORMAT_A_8,
+                                                 COGL_PIXEL_FORMAT_A_8,
+                                                 stride,
+                                                 mask_data,
+                                                 NULL /* error */);
+    }
+  else
+    {
+      /* Note: we don't allow slicing for this texture because we
+       * need to use it with multi-texturing which doesn't support
+       * sliced textures */
+      mask_texture = cogl_texture_new_from_data (tex_width, tex_height,
+                                                 COGL_TEXTURE_NO_SLICING,
+                                                 COGL_PIXEL_FORMAT_A_8,
+                                                 COGL_PIXEL_FORMAT_ANY,
+                                                 stride,
+                                                 mask_data);
+    }

-  meta_shaped_texture_set_overlay_path (META_SHAPED_TEXTURE (priv->actor),
-                                        corner_region, corner_path);
-
-  cairo_region_destroy (corner_region);
+  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor),
+                                        mask_texture);
+  cogl_handle_unref (mask_texture);

+  g_free (mask_data);
 }

 static void
@@ -2148,53 +2147,30 @@ check_needs_reshape (MetaWindowActor *self)
  MetaDisplay *display = meta_screen_get_display (screen);
  MetaFrameBorders borders;
  cairo_region_t *region;
+  cairo_rectangle_int_t client_area;

  if (!priv->needs_reshape)
    return;

-  meta_shaped_texture_set_shape_region (META_SHAPED_TEXTURE (priv->actor), NULL);
-  meta_window_actor_clear_shape_region (self);
-
  meta_frame_calc_borders (priv->window->frame, &borders);

-  region = meta_window_get_frame_bounds (priv->window);
-  if (region != NULL)
-    {
-      /* This returns the window's internal frame bounds region,
-       * so we need to copy it because we modify it below. */
-      region = cairo_region_copy (region);
-    }
-  else
-    {
-      /* If we have no region, we have no frame. We have no frame,
-       * so just use the bounding region instead */
-      region = cairo_region_copy (priv->bounding_region);
-    }
+  client_area.x = borders.total.left;
+  client_area.y = borders.total.top;
+  client_area.width = priv->window->rect.width;
+  client_area.height = priv->window->rect.height;
+
+  meta_shaped_texture_set_mask_texture (META_SHAPED_TEXTURE (priv->actor), COGL_INVALID_HANDLE);
+  meta_window_actor_clear_shape_region (self);

 #ifdef HAVE_SHAPE
  if (priv->window->has_shape)
    {
+      /* Translate the set of XShape rectangles that we
+       * get from the X server to a cairo_region. */
      Display *xdisplay = meta_display_get_xdisplay (display);
      XRectangle *rects;
+      cairo_rectangle_int_t *cairo_rects = NULL;
      int n_rects, ordering;
-      cairo_rectangle_int_t client_area;
-
-      client_area.width = priv->window->rect.width;
-      client_area.height = priv->window->rect.height;
-
-      if (priv->window->frame)
-        {
-          client_area.x = borders.total.left;
-          client_area.y = borders.total.top;
-        }
-      else
-        {
-          client_area.x = 0;
-          client_area.y = 0;
-        }
-
-      /* Punch out client area. */
-      cairo_region_subtract_rectangle (region, &client_area);

      meta_error_trap_push (display);
      rects = XShapeGetRectangles (xdisplay,
@@ -2206,29 +2182,37 @@ check_needs_reshape (MetaWindowActor *self)

      if (rects)
        {
+          cairo_rects = g_new (cairo_rectangle_int_t, n_rects);
          int i;
          for (i = 0; i < n_rects; i ++)
            {
-              cairo_rectangle_int_t rect = { rects[i].x + client_area.x,
-                                             rects[i].y + client_area.y,
-                                             rects[i].width,
-                                             rects[i].height };
-              cairo_region_union_rectangle (region, &rect);
+              cairo_rects[i].x = client_area.x + rects[i].x;
+              cairo_rects[i].y = client_area.y + rects[i].y;
+              cairo_rects[i].width = rects[i].width;
+              cairo_rects[i].height = rects[i].height;
            }
          XFree (rects);
        }
+
+      region = cairo_region_create_rectangles (cairo_rects, n_rects);
+      g_free (cairo_rects);
    }
+  else
 #endif
+    {
+      /* If we don't have a shape on the server, that means that
+       * we have an implicit shape of one rectangle covering the
+       * entire window. */
+      region = cairo_region_create_rectangle (&client_area);
+    }

-  meta_shaped_texture_set_shape_region (META_SHAPED_TEXTURE (priv->actor),
-                                        region);
-
+  /* This takes the region, generates a mask using GTK+
+   * and scans the mask looking for all opaque pixels,
+   * adding it to region.
+   */
+  build_and_scan_frame_mask (self, &client_area, region);
  meta_window_actor_update_shape_region (self, region);

-  cairo_region_destroy (region);
-
-  update_corners (self, &borders);
-
  priv->needs_reshape = FALSE;
  meta_window_actor_invalidate_shadow (self);
 }
--- a/src/compositor/meta-window-group.c
+++ b/src/compositor/meta-window-group.c
@@ -209,7 +209,6 @@ meta_window_group_paint (ClutterActor *actor)
      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))
--- a/src/compositor/plugins/default.c
+++ b/src/compositor/plugins/default.c
@@ -112,8 +112,6 @@ struct _MetaDefaultPluginPrivate
  ClutterActor          *desktop2;

  MetaPluginInfo         info;
-
-  gboolean               debug_mode : 1;
 };

 /*
@@ -182,34 +180,6 @@ meta_default_plugin_get_property (GObject    *object,
    }
 }

-static void
-start (MetaPlugin *plugin)
-{
-  MetaDefaultPluginPrivate *priv   = META_DEFAULT_PLUGIN (plugin)->priv;
-
-  guint destroy_timeout  = DESTROY_TIMEOUT;
-  guint minimize_timeout = MINIMIZE_TIMEOUT;
-  guint maximize_timeout = MAXIMIZE_TIMEOUT;
-  guint map_timeout      = MAP_TIMEOUT;
-  guint switch_timeout   = SWITCH_TIMEOUT;
-
-  if (meta_plugin_debug_mode (plugin))
-    {
-      g_debug ("Plugin %s: Entering debug mode.", priv->info.name);
-
-      priv->debug_mode = TRUE;
-
-      /*
-       * Double the effect duration to make them easier to observe.
-       */
-      destroy_timeout  *= 2;
-      minimize_timeout *= 2;
-      maximize_timeout *= 2;
-      map_timeout      *= 2;
-      switch_timeout   *= 2;
-    }
-}
-
 static void
 meta_default_plugin_class_init (MetaDefaultPluginClass *klass)
 {
@@ -221,7 +191,6 @@ meta_default_plugin_class_init (MetaDefaultPluginClass *klass)
  gobject_class->set_property    = meta_default_plugin_set_property;
  gobject_class->get_property    = meta_default_plugin_get_property;

-  plugin_class->start            = start;
  plugin_class->map              = map;
  plugin_class->minimize         = minimize;
  plugin_class->maximize         = maximize;
--- a/src/compositor/region-utils.c
+++ b/src/compositor/region-utils.c
@@ -43,25 +43,10 @@
 /* Optimium performance seems to be with MAX_CHUNK_RECTANGLES=4; 8 is about 10% slower.
 * But using 8 may be more robust to systems with slow malloc(). */
 #define MAX_CHUNK_RECTANGLES 8
+/* XXX: keep in sync with region-utils.h */
 #define MAX_LEVELS 16

-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:
-   *
-   * |a  |
-   * |b  |a  |
-   * |c  |   |ab |
-   * |d  |c  |ab |
-   * |e  |   |   |abcd|
-   */
-  cairo_region_t *levels[MAX_LEVELS];
-  int n_levels;
-} MetaRegionBuilder;
-
-static void
+void
 meta_region_builder_init (MetaRegionBuilder *builder)
 {
  int i;
@@ -70,7 +55,7 @@ meta_region_builder_init (MetaRegionBuilder *builder)
  builder->n_levels = 1;
 }

-static void
+void
 meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
                                   int                x,
                                   int                y,
@@ -115,7 +100,7 @@ meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
    }
 }

-static cairo_region_t *
+cairo_region_t *
 meta_region_builder_finish (MetaRegionBuilder *builder)
 {
  cairo_region_t *result = NULL;
--- a/src/compositor/region-utils.h
+++ b/src/compositor/region-utils.h
@@ -63,6 +63,34 @@ struct _MetaRegionIterator {
  cairo_rectangle_int_t next_rectangle;
 };

+typedef struct _MetaRegionBuilder MetaRegionBuilder;
+
+/* XXX: keep in sync with region-utils.c */
+#define MAX_LEVELS 16
+struct _MetaRegionBuilder {
+  /* 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:
+   *
+   * |a  |
+   * |b  |a  |
+   * |c  |   |ab |
+   * |d  |c  |ab |
+   * |e  |   |   |abcd|
+   */
+  cairo_region_t *levels[MAX_LEVELS];
+  int n_levels;
+};
+#undef MAX_LEVELS
+
+void     meta_region_builder_init       (MetaRegionBuilder *builder);
+void     meta_region_builder_add_rectangle (MetaRegionBuilder *builder,
+                                            int                x,
+                                            int                y,
+                                            int                width,
+                                            int                height);
+cairo_region_t * meta_region_builder_finish (MetaRegionBuilder *builder);
+
 void     meta_region_iterator_init      (MetaRegionIterator *iter,
                                         cairo_region_t     *region);
 gboolean meta_region_iterator_at_end    (MetaRegionIterator *iter);
--- a/src/core/bell.c
+++ b/src/core/bell.c
@@ -23,7 +23,8 @@
 */

 /**
- * \file bell.c Ring the bell or flash the screen
+ * SECTION:Bell
+ * @short_description: Ring the bell or flash the screen
 *
 * Sometimes, X programs "ring the bell", whatever that means. Mutter lets
 * the user configure the bell to be audible or visible (aka visual), and
@@ -57,6 +58,10 @@
 #endif

 /**
+ * bell_flash_screen:
+ * @display:  The display which owns the screen (rather redundant)
+ * @screen:   The screen to flash
+ *
 * Flashes one entire screen.  This is done by making a window the size of the
 * whole screen (or reusing the old one, if it's still around), mapping it,
 * painting it white and then black, and then unmapping it. We set saveunder so
@@ -65,14 +70,12 @@
 * Unlike frame flashes, we don't do fullscreen flashes with a timeout; rather,
 * we do them in one go, because we don't have to rely on the theme code
 * redrawing the frame for us in order to do the flash.
- *
- * \param display  The display which owns the screen (rather redundant)
- * \param screen   The screen to flash
- *
- * \bug The way I read it, this appears not to do the flash
+ */
+/*
+ * Bug: The way I read it, this appears not to do the flash
 * the first time we flash a particular display. Am I wrong?
 *
- * \bug This appears to destroy our current XSync status.
+ * Bug: This appears to destroy our current XSync status.
 */
 static void
 bell_flash_screen (MetaDisplay *display, 
@@ -137,14 +140,15 @@ bell_flash_screen (MetaDisplay *display,
 }

 /**
+ * bell_flash_fullscreen:
+ * @display: The display the event came in on
+ * @xkb_ev: The bell event
+ *
 * Flashes one screen, or all screens, in response to a bell event.
 * If the event is on a particular window, flash the screen that
 * window is on. Otherwise, flash every screen on this display.
 *
 * If the configure script found we had no XKB, this does not exist.
- *
- * \param display  The display the event came in on
- * \param xkb_ev   The bell event
 */
 #ifdef HAVE_XKB
 static void
@@ -182,17 +186,21 @@ bell_flash_fullscreen (MetaDisplay *display,
 }

 /**
+ * bell_unflash_frame:
+ * @data: The frame to unflash, cast to a gpointer so it can go into
+ *        a callback function.
+ *
 * Makes a frame be not flashed; this is the timeout half of
 * bell_flash_window_frame(). This is done simply by clearing the
 * flash flag and queuing a redraw of the frame.
 *
 * If the configure script found we had no XKB, this does not exist.
 *
- * \param data  The frame to unflash, cast to a gpointer so it can go into
- *              a callback function.
- * \return Always FALSE, so we don't get called again.
- *
- * \bug This is the parallel to bell_flash_window_frame(), so it should
+ * Returns: Always FALSE, so we don't get called again.
+ */
+
+/*
+ * Bug: This is the parallel to bell_flash_window_frame(), so it should
 * really be called meta_bell_unflash_window_frame().
 */
 static gboolean 
@@ -205,6 +213,9 @@ bell_unflash_frame (gpointer data)
 }

 /**
+ * bell_flash_window_frame:
+ * @window: The window to flash
+ *
 * Makes a frame flash and then return to normal shortly afterwards.
 * This is done by setting a flag so that the theme
 * code will temporarily draw the frame as focussed if it's unfocussed and
@@ -212,8 +223,6 @@ bell_unflash_frame (gpointer data)
 * that the flag can be unset and the frame re-redrawn.
 *
 * If the configure script found we had no XKB, this does not exist.
- *
- * \param window  The window to flash
 */
 static void
 bell_flash_window_frame (MetaWindow *window)
@@ -231,11 +240,12 @@ bell_flash_window_frame (MetaWindow *window)
 }

 /**
+ * bell_flash_frame:
+ * @display:  The display the bell event came in on
+ * @xkb_ev:   The bell event we just received
+ *
 * Flashes the frame of the focussed window. If there is no focussed window,
 * flashes the screen.
- *
- * \param display  The display the bell event came in on
- * \param xkb_ev   The bell event we just received
 */
 static void
 bell_flash_frame (MetaDisplay *display, 
@@ -261,15 +271,18 @@ bell_flash_frame (MetaDisplay *display,
 }

 /**
+ * bell_visual_notify:
+ * @display: The display the bell event came in on
+ * @xkb_ev: The bell event we just received
+ *
 * Gives the user some kind of visual bell substitute, in response to a
 * bell event. What this is depends on the "visual bell type" pref.
 *
 * If the configure script found we had no XKB, this does not exist.
- *
- * \param display  The display the bell event came in on
- * \param xkb_ev   The bell event we just received
- *
- * \bug This should be merged with meta_bell_notify().
+ */
+
+/*
+ * Bug: This should be merged with meta_bell_notify().
 */
 static void
 bell_visual_notify (MetaDisplay *display, 
@@ -407,12 +420,13 @@ meta_bell_shutdown (MetaDisplay *display)
 }

 /**
+ * meta_bell_notify_frame_destroy:
+ * @frame: The frame which is being destroyed
+ *
 * Deals with a frame being destroyed. This is important because if we're
 * using a visual bell, we might be flashing the edges of the frame, and
 * so we'd have a timeout function waiting ready to un-flash them. If the
 * frame's going away, we can tell the timeout not to bother.
- *
- * \param frame  The frame which is being destroyed
 */
 void
 meta_bell_notify_frame_destroy (MetaFrame *frame)
--- a/src/core/bell.h
+++ b/src/core/bell.h
@@ -1,17 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/**
- * \file bell.h Ring the bell or flash the screen
- *
- * Sometimes, X programs "ring the bell", whatever that means. Mutter lets
- * the user configure the bell to be audible or visible (aka visual), and
- * if it's visual it can be configured to be frame-flash or fullscreen-flash.
- * We never get told about audible bells; X handles them just fine by itself.
- *
- * The visual bell was the result of a discussion in Bugzilla here:
- * <http://bugzilla.gnome.org/show_bug.cgi?id=99886>.
- */
-
 /* 
 * Copyright (C) 2002 Sun Microsystems Inc.
 * 
--- a/src/core/boxes.c
+++ b/src/core/boxes.c
@@ -625,7 +625,6 @@ meta_rectangle_get_minimal_spanning_set_for_region (
  *temp_rect = *basic_rect;
  ret = g_list_prepend (NULL, temp_rect);

-  strut_iter = all_struts;
  for (strut_iter = all_struts; strut_iter; strut_iter = strut_iter->next)
    {
      GList *rect_iter; 
--- a/src/core/display-private.h
+++ b/src/core/display-private.h
@@ -408,7 +408,6 @@ const char* meta_event_mode_to_string   (int m);
 const char* meta_event_detail_to_string (int d);

 void meta_display_queue_retheme_all_windows (MetaDisplay *display);
-void meta_display_retheme_all (void);

 void meta_display_set_cursor_theme (const char *theme, 
 				    int         size);
--- a/src/core/display.c
+++ b/src/core/display.c
@@ -25,9 +25,10 @@
 */

 /**
- * \file display.c Handles operations on an X display.
+ * SECTION:MetaDisplay
+ * @short_description: Handles operations on an X display.
 *
- * The display is represented as a MetaDisplay struct.
+ * The display is represented as a #MetaDisplay struct.
 */

 #define _XOPEN_SOURCE 600 /* for gethostname() */
@@ -53,12 +54,6 @@
 #include <X11/cursorfont.h>
 #include "mutter-enum-types.h"

-#ifdef HAVE_SOLARIS_XINERAMA
-#include <X11/extensions/xinerama.h>
-#endif
-#ifdef HAVE_XFREE_XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif
 #ifdef HAVE_RANDR
 #include <X11/extensions/Xrandr.h>
 #endif
@@ -87,7 +82,7 @@
         g == META_GRAB_OP_KEYBOARD_ESCAPING_GROUP)

 /**
- * \defgroup pings Pings
+ * SECTION:pings
 *
 * Sometimes we want to see whether a window is responding,
 * so we send it a "ping" message and see whether it sends us back a "pong"
@@ -102,13 +97,13 @@
 */

 /**
+ * MetaPingData:
+ *
 * Describes a ping on a window. When we send a ping to a window, we build
 * one of these structs, and it eventually gets passed to the timeout function
 * or to the function which handles the response from the window. If the window
 * does or doesn't respond to the ping, we use this information to deal with
 * these facts; we have a handler function for each.
- *
- * \ingroup pings
 */
 typedef struct 
 {
@@ -150,7 +145,7 @@ enum {

 static guint display_signals [LAST_SIGNAL] = { 0 };

-/**
+/*
 * The display we're managing.  This is a singleton object.  (Historically,
 * this was a list of displays, but there was never any way to add more
 * than one element to it.)  The goofy name is because we don't want it
@@ -185,7 +180,7 @@ static void    prefs_changed_callback    (MetaPreference pref,

 static void    sanity_check_timestamps   (MetaDisplay *display,
                                          guint32      known_good_timestamp);
-
+ 
 MetaGroup*     get_focussed_group (MetaDisplay *display);

 static void
@@ -295,10 +290,10 @@ meta_display_class_init (MetaDisplayClass *klass)


 /**
- * Destructor for MetaPingData structs. Will destroy the
- * event source for the struct as well.
+ * ping_data_free:
 *
- * \ingroup pings
+ * Destructor for #MetaPingData structs. Will destroy the
+ * event source for the struct as well.
 */
 static void
 ping_data_free (MetaPingData *ping_data)
@@ -311,14 +306,12 @@ ping_data_free (MetaPingData *ping_data)
 }

 /**
+ * remove_pending_pings_for_window:
+ * @display: The display the window appears on
+ * @xwindow: The X ID of the window whose pings we should remove
+ *
 * Frees every pending ping structure for the given X window on the
 * given display. This means that we also destroy the timeouts.
- *
- * \param display The display the window appears on
- * \param xwindow The X ID of the window whose pings we should remove
- *
- * \ingroup pings
- *
 */
 static void
 remove_pending_pings_for_window (MetaDisplay *display, Window xwindow)
@@ -417,14 +410,14 @@ meta_display_init (MetaDisplay *disp)
 }

 /**
+ * meta_display_open:
+ *
 * Opens a new display, sets it up, initialises all the X extensions
 * we will need, and adds it to the list of displays.
 *
- * \return True if the display was opened successfully, and False
+ * Returns: %TRUE if the display was opened successfully, and %FALSE
 * otherwise-- that is, if the display doesn't exist or it already
 * has a window manager.
- *
- * \ingroup main
 */
 gboolean
 meta_display_open (void)
@@ -474,6 +467,8 @@ meta_display_open (void)
      buf[sizeof(buf)-1] = '\0';
      the_display->hostname = g_strdup (buf);
    }
+  else
+    the_display->hostname = NULL;
  the_display->error_trap_synced_at_last_pop = TRUE;
  the_display->error_traps = 0;
  the_display->error_trap_handler = NULL;
@@ -1051,6 +1046,7 @@ meta_display_close (MetaDisplay *display,
  meta_display_free_window_prop_hooks (display);
  meta_display_free_group_prop_hooks (display);
  
+  g_free (display->hostname);
  g_free (display->name);

  meta_display_shutdown_keys (display);
@@ -1168,14 +1164,16 @@ meta_display_ungrab (MetaDisplay *display)
 }

 /**
- * Returns the singleton MetaDisplay if "xdisplay" matches the X display it's
- * managing; otherwise gives a warning and returns NULL.  When we were claiming
+ * meta_display_for_x_display:
+ * @xdisplay: An X display
+ *
+ * Returns the singleton MetaDisplay if @xdisplay matches the X display it's
+ * managing; otherwise gives a warning and returns %NULL.  When we were claiming
 * to be able to manage multiple displays, this was supposed to find the
 * display out of the list which matched that display.  Now it's merely an
 * extra sanity check.
 *
- * \param xdisplay  An X display
- * \return  The singleton X display, or NULL if "xdisplay" isn't the one
+ * Returns: The singleton X display, or %NULL if @xdisplay isn't the one
 *          we're managing.
 */
 MetaDisplay*
@@ -1191,9 +1189,11 @@ meta_display_for_x_display (Display *xdisplay)
 }

 /**
+ * meta_get_display:
+ *
 * Accessor for the singleton MetaDisplay.
 *
- * \return  The only MetaDisplay there is.  This can be NULL, but only
+ * Returns: The only #MetaDisplay there is.  This can be %NULL, but only
 *          during startup.
 */
 MetaDisplay*
@@ -1601,19 +1601,18 @@ handle_net_restack_window (MetaDisplay* display,
 #endif

 /**
+ * event_callback:
+ * @event: The event that just happened
+ * @data: The #MetaDisplay that events are coming from, cast to a gpointer
+ *        so that it can be sent to a callback
+ *
 * This is the most important function in the whole program. It is the heart,
 * it is the nexus, it is the Grand Central Station of Mutter's world.
- * When we create a MetaDisplay, we ask GDK to pass *all* events for *all*
+ * When we create a #MetaDisplay, we ask GDK to pass *all* events for *all*
 * windows to this function. So every time anything happens that we might
 * want to know about, this function gets called. You see why it gets a bit
 * busy around here. Most of this function is a ginormous switch statement
 * dealing with all the kinds of events that might turn up.
- *
- * \param event The event that just happened
- * \param data  The MetaDisplay that events are coming from, cast to a gpointer
- *              so that it can be sent to a callback
- *
- * \ingroup main
 */
 static gboolean
 event_callback (XEvent   *event,
@@ -2572,9 +2571,6 @@ event_callback (XEvent   *event,
              else if (event->xclient.message_type ==
                       display->atom__MUTTER_RELOAD_THEME_MESSAGE)
                {
-                  meta_verbose ("Received reload theme request\n");
-                  meta_ui_set_current_theme (meta_prefs_get_theme (),
-                                             TRUE);
                  meta_display_retheme_all ();
                }
              else if (event->xclient.message_type ==
@@ -4197,21 +4193,23 @@ meta_display_set_cursor_theme (const char *theme,
 #endif
 }

-/**
+/*
 * Stores whether syncing is currently enabled.
 */
 static gboolean is_syncing = FALSE;

 /**
+ * meta_is_syncing:
+ *
 * Returns whether X synchronisation is currently enabled.
 *
- * \return true if we must wait for events whenever we send X requests;
- * false otherwise.
- *
- * \bug This is *only* called by meta_display_open, but by that time
+ * FIXME: This is *only* called by meta_display_open(), but by that time
 * we have already turned syncing on or off on startup, and we don't
 * have any way to do so while Mutter is running, so it's rather
 * pointless.
+ *
+ * Returns: %TRUE if we must wait for events whenever we send X requests;
+ * %FALSE otherwise.
 */
 gboolean
 meta_is_syncing (void)
@@ -4220,10 +4218,9 @@ meta_is_syncing (void)
 }

 /**
- * A handy way to turn on synchronisation on or off for every display.
+ * meta_set_syncing:
 *
- * \bug Of course there is only one display ever anyway, so this can
- * be rather hugely simplified.
+ * A handy way to turn on synchronisation on or off for every display.
 */
 void
 meta_set_syncing (gboolean setting)
@@ -4236,26 +4233,25 @@ meta_set_syncing (gboolean setting)
    }
 }

-/**
+/*
 * How long, in milliseconds, we should wait after pinging a window
 * before deciding it's not going to get back to us.
 */
 #define PING_TIMEOUT_DELAY 5000

 /**
+ * meta_display_ping_timeout:
+ * @data: All the information about this ping. It is a #MetaPingData
+ *        cast to a #gpointer in order to be passable to a timeout function.
+ *        This function will also free this parameter.
+ *
 * Does whatever it is we decided to do when a window didn't respond
 * to a ping. We also remove the ping from the display's list of
 * pending pings. This function is called by the event loop when the timeout
 * times out which we created at the start of the ping.
 *
- * \param data All the information about this ping. It is a MetaPingData
- *             cast to a void* in order to be passable to a timeout function.
- *             This function will also free this parameter.
- *
- * \return Always returns false, because this function is called as a
- *         timeout and we don't want to run the timer again.
- *
- * \ingroup pings
+ * Returns: Always returns %FALSE, because this function is called as a
+ *          timeout and we don't want to run the timer again.
 */
 static gboolean
 meta_display_ping_timeout (gpointer data)
@@ -4282,6 +4278,17 @@ meta_display_ping_timeout (gpointer data)
 }

 /**
+ * meta_display_ping_window:
+ * @display: The #MetaDisplay that the window is on
+ * @window: The #MetaWindow to send the ping to
+ * @timestamp: The timestamp of the ping. Used for uniqueness.
+ *             Cannot be CurrentTime; use a real timestamp!
+ * @ping_reply_func: The callback to call if we get a response.
+ * @ping_timeout_func: The callback to call if we don't get a response.
+ * @user_data: Arbitrary data that will be passed to the callback
+ *             function. (In practice it's often a pointer to
+ *             the window.)
+ *
 * Sends a ping request to a window. The window must respond to
 * the request within a certain amount of time. If it does, we
 * will call one callback; if the time passes and we haven't had
@@ -4291,20 +4298,9 @@ meta_display_ping_timeout (gpointer data)
 * This function returns straight away after setting things up;
 * the callbacks will be called from the event loop.
 *
- * \param display  The MetaDisplay that the window is on
- * \param window   The MetaWindow to send the ping to
- * \param timestamp The timestamp of the ping. Used for uniqueness.
- *                  Cannot be CurrentTime; use a real timestamp!
- * \param ping_reply_func The callback to call if we get a response.
- * \param ping_timeout_func The callback to call if we don't get a response.
- * \param user_data Arbitrary data that will be passed to the callback
- *                  function. (In practice it's often a pointer to
- *                  the window.)
+ * FIXME: This should probably be a method on windows, rather than displays
+ *        for one of their windows.
 *
- * \bug This should probably be a method on windows, rather than displays
- *      for one of their windows.
- *
- * \ingroup pings
 */
 void
 meta_display_ping_window (MetaDisplay       *display,
@@ -4386,10 +4382,9 @@ process_request_frame_extents (MetaDisplay    *display,
        }

      /* Return estimated frame extents for a normal window. */
-      meta_ui_theme_get_frame_borders (screen->ui,
-                                       META_FRAME_TYPE_NORMAL,
-                                       0,
-                                       &borders);
+      meta_ui_get_frame_borders (screen->ui,
+                                 xwindow,
+                                 &borders);
      data[0] = borders.visible.left;
      data[1] = borders.visible.right;
      data[2] = borders.visible.top;
@@ -4412,16 +4407,15 @@ process_request_frame_extents (MetaDisplay    *display,
 }

 /**
+ * process_pong_message:
+ * @display: the display we got the pong from
+ * @event: the #XEvent which is a pong; we can tell which
+ *         ping it corresponds to because it bears the
+ *         same timestamp.
+ *
 * Process the pong (the response message) from the ping we sent
 * to the window. This involves removing the timeout, calling the
 * reply handler function, and freeing memory.
- *
- * \param display  the display we got the pong from
- * \param event    the XEvent which is a pong; we can tell which
- *                 ping it corresponds to because it bears the
- *                 same timestamp.
- *
- * \ingroup pings
 */
 static void
 process_pong_message (MetaDisplay    *display,
@@ -4468,18 +4462,17 @@ process_pong_message (MetaDisplay    *display,
 }

 /**
+ * meta_display_window_has_pending_pings:
+ * @display: The #MetaDisplay of the window.
+ * @window: The #MetaWindow whose pings we want to know about.
+ *
 * Finds whether a window has any pings waiting on it.
 *
- * \param display The MetaDisplay of the window.
- * \param window  The MetaWindow whose pings we want to know about.
+ * FIXME: This should probably be a method on windows, rather than displays
+ *        for one of their windows.
 *
- * \return True if there is at least one ping which has been sent
- *         to the window without getting a response; false otherwise.
- *
- * \bug This should probably be a method on windows, rather than displays
- *      for one of their windows.
- *
- * \ingroup pings
+ * Returns: %TRUE if there is at least one ping which has been sent
+ *          to the window without getting a response; %FALSE otherwise.
 */
 gboolean
 meta_display_window_has_pending_pings (MetaDisplay *display,
--- a/src/core/frame.c
+++ b/src/core/frame.c
@@ -113,9 +113,18 @@ meta_window_ensure_frame (MetaWindow *window)
  attrs.event_mask = EVENT_MASK;
  XChangeWindowAttributes (window->display->xdisplay,
 			   frame->xwindow, CWEventMask, &attrs);
+  /* stick frame to the window */
+  window->frame = frame;
  
  meta_display_register_x_window (window->display, &frame->xwindow, window);

+  meta_ui_realize_frame_window (window->screen->ui, frame->xwindow);
+
+  if (window->title)
+    meta_ui_set_frame_title (window->screen->ui,
+                             window->frame->xwindow,
+                             window->title);
+
  /* Reparent the client window; it may be destroyed,
   * thus the error trap. We'll get a destroy notify later
   * and free everything. Comment in FVWM source code says
@@ -148,20 +157,6 @@ meta_window_ensure_frame (MetaWindow *window)
                   window->rect.y);
  /* FIXME handle this error */
  meta_error_trap_pop (window->display);
-  
-  /* stick frame to the window */
-  window->frame = frame;
-
-  /* Now that frame->xwindow is registered with window, we can set its
-   * style and background.
-   */
-  meta_ui_update_frame_style (window->screen->ui, frame->xwindow);
-  meta_ui_reset_frame_bg (window->screen->ui, frame->xwindow);
-  
-  if (window->title)
-    meta_ui_set_frame_title (window->screen->ui,
-                             window->frame->xwindow,
-                             window->title);

  /* Move keybindings to frame instead of window */
  meta_window_grab_keys (window);
@@ -220,11 +215,6 @@ meta_window_destroy_frame (MetaWindow *window)
                                    frame->xwindow);
  
  window->frame = NULL;
-  if (window->frame_bounds)
-    {
-      cairo_region_destroy (window->frame_bounds);
-      window->frame_bounds = NULL;
-    }

  /* Move keybindings to window instead of frame */
  meta_window_grab_keys (window);
@@ -333,16 +323,12 @@ meta_frame_calc_borders (MetaFrame        *frame,
 }

 void
-meta_frame_get_corner_radiuses (MetaFrame *frame,
-                                float     *top_left,
-                                float     *top_right,
-                                float     *bottom_left,
-                                float     *bottom_right)
+meta_frame_render_background (MetaFrame *frame,
+                              cairo_t   *cr)
 {
-  meta_ui_get_corner_radiuses (frame->window->screen->ui,
-                               frame->xwindow,
-                               top_left, top_right,
-                               bottom_left, bottom_right);
+  meta_ui_render_background (frame->window->screen->ui,
+                             frame->xwindow,
+                             cr);
 }

 gboolean
@@ -358,15 +344,6 @@ meta_frame_sync_to_window (MetaFrame *frame,
              frame->rect.x + frame->rect.width,
              frame->rect.y + frame->rect.height);

-  /* set bg to none to avoid flicker */
-  if (need_resize)
-    {
-      meta_ui_unflicker_frame_bg (frame->window->screen->ui,
-                                  frame->xwindow,
-                                  frame->rect.width,
-                                  frame->rect.height);
-    }
-
  meta_ui_move_resize_frame (frame->window->screen->ui,
 			     frame->xwindow,
 			     frame->rect.x,
@@ -376,30 +353,18 @@ meta_frame_sync_to_window (MetaFrame *frame,

  if (need_resize)
    {
-      meta_ui_reset_frame_bg (frame->window->screen->ui,
-                              frame->xwindow);
-
      /* If we're interactively resizing the frame, repaint
       * it immediately so we don't start to lag.
       */
      if (frame->window->display->grab_window ==
          frame->window)
-        meta_ui_repaint_frame (frame->window->screen->ui,
-                               frame->xwindow);
+        meta_ui_queue_frame_draw (frame->window->screen->ui,
+                                  frame->xwindow);
    }

  return need_resize;
 }

-cairo_region_t *
-meta_frame_get_frame_bounds (MetaFrame *frame)
-{
-  return meta_ui_get_frame_bounds (frame->window->screen->ui,
-                                   frame->xwindow,
-                                   frame->rect.width,
-                                   frame->rect.height);
-}
-
 void
 meta_frame_queue_draw (MetaFrame *frame)
 {
--- a/src/core/frame.h
+++ b/src/core/frame.h
@@ -63,19 +63,14 @@ Window         meta_frame_get_xwindow (MetaFrame *frame);
 void meta_frame_calc_borders      (MetaFrame        *frame,
                                   MetaFrameBorders *borders);

-void meta_frame_get_corner_radiuses (MetaFrame *frame,
-                                     float     *top_left,
-                                     float     *top_right,
-                                     float     *bottom_left,
-                                     float     *bottom_right);
+void meta_frame_render_background (MetaFrame *frame,
+                                   cairo_t   *cr);

 gboolean meta_frame_sync_to_window (MetaFrame         *frame,
                                    int                gravity,
                                    gboolean           need_move,
                                    gboolean           need_resize);

-cairo_region_t *meta_frame_get_frame_bounds (MetaFrame *frame);
-
 void meta_frame_set_screen_cursor (MetaFrame	*frame,
 				   MetaCursor	cursor);

--- a/src/core/keybindings.c
+++ b/src/core/keybindings.c
@@ -2972,17 +2972,6 @@ handle_panel (MetaDisplay    *display,
  meta_error_trap_pop (display);
 }

-static void
-handle_toggle_recording (MetaDisplay    *display,
-                         MetaScreen     *screen,
-                         MetaWindow     *window,
-                         XEvent         *event,
-                         MetaKeyBinding *binding,
-                         gpointer        dummy)
-{
-  g_signal_emit_by_name (screen, "toggle-recording");
-}
-
 static void
 handle_activate_window_menu (MetaDisplay    *display,
                      MetaScreen     *screen,
@@ -3886,13 +3875,6 @@ init_builtin_key_bindings (MetaDisplay *display)
                          META_KEYBINDING_ACTION_PANEL_RUN_DIALOG,
                          handle_panel, META_KEYBINDING_ACTION_PANEL_RUN_DIALOG);

-  add_builtin_keybinding (display,
-                          "toggle-recording",
-                          mutter_keybindings,
-                          META_KEY_BINDING_NONE,
-                          META_KEYBINDING_ACTION_TOGGLE_RECORDING,
-                          handle_toggle_recording, 0);
-
  add_builtin_keybinding (display,
                          "set-spew-mark",
                          common_keybindings,
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -23,18 +23,19 @@
 */

 /**
- * \file 
- * Program startup.
+ * SECTION:main
+ * @short_description: Program startup.
+ *
 * Functions which parse the command-line arguments, create the display,
 * kick everything off and then close down Mutter when it's time to go.
- */
-
-/**
- * \mainpage
+ *
+ *
+ *
 * Mutter - a boring window manager for the adult in you
 *
 * Many window managers are like Marshmallow Froot Loops; Mutter
- * is like Cheerios.
+ * is like Frosted Flakes: it's still plain old corn, but dusted
+ * with some sugar.
 *
 * The best way to get a handle on how the whole system fits together
 * is discussed in doc/code-overview.txt; if you're looking for functions
@@ -77,12 +78,12 @@
 #include <girepository.h>
 #endif

-/**
+/*
 * The exit code we'll return to our parent process when we eventually die.
 */
 static MetaExitCode meta_exit_code = META_EXIT_SUCCESS;

-/**
+/*
 * Handle on the main loop, so that we have an easy way of shutting Mutter
 * down.
 */
@@ -92,14 +93,15 @@ static void prefs_changed_callback (MetaPreference pref,
                                    gpointer       data);

 /**
+ * log_handler:
+ * @log_domain: the domain the error occurred in (we ignore this)
+ * @log_level: the log level so that we can filter out less
+ *             important messages
+ * @message: the message to log
+ * @user_data: arbitrary data (we ignore this)
+ *
 * Prints log messages. If Mutter was compiled with backtrace support,
 * also prints a backtrace (see meta_print_backtrace()).
- *
- * \param log_domain  the domain the error occurred in (we ignore this)
- * \param log_level   the log level so that we can filter out less
- *                    important messages
- * \param message     the message to log
- * \param user_data   arbitrary data (we ignore this)
 */
 static void
 log_handler (const gchar   *log_domain,
@@ -112,10 +114,12 @@ log_handler (const gchar   *log_domain,
 }

 /**
+ * meta_print_compilation_info:
+ *
 * Prints a list of which configure script options were used to
 * build this copy of Mutter. This is actually always called
 * on startup, but it's all no-op unless we're in verbose mode
- * (see meta_set_verbose).
+ * (see meta_set_verbose()).
 */
 static void
 meta_print_compilation_info (void)
@@ -125,21 +129,6 @@ meta_print_compilation_info (void)
 #else
  meta_verbose ("Compiled without shape extension\n");
 #endif
-#ifdef HAVE_XINERAMA
-  meta_topic (META_DEBUG_XINERAMA, "Compiled with Xinerama extension\n");
-#else
-  meta_topic (META_DEBUG_XINERAMA, "Compiled without Xinerama extension\n");
-#endif
-#ifdef HAVE_XFREE_XINERAMA
-  meta_topic (META_DEBUG_XINERAMA, " (using XFree86 Xinerama)\n");
-#else
-  meta_topic (META_DEBUG_XINERAMA, " (not using XFree86 Xinerama)\n");
-#endif
-#ifdef HAVE_SOLARIS_XINERAMA
-  meta_topic (META_DEBUG_XINERAMA, " (using Solaris Xinerama)\n");
-#else
-  meta_topic (META_DEBUG_XINERAMA, " (not using Solaris Xinerama)\n");
-#endif
 #ifdef HAVE_XSYNC
  meta_verbose ("Compiled with sync extension\n");
 #else
@@ -158,12 +147,14 @@ meta_print_compilation_info (void)
 }

 /**
+ * meta_print_self_identity:
+ *
 * Prints the version number, the current timestamp (not the
 * build date), the locale, the character encoding, and a list
 * of configure script options that were used to build this
 * copy of Mutter. This is actually always called
 * on startup, but it's all no-op unless we're in verbose mode
- * (see meta_set_verbose).
+ * (see meta_set_verbose()).
 */
 static void
 meta_print_self_identity (void)
@@ -188,7 +179,7 @@ meta_print_self_identity (void)
  meta_print_compilation_info ();
 }

-/**
+/*
 * The set of possible options that can be set on Mutter's
 * command line.
 */
@@ -327,10 +318,12 @@ meta_clutter_init (void)
 }

 /**
+ * meta_select_display:
+ *
 * Selects which display Mutter should use. It first tries to use
- * display_name as the display. If display_name is NULL then
+ * @display_name as the display. If @display_name is %NULL then
 * try to use the environment variable MUTTER_DISPLAY. If that
- * also is NULL, use the default - :0.0
+ * also is %NULL, use the default - :0.0
 */
 static void
 meta_select_display (gchar *display_name)
@@ -484,42 +477,6 @@ meta_run (void)
  if (g_getenv ("MUTTER_G_FATAL_WARNINGS") != NULL)
    g_log_set_always_fatal (G_LOG_LEVEL_MASK);
  
-  meta_ui_set_current_theme (meta_prefs_get_theme (), FALSE);
-
-  /* Try to find some theme that'll work if the theme preference
-   * doesn't exist.  First try Simple (the default theme) then just
-   * try anything in the themes directory.
-   */
-  if (!meta_ui_have_a_theme ())
-    meta_ui_set_current_theme ("Simple", FALSE);
-  
-  if (!meta_ui_have_a_theme ())
-    {
-      const char *dir_entry = NULL;
-      GError *err = NULL;
-      GDir   *themes_dir = NULL;
-      
-      if (!(themes_dir = g_dir_open (MUTTER_DATADIR"/themes", 0, &err)))
-        {
-          meta_fatal (_("Failed to scan themes directory: %s\n"), err->message);
-          g_error_free (err);
-        } 
-      else 
-        {
-          while (((dir_entry = g_dir_read_name (themes_dir)) != NULL) && 
-                 (!meta_ui_have_a_theme ()))
-            {
-              meta_ui_set_current_theme (dir_entry, FALSE);
-            }
-          
-          g_dir_close (themes_dir);
-        }
-    }
-  
-  if (!meta_ui_have_a_theme ())
-    meta_fatal (_("Could not find a theme! Be sure %s exists and contains the usual themes.\n"),
-                MUTTER_DATADIR"/themes");
-  
  /* Connect to SM as late as possible - but before managing display,
   * or we might try to manage a window before we have the session
   * info
@@ -560,13 +517,14 @@ meta_run (void)
 }

 /**
+ * meta_quit:
+ * @code: The success or failure code to return to the calling process.
+ *
 * Stops Mutter. This tells the event loop to stop processing; it is
 * rather dangerous to use this because this will leave the user with
 * no window manager. We generally do this only if, for example, the
 * session manager asks us to; we assume the session manager knows
 * what it's talking about.
- *
- * \param code The success or failure code to return to the calling process.
 */
 void
 meta_quit (MetaExitCode code)
@@ -579,13 +537,14 @@ meta_quit (MetaExitCode code)
 }

 /**
+ * prefs_changed_callback:
+ * @pref  Which preference has changed
+ * @data  Arbitrary data (which we ignore)
+ *
 * Called on pref changes. (One of several functions of its kind and purpose.)
 *
- * \bug Why are these particular prefs handled in main.c and not others?
- * Should they be?
- *
- * \param pref  Which preference has changed
- * \param data  Arbitrary data (which we ignore)
+ * FIXME: Why are these particular prefs handled in main.c and not others?
+ *        Should they be?
 */
 static void
 prefs_changed_callback (MetaPreference pref,
@@ -593,9 +552,7 @@ prefs_changed_callback (MetaPreference pref,
 {
  switch (pref)
    {
-    case META_PREF_THEME:
    case META_PREF_DRAGGABLE_BORDER_WIDTH:
-      meta_ui_set_current_theme (meta_prefs_get_theme (), FALSE);
      meta_display_retheme_all ();
      break;

--- a/src/core/prefs.c
+++ b/src/core/prefs.c
@@ -42,7 +42,6 @@
 * not given a name here, because the purpose of the unified handlers
 * is that keys should be referred to exactly once.
 */
-#define KEY_TITLEBAR_FONT "titlebar-font"
 #define KEY_NUM_WORKSPACES "num-workspaces"
 #define KEY_WORKSPACE_NAMES "workspace-names"

@@ -53,7 +52,6 @@
 #define KEY_GNOME_CURSOR_SIZE "cursor-size"

 #define KEY_OVERLAY_KEY "overlay-key"
-#define KEY_LIVE_HIDDEN_WINDOWS "live-hidden-windows"
 #define KEY_WORKSPACES_ONLY_ON_PRIMARY "workspaces-only-on-primary"
 #define KEY_NO_TAB_POPUP "no-tab-popup"

@@ -70,14 +68,11 @@ static guint changed_idle;
 static GList *listeners = NULL;
 static GHashTable *settings_schemas;

-static gboolean use_system_font = FALSE;
-static PangoFontDescription *titlebar_font = NULL;
 static MetaVirtualModifier mouse_button_mods = Mod1Mask;
 static GDesktopFocusMode focus_mode = G_DESKTOP_FOCUS_MODE_CLICK;
 static GDesktopFocusNewWindows focus_new_windows = G_DESKTOP_FOCUS_NEW_WINDOWS_SMART;
 static gboolean raise_on_click = TRUE;
 static gboolean attach_modal_dialogs = FALSE;
-static char* current_theme = NULL;
 static int num_workspaces = 4;
 static GDesktopTitlebarAction action_double_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_TOGGLE_MAXIMIZE;
 static GDesktopTitlebarAction action_middle_click_titlebar = G_DESKTOP_TITLEBAR_ACTION_LOWER;
@@ -104,7 +99,6 @@ static MetaButtonLayout button_layout;
 /* NULL-terminated array */
 static char **workspace_names = NULL;

-static gboolean live_hidden_windows = FALSE;
 static gboolean workspaces_only_on_primary = FALSE;

 static gboolean no_tab_popup = FALSE;
@@ -129,8 +123,6 @@ static void queue_changed (MetaPreference  pref);

 static void maybe_give_disable_workarounds_warning (void);

-static gboolean titlebar_handler (GVariant*, gpointer*, gpointer);
-static gboolean theme_name_handler (GVariant*, gpointer*, gpointer);
 static gboolean mouse_button_mods_handler (GVariant*, gpointer*, gpointer);
 static gboolean button_layout_handler (GVariant*, gpointer*, gpointer);

@@ -165,36 +157,30 @@ typedef struct
  gboolean *target;
 } MetaBoolPreference;

+
+/**
+ * MetaStringPreference:
+ * @handler: (allow-none): A handler. Many of the string preferences
+ * aren't stored as strings and need parsing; others of them have
+ * default values which can't be solved in the general case.  If you
+ * include a function pointer here, it will be called instead of writing
+ * the string value out to the target variable.
+ * The function will be passed to g_settings_get_mapped() and should
+ * return %TRUE if the mapping was successful and %FALSE otherwise.
+ * In the former case the function is expected to handle the result
+ * of the conversion itself and call queue_changed() appropriately;
+ * in particular the @result (out) parameter as returned by
+ * g_settings_get_mapped() will be ignored in all cases.
+ * This may be %NULL.  If it is, see "target", below.
+ * @target: (allow-none): Where to write the incoming string.
+ * This must be %NULL if the handler is non-%NULL.
+ * If the incoming string is %NULL, no change will be made.
+ */
 typedef struct
 {
  MetaBasePreference base;
-
-  /**
-   * A handler.  Many of the string preferences aren't stored as
-   * strings and need parsing; others of them have default values
-   * which can't be solved in the general case.  If you include a
-   * function pointer here, it will be called instead of writing
-   * the string value out to the target variable.
-   *
-   * The function will be passed to g_settings_get_mapped() and should
-   * return %TRUE if the mapping was successful and %FALSE otherwise.
-   * In the former case the function is expected to handle the result
-   * of the conversion itself and call queue_changed() appropriately;
-   * in particular the @result (out) parameter as returned by
-   * g_settings_get_mapped() will be ignored in all cases.
-   *
-   * This may be NULL.  If it is, see "target", below.
-   */
  GSettingsGetMapping handler;
-
-  /**
-   * Where to write the incoming string.
-   *
-   * This must be NULL if the handler is non-NULL.
-   * If the incoming string is NULL, no change will be made.
-   */
  gchar **target;
-
 } MetaStringPreference;

 typedef struct
@@ -274,13 +260,6 @@ static MetaBoolPreference preferences_bool[] =
      },
      &raise_on_click,
    },
-    {
-      { "titlebar-uses-system-font",
-        SCHEMA_GENERAL,
-        META_PREF_TITLEBAR_FONT, /* note! shares a pref */
-      },
-      &use_system_font,
-    },
    {
      { "dynamic-workspaces",
        SCHEMA_MUTTER,
@@ -351,13 +330,6 @@ static MetaBoolPreference preferences_bool[] =
      },
      &edge_tiling,
    },
-    {
-      { KEY_LIVE_HIDDEN_WINDOWS,
-        SCHEMA_MUTTER,
-        META_PREF_LIVE_HIDDEN_WINDOWS,
-      },
-      &live_hidden_windows,
-    },
    {
      { "workspaces-only-on-primary",
        SCHEMA_MUTTER,
@@ -385,22 +357,6 @@ static MetaStringPreference preferences_string[] =
      mouse_button_mods_handler,
      NULL,
    },
-    {
-      { "theme",
-        SCHEMA_GENERAL,
-        META_PREF_THEME,
-      },
-      theme_name_handler,
-      NULL,
-    },
-    {
-      { KEY_TITLEBAR_FONT,
-        SCHEMA_GENERAL,
-        META_PREF_TITLEBAR_FONT,
-      },
-      titlebar_handler,
-      NULL,
-    },
    {
      { "button-layout",
        SCHEMA_GENERAL,
@@ -931,9 +887,9 @@ do_override (char *key,


 /**
- * meta_prefs_override_preference_schema
+ * meta_prefs_override_preference_schema:
 * @key: the preference name
- * @schema: new schema for preference %key
+ * @schema: new schema for preference @key
 *
 * Specify a schema whose keys are used to override the standard Metacity
 * keys. This might be used if a plugin expected a different value for
@@ -1062,6 +1018,8 @@ bindings_changed (GSettings *settings,
 }

 /**
+ * maybe_give_disable_workaround_warning:
+ *
 * Special case: give a warning the first time disable_workarounds
 * is turned on.
 */
@@ -1112,12 +1070,6 @@ meta_prefs_get_raise_on_click (void)
  return raise_on_click || focus_mode == G_DESKTOP_FOCUS_MODE_CLICK;
 }

-const char*
-meta_prefs_get_theme (void)
-{
-  return current_theme;
-}
-
 const char*
 meta_prefs_get_cursor_theme (void)
 {
@@ -1135,70 +1087,6 @@ meta_prefs_get_cursor_size (void)
 /* Handlers for string preferences.                                         */
 /****************************************************************************/

-static gboolean
-titlebar_handler (GVariant *value,
-                  gpointer *result,
-                  gpointer data)
-{
-  PangoFontDescription *desc;
-  const gchar *string_value;
-
-  *result = NULL; /* ignored */
-  string_value = g_variant_get_string (value, NULL);
-  desc = pango_font_description_from_string (string_value);
-
-  if (desc == NULL)
-    {
-      meta_warning (_("Could not parse font description "
-                      "\"%s\" from GSettings key %s\n"),
-                    string_value ? string_value : "(null)",
-                    KEY_TITLEBAR_FONT);
-      return FALSE;
-    }
-
-  /* Is the new description the same as the old? */
-  if (titlebar_font &&
-      pango_font_description_equal (desc, titlebar_font))
-    {
-      pango_font_description_free (desc);
-    }
-  else
-    {
-      if (titlebar_font)
-        pango_font_description_free (titlebar_font);
-
-      titlebar_font = desc;
-      queue_changed (META_PREF_TITLEBAR_FONT);
-    }
-
-  return TRUE;
-}
-
-static gboolean
-theme_name_handler (GVariant *value,
-                    gpointer *result,
-                    gpointer  data)
-{
-  const gchar *string_value;
-
-  *result = NULL; /* ignored */
-  string_value = g_variant_get_string (value, NULL);
-
-  if (!string_value || !*string_value)
-    return FALSE;
-
-  if (g_strcmp0 (current_theme, string_value) != 0)
-    {
-      if (current_theme)
-        g_free (current_theme);
-
-      current_theme = g_strdup (string_value);
-      queue_changed (META_PREF_THEME);
-    }
-
-  return TRUE;
-}
-
 static gboolean
 mouse_button_mods_handler (GVariant *value,
                           gpointer *result,
@@ -1491,15 +1379,6 @@ button_layout_handler (GVariant *value,
  return TRUE;
 }

-const PangoFontDescription*
-meta_prefs_get_titlebar_font (void)
-{
-  if (use_system_font)
-    return NULL;
-  else
-    return titlebar_font;
-}
-
 int
 meta_prefs_get_num_workspaces (void)
 {
@@ -1547,12 +1426,6 @@ meta_preference_to_string (MetaPreference pref)

    case META_PREF_RAISE_ON_CLICK:
      return "RAISE_ON_CLICK";
-      
-    case META_PREF_THEME:
-      return "THEME";
-
-    case META_PREF_TITLEBAR_FONT:
-      return "TITLEBAR_FONT";

    case META_PREF_NUM_WORKSPACES:
      return "NUM_WORKSPACES";
@@ -1617,9 +1490,6 @@ meta_preference_to_string (MetaPreference pref)
    case META_PREF_FORCE_FULLSCREEN:
      return "FORCE_FULLSCREEN";

-    case META_PREF_LIVE_HIDDEN_WINDOWS:
-      return "LIVE_HIDDEN_WINDOWS";
-
    case META_PREF_WORKSPACES_ONLY_ON_PRIMARY:
      return "WORKSPACES_ONLY_ON_PRIMARY";

@@ -2004,7 +1874,8 @@ meta_prefs_remove_keybinding (const char *name)

 /**
 * meta_prefs_get_keybindings:
- * Return: (element-type MetaKeyPref) (transfer container):
+ *
+ * Returns: (element-type MetaKeyPref) (transfer container):
 */
 GList *
 meta_prefs_get_keybindings ()
@@ -2130,27 +2001,6 @@ meta_prefs_get_force_fullscreen (void)
  return force_fullscreen;
 }

-gboolean
-meta_prefs_get_live_hidden_windows (void)
-{
-#if 0
-  return live_hidden_windows;
-#else
-  return TRUE;
-#endif
-}
-
-void
-meta_prefs_set_live_hidden_windows (gboolean whether)
-{
-  MetaBasePreference *pref;
-
-  find_pref (preferences_bool, sizeof(MetaBoolPreference),
-             KEY_LIVE_HIDDEN_WINDOWS, &pref);
-  g_settings_set_boolean (SETTINGS (pref->schema), KEY_LIVE_HIDDEN_WINDOWS,
-                          whether);
-}
-
 gboolean
 meta_prefs_get_workspaces_only_on_primary (void)
 {
--- a/src/core/screen.c
+++ b/src/core/screen.c
@@ -41,12 +41,8 @@
 #include <meta/compositor.h>
 #include "mutter-enum-types.h"

-#ifdef HAVE_SOLARIS_XINERAMA
-#include <X11/extensions/xinerama.h>
-#endif
-#ifdef HAVE_XFREE_XINERAMA
 #include <X11/extensions/Xinerama.h>
-#endif
+
 #ifdef HAVE_RANDR
 #include <X11/extensions/Xrandr.h>
 #endif
@@ -83,7 +79,6 @@ enum
 enum
 {
  RESTACKED,
-  TOGGLE_RECORDING,
  WORKSPACE_ADDED,
  WORKSPACE_REMOVED,
  WORKSPACE_SWITCHED,
@@ -230,14 +225,6 @@ meta_screen_class_init (MetaScreenClass *klass)
                  NULL, NULL, NULL,
                  G_TYPE_NONE, 1, G_TYPE_POINTER);

-  screen_signals[TOGGLE_RECORDING] =
-    g_signal_new ("toggle-recording",
-                  G_TYPE_FROM_CLASS (klass),
-                  G_SIGNAL_RUN_LAST,
-                  0,
-                  NULL, NULL, NULL,
-                  G_TYPE_NONE, 0);
-
  screen_signals[WORKAREAS_CHANGED] =
    g_signal_new ("workareas-changed",
                  G_TYPE_FROM_CLASS (object_class),
@@ -487,7 +474,6 @@ reload_monitor_infos (MetaScreen *screen)
      screen->monitor_infos[1].rect.width = screen->rect.width / 2;
    }

-#ifdef HAVE_XFREE_XINERAMA
  if (screen->n_monitor_infos == 0 &&
      XineramaIsActive (display->xdisplay))
    {
@@ -557,74 +543,10 @@ reload_monitor_infos (MetaScreen *screen)
  else if (screen->n_monitor_infos > 0)
    {
      meta_topic (META_DEBUG_XINERAMA,
-                  "No XFree86 Xinerama extension or XFree86 Xinerama inactive on display %s\n",
+                  "No Xinerama extension or Xinerama inactive on display %s\n",
                  display->name);
    }
-#else
-  meta_topic (META_DEBUG_XINERAMA,
-              "Mutter compiled without XFree86 Xinerama support\n");
-#endif /* HAVE_XFREE_XINERAMA */

-#ifdef HAVE_SOLARIS_XINERAMA
-  /* This code from GDK, Copyright (C) 2002 Sun Microsystems */
-  if (screen->n_monitor_infos == 0 &&
-      XineramaGetState (screen->display->xdisplay,
-                        screen->number))
-    {
-      XRectangle monitors[MAXFRAMEBUFFERS];
-      unsigned char hints[16];
-      int result;
-      int n_monitors;
-      int i;
-
-      n_monitors = 0;
-      result = XineramaGetInfo (screen->display->xdisplay,
-                                screen->number,
-				monitors, hints,
-                                &n_monitors);
-      /* Yes I know it should be Success but the current implementation 
-       * returns the num of monitor
-       */
-      if (result > 0)
-	{
-          g_assert (n_monitors > 0);
-          
-          screen->monitor_infos = g_new0 (MetaMonitorInfo, n_monitors);
-          screen->n_monitor_infos = n_monitors;
-          
-          i = 0;
-          while (i < n_monitors)
-            {
-              screen->monitor_infos[i].number = i;
-              screen->monitor_infos[i].rect.x = monitors[i].x;
-              screen->monitor_infos[i].rect.y = monitors[i].y;
-              screen->monitor_infos[i].rect.width = monitors[i].width;
-              screen->monitor_infos[i].rect.height = monitors[i].height;
-
-              meta_topic (META_DEBUG_XINERAMA,
-                          "Monitor %d is %d,%d %d x %d\n",
-                          screen->monitor_infos[i].number,
-                          screen->monitor_infos[i].rect.x,
-                          screen->monitor_infos[i].rect.y,
-                          screen->monitor_infos[i].rect.width,
-                          screen->monitor_infos[i].rect.height);              
-              
-              ++i;
-            }
-	}
-    }
-  else if (screen->n_monitor_infos == 0)
-    {
-      meta_topic (META_DEBUG_XINERAMA,
-                  "No Solaris Xinerama extension or Solaris Xinerama inactive on display %s\n",
-                  display->name);
-    }
-#else
-  meta_topic (META_DEBUG_XINERAMA,
-              "Mutter compiled without Solaris Xinerama support\n");
-#endif /* HAVE_SOLARIS_XINERAMA */
-
-  
  /* If no Xinerama, fill in the single screen info so
   * we can use the field unconditionally
   */
@@ -3463,9 +3385,10 @@ meta_screen_get_screen_number (MetaScreen *screen)

 /**
 * meta_screen_get_display:
- * Retrieve the display associated with screen.
 * @screen: A #MetaScreen
 * 
+ * Retrieve the display associated with screen.
+ *
 * Returns: (transfer none): Display 
 */
 MetaDisplay *
--- a/src/core/stack-tracker.c
+++ b/src/core/stack-tracker.c
@@ -394,6 +394,8 @@ meta_stack_tracker_free (MetaStackTracker *tracker)
  g_queue_foreach (tracker->queued_requests, (GFunc)meta_stack_op_free, NULL);
  g_queue_free (tracker->queued_requests);
  tracker->queued_requests = NULL;
+
+  g_free (tracker);
 }

 static void
--- a/src/core/stack.c
+++ b/src/core/stack.c
@@ -1,7 +1,8 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

 /**
- * \file stack.c  Which windows cover which other windows
+ * SECTION:stack
+ * @short_description: Which windows cover which other windows
 */

 /* 
@@ -799,6 +800,8 @@ apply_constraints (Constraint **constraints,
 }

 /**
+ * stack_do_window_deletions:
+ *
 * Go through "deleted" and take the matching windows
 * out of "windows".
 */
@@ -899,6 +902,8 @@ stack_do_window_additions (MetaStack *stack)
 }

 /**
+ * stack_do_relayer:
+ *
 * Update the layers that windows are in
 */
 static void
@@ -944,6 +949,8 @@ stack_do_relayer (MetaStack *stack)
 }

 /**
+ * stack_do_constrain:
+ *
 * Update stack_position and layer to reflect transiency
 * constraints
 */
@@ -976,6 +983,8 @@ stack_do_constrain (MetaStack *stack)
 }

 /**
+ * stack_do_resort:
+ *
 * Sort stack->sorted with layers having priority over stack_position.
 */
 static void
@@ -994,6 +1003,8 @@ stack_do_resort (MetaStack *stack)
 }

 /**
+ * stack_ensure_sorted:
+ *
 * Puts the stack into canonical form.
 *
 * Honour the removed and added lists of the stack, and then recalculate
@@ -1013,6 +1024,8 @@ stack_ensure_sorted (MetaStack *stack)
 }

 /**
+ * raise_window_relative_to_managed_windows:
+ *
 * This function is used to avoid raising a window above popup
 * menus and other such things.
 *
@@ -1113,6 +1126,8 @@ raise_window_relative_to_managed_windows (MetaScreen *screen,
 }

 /**
+ * stack_sync_to_server:
+ *
 * Order the windows on the X server to be the same as in our structure.
 * We do this using XRestackWindows if we don't know the previous order,
 * or XConfigureWindow on a few particular windows if we do and can figure
--- a/src/core/stack.h
+++ b/src/core/stack.h
@@ -1,23 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/**
- * \file stack.h  Which windows cover which other windows
- *
- * There are two factors that determine window position.
- * 
- * One is window->stack_position, which is a unique integer
- * indicating how windows are ordered with respect to one
- * another. The ordering here transcends layers; it isn't changed
- * as the window is moved among layers. This allows us to move several
- * windows from one layer to another, while preserving the relative
- * order of the moved windows. Also, it allows us to restore
- * the stacking order from a saved session.
- * 
- * However when actually stacking windows on the screen, the
- * layer overrides the stack_position; windows are first sorted
- * by layer, then by stack_position within each layer.
- */
-
 /* 
 * Copyright (C) 2001 Havoc Pennington
 * Copyright (C) 2005 Elijah Newren
@@ -41,6 +23,25 @@
 #ifndef META_STACK_H
 #define META_STACK_H

+/**
+ * SECTION:stack
+ * @short_description: Which windows cover which other windows
+ *
+ * There are two factors that determine window position.
+ * 
+ * One is window->stack_position, which is a unique integer
+ * indicating how windows are ordered with respect to one
+ * another. The ordering here transcends layers; it isn't changed
+ * as the window is moved among layers. This allows us to move several
+ * windows from one layer to another, while preserving the relative
+ * order of the moved windows. Also, it allows us to restore
+ * the stacking order from a saved session.
+ * 
+ * However when actually stacking windows on the screen, the
+ * layer overrides the stack_position; windows are first sorted
+ * by layer, then by stack_position within each layer.
+ */
+
 #include "screen-private.h"

 /**
@@ -123,192 +124,214 @@ struct _MetaStack
 };

 /**
+ * meta_stack_new:
+ * @screen: The MetaScreen which will be the parent of this stack.
+ *
 * Creates and initialises a MetaStack.
 *
- * \param screen  The MetaScreen which will be the parent of this stack.
- * \return The new screen.
+ * Returns: The new screen.
 */
 MetaStack *meta_stack_new       (MetaScreen     *screen);

 /**
- * Destroys and frees a MetaStack.
+ * meta_stack_free:
+ * @stack: The stack to destroy.
 *
- * \param stack  The stack to destroy.
+ * Destroys and frees a MetaStack.
 */
 void       meta_stack_free      (MetaStack      *stack);

 /**
+ * meta_stack_add:
+ * @stack: The stack to add it to
+ * @window: The window to add
+ *
 * Adds a window to the local stack.  It is a fatal error to call this
 * function on a window which already exists on the stack of any screen.
- *
- * \param window  The window to add
- * \param stack  The stack to add it to
 */
 void       meta_stack_add       (MetaStack      *stack,
                                 MetaWindow     *window);

 /**
+ * meta_stack_remove:
+ * @stack: The stack to remove it from
+ * @window: The window to remove
+ *
 * Removes a window from the local stack.  It is a fatal error to call this
 * function on a window which exists on the stack of any screen.
- *
- * \param window  The window to remove
- * \param stack   The stack to remove it from
 */
 void       meta_stack_remove    (MetaStack      *stack,
                                 MetaWindow     *window);
 /**
+ * meta_stack_update_layer:
+ * @stack: The stack to recalculate
+ * @window: Dummy parameter
+ *
 * Recalculates the correct layer for all windows in the stack,
 * and moves them about accordingly.
 *
- * \param window  Dummy parameter
- * \param stack   The stack to recalculate
- * \bug What's with the dummy parameter?
 */
 void       meta_stack_update_layer    (MetaStack      *stack,
                                       MetaWindow     *window);

 /**
+ * meta_stack_update_transient:
+ * @stack: The stack to recalculate
+ * @window: Dummy parameter
+ *
 * Recalculates the correct stacking order for all windows in the stack
 * according to their transience, and moves them about accordingly.
 *
- * \param window  Dummy parameter
- * \param stack   The stack to recalculate
- * \bug What's with the dummy parameter?
+ * FIXME: What's with the dummy parameter?
 */
 void       meta_stack_update_transient (MetaStack     *stack,
                                        MetaWindow    *window);

 /**
- * Move a window to the top of its layer.
+ * meta_stack_raise:
+ * @stack: The stack to modify.
+ * @window: The window that's making an ascension.
+ *              (Amulet of Yendor not required.)
 *
- * \param stack  The stack to modify.
- * \param window  The window that's making an ascension.
- *                (Amulet of Yendor not required.)
+ * Move a window to the top of its layer.
 */
 void       meta_stack_raise     (MetaStack      *stack,
                                 MetaWindow     *window);
 /**
- * Move a window to the bottom of its layer.
+ * meta_stack_lower:
+ * @stack: The stack to modify.
+ * @window: The window that's on the way downwards.
 *
- * \param stack  The stack to modify.
- * \param window  The window that's on the way downwards.
+ * Move a window to the bottom of its layer.
 */
 void       meta_stack_lower     (MetaStack      *stack,
                                 MetaWindow     *window);

 /**
+ * meta_stack_freeze:
+ * @stack: The stack to freeze.
+ *
 * Prevent syncing to server until the next call of meta_stack_thaw(),
 * so that we can carry out multiple operations in one go without having
 * everything halfway reflected on the X server.
 *
 * (Calls to meta_stack_freeze() nest, so that multiple calls to
 * meta_stack_freeze will require multiple calls to meta_stack_thaw().)
- *
- * \param stack  The stack to freeze.
 */
 void       meta_stack_freeze    (MetaStack      *stack);

 /**
+ * meta_stack_thaw:
+ * @stack: The stack to thaw.
+ *
 * Undoes a meta_stack_freeze(), and processes anything which has become
 * necessary during the freeze.  It is an error to call this function if
 * the stack has not been frozen.
- *
- * \param stack  The stack to thaw.
 */
 void       meta_stack_thaw      (MetaStack      *stack);

 /**
+ * meta_stack_get_top:
+ * @stack: The stack to examine.
+ *
 * Finds the top window on the stack.
 *
- * \param stack  The stack to examine.
- * \return The top window on the stack, or NULL in the vanishingly unlikely
- *         event that you have no windows on your screen whatsoever.
+ * Returns: The top window on the stack, or %NULL in the vanishingly unlikely
+ *          event that you have no windows on your screen whatsoever.
 */
 MetaWindow* meta_stack_get_top    (MetaStack  *stack);

 /**
+ * meta_stack_get_bottom:
+ * @stack: The stack to search
+ *
 * Finds the window at the bottom of the stack.  Since that's pretty much
 * always the desktop, this isn't the most useful of functions, and nobody
 * actually calls it.  We should probably get rid of it.
- *
- * \param stack  The stack to search
 */
 MetaWindow* meta_stack_get_bottom (MetaStack  *stack);

 /**
+ * meta_stack_get_above:
+ * @stack: The stack to search.
+ * @window: The window to look above.
+ * @only_within_layer: If %TRUE, will return %NULL if @window is the
+ *                     top window in its layer.
+ *
 * Finds the window above a given window in the stack.
 * It is not an error to pass in a window which does not exist in
- * the stack; the function will merely return NULL.
+ * the stack; the function will merely return %NULL.
 *
- * \param stack   The stack to search.
- * \param window  The window to look above.
- * \param only_within_layer  If true, will return NULL if "window" is the
- *                           top window in its layer.
- * \return NULL if there is no such window;
- *         the window above "window" otherwise.
+ * Returns: %NULL if there is no such window;
+ *          the window above @window otherwise.
 */
 MetaWindow* meta_stack_get_above  (MetaStack  *stack,
                                   MetaWindow *window,
                                   gboolean    only_within_layer);

 /**
+ * meta_stack_get_below:
+ * @stack: The stack to search.
+ * @window: The window to look below.
+ * @only_within_layer: If %TRUE, will return %NULL if window is the
+ *                     bottom window in its layer.
+ *
 * Finds the window below a given window in the stack.
 * It is not an error to pass in a window which does not exist in
- * the stack; the function will merely return NULL.
+ * the stack; the function will merely return %NULL.
 *
- * \param stack   The stack to search.
- * \param window  The window to look below.
- * \param only_within_layer  If true, will return NULL if "window" is the
- *                           bottom window in its layer.
- * \return NULL if there is no such window;
- *         the window below "window" otherwise.
+ *
+ * Returns: %NULL if there is no such window;
+ *          the window below @window otherwise.
 */
 MetaWindow* meta_stack_get_below  (MetaStack  *stack,
                                   MetaWindow *window,
                                   gboolean    only_within_layer);

 /**
- * Find the topmost, focusable, mapped, window in a stack.  If you supply
- * a window as "not_this_one", we won't return that one (presumably
- * because it's going to be going away).  But if you do supply "not_this_one"
- * and we find its parent, we'll return that; and if "not_this_one" is in
+ * meta_stack_get_default_focus_window:
+ * @stack: The stack to search.
+ * @workspace: %NULL to search all workspaces; otherwise only windows
+ *             from that workspace will be returned.
+ * @not_this_one: Window to ignore because it's being unfocussed or
+ *                going away.
+ *
+ * Find the topmost, focusable, mapped, window in a stack. If you supply
+ * a window as @not_this_one, we won't return that one (presumably
+ * because it's going to be going away).  But if you do supply @not_this_one
+ * and we find its parent, we'll return that; and if @not_this_one is in
 * a group, we'll return the top window of that group.
 *
 * Also, we are prejudiced against dock windows.  Every kind of window, even
 * the desktop, will be returned in preference to a dock window.
 *
- * \param stack  The stack to search.
- * \param workspace  NULL to search all workspaces; otherwise only windows
- *                   from that workspace will be returned.
- * \param not_this_one  Window to ignore because it's being unfocussed or
- *                      going away.
- * \return The window matching all these constraints or NULL if none does.
- * 
- * \bug Never called!
+ * Returns: The window matching all these constraints or %NULL if none does.
  */
 MetaWindow* meta_stack_get_default_focus_window          (MetaStack     *stack,
                                                          MetaWorkspace *workspace,
                                                          MetaWindow    *not_this_one);

 /**
+ * meta_stack_get_default_focus_window_at_point:
+ * @stack: The stack to search.
+ * @workspace: %NULL to search all workspaces; otherwise only windows
+ *             from that workspace will be returned.
+ * @not_this_one: Window to ignore because it's being unfocussed or
+ *                going away.
+ * @root_x: The returned window must contain this point,
+ *          unless it's a dock.
+ * @root_y: See root_x.
+ *
 * Find the topmost, focusable, mapped, window in a stack.  If you supply
- * a window as "not_this_one", we won't return that one (presumably
- * because it's going to be going away).  But if you do supply "not_this_one"
- * and we find its parent, we'll return that; and if "not_this_one" is in
+ * a window as @not_this_one, we won't return that one (presumably
+ * because it's going to be going away).  But if you do supply @not_this_one
+ * and we find its parent, we'll return that; and if @not_this_one is in
 * a group, we'll return the top window of that group.
 *
 * Also, we are prejudiced against dock windows.  Every kind of window, even
 * the desktop, will be returned in preference to a dock window.
 *
- * \param stack  The stack to search.
- * \param workspace  NULL to search all workspaces; otherwise only windows
- *                   from that workspace will be returned.
- * \param not_this_one  Window to ignore because it's being unfocussed or
- *                      going away.
- * \param root_x  The returned window must contain this point,
- *                unless it's a dock.
- * \param root_y  See root_x.
- * \return The window matching all these constraints or NULL if none does.
+ * Returns: The window matching all these constraints or %NULL if none does.
 */
 MetaWindow* meta_stack_get_default_focus_window_at_point (MetaStack     *stack,
                                                          MetaWorkspace *workspace,
@@ -317,18 +340,25 @@ MetaWindow* meta_stack_get_default_focus_window_at_point (MetaStack     *stack,
                                                          int            root_y);

 /**
+ * meta_stack_list_windows:
+ * @stack: The stack to examine.
+ * @workspace: If not %NULL, only windows on this workspace will be
+ *             returned; otherwise all windows in the stack will be
+ *             returned.
+ *
 * Finds all the windows in the stack, in order.
 *
- * \param stack  The stack to examine.
- * \param workspace  If non-NULL, only windows on this workspace will be
- *                   returned; otherwise all windows in the stack will be
- *                   returned.
- * \return A list of windows, in stacking order, honouring layers.
+ * Returns: A list of windows, in stacking order, honouring layers.
 */
 GList*      meta_stack_list_windows (MetaStack *stack,
                                     MetaWorkspace *workspace);

 /**
+ * meta_stack_windows_cmp:
+ * @stack: A stack containing both window_a and window_b
+ * @window_a: A window
+ * @window_b  Another window
+ *
 * Comparison function for windows within a stack.  This is not directly
 * suitable for use within a standard comparison routine, because it takes
 * an extra parameter; you will need to wrap it.
@@ -339,9 +369,6 @@ GList*      meta_stack_list_windows (MetaStack *stack,
 *
 * (FIXME: Apparently identical to compare_window_position(). Merge them.)
 *
- * \param stack  A stack containing both window_a and window_b
- * \param window_a  A window
- * \param window_b  Another window
 * \return -1 if window_a is below window_b, honouring layers; 1 if it's
 *         above it; 0 if you passed in the same window twice!
 */
@@ -350,35 +377,40 @@ int         meta_stack_windows_cmp  (MetaStack  *stack,
                                     MetaWindow *window_b);

 /**
+ * meta_window_set_stack_position:
+ * @window: The window which is moving.
+ * @position:  Where it should move to (0 is the bottom).
+ *
 * Sets the position of a window within the stack.  This will only move it
 * up or down within its layer.  It is an error to attempt to move this
 * below position zero or above the last position in the stack (however, since
 * we don't provide a simple way to tell the number of windows in the stack,
 * this requirement may not be easy to fulfil).
- *
- * \param window  The window which is moving.
- * \param position  Where it should move to (0 is the bottom).
 */
 void meta_window_set_stack_position (MetaWindow *window,
                                     int         position);

 /**
+ * meta_stack_get_positions:
+ * @stack: The stack to examine.
+ *
 * Returns the current stack state, allowing rudimentary transactions.
 *
- * \param stack  The stack to examine.
- * \return An opaque GList representing the current stack sort order;
- *         it is the caller's responsibility to free it.
- *         Pass this to meta_stack_set_positions() later if you want to restore
- *         the state to where it was when you called this function.
+ * Returns: An opaque GList representing the current stack sort order;
+ *          it is the caller's responsibility to free it.
+ *          Pass this to meta_stack_set_positions() later if you want to restore
+ *          the state to where it was when you called this function.
 */
 GList* meta_stack_get_positions (MetaStack *stack);

 /**
+ * meta_stack_set_positions:
+ * @stack:  The stack to roll back.
+ * @windows:  The list returned from meta_stack_get_positions().
+ *
 * Rolls back a transaction, given the list returned from
 * meta_stack_get_positions().
 *
- * \param stack  The stack to roll back.
- * \param windows  The list returned from meta_stack_get_positions().
 */
 void   meta_stack_set_positions (MetaStack *stack,
                                 GList     *windows);
--- a/src/core/util.c
+++ b/src/core/util.c
@@ -926,5 +926,43 @@ meta_later_remove (guint later_id)
    }
 }

+/**
+ * meta_frame_type_to_string:
+ *
+ * Converts a frame type enum value to the name string that would
+ * appear in the theme definition file.
+ *
+ * Return value: the string value
+ */
+const char*
+meta_frame_type_to_string (MetaFrameType type)
+{
+  switch (type)
+    {
+    case META_FRAME_TYPE_NORMAL:
+      return "normal";
+    case META_FRAME_TYPE_DIALOG:
+      return "dialog";
+    case META_FRAME_TYPE_MODAL_DIALOG:
+      return "modal_dialog";
+    case META_FRAME_TYPE_UTILITY:
+      return "utility";
+    case META_FRAME_TYPE_MENU:
+      return "menu";
+    case META_FRAME_TYPE_BORDER:
+      return "border";
+    case META_FRAME_TYPE_ATTACHED:
+      return "attached";
+#if 0
+    case META_FRAME_TYPE_TOOLBAR:
+      return "toolbar";
+#endif
+    case  META_FRAME_TYPE_LAST:
+      break;
+    }
+
+  return "<unknown>";
+}
+
 /* eof util.c */

--- a/src/core/window-private.h
+++ b/src/core/window-private.h
@@ -333,9 +333,6 @@ struct _MetaWindow
  /* if TRUE, window is attached to its parent */
  guint attached : 1;

-  /* if non-NULL, the bounds of the window frame */
-  cairo_region_t *frame_bounds;
-
  /* Note: can be NULL */
  GSList *struts;

--- a/src/core/window-props.c
+++ b/src/core/window-props.c
@@ -1,7 +1,8 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

 /**
- * \file window-props.c    MetaWindow property handling
+ * SECTION:window-props
+ * @short_description: #MetaWindow property handling
 *
 * A system which can inspect sets of properties of given windows
 * and take appropriate action given their values.
@@ -389,11 +390,13 @@ reload_net_wm_user_time_window (MetaWindow    *window,
 #define MAX_TITLE_LENGTH 512

 /**
- * Called by set_window_title and set_icon_title to set the value of
- * *target to title. It required and atom is set, it will update the
+ * set_title_text:
+ *
+ * Called by set_window_title() and set_icon_title() to set the value of
+ * @target to @title. It required and @atom is set, it will update the
 * appropriate property.
 *
- * Returns TRUE if a new title was set.
+ * Returns: %TRUE if a new title was set.
 */
 static gboolean
 set_title_text (MetaWindow  *window,
@@ -1585,7 +1588,7 @@ reload_gtk_theme_variant (MetaWindow    *window,
      window->gtk_theme_variant = g_strdup (requested_variant);

      if (window->frame)
-        meta_ui_update_frame_style (window->screen->ui, window->frame->xwindow);
+        meta_ui_queue_frame_draw (window->screen->ui, window->frame->xwindow);
    }
 }

@@ -1613,7 +1616,7 @@ reload_gtk_hide_titlebar_when_maximized (MetaWindow    *window,
      meta_window_queue (window, META_QUEUE_MOVE_RESIZE);

      if (window->frame)
-        meta_ui_update_frame_style (window->screen->ui, window->frame->xwindow);
+        meta_ui_queue_frame_draw (window->screen->ui, window->frame->xwindow);
    }
 }

@@ -1643,6 +1646,9 @@ RELOAD_STRING (gtk_menubar_object_path,     "gtk-menubar-object-path")
 #undef RELOAD_STRING

 /**
+ * meta_display_init_window_prop_hooks:
+ * @display: The #MetaDisplay
+ *
 * Initialises the property hooks system.  Each row in the table named "hooks"
 * represents an action to take when a property is found on a newly-created
 * window, or when a property changes its value.
--- a/src/core/window-props.h
+++ b/src/core/window-props.h
@@ -1,7 +1,8 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

 /**
- * \file window-props.h    MetaWindow property handling
+ * SECTION:window-props
+ * @short_description: MetaWindow property handling
 *
 * A system which can inspect sets of properties of given windows
 * and take appropriate action given their values.
@@ -35,12 +36,13 @@
 #include "window-private.h"

 /**
+ * meta_window_reload_property:
+ * @window: The window.
+ * @property: A single X atom.
+ *
 * Requests the current values of a single property for a given
 * window from the server, and deals with it appropriately.
 * Does not return it to the caller (it's been dealt with!)
- *
- * \param window     The window.
- * \param property   A single X atom.
 */
 void meta_window_reload_property   (MetaWindow *window,
                                    Atom        property,
@@ -48,13 +50,14 @@ void meta_window_reload_property   (MetaWindow *window,


 /**
+ * meta_window_reload_properties:
+ * @window: The window.
+ * @properties: A pointer to a list of X atoms, "n_properties" long.
+ * @n_properties: The length of the properties list.
+ *
 * Requests the current values of a set of properties for a given
 * window from the server, and deals with them appropriately.
 * Does not return them to the caller (they've been dealt with!)
- *
- * \param window      The window.
- * \param properties  A pointer to a list of X atoms, "n_properties" long.
- * \param n_properties  The length of the properties list.
 */
 void meta_window_reload_properties (MetaWindow *window,
                                    const Atom *properties,
@@ -62,14 +65,15 @@ void meta_window_reload_properties (MetaWindow *window,
                                    gboolean    initial);

 /**
+ * meta_window_reload_property_from_xwindow:
+ * @window:     A window on the same display as the one we're
+ *                   investigating (only used to find the display)
+ * @xwindow:    The X handle for the window.
+ * @property:   A single X atom.
+ *
 * Requests the current values of a single property for a given
 * window from the server, and deals with it appropriately.
 * Does not return it to the caller (it's been dealt with!)
- *
- * \param window     A window on the same display as the one we're
- *                   investigating (only used to find the display)
- * \param xwindow    The X handle for the window.
- * \param property   A single X atom.
 */
 void meta_window_reload_property_from_xwindow
                                   (MetaWindow *window,
@@ -78,15 +82,16 @@ void meta_window_reload_property_from_xwindow
                                    gboolean    initial);

 /**
+ * meta_window_reload_properties_from_xwindow:
+ * @window:     A window on the same display as the one we're
+ *                   investigating (only used to find the display)
+ * @xwindow:     The X handle for the window.
+ * @properties:  A pointer to a list of X atoms, "n_properties" long.
+ * @n_properties:  The length of the properties list.
+ *
 * Requests the current values of a set of properties for a given
 * window from the server, and deals with them appropriately.
 * Does not return them to the caller (they've been dealt with!)
- *
- * \param window     A window on the same display as the one we're
- *                   investigating (only used to find the display)
- * \param xwindow     The X handle for the window.
- * \param properties  A pointer to a list of X atoms, "n_properties" long.
- * \param n_properties  The length of the properties list.
 */
 void meta_window_reload_properties_from_xwindow
                                   (MetaWindow *window,
@@ -96,41 +101,44 @@ void meta_window_reload_properties_from_xwindow
                                    gboolean    initial);

 /**
+ * meta_window_load_initial_properties:
+ * @window:      The window.
+ *
 * Requests the current values for standard properties for a given
 * window from the server, and deals with them appropriately.
 * Does not return them to the caller (they've been dealt with!)
- *
- * \param window      The window.
 */
 void meta_window_load_initial_properties (MetaWindow *window);

 /**
+ * meta_display_init_window_prop_hooks:
+ * @display:  The display.
+ *
 * Initialises the hooks used for the reload_propert* functions
 * on a particular display, and stores a pointer to them in the
 * display.
- *
- * \param display  The display.
 */
 void meta_display_init_window_prop_hooks (MetaDisplay *display);

 /**
+ * meta_display_free_window_prop_hooks:
+ * @display:  The display.
 * Frees the hooks used for the reload_propert* functions
 * for a particular display.
- *
- * \param display  The display.
 */
 void meta_display_free_window_prop_hooks (MetaDisplay *display);

 /**
+ * meta_set_normal_hints:
+ * @window:   The window to set the size hints on.
+ * @hints:    Either some X size hints, or NULL for default.
+ *
 * Sets the size hints for a window.  This happens when a
 * WM_NORMAL_HINTS property is set on a window, but it is public
 * because the size hints are set to defaults when a window is
 * created.  See
 * http://tronche.com/gui/x/icccm/sec-4.html#WM_NORMAL_HINTS
 * for the X details.
- *
- * \param window   The window to set the size hints on.
- * \param hints    Either some X size hints, or NULL for default.
 */
 void meta_set_normal_hints (MetaWindow *window,
 			    XSizeHints *hints);
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -217,9 +217,6 @@ meta_window_finalize (GObject *object)
  if (window->mini_icon)
    g_object_unref (G_OBJECT (window->mini_icon));

-  if (window->frame_bounds)
-    cairo_region_destroy (window->frame_bounds);
-
  meta_icon_cache_free (&window->icon_cache);

  g_free (window->sm_client_id);
@@ -2225,7 +2222,7 @@ implement_showing (MetaWindow *window,
       * so we should place the window even if we're hiding it rather
       * than showing it.
       */
-      if (!window->placed && meta_prefs_get_live_hidden_windows ())
+      if (!window->placed)
        meta_window_force_placement (window);

      meta_window_hide (window);
@@ -2827,20 +2824,6 @@ map_frame (MetaWindow *window)
    return FALSE;
 }

-static gboolean
-unmap_frame (MetaWindow *window)
-{
-  if (window->frame && window->frame->mapped)
-    {
-      meta_topic (META_DEBUG_WINDOW_STATE, "Frame actually needs unmap\n");
-      window->frame->mapped = FALSE;
-      meta_ui_unmap_frame (window->screen->ui, window->frame->xwindow);
-      return TRUE;
-    }
-  else
-    return FALSE;
-}
-
 static gboolean
 map_client_window (MetaWindow *window)
 {
@@ -3108,15 +3091,12 @@ meta_window_show (MetaWindow *window)
      if (map_client_window (window))
        did_show = TRUE;

-      if (meta_prefs_get_live_hidden_windows ())
+      if (window->hidden)
        {
-          if (window->hidden)
-            {
-              meta_stack_freeze (window->screen->stack);
-              window->hidden = FALSE;
-              meta_stack_thaw (window->screen->stack);
-              did_show = TRUE;
-            }
+          meta_stack_freeze (window->screen->stack);
+          window->hidden = FALSE;
+          meta_stack_thaw (window->screen->stack);
+          did_show = TRUE;
        }

      if (window->iconic)
@@ -3251,32 +3231,19 @@ meta_window_hide (MetaWindow *window)

  did_hide = FALSE;

-  if (meta_prefs_get_live_hidden_windows ())
-    {
-      /* If this is the first time that we've calculating the showing
-       * state of the window, the frame and client window might not
-       * yet be mapped, so we need to map them now */
-      map_frame (window);
-      map_client_window (window);
+  /* If this is the first time that we've calculating the showing
+   * state of the window, the frame and client window might not
+   * yet be mapped, so we need to map them now */
+  map_frame (window);
+  map_client_window (window);

-      if (!window->hidden)
-        {
-          meta_stack_freeze (window->screen->stack);
-          window->hidden = TRUE;
-          meta_stack_thaw (window->screen->stack);
-
-          did_hide = TRUE;
-        }
-    }
-  else
+  if (!window->hidden)
    {
-      /* Unmapping the frame is enough to make the window disappear,
-       * but we need to hide the window itself so the client knows
-       * it has been hidden */
-      if (unmap_frame (window))
-        did_hide = TRUE;
-      if (unmap_client_window (window, " (hiding)"))
-        did_hide = TRUE;
+      meta_stack_freeze (window->screen->stack);
+      window->hidden = TRUE;
+      meta_stack_thaw (window->screen->stack);
+
+      did_hide = TRUE;
    }

  if (!window->iconic)
@@ -3452,10 +3419,11 @@ meta_window_save_rect (MetaWindow *window)
 }

 /**
+ * force_save_user_window_placement:
+ * @window: Store current position of this window for future reference
+ *
 * Save the user_rect regardless of whether the window is maximized or
 * fullscreen. See save_user_window_placement() for most uses.
- *
- * \param window  Store current position of this window for future reference
 */
 static void
 force_save_user_window_placement (MetaWindow *window)
@@ -3464,11 +3432,12 @@ force_save_user_window_placement (MetaWindow *window)
 }

 /**
+ * save_user_window_placement:
+ * @window: Store current position of this window for future reference
+ *
 * Save the user_rect, but only if the window is neither maximized nor
 * fullscreen, otherwise the window may snap back to those dimensions
 * (bug #461927).
- *
- * \param window  Store current position of this window for future reference
 */
 static void
 save_user_window_placement (MetaWindow *window)
@@ -4607,11 +4576,8 @@ meta_window_move_resize_internal (MetaWindow          *window,
  gboolean need_move_frame = FALSE;
  gboolean need_resize_client = FALSE;
  gboolean need_resize_frame = FALSE;
-  int frame_size_dx;
-  int frame_size_dy;
  int size_dx;
  int size_dy;
-  gboolean frame_shape_changed = FALSE;
  gboolean is_configure_request;
  gboolean do_gravity_adjust;
  gboolean is_user_action;
@@ -4709,6 +4675,7 @@ meta_window_move_resize_internal (MetaWindow          *window,

  if (window->frame)
    {
+      int frame_size_dx, frame_size_dy;
      int new_w, new_h;

      new_w = window->rect.width + borders.total.left + borders.total.right;
@@ -4731,11 +4698,6 @@ meta_window_move_resize_internal (MetaWindow          *window,
                  window->frame->rect.width,
                  window->frame->rect.height);
    }
-  else
-    {
-      frame_size_dx = 0;
-      frame_size_dy = 0;
-    }

  /* For nice effect, when growing the window we want to move/resize
   * the frame first, when shrinking the window we want to move/resize
@@ -4914,9 +4876,9 @@ meta_window_move_resize_internal (MetaWindow          *window,
    meta_window_set_gravity (window, StaticGravity);

  if (configure_frame_first && window->frame)
-    frame_shape_changed = meta_frame_sync_to_window (window->frame,
-                                                     gravity,
-                                                     need_move_frame, need_resize_frame);
+    meta_frame_sync_to_window (window->frame,
+                               gravity,
+                               need_move_frame, need_resize_frame);

  values.border_width = 0;
  values.x = client_move_x;
@@ -4971,9 +4933,9 @@ meta_window_move_resize_internal (MetaWindow          *window,
    }

  if (!configure_frame_first && window->frame)
-    frame_shape_changed = meta_frame_sync_to_window (window->frame,
-                                                     gravity,
-                                                     need_move_frame, need_resize_frame);
+    meta_frame_sync_to_window (window->frame,
+                               gravity,
+                               need_move_frame, need_resize_frame);

  /* Put gravity back to be nice to lesser window managers */
  if (use_static_gravity)
@@ -5016,12 +4978,6 @@ meta_window_move_resize_internal (MetaWindow          *window,
   *   b) all constraints are obeyed by window->rect and frame->rect
   */

-  if (frame_shape_changed && window->frame_bounds)
-    {
-      cairo_region_destroy (window->frame_bounds);
-      window->frame_bounds = NULL;
-    }
-
  meta_window_foreach_transient (window, maybe_move_attached_dialog, NULL);

  meta_stack_update_window_tile_matches (window->screen->stack,
@@ -5108,18 +5064,20 @@ meta_window_move_frame (MetaWindow  *window,
 {
  int x = root_x_nw;
  int y = root_y_nw;
-  MetaFrameBorders borders;

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

+      /* root_x_nw and root_y_nw correspond to where the top of
+       * the visible frame should be. Offset by the distance between
+       * the origin of the window and the origin of the enclosing
+       * window decorations.
+       */
+      x += window->frame->child_x - borders.invisible.left;
+      y += window->frame->child_y - borders.invisible.top;
+    }
  meta_window_move (window, user_op, x, y);
 }

@@ -5825,7 +5783,7 @@ update_net_frame_extents (MetaWindow *window)

  meta_topic (META_DEBUG_GEOMETRY,
              "Setting _NET_FRAME_EXTENTS on managed window 0x%lx "
-              "to left = %lu, right = %lu, top = %lu, bottom = %lu\n",
+ "to left = %lu, right = %lu, top = %lu, bottom = %lu\n",
              window->xwindow, data[0], data[1], data[2], data[3]);

  meta_error_trap_push (window->display);
@@ -8241,10 +8199,6 @@ menu_callback (MetaWindowMenu *menu,
 	{
 	  meta_window_change_workspace (window,
 					workspace);
-#if 0
-	  meta_workspace_activate (workspace);
-	  meta_window_raise (window);
-#endif
 	}
    }
  else
@@ -8334,13 +8288,6 @@ meta_window_show_menu (MetaWindow *window,
  else
    ops |= META_MENU_OP_MAXIMIZE;

-#if 0
-  if (window->shaded)
-    ops |= META_MENU_OP_UNSHADE;
-  else
-    ops |= META_MENU_OP_SHADE;
-#endif
-
  if (window->wm_state_above)
    ops |= META_MENU_OP_UNABOVE;
  else
@@ -8380,6 +8327,8 @@ meta_window_show_menu (MetaWindow *window,

  menu =
    meta_ui_window_menu_new (window->screen->ui,
+                             window->display->xdisplay,
+                             window->screen->number,
                             window->xwindow,
                             ops,
                             insensitive,
@@ -10692,27 +10641,6 @@ meta_window_get_frame_type (MetaWindow *window)
    }
 }

-/**
- * meta_window_get_frame_bounds:
- *
- * Gets a region representing the outer bounds of the window's frame.
- *
- * Return value: (transfer none) (allow-none): a #cairo_region_t
- *  holding the outer bounds of the window, or %NULL if the window
- *  doesn't have a frame.
- */
-cairo_region_t *
-meta_window_get_frame_bounds (MetaWindow *window)
-{
-  if (!window->frame_bounds)
-    {
-      if (window->frame)
-        window->frame_bounds = meta_frame_get_frame_bounds (window->frame);
-    }
-
-  return window->frame_bounds;
-}
-
 /**
 * meta_window_is_attached_dialog:
 * @window: a #MetaWindow
--- a/src/core/workspace.c
+++ b/src/core/workspace.c
@@ -192,7 +192,7 @@ meta_workspace_new (MetaScreen *screen)
  return workspace;
 }

-/** Foreach function for workspace_free_struts() */
+/* Foreach function for workspace_free_struts() */
 static void
 free_this (gpointer candidate, gpointer dummy)
 {
@@ -200,9 +200,10 @@ free_this (gpointer candidate, gpointer dummy)
 }

 /**
- * Frees the combined struts list of a workspace.
+ * workspace_free_all_struts:
+ * @workspace: The workspace.
 *
- * \param workspace  The workspace.
+ * Frees the combined struts list of a workspace.
 */
 static void
 workspace_free_all_struts (MetaWorkspace *workspace)
@@ -216,9 +217,10 @@ workspace_free_all_struts (MetaWorkspace *workspace)
 }

 /**
- * Frees the struts list set with meta_workspace_set_builtin_struts
+ * workspace_free_builtin_struts:
+ * @workspace: The workspace.
 *
- * \param workspace  The workspace.
+ * Frees the struts list set with meta_workspace_set_builtin_struts
 */
 static void
 workspace_free_builtin_struts (MetaWorkspace *workspace)
@@ -997,18 +999,6 @@ ensure_work_areas_validated (MetaWorkspace *workspace)

  /* We're all done, YAAY!  Record that everything has been validated. */
  workspace->work_areas_invalid = FALSE;
-
-  {
-    /*
-     * Notify the compositor that the workspace geometry has changed.
-     */
-    MetaScreen     *screen = workspace->screen;
-    MetaDisplay    *display = meta_screen_get_display (screen);
-    MetaCompositor *comp = meta_display_get_compositor (display);
-
-    if (comp)
-      meta_compositor_update_workspace_geometry (comp, workspace);
-  }
 }

 static gboolean
--- a/src/meta/common.h
+++ b/src/meta/common.h
@@ -364,6 +364,7 @@ void meta_frame_borders_clear (MetaFrameBorders *self);
  (ycoord) <  ((rect).y + (rect).height))

 /**
+ * MetaStackLayer:
 * Layers a window can be in.
 * These MUST be in the order of stacking.
 */
--- a/src/meta/compositor.h
+++ b/src/meta/compositor.h
@@ -153,8 +153,6 @@ void meta_compositor_set_updates          (MetaCompositor *compositor,
                                           MetaWindow     *window,
                                           gboolean        updates);

-void meta_compositor_update_workspace_geometry (MetaCompositor *compositor,
-                                                MetaWorkspace  *workspace);
 void meta_compositor_sync_stack                (MetaCompositor *compositor,
                                                MetaScreen     *screen,
                                                GList          *stack);
--- a/src/meta/display.h
+++ b/src/meta/display.h
@@ -175,4 +175,6 @@ void meta_display_unmanage_screen (MetaDisplay *display,
                                   MetaScreen  *screen,
                                   guint32      timestamp);

+void meta_display_retheme_all (void);
+
 #endif
--- a/src/meta/gradient.h
+++ b/src/meta/gradient.h
@@ -1,65 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Mutter gradient rendering */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington, 99% copied from wrlib in
- * WindowMaker, Copyright (C) 1997-2000 Dan Pascu and Alfredo Kojima
- * 
- * 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_GRADIENT_H
-#define META_GRADIENT_H
-
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdk.h>
-
-typedef enum
-{
-  META_GRADIENT_VERTICAL,
-  META_GRADIENT_HORIZONTAL,
-  META_GRADIENT_DIAGONAL,
-  META_GRADIENT_LAST
-} MetaGradientType;
-
-GdkPixbuf* meta_gradient_create_simple     (int               width,
-                                            int               height,
-                                            const GdkRGBA    *from,
-                                            const GdkRGBA    *to,
-                                            MetaGradientType  style);
-GdkPixbuf* meta_gradient_create_multi      (int               width,
-                                            int               height,
-                                            const GdkRGBA    *colors,
-                                            int               n_colors,
-                                            MetaGradientType  style);
-GdkPixbuf* meta_gradient_create_interwoven (int               width,
-                                            int               height,
-                                            const GdkRGBA     colors1[2],
-                                            int               thickness1,
-                                            const GdkRGBA     colors2[2],
-                                            int               thickness2);
-
-
-/* Generate an alpha gradient and multiply it with the existing alpha
- * channel of the given pixbuf
- */
-void meta_gradient_add_alpha (GdkPixbuf       *pixbuf,
-                              const guchar    *alphas,
-                              int              n_alphas,
-                              MetaGradientType type);
-
-
-#endif
--- a/src/meta/meta-shaped-texture.h
+++ b/src/meta/meta-shaped-texture.h
@@ -72,12 +72,8 @@ void meta_shaped_texture_set_pixmap (MetaShapedTexture *stex,

 CoglHandle meta_shaped_texture_get_texture (MetaShapedTexture *stex);

-void meta_shaped_texture_set_shape_region (MetaShapedTexture *stex,
-                                           cairo_region_t    *region);
-
-void meta_shaped_texture_set_overlay_path (MetaShapedTexture *stex,
-                                           cairo_region_t    *overlay_region,
-                                           cairo_path_t      *overlay_path);
+void meta_shaped_texture_set_mask_texture (MetaShapedTexture *stex,
+                                           CoglHandle         mask_texture);

 /* Assumes ownership of clip_region */
 void meta_shaped_texture_set_clip_region (MetaShapedTexture *stex,
--- a/src/meta/prefs.h
+++ b/src/meta/prefs.h
@@ -45,8 +45,6 @@ typedef enum
  META_PREF_ACTION_RIGHT_CLICK_TITLEBAR,
  META_PREF_AUTO_RAISE,
  META_PREF_AUTO_RAISE_DELAY,
-  META_PREF_THEME,
-  META_PREF_TITLEBAR_FONT,
  META_PREF_NUM_WORKSPACES,
  META_PREF_DYNAMIC_WORKSPACES,
  META_PREF_APPLICATION_BASED,
@@ -64,7 +62,6 @@ typedef enum
  META_PREF_RESIZE_WITH_RIGHT_BUTTON,
  META_PREF_EDGE_TILING,
  META_PREF_FORCE_FULLSCREEN,
-  META_PREF_LIVE_HIDDEN_WINDOWS,
  META_PREF_WORKSPACES_ONLY_ON_PRIMARY,
  META_PREF_NO_TAB_POPUP,
  META_PREF_DRAGGABLE_BORDER_WIDTH
@@ -92,7 +89,6 @@ GDesktopFocusMode           meta_prefs_get_focus_mode         (void);
 GDesktopFocusNewWindows     meta_prefs_get_focus_new_windows  (void);
 gboolean                    meta_prefs_get_attach_modal_dialogs (void);
 gboolean                    meta_prefs_get_raise_on_click     (void);
-const char*                 meta_prefs_get_theme              (void);
 /* returns NULL if GTK default should be used */
 const PangoFontDescription* meta_prefs_get_titlebar_font      (void);
 int                         meta_prefs_get_num_workspaces     (void);
@@ -129,18 +125,8 @@ int         meta_prefs_get_cursor_size       (void);
 gboolean    meta_prefs_get_compositing_manager (void);
 gboolean    meta_prefs_get_force_fullscreen  (void);

-/**
- * Sets whether the compositor is turned on.
- *
- * \param whether   TRUE to turn on, FALSE to turn off
- */
-void meta_prefs_set_compositing_manager (gboolean whether);
-
 void meta_prefs_set_force_fullscreen (gboolean whether);

-gboolean meta_prefs_get_live_hidden_windows (void);
-void     meta_prefs_set_live_hidden_windows (gboolean whether);
-
 gboolean meta_prefs_get_workspaces_only_on_primary (void);

 gboolean meta_prefs_get_no_tab_popup (void);
@@ -276,7 +262,7 @@ typedef struct

  MetaKeyBindingAction action;

-  /**
+  /*
   * A list of MetaKeyCombos. Each of them is bound to
   * this keypref. If one has keysym==modifiers==0, it is
   * ignored.
--- a/src/meta/preview-widget.h
+++ b/src/meta/preview-widget.h
@@ -1,88 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity theme preview widget */
-
-/* 
- * Copyright (C) 2002 Havoc Pennington
- * 
- * 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/common.h>
-#include <meta/theme.h>
-#include <gtk/gtk.h>
-
-#ifndef META_PREVIEW_WIDGET_H
-#define META_PREVIEW_WIDGET_H
-
-#define META_TYPE_PREVIEW			 (meta_preview_get_type ())
-#define META_PREVIEW(obj)			 (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_PREVIEW, MetaPreview))
-#define META_PREVIEW_CLASS(klass)		 (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_PREVIEW, MetaPreviewClass))
-#define META_IS_PREVIEW(obj)		 (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_PREVIEW))
-#define META_IS_PREVIEW_CLASS(klass)	 (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_PREVIEW))
-#define META_PREVIEW_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_PREVIEW, MetaPreviewClass))
-
-typedef struct _MetaPreview	MetaPreview;
-typedef struct _MetaPreviewClass	MetaPreviewClass;
-
-struct _MetaPreview
-{
-  GtkBin bin;
-
-  MetaTheme *theme;
-  char *title;
-  MetaFrameType type;
-  MetaFrameFlags flags;  
-
-  PangoLayout *layout;
-  int text_height;
-
-  MetaFrameBorders borders;
-  guint            borders_cached : 1;
-
-  MetaButtonLayout button_layout;
-};
-
-struct _MetaPreviewClass
-{
-  GtkBinClass parent_class;
-};
-
-
-GType    meta_preview_get_type (void) G_GNUC_CONST;
-GtkWidget* meta_preview_new	 (void);
-
-void meta_preview_set_theme         (MetaPreview            *preview,
-                                     MetaTheme              *theme);
-void meta_preview_set_title         (MetaPreview            *preview,
-                                     const char             *title);
-void meta_preview_set_frame_type    (MetaPreview            *preview,
-                                     MetaFrameType           type);
-void meta_preview_set_frame_flags   (MetaPreview            *preview,
-                                     MetaFrameFlags          flags);
-void meta_preview_set_button_layout (MetaPreview            *preview,
-                                     const MetaButtonLayout *button_layout);
-
-cairo_region_t * meta_preview_get_clip_region (MetaPreview *preview,
-                                               gint         new_window_width,
-                                               gint         new_window_height);
-
-GdkPixbuf* meta_preview_get_icon (void);
-GdkPixbuf* meta_preview_get_mini_icon (void);
-
-#endif
--- a/src/meta/theme.h
+++ b/src/meta/theme.h
@@ -1,47 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity Theme Rendering */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington
- * 
- * 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_THEME_H
-#define META_THEME_H
-
-#include <glib.h>
-
-/**
- * MetaTheme:
- *
- */
-typedef struct _MetaTheme MetaTheme;
-
-MetaTheme* meta_theme_get_current (void);
-void       meta_theme_set_current (const char *name,
-                                   gboolean    force_reload);
-
-MetaTheme* meta_theme_new      (void);
-void       meta_theme_free     (MetaTheme *theme);
-gboolean   meta_theme_validate (MetaTheme *theme,
-                                GError   **error);
-
-MetaTheme* meta_theme_load (const char *theme_name,
-                            GError    **err);
-
-#endif
--- a/src/meta/window.h
+++ b/src/meta/window.h
@@ -167,8 +167,6 @@ const char *meta_window_get_mutter_hints (MetaWindow *window);

 MetaFrameType meta_window_get_frame_type (MetaWindow *window);

-cairo_region_t *meta_window_get_frame_bounds (MetaWindow *window);
-
 MetaWindow *meta_window_get_tile_match (MetaWindow *window);

 #endif
--- a/src/meta/workspace.h
+++ b/src/meta/workspace.h
@@ -1,15 +1,5 @@
 /* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */

-/**
- * \file workspace.h    Workspaces
- *
- * A workspace is a set of windows which all live on the same
- * screen.  (You may also see the name "desktop" around the place,
- * which is the EWMH's name for the same thing.)  Only one workspace
- * of a screen may be active at once; all windows on all other workspaces
- * are unmapped.
- */
-
 /*
 * Copyright (C) 2001 Havoc Pennington
 * Copyright (C) 2004, 2005 Elijah Newren
@@ -33,6 +23,17 @@
 #ifndef META_WORKSPACE_H
 #define META_WORKSPACE_H

+/**
+ * SECTION:Workspaces
+ * @short_description:Workspaces
+ *
+ * A workspace is a set of windows which all live on the same
+ * screen.  (You may also see the name "desktop" around the place,
+ * which is the EWMH's name for the same thing.)  Only one workspace
+ * of a screen may be active at once; all windows on all other workspaces
+ * are unmapped.
+ */
+
 #include <meta/types.h>
 #include <meta/boxes.h>
 #include <meta/screen.h>
--- a/src/mutter-schemas.convert
+++ b/src/mutter-schemas.convert
@@ -1,6 +1,5 @@
 [org.gnome.mutter]
 overlay-key = /apps/mutter/general/overlay_key
 attach-modal-dialogs = /apps/mutter/general/attach_modal_dialogs
-live-hidden-windows = /apps/mutter/general/live_hidden_windows
 workspaces-only-on-primary = /apps/mutter/general/workspaces_only_on_primary
 draggable-border-width = /apps/mutter/general/draggable_border_width
--- a/src/org.gnome.mutter.gschema.xml.in
+++ b/src/org.gnome.mutter.gschema.xml.in
@@ -25,16 +25,6 @@
      </_description>
    </key>

-    <key name="live-hidden-windows" type="b">
-      <default>false</default>
-      <_summary>Live Hidden Windows</_summary>
-      <_description>
-        Determines whether hidden windows (i.e., minimized windows and
-        windows on other workspaces than the current one) should be kept
-        alive.
-      </_description>
-    </key>
-
    <key name="edge-tiling" type="b">
      <default>false</default>
      <_summary>Enable edge tiling when dropping windows on screen edges</_summary>
@@ -89,10 +79,6 @@
  </schema>
  <schema id="org.gnome.mutter.keybindings" path="/org/gnome/mutter/keybindings/">

-    <key name="toggle-recording" type="as">
-      <default><![CDATA[['<Control><Shift><Alt>r']]]></default>
-    </key>
-
    <key name="toggle-tiled-left" type="as">
      <default><![CDATA[['<Super>Left']]]></default>
    </key>
--- a/src/ui/draw-workspace.c
+++ b/src/ui/draw-workspace.c
@@ -26,7 +26,6 @@
 */

 #include "draw-workspace.h"
-#include "theme-private.h"


 static void
@@ -75,11 +74,8 @@ draw_window (GtkWidget                   *widget,
 {
  GdkPixbuf *icon;
  int icon_x, icon_y, icon_w, icon_h;
-  gboolean is_active;
  GdkRGBA color;
  GtkStyleContext *style;
-
-  is_active = win->is_active;
  
  cairo_save (cr);

@@ -87,10 +83,7 @@ draw_window (GtkWidget                   *widget,
  cairo_clip (cr);

  style = gtk_widget_get_style_context (widget);
-  if (is_active)
-    meta_gtk_style_get_light_color (style, state, &color);
-  else
-    gtk_style_context_get_background_color (style, state, &color);
+  gtk_style_context_get_background_color (style, state, &color);
  gdk_cairo_set_source_rgba (cr, &color);

  cairo_rectangle (cr,
@@ -197,7 +190,7 @@ wnck_draw_workspace (GtkWidget                   *widget,
    {
      GdkRGBA color;

-      meta_gtk_style_get_dark_color (style,state, &color);
+      gtk_style_context_get_background_color (style, state, &color);
      gdk_cairo_set_source_rgba (cr, &color);
      cairo_rectangle (cr, x, y, width, height);
      cairo_fill (cr);
--- a/src/ui/frames.c
+++ b/src/ui/frames.c
--- a/src/ui/frames.h
+++ b/src/ui/frames.h
@@ -1,175 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity window frame manager widget */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington
- * 
- * 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_FRAMES_H
-#define META_FRAMES_H
-
-#include <gtk/gtk.h>
-#include <gdk/gdkx.h>
-#include <meta/common.h>
-#include "theme-private.h"
-
-typedef enum
-{
-  META_FRAME_CONTROL_NONE,
-  META_FRAME_CONTROL_TITLE,
-  META_FRAME_CONTROL_DELETE,
-  META_FRAME_CONTROL_MENU,
-  META_FRAME_CONTROL_MINIMIZE,
-  META_FRAME_CONTROL_MAXIMIZE,
-  META_FRAME_CONTROL_UNMAXIMIZE,
-  META_FRAME_CONTROL_SHADE,
-  META_FRAME_CONTROL_UNSHADE,
-  META_FRAME_CONTROL_ABOVE,
-  META_FRAME_CONTROL_UNABOVE,
-  META_FRAME_CONTROL_STICK,
-  META_FRAME_CONTROL_UNSTICK,
-  META_FRAME_CONTROL_RESIZE_SE,
-  META_FRAME_CONTROL_RESIZE_S,
-  META_FRAME_CONTROL_RESIZE_SW,
-  META_FRAME_CONTROL_RESIZE_N,
-  META_FRAME_CONTROL_RESIZE_NE,
-  META_FRAME_CONTROL_RESIZE_NW,
-  META_FRAME_CONTROL_RESIZE_W,
-  META_FRAME_CONTROL_RESIZE_E,
-  META_FRAME_CONTROL_CLIENT_AREA
-} MetaFrameControl;
-
-/* This is one widget that manages all the window frames
- * as subwindows.
- */
-
-#define META_TYPE_FRAMES            (meta_frames_get_type ())
-#define META_FRAMES(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_FRAMES, MetaFrames))
-#define META_FRAMES_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_FRAMES, MetaFramesClass))
-#define META_IS_FRAMES(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_FRAMES))
-#define META_IS_FRAMES_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_FRAMES))
-#define META_FRAMES_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_FRAMES, MetaFramesClass))
-
-typedef struct _MetaFrames        MetaFrames;
-typedef struct _MetaFramesClass   MetaFramesClass;
-
-typedef struct _MetaUIFrame         MetaUIFrame;
-
-struct _MetaUIFrame
-{
-  Window xwindow;
-  GdkWindow *window;
-  GtkStyleContext *style;
-  MetaFrameStyle *cache_style;
-  PangoLayout *layout;
-  int text_height;
-  char *title; /* NULL once we have a layout */
-  guint expose_delayed : 1;
-  guint shape_applied : 1;
-  
-  /* FIXME get rid of this, it can just be in the MetaFrames struct */
-  MetaFrameControl prelit_control;
-};
-
-struct _MetaFrames
-{
-  GtkWindow parent_instance;
-  
-  GHashTable *text_heights;
-
-  GHashTable *frames;
-
-  guint tooltip_timeout;
-  MetaUIFrame *last_motion_frame;
-
-  GtkStyleContext *normal_style;
-  GHashTable *style_variants;
-
-  int expose_delay_count;
-
-  int invalidate_cache_timeout_id;
-  GList *invalidate_frames;
-  GHashTable *cache;
-};
-
-struct _MetaFramesClass
-{
-  GtkWindowClass parent_class;
-
-};
-
-GType        meta_frames_get_type               (void) G_GNUC_CONST;
-
-MetaFrames *meta_frames_new (int screen_number);
-
-void meta_frames_manage_window (MetaFrames *frames,
-                                Window      xwindow,
-				GdkWindow  *window);
-void meta_frames_unmanage_window (MetaFrames *frames,
-                                  Window      xwindow);
-void meta_frames_set_title (MetaFrames *frames,
-                            Window      xwindow,
-                            const char *title);
-
-void meta_frames_update_frame_style (MetaFrames *frames,
-                                     Window      xwindow);
-
-void meta_frames_repaint_frame (MetaFrames *frames,
-                                Window      xwindow);
-
-void meta_frames_get_borders (MetaFrames *frames,
-                              Window xwindow,
-                              MetaFrameBorders *borders);
-
-void meta_frames_reset_bg     (MetaFrames *frames,
-                               Window      xwindow);
-void meta_frames_unflicker_bg (MetaFrames *frames,
-                               Window      xwindow,
-                               int         target_width,
-                               int         target_height);
-
-cairo_region_t *meta_frames_get_frame_bounds (MetaFrames *frames,
-                                              Window      xwindow,
-                                              int         window_width,
-                                              int         window_height);
-
-void meta_frames_get_corner_radiuses (MetaFrames *frames,
-                                      Window      xwindow,
-                                      float      *top_left,
-                                      float      *top_right,
-                                      float      *bottom_left,
-                                      float      *bottom_right);
-
-void meta_frames_move_resize_frame (MetaFrames *frames,
-				    Window      xwindow,
-				    int         x,
-				    int         y,
-				    int         width,
-				    int         height);
-void meta_frames_queue_draw (MetaFrames *frames,
-                             Window      xwindow);
-
-void meta_frames_notify_menu_hide (MetaFrames *frames);
-
-Window meta_frames_get_moving_frame (MetaFrames *frames);
-
-void meta_frames_push_delay_exposes (MetaFrames *frames);
-void meta_frames_pop_delay_exposes  (MetaFrames *frames);
-
-#endif
--- a/src/ui/gradient.c
+++ b/src/ui/gradient.c
@@ -1,865 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity gradient rendering */
-
-/* 
- * Copyright (C) 2001 Havoc Pennington, 99% copied from wrlib in
- * WindowMaker, Copyright (C) 1997-2000 Dan Pascu and Alfredo Kojima
- * Copyright (C) 2005 Elijah Newren
- * 
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- * 
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
- * 02111-1307, USA.  */
-
-#include <meta/gradient.h>
-#include <meta/util.h>
-#include <string.h>
-
-/* This is all Alfredo's and Dan's usual very nice WindowMaker code,
- * slightly GTK-ized
- */
-static GdkPixbuf* meta_gradient_create_horizontal       (int             width,
-                                                         int             height,
-                                                         const GdkRGBA  *from,
-                                                         const GdkRGBA  *to);
-static GdkPixbuf* meta_gradient_create_vertical         (int             width,
-                                                         int             height,
-                                                         const GdkRGBA  *from,
-                                                         const GdkRGBA  *to);
-static GdkPixbuf* meta_gradient_create_diagonal         (int             width,
-                                                         int             height,
-                                                         const GdkRGBA  *from,
-                                                         const GdkRGBA  *to);
-static GdkPixbuf* meta_gradient_create_multi_horizontal (int             width,
-                                                         int             height,
-                                                         const GdkRGBA  *colors,
-                                                         int             count);
-static GdkPixbuf* meta_gradient_create_multi_vertical   (int             width,
-                                                         int             height,
-                                                         const GdkRGBA  *colors,
-                                                         int             count);
-static GdkPixbuf* meta_gradient_create_multi_diagonal   (int             width,
-                                                         int             height,
-                                                         const GdkRGBA  *colors,
-                                                         int             count);
-
-
-/* Used as the destroy notification function for gdk_pixbuf_new() */
-static void
-free_buffer (guchar *pixels, gpointer data)
-{
-  g_free (pixels);
-}
-
-static GdkPixbuf*
-blank_pixbuf (int width, int height, gboolean no_padding)
-{
-  guchar *buf;
-  int rowstride;
-
-  g_return_val_if_fail (width > 0, NULL);
-  g_return_val_if_fail (height > 0, NULL);
-
-  if (no_padding)
-    rowstride = width * 3;
-  else
-    /* Always align rows to 32-bit boundaries */  
-    rowstride = 4 * ((3 * width + 3) / 4);
-
-  buf = g_try_malloc (height * rowstride);
-  if (!buf)
-    return NULL;
-
-  return gdk_pixbuf_new_from_data (buf, GDK_COLORSPACE_RGB,
-                                   FALSE, 8,
-                                   width, height, rowstride,
-                                   free_buffer, NULL);
-}
-
-/**
- * meta_gradient_create_simple:
- * @width: Width in pixels
- * @height: Height in pixels
- * @from: Starting color
- * @to: Ending color
- * @style: Gradient style
- *
- * Returns: (transfer full): A new linear gradient
- */
-GdkPixbuf*
-meta_gradient_create_simple (int              width,
-                             int              height,
-                             const GdkRGBA   *from,
-                             const GdkRGBA   *to,
-                             MetaGradientType style)
-{
-  switch (style)
-    {
-    case META_GRADIENT_HORIZONTAL:
-      return meta_gradient_create_horizontal (width, height,
-                                              from, to);
-    case META_GRADIENT_VERTICAL:
-      return meta_gradient_create_vertical (width, height,
-                                            from, to);
-
-    case META_GRADIENT_DIAGONAL:
-      return meta_gradient_create_diagonal (width, height,
-                                            from, to);
-    case META_GRADIENT_LAST:
-      break;
-    }
-  g_assert_not_reached ();
-  return NULL;
-}
-
-/**
- * meta_gradient_create_multi:
- * @width: Width in pixels
- * @height: Height in pixels
- * @colors: (array length=n_colors): Array of colors
- * @n_colors: Number of colors
- * @style: Gradient style
- *
- * Returns: (transfer full): A new multi-step linear gradient
- */
-GdkPixbuf*
-meta_gradient_create_multi (int              width,
-                            int              height,
-                            const GdkRGBA   *colors,
-                            int              n_colors,
-                            MetaGradientType style)
-{
-
-  if (n_colors > 2)
-    {
-      switch (style)
-        {
-        case META_GRADIENT_HORIZONTAL:
-          return meta_gradient_create_multi_horizontal (width, height, colors, n_colors);
-        case META_GRADIENT_VERTICAL:
-          return meta_gradient_create_multi_vertical (width, height, colors, n_colors);
-        case META_GRADIENT_DIAGONAL:
-          return meta_gradient_create_multi_diagonal (width, height, colors, n_colors);
-        case META_GRADIENT_LAST:
-          g_assert_not_reached ();
-          break;
-        }
-    }
-  else if (n_colors > 1)
-    {
-      return meta_gradient_create_simple (width, height, &colors[0], &colors[1],
-                                          style);
-    }
-  else if (n_colors > 0)
-    {
-      return meta_gradient_create_simple (width, height, &colors[0], &colors[0],
-                                          style);
-    }
-  g_assert_not_reached ();
-  return NULL;
-}
-
-/**
- * meta_gradient_create_interwoven: (skip)
- *
- * Interwoven essentially means we have two vertical gradients,
- * cut into horizontal strips of the given thickness, and then the strips
- * are alternated. I'm not sure what it's good for, just copied since
- * WindowMaker had it.
- */
-GdkPixbuf*
-meta_gradient_create_interwoven (int            width,
-                                 int            height,
-                                 const GdkRGBA  colors1[2],
-                                 int            thickness1,
-                                 const GdkRGBA  colors2[2],
-                                 int            thickness2)
-{
-  
-  int i, j, k, l, ll;
-  long r1, g1, b1, dr1, dg1, db1;
-  long r2, g2, b2, dr2, dg2, db2;
-  GdkPixbuf *pixbuf;
-  unsigned char *ptr;
-  unsigned char *pixels;
-  int rowstride;
-  
-  pixbuf = blank_pixbuf (width, height, FALSE);
-  if (pixbuf == NULL)
-    return NULL;
-    
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  
-  r1 = (long)(colors1[0].red*0xffffff);
-  g1 = (long)(colors1[0].green*0xffffff);
-  b1 = (long)(colors1[0].blue*0xffffff);
-
-  r2 = (long)(colors2[0].red*0xffffff);
-  g2 = (long)(colors2[0].green*0xffffff);
-  b2 = (long)(colors2[0].blue*0xffffff);
-
-  dr1 = ((colors1[1].red-colors1[0].red)*0xffffff)/(int)height;
-  dg1 = ((colors1[1].green-colors1[0].green)*0xffffff)/(int)height;
-  db1 = ((colors1[1].blue-colors1[0].blue)*0xffffff)/(int)height;
-
-  dr2 = ((colors2[1].red-colors2[0].red)*0xffffff)/(int)height;
-  dg2 = ((colors2[1].green-colors2[0].green)*0xffffff)/(int)height;
-  db2 = ((colors2[1].blue-colors2[0].blue)*0xffffff)/(int)height;
-
-  for (i=0,k=0,l=0,ll=thickness1; i<height; i++)
-    {
-      ptr = pixels + i * rowstride;
-      
-      if (k == 0)
-        {
-          ptr[0] = (unsigned char) (r1>>16);
-          ptr[1] = (unsigned char) (g1>>16);
-          ptr[2] = (unsigned char) (b1>>16);
-        }
-      else
-        {
-          ptr[0] = (unsigned char) (r2>>16);
-          ptr[1] = (unsigned char) (g2>>16);
-          ptr[2] = (unsigned char) (b2>>16);
-        }
-
-      for (j=1; j <= width/2; j *= 2)
-        memcpy (&(ptr[j*3]), ptr, j*3);
-      memcpy (&(ptr[j*3]), ptr, (width - j)*3);
-
-      if (++l == ll)
-        {
-          if (k == 0)
-            {
-              k = 1;
-              ll = thickness2;
-            }
-          else
-            {
-              k = 0;
-              ll = thickness1;
-            }
-          l = 0;
-        }
-      r1+=dr1;
-      g1+=dg1;
-      b1+=db1;
-	
-      r2+=dr2;
-      g2+=dg2;
-      b2+=db2;
-    }
-
-  return pixbuf;
-}
-
-/*
- *----------------------------------------------------------------------
- * meta_gradient_create_horizontal--
- * 	Renders a horizontal linear gradient of the specified size in the
- * GdkPixbuf format with a border of the specified type. 
- * 
- * Returns:
- * 	A 24bit GdkPixbuf with the gradient (no alpha channel).
- * 
- * Side effects:
- * 	None
- *---------------------------------------------------------------------- 
- */
-static GdkPixbuf*
-meta_gradient_create_horizontal (int width, int height,
-                                 const GdkRGBA *from,
-                                 const GdkRGBA *to)
-{    
-  int i;
-  long r, g, b, dr, dg, db;
-  GdkPixbuf *pixbuf;
-  unsigned char *ptr;
-  unsigned char *pixels;
-  int r0, g0, b0;
-  int rf, gf, bf;
-  int rowstride;
-
-  pixbuf = blank_pixbuf (width, height, FALSE);
-  if (pixbuf == NULL)
-    return NULL;
-    
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-  ptr = pixels;
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  
-  r0 = (guchar) (from->red * 0xff);
-  g0 = (guchar) (from->green * 0xff);
-  b0 = (guchar) (from->blue * 0xff);
-  rf = (guchar) (to->red * 0xff);
-  gf = (guchar) (to->green * 0xff);
-  bf = (guchar) (to->blue * 0xff);
-  
-  r = r0 << 16;
-  g = g0 << 16;
-  b = b0 << 16;
-    
-  dr = ((rf-r0)<<16)/(int)width;
-  dg = ((gf-g0)<<16)/(int)width;
-  db = ((bf-b0)<<16)/(int)width;
-  /* render the first line */
-  for (i=0; i<width; i++)
-    {
-      *(ptr++) = (unsigned char)(r>>16);
-      *(ptr++) = (unsigned char)(g>>16);
-      *(ptr++) = (unsigned char)(b>>16);
-      r += dr;
-      g += dg;
-      b += db;
-    }
-
-  /* copy the first line to the other lines */
-  for (i=1; i<height; i++)
-    {
-      memcpy (&(pixels[i*rowstride]), pixels, rowstride);
-    }
-  return pixbuf;
-}
-
-/*
- *----------------------------------------------------------------------
- * meta_gradient_create_vertical--
- *      Renders a vertical linear gradient of the specified size in the
- * GdkPixbuf format with a border of the specified type.
- *
- * Returns:
- *      A 24bit GdkPixbuf with the gradient (no alpha channel).
- *
- * Side effects:
- *      None
- *----------------------------------------------------------------------
- */
-static GdkPixbuf*
-meta_gradient_create_vertical (int width, int height,
-                               const GdkRGBA *from,
-                               const GdkRGBA *to)
-{
-  int i, j;
-  long r, g, b, dr, dg, db;
-  GdkPixbuf *pixbuf;
-  unsigned char *ptr;
-  int r0, g0, b0;
-  int rf, gf, bf;
-  int rowstride;
-  unsigned char *pixels;
-  
-  pixbuf = blank_pixbuf (width, height, FALSE);
-  if (pixbuf == NULL)
-    return NULL;
-    
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  
-  r0 = (guchar) (from->red * 0xff);
-  g0 = (guchar) (from->green * 0xff);
-  b0 = (guchar) (from->blue * 0xff);
-  rf = (guchar) (to->red * 0xff);
-  gf = (guchar) (to->green * 0xff);
-  bf = (guchar) (to->blue * 0xff);
-  
-  r = r0<<16;
-  g = g0<<16;
-  b = b0<<16;
-
-  dr = ((rf-r0)<<16)/(int)height;
-  dg = ((gf-g0)<<16)/(int)height;
-  db = ((bf-b0)<<16)/(int)height;
-
-  for (i=0; i<height; i++)
-    {
-      ptr = pixels + i * rowstride;
-      
-      ptr[0] = (unsigned char)(r>>16);
-      ptr[1] = (unsigned char)(g>>16);
-      ptr[2] = (unsigned char)(b>>16);
-
-      for (j=1; j <= width/2; j *= 2)
-        memcpy (&(ptr[j*3]), ptr, j*3);
-      memcpy (&(ptr[j*3]), ptr, (width - j)*3);
-
-      r+=dr;
-      g+=dg;
-      b+=db;
-    }
-  return pixbuf;
-}
-
-
-/*
- *----------------------------------------------------------------------
- * meta_gradient_create_diagonal--
- *      Renders a diagonal linear gradient of the specified size in the
- * GdkPixbuf format with a border of the specified type.
- *
- * Returns:
- *      A 24bit GdkPixbuf with the gradient (no alpha channel).
- *
- * Side effects:
- *      None
- *----------------------------------------------------------------------
- */
-
-
-static GdkPixbuf*
-meta_gradient_create_diagonal (int width, int height,
-                               const GdkRGBA *from,
-                               const GdkRGBA *to)
-{
-  GdkPixbuf *pixbuf, *tmp;
-  int j;
-  float a, offset;
-  unsigned char *ptr;
-  unsigned char *pixels;
-  int rowstride;
-  
-  if (width == 1)
-    return meta_gradient_create_vertical (width, height, from, to);
-  else if (height == 1)
-    return meta_gradient_create_horizontal (width, height, from, to);
-
-  pixbuf = blank_pixbuf (width, height, FALSE);
-  if (pixbuf == NULL)
-    return NULL;
-    
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-
-  tmp = meta_gradient_create_horizontal (2*width-1, 1, from, to);
-  if (!tmp)
-    {
-      g_object_unref (G_OBJECT (pixbuf));
-      return NULL;
-    }
-
-  ptr = gdk_pixbuf_get_pixels (tmp);
-
-  a = ((float)(width - 1))/((float)(height - 1));
-  width = width * 3;
-
-  /* copy the first line to the other lines with corresponding offset */
-  for (j=0, offset=0.0; j<rowstride*height; j += rowstride)
-    {
-      memcpy (&(pixels[j]), &ptr[3*(int)offset], width);
-      offset += a;
-    }
-
-  g_object_unref (G_OBJECT (tmp));
-  return pixbuf;
-}
-
-
-static GdkPixbuf*
-meta_gradient_create_multi_horizontal (int width, int height,
-                                       const GdkRGBA *colors,
-                                       int count)
-{
-  int i, j, k;
-  long r, g, b, dr, dg, db;
-  GdkPixbuf *pixbuf;
-  unsigned char *ptr;
-  unsigned char *pixels;
-  int width2;  
-  int rowstride;
-  
-  g_return_val_if_fail (count > 2, NULL);
-
-  pixbuf = blank_pixbuf (width, height, FALSE);
-  if (pixbuf == NULL)
-    return NULL;
-    
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  ptr = pixels;
-    
-  if (count > width)
-    count = width;
-    
-  if (count > 1)
-    width2 = width/(count-1);
-  else
-    width2 = width;
-    
-  k = 0;
-
-  r = (long)(colors[0].red * 0xffffff);
-  g = (long)(colors[0].green * 0xffffff);
-  b = (long)(colors[0].blue * 0xffffff);
-
-  /* render the first line */
-  for (i=1; i<count; i++)
-    {
-      dr = (int)((colors[i].red   - colors[i-1].red)  *0xffffff)/(int)width2;
-      dg = (int)((colors[i].green - colors[i-1].green)*0xffffff)/(int)width2;
-      db = (int)((colors[i].blue  - colors[i-1].blue) *0xffffff)/(int)width2;
-      for (j=0; j<width2; j++)
-        {
-          *ptr++ = (unsigned char)(r>>16);
-          *ptr++ = (unsigned char)(g>>16);
-          *ptr++ = (unsigned char)(b>>16);
-          r += dr;
-          g += dg;
-          b += db;
-          k++;
-	}
-      r = (long)(colors[i].red   * 0xffffff);
-      g = (long)(colors[i].green * 0xffffff);
-      b = (long)(colors[i].blue  * 0xffffff);
-    }
-  for (j=k; j<width; j++)
-    {
-      *ptr++ = (unsigned char)(r>>16);
-      *ptr++ = (unsigned char)(g>>16);
-      *ptr++ = (unsigned char)(b>>16);
-    }
-    
-  /* copy the first line to the other lines */
-  for (i=1; i<height; i++)
-    {
-      memcpy (&(pixels[i*rowstride]), pixels, rowstride);
-    }
-  return pixbuf;
-}
-
-static GdkPixbuf*
-meta_gradient_create_multi_vertical (int width, int height,
-                                     const GdkRGBA *colors,
-                                     int count)
-{
-  int i, j, k;
-  long r, g, b, dr, dg, db;
-  GdkPixbuf *pixbuf;
-  unsigned char *ptr, *tmp, *pixels;
-  int height2;
-  int x;
-  int rowstride;
-  
-  g_return_val_if_fail (count > 2, NULL);
-
-  pixbuf = blank_pixbuf (width, height, FALSE);
-  if (pixbuf == NULL)
-    return NULL;
-    
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  ptr = pixels;
-    
-  if (count > height)
-    count = height;
-    
-  if (count > 1)
-    height2 = height/(count-1);
-  else
-    height2 = height;
-    
-  k = 0;
-
-  r = (long)(colors[0].red * 0xffffff);
-  g = (long)(colors[0].green * 0xffffff);
-  b = (long)(colors[0].blue * 0xffffff);
-
-  for (i=1; i<count; i++)
-    {
-      dr = (int)((colors[i].red   - colors[i-1].red)  *0xffffff)/(int)height2;
-      dg = (int)((colors[i].green - colors[i-1].green)*0xffffff)/(int)height2;
-      db = (int)((colors[i].blue  - colors[i-1].blue) *0xffffff)/(int)height2;
-
-      for (j=0; j<height2; j++)
-        {
-          ptr[0] = (unsigned char)(r>>16);
-          ptr[1] = (unsigned char)(g>>16);
-          ptr[2] = (unsigned char)(b>>16);
-
-          for (x=1; x <= width/2; x *= 2)
-            memcpy (&(ptr[x*3]), ptr, x*3);
-          memcpy (&(ptr[x*3]), ptr, (width - x)*3);
-
-          ptr += rowstride;
-          
-          r += dr;
-          g += dg;
-          b += db;
-          k++;
-	}
-      r = (long)(colors[i].red   * 0xffffff);
-      g = (long)(colors[i].green * 0xffffff);
-      b = (long)(colors[i].blue  * 0xffffff);
-    }
-
-  if (k<height)
-    {
-      tmp = ptr;
-
-      ptr[0] = (unsigned char) (r>>16);
-      ptr[1] = (unsigned char) (g>>16);
-      ptr[2] = (unsigned char) (b>>16);
-
-      for (x=1; x <= width/2; x *= 2)
-        memcpy (&(ptr[x*3]), ptr, x*3);
-      memcpy (&(ptr[x*3]), ptr, (width - x)*3);
-
-      ptr += rowstride;
-      
-      for (j=k+1; j<height; j++)
-        {
-          memcpy (ptr, tmp, rowstride);
-          ptr += rowstride;
-        }
-    }
-    
-  return pixbuf;
-}
-
-
-static GdkPixbuf*
-meta_gradient_create_multi_diagonal (int width, int height,
-                                     const GdkRGBA *colors,
-                                     int count)
-{
-  GdkPixbuf *pixbuf, *tmp;
-  float a, offset;
-  int j;
-  unsigned char *ptr;
-  unsigned char *pixels;
-  int rowstride;
-  
-  g_return_val_if_fail (count > 2, NULL);
-
-  if (width == 1)
-    return meta_gradient_create_multi_vertical (width, height, colors, count);
-  else if (height == 1)
-    return meta_gradient_create_multi_horizontal (width, height, colors, count);
-
-  pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8,
-                           width, height);
-  if (pixbuf == NULL)
-    return NULL;
-    
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  
-  if (count > width)
-    count = width;
-  if (count > height)
-    count = height;
-
-  if (count > 2)
-    tmp = meta_gradient_create_multi_horizontal (2*width-1, 1, colors, count);
-  else
-    /* wrlib multiplies these colors by 256 before passing them in, but
-     * I think it's a bug in wrlib, so changed here. I could be wrong
-     * though, if we notice two-color multi diagonals not working.
-     */
-    tmp = meta_gradient_create_horizontal (2*width-1, 1,
-                                           &colors[0], &colors[1]);
-
-  if (!tmp)
-    {
-      g_object_unref (G_OBJECT (pixbuf));
-      return NULL;
-    }
-  ptr = gdk_pixbuf_get_pixels (tmp);
-
-  a = ((float)(width - 1))/((float)(height - 1));
-  width = width * 3;
-
-  /* copy the first line to the other lines with corresponding offset */
-  for (j=0, offset=0; j<rowstride*height; j += rowstride)
-    {
-      memcpy (&(pixels[j]), &ptr[3*(int)offset], width);
-      offset += a;
-    }
-
-  g_object_unref (G_OBJECT (tmp));
-  return pixbuf;
-}
-
-static void
-simple_multiply_alpha (GdkPixbuf *pixbuf,
-                       guchar     alpha)
-{
-  guchar *pixels;
-  int rowstride;
-  int height;
-  int row;
-
-  g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-  
-  if (alpha == 255)
-    return;
-  
-  g_assert (gdk_pixbuf_get_has_alpha (pixbuf));
-  
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  height = gdk_pixbuf_get_height (pixbuf);
-
-  row = 0;
-  while (row < height)
-    {
-      guchar *p;
-      guchar *end;
-
-      p = pixels + row * rowstride;
-      end = p + rowstride;
-
-      while (p != end)
-        {
-          p += 3; /* skip RGB */
-
-          /* multiply the two alpha channels. not sure this is right.
-           * but some end cases are that if the pixbuf contains 255,
-           * then it should be modified to contain "alpha"; if the
-           * pixbuf contains 0, it should remain 0.
-           */
-          /* ((*p / 255.0) * (alpha / 255.0)) * 255; */
-          *p = (guchar) (((int) *p * (int) alpha) / (int) 255);
-          
-          ++p; /* skip A */
-        }
-
-      ++row;
-    }
-}
-
-static void
-meta_gradient_add_alpha_horizontal (GdkPixbuf           *pixbuf,
-                                    const unsigned char *alphas,
-                                    int                  n_alphas)
-{
-  int i, j;
-  long a, da;
-  unsigned char *p;
-  unsigned char *pixels;
-  int width2;  
-  int rowstride;
-  int width, height;
-  unsigned char *gradient;
-  unsigned char *gradient_p;
-  unsigned char *gradient_end;
-  
-  g_return_if_fail (n_alphas > 0);
-
-  if (n_alphas == 1)
-    {
-      /* Optimize this */
-      simple_multiply_alpha (pixbuf, alphas[0]);
-      return;
-    }
-  
-  width = gdk_pixbuf_get_width (pixbuf);
-  height = gdk_pixbuf_get_height (pixbuf);
-
-  gradient = g_new (unsigned char, width);
-  gradient_end = gradient + width;
-  
-  if (n_alphas > width)
-    n_alphas = width;
-    
-  if (n_alphas > 1)
-    width2 = width / (n_alphas - 1);
-  else
-    width2 = width;
-    
-  a = alphas[0] << 8;
-  gradient_p = gradient;
-  
-  /* render the gradient into an array */
-  for (i = 1; i < n_alphas; i++)
-    {
-      da = (((int)(alphas[i] - (int) alphas[i-1])) << 8) / (int) width2;
-
-      for (j = 0; j < width2; j++)
-        {
-          *gradient_p++ = (a >> 8);
-          
-          a += da;
-	}
-
-      a = alphas[i] << 8;
-    }
-
-  /* get leftover pixels */
-  while (gradient_p != gradient_end)
-    {
-      *gradient_p++ = a >> 8;
-    }
-    
-  /* Now for each line of the pixbuf, fill in with the gradient */
-  pixels = gdk_pixbuf_get_pixels (pixbuf);
-  rowstride = gdk_pixbuf_get_rowstride (pixbuf);
-  
-  p = pixels;
-  i = 0;
-  while (i < height)
-    {
-      unsigned char *row_end = p + rowstride;
-      gradient_p = gradient;
-
-      p += 3;
-      while (gradient_p != gradient_end)
-        {
-          /* multiply the two alpha channels. not sure this is right.
-           * but some end cases are that if the pixbuf contains 255,
-           * then it should be modified to contain "alpha"; if the
-           * pixbuf contains 0, it should remain 0.
-           */
-          /* ((*p / 255.0) * (alpha / 255.0)) * 255; */
-          *p = (guchar) (((int) *p * (int) *gradient_p) / (int) 255);
-
-          p += 4;
-          ++gradient_p;
-        }
-
-      p = row_end;
-      ++i;
-    }
-  
-  g_free (gradient);
-}
-
-void
-meta_gradient_add_alpha (GdkPixbuf       *pixbuf,
-                         const guchar    *alphas,
-                         int              n_alphas,
-                         MetaGradientType type)
-{
-  g_return_if_fail (GDK_IS_PIXBUF (pixbuf));
-  g_return_if_fail (gdk_pixbuf_get_has_alpha (pixbuf));
-  g_return_if_fail (n_alphas > 0);
-  
-  switch (type)
-    {
-    case META_GRADIENT_HORIZONTAL:
-      meta_gradient_add_alpha_horizontal (pixbuf, alphas, n_alphas);
-      break;
-      
-    case META_GRADIENT_VERTICAL:
-      g_printerr ("metacity: vertical alpha channel gradient not implemented yet\n");
-      break;
-      
-    case META_GRADIENT_DIAGONAL:
-      g_printerr ("metacity: diagonal alpha channel gradient not implemented yet\n");
-      break;
-      
-    case META_GRADIENT_LAST:
-      g_assert_not_reached ();
-      break;
-    }
-}
--- a/src/ui/menu.c
+++ b/src/ui/menu.c
@@ -137,7 +137,7 @@ menu_closed (GtkMenu *widget,
  
  menu = data;

-  meta_frames_notify_menu_hide (menu->frames);
+  meta_ui_notify_menu_hide (menu->ui);
  (* menu->func) (menu,
                  GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                  menu->client_xwindow,
@@ -157,7 +157,7 @@ activate_cb (GtkWidget *menuitem, gpointer data)
  
  md = data;

-  meta_frames_notify_menu_hide (md->menu->frames);
+  meta_ui_notify_menu_hide (md->menu->ui);
  (* md->menu->func) (md->menu,
                      GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
                      md->menu->client_xwindow,
@@ -321,7 +321,9 @@ menu_item_new (MenuItem *menuitem, int workspace_id)
 }

 MetaWindowMenu*
-meta_window_menu_new   (MetaFrames         *frames,
+meta_window_menu_new   (MetaUI             *ui,
+                        Display            *display,
+                        gint                screen_no,
                        MetaMenuOp          ops,
                        MetaMenuOp          insensitive,
                        Window              client_xwindow,
@@ -332,6 +334,8 @@ meta_window_menu_new   (MetaFrames         *frames,
 {
  int i;
  MetaWindowMenu *menu;
+  GdkDisplay *gdkdisplay = gdk_x11_lookup_xdisplay (display);
+  GdkScreen *screen = gdk_display_get_screen (gdkdisplay, screen_no);

  /* FIXME: Modifications to 'ops' should happen in meta_window_show_menu */
  if (n_workspaces < 2)
@@ -341,7 +345,7 @@ meta_window_menu_new   (MetaFrames         *frames,
    ops &= ~(META_MENU_OP_WORKSPACES);
  
  menu = g_new (MetaWindowMenu, 1);
-  menu->frames = frames;
+  menu->ui = ui;
  menu->client_xwindow = client_xwindow;
  menu->func = func;
  menu->data = data;
@@ -350,8 +354,7 @@ meta_window_menu_new   (MetaFrames         *frames,
  
  menu->menu = gtk_menu_new ();

-  gtk_menu_set_screen (GTK_MENU (menu->menu),
-                       gtk_widget_get_screen (GTK_WIDGET (frames)));
+  gtk_menu_set_screen (GTK_MENU (menu->menu), screen);

  for (i = 0; i < (int) G_N_ELEMENTS (menuitems); i++)
    {
@@ -384,10 +387,7 @@ meta_window_menu_new   (MetaFrames         *frames,
            {
              if (ops & META_MENU_OP_WORKSPACES)
                {
-                  Display *display;
                  Window xroot;
-                  GdkScreen *screen;
-                  GdkWindow *window;
                  GtkWidget *submenu;
                  int j;

@@ -400,10 +400,6 @@ meta_window_menu_new   (MetaFrames         *frames,
                  meta_verbose ("Creating %d-workspace menu current space %lu\n",
                      n_workspaces, active_workspace);

-                  window = gtk_widget_get_window (GTK_WIDGET (frames));
-                  display = GDK_WINDOW_XDISPLAY (window);
-
-                  screen = gdk_window_get_screen (window);
                  xroot = GDK_WINDOW_XID (gdk_screen_get_root_window (screen));

                  submenu = gtk_menu_new ();
--- a/src/ui/menu.h
+++ b/src/ui/menu.h
@@ -25,7 +25,7 @@
 #define META_MENU_H

 #include <gtk/gtk.h>
-#include "frames.h"
+#include "ui.h"

 /* Stock icons */
 #define METACITY_STOCK_DELETE   "metacity-delete"
@@ -34,7 +34,7 @@

 struct _MetaWindowMenu
 {
-  MetaFrames *frames;
+  MetaUI *ui;
  Window client_xwindow;
  GtkWidget *menu;
  MetaWindowMenuFunc func;
@@ -43,7 +43,9 @@ struct _MetaWindowMenu
  MetaMenuOp insensitive;
 };

-MetaWindowMenu* meta_window_menu_new      (MetaFrames         *frames,
+MetaWindowMenu* meta_window_menu_new      (MetaUI             *ui,
+                                           Display            *display,
+                                           gint                screen_no,
                                           MetaMenuOp          ops,
                                           MetaMenuOp          insensitive,
                                           Window              client_xwindow,
--- a/src/ui/preview-widget.c
+++ b/src/ui/preview-widget.c
@@ -1,581 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Metacity theme preview widget */
-
-/* 
- * Copyright (C) 2002 Havoc Pennington
- * 
- * 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.
- */
-
-#define _GNU_SOURCE
-#define _XOPEN_SOURCE 600 /* for the maths routines over floats */
-
-#include <math.h>
-#include <gtk/gtk.h>
-#include <meta/preview-widget.h>
-#include "theme-private.h"
-
-static void     meta_preview_get_preferred_width  (GtkWidget *widget,
-                                                   gint      *minimum,
-                                                   gint      *natural);
-static void     meta_preview_get_preferred_height (GtkWidget *widget,
-                                                   gint      *minimum,
-                                                   gint      *natural);
-static void     meta_preview_size_allocate (GtkWidget        *widget,
-                                            GtkAllocation    *allocation);
-static gboolean meta_preview_draw          (GtkWidget        *widget,
-                                            cairo_t          *cr);
-static void     meta_preview_finalize      (GObject          *object);
-
-G_DEFINE_TYPE (MetaPreview, meta_preview, GTK_TYPE_BIN);
-
-static void
-meta_preview_class_init (MetaPreviewClass *class)
-{
-  GObjectClass *gobject_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class;
-
-  widget_class = (GtkWidgetClass*) class;
-
-  gobject_class->finalize = meta_preview_finalize;
-
-  widget_class->draw = meta_preview_draw;
-  widget_class->get_preferred_width = meta_preview_get_preferred_width;
-  widget_class->get_preferred_height = meta_preview_get_preferred_height;
-  widget_class->size_allocate = meta_preview_size_allocate;
-
-  gtk_container_class_handle_border_width (GTK_CONTAINER_CLASS (class));
-}
-
-static void
-meta_preview_init (MetaPreview *preview)
-{
-  int i;
-
-  gtk_widget_set_has_window (GTK_WIDGET (preview), FALSE);
-
-  i = 0;
-  while (i < MAX_BUTTONS_PER_CORNER)
-    {
-      preview->button_layout.left_buttons[i] = META_BUTTON_FUNCTION_LAST;
-      preview->button_layout.right_buttons[i] = META_BUTTON_FUNCTION_LAST;
-      ++i;
-    }
-  
-  preview->button_layout.left_buttons[0] = META_BUTTON_FUNCTION_MENU;
-
-  preview->button_layout.right_buttons[0] = META_BUTTON_FUNCTION_MINIMIZE;
-  preview->button_layout.right_buttons[1] = META_BUTTON_FUNCTION_MAXIMIZE;
-  preview->button_layout.right_buttons[2] = META_BUTTON_FUNCTION_CLOSE;
-  
-  preview->type = META_FRAME_TYPE_NORMAL;
-  preview->flags =
-    META_FRAME_ALLOWS_DELETE |
-    META_FRAME_ALLOWS_MENU |
-    META_FRAME_ALLOWS_MINIMIZE |
-    META_FRAME_ALLOWS_MAXIMIZE |
-    META_FRAME_ALLOWS_VERTICAL_RESIZE |
-    META_FRAME_ALLOWS_HORIZONTAL_RESIZE |
-    META_FRAME_HAS_FOCUS |
-    META_FRAME_ALLOWS_SHADE |
-    META_FRAME_ALLOWS_MOVE;
-
-  preview->borders_cached = FALSE;
-}
-
-GtkWidget*
-meta_preview_new (void)
-{
-  MetaPreview *preview;
-  
-  preview = g_object_new (META_TYPE_PREVIEW, NULL);
-  
-  return GTK_WIDGET (preview);
-}
-
-static void
-meta_preview_finalize (GObject *object)
-{
-  MetaPreview *preview;
-
-  preview = META_PREVIEW (object);
-
-  g_free (preview->title);
-  preview->title = NULL;
-  
-  G_OBJECT_CLASS (meta_preview_parent_class)->finalize (object);
-}
-
-static void
-ensure_info (MetaPreview *preview)
-{
-  GtkWidget *widget;
-
-  widget = GTK_WIDGET (preview);
-  
-  if (preview->layout == NULL)
-    {
-      PangoFontDescription *font_desc;
-      double scale;
-      PangoAttrList *attrs;
-      PangoAttribute *attr;
-
-      if (preview->theme)        
-        scale = meta_theme_get_title_scale (preview->theme,
-                                            preview->type,
-                                            preview->flags);
-      else
-        scale = 1.0;
-      
-      preview->layout = gtk_widget_create_pango_layout (widget,
-                                                        preview->title);
-      
-      font_desc = meta_gtk_widget_get_font_desc (widget, scale, NULL);
-      
-      preview->text_height =
-        meta_pango_font_desc_get_text_height (font_desc,
-                                              gtk_widget_get_pango_context (widget));
-          
-      attrs = pango_attr_list_new ();
-      
-      attr = pango_attr_size_new (pango_font_description_get_size (font_desc));
-      attr->start_index = 0;
-      attr->end_index = G_MAXINT;
-      
-      pango_attr_list_insert (attrs, attr);
-      
-      pango_layout_set_attributes (preview->layout, attrs);
-      
-      pango_attr_list_unref (attrs);      
-  
-      pango_font_description_free (font_desc);
-    }
-
-  if (!preview->borders_cached)
-    {
-      if (preview->theme)
-        meta_theme_get_frame_borders (preview->theme,
-                                      preview->type,
-                                      preview->text_height,
-                                      preview->flags,
-                                      &preview->borders);
-      else
-        meta_frame_borders_clear (&preview->borders);
-      preview->borders_cached = TRUE;
-    }
-}
-
-static gboolean
-meta_preview_draw (GtkWidget *widget,
-                   cairo_t   *cr)
-{
-  MetaPreview *preview = META_PREVIEW (widget);
-  GtkAllocation allocation;
-
-  gtk_widget_get_allocation (widget, &allocation);
-
-  if (preview->theme)
-    {
-      int client_width;
-      int client_height;
-      MetaButtonState button_states[META_BUTTON_TYPE_LAST] =
-      {
-        META_BUTTON_STATE_NORMAL,
-        META_BUTTON_STATE_NORMAL,
-        META_BUTTON_STATE_NORMAL,
-        META_BUTTON_STATE_NORMAL
-      };
-  
-      ensure_info (preview);
-      cairo_save (cr);
-
-      client_width = allocation.width - preview->borders.total.left - preview->borders.total.right;
-      client_height = allocation.height - preview->borders.total.top - preview->borders.total.bottom;
-
-      if (client_width < 0)
-        client_width = 1;
-      if (client_height < 0)
-        client_height = 1;  
-      
-      meta_theme_draw_frame (preview->theme,
-                             widget,
-                             cr,
-                             preview->type,
-                             preview->flags,
-                             client_width, client_height,
-                             preview->layout,
-                             preview->text_height,
-                             &preview->button_layout,
-                             button_states,
-                             meta_preview_get_mini_icon (),
-                             meta_preview_get_icon ());
-
-      cairo_restore (cr);
-    }
-
-  /* draw child */
-  return GTK_WIDGET_CLASS (meta_preview_parent_class)->draw (widget, cr);
-}
-
-#define NO_CHILD_WIDTH 80
-#define NO_CHILD_HEIGHT 20
-
-static void
-meta_preview_get_preferred_width (GtkWidget *widget,
-                                  gint      *minimum,
-                                  gint      *natural)
-{
-  MetaPreview *preview;
-  GtkWidget *child;
-
-  preview = META_PREVIEW (widget);
-
-  ensure_info (preview);
-
-  *minimum = *natural = preview->borders.total.left + preview->borders.total.right;
-
-  child = gtk_bin_get_child (GTK_BIN (preview));
-  if (child && gtk_widget_get_visible (child))
-    {
-      gint child_min, child_nat;
-
-      gtk_widget_get_preferred_width (child, &child_min, &child_nat);
-
-      *minimum += child_min;
-      *natural += child_nat;
-    }
-  else
-    {
-      *minimum += NO_CHILD_WIDTH;
-      *natural += NO_CHILD_WIDTH;
-    }
-}
-
-static void
-meta_preview_get_preferred_height (GtkWidget *widget,
-                                   gint      *minimum,
-                                   gint      *natural)
-{
-  MetaPreview *preview;
-  GtkWidget *child;
-
-  preview = META_PREVIEW (widget);
-
-  ensure_info (preview);
-
-  *minimum = *natural = preview->borders.total.top + preview->borders.total.bottom;
-
-  child = gtk_bin_get_child (GTK_BIN (preview));
-  if (child && gtk_widget_get_visible (child))
-    {
-      gint child_min, child_nat;
-
-      gtk_widget_get_preferred_height (child, &child_min, &child_nat);
-
-      *minimum += child_min;
-      *natural += child_nat;
-    }
-  else
-    {
-      *minimum += NO_CHILD_HEIGHT;
-      *natural += NO_CHILD_HEIGHT;
-    }
-}
-
-static void
-meta_preview_size_allocate (GtkWidget         *widget,
-                            GtkAllocation     *allocation)
-{
-  MetaPreview *preview;
-  GtkAllocation widget_allocation, child_allocation;
-  GtkWidget *child;
-
-  preview = META_PREVIEW (widget);
-
-  ensure_info (preview);
-
-  gtk_widget_set_allocation (widget, allocation);
-
-  child = gtk_bin_get_child (GTK_BIN (widget));
-  if (child && gtk_widget_get_visible (child))
-    {
-      gtk_widget_get_allocation (widget, &widget_allocation);
-      child_allocation.x = widget_allocation.x + preview->borders.total.left;
-      child_allocation.y = widget_allocation.y + preview->borders.total.top;
-
-      child_allocation.width = MAX (1, widget_allocation.width - preview->borders.total.left - preview->borders.total.right);
-      child_allocation.height = MAX (1, widget_allocation.height - preview->borders.total.top - preview->borders.total.bottom);
-
-      gtk_widget_size_allocate (child, &child_allocation);
-    }
-}
-
-static void
-clear_cache (MetaPreview *preview)
-{
-  if (preview->layout)
-    {
-      g_object_unref (G_OBJECT (preview->layout));
-      preview->layout = NULL;
-    }
-
-  preview->borders_cached = FALSE;
-}
-
-void
-meta_preview_set_theme (MetaPreview    *preview,
-                        MetaTheme      *theme)
-{
-  g_return_if_fail (META_IS_PREVIEW (preview));
-
-  preview->theme = theme;
-  
-  clear_cache (preview);
-
-  gtk_widget_queue_resize (GTK_WIDGET (preview));
-}
-
-void
-meta_preview_set_title (MetaPreview    *preview,
-                        const char     *title)
-{
-  g_return_if_fail (META_IS_PREVIEW (preview));
-
-  g_free (preview->title);
-  preview->title = g_strdup (title);
-  
-  clear_cache (preview);
-
-  gtk_widget_queue_resize (GTK_WIDGET (preview));
-}
-
-void
-meta_preview_set_frame_type (MetaPreview    *preview,
-                             MetaFrameType   type)
-{
-  g_return_if_fail (META_IS_PREVIEW (preview));
-
-  preview->type = type;
-
-  clear_cache (preview);
-
-  gtk_widget_queue_resize (GTK_WIDGET (preview));
-}
-
-void
-meta_preview_set_frame_flags (MetaPreview    *preview,
-                              MetaFrameFlags  flags)
-{
-  g_return_if_fail (META_IS_PREVIEW (preview));
-
-  preview->flags = flags;
-
-  clear_cache (preview);
-
-  gtk_widget_queue_resize (GTK_WIDGET (preview));
-}
-
-void
-meta_preview_set_button_layout (MetaPreview            *preview,
-                                const MetaButtonLayout *button_layout)
-{
-  g_return_if_fail (META_IS_PREVIEW (preview));
-  
-  preview->button_layout = *button_layout;  
-  
-  gtk_widget_queue_draw (GTK_WIDGET (preview));
-}
-
-GdkPixbuf*
-meta_preview_get_icon (void)
-{
-  static GdkPixbuf *default_icon = NULL;
-
-  if (default_icon == NULL)
-    {
-      GtkIconTheme *theme;
-      gboolean icon_exists;
-
-      theme = gtk_icon_theme_get_default ();
-
-      icon_exists = gtk_icon_theme_has_icon (theme, META_DEFAULT_ICON_NAME);
-
-      if (icon_exists)
-          default_icon = gtk_icon_theme_load_icon (theme,
-                                                   META_DEFAULT_ICON_NAME,
-                                                   META_ICON_WIDTH,
-                                                   0,
-                                                   NULL);
-      else
-          default_icon = gtk_icon_theme_load_icon (theme,
-                                                   "gtk-missing-image",
-                                                   META_ICON_WIDTH,
-                                                   0,
-                                                   NULL);
-
-      g_assert (default_icon);
-    }
-  
-  return default_icon;
-}
-
-GdkPixbuf*
-meta_preview_get_mini_icon (void)
-{
-  static GdkPixbuf *default_icon = NULL;
-
-  if (default_icon == NULL)
-    {
-      GtkIconTheme *theme;
-      gboolean icon_exists;
-
-      theme = gtk_icon_theme_get_default ();
-
-      icon_exists = gtk_icon_theme_has_icon (theme, META_DEFAULT_ICON_NAME);
-
-      if (icon_exists)
-          default_icon = gtk_icon_theme_load_icon (theme,
-                                                   META_DEFAULT_ICON_NAME,
-                                                   META_MINI_ICON_WIDTH,
-                                                   0,
-                                                   NULL);
-      else
-          default_icon = gtk_icon_theme_load_icon (theme,
-                                                   "gtk-missing-image",
-                                                   META_MINI_ICON_WIDTH,
-                                                   0,
-                                                   NULL);
-
-      g_assert (default_icon);
-    }
-  
-  return default_icon;
-}
-
-cairo_region_t *
-meta_preview_get_clip_region (MetaPreview *preview, gint new_window_width, gint new_window_height)
-{
-  cairo_rectangle_int_t xrect;
-  cairo_region_t *corners_xregion, *window_xregion;
-  gint flags;
-  MetaFrameLayout *fgeom;
-  MetaFrameStyle *frame_style;
-
-  g_return_val_if_fail (META_IS_PREVIEW (preview), NULL);
-
-  flags = (META_PREVIEW (preview)->flags);
-
-  window_xregion = cairo_region_create ();
-
-  xrect.x = 0;
-  xrect.y = 0;
-  xrect.width = new_window_width;
-  xrect.height = new_window_height;
-
-  cairo_region_union_rectangle (window_xregion, &xrect);
-
-  if (preview->theme == NULL)
-    return window_xregion;
-
-  /* Otherwise, we do have a theme, so calculate the corners */
-  frame_style = meta_theme_get_frame_style (preview->theme,
-      META_FRAME_TYPE_NORMAL, flags);
-
-  fgeom = frame_style->layout;
-
-  corners_xregion = cairo_region_create ();
-
-  if (fgeom->top_left_corner_rounded_radius != 0)
-    {
-      const int corner = fgeom->top_left_corner_rounded_radius;
-      const float radius = sqrt(corner) + corner;
-      int i;
-
-      for (i=0; i<corner; i++)
-        {
-
-          const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
-          xrect.x = 0;
-          xrect.y = i;
-          xrect.width = width;
-          xrect.height = 1;
-
-          cairo_region_union_rectangle (corners_xregion, &xrect);
-        }
-    }
-
-  if (fgeom->top_right_corner_rounded_radius != 0)
-    {
-      const int corner = fgeom->top_right_corner_rounded_radius;
-      const float radius = sqrt(corner) + corner;
-      int i;
-
-      for (i=0; i<corner; i++)
-        {
-          const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
-          xrect.x = new_window_width - width;
-          xrect.y = i;
-          xrect.width = width;
-          xrect.height = 1;
-
-          cairo_region_union_rectangle (corners_xregion, &xrect);
-        }
-    }
-
-  if (fgeom->bottom_left_corner_rounded_radius != 0)
-    {
-      const int corner = fgeom->bottom_left_corner_rounded_radius;
-      const float radius = sqrt(corner) + corner;
-      int i;
-
-      for (i=0; i<corner; i++)
-        {
-          const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
-          xrect.x = 0;
-          xrect.y = new_window_height - i - 1;
-          xrect.width = width;
-          xrect.height = 1;
-
-          cairo_region_union_rectangle (corners_xregion, &xrect);
-        }
-    }
-
-  if (fgeom->bottom_right_corner_rounded_radius != 0)
-    {
-      const int corner = fgeom->bottom_right_corner_rounded_radius;
-      const float radius = sqrt(corner) + corner;
-      int i;
-
-      for (i=0; i<corner; i++)
-        {
-          const int width = floor(0.5 + radius - sqrt(radius*radius - (radius-(i+0.5))*(radius-(i+0.5))));
-          xrect.x = new_window_width - width;
-          xrect.y = new_window_height - i - 1;
-          xrect.width = width;
-          xrect.height = 1;
-
-          cairo_region_union_rectangle (corners_xregion, &xrect);
-        }
-    }
-
-  cairo_region_subtract (window_xregion, corners_xregion);
-  cairo_region_destroy (corners_xregion);
-
-  return window_xregion;
-}
-
-
--- a/src/ui/tabpopup.c
+++ b/src/ui/tabpopup.c
@@ -844,9 +844,12 @@ meta_select_workspace_class_init (MetaSelectWorkspaceClass *klass)
 }

 /**
- * meta_convert_meta_to_wnck() converts a MetaWindow to a
- * WnckWindowDisplayInfo window that is used to build a thumbnail of a
- * workspace.
+ * meta_convert_meta_to_wnck:
+ * @window: the #MetaWindow
+ * @screen: the #MetaScreen the window is on
+ *
+ * Converts a #MetaWindow to a #WnckWindowDisplayInfo window
+ * that is used to build a thumbnail of a workspace.
 **/
 static WnckWindowDisplayInfo
 meta_convert_meta_to_wnck (MetaWindow *window, MetaScreen *screen)
--- a/src/ui/testgradient.c
+++ b/src/ui/testgradient.c
@@ -1,317 +0,0 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
-/* Mutter gradient test program */
-
-/* 
- * Copyright (C) 2002 Havoc Pennington
- * 
- * 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 <meta/gradient.h>
-#include <gtk/gtk.h>
-
-typedef void (* RenderGradientFunc) (cairo_t     *cr,
-                                     int          width,
-                                     int          height);
-
-static void
-draw_checkerboard (cairo_t *cr,
-                   int      width,
-                   int      height)
-{
-  gint i, j, xcount, ycount;
-  GdkRGBA color1, color2;
-  
-#define CHECK_SIZE 10
-#define SPACING 2  
-
-  color1.red = 30000. / 65535.;
-  color1.green = 30000. / 65535.;
-  color1.blue = 30000. / 65535.;
-  color1.alpha = 1.0;
-
-  color2.red = 50000. / 65535.;
-  color2.green = 50000. / 65535.;
-  color2.blue = 50000. / 65535.;
-  color2.alpha = 1.0;
-
-  xcount = 0;
-  i = SPACING;
-  while (i < width)
-    {
-      j = SPACING;
-      ycount = xcount % 2; /* start with even/odd depending on row */
-      while (j < height)
-	{
-	  if (ycount % 2)
-	    gdk_cairo_set_source_rgba (cr, &color1);
-	  else
-	    gdk_cairo_set_source_rgba (cr, &color2);
-
-	  /* If we're outside event->area, this will do nothing.
-	   * It might be mildly more efficient if we handled
-	   * the clipping ourselves, but again we're feeling lazy.
-	   */
-          cairo_rectangle (cr, i, j, CHECK_SIZE, CHECK_SIZE);
-          cairo_fill (cr);
-
-	  j += CHECK_SIZE + SPACING;
-	  ++ycount;
-	}
-
-      i += CHECK_SIZE + SPACING;
-      ++xcount;
-    }
-}
-
-static void
-render_simple (cairo_t     *cr,
-               int width, int height,
-               MetaGradientType type,
-               gboolean    with_alpha)
-{
-  GdkPixbuf *pixbuf;
-  GdkRGBA from, to;
-  
-  gdk_rgba_parse (&from, "blue");
-  gdk_rgba_parse (&to, "green");
-
-  pixbuf = meta_gradient_create_simple (width, height,
-                                        &from, &to,
-                                        type);
-
-  if (with_alpha)
-    {
-      const unsigned char alphas[] = { 0xff, 0xaa, 0x2f, 0x0, 0xcc, 0xff, 0xff };
-      
-      if (!gdk_pixbuf_get_has_alpha (pixbuf))
-        {
-          GdkPixbuf *new_pixbuf;
-          
-          new_pixbuf = gdk_pixbuf_add_alpha (pixbuf, FALSE, 0, 0, 0);
-          g_object_unref (G_OBJECT (pixbuf));
-          pixbuf = new_pixbuf;
-        }
-      
-      meta_gradient_add_alpha (pixbuf,
-                               alphas, G_N_ELEMENTS (alphas),
-                               META_GRADIENT_HORIZONTAL);
-      
-      draw_checkerboard (cr , width, height);
-    }
-    
-  gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-  cairo_rectangle (cr, 0, 0, width, height);
-  cairo_fill (cr);
-
-  g_object_unref (G_OBJECT (pixbuf));
-}
-
-static void
-render_vertical_func (cairo_t *cr,
-                      int width, int height)
-{
-  render_simple (cr, width, height, META_GRADIENT_VERTICAL, FALSE);
-}
-
-static void
-render_horizontal_func (cairo_t *cr,
-                        int width, int height)
-{
-  render_simple (cr, width, height, META_GRADIENT_HORIZONTAL, FALSE);
-}
-
-static void
-render_diagonal_func (cairo_t *cr,
-                      int width, int height)
-{
-  render_simple (cr, width, height, META_GRADIENT_DIAGONAL, FALSE);
-}
-
-static void
-render_diagonal_alpha_func (cairo_t *cr,
-                            int width, int height)
-{
-  render_simple (cr, width, height, META_GRADIENT_DIAGONAL, TRUE);
-}
-
-static void
-render_multi (cairo_t     *cr,
-              int width, int height,
-              MetaGradientType type)
-{
-  GdkPixbuf *pixbuf;
-#define N_COLORS 5
-  GdkRGBA colors[N_COLORS];
-
-  gdk_rgba_parse (&colors[0], "red");
-  gdk_rgba_parse (&colors[1], "blue");
-  gdk_rgba_parse (&colors[2], "orange");
-  gdk_rgba_parse (&colors[3], "pink");
-  gdk_rgba_parse (&colors[4], "green");
-
-  pixbuf = meta_gradient_create_multi (width, height,
-                                       colors, N_COLORS,
-                                       type);
-
-  gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-  cairo_rectangle (cr, 0, 0, width, height);
-  cairo_fill (cr);
-
-  g_object_unref (G_OBJECT (pixbuf));
-#undef N_COLORS
-}
-
-static void
-render_vertical_multi_func (cairo_t *cr,
-                            int width, int height)
-{
-  render_multi (cr, width, height, META_GRADIENT_VERTICAL);
-}
-
-static void
-render_horizontal_multi_func (cairo_t *cr,
-                              int width, int height)
-{
-  render_multi (cr, width, height, META_GRADIENT_HORIZONTAL);
-}
-
-static void
-render_diagonal_multi_func (cairo_t *cr,
-                            int width, int height)
-{
-  render_multi (cr, width, height, META_GRADIENT_DIAGONAL);
-}
-
-static void
-render_interwoven_func (cairo_t *cr,
-                        int width, int height)
-{
-  GdkPixbuf *pixbuf;
-#define N_COLORS 4
-  GdkRGBA colors[N_COLORS];
-
-  gdk_rgba_parse (&colors[0], "red");
-  gdk_rgba_parse (&colors[1], "blue");
-  gdk_rgba_parse (&colors[2], "pink");
-  gdk_rgba_parse (&colors[3], "green");
-
-  pixbuf = meta_gradient_create_interwoven (width, height,
-                                            colors, height / 10,
-                                            colors + 2, height / 14);
-
-  gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-  cairo_rectangle (cr, 0, 0, width, height);
-  cairo_fill (cr);
-
-  g_object_unref (G_OBJECT (pixbuf));
-}
-
-static gboolean
-draw_callback (GtkWidget *widget,
-               cairo_t   *cr,
-               gpointer   data)
-{
-  RenderGradientFunc func = data;
-  GtkStyleContext *style;
-  GdkRGBA color;
-
-  style = gtk_widget_get_style_context (widget);
-
-  gtk_style_context_save (style);
-  gtk_style_context_set_state (style, gtk_widget_get_state_flags (widget));
-  gtk_style_context_lookup_color (style, "foreground-color", &color);
-  gtk_style_context_restore (style);
-
-  gdk_cairo_set_source_rgba (cr, &color);
-
-  (* func) (cr,
-            gtk_widget_get_allocated_width (widget),
-            gtk_widget_get_allocated_height (widget));
-
-  return FALSE;
-}
-
-static GtkWidget*
-create_gradient_window (const char *title,
-                        RenderGradientFunc func)
-{
-  GtkWidget *window;
-  GtkWidget *drawing_area;
-
-  window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
-
-  gtk_window_set_title (GTK_WINDOW (window), title);
-  
-  drawing_area = gtk_drawing_area_new ();
-
-  gtk_widget_set_size_request (drawing_area, 1, 1);
-
-  gtk_window_set_default_size (GTK_WINDOW (window), 175, 175);
-  
-  g_signal_connect (G_OBJECT (drawing_area),
-                    "draw",
-                    G_CALLBACK (draw_callback),
-                    func);
-
-  gtk_container_add (GTK_CONTAINER (window), drawing_area);
-
-  gtk_widget_show_all (window);
-  
-  return window;
-}
-
-static void
-meta_gradient_test (void)
-{
-  create_gradient_window ("Simple vertical",
-                          render_vertical_func);
-
-  create_gradient_window ("Simple horizontal",
-                          render_horizontal_func);
-
-  create_gradient_window ("Simple diagonal",
-                          render_diagonal_func);
-
-  create_gradient_window ("Multi vertical",
-                          render_vertical_multi_func);
-
-  create_gradient_window ("Multi horizontal",
-                          render_horizontal_multi_func);
-
-  create_gradient_window ("Multi diagonal",
-                          render_diagonal_multi_func);
-
-  create_gradient_window ("Interwoven",
-                          render_interwoven_func);
-
-  create_gradient_window ("Simple diagonal with horizontal multi alpha",
-                          render_diagonal_alpha_func);
-
-}
-
-int
-main (int argc, char **argv)
-{
-  gtk_init (&argc, &argv);
-
-  meta_gradient_test ();
-
-  gtk_main ();
-
-  return 0;
-}
-
--- a/src/ui/theme-parser.c
+++ b/src/ui/theme-parser.c
--- a/src/ui/theme-private.h
+++ b/src/ui/theme-private.h
--- a/src/ui/theme-viewer.c
+++ b/src/ui/theme-viewer.c
--- a/src/ui/theme.c
+++ b/src/ui/theme.c
--- a/src/ui/ui.c
+++ b/src/ui/ui.c
@@ -25,11 +25,10 @@
 #include <config.h>
 #include <meta/prefs.h>
 #include "ui.h"
-#include "frames.h"
+#include "uiframe.h"
 #include <meta/util.h>
 #include "menu.h"
 #include "core.h"
-#include "theme-private.h"

 #include "inlinepixbufs.h"

@@ -47,7 +46,7 @@ struct _MetaUI
 {
  Display *xdisplay;
  Screen *xscreen;
-  MetaFrames *frames;
+  GHashTable *frames;

  /* For double-click tracking */
  guint button_click_number;
@@ -82,7 +81,7 @@ meta_ui_get_display (void)
  return GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 }

-/* We do some of our event handling in frames.c, which expects
+/* We do some of our event handling in uiframe.c, which expects
 * GDK events delivered by GTK+.  However, since the transition to
 * client side windows, we can't let GDK see button events, since the
 * client-side tracking of implicit and explicit grabs it does will
@@ -93,7 +92,7 @@ meta_ui_get_display (void)
 * through the normal GDK event handling.
 *
 * To reduce the amount of code, the only events fields filled out
- * below are the ones that frames.c uses. If frames.c is modified to
+ * below are the ones that uiframe.c uses. If uiframe.c is modified to
 * use more fields, more fields need to be filled out below.
 */

@@ -270,6 +269,60 @@ meta_ui_remove_event_func (Display       *xdisplay,
  ef = NULL;
 }

+
+static void
+queue_draw_func (gpointer key, gpointer value, gpointer data)
+{
+  gtk_widget_queue_draw (GTK_WIDGET (value));
+}
+
+static void
+button_layout_changed (MetaUI *ui)
+{
+  g_hash_table_foreach (ui->frames, queue_draw_func, NULL);
+}
+
+static void
+prefs_changed_callback (MetaPreference pref,
+                        void          *data)
+{
+  switch (pref)
+    {
+    case META_PREF_BUTTON_LAYOUT:
+      button_layout_changed ((MetaUI *) data);
+      break;
+    default:
+      break;
+    }
+}
+
+static gint
+unsigned_long_equal (gconstpointer v1,
+                     gconstpointer v2)
+{
+  return *((const gulong*) v1) == *((const gulong*) v2);
+}
+
+static guint
+unsigned_long_hash (gconstpointer v)
+{
+  gulong val = * (const gulong *) v;
+
+  /* I'm not sure this works so well. */
+#if GLIB_SIZEOF_LONG > 4
+  return (guint) (val ^ (val >> 32));
+#else
+  return val;
+#endif
+}
+
+static MetaUIFrame*
+meta_ui_lookup_window (MetaUI *ui,
+                       Window  xwindow)
+{
+  return g_hash_table_lookup (ui->frames, &xwindow);
+}
+
 MetaUI*
 meta_ui_new (Display *xdisplay,
             Screen  *screen)
@@ -284,11 +337,9 @@ meta_ui_new (Display *xdisplay,
  gdisplay = gdk_x11_lookup_xdisplay (xdisplay);
  g_assert (gdisplay == gdk_display_get_default ());

-  ui->frames = meta_frames_new (XScreenNumberOfScreen (screen));
-  /* This does not actually show any widget. MetaFrames has been hacked so
-   * that showing it doesn't actually do anything. But we need the flags
-   * set for GTK to deliver events properly. */
-  gtk_widget_show (GTK_WIDGET (ui->frames));
+  ui->frames = g_hash_table_new_full (unsigned_long_hash, unsigned_long_equal,
+                                      NULL, (GDestroyNotify) gtk_widget_destroy);
+  meta_prefs_add_listener (prefs_changed_callback, ui);

  g_object_set_data (G_OBJECT (gdisplay), "meta-ui", ui);

@@ -300,7 +351,9 @@ meta_ui_free (MetaUI *ui)
 {
  GdkDisplay *gdisplay;

-  gtk_widget_destroy (GTK_WIDGET (ui->frames));
+  g_assert (g_hash_table_size (ui->frames) == 0);
+  meta_prefs_remove_listener (prefs_changed_callback, ui);
+  g_hash_table_unref (ui->frames);

  gdisplay = gdk_x11_lookup_xdisplay (ui->xdisplay);
  g_object_set_data (G_OBJECT (gdisplay), "meta-ui", NULL);
@@ -310,24 +363,24 @@ meta_ui_free (MetaUI *ui)

 void
 meta_ui_get_frame_borders (MetaUI *ui,
-                           Window frame_xwindow,
+                           Window xwindow,
                           MetaFrameBorders *borders)
 {
-  meta_frames_get_borders (ui->frames, frame_xwindow,
-                           borders);
+  MetaUIFrame *frame = meta_ui_lookup_window (ui, xwindow);
+
+  if (frame == NULL)
+    meta_bug ("No such frame 0x%lx\n", xwindow);
+  
+  meta_uiframe_get_frame_borders (frame, borders);
 }

 void
-meta_ui_get_corner_radiuses (MetaUI *ui,
-                             Window  xwindow,
-                             float  *top_left,
-                             float  *top_right,
-                             float  *bottom_left,
-                             float  *bottom_right)
+meta_ui_render_background (MetaUI  *ui,
+                           Window   xwindow,
+                           cairo_t *cr)
 {
-  meta_frames_get_corner_radiuses (ui->frames, xwindow,
-                                   top_left, top_right,
-                                   bottom_left, bottom_right);
+  MetaUIFrame *frame = meta_ui_lookup_window (ui, xwindow);
+  meta_uiframe_paint (frame, cr);
 }

 Window
@@ -347,6 +400,7 @@ meta_ui_create_frame_window (MetaUI *ui,
  gint attributes_mask;
  GdkWindow *window;
  GdkVisual *visual;
+  MetaUIFrame *frame;
  
  /* Default depth/visual handles clients with weird visuals; they can
   * always be children of the root depth/visual obviously, but
@@ -396,28 +450,84 @@ meta_ui_create_frame_window (MetaUI *ui,
 		    &attrs, attributes_mask);

  gdk_window_resize (window, width, height);
-  
-  meta_frames_manage_window (ui->frames, GDK_WINDOW_XID (window), window);

-  return GDK_WINDOW_XID (window);
+  frame = g_object_new (META_TYPE_UIFRAME,
+                        "type", GTK_WINDOW_POPUP,
+                        "app-paintable", TRUE,
+                        NULL);
+
+  /* This fakes out the widget so it won't actually
+   * get realized as a server-side window. */
+
+  /* XXX: the gtk_widget_set_parent_window call unsets is_toplevel,
+   * leading to the widget not being realized, which triggers all sorts
+   * of assertions. Company suggested the below hack until we have
+   * something better. */
+
+  /* gtk_widget_set_parent_window (GTK_WIDGET (frame), window); */
+  g_object_set_data (G_OBJECT (frame), "gtk-parent-window", g_object_ref (window));
+
+  gdk_window_set_user_data (window, frame);
+
+  /* Don't set event mask here, it's in frame.c */
+  frame->window = g_object_ref (window);
+  frame->xwindow = GDK_WINDOW_XID (window);
+  frame->prelit_control = META_FRAME_CONTROL_NONE;
+
+  /* Don't set the window background yet; we need frame->xwindow to be
+   * registered with its MetaWindow, which happens after this function
+   * and meta_ui_create_frame_window() return to meta_window_ensure_frame().
+   */
+  meta_core_grab_buttons (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), frame->xwindow);
+
+  g_hash_table_replace (ui->frames, &frame->xwindow, frame);
+
+  return frame->xwindow;
+}
+
+void
+meta_ui_realize_frame_window (MetaUI  *ui,
+                            Window   xwindow)
+{
+  MetaUIFrame *frame = meta_ui_lookup_window (ui, xwindow);
+  gtk_widget_show (GTK_WIDGET (frame));
 }

 void
 meta_ui_destroy_frame_window (MetaUI *ui,
 			      Window  xwindow)
 {
-  meta_frames_unmanage_window (ui->frames, xwindow);
+  MetaUIFrame *frame;
+
+  frame = g_hash_table_lookup (ui->frames, &xwindow);
+
+  if (frame)
+    {
+      /* restore the cursor */
+      meta_core_set_screen_cursor (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                                   frame->xwindow,
+                                   META_CURSOR_DEFAULT);
+
+      gdk_window_set_user_data (frame->window, NULL);
+
+      g_hash_table_remove (ui->frames, &frame->xwindow);
+    }
+  else
+    meta_warning ("Frame 0x%lx not managed, can't unmanage\n", xwindow);
 }

 void
 meta_ui_move_resize_frame (MetaUI *ui,
-			   Window frame,
+			   Window xwindow,
 			   int x,
 			   int y,
 			   int width,
 			   int height)
 {
-  meta_frames_move_resize_frame (ui->frames, frame, x, y, width, height);
+  MetaUIFrame *frame = meta_ui_lookup_window (ui, xwindow);
+
+  gdk_window_move_resize (frame->window, x, y, width, height);
+  gtk_widget_set_size_request (GTK_WIDGET (frame), width, height);
 }

 void
@@ -448,52 +558,15 @@ meta_ui_unmap_frame (MetaUI *ui,
    gdk_window_hide (window);
 }

-void
-meta_ui_unflicker_frame_bg (MetaUI *ui,
-                            Window  xwindow,
-                            int     target_width,
-                            int     target_height)
-{
-  meta_frames_unflicker_bg (ui->frames, xwindow,
-                            target_width, target_height);
-}
-
-void
-meta_ui_update_frame_style (MetaUI  *ui,
-                            Window   xwindow)
-{
-  meta_frames_update_frame_style (ui->frames, xwindow);
-}
-
-void
-meta_ui_repaint_frame (MetaUI *ui,
-                       Window xwindow)
-{
-  meta_frames_repaint_frame (ui->frames, xwindow);
-}
-
-void
-meta_ui_reset_frame_bg (MetaUI *ui,
-                        Window xwindow)
-{
-  meta_frames_reset_bg (ui->frames, xwindow);
-}
-
-cairo_region_t *
-meta_ui_get_frame_bounds (MetaUI  *ui,
-                          Window   xwindow,
-                          int      window_width,
-                          int      window_height)
-{
-  return meta_frames_get_frame_bounds (ui->frames, xwindow,
-                                       window_width, window_height);
-}
-
 void
 meta_ui_queue_frame_draw (MetaUI *ui,
                          Window xwindow)
 {
-  meta_frames_queue_draw (ui->frames, xwindow);
+  MetaUIFrame *frame = meta_ui_lookup_window (ui, xwindow);
+  GtkWidget *widget = GTK_WIDGET (frame);
+  /* Force a style update. */
+  gtk_style_context_invalidate (gtk_widget_get_style_context (widget));
+  gtk_widget_queue_draw (widget);
 }

 void
@@ -501,11 +574,14 @@ meta_ui_set_frame_title (MetaUI     *ui,
                         Window      xwindow,
                         const char *title)
 {
-  meta_frames_set_title (ui->frames, xwindow, title);
+  MetaUIFrame *frame = meta_ui_lookup_window (ui, xwindow);
+  meta_uiframe_set_title (frame, title);
 }

 MetaWindowMenu*
 meta_ui_window_menu_new  (MetaUI             *ui,
+                          Display            *display,
+                          gint                screen_no,
                          Window              client_xwindow,
                          MetaMenuOp          ops,
                          MetaMenuOp          insensitive,
@@ -514,7 +590,7 @@ meta_ui_window_menu_new  (MetaUI             *ui,
                          MetaWindowMenuFunc  func,
                          gpointer            data)
 {
-  return meta_window_menu_new (ui->frames,
+  return meta_window_menu_new (ui, display, screen_no,
                               ops, insensitive,
                               client_xwindow,
                               active_workspace,
@@ -588,18 +664,6 @@ meta_gdk_pixbuf_get_from_pixmap (Pixmap       xpixmap,
  return retval;
 }

-void
-meta_ui_push_delay_exposes (MetaUI *ui)
-{
-  meta_frames_push_delay_exposes (ui->frames);
-}
-
-void
-meta_ui_pop_delay_exposes  (MetaUI *ui)
-{
-  meta_frames_pop_delay_exposes (ui->frames);
-}
-
 GdkPixbuf*
 meta_ui_get_default_window_icon (MetaUI *ui)
 {
@@ -721,57 +785,6 @@ meta_text_property_to_utf8 (Display             *xdisplay,
  return retval;
 }

-void
-meta_ui_theme_get_frame_borders (MetaUI *ui,
-                                 MetaFrameType      type,
-                                 MetaFrameFlags     flags,
-                                 MetaFrameBorders  *borders)
-{
-  int text_height;
-  GtkStyleContext *style = NULL;
-  PangoContext *context;
-  const PangoFontDescription *font_desc;
-
-  if (meta_ui_have_a_theme ())
-    {
-      context = gtk_widget_get_pango_context (GTK_WIDGET (ui->frames));
-      font_desc = meta_prefs_get_titlebar_font ();
-
-      if (!font_desc)
-        {
-          style = gtk_style_context_new ();
-          font_desc = gtk_style_context_get_font (style, 0);
-        }
-
-      text_height = meta_pango_font_desc_get_text_height (font_desc, context);
-
-      meta_theme_get_frame_borders (meta_theme_get_current (),
-                                    type, text_height, flags,
-                                    borders);
-    }
-  else
-    {
-      meta_frame_borders_clear (borders);
-    }
-
-  if (style != NULL)
-    g_object_unref (style);
-}
-
-void
-meta_ui_set_current_theme (const char *name,
-                           gboolean    force_reload)
-{
-  meta_theme_set_current (name, force_reload);
-  meta_invalidate_default_icons ();
-}
-
-gboolean
-meta_ui_have_a_theme (void)
-{
-  return meta_theme_get_current () != NULL;
-}
-
 static void
 meta_ui_accelerator_parse (const char      *accel,
                           guint           *keysym,
@@ -976,7 +989,7 @@ meta_ui_window_is_widget (MetaUI *ui,
    {
      void *user_data = NULL;
      gdk_window_get_user_data (window, &user_data);
-      return user_data != NULL && user_data != ui->frames;
+      return user_data != NULL && !META_IS_UIFRAME (user_data);
    }
  else
    return FALSE;
@@ -1030,7 +1043,7 @@ meta_ui_get_drag_threshold (MetaUI *ui)
  GtkSettings *settings;
  int threshold;

-  settings = gtk_widget_get_settings (GTK_WIDGET (ui->frames));
+  settings = gtk_settings_get_default ();

  threshold = 8;
  g_object_get (G_OBJECT (settings), "gtk-dnd-drag-threshold", &threshold, NULL);
@@ -1047,3 +1060,29 @@ meta_ui_get_direction (void)
  return META_UI_DIRECTION_LTR;
 }

+void
+meta_ui_notify_menu_hide (MetaUI *ui)
+{
+  Display *display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+  if (meta_core_get_grab_op (display) ==
+      META_GRAB_OP_CLICKING_MENU)
+    {
+      Window grab_frame;
+
+      grab_frame = meta_core_get_grab_frame (display);
+
+      if (grab_frame != None)
+        {
+          MetaUIFrame *frame;
+          frame = meta_ui_lookup_window (ui, grab_frame);
+
+          if (frame)
+            {
+              /* XXX: will redo redraw_control with GTK+ widgets
+               * soon enough */
+              /* redraw_control (frame, META_FRAME_CONTROL_MENU); */
+              meta_core_end_grab_op (display, CurrentTime);
+            }
+        }
+    }
+}
--- a/src/ui/ui.h
+++ b/src/ui/ui.h
@@ -57,10 +57,6 @@ MetaUI* meta_ui_new (Display *xdisplay,
                     Screen  *screen);
 void    meta_ui_free (MetaUI *ui);

-void meta_ui_theme_get_frame_borders (MetaUI *ui,
-                                      MetaFrameType      type,
-                                      MetaFrameFlags     flags,
-                                      MetaFrameBorders *borders);
 void meta_ui_get_frame_borders (MetaUI *ui,
                                Window frame_xwindow,
                                MetaFrameBorders *borders);
@@ -73,6 +69,8 @@ Window meta_ui_create_frame_window (MetaUI *ui,
 				    gint height,
 				    gint screen_no,
                                    gulong *create_serial);
+void meta_ui_realize_frame_window (MetaUI *ui,
+				   Window  xwindow);
 void meta_ui_destroy_frame_window (MetaUI *ui,
 				   Window  xwindow);
 void meta_ui_move_resize_frame (MetaUI *ui,
@@ -88,24 +86,9 @@ void meta_ui_map_frame   (MetaUI *ui,
 void meta_ui_unmap_frame (MetaUI *ui,
                          Window  xwindow);

-void meta_ui_unflicker_frame_bg (MetaUI *ui,
-                                 Window  xwindow,
-                                 int     target_width,
-                                 int     target_height);
-void meta_ui_reset_frame_bg     (MetaUI *ui,
-                                 Window  xwindow);
-
-cairo_region_t *meta_ui_get_frame_bounds (MetaUI  *ui,
-                                          Window   xwindow,
-                                          int      window_width,
-                                          int      window_height);
-
-void meta_ui_get_corner_radiuses (MetaUI *ui,
-                                  Window  xwindow,
-                                  float  *top_left,
-                                  float  *top_right,
-                                  float  *bottom_left,
-                                  float  *bottom_right);
+void meta_ui_render_background (MetaUI  *ui,
+                                Window   xwindow,
+                                cairo_t *cr);

 void meta_ui_queue_frame_draw (MetaUI *ui,
                               Window xwindow);
@@ -114,13 +97,9 @@ void meta_ui_set_frame_title (MetaUI *ui,
                              Window xwindow,
                              const char *title);

-void meta_ui_update_frame_style (MetaUI  *ui,
-                                 Window   window);
-
-void meta_ui_repaint_frame (MetaUI *ui,
-                            Window xwindow);
-
 MetaWindowMenu* meta_ui_window_menu_new   (MetaUI             *ui,
+                                           Display            *display,
+                                           gint                screen_no,
                                           Window              client_xwindow,
                                           MetaMenuOp          ops,
                                           MetaMenuOp          insensitive,
@@ -143,13 +122,6 @@ GdkPixbuf* meta_gdk_pixbuf_get_from_pixmap (Pixmap       xpixmap,
                                            int          width,
                                            int          height);

-/* Used when we have a server grab and draw all over everything,
- * then we need to handle exposes after doing that, instead of
- * during it
- */
-void      meta_ui_push_delay_exposes (MetaUI *ui);
-void      meta_ui_pop_delay_exposes  (MetaUI *ui);
-
 GdkPixbuf* meta_ui_get_default_window_icon (MetaUI *ui);
 GdkPixbuf* meta_ui_get_default_mini_icon (MetaUI *ui);

@@ -159,10 +131,6 @@ gboolean  meta_ui_window_should_not_cause_focus (Display *xdisplay,
 char*     meta_text_property_to_utf8 (Display             *xdisplay,
                                      const XTextProperty *prop);

-void     meta_ui_set_current_theme (const char *name,
-                                    gboolean    force_reload);
-gboolean meta_ui_have_a_theme      (void);
-
 /* Not a real key symbol but means "key above the tab key"; this is
 * used as the default keybinding for cycle_group.
 * 0x2xxxxxxx is a range not used by GDK or X. the remaining digits are
@@ -186,6 +154,8 @@ int      meta_ui_get_drag_threshold       (MetaUI *ui);

 MetaUIDirection meta_ui_get_direction (void);

+void meta_ui_notify_menu_hide (MetaUI *ui);
+
 #include "tabpopup.h"
 #include "tile-preview.h"

--- a/src/ui/uiframe.c
+++ b/src/ui/uiframe.c
@@ -0,0 +1,940 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Metacity window frame manager widget */
+
+/* 
+ * Copyright (C) 2001 Havoc Pennington
+ * Copyright (C) 2003 Red Hat, Inc.
+ * Copyright (C) 2005, 2006 Elijah Newren
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ * 
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+ * 02111-1307, USA.
+ */
+
+#include <config.h>
+#include <math.h>
+#include <string.h>
+#include <meta/boxes.h>
+#include "uiframe.h"
+#include <meta/util.h>
+#include "core.h"
+#include "menu.h"
+#include <meta/prefs.h>
+#include "ui.h"
+
+#ifdef HAVE_SHAPE
+#include <X11/extensions/shape.h>
+#endif
+
+static MetaFrameControl get_control  (MetaUIFrame       *frame,
+                                      int                x,
+                                      int                y);
+
+G_DEFINE_TYPE (MetaUIFrame, meta_uiframe, GTK_TYPE_WINDOW);
+
+
+static void
+initialize_style_context (MetaUIFrame *frame)
+{
+  GtkWidget *widget;
+  GtkCssProvider *provider;
+  GdkScreen *screen;
+  char *theme_name, *variant;
+
+  if (G_LIKELY (frame->style_context_initialized))
+    return;
+
+  widget = GTK_WIDGET (frame);
+
+  screen = gtk_widget_get_screen (widget);
+  g_object_get (gtk_settings_get_for_screen (screen),
+                "gtk-theme-name", &theme_name,
+                NULL);
+
+  meta_core_get (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (frame))),
+                 frame->xwindow,
+                 META_CORE_GET_THEME_VARIANT, &variant,
+                 META_CORE_GET_END);
+
+  provider = gtk_css_provider_get_named (theme_name, variant);
+  gtk_style_context_add_provider (gtk_widget_get_style_context (widget),
+                                  GTK_STYLE_PROVIDER (provider),
+                                  GTK_STYLE_PROVIDER_PRIORITY_THEME);
+
+  g_free (theme_name);
+
+  frame->style_context_initialized = TRUE;
+}
+
+static void
+sync_state_flags (MetaUIFrame *frame)
+{
+  MetaFrameFlags flags;
+  GtkStateFlags gtk_flags;
+
+  initialize_style_context (frame);
+
+  meta_core_get (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (frame))),
+                 frame->xwindow,
+                 META_CORE_GET_FRAME_FLAGS, &flags,
+                 META_CORE_GET_END);
+
+  gtk_flags = GTK_STATE_FLAG_NORMAL;
+
+  if ((flags & META_FRAME_HAS_FOCUS) == 0)
+    gtk_flags |= GTK_STATE_FLAG_BACKDROP;
+
+  gtk_widget_set_state_flags (GTK_WIDGET (frame), gtk_flags, TRUE);
+}
+
+void
+meta_uiframe_get_frame_borders (MetaUIFrame      *frame,
+                                MetaFrameBorders *borders)
+{
+  GtkWidget *widget = GTK_WIDGET (frame);
+  GtkBorder padding;
+  GtkStyleContext *style_context;
+  MetaFrameType type;
+  MetaFrameFlags flags;
+  int draggable_borders;
+
+  meta_core_get (GDK_DISPLAY_XDISPLAY (gtk_widget_get_display (GTK_WIDGET (frame))),
+                 frame->xwindow,
+                 META_CORE_GET_FRAME_TYPE, &type,
+                 META_CORE_GET_FRAME_FLAGS, &flags,
+                 META_CORE_GET_END);
+
+  /* For a full-screen window, we don't have any borders, visible or not. */
+  if (flags & META_FRAME_FULLSCREEN)
+    return;
+
+  sync_state_flags (frame);
+
+  meta_frame_borders_clear (borders);
+
+  style_context = gtk_widget_get_style_context (widget);
+
+  gtk_style_context_get_border (style_context,
+                                gtk_widget_get_state_flags (widget),
+                                &borders->visible);
+
+  gtk_style_context_get_padding (style_context,
+                                 gtk_widget_get_state_flags (widget),
+                                 &padding);
+
+  borders->visible.left += padding.left;
+  borders->visible.right += padding.right;
+  borders->visible.top += padding.top;
+  borders->visible.bottom += padding.bottom;
+
+  draggable_borders = meta_prefs_get_draggable_border_width ();
+
+  if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE)
+    {
+      borders->invisible.left   = MAX (0, draggable_borders - borders->visible.left);
+      borders->invisible.right  = MAX (0, draggable_borders - borders->visible.right);
+    }
+
+  if (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE)
+    {
+      borders->invisible.bottom = MAX (0, draggable_borders - borders->visible.bottom);
+
+      /* borders.visible.top is the height of the *title bar*. We can't do the same
+       * algorithm here, titlebars are expectedly much bigger. Just subtract a couple
+       * pixels to get a proper feel. */
+      if (type != META_FRAME_TYPE_ATTACHED)
+        borders->invisible.top    = MAX (0, draggable_borders - 2);
+    }
+
+  borders->total.left   = borders->invisible.left   + borders->visible.left;
+  borders->total.right  = borders->invisible.right  + borders->visible.right;
+  borders->total.bottom = borders->invisible.bottom + borders->visible.bottom;
+  borders->total.top    = borders->invisible.top    + borders->visible.top;
+}
+
+static void
+meta_uiframe_finalize (GObject *obj)
+{
+  MetaUIFrame *frame = META_UIFRAME (obj);
+
+  if (frame->window)
+    g_object_unref (frame->window);
+}
+
+static void
+meta_uiframe_init (MetaUIFrame *frame)
+{
+  GtkWidget *container, *label;
+
+  frame->container = container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+  frame->label = label = gtk_label_new ("");
+  frame->style_context_initialized = FALSE;
+
+  gtk_container_add (GTK_CONTAINER (frame), container);
+  gtk_container_add (GTK_CONTAINER (container), frame->label);
+
+  gtk_widget_set_hexpand (container, TRUE);
+  gtk_widget_set_hexpand (label, TRUE);
+  gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
+  gtk_widget_set_valign (label, GTK_ALIGN_START);
+
+  gtk_widget_show_all (GTK_WIDGET (container));
+}
+
+/* The client rectangle surrounds client window; it subtracts both
+ * the visible and invisible borders from the frame window's size.
+ */
+static void
+get_client_rect (MetaFrameBorders      *borders,
+                 int                    window_width,
+                 int                    window_height,
+                 cairo_rectangle_int_t *rect)
+{
+  rect->x = borders->total.left;
+  rect->y = borders->total.top;
+  rect->width = window_width - borders->total.right - rect->x;
+  rect->height = window_height - borders->total.bottom - rect->y;
+}
+
+void
+meta_uiframe_set_title (MetaUIFrame *frame,
+                        const char  *title)
+{
+  gtk_label_set_text (GTK_LABEL (frame->label), title);
+}
+
+static gboolean
+meta_frame_titlebar_event (MetaUIFrame    *frame,
+                           GdkEventButton *event,
+                           int            action)
+{
+  MetaFrameFlags flags;
+  Display *display;
+
+  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+
+  switch (action)
+    {
+    case G_DESKTOP_TITLEBAR_ACTION_TOGGLE_SHADE:
+      {
+        meta_core_get (display, frame->xwindow,
+                       META_CORE_GET_FRAME_FLAGS, &flags,
+                       META_CORE_GET_END);
+        
+        if (flags & META_FRAME_ALLOWS_SHADE)
+          {
+            if (flags & META_FRAME_SHADED)
+              meta_core_unshade (display,
+                                 frame->xwindow,
+                                 event->time);
+            else
+              meta_core_shade (display,
+                               frame->xwindow,
+                               event->time);
+          }
+      }
+      break;          
+      
+    case G_DESKTOP_TITLEBAR_ACTION_TOGGLE_MAXIMIZE:
+      {
+        meta_core_get (display, frame->xwindow,
+                       META_CORE_GET_FRAME_FLAGS, &flags,
+                       META_CORE_GET_END);
+        
+        if (flags & META_FRAME_ALLOWS_MAXIMIZE)
+          {
+            meta_core_toggle_maximize (display, frame->xwindow);
+          }
+      }
+      break;
+
+    case G_DESKTOP_TITLEBAR_ACTION_TOGGLE_MAXIMIZE_HORIZONTALLY:
+      {
+        meta_core_get (display, frame->xwindow,
+                       META_CORE_GET_FRAME_FLAGS, &flags,
+                       META_CORE_GET_END);
+        
+        if (flags & META_FRAME_ALLOWS_MAXIMIZE)
+          {
+            meta_core_toggle_maximize_horizontally (display, frame->xwindow);
+          }
+      }
+      break;
+
+    case G_DESKTOP_TITLEBAR_ACTION_TOGGLE_MAXIMIZE_VERTICALLY:
+      {
+        meta_core_get (display, frame->xwindow,
+                       META_CORE_GET_FRAME_FLAGS, &flags,
+                       META_CORE_GET_END);
+        
+        if (flags & META_FRAME_ALLOWS_MAXIMIZE)
+          {
+            meta_core_toggle_maximize_vertically (display, frame->xwindow);
+          }
+      }
+      break;
+
+    case G_DESKTOP_TITLEBAR_ACTION_MINIMIZE:
+      {
+        meta_core_get (display, frame->xwindow,
+                       META_CORE_GET_FRAME_FLAGS, &flags,
+                       META_CORE_GET_END);
+        
+        if (flags & META_FRAME_ALLOWS_MINIMIZE)
+          {
+            meta_core_minimize (display, frame->xwindow);
+          }
+      }
+      break;
+
+    case G_DESKTOP_TITLEBAR_ACTION_NONE:
+      /* Yaay, a sane user that doesn't use that other weird crap! */
+      break;
+    
+    case G_DESKTOP_TITLEBAR_ACTION_LOWER:
+      meta_core_user_lower_and_unfocus (display,
+                                        frame->xwindow,
+                                        event->time);
+      break;
+
+    case G_DESKTOP_TITLEBAR_ACTION_MENU:
+      meta_core_show_window_menu (display,
+                                  frame->xwindow,
+                                  event->x_root,
+                                  event->y_root,
+                                  event->button,
+                                  event->time);
+      break;
+    }
+  
+  return TRUE;
+}
+
+static gboolean
+meta_frame_double_click_event (MetaUIFrame    *frame,
+                               GdkEventButton *event)
+{
+  int action = meta_prefs_get_action_double_click_titlebar ();
+  
+  return meta_frame_titlebar_event (frame, event, action);
+}
+
+static gboolean
+meta_frame_middle_click_event (MetaUIFrame    *frame,
+                               GdkEventButton *event)
+{
+  int action = meta_prefs_get_action_middle_click_titlebar();
+  
+  return meta_frame_titlebar_event (frame, event, action);
+}
+
+static gboolean
+meta_frame_right_click_event(MetaUIFrame     *frame,
+                             GdkEventButton  *event)
+{
+  int action = meta_prefs_get_action_right_click_titlebar();
+  
+  return meta_frame_titlebar_event (frame, event, action);
+}
+
+static gboolean
+meta_uiframe_button_press_event (GtkWidget      *widget,
+                                 GdkEventButton *event)
+{
+  MetaUIFrame *frame;
+  MetaFrameControl control;
+  Display *display;
+
+  frame = META_UIFRAME (widget);
+
+  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+
+  /* Remember that the display may have already done something with this event.
+   * If so there's probably a GrabOp in effect.
+   */
+  control = get_control (frame, event->x, event->y);
+
+  /* focus on click, even if click was on client area */
+  if (event->button == 1 &&
+      !(control == META_FRAME_CONTROL_MINIMIZE ||
+        control == META_FRAME_CONTROL_DELETE ||
+        control == META_FRAME_CONTROL_MAXIMIZE))
+    {
+      meta_topic (META_DEBUG_FOCUS,
+                  "Focusing window with frame 0x%lx due to button 1 press\n",
+                  frame->xwindow);
+      meta_core_user_focus (display,
+                            frame->xwindow,
+                            event->time);      
+    }
+
+  /* don't do the rest of this if on client area */
+  if (control == META_FRAME_CONTROL_CLIENT_AREA)
+    return FALSE; /* not on the frame, just passed through from client */
+  
+  /* We want to shade even if we have a GrabOp, since we'll have a move grab
+   * if we double click the titlebar.
+   */
+  if (control == META_FRAME_CONTROL_TITLE &&
+      event->button == 1 &&
+      event->type == GDK_2BUTTON_PRESS)
+    {
+      meta_core_end_grab_op (display, event->time);
+      return meta_frame_double_click_event (frame, event);
+    }
+
+  if (meta_core_get_grab_op (display) !=
+      META_GRAB_OP_NONE)
+    return FALSE; /* already up to something */  
+
+  if (event->button == 1 &&
+      (control == META_FRAME_CONTROL_MAXIMIZE ||
+       control == META_FRAME_CONTROL_UNMAXIMIZE ||
+       control == META_FRAME_CONTROL_MINIMIZE ||
+       control == META_FRAME_CONTROL_DELETE ||
+       control == META_FRAME_CONTROL_SHADE ||
+       control == META_FRAME_CONTROL_UNSHADE ||
+       control == META_FRAME_CONTROL_ABOVE ||
+       control == META_FRAME_CONTROL_UNABOVE ||
+       control == META_FRAME_CONTROL_STICK ||
+       control == META_FRAME_CONTROL_UNSTICK ||
+       control == META_FRAME_CONTROL_MENU))
+    {
+      MetaGrabOp op = META_GRAB_OP_NONE;
+
+      switch (control)
+        {
+        case META_FRAME_CONTROL_MINIMIZE:
+          op = META_GRAB_OP_CLICKING_MINIMIZE;
+          break;
+        case META_FRAME_CONTROL_MAXIMIZE:
+          op = META_GRAB_OP_CLICKING_MAXIMIZE;
+          break;
+        case META_FRAME_CONTROL_UNMAXIMIZE:
+          op = META_GRAB_OP_CLICKING_UNMAXIMIZE;
+          break;
+        case META_FRAME_CONTROL_DELETE:
+          op = META_GRAB_OP_CLICKING_DELETE;
+          break;
+        case META_FRAME_CONTROL_MENU:
+          op = META_GRAB_OP_CLICKING_MENU;
+          break;
+        case META_FRAME_CONTROL_SHADE:
+          op = META_GRAB_OP_CLICKING_SHADE;
+          break;
+        case META_FRAME_CONTROL_UNSHADE:
+          op = META_GRAB_OP_CLICKING_UNSHADE;
+          break;
+        case META_FRAME_CONTROL_ABOVE:
+          op = META_GRAB_OP_CLICKING_ABOVE;
+          break;
+        case META_FRAME_CONTROL_UNABOVE:
+          op = META_GRAB_OP_CLICKING_UNABOVE;
+          break;
+        case META_FRAME_CONTROL_STICK:
+          op = META_GRAB_OP_CLICKING_STICK;
+          break;
+        case META_FRAME_CONTROL_UNSTICK:
+          op = META_GRAB_OP_CLICKING_UNSTICK;
+          break;
+        default:
+          g_assert_not_reached ();
+          break;
+        }
+
+      meta_core_begin_grab_op (display,
+                               frame->xwindow,
+                               op,
+                               TRUE,
+                               TRUE,
+                               event->button,
+                               0,
+                               event->time,
+                               event->x_root,
+                               event->y_root);      
+    }
+  else if (event->button == 1 &&
+           (control == META_FRAME_CONTROL_RESIZE_SE ||
+            control == META_FRAME_CONTROL_RESIZE_S ||
+            control == META_FRAME_CONTROL_RESIZE_SW ||
+            control == META_FRAME_CONTROL_RESIZE_NE ||
+            control == META_FRAME_CONTROL_RESIZE_N ||
+            control == META_FRAME_CONTROL_RESIZE_NW ||
+            control == META_FRAME_CONTROL_RESIZE_E ||
+            control == META_FRAME_CONTROL_RESIZE_W))
+    {
+      MetaGrabOp op;
+      
+      op = META_GRAB_OP_NONE;
+      
+      switch (control)
+        {
+        case META_FRAME_CONTROL_RESIZE_SE:
+          op = META_GRAB_OP_RESIZING_SE;
+          break;
+        case META_FRAME_CONTROL_RESIZE_S:
+          op = META_GRAB_OP_RESIZING_S;
+          break;
+        case META_FRAME_CONTROL_RESIZE_SW:
+          op = META_GRAB_OP_RESIZING_SW;
+          break;
+        case META_FRAME_CONTROL_RESIZE_NE:
+          op = META_GRAB_OP_RESIZING_NE;
+          break;
+        case META_FRAME_CONTROL_RESIZE_N:
+          op = META_GRAB_OP_RESIZING_N;
+          break;
+        case META_FRAME_CONTROL_RESIZE_NW:
+          op = META_GRAB_OP_RESIZING_NW;
+          break;
+        case META_FRAME_CONTROL_RESIZE_E:
+          op = META_GRAB_OP_RESIZING_E;
+          break;
+        case META_FRAME_CONTROL_RESIZE_W:
+          op = META_GRAB_OP_RESIZING_W;
+          break;
+        default:
+          g_assert_not_reached ();
+          break;
+        }
+
+      meta_core_begin_grab_op (display,
+                               frame->xwindow,
+                               op,
+                               TRUE,
+                               TRUE,
+                               event->button,
+                               0,
+                               event->time,
+                               event->x_root,
+                               event->y_root);
+    }
+  else if (control == META_FRAME_CONTROL_TITLE &&
+           event->button == 1)
+    {
+      MetaFrameFlags flags;
+
+      meta_core_get (display, frame->xwindow,
+                     META_CORE_GET_FRAME_FLAGS, &flags,
+                     META_CORE_GET_END);
+
+      if (flags & META_FRAME_ALLOWS_MOVE)
+        {          
+          meta_core_begin_grab_op (display,
+                                   frame->xwindow,
+                                   META_GRAB_OP_MOVING,
+                                   TRUE,
+                                   TRUE,
+                                   event->button,
+                                   0,
+                                   event->time,
+                                   event->x_root,
+                                   event->y_root);
+        }
+    }
+  else if (event->button == 2)
+    {
+      return meta_frame_middle_click_event (frame, event);
+    }
+  else if (event->button == 3)
+    {
+      return meta_frame_right_click_event (frame, event);
+    }
+  
+  return TRUE;
+}
+
+static gboolean
+meta_uiframe_button_release_event    (GtkWidget           *widget,
+                                      GdkEventButton      *event)
+{
+  MetaUIFrame *frame;
+  MetaGrabOp op;
+  Display *display;
+  
+  frame = META_UIFRAME (widget);
+  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+
+  op = meta_core_get_grab_op (display);
+
+  if (op == META_GRAB_OP_NONE)
+    return FALSE;
+
+  /* We only handle the releases we handled the presses for (things
+   * involving frame controls). Window ops that don't require a
+   * frame are handled in the Xlib part of the code, display.c/window.c
+   */
+  if (frame->xwindow == meta_core_get_grab_frame (display) &&
+      ((int) event->button) == meta_core_get_grab_button (display))
+    {
+      MetaFrameControl control;
+
+      control = get_control (frame, event->x, event->y);
+      
+      switch (op)
+        {
+        case META_GRAB_OP_CLICKING_MINIMIZE:
+          if (control == META_FRAME_CONTROL_MINIMIZE)
+            meta_core_minimize (display, frame->xwindow);
+          
+          meta_core_end_grab_op (display, event->time);
+          break;
+
+        case META_GRAB_OP_CLICKING_MAXIMIZE:
+          if (control == META_FRAME_CONTROL_MAXIMIZE)
+          {
+            /* Focus the window on the maximize */
+            meta_core_user_focus (display,
+                            frame->xwindow,
+                            event->time);      
+            meta_core_maximize (display, frame->xwindow);
+          }
+          meta_core_end_grab_op (display, event->time);
+          break;
+
+        case META_GRAB_OP_CLICKING_UNMAXIMIZE:
+          if (control == META_FRAME_CONTROL_UNMAXIMIZE)
+            meta_core_unmaximize (display, frame->xwindow);
+          
+          meta_core_end_grab_op (display, event->time);
+          break;
+          
+        case META_GRAB_OP_CLICKING_DELETE:
+          if (control == META_FRAME_CONTROL_DELETE)
+            meta_core_delete (display, frame->xwindow, event->time);
+          
+          meta_core_end_grab_op (display, event->time);
+          break;
+          
+        case META_GRAB_OP_CLICKING_MENU:
+          meta_core_end_grab_op (display, event->time);
+          break;
+
+        case META_GRAB_OP_CLICKING_SHADE:
+          if (control == META_FRAME_CONTROL_SHADE)
+            meta_core_shade (display, frame->xwindow, event->time);
+          
+          meta_core_end_grab_op (display, event->time);
+          break;
+ 
+        case META_GRAB_OP_CLICKING_UNSHADE:
+          if (control == META_FRAME_CONTROL_UNSHADE)
+            meta_core_unshade (display, frame->xwindow, event->time);
+
+          meta_core_end_grab_op (display, event->time);
+          break;
+
+        case META_GRAB_OP_CLICKING_ABOVE:
+          if (control == META_FRAME_CONTROL_ABOVE)
+            meta_core_make_above (display, frame->xwindow);
+          
+          meta_core_end_grab_op (display, event->time);
+          break;
+ 
+        case META_GRAB_OP_CLICKING_UNABOVE:
+          if (control == META_FRAME_CONTROL_UNABOVE)
+            meta_core_unmake_above (display, frame->xwindow);
+
+          meta_core_end_grab_op (display, event->time);
+          break;
+
+        case META_GRAB_OP_CLICKING_STICK:
+          if (control == META_FRAME_CONTROL_STICK)
+            meta_core_stick (display, frame->xwindow);
+
+          meta_core_end_grab_op (display, event->time);
+          break;
+ 
+        case META_GRAB_OP_CLICKING_UNSTICK:
+          if (control == META_FRAME_CONTROL_UNSTICK)
+            meta_core_unstick (display, frame->xwindow);
+
+          meta_core_end_grab_op (display, event->time);
+          break;
+          
+        default:
+          break;
+        }
+    }
+  
+  return TRUE;
+}
+
+static void
+clip_to_screen (cairo_region_t *region,
+                MetaUIFrame    *frame)
+{
+  cairo_rectangle_int_t frame_area;
+  cairo_rectangle_int_t screen_area = { 0, 0, 0, 0 };
+  cairo_region_t *tmp_region;
+  
+  /* Chop off stuff outside the screen; this optimization
+   * is crucial to handle huge client windows,
+   * like "xterm -geometry 1000x1000"
+   */
+  meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                 frame->xwindow,
+                 META_CORE_GET_FRAME_X, &frame_area.x,
+                 META_CORE_GET_FRAME_Y, &frame_area.y,
+                 META_CORE_GET_FRAME_WIDTH, &frame_area.width,
+                 META_CORE_GET_FRAME_HEIGHT, &frame_area.height,
+                 META_CORE_GET_SCREEN_WIDTH, &screen_area.width,
+                 META_CORE_GET_SCREEN_HEIGHT, &screen_area.height,
+                 META_CORE_GET_END);
+
+  cairo_region_translate (region, frame_area.x, frame_area.y);
+
+  tmp_region = cairo_region_create_rectangle (&frame_area);
+  cairo_region_intersect (region, tmp_region);
+  cairo_region_destroy (tmp_region);
+
+  tmp_region = cairo_region_create_rectangle (&screen_area);
+  cairo_region_intersect (region, tmp_region);
+  cairo_region_destroy (tmp_region);
+
+  cairo_region_translate (region, - frame_area.x, - frame_area.y);
+}
+
+static void
+subtract_client_area (cairo_region_t *region,
+                      MetaUIFrame    *frame)
+{
+  cairo_rectangle_int_t area;
+  MetaFrameBorders borders;
+  cairo_region_t *tmp_region;
+  Display *display;
+  
+  display = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+
+  meta_core_get (display, frame->xwindow,
+                 META_CORE_GET_CLIENT_WIDTH, &area.width,
+                 META_CORE_GET_CLIENT_HEIGHT, &area.height,
+                 META_CORE_GET_END);
+
+  meta_uiframe_get_frame_borders (frame, &borders);
+
+  area.x = borders.total.left;
+  area.y = borders.total.top;
+
+  tmp_region = cairo_region_create_rectangle (&area);
+  cairo_region_subtract (region, tmp_region);
+  cairo_region_destroy (tmp_region);
+}
+
+void
+meta_uiframe_paint (MetaUIFrame  *frame,
+                    cairo_t      *cr)
+{
+  GtkWidget *widget = GTK_WIDGET (frame);
+  GtkStyleContext *style_gtk = gtk_widget_get_style_context (widget);
+  GdkRectangle visible_rect;
+  MetaFrameBorders borders;
+
+  meta_uiframe_get_frame_borders (frame, &borders);
+  gtk_widget_get_allocation (widget, &visible_rect);
+
+  visible_rect.x += borders.invisible.left;
+  visible_rect.y += borders.invisible.top;
+  visible_rect.width -= borders.invisible.left + borders.invisible.right;
+  visible_rect.height -= borders.invisible.top - borders.invisible.bottom;
+
+  sync_state_flags (frame);
+
+  gtk_render_background (style_gtk, cr,
+                         visible_rect.x,
+                         visible_rect.y,
+                         visible_rect.width,
+                         visible_rect.height);
+
+  gtk_render_frame (style_gtk, cr,
+                    visible_rect.x,
+                    visible_rect.y,
+                    visible_rect.width,
+                    visible_rect.height);
+
+  /* We chain up to paint the contents here so that the mask
+   * we paint with meta_frame_render_background can be accurate
+   * with children. */
+  GTK_WIDGET_CLASS (meta_uiframe_parent_class)->draw (widget, cr);
+}
+
+static gboolean
+meta_uiframe_draw (GtkWidget *widget,
+                   cairo_t   *cr)
+{
+  MetaUIFrame *frame;
+  cairo_region_t *region;
+  cairo_rectangle_int_t clip;
+
+  frame = META_UIFRAME (widget);
+  gdk_cairo_get_clip_rectangle (cr, &clip);
+
+  region = cairo_region_create_rectangle (&clip);
+
+  clip_to_screen (region, frame);
+  subtract_client_area (region, frame);
+
+  if (cairo_region_num_rectangles (region) == 0)
+    goto out;
+
+  gdk_cairo_region (cr, region);
+  cairo_clip (cr);
+
+  cairo_save (cr);
+  cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+  cairo_set_source_rgba (cr, 1, 1, 1, 1);
+  cairo_paint (cr);
+  cairo_restore (cr);
+
+  meta_uiframe_paint (frame, cr);
+
+ out:
+  cairo_region_destroy (region);
+
+  return TRUE;
+}
+
+static void
+meta_uiframe_style_updated (GtkWidget *widget)
+{
+  MetaUIFrame *frame = META_UIFRAME (widget);
+  GtkWidget *container = frame->container;
+  MetaFrameBorders borders;
+
+  meta_uiframe_get_frame_borders (frame, &borders);
+
+  gtk_widget_set_margin_left (container, borders.total.left);
+  gtk_widget_set_margin_right (container, borders.total.right);
+  gtk_widget_set_margin_top (container, borders.invisible.top);
+  gtk_widget_set_size_request (container, -1, borders.visible.top);
+}
+
+static MetaFrameControl
+get_control (MetaUIFrame *frame,
+             int x, int y)
+{
+  MetaFrameBorders borders;
+  MetaFrameFlags flags;
+  MetaFrameType type;
+  gboolean has_vert, has_horiz;
+  gboolean has_north_resize;
+  cairo_rectangle_int_t client;
+  int width, height;
+
+  meta_core_get (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+                 frame->xwindow,
+                 META_CORE_GET_FRAME_FLAGS, &flags,
+                 META_CORE_GET_CLIENT_WIDTH, &width,
+                 META_CORE_GET_CLIENT_HEIGHT, &height,
+                 META_CORE_GET_FRAME_TYPE, &type,
+                 META_CORE_GET_END);
+
+  meta_uiframe_get_frame_borders (frame, &borders);
+  get_client_rect (&borders, width, height, &client);
+
+  if (POINT_IN_RECT (x, y, client))
+    return META_FRAME_CONTROL_CLIENT_AREA;
+
+  has_north_resize = (type != META_FRAME_TYPE_ATTACHED);
+  has_vert = (flags & META_FRAME_ALLOWS_VERTICAL_RESIZE) != 0;
+  has_horiz = (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE) != 0;
+
+  /* South resize always has priority over north resize,
+   * in case of overlap.
+   */
+
+  if (y >= (height - borders.total.bottom) &&
+      x >= (width - borders.total.right))
+    {
+      if (has_vert && has_horiz)
+        return META_FRAME_CONTROL_RESIZE_SE;
+      else if (has_vert)
+        return META_FRAME_CONTROL_RESIZE_S;
+      else if (has_horiz)
+        return META_FRAME_CONTROL_RESIZE_E;
+    }
+  else if (y >= (height - borders.total.bottom) &&
+           x <= borders.total.left)
+    {
+      if (has_vert && has_horiz)
+        return META_FRAME_CONTROL_RESIZE_SW;
+      else if (has_vert)
+        return META_FRAME_CONTROL_RESIZE_S;
+      else if (has_horiz)
+        return META_FRAME_CONTROL_RESIZE_W;
+    }
+  else if (y < (borders.invisible.top) &&
+           x <= borders.total.left && has_north_resize)
+    {
+      if (has_vert && has_horiz)
+        return META_FRAME_CONTROL_RESIZE_NW;
+      else if (has_vert)
+        return META_FRAME_CONTROL_RESIZE_N;
+      else if (has_horiz)
+        return META_FRAME_CONTROL_RESIZE_W;
+    }
+  else if (y < (borders.invisible.top) &&
+           x >= width - borders.total.right && has_north_resize)
+    {
+      if (has_vert && has_horiz)
+        return META_FRAME_CONTROL_RESIZE_NE;
+      else if (has_vert)
+        return META_FRAME_CONTROL_RESIZE_N;
+      else if (has_horiz)
+        return META_FRAME_CONTROL_RESIZE_E;
+    }
+  else if (y < borders.invisible.top)
+    {
+      if (has_vert && has_north_resize)
+        return META_FRAME_CONTROL_RESIZE_N;
+    }
+  else if (y >= (height - borders.total.bottom))
+    {
+      if (has_vert)
+        return META_FRAME_CONTROL_RESIZE_S;
+    }
+  else if (x <= borders.total.left)
+    {
+      if (has_horiz)
+        return META_FRAME_CONTROL_RESIZE_W;
+    }
+  else if (x >= (width - borders.total.right))
+    {
+      if (has_horiz)
+        return META_FRAME_CONTROL_RESIZE_E;
+    }
+
+  if (y >= borders.total.top)
+    return META_FRAME_CONTROL_NONE;
+  else
+    return META_FRAME_CONTROL_TITLE;
+}
+
+static void
+meta_uiframe_class_init (MetaUIFrameClass *class)
+{
+  GObjectClass   *gobject_class;
+  GtkWidgetClass *widget_class;
+
+  gobject_class = G_OBJECT_CLASS (class);
+  widget_class = GTK_WIDGET_CLASS (class);
+
+  gobject_class->finalize = meta_uiframe_finalize;
+
+  widget_class->draw = meta_uiframe_draw;
+  widget_class->style_updated = meta_uiframe_style_updated;
+  widget_class->button_press_event = meta_uiframe_button_press_event;
+  widget_class->button_release_event = meta_uiframe_button_release_event;
+}
--- a/src/ui/uiframe.h
+++ b/src/ui/uiframe.h
@@ -0,0 +1,101 @@
+/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
+
+/* Metacity window frame manager widget */
+
+/* 
+ * Copyright (C) 2001 Havoc Pennington
+ * 
+ * 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_UIFRAME_H
+#define META_UIFRAME_H
+
+#include <gtk/gtk.h>
+#include <gdk/gdkx.h>
+#include <meta/common.h>
+
+typedef enum
+{
+  META_FRAME_CONTROL_NONE,
+  META_FRAME_CONTROL_TITLE,
+  META_FRAME_CONTROL_DELETE,
+  META_FRAME_CONTROL_MENU,
+  META_FRAME_CONTROL_MINIMIZE,
+  META_FRAME_CONTROL_MAXIMIZE,
+  META_FRAME_CONTROL_UNMAXIMIZE,
+  META_FRAME_CONTROL_SHADE,
+  META_FRAME_CONTROL_UNSHADE,
+  META_FRAME_CONTROL_ABOVE,
+  META_FRAME_CONTROL_UNABOVE,
+  META_FRAME_CONTROL_STICK,
+  META_FRAME_CONTROL_UNSTICK,
+  META_FRAME_CONTROL_RESIZE_SE,
+  META_FRAME_CONTROL_RESIZE_S,
+  META_FRAME_CONTROL_RESIZE_SW,
+  META_FRAME_CONTROL_RESIZE_N,
+  META_FRAME_CONTROL_RESIZE_NE,
+  META_FRAME_CONTROL_RESIZE_NW,
+  META_FRAME_CONTROL_RESIZE_W,
+  META_FRAME_CONTROL_RESIZE_E,
+  META_FRAME_CONTROL_CLIENT_AREA
+} MetaFrameControl;
+
+/* This is one widget that manages all the window frames
+ * as subwindows.
+ */
+
+#define META_TYPE_UIFRAME            (meta_uiframe_get_type ())
+#define META_UIFRAME(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), META_TYPE_UIFRAME, MetaUIFrame))
+#define META_UIFRAME_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), META_TYPE_UIFRAME, MetaUIFrameClass))
+#define META_IS_UIFRAME(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), META_TYPE_UIFRAME))
+#define META_IS_UIFRAME_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), META_TYPE_UIFRAME))
+#define META_UIFRAME_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), META_TYPE_UIFRAME, MetaUIFrameClass))
+
+typedef struct _MetaUIFrame        MetaUIFrame;
+typedef struct _MetaUIFrameClass   MetaUIFrameClass;
+
+struct _MetaUIFrame
+{
+  GtkWindow parent_instance;
+
+  Window xwindow;
+  GdkWindow *window;
+  MetaFrameControl prelit_control;
+
+  GtkWidget *label;
+  GtkWidget *container;
+
+  gboolean style_context_initialized;
+};
+
+struct _MetaUIFrameClass
+{
+  GtkWindowClass parent_class;
+};
+
+GType        meta_uiframe_get_type (void) G_GNUC_CONST;
+
+void meta_uiframe_set_title (MetaUIFrame *frame,
+                             const char  *title);
+
+void meta_uiframe_paint (MetaUIFrame  *frame,
+                         cairo_t      *cr);
+
+void meta_uiframe_get_frame_borders (MetaUIFrame      *frame,
+                                     MetaFrameBorders *borders);
+
+#endif
Author	SHA1	Message	Date
Jasper St. Pierre	7623b97399	Remove legacy theming API Since the move to GTK+ toplevels, it required removing the preview-widget and theme-viewer parts of the code. (They didn't work with the new CSS stuff anyway... shhh..)	2012-05-07 20:37:09 -03:00
Jasper St. Pierre	8d8e0cb055	uiframe: Make children respect border/padding Also, center the label horizontally. There's still some shenanigans I have to figure out with respect to vertical centering... This should be in GTK+ by default...	2012-05-07 20:33:00 -03:00
Jasper St. Pierre	1620131434	ui: Make sure to invalidate the style on a retheme/redraw	2012-05-07 20:21:13 -03:00
Jasper St. Pierre	873da3405c	frames: Only realize the widget after it's been properly associated This makes sure that we don't get into a situation from a GTK+ handler where we'll have an unassociated frame window.	2012-05-07 20:20:51 -03:00
Jasper St. Pierre	8a062b39ab	display: Make meta_display_retheme_all public	2012-05-07 20:19:51 -03:00
Jasper St. Pierre	3ab3c8423e	theme: Start using MetaUIFrame for the context path Very soon we'll be scrapping this and doing something different internally	2012-05-05 02:11:34 -03:00
Jasper St. Pierre	11e1f687f9	theme: Remove support for painting layouts We'll do this with a GtkLabel child instead. This means that the mask text shadows are currently broken -- we'll fix up things later to be better.	2012-05-05 01:30:30 -03:00
Jasper St. Pierre	25815473e6	theme: Scrap meta_theme_draw_frame The more public symbols we remove, the closer we get to not supporting the legacy theme API at all...	2012-05-05 00:00:47 -03:00
Jasper St. Pierre	5053997021	ui: Scrap MetaFrames, move rest of frame management into MetaUi Additionally, rename the code that houses MetaUIFrame to uiframe.[ch], and fix up some other places that depended on MetaFrames.	2012-05-04 23:48:10 -03:00
Jasper St. Pierre	b6468a7fa5	frames: Add a GtkWindow per frame Now, now, it's not as bad as it sounds. We're using gtk_widget_set_parent_window, as used by glade to embed toplevel windows, to do our magic.	2012-05-04 23:10:28 -03:00
Jasper St. Pierre	e2e0ead870	theme: Remove some more unused methods	2012-05-04 13:32:53 -04:00
Jasper St. Pierre	f80a5d892f	preview-widget: Don't override settings for the pango layout This is now in CSS. Remove the now unused meta_gtk_widget_get_font_desc as well.	2012-05-04 13:30:54 -04:00
Jasper St. Pierre	5823c5e0f5	ui: Remove text_height from the public theme interface It wasn't being used	2012-05-04 13:29:18 -04:00
Jasper St. Pierre	ecac8c9d09	prefs: Remove titlebar font and use-system-font preferences Specify them in CSS instead.	2012-05-03 23:21:37 -04:00
Jasper St. Pierre	2666303045	frames: Support rendering layouts	2012-05-03 23:17:36 -04:00
Jasper St. Pierre	0a9bc8995a	frames: Support opacity in frame drawing There's still a bug here (frame opacity doesn't "kick in" until we change the frame geometry), and the colors aren't correct (we're painting on top of a white surface, not a 0-alpha surface), but we at least remove some redraw issues that come when you're not always obscuring the last paint.	2012-05-03 16:03:45 -04:00
Jasper St. Pierre	143436c37c	frames: Remove reset_frames / unflicker_bg	2012-05-03 16:00:26 -04:00
Jasper St. Pierre	7c11e0b0eb	frames: Remove caching XXX hack just to see how slow it is	2012-05-02 14:37:17 -04:00
Jasper St. Pierre	beccdd64f5	frames: Remove invalidate_cache_timeout WTF was this for? Was this a hacky bugfix? The git log gives no information.	2012-05-02 14:37:17 -04:00
Jasper St. Pierre	dd0a6d7e08	frames: Only make one call to meta_frames_paint	2012-05-02 14:37:17 -04:00
Jasper St. Pierre	02bb550bd6	theme: Calculate frame geometry borders from CSS Use the CSS 'border' and 'padding' properties rather than frame geometry. This is a bit messy, so I'll fix it up with a new path representing the titlebar soon.	2012-05-02 14:37:17 -04:00
Jasper St. Pierre	8f789a8fad	ui: Remove meta_ui_theme_get_frame_borders The function is easily replaced, and also becomes more correct as different window types may have different extents.	2012-05-02 14:37:17 -04:00
Jasper St. Pierre	865b9df9a9	window-actor: Use MetaRegionBuilder when scanning the visible region This gives a pretty solid performance improvement when resizing windows.	2012-05-02 14:37:17 -04:00
Jasper St. Pierre	1e9268045d	window-actor: Add a debugging tool to write a region to a PNG Just a helper function that I keep rewriting all over the place.	2012-05-02 14:37:17 -04:00
Jasper St. Pierre	20acb73024	frames: Remove get_frame_bounds It's now unused, and we can't use it if we want to let GTK+ paint and scan the frame region. With it, we can also stop depending on the terrible GTK+ hack and remove the corner radius properties in the frame geometry, as they aren't needed any more.	2012-05-02 14:37:17 -04:00
Jasper St. Pierre	b97ad209c2	window-actor: Don't use get_frame_bounds We want to remove it.	2012-05-02 14:37:17 -04:00
Jasper St. Pierre	f2d8e3266b	window-actor: Use cairo to paint regular shape region	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	11be2fa36a	window-actor: Work around cairo bug Thank to Company and ickle, a cairo bug was identified and then fixed. They helped me verify I'm not going insane! http://cgit.freedesktop.org/cairo/commit/?id=ec400daf9ec3bbd8403324db7fcdaf175e185e7b	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	302302a116	window-actor: Paint the frame mask with GTK+ as well Use meta_theme_render_background to paint the background of the frame, and then scan it to give us a region we can use to generate the shape region from. It may be worth looking at the uses of the shape region to see if we can replace some (all?) of them by masks instead, so we don't have to scan the mask.	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	fd13dad0c4	window-actor: Use cairo_region_create_rectangles Instead of the bunch of unions.	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	2da1ed1ae0	theme: Split GtkStateFlags grabbing code out	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	58f04c7284	Add simple dumb CSS rendering	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	a6737ef129	theme: Make meta_frame_style_draw_with_style private	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	52fee4df1c	window-actor: Add back antialiased window corners This simply adds fancy arcs to the mask texture.	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	8da12ac0e0	window-actor: Punt mask generation to MetaWindowActor This effectively makes MetaShapedTexture not a MetaShapedTexture, but a simple and dumb MetaMaskedTexture, with an optimization for clipped regions. We're doing this as the mask may need to be more complicated than made of a region plus a "cairo overlay" -- we eventually want GTK+ to draw the rounded corner background. Save rounded corners for a later commit, again.	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	e43f8db6e8	window-actor: Remove an unnecessary frame check meta_frame_calc_borders will zero out the borders if we don't have a frame.	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	a7cbc9ad9a	meta-shaped-texture: Remove corners for now We'll add them back with gtk_render_background	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	0be3f81841	theme: Use a MetaWindow path rather than a GtkWidget path This is a terrible ugly hack.	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	f53e26bc39	frames: Fix border-radius stupidity Since we're breaking the theme format, we don't need to do this any logner.	2012-05-02 14:37:16 -04:00
Jasper St. Pierre	cc3be6da4d	theme: Parse window radiuses from CSS This requires a local hack to GTK+ that's ugly and I'm not sharing it. We'll do things properly soon enough.	2012-05-02 14:37:15 -04:00
Jasper St. Pierre	fef2a061a8	theme: Require a GTK+ style context in meta_theme_calc_geometry	2012-05-02 14:37:15 -04:00
Jasper St. Pierre	bdb995d758	theme: Make meta_frame_layout_calc_geometry private	2012-05-02 14:37:15 -04:00
Jasper St. Pierre	2a729f89aa	preview-widget: Remove the unused meta_preview_get_clip_region Besides being unused, it used meta_theme_get_frame_style. Since we want to remove the static style layout structs, we need to remove usage of that. Removing unused usage is the way to go.	2012-05-02 14:37:15 -04:00
Jasper St. Pierre	af242b27b2	ui: Move theme variant code loading into theme.c As we'll have a new API that draws using GtkStyleContext, it makes sense to put all API using GtkStyleContext where the theme code is. Note that the MetaThemeVariant code is just a stop-gap right now - in the future, we'll have per-window theming, using CSS infrastructure like includes for code reuse.	2012-05-02 14:37:15 -04:00
Jasper St. Pierre	a198ff415a	theme: Remove dead code While the comment claims that we may want to keep this around for optimization purposes, the operations are raw bitmap operations that would be cleaner done in cairo. https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:37:00 -04:00
Jasper St. Pierre	981c1c2ab5	theme: Remove bogus comment https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:37:00 -04:00
Jasper St. Pierre	fb35f9fa49	theme: Replace char array element comparisons with strncmp https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:37:00 -04:00
Jasper St. Pierre	9194a04faa	theme: Remove COLORIZE feature of images From a quick code search and grep of gnome-themes-standard, none of the themes that I inspected used this feature. Since it's the last thing that uses a lot of old legacy GdkPixbuf code, I'd rather just consider the feature unsupported at this point and clean up everything I need to. https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:37:00 -04:00
Jasper St. Pierre	a0ed41d8ce	theme: Use cairo for drawing uncolorized IMAGEs https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:37:00 -04:00
Jasper St. Pierre	e3e87727b6	theme: Use cairo for TINT operations with alpha https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:37:00 -04:00
Jasper St. Pierre	2d878f29eb	theme: Use cairo for drawing ICON Thanks to Benjamin Otte for helping me clean this up. https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:37:00 -04:00
Jasper St. Pierre	307e4c7d0e	theme: Properly indent code s/tabs/spaces/ https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:37:00 -04:00
Jasper St. Pierre	43e7687d89	theme: Consolidate unused ops https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:36:59 -04:00
Jasper St. Pierre	2e4f67f3f9	theme: Remove our own gradient stuff Part one of porting to cairo. This requires removing support for a seldomly used feature in the theme format - alpha gradients on tint, icon and image. Grepping through gnome-themes-standard and searching for code, I couldn't find any usage of this feature, so I consider it safe to remove. Thanks to Benjamin Otte for helping me clean this up. https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:36:59 -04:00
Jasper St. Pierre	69c11b59c4	theme: Remove unused RECTANGLE code https://bugzilla.gnome.org/show_bug.cgi?id=662962	2012-05-02 14:36:59 -04:00
Evan Broder	4148a5cc6a	Fix introspection gir metadata The EXPORT_PACKAGES variable to the GIR makefile should be the packages needed to use this gir. It's also unnecessary to set PACKAGES (which is just used for CFLAGS at scan-time) since CFLAGS is already pulls in all necessary CFLAGS. https://bugzilla.gnome.org/show_bug.cgi?id=671092	2012-05-02 14:13:48 -04:00
Pavel Vasin	8a6a568aca	meta_stack_tracker_free(): fix memory leak https://bugzilla.gnome.org/show_bug.cgi?id=672640	2012-05-02 14:03:56 -04:00
Pavel Vasin	12cc0cee29	display: correctly init and free hostname ==31043== 7 bytes in 1 blocks are definitely lost in loss record 213 of 6,861 ==31043== at 0x402B018: malloc (in /usr/lib/valgrind/vgpreload_memcheck-x86-linux.so) ==31043== by 0x417789A: ??? (in /usr/lib/libglib-2.0.so.0.3122.0) ==31043== by 0x4177C42: g_malloc (in /usr/lib/libglib-2.0.so.0.3122.0) ==31043== by 0x418DC3A: g_strdup (in /usr/lib/libglib-2.0.so.0.3122.0) ==31043== by 0x408C470: meta_display_open (display.c:475) ==31043== by 0x40A4D42: meta_run (main.c:552) ==31043== by 0x8048A74: main (mutter.c:96) https://bugzilla.gnome.org/show_bug.cgi?id=672640	2012-05-02 14:03:34 -04:00
Jasper St. Pierre	878b1012b4	window-actor: Another simple clang warning fix If we explicitly check for a NULL pointer, clang will assume that the pointer may be NULL at some point. We clearly rely on the pointer being non-NULL earlier, so fix this guy up. https://bugzilla.gnome.org/show_bug.cgi?id=674876	2012-05-01 18:25:33 -04:00
Jasper St. Pierre	a78fec7951	window: Remove setting of an unused variable Well, technically it's used, but only in one block, so let's just make it scoped to that block. https://bugzilla.gnome.org/show_bug.cgi?id=674876	2012-05-01 18:21:17 -04:00
Jasper St. Pierre	a24c512caa	boxes: Remove an unnecessary assignment https://bugzilla.gnome.org/show_bug.cgi?id=674876	2012-05-01 18:21:17 -04:00
Owen W. Taylor	c669a3892e	meta_window_move_frame(): fix crash when frame is NULL When meta_frame_calc_borders() was made to take a NULL frame argument, a crash was accidentally introduced into meta_window_move_frame(). This partially reverts `8c1b2d5`. https://bugzilla.gnome.org/show_bug.cgi?id=675254	2012-05-01 13:44:35 -04:00
Owen W. Taylor	ba4f008d40	meta_window_actor_has_shadow: remove verbosity meta_window_actor_has_shadow() is called for every paint for every window, verbosely logging in it makes the output of MUTTER_VERBOSE pretty much useless.	2012-05-01 11:37:23 -04:00
Jasper St. Pierre	b0a099935b	frames: Remove forgotten references to tooltips Tooltips were removed a little while back, but two historical artifacts were untouched. We're not in the museum business, now are we...	2012-04-30 16:36:18 -04:00
Praveen Illa	aba39ef953	Updated Telugu Translation	2012-04-30 11:00:28 +05:30
Jasper St. Pierre	ebf8c460e1	default plugin: Remove start method that does nothing All animations use the constants directly, so this is just declaring a bunch of local variables and then doing nothing with it. Another clang warning. https://bugzilla.gnome.org/show_bug.cgi?id=674876	2012-04-26 15:07:46 -04:00
Jasper St. Pierre	25d3432eee	window-group: Remove an unnecessary assignment Clang warns about this. https://bugzilla.gnome.org/show_bug.cgi?id=674876	2012-04-26 15:07:46 -04:00
Jasper St. Pierre	cd7a74fbcd	texture-tower: Remove potential leak The expression in here does not match the one where we malloc the data. https://bugzilla.gnome.org/show_bug.cgi?id=674876	2012-04-26 10:02:41 -04:00
Javier Jardón	c64188c67f	core/window.c: Remove unused unmap_frame() function	2012-04-26 11:54:31 +01:00
Javier Jardón	4c2371f2e7	Revert "core/window.c: Remove unused function" This reverts commit `ff6c31dcc0`.	2012-04-26 11:54:12 +01:00
Javier Jardón	ff6c31dcc0	core/window.c: Remove unused function	2012-04-26 11:29:24 +01:00
Jasper St. Pierre	1b649c18ed	Remove live-hidden-windows from mutter-schemas.convert The preference no longer exists.	2012-04-26 02:37:34 -04:00
Owen W. Taylor	93037e4c6b	Make support for "XFree86" Xinerama mandatory Require the headers for "XFree86" Xinerama to be present at compile time. The older "Solaris" Xinerama is only needed for versions of Solaris where Mutter is unlikely to work. Solaris 10 and 11 include the XFree86 Xinerama libraries, and apparently that's the only version that will actually work for Solaris 11, which uses Xorg. https://bugzilla.gnome.org/show_bug.cgi?id=674727	2012-04-25 14:37:32 -04:00
Neil Roberts	ed358c8f4b	meta-texture-rectangle: Use Cogl's API to create a rectangle texture Cogl now has public experimental API to create a rectangle texture which we can use instead of creating a foreign texture with GL. This avoids Mutter depending on Cogl including a GL header from its public headers which it might not do in future. https://bugzilla.gnome.org/show_bug.cgi?id=672711	2012-04-25 14:54:09 +01:00
Robert Bragg	a22859a64a	shaped-texture: never slice shape mask texture Since Cogl doesn't support multi-texturing with sliced textures and the shape texture is combined with the texture-from-pixmap texture we need to make sure we never construct a sliced mask texture. This patch simply passes the COGL_TEXTURE_NO_SLICE flag to cogl_texture_from_data when creating the shape mask texture. https://bugzilla.gnome.org/show_bug.cgi?id=674731	2012-04-25 11:57:33 +01:00
Jasper St. Pierre	c44438b19f	Revert "Remove a bunch of dead code" This reverts commit `0d794f28f0`. I thought this was marked ACN. It wasn't.	2012-04-24 18:02:33 -04:00
Jasper St. Pierre	b58366d3ad	theme: Remove unused "widget" parameter to frame style drawing It seems that the only usage of the "widget" parameter throughout the entire call chain was to pass between two function calls as mutual recursion. https://bugzilla.gnome.org/show_bug.cgi?id=671104	2012-04-24 16:54:49 -04:00
Jasper St. Pierre	6900128b2f	theme: Remove unused entry points meta_draw_op_draw, meta_draw_op_list_draw, and meta_frame_style_draw were all unused https://bugzilla.gnome.org/show_bug.cgi?id=671104	2012-04-24 16:54:49 -04:00
Jasper St. Pierre	c0b4d68390	meta-window-actor: Remove some unused constants https://bugzilla.gnome.org/show_bug.cgi?id=671104	2012-04-24 16:54:49 -04:00
Jasper St. Pierre	0d794f28f0	Remove a bunch of dead code Code isn't version control. We don't need bug links and commented out code to remind us of how things were done originally. https://bugzilla.gnome.org/show_bug.cgi?id=671104	2012-04-24 16:54:49 -04:00
Jasper St. Pierre	e389eff79d	Remove meta_compositor_update_workspace_geometry This callback is just dead code https://bugzilla.gnome.org/show_bug.cgi?id=671104	2012-04-24 16:54:49 -04:00
Jasper St. Pierre	41adbdda12	prefs: Remove a dead declaration https://bugzilla.gnome.org/show_bug.cgi?id=671104	2012-04-24 16:41:04 -04:00
Jasper St. Pierre	2d6555ca4d	prefs: Remove live-hidden-windows preference The preference existed, even though it was hard-coded to true. Just remove it for good. https://bugzilla.gnome.org/show_bug.cgi?id=671104	2012-04-24 16:40:47 -04:00
Jasper St. Pierre	044d58951e	Switch to gtk-doc syntax https://bugzilla.gnome.org/show_bug.cgi?id=673752	2012-04-24 15:20:39 -04:00
Florian Müllner	9c97e8999e	keybindings: Remove 'toggle-recording' binding The keybinding is only useful when using GNOME Shell, so now that we can define keybindings outside of mutter, move it there. https://bugzilla.gnome.org/show_bug.cgi?id=674376	2012-04-24 17:36:46 +02:00