Merge lp:~linaro-graphics-wg/compiz-core/linaro-gles2 into lp:compiz-core/0.9.5

[Sam Spilsbury]

This branch contains the code to make compiz work on GLES. This includes several changes to the compiz API.

* GLVertexBuffer class added for managing vertices, normals, texture coordinates, and colors
* GLProgram class added for managing GLSL programs
* GLProgramCache class added for managing per-plugin GLSL programs efficiently, uses an LRU cache
  to avoid recompiling recently used GLSL programs all the time
* GLFragment class removed as fragment programs are no longer used (replaced with GLSL programs)
* GL_BLEND now always enabled when rendering as almost everything was enabling it anyway
* EGL context setup added
* EglTexture class added to use EGL_image extension instead of GLX_EXT_texture_from_pixmap for GLES

Things left to do for a complete port:

  * properly check for GLSL support on desktop, currently assumes if you have VBO support you
    have GLSL support
  * port blur, wobbly, rotate, cube, and water plugins
    * wobbly, cube, and rotate should be fairly straightforward, water and blur need updated to
      use GLSL instead of fragment programs

[Sam Spilsbury (smspillaz)]

1682 + int render (const GLMatrix &modelview,
1683 + const GLWindowPaintAttrib &attrib);
1684 +
1685 + int render (const GLMatrix &projection,
1686 + const GLMatrix &modelview,
1687 + const GLWindowPaintAttrib &attrib);

Probably for the sake of API confusion, it might be worth swapping the order of projection and modelview in this case, so you have

1685 + int render (const GLMatrix &modelview,
1686 + const GLMatrix &projection,
1687 + const GLWindowPaintAttrib &attrib);

--

1586 + GLProgram* operator () (std::list<GLShaderData*>);

Can that take a const std::list <GLShaderData *> & ?

1116 +#if !defined(GL_BGRA)
1117 + #if !defined(GL_BGRA_EXT)
1118 + #error GL_BGRA support is required
1119 + #else
1120 + #define GL_BGRA GL_BGRA_EXT
1121 + #endif
1122 +#endif

This can probably be detected in CMake by using try_compile () [1]

1703 - <default>true</default>
1704 + <default>false</default>

Does this need to be off by default?

1678 + void setProgram (GLProgram *program);
1679 +
1680 + int render (const GLMatrix &modelview);
1681 +
1682 + int render (const GLMatrix &modelview,
1683 + const GLWindowPaintAttrib &attrib);
1684 +
1685 + int render (const GLMatrix &projection,
1686 + const GLMatrix &modelview,
1687 + const GLWindowPaintAttrib &attrib);

The semantics of this are odd. Is GLVertexBuffer meant to be a stateful object which holds on to the state of what its rendering? In that case, it might be more appropriate to have a:

void setProjection ();
void setModelView ();
void setAttrib ();

However, on another though, perhaps all of these arguments are redundant. If glPushMatrix, glLoadMatrixf and glPopMatrix are all parts of the deprecated API, and PrivateGLVertexBuffer::render is really doing this:

+ GLfloat params[4] = {0, 0, 0, 0};
+ GLfloat attribs[3] = {1, 1, 1};
+ GLint index = 0;
+

+ program->setUniform ("projection", projection);
+ program->setUniform ("modelview", modelview);

+ //convert paint attribs to 0-1 range
+ attribs[0] = attrib.opacity / 65535.0f;
+ attribs[1] = attrib.brightness / 65535.0f;
+ attribs[2] = attrib.saturation / 65535.0f;
+ program->setUniform3f ("paintAttrib", attribs[0], attribs[1], attribs[2]);
+

Then it might make more sense to have helper objects in the OpenGL plugin to handle that so that you don't need to pass matrices or paint attributes to the GLVertexBuffer at render time and we don't need to continue to expand the ::render () function argument list should we add more things to the core profile.

The helper object might just server to build a GLProgram with that stuff built in so that it can be passed directly to GLVertexBuffer at render time. Just a thought.

+ #ifdef USE_GLES
+ Display *xdpy = screen->dpy ();
+
+ glFlush ();
+ if (mask & COMPOSITE_SCREEN_DAMAGE_ALL_MASK)
+ {
+ eglSwapBuffers (eglGetDisplay (xdpy), surface);
+ }
+ else
+ {
+ #warning use proper extension for this
+ eglSwapBuffers (eglGetDisplay (xdpy), surface);
+ }
+ eglW...

[Daniel van Vugt (vanvugt)]

Is there a reason nothing has happened here since Aug/Sep 2011?

[Sam Spilsbury (smspillaz)]

All these conflicts seem to be here due to the fact that bzr seems to think we've deleted and re-added every file in the tree *sigh*

[Daniel van Vugt (vanvugt)]

No problem. Just make a new branch and copy these files into it and propose the new one. Then bzr should be happier.

[lp:~linaro-graphics-wg/compiz-core/linaro-gles2]

2901. By Frederic Plourde on 2012-01-25

Fix compiz decorator's shadow blending

2902. By Frederic Plourde on 2012-01-25

Workaround GL_LINE_LOOP usage in resize plugin

2903. By Frederic Plourde on 2012-01-25

Fix blending in the resize plugin

2904. By Frederic Plourde on 2012-01-25

Draw resize plugin in fullscreen mode to workaround rendering instabilities

2905. By Alexandros Frantzis on 2012-02-23

Sync with lp:compiz-core.

2906. By Alexandros Frantzis on 2012-02-23

Sync with lp:compiz-core.

2907. By Alexandros Frantzis on 2012-03-02

Sync with lp:compiz-core.

2908. By Alexandros Frantzis on 2012-03-05

Use new WRAPABLE_HND_* macros.

2909. By Alexandros Frantzis on 2012-03-05

Correct count of wrapable functions in GLScreen.

2910. By Alexandros Frantzis on 2012-03-05

Sync with lp:compiz-core

2911. By Frederic Plourde on 2012-03-09

Fix decoration mapping instabilities and texturing artefacts.

2912. By Alexandros Frantzis on 2012-03-13

Work around compile issue on ARM.

When compiling with -O2 on ARM, the original code leads to an array index out
of bounds compilation error. In that case, the compiler doesn't infer that
sizeof(a)/sizeof(T) is a constant, and tries to compile cases in the switch
statement that use array indices that are invalid for the particular template
instantiation.

To fix this we use the 'C' template variable, which is constant for each
template instantiation, directly in the switch statement.

2913. By Alexandros Frantzis on 2012-03-13

Sync with lp:compiz-core.

2914. By Alexandros Frantzis on 2012-03-21

Sync with lp:compiz-core.

2915. By Alexandros Frantzis on 2012-03-29

opengl: Ensure blending is enabled, when needed, when drawing window contents.

2916. By Alexandros Frantzis on 2012-04-02

opengl: Refactor shader infrastructure to use small, performant programs.

This commit replaces the single complicated shader with minimal,
performant shaders, tailored to specific use cases. The new GLShaderCache
object is used for creating and caching the shader data for specific uses
cases (GLShaderParameters).

This commit also adds automatic creation of suitable GL programs in
GLVertexBuffers (see ::setAutoProgram) that don't have a program
explicitly set.

2917. By Alexandros Frantzis on 2012-04-03

Sync with lp:compiz-core.

2918. By Alexandros Frantzis on 2012-04-04

opengl: Disable blending by default when drawing the screen.

Each operation/plugin should enable it (and reset it) as needed
(as most operations are currently doing).

2919. By Alexandros Frantzis on 2012-04-06

Fix compilation with desktop GL.

2920. By Alexandros Frantzis on 2012-04-06

opengl: For OpenGL ES 2.0 ensure that format equals internalFormat when uploading texture data.

In OpenGL ES 2.0 no format conversion is allowed, i.e., format must equal internalFormat.

2921. By Alexandros Frantzis on 2012-04-10

Sync with lp:compiz-core.

2922. By Alexandros Frantzis on 2012-04-19

Sync with lp:compiz-core.

Unmerged revisions

2922. By Alexandros Frantzis on 2012-04-19

Sync with lp:compiz-core.

2921. By Alexandros Frantzis on 2012-04-10

Sync with lp:compiz-core.

2920. By Alexandros Frantzis on 2012-04-06

opengl: For OpenGL ES 2.0 ensure that format equals internalFormat when uploading texture data.

In OpenGL ES 2.0 no format conversion is allowed, i.e., format must equal internalFormat.

2919. By Alexandros Frantzis on 2012-04-06

Fix compilation with desktop GL.

2918. By Alexandros Frantzis on 2012-04-04

opengl: Disable blending by default when drawing the screen.

Each operation/plugin should enable it (and reset it) as needed
(as most operations are currently doing).

2917. By Alexandros Frantzis on 2012-04-03

Sync with lp:compiz-core.

2916. By Alexandros Frantzis on 2012-04-02

opengl: Refactor shader infrastructure to use small, performant programs.

This commit replaces the single complicated shader with minimal,
performant shaders, tailored to specific use cases. The new GLShaderCache
object is used for creating and caching the shader data for specific uses
cases (GLShaderParameters).

This commit also adds automatic creation of suitable GL programs in
GLVertexBuffers (see ::setAutoProgram) that don't have a program
explicitly set.

2915. By Alexandros Frantzis on 2012-03-29

opengl: Ensure blending is enabled, when needed, when drawing window contents.

2914. By Alexandros Frantzis on 2012-03-21

Sync with lp:compiz-core.

2913. By Alexandros Frantzis on 2012-03-13

Sync with lp:compiz-core.

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-01-24 10:43:23 +0000
+++ CMakeLists.txt	2012-02-08 18:50:27 +0000
@@ -86,6 +86,7 @@
     libxml-2.0
     libxslt
     glib-2.0
+    gtk+-3.0
     gio-2.0
     glibmm-2.4
     "libstartup-notification-1.0 >= 0.7"
@@ -119,6 +120,7 @@
     DESTINATION ${COMPIZ_DESTDIR}${libdir}/pkgconfig
 )
 
+<<<<<<< TREE
 # Build Google Test and make its headers known
 find_package (GTest)
 find_library (GMOCK_LIBRARY gmock)
@@ -134,6 +136,14 @@
 find_package (Threads REQUIRED)
 
 # Add the rest of compiz
+=======
+# temporarily disable plugins that aren't ported yed
+set (COMPIZ_DISABLE_PLUGIN_BLUR ON)
+set (COMPIZ_DISABLE_PLUGIN_CUBE ON)
+set (COMPIZ_DISABLE_PLUGIN_ROTATE ON)
+set (COMPIZ_DISABLE_PLUGIN_WOBBLY ON)
+
+>>>>>>> MERGE-SOURCE
 add_subdirectory (cmake)
 add_subdirectory (include)
 add_subdirectory (images)
@@ -145,7 +155,14 @@
 add_subdirectory (src)
 add_subdirectory (xslt)
 add_subdirectory (plugins)
+<<<<<<< TREE
 add_subdirectory (tests)
+=======
+add_subdirectory (unity/unity_window_decorator)
+if (BUILD_TESTING)
+	add_subdirectory (tests)
+endif (BUILD_TESTING)
+>>>>>>> MERGE-SOURCE
 
 compiz_ensure_linkage ()
 compiz_package_generation ("Compiz")
@@ -159,7 +176,16 @@
 
 _check_compiz_cmake_macro (${CMAKE_MODULE_PATH_ORIG})
 
+<<<<<<< TREE
 # Enable coverage reporting for compiz
 enable_coverage_report()
 
 
+=======
+# temporarily disable plugins that aren't ported yed
+SET(COMPIZ_DISABLE_PLUGIN_BLUR "ON")
+SET(COMPIZ_DISABLE_PLUGIN_CUBE "ON")
+SET(COMPIZ_DISABLE_PLUGIN_ROTATE "ON")
+SET(COMPIZ_DISABLE_PLUGIN_WATER "ON")
+SET(COMPIZ_DISABLE_PLUGIN_WOBBLY "ON")
+>>>>>>> MERGE-SOURCE
 
=== modified file 'NEWS'
=== modified file 'VERSION'
--- VERSION	2012-01-24 09:11:41 +0000
+++ VERSION	2012-02-08 18:50:27 +0000
@@ -1,1 +1,5 @@
+<<<<<<< TREE
 0.9.7.0
+=======
+0.9.6
+>>>>>>> MERGE-SOURCE
 
=== modified file 'cmake/CMakeLists.txt'
--- cmake/CMakeLists.txt	2011-07-27 16:13:28 +0000
+++ cmake/CMakeLists.txt	2012-02-08 18:50:27 +0000
@@ -15,6 +15,8 @@
       plugin_extensions/CompizGenInstallData.cmake)
 list (APPEND _PluginExtensionFiles
       plugin_extensions/CompizGenInstallImages.cmake)
+list (APPEND _PluginExtensionFiles
+      plugin_extensions/CompizOpenGLFixups.cmake)
 
 if (USE_GCONF)
     list (APPEND _files CompizGconf.cmake)
 
=== modified file 'cmake/CompizCommon.cmake'
--- cmake/CompizCommon.cmake	2012-01-27 07:01:47 +0000
+++ cmake/CompizCommon.cmake	2012-02-08 18:50:27 +0000
@@ -18,6 +18,7 @@
 
 set (CMAKE_SKIP_RPATH FALSE)
 
+option (BUILD_GLES "Build against GLESv2 instead of GL" OFF)
 option (COMPIZ_BUILD_WITH_RPATH "Leave as ON unless building packages" ON)
 option (COMPIZ_RUN_LDCONFIG "Leave OFF unless you need to run ldconfig after install")
 option (COMPIZ_PACKAGING_ENABLED "Enable to manually set prefix, exec_prefix, libdir, includedir, datadir" OFF)
@@ -75,6 +76,17 @@
     set(IS_BZR_REPO 0)
 endif (IS_DIRECTORY ${CMAKE_SOURCE_DIR}/.bzr)
 
+set (USE_GLES ${BUILD_GLES})
+
+if (USE_GLES)
+    find_package(OpenGLES2)
+
+    if (NOT OPENGLES2_FOUND)
+	set (USE_GLES 0)
+	message (SEND_ERROR "OpenGLESv2 not found")
+    endif (NOT OPENGLES2_FOUND)
+endif (USE_GLES)
+
 function (compiz_ensure_linkage)
     find_program (LDCONFIG_EXECUTABLE ldconfig)
     mark_as_advanced (FORCE LDCONFIG_EXECUTABLE)
@@ -124,8 +136,13 @@
 	add_custom_target (release-signoff)
 
 	add_custom_target (release-update-working-tree
+<<<<<<< TREE
 			   COMMAND cp NEWS ${CMAKE_SOURCE_DIR} && bzr add ${CMAKE_SOURCE_DIR}/NEWS &&
 				   cp AUTHORS ${CMAKE_SOURCE_DIR} && bzr add ${CMAKE_SOURCE_DIR}/AUTHORS
+=======
+			   COMMAND cp NEWS ${CMAKE_SOURCE_DIR} && git add ${CMAKE_SOURCE_DIR}/NEWS &&
+				   cp AUTHORS ${CMAKE_SOURCE_DIR} && git add ${CMAKE_SOURCE_DIR}/AUTHORS
+>>>>>>> MERGE-SOURCE
 			   COMMENT "Updating working tree"
 			   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}) 
 
@@ -190,6 +207,7 @@
 		message ("-- Using auto news update: " ${AUTO_NEWS_UPDATE})
 	endif (AUTO_NEWS_UPDATE)
 
+<<<<<<< TREE
 	if (NOT EXISTS ${CMAKE_SOURCE_DIR}/.AUTHORS.sed)
 		file (WRITE ${CMAKE_SOURCE_DIR}/.AUTHORS.sed "")
 	endif (NOT EXISTS ${CMAKE_SOURCE_DIR}/.AUTHORS.sed)
@@ -210,6 +228,55 @@
 				   COMMENT "Generating NEWS Header"
 				   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
 	endif (AUTO_NEWS_UPDATE)
+=======
+	if (NOT EXISTS ${CMAKE_SOURCE_DIR}/.AUTHORS.sed)
+		file (WRITE ${CMAKE_SOURCE_DIR}/.AUTHORS.sed "")
+	endif (NOT EXISTS ${CMAKE_SOURCE_DIR}/.AUTHORS.sed)
+
+	if (${IS_GIT_REPO})
+		find_program (GEN_GIT_LOG gen-git-log.sh)
+		add_custom_target (authors
+				   COMMAND git shortlog -se | cut -c8- | sed -r -f ${CMAKE_SOURCE_DIR}/.AUTHORS.sed  | sort -u  > AUTHORS
+				   COMMENT "Generating AUTHORS"
+				   WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+
+		if (AUTO_NEWS_UPDATE)
+			add_custom_target (news-header echo > ${CMAKE_BINARY_DIR}/NEWS.update
+					   COMMAND echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`git config user.name`' <'`git config user.email`'>)' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo '${AUTO_NEWS_UPDATE}' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
+					   COMMENT "Generating NEWS Header"
+					   WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+		else (AUTO_NEWS_UPDATE)
+			add_custom_target (news-header echo > ${CMAKE_BINARY_DIR}/NEWS.update
+					   COMMAND echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`git config user.name`' <'`git config user.email`'>)' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && $ENV{EDITOR} ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
+					   COMMENT "Generating NEWS Header"
+					   WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
+		endif (AUTO_NEWS_UPDATE)
+
+	else (${IS_GIT_REPO})
+		if (${IS_BZR_REPO})
+			add_custom_target (authors
+					   COMMAND bzr log --long --levels=0 | grep -e "^\\s*author:" -e "^\\s*committer:" | cut -d ":" -f 2 | sed -r -f ${CMAKE_SOURCE_DIR}/.AUTHORS.sed  | sort -u > AUTHORS
+					   COMMENT "Generating AUTHORS")
+
+			if (AUTO_NEWS_UPDATE)
+
+				add_custom_target (news-header echo > ${CMAKE_BINARY_DIR}/NEWS.update
+						   COMMAND echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`bzr config email`')' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo '${AUTO_NEWS_UPDATE}' >> ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
+						   COMMENT "Generating NEWS Header"
+						   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+			else (AUTO_NEWS_UPDATE)
+				add_custom_target (news-header echo > ${CMAKE_BINARY_DIR}/NEWS.update
+						   COMMAND echo 'Release ${VERSION} ('`date +%Y-%m-%d`' '`bzr config email`')' > ${CMAKE_BINARY_DIR}/NEWS.update && seq -s "=" `cat ${CMAKE_BINARY_DIR}/NEWS.update | wc -c` | sed 's/[0-9]//g' >> ${CMAKE_BINARY_DIR}/NEWS.update && $ENV{EDITOR} ${CMAKE_BINARY_DIR}/NEWS.update && echo >> ${CMAKE_BINARY_DIR}/NEWS.update
+						   COMMENT "Generating NEWS Header"
+						   WORKING_DIRECTORY ${CMAKE_SOURCE_DIR})
+			endif (AUTO_NEWS_UPDATE)
+
+		else (${IS_BZR_REPO})
+			add_custom_target (authors)
+			add_custom_target (news-header)
+		endif (${IS_BZR_REPO})
+	endif (${IS_GIT_REPO})
+>>>>>>> MERGE-SOURCE
 
 	add_custom_target (news
 			   COMMAND cat ${CMAKE_SOURCE_DIR}/NEWS > NEWS.old &&
 
=== added file 'cmake/CompizGSettings.cmake'
--- cmake/CompizGSettings.cmake	1970-01-01 00:00:00 +0000
+++ cmake/CompizGSettings.cmake	2012-02-08 18:50:27 +0000
@@ -0,0 +1,76 @@
+option (
+    USE_GSETTINGS
+    "Generate GSettings schemas"
+    ON
+)
+
+option (
+    COMPIZ_DISABLE_GS_SCHEMAS_INSTALL
+    "Disables gsettings schema installation"
+    OFF
+)
+
+set (
+    COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR ${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR} CACHE PATH
+    "Installation path of the gsettings schema file"
+)
+
+function (compiz_install_gsettings_schema _src _dst)
+    find_program (PKG_CONFIG_TOOL pkg-config)
+    find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas)
+    mark_as_advanced (FORCE PKG_CONFIG_TOOL)
+
+    # find out where schemas need to go if we are installing them systemwide
+    execute_process (COMMAND ${PKG_CONFIG_TOOL} glib-2.0 --variable prefix  OUTPUT_VARIABLE GSETTINGS_GLIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+    SET (GSETTINGS_GLOBAL_INSTALL_DIR "${GSETTINGS_GLIB_PREFIX}/share/glib-2.0/schemas/")
+
+    if (PKG_CONFIG_TOOL AND
+	GLIB_COMPILE_SCHEMAS AND NOT
+	COMPIZ_DISABLE_SCHEMAS_INSTALL AND
+	USE_GSETTINGS)
+	install (CODE "
+		message (\"$ENV{USER} is the username in use right now\")
+		if (\"$ENV{USER}\"\ STREQUAL \"root\")
+		    message (\"-- Installing GSettings schemas ${GSETTINGS_GLOBAL_INSTALL_DIR}\"\)
+		    file (INSTALL DESTINATION \"${GSETTINGS_GLOBAL_INSTALL_DIR}\"
+			  TYPE FILE
+			  FILES \"${_src}\")
+		    message (\"-- Recompiling GSettings schemas in ${GSETTINGS_GLOBAL_INSTALL_DIR}\"\)
+		    execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${GSETTINGS_GLOBAL_INSTALL_DIR})
+
+		else (\"$ENV{USER}\"\ STREQUAL \"root\"\)
+		    # It seems like this is only available in CMake > 2.8.5
+		    # but hardly anybody has that, so comment out this warning for now
+		    # string (FIND $ENV{XDG_DATA_DIRS} \"${COMPIZ_DESTDIR}${_dst}\" XDG_INSTALL_PATH)
+		    # if (NOT XDG_INSTALL_PATH)
+		    #	message (\"[WARNING]: Installing GSettings schemas to directory that is not in XDG_DATA_DIRS, you need to add ${COMPIZ_DESTDIR}${_dst} to your XDG_DATA_DIRS in order for GSettings schemas to be found!\"\)
+		    # endif (NOT XDG_INSTALL_PATH)
+		    message (\"-- Installing GSettings schemas to ${COMPIZ_DESTDIR}${_dst}\"\)
+		    file (INSTALL DESTINATION \"${COMPIZ_DESTDIR}${_dst}\"
+			  TYPE FILE
+			  FILES \"${_src}\")
+		    message (\"-- Recompiling GSettings schemas in ${COMPIZ_DESTDIR}${_dst}\"\)
+		    execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${COMPIZ_DESTDIR}${_dst})
+		endif (\"$ENV{USER}\" STREQUAL \"root\"\)
+		")
+    endif ()
+endfunction ()
+
+# generate gconf schema
+function (compiz_gsettings_schema _src _dst _inst)
+    find_program (XSLTPROC_EXECUTABLE xsltproc)
+    mark_as_advanced (FORCE XSLTPROC_EXECUTABLE)
+
+    if (XSLTPROC_EXECUTABLE AND USE_GSETTINGS)
+	message ("generating gsettings schema for core")
+	add_custom_command (
+	    OUTPUT ${_dst}
+	    COMMAND ${XSLTPROC_EXECUTABLE}
+		    -o ${_dst}
+		    ${COMPIZ_GSETTINGS_SCHEMAS_XSLT}
+		    ${_src}
+	    DEPENDS ${_src}
+	)
+	compiz_install_gsettings_schema (${_dst} ${_inst})
+    endif ()
+endfunction ()
 
=== renamed file 'cmake/CompizGSettings.cmake' => 'cmake/CompizGSettings.cmake.THIS'
=== modified file 'cmake/CompizPlugin.cmake'
--- cmake/CompizPlugin.cmake	2012-01-23 17:33:54 +0000
+++ cmake/CompizPlugin.cmake	2012-02-08 18:50:27 +0000
@@ -257,6 +257,16 @@
 	    NO_DEFAULT_PATH
 	)
 
+	set (COMPIZ_CURRENT_PLUGIN ${plugin})
+	set (COMPIZ_CURRENT_XML_FILE ${_translated_xml})
+
+	# find extension files
+	file (GLOB _extension_files "${COMPIZ_CMAKE_MODULE_PATH}/plugin_extensions/*.cmake")
+
+	foreach (_file ${_extension_files})
+	    include (${_file})
+	endforeach ()
+
 	# generate pkgconfig file and install it and the plugin header file
 	if (_${plugin}_pkg AND EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/include/${plugin})
 	    if ("${PLUGIN_BUILDTYPE}" STREQUAL "local")
@@ -269,11 +279,15 @@
 		    set (VERSION 0.0.1-git)
 		endif (NOT VERSION)
 
+		#add CFLAGSADD so pkg-config file has correct flags
+		set (COMPIZ_CFLAGS ${COMPIZ_CFLAGS} ${${_PLUGIN}_CFLAGSADD})
+
 		compiz_configure_file (
 		    ${_${plugin}_pkg}
 		    ${CMAKE_BINARY_DIR}/generated/compiz-${plugin}.pc
 		    COMPIZ_REQUIRES
 		    COMPIZ_CFLAGS
+		    PKGCONFIG_LIBS
 		)
 
 		install (
@@ -287,16 +301,6 @@
 	    endif ()
 	endif ()
 
-	set (COMPIZ_CURRENT_PLUGIN ${plugin})
-	set (COMPIZ_CURRENT_XML_FILE ${_translated_xml})
-
-	# find extension files
-	file (GLOB _extension_files "${COMPIZ_CMAKE_MODULE_PATH}/plugin_extensions/*.cmake")
-
-	foreach (_file ${_extension_files})
-	    include (${_file})
-	endforeach ()
-
 	# find files for build
 	file (GLOB _h_files "${CMAKE_CURRENT_SOURCE_DIR}/src/*.h")
 	file (GLOB _h_ins_files "${CMAKE_CURRENT_SOURCE_DIR}/include/${plugin}/*.h")
 
=== added file 'cmake/FindOpenGLES2.cmake'
--- cmake/FindOpenGLES2.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindOpenGLES2.cmake	2012-02-08 18:50:27 +0000
@@ -0,0 +1,51 @@
+# - Try to find OpenGLES
+# Once done this will define
+#  
+#  OPENGLES2_FOUND        - system has OpenGLES
+#  OPENGLES2_INCLUDE_DIR  - the GLES include directory
+#  OPENGLES2_LIBRARY	  - the GLES library
+#  OPENGLES2_LIBRARIES    - Link this to use OpenGLES
+#   
+
+FIND_PATH(OPENGLES2_INCLUDE_DIR GLES2/gl2.h
+  /usr/openwin/share/include
+  /opt/graphics/OpenGL/include /usr/X11R6/include
+  /usr/include
+)
+
+FIND_LIBRARY(OPENGLES2_LIBRARY
+  NAMES GLESv2
+  PATHS /opt/graphics/OpenGL/lib
+        /usr/openwin/lib
+        /usr/shlib /usr/X11R6/lib
+        /usr/lib
+)
+
+FIND_LIBRARY(OPENGLES2_EGL_LIBRARY
+    NAMES EGL
+    PATHS /usr/shlib /usr/X11R6/lib
+          /usr/lib
+)
+
+# On Unix OpenGL most certainly always requires X11.
+# Feel free to tighten up these conditions if you don't 
+# think this is always true.
+# It's not true on OSX.
+
+IF (OPENGLES2_LIBRARY)
+  IF(NOT X11_FOUND)
+    INCLUDE(FindX11)
+  ENDIF(NOT X11_FOUND)
+  IF (X11_FOUND)
+    IF (NOT APPLE)
+      SET (OPENGLES2_LIBRARIES ${X11_LIBRARIES})
+    ENDIF (NOT APPLE)
+  ENDIF (X11_FOUND)
+ENDIF(OPENGLES2_LIBRARY)
+
+SET( OPENGLES2_FOUND "NO" )
+IF(OPENGLES2_LIBRARY AND OPENGLES2_EGL_LIBRARY)
+    SET( OPENGLES2_LIBRARIES  ${OPENGLES2_LIBRARY} ${OPENGLES2_EGL_LIBRARY} ${OPENGLES2_LIBRARIES})
+    SET( OPENGLES2_FOUND "YES" )
+ENDIF(OPENGLES2_LIBRARY AND OPENGLES2_EGL_LIBRARY)
+
 
=== modified file 'cmake/base.cmake'
--- cmake/base.cmake	2011-07-27 16:13:28 +0000
+++ cmake/base.cmake	2012-02-08 18:50:27 +0000
@@ -24,6 +24,7 @@
     compiz_print_configure_header ("Compiz")
     compiz_color_message ("\n${_escape}[4mOptional features:${_escape}[0m\n")
 
+    compiz_print_result_message ("GLESv2" USE_GLES)
     compiz_print_result_message ("gtk window decorator" USE_GTK)
     compiz_print_result_message ("metacity theme support" USE_METACITY)
     compiz_print_result_message ("gconf schemas" USE_GCONF)
@@ -46,7 +47,8 @@
     endif ()
     add_custom_target (findcompiz_install
 	${CMAKE_COMMAND} -E make_directory ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
-	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
+	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindCompiz.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules &&
+	${CMAKE_COMMAND} -E copy ${CMAKE_SOURCE_DIR}/cmake/FindOpenGLES2.cmake ${COMPIZ_DESTDIR}${CMAKE_ROOT}/Modules
     )
 endfunction ()
 
 
=== added file 'cmake/plugin_extensions/CompizGenGSettings.cmake'
--- cmake/plugin_extensions/CompizGenGSettings.cmake	1970-01-01 00:00:00 +0000
+++ cmake/plugin_extensions/CompizGenGSettings.cmake	2012-02-08 18:50:27 +0000
@@ -0,0 +1,104 @@
+option (
+    COMPIZ_DISABLE_SCHEMAS_INSTALL
+    "Disables gsettings schema installation"
+    OFF
+)
+
+option (
+    USE_GSETTINGS
+    "Generate GSettings schemas"
+    ON
+)
+
+set (
+    COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR ${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR} CACHE PATH
+    "Installation path of the gsettings schema file"
+)
+
+macro (compiz_gsettings_prepare_install_dirs)
+    # package
+    if ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "package")
+	if (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
+            set (PLUGIN_SCHEMADIR "${datadir}/glib-2.0/schemas/")
+        else (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
+	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR}")
+	endif (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
+    # compiz
+    elseif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "compiz" OR
+	    "$ENV{BUILD_GLOBAL}" STREQUAL "true")
+	if (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
+            set (PLUGIN_SCHEMADIR "${COMPIZ_PREFIX}/share/glib-2.0/schemas/")
+        else (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
+	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR}")
+	endif (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
+    # local
+    else ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "compiz" OR
+	  "$ENV{BUILD_GLOBAL}" STREQUAL "true")
+
+	if (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
+            set (PLUGIN_SCHEMADIR "$ENV{HOME}/.config/compiz-1/gsettings/schemas")
+        else (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
+	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR}")
+	endif (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
+
+    endif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "package")
+endmacro (compiz_gsettings_prepare_install_dirs)
+
+function (compiz_install_gsettings_schema _src _dst)
+    find_program (PKG_CONFIG_TOOL pkg-config)
+    find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas)
+    mark_as_advanced (FORCE PKG_CONFIG_TOOL)
+
+    # find out where schemas need to go if we are installing them systemwide
+    execute_process (COMMAND ${PKG_CONFIG_TOOL} glib-2.0 --variable prefix  OUTPUT_VARIABLE GSETTINGS_GLIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
+    SET (GSETTINGS_GLOBAL_INSTALL_DIR "${GSETTINGS_GLIB_PREFIX}/share/glib-2.0/schemas/")
+
+    if (USE_GSETTINGS AND
+	PKG_CONFIG_TOOL AND
+	GLIB_COMPILE_SCHEMAS AND NOT
+	COMPIZ_DISABLE_SCHEMAS_INSTALL)
+	install (CODE "
+		if (\"$ENV{USER}\"\ STREQUAL \"root\")
+		    message (\"-- Installing GSettings schemas ${GSETTINGS_GLOBAL_INSTALL_DIR}\"\)
+		    file (INSTALL DESTINATION \"${GSETTINGS_GLOBAL_INSTALL_DIR}\"
+			  TYPE FILE
+			  FILES \"${_src}\")
+		    message (\"-- Recompiling GSettings schemas in ${GSETTINGS_GLOBAL_INSTALL_DIR}\"\)
+		    execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${GSETTINGS_GLOBAL_INSTALL_DIR})
+
+		else (\"$ENV{USER}\"\ STREQUAL \"root\"\)
+		    # It seems like this is only available in CMake > 2.8.5
+		    # but hardly anybody has that, so comment out this warning for now
+		    # string (FIND $ENV{XDG_DATA_DIRS} \"${COMPIZ_DESTDIR}${_dst}\" XDG_INSTALL_PATH)
+		    # if (NOT XDG_INSTALL_PATH)
+		    message (\"[WARNING]: Installing GSettings schemas to a custom location that might not be in XDG_DATA_DIRS, you need to add ${COMPIZ_DESTDIR}${_dst} to your XDG_DATA_DIRS in order for GSettings schemas to be found!\"\)
+		    # endif (NOT XDG_INSTALL_PATH)
+		    message (\"-- Installing GSettings schemas to ${COMPIZ_DESTDIR}${_dst}\"\)
+		    file (INSTALL DESTINATION \"${COMPIZ_DESTDIR}${_dst}\"
+			  TYPE FILE
+			  FILES \"${_src}\")
+		    message (\"-- Recompiling GSettings schemas in ${COMPIZ_DESTDIR}${_dst}\"\)
+		    execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${COMPIZ_DESTDIR}${_dst})
+		endif (\"$ENV{USER}\" STREQUAL \"root\"\)
+		")
+    endif ()
+endfunction ()
+
+# generate gsettings schema
+find_program (XSLTPROC_EXECUTABLE xsltproc)
+mark_as_advanced (FORCE XSLTPROC_EXECUTABLE)
+
+if (XSLTPROC_EXECUTABLE AND USE_GSETTINGS)
+    compiz_gsettings_prepare_install_dirs ()
+
+    add_custom_command (
+	OUTPUT "${CMAKE_BINARY_DIR}/generated/org.freedesktop.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml"
+	COMMAND ${XSLTPROC_EXECUTABLE}
+	        -o "${CMAKE_BINARY_DIR}/generated/org.freedesktop.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml"
+	        ${COMPIZ_GSETTINGS_SCHEMAS_XSLT}
+	        ${COMPIZ_CURRENT_XML_FILE}
+	DEPENDS ${COMPIZ_CURRENT_XML_FILE}
+    )
+    compiz_install_gsettings_schema ("${CMAKE_BINARY_DIR}/generated/org.freedesktop.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml" ${PLUGIN_SCHEMADIR})
+    list (APPEND COMPIZ_CURRENT_SOURCES_ADDS ${CMAKE_BINARY_DIR}/generated/org.freedesktop.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml)
+endif ()
 
=== removed file 'cmake/plugin_extensions/CompizGenGSettings.cmake'
--- cmake/plugin_extensions/CompizGenGSettings.cmake	2011-09-29 03:29:41 +0000
+++ cmake/plugin_extensions/CompizGenGSettings.cmake	1970-01-01 00:00:00 +0000
@@ -1,104 +0,0 @@
-option (
-    COMPIZ_DISABLE_SCHEMAS_INSTALL
-    "Disables gsettings schema installation"
-    OFF
-)
-
-option (
-    USE_GSETTINGS
-    "Generate GSettings schemas"
-    ON
-)
-
-set (
-    COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR ${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR} CACHE PATH
-    "Installation path of the gsettings schema file"
-)
-
-macro (compiz_gsettings_prepare_install_dirs)
-    # package
-    if ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "package")
-	if (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-            set (PLUGIN_SCHEMADIR "${datadir}/glib-2.0/schemas/")
-        else (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR}")
-	endif (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-    # compiz
-    elseif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "compiz" OR
-	    "$ENV{BUILD_GLOBAL}" STREQUAL "true")
-	if (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-            set (PLUGIN_SCHEMADIR "${COMPIZ_PREFIX}/share/glib-2.0/schemas/")
-        else (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR}")
-	endif (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-    # local
-    else ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "compiz" OR
-	  "$ENV{BUILD_GLOBAL}" STREQUAL "true")
-
-	if (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-            set (PLUGIN_SCHEMADIR "$ENV{HOME}/.config/compiz-1/gsettings/schemas")
-        else (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-	    set (PLUGIN_SCHEMADIR "${COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR}")
-	endif (NOT COMPIZ_INSTALL_GSETTINGS_SCHEMA_DIR)
-
-    endif ("${COMPIZ_PLUGIN_INSTALL_TYPE}" STREQUAL "package")
-endmacro (compiz_gsettings_prepare_install_dirs)
-
-function (compiz_install_gsettings_schema _src _dst)
-    find_program (PKG_CONFIG_TOOL pkg-config)
-    find_program (GLIB_COMPILE_SCHEMAS glib-compile-schemas)
-    mark_as_advanced (FORCE PKG_CONFIG_TOOL)
-
-    # find out where schemas need to go if we are installing them systemwide
-    execute_process (COMMAND ${PKG_CONFIG_TOOL} glib-2.0 --variable prefix  OUTPUT_VARIABLE GSETTINGS_GLIB_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
-    SET (GSETTINGS_GLOBAL_INSTALL_DIR "${GSETTINGS_GLIB_PREFIX}/share/glib-2.0/schemas/")
-
-    if (USE_GSETTINGS AND
-	PKG_CONFIG_TOOL AND
-	GLIB_COMPILE_SCHEMAS AND NOT
-	COMPIZ_DISABLE_SCHEMAS_INSTALL)
-	install (CODE "
-		if (\"$ENV{USER}\"\ STREQUAL \"root\")
-		    message (\"-- Installing GSettings schemas ${GSETTINGS_GLOBAL_INSTALL_DIR}\"\)
-		    file (INSTALL DESTINATION \"${GSETTINGS_GLOBAL_INSTALL_DIR}\"
-			  TYPE FILE
-			  FILES \"${_src}\")
-		    message (\"-- Recompiling GSettings schemas in ${GSETTINGS_GLOBAL_INSTALL_DIR}\"\)
-		    execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${GSETTINGS_GLOBAL_INSTALL_DIR})
-
-		else (\"$ENV{USER}\"\ STREQUAL \"root\"\)
-		    # It seems like this is only available in CMake > 2.8.5
-		    # but hardly anybody has that, so comment out this warning for now
-		    # string (FIND $ENV{XDG_DATA_DIRS} \"${COMPIZ_DESTDIR}${_dst}\" XDG_INSTALL_PATH)
-		    # if (NOT XDG_INSTALL_PATH)
-		    message (\"[WARNING]: Installing GSettings schemas to a custom location that might not be in XDG_DATA_DIRS, you need to add ${COMPIZ_DESTDIR}${_dst} to your XDG_DATA_DIRS in order for GSettings schemas to be found!\"\)
-		    # endif (NOT XDG_INSTALL_PATH)
-		    message (\"-- Installing GSettings schemas to ${COMPIZ_DESTDIR}${_dst}\"\)
-		    file (INSTALL DESTINATION \"${COMPIZ_DESTDIR}${_dst}\"
-			  TYPE FILE
-			  FILES \"${_src}\")
-		    message (\"-- Recompiling GSettings schemas in ${COMPIZ_DESTDIR}${_dst}\"\)
-		    execute_process (COMMAND ${GLIB_COMPILE_SCHEMAS} ${COMPIZ_DESTDIR}${_dst})
-		endif (\"$ENV{USER}\" STREQUAL \"root\"\)
-		")
-    endif ()
-endfunction ()
-
-# generate gsettings schema
-find_program (XSLTPROC_EXECUTABLE xsltproc)
-mark_as_advanced (FORCE XSLTPROC_EXECUTABLE)
-
-if (XSLTPROC_EXECUTABLE AND USE_GSETTINGS)
-    compiz_gsettings_prepare_install_dirs ()
-
-    add_custom_command (
-	OUTPUT "${CMAKE_BINARY_DIR}/generated/org.freedesktop.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml"
-	COMMAND ${XSLTPROC_EXECUTABLE}
-	        -o "${CMAKE_BINARY_DIR}/generated/org.freedesktop.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml"
-	        ${COMPIZ_GSETTINGS_SCHEMAS_XSLT}
-	        ${COMPIZ_CURRENT_XML_FILE}
-	DEPENDS ${COMPIZ_CURRENT_XML_FILE}
-    )
-    compiz_install_gsettings_schema ("${CMAKE_BINARY_DIR}/generated/org.freedesktop.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml" ${PLUGIN_SCHEMADIR})
-    list (APPEND COMPIZ_CURRENT_SOURCES_ADDS ${CMAKE_BINARY_DIR}/generated/org.freedesktop.compiz.${COMPIZ_CURRENT_PLUGIN}.gschema.xml)
-endif ()
 
=== added file 'cmake/plugin_extensions/CompizOpenGLFixups.cmake'
--- cmake/plugin_extensions/CompizOpenGLFixups.cmake	1970-01-01 00:00:00 +0000
+++ cmake/plugin_extensions/CompizOpenGLFixups.cmake	2012-02-08 18:50:27 +0000
@@ -0,0 +1,22 @@
+
+# modify pkg-config libs for opengl based on if we found GLES or not
+if (${COMPIZ_CURRENT_PLUGIN} STREQUAL "opengl")
+    if (USE_GLES)
+	set (PKGCONFIG_LIBS "-lGLESv2 -lEGL")
+    else (USE_GLES)
+	set (PKGCONFIG_LIBS "-lGL")
+    endif (USE_GLES)
+endif (${COMPIZ_CURRENT_PLUGIN} STREQUAL "opengl")
+
+# if plugin is using opengl plugin check for GLES library and set correct define
+if (NOT "${${_PLUGIN}_PLUGINDEPS}" STREQUAL "")
+    string (REGEX MATCH "opengl" opengl_found ${${_PLUGIN}_PLUGINDEPS})
+
+    if (opengl_found STREQUAL "opengl")
+	if (USE_GLES)
+	    set (${_PLUGIN}_CFLAGSADD ${${_PLUGIN}_CFLAGSADD} " -DUSE_GLES")
+	    string (REPLACE ";" " " ${_PLUGIN}_CFLAGSADD ${${_PLUGIN}_CFLAGSADD})
+	endif (USE_GLES)
+    endif (opengl_found STREQUAL "opengl")
+endif (NOT "${${_PLUGIN}_PLUGINDEPS}" STREQUAL "")
+
 
=== modified file 'gtk/CMakeLists.txt'
--- gtk/CMakeLists.txt	2011-10-13 14:06:05 +0000
+++ gtk/CMakeLists.txt	2012-02-08 18:50:27 +0000
@@ -82,7 +82,7 @@
 
 configure_file (
     ${CMAKE_CURRENT_SOURCE_DIR}/config.h.gtk.in
-    ${CMAKE_CURRENT_BINARY_DIR}/config.h
+    ${CMAKE_CURRENT_BINARY_DIR}/config.h	
 )
 
 add_subdirectory (window-decorator)
 
=== added file 'gtk/config.h.gtk.in'
--- gtk/config.h.gtk.in	1970-01-01 00:00:00 +0000
+++ gtk/config.h.gtk.in	2012-02-08 18:50:27 +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}"
 
=== 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/gnome/CMakeLists.txt'
--- gtk/gnome/CMakeLists.txt	2011-10-13 14:06:05 +0000
+++ gtk/gnome/CMakeLists.txt	2012-02-08 18:50:27 +0000
@@ -9,5 +9,79 @@
 	DESTINATION ${COMPIZ_DESTDIR}${datadir}/applications
     )
 
+<<<<<<< TREE
     add_custom_target (compiz.desktop ALL SOURCES ${desktop_file})
 endif (BUILD_GNOME)
+=======
+    set (wmproperties_file ${CMAKE_CURRENT_BINARY_DIR}/compiz-wm.desktop)
+    compiz_translate_desktop_file (
+        ${CMAKE_CURRENT_SOURCE_DIR}/compiz-wm.desktop.in
+        ${wmproperties_file}
+    )
+    compiz_opt_install_file (
+	${wmproperties_file}
+	${windowsettingsdatadir}/gnome/wm-properties/compiz-wm.desktop
+    )
+
+
+    if (USE_GNOME_KEYBINDINGS)
+        compiz_translate_xml (
+	    ${CMAKE_CURRENT_SOURCE_DIR}/50-compiz-desktop-key.xml.in
+	    ${CMAKE_CURRENT_BINARY_DIR}/50-compiz-desktop-key.xml
+	)
+	compiz_translate_xml (
+	    ${CMAKE_CURRENT_SOURCE_DIR}/50-compiz-key.xml.in
+	    ${CMAKE_CURRENT_BINARY_DIR}/50-compiz-key.xml
+	)
+	set (key_xml
+	    ${CMAKE_CURRENT_BINARY_DIR}/50-compiz-desktop-key.xml
+	    ${CMAKE_CURRENT_BINARY_DIR}/50-compiz-key.xml
+	)
+	compiz_opt_install_file (
+	    ${CMAKE_CURRENT_BINARY_DIR}/50-compiz-desktop-key.xml
+	    ${keybindingsdir}/50-compiz-desktop-key.xml
+	)
+	compiz_opt_install_file (
+	    ${CMAKE_CURRENT_BINARY_DIR}/50-compiz-key.xml
+	    ${keybindingsdir}/50-compiz-key.xml
+	)
+    endif (USE_GNOME_KEYBINDINGS)
+
+    add_library (gnome-compiz MODULE
+	compiz-window-manager.c
+	compiz-window-manager.h
+	${key_xml}
+	${desktop_file}
+	${wmproperties_file}
+    )
+
+
+    set_target_properties (gnome-compiz
+	PROPERTIES OUTPUT_NAME compiz
+	SKIP_BUILD_RPATH 1
+    )
+
+    target_link_libraries (
+	gnome-compiz ${GNOME_WINDOW_SETTINGS_LIBRARIES}
+    )
+
+    compiz_opt_install_file (
+	${CMAKE_CURRENT_BINARY_DIR}/libcompiz.so
+	${windowsettingslibdir}/window-manager-settings/libcompiz.so
+    )
+else (USE_GNOME)
+
+  set (desktop_file ${CMAKE_CURRENT_BINARY_DIR}/compiz.desktop)
+      compiz_translate_desktop_file (
+	  ${CMAKE_CURRENT_SOURCE_DIR}/compiz.desktop.in
+	  ${desktop_file}
+      )
+
+      install (
+	  FILES ${desktop_file}
+	  DESTINATION ${COMPIZ_DESTDIR}${datadir}/applications
+      )
+
+      add_custom_target (gnome-compiz ALL
+			 DEPENDS ${desktop_file})
+endif (USE_GNOME)>>>>>>> MERGE-SOURCE
 
=== modified file 'gtk/gnome/compiz.desktop.in'
--- gtk/gnome/compiz.desktop.in	2009-03-08 12:21:32 +0000
+++ gtk/gnome/compiz.desktop.in	2012-02-08 18:50:27 +0000
@@ -5,7 +5,7 @@
 Exec=compiz
 NoDisplay=true
 # name of loadable control center module
-X-GNOME-WMSettingsModule=compiz
+X-GNOME-WMSettingsModule=metacity
 # autostart phase
 X-GNOME-Autostart-Phase=WindowManager
 X-GNOME-Provides=windowmanager
 
=== added file 'gtk/window-decorator/actionmenu.c'
--- gtk/window-decorator/actionmenu.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/actionmenu.c	2012-02-08 18:50:27 +0000
@@ -0,0 +1,134 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Reveman <[e-mail]>
+ */
+
+#include "gtk-window-decorator.h"
+
+static void
+action_menu_unmap (GObject *object)
+{
+    action_menu_mapped = FALSE;
+}
+
+static void
+position_action_menu (GtkMenu  *menu,
+		      gint     *x,
+		      gint     *y,
+		      gboolean *push_in,
+		      gpointer user_data)
+{
+    WnckWindow *win = (WnckWindow *) user_data;
+    WnckWindowType win_type = wnck_window_get_window_type (win);
+    decor_frame_t  *frame = gwd_get_decor_frame (win);
+    decor_t    *d = g_object_get_data (G_OBJECT (win), "decor");
+    gint       bx, by, width, height;
+
+    wnck_window_get_client_window_geometry (win, x, y, &width, &height);
+
+    if ((*theme_get_button_position) (d, BUTTON_MENU, width, height,
+				      &bx, &by, &width, &height))
+	*x = *x - frame->win_extents.left + bx;
+
+    gwd_decor_frame_unref (frame);
+
+    if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
+    {
+	GtkRequisition req;
+
+	gtk_widget_size_request (GTK_WIDGET (menu), &req);
+	*x = MAX (0, *x - req.width + width);
+    }
+
+    *push_in = TRUE;
+}
+
+void
+action_menu_map (WnckWindow *win,
+		 long	     button,
+		 Time	     time)
+{
+    GdkDisplay *gdkdisplay;
+    GdkScreen  *screen;
+
+    gdkdisplay = gdk_display_get_default ();
+    screen     = gdk_display_get_default_screen (gdkdisplay);
+
+    if (action_menu)
+    {
+	if (action_menu_mapped)
+	{
+	    gtk_widget_destroy (action_menu);
+	    action_menu_mapped = FALSE;
+	    action_menu = NULL;
+	    return;
+	}
+	else
+	    gtk_widget_destroy (action_menu);
+    }
+
+    switch (wnck_window_get_window_type (win)) {
+    case WNCK_WINDOW_DESKTOP:
+    case WNCK_WINDOW_DOCK:
+	/* don't allow window action */
+	return;
+    case WNCK_WINDOW_NORMAL:
+    case WNCK_WINDOW_DIALOG:
+
+#ifndef HAVE_LIBWNCK_2_19_4
+    case WNCK_WINDOW_MODAL_DIALOG:
+#endif
+
+    case WNCK_WINDOW_TOOLBAR:
+    case WNCK_WINDOW_MENU:
+    case WNCK_WINDOW_UTILITY:
+    case WNCK_WINDOW_SPLASHSCREEN:
+	/* allow window action menu */
+	break;
+    }
+
+    action_menu = wnck_create_window_action_menu (win);
+
+    gtk_menu_set_screen (GTK_MENU (action_menu), screen);
+
+    g_signal_connect_object (G_OBJECT (action_menu), "unmap",
+			     G_CALLBACK (action_menu_unmap),
+			     0, 0);
+
+    gtk_widget_show (action_menu);
+
+    if (!button || button == 1)
+    {
+	gtk_menu_popup (GTK_MENU (action_menu),
+			NULL, NULL,
+			position_action_menu, (gpointer) win,
+			button,
+			time);
+    }
+    else
+    {
+	gtk_menu_popup (GTK_MENU (action_menu),
+			NULL, NULL,
+			NULL, NULL,
+			button,
+			time);
+    }
+
+    action_menu_mapped = TRUE;
+}
 
=== removed file 'gtk/window-decorator/actionmenu.c'
--- gtk/window-decorator/actionmenu.c	2011-05-07 08:58:10 +0000
+++ gtk/window-decorator/actionmenu.c	1970-01-01 00:00:00 +0000
@@ -1,133 +0,0 @@
-/*
- * Copyright © 2006 Novell, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Reveman <[e-mail]>
- */
-
-#include "gtk-window-decorator.h"
-
-static void
-action_menu_unmap (GObject *object)
-{
-    action_menu_mapped = FALSE;
-}
-
-static void
-position_action_menu (GtkMenu  *menu,
-		      gint     *x,
-		      gint     *y,
-		      gboolean *push_in,
-		      gpointer user_data)
-{
-    WnckWindow *win = (WnckWindow *) user_data;
-    decor_frame_t  *frame = gwd_get_decor_frame (get_frame_type (win));
-    decor_t    *d = g_object_get_data (G_OBJECT (win), "decor");
-    gint       bx, by, width, height;
-
-    wnck_window_get_client_window_geometry (win, x, y, &width, &height);
-
-    if ((*theme_get_button_position) (d, BUTTON_MENU, width, height,
-				      &bx, &by, &width, &height))
-	*x = *x - frame->win_extents.left + bx;
-
-    gwd_decor_frame_unref (frame);
-
-    if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
-    {
-	GtkRequisition req;
-
-	gtk_widget_size_request (GTK_WIDGET (menu), &req);
-	*x = MAX (0, *x - req.width + width);
-    }
-
-    *push_in = TRUE;
-}
-
-void
-action_menu_map (WnckWindow *win,
-		 long	     button,
-		 Time	     time)
-{
-    GdkDisplay *gdkdisplay;
-    GdkScreen  *screen;
-
-    gdkdisplay = gdk_display_get_default ();
-    screen     = gdk_display_get_default_screen (gdkdisplay);
-
-    if (action_menu)
-    {
-	if (action_menu_mapped)
-	{
-	    gtk_widget_destroy (action_menu);
-	    action_menu_mapped = FALSE;
-	    action_menu = NULL;
-	    return;
-	}
-	else
-	    gtk_widget_destroy (action_menu);
-    }
-
-    switch (wnck_window_get_window_type (win)) {
-    case WNCK_WINDOW_DESKTOP:
-    case WNCK_WINDOW_DOCK:
-	/* don't allow window action */
-	return;
-    case WNCK_WINDOW_NORMAL:
-    case WNCK_WINDOW_DIALOG:
-
-#ifndef HAVE_LIBWNCK_2_19_4
-    case WNCK_WINDOW_MODAL_DIALOG:
-#endif
-
-    case WNCK_WINDOW_TOOLBAR:
-    case WNCK_WINDOW_MENU:
-    case WNCK_WINDOW_UTILITY:
-    case WNCK_WINDOW_SPLASHSCREEN:
-	/* allow window action menu */
-	break;
-    }
-
-    action_menu = wnck_create_window_action_menu (win);
-
-    gtk_menu_set_screen (GTK_MENU (action_menu), screen);
-
-    g_signal_connect_object (G_OBJECT (action_menu), "unmap",
-			     G_CALLBACK (action_menu_unmap),
-			     0, 0);
-
-    gtk_widget_show (action_menu);
-
-    if (!button || button == 1)
-    {
-	gtk_menu_popup (GTK_MENU (action_menu),
-			NULL, NULL,
-			position_action_menu, (gpointer) win,
-			button,
-			time);
-    }
-    else
-    {
-	gtk_menu_popup (GTK_MENU (action_menu),
-			NULL, NULL,
-			NULL, NULL,
-			button,
-			time);
-    }
-
-    action_menu_mapped = TRUE;
-}
 
=== added file 'gtk/window-decorator/blurprops.c'
--- gtk/window-decorator/blurprops.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/blurprops.c	2012-02-08 18:50:27 +0000
@@ -0,0 +1,89 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Reveman <[e-mail]>
+ */
+
+#include "gtk-window-decorator.h"
+
+void
+decor_update_blur_property (decor_t *d,
+			    int     width,
+			    int     height,
+			    Region  top_region,
+			    int     top_offset,
+			    Region  bottom_region,
+			    int     bottom_offset,
+			    Region  left_region,
+			    int     left_offset,
+			    Region  right_region,
+			    int     right_offset)
+{
+    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+    long    *data = NULL;
+    int     size = 0;
+    
+    if (settings->blur_type != BLUR_TYPE_ALL)
+    {
+	bottom_region = NULL;
+	left_region   = NULL;
+	right_region  = NULL;
+	
+	if (settings->blur_type != BLUR_TYPE_TITLEBAR)
+	    top_region = NULL;
+    }
+
+    if (top_region)
+	size += top_region->numRects;
+    if (bottom_region)
+	size += bottom_region->numRects;
+    if (left_region)
+	size += left_region->numRects;
+    if (right_region)
+	size += right_region->numRects;
+
+    if (size)
+	data = (long *) malloc (sizeof (long) * (2 + size * 6));
+
+    if (data)
+    {
+	decor_region_to_blur_property (data, 4, 0, width, height,
+				       top_region, top_offset,
+				       bottom_region, bottom_offset,
+				       left_region, left_offset,
+				       right_region, right_offset);
+
+	gdk_error_trap_push ();
+	XChangeProperty (xdisplay, d->prop_xid,
+			 win_blur_decor_atom,
+			 XA_INTEGER,
+			 32, PropModeReplace, (guchar *) data,
+			 2 + size * 6);
+	gdk_display_sync (gdk_display_get_default ());
+	gdk_error_trap_pop ();
+
+	free (data);
+    }
+    else
+    {
+	gdk_error_trap_push ();
+	XDeleteProperty (xdisplay, d->prop_xid, win_blur_decor_atom);
+	gdk_display_sync (gdk_display_get_default ());
+	gdk_error_trap_pop ();
+    }
+}
 
=== removed file 'gtk/window-decorator/blurprops.c'
--- gtk/window-decorator/blurprops.c	2011-02-21 09:53:08 +0000
+++ gtk/window-decorator/blurprops.c	1970-01-01 00:00:00 +0000
@@ -1,89 +0,0 @@
-/*
- * Copyright © 2006 Novell, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Reveman <[e-mail]>
- */
-
-#include "gtk-window-decorator.h"
-
-void
-decor_update_blur_property (decor_t *d,
-			    int     width,
-			    int     height,
-			    Region  top_region,
-			    int     top_offset,
-			    Region  bottom_region,
-			    int     bottom_offset,
-			    Region  left_region,
-			    int     left_offset,
-			    Region  right_region,
-			    int     right_offset)
-{
-    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-    long    *data = NULL;
-    int     size = 0;
-    
-    if (settings->blur_type != BLUR_TYPE_ALL)
-    {
-	bottom_region = NULL;
-	left_region   = NULL;
-	right_region  = NULL;
-	
-	if (settings->blur_type != BLUR_TYPE_TITLEBAR)
-	    top_region = NULL;
-    }
-
-    if (top_region)
-	size += top_region->numRects;
-    if (bottom_region)
-	size += bottom_region->numRects;
-    if (left_region)
-	size += left_region->numRects;
-    if (right_region)
-	size += right_region->numRects;
-
-    if (size)
-	data = (long *) malloc (sizeof (long) * (2 + size * 6));
-
-    if (data)
-    {
-	decor_region_to_blur_property (data, 4, 0, width, height,
-				       top_region, top_offset,
-				       bottom_region, bottom_offset,
-				       left_region, left_offset,
-				       right_region, right_offset);
-
-	gdk_error_trap_push ();
-	XChangeProperty (xdisplay, d->prop_xid,
-			 win_blur_decor_atom,
-			 XA_INTEGER,
-			 32, PropModeReplace, (guchar *) data,
-			 2 + size * 6);
-	gdk_display_sync (gdk_display_get_default ());
-	gdk_error_trap_pop ();
-
-	free (data);
-    }
-    else
-    {
-	gdk_error_trap_push ();
-	XDeleteProperty (xdisplay, d->prop_xid, win_blur_decor_atom);
-	gdk_display_sync (gdk_display_get_default ());
-	gdk_error_trap_pop ();
-    }
-}
 
=== added file 'gtk/window-decorator/cairo.c'
--- gtk/window-decorator/cairo.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/cairo.c	2012-02-08 18:50:27 +0000
@@ -0,0 +1,915 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Reveman <[e-mail]>
+ *
+ * 2D Mode: Copyright © 2010 Sam Spilsbury <[e-mail]>
+ * Frames Management: Copright © 2011 Canonical Ltd.
+ *        Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "gtk-window-decorator.h"
+
+void
+rounded_rectangle (cairo_t *cr,
+		   double  x,
+		   double  y,
+		   double  w,
+		   double  h,
+		   double  radius,
+		   int	   corner)
+{
+    if (corner & CORNER_TOPLEFT)
+	cairo_move_to (cr, x + radius, y);
+    else
+	cairo_move_to (cr, x, y);
+
+    if (corner & CORNER_TOPRIGHT)
+	cairo_arc (cr, x + w - radius, y + radius, radius,
+		   M_PI * 1.5, M_PI * 2.0);
+    else
+	cairo_line_to (cr, x + w, y);
+
+    if (corner & CORNER_BOTTOMRIGHT)
+	cairo_arc (cr, x + w - radius, y + h - radius, radius,
+		   0.0, M_PI * 0.5);
+    else
+	cairo_line_to (cr, x + w, y + h);
+
+    if (corner & CORNER_BOTTOMLEFT)
+	cairo_arc (cr, x + radius, y + h - radius, radius,
+		   M_PI * 0.5, M_PI);
+    else
+	cairo_line_to (cr, x, y + h);
+
+    if (corner & CORNER_TOPLEFT)
+	cairo_arc (cr, x + radius, y + radius, radius, M_PI, M_PI * 1.5);
+    else
+	cairo_line_to (cr, x, y);
+}
+
+void
+fill_rounded_rectangle (cairo_t       *cr,
+			double        x,
+			double        y,
+			double        w,
+			double        h,
+			double	      radius,
+			int	      corner,
+			decor_color_t *c0,
+			double        alpha0,
+			decor_color_t *c1,
+			double	      alpha1,
+			int	      gravity)
+{
+    cairo_pattern_t *pattern;
+
+    rounded_rectangle (cr, x, y, w, h, radius, corner);
+
+    if (gravity & SHADE_RIGHT)
+    {
+	x = x + w;
+	w = -w;
+    }
+    else if (!(gravity & SHADE_LEFT))
+    {
+	x = w = 0;
+    }
+
+    if (gravity & SHADE_BOTTOM)
+    {
+	y = y + h;
+	h = -h;
+    }
+    else if (!(gravity & SHADE_TOP))
+    {
+	y = h = 0;
+    }
+
+    if (w && h)
+    {
+	cairo_matrix_t matrix;
+
+	pattern = cairo_pattern_create_radial (0.0, 0.0, 0.0, 0.0, 0.0, w);
+
+	cairo_matrix_init_scale (&matrix, 1.0, w / h);
+	cairo_matrix_translate (&matrix, -(x + w), -(y + h));
+
+	cairo_pattern_set_matrix (pattern, &matrix);
+    }
+    else
+    {
+	pattern = cairo_pattern_create_linear (x + w, y + h, x, y);
+    }
+
+    cairo_pattern_add_color_stop_rgba (pattern, 0.0, c0->r, c0->g, c0->b,
+				       alpha0);
+
+    cairo_pattern_add_color_stop_rgba (pattern, 1.0, c1->r, c1->g, c1->b,
+				       alpha1);
+
+    cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
+
+    cairo_set_source (cr, pattern);
+    cairo_fill (cr);
+    cairo_pattern_destroy (pattern);
+}
+
+void
+draw_shadow_background (decor_t		*d,
+			cairo_t		*cr,
+			decor_shadow_t  *s,
+			decor_context_t *c)
+{
+    Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+
+    if (!s || !s->picture ||!d->picture)
+    {
+	cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.0);
+	cairo_paint (cr);
+    }
+    else
+    {
+	decor_fill_picture_extents_with_shadow (xdisplay,
+						s, c,
+						d->picture,
+						&d->border_layout);
+    }
+}
+
+static void
+draw_close_button (decor_t *d,
+		   cairo_t *cr,
+		   double  s)
+{
+    cairo_rel_move_to (cr, 0.0, s);
+
+    cairo_rel_line_to (cr, s, -s);
+    cairo_rel_line_to (cr, s, s);
+    cairo_rel_line_to (cr, s, -s);
+    cairo_rel_line_to (cr, s, s);
+
+    cairo_rel_line_to (cr, -s, s);
+    cairo_rel_line_to (cr, s, s);
+    cairo_rel_line_to (cr, -s, s);
+    cairo_rel_line_to (cr, -s, -s);
+
+    cairo_rel_line_to (cr, -s, s);
+    cairo_rel_line_to (cr, -s, -s);
+    cairo_rel_line_to (cr, s, -s);
+
+    cairo_close_path (cr);
+}
+
+static void
+draw_max_button (decor_t *d,
+		 cairo_t *cr,
+		 double  s)
+{
+    cairo_rel_line_to (cr, 12.0, 0.0);
+    cairo_rel_line_to (cr, 0.0, 12.0);
+    cairo_rel_line_to (cr, -12.0, 0.0);
+
+    cairo_close_path (cr);
+
+    cairo_rel_move_to (cr, 2.0, s);
+
+    cairo_rel_line_to (cr, 12.0 - 4.0, 0.0);
+    cairo_rel_line_to (cr, 0.0, 12.0 - s - 2.0);
+    cairo_rel_line_to (cr, -(12.0 - 4.0), 0.0);
+
+    cairo_close_path (cr);
+}
+
+static void
+draw_unmax_button (decor_t *d,
+		   cairo_t *cr,
+		   double  s)
+{
+    cairo_rel_move_to (cr, 1.0, 1.0);
+
+    cairo_rel_line_to (cr, 10.0, 0.0);
+    cairo_rel_line_to (cr, 0.0, 10.0);
+    cairo_rel_line_to (cr, -10.0, 0.0);
+
+    cairo_close_path (cr);
+
+    cairo_rel_move_to (cr, 2.0, s);
+
+    cairo_rel_line_to (cr, 10.0 - 4.0, 0.0);
+    cairo_rel_line_to (cr, 0.0, 10.0 - s - 2.0);
+    cairo_rel_line_to (cr, -(10.0 - 4.0), 0.0);
+
+    cairo_close_path (cr);
+}
+
+static void
+draw_min_button (decor_t *d,
+		 cairo_t *cr,
+		 double  s)
+{
+    cairo_rel_move_to (cr, 0.0, 8.0);
+
+    cairo_rel_line_to (cr, 12.0, 0.0);
+    cairo_rel_line_to (cr, 0.0, s);
+    cairo_rel_line_to (cr, -12.0, 0.0);
+
+    cairo_close_path (cr);
+}
+
+typedef void (*draw_proc) (cairo_t *cr);
+
+static void
+button_state_offsets (gdouble x,
+		      gdouble y,
+		      guint   state,
+		      gdouble *return_x,
+		      gdouble *return_y)
+{
+    static double off[]	= { 0.0, 0.0, 0.0, 0.5 };
+
+    *return_x  = x + off[state];
+    *return_y  = y + off[state];
+}
+
+static void
+button_state_paint (cairo_t	  *cr,
+		    GtkStyle	  *style,
+		    decor_color_t *color,
+		    guint	  state)
+{
+
+#define IN_STATE (PRESSED_EVENT_WINDOW | IN_EVENT_WINDOW)
+
+    if ((state & IN_STATE) == IN_STATE)
+    {
+	if (state & IN_EVENT_WINDOW)
+	    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+	else
+	    cairo_set_source_rgba (cr, color->r, color->g, color->b, 0.95);
+
+	cairo_fill_preserve (cr);
+
+	gdk_cairo_set_source_color_alpha (cr,
+					  &style->fg[GTK_STATE_NORMAL],
+					  STROKE_ALPHA);
+
+	cairo_set_line_width (cr, 1.0);
+	cairo_stroke (cr);
+	cairo_set_line_width (cr, 2.0);
+    }
+    else
+    {
+	gdk_cairo_set_source_color_alpha (cr,
+					  &style->fg[GTK_STATE_NORMAL],
+					  STROKE_ALPHA);
+	cairo_stroke_preserve (cr);
+
+	if (state & IN_EVENT_WINDOW)
+	    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+	else
+	    cairo_set_source_rgba (cr, color->r, color->g, color->b, 0.95);
+
+	cairo_fill (cr);
+    }
+}
+
+void
+draw_window_decoration (decor_t *d)
+{
+    cairo_t       *cr;
+    GtkStyle	  *style;
+    GdkDrawable   *drawable;
+    decor_color_t color;
+    double        alpha;
+    double        x1, y1, x2, y2, x, y, h;
+    int		  corners = SHADE_LEFT | SHADE_RIGHT | SHADE_TOP | SHADE_BOTTOM;
+    int		  top;
+    int		  button_x;
+
+    if (!d->pixmap)
+	return;
+
+
+    style = gtk_widget_get_style (d->frame->style_window_rgba);
+
+    if (d->state & (WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY |
+		    WNCK_WINDOW_STATE_MAXIMIZED_VERTICALLY))
+	corners = 0;
+
+    color.r = style->bg[GTK_STATE_NORMAL].red   / 65535.0;
+    color.g = style->bg[GTK_STATE_NORMAL].green / 65535.0;
+    color.b = style->bg[GTK_STATE_NORMAL].blue  / 65535.0;
+
+    if (d->frame_window)
+    {
+	GdkColormap *cmap;
+
+	cmap = get_colormap_for_drawable (GDK_DRAWABLE (d->pixmap));
+	gdk_drawable_set_colormap (GDK_DRAWABLE (d->pixmap), cmap);
+	gdk_drawable_set_colormap (GDK_DRAWABLE (d->buffer_pixmap), cmap);
+	drawable = GDK_DRAWABLE (d->buffer_pixmap);
+    }
+    else if (d->buffer_pixmap)
+	drawable = GDK_DRAWABLE (d->buffer_pixmap);
+    else
+	drawable = GDK_DRAWABLE (d->pixmap);
+
+    cr = gdk_cairo_create (GDK_DRAWABLE (drawable));
+    if (!cr)
+	return;
+
+    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+
+    top = d->frame->win_extents.top + d->frame->titlebar_height;
+
+    x1 = d->context->left_space - d->frame->win_extents.left;
+    y1 = d->context->top_space - d->frame->win_extents.top - d->frame->titlebar_height;
+    x2 = d->width - d->context->right_space + d->frame->win_extents.right;
+    y2 = d->height - d->context->bottom_space + d->frame->win_extents.bottom;
+
+    h = d->height - d->context->top_space - d->context->bottom_space;
+
+    cairo_set_line_width (cr, 1.0);
+
+    if (!d->frame_window)
+	draw_shadow_background (d, cr, d->shadow, d->context);
+
+    if (d->active)
+    {
+	decor_color_t *title_color = _title_color;
+
+	alpha = settings->decoration_alpha + 0.3;
+
+	fill_rounded_rectangle (cr,
+				x1 + 0.5,
+				y1 + 0.5,
+				d->frame->win_extents.left - 0.5,
+				top - 0.5,
+				5.0, CORNER_TOPLEFT & corners,
+				&title_color[0], 1.0, &title_color[1], alpha,
+				SHADE_TOP | SHADE_LEFT);
+
+	fill_rounded_rectangle (cr,
+				x1 + d->frame->win_extents.left,
+				y1 + 0.5,
+				x2 - x1 - d->frame->win_extents.left -
+				d->frame->win_extents.right,
+				top - 0.5,
+				5.0, 0,
+				&title_color[0], 1.0, &title_color[1], alpha,
+				SHADE_TOP);
+
+	fill_rounded_rectangle (cr,
+				x2 - d->frame->win_extents.right,
+				y1 + 0.5,
+				d->frame->win_extents.right - 0.5,
+				top - 0.5,
+				5.0, CORNER_TOPRIGHT & corners,
+				&title_color[0], 1.0, &title_color[1], alpha,
+				SHADE_TOP | SHADE_RIGHT);
+    }
+    else
+    {
+	alpha = settings->decoration_alpha;
+
+	fill_rounded_rectangle (cr,
+				x1 + 0.5,
+				y1 + 0.5,
+				d->frame->win_extents.left - 0.5,
+				top - 0.5,
+				5.0, CORNER_TOPLEFT & corners,
+				&color, 1.0, &color, alpha,
+				SHADE_TOP | SHADE_LEFT);
+
+	fill_rounded_rectangle (cr,
+				x1 + d->frame->win_extents.left,
+				y1 + 0.5,
+				x2 - x1 - d->frame->win_extents.left -
+				d->frame->win_extents.right,
+				top - 0.5,
+				5.0, 0,
+				&color, 1.0, &color, alpha,
+				SHADE_TOP);
+
+	fill_rounded_rectangle (cr,
+				x2 - d->frame->win_extents.right,
+				y1 + 0.5,
+				d->frame->win_extents.right - 0.5,
+				top - 0.5,
+				5.0, CORNER_TOPRIGHT & corners,
+				&color, 1.0, &color, alpha,
+				SHADE_TOP | SHADE_RIGHT);
+    }
+
+    fill_rounded_rectangle (cr,
+			    x1 + 0.5,
+			    y1 + top,
+			    d->frame->win_extents.left - 0.5,
+			    h,
+			    5.0, 0,
+			    &color, 1.0, &color, alpha,
+			    SHADE_LEFT);
+
+    fill_rounded_rectangle (cr,
+			    x2 - d->frame->win_extents.right,
+			    y1 + top,
+			    d->frame->win_extents.right - 0.5,
+			    h,
+			    5.0, 0,
+			    &color, 1.0, &color, alpha,
+			    SHADE_RIGHT);
+
+
+    fill_rounded_rectangle (cr,
+			    x1 + 0.5,
+			    y2 - d->frame->win_extents.bottom,
+			    d->frame->win_extents.left - 0.5,
+			    d->frame->win_extents.bottom - 0.5,
+			    5.0, CORNER_BOTTOMLEFT & corners,
+			    &color, 1.0, &color, alpha,
+			    SHADE_BOTTOM | SHADE_LEFT);
+
+    fill_rounded_rectangle (cr,
+			    x1 + d->frame->win_extents.left,
+			    y2 - d->frame->win_extents.bottom,
+			    x2 - x1 - d->frame->win_extents.left -
+			    d->frame->win_extents.right,
+			    d->frame->win_extents.bottom - 0.5,
+			    5.0, 0,
+			    &color, 1.0, &color, alpha,
+			    SHADE_BOTTOM);
+
+    fill_rounded_rectangle (cr,
+			    x2 - d->frame->win_extents.right,
+			    y2 - d->frame->win_extents.bottom,
+			    d->frame->win_extents.right - 0.5,
+			    d->frame->win_extents.bottom - 0.5,
+			    5.0, CORNER_BOTTOMRIGHT & corners,
+			    &color, 1.0, &color, alpha,
+			    SHADE_BOTTOM | SHADE_RIGHT);
+
+    cairo_rectangle (cr,
+		     d->context->left_space,
+		     d->context->top_space,
+		     d->width - d->context->left_space -
+		     d->context->right_space,
+		     h);
+    gdk_cairo_set_source_color (cr, &style->bg[GTK_STATE_NORMAL]);
+    cairo_fill (cr);
+
+    cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
+
+    if (d->active)
+    {
+	gdk_cairo_set_source_color_alpha (cr,
+					  &style->fg[GTK_STATE_NORMAL],
+					  0.7);
+
+	cairo_move_to (cr, x1 + 0.5, y1 + top - 0.5);
+	cairo_rel_line_to (cr, x2 - x1 - 1.0, 0.0);
+
+	cairo_stroke (cr);
+    }
+
+    rounded_rectangle (cr,
+		       x1 + 0.5, y1 + 0.5,
+		       x2 - x1 - 1.0, y2 - y1 - 1.0,
+		       5.0,
+		       (CORNER_TOPLEFT | CORNER_TOPRIGHT | CORNER_BOTTOMLEFT |
+			CORNER_BOTTOMRIGHT) & corners);
+
+    cairo_clip (cr);
+
+    cairo_translate (cr, 1.0, 1.0);
+
+    rounded_rectangle (cr,
+		       x1 + 0.5, y1 + 0.5,
+		       x2 - x1 - 1.0, y2 - y1 - 1.0,
+		       5.0,
+		       (CORNER_TOPLEFT | CORNER_TOPRIGHT | CORNER_BOTTOMLEFT |
+			CORNER_BOTTOMRIGHT) & corners);
+
+    cairo_set_source_rgba (cr, 1.0, 1.0, 1.0, 0.4);
+
+    cairo_stroke (cr);
+
+    cairo_translate (cr, -2.0, -2.0);
+
+    rounded_rectangle (cr,
+		       x1 + 0.5, y1 + 0.5,
+		       x2 - x1 - 1.0, y2 - y1 - 1.0,
+		       5.0,
+		       (CORNER_TOPLEFT | CORNER_TOPRIGHT | CORNER_BOTTOMLEFT |
+			CORNER_BOTTOMRIGHT) & corners);
+
+    cairo_set_source_rgba (cr, 0.0, 0.0, 0.0, 0.1);
+
+    cairo_stroke (cr);
+
+    cairo_translate (cr, 1.0, 1.0);
+
+    cairo_reset_clip (cr);
+
+    rounded_rectangle (cr,
+		       x1 + 0.5, y1 + 0.5,
+		       x2 - x1 - 1.0, y2 - y1 - 1.0,
+		       5.0,
+		       (CORNER_TOPLEFT | CORNER_TOPRIGHT | CORNER_BOTTOMLEFT |
+			CORNER_BOTTOMRIGHT) & corners);
+
+    gdk_cairo_set_source_color_alpha (cr,
+				      &style->fg[GTK_STATE_NORMAL],
+				      alpha);
+
+    cairo_stroke (cr);
+
+    cairo_set_line_width (cr, 2.0);
+
+    button_x = d->width - d->context->right_space - 13;
+
+    if (d->actions & WNCK_WINDOW_ACTION_CLOSE)
+    {
+	button_state_offsets (button_x,
+			      y1 - 3.0 + d->frame->titlebar_height / 2,
+			      d->button_states[BUTTON_CLOSE], &x, &y);
+
+	button_x -= 17;
+
+	if (d->active)
+	{
+	    cairo_move_to (cr, x, y);
+	    draw_close_button (d, cr, 3.0);
+	    button_state_paint (cr, style, &color,
+				d->button_states[BUTTON_CLOSE]);
+	}
+	else
+	{
+	    gdk_cairo_set_source_color_alpha (cr,
+					      &style->fg[GTK_STATE_NORMAL],
+					      alpha * 0.75);
+
+	    cairo_move_to (cr, x, y);
+	    draw_close_button (d, cr, 3.0);
+	    cairo_fill (cr);
+	}
+    }
+
+    if (d->actions & WNCK_WINDOW_ACTION_MAXIMIZE)
+    {
+	button_state_offsets (button_x,
+			      y1 - 3.0 + d->frame->titlebar_height / 2,
+			      d->button_states[BUTTON_MAX], &x, &y);
+
+	button_x -= 17;
+
+	cairo_set_fill_rule (cr, CAIRO_FILL_RULE_EVEN_ODD);
+
+	if (d->active)
+	{
+	    gdk_cairo_set_source_color_alpha (cr,
+					      &style->fg[GTK_STATE_NORMAL],
+					      STROKE_ALPHA);
+
+	    cairo_move_to (cr, x, y);
+
+	    if (d->state & (WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY |
+			    WNCK_WINDOW_STATE_MAXIMIZED_VERTICALLY))
+		draw_unmax_button (d, cr, 4.0);
+	    else
+		draw_max_button (d, cr, 4.0);
+
+	    button_state_paint (cr, style, &color,
+				d->button_states[BUTTON_MAX]);
+	}
+	else
+	{
+	    gdk_cairo_set_source_color_alpha (cr,
+					      &style->fg[GTK_STATE_NORMAL],
+					      alpha * 0.75);
+
+	    cairo_move_to (cr, x, y);
+
+	    if (d->state & (WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY |
+			    WNCK_WINDOW_STATE_MAXIMIZED_VERTICALLY))
+		draw_unmax_button (d, cr, 4.0);
+	    else
+		draw_max_button (d, cr, 4.0);
+
+	    cairo_fill (cr);
+	}
+    }
+
+    if (d->actions & WNCK_WINDOW_ACTION_MINIMIZE)
+    {
+	button_state_offsets (button_x,
+			      y1 - 3.0 + d->frame->titlebar_height / 2,
+			      d->button_states[BUTTON_MIN], &x, &y);
+
+	button_x -= 17;
+
+	if (d->active)
+	{
+	    gdk_cairo_set_source_color_alpha (cr,
+					      &style->fg[GTK_STATE_NORMAL],
+					      STROKE_ALPHA);
+
+
+	    cairo_move_to (cr, x, y);
+	    draw_min_button (d, cr, 4.0);
+	    button_state_paint (cr, style, &color,
+				d->button_states[BUTTON_MIN]);
+	}
+	else
+	{
+	    gdk_cairo_set_source_color_alpha (cr,
+					      &style->fg[GTK_STATE_NORMAL],
+					      alpha * 0.75);
+
+	    cairo_move_to (cr, x, y);
+	    draw_min_button (d, cr, 4.0);
+	    cairo_fill (cr);
+	}
+    }
+
+    if (d->layout)
+    {
+	if (d->active)
+	{
+	    cairo_move_to (cr,
+			   d->context->left_space + 21.0,
+			   y1 + 2.0 + (d->frame->titlebar_height - d->frame->text_height) / 2.0);
+
+	    gdk_cairo_set_source_color_alpha (cr,
+					      &style->fg[GTK_STATE_NORMAL],
+					      STROKE_ALPHA);
+
+	    pango_cairo_layout_path (cr, d->layout);
+	    cairo_stroke (cr);
+
+	    cairo_set_source_rgb (cr, 1.0, 1.0, 1.0);
+	}
+	else
+	{
+	    gdk_cairo_set_source_color_alpha (cr,
+					      &style->fg[GTK_STATE_NORMAL],
+					      alpha);
+	}
+
+	cairo_move_to (cr,
+		       d->context->left_space + 21.0,
+		       y1 + 2.0 + (d->frame->titlebar_height - d->frame->text_height) / 2.0);
+
+	pango_cairo_show_layout (cr, d->layout);
+    }
+
+    if (d->icon)
+    {
+	cairo_translate (cr, d->context->left_space + 1,
+			 y1 - 5.0 + d->frame->titlebar_height / 2);
+	cairo_set_source (cr, d->icon);
+	cairo_rectangle (cr, 0.0, 0.0, 16.0, 16.0);
+	cairo_clip (cr);
+
+	if (d->active)
+	    cairo_paint (cr);
+	else
+	    cairo_paint_with_alpha (cr, alpha);
+    }
+
+    cairo_destroy (cr);
+
+    copy_to_front_buffer (d);
+
+    if (d->frame_window)
+    {
+	GdkWindow *gdk_frame_window = gtk_widget_get_window (d->decor_window);
+
+	gtk_image_set_from_pixmap (GTK_IMAGE (d->decor_image), d->pixmap, NULL);
+	gtk_window_resize (GTK_WINDOW (d->decor_window), d->width, d->height);
+	gdk_window_move (gdk_frame_window, 0, 0);
+	gdk_window_lower (gdk_frame_window);
+    }
+
+    if (d->prop_xid)
+    {
+	decor_update_window_property (d);
+	d->prop_xid = 0;
+    }
+}
+
+static void
+calc_button_size (decor_t *d)
+{
+    gint button_width;
+
+    button_width = 0;
+
+    if (d->actions & WNCK_WINDOW_ACTION_CLOSE)
+	button_width += 17;
+
+    if (d->actions & (WNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY   |
+		      WNCK_WINDOW_ACTION_MAXIMIZE_VERTICALLY     |
+		      WNCK_WINDOW_ACTION_UNMAXIMIZE_HORIZONTALLY |
+		      WNCK_WINDOW_ACTION_UNMAXIMIZE_VERTICALLY))
+	button_width += 17;
+
+    if (d->actions & (WNCK_WINDOW_ACTION_MINIMIZE |
+		      WNCK_WINDOW_ACTION_MINIMIZE))
+	button_width += 17;
+
+    if (button_width)
+	button_width++;
+
+    d->button_width = button_width;
+}
+
+gboolean
+calc_decoration_size (decor_t *d,
+		      gint    w,
+		      gint    h,
+		      gint    name_width,
+		      gint    *width,
+		      gint    *height)
+{
+    decor_layout_t layout;
+    int		   top_width;
+
+    /* To avoid wasting texture memory, we only calculate the minimal
+     * required decoration size then clip and stretch the texture where
+     * appropriate
+     */
+
+    if (!d->frame_window)
+    {
+	calc_button_size (d);
+
+	if (w < ICON_SPACE + d->button_width)
+	    return FALSE;
+
+	top_width = name_width + d->button_width + ICON_SPACE;
+	if (w < top_width)
+	    top_width = MAX (ICON_SPACE + d->button_width, w);
+
+	decor_get_default_layout (&d->frame->window_context, top_width, 1, &layout);
+
+	if (!d->context || memcmp (&layout, &d->border_layout, sizeof (layout)))
+	{
+	    *width  = layout.width;
+	    *height = layout.height;
+
+	    d->border_layout = layout;
+	    d->context       = &d->frame->window_context;
+	    d->shadow        = d->frame->border_shadow;
+
+	    return TRUE;
+	}
+    }
+    else
+    {
+	calc_button_size (d);
+
+	/* _default_win_extents + top height */
+
+	top_width = name_width + d->button_width + ICON_SPACE;
+	if (w < top_width)
+	    top_width = MAX (ICON_SPACE + d->button_width, w);
+
+	decor_get_default_layout (&d->frame->window_context_no_shadow,
+				  d->client_width, d->client_height, &layout);
+
+	*width = layout.width;
+	*height = layout.height;
+
+	d->border_layout = layout;
+	d->context = &d->frame->window_context_no_shadow;
+	d->shadow = d->frame->border_no_shadow;
+
+	return TRUE;
+    }
+
+    return FALSE;
+}
+
+gboolean
+get_button_position (decor_t *d,
+		     gint    i,
+		     gint    width,
+		     gint    height,
+		     gint    *x,
+		     gint    *y,
+		     gint    *w,
+		     gint    *h)
+{
+    if (i > BUTTON_MENU)
+	return FALSE;
+
+    if (d->frame_window)
+    {
+	*x = bpos[i].x + bpos[i].xw * width + d->frame->win_extents.left + 4;
+	*y = bpos[i].y + bpos[i].yh * height + bpos[i].yth *
+	    (d->frame->titlebar_height - 17) + d->frame->win_extents.top + 2;
+    }
+    else
+    {
+	*x = bpos[i].x + bpos[i].xw * width;
+	*y = bpos[i].y + bpos[i].yh * height + bpos[i].yth *
+	    (d->frame->titlebar_height - 17);
+    }
+
+    *w = bpos[i].w + bpos[i].ww * width;
+    *h = bpos[i].h + bpos[i].hh * height + bpos[i].hth +
+	(d->frame->titlebar_height - 17);
+
+    /* hack to position multiple buttons on the right */
+    if (i != BUTTON_MENU)
+	*x -= 10 + 16 * i;
+
+    return TRUE;
+}
+
+void
+get_event_window_position (decor_t *d,
+			   gint    i,
+			   gint    j,
+			   gint    width,
+			   gint    height,
+			   gint    *x,
+			   gint    *y,
+			   gint    *w,
+			   gint    *h)
+{
+    if (d->frame_window)
+    {
+	*x = pos[i][j].x + pos[i][j].xw * width + d->frame->win_extents.left;
+	*y = pos[i][j].y + d->frame->win_extents.top +
+	     pos[i][j].yh * height + pos[i][j].yth * (d->frame->titlebar_height - 17);
+
+	if (i == 0 && (j == 0 || j == 2))
+	    *y -= d->frame->titlebar_height;
+    }
+    else
+    {
+	*x = pos[i][j].x + pos[i][j].xw * width;
+	*y = pos[i][j].y +
+	     pos[i][j].yh * height + pos[i][j].yth * (d->frame->titlebar_height - 17);
+    }
+
+    if ((d->state & WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY) &&
+	(j == 0 || j == 2))
+    {
+	*w = 0;
+    }
+    else
+    {
+	*w = pos[i][j].w + pos[i][j].ww * width;
+    }
+
+    if ((d->state & WNCK_WINDOW_STATE_MAXIMIZED_VERTICALLY) &&
+	(i == 0 || i == 2))
+    {
+	*h = 0;
+    }
+    else
+    {
+	*h = pos[i][j].h +
+	     pos[i][j].hh * height + pos[i][j].hth * (d->frame->titlebar_height - 17);
+    }
+}
+
+gfloat
+get_title_scale (decor_frame_t *frame)
+{
+    return 1.0f;
+}
+
+void
+update_border_extents (decor_frame_t *frame)
+{
+    decor_frame_t *default_frame = gwd_get_decor_frame ("default");
+
+    frame = gwd_decor_frame_ref (frame);
+
+    frame->win_extents = default_frame->win_extents;
+    frame->max_win_extents = default_frame->win_extents;
+    frame->titlebar_height = frame->max_titlebar_height =
+	    (frame->text_height < 17) ? 17 : frame->text_height;
+
+    gwd_decor_frame_unref (frame);
+    gwd_decor_frame_unref (default_frame);
+}
 
=== renamed file 'gtk/window-decorator/cairo.c' => 'gtk/window-decorator/cairo.c.THIS'
=== added file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/decorator.c	2012-02-08 18:50:27 +0000
@@ -0,0 +1,1301 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Reveman <[e-mail]>
+ *
+ * 2D Mode: Copyright © 2010 Sam Spilsbury <[e-mail]>
+ * Frames Management: Copright © 2011 Canonical Ltd.
+ *        Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "gtk-window-decorator.h"
+
+decor_frame_t *
+create_normal_frame (const gchar *type)
+{
+    decor_frame_t *frame = decor_frame_new (type);
+
+    decor_context_t _window_context = {
+	{ 0, 0, 0, 0 },
+	6, 6, 4, 6,
+	0, 0, 0, 0
+    };
+
+    decor_context_t _max_window_context = {
+	{ 0, 0, 0, 0 },
+	6, 6, 4, 6,
+	0, 0, 0, 0
+    };
+
+    decor_context_t _window_context_no_shadow = {
+	{ 0, 0, 0, 0 },
+	6, 6, 4, 6,
+	0, 0, 0, 0
+    };
+
+    decor_context_t _max_window_context_no_shadow = {
+	{ 0, 0, 0, 0 },
+	6, 6, 4, 6,
+	0, 0, 0, 0
+    };
+
+    decor_extents_t _win_extents         = { 6, 6, 6, 6 };
+    decor_extents_t _max_win_extents     = { 6, 6, 4, 6 };
+
+    frame->win_extents = _win_extents;
+    frame->max_win_extents = _max_win_extents;
+    frame->update_shadow = decor_frame_update_shadow;
+    frame->window_context = _window_context;
+    frame->window_context_no_shadow = _window_context_no_shadow;
+    frame->max_window_context = _max_window_context;
+    frame->max_window_context_no_shadow = _max_window_context_no_shadow;
+
+    return frame;
+}
+
+void
+destroy_normal_frame (decor_frame_t *frame)
+{
+    decor_frame_destroy (frame);
+}
+
+decor_frame_t *
+create_bare_frame (const gchar *type)
+{
+    decor_frame_t *frame = decor_frame_new (type);
+    decor_context_t _shadow_context = {
+	{ 0, 0, 0, 0 },
+	0, 0, 0, 0,
+	0, 0, 0, 0,
+    };
+
+    decor_extents_t _shadow_extents      = { 0, 0, 0, 0 };
+
+    frame->win_extents = _shadow_extents;
+    frame->max_win_extents = _shadow_extents;
+    frame->win_extents = _shadow_extents;
+    frame->window_context = _shadow_context;
+    frame->window_context_no_shadow = _shadow_context;
+    frame->max_window_context = _shadow_context;
+    frame->max_window_context_no_shadow = _shadow_context;
+    frame->update_shadow = bare_frame_update_shadow;
+
+    return frame;
+}
+
+void
+destroy_bare_frame (decor_frame_t *frame)
+{
+    decor_frame_destroy (frame);
+}
+
+
+/*
+ * get_titlebar_font
+ *
+ * Returns: PangoFontDescription * or NULL if using system font
+ * Description: Helper function to get the font for the titlebar
+ */
+static const PangoFontDescription *
+get_titlebar_font (decor_frame_t *frame)
+{
+    if (settings->use_system_font)
+	return NULL;
+    else
+	return frame->titlebar_font;
+}
+
+/*
+ * frame_update_titlebar_font
+ *
+ * Returns: void
+ * Description: updates the titlebar font from the pango context, should
+ * be called whenever the gtk style or font has changed
+ */
+void
+frame_update_titlebar_font (decor_frame_t *frame)
+{
+    const PangoFontDescription *font_desc;
+    PangoFontMetrics	       *metrics;
+    PangoLanguage	       *lang;
+
+    frame = gwd_decor_frame_ref (frame);
+
+    font_desc = get_titlebar_font (frame);
+    if (!font_desc)
+    {
+	GtkStyle *default_style;
+
+	default_style = gtk_widget_get_default_style ();
+	font_desc = default_style->font_desc;
+    }
+
+    pango_context_set_font_description (frame->pango_context, font_desc);
+
+    lang    = pango_context_get_language (frame->pango_context);
+    metrics = pango_context_get_metrics (frame->pango_context, font_desc, lang);
+
+    frame->text_height = PANGO_PIXELS (pango_font_metrics_get_ascent (metrics) +
+				pango_font_metrics_get_descent (metrics));
+
+    gwd_decor_frame_unref (frame);
+
+    pango_font_metrics_unref (metrics);
+}
+
+void
+update_frames_titlebar_fonts (gpointer key,
+			      gpointer value,
+			      gpointer user_data)
+{
+    frame_update_titlebar_font ((decor_frame_t *) value);
+}
+
+void
+update_titlebar_font ()
+{
+    gwd_frames_foreach (update_frames_titlebar_fonts, NULL);
+}
+
+
+/*
+ * update_event_windows
+ *
+ * Returns: void
+ * Description: creates small "event windows" for the buttons specified to be
+ * on the titlebar by wnck. Note here that for the pixmap mode we create actual
+ * X windows but in the reparenting mode this is not possible so we create event
+ * capture boxes on the window instead. The geometry of the decoration is retrieved
+ * with wnck_window_get_client_window_geometry and adjusted for shade. Also we
+ * need to query the theme for what window positions are appropriate here.
+ *
+ * This function works on the buttons and also the small event regions that we need
+ * in order to toggle certain actions on the window decoration (eg resize, move)
+ *
+ * So your window decoration might look something like this (not to scale):
+ *
+ * -----------------------------------------------------------
+ * | rtl |                   rt                        | rtr |
+ * | --- |---------------------------------------------| --- |
+ * |     | [i][s][m]         mv              [_][M][X] |     |
+ * |     |---------------------------------------------|     |
+ * |     |                                             |     |
+ * | rl  |             window contents                 | rr  |
+ * |     |                                             |     |
+ * |     |                                             |     |
+ * | --- |---------------------------------------------| --- |
+ * | rbl |                  rb                         | rbr |
+ * -----------------------------------------------------------
+ *
+ * Where:
+ * - rtl = resize top left
+ * - rtr = resize top right
+ * - rbl = resize bottom left
+ * - rbr = resize bottom right
+ * - rt = resize top
+ * - rb = resize bottom
+ * - rl = resize left
+ * - rr = resize right
+ * - mv = "grab move" area (eg titlebar)
+ * - i = icon
+ * - s = shade
+ * - m = menu
+ * - _ = minimize
+ * - M = maximize
+ * - X = close
+ *
+ * For the reparenting mode we use button_windows[i].pos and for the pixmap mode
+ * we use buttons_windows[i].window
+ *
+ */
+void
+update_event_windows (WnckWindow *win)
+{
+    Display *xdisplay;
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    gint    x0, y0, width, height, x, y, w, h;
+    gint    i, j, k, l;
+    gint    actions = d->actions;
+
+    xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+
+    /* Get the geometry of the client */
+    wnck_window_get_client_window_geometry (win, &x0, &y0, &width, &height);
+
+    /* Shaded windows have no height - also skip some event windows */
+    if (d->state & WNCK_WINDOW_STATE_SHADED)
+    {
+	height = 0;
+	k = l = 1;
+    }
+    else
+    {
+	k = 0;
+	l = 2;
+    }
+
+    gdk_error_trap_push ();
+
+    /* [rtl, ru, rtr], [rl, mv, rr], [rbl, rb, rbr] */
+    for (i = 0; i < 3; i++)
+    {
+	static guint event_window_actions[3][3] = {
+	    {
+		WNCK_WINDOW_ACTION_RESIZE,
+		WNCK_WINDOW_ACTION_RESIZE,
+		WNCK_WINDOW_ACTION_RESIZE
+	    }, {
+		WNCK_WINDOW_ACTION_RESIZE,
+		WNCK_WINDOW_ACTION_MOVE,
+		WNCK_WINDOW_ACTION_RESIZE
+	    }, {
+		WNCK_WINDOW_ACTION_RESIZE,
+		WNCK_WINDOW_ACTION_RESIZE,
+		WNCK_WINDOW_ACTION_RESIZE
+	    }
+	};
+
+	for (j = 0; j < 3; j++)
+	{
+	    w = 0;
+	    h = 0;
+
+	    if (actions & event_window_actions[i][j] && i >= k && i <= l)
+		(*theme_get_event_window_position) (d, i, j, width, height,
+						    &x, &y, &w, &h);
+
+	    /* Reparenting mode - create boxes which we monitor motionnotify on */
+	    if (d->frame_window)
+	    {
+		BoxPtr box = &d->event_windows[i][j].pos;
+		box->x1  = x;
+		box->x2 = x + w;
+		box->y1 = y;
+		box->y2 = y + h;
+	    }
+	    /* Pixmap mode with window geometry - create small event windows */
+	    else if (!d->frame_window && w != 0 && h != 0)
+	    {
+		XMapWindow (xdisplay, d->event_windows[i][j].window);
+		XMoveResizeWindow (xdisplay, d->event_windows[i][j].window,
+				   x, y, w, h);
+	    }
+	    /* No parent and no geometry - unmap all event windows */
+	    else if (!d->frame_window)
+	    {
+		XUnmapWindow (xdisplay, d->event_windows[i][j].window);
+	    }
+	}
+    }
+
+    /* no button event windows if width is less than minimum width */
+    if (width < ICON_SPACE + d->button_width)
+	actions = 0;
+
+    /* Above, stick, unshade and unstick are only available in wnck => 2.18.1 */
+    for (i = 0; i < BUTTON_NUM; i++)
+    {
+	static guint button_actions[BUTTON_NUM] = {
+	    WNCK_WINDOW_ACTION_CLOSE,
+	    WNCK_WINDOW_ACTION_MAXIMIZE,
+	    WNCK_WINDOW_ACTION_MINIMIZE,
+	    0,
+	    WNCK_WINDOW_ACTION_SHADE,
+
+#ifdef HAVE_LIBWNCK_2_18_1
+	    WNCK_WINDOW_ACTION_ABOVE,
+	    WNCK_WINDOW_ACTION_STICK,
+	    WNCK_WINDOW_ACTION_UNSHADE,
+	    WNCK_WINDOW_ACTION_ABOVE,
+	    WNCK_WINDOW_ACTION_UNSTICK
+#else
+	    0,
+	    0,
+	    0,
+	    0,
+	    0
+#endif
+
+	};
+
+	/* Reparenting mode - if a box was set and we no longer need it reset its geometry */
+	if (d->frame_window &&
+	    button_actions[i] && !(actions & button_actions[i]))
+	{
+	    memset (&d->button_windows[i].pos, 0, sizeof (Box));
+	}
+	/* Pixmap mode - if a box was set and we no longer need it unmap its window */
+	else if (!d->frame_window &&
+		 button_actions[i] && !(actions & button_actions[i]))
+	{
+	    XUnmapWindow (xdisplay, d->button_windows[i].window);
+	    continue;
+	}
+
+	/* Reparenting mode - if there is a button position for this
+	 * button then set the geometry */
+	if (d->frame_window &&
+	    (*theme_get_button_position) (d, i, width, height, &x, &y, &w, &h))
+	{
+	    BoxPtr box = &d->button_windows[i].pos;
+	    box->x1 = x;
+	    box->y1 = y;
+	    box->x2 = x + w;
+	    box->y2 = y + h;
+	}
+	/* Pixmap mode - if there is a button position for this button then map the window
+	 * and resize it to this position */
+	else if (!d->frame_window &&
+		 (*theme_get_button_position) (d, i, width, height,
+					       &x, &y, &w, &h))
+	{
+	    Window win = d->button_windows[i].window;
+	    XMapWindow (xdisplay, win);
+	    XMoveResizeWindow (xdisplay, win, x, y, w, h);
+	}
+	else if (!d->frame_window)
+	{
+	    XUnmapWindow (xdisplay, d->button_windows[i].window);
+	}
+    }
+
+    gdk_display_sync (gdk_display_get_default ());
+    gdk_error_trap_pop ();
+}
+
+/*
+ * wnck_window_get_real_name
+ *
+ * Returns: const char * or NULL
+ * Description: Wrapper function to either get the name of the window or
+ * return NULL
+ */
+
+#ifdef HAVE_WNCK_WINDOW_HAS_NAME
+static const char *
+wnck_window_get_real_name (WnckWindow *win)
+{
+    return wnck_window_has_name (win) ? wnck_window_get_name (win) : NULL;
+}
+#define wnck_window_get_name wnck_window_get_real_name
+#endif
+
+/*
+ * max_window_name_width
+ *
+ * Returns: gint
+ * Description: Calculate the width of the decoration required to display
+ * the window name using pango (with 6px padding)
+ * Returns zero if window has no name.
+ */
+gint
+max_window_name_width (WnckWindow *win)
+{
+    decor_t     *d = g_object_get_data (G_OBJECT (win), "decor");
+    const gchar *name;
+    gint	w;
+
+    /* Ensure that a layout is created */
+    if (!d->layout)
+    {
+	d->layout = pango_layout_new (d->frame->pango_context);
+	if (!d->layout)
+	    return 0;
+
+	pango_layout_set_wrap (d->layout, PANGO_WRAP_CHAR);
+    }
+
+    /* Return zero if window has no name */
+    name = wnck_window_get_name (win);
+    if (!name)
+	return 0;
+
+    /* Reset the width, set hte text and get the size required */
+    pango_layout_set_auto_dir (d->layout, FALSE);
+    pango_layout_set_width (d->layout, -1);
+    pango_layout_set_text (d->layout, name, strlen (name));
+    pango_layout_get_pixel_size (d->layout, &w, NULL);
+
+    if (d->name)
+	pango_layout_set_text (d->layout, d->name, strlen (d->name));
+
+    return w + 6;
+}
+
+/*
+ * update_window_decoration_name
+ *
+ * Returns: void
+ * Description: frees the last window name and gets the new one from
+ * wnck. Also checks to see if the name has a length (slight optimization)
+ * and re-creates the pango context to re-render the name
+ */
+void
+update_window_decoration_name (WnckWindow *win)
+{
+    decor_t	    *d = g_object_get_data (G_OBJECT (win), "decor");
+    const gchar	    *name;
+    glong	    name_length;
+    PangoLayoutLine *line;
+
+    if (d->name)
+    {
+	g_free (d->name);
+	d->name = NULL;
+    }
+
+    /* Only operate if the window name has a length */
+    name = wnck_window_get_name (win);
+    if (name && (name_length = strlen (name)))
+    {
+	gint w;
+
+	/* Cairo mode: w = SHRT_MAX */
+	if (theme_draw_window_decoration != draw_window_decoration)
+	{
+	    w = SHRT_MAX;
+	}
+	/* Need to get a minimum width for the name */
+	else
+	{
+	    gint width;
+
+	    wnck_window_get_client_window_geometry (win, NULL, NULL,
+						    &width, NULL);
+
+	    w = width - ICON_SPACE - 2 - d->button_width;
+	    if (w < 1)
+		w = 1;
+	}
+
+	/* Set the maximum width for the layout (in case
+	 * decoration size < text width) since we
+	 * still need to show the buttons and the window name */
+	pango_layout_set_auto_dir (d->layout, FALSE);
+	pango_layout_set_width (d->layout, w * PANGO_SCALE);
+	pango_layout_set_text (d->layout, name, name_length);
+
+	line = pango_layout_get_line (d->layout, 0);
+
+	name_length = line->length;
+	if (pango_layout_get_line_count (d->layout) > 1)
+	{
+	    if (name_length < 4)
+	    {
+		pango_layout_set_text (d->layout, NULL, 0);
+		return;
+	    }
+
+	    d->name = g_strndup (name, name_length);
+	    strcpy (d->name + name_length - 3, "...");
+	}
+	else
+	    d->name = g_strndup (name, name_length);
+
+	/* Truncate the text */
+	pango_layout_set_text (d->layout, d->name, name_length);
+    }
+}
+
+/*
+ * update_window_decoration_icon
+ *
+ * Updates the window icon (destroys the existing cairo pattern
+ * and creates a new one for the pixmap)
+ */
+void
+update_window_decoration_icon (WnckWindow *win)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+
+    /* Destroy old stuff */
+    if (d->icon)
+    {
+	cairo_pattern_destroy (d->icon);
+	d->icon = NULL;
+    }
+
+    if (d->icon_pixmap)
+    {
+	g_object_unref (G_OBJECT (d->icon_pixmap));
+	d->icon_pixmap = NULL;
+    }
+
+    if (d->icon_pixbuf)
+	g_object_unref (G_OBJECT (d->icon_pixbuf));
+
+    /* Get the mini icon pixbuf from libwnck */
+    d->icon_pixbuf = wnck_window_get_mini_icon (win);
+    if (d->icon_pixbuf)
+    {
+	cairo_t	*cr;
+
+	g_object_ref (G_OBJECT (d->icon_pixbuf));
+
+	/* 32 bit pixmap on pixmap mode, 24 for reparenting */
+	if (d->frame_window)
+	    d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf,
+						     d->frame->style_window_rgba);
+	else
+	    d->icon_pixmap = pixmap_new_from_pixbuf (d->icon_pixbuf,
+						     d->frame->style_window_rgb);
+	cr = gdk_cairo_create (GDK_DRAWABLE (d->icon_pixmap));
+	d->icon = cairo_pattern_create_for_surface (cairo_get_target (cr));
+	cairo_destroy (cr);
+    }
+}
+
+
+/*
+ * update_window_decoration_size
+ * Returns: FALSE for failure, TRUE for success
+ * Description: Calculates the minimum size of the decoration that we need
+ * to render. This is mostly done by the theme but there is some work that
+ * we need to do here first, such as getting the client geometry, setting
+ * drawable depths, creating pixmaps, creating XRenderPictures and
+ * updating the window decoration name
+ */
+ 
+gboolean
+update_window_decoration_size (WnckWindow *win)
+{
+    decor_t           *d = g_object_get_data (G_OBJECT (win), "decor");
+    GdkPixmap         *pixmap, *buffer_pixmap = NULL;
+    Picture           picture;
+    gint              width, height;
+    gint              x, y, w, h, name_width;
+    Display           *xdisplay;
+    XRenderPictFormat *format;
+
+    xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+
+    /* Get the geometry of the window, we'll need it later */
+    wnck_window_get_client_window_geometry (win, &x, &y, &w, &h);
+
+    /* Get the width of the name */
+    name_width = max_window_name_width (win);
+
+    /* Ask the theme to tell us how much space it needs. If this is not successful
+     * update the decoration name and return false */
+    if (!(*theme_calc_decoration_size) (d, w, h, name_width, &width, &height))
+    {
+	update_window_decoration_name (win);
+	return FALSE;
+    }
+
+    gdk_error_trap_push ();
+
+    /* Get the correct depth for the frame window in reparenting mode, otherwise
+     * enforce 32 */
+    if (d->frame_window)
+	pixmap = create_pixmap (width, height, d->frame->style_window_rgb);
+    else
+	pixmap = create_pixmap (width, height, d->frame->style_window_rgba);
+
+    gdk_flush ();
+
+    /* Handle failure */
+    if (!pixmap || gdk_error_trap_pop ())
+    {
+	memset (pixmap, 0, sizeof (pixmap));
+	return FALSE;
+    }
+
+    gdk_error_trap_push ();
+
+    if (d->frame_window)
+	buffer_pixmap = create_pixmap (width, height, d->frame->style_window_rgb);
+    else
+	buffer_pixmap = create_pixmap (width, height, d->frame->style_window_rgba);
+
+    gdk_flush ();
+
+    /* Handle failure */
+    if (!buffer_pixmap || gdk_error_trap_pop ())
+    {
+	memset (buffer_pixmap, 0, sizeof (buffer_pixmap));
+	g_object_unref (G_OBJECT (pixmap));
+	return FALSE;
+    }
+
+    /* Create XRender context */
+    format = get_format_for_drawable (d, GDK_DRAWABLE (buffer_pixmap));
+    picture = XRenderCreatePicture (xdisplay, GDK_PIXMAP_XID (buffer_pixmap),
+				    format, 0, NULL);
+
+    /* Destroy the old pixmaps and pictures */
+    if (d->pixmap)
+	g_object_unref (G_OBJECT (d->pixmap));
+
+    if (d->buffer_pixmap)
+	g_object_unref (G_OBJECT (d->buffer_pixmap));
+
+    if (d->picture)
+	XRenderFreePicture (xdisplay, d->picture);
+
+    if (d->cr)
+	cairo_destroy (d->cr);
+
+    /* Assign new pixmaps and pictures */
+    d->pixmap	     = pixmap;
+    d->buffer_pixmap = buffer_pixmap;
+    d->cr	     = gdk_cairo_create (pixmap);
+
+    d->picture = picture;
+
+    d->width  = width;
+    d->height = height;
+
+    d->prop_xid = wnck_window_get_xid (win);
+
+    update_window_decoration_name (win);
+
+    /* Redraw decoration on idle */
+    queue_decor_draw (d);
+
+    return TRUE;
+}
+
+/* to save some memory, value is specific to current decorations */
+#define TRANSLUCENT_CORNER_SIZE 3
+
+/*
+ * draw_border_shape
+ * Returns: void
+ * Description: Draws a slight border around the decoration
+ */
+static void
+draw_border_shape (Display	   *xdisplay,
+		   Pixmap	   pixmap,
+		   Picture	   picture,
+		   int		   width,
+		   int		   height,
+		   decor_context_t *c,
+		   void		   *closure)
+{
+    static XRenderColor white = { 0xffff, 0xffff, 0xffff, 0xffff };
+    GdkColormap		*colormap;
+    decor_t		d;
+    decor_shadow_info_t *info = (decor_shadow_info_t *) closure;
+    double		save_decoration_alpha;
+
+    memset (&d, 0, sizeof (d));
+
+    if (info)
+	d.frame = info->frame;
+    else
+	d.frame = gwd_get_decor_frame ("default");
+
+    d.pixmap  = gdk_pixmap_foreign_new_for_display (gdk_display_get_default (),
+						    pixmap);
+    d.width   = width;
+    d.height  = height;
+    d.active  = TRUE;
+    d.draw    = theme_draw_window_decoration;
+    d.picture = picture;
+    d.context = c;
+
+    /* we use closure argument if maximized */
+    if (info)
+	d.state = info->state;
+    else
+	d.state = 0;
+
+    decor_get_default_layout (c, 1, 1, &d.border_layout);
+
+    colormap = get_colormap_for_drawable (GDK_DRAWABLE (d.pixmap));
+    gdk_drawable_set_colormap (d.pixmap, colormap);
+
+    /* create shadow from opaque decoration
+     * FIXME: Should not modify settings value
+     * like this */
+    save_decoration_alpha = settings->decoration_alpha;
+    settings->decoration_alpha = 1.0;
+
+    (*d.draw) (&d);
+
+    settings->decoration_alpha = save_decoration_alpha;
+
+    XRenderFillRectangle (xdisplay, PictOpSrc, picture, &white,
+			  c->left_space,
+			  c->top_space,
+			  width - c->left_space - c->right_space,
+			  height - c->top_space - c->bottom_space);
+
+    if (!info)
+	gwd_decor_frame_unref (d.frame);
+
+    g_object_unref (G_OBJECT (d.pixmap));
+}
+
+
+/*
+ * update_shadow
+ * Returns: 1 for success, 0 for failure
+ * Description: creates a libdecoration shadow context and updates
+ * the decoration context for the shadow for the properties that we
+ * have already read from the root window.
+ *
+ * For the pixmap mode we have opt_shadow which is passed to
+ * decor_shadow_create (which contains the shadow settings from
+ * the root window)
+ *
+ * For the reparenting mode we always enforce a zero-shadow in
+ * the opt_no_shadow passed to decor_shadow_create.
+ *
+ * We do something similar  for the maximimzed mode as well
+ */
+void
+bare_frame_update_shadow (Display		  *xdisplay,
+			  Screen		  *screen,
+			  decor_frame_t		 *frame,
+			  decor_shadow_info_t    *info,
+			  decor_shadow_options_t *opt_shadow,
+			  decor_shadow_options_t *opt_no_shadow)
+{
+    if (frame->border_shadow)
+    {
+	decor_shadow_destroy (xdisplay, frame->border_shadow);
+	frame->border_shadow = NULL;
+    }
+
+    frame->border_shadow = decor_shadow_create (xdisplay,
+					    screen,
+					    1, 1,
+					    0,
+					    0,
+					    0,
+					    0,
+					    0, 0, 0, 0,
+					    opt_shadow,
+					    &frame->window_context,
+					    decor_draw_simple,
+					    NULL);
+}
+
+void
+switcher_frame_update_shadow (Display		  *xdisplay,
+			      Screen		  *screen,
+			      decor_frame_t	  *frame,
+			      decor_shadow_info_t    *info,
+			      decor_shadow_options_t *opt_shadow,
+			      decor_shadow_options_t *opt_no_shadow)
+{
+    if (frame->border_shadow)
+    {
+	decor_shadow_destroy (xdisplay, frame->border_shadow);
+	frame->border_shadow = NULL;
+    }
+
+    frame->border_shadow = decor_shadow_create (xdisplay,
+						screen,
+						1, 1,
+						frame->win_extents.left,
+						frame->win_extents.right,
+						frame->win_extents.top,
+						frame->win_extents.bottom,
+						frame->win_extents.left -
+						TRANSLUCENT_CORNER_SIZE,
+						frame->win_extents.right -
+						TRANSLUCENT_CORNER_SIZE,
+						frame->win_extents.top -
+						TRANSLUCENT_CORNER_SIZE,
+						frame->win_extents.bottom -
+						TRANSLUCENT_CORNER_SIZE,
+						opt_shadow,
+						&frame->window_context,
+						decor_draw_simple,
+						NULL);
+}
+
+void
+decor_frame_update_shadow (Display		  *xdisplay,
+			   Screen		  *screen,
+			   decor_frame_t	  *frame,
+			   decor_shadow_info_t    *info,
+			   decor_shadow_options_t *opt_shadow,
+			   decor_shadow_options_t *opt_no_shadow)
+{
+    if (frame->border_shadow)
+    {
+	decor_shadow_destroy (xdisplay, frame->border_shadow);
+	frame->border_shadow = NULL;
+    }
+
+    frame->border_shadow = decor_shadow_create (xdisplay,
+						 screen,
+						 1, 1,
+						 frame->win_extents.left,
+						 frame->win_extents.right,
+						 frame->win_extents.top + frame->titlebar_height,
+						 frame->win_extents.bottom,
+						 frame->win_extents.left -
+						 TRANSLUCENT_CORNER_SIZE,
+						 frame->win_extents.right -
+						 TRANSLUCENT_CORNER_SIZE,
+						 frame->win_extents.top + frame->titlebar_height -
+						 TRANSLUCENT_CORNER_SIZE,
+						 frame->win_extents.bottom -
+						 TRANSLUCENT_CORNER_SIZE,
+						 opt_shadow,
+						 &frame->window_context,
+						 draw_border_shape,
+						 (void *) info);
+    if (frame->border_no_shadow)
+    {
+	decor_shadow_destroy (xdisplay, frame->border_no_shadow);
+	frame->border_no_shadow = NULL;
+    }
+
+    frame->border_no_shadow = decor_shadow_create (xdisplay,
+					 screen,
+					 1, 1,
+					 frame->win_extents.left,
+					 frame->win_extents.right,
+					 frame->win_extents.top + frame->titlebar_height,
+					 frame->win_extents.bottom,
+					 frame->win_extents.left -
+					 TRANSLUCENT_CORNER_SIZE,
+					 frame->win_extents.right -
+					 TRANSLUCENT_CORNER_SIZE,
+					 frame->win_extents.top + frame->titlebar_height -
+					 TRANSLUCENT_CORNER_SIZE,
+					 frame->win_extents.bottom -
+					 TRANSLUCENT_CORNER_SIZE,
+					 opt_no_shadow,
+					 &frame->window_context_no_shadow,
+					 draw_border_shape,
+					 0);
+
+    /* Maximized border shadow pixmap mode */
+    if (frame->max_border_shadow)
+    {
+	decor_shadow_destroy (xdisplay, frame->max_border_shadow);
+	frame->max_border_shadow = NULL;
+    }
+
+    info->state = (WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY |
+		   WNCK_WINDOW_STATE_MAXIMIZED_VERTICALLY);
+
+    frame->max_border_shadow =
+	decor_shadow_create (xdisplay,
+			     screen,
+			     1, 1,
+			     frame->max_win_extents.left,
+			     frame->max_win_extents.right,
+			     frame->max_win_extents.top + frame->max_titlebar_height,
+			     frame->max_win_extents.bottom,
+			     frame->max_win_extents.left - TRANSLUCENT_CORNER_SIZE,
+			     frame->max_win_extents.right - TRANSLUCENT_CORNER_SIZE,
+			     frame->max_win_extents.top + frame->max_titlebar_height -
+			     TRANSLUCENT_CORNER_SIZE,
+			     frame->max_win_extents.bottom - TRANSLUCENT_CORNER_SIZE,
+			     opt_shadow,
+			     &frame->max_window_context,
+			     draw_border_shape,
+			     (void *) info);
+
+    /* Enforced maximize zero shadow reparenting mode */
+    if (frame->max_border_no_shadow)
+    {
+	decor_shadow_destroy (xdisplay, frame->max_border_shadow);
+	frame->max_border_shadow = NULL;
+    }
+
+    frame->max_border_no_shadow =
+	decor_shadow_create (xdisplay,
+			     screen,
+			     1, 1,
+			     frame->max_win_extents.left,
+			     frame->max_win_extents.right,
+			     frame->max_win_extents.top + frame->max_titlebar_height,
+			     frame->max_win_extents.bottom,
+			     frame->max_win_extents.left - TRANSLUCENT_CORNER_SIZE,
+			     frame->max_win_extents.right - TRANSLUCENT_CORNER_SIZE,
+			     frame->max_win_extents.top + frame->max_titlebar_height -
+			     TRANSLUCENT_CORNER_SIZE,
+			     frame->max_win_extents.bottom - TRANSLUCENT_CORNER_SIZE,
+			     opt_no_shadow,
+			     &frame->max_window_context_no_shadow,
+			     draw_border_shape,
+			     (void *) info);
+}
+
+
+typedef struct _tdtd_shadow_options
+{
+    decor_shadow_options_t *shadow;
+    decor_shadow_options_t *no_shadow;
+} tdtd_shadow_options_t;
+
+void
+frame_update_shadow (decor_frame_t	    *frame,
+		     decor_shadow_info_t    *info,
+		     decor_shadow_options_t *opt_shadow,
+		     decor_shadow_options_t *opt_no_shadow)
+{
+    gwd_decor_frame_ref (frame);
+
+    (*frame->update_shadow) (gdk_x11_get_default_xdisplay (),
+			     gdk_x11_screen_get_xscreen (gdk_screen_get_default ()),
+			     frame, info, opt_shadow, opt_no_shadow);
+
+    gwd_decor_frame_unref (frame);
+}
+
+void
+update_frames_shadows (gpointer key,
+		       gpointer value,
+		       gpointer user_data)
+{
+    decor_frame_t	  *frame = (decor_frame_t *) value;
+    tdtd_shadow_options_t *opts =  (tdtd_shadow_options_t *) user_data;
+
+    gwd_decor_frame_ref (frame);
+
+    decor_shadow_info_t *info = malloc (sizeof (decor_shadow_info_t));
+
+    if (!info)
+	return;
+
+    info->frame = frame;
+    info->state = 0;
+
+    frame_update_shadow (frame, info, opts->shadow, opts->no_shadow);
+
+    gwd_decor_frame_unref (frame);
+
+    free (info);
+    info = NULL;
+
+}
+
+int
+update_shadow (void)
+{
+    decor_shadow_options_t opt_shadow;
+    decor_shadow_options_t opt_no_shadow;
+    tdtd_shadow_options_t  *opts;
+
+    opts = malloc (sizeof (tdtd_shadow_options_t));
+
+    if (!opts)
+	return 0;
+
+    opt_shadow.shadow_radius  = settings->shadow_radius;
+    opt_shadow.shadow_opacity = settings->shadow_opacity;
+
+    memcpy (opt_shadow.shadow_color, settings->shadow_color, sizeof (settings->shadow_color));
+
+    opt_shadow.shadow_offset_x = settings->shadow_offset_x;
+    opt_shadow.shadow_offset_y = settings->shadow_offset_y;
+
+    opt_no_shadow.shadow_radius  = 0;
+    opt_no_shadow.shadow_opacity = 0;
+
+    opt_no_shadow.shadow_offset_x = 0;
+    opt_no_shadow.shadow_offset_y = 0;
+
+    opts->shadow = &opt_shadow;
+    opts->no_shadow = &opt_no_shadow;
+
+    gwd_frames_foreach (update_frames_shadows, (gpointer ) opts);
+
+    if (opts)
+	free (opts);
+
+    return 1;
+}
+
+/*
+ * update_window_decoration
+ *
+ * Returns: void
+ * Description: The master function to update the window decoration
+ * if the pixmap needs to be redrawn
+ */
+void
+update_window_decoration (WnckWindow *win)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+
+    if (d->decorated)
+    {
+	/* force size update */
+	d->context = NULL;
+	d->width = d->height = 0;
+
+	update_window_decoration_size (win);
+	update_event_windows (win);
+    }
+}
+
+/*
+ * update_window_decoration_state
+ *
+ * Returns: void
+ * Description: helper function to update the state of the decor_t
+ */
+void
+update_window_decoration_state (WnckWindow *win)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+
+    d->state = wnck_window_get_state (win);
+}
+
+/*
+ * update_window_decoration_actions
+ *
+ * Returns: void
+ * Description: helper function to update the actions of the decor_t
+ */
+void
+update_window_decoration_actions (WnckWindow *win)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+
+    d->actions = wnck_window_get_actions (win);
+}
+
+
+/*
+ * draw_decor_list
+ *
+ * Returns: bool
+ * Description: function to be called on g_idle_add to draw window
+ * decorations when we are not doing anything
+ */
+static gboolean
+draw_decor_list (void *data)
+{
+    GSList  *list;
+    decor_t *d;
+
+    draw_idle_id = 0;
+
+    for (list = draw_list; list; list = list->next)
+    {
+	d = (decor_t *) list->data;
+	(*d->draw) (d);
+    }
+
+    g_slist_free (draw_list);
+    draw_list = NULL;
+
+    return FALSE;
+}
+
+/*
+ * queue_decor_draw
+ *
+ * Description :queue a redraw request for this decoration. Since this function
+ * only gets called on idle, don't redraw window decorations multiple
+ * times if they are already waiting to be drawn (since the drawn copy
+ * will always be the most updated one)
+ */
+void
+queue_decor_draw (decor_t *d)
+{
+    if (g_slist_find (draw_list, d))
+	return;
+
+    draw_list = g_slist_append (draw_list, d);
+
+    if (!draw_idle_id)
+	draw_idle_id = g_idle_add (draw_decor_list, NULL);
+}
+
+/*
+ * update_default_decorations
+ *
+ * Description: update the default decorations
+ */
+void
+update_default_decorations (GdkScreen *screen)
+{
+    long	    data[256];
+    Window	    xroot;
+    GdkDisplay	    *gdkdisplay = gdk_display_get_default ();
+    Display	    *xdisplay = gdk_x11_display_get_xdisplay (gdkdisplay);
+    Atom	    bareAtom, normalAtom, activeAtom;
+    decor_t	    d;
+    gint	    nQuad;
+    decor_quad_t    quads[N_QUADS_MAX];
+    decor_frame_t   *frame;
+    decor_frame_t   *bare_frame = gwd_get_decor_frame ("bare");
+    decor_extents_t extents;
+
+    xroot = RootWindowOfScreen (gdk_x11_screen_get_xscreen (screen));
+
+    bareAtom   = XInternAtom (xdisplay, DECOR_BARE_ATOM_NAME, FALSE);
+    normalAtom = XInternAtom (xdisplay, DECOR_NORMAL_ATOM_NAME, FALSE);
+    activeAtom = XInternAtom (xdisplay, DECOR_ACTIVE_ATOM_NAME, FALSE);
+
+    if (bare_frame->border_shadow)
+    {
+	decor_layout_t layout;
+
+	decor_get_default_layout (&bare_frame->window_context, 1, 1, &layout);
+
+	nQuad = decor_set_lSrStSbS_window_quads (quads, &bare_frame->window_context,
+						 &layout);
+
+	decor_quads_to_property (data, bare_frame->border_shadow->pixmap,
+				 &bare_frame->win_extents, &bare_frame->win_extents,
+				 &bare_frame->win_extents, &bare_frame->win_extents,
+				 0, 0, quads, nQuad);
+
+	XChangeProperty (xdisplay, xroot,
+			 bareAtom,
+			 XA_INTEGER,
+			 32, PropModeReplace, (guchar *) data,
+			 BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad);
+
+	if (minimal)
+	{
+	    XChangeProperty (xdisplay, xroot,
+			     normalAtom,
+			     XA_INTEGER,
+			     32, PropModeReplace, (guchar *) data,
+			     BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad);
+	    XChangeProperty (xdisplay, xroot,
+			     activeAtom,
+			     XA_INTEGER,
+			     32, PropModeReplace, (guchar *) data,
+			     BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad);
+	}
+    }
+    else
+    {
+	XDeleteProperty (xdisplay, xroot, bareAtom);
+
+	if (minimal)
+	{
+	    XDeleteProperty (xdisplay, xroot, normalAtom);
+	    XDeleteProperty (xdisplay, xroot, activeAtom);
+	}
+    }
+
+    if (minimal)
+    {
+	gwd_decor_frame_unref (bare_frame);
+	return;
+    }
+
+    memset (&d, 0, sizeof (d));
+
+    frame = gwd_get_decor_frame ("default");
+    extents = frame->win_extents;
+
+    d.context = &frame->window_context;
+    d.shadow  = frame->border_shadow;
+    d.layout  = pango_layout_new (frame->pango_context);
+
+    decor_get_default_layout (d.context, 1, 1, &d.border_layout);
+
+    d.width  = d.border_layout.width;
+    d.height = d.border_layout.height;
+
+    d.frame = frame;
+
+    extents.top += frame->titlebar_height;
+
+    d.draw = theme_draw_window_decoration;
+
+    if (decor_normal_pixmap)
+	g_object_unref (G_OBJECT (decor_normal_pixmap));
+
+    nQuad = decor_set_lSrStSbS_window_quads (quads, d.context,
+					     &d.border_layout);
+
+    decor_normal_pixmap = create_pixmap (d.width, d.height, frame->style_window_rgba);
+
+    if (decor_normal_pixmap)
+    {
+	d.pixmap  = decor_normal_pixmap;
+	d.active  = FALSE;
+	d.picture = XRenderCreatePicture (xdisplay,
+					  GDK_PIXMAP_XID (d.pixmap),
+					  xformat_rgba, 0, NULL);
+
+	(*d.draw) (&d);
+
+	XRenderFreePicture (xdisplay, d.picture);
+
+	decor_quads_to_property (data, GDK_PIXMAP_XID (d.pixmap),
+				 &extents, &extents,
+				 &extents, &extents, 0, 0, quads, nQuad);
+
+	XChangeProperty (xdisplay, xroot,
+			 normalAtom,
+			 XA_INTEGER,
+			 32, PropModeReplace, (guchar *) data,
+			 BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad);
+    }
+
+    if (decor_active_pixmap)
+	g_object_unref (G_OBJECT (decor_active_pixmap));
+
+    decor_active_pixmap = create_pixmap (d.width, d.height, frame->style_window_rgba);
+
+    if (decor_active_pixmap)
+    {
+	d.pixmap  = decor_active_pixmap;
+	d.active  = TRUE;
+	d.picture = XRenderCreatePicture (xdisplay,
+					  GDK_PIXMAP_XID (d.pixmap),
+					  xformat_rgba, 0, NULL);
+
+	(*d.draw) (&d);
+
+	XRenderFreePicture (xdisplay, d.picture);
+
+	decor_quads_to_property (data, GDK_PIXMAP_XID (d.pixmap),
+				 &extents, &extents,
+				 &extents, &extents, 0, 0, quads, nQuad);
+
+	XChangeProperty (xdisplay, xroot,
+			 activeAtom,
+			 XA_INTEGER,
+			 32, PropModeReplace, (guchar *) data,
+			 BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad);
+    }
+
+    gwd_decor_frame_unref (frame);
+    gwd_decor_frame_unref (bare_frame);
+
+    if (d.layout)
+	g_object_unref (G_OBJECT (d.layout));
+}
+
+/*
+ * copy_to_front_buffer
+ *
+ * Description: Helper function to copy the buffer pixmap to a front buffer
+ */
+void
+copy_to_front_buffer (decor_t *d)
+{
+    if (!d->buffer_pixmap)
+	return;
+
+    cairo_set_operator (d->cr, CAIRO_OPERATOR_SOURCE);
+    gdk_cairo_set_source_pixmap (d->cr, d->buffer_pixmap, 0, 0);
+    cairo_paint (d->cr);
+}
 
=== renamed file 'gtk/window-decorator/decorator.c' => 'gtk/window-decorator/decorator.c.THIS'
=== added file 'gtk/window-decorator/decorprops.c'
--- gtk/window-decorator/decorprops.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/decorprops.c	2012-02-08 18:50:27 +0000
@@ -0,0 +1,161 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Reveman <[e-mail]>
+ *
+ * 2D Mode: Copyright © 2010 Sam Spilsbury <[e-mail]>
+ * Frames Management: Copright © 2011 Canonical Ltd.
+ *        Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "gtk-window-decorator.h"
+
+void
+decor_update_window_property (decor_t *d)
+{
+    long	    data[256];
+    Display	    *xdisplay =
+	GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+    decor_extents_t extents = d->frame->win_extents;
+    gint	    nQuad;
+    decor_quad_t    quads[N_QUADS_MAX];
+    int		    w, h;
+    gint	    stretch_offset;
+    REGION	    top, bottom, left, right;
+
+    w = d->border_layout.top.x2 - d->border_layout.top.x1 -
+	d->context->left_space - d->context->right_space;
+
+    if (d->border_layout.rotation)
+	h = d->border_layout.left.x2 - d->border_layout.left.x1;
+    else
+	h = d->border_layout.left.y2 - d->border_layout.left.y1;
+
+    stretch_offset = w - d->button_width - 1;
+
+    nQuad = decor_set_lSrStXbS_window_quads (quads, d->context,
+					     &d->border_layout,
+					     stretch_offset);
+
+    extents.top += d->frame->titlebar_height;
+
+    if (d->frame_window)
+    {
+	decor_gen_window_property (data, &extents, &extents, 20, 20);
+    }
+    else
+    {
+	decor_quads_to_property (data, GDK_PIXMAP_XID (d->pixmap),
+			     &extents, &extents,
+			     &extents, &extents,
+			     ICON_SPACE + d->button_width,
+			     0,
+			     quads, nQuad);
+    }
+
+    gdk_error_trap_push ();
+    XChangeProperty (xdisplay, d->prop_xid,
+		     win_decor_atom,
+		     XA_INTEGER,
+		     32, PropModeReplace, (guchar *) data,
+		     BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad);
+    gdk_display_sync (gdk_display_get_default ());
+    gdk_error_trap_pop ();
+
+    top.rects = &top.extents;
+    top.numRects = top.size = 1;
+
+    top.extents.x1 = -extents.left;
+    top.extents.y1 = -extents.top;
+    top.extents.x2 = w + extents.right;
+    top.extents.y2 = 0;
+
+    bottom.rects = &bottom.extents;
+    bottom.numRects = bottom.size = 1;
+
+    bottom.extents.x1 = -extents.left;
+    bottom.extents.y1 = 0;
+    bottom.extents.x2 = w + extents.right;
+    bottom.extents.y2 = extents.bottom;
+
+    left.rects = &left.extents;
+    left.numRects = left.size = 1;
+
+    left.extents.x1 = -extents.left;
+    left.extents.y1 = 0;
+    left.extents.x2 = 0;
+    left.extents.y2 = h;
+
+    right.rects = &right.extents;
+    right.numRects = right.size = 1;
+
+    right.extents.x1 = 0;
+    right.extents.y1 = 0;
+    right.extents.x2 = extents.right;
+    right.extents.y2 = h;
+
+    decor_update_blur_property (d,
+				w, h,
+				&top, stretch_offset,
+				&bottom, w / 2,
+				&left, h / 2,
+				&right, h / 2);
+}
+
+void
+decor_update_switcher_property (decor_t *d)
+{
+    long	 data[256];
+    Display	 *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+    gint	 nQuad;
+    decor_quad_t quads[N_QUADS_MAX];
+    GtkStyle     *style;
+    long         fgColor[4];
+    
+    nQuad = decor_set_lSrStSbX_window_quads (quads, &d->frame->window_context,
+					     &d->border_layout,
+					     d->border_layout.top.x2 -
+					     d->border_layout.top.x1 -
+					     d->frame->window_context.extents.left -
+						 d->frame->window_context.extents.right -
+						     32);
+    
+    decor_quads_to_property (data, GDK_PIXMAP_XID (d->pixmap),
+			     &d->frame->win_extents, &d->frame->win_extents,
+			     &d->frame->win_extents, &d->frame->win_extents,
+			     0, 0, quads, nQuad);
+    
+    style = gtk_widget_get_style (d->frame->style_window_rgba);
+    
+    fgColor[0] = style->fg[GTK_STATE_NORMAL].red;
+    fgColor[1] = style->fg[GTK_STATE_NORMAL].green;
+    fgColor[2] = style->fg[GTK_STATE_NORMAL].blue;
+    fgColor[3] = SWITCHER_ALPHA;
+    
+    gdk_error_trap_push ();
+    XChangeProperty (xdisplay, d->prop_xid,
+		     win_decor_atom,
+		     XA_INTEGER,
+		     32, PropModeReplace, (guchar *) data,
+		     BASE_PROP_SIZE + QUAD_PROP_SIZE * nQuad);
+    XChangeProperty (xdisplay, d->prop_xid, switcher_fg_atom,
+		     XA_INTEGER, 32, PropModeReplace, (guchar *) fgColor, 4);
+    gdk_display_sync (gdk_display_get_default ());
+    gdk_error_trap_pop ();
+    
+}
 
=== renamed file 'gtk/window-decorator/decorprops.c' => 'gtk/window-decorator/decorprops.c.THIS'
=== added file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/events.c	2012-02-08 18:50:27 +0000
@@ -0,0 +1,1177 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Reveman <[e-mail]>
+ *
+ * 2D Mode: Copyright © 2010 Sam Spilsbury <[e-mail]>
+ * Frames Management: Copright © 2011 Canonical Ltd.
+ *        Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "gtk-window-decorator.h" 
+
+void
+move_resize_window (WnckWindow *win,
+		    int	       direction,
+		    decor_event *gtkwd_event)
+{
+    Display    *xdisplay;
+    GdkDisplay *gdkdisplay;
+    GdkScreen  *screen;
+    Window     xroot;
+    XEvent     ev;
+
+    gdkdisplay = gdk_display_get_default ();
+    xdisplay   = GDK_DISPLAY_XDISPLAY (gdkdisplay);
+    screen     = gdk_display_get_default_screen (gdkdisplay);
+    xroot      = RootWindowOfScreen (gdk_x11_screen_get_xscreen (screen));
+
+    if (action_menu_mapped)
+    {
+	gtk_object_destroy (GTK_OBJECT (action_menu));
+	action_menu_mapped = FALSE;
+	action_menu = NULL;
+	return;
+    }
+
+    ev.xclient.type    = ClientMessage;
+    ev.xclient.display = xdisplay;
+
+    ev.xclient.serial	  = 0;
+    ev.xclient.send_event = TRUE;
+
+    ev.xclient.window	    = wnck_window_get_xid (win);
+    ev.xclient.message_type = wm_move_resize_atom;
+    ev.xclient.format	    = 32;
+
+    ev.xclient.data.l[0] = gtkwd_event->x_root;
+    ev.xclient.data.l[1] = gtkwd_event->y_root;
+    ev.xclient.data.l[2] = direction;
+    ev.xclient.data.l[3] = gtkwd_event->button;
+    ev.xclient.data.l[4] = 1;
+
+    XUngrabPointer (xdisplay, gtkwd_event->time);
+    XUngrabKeyboard (xdisplay, gtkwd_event->time);
+
+    XSendEvent (xdisplay, xroot, FALSE,
+		SubstructureRedirectMask | SubstructureNotifyMask,
+		&ev);
+
+    XSync (xdisplay, FALSE);
+}
+
+void
+common_button_event (WnckWindow *win,
+		     decor_event *gtkwd_event,
+		     decor_event_type gtkwd_type,
+		     int	button,
+		     int	max,
+		     char	*tooltip)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[button];
+
+    handle_tooltip_event (win, gtkwd_event, gtkwd_type, state, tooltip);
+
+    if (d->frame_window && gtkwd_type == GEnterNotify)
+    {
+	GdkCursor* cursor;
+	cursor = gdk_cursor_new (GDK_LEFT_PTR);
+	gdk_window_set_cursor (d->frame_window, cursor);
+	gdk_cursor_unref (cursor);
+    }
+
+    switch (gtkwd_type) {
+    case GButtonPress:
+	if (gtkwd_event->button <= max)
+	    d->button_states[button] |= PRESSED_EVENT_WINDOW;
+	break;
+    case GButtonRelease:
+	if (gtkwd_event->button <= max)
+	    d->button_states[button] &= ~PRESSED_EVENT_WINDOW;
+	break;
+    case GEnterNotify:
+	d->button_states[button] |= IN_EVENT_WINDOW;
+	break;
+    case GLeaveNotify:
+	d->button_states[button] &= ~IN_EVENT_WINDOW;
+	break;
+    default:
+	break;
+    }
+
+    if (state != d->button_states[button])
+	queue_decor_draw (d);
+}
+
+#define BUTTON_EVENT_ACTION_STATE (PRESSED_EVENT_WINDOW | IN_EVENT_WINDOW)
+
+void
+close_button_event (WnckWindow *win,
+		    decor_event *gtkwd_event,
+		    decor_event_type gtkwd_type)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[BUTTON_CLOSE];
+
+    common_button_event (win, gtkwd_event, gtkwd_type,
+			 BUTTON_CLOSE, 1, _("Close Window"));
+
+    switch (gtkwd_type) {
+    case GButtonRelease:
+	if (gtkwd_event->button == 1)
+	    if (state == BUTTON_EVENT_ACTION_STATE)
+		wnck_window_close (win, gtkwd_event->time);
+	break;
+    default:
+	break;
+    }
+}
+
+void
+max_button_event (WnckWindow *win,
+		  decor_event *gtkwd_event,
+		  decor_event_type gtkwd_type)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[BUTTON_MAX];
+
+    if (wnck_window_is_maximized (win))
+	common_button_event (win, gtkwd_event, gtkwd_type, BUTTON_MAX,
+			     3, _("Unmaximize Window"));
+    else
+	common_button_event (win, gtkwd_event, gtkwd_type, BUTTON_MAX,
+			     3, _("Maximize Window"));
+
+    switch (gtkwd_type) {
+    case GButtonRelease:
+	if (gtkwd_event->button <= 3)
+	{
+	    if (state == BUTTON_EVENT_ACTION_STATE)
+	    {
+		if (gtkwd_event->button == 2)
+		{
+		    if (wnck_window_is_maximized_vertically (win))
+			wnck_window_unmaximize_vertically (win);
+		    else
+			wnck_window_maximize_vertically (win);
+		}
+		else if (gtkwd_event->button == 3)
+		{
+		    if (wnck_window_is_maximized_horizontally (win))
+			wnck_window_unmaximize_horizontally (win);
+		    else
+			wnck_window_maximize_horizontally (win);
+		}
+		else
+		{
+		    if (wnck_window_is_maximized (win))
+			wnck_window_unmaximize (win);
+		    else
+			wnck_window_maximize (win);
+		}
+	    }
+	}
+	break;
+    default:
+	break;
+    }
+}
+
+void
+min_button_event (WnckWindow *win,
+		  decor_event *gtkwd_event,
+		  decor_event_type gtkwd_type)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[BUTTON_MIN];
+
+    common_button_event (win, gtkwd_event, gtkwd_type,
+			 BUTTON_MIN, 1, _("Minimize Window"));
+
+    switch (gtkwd_type) {
+    case GButtonRelease:
+	if (gtkwd_event->button == 1)
+	    if (state == BUTTON_EVENT_ACTION_STATE)
+		wnck_window_minimize (win);
+	break;
+    default:
+	break;
+    }
+}
+
+void
+menu_button_event (WnckWindow *win,
+		   decor_event *gtkwd_event,
+		   decor_event_type gtkwd_type)
+{
+
+    common_button_event (win, gtkwd_event, gtkwd_type,
+			 BUTTON_MENU, 1, _("Window Menu"));
+
+    switch (gtkwd_type) {
+    case GButtonPress:
+	if (gtkwd_event->button == 1)
+	    action_menu_map (win,
+			     gtkwd_event->button,
+			     gtkwd_event->time);
+	break;
+    default:
+	break;
+    }
+}
+
+void
+shade_button_event (WnckWindow *win,
+		    decor_event *gtkwd_event,
+		    decor_event_type gtkwd_type)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[BUTTON_SHADE];
+
+    common_button_event (win, gtkwd_event, gtkwd_type,
+			 BUTTON_SHADE, 1, _("Shade"));
+
+    switch (gtkwd_type) {
+    case GButtonRelease:
+	if (gtkwd_event->button == 1)
+	{
+	    if (state == BUTTON_EVENT_ACTION_STATE)
+		wnck_window_shade (win);
+	}
+	break;
+    default:
+	break;
+    }
+}
+
+void
+above_button_event (WnckWindow *win,
+		    decor_event *gtkwd_event,
+		    decor_event_type gtkwd_type)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[BUTTON_ABOVE];
+
+    common_button_event (win, gtkwd_event, gtkwd_type,
+			 BUTTON_ABOVE, 1, _("Make Above"));
+
+    switch (gtkwd_type) {
+    case GButtonRelease:
+	if (gtkwd_event->button == 1)
+	    if (state == BUTTON_EVENT_ACTION_STATE)
+#ifdef HAVE_LIBWNCK_2_18_1
+		wnck_window_make_above (win);
+#endif
+	break;
+    default:
+	break;
+    }
+}
+
+void
+stick_button_event (WnckWindow *win,
+		    decor_event *gtkwd_event,
+		    decor_event_type gtkwd_type)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[BUTTON_STICK];
+
+    common_button_event (win, gtkwd_event, gtkwd_type,
+			 BUTTON_STICK, 1, _("Stick"));
+
+    switch (gtkwd_type) {
+    case GButtonRelease:
+	if (gtkwd_event->button == 1)
+	    if (state == BUTTON_EVENT_ACTION_STATE)
+		wnck_window_stick (win);
+	break;
+    default:
+	break;
+    }
+}
+
+void
+unshade_button_event (WnckWindow *win,
+		      decor_event *gtkwd_event,
+		      decor_event_type gtkwd_type)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[BUTTON_UNSHADE];
+
+    common_button_event (win, gtkwd_event, gtkwd_type,
+			 BUTTON_UNSHADE, 1, _("Unshade"));
+
+    switch (gtkwd_type) {
+    case GButtonRelease:
+	if (gtkwd_event->button == 1)
+	    if (state == BUTTON_EVENT_ACTION_STATE)
+		wnck_window_unshade (win);
+	break;
+    default:
+	break;
+    }
+}
+
+void
+unabove_button_event (WnckWindow *win,
+		      decor_event *gtkwd_event,
+		      decor_event_type gtkwd_type)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[BUTTON_UNABOVE];
+
+    common_button_event (win, gtkwd_event, gtkwd_type,
+			 BUTTON_UNABOVE, 1, _("Unmake Above"));
+
+    switch (gtkwd_type) {
+    case GButtonRelease:
+	if (gtkwd_event->button == 1)
+	    if (state == BUTTON_EVENT_ACTION_STATE)
+#ifdef HAVE_LIBWNCK_2_18_1
+		wnck_window_unmake_above (win);
+#endif
+	break;
+    default:
+	break;
+    }
+}
+
+void
+unstick_button_event (WnckWindow *win,
+		      decor_event *gtkwd_event,
+		      decor_event_type gtkwd_type)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    guint   state = d->button_states[BUTTON_UNSTICK];
+
+    common_button_event (win, gtkwd_event, gtkwd_type,
+			 BUTTON_UNSTICK, 1, _("Unstick"));
+
+    switch (gtkwd_type) {
+    case GButtonRelease:
+	if (gtkwd_event->button == 1)
+	    if (state == BUTTON_EVENT_ACTION_STATE)
+		wnck_window_unstick (win);
+	break;
+    default:
+	break;
+    }
+}
+
+void
+handle_title_button_event (WnckWindow   *win,
+			   int          action,
+			   decor_event *gtkwd_event)
+{
+    switch (action) {
+    case CLICK_ACTION_SHADE:
+	if (wnck_window_is_shaded (win))
+	    wnck_window_unshade (win);
+	else
+	    wnck_window_shade (win);
+	break;
+    case CLICK_ACTION_MAXIMIZE:
+	if (wnck_window_is_maximized (win))
+	    wnck_window_unmaximize (win);
+	else
+	    wnck_window_maximize (win);
+	break;
+    case CLICK_ACTION_MINIMIZE:
+	if (!wnck_window_is_minimized (win))
+	    wnck_window_minimize (win);
+	break;
+    case CLICK_ACTION_RAISE:
+	restack_window (win, Above);
+	break;
+    case CLICK_ACTION_LOWER:
+	restack_window (win, Below);
+	break;
+    case CLICK_ACTION_MENU:
+	action_menu_map (win, gtkwd_event->button, gtkwd_event->time);
+	break;
+    }
+}
+
+void
+handle_mouse_wheel_title_event (WnckWindow   *win,
+				unsigned int button)
+{
+    switch (settings->wheel_action) {
+    case WHEEL_ACTION_SHADE:
+	if (button == 4)
+	{
+	    if (!wnck_window_is_shaded (win))
+		wnck_window_shade (win);
+	}
+	else if (button == 5)
+	{
+	    if (wnck_window_is_shaded (win))
+		wnck_window_unshade (win);
+	}
+	break;
+    default:
+	break;
+    }
+}
+
+void
+title_event (WnckWindow       *win,
+	     decor_event      *gtkwd_event,
+	     decor_event_type gtkwd_type)
+{
+    static int	  last_button_num = 0;
+    static Window last_button_xwindow = None;
+    static Time	  last_button_time = 0;
+    static int	  last_button_x = 0;
+    static int	  last_button_y = 0;
+
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+
+    if (d->frame_window && gtkwd_type == GEnterNotify)
+    {
+	GdkCursor* cursor = gdk_cursor_new (GDK_LEFT_PTR);
+	gdk_window_set_cursor (d->frame_window, cursor);
+	gdk_cursor_unref (cursor);
+    }
+
+    if (gtkwd_type != GButtonPress)
+	return;
+
+    if (gtkwd_event->button == 1)
+    {
+	if (gtkwd_event->button == last_button_num		        &&
+	    gtkwd_event->window == last_button_xwindow		        &&
+	    gtkwd_event->time < last_button_time + double_click_timeout &&
+	    dist (gtkwd_event->x, gtkwd_event->y,
+		  last_button_x, last_button_y) < DOUBLE_CLICK_DISTANCE)
+	{
+	    handle_title_button_event (win, settings->double_click_action,
+				       gtkwd_event);
+
+	    last_button_num	= 0;
+	    last_button_xwindow = None;
+	    last_button_time	= 0;
+	    last_button_x	= 0;
+	    last_button_y	= 0;
+	}
+	else
+	{
+	    last_button_num	= gtkwd_event->button;
+	    last_button_xwindow = gtkwd_event->window;
+	    last_button_time	= gtkwd_event->time;
+	    last_button_x	= gtkwd_event->x;
+	    last_button_y	= gtkwd_event->y;
+
+	    restack_window (win, Above);
+
+	    move_resize_window (win, WM_MOVERESIZE_MOVE, gtkwd_event);
+	}
+    }
+    else if (gtkwd_event->button == 2)
+    {
+	handle_title_button_event (win, settings->middle_click_action,
+				   gtkwd_event);
+    }
+    else if (gtkwd_event->button == 3)
+    {
+	handle_title_button_event (win, settings->right_click_action,
+				   gtkwd_event);
+    }
+    else if (gtkwd_event->button == 4 ||
+	     gtkwd_event->button == 5)
+    {
+	handle_mouse_wheel_title_event (win, gtkwd_event->button);
+    }
+}
+
+void
+frame_common_event (WnckWindow       *win,
+		    int              direction,
+		    decor_event      *gtkwd_event,
+		    decor_event_type gtkwd_type)
+{
+
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+
+    if (d->frame_window && gtkwd_type == GEnterNotify)
+    {
+	GdkCursor *cursor = NULL;
+
+	switch (direction)
+	{
+	    case WM_MOVERESIZE_SIZE_TOPLEFT:
+		cursor = gdk_cursor_new (GDK_TOP_LEFT_CORNER);
+		break;
+	    case WM_MOVERESIZE_SIZE_LEFT:
+		cursor = gdk_cursor_new (GDK_LEFT_SIDE);
+		break;
+	    case WM_MOVERESIZE_SIZE_BOTTOMLEFT:
+		cursor = gdk_cursor_new (GDK_BOTTOM_LEFT_CORNER);
+		break;
+	    case WM_MOVERESIZE_SIZE_BOTTOM:
+		cursor = gdk_cursor_new (GDK_BOTTOM_SIDE);
+	        break;
+	    case WM_MOVERESIZE_SIZE_BOTTOMRIGHT:
+		cursor = gdk_cursor_new (GDK_BOTTOM_RIGHT_CORNER);
+		break;
+	    case WM_MOVERESIZE_SIZE_RIGHT:
+		cursor = gdk_cursor_new (GDK_RIGHT_SIDE);
+		break;
+	    case WM_MOVERESIZE_SIZE_TOPRIGHT:
+		cursor = gdk_cursor_new (GDK_TOP_RIGHT_CORNER);
+		break;
+	    case WM_MOVERESIZE_SIZE_TOP:
+		cursor = gdk_cursor_new (GDK_TOP_SIDE);
+		break;
+	    default:
+		break;
+	}
+
+	if (cursor)
+	{
+	    gdk_window_set_cursor (d->frame_window, cursor);
+	    gdk_cursor_unref (cursor);
+	}
+    }
+
+    if (gtkwd_type != GButtonPress)
+	return;
+
+    switch (gtkwd_event->button) {
+    case 1:
+	move_resize_window (win, direction, gtkwd_event);
+	restack_window (win, Above);
+	break;
+    case 2:
+	handle_title_button_event (win, settings->middle_click_action,
+				   gtkwd_event);
+	break;
+    case 3:
+	handle_title_button_event (win, settings->right_click_action,
+				   gtkwd_event);
+	break;
+    }
+}
+
+void
+top_left_event (WnckWindow       *win,
+		decor_event      *gtkwd_event,
+		decor_event_type gtkwd_type)
+{
+    frame_common_event (win, WM_MOVERESIZE_SIZE_TOPLEFT,
+		        gtkwd_event, gtkwd_type);
+}
+
+void
+top_event (WnckWindow       *win,
+	   decor_event      *gtkwd_event,
+	   decor_event_type gtkwd_type)
+{
+    frame_common_event (win, WM_MOVERESIZE_SIZE_TOP,
+			gtkwd_event, gtkwd_type);
+}
+
+void
+top_right_event (WnckWindow       *win,
+		 decor_event      *gtkwd_event,
+		 decor_event_type gtkwd_type)
+{
+    frame_common_event (win, WM_MOVERESIZE_SIZE_TOPRIGHT,
+			gtkwd_event, gtkwd_type);
+}
+
+void
+left_event (WnckWindow       *win,
+	    decor_event      *gtkwd_event,
+	    decor_event_type gtkwd_type)
+{
+    frame_common_event (win, WM_MOVERESIZE_SIZE_LEFT,
+			gtkwd_event, gtkwd_type);
+}
+
+void
+right_event (WnckWindow       *win,
+	     decor_event      *gtkwd_event,
+	     decor_event_type gtkwd_type)
+{
+    frame_common_event (win, WM_MOVERESIZE_SIZE_RIGHT,
+			gtkwd_event, gtkwd_type);
+}
+
+void
+bottom_left_event (WnckWindow *win,
+		   decor_event *gtkwd_event,
+		   decor_event_type gtkwd_type)
+{
+    frame_common_event (win, WM_MOVERESIZE_SIZE_BOTTOMLEFT,
+			gtkwd_event, gtkwd_type);
+}
+
+void
+bottom_event (WnckWindow *win,
+	      decor_event *gtkwd_event,
+	      decor_event_type gtkwd_type)
+{
+    frame_common_event (win, WM_MOVERESIZE_SIZE_BOTTOM,
+			gtkwd_event, gtkwd_type);
+}
+
+void
+bottom_right_event (WnckWindow *win,
+		    decor_event *gtkwd_event,
+		    decor_event_type gtkwd_type)
+{
+    frame_common_event (win, WM_MOVERESIZE_SIZE_BOTTOMRIGHT,
+			gtkwd_event, gtkwd_type);
+}
+
+void
+frame_window_realized (GtkWidget *widget,
+		       gpointer  data)
+{
+    decor_t *d = (decor_t *) data;
+
+    if (d)
+    {
+	GdkWindow *gdk_frame_window = gtk_widget_get_window (d->decor_window);
+	gdk_window_reparent (gdk_frame_window, d->frame_window, 0, 0);
+	gdk_window_lower (gdk_frame_window);
+
+    }
+}
+
+event_callback
+find_event_callback_for_point (decor_t *d,
+			       int     x,
+			       int     y,
+			       Bool    *enter,
+			       Bool    *leave,
+			       BoxPtr  *entered_box)
+{
+    int    i, j;
+    BoxPtr box;
+
+    for (i = 0; i < BUTTON_NUM; i++)
+    {
+	box = &d->button_windows[i].pos;
+	if (x >= box->x1 && x <= box->x2 &&
+	    y >= box->y1 && y <= box->y2)
+	{
+	    if (d->last_pos_entered != box)
+	    {
+		if (enter)
+		    *enter = TRUE;
+		if (leave && d->last_pos_entered)
+		    *leave = TRUE;
+		if (entered_box)
+		    *entered_box = box;
+	    }
+	    return d->button_windows[i].callback;
+	}
+    }
+
+    for (i = 0; i < 3; i++)
+    {
+	for (j = 0; j < 3; j++)
+	{
+	    box = &d->event_windows[i][j].pos;
+	    if (x >= box->x1 && x <= box->x2 &&
+		y >= box->y1 && y <= box->y2)
+	    {
+		if (d->last_pos_entered != box)
+		{
+		    if (enter)
+			*enter = TRUE;
+		    if (leave && d->last_pos_entered)
+			*leave = TRUE;
+		    if (entered_box)
+			*entered_box = box;
+		}
+		return d->event_windows[i][j].callback;
+	    }
+	}
+    }
+
+    return NULL;
+}
+
+event_callback
+find_leave_event_callback (decor_t *d)
+{
+    int i, j;
+
+    for (i = 0; i < BUTTON_NUM; i++)
+    {
+	if (d->last_pos_entered == &d->button_windows[i].pos)
+	    return d->button_windows[i].callback;
+    }
+
+    for (i = 0; i < 3; i++)
+    {
+	for (j = 0; j < 3; j++)
+	{
+	    if (d->last_pos_entered == &d->event_windows[i][j].pos)
+		return d->event_windows[i][j].callback;
+	}
+    }
+
+    return NULL;
+}
+
+void
+frame_handle_button_press (GtkWidget      *widget,
+			   GdkEventButton *event,
+			   gpointer       user_data)
+{
+    decor_t *d = (decor_t *) user_data;
+
+    if (d)
+    {
+	/* Check to see where the event happened and fill out an appropriate
+	 * struct
+	 */
+	event_callback cb;
+
+	cb = find_event_callback_for_point (d, event->x, event->y,
+					    NULL, NULL, NULL);
+
+	if (cb && d->decorated)
+	{
+	    decor_event gtkwd_event;
+
+	    gtkwd_event.window = GDK_WINDOW_XID (d->frame_window);
+	    gtkwd_event.button = event->button;
+	    gtkwd_event.x      = event->x;
+	    gtkwd_event.y      = event->y;
+	    gtkwd_event.x_root = event->x_root;
+	    gtkwd_event.y_root = event->y_root;
+	    gtkwd_event.time   = event->time;
+
+	    (*cb) (d->win, &gtkwd_event, GButtonPress);
+	}
+    }
+}
+
+void
+frame_handle_button_release (GtkWidget      *widget,
+			     GdkEventButton *event,
+			     gpointer       user_data)
+{
+    decor_t *d = (decor_t *) user_data;
+
+    if (d)
+    {
+	event_callback cb;
+
+	cb = find_event_callback_for_point (d, event->x, event->y,
+					    NULL, NULL, NULL);
+
+	if (cb && d->decorated)
+	{
+	    decor_event gtkwd_event;
+
+	    gtkwd_event.window = GDK_WINDOW_XID (d->frame_window);
+	    gtkwd_event.button = event->button;
+	    gtkwd_event.x      = event->x;
+	    gtkwd_event.y      = event->y;
+	    gtkwd_event.x_root = event->x_root;
+	    gtkwd_event.y_root = event->y_root;
+	    gtkwd_event.time   = event->time;
+
+	    (*cb) (d->win, &gtkwd_event, GButtonRelease);
+	}
+    }
+}
+
+void
+frame_handle_motion (GtkWidget      *widget,
+		     GdkEventMotion *event,
+		     gpointer       user_data)
+{
+    decor_t *d = (decor_t *) user_data;
+
+    if (d)
+    {
+	event_callback cb = NULL;
+	Bool           send_enter = FALSE;
+	Bool           send_leave = FALSE;
+	BoxPtr         entered_box;
+
+	cb = find_event_callback_for_point (d, event->x, event->y,
+					    &send_enter, &send_leave,
+					    &entered_box);
+
+	if (cb && d->decorated)
+	{
+	    decor_event gtkwd_event;
+
+	    gtkwd_event.window = GDK_WINDOW_XID (d->frame_window);
+	    gtkwd_event.x      = event->x;
+	    gtkwd_event.y      = event->y;
+	    gtkwd_event.x_root = event->x_root;
+	    gtkwd_event.y_root = event->y_root;
+	    gtkwd_event.time   = event->time;
+
+	    if (send_enter)
+		(*cb) (d->win, &gtkwd_event, GEnterNotify);
+
+	    if (send_leave)
+	    {
+		event_callback leave_cb;
+
+		leave_cb = find_leave_event_callback (d);
+
+		if (leave_cb)
+		    (*leave_cb) (d->win, &gtkwd_event, GLeaveNotify);
+
+	    }
+
+	    if (send_enter)
+		d->last_pos_entered = entered_box;
+	}
+	else if (d->last_pos_entered && d->decorated)
+	{
+	    /* We are not in an event / button window but last_pos_entered
+	     * is still set, so send a GLeaveNotify to last_pos_entered
+	     * and set it to NULL
+	     */
+
+	    event_callback leave_cb;
+
+	    leave_cb = find_leave_event_callback (d);
+
+	    if (leave_cb)
+	    {
+		decor_event    gtkwd_event;
+
+		gtkwd_event.window = GDK_WINDOW_XID (d->frame_window);
+		gtkwd_event.x      = event->x;
+		gtkwd_event.y      = event->y;
+		gtkwd_event.x_root = event->x_root;
+		gtkwd_event.y_root = event->y_root;
+		gtkwd_event.time   = event->time;
+
+		(*leave_cb) (d->win, &gtkwd_event, GLeaveNotify);
+	    }
+
+	    d->last_pos_entered = NULL;
+	}
+    }
+}
+
+GdkFilterReturn
+event_filter_func (GdkXEvent *gdkxevent,
+		   GdkEvent  *event,
+		   gpointer  data)
+{
+    Display    *xdisplay;
+    GdkDisplay *gdkdisplay;
+    XEvent     *xevent = gdkxevent;
+    gulong     xid = 0;
+    Window     select = 0;
+
+    gdkdisplay = gdk_display_get_default ();
+    xdisplay   = GDK_DISPLAY_XDISPLAY (gdkdisplay);
+
+    switch (xevent->type) {
+    case CreateNotify:
+	{
+	    if (!wnck_window_get (xevent->xcreatewindow.window))
+	    {
+		GdkWindow *toplevel = create_foreign_window (xevent->xcreatewindow.window);
+
+		if (toplevel)
+		{
+		    gdk_window_set_events (toplevel,
+					   gdk_window_get_events (toplevel) |
+					   GDK_PROPERTY_CHANGE_MASK);
+
+		    /* 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);
+		}
+	    }
+	}
+	break;
+    case ButtonPress:
+    case ButtonRelease:
+	xid = (gulong)
+	    g_hash_table_lookup (frame_table,
+				 GINT_TO_POINTER (xevent->xbutton.window));
+	break;
+    case EnterNotify:
+    case LeaveNotify:
+	xid = (gulong)
+	    g_hash_table_lookup (frame_table,
+				 GINT_TO_POINTER (xevent->xcrossing.window));
+	break;
+    case MotionNotify:
+	xid = (gulong)
+	    g_hash_table_lookup (frame_table,
+				 GINT_TO_POINTER (xevent->xmotion.window));
+	break;
+    case PropertyNotify:
+	if (xevent->xproperty.atom == frame_input_window_atom)
+	{
+	    WnckWindow *win;
+
+	    xid = xevent->xproperty.window;
+
+	    win = wnck_window_get (xid);
+	    if (win)
+	    {
+		Window frame;
+
+		if (!get_window_prop (xid, select_window_atom, &select))
+		{
+		    if (get_window_prop (xid, frame_input_window_atom, &frame))
+			add_frame_window (win, frame, FALSE);
+		    else
+			remove_frame_window (win);
+		}
+	    }
+	}
+	if (xevent->xproperty.atom == frame_output_window_atom)
+	{
+	    WnckWindow *win;
+
+	    xid = xevent->xproperty.window;
+
+	    win = wnck_window_get (xid);
+	    if (win)
+	    {
+		Window frame;
+
+		if (!get_window_prop (xid, select_window_atom, &select))
+		{
+		    if (get_window_prop (xid, frame_output_window_atom, &frame))
+			add_frame_window (win, frame, TRUE);
+		    else
+			remove_frame_window (win);
+		}
+	    }
+	}
+	else if (xevent->xproperty.atom == compiz_shadow_info_atom ||
+		 xevent->xproperty.atom == compiz_shadow_color_atom)
+	{
+	    GdkScreen  *g_screen = gdk_display_get_default_screen (gdkdisplay);
+	    Window     root = GDK_WINDOW_XWINDOW (gdk_screen_get_root_window (g_screen));
+	    WnckScreen *screen;
+	    
+	    screen = wnck_screen_get_for_root (root);
+	    
+	    if (screen)
+	    {
+		if (shadow_property_changed (screen))
+		    decorations_changed (screen);
+	    }
+	}
+	else if (xevent->xproperty.atom == mwm_hints_atom)
+	{
+	    WnckWindow *win;
+
+	    xid = xevent->xproperty.window;
+
+	    win = wnck_window_get (xid);
+	    if (win)
+	    {
+		decor_t  *d = g_object_get_data (G_OBJECT (win), "decor");
+		gboolean decorated = FALSE;
+
+		if (get_mwm_prop (xid) & (MWM_DECOR_ALL | MWM_DECOR_TITLE))
+		    decorated = TRUE;
+
+		if (decorated != d->decorated)
+		{
+		    d->decorated = decorated;
+		    if (decorated)
+		    {
+			d->context = NULL;
+			d->width = d->height = 0;
+
+			d->frame = gwd_get_decor_frame (get_frame_type (win));
+
+			update_window_decoration_size (win);
+			update_event_windows (win);
+		    }
+		    else
+		    {
+			gwd_decor_frame_unref (d->frame);
+			d->frame = NULL;
+
+			gdk_error_trap_push ();
+			XDeleteProperty (xdisplay, xid, win_decor_atom);
+			gdk_display_sync (gdk_display_get_default ());
+			gdk_error_trap_pop ();
+		    }
+		}
+	    }
+	}
+	else if (xevent->xproperty.atom == select_window_atom)
+	{
+	    Window select;
+
+	    if (get_window_prop (xevent->xproperty.window, select_window_atom, &select))
+		update_switcher_window (xevent->xproperty.window, select);
+	}
+	break;
+    case DestroyNotify:
+	g_hash_table_remove (frame_table,
+			     GINT_TO_POINTER (xevent->xproperty.window));
+	break;
+    case ClientMessage:
+	if (xevent->xclient.message_type == toolkit_action_atom)
+	{
+	    long action;
+
+	    action = xevent->xclient.data.l[0];
+	    if (action == toolkit_action_window_menu_atom)
+	    {
+		WnckWindow *win;
+
+		win = wnck_window_get (xevent->xclient.window);
+		if (win)
+		{
+		    action_menu_map (win,
+				     xevent->xclient.data.l[2],
+				     xevent->xclient.data.l[1]);
+		}
+	    }
+	    else if (action == toolkit_action_force_quit_dialog_atom)
+	    {
+		WnckWindow *win;
+
+		win = wnck_window_get (xevent->xclient.window);
+		if (win)
+		{
+		    if (xevent->xclient.data.l[2])
+			show_force_quit_dialog (win,
+						xevent->xclient.data.l[1]);
+		    else
+			hide_force_quit_dialog (win);
+		}
+	    }
+	}
+    default:
+	break;
+    }
+
+    if (xid)
+    {
+	WnckWindow *win;
+
+	win = wnck_window_get (xid);
+	if (win)
+	{
+	    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+
+	    if (d->decorated)
+	    {
+		gint             i, j;
+		event_callback   cb = NULL;
+		Window           w = xevent->xany.window;
+
+		for (i = 0; i < 3; i++)
+		    for (j = 0; j < 3; j++)
+			if (d->event_windows[i][j].window == w)
+			    cb = d->event_windows[i][j].callback;
+
+		if (!cb)
+		{
+		    for (i = 0; i < BUTTON_NUM; i++)
+			if (d->button_windows[i].window == w)
+			    cb = d->button_windows[i].callback;
+		}
+
+		if (cb)
+		{
+		    decor_event      gtkwd_event;
+		    decor_event_type gtkwd_type;
+
+		    gtkwd_event.window = w;
+
+		    switch (xevent->type)
+		    {
+			case ButtonPress:
+			case ButtonRelease:
+			    if (xevent->type == ButtonPress)
+				gtkwd_type = GButtonPress;
+			    else
+				gtkwd_type = GButtonRelease;
+			    gtkwd_event.button = xevent->xbutton.button;
+			    gtkwd_event.x = xevent->xbutton.x;
+			    gtkwd_event.y = xevent->xbutton.y;
+			    gtkwd_event.x_root = xevent->xbutton.x_root;
+			    gtkwd_event.y_root = xevent->xbutton.y_root;
+			    gtkwd_event.time = xevent->xbutton.time;
+			    break;
+			case EnterNotify:
+			case LeaveNotify:
+			    if (xevent->type == EnterNotify)
+				gtkwd_type = GEnterNotify;
+			    else
+				gtkwd_type = GLeaveNotify;
+			    gtkwd_event.x = xevent->xcrossing.x;
+			    gtkwd_event.y = xevent->xcrossing.y;
+			    gtkwd_event.x_root = xevent->xcrossing.x_root;
+			    gtkwd_event.y_root = xevent->xcrossing.y_root;
+			    gtkwd_event.time = xevent->xcrossing.time;
+			    break;
+			default:
+			    cb = NULL;
+			    break;
+		    }
+		    if (cb)
+			(*cb) (win, &gtkwd_event, gtkwd_type);
+		}
+	    }
+	}
+    }
+
+    return GDK_FILTER_CONTINUE;
+}
+
+GdkFilterReturn
+selection_event_filter_func (GdkXEvent *gdkxevent,
+			     GdkEvent  *event,
+			     gpointer  data)
+{
+    Display    *xdisplay;
+    GdkDisplay *gdkdisplay;
+    XEvent     *xevent = gdkxevent;
+    int	       status;
+
+    gdkdisplay = gdk_display_get_default ();
+    xdisplay   = GDK_DISPLAY_XDISPLAY (gdkdisplay);
+
+    switch (xevent->type) {
+    case SelectionRequest:
+	decor_handle_selection_request (xdisplay, xevent, dm_sn_timestamp);
+	break;
+    case SelectionClear:
+	status = decor_handle_selection_clear (xdisplay, xevent, 0);
+	if (status == DECOR_SELECTION_GIVE_UP)
+	    gtk_main_quit ();
+    default:
+	break;
+    }
+
+    return GDK_FILTER_CONTINUE;
+}
 
=== renamed file 'gtk/window-decorator/events.c' => 'gtk/window-decorator/events.c.THIS'
=== added file 'gtk/window-decorator/forcequit.c'
--- gtk/window-decorator/forcequit.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/forcequit.c	2012-02-08 18:50:27 +0000
@@ -0,0 +1,201 @@
+/*
+ * Copyright © 2006 Novell, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Author: David Reveman <[e-mail]>
+ *
+ * 2D Mode: Copyright © 2010 Sam Spilsbury <[e-mail]>
+ * Frames Management: Copright © 2011 Canonical Ltd.
+ *        Authored By: Sam Spilsbury <[e-mail]>
+ */
+
+#include "gtk-window-decorator.h"
+
+static char *
+get_client_machine (Window xwindow)
+{
+    Atom   atom, type;
+    gulong nitems, bytes_after;
+    guchar *str = NULL;
+    int    format, result;
+    char   *retval;
+
+    atom = XInternAtom (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), "WM_CLIENT_MACHINE", FALSE);
+
+    gdk_error_trap_push ();
+
+    result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+				 xwindow, atom,
+				 0, G_MAXLONG,
+				 FALSE, XA_STRING, &type, &format, &nitems,
+				 &bytes_after, &str);
+
+    gdk_error_trap_pop ();
+
+    if (result != Success)
+	return NULL;
+
+    if (type != XA_STRING)
+    {
+	XFree (str);
+	return NULL;
+    }
+
+    retval = g_strdup ((gchar *) str);
+
+    XFree (str);
+
+    return retval;
+}
+
+static void
+kill_window (WnckWindow *win)
+{
+    WnckApplication *app;
+
+    app = wnck_window_get_application (win);
+    if (app)
+    {
+	gchar buf[257], *client_machine;
+	int   pid;
+
+	pid = wnck_application_get_pid (app);
+	client_machine = get_client_machine (wnck_application_get_xid (app));
+
+	if (client_machine && pid > 0)
+	{
+	    if (gethostname (buf, sizeof (buf) - 1) == 0)
+	    {
+		if (strcmp (buf, client_machine) == 0)
+		    kill (pid, 9);
+	    }
+	}
+
+	if (client_machine)
+	    g_free (client_machine);
+    }
+
+    gdk_error_trap_push ();
+    XKillClient (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()), wnck_window_get_xid (win));
+    gdk_display_sync (gdk_display_get_default ());
+    gdk_error_trap_pop ();
+}
+
+static void
+force_quit_dialog_realize (GtkWidget *dialog,
+			   void      *data)
+{
+    WnckWindow *win = data;
+
+    gdk_error_trap_push ();
+    XSetTransientForHint (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+			  GDK_WINDOW_XID (dialog->window),
+			  wnck_window_get_xid (win));
+    gdk_display_sync (gdk_display_get_default ());
+    gdk_error_trap_pop ();
+}
+
+static void
+force_quit_dialog_response (GtkWidget *dialog,
+			    gint      response,
+			    void      *data)
+{
+    WnckWindow *win = data;
+    decor_t    *d = g_object_get_data (G_OBJECT (win), "decor");
+
+    if (response == GTK_RESPONSE_ACCEPT)
+	kill_window (win);
+
+    if (d->force_quit_dialog)
+    {
+	d->force_quit_dialog = NULL;