Merge lp:~compiz-team/compiz-core/oneiric.uwd_fixes into lp:~compiz-team/compiz-core/oneiric.new_uwd

[Sam Spilsbury]

Various UWD fixes to get the review process started. Needs LP bug references.

[Jason Smith (jassmith)]

+1, have tested and read code, nothing stuck out

review: Approve

[Jason Smith (jassmith)]

+1 again

review: Approve

=== modified file 'gtk/CMakeLists.txt'
--- gtk/CMakeLists.txt	2011-08-11 08:56:52 +0000
+++ gtk/CMakeLists.txt	2011-08-19 15:05:12 +0000
@@ -42,10 +42,5 @@
     compiz_set (USE_GNOME_KEYBINDINGS 0)
 endif (NOT USE_GNOME)
 
-configure_file (
-    ${CMAKE_CURRENT_SOURCE_DIR}/config.h.gtk.in
-    ${CMAKE_CURRENT_BINARY_DIR}/config.h
-)
-
 add_subdirectory (gnome)
 add_subdirectory (window-decorator)
 
=== removed file 'gtk/config.h.gtk.in'
--- gtk/config.h.gtk.in	2008-10-14 10:27:55 +0000
+++ gtk/config.h.gtk.in	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/* Define to 1 if Metacity support is enabled */
-#cmakedefine USE_METACITY 1
-
-/* Define to 1 if Gconf support is enabled */
-#cmakedefine USE_GCONF 1
-
-/* Define to 1 if you have the `wnck_window_has_name' function. */
-#cmakedefine HAVE_WNCK_WINDOW_HAS_NAME 1
-
-/* Define to 1 if libwnck version >= 2_18_1 */
-#cmakedefine HAVE_LIBWNCK_2_18_1 1
-
-/* Define to 1 if libwnck version >= 2_19_4 */
-#cmakedefine HAVE_LIBWNCK_2_19_4 1
-
-/* Define to 1 if metacity version >= 2.15.21 */
-#cmakedefine HAVE_METACITY_2_15_21 1
-
-/* Define to 1 if metacity version >= 2.17.0 */
-#cmakedefine HAVE_METACITY_2_17_0 1
-
-/* Define to 1 if metacity version >= 2.23.2 */
-#cmakedefine HAVE_METACITY_2_23_2 1
-
-#define GETTEXT_PACKAGE "${GETTEXT_PACKAGE}"
 
=== modified file 'gtk/window-decorator/CMakeLists.txt'
--- gtk/window-decorator/CMakeLists.txt	2011-08-11 16:42:06 +0000
+++ gtk/window-decorator/CMakeLists.txt	2011-08-19 15:05:12 +0000
@@ -36,162 +36,9 @@
 	pangocairo
     )
     if (UNITY_WINDOW_DECORATOR_FOUND)
-	include (CheckFunctionExists)
-        set (CMAKE_REQUIRED_FLAGS ${UNITY_WINDOW_DECORATOR_CFLAGS})
-        set (CMAKE_REQUIRED_LIBRARIES ${UNITY_WINDOW_DECORATOR_LIBRARIES})
-        list (FIND CMAKE_REQUIRED_FLAGS "-D_REENTRANT" REENTRANT_INDEX)
-        if (REENTRANT_INDEX)
-          list (REMOVE_AT CMAKE_REQUIRED_FLAGS REENTRANT_INDEX)
-          list (APPEND CMAKE_REQUIRED_FLAGS "-D_REENTRANT=1")
-        endif (REENTRANT_INDEX)
-        check_function_exists (wnck_window_has_name HAVE_WNCK_WINDOW_HAS_NAME)
-        set (CMAKE_REQUIRED_FLAGS "")
-        set (CMAKE_REQUIRED_LIBRARIES "")
-
-        compiz_pkg_check_modules (HAVE_LIBWNCK_2_18_1 libwnck-1.0>=2.18.1)
-        compiz_pkg_check_modules (HAVE_LIBWNCK_2_19_4 libwnck-1.0>=2.19.4)
-
-        if (BUILD_METACITY)
-            pkg_check_modules (METACITY libmetacity-private)
-            if (METACITY_FOUND)
-		compiz_pkg_check_modules (HAVE_METACITY_2_15_21 libmetacity-private>=2.15.21)
-		compiz_pkg_check_modules (HAVE_METACITY_2_17_0 libmetacity-private>=2.17.0)
-		compiz_pkg_check_modules (HAVE_METACITY_2_23_2 libmetacity-private>=2.23.2)
-            else (METACITY_FOUND)
-		compiz_set (USE_METACITY 0)
-            endif (METACITY_FOUND)
-        endif (BUILD_METACITY)
-
-	if (COMPIZ_BUILD_WITH_RPATH)
-	    set (CMAKE_INSTALL_RPATH ${libdir})
-	endif (COMPIZ_BUILD_WITH_RPATH)
-
-	configure_file (
-	    ${CMAKE_CURRENT_SOURCE_DIR}/config.h.gtk.in
-	    ${CMAKE_CURRENT_BINARY_DIR}/config.h
-	)
-
-	include_directories (
-        ${compiz_SOURCE_DIR}/include
-	    ${CMAKE_CURRENT_BINARY_DIR}
-	    ${UNITY_WINDOW_DECORATOR_INCLUDE_DIRS}
-	    ${METACITY_INCLUDE_DIRS}
-	    ${GCONF_INCLUDE_DIRS}
-	    ${DBUS_GLIB_INCLUDE_DIRS}
-	)
-
-	add_definitions (
-	    -DHAVE_CONFIG_H
-	    -DALL_LINGUAS=\"${ALL_LINGUAS}\"
-	    -DLOCALEDIR=\\\"${datadir}/locale\\\"
-	)
-
-	link_directories (
-	    ${UNITY_WINDOW_DECORATOR_LIBRARY_DIRS}
-	    ${COMPIZ_LINK_DIRS}
-	)
-
-	if (USE_GCONF_UNITY_WINDOW_DECORATOR)
-
-	    if (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-		set (SCHEMADIR "${CMAKE_INSTALL_PREFIX}/share/gconf/schemas")
-	    else (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-		set (SCHEMADIR "${COMPIZ_INSTALL_GCONF_SCHEMA_DIR}")
-	    endif (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
-
-	    set (gwd_schema ${CMAKE_CURRENT_BINARY_DIR}/gwd.schemas)
-
-	    compiz_translate_xml (
-	        ${CMAKE_CURRENT_SOURCE_DIR}/gwd.schemas.in
-	        ${gwd_schema}
-	    )
-
-	    compiz_install_gconf_schema (${CMAKE_CURRENT_BINARY_DIR}/gwd.schemas ${SCHEMADIR})
-
-	endif (USE_GCONF_UNITY_WINDOW_DECORATOR)
-
-	add_executable (unity-window-decorator
-			gtk-window-decorator.c
-			blurprops.c
-			decorprops.c
-			cairo.c
-			gdk.c
-			switcher.c
-			metacity.c
-			events.c
-			forcequit.c
-			actionmenu.c
-			settings.c
-			util.c
-			style.c
-			wnck.c
-			decorator.c
-			frames.c
-			${gwd_schema}
-	)
-
-	add_executable (gtk-window-decorator
-			gtk-window-decorator.c
-			blurprops.c
-			decorprops.c
-			cairo.c
-			gdk.c
-			switcher.c
-			metacity.c
-			events.c
-			forcequit.c
-			actionmenu.c
-			settings.c
-			util.c
-			style.c
-			wnck.c
-			decorator.c
-			frames.c
-			${gwd_schema}
-	)
-
-	if (USE_METACITY)
-	    set (metacitylibs ${METACITY_LIBRARIES})
-	endif (USE_METACITY)
-
-	set_target_properties (
-	    unity-window-decorator PROPERTIES
-	    INSTALL_RPATH_USE_LINK_PATH 0
-	)
-
-	target_link_libraries (unity-window-decorator
-				decoration
-				${UNITY_WINDOW_DECORATOR_LIBRARIES}
-				${GCONF_LIBRARIES}
-				${DBUS_GLIB_LIBRARIES}
-				${metacitylibs}
-	)
-
-	install (
-	    TARGETS unity-window-decorator
-	    DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}
-	    RUNTIME DESTINATION bin
-	)
-
-	set_target_properties (
-	    gtk-window-decorator PROPERTIES
-	    INSTALL_RPATH_USE_LINK_PATH 0
-	)
-
-	target_link_libraries (gtk-window-decorator
-				decoration
-				${UNITY_WINDOW_DECORATOR_LIBRARIES}
-				${GCONF_LIBRARIES}
-				${DBUS_GLIB_LIBRARIES}
-				${metacitylibs}
-	)
-
-	install (
-	    TARGETS gtk-window-decorator
-	    DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}
-	    RUNTIME DESTINATION bin
-	)
-
+
+	add_subdirectory (test-cache)
+	add_subdirectory (src)
 	add_subdirectory (simple_decorator)
 	add_subdirectory (decoration_inspector)
 
 
=== removed file 'gtk/window-decorator/config.h.gtk.in'
--- gtk/window-decorator/config.h.gtk.in	2011-08-11 08:56:52 +0000
+++ gtk/window-decorator/config.h.gtk.in	1970-01-01 00:00:00 +0000
@@ -1,25 +0,0 @@
-/* Define to 1 if Metacity support is enabled */
-#cmakedefine USE_METACITY 1
-
-/* Define to 1 if Gconf support is enabled */
-#cmakedefine USE_GCONF 1
-
-/* Define to 1 if you have the `wnck_window_has_name' function. */
-#cmakedefine HAVE_WNCK_WINDOW_HAS_NAME 1
-
-/* Define to 1 if libwnck version >= 2_18_1 */
-#cmakedefine HAVE_LIBWNCK_2_18_1 1
-
-/* Define to 1 if libwnck version >= 2_19_4 */
-#cmakedefine HAVE_LIBWNCK_2_19_4 1
-
-/* Define to 1 if metacity version >= 2.15.21 */
-#cmakedefine HAVE_METACITY_2_15_21 1
-
-/* Define to 1 if metacity version >= 2.17.0 */
-#cmakedefine HAVE_METACITY_2_17_0 1
-
-/* Define to 1 if metacity version >= 2.23.2 */
-#cmakedefine HAVE_METACITY_2_23_2 1
-
-#define GETTEXT_PACKAGE "${GETTEXT_PACKAGE}"
 
=== added file 'gtk/window-decorator/decoration-test.c'
--- gtk/window-decorator/decoration-test.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/decoration-test.c	2011-08-19 15:05:12 +0000
@@ -0,0 +1,540 @@
+/*
+ * decoration-test.h
+ *
+ * Copyright (c) 2011 Canonical Ltd.
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by:
+ * Sam Spilsbury <[e-mail]>
+ */
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+#include "decoration-test.h"
+
+
+int fasprintf (char **strret, const char *fmt, ... )
+{
+    char *orig = NULL;
+    int  ret = 1;
+
+    if (*strret)
+	orig = *strret;
+
+    va_list args;
+    va_start (args, fmt);
+    ret = vasprintf (strret, fmt, args);
+    va_end (args);
+
+    if (orig)
+	free (orig);
+
+    return ret;
+}
+	
+
+char *
+print_gravity (void *d)
+{
+    char *str = NULL;
+    int  gravity = *((int *)  d);
+    fasprintf (&str, "");
+
+    if (gravity & GRAVITY_WEST)
+	fasprintf (&str, "%sGRAVITY_WEST ", str);
+    if (gravity & GRAVITY_EAST)
+	fasprintf (&str, "%sGRAVITY_EAST ", str);
+    if (gravity & GRAVITY_NORTH)
+	fasprintf (&str, "%sGRAVITY_NORTH ", str);
+    if (gravity & GRAVITY_SOUTH)
+	fasprintf (&str, "%sGRAVITY_SOUTH ", str);
+
+    return str;
+}
+
+char *
+print_stretch (void *d)
+{
+    char *str = NULL;
+    int  stretch = *((int *) d);
+    fasprintf (&str, "");
+
+    if (stretch & STRETCH_X)
+	fasprintf (&str, "%sSTRETCH_X ", str);
+    if (stretch & STRETCH_Y)
+	fasprintf (&str, "%sSTRETCH_Y ", str);
+
+    return str;
+}
+
+char *
+print_align (void *d)
+{
+    char *str = NULL;
+    int  align = *((int *) d);
+    fasprintf (&str, "");
+
+    if (align & ALIGN_LEFT)
+	fasprintf (&str, "%sALIGN_LEFT ", str);
+    if (align & ALIGN_RIGHT)
+	fasprintf (&str, "%sALIGN_RIGHT ", str);
+    if (align & ALIGN_TOP)
+	fasprintf (&str, "%sALIGN_TOP ", str);
+    if (align & ALIGN_BOTTOM)
+	fasprintf (&str, "%sALIGN BOTTOM ", str);
+
+    return str;
+}
+
+char *
+print_clamp (void *d)
+{
+    char *str = NULL;
+    int  clamp = *((int *) d);
+    fasprintf (&str, "");
+
+    if (clamp & CLAMP_HORZ)
+	fasprintf (&str, "%sCLAMP_HORZ ", str);
+    if (clamp & CLAMP_VERT)
+	fasprintf (&str, "%sCLAMP_VERT ", str);
+
+    return str;
+}
+
+char *
+print_frame_type (void *d)
+{
+    char *str = NULL;
+    unsigned int frame_type = *((unsigned int *) d);
+    fasprintf (&str, "");
+
+    if (frame_type & DECOR_WINDOW_TYPE_NORMAL)
+	fasprintf (&str, "%sDECOR_WINDOW_TYPE_NORMAL ", str);
+    if (frame_type & DECOR_WINDOW_TYPE_DIALOG)
+	fasprintf (&str, "%sDECOR_WINDOW_TYPE_DIALOG ", str);
+    if (frame_type & DECOR_WINDOW_TYPE_MENU)
+	fasprintf (&str, "%sDECOR_WINDOW_TYPE_MENU ", str);
+    if (frame_type & DECOR_WINDOW_TYPE_UTILITY)
+	fasprintf (&str, "%sDECOR_WINDOW_TYPE_UTILITY ", str);
+    if (frame_type & DECOR_WINDOW_TYPE_BARE)
+	fasprintf (&str, "%sDECOR_WINDOW_TYPE_BARE ", str);
+    if (frame_type & DECOR_WINDOW_TYPE_SWITCHER)
+	fasprintf (&str, "%sDECOR_WINDOW_TYPE_SWITCHER ", str);
+
+    return str;
+}
+
+char *
+print_frame_actions (void *d)
+{
+    char *str = NULL;
+    unsigned int frame_actions = *((unsigned int *) d);
+    fasprintf (&str, "");
+
+    if (frame_actions & DECOR_WINDOW_ACTION_RESIZE_HORZ)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_RESIZE_HORZ ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_RESIZE_VERT)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_RESIZE_VERT ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_CLOSE)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_CLOSE ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_MINIMIZE)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_MINIMIZE ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_UNMINIMIZE)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_UNMINIMIZE ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_MAXIMIZE_HORZ)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_MAXIMIZE_HORZ ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_MAXIMIZE_VERT)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_MAXIMIZE_VERT ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_UNMAXIMIZE_HORZ)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_UNMAXIMIZE_HORZ ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_UNMAXIMIZE_VERT)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_UNMAXIMIZE_VERT ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_SHADE)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_SHADE ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_UNSHADE)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_UNSHADE ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_STICK)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_STICK ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_UNSTICK)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_UNSTICK ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_FULLSCREEN)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_FULLSCREEN ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_ABOVE)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_ABOVE ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_BELOW)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_BELOW ", str);
+    if (frame_actions & DECOR_WINDOW_ACTION_MOVE)
+	fasprintf (&str, "%sDECOR_WINDOW_ACTION_MOVE ", str);
+
+    return str;
+}
+
+char *
+print_frame_state (void *d)
+{
+    char *str = NULL;
+    unsigned int frame_state =  *((unsigned int *) d);
+    fasprintf (&str, "");
+
+    if (frame_state & DECOR_WINDOW_STATE_FOCUS)
+	fasprintf (&str, "%sDECOR_WINDOW_STATE_FOCUS ", str);
+    if (frame_state & DECOR_WINDOW_STATE_MAXIMIZED_VERT)
+	fasprintf (&str, "%sDECOR_WINDOW_STATE_MAXIMIZED_VERT ", str);
+    if (frame_state & DECOR_WINDOW_STATE_MAXIMIZED_HORZ)
+	fasprintf (&str, "%sDECOR_WINDOW_STATE_MAXIMIZED_HORZ ", str);
+    if (frame_state & DECOR_WINDOW_STATE_SHADED)
+	fasprintf (&str, "%sDECOR_WINDOW_STATE_SHADED ", str);
+    if (frame_state & DECOR_WINDOW_STATE_COMPOSITED)
+	fasprintf (&str, "%sDECOR_WINDOW_STATE_COMPOSITED ", str);
+    if (frame_state & DECOR_WINDOW_STATE_MODAL)
+	fasprintf (&str, "%sDECOR_WINDOW_STATE_MODAL ", str);
+
+    return str;
+}
+
+char *
+print_unsigned_hex (void *d)
+{
+    char *str = NULL;
+    unsigned int hex = *((unsigned int *) d);
+    fasprintf (&str, "");
+
+    fasprintf (&str, "%s0x%x", str, hex);
+
+    return str;
+}
+
+char *
+print_int (void *d)
+{
+    char *str = NULL;
+    unsigned int i = *((unsigned int *) d);
+
+    fasprintf (&str, "%s%i", str, i);
+
+    return str;
+}
+
+char *
+print_box (void *d)
+{
+    decor_point_t *point = ((decor_point_t *) d);
+    char *str = print_gravity ((void *) &(point->gravity));
+    fasprintf (&str, "");
+
+    fasprintf (&str, "%s : x: %i y: %i", str, point->x, point->y);
+
+    return str;
+}
+
+char *
+print_float (void *d)
+{
+    char *str = NULL;
+    float f = *((float *) d);
+
+    fasprintf (&str, "%s%f", str, f);
+
+    return str;
+}
+
+char *
+print_extents (void *d)
+{
+    decor_extents_t *extents = ((decor_extents_t *) d);
+    char *str = NULL;
+    fasprintf (&str, "");
+
+    fasprintf (&str, "%s : left: %i right: %i: top: %i: bottom: %i", str, extents->left, extents->right, extents->top, extents->bottom);
+
+    return str;
+}
+
+void
+dump_decoration_data (long int *d_ptr)
+{
+    unsigned int i;
+
+    printf ("size: wrote: %li\n", *d_ptr++);
+    printf ("type: wrote: %li\n", *d_ptr++);
+    printf ("frame_type: wrote: %li\n", *d_ptr++);
+    printf ("frame_state: wrote: 0x%lx\n", *d_ptr++);
+    printf ("frame_actions: wrote: 0x%lx\n", *d_ptr++);
+    printf ("pixmap: wrote: 0x%lx\n", *d_ptr++);
+
+    printf ("fl: wrote: %li\n", *d_ptr++);
+    printf ("ft: wrote: %li\n", *d_ptr++);
+    printf ("ft: wrote: %li\n", *d_ptr++);
+    printf ("fb: wrote: %li\n", *d_ptr++);
+    printf ("bl: wrote: %li\n", *d_ptr++);
+    printf ("bt: wrote: %li\n", *d_ptr++);
+    printf ("bt: wrote: %li\n", *d_ptr++);
+    printf ("bb: wrote: %li\n", *d_ptr++);
+
+    printf ("min_width: wrote: %li\n", *d_ptr++);
+    printf ("min_height: wrote: %li\n", *d_ptr++);
+
+    i = *d_ptr++;
+    printf ("nQuad: wrote: %li\n", *d_ptr++);
+    while (i--)
+    {
+	printf ("quad %i flags: wrote:  0x%lx ", i, *d_ptr++);
+	int  gravityv = *d_ptr;
+	char *gravity = print_gravity (&gravityv);
+	int  gravity2v = *d_ptr >> 4;
+	char *gravity2 = print_gravity (&gravity2v);
+	int  alignv = *d_ptr >> 8;
+	char *align = print_align (&alignv);
+	int  clampv = *d_ptr >> 10;
+	char *clamp = print_clamp (&clampv);
+	int  stretchv = *d_ptr >> 12;
+	char *stretch = print_stretch (&stretchv);
+
+	printf ("%s ", gravity);
+	printf ("%s ", gravity2);
+	printf ("%s ", align);
+	printf ("%s ", clamp);
+	printf ("%s ", stretch);
+	printf ("\n");
+
+	free (gravity);
+	free (gravity2);
+	free (align);
+	free (clamp);
+	free (stretch);
+
+	printf ("quad %i p1x: wrote:  %li\n", i, *d_ptr++);
+	printf ("quad %i p1y: wrote:  %li\n", i, *d_ptr++);
+	printf ("quad %i p2x: wrote:  %li\n", i, *d_ptr++);
+	printf ("quad %i p2y: wrote:  %li\n", i, *d_ptr++);
+	printf ("quad %i max_width: wrote:  %li\n", i, *d_ptr++);
+	printf ("quad %i max_height: wrote:  %li\n", i, *d_ptr++);
+	printf ("quad %i matrix x0: wrote:  %li\n", i, *d_ptr++);
+	printf ("quad %i matrix y0: wrote:  %li\n", i, *d_ptr++);
+    }
+}
+
+void
+dump_decoration (decoration *d)
+{
+    unsigned int    i;
+    printf ("decoration * %p contains : \n", d);
+
+    printf ("frame_type: 0x%x\n", d->frame_type);
+    printf ("frame_state: 0x%x\n", d->frame_state);
+    printf ("frame_actions: 0x%x\n", d->frame_actions);
+    printf ("pixmap: 0x%x\n", (unsigned int) d->p);
+    printf ("frame left: %i\n", d->extents.left);
+    printf ("frame right: %i\n", d->extents.right);
+    printf ("frame top: %i\n", d->extents.top);
+    printf ("frame bottom: %i\n", d->extents.bottom);
+    printf ("input left: %i\n", d->extents.left);
+    printf ("input right: %i\n", d->extents.right);
+    printf ("input top: %i\n", d->extents.top);
+    printf ("input bottom: %i\n", d->extents.bottom);
+    printf ("n quads: %i\n", d->nQuad);
+
+    for (i = 0; i < d->nQuad; i++)
+    {
+	int  gravityv = d->quads[i].p1.gravity;
+	char *gravity = print_gravity (&gravityv);
+	int  gravity2v = d->quads[i].p2.gravity;
+	char *gravity2 = print_gravity (&gravity2v);
+	int  alignv = d->quads[i].align;
+	char *align = print_align (&alignv);
+	int  clampv = d->quads[i].clamp;
+	char *clamp = print_clamp (&clampv);
+	int  stretchv = d->quads[i].stretch;
+	char *stretch = print_stretch (&stretchv);
+
+	printf ("quad %i p1: x: %i\n", i, d->quads[i].p1.x);
+	printf ("quad %i p1: y: %i\n", i, d->quads[i].p1.y);
+	printf ("quad %i p1: gravity: 0x%x ", i, gravityv);
+	printf ("%s ", gravity);
+	printf ("\n");
+
+	printf ("quad %i p2: x: %i\n", i, d->quads[i].p2.x);
+	printf ("quad %i p2: y: %i\n", i, d->quads[i].p2.y);
+	printf ("quad %i p2: gravity: 0x%x ", i, gravity2v);
+	printf ("%s ", gravity2);
+	printf ("\n");
+
+	printf ("quad %i max_width: %i\n", i, d->quads[i].max_width);
+	printf ("quad %i max_height:  %i\n", i, d->quads[i].max_height);
+
+	printf ("quad %i align: 0x%x :", i, alignv);
+	printf ("%s ", align);
+	printf ("\n");
+
+	printf ("quad %i clamp: 0x%x :", i, clampv);
+	printf ("%s ", clamp);
+	printf ("\n");
+
+	printf ("quad %i stretch: 0x%x :", i, clampv);
+	printf ("%s ", stretch);
+	printf ("\n");
+
+	printf ("\n");
+
+	free (gravity);
+	free (gravity2);
+	free (align);
+	free (clamp);
+	free (stretch);
+
+    }
+}
+
+void
+destroy_decoration (decoration *d,
+		    decor_cache_t *cache)
+{
+    if (!decor_cache_remove_subproperty (cache,
+					 d->frame_type,
+					 d->frame_state,
+					 d->frame_actions,
+					 d->property))
+	printf ("can't remove property 0x%x 0x%x 0x%x from %p...\n", d->frame_type, d->frame_state, d->frame_actions, cache->data);
+
+    free (d);
+}
+
+decoration *
+load_decoration_from_property (long int *data)
+{
+    decoration *d = calloc (1, sizeof (decoration));
+
+    /* safe-ish, wouldn't count on it */
+    d->nQuad = decor_pixmap_property_to_quads (data, &d->p, &d->extents, &d->extents, &d->min_width, &d->min_height, &d->frame_type, &d->frame_state, &d->frame_actions, d->quads);
+   // memcpy (&d->property->data, data, sizeof (long int) * data[1]);
+
+    return d;
+}
+
+char *
+data_to_string (long int *data, unsigned int data_size)
+{
+    char *string = NULL;
+    int  i = 0;
+
+    fasprintf (&string, "");
+
+    for (; i < data_size; i++)
+	fasprintf (&string, "%s%li, ", string, data[i]);
+
+    return string;
+}
+
+long int *
+string_to_data (const char *string, unsigned int *data_size)
+{
+    char     *save;
+    char     *tok;
+    char     *working;
+    long int *data, *orig_data;
+
+    working = strdup (string);
+
+    *data_size = 0;
+    tok = strtok_r (working, ", ", &save);
+
+    while (tok != NULL)
+    {
+	tok = strtok_r (NULL, ", ", &save);
+	(*data_size)++;
+    }
+
+    free (working);
+
+    orig_data = data = calloc (*data_size + 1, sizeof (long int));
+    working = strdup (string);
+
+    save = NULL;
+
+    *data_size = 0;
+    tok = strtok_r (working, ", ", &save);
+
+    while (tok != NULL)
+    {
+	if (!sscanf (tok, "%li", data))
+	    printf ("couldn't parse %s", tok);
+
+	tok = strtok_r (NULL, ", ", &save);
+	data++;
+    }
+
+    free (working);
+
+    return orig_data;
+}
+
+
+decoration *
+create_decoration_from_info (Pixmap p,
+			     int    el,
+			     int    er,
+			     int    et,
+			     int    eb,
+			     int    ls,
+			     int    rs,
+			     int    ts,
+			     int    bs,
+			     int    lcs,
+			     int    rcs,
+			     int    tcs,
+			     int    bcs,
+			     int    mw,
+			     int    mh,
+			     unsigned int frame_type,
+			     unsigned int frame_state,
+			     unsigned int frame_actions,
+			     decor_cache_t *cache)
+{
+    decoration *d = calloc (1, sizeof (decoration));
+
+    d->p = p;
+
+    d->extents.left = el;
+    d->extents.right = er;
+    d->extents.top = et;
+    d->extents.bottom = eb;
+
+    d->context.extents = d->extents;
+    d->context.left_space = ls;
+    d->context.right_space = rs;
+    d->context.top_space = ts;
+    d->context.bottom_space = bs;
+    d->context.left_corner_space = lcs;
+    d->context.right_corner_space = rcs;
+    d->context.top_corner_space = tcs;
+    d->context.bottom_corner_space = bcs;
+
+    d->min_width = mw;
+    d->min_height = mh;
+
+    d->frame_type = frame_type;
+    d->frame_state = frame_state;
+    d->frame_actions = frame_actions;
+
+    decor_get_default_layout (&d->context, mw, mh, &d->layout);
+    d->nQuad = decor_set_lSrStSbS_window_quads (d->quads, &d->context, &d->layout);
+    d->property = decor_cache_append_pixmap (cache, d->nQuad);
+
+    decor_subproperty_set_pixmap (d->property, d->p, &d->extents, &d->extents,
+				  0, 0, d->quads, d->nQuad, d->frame_type,
+				  d->frame_state, d->frame_actions);
+
+    return d;
+}
 
=== removed file 'gtk/window-decorator/decoration-test.c'
--- gtk/window-decorator/decoration-test.c	2011-08-11 08:56:52 +0000
+++ gtk/window-decorator/decoration-test.c	1970-01-01 00:00:00 +0000
@@ -1,537 +0,0 @@
-/*
- * decoration-test.h
- *
- * Copyright (c) 2011 Canonical Ltd.
- *
- * 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 3 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by:
- * Sam Spilsbury <[e-mail]>
- */
-
-#include "decoration-test.h"
-
-int fasprintf (char **strret, const char *fmt, ... )
-{
-    char *orig = NULL;
-    int  ret = 1;
-
-    if (*strret)
-	orig = *strret;
-
-    va_list args;
-    va_start (args, fmt);
-    ret = vasprintf (strret, fmt, args);
-    va_end (args);
-
-    if (orig)
-	free (orig);
-
-    return ret;
-}
-	
-
-char *
-print_gravity (void *d)
-{
-    char *str = NULL;
-    int  gravity = *((int *)  d);
-    fasprintf (&str, "");
-
-    if (gravity & GRAVITY_WEST)
-	fasprintf (&str, "%sGRAVITY_WEST ", str);
-    if (gravity & GRAVITY_EAST)
-	fasprintf (&str, "%sGRAVITY_EAST ", str);
-    if (gravity & GRAVITY_NORTH)
-	fasprintf (&str, "%sGRAVITY_NORTH ", str);
-    if (gravity & GRAVITY_SOUTH)
-	fasprintf (&str, "%sGRAVITY_SOUTH ", str);
-
-    return str;
-}
-
-char *
-print_stretch (void *d)
-{
-    char *str = NULL;
-    int  stretch = *((int *) d);
-    fasprintf (&str, "");
-
-    if (stretch & STRETCH_X)
-	fasprintf (&str, "%sSTRETCH_X ", str);
-    if (stretch & STRETCH_Y)
-	fasprintf (&str, "%sSTRETCH_Y ", str);
-
-    return str;
-}
-
-char *
-print_align (void *d)
-{
-    char *str = NULL;
-    int  align = *((int *) d);
-    fasprintf (&str, "");
-
-    if (align & ALIGN_LEFT)
-	fasprintf (&str, "%sALIGN_LEFT ", str);
-    if (align & ALIGN_RIGHT)
-	fasprintf (&str, "%sALIGN_RIGHT ", str);
-    if (align & ALIGN_TOP)
-	fasprintf (&str, "%sALIGN_TOP ", str);
-    if (align & ALIGN_BOTTOM)
-	fasprintf (&str, "%sALIGN BOTTOM ", str);
-
-    return str;
-}
-
-char *
-print_clamp (void *d)
-{
-    char *str = NULL;
-    int  clamp = *((int *) d);
-    fasprintf (&str, "");
-
-    if (clamp & CLAMP_HORZ)
-	fasprintf (&str, "%sCLAMP_HORZ ", str);
-    if (clamp & CLAMP_VERT)
-	fasprintf (&str, "%sCLAMP_VERT ", str);
-
-    return str;
-}
-
-char *
-print_frame_type (void *d)
-{
-    char *str = NULL;
-    unsigned int frame_type = *((unsigned int *) d);
-    fasprintf (&str, "");
-
-    if (frame_type & DECOR_WINDOW_TYPE_NORMAL)
-	fasprintf (&str, "%sDECOR_WINDOW_TYPE_NORMAL ", str);
-    if (frame_type & DECOR_WINDOW_TYPE_DIALOG)
-	fasprintf (&str, "%sDECOR_WINDOW_TYPE_DIALOG ", str);
-    if (frame_type & DECOR_WINDOW_TYPE_MENU)
-	fasprintf (&str, "%sDECOR_WINDOW_TYPE_MENU ", str);
-    if (frame_type & DECOR_WINDOW_TYPE_UTILITY)
-	fasprintf (&str, "%sDECOR_WINDOW_TYPE_UTILITY ", str);
-    if (frame_type & DECOR_WINDOW_TYPE_BARE)
-	fasprintf (&str, "%sDECOR_WINDOW_TYPE_BARE ", str);
-    if (frame_type & DECOR_WINDOW_TYPE_SWITCHER)
-	fasprintf (&str, "%sDECOR_WINDOW_TYPE_SWITCHER ", str);
-
-    return str;
-}
-
-char *
-print_frame_actions (void *d)
-{
-    char *str = NULL;
-    unsigned int frame_actions = *((unsigned int *) d);
-    fasprintf (&str, "");
-
-    if (frame_actions & DECOR_WINDOW_ACTION_RESIZE_HORZ)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_RESIZE_HORZ ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_RESIZE_VERT)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_RESIZE_VERT ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_CLOSE)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_CLOSE ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_MINIMIZE)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_MINIMIZE ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_UNMINIMIZE)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_UNMINIMIZE ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_MAXIMIZE_HORZ)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_MAXIMIZE_HORZ ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_MAXIMIZE_VERT)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_MAXIMIZE_VERT ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_UNMAXIMIZE_HORZ)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_UNMAXIMIZE_HORZ ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_UNMAXIMIZE_VERT)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_UNMAXIMIZE_VERT ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_SHADE)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_SHADE ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_UNSHADE)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_UNSHADE ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_STICK)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_STICK ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_UNSTICK)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_UNSTICK ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_FULLSCREEN)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_FULLSCREEN ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_ABOVE)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_ABOVE ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_BELOW)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_BELOW ", str);
-    if (frame_actions & DECOR_WINDOW_ACTION_MOVE)
-	fasprintf (&str, "%sDECOR_WINDOW_ACTION_MOVE ", str);
-
-    return str;
-}
-
-char *
-print_frame_state (void *d)
-{
-    char *str = NULL;
-    unsigned int frame_state =  *((unsigned int *) d);
-    fasprintf (&str, "");
-
-    if (frame_state & DECOR_WINDOW_STATE_FOCUS)
-	fasprintf (&str, "%sDECOR_WINDOW_STATE_FOCUS ", str);
-    if (frame_state & DECOR_WINDOW_STATE_MAXIMIZED_VERT)
-	fasprintf (&str, "%sDECOR_WINDOW_STATE_MAXIMIZED_VERT ", str);
-    if (frame_state & DECOR_WINDOW_STATE_MAXIMIZED_HORZ)
-	fasprintf (&str, "%sDECOR_WINDOW_STATE_MAXIMIZED_HORZ ", str);
-    if (frame_state & DECOR_WINDOW_STATE_SHADED)
-	fasprintf (&str, "%sDECOR_WINDOW_STATE_SHADED ", str);
-    if (frame_state & DECOR_WINDOW_STATE_COMPOSITED)
-	fasprintf (&str, "%sDECOR_WINDOW_STATE_COMPOSITED ", str);
-    if (frame_state & DECOR_WINDOW_STATE_MODAL)
-	fasprintf (&str, "%sDECOR_WINDOW_STATE_MODAL ", str);
-
-    return str;
-}
-
-char *
-print_unsigned_hex (void *d)
-{
-    char *str = NULL;
-    unsigned int hex = *((unsigned int *) d);
-    fasprintf (&str, "");
-
-    fasprintf (&str, "%s0x%x", str, hex);
-
-    return str;
-}
-
-char *
-print_int (void *d)
-{
-    char *str = NULL;
-    unsigned int i = *((unsigned int *) d);
-
-    fasprintf (&str, "%s%i", str, i);
-
-    return str;
-}
-
-char *
-print_box (void *d)
-{
-    decor_point_t *point = ((decor_point_t *) d);
-    char *str = print_gravity ((void *) &(point->gravity));
-    fasprintf (&str, "");
-
-    fasprintf (&str, "%s : x: %i y: %i", str, point->x, point->y);
-
-    return str;
-}
-
-char *
-print_float (void *d)
-{
-    char *str = NULL;
-    float f = *((float *) d);
-
-    fasprintf (&str, "%s%f", str, f);
-
-    return str;
-}
-
-char *
-print_extents (void *d)
-{
-    decor_extents_t *extents = ((decor_extents_t *) d);
-    char *str = NULL;
-    fasprintf (&str, "");
-
-    fasprintf (&str, "%s : left: %i right: %i: top: %i: bottom: %i", str, extents->left, extents->right, extents->top, extents->bottom);
-
-    return str;
-}
-
-void
-dump_decoration_data (long int *d_ptr)
-{
-    unsigned int i;
-
-    printf ("size: wrote: %li\n", *d_ptr++);
-    printf ("type: wrote: %li\n", *d_ptr++);
-    printf ("frame_type: wrote: %li\n", *d_ptr++);
-    printf ("frame_state: wrote: 0x%lx\n", *d_ptr++);
-    printf ("frame_actions: wrote: 0x%lx\n", *d_ptr++);
-    printf ("pixmap: wrote: 0x%lx\n", *d_ptr++);
-
-    printf ("fl: wrote: %li\n", *d_ptr++);
-    printf ("ft: wrote: %li\n", *d_ptr++);
-    printf ("ft: wrote: %li\n", *d_ptr++);
-    printf ("fb: wrote: %li\n", *d_ptr++);
-    printf ("bl: wrote: %li\n", *d_ptr++);
-    printf ("bt: wrote: %li\n", *d_ptr++);
-    printf ("bt: wrote: %li\n", *d_ptr++);
-    printf ("bb: wrote: %li\n", *d_ptr++);
-
-    printf ("min_width: wrote: %li\n", *d_ptr++);
-    printf ("min_height: wrote: %li\n", *d_ptr++);
-
-    i = *d_ptr++;
-    printf ("nQuad: wrote: %li\n", *d_ptr++);
-    while (i--)
-    {
-	printf ("quad %i flags: wrote:  0x%lx ", i, *d_ptr++);
-	int  gravityv = *d_ptr;
-	char *gravity = print_gravity (&gravityv);
-	int  gravity2v = *d_ptr >> 4;
-	char *gravity2 = print_gravity (&gravity2v);
-	int  alignv = *d_ptr >> 8;
-	char *align = print_align (&alignv);
-	int  clampv = *d_ptr >> 10;
-	char *clamp = print_clamp (&clampv);
-	int  stretchv = *d_ptr >> 12;
-	char *stretch = print_stretch (&stretchv);
-
-	printf ("%s ", gravity);
-	printf ("%s ", gravity2);
-	printf ("%s ", align);
-	printf ("%s ", clamp);
-	printf ("%s ", stretch);
-	printf ("\n");
-
-	free (gravity);
-	free (gravity2);
-	free (align);
-	free (clamp);
-	free (stretch);
-
-	printf ("quad %i p1x: wrote:  %li\n", i, *d_ptr++);
-	printf ("quad %i p1y: wrote:  %li\n", i, *d_ptr++);
-	printf ("quad %i p2x: wrote:  %li\n", i, *d_ptr++);
-	printf ("quad %i p2y: wrote:  %li\n", i, *d_ptr++);
-	printf ("quad %i max_width: wrote:  %li\n", i, *d_ptr++);
-	printf ("quad %i max_height: wrote:  %li\n", i, *d_ptr++);
-	printf ("quad %i matrix x0: wrote:  %li\n", i, *d_ptr++);
-	printf ("quad %i matrix y0: wrote:  %li\n", i, *d_ptr++);
-    }
-}
-
-void
-dump_decoration (decoration *d)
-{
-    unsigned int    i;
-    printf ("decoration * %p contains : \n", d);
-
-    printf ("frame_type: 0x%x\n", d->frame_type);
-    printf ("frame_state: 0x%x\n", d->frame_state);
-    printf ("frame_actions: 0x%x\n", d->frame_actions);
-    printf ("pixmap: 0x%x\n", d->p);
-    printf ("frame left: %i\n", d->extents.left);
-    printf ("frame right: %i\n", d->extents.right);
-    printf ("frame top: %i\n", d->extents.top);
-    printf ("frame bottom: %i\n", d->extents.bottom);
-    printf ("input left: %i\n", d->extents.left);
-    printf ("input right: %i\n", d->extents.right);
-    printf ("input top: %i\n", d->extents.top);
-    printf ("input bottom: %i\n", d->extents.bottom);
-    printf ("n quads: %i\n", d->nQuad);
-
-    for (i = 0; i < d->nQuad; i++)
-    {
-	int  gravityv = d->quads[i].p1.gravity;
-	char *gravity = print_gravity (&gravityv);
-	int  gravity2v = d->quads[i].p2.gravity;
-	char *gravity2 = print_gravity (&gravity2v);
-	int  alignv = d->quads[i].align;
-	char *align = print_align (&alignv);
-	int  clampv = d->quads[i].clamp;
-	char *clamp = print_clamp (&clampv);
-	int  stretchv = d->quads[i].stretch;
-	char *stretch = print_stretch (&stretchv);
-
-	printf ("quad %i p1: x: %i\n", i, d->quads[i].p1.x);
-	printf ("quad %i p1: y: %i\n", i, d->quads[i].p1.y);
-	printf ("quad %i p1: gravity: 0x%x ", i, gravityv);
-	printf ("%s ", gravity);
-	printf ("\n");
-
-	printf ("quad %i p2: x: %i\n", i, d->quads[i].p2.x);
-	printf ("quad %i p2: y: %i\n", i, d->quads[i].p2.y);
-	printf ("quad %i p2: gravity: 0x%x ", i, gravity2v);
-	printf ("%s ", gravity2);
-	printf ("\n");
-
-	printf ("quad %i max_width: %i\n", i, d->quads[i].max_width);
-	printf ("quad %i max_height:  %i\n", i, d->quads[i].max_height);
-
-	printf ("quad %i align: 0x%x :", i, alignv);
-	printf ("%s ", align);
-	printf ("\n");
-
-	printf ("quad %i clamp: 0x%x :", i, clampv);
-	printf ("%s ", clamp);
-	printf ("\n");
-
-	printf ("quad %i stretch: 0x%x :", i, clampv);
-	printf ("%s ", stretch);
-	printf ("\n");
-
-	printf ("\n");
-
-	free (gravity);
-	free (gravity2);
-	free (align);
-	free (clamp);
-	free (stretch);
-
-    }
-}
-
-void
-destroy_decoration (decoration *d,
-		    decor_cache_t *cache)
-{
-    if (!decor_cache_remove_subproperty (cache,
-					 d->frame_type,
-					 d->frame_state,
-					 d->frame_actions,
-					 d->property))
-	printf ("can't remove property 0x%x 0x%x 0x%x from %p...\n", d->frame_type, d->frame_state, d->frame_actions, cache->data);
-
-    free (d);
-}
-
-decoration *
-load_decoration_from_property (long int *data)
-{
-    decoration *d = calloc (1, sizeof (decoration));
-
-    /* safe-ish, wouldn't count on it */
-    d->nQuad = decor_pixmap_property_to_quads (data, &d->p, &d->extents, &d->extents, &d->min_width, &d->min_height, &d->frame_type, &d->frame_state, &d->frame_actions, d->quads);
-   // memcpy (&d->property->data, data, sizeof (long int) * data[1]);
-
-    return d;
-}
-
-char *
-data_to_string (long int *data, unsigned int data_size)
-{
-    char *string = NULL;
-    int  i = 0;
-
-    fasprintf (&string, "");
-
-    for (; i < data_size; i++)
-	fasprintf (&string, "%s%li, ", string, data[i]);
-
-    return string;
-}
-
-long int *
-string_to_data (const char *string, unsigned int *data_size)
-{
-    char     *save;
-    char     *tok;
-    char     *working;
-    long int *data, *orig_data;
-
-    working = strdup (string);
-
-    *data_size = 0;
-    tok = strtok_r (working, ", ", &save);
-
-    while (tok != NULL)
-    {
-	tok = strtok_r (NULL, ", ", &save);
-	(*data_size)++;
-    }
-
-    free (working);
-
-    orig_data = data = calloc (*data_size + 1, sizeof (long int));
-    working = strdup (string);
-
-    save = NULL;
-
-    *data_size = 0;
-    tok = strtok_r (working, ", ", &save);
-
-    while (tok != NULL)
-    {
-	if (!sscanf (tok, "%li", data))
-	    printf ("couldn't parse %s", tok);
-
-	tok = strtok_r (NULL, ", ", &save);
-	data++;
-    }
-
-    free (working);
-
-    return orig_data;
-}
-
-
-decoration *
-create_decoration_from_info (Pixmap p,
-			     int    el,
-			     int    er,
-			     int    et,
-			     int    eb,
-			     int    ls,
-			     int    rs,
-			     int    ts,
-			     int    bs,
-			     int    lcs,
-			     int    rcs,
-			     int    tcs,
-			     int    bcs,
-			     int    mw,
-			     int    mh,
-			     unsigned int frame_type,
-			     unsigned int frame_state,
-			     unsigned int frame_actions,
-			     decor_cache_t *cache)
-{
-    decoration *d = calloc (1, sizeof (decoration));
-
-    d->p = p;
-
-    d->extents.left = el;
-    d->extents.right = er;
-    d->extents.top = et;
-    d->extents.bottom = eb;
-
-    d->context.extents = d->extents;
-    d->context.left_space = ls;
-    d->context.right_space = rs;
-    d->context.top_space = ts;
-    d->context.bottom_space = bs;
-    d->context.left_corner_space = lcs;
-    d->context.right_corner_space = rcs;
-    d->context.top_corner_space = tcs;
-    d->context.bottom_corner_space = bcs;
-
-    d->min_width = mw;
-    d->min_height = mh;
-
-    d->frame_type = frame_type;
-    d->frame_state = frame_state;
-    d->frame_actions = frame_actions;
-
-    decor_get_default_layout (&d->context, mw, mh, &d->layout);
-    d->nQuad = decor_set_lSrStSbS_window_quads (d->quads, &d->context, &d->layout);
-    d->property = decor_cache_append_pixmap (cache, d->nQuad);
-
-    decor_subproperty_set_pixmap (d->property, d->p, &d->extents, &d->extents,
-				  0, 0, d->quads, d->nQuad, d->frame_type,
-				  d->frame_state, d->frame_actions);
-
-    return d;
-}
 
=== modified file 'gtk/window-decorator/decoration-test.h'
--- gtk/window-decorator/decoration-test.h	2011-08-11 08:56:52 +0000
+++ gtk/window-decorator/decoration-test.h	2011-08-19 15:05:12 +0000
@@ -23,21 +23,24 @@
 #ifndef _COMPIZ_DECORATION_TEST_H
 #define _COMPIZ_DECORATION_TEST_H
 
-#include "gtk-window-decorator.h"
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <stdarg.h>
+#include <decoration.h>
+#include <X11/Xlib.h>
+#include <X11/Xatom.h>
+#include <stdlib.h>
 
 typedef struct _decoration
 {
-    guint32 	    frame_type;
-    guint32 	    frame_state;
-    guint32 	    frame_actions;
+    unsigned int    frame_type;
+    unsigned int    frame_state;
+    unsigned int    frame_actions;
     decor_extents_t extents;
     decor_context_t context;
     decor_layout_t  layout;
     decor_quad_t    quads[N_QUADS_MAX];
-    guint32         nQuad;
+    unsigned int    nQuad;
     int             min_width;
     int             min_height;
     Pixmap          p;
 
=== modified file 'gtk/window-decorator/decoration_inspector/CMakeLists.txt'
--- gtk/window-decorator/decoration_inspector/CMakeLists.txt	2011-08-11 08:56:52 +0000
+++ gtk/window-decorator/decoration_inspector/CMakeLists.txt	2011-08-19 15:05:12 +0000
@@ -1,5 +1,7 @@
 pkg_check_modules (DECORATION_INSPECTOR REQUIRED gtk+-3.0 libdecoration)
-include_directories (${DECORATION_INSPECTOR_INCLUDE_DIRECTORES} ..)
+include_directories (${DECORATION_INSPECTOR_INCLUDE_DIRS}
+		     ${compiz_SOURCE_DIR}/include
+		     ..)
 add_definitions (-DPREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\")
 
 add_executable (decoration_inspector decoration_inspector.c ../decoration-test.c)
 
=== modified file 'gtk/window-decorator/decoration_inspector/decoration_inspector.c'
--- gtk/window-decorator/decoration_inspector/decoration_inspector.c	2011-08-11 08:56:52 +0000
+++ gtk/window-decorator/decoration_inspector/decoration_inspector.c	2011-08-19 15:05:12 +0000
@@ -20,7 +20,14 @@
  * Sam Spilsbury <[e-mail]>
  */
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 #include <gtk/gtk.h>
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <cairo.h>
+#include <cairo-xlib.h>
 #include "decoration-test.h"
 
 GObject *ib1 = NULL;
@@ -63,8 +70,6 @@
 	GdkPixbuf    *pb;
 	XVisualInfo   visual_info;
 
-	printf ("d->p is 0x%x\n", d->p);
-
 	XGetGeometry (xdisplay, d->p, &root, &x, &y, &width, &height, &border, &depth);
 	XMatchVisualInfo (xdisplay, DefaultScreen (xdisplay), 32, TrueColor, &visual_info);
 
@@ -150,7 +155,6 @@
 		cairo_set_source_rgba (cr, 0.0, 0.0, 1.0, 0.3);
 
 	    cairo_move_to (cr, 0, 0);
-	    g_debug ("rect: %i %i %i %i p: %i %i", px + x1, py + y1, px + (x2 - x1), py + (y2 - y1), px, py);
 	    cairo_rectangle (cr, (px + x1), (py + y1), (x2 - x1), (y2 - y1));
 	    cairo_fill (cr);
 
@@ -202,8 +206,6 @@
 	    c.y0 -=
 		y1 * c.yy +
 		x1 * c.yx;
-	    
-	    printf ("c for quad %i is :\n xx: %f yx %f\n xy: %f yy: %f\n x0: %f y0: %f\n", nQuad, c.xx, c.yx, c.xy, c.yy, c.x0, c.y0);
 
 	    quad++;
 	}
@@ -655,9 +657,6 @@
 	property_type_combo = gtk_builder_get_object (builder, "property_type_combo");
 
     long    *ret = NULL;
-    const gchar *text = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (property_type_combo));
-
-    g_debug ("%s", text);
 
     if (g_strcmp0 ("data", arg) == 0)
     {
@@ -677,8 +676,6 @@
 
 	sscanf (window_id_string, "0x%x", &window);
 
-	g_debug ("window is 0x%x", window);
-
 	if (window)
 	{
 	    Display *xdisplay = gdk_x11_display_get_xdisplay (gdk_display_get_default ());
@@ -698,7 +695,9 @@
 
 	    if (result != Success || !n || !data)
 	    {
-		fprintf (stderr, "failed to read property %i %i (type %i fmt %i)!\n", n, nleft, actual, format);
+		fprintf (stderr, "failed to read property %li %li (type %i fmt %i)!\n", n, nleft,
+			 (unsigned int) actual,
+			 (unsigned int) format);
 		return NULL;
 	    }
 
@@ -737,8 +736,6 @@
     GtkTreeIter  iter;
     GtkTreePath  *last = gtk_tree_path_copy (path);
 
-    g_debug ("activated row");
-
     if (gtk_tree_model_get_iter (model, &iter, last))
     {
 	gint decoration_num;
@@ -761,12 +758,13 @@
 	decoration_num = atoi (str);
 
 	data = pos = get_decorations_data (builder);
+
+	if (!data)
+	    return;
 	decorations = calloc (decor_property_get_num (data), sizeof (decoration *));
 
 	pos += 2;
 
-	g_debug ("there are %i decorations", decor_property_get_num (data));
-
 	for (i = 0 ; i < decor_property_get_num (data); i++)
 	{
 	    decorations[i] = load_decoration_from_property (pos);
@@ -787,7 +785,6 @@
     GtkBuilder *builder = (GtkBuilder *) user_data;
     decoration **decorations;
     decoration *d;
-    decor_cache_t *cache = g_object_get_data (G_OBJECT (builder), "all_decoration_data");
     long int   *data, *pos;
     unsigned int i, j;
     GtkTreeStore *store = gtk_tree_store_new (COLUMN_N, G_TYPE_STRING, G_TYPE_STRING);
@@ -817,12 +814,14 @@
     gtk_tree_view_set_model (GTK_TREE_VIEW (tree_view), NULL);
 
     data = pos =  get_decorations_data (builder);
+
+    if (!data)
+	return;
+
     decorations = calloc (decor_property_get_num (data), sizeof (decoration *));
 
     pos += 2;
 
-    g_debug ("there are %i decorations", decor_property_get_num (data));
-
     for (i = 0 ; i < decor_property_get_num (data); i++)
     {
 	decorations[i] = load_decoration_from_property (pos);
@@ -836,7 +835,6 @@
 
 	asprintf (&label, "Decoration %i:", i);
 	asprintf (&hex_data, "%i", i);
-	g_debug ("processing: %s", label);
 	gtk_tree_store_append (store, &master_iter, NULL);
 	gtk_tree_store_set (store, &master_iter, COLUMN_LABEL, label, COLUMN_DATA, hex_data, -1);
 
 
=== modified file 'gtk/window-decorator/simple_decorator/CMakeLists.txt'
--- gtk/window-decorator/simple_decorator/CMakeLists.txt	2011-08-11 08:56:52 +0000
+++ gtk/window-decorator/simple_decorator/CMakeLists.txt	2011-08-19 15:05:12 +0000
@@ -1,5 +1,7 @@
 pkg_check_modules (SIMPLE_DECORATOR REQUIRED x11 cairo-xlib libdecoration libpng)
-include_directories (${SIMPLE_DECORATOR_INCLUDE_DIRECTORES} ..)
+include_directories (${SIMPLE_DECORATOR_INCLUDE_DIRS}
+		     ${compiz_SOURCE_DIR}/include
+		     ..)
 add_definitions (-DPREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\")
 
 add_executable (simple-decorator simple-decorator.c ../decoration-test.c)
 
=== modified file 'gtk/window-decorator/simple_decorator/simple-decorator.c'
--- gtk/window-decorator/simple_decorator/simple-decorator.c	2011-08-11 08:56:52 +0000
+++ gtk/window-decorator/simple_decorator/simple-decorator.c	2011-08-19 15:05:12 +0000
@@ -29,6 +29,10 @@
 #include <X11/Xatom.h>
 #include <cairo/cairo-xlib.h>
 #include <png.h>
+#include <signal.h>
+
+#define TRUE 1
+#define FALSE 0
 
 typedef struct _simple_decoration {
     Display       *display;
 
=== added directory 'gtk/window-decorator/src'
=== added file 'gtk/window-decorator/src/CMakeLists.txt'
--- gtk/window-decorator/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/src/CMakeLists.txt	2011-08-19 15:05:12 +0000
@@ -0,0 +1,155 @@
+include (CheckFunctionExists)
+set (CMAKE_REQUIRED_FLAGS ${UNITY_WINDOW_DECORATOR_CFLAGS})
+set (CMAKE_REQUIRED_LIBRARIES ${UNITY_WINDOW_DECORATOR_LIBRARIES})
+list (FIND CMAKE_REQUIRED_FLAGS "-D_REENTRANT" REENTRANT_INDEX)
+if (REENTRANT_INDEX)
+  list (REMOVE_AT CMAKE_REQUIRED_FLAGS REENTRANT_INDEX)
+  list (APPEND CMAKE_REQUIRED_FLAGS "-D_REENTRANT=1")
+endif (REENTRANT_INDEX)
+check_function_exists (wnck_window_has_name HAVE_WNCK_WINDOW_HAS_NAME)
+set (CMAKE_REQUIRED_FLAGS "")
+set (CMAKE_REQUIRED_LIBRARIES "")
+
+compiz_pkg_check_modules (HAVE_LIBWNCK_2_18_1 libwnck-1.0>=2.18.1)
+compiz_pkg_check_modules (HAVE_LIBWNCK_2_19_4 libwnck-1.0>=2.19.4)
+
+if (BUILD_METACITY)
+    pkg_check_modules (METACITY libmetacity-private)
+    if (METACITY_FOUND)
+	compiz_pkg_check_modules (HAVE_METACITY_2_15_21 libmetacity-private>=2.15.21)
+	compiz_pkg_check_modules (HAVE_METACITY_2_17_0 libmetacity-private>=2.17.0)
+	compiz_pkg_check_modules (HAVE_METACITY_2_23_2 libmetacity-private>=2.23.2)
+    else (METACITY_FOUND)
+	compiz_set (USE_METACITY 0)
+    endif (METACITY_FOUND)
+endif (BUILD_METACITY)
+
+if (COMPIZ_BUILD_WITH_RPATH)
+    set (CMAKE_INSTALL_RPATH ${libdir})
+endif (COMPIZ_BUILD_WITH_RPATH)
+
+configure_file (
+    ${CMAKE_CURRENT_SOURCE_DIR}/config.h.gtk.in
+    ${CMAKE_CURRENT_BINARY_DIR}/config.h
+)
+
+include_directories (
+    ${compiz_SOURCE_DIR}/include
+    ${CMAKE_CURRENT_BINARY_DIR}
+    ${UNITY_WINDOW_DECORATOR_INCLUDE_DIRS}
+    ${METACITY_INCLUDE_DIRS}
+    ${GCONF_INCLUDE_DIRS}
+    ${DBUS_GLIB_INCLUDE_DIRS}
+)
+
+add_definitions (
+    -DHAVE_CONFIG_H
+    -DALL_LINGUAS=\"${ALL_LINGUAS}\"
+    -DLOCALEDIR=\\\"${datadir}/locale\\\"
+)
+
+link_directories (
+    ${UNITY_WINDOW_DECORATOR_LIBRARY_DIRS}
+    ${COMPIZ_LINK_DIRS}
+)
+
+if (USE_GCONF_UNITY_WINDOW_DECORATOR)
+
+    if (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
+	set (SCHEMADIR "${CMAKE_INSTALL_PREFIX}/share/gconf/schemas")
+    else (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
+	set (SCHEMADIR "${COMPIZ_INSTALL_GCONF_SCHEMA_DIR}")
+    endif (NOT COMPIZ_INSTALL_GCONF_SCHEMA_DIR)
+
+    set (gwd_schema ${CMAKE_CURRENT_BINARY_DIR}/gwd.schemas)
+
+    compiz_translate_xml (
+        ${CMAKE_CURRENT_SOURCE_DIR}/gwd.schemas.in
+        ${gwd_schema}
+    )
+
+    compiz_install_gconf_schema (${CMAKE_CURRENT_BINARY_DIR}/gwd.schemas ${SCHEMADIR})
+
+endif (USE_GCONF_UNITY_WINDOW_DECORATOR)
+
+add_executable (unity-window-decorator
+		gtk-window-decorator.c
+		blurprops.c
+		decorprops.c
+		cairo.c
+		gdk.c
+		switcher.c
+		metacity.c
+		events.c
+		forcequit.c
+		actionmenu.c
+		settings.c
+		util.c
+		style.c
+		wnck.c
+		decorator.c
+		frames.c
+		${gwd_schema}
+)
+
+add_executable (gtk-window-decorator
+		gtk-window-decorator.c
+		blurprops.c
+		decorprops.c
+		cairo.c
+		gdk.c
+		switcher.c
+		metacity.c
+		events.c
+		forcequit.c
+		actionmenu.c
+		settings.c
+		util.c
+		style.c
+		wnck.c
+		decorator.c
+		frames.c
+		${gwd_schema}
+)
+
+if (USE_METACITY)
+    set (metacitylibs ${METACITY_LIBRARIES})
+endif (USE_METACITY)
+
+set_target_properties (
+    unity-window-decorator PROPERTIES
+    INSTALL_RPATH_USE_LINK_PATH 0
+)
+
+target_link_libraries (unity-window-decorator
+			decoration
+			${UNITY_WINDOW_DECORATOR_LIBRARIES}
+			${GCONF_LIBRARIES}
+			${DBUS_GLIB_LIBRARIES}
+			${metacitylibs}
+)
+
+install (
+    TARGETS unity-window-decorator
+    DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}
+    RUNTIME DESTINATION bin
+)
+
+set_target_properties (
+    gtk-window-decorator PROPERTIES
+    INSTALL_RPATH_USE_LINK_PATH 0
+)
+
+target_link_libraries (gtk-window-decorator
+			decoration
+			${UNITY_WINDOW_DECORATOR_LIBRARIES}
+			${GCONF_LIBRARIES}
+			${DBUS_GLIB_LIBRARIES}
+			${metacitylibs}
+)
+
+install (
+    TARGETS gtk-window-decorator
+    DESTINATION ${COMPIZ_DESTDIR}${exec_prefix}
+    RUNTIME DESTINATION bin
+)
 
=== renamed file 'gtk/window-decorator/actionmenu.c' => 'gtk/window-decorator/src/actionmenu.c'
=== renamed file 'gtk/window-decorator/blurprops.c' => 'gtk/window-decorator/src/blurprops.c'
=== renamed file 'gtk/window-decorator/cairo.c' => 'gtk/window-decorator/src/cairo.c'
--- gtk/window-decorator/cairo.c	2011-08-11 19:38:07 +0000
+++ gtk/window-decorator/src/cairo.c	2011-08-19 15:05:12 +0000
@@ -131,14 +131,15 @@
 }
 
 void
-draw_shadow_background (GWDDecoration		*d,
+draw_shadow_background (Picture         p,
 			cairo_t		*cr,
 			decor_shadow_t  *s,
-			decor_context_t *c)
+			decor_context_t *c,
+			decor_layout_t  *layout)
 {
     Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 
-    if (!s || !s->picture ||!d->picture)
+    if (!s || !s->picture || !p)
     {
 	cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
 	cairo_paint (cr);
@@ -147,8 +148,8 @@
     {
 	decor_fill_picture_extents_with_shadow (xdisplay,
 						s, c,
-						d->picture,
-						&d->border_layout);
+						p,
+						layout);
     }
 }
 
@@ -348,7 +349,7 @@
     cairo_set_line_width (cr, 1.0);
 
     if (d->frame->frame_state & DECOR_WINDOW_STATE_COMPOSITED)
-	draw_shadow_background (d, cr, d->frame->shadow, &d->frame->context);
+	draw_shadow_background (d->picture, cr, d->frame->shadow, &d->frame->context, &d->border_layout);
 
     if (d->frame->frame_state & DECOR_WINDOW_STATE_FOCUS)
     {
 
=== added file 'gtk/window-decorator/src/config.h.gtk.in'
--- gtk/window-decorator/src/config.h.gtk.in	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/src/config.h.gtk.in	2011-08-19 15:05:12 +0000
@@ -0,0 +1,25 @@
+/* Define to 1 if Metacity support is enabled */
+#cmakedefine USE_METACITY 1
+
+/* Define to 1 if Gconf support is enabled */
+#cmakedefine USE_GCONF 1
+
+/* Define to 1 if you have the `wnck_window_has_name' function. */
+#cmakedefine HAVE_WNCK_WINDOW_HAS_NAME 1
+
+/* Define to 1 if libwnck version >= 2_18_1 */
+#cmakedefine HAVE_LIBWNCK_2_18_1 1
+
+/* Define to 1 if libwnck version >= 2_19_4 */
+#cmakedefine HAVE_LIBWNCK_2_19_4 1
+
+/* Define to 1 if metacity version >= 2.15.21 */
+#cmakedefine HAVE_METACITY_2_15_21 1
+
+/* Define to 1 if metacity version >= 2.17.0 */
+#cmakedefine HAVE_METACITY_2_17_0 1
+
+/* Define to 1 if metacity version >= 2.23.2 */
+#cmakedefine HAVE_METACITY_2_23_2 1
+
+#define GETTEXT_PACKAGE "${GETTEXT_PACKAGE}"
 
=== renamed file 'gtk/window-decorator/decorator.c' => 'gtk/window-decorator/src/decorator.c'
--- gtk/window-decorator/decorator.c	2011-08-11 19:38:07 +0000
+++ gtk/window-decorator/src/decorator.c	2011-08-19 15:05:12 +0000
@@ -87,12 +87,6 @@
     frame_update_titlebar_font ((GWDFrame *) value);
 }
 
-void
-update_titlebar_font ()
-{
-    gwd_frames_foreach (update_frames_titlebar_fonts, NULL);
-}
-
 
 /*
  * update_event_windows
@@ -393,13 +387,7 @@
 	/* Need to get a minimum width for the name */
 	else if (d->window)
 	{
-	    gint width;
-
-	    wnck_window_get_client_window_geometry (d->window->win,
-						    NULL, NULL,
-						    &width, NULL);
-
-	    w = width - ICON_SPACE - 2 - d->button_width;
+	    w = d->window->client_geometry.width - ICON_SPACE - 2 - d->button_width;
 	    if (w < 1)
 		w = 1;
 	}
@@ -634,6 +622,7 @@
     d.height  = height;
     d.draw    = theme_draw_window_decoration;
     d.picture = picture;
+    d.window = NULL;
     d.frame->context = *c;
 
     decor_get_default_layout (&d.frame->context, 1, 1, &d.border_layout);
@@ -857,14 +846,6 @@
 
 }
 
-int
-update_shadow (void)
-{
-    gwd_frames_foreach (update_frames_shadows, NULL);
-
-    return 1;
-}
-
 /*
  * populate_type
  *
@@ -1083,10 +1064,6 @@
     GList     *it = w->decorations;
     int xp, yp, wp, hp;
 
-    /* FIXME: remove */
-    guint32 frame_type = populate_frame_type (win);
-    guint32 frame_state = populate_frame_state (win);
-
     /* force size update */
     wnck_window_get_client_window_geometry (w->win, &xp, &yp, &hp, &wp);
 
@@ -1100,24 +1077,17 @@
 	GWDDecoration *d = (GWDDecoration *) it->data;
 
 	if (update_window_decoration_size (d, &w->client_geometry, wnck_window_get_name (w->win)) &&
-	    frame_type == d->frame->frame_type &&
-	    frame_state == d->frame->frame_state &&
+	    w->type == d->frame->frame_type &&
+	    w->state == d->frame->frame_state &&
 	    w->frame_window)
+	{
 	    update_event_windows (w->frame_window);
+	}
 
 	it = g_list_next (it);
     }
 }
 
-static struct timeval this_tv;
-static struct timeval last_tv;
-
-#define print_time(...) \
-    gettimeofday (&this_tv, NULL); \
-    printf ("TIME DEBUG: time: %li %s", this_tv.tv_usec - last_tv.tv_usec, __VA_ARGS__); \
-    last_tv = this_tv; \
-
-
 /*
  * update_property_on_window
  *
@@ -1129,12 +1099,6 @@
     GdkDisplay	    *gdkdisplay = gdk_display_get_default ();
     Display	    *xdisplay = gdk_x11_display_get_xdisplay (gdkdisplay);
 
-    gettimeofday (&this_tv, NULL);
-
-    gettimeofday (&this_tv, NULL);
-    //printf ("TIME DEBUG: %s time: %li on window 0x%x\n", G_STRFUNC, this_tv.tv_usec - last_tv.tv_usec, window->xid);
-    last_tv = this_tv;
-
     gdk_error_trap_push ();
     XChangeProperty (xdisplay, window->xid,
 		     win_decor_atom,
@@ -1143,10 +1107,6 @@
 		     window->cache->size);
     gdk_display_sync (gdk_display_get_default ());
     gdk_error_trap_pop ();
-
-    gettimeofday (&this_tv, NULL);
-    //printf ("TIME DEBUG: %s done: %li on window 0x%x\n", G_STRFUNC, this_tv.tv_usec - last_tv.tv_usec, window->xid);
-    last_tv = this_tv;
 }
 
 /*
 
=== renamed file 'gtk/window-decorator/decorprops.c' => 'gtk/window-decorator/src/decorprops.c'
=== renamed file 'gtk/window-decorator/events.c' => 'gtk/window-decorator/src/events.c'
--- gtk/window-decorator/events.c	2011-08-12 09:01:24 +0000
+++ gtk/window-decorator/src/events.c	2011-08-19 15:05:12 +0000
@@ -25,11 +25,6 @@
 
 #include "gtk-window-decorator.h"
 
-/* FIXME: This is a hack until we can
- * figure out why gdk is giving us events
- * twice */
-gulong last_event_serial = 0;
-
 void
 move_resize_window (WnckWindow *win,
 		    int	       direction,
@@ -96,12 +91,18 @@
     {
 	GdkCursor* cursor;
 	GdkWindow* window = create_foreign_window (w->frame_window->xid);
-	cursor = gdk_cursor_new (GDK_LEFT_PTR);
-	gdk_error_trap_push ();
-	gdk_window_set_cursor (window, cursor);
-	gdk_cursor_unref (cursor);
-	gdk_display_sync (gdk_display_get_default ());
-	if (gdk_error_trap_pop ())
+
+	if (window)
+	{
+	    cursor = gdk_cursor_new (GDK_LEFT_PTR);
+	    gdk_error_trap_push ();
+	    gdk_window_set_cursor (window, cursor);
+	    gdk_cursor_unref (cursor);
+	    gdk_display_sync (gdk_display_get_default ());
+	    if (gdk_error_trap_pop ())
+		return;
+	}
+	else
 	    return;
     }
 
@@ -459,11 +460,16 @@
     {
 	GdkCursor* cursor = gdk_cursor_new (GDK_LEFT_PTR);
 	GdkWindow* window = create_foreign_window (w->frame_window->xid);
-	gdk_error_trap_push ();
-	gdk_window_set_cursor (window, cursor);
-	gdk_cursor_unref (cursor);
-	gdk_display_sync (gdk_display_get_default ());
-	if (gdk_error_trap_pop ())
+	if (window)
+	{
+	    gdk_error_trap_push ();
+	    gdk_window_set_cursor (window, cursor);
+	    gdk_cursor_unref (cursor);
+	    gdk_display_sync (gdk_display_get_default ());
+	    if (gdk_error_trap_pop ())
+		return;
+	}
+	else
 	    return;
     }
 
@@ -562,13 +568,16 @@
 
 	if (cursor)
 	{
-	    GdkWindow* window = create_foreign_window (w->frame_window->xid);
-	    gdk_error_trap_push ();
-	    gdk_window_set_cursor (window, cursor);
-	    gdk_cursor_unref (cursor);
-	    gdk_display_sync (gdk_display_get_default ());
-	    if (gdk_error_trap_pop ())
-		return;
+	    GdkWindow  *window = create_foreign_window (w->frame_window->xid);
+	    if (window)
+	    {
+		gdk_error_trap_push ();
+		gdk_window_set_cursor (window, cursor);
+		gdk_cursor_unref (cursor);
+		gdk_display_sync (gdk_display_get_default ());
+		if (gdk_error_trap_pop ())
+		    return;
+	    }
 	}
     }
 
@@ -883,45 +892,42 @@
 }
 
 GdkFilterReturn
-event_filter_func (GdkXEvent *gdkxevent,
-		   GdkEvent  *event,
-		   gpointer  data)
+event_handler (GdkXEvent   *event,
+	       GdkEvent    *gevent,
+	       gpointer data)
 {
     GdkDisplay *gdkdisplay;
-    XEvent     *xevent = gdkxevent;
     gulong     xid = 0;
     Window     select = 0;
+    XEvent     *xevent = (XEvent *) event;
 
     gdkdisplay = gdk_display_get_default ();
 
-    /* Hack, see above */
-    if (last_event_serial == xevent->xany.serial)
-    {
-	last_event_serial = 0;
-	return GDK_FILTER_CONTINUE;
-    }
-
-    last_event_serial = xevent->xany.serial;
-
     switch (xevent->type) {
     case CreateNotify:
 	{
-	    GdkWindow *toplevel = create_foreign_window (xevent->xcreatewindow.window);
-
-	    if (toplevel)
+	    if (xevent->xcreatewindow.parent == gdk_x11_get_default_root_xwindow ())
 	    {
-		gdk_window_set_events (toplevel,
-				       gdk_window_get_events (toplevel) |
-				       GDK_PROPERTY_CHANGE_MASK |
-				       GDK_FOCUS_CHANGE_MASK);
-		gdk_window_add_filter (toplevel, event_filter_func, NULL);
+		GdkWindow *toplevel = create_foreign_window (xevent->xcreatewindow.window);
 
-		if (!wnck_window_get (xevent->xcreatewindow.window))
+		if (toplevel)
 		{
-		    /* check if the window is a switcher and update accordingly */
-
-		    if (get_window_prop (xevent->xcreatewindow.window, select_window_atom, &select))
-			update_switcher_window (xevent->xcreatewindow.window, select);
+		    if (!wnck_window_get (xevent->xcreatewindow.window))
+		    {
+			gdk_error_trap_push ();
+			gdk_window_set_events (toplevel,
+					       gdk_window_get_events (toplevel) |
+					       GDK_PROPERTY_CHANGE_MASK |
+					       GDK_FOCUS_CHANGE_MASK);
+			gdk_display_sync (gdk_display_get_default ());
+			if (gdk_error_trap_pop ())
+			    g_warning ("X Error while trying to set window events");
+
+			/* check if the window is a switcher and update accordingly */
+
+			if (get_window_prop (xevent->xcreatewindow.window, select_window_atom, &select))
+			    update_switcher_window (xevent->xcreatewindow.window, select);
+		    }
 		}
 	    }
 	}
@@ -1064,92 +1070,169 @@
 	    unsigned int mask;
 	    XButtonEvent eb;
 
+	    gdk_error_trap_push ();
 	    XQueryPointer (gdk_x11_display_get_xdisplay (gdk_display_get_default ()),
 			   last_clicked_frame->frame_window->xid,
 			   &root,
 			   &child,
 			   &x_root, &y_root, &x, &y, &mask);
-
-	    eb.type = ButtonRelease;
-	    eb.send_event = FALSE;
-	    eb.time = CurrentTime;
-	    eb.x = (double) x;
-	    eb.y = (double) y;
-	    eb.x_root = (double) x_root;
-	    eb.y_root = (double) y_root;
-	    eb.state = 0;
-	    eb.button = 0;
-
-	    if (last_clicked_frame)
-		frame_handle_button_release (&eb, last_clicked_frame);
+	    gdk_display_sync (gdk_display_get_default ());
+	    if (!gdk_error_trap_pop ())
+	    {
+		eb.type = ButtonRelease;
+		eb.send_event = FALSE;
+		eb.time = CurrentTime;
+		eb.x = (double) x;
+		eb.y = (double) y;
+		eb.x_root = (double) x_root;
+		eb.y_root = (double) y_root;
+		eb.state = 0;
+		eb.button = 0;
+
+		if (last_clicked_frame)
+		    frame_handle_button_release (&eb, last_clicked_frame);
+	    }
 	}
     case ButtonPress:
     {
-	GWDWindow *w = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xbutton.window));
+	GWDFrameWindow *fw = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xbutton.window));
 
-	if (w)
+	if (fw)
 	{
-	    frame_handle_button_press ((XButtonEvent *) xevent, w);
-	    return GDK_FILTER_REMOVE;
+	    frame_handle_button_press ((XButtonEvent *) xevent, fw->window);
 	}
 
 	break;
     }
     case ButtonRelease:
     {
-	GWDWindow *w = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xbutton.window));
+	GWDFrameWindow *fw = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xbutton.window));
 
-    	if (w)
+    	if (fw)
     	{
-	    frame_handle_button_release ((XButtonEvent *) xevent, w);
-	    return GDK_FILTER_REMOVE;
+	    frame_handle_button_release ((XButtonEvent *) xevent, fw->window);
 	}
 
 	break;
     }
     case MotionNotify:
     {
-	GWDWindow *w = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xmotion.window));
+	GWDFrameWindow *fw = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xmotion.window));
 
-    	if (w)
+    	if (fw)
     	{
-	    frame_handle_motion ((XMotionEvent *) xevent, w);
-	    return GDK_FILTER_REMOVE;
-	}
-
+	    frame_handle_motion ((XMotionEvent *) xevent, fw->window);
+	}
+
+	break;
+    }
+    case LeaveNotify:
+    {
+	GWDFrameWindow *fw = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xcrossing.window));
+
+	if (fw && xevent->xcrossing.mode == NotifyNormal)
+	{
+	    guint state[BUTTON_NUM];
+	    memcpy (state, fw->button_states, sizeof (guint) * BUTTON_NUM);
+
+	    GWDDecoration *d = gwd_decoration_get (fw->window,
+						   fw->window->type,
+						   fw->window->state,
+						   fw->window->actions);
+	    /* Reset button states as we are no longer in this frame window */
+	    memset (&fw->button_states, 0, sizeof (guint) * BUTTON_NUM);
+
+	    fw->last_entered = NULL;
+
+	    if (memcmp (state, fw->button_states, sizeof (guint) * BUTTON_NUM))
+		queue_decor_draw (d);
+	}
 	break;
     }
     case DestroyNotify:
     {
-	GWDWindow *w = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xdestroywindow.window));
+	GWDFrameWindow *fw = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xdestroywindow.window));
 
 	/* The parent window went away, we must remove our frame window */
-	if (w)
+	if (fw)
 	{
-	    gboolean safe = FALSE;
-
-	    if (xevent->xdestroywindow.window == w->frame_window->container_xid)
-		safe = TRUE;
-
-	    gwd_frame_window_delete (w->frame_window, safe);
-	    w->frame_window = NULL;
+	    /* The reality is that we're racing with gtk to get rid of
+	     * the window before it dies server side, things could get
+	     * hairy here */
+	    gdk_error_trap_push ();
+	    gwd_frame_window_delete (fw, TRUE);
+	    gdk_error_trap_pop ();
+	    fw->window->frame_window = NULL;
 	}
 
-	return GDK_FILTER_REMOVE;
 	break;
     }
     case ReparentNotify:
     {
-	GWDWindow *w = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xreparent.window));
+	GWDFrameWindow *fw = g_hash_table_lookup (frame_table, GINT_TO_POINTER (xevent->xreparent.window));
 
-	/* The parent window went away, we must remove our frame window */
-	if (w && xevent->xreparent.parent == gdk_x11_get_default_root_xwindow ())
+	/* Compiz unreparented the decoration
+	 * so we must remove our frame window
+	 * as well */
+	if (fw)
 	{
-	    gwd_frame_window_delete (w->frame_window, FALSE);
-	    w->frame_window = NULL;
+	    GdkWindow *backing_window = gtk_widget_get_window (GTK_WIDGET (fw->container));
+	    GdkWindow *compiz_frame_window = create_foreign_window (fw->xid);
+
+	    if (xevent->xreparent.parent == gdk_x11_get_default_root_xwindow ())
+	    {
+		gwd_frame_window_delete (fw, TRUE);
+	    }
+	    else
+	    {
+		unsigned int i, j;
+		static event_callback callback[3][3] = {
+		    { top_left_event,    top_event,    top_right_event    },
+		    { left_event,	     title_event,  right_event	      },
+		    { bottom_left_event, bottom_event, bottom_right_event }
+		};
+		static event_callback button_callback[BUTTON_NUM] = {
+		    close_button_event,
+		    max_button_event,
+		    min_button_event,
+		    menu_button_event,
+		    shade_button_event,
+		    above_button_event,
+		    stick_button_event,
+		    unshade_button_event,
+		    unabove_button_event,
+		    unstick_button_event
+		};
+
+		/* Checking if the window is mapped
+		 * seems to help in the case where
+		 * GDK sends the same event multiple times */
+		if (compiz_frame_window &&
+		    backing_window &&
+		    !gdk_window_is_viewable (backing_window))
+		{
+		    gdk_window_set_events (compiz_frame_window,
+					   GDK_STRUCTURE_MASK |
+					   GDK_SUBSTRUCTURE_MASK);
+		    gdk_window_set_events (backing_window, GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK |
+					   GDK_BUTTON_PRESS_MASK |
+					   GDK_BUTTON_RELEASE_MASK |
+					   GDK_LEAVE_NOTIFY_MASK);
+
+		    gtk_widget_show_all (GTK_WIDGET (fw->container));
+
+		    for (i = 0; i < 3; i++)
+			for (j = 0; j < 3; j++)
+			    fw->event_windows[i][j].callback = callback[i][j];
+
+		    for (i = 0; i < BUTTON_NUM; i++)
+			fw->button_windows[i].callback = button_callback[i];
+
+		    update_event_windows (fw);
+		}
+	    }
 	}
 
-	return GDK_FILTER_REMOVE;
 	break;
     }
     case ClientMessage:
@@ -1188,6 +1271,7 @@
 		}
 	    }
 	}
+	break;
     default:
 	break;
     }
@@ -1196,26 +1280,23 @@
 }
 
 GdkFilterReturn
-selection_event_filter_func (GdkXEvent *gdkxevent,
-			     GdkEvent  *event,
-			     gpointer  data)
+selection_event_handler (GdkXEvent *event,
+			 GdkEvent  *gdkevent,
+			 gpointer  user_data)
 {
-    Display    *xdisplay;
-    GdkDisplay *gdkdisplay;
-    XEvent     *xevent = gdkxevent;
-    int	       status;
-
-    gdkdisplay = gdk_display_get_default ();
-    xdisplay   = GDK_DISPLAY_XDISPLAY (gdkdisplay);
-
-    switch (xevent->type) {
+    XEvent *xevent = (XEvent *) event;
+
+    switch (xevent->type)
+    {
     case SelectionRequest:
-	decor_handle_selection_request (xdisplay, xevent, dm_sn_timestamp);
+	decor_handle_selection_request (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), xevent, dm_sn_timestamp);
 	break;
     case SelectionClear:
-	status = decor_handle_selection_clear (xdisplay, xevent, 0);
+    {
+	int status = decor_handle_selection_clear (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), xevent, 0);
 	if (status == DECOR_SELECTION_GIVE_UP)
 	    gtk_main_quit ();
+    }
     default:
 	break;
     }
 
=== renamed file 'gtk/window-decorator/forcequit.c' => 'gtk/window-decorator/src/forcequit.c'
=== renamed file 'gtk/window-decorator/frames.c' => 'gtk/window-decorator/src/frames.c'
--- gtk/window-decorator/frames.c	2011-08-11 19:38:07 +0000
+++ gtk/window-decorator/src/frames.c	2011-08-19 15:05:12 +0000
@@ -22,6 +22,8 @@
 
 #include "gtk-window-decorator.h"
 
+
+
 typedef struct _decor_frame_type_info
 {
     create_frame_proc create_func;
 
=== renamed file 'gtk/window-decorator/gdk.c' => 'gtk/window-decorator/src/gdk.c'
=== renamed file 'gtk/window-decorator/gtk-window-decorator.c' => 'gtk/window-decorator/src/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2011-08-11 19:38:07 +0000
+++ gtk/window-decorator/src/gtk-window-decorator.c	2011-08-19 15:05:12 +0000
@@ -49,8 +49,6 @@
 
 Atom net_wm_state_atom;
 Atom net_wm_state_modal_atom;
-
-
 Time dm_sn_timestamp;
 
 struct _cursor cursor[3][3] = {
@@ -273,7 +271,7 @@
 		     FALSE);
 
     net_wm_state_atom = XInternAtom (xdisplay,"_NET_WM_STATE", 0);
-    net_wm_state_modal_atom = XInternAtom (xdisplay, "_NET_MW_STATE_MODAL", 0);
+    net_wm_state_modal_atom = XInternAtom (xdisplay, "_NET_WM_STATE_MODAL", 0);
 
     status = decor_acquire_dm_session (xdisplay,
 				       gdk_screen_get_number (gdkscreen),
@@ -366,7 +364,7 @@
     wnck_set_client_type (WNCK_CLIENT_TYPE_PAGER);
 
     gdk_window_add_filter (NULL,
-			   selection_event_filter_func,
+			   selection_event_handler,
 			   NULL);
 
     if (!minimal)
@@ -374,25 +372,29 @@
 	GdkWindow *root = create_foreign_window (gdk_x11_get_default_root_xwindow ());
 	gwd_default_decorations_window = gwd_window_new (gdk_x11_get_default_root_xwindow ());
 
- 	gdk_window_add_filter (NULL,
- 			       event_filter_func,
- 			       NULL);
-			       
+	gdk_window_add_filter (NULL,
+			       event_handler,
+			       NULL);
+
 	XQueryTree (xdisplay, gdk_x11_get_default_root_xwindow (),
 		    &root_ret, &parent_ret, &children, &nchildren);
 
 	for (i = 0; i < nchildren; i++)
 	{
 	    GdkWindow *toplevel = create_foreign_window  (children[i]);
-
 	    /* Need property notify on all windows */
 
-	    gdk_window_set_events (toplevel,
-				   gdk_window_get_events (toplevel) |
-				   GDK_PROPERTY_CHANGE_MASK |
-				   GDK_FOCUS_CHANGE_MASK);
-
-	    gdk_window_add_filter (toplevel, event_filter_func, NULL);
+	    if (toplevel)
+	    {
+		gdk_error_trap_push ();
+		gdk_window_set_events (toplevel,
+				       gdk_window_get_events (toplevel) |
+				       GDK_PROPERTY_CHANGE_MASK |
+				       GDK_FOCUS_CHANGE_MASK);
+		gdk_display_sync (gdk_display_get_default ());
+		if (gdk_error_trap_pop ())
+		    g_warning ("X Error while trying to set events");
+	    }
 	}
 
 	/* Need MapNotify on new windows */
@@ -402,8 +404,8 @@
 			       GDK_VISIBILITY_NOTIFY_MASK |
 			       GDK_SUBSTRUCTURE_MASK |
 			       GDK_FOCUS_CHANGE_MASK);
- 
- 	connect_screen (screen);
+
+	connect_screen (screen);
     }
 
     decor_set_dm_check_hint (xdisplay, gdk_screen_get_number (gdkscreen),
@@ -428,6 +430,8 @@
     if (gwd_default_decorations_window)
 	gwd_window_delete (gwd_default_decorations_window);
 
+    gdk_display_sync (gdk_display_get_default ());
+
     if (switcher_label)
 	g_object_unref (switcher_label);
 
 
=== renamed file 'gtk/window-decorator/gtk-window-decorator.h' => 'gtk/window-decorator/src/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2011-08-11 19:38:07 +0000
+++ gtk/window-decorator/src/gtk-window-decorator.h	2011-08-19 15:05:12 +0000
@@ -29,6 +29,10 @@
 #include <config.h>
 #endif
 
+#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
+
 #include "decoration.h"
 
 #include <X11/Xlib.h>
@@ -69,6 +73,8 @@
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 #include <gdk/gdk.h>
+#include <gdk/gdkpixbuf.h>
+
 
 #ifdef USE_GCONF
 #include <gconf/gconf-client.h>
@@ -105,6 +111,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <signal.h>
+#include <stdio.h>
 
 #include <libintl.h>
 #define _(x)  gettext (x)
@@ -416,6 +423,7 @@
     event_window        button_windows[BUTTON_NUM];
     guint	        button_states[BUTTON_NUM];
     GtkWidget           *container;
+    GtkWidget           *event_box;
     event_window        *last_entered;
     Window              xid;
     Window              container_xid;
@@ -684,16 +692,10 @@
 void
 update_event_windows (GWDFrameWindow *fw);
 
-int
-update_shadow (void);
-
 gboolean
 shadow_property_changed (WnckScreen *screen);
 
 void
-update_titlebar_font ();
-
-void
 update_window_decoration (WnckWindow *win);
 
 void
@@ -705,6 +707,16 @@
 void
 copy_to_front_buffer (GWDDecoration *d);
 
+void
+update_frames_titlebar_fonts (gpointer key,
+			      gpointer value,
+			      gpointer user_data);
+
+void
+update_frames_shadows (gpointer key,
+		       gpointer value,
+		       gpointer user_data);
+
 /* wnck.c*/
 
 void
@@ -797,10 +809,11 @@
 #define SHADE_BOTTOM (1 << 3)
 
 void
-draw_shadow_background (GWDDecoration		*d,
+draw_shadow_background (Picture         p,
 			cairo_t		*cr,
 			decor_shadow_t  *s,
-			decor_context_t *c);
+			decor_context_t *c,
+			decor_layout_t  *layout);
 
 void
 draw_window_decoration (GWDDecoration *d);
@@ -1148,14 +1161,14 @@
 		     GWDWindow    *);
 
 GdkFilterReturn
-selection_event_filter_func (GdkXEvent *gdkxevent,
-			     GdkEvent  *event,
-			     gpointer  data);
+event_handler (GdkXEvent *event,
+	       GdkEvent  *gevent,
+	       gpointer data);
 
 GdkFilterReturn
-event_filter_func (GdkXEvent *gdkxevent,
-		   GdkEvent  *event,
-		   gpointer  data);
+selection_event_handler (GdkXEvent *event,
+			 GdkEvent  *gdkevent,
+			 gpointer  user_data);
 
 /* forcequit.c */
 
 
=== renamed file 'gtk/window-decorator/gwd.schemas.in' => 'gtk/window-decorator/src/gwd.schemas.in'
=== renamed file 'gtk/window-decorator/metacity.c' => 'gtk/window-decorator/src/metacity.c'
--- gtk/window-decorator/metacity.c	2011-08-11 19:38:07 +0000
+++ gtk/window-decorator/src/metacity.c	2011-08-19 15:05:12 +0000
@@ -24,7 +24,6 @@
  */
 
 #include "gtk-window-decorator.h"
-#include "decoration-test.h"
 
 #ifdef USE_METACITY
 
@@ -229,7 +228,8 @@
 
 static Region
 meta_get_top_border_region (const MetaFrameGeometry *fgeom,
-			    int			    width)
+			    int			    width,
+			    gboolean                clip)
 {
     Region     corners_xregion, border_xregion;
     XRectangle xrect;
@@ -247,36 +247,38 @@
 			    &bottom_left_radius,
 			    &bottom_right_radius);
 
-    if (top_left_radius)
-    {
-	for (i = 0; i < top_left_radius; i++)
-	{
-	    w = radius_to_width (top_left_radius, i);
-
-	    xrect.x	 = 0;
-	    xrect.y	 = i;
-	    xrect.width  = w;
-	    xrect.height = 1;
-
-	    XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
-	}
-    }
-
-    if (top_right_radius)
-    {
-	for (i = 0; i < top_right_radius; i++)
-	{
-	    w = radius_to_width (top_right_radius, i);
-
-	    xrect.x	 = width - w;
-	    xrect.y	 = i;
-	    xrect.width  = w;
-	    xrect.height = 1;
-
-	    XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
-	}
-    }
-
+    if (clip)
+    {
+	if (top_left_radius)
+	{
+	    for (i = 0; i < top_left_radius; i++)
+	    {
+		w = radius_to_width (top_left_radius, i);
+
+		xrect.x	 = 0;
+		xrect.y	 = i;
+		xrect.width  = w;
+		xrect.height = 1;
+
+		XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
+	    }
+	}
+
+	if (top_right_radius)
+	{
+	    for (i = 0; i < top_right_radius; i++)
+	    {
+		w = radius_to_width (top_right_radius, i);
+
+		xrect.x	 = width - w;
+		xrect.y	 = i;
+		xrect.width  = w;
+		xrect.height = 1;
+
+		XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
+	    }
+	}
+    }
     border_xregion = XCreateRegion ();
 
     xrect.x = 0;
@@ -295,7 +297,8 @@
 
 static Region
 meta_get_bottom_border_region (const MetaFrameGeometry *fgeom,
-			       int		        width)
+			       int		        width,
+			       gboolean                 clip)
 {
     Region     corners_xregion, border_xregion;
     XRectangle xrect;
@@ -313,33 +316,36 @@
 			    &bottom_left_radius,
 			    &bottom_right_radius);
 
-    if (bottom_left_radius)
+    if (clip)
     {
-	for (i = 0; i < bottom_left_radius; i++)
+	if (bottom_left_radius)
 	{
-	    w = radius_to_width (bottom_left_radius, i);
-
-	    xrect.x	 = 0;
-	    xrect.y	 = fgeom->bottom_height - i - 1;
-	    xrect.width  = w;
-	    xrect.height = 1;
-
-	    XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
+	    for (i = 0; i < bottom_left_radius; i++)
+	    {
+		w = radius_to_width (bottom_left_radius, i);
+
+		xrect.x	 = 0;
+		xrect.y	 = fgeom->bottom_height - i - 1;
+		xrect.width  = w;
+		xrect.height = 1;
+
+		XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
+	    }
 	}
-    }
 
-    if (bottom_right_radius)
-    {
-	for (i = 0; i < bottom_right_radius; i++)
+	if (bottom_right_radius)
 	{
-	    w = radius_to_width (bottom_right_radius, i);
-
-	    xrect.x	 = width - w;
-	    xrect.y	 = fgeom->bottom_height - i - 1;
-	    xrect.width  = w;
-	    xrect.height = 1;
-
-	    XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
+	    for (i = 0; i < bottom_right_radius; i++)
+	    {
+		w = radius_to_width (bottom_right_radius, i);
+
+		xrect.x	 = width - w;
+		xrect.y	 = fgeom->bottom_height - i - 1;
+		xrect.width  = w;
+		xrect.height = 1;
+
+		XUnionRectWithRegion (&xrect, corners_xregion, corners_xregion);
+	    }
 	}
     }
 
@@ -519,22 +525,6 @@
 			DECOR_WINDOW_STATE_MAXIMIZED_VERT)))
 	flags |= (MetaFrameFlags ) META_FRAME_MAXIMIZED;
 
-    /* FIXME: do we really need to support all these ? */
-
-    //if (d->frame->frame_state & DECOR_WINDOW_STATE_STICK)
-	//flags |= (MetaFrameFlags ) META_FRAME_STUCK;
-
-    //if (d->frame->frame_state & DECOR_WINDOW_STATE_FULLSCREEN)
-	//flags |= (MetaFrameFlags ) META_FRAME_FULLSCREEN;
-
-    //if (d->frame->frame_state & DECOR_WINDOW_STATE_SHADED)
-	//flags |= (MetaFrameFlags ) META_FRAME_SHADED;
-
-#ifdef HAVE_METACITY_2_17_0
-    //if (d->frame->frame_state & DECOR_WINDOW_STATE_ABOVE)
-	//flags |= (MetaFrameFlags ) META_FRAME_ABOVE;
-#endif
-
     if (frame_state & DECOR_WINDOW_STATE_FOCUS)
 	flags |= (MetaFrameFlags ) META_FRAME_HAS_FOCUS;
 
@@ -656,6 +646,43 @@
 }
 
 void
+meta_rounded_rectangle (cairo_t *cr,
+			double  x,
+			double  y,
+			double  w,
+			double  h,
+			int     r_tl,
+			int     r_tr,
+			int     r_bl,
+			int     r_br)
+{
+    if (r_tl > 0)
+	cairo_move_to (cr, x + r_tl, y);
+    else
+	cairo_move_to (cr, x, y);
+
+    if (r_tr > 0)
+	cairo_arc (cr, x + w - r_tr, y + r_tr, r_tr, M_PI * 1.5, M_PI * 2.0);
+    else
+	cairo_line_to (cr, x + w, y);
+
+    if (r_br > 0)
+	cairo_arc (cr, x + w - r_br, y + h - r_br, r_br, 0.0, M_PI * 0.5);
+    else
+	cairo_line_to (cr, x + w, y + h);
+
+    if (r_bl > 0)
+	cairo_arc (cr, x + r_bl, y + h - r_bl, r_bl, M_PI * 0.5, M_PI);
+    else
+	cairo_line_to (cr, x, y + h);
+
+    if (r_tl > 0)
+	cairo_arc (cr, x + r_tl, y + r_tl, r_tl, M_PI, M_PI * 1.5);
+    else
+	cairo_line_to (cr, x, y);
+}
+
+void
 meta_draw_window_decoration (GWDDecoration *d)
 {
     Display	      *xdisplay =
@@ -669,7 +696,7 @@
     MetaFrameType     frame_type;
     MetaTheme	      *theme;
     GtkStyle	      *style;
-    cairo_t	      *cr;
+    cairo_t	      *bg_cr, *final_cr;
     gint	      size, i;
     GdkRectangle      clip, rect;
     GdkDrawable       *drawable;
@@ -686,6 +713,14 @@
     GdkColor	      bg_color;
     double	      bg_alpha;
     GdkPixbuf         *icon_pixbuf;
+    int	              top_left_radius;
+    int	              top_right_radius;
+    int	              bottom_left_radius;
+    int	              bottom_right_radius;
+    gboolean          clip_drawing = d->window ? FALSE : TRUE;
+    XRenderPictFormat *format;
+    Picture           tmp;
+    GdkPixmap         *tmp_pixmap;
 
     if (!d->pixmap || !d->picture)
 	return;
@@ -698,13 +733,30 @@
     if (settings->decoration_alpha == 1.0)
 	alpha = 1.0;
 
+    if (!(d->frame->frame_state & DECOR_WINDOW_STATE_COMPOSITED))
+    {
+	GdkColormap *cmap;
+
+	cmap   = get_colormap_for_drawable (GDK_DRAWABLE (d->pixmap));
+	tmp_pixmap = create_pixmap (d->width, d->height, d->frame->style_window);
+	gdk_drawable_set_colormap (GDK_DRAWABLE (tmp_pixmap), cmap);
+    }
+    else
+	tmp_pixmap = create_pixmap (d->width, d->height, d->frame->style_window);
+
+    format = get_format_for_drawable (d, GDK_DRAWABLE (tmp_pixmap));
+    tmp = XRenderCreatePicture (xdisplay, GDK_PIXMAP_XID (tmp_pixmap),
+				format, 0, NULL);
+
     style = gtk_widget_get_style (d->frame->style_window);
     style_window = d->frame->style_window;
 
-    drawable = d->buffer_pixmap ? d->buffer_pixmap : d->pixmap;
-    cr = gdk_cairo_create (GDK_DRAWABLE (drawable));
+    drawable = tmp_pixmap;
+    bg_cr = gdk_cairo_create (GDK_DRAWABLE (drawable));
+    final_cr = gdk_cairo_create (GDK_DRAWABLE (d->buffer_pixmap ? d->buffer_pixmap : d->pixmap));
 
-    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+    cairo_set_operator (bg_cr, CAIRO_OPERATOR_SOURCE);
+    cairo_set_operator (final_cr, CAIRO_OPERATOR_SOURCE);
 
     theme = meta_theme_get_current ();
     frame_type = meta_frame_type_from_string (frame_type_string (d->frame->frame_type, d->frame->frame_state));
@@ -715,13 +767,22 @@
     meta_get_decoration_geometry (d, theme, &flags, &fgeom, &button_layout,
 				  frame_type, &clip);
 
+    meta_get_corner_radius (&fgeom,
+			    &top_left_radius,
+			    &top_right_radius,
+			    &bottom_left_radius,
+			    &bottom_right_radius);
+
     /* FIXME: I have no idea why this fixes disappearing titlebars
      * on windows that have no shadow, but it does */
     if (!d->window ||
 	(d->frame->frame_state & DECOR_WINDOW_STATE_COMPOSITED &&
 	 d->frame->shadow &&
 	(d->frame->shadow->width || d->frame->shadow->height)))
-	draw_shadow_background (d, cr, d->frame->shadow, &d->frame->context);
+    {
+	draw_shadow_background (tmp, bg_cr, NULL, &d->frame->context, &d->border_layout);
+	draw_shadow_background (d->picture, final_cr, d->frame->shadow, &d->frame->context, &d->border_layout);
+    }
 
     for (i = 0; i < META_BUTTON_TYPE_LAST; i++)
 	if (d->window && d->window->frame_window)
@@ -747,8 +808,6 @@
     }
 #endif
 
-    cairo_destroy (cr);
-
     rect.x     = 0;
     rect.y     = 0;
     rect.width = clip.width;
@@ -757,7 +816,7 @@
 
     if (rect.width && size)
     {
-	XRenderPictFormat *format;
+	cairo_t           *cr;
 
 	if (!(d->frame->frame_state & DECOR_WINDOW_STATE_COMPOSITED))
 	{
@@ -802,19 +861,40 @@
 				   icon_pixbuf,
 				   NULL);
 
-	    top_region = meta_get_top_border_region (&fgeom, clip.width);
+	    /* clear area around corners */
+	    cairo_save (cr);
+	    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+	    cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+	    cairo_rectangle (cr,
+			     rect.x,
+			     rect.y,
+			     rect.width,
+			     rect.height);
+	    meta_rounded_rectangle (cr,
+				    rect.x,
+				    rect.y,
+				    rect.width,
+				    rect.height,
+				    top_left_radius,
+				    top_right_radius,
+				    0,
+				    0);
+	    cairo_fill (cr);
+	    cairo_restore (cr);
+
+	    top_region = meta_get_top_border_region (&fgeom, clip.width, clip_drawing);
 
 	    decor_blend_border_picture (xdisplay,
 					&d->frame->context,
 					src,
 					0, 0,
-					d->picture,
+					tmp,
 					&d->border_layout,
 					BORDER_TOP,
 					top_region,
 					alpha * 0xffff,
 					shade_alpha,
-				        0);
+					0);
 	}
 
 	if (fgeom.bottom_height)
@@ -842,13 +922,33 @@
 				   icon_pixbuf,
 				   NULL);
 
-	    bottom_region = meta_get_bottom_border_region (&fgeom, clip.width);
+	    cairo_save (cr);
+	    cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+	    cairo_set_operator (cr, CAIRO_OPERATOR_CLEAR);
+	    cairo_rectangle (cr,
+			     rect.x,
+			     rect.y,
+			     rect.width,
+			     rect.height);
+	    meta_rounded_rectangle (cr,
+				    rect.x,
+				    rect.y,
+				    rect.width,
+				    rect.height,
+				    0,
+				    0,
+				    bottom_left_radius,
+				    bottom_right_radius);
+	    cairo_fill (cr);
+	    cairo_restore (cr);
+
+	    bottom_region = meta_get_bottom_border_region (&fgeom, clip.width, clip_drawing);
 
 	    decor_blend_border_picture (xdisplay,
 					&d->frame->context,
 					src,
 					0, 0,
-					d->picture,
+					tmp,
 					&d->border_layout,
 					BORDER_BOTTOM,
 					bottom_region,
@@ -871,7 +971,7 @@
 
     if (size && rect.height)
     {
-	XRenderPictFormat *format;
+	cairo_t       *cr;
 
 	if (d->frame->frame_state & DECOR_WINDOW_STATE_COMPOSITED)
 	{
@@ -923,13 +1023,14 @@
 					&d->frame->context,
 					src,
 					0, 0,
-					d->picture,
+					tmp,
 					&d->border_layout,
 					BORDER_LEFT,
 					left_region,
-					alpha * 0xffff,
+					0xffff,
 					shade_alpha,
 				        0);
+
 	}
 
 	if (fgeom.right_width)
@@ -963,22 +1064,40 @@
 					&d->frame->context,
 					src,
 					0, 0,
-					d->picture,
+					tmp,
 					&d->border_layout,
 					BORDER_RIGHT,
 					right_region,
-					alpha * 0xffff,
+					0xffff,
 					shade_alpha,
 				        0);
+
 	}
 
-	cairo_destroy (cr);
+	XRenderComposite (xdisplay,
+			  PictOpOver,
+			  tmp,
+			  None,
+			  d->picture,
+			  0,
+			  0,
+			  0,
+			  0,
+			  0,
+			  0,
+			  d->width,
+			  d->height);
+
+	cairo_destroy (bg_cr);
 
 	g_object_unref (G_OBJECT (pixmap));
 
 	XRenderFreePicture (xdisplay, src);
     }
 
+    g_object_unref (G_OBJECT (tmp_pixmap));
+    XRenderFreePicture (xdisplay, tmp);
+
     /* FIXME: Shouldn't need to copy from d->pixmap directly into d->image_box
      * there should be a way to get from d->buffer_pixmap to d->image_box */
     copy_to_front_buffer (d);
 
=== renamed file 'gtk/window-decorator/settings.c' => 'gtk/window-decorator/src/settings.c'
--- gtk/window-decorator/settings.c	2011-08-11 08:56:52 +0000
+++ gtk/window-decorator/src/settings.c	2011-08-19 15:05:12 +0000
@@ -334,8 +334,6 @@
     gwd_decor_frame_unref (frame);
 }
 
-#warning set_frames_scales
-
 void
 set_frames_scales (gpointer key,
 		   gpointer value,
 
=== renamed file 'gtk/window-decorator/style.c' => 'gtk/window-decorator/src/style.c'
=== renamed file 'gtk/window-decorator/switcher.c' => 'gtk/window-decorator/src/switcher.c'
--- gtk/window-decorator/switcher.c	2011-08-11 17:35:20 +0000
+++ gtk/window-decorator/src/switcher.c	2011-08-19 15:05:12 +0000
@@ -112,7 +112,7 @@
 
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
-    draw_shadow_background (d, cr, d->frame->shadow, &d->frame->context);
+    draw_shadow_background (d->picture, cr, d->frame->shadow, &d->frame->context, &d->border_layout);
 
     fill_rounded_rectangle (cr,
 			    x1 + 0.5,
 
=== renamed file 'gtk/window-decorator/util.c' => 'gtk/window-decorator/src/util.c'
--- gtk/window-decorator/util.c	2011-08-11 09:51:45 +0000
+++ gtk/window-decorator/src/util.c	2011-08-19 15:05:12 +0000
@@ -123,6 +123,9 @@
     unsigned long n, left;
     unsigned char *prop_data;
     Atom          *data;
+    gint          err;
+
+    gdk_error_trap_push ();
 
     result = XGetWindowProperty (gdk_x11_get_default_xdisplay (),
 				 xwindow,
@@ -130,6 +133,13 @@
 				 0L, 1024L, FALSE, XA_ATOM, &actual, &format,
 				 &n, &left, &prop_data);
 
+    err = gdk_error_trap_pop ();
+    if (err != Success || result != Success)
+    {
+	g_warning ("X Error while trying to fetch property");
+	return 0;
+    }
+
     data = (Atom *) prop_data;
 
     if (result == Success && data)
 
=== renamed file 'gtk/window-decorator/wnck.c' => 'gtk/window-decorator/src/wnck.c'
--- gtk/window-decorator/wnck.c	2011-08-11 19:38:07 +0000
+++ gtk/window-decorator/src/wnck.c	2011-08-19 15:05:12 +0000
@@ -79,7 +79,6 @@
 {
     GWDWindow *w = g_object_get_data (G_OBJECT (win), "decor");
     GList     *it = w->decorations;
-
     while (it)
     {
 	GdkPixbuf *pb = wnck_window_get_mini_icon (win);
@@ -142,14 +141,12 @@
     GList      *windows;
     Window     select;
 
-    update_shadow ();
-    gwd_frames_foreach (update_frames_defaults, NULL);
     gwd_frames_foreach (set_frames_scales, (gpointer) settings->font);
-
-    update_titlebar_font ();
-
+    gwd_frames_foreach (update_frames_titlebar_fonts, NULL);
     gwd_frames_foreach (update_frames_border_extents,
 			NULL);
+    gwd_frames_foreach (update_frames_shadows, NULL);
+    gwd_frames_foreach (update_frames_defaults, NULL);
 
     if (minimal)
 	return;
@@ -160,6 +157,7 @@
     while (windows != NULL)
     {
 	GWDWindow *w = g_object_get_data (G_OBJECT (windows->data), "decor");
+
 	GList     *it = w->decorations;
 
 #ifdef USE_METACITY
@@ -167,13 +165,13 @@
 	{
 	    GWDDecoration *d = (GWDDecoration *) it->data;
 	    if (d->draw == draw_window_decoration ||
-		d->draw == meta_draw_window_decoration)
+		    d->draw == meta_draw_window_decoration)
 		d->draw = theme_draw_window_decoration;
 	    it = g_list_next (it);
 	}
 #endif
+	update_window_decoration (windows->data);
 
-	update_window_decoration (WNCK_WINDOW (windows->data));
 	windows = windows->next;
     }
 
@@ -244,9 +242,11 @@
     GWDDecoration        *d;
 
     /* Inhibit the generation of new decorations for
-     * windows which are not decorated and managed*/
-    if (!(window->mwm_prop & (MWM_DECOR_ALL | MWM_DECOR_TITLE)) &&
-	window->win)
+     * windows which are not decorated and managed
+     * or destroyed */
+    if ((!(window->mwm_prop & (MWM_DECOR_ALL | MWM_DECOR_TITLE)) &&
+	   window->win) ||
+	!window->xid)
     {
 	if (window != gwd_default_decorations_window)
 	{
@@ -295,10 +295,10 @@
 	d->window->icon = update_window_decoration_icon (d->window->icon,
 							 icon,
 							 d->frame->style_window);
-
-	update_window_decoration_size (d, client_geometry, name);
     }
 
+    update_window_decoration_size (d, client_geometry, name);
+
     /* If this is the default decorations window and the
      * default implementation is NULL, then it means that
      * we're in decor_frame_refresh and the defeault implementation
@@ -458,6 +458,12 @@
     win->force_quit_dialog = NULL;
     win->xid = xid;
     win->frame_window = NULL;
+    memset (&win->client_geometry, 0, sizeof (XRectangle));
+    win->mwm_prop = 0;
+    win->net_wm_state_modal_atom = 0;
+    win->actions = 0;
+    win->state = 0;
+    win->type = DECOR_WINDOW_TYPE_BARE;
 
     /* Managed window */
     if (win->win)
@@ -466,9 +472,20 @@
 	GdkWindow      *client = create_foreign_window (win->xid);
 	int            xp, yp, wp, hp;
 
-	gdk_window_set_events (client, gdk_window_get_events (client) |
-			       GDK_PROPERTY_CHANGE_MASK);
-	gdk_window_add_filter (client, event_filter_func, NULL);
+	gdk_error_trap_push ();
+	if (client)
+	    gdk_window_set_events (client, gdk_window_get_events (client) |
+				   GDK_PROPERTY_CHANGE_MASK);
+
+	gdk_display_sync (gdk_display_get_default ());
+	if (gdk_error_trap_pop () || !client)
+	{
+	    g_warning ("attempted to create GWDWindow for"\
+		       "destroyed window 0x%x", (guint32) xid);
+	    win->xid = 0;
+	    return win;
+	}
+
 	wnck_window_get_client_window_geometry (win->win, &xp, &yp, &hp, &wp);
 
 	win->client_geometry.x = xp;
@@ -502,15 +519,22 @@
 	{
 	    g_warning ("attempted to create GWDWindow for"\
 		       "destroyed window 0x%x", (guint32) xid);
-
-	    return NULL;
-	}
-
-	/* always 0 */
-	win->actions = 0;
-	win->state = 0;
-	win->type = DECOR_WINDOW_TYPE_BARE;
-	win->mwm_prop = 0;
+	    win->xid = 0;
+	    return win;
+	}
+
+	if (xid == root)
+	{
+	    x = 0;
+	    y = 0;
+	    width = 1;
+	    height = 1;
+	}
+
+	win->client_geometry.x = x;
+	win->client_geometry.y = y;
+	win->client_geometry.width = width;
+	win->client_geometry.height = height;
     }
 
     win->cache = decor_cache_new ();
@@ -566,7 +590,10 @@
     win->icon = update_window_decoration_icon (win->icon, NULL, NULL);
 
     if (win->frame_window)
+    {
 	gwd_frame_window_delete (win->frame_window, FALSE);
+	win->frame_window->window = NULL;
+    }
 
     if (win->force_quit_dialog)
 	g_object_unref (G_OBJECT (win->force_quit_dialog));
@@ -599,7 +626,6 @@
     GdkColormap    *colormap;
     GdkWindow      *compiz_frame_window = create_foreign_window (frame_window);
     GdkWindow      *backing_window;
-    unsigned int i, j;
 
     if (!compiz_frame_window)
     {
@@ -607,83 +633,47 @@
 	return NULL;
     }
 
-    static event_callback callback[3][3] = {
-	{ top_left_event,    top_event,    top_right_event    },
-	{ left_event,	     title_event,  right_event	      },
-	{ bottom_left_event, bottom_event, bottom_right_event }
-    };
-    static event_callback button_callback[BUTTON_NUM] = {
-	close_button_event,
-	max_button_event,
-	min_button_event,
-	menu_button_event,
-	shade_button_event,
-	above_button_event,
-	stick_button_event,
-	unshade_button_event,
-	unabove_button_event,
-	unstick_button_event
-    };
-
     fw->window = win;
     fw->xid = frame_window;
     fw->atom = atom;
     fw->container = gtk_window_new (GTK_WINDOW_POPUP);
+    fw->event_box = gtk_event_box_new ();
 
     colormap = get_colormap_for_drawable (GDK_DRAWABLE (compiz_frame_window));
     gtk_widget_set_colormap (GTK_WIDGET (fw->container), colormap);
 
+    g_object_set (G_OBJECT (fw->container), "has-resize-grip", FALSE, NULL);
+    g_object_set (G_OBJECT (fw->container), "destroy-with-parent", TRUE, NULL);
+    g_object_set (G_OBJECT (fw->container), "focus-on-map", FALSE, NULL);
+    g_object_set (G_OBJECT (fw->container), "accept-focus", FALSE, NULL);
+    gdk_error_trap_push ();
     gtk_widget_realize (GTK_WIDGET (fw->container));
     backing_window = gtk_widget_get_window (GTK_WIDGET (fw->container));
 
+    fw->container_xid = GDK_WINDOW_XID (backing_window);
+
     /* Remove the input shape of the output window */
-    gdk_error_trap_push ();
-    XShapeSelectInput (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), GDK_WINDOW_XID (backing_window), NoEventMask);
-    XShapeCombineRectangles (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), GDK_WINDOW_XID (backing_window),
-			     ShapeInput, 0, 0, NULL, 0, ShapeSet, 0);
-
-    XSetWindowAttributes attrib;
-
-    /* Don't let events from this window screw up processing */
-    attrib.do_not_propagate_mask = ButtonPressMask | ButtonReleaseMask | PointerMotionMask;
-    XChangeWindowAttributes (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), GDK_WINDOW_XID (backing_window), CWDontPropagate, &attrib);
-
-    /* Reparent this window into the backing window */
-    XReparentWindow (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), GDK_WINDOW_XID (backing_window), fw->xid, 0, 0);
-    XLowerWindow (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), GDK_WINDOW_XID (backing_window));
-
     gdk_display_sync (gdk_display_get_default ());
     if (!gdk_error_trap_pop ())
     {
-	gtk_widget_show_all (GTK_WIDGET (fw->container));
-
-	for (i = 0; i < 3; i++)
-	    for (j = 0; j < 3; j++)
-		fw->event_windows[i][j].callback = callback[i][j];
-
-	for (i = 0; i < BUTTON_NUM; i++)
-	    fw->button_windows[i].callback = button_callback[i];
-
-	fw->container_xid = GDK_WINDOW_XID (backing_window);
-
-	update_event_windows (fw);
-
-	gdk_window_set_events (backing_window,
-				GDK_STRUCTURE_MASK);
 	gdk_window_set_events (compiz_frame_window,
 				gdk_window_get_events (compiz_frame_window) |
-				GDK_POINTER_MOTION_MASK |
-				GDK_BUTTON_PRESS_MASK |
-				GDK_BUTTON_RELEASE_MASK |
-				GDK_STRUCTURE_MASK);
-	gdk_window_add_filter (compiz_frame_window, event_filter_func, NULL);
-	gdk_window_add_filter (backing_window, event_filter_func, NULL);
+				GDK_STRUCTURE_MASK |
+				GDK_SUBSTRUCTURE_MASK);
 
-	g_hash_table_insert (frame_table, GINT_TO_POINTER (fw->xid), win);
-	g_hash_table_insert (frame_table, GINT_TO_POINTER (fw->container_xid), win);
+	decor_request_embed_window (gdk_x11_display_get_xdisplay (gdk_display_get_default ()),
+				    gdk_x11_get_default_screen (),
+				    win->xid,
+				    fw->container_xid,
+				    fw->xid,
+				    0,
+				    0);
+	g_hash_table_insert (frame_table, GINT_TO_POINTER (fw->xid), fw);
+	g_hash_table_insert (frame_table, GINT_TO_POINTER (fw->container_xid), fw);
     }
     else
     {
+	g_warning ("failed to create input window for 0x%x", fw->window->xid);
 	gtk_widget_destroy (GTK_WIDGET (fw->container));
 	free (fw);
 	return NULL;
@@ -693,18 +683,54 @@
 }
 
 void
-gwd_frame_window_delete (GWDFrameWindow *fw, gboolean safe)
+gwd_frame_window_delete (GWDFrameWindow *fw, gboolean unreparented)
 {
-
-    if (!safe && fw->container)
-	gtk_widget_destroy (GTK_WIDGET (fw->container));
-    else if (safe && fw->container)
-	g_warning ("seems like some buggy application deleted our frame window, trying to work around, but I might leak memory in the process, sorry!");
-
-    g_hash_table_remove (frame_table, GINT_TO_POINTER (fw->xid));
-    g_hash_table_remove (frame_table, GINT_TO_POINTER (fw->container_xid));
-
-    free (fw);
+    gboolean safe = FALSE;
+
+    /* Triple check that ... */
+    if (!safe)
+    {
+	gdk_display_sync (gdk_display_get_default ());
+
+	XEvent e;
+	if (XCheckTypedWindowEvent (gdk_x11_display_get_xdisplay (gdk_display_get_default ()),
+				    fw->xid, DestroyNotify, &e))
+	{
+	    g_warning ("deleting destroyed window");
+	    XPutBackEvent (gdk_x11_display_get_xdisplay (gdk_display_get_default ()), &e);
+	    safe = TRUE;
+	}
+    }
+
+    /* Wait until the unreparent notification
+     * comes around */
+    if (!unreparented)
+    {
+	decor_request_embed_window (gdk_x11_display_get_xdisplay (gdk_display_get_default ()),
+				    gdk_x11_get_default_screen (),
+				    fw->window->xid,
+				    fw->container_xid,
+				    fw->xid,
+				    0,
+				    0);
+    }
+    else
+    {
+	if (last_clicked_frame &&
+	    last_clicked_frame->frame_window == fw)
+	    last_clicked_frame = NULL;
+
+	if (fw->container)
+	    gtk_widget_destroy (GTK_WIDGET (fw->container));
+
+	g_hash_table_remove (frame_table, GINT_TO_POINTER (fw->xid));
+	g_hash_table_remove (frame_table, GINT_TO_POINTER (fw->container_xid));
+
+	if (fw->window)
+	    fw->window->frame_window = NULL;
+
+	free (fw);
+    }
 }
 
 void
@@ -738,9 +764,7 @@
     {
 	GWDWindow *w = g_object_get_data (G_OBJECT (win), "decor");
 
-	/* g_object_get_data can return NULL here since
-	 * the window could have just been destroyed */
-
+	/* On startup this can be NULL */
 	if (w)
 	{
 	    w->state &= ~(DECOR_WINDOW_STATE_FOCUS);
@@ -755,7 +779,6 @@
 	GWDWindow *w = g_object_get_data (G_OBJECT (win), "decor");
 
 	w->state |= DECOR_WINDOW_STATE_FOCUS;
-
 	gwd_decoration_get (w, w->type, w->state, w->actions);
     }
 }
 
=== added directory 'gtk/window-decorator/test-cache'
=== removed file 'gtk/window-decorator/test-cache.c'
--- gtk/window-decorator/test-cache.c	2011-08-11 08:56:52 +0000
+++ gtk/window-decorator/test-cache.c	1970-01-01 00:00:00 +0000
@@ -1,116 +0,0 @@
-/*
- * test-cache.c
- *
- * Copyright (c) 2011 Canonical Ltd.
- *
- * 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 3 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, see <http://www.gnu.org/licenses/>.
- *
- * Authored by:
- * Sam Spilsbury <[e-mail]>
- */
-
-#include "decoration-test.h"
-
-int main (void)
-{
-    char            *data_string;
-    decor_cache_t   *cache = decor_cache_new ();
-    decor_subproperty_t *s1, *s2, *s3;
-    decoration      *d1 = NULL;
-    decoration      *d2 = NULL;
-    decoration      *d3 = NULL;
-
-    g_debug ("create decoration 1");
-
-    d1 = create_decoration_from_info (None, 5, 5, 5, 5,
-				      10, 10, 10, 10, 5, 5, 5, 5,
-				      100, 100,
-				      DECOR_WINDOW_TYPE_NORMAL,
-				      DECOR_WINDOW_STATE_FOCUS |
-				      DECOR_WINDOW_STATE_COMPOSITED,
-				      0,
-				      cache);
-
-    g_debug ("create decoration 2");
-
-    d2 = create_decoration_from_info (None, 5, 5, 5, 5,
-				      10, 10, 10, 10, 5, 5, 5, 5,
-				      100, 100,
-				      DECOR_WINDOW_TYPE_NORMAL,
-				      DECOR_WINDOW_STATE_COMPOSITED,
-				      0,
-				      cache);
-
-    g_debug ("create decoration 3");
-
-    d3 = create_decoration_from_info (None, 5, 5, 5, 5,
-				      10, 10, 10, 10, 5, 5, 5, 5,
-				      100, 100,
-				      DECOR_WINDOW_TYPE_DIALOG,
-				      DECOR_WINDOW_STATE_COMPOSITED,
-				      0,
-				      cache);
-
-    g_debug ("Writing pixmap property");
-
-    dump_decoration_data (d1->property->data);
-    dump_decoration_data (d2->property->data);
-    dump_decoration_data (d3->property->data);
-
-    printf ("Property contains : { ");
-    data_string = data_to_string (cache->data, cache->size);
-    printf ("%s", data_string);
-    printf ("}\n");
-    free (data_string);
-    data_string = NULL;
-
-    g_debug ("Reading pixmap property");
-
-    s1 = d1->property;
-    free (d1);
-
-    s2 = d2->property;
-    free (d2);
-
-    s3 = d3->property;
-    free (d3);
-
-    d1 = load_decoration_from_property (s1->data);
-    d1->property = s1;
-    d2 = load_decoration_from_property (s2->data);
-    d2->property = s2;
-    d3 = load_decoration_from_property (s3->data);
-    d3->property = s3;
-
-    dump_decoration (d1);
-    dump_decoration (d2);
-    dump_decoration (d3);
-
-    g_debug ("Delete decoration 2");
-    destroy_decoration (d2, cache);
-
-    dump_decoration (d1);
-    dump_decoration (d3);
-
-    g_debug ("Delete decoration 3");
-    destroy_decoration (d3, cache);
-
-    dump_decoration (d1);
-
-    g_debug ("Delete decoration 1");
-    destroy_decoration (d1, cache);
-
-    decor_cache_destroy (cache);
-    return 0;
-}
 
=== added file 'gtk/window-decorator/test-cache/CMakeLists.txt'
--- gtk/window-decorator/test-cache/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/test-cache/CMakeLists.txt	2011-08-19 15:05:12 +0000
@@ -0,0 +1,9 @@
+pkg_check_modules (TEST_CACHE REQUIRED libdecoration)
+include_directories (${TEST_CACHE_INCLUDE_DIRS}
+		     ${compiz_SOURCE_DIR}/include
+		     ..)
+add_definitions (-DPREFIX=\\\"${CMAKE_INSTALL_PREFIX}\\\")
+
+add_executable (test-cache test-cache.c ../decoration-test.c)
+
+target_link_libraries (test-cache ${TEST_CACHE_LIBRARIES})
 
=== added file 'gtk/window-decorator/test-cache/test-cache.c'
--- gtk/window-decorator/test-cache/test-cache.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/test-cache/test-cache.c	2011-08-19 15:05:12 +0000
@@ -0,0 +1,116 @@
+/*
+ * test-cache.c
+ *
+ * Copyright (c) 2011 Canonical Ltd.
+ *
+ * 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 3 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, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by:
+ * Sam Spilsbury <[e-mail]>
+ */
+
+#include "decoration-test.h"
+
+int main (void)
+{
+    char            *data_string;
+    decor_cache_t   *cache = decor_cache_new ();
+    decor_subproperty_t *s1, *s2, *s3;
+    decoration      *d1 = NULL;
+    decoration      *d2 = NULL;
+    decoration      *d3 = NULL;
+
+    printf ("create decoration 1\n");
+
+    d1 = create_decoration_from_info (None, 5, 5, 5, 5,
+				      10, 10, 10, 10, 5, 5, 5, 5,
+				      100, 100,
+				      DECOR_WINDOW_TYPE_NORMAL,
+				      DECOR_WINDOW_STATE_FOCUS |
+				      DECOR_WINDOW_STATE_COMPOSITED,
+				      0,
+				      cache);
+
+    printf ("create decoration 2\n");
+
+    d2 = create_decoration_from_info (None, 5, 5, 5, 5,
+				      10, 10, 10, 10, 5, 5, 5, 5,
+				      100, 100,
+				      DECOR_WINDOW_TYPE_NORMAL,
+				      DECOR_WINDOW_STATE_COMPOSITED,
+				      0,
+				      cache);
+
+    printf ("create decoration 3\n");
+
+    d3 = create_decoration_from_info (None, 5, 5, 5, 5,
+				      10, 10, 10, 10, 5, 5, 5, 5,
+				      100, 100,
+				      DECOR_WINDOW_TYPE_DIALOG,
+				      DECOR_WINDOW_STATE_COMPOSITED,
+				      0,
+				      cache);
+
+    printf ("Writing pixmap property\n");
+
+    dump_decoration_data (d1->property->data);
+    dump_decoration_data (d2->property->data);
+    dump_decoration_data (d3->property->data);
+
+    printf ("Property contains : { ");
+    data_string = data_to_string (cache->data, cache->size);
+    printf ("%s", data_string);
+    printf ("}\n");
+    free (data_string);
+    data_string = NULL;
+
+    printf ("Reading pixmap property\n");
+
+    s1 = d1->property;
+    free (d1);
+
+    s2 = d2->property;
+    free (d2);
+
+    s3 = d3->property;
+    free (d3);
+
+    d1 = load_decoration_from_property (s1->data);
+    d1->property = s1;
+    d2 = load_decoration_from_property (s2->data);
+    d2->property = s2;
+    d3 = load_decoration_from_property (s3->data);
+    d3->property = s3;
+
+    dump_decoration (d1);
+    dump_decoration (d2);
+    dump_decoration (d3);
+
+    printf ("Delete decoration 2\n");
+    destroy_decoration (d2, cache);
+
+    dump_decoration (d1);
+    dump_decoration (d3);
+
+    printf ("Delete decoration 3\n");
+    destroy_decoration (d3, cache);
+
+    dump_decoration (d1);
+
+    printf ("Delete decoration 1\n");
+    destroy_decoration (d1, cache);
+
+    decor_cache_destroy (cache);
+    return 0;
+}
 
=== modified file 'include/decoration.h'
--- include/decoration.h	2011-08-11 19:38:07 +0000
+++ include/decoration.h	2011-08-19 15:05:12 +0000
@@ -21,6 +21,8 @@
  * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
  * Author: David Reveman <[e-mail]>
+ * Frame Cache System: Copyright (c) 2011 Canonical Ltd.
+ *        Authored By: Sam Spilsbury <[e-mail]>
  */
 
 #ifndef _DECORATION_H
@@ -40,6 +42,7 @@
 #define DECOR_BARE_ATOM_NAME                    "_COMPIZ_WINDOW_DECOR_BARE"
 #define DECOR_NORMAL_ATOM_NAME                  "_COMPIZ_WINDOW_DECOR_NORMAL"
 #define DECOR_ACTIVE_ATOM_NAME                  "_COMPIZ_WINDOW_DECOR_ACTIVE"
+#define DECOR_REQUEST_EMBED_WINDOW_ATOM_NAME    "_COMPIZ_EMBED_DECOR_WINDOW"
 #define DECOR_WINDOW_ATOM_NAME                  "_COMPIZ_WINDOW_DECOR"
 #define DECOR_BLUR_ATOM_NAME                    "_COMPIZ_WM_WINDOW_BLUR_DECOR"
 #define DECOR_SWITCH_WINDOW_ATOM_NAME           "_COMPIZ_SWITCH_SELECT_WINDOW"
@@ -226,19 +229,35 @@
 int
 decor_version (void);
 
+/* Allocates a new cache object */
+
 decor_cache_t *
 decor_cache_new ();
 
+/* Destroys the cache object */
+
 void
 decor_cache_destroy (decor_cache_t *);
 
+/* Appends the size of a window property to a cache
+ * object, returning a structure representing the
+ * index of that property inside of the cache */
+
 decor_subproperty_t *
 decor_cache_append_window (decor_cache_t *cache);
 
+/* Appends the size of a pixmap property to a cache
+ * object, returning a structure representing the
+ * index of that property inside of the cache
+ *
+ * nQuad: maximum number of quads allowed in the
+ * property */
+
 decor_subproperty_t *
 decor_cache_append_pixmap (decor_cache_t *cache,
 			   unsigned int nQuad);
 
+/* Writes pixmap information to a pixmap subproperty */
 void
 decor_subproperty_set_pixmap (decor_subproperty_t   *property,
 			      Pixmap		    pixmap,
@@ -252,6 +271,7 @@
 			      unsigned int          frame_state,
 			      unsigned int          frame_actions);
 
+/* Writes window information to a pixmap subproperty */
 void
 decor_subproperty_set_window (decor_subproperty_t   *cache,
 			      decor_extents_t       *input,
@@ -276,15 +296,20 @@
 int
 decor_subproperty_get_type (long int *);
 
+/* Retreive the next subproperty index in the data */
 long *
 decor_get_next_subproperty (long int       	*data,
 			    long		*property,
 			    unsigned int	*n);
 
-/* frame_type, frame_state and frame_actions here
+/*
+ * Removes the subproperty specified at the index in property
+ * from the cache object and reallocates the cache, updating
+ * the indexes for the other properties automatically
+ *
+ * frame_type, frame_state and frame_actions here
  * are all used for error detection, though maybe
  * they should be removed in the future */
-
 int
 decor_cache_remove_subproperty (decor_cache_t       *cache,
 				unsigned int        frame_type,
@@ -292,6 +317,10 @@
 				unsigned int        frame_actions,
 				decor_subproperty_t *property);
 
+/*
+ * Reads serialized pixmap property information into
+ * a set of quads, pixmap and minimum geometry + metadata */
+
 int
 decor_pixmap_property_to_quads (long		 *data,
 				Pixmap		 *pixmap,
@@ -304,6 +333,10 @@
 				unsigned int     *frame_actions,
 				decor_quad_t     *quad);
 
+/*
+ * Reads serialized window property information into
+ * a set of minimum geometry + metadata */
+
 int
 decor_window_property (long	       *data,
 		       decor_extents_t *input,
@@ -449,6 +482,12 @@
 		       int	       height,
 		       decor_layout_t  *layout);
 
+/*
+ * Fills the specified picture with the shadow extents
+ * according to the frame layout information in layout
+ * and context
+ */
+
 void
 decor_fill_picture_extents_with_shadow (Display	        *xdisplay,
 					decor_shadow_t  *shadow,
@@ -468,6 +507,16 @@
 			       unsigned short  alpha,
 			       int	       shade_alpha);
 
+/*
+ * Blends a part of the frame into an existing
+ * XRenderPicture, clipping by region and
+ * padding as appropriate. Also applies a
+ * translucent fade-out to the decoration
+ * if that was specified
+ *
+ * Use ignore_src_alpha to force painting an
+ * opaque decoration */
+
 void
 decor_blend_border_picture (Display	    *xdisplay,
 			    decor_context_t *context,
@@ -482,6 +531,21 @@
 			    int	            shade_alpha,
 			    int             ignore_src_alpha);
 
+/*
+ * Convenience function for decorations to request that
+ * one of their windows be reparented into the frame
+ * window that compiz gave it. Specify None in
+ * embed to have the frame unreparented */
+
+int
+decor_request_embed_window (Display	    *xdisplay,
+			    int	            screen,
+			    Window	    client,
+			    Window	    embed,
+			    Window	    frame,
+			    int             x_off,
+			    int             y_off);
+
 #define DECOR_ACQUIRE_STATUS_SUCCESS	      0
 #define DECOR_ACQUIRE_STATUS_FAILED	      1
 #define DECOR_ACQUIRE_STATUS_OTHER_DM_RUNNING 2
 
=== modified file 'libdecoration/decoration.c'
--- libdecoration/decoration.c	2011-08-11 19:38:07 +0000
+++ libdecoration/decoration.c	2011-08-19 15:05:12 +0000
@@ -530,7 +530,6 @@
     }
     else
     {
-	/* There has to be something better than this ... */
 	data = data + decor_subproperty_get_size (data);
 	(*n)++;
     }
@@ -3037,6 +3036,38 @@
 }
 
 int
+decor_request_embed_window (Display	    *xdisplay,
+			    int	            screen,
+			    Window	    client,
+			    Window	    embed,
+			    Window	    frame,
+			    int             x_off,
+			    int             y_off)
+{
+    XEvent    event;
+    Atom      embed_window_atom = XInternAtom (xdisplay,
+					       DECOR_REQUEST_EMBED_WINDOW_ATOM_NAME,
+					       0);
+
+    /* Send client message indicating that we want to embed
+     * this 'embed' window into the frame for the client */
+    event.xclient.type	       = ClientMessage;
+    event.xclient.window       = client;
+    event.xclient.message_type = embed_window_atom;
+    event.xclient.format       = 32;
+    event.xclient.data.l[0]    = embed;
+    event.xclient.data.l[1]    = frame;
+    event.xclient.data.l[2]    = x_off;
+    event.xclient.data.l[3]    = y_off;
+    event.xclient.data.l[4]    = 0;
+
+    XSendEvent (xdisplay,  XRootWindow (xdisplay, screen), 0,
+		StructureNotifyMask, &event);
+
+    return 1;
+}
+
+int
 decor_acquire_dm_session (Display    *xdisplay,
 			  int	     screen,
 			  const char *name,
 
=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2011-08-11 19:39:44 +0000
+++ plugins/decor/src/decor.cpp	2011-08-19 15:05:12 +0000
@@ -42,6 +42,29 @@
 
 COMPIZ_PLUGIN_20090315 (decor, DecorPluginVTable)
 
+/*
+ * Count the number of bits which are currently
+ * set in an interger. */
+static unsigned int
+numBits (unsigned int i)
+{
+#ifdef __GNUC__
+    return __builtin_popcount (i);
+#else
+    unsigned int count = 0;
+    /* software implementation */
+    while (i > 0)
+    {
+	if (i & 1)
+	    count++;
+
+	i >> 1;
+    }
+
+    return count;
+#endif
+}
+
 /* From core */
 
 bool
@@ -857,7 +880,7 @@
 DecorWindow::matchType (CompWindow *w,
                         unsigned int decorType)
 {
-    const unsigned int nTypeStates = 5;
+    const unsigned int nTypeStates = 4;
     unsigned int i;
     struct typestate {
         unsigned int compFlag;
@@ -865,7 +888,8 @@
     } typeStates[] =
     {
         { CompWindowTypeNormalMask, DECOR_WINDOW_TYPE_NORMAL },
-	{ CompWindowTypeDialogMask, DECOR_WINDOW_TYPE_DIALOG },
+	{ CompWindowTypeDialogMask |
+	  CompWindowTypeModalDialogMask, DECOR_WINDOW_TYPE_DIALOG },
         { CompWindowTypeMenuMask, DECOR_WINDOW_TYPE_MENU },
         { CompWindowTypeUtilMask, DECOR_WINDOW_TYPE_UTILITY}
     };
@@ -975,7 +999,7 @@
 	    if (DecorWindow::matchType (w, d->frameType))
 	    {
 		/* Prefer the highest number of bits */
-		if (matchedType < d->frameType && (!sizeCheck || dw->checkSize (d)))
+		if (numBits (matchedType) < numBits (d->frameType) && (!sizeCheck || dw->checkSize (d)))
 		{
 		    decoration = d;
 		    matchedType = d->frameType;
@@ -983,7 +1007,7 @@
 
 		if (DecorWindow::matchState (w, d->frameState) && (!sizeCheck || dw->checkSize (d)))
 		{
-		    if (matchedState < d->frameState)
+		    if (numBits (matchedState) < numBits (d->frameState))
 		    {
 			decoration = d;
 			matchedState = d->frameState;
@@ -991,7 +1015,7 @@
 
 		    if (DecorWindow::matchActions (w, d->frameActions) && (!sizeCheck || dw->checkSize (d)))
 		    {
-			if (matchedActions < d->frameActions)
+			if (numBits (matchedActions) < numBits (d->frameActions))
 			{
 			    decoration = d;
 			    matchedActions = d->frameActions;
@@ -1061,7 +1085,7 @@
     if (decorate)
     {
         /* Attempt to find a matching */
-        decoration = decor.findMatchingDecoration (window, true);
+	decoration = decor.findMatchingDecoration (window, true);
 
 	if (!decoration)
 	{
@@ -1219,21 +1243,52 @@
 	    Window parent;
 	    Window *children;
 	    unsigned int nchildren;
-	    XEvent e;
-
-	    /* Unreparent all the children of this window first into a
-	     * the root window. Once the property is deleted it is the DM's
-	     * responsibility to get rid of the decoration ... though that may
-	     * come with artifacts */
-	    if (XCheckTypedWindowEvent (screen->dpy (), inputFrame, DestroyNotify, &e))
-	    {
-		XPutBackEvent (screen->dpy (), &e);
+	    std::vector<XEvent> events;
+	    bool                  pending = true;
+	    bool                  alive   = true;
+
+	    /* Check pending events on StructureNotifyMask to see if this frame window
+	     * has already been destroyed, in which case unreparenting its children
+	     * is pointless since the save sets will do that for us
+	     *
+	     * Note: we can't use XCheckTypedEvent here since we also have SubstructureNotifyMask
+	     * on the inputFrame and may recieve DestroyNotify events for its children */
+	    while (pending)
+	    {
+		XEvent e;
+		pending = XCheckWindowEvent (screen->dpy (), inputFrame, StructureNotifyMask, &e);
+
+		if (pending)
+		{
+		    events.push_back (e);
+		    if (e.type == DestroyNotify && e.xdestroywindow.window == inputFrame)
+		    {
+			alive = false;
+			break;
+		    }
+		}
+	    }
+
+	    /* Put all the events back in the queue */
+	    while (events.size ())
+	    {
+		XPutBackEvent (screen->dpy (), &events.back ());
+		events.pop_back ();
+	    }
+
+	    if (!alive)
+	    {
+		inputFrame = 0;
 	    }
 	    else
 	    {
 	        Status       s = XQueryTree (screen->dpy (), inputFrame, &root,
 					     &parent, &children, &nchildren);
 
+		/* Unreparent all the children of this window first into a
+		 * the root window. Once the property is deleted it is the DM's
+		 * responsibility to get rid of the decoration ... though that may
+		 * come with artifacts */
 	        if (s && nchildren && children)
 	        {
 		    for (unsigned int i = 0; i < nchildren; i++)
@@ -1256,6 +1311,8 @@
 	    inputFrame = None;
 	    frameRegion = CompRegion ();
 
+	    dScreen->frames.erase (inputFrame);
+
 	    oldX = 0;
 	    oldY = 0;
 	    oldWidth  = 0;
@@ -1268,17 +1325,42 @@
 	    Window parent;
 	    Window *children;
 	    unsigned int nchildren;
-	    XEvent e;
+	    std::vector<XEvent> events;
+	    bool                  pending = true;
+	    bool                  alive   = true;
+
+	    /* Unreparent all the children of this window first into a
+	     * the root window. Once the property is deleted it is the DM's
+	     * responsibility to get rid of the decoration ... though that may
+	     * come with artifacts */
 
 	    XDamageDestroy (screen->dpy (), frameDamage);
 
-	    /* Unreparent all the children of this window first into a
-	     * the root window. Once the property is deleted it is the DM's
-	     * responsibility to get rid of the decoration ... though that may
-	     * come with artifacts */
-	    if (XCheckTypedWindowEvent (screen->dpy (), outputFrame, DestroyNotify, &e))
-	    {
-		XPutBackEvent (screen->dpy (), &e);
+	    while (pending)
+	    {
+		XEvent e;
+		pending = XCheckWindowEvent (screen->dpy (), outputFrame, StructureNotifyMask, &e);
+
+		if (pending)
+		{
+		    events.push_back (e);
+		    if (e.type == DestroyNotify && e.xdestroywindow.window == inputFrame)
+		    {
+			alive = false;
+			break;
+		    }
+		}
+	    }
+
+	    while (events.size ())
+	    {
+		XPutBackEvent (screen->dpy (), &events.back ());
+		events.pop_back ();
+	    }
+
+	    if (!alive)
+	    {
+		outputFrame = 0;
 	    }
 	    else
 	    {
@@ -1359,9 +1441,8 @@
     {
 	XSetWindowAttributes attr;
 
-	attr.event_mask	   = StructureNotifyMask;
+	attr.event_mask	   = StructureNotifyMask | SubstructureNotifyMask;
 	attr.override_redirect = true;
-
 	/* cough */
 	/* Yeah, so as it turns out you can't reparent an InputOuput
 	 * window into an InputOnly one, which is what some decorators
@@ -1387,6 +1468,8 @@
 	if (screen->XShape ())
 	    XShapeSelectInput (screen->dpy (), inputFrame, ShapeNotifyMask);
 
+	dScreen->frames[inputFrame] = this;
+
 	oldX = 0;
 	oldY = 0;
 	oldWidth  = 0;
@@ -1475,7 +1558,7 @@
 	XSetWindowAttributes attr;
 
 	attr.background_pixel  = 0x0;
-	attr.event_mask        = StructureNotifyMask;
+	attr.event_mask	   = StructureNotifyMask | SubstructureNotifyMask;
 	attr.override_redirect = true;
 
 	outputFrame = XCreateWindow (screen->dpy (), window->frame (),
@@ -1796,6 +1879,10 @@
     CompWindow *w;
 
     switch (event->type) {
+	case MapRequest:
+	    if (frames.find (event->xmaprequest.parent) != frames.end ())
+		XMapWindow (screen->dpy (), event->xmaprequest.window);
+	    break;
 	case DestroyNotify:
 	    w = screen->findWindow (event->xdestroywindow.window);
 	    if (w)
@@ -1803,6 +1890,16 @@
 		if (w->id () == dmWin)
 		    checkForDm (true);
 	    }
+	    else
+	    {
+		if (frames.find (event->xdestroywindow.event) != frames.end ())
+		{
+		    DecorWindow *dw = frames[event->xdestroywindow.event];
+
+		    XChangeSaveSet (screen->dpy (), event->xdestroywindow.window, SetModeDelete);
+		    dw->decoratorWindows.remove (event->xdestroywindow.window);
+		}
+	    }
 	    break;
 	case ClientMessage:
 	    if (event->xclient.message_type == requestFrameExtentsAtom)
@@ -1811,6 +1908,48 @@
 		if (w)
 		    DecorWindow::get (w)->update (true);
 	    }
+	    /* The decoration manager requested for us to embed
+	     * one of its frame windows, so do that */
+	    if (event->xclient.message_type == decorRequestEmbedWindowAtom)
+	    {
+		w = screen->findWindow (event->xclient.window);
+		if (w)
+		{
+		    DecorWindow *dw = DecorWindow::get (w);
+		    Window embed = event->xclient.data.l[0];
+		    Window frame = event->xclient.data.l[1];
+
+		    if (frame)
+		    {
+			XChangeSaveSet (screen->dpy (), embed, SetModeInsert);
+			XReparentWindow (screen->dpy (),
+					 embed,
+					 frame,
+					 0,
+					 0);
+
+			dw->decoratorWindows.push_back (embed);
+		    }
+		    /* In case the decoration manager specifies no frame, it doesn't
+		     * wish for this frame window to be embedded anymore */
+		    else
+		    {
+			std::list<Window>::iterator it = std::find (dw->decoratorWindows.begin(),
+								    dw->decoratorWindows.end(),
+								    frame);
+
+			if (it != dw->decoratorWindows.end ())
+			{
+			    XChangeSaveSet (screen->dpy (), embed, SetModeDelete);
+			    XReparentWindow (screen->dpy (),
+					     embed,
+					     screen->root (),
+					     event->xclient.data.l[1],
+					     event->xclient.data.l[2]);
+			}
+		    }
+		}
+	    }
 	default:
 	    if (cmActive &&
 		event->type == cScreen->damageEvent () + XDamageNotify)
@@ -1928,7 +2067,7 @@
 	    break;
 	case DestroyNotify:
 	    /* Only for when the client window gets destroyed */
-	    w = screen->findTopLevelWindow (event->xproperty.window);
+	    w = screen->findTopLevelWindow (event->xdestroywindow.window);
 	    if (w)
 	    {
 		DECOR_WINDOW (w);
@@ -2278,6 +2417,8 @@
 	XInternAtom (s->dpy (), "_COMPIZ_NET_CM_SHADOW_COLOR", 0);
     shadowInfoAtom =
 	XInternAtom (s->dpy (), "_COMPIZ_NET_CM_SHADOW_PROPERTIES", 0);
+    decorRequestEmbedWindowAtom =
+	XInternAtom (s->dpy (), DECOR_REQUEST_EMBED_WINDOW_ATOM_NAME, 0);
 
     windowDefault.texture   = NULL;
     windowDefault.minWidth  = 0;
 
=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2011-08-11 19:38:07 +0000
+++ plugins/decor/src/decor.h	2011-08-19 15:05:12 +0000
@@ -160,6 +160,7 @@
 	Atom shadowColorAtom;
 	Atom shadowInfoAtom;
 	Atom decorSwitchWindowAtom;
+	Atom decorRequestEmbedWindowAtom;
 
 	Window dmWin;
 	int    dmSupports;
@@ -258,6 +259,8 @@
 	bool	  unshading;
 	bool	  shading;
 	bool	  isSwitcher;
+
+	std::list<Window> decoratorWindows;
 };
 
 class DecorPluginVTable :