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

[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.

[Sam Spilsbury (smspillaz)]

OK, it looks like trunk needs to be merged into this branch

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

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.

[Daniel van Vugt (vanvugt)]

I hope to test this and if all goes well then merge when 0.9.8 opens up.

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

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.

[Daniel van Vugt (vanvugt)]

I will ask the linaro team to propose the branch to 0.9.8, since they're the ones who will be fixing anything that needs fixing...

review: Disapprove

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-03-27 15:28:35 +0000
+++ CMakeLists.txt	2012-04-10 15:45:28 +0000
@@ -119,6 +119,12 @@
     DESTINATION ${COMPIZ_DESTDIR}${libdir}/pkgconfig
 )
 
+# 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)
+
 # Build Google Test and make its headers known
 find_package (GTest)
 
@@ -183,6 +189,12 @@
 
 _check_compiz_cmake_macro (${CMAKE_MODULE_PATH_ORIG})
 
+# 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")
 # Enable coverage reporting for compiz
 enable_coverage_report()
 

=== modified file 'cmake/CMakeLists.txt'
--- cmake/CMakeLists.txt	2011-07-27 16:13:28 +0000
+++ cmake/CMakeLists.txt	2012-04-10 15:45:28 +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-04-10 15:45:28 +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)

=== modified file 'cmake/CompizPlugin.cmake'
--- cmake/CompizPlugin.cmake	2012-02-07 06:39:28 +0000
+++ cmake/CompizPlugin.cmake	2012-04-10 15:45:28 +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-04-10 15:45:28 +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-04-10 15:45:28 +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/CompizOpenGLFixups.cmake'
--- cmake/plugin_extensions/CompizOpenGLFixups.cmake	1970-01-01 00:00:00 +0000
+++ cmake/plugin_extensions/CompizOpenGLFixups.cmake	2012-04-10 15:45:28 +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 "")
+

=== 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-04-10 15:45:28 +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}"

=== 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-04-10 15:45:28 +0000
@@ -0,0 +1,133 @@
+/*
+ * 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;
+}

=== 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-04-10 15:45:28 +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/forcequit.c'
--- gtk/window-decorator/forcequit.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/forcequit.c	2012-04-10 15:45:28 +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;
+	gtk_widget_destroy (dialog);
+    }
+}
+
+void
+show_force_quit_dialog (WnckWindow *win,
+			Time        timestamp)
+{
+    decor_t   *d = g_object_get_data (G_OBJECT (win), "decor");
+    GtkWidget *dialog;
+    gchar     *str, *tmp;
+
+    if (d->force_quit_dialog)
+	return;
+
+    tmp = g_markup_escape_text (wnck_window_get_name (win), -1);
+    str = g_strdup_printf (_("The window \"%s\" is not responding."), tmp);
+
+    g_free (tmp);
+
+    dialog = gtk_message_dialog_new (NULL, 0,
+				     GTK_MESSAGE_WARNING,
+				     GTK_BUTTONS_NONE,
+				     "<b>%s</b>\n\n%s",
+				     str,
+				     _("Forcing this application to "
+				     "quit will cause you to lose any "
+				     "unsaved changes."));
+    g_free (str);
+
+    gtk_window_set_icon_name (GTK_WINDOW (dialog), "force-quit");
+
+    gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label),
+			      TRUE);
+    gtk_label_set_line_wrap (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label),
+			     TRUE);
+
+    gtk_dialog_add_buttons (GTK_DIALOG (dialog),
+			    GTK_STOCK_CANCEL,
+			    GTK_RESPONSE_REJECT,
+			    _("_Force Quit"),
+			    GTK_RESPONSE_ACCEPT,
+			    NULL);
+
+    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT);
+
+    g_signal_connect (G_OBJECT (dialog), "realize",
+		      G_CALLBACK (force_quit_dialog_realize),
+		      win);
+
+    g_signal_connect (G_OBJECT (dialog), "response",
+		      G_CALLBACK (force_quit_dialog_response),
+		      win);
+
+    gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
+
+    gtk_widget_realize (dialog);
+
+    gdk_x11_window_set_user_time (dialog->window, timestamp);
+
+    gtk_widget_show (dialog);
+
+    d->force_quit_dialog = dialog;
+}
+
+void
+hide_force_quit_dialog (WnckWindow *win)
+{
+    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+
+    if (d->force_quit_dialog)
+    {
+	gtk_widget_destroy (d->force_quit_dialog);
+	d->force_quit_dialog = NULL;
+    }
+}

=== removed file 'gtk/window-decorator/forcequit.c'
--- gtk/window-decorator/forcequit.c	2011-02-21 09:53:08 +0000
+++ gtk/window-decorator/forcequit.c	1970-01-01 00:00:00 +0000
@@ -1,201 +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]>
- *
- * 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;
-	gtk_widget_destroy (dialog);
-    }
-}
-
-void
-show_force_quit_dialog (WnckWindow *win,
-			Time        timestamp)
-{
-    decor_t   *d = g_object_get_data (G_OBJECT (win), "decor");
-    GtkWidget *dialog;
-    gchar     *str, *tmp;
-
-    if (d->force_quit_dialog)
-	return;
-
-    tmp = g_markup_escape_text (wnck_window_get_name (win), -1);
-    str = g_strdup_printf (_("The window \"%s\" is not responding."), tmp);
-
-    g_free (tmp);
-
-    dialog = gtk_message_dialog_new (NULL, 0,
-				     GTK_MESSAGE_WARNING,
-				     GTK_BUTTONS_NONE,
-				     "<b>%s</b>\n\n%s",
-				     str,
-				     _("Forcing this application to "
-				     "quit will cause you to lose any "
-				     "unsaved changes."));
-    g_free (str);
-
-    gtk_window_set_icon_name (GTK_WINDOW (dialog), "force-quit");
-
-    gtk_label_set_use_markup (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label),
-			      TRUE);
-    gtk_label_set_line_wrap (GTK_LABEL (GTK_MESSAGE_DIALOG (dialog)->label),
-			     TRUE);
-
-    gtk_dialog_add_buttons (GTK_DIALOG (dialog),
-			    GTK_STOCK_CANCEL,
-			    GTK_RESPONSE_REJECT,
-			    _("_Force Quit"),
-			    GTK_RESPONSE_ACCEPT,
-			    NULL);
-
-    gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_REJECT);
-
-    g_signal_connect (G_OBJECT (dialog), "realize",
-		      G_CALLBACK (force_quit_dialog_realize),
-		      win);
-
-    g_signal_connect (G_OBJECT (dialog), "response",
-		      G_CALLBACK (force_quit_dialog_response),
-		      win);
-
-    gtk_window_set_modal (GTK_WINDOW (dialog), TRUE);
-
-    gtk_widget_realize (dialog);
-
-    gdk_x11_window_set_user_time (dialog->window, timestamp);
-
-    gtk_widget_show (dialog);
-
-    d->force_quit_dialog = dialog;
-}
-
-void
-hide_force_quit_dialog (WnckWindow *win)
-{
-    decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
-
-    if (d->force_quit_dialog)
-    {
-	gtk_widget_destroy (d->force_quit_dialog);
-	d->force_quit_dialog = NULL;
-    }
-}

=== added file 'gtk/window-decorator/gdk.c'
--- gtk/window-decorator/gdk.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/gdk.c	2012-04-10 15:45:28 +0000
@@ -0,0 +1,106 @@
+/*
+ * 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"
+
+GdkPixmap *
+pixmap_new_from_pixbuf (GdkPixbuf *pixbuf, GtkWidget *parent)
+{
+    GdkPixmap *pixmap;
+    guint     width, height;
+    cairo_t   *cr;
+
+    width  = gdk_pixbuf_get_width (pixbuf);
+    height = gdk_pixbuf_get_height (pixbuf);
+
+    pixmap = create_pixmap (width, height, parent);
+    if (!pixmap)
+	return NULL;
+
+    cr = (cairo_t *) gdk_cairo_create (GDK_DRAWABLE (pixmap));
+    gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
+    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
+    cairo_paint (cr);
+    cairo_destroy (cr);
+
+    return pixmap;
+}
+
+
+void
+gdk_cairo_set_source_color_alpha (cairo_t  *cr,
+				  GdkColor *color,
+				  double   alpha)
+{
+    cairo_set_source_rgba (cr,
+			   color->red   / 65535.0,
+			   color->green / 65535.0,
+			   color->blue  / 65535.0,
+			   alpha);
+}
+
+inline GdkWindow *
+create_gdk_window (Window xframe)
+{
+    GdkDisplay  *display = gdk_display_get_default ();
+    GdkScreen   *screen  = gdk_display_get_default_screen (display);
+    GdkWindow   *window  = create_foreign_window (xframe);
+    GdkColormap *cmap    = gdk_screen_get_rgb_colormap (screen);
+
+    gdk_drawable_set_colormap (GDK_DRAWABLE (window), cmap);
+
+    return window;
+}
+
+GdkColormap *
+get_colormap_for_drawable (GdkDrawable *d)
+{
+    GdkDisplay *display = gdk_display_get_default ();
+    GdkScreen  *screen  = gdk_display_get_default_screen (display);
+
+    if (gdk_drawable_get_depth (d) == 32)
+	return gdk_screen_get_rgba_colormap (screen);
+
+    return gdk_screen_get_rgb_colormap (screen);
+}
+
+XRenderPictFormat *
+get_format_for_drawable (decor_t *d, GdkDrawable *drawable)
+{
+    if (!d->frame_window || gdk_drawable_get_depth (drawable) == 32)
+	return xformat_rgba;
+
+    return xformat_rgb;
+}
+
+GdkPixmap *
+create_pixmap (int	  w,
+	       int	  h,
+	       GtkWidget *parent_style_window)
+{
+    GdkWindow *window;
+
+    if (w == 0 || h == 0)
+	abort ();
+
+    window = gtk_widget_get_window (parent_style_window);
+    return gdk_pixmap_new (GDK_DRAWABLE (window), w, h, -1 /* CopyFromParent */);
+}

=== removed file 'gtk/window-decorator/gdk.c'
--- gtk/window-decorator/gdk.c	2011-02-23 18:11:11 +0000
+++ gtk/window-decorator/gdk.c	1970-01-01 00:00:00 +0000
@@ -1,106 +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"
-
-GdkPixmap *
-pixmap_new_from_pixbuf (GdkPixbuf *pixbuf, GtkWidget *parent)
-{
-    GdkPixmap *pixmap;
-    guint     width, height;
-    cairo_t   *cr;
-
-    width  = gdk_pixbuf_get_width (pixbuf);
-    height = gdk_pixbuf_get_height (pixbuf);
-
-    pixmap = create_pixmap (width, height, parent);
-    if (!pixmap)
-	return NULL;
-
-    cr = (cairo_t *) gdk_cairo_create (GDK_DRAWABLE (pixmap));
-    gdk_cairo_set_source_pixbuf (cr, pixbuf, 0, 0);
-    cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
-    cairo_paint (cr);
-    cairo_destroy (cr);
-
-    return pixmap;
-}
-
-
-void
-gdk_cairo_set_source_color_alpha (cairo_t  *cr,
-				  GdkColor *color,
-				  double   alpha)
-{
-    cairo_set_source_rgba (cr,
-			   color->red   / 65535.0,
-			   color->green / 65535.0,
-			   color->blue  / 65535.0,
-			   alpha);
-}
-
-inline GdkWindow *
-create_gdk_window (Window xframe)
-{
-    GdkDisplay  *display = gdk_display_get_default ();
-    GdkScreen   *screen  = gdk_display_get_default_screen (display);
-    GdkWindow   *window  = create_foreign_window (xframe);
-    GdkColormap *cmap    = gdk_screen_get_rgb_colormap (screen);
-
-    gdk_drawable_set_colormap (GDK_DRAWABLE (window), cmap);
-
-    return window;
-}
-
-GdkColormap *
-get_colormap_for_drawable (GdkDrawable *d)
-{
-    GdkDisplay *display = gdk_display_get_default ();
-    GdkScreen  *screen  = gdk_display_get_default_screen (display);
-
-    if (gdk_drawable_get_depth (d) == 32)
-	return gdk_screen_get_rgba_colormap (screen);
-
-    return gdk_screen_get_rgb_colormap (screen);
-}
-
-XRenderPictFormat *
-get_format_for_drawable (decor_t *d, GdkDrawable *drawable)
-{
-    if (!d->frame_window || gdk_drawable_get_depth (drawable) == 32)
-	return xformat_rgba;
-
-    return xformat_rgb;
-}
-
-GdkPixmap *
-create_pixmap (int	  w,
-	       int	  h,
-	       GtkWidget *parent_style_window)
-{
-    GdkWindow *window;
-
-    if (w == 0 || h == 0)
-	abort ();
-
-    window = gtk_widget_get_window (parent_style_window);
-    return gdk_pixmap_new (GDK_DRAWABLE (window), w, h, -1 /* CopyFromParent */);
-}

=== added file 'gtk/window-decorator/style.c'
--- gtk/window-decorator/style.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/style.c	2012-04-10 15:45:28 +0000
@@ -0,0 +1,66 @@
+/*
+ * 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
+update_style (GtkWidget *widget)
+{
+    GtkStyle      *style;
+    decor_color_t spot_color;
+    
+    style = gtk_widget_get_style (widget);
+    g_object_ref (G_OBJECT (style));
+    
+    style = gtk_style_attach (style, widget->window);
+    
+    spot_color.r = style->bg[GTK_STATE_SELECTED].red   / 65535.0;
+    spot_color.g = style->bg[GTK_STATE_SELECTED].green / 65535.0;
+    spot_color.b = style->bg[GTK_STATE_SELECTED].blue  / 65535.0;
+    
+    g_object_unref (G_OBJECT (style));
+    
+    shade (&spot_color, &_title_color[0], 1.05);
+    shade (&_title_color[0], &_title_color[1], 0.85);
+    
+}
+
+void
+style_changed (GtkWidget *widget,
+	       void      *user_data)
+{
+    GdkDisplay *gdkdisplay;
+    GdkScreen  *gdkscreen;
+    WnckScreen *screen;
+
+    PangoContext *context = (PangoContext *) user_data;
+
+    gdkdisplay = gdk_display_get_default ();
+    gdkscreen  = gdk_display_get_default_screen (gdkdisplay);
+    screen     = wnck_screen_get_default ();
+
+    update_style (widget);
+
+    pango_cairo_context_set_resolution (context,
+					gdk_screen_get_resolution (gdkscreen));
+
+    decorations_changed (screen);
+}

=== removed file 'gtk/window-decorator/style.c'
--- gtk/window-decorator/style.c	2011-02-21 09:53:08 +0000
+++ gtk/window-decorator/style.c	1970-01-01 00:00:00 +0000
@@ -1,66 +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
-update_style (GtkWidget *widget)
-{
-    GtkStyle      *style;
-    decor_color_t spot_color;
-    
-    style = gtk_widget_get_style (widget);
-    g_object_ref (G_OBJECT (style));
-    
-    style = gtk_style_attach (style, widget->window);
-    
-    spot_color.r = style->bg[GTK_STATE_SELECTED].red   / 65535.0;
-    spot_color.g = style->bg[GTK_STATE_SELECTED].green / 65535.0;
-    spot_color.b = style->bg[GTK_STATE_SELECTED].blue  / 65535.0;
-    
-    g_object_unref (G_OBJECT (style));
-    
-    shade (&spot_color, &_title_color[0], 1.05);
-    shade (&_title_color[0], &_title_color[1], 0.85);
-    
-}
-
-void
-style_changed (GtkWidget *widget,
-	       void      *user_data)
-{
-    GdkDisplay *gdkdisplay;
-    GdkScreen  *gdkscreen;
-    WnckScreen *screen;
-
-    PangoContext *context = (PangoContext *) user_data;
-
-    gdkdisplay = gdk_display_get_default ();
-    gdkscreen  = gdk_display_get_default_screen (gdkdisplay);
-    screen     = wnck_screen_get_default ();
-
-    update_style (widget);
-
-    pango_cairo_context_set_resolution (context,
-					gdk_screen_get_resolution (gdkscreen));
-
-    decorations_changed (screen);
-}

=== added file 'gtk/window-decorator/util.c'
--- gtk/window-decorator/util.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/util.c	2012-04-10 15:45:28 +0000
@@ -0,0 +1,299 @@
+/*
+ * 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"
+
+double
+square (double x)
+{
+    return x * x;
+}
+
+double
+dist (double x1, double y1,
+      double x2, double y2)
+{
+    return sqrt (square (x1 - x2) + square (y1 - y2));
+}
+
+gboolean
+get_window_prop (Window xwindow,
+		 Atom   atom,
+		 Window *val)
+{
+    Atom   type;
+    int	   format;
+    gulong nitems;
+    gulong bytes_after;
+    Window *w;
+    int    err, result;
+
+    *val = 0;
+
+    gdk_error_trap_push ();
+
+    type = None;
+    result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
+				 xwindow,
+				 atom,
+				 0, G_MAXLONG,
+				 False, XA_WINDOW, &type, &format, &nitems,
+				 &bytes_after, (void*) &w);
+    err = gdk_error_trap_pop ();
+    if (err != Success || result != Success)
+	return FALSE;
+
+    if (type != XA_WINDOW)
+    {
+	XFree (w);
+	return FALSE;
+    }
+
+    *val = *w;
+    XFree (w);
+
+    return TRUE;
+}
+
+unsigned int
+get_mwm_prop (Window xwindow)
+{
+    Display	  *xdisplay;
+    Atom	  actual;
+    int		  err, result, format;
+    unsigned long n, left;
+    unsigned char *data;
+    unsigned int  decor = MWM_DECOR_ALL;
+
+    xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+
+    gdk_error_trap_push ();
+
+    result = XGetWindowProperty (xdisplay, xwindow, mwm_hints_atom,
+				 0L, 20L, FALSE, mwm_hints_atom,
+				 &actual, &format, &n, &left, &data);
+
+    err = gdk_error_trap_pop ();
+    if (err != Success || result != Success)
+	return decor;
+
+    if (data)
+    {
+	MwmHints *mwm_hints = (MwmHints *) data;
+
+	if (n >= PROP_MOTIF_WM_HINT_ELEMENTS)
+	{
+	    if (mwm_hints->flags & MWM_HINTS_DECORATIONS)
+		decor = mwm_hints->decorations;
+	}
+
+	XFree (data);
+    }
+
+    return decor;
+}
+
+/* from clearlooks theme */
+static void
+rgb_to_hls (gdouble *r,
+	    gdouble *g,
+	    gdouble *b)
+{
+    gdouble min;
+    gdouble max;
+    gdouble red;
+    gdouble green;
+    gdouble blue;
+    gdouble h, l, s;
+    gdouble delta;
+
+    red = *r;
+    green = *g;
+    blue = *b;
+
+    if (red > green)
+    {
+	if (red > blue)
+	    max = red;
+	else
+	    max = blue;
+
+	if (green < blue)
+	    min = green;
+	else
+	    min = blue;
+    }
+    else
+    {
+	if (green > blue)
+	    max = green;
+	else
+	    max = blue;
+
+	if (red < blue)
+	    min = red;
+	else
+	    min = blue;
+    }
+
+    l = (max + min) / 2;
+    s = 0;
+    h = 0;
+
+    if (max != min)
+    {
+	if (l <= 0.5)
+	    s = (max - min) / (max + min);
+	else
+	    s = (max - min) / (2 - max - min);
+
+	delta = max -min;
+	if (red == max)
+	    h = (green - blue) / delta;
+	else if (green == max)
+	    h = 2 + (blue - red) / delta;
+	else if (blue == max)
+	    h = 4 + (red - green) / delta;
+
+	h *= 60;
+	if (h < 0.0)
+	    h += 360;
+    }
+
+    *r = h;
+    *g = l;
+    *b = s;
+}
+
+static void
+hls_to_rgb (gdouble *h,
+	    gdouble *l,
+	    gdouble *s)
+{
+    gdouble hue;
+    gdouble lightness;
+    gdouble saturation;
+    gdouble m1, m2;
+    gdouble r, g, b;
+
+    lightness = *l;
+    saturation = *s;
+
+    if (lightness <= 0.5)
+	m2 = lightness * (1 + saturation);
+    else
+	m2 = lightness + saturation - lightness * saturation;
+
+    m1 = 2 * lightness - m2;
+
+    if (saturation == 0)
+    {
+	*h = lightness;
+	*l = lightness;
+	*s = lightness;
+    }
+    else
+    {
+	hue = *h + 120;
+	while (hue > 360)
+	    hue -= 360;
+	while (hue < 0)
+	    hue += 360;
+
+	if (hue < 60)
+	    r = m1 + (m2 - m1) * hue / 60;
+	else if (hue < 180)
+	    r = m2;
+	else if (hue < 240)
+	    r = m1 + (m2 - m1) * (240 - hue) / 60;
+	else
+	    r = m1;
+
+	hue = *h;
+	while (hue > 360)
+	    hue -= 360;
+	while (hue < 0)
+	    hue += 360;
+
+	if (hue < 60)
+	    g = m1 + (m2 - m1) * hue / 60;
+	else if (hue < 180)
+	    g = m2;
+	else if (hue < 240)
+	    g = m1 + (m2 - m1) * (240 - hue) / 60;
+	else
+	    g = m1;
+
+	hue = *h - 120;
+	while (hue > 360)
+	    hue -= 360;
+	while (hue < 0)
+	    hue += 360;
+
+	if (hue < 60)
+	    b = m1 + (m2 - m1) * hue / 60;
+	else if (hue < 180)
+	    b = m2;
+	else if (hue < 240)
+	    b = m1 + (m2 - m1) * (240 - hue) / 60;
+	else
+	    b = m1;
+
+	*h = r;
+	*l = g;
+	*s = b;
+    }
+}
+
+void
+shade (const decor_color_t *a,
+       decor_color_t	   *b,
+       float		   k)
+{
+    double red;
+    double green;
+    double blue;
+
+    red   = a->r;
+    green = a->g;
+    blue  = a->b;
+
+    rgb_to_hls (&red, &green, &blue);
+
+    green *= k;
+    if (green > 1.0)
+	green = 1.0;
+    else if (green < 0.0)
+	green = 0.0;
+
+    blue *= k;
+    if (blue > 1.0)
+	blue = 1.0;
+    else if (blue < 0.0)
+	blue = 0.0;
+
+    hls_to_rgb (&red, &green, &blue);
+
+    b->r = red;
+    b->g = green;
+    b->b = blue;
+}
+

=== removed file 'gtk/window-decorator/util.c'
--- gtk/window-decorator/util.c	2011-02-21 09:53:08 +0000
+++ gtk/window-decorator/util.c	1970-01-01 00:00:00 +0000
@@ -1,299 +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"
-
-double
-square (double x)
-{
-    return x * x;
-}
-
-double
-dist (double x1, double y1,
-      double x2, double y2)
-{
-    return sqrt (square (x1 - x2) + square (y1 - y2));
-}
-
-gboolean
-get_window_prop (Window xwindow,
-		 Atom   atom,
-		 Window *val)
-{
-    Atom   type;
-    int	   format;
-    gulong nitems;
-    gulong bytes_after;
-    Window *w;
-    int    err, result;
-
-    *val = 0;
-
-    gdk_error_trap_push ();
-
-    type = None;
-    result = XGetWindowProperty (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()),
-				 xwindow,
-				 atom,
-				 0, G_MAXLONG,
-				 False, XA_WINDOW, &type, &format, &nitems,
-				 &bytes_after, (void*) &w);
-    err = gdk_error_trap_pop ();
-    if (err != Success || result != Success)
-	return FALSE;
-
-    if (type != XA_WINDOW)
-    {
-	XFree (w);
-	return FALSE;
-    }
-
-    *val = *w;
-    XFree (w);
-
-    return TRUE;
-}
-
-unsigned int
-get_mwm_prop (Window xwindow)
-{
-    Display	  *xdisplay;
-    Atom	  actual;
-    int		  err, result, format;
-    unsigned long n, left;
-    unsigned char *data;
-    unsigned int  decor = MWM_DECOR_ALL;
-
-    xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-
-    gdk_error_trap_push ();
-
-    result = XGetWindowProperty (xdisplay, xwindow, mwm_hints_atom,
-				 0L, 20L, FALSE, mwm_hints_atom,
-				 &actual, &format, &n, &left, &data);
-
-    err = gdk_error_trap_pop ();
-    if (err != Success || result != Success)
-	return decor;
-
-    if (data)
-    {
-	MwmHints *mwm_hints = (MwmHints *) data;
-
-	if (n >= PROP_MOTIF_WM_HINT_ELEMENTS)
-	{
-	    if (mwm_hints->flags & MWM_HINTS_DECORATIONS)
-		decor = mwm_hints->decorations;
-	}
-
-	XFree (data);
-    }
-
-    return decor;
-}
-
-/* from clearlooks theme */
-static void
-rgb_to_hls (gdouble *r,
-	    gdouble *g,
-	    gdouble *b)
-{
-    gdouble min;
-    gdouble max;
-    gdouble red;
-    gdouble green;
-    gdouble blue;
-    gdouble h, l, s;
-    gdouble delta;
-
-    red = *r;
-    green = *g;
-    blue = *b;
-
-    if (red > green)
-    {
-	if (red > blue)
-	    max = red;
-	else
-	    max = blue;
-
-	if (green < blue)
-	    min = green;
-	else
-	    min = blue;
-    }
-    else
-    {
-	if (green > blue)
-	    max = green;
-	else
-	    max = blue;
-
-	if (red < blue)
-	    min = red;
-	else
-	    min = blue;
-    }
-
-    l = (max + min) / 2;
-    s = 0;
-    h = 0;
-
-    if (max != min)
-    {
-	if (l <= 0.5)
-	    s = (max - min) / (max + min);
-	else
-	    s = (max - min) / (2 - max - min);
-
-	delta = max -min;
-	if (red == max)
-	    h = (green - blue) / delta;
-	else if (green == max)
-	    h = 2 + (blue - red) / delta;
-	else if (blue == max)
-	    h = 4 + (red - green) / delta;
-
-	h *= 60;
-	if (h < 0.0)
-	    h += 360;
-    }
-
-    *r = h;
-    *g = l;
-    *b = s;
-}
-
-static void
-hls_to_rgb (gdouble *h,
-	    gdouble *l,
-	    gdouble *s)
-{
-    gdouble hue;
-    gdouble lightness;
-    gdouble saturation;
-    gdouble m1, m2;
-    gdouble r, g, b;
-
-    lightness = *l;
-    saturation = *s;
-
-    if (lightness <= 0.5)
-	m2 = lightness * (1 + saturation);
-    else
-	m2 = lightness + saturation - lightness * saturation;
-
-    m1 = 2 * lightness - m2;
-
-    if (saturation == 0)
-    {
-	*h = lightness;
-	*l = lightness;
-	*s = lightness;
-    }
-    else
-    {
-	hue = *h + 120;
-	while (hue > 360)
-	    hue -= 360;
-	while (hue < 0)
-	    hue += 360;
-
-	if (hue < 60)
-	    r = m1 + (m2 - m1) * hue / 60;
-	else if (hue < 180)
-	    r = m2;
-	else if (hue < 240)
-	    r = m1 + (m2 - m1) * (240 - hue) / 60;
-	else
-	    r = m1;
-
-	hue = *h;
-	while (hue > 360)
-	    hue -= 360;
-	while (hue < 0)
-	    hue += 360;
-
-	if (hue < 60)
-	    g = m1 + (m2 - m1) * hue / 60;
-	else if (hue < 180)
-	    g = m2;
-	else if (hue < 240)
-	    g = m1 + (m2 - m1) * (240 - hue) / 60;
-	else
-	    g = m1;
-
-	hue = *h - 120;
-	while (hue > 360)
-	    hue -= 360;
-	while (hue < 0)
-	    hue += 360;
-
-	if (hue < 60)
-	    b = m1 + (m2 - m1) * hue / 60;
-	else if (hue < 180)
-	    b = m2;
-	else if (hue < 240)
-	    b = m1 + (m2 - m1) * (240 - hue) / 60;
-	else
-	    b = m1;
-
-	*h = r;
-	*l = g;
-	*s = b;
-    }
-}
-
-void
-shade (const decor_color_t *a,
-       decor_color_t	   *b,
-       float		   k)
-{
-    double red;
-    double green;
-    double blue;
-
-    red   = a->r;
-    green = a->g;
-    blue  = a->b;
-
-    rgb_to_hls (&red, &green, &blue);
-
-    green *= k;
-    if (green > 1.0)
-	green = 1.0;
-    else if (green < 0.0)
-	green = 0.0;
-
-    blue *= k;
-    if (blue > 1.0)
-	blue = 1.0;
-    else if (blue < 0.0)
-	blue = 0.0;
-
-    hls_to_rgb (&red, &green, &blue);
-
-    b->r = red;
-    b->g = green;
-    b->b = blue;
-}
-

=== modified file 'plugins/annotate/src/annotate.cpp'
--- plugins/annotate/src/annotate.cpp	2012-01-30 05:12:24 +0000
+++ plugins/annotate/src/annotate.cpp	2012-04-10 15:45:28 +0000
@@ -629,11 +629,14 @@
 
     if (status)
     {
+	GLVertexBuffer *streamingBuffer = GLVertexBuffer::streamingBuffer ();
+	GLfloat         vertexData[18];
+	GLfloat         textureData[12];
 	CompRect	rect;
 	GLMatrix	sTransform = transform;
 	int		numRect;
 	int		pos = 0;
-	float		vectorX, vectorY, offset;
+	float		offset;
 	int		angle;
 
 	offset = optionGetStrokeWidth () / 2;
@@ -641,12 +644,6 @@
 	/* This replaced prepareXCoords (s, output, -DEFAULT_Z_CAMERA) */
 	sTransform.toScreenSpace (output, -DEFAULT_Z_CAMERA);
 
-	glPushMatrix ();
-	glLoadMatrixf (sTransform.getMatrix ());
-
-	glDisableClientState (GL_TEXTURE_COORD_ARRAY);
-	glEnable (GL_BLEND);
-
 	if (content && !region.isEmpty ())
 	{
 	    foreach (GLTexture *tex, texture)
@@ -656,34 +653,66 @@
 
 	        tex->enable (GLTexture::Fast);
 
-	        glBegin (GL_QUADS);
+	        streamingBuffer->begin (GL_TRIANGLES);
 
 	        while (numRect--)
 	        {
-	            glTexCoord2f (
-		        COMP_TEX_COORD_X (tex->matrix (), rect.at (pos).x1 ()),
-		        COMP_TEX_COORD_Y (tex->matrix (), rect.at (pos).y2 ()));
-	            glVertex2i (rect.at (pos).x1 (), rect.at (pos).y2 ());
-
-	            glTexCoord2f (
-		        COMP_TEX_COORD_X (tex->matrix (), rect.at (pos).x2 ()),
-		        COMP_TEX_COORD_Y (tex->matrix (), rect.at (pos).y2 ()));
-	            glVertex2i (rect.at (pos).x2 (), rect.at (pos).y2 ());
-
-	            glTexCoord2f (
-		        COMP_TEX_COORD_X (tex->matrix (), rect.at (pos).x2 ()),
-		        COMP_TEX_COORD_Y (tex->matrix (), rect.at (pos).y1 ()));
-	            glVertex2i (rect.at (pos).x2 (), rect.at (pos).y1 ());
-
-	            glTexCoord2f (
-		        COMP_TEX_COORD_X (tex->matrix (), rect.at (pos).x1 ()),
-		        COMP_TEX_COORD_Y (tex->matrix (), rect.at (pos).y1 ()));
-	            glVertex2i (rect.at (pos).x1 (), rect.at (pos).y1 ());
-
+		    GLfloat tx1 = COMP_TEX_COORD_X (tex->matrix (),
+		                                       rect.at (pos).x1 ());
+		    GLfloat tx2 = COMP_TEX_COORD_X (tex->matrix (),
+		                                       rect.at (pos).x2 ());
+		    GLfloat ty1 = COMP_TEX_COORD_Y (tex->matrix (),
+		                                       rect.at (pos).y1 ());
+		    GLfloat ty2 = COMP_TEX_COORD_Y (tex->matrix (),
+		                                       rect.at (pos).y2 ());
+
+		    vertexData[0]  = rect.at (pos).x1 ();
+		    vertexData[1]  = rect.at (pos).y1 ();
+		    vertexData[2]  = 0.0f;
+		    vertexData[3]  = rect.at (pos).x1 ();
+		    vertexData[4]  = rect.at (pos).y2 ();
+		    vertexData[5]  = 0.0f;
+		    vertexData[6]  = rect.at (pos).x2 ();
+		    vertexData[7]  = rect.at (pos).y1 ();
+		    vertexData[8]  = 0.0f;
+		    vertexData[9]  = rect.at (pos).x1 ();
+		    vertexData[10] = rect.at (pos).y2 ();
+		    vertexData[11] = 0.0f;
+
+		    vertexData[12] = rect.at (pos).x2 ();
+		    vertexData[13] = rect.at (pos).y2 ();
+		    vertexData[14] = 0.0f;
+
+		    vertexData[15] = rect.at (pos).x2 ();
+		    vertexData[16] = rect.at (pos).y1 ();
+		    vertexData[17] = 0.0f;
+
+		    textureData[0]  = tx1;
+		    textureData[1]  = ty1;
+
+		    textureData[2]  = tx1;
+		    textureData[3]  = ty2;
+
+		    textureData[4]  = tx2;
+		    textureData[5]  = ty1;
+
+		    textureData[6]  = tx1;
+		    textureData[7]  = ty2;
+
+		    textureData[8]  = tx2;
+		    textureData[9]  = ty2;
+
+		    textureData[10] = tx2;
+		    textureData[11] = ty1;
+
+		    streamingBuffer->addVertices (6, vertexData);
+		    streamingBuffer->addTexCoords (0, 6, textureData);
 	            pos++;
 	        }
 
-	        glEnd ();
+		streamingBuffer->end ();
+		streamingBuffer->render (sTransform);
+
 	        tex->disable ();
 	    }
 	}
@@ -691,85 +720,130 @@
 	switch (drawMode)
 	{
 	case LineMode:
-	    glColor4usv (optionGetStrokeColor ());
 	    glLineWidth (optionGetStrokeWidth ());
-	    glBegin (GL_LINES);
-	    glVertex2i (initialPointerX, initialPointerY);
-	    glVertex2i (lineVector.x (), lineVector.y ());
-	    glEnd ();
+
+	    streamingBuffer->begin (GL_LINES);
+
+	    streamingBuffer->addColors (1, optionGetStrokeColor ());
+
+	    vertexData[0] = initialPointerX;
+	    vertexData[1] = initialPointerY;
+	    vertexData[2] = 0.0f;
+	    vertexData[3] = lineVector.x ();
+	    vertexData[4] = lineVector.y ();
+	    vertexData[5] = 0.0f;
+	    streamingBuffer->addVertices (2, vertexData);
+
+	    streamingBuffer->end ();
+	    streamingBuffer->render (sTransform);
 	    break;
 
 	case RectangleMode:
+	    vertexData[0]  = rectangle.x1 ();
+	    vertexData[1]  = rectangle.y1 ();
+	    vertexData[2]  = 0.0f;
+	    vertexData[3]  = rectangle.x1 ();
+	    vertexData[4]  = rectangle.y2 ();
+	    vertexData[5]  = 0.0f;
+	    vertexData[6]  = rectangle.x2 ();
+	    vertexData[7]  = rectangle.y1 ();
+	    vertexData[8]  = 0.0f;
+	    vertexData[9]  = rectangle.x2 ();
+	    vertexData[10] = rectangle.y2 ();
+	    vertexData[11] = 0.0f;
+
 	    /* fill rectangle */
-	    glColor4usv (optionGetFillColor ());
-	    glRecti (rectangle.x1 (), rectangle.y2 (),
-		     rectangle.x2 (), rectangle.y1 ());
+	    streamingBuffer->begin (GL_TRIANGLE_STRIP);
+
+	    streamingBuffer->addColors (1, optionGetFillColor ());
+	    streamingBuffer->addVertices (4, vertexData);
+
+	    streamingBuffer->end ();
+	    streamingBuffer->render (sTransform);
 
 	    /* draw rectangle outline */
-	    glColor4usv (optionGetStrokeColor ());
-	    glRecti (rectangle.x1 () - offset, rectangle.y2 (),
-		     rectangle.x1 () + offset, rectangle.y1 ());
+/*	    streamingBuffer->begin ();
+
+	    streamingBuffer->addColors (1, optionGetStrokeColor ());
+
+	    vertexData[0] = rectangle.x1 () - offset;
+	    vertexData[3] = rectangle.x1 () - offset;
+	    streamingBuffer->addVertices (4, vertexData);
+
 	    glRecti (rectangle.x2 () - offset, rectangle.y2 (),
 		     rectangle.x2 () + offset, rectangle.y1 ());
 	    glRecti (rectangle.x1 () - offset, rectangle.y1 () + offset,
 		     rectangle.x2 () + offset, rectangle.y1 () - offset);
 	    glRecti (rectangle.x1 () - offset, rectangle.y2 () + offset,
-		     rectangle.x2 () + offset, rectangle.y2 () - offset);
+		     rectangle.x2 () + offset, rectangle.y2 () - offset);*/
 	    break;
 
 	case EllipseMode:
 	    /* fill ellipse */
-	    glColor4usv (optionGetFillColor ());
-
-	    glBegin (GL_TRIANGLE_FAN);
-	    glVertex2d (ellipse.center.x (), ellipse.center.y ());
+	    streamingBuffer->begin (GL_TRIANGLE_FAN);
+
+	    streamingBuffer->addColors (1, optionGetFillColor ());
+
+	    vertexData[0] = ellipse.center.x ();
+	    vertexData[1] = ellipse.center.y ();
+	    vertexData[2] = 0.0f;
+	    streamingBuffer->addVertices (1, vertexData);
+
 	    for (angle = 0; angle <= 360; angle += 1)
 	    {
-		vectorX = ellipse.center.x () +
-			 (ellipse.radiusX * sinf (angle * DEG2RAD));
-		vectorY = ellipse.center.y () +
-			 (ellipse.radiusY * cosf (angle * DEG2RAD));
-		glVertex2d (vectorX, vectorY);
+		vertexData[0] = ellipse.center.x () +
+		                (ellipse.radiusX * sinf (angle * DEG2RAD));
+		vertexData[1] = ellipse.center.y () +
+		                (ellipse.radiusY * cosf (angle * DEG2RAD));
+		streamingBuffer->addVertices (1, vertexData);
 	    }
-	    glVertex2d (ellipse.center.x (), ellipse.center.y () +
-			ellipse.radiusY);
-	    glEnd();
+
+	    vertexData[0] = ellipse.center.x ();
+	    vertexData[1] = ellipse.center.y () + ellipse.radiusY;
+	    streamingBuffer->addVertices (1, vertexData);
+
+	    streamingBuffer->end ();
+	    streamingBuffer->render (sTransform);
 
 	    /* draw ellipse outline */
-	    glColor4usv (optionGetStrokeColor ());
 	    glLineWidth (optionGetStrokeWidth ());
 
-	    glBegin (GL_TRIANGLE_STRIP);
-	    glVertex2d (ellipse.center.x (), ellipse.center.y () +
-			ellipse.radiusY - offset);
+	    streamingBuffer->begin (GL_TRIANGLE_STRIP);
+
+	    streamingBuffer->addColors (1, optionGetStrokeColor ());
+
+
+	    vertexData[0] = ellipse.center.x ();
+	    vertexData[1] = ellipse.center.y () + ellipse.radiusY - offset;
+	    vertexData[2] = 0.0f;
+	    streamingBuffer->addVertices (1, vertexData);
+
 	    for (angle = 360; angle >= 0; angle -= 1)
 	    {
-		vectorX = ellipse.center.x () + ((ellipse.radiusX -
-			  offset) * sinf (angle * DEG2RAD));
-		vectorY = ellipse.center.y () + ((ellipse.radiusY -
-			  offset) * cosf (angle * DEG2RAD));
-		glVertex2d (vectorX, vectorY);
-		vectorX = ellipse.center.x () + ((ellipse.radiusX +
-			  offset) * sinf (angle * DEG2RAD));
-		vectorY = ellipse.center.y () + ((ellipse.radiusY +
-			  offset) * cosf (angle * DEG2RAD));
-		glVertex2d (vectorX, vectorY);
+		vertexData[0] = ellipse.center.x () + ((ellipse.radiusX -
+		                offset) * sinf (angle * DEG2RAD));
+		vertexData[1] = ellipse.center.y () + ((ellipse.radiusY -
+				offset) * cosf (angle * DEG2RAD));
+		vertexData[2] = 0.0f;
+		vertexData[3] = ellipse.center.x () + ((ellipse.radiusX +
+		                offset) * sinf (angle * DEG2RAD));
+		vertexData[4] = ellipse.center.y () + ((ellipse.radiusY +
+		                offset) * cosf (angle * DEG2RAD));
+		vertexData[5] = 0.0f;
+		streamingBuffer->addVertices (2, vertexData);
 	    }
-	    glVertex2d (ellipse.center.x (), ellipse.center.y () +
-			ellipse.radiusY + offset);
-	    glEnd();
+
+	    vertexData[0] = ellipse.center.x ();
+	    vertexData[1] = ellipse.center.y () + ellipse.radiusY + offset;
+	    streamingBuffer->addVertices (1, vertexData);
+
+	    streamingBuffer->end ();
+	    streamingBuffer->render (sTransform);
 	    break;
 
 	default:
 	    break;
 	}
-
-	/* clean up */
-	glColor4usv (defaultColor);
-	glDisable (GL_BLEND);
-	glEnableClientState (GL_TEXTURE_COORD_ARRAY);
-
-	glPopMatrix ();
     }
 
     return status;

=== modified file 'plugins/blur/CMakeLists.txt'
--- plugins/blur/CMakeLists.txt	2011-01-24 06:28:52 +0000
+++ plugins/blur/CMakeLists.txt	2012-04-10 15:45:28 +0000
@@ -2,15 +2,15 @@
 
 include (CompizPlugin)
 
-find_package (OpenGL)
-
-if (OPENGL_GLU_FOUND)
-    compiz_plugin(blur PLUGINDEPS composite opengl LIBRARIES decoration ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
-
-    if (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_BLUR)
-	set_target_properties (
-	    blur PROPERTIES
-	    INSTALL_RPATH "${COMPIZ_LIBDIR}"
-	)
-    endif (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_BLUR)
-endif ()
+#find_package (OpenGL)
+
+#if (OPENGL_GLU_FOUND)
+#    compiz_plugin(blur PLUGINDEPS composite opengl LIBRARIES decoration ${OPENGL_glu_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
+
+#    if (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_BLUR)
+#	set_target_properties (
+#	    blur PROPERTIES
+#	    INSTALL_RPATH "${COMPIZ_LIBDIR}"
+#	)
+#    endif (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_BLUR)
+#endif ()

=== modified file 'plugins/clone/src/clone.cpp'
--- plugins/clone/src/clone.cpp	2010-02-04 17:16:02 +0000
+++ plugins/clone/src/clone.cpp	2012-04-10 15:45:28 +0000
@@ -295,9 +295,6 @@
 			 0.0f);
 	sTransform.scale (zoomX, zoomY, 1.0f);
 
-	glPushMatrix ();
-	glLoadMatrixf (sTransform.getMatrix ());
-
 	filter = gScreen->textureFilter ();
 
 	if (offset == 0.0f)
@@ -325,8 +322,6 @@
 	}
 
 	gScreen->setTextureFilter (filter);
-
-	glPopMatrix ();
     }
 
     return status;

=== modified file 'plugins/compiztoolbox/src/compiztoolbox.cpp'
--- plugins/compiztoolbox/src/compiztoolbox.cpp	2012-01-18 16:26:45 +0000
+++ plugins/compiztoolbox/src/compiztoolbox.cpp	2012-04-10 15:45:28 +0000
@@ -465,9 +465,7 @@
 	sAttrib.yTranslate = wy - g.y () +
 			     window->border ().top  * sAttrib.yScale;
 
-	GLFragment::Attrib fragment (sAttrib);
-
-	if (window->alpha () || fragment.getOpacity () != OPAQUE)
+	if (window->alpha () || sAttrib.opacity != OPAQUE)
 	    mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
 
 	wTransform.translate (g.x (), g.y (), 0.0f);
@@ -476,9 +474,6 @@
 			      sAttrib.yTranslate / sAttrib.yScale - g.y (),
 			      0.0f);
 
-	glPushMatrix ();
-	glLoadMatrixf (wTransform.getMatrix ());
-
 	filter = gScreen->textureFilter ();
 
 	if (baseScreen->getMipmap ())
@@ -488,13 +483,11 @@
 	   very ugly but necessary until the vertex stage has been made
 	   fully pluggable. */
 	gWindow->glAddGeometrySetCurrentIndex (MAXSHORT);
-	gWindow->glDraw (wTransform, fragment, infiniteRegion, mask);
+	gWindow->glDraw (wTransform, sAttrib, infiniteRegion, mask);
 	gWindow->glAddGeometrySetCurrentIndex (addWindowGeometryIndex);
 
 	gScreen->setTextureFilter (filter);
 
-	glPopMatrix ();
-
 	if (iconMode != HideIcon)
 	{
 	    icon = gWindow->getIcon (MAX_ICON_SIZE, MAX_ICON_SIZE);
@@ -535,30 +528,23 @@
 	sAttrib.xTranslate = wx - g.x ();
 	sAttrib.yTranslate = wy - g.y ();
 
-	gWindow->geometry ().reset ();
+	gWindow->vertexBuffer ()->begin ();
 
 	gWindow->glAddGeometrySetCurrentIndex (MAXSHORT);
 	gWindow->glAddGeometry (matrix, iconReg, infiniteRegion);
 	gWindow->glAddGeometrySetCurrentIndex (addWindowGeometryIndex);
 
-	if (gWindow->geometry ().vCount)
-	{
-	    GLFragment::Attrib fragment (sAttrib);
-	    GLMatrix           wTransform (transform);
-
-	    wTransform.translate (g.x (), g.y (), 0.0f);
-	    wTransform.scale (sAttrib.xScale, sAttrib.yScale, 1.0f);
-	    wTransform.translate (sAttrib.xTranslate / sAttrib.xScale - g.x (),
-				  sAttrib.yTranslate / sAttrib.yScale - g.y (),
-				  0.0f);
-
-	    glPushMatrix ();
-	    glLoadMatrixf (wTransform.getMatrix ());
-
-	    gWindow->glDrawTexture (icon, fragment, mask);
-
-	    glPopMatrix ();
-	}
+	gWindow->vertexBuffer ()->end ();
+
+	GLMatrix           wTransform (transform);
+
+	wTransform.translate (g.x (), g.y (), 0.0f);
+	wTransform.scale (sAttrib.xScale, sAttrib.yScale, 1.0f);
+	wTransform.translate (sAttrib.xTranslate / sAttrib.xScale - g.x (),
+	                      sAttrib.yTranslate / sAttrib.yScale - g.y (),
+	                      0.0f);
+
+	gWindow->glDrawTexture (icon, wTransform, sAttrib, mask);
     }
 }
 

=== modified file 'plugins/copytex/src/copytex.cpp'
--- plugins/copytex/src/copytex.cpp	2011-06-01 03:33:04 +0000
+++ plugins/copytex/src/copytex.cpp	2012-04-10 15:45:28 +0000
@@ -112,6 +112,14 @@
     GLenum            target;
     GLTexture::Matrix matrix = _identity_matrix;
 
+#ifdef USE_GLES
+    target = GL_TEXTURE_2D;
+    matrix.xx = 1.0f / dim.width ();
+    matrix.yy = 1.0f / dim.height ();
+    matrix.x0 = -dim.x () * matrix.xx;
+    matrix.y0 = -dim.y () * matrix.yy;
+#else
+
     if (GL::textureNonPowerOfTwo ||
 	(POWER_OF_TWO (dim.width ()) && POWER_OF_TWO (dim.height ())))
     {
@@ -129,6 +137,7 @@
 	matrix.x0 = -dim.x ();
 	matrix.y0 = -dim.y ();
     }
+#endif
 
     setData (target, matrix, false);
     setGeometry (dim.x1 (), dim.y1 (), dim.x2 () - dim.x1 (), dim.y2 () - dim.y1 ());

=== modified file 'plugins/cube/CMakeLists.txt'
--- plugins/cube/CMakeLists.txt	2009-11-03 20:14:43 +0000
+++ plugins/cube/CMakeLists.txt	2012-04-10 15:45:28 +0000
@@ -2,4 +2,4 @@
 
 include (CompizPlugin)
 
-compiz_plugin(cube PLUGINDEPS composite opengl)
\ No newline at end of file
+#compiz_plugin(cube PLUGINDEPS composite opengl)

=== modified file 'plugins/cube/src/cube.cpp'
--- plugins/cube/src/cube.cpp	2012-01-16 09:50:28 +0000
+++ plugins/cube/src/cube.cpp	2012-04-10 15:45:28 +0000
@@ -1123,7 +1123,6 @@
     if ((priv->mDesktopOpacity != OPAQUE) || (color[3] != OPAQUE))
     {
 	priv->gScreen->setTexEnvMode (GL_MODULATE);
-	glEnable (GL_BLEND);
 	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
 
@@ -1149,7 +1148,6 @@
     glEnableClientState (GL_TEXTURE_COORD_ARRAY);
 
     priv->gScreen->setTexEnvMode (GL_REPLACE);
-    glDisable (GL_BLEND);
     glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 }
 
@@ -1190,7 +1188,6 @@
     if ((priv->mDesktopOpacity != OPAQUE) || (color[3] != OPAQUE))
     {
 	priv->gScreen->setTexEnvMode (GL_MODULATE);
-	glEnable (GL_BLEND);
 	glBlendFunc (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
     }
 
@@ -1206,7 +1203,6 @@
     glEnableClientState (GL_TEXTURE_COORD_ARRAY);
 
     priv->gScreen->setTexEnvMode (GL_REPLACE);
-    glDisable (GL_BLEND);
     glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 }
 

=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-04-08 10:09:51 +0000
+++ plugins/decor/src/decor.cpp	2012-04-10 15:45:28 +0000
@@ -177,15 +177,13 @@
  */
 
 bool
-DecorWindow::glDraw (const GLMatrix     &transform,
-		     GLFragment::Attrib &attrib,
-		     const CompRegion   &region,
-		     unsigned int       mask)
+DecorWindow::glDraw (const GLMatrix            &transform,
+		     const GLWindowPaintAttrib &attrib,
+		     const CompRegion          &region,
+		     unsigned int              mask)
 {
     bool status;
 
-    status = gWindow->glDraw (transform, attrib, region, mask);
-
     /* Don't render dock decorations (shadows) on just any old window */
     if (!(window->type () & CompWindowTypeDockMask))
     {
@@ -205,16 +203,19 @@
 	}
     }
 
+    status = gWindow->glDraw (transform, attrib, region, mask);
+
     return status;
 }
 
 void
-DecorWindow::glDecorate (const GLMatrix     &transform,
-		         GLFragment::Attrib &attrib,
-		         const CompRegion   &region,
-		         unsigned int       mask)
+DecorWindow::glDecorate (const GLMatrix            &transform,
+			 const GLWindowPaintAttrib &attrib,
+			 const CompRegion          &region,
+			 unsigned int              mask)
 {
     const CompRegion *preg = NULL;
+    GLboolean isBlendingEnabled;
 
     if ((mask & (PAINT_WINDOW_ON_TRANSFORMED_SCREEN_MASK |
 		 PAINT_WINDOW_WITH_OFFSET_MASK)))
@@ -241,7 +242,7 @@
 	GLTexture::MatrixList ml (1);
 	mask |= PAINT_WINDOW_BLEND_MASK;
 
-	gWindow->geometry ().reset ();
+	gWindow->vertexBuffer ()->begin ();
 
 	for (int i = 0; i < wd->nQuad; i++)
 	{
@@ -258,9 +259,14 @@
 	    }
 	}
 
-	if (gWindow->geometry ().vCount)
-	    gWindow->glDrawTexture (wd->decor->texture->textures[0],
-				    attrib, mask);
+	gWindow->vertexBuffer ()->end ();
+
+	glGetBooleanv (GL_BLEND, &isBlendingEnabled);
+	glEnable (GL_BLEND);
+	gWindow->glDrawTexture (wd->decor->texture->textures[0], transform,
+	                        attrib, mask);
+	if (!isBlendingEnabled)
+	    glDisable (GL_BLEND);
     }
     else if (wd && !reg.isEmpty () &&
 	     wd->decor->type == WINDOW_DECORATION_TYPE_WINDOW)
@@ -272,14 +278,18 @@
 	if (gWindow->textures ().empty ())
 	    return;
 
+	glGetBooleanv (GL_BLEND, &isBlendingEnabled);
+	glEnable (GL_BLEND);
+
 	if (gWindow->textures ().size () == 1)
 	{
 	    ml[0] = gWindow->matrices ()[0];
-	    gWindow->geometry ().reset ();
+	    gWindow->vertexBuffer ()->begin ();
 	    gWindow->glAddGeometry (ml, window->frameRegion (), reg);
+	    gWindow->vertexBuffer ()->end ();
 
-	    if (gWindow->geometry ().vCount)
-		gWindow->glDrawTexture (gWindow->textures ()[0], attrib, mask);
+	    gWindow->glDrawTexture (gWindow->textures ()[0], transform,
+	                            attrib, mask);
 	}
 	else
 	{
@@ -288,14 +298,17 @@
 	    for (unsigned int i = 0; i < gWindow->textures ().size (); i++)
 	    {
 		ml[0] = gWindow->matrices ()[i];
-		gWindow->geometry ().reset ();
+		gWindow->vertexBuffer ()->begin ();
 		gWindow->glAddGeometry (ml, regions[i], reg);
+		gWindow->vertexBuffer ()->end ();
 
-		if (gWindow->geometry ().vCount)
-		    gWindow->glDrawTexture (gWindow->textures ()[i], attrib,
-					    mask);
+		gWindow->glDrawTexture (gWindow->textures ()[i], transform,
+		                        attrib, mask);
 	    }
 	}
+
+	if (!isBlendingEnabled)
+	    glDisable (GL_BLEND);
     }
 }
 

=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2012-03-30 14:29:18 +0000
+++ plugins/decor/src/decor.h	2012-04-10 15:45:28 +0000
@@ -252,10 +252,10 @@
 
 	void computeShadowRegion ();
 
-	bool glDraw (const GLMatrix &, GLFragment::Attrib &,
+	bool glDraw (const GLMatrix &, const GLWindowPaintAttrib &,
 		     const CompRegion &, unsigned int);
-	void glDecorate (const GLMatrix &, GLFragment::Attrib &,
-		         const CompRegion &, unsigned int);
+	void glDecorate (const GLMatrix &, const GLWindowPaintAttrib &,
+			 const CompRegion &, unsigned int);
 
 	void windowNotify (CompWindowNotify n);
 

=== modified file 'plugins/imgsvg/src/imgsvg.cpp'
--- plugins/imgsvg/src/imgsvg.cpp	2012-01-18 16:26:45 +0000
+++ plugins/imgsvg/src/imgsvg.cpp	2012-04-10 15:45:28 +0000
@@ -220,12 +220,12 @@
 }
 
 bool
-SvgWindow::glDraw (const GLMatrix     &transform,
-		   GLFragment::Attrib &fragment,
-		   const CompRegion   &region,
-		   unsigned int       mask)
+SvgWindow::glDraw (const GLMatrix            &transform,
+		   const GLWindowPaintAttrib &attrib,
+		   const CompRegion          &region,
+		   unsigned int              mask)
 {
-    bool status = gWindow->glDraw (transform, fragment, region, mask);
+    bool status = gWindow->glDraw (transform, attrib, region, mask);
 
     if (!status)
 	return status;
@@ -251,13 +251,15 @@
 	{
 	    matrix[0] = context->texture[0].matrices[i];
 
-	    gWindow->geometry ().reset ();
+	    gWindow->vertexBuffer ()->begin ();
 	    gWindow->glAddGeometry (matrix, context->box, reg);
+	    gWindow->vertexBuffer ()->end ();
 
 	    if (mask & PAINT_WINDOW_TRANSLUCENT_MASK)
 		mask |= PAINT_WINDOW_BLEND_MASK;
 
-	    gWindow->glDrawTexture (context->texture[0].textures[i], fragment, mask);
+	    gWindow->glDrawTexture (context->texture[0].textures[i], transform,
+	                            attrib, mask);
 
 	    if (rect.width () > 0 && rect.height () > 0)
 	    {
@@ -321,11 +323,12 @@
 		    saveFilter = gScreen->filter (SCREEN_TRANS_FILTER);
 		    gScreen->setFilter (SCREEN_TRANS_FILTER, GLTexture::Good);
 
-		    gWindow->geometry ().reset ();
+		    gWindow->vertexBuffer ()->begin ();
 		    gWindow->glAddGeometry (matrix, r, reg);
+		    gWindow->vertexBuffer ()->end ();
 
 		    gWindow->glDrawTexture (context->texture[1].textures[j],
-					    fragment, mask);
+					    transform, attrib, mask);
 
 		    gScreen->setFilter (SCREEN_TRANS_FILTER, saveFilter);
 		}

=== modified file 'plugins/imgsvg/src/imgsvg.h'
--- plugins/imgsvg/src/imgsvg.h	2012-01-18 16:26:45 +0000
+++ plugins/imgsvg/src/imgsvg.h	2012-04-10 15:45:28 +0000
@@ -76,7 +76,8 @@
 	SvgWindow (CompWindow *window);
 	~SvgWindow ();
 
-	bool glDraw (const GLMatrix &transform, GLFragment::Attrib &fragment,
+	bool glDraw (const GLMatrix &transform,
+		     const GLWindowPaintAttrib &attrib,
 		     const CompRegion &region, unsigned int mask);
 	void moveNotify (int dx, int dy, bool immediate);
 	void resizeNotify (int dx, int dy, int dwidth, int dheight);

=== modified file 'plugins/obs/src/obs.cpp'
--- plugins/obs/src/obs.cpp	2010-07-02 02:49:24 +0000
+++ plugins/obs/src/obs.cpp	2012-04-10 15:45:28 +0000
@@ -151,29 +151,30 @@
 	 we wrap into glDrawWindow here */
 
 bool
-ObsWindow::glDraw (const GLMatrix&     transform,
-		   GLFragment::Attrib& attrib,
-		   const CompRegion&   region,
-		   unsigned int        mask)
+ObsWindow::glDraw (const GLMatrix            &transform,
+		   const GLWindowPaintAttrib &attrib,
+		   const CompRegion          &region,
+		   unsigned int              mask)
 {
+    GLWindowPaintAttrib wAttrib (attrib);
     int factor;
 
     factor = customFactor[MODIFIER_OPACITY];
     if (factor != 100)
     {
-	attrib.setOpacity (factor * attrib.getOpacity () / 100);
+	wAttrib.opacity = factor * wAttrib.opacity / 100;
 	mask |= PAINT_WINDOW_TRANSLUCENT_MASK;
     }
 
     factor = customFactor[MODIFIER_BRIGHTNESS];
     if (factor != 100)
-	attrib.setBrightness (factor * attrib.getBrightness () / 100);
+	wAttrib.brightness = factor * wAttrib.brightness / 100;
 
     factor = customFactor[MODIFIER_SATURATION];
     if (factor != 100)
-	attrib.setSaturation (factor * attrib.getSaturation () / 100);
+	wAttrib.saturation = factor * wAttrib.saturation / 100;
 
-    return gWindow->glDraw (transform, attrib, region, mask);
+    return gWindow->glDraw (transform, wAttrib, region, mask);
 }
 
 void

=== modified file 'plugins/obs/src/obs.h'
--- plugins/obs/src/obs.h	2012-01-18 16:26:45 +0000
+++ plugins/obs/src/obs.h	2012-04-10 15:45:28 +0000
@@ -66,7 +66,7 @@
 
 	bool glPaint (const GLWindowPaintAttrib &, const GLMatrix &,
 		      const CompRegion &, unsigned int);
-	bool glDraw (const GLMatrix &, GLFragment::Attrib &,
+	bool glDraw (const GLMatrix &, const GLWindowPaintAttrib &,
 		     const CompRegion &, unsigned int);
 
 	void changePaintModifier (unsigned int, int);

=== modified file 'plugins/opengl/CMakeLists.txt'
--- plugins/opengl/CMakeLists.txt	2009-03-15 05:09:18 +0000
+++ plugins/opengl/CMakeLists.txt	2012-04-10 15:45:28 +0000
@@ -2,7 +2,12 @@
 
 include (CompizPlugin)
 
-find_package (OpenGL)
-if (OPENGL_FOUND)
-    compiz_plugin(opengl PLUGINDEPS composite LIBRARIES ${OPENGL_gl_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
-endif ()
\ No newline at end of file
+if (USE_GLES)
+    compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD "-DUSE_GLES -std=c++0x" LIBRARIES ${OPENGLES2_LIBRARIES} INCDIRS ${OPENGLES2_INCLUDE_DIR})
+else (USE_GLES)
+    find_package (OpenGL)
+    if (OPENGL_FOUND)
+	compiz_plugin(opengl PLUGINDEPS composite CFLAGSADD -std=c++0x LIBRARIES ${OPENGL_gl_LIBRARY} INCDIRS ${OPENGL_INCLUDE_DIR})
+    endif (OPENGL_FOUND)
+endif (USE_GLES)
+

=== modified file 'plugins/opengl/compiz-opengl.pc.in'
--- plugins/opengl/compiz-opengl.pc.in	2009-03-15 05:09:18 +0000
+++ plugins/opengl/compiz-opengl.pc.in	2012-04-10 15:45:28 +0000
@@ -8,5 +8,5 @@
 Version: @VERSION@
 
 Requires: compiz compiz-composite
-Libs: -lGL -L${libdir} -lopengl
-Cflags: @COMPIZ_CFLAGS@ -I${includedir}/compiz
\ No newline at end of file
+Libs: @PKGCONFIG_LIBS@ -L${libdir} -lopengl
+Cflags: @COMPIZ_CFLAGS@ -I${includedir}/compiz

=== removed file 'plugins/opengl/include/opengl/fragment.h'
--- plugins/opengl/include/opengl/fragment.h	2012-01-18 16:26:45 +0000
+++ plugins/opengl/include/opengl/fragment.h	1970-01-01 00:00:00 +0000
@@ -1,125 +0,0 @@
-/*
- * Copyright © 2008 Dennis Kasprzyk
- * Copyright © 2007 Novell, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Dennis Kasprzyk not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Dennis Kasprzyk makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * DENNIS KASPRZYK DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL DENNIS KASPRZYK BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Authors: Dennis Kasprzyk <[e-mail]>
- *          David Reveman <[e-mail]>
- */
-
-#ifndef _GLFRAGMENT_H
-#define _GLFRAGMENT_H
-
-#define MAX_FRAGMENT_FUNCTIONS 16
-
-#define COMP_FETCH_TARGET_2D   0
-#define COMP_FETCH_TARGET_RECT 1
-#define COMP_FETCH_TARGET_NUM  2
-
-struct GLWindowPaintAttrib;
-class GLScreen;
-class GLTexture;
-
-/**
- * Describes a texture modification fragment program
- * for a texture
- */
-namespace GLFragment {
-
-    class Storage;
-
-    typedef unsigned int FunctionId;
-
-    class PrivateFunctionData;
-    class PrivateAttrib;
-
-    class FunctionData {
-	public:
-	    FunctionData ();
-	    ~FunctionData ();
-
-	    /**
-	     * Returns the status of this fragment program
-	     * (valid or invalid)
-	     */
-	    bool status ();
-
-	    void addTempHeaderOp (const char *name);
-
-	    void addParamHeaderOp (const char *name);
-
-	    void addAttribHeaderOp (const char *name);
-
-
-	    void addFetchOp (const char *dst, const char *offset, int target);
-
-	    void addColorOp (const char *dst, const char *src);
-
-	    void addDataOp (const char *str, ...);
-
-	    void addBlendOp (const char *str, ...);
-
-	    FunctionId createFragmentFunction (const char *name);
-
-	private:
-	    PrivateFunctionData *priv;
-    };
-
-    class Attrib {
-	public:
-	    Attrib (const GLWindowPaintAttrib &paint);
-	    Attrib (const Attrib&);
-	    ~Attrib ();
-
-	    Attrib &operator= (const Attrib &rhs);
-
-	    unsigned int allocTextureUnits (unsigned int nTexture);
-
-	    unsigned int allocParameters (unsigned int nParam);
-
-	    void addFunction (FunctionId function);
-
-	    bool enable (bool *blending);
-	    void disable ();
-
-	    unsigned short getSaturation ();
-	    unsigned short getBrightness ();
-	    unsigned short getOpacity ();
-
-	    void setSaturation (unsigned short);
-	    void setBrightness (unsigned short);
-	    void setOpacity (unsigned short);
-
-	    bool hasFunctions ();
-
-	private:
-	    PrivateAttrib *priv;
-    };
-
-    void destroyFragmentFunction (FunctionId id);
-
-    FunctionId getSaturateFragmentFunction (GLTexture *texture,
-					    int       param);
-};
-
-
-
-#endif

=== added file 'plugins/opengl/include/opengl/framebufferobject.h'
--- plugins/opengl/include/opengl/framebufferobject.h	1970-01-01 00:00:00 +0000
+++ plugins/opengl/include/opengl/framebufferobject.h	2012-04-10 15:45:28 +0000
@@ -0,0 +1,107 @@
+/*
+ * Copyright (c) 2011 Collabora, Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Collabora Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Collabora Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * COLLABORA LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL COLLABORA LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Pekka Paalanen <[e-mail]>
+ */
+
+#ifndef _COMPIZ_GLFRAMEBUFFEROBJECT_H
+#define _COMPIZ_GLFRAMEBUFFEROBJECT_H
+
+#include <opengl/opengl.h>
+
+struct PrivateGLFramebufferObject;
+
+/**
+ * Class representing a framebuffer object in GL, supporting only one
+ * color attachment as per GLES 2 spec. The color attachment is referred
+ * to as the texture (of the FBO).
+ *
+ * Usage:
+ * 1. create a GLFramebufferObject (requires a GL context)
+ * 2. call allocate (size), and check status ()
+ * 3. old = bind ()
+ * 4. do your rendering
+ * 5. rebind (old)
+ * 6. use the rendered texture via tex ()
+ * 7. go to 2 or 3, or delete to quit (requires a GL context)
+ *
+ * TODO: add depth/stencil attachments
+ * FIXME: written for OpenGL ES 2 only, desktop OpenGL might not work.
+ */
+class GLFramebufferObject
+{
+    public:
+	GLFramebufferObject ();
+	~GLFramebufferObject ();
+
+	/**
+	 * Ensure the texture is of the given size, recreating it if needed,
+	 * and replace the FBO color attachment with it. The texture contents
+	 * become undefined, unless specified in the 'image' argument.
+	 * When specifying 'image', it's also possible to pass-in the
+	 * desired image's 'format' and 'type'.
+	 *
+	 * Returns true on success, and false on texture allocation failure.
+	 */
+	bool allocate (const CompSize &size,
+		       const char *image = NULL,
+		       GLenum format = GL_RGBA,
+		       GLenum type = GL_UNSIGNED_BYTE);
+
+	/**
+	 * Bind this as the current FBO, previous binding in GL context is
+	 * undone. GL rendering is now targeted to this FBO.
+	 * Returns a pointer to the previously bound FBO, or NULL if
+	 * the previous binding was zero (the window system provided
+	 * framebuffer).
+	 *
+	 * The previous FBO is no longer bound, so you can use its
+	 * texture. To restore the previous FBO, call rebind (FBO) with
+	 * the returned pointer as the argument.
+	 */
+	GLFramebufferObject *bind ();
+
+	/**
+	 * Bind the given FBO as the current FBO, without looking up the
+	 * previous binding. The argument can be NULL, in which case the
+	 * window system provided framebuffer gets bound (FBO is unbound).
+	 */
+	static void rebind (GLFramebufferObject *fbo);
+
+	/**
+	 * Check the FBO completeness. Returns true on complete.
+	 * Otherwise returns false and reports the error to log.
+	 */
+	bool checkStatus ();
+
+	/**
+	 * Return a pointer to the texture that is the color attachment.
+	 * This will return NULL, if allocate () has not been called, or
+	 * the last allocate () call failed.
+	 */
+	GLTexture *tex ();
+
+    private:
+	PrivateGLFramebufferObject *priv;
+};
+
+#endif // _COMPIZ_GLFRAMEBUFFEROBJECT_H

=== modified file 'plugins/opengl/include/opengl/matrix.h'
--- plugins/opengl/include/opengl/matrix.h	2009-03-15 05:09:18 +0000
+++ plugins/opengl/include/opengl/matrix.h	2012-04-10 15:45:28 +0000
@@ -44,6 +44,8 @@
 	void reset ();
 	void toScreenSpace (const CompOutput *output, float z);
 
+	bool invert ();
+
 	void rotate (const float angle, const float x,
 		     const float y, const float z);
 	void rotate (const float angle, const GLVector& vector);

=== modified file 'plugins/opengl/include/opengl/opengl.h'
--- plugins/opengl/include/opengl/opengl.h	2012-01-20 09:05:56 +0000
+++ plugins/opengl/include/opengl/opengl.h	2012-04-10 15:45:28 +0000
@@ -28,16 +28,45 @@
 #ifndef _COMPIZ_OPENGL_H
 #define _COMPIZ_OPENGL_H
 
+#ifdef USE_GLES
+#define SUPPORT_X11
+#include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
+#include <EGL/egl.h>
+#include <EGL/eglext.h>
+#else
 #include <GL/gl.h>
 #include <GL/glx.h>
+#endif
+
+#include <core/size.h>
+#include <core/pluginclasshandler.h>
 
 #include <opengl/matrix.h>
 #include <opengl/texture.h>
-#include <opengl/fragment.h>
+#include <opengl/framebufferobject.h>
+#include <opengl/vertexbuffer.h>
+#include <opengl/program.h>
+#include <opengl/programcache.h>
+#include <opengl/shadercache.h>
 
 #define COMPIZ_OPENGL_ABI 4
 
-#include <core/pluginclasshandler.h>
+#if !defined(GL_BGRA)
+    #if !defined(GL_BGRA_EXT)
+	#error GL_BGRA support is required
+    #else
+	#define GL_BGRA GL_BGRA_EXT
+    #endif
+#endif
+
+#if !defined(GL_BGRA)
+    #if !defined(GL_BGRA_EXT)
+	#error GL_BGRA support is required
+    #else
+	#define GL_BGRA GL_BGRA_EXT
+    #endif
+#endif
 
 /**
  * camera distance from screen, 0.5 * tan (FOV)
@@ -75,8 +104,26 @@
 #endif
 
 namespace GL {
-
+    #ifdef USE_GLES
+    typedef EGLImageKHR (*EGLCreateImageKHRProc)  (EGLDisplay dpy,
+                                                   EGLContext ctx,
+                                                   EGLenum target,
+                                                   EGLClientBuffer buffer,
+                                                   const EGLint *attrib_list);
+    typedef EGLBoolean  (*EGLDestroyImageKHRProc) (EGLDisplay dpy,
+                                                   EGLImageKHR image);
+
+    typedef void (*GLEGLImageTargetTexture2DOESProc) (GLenum target,
+                                                      GLeglImageOES image);
+
+    typedef EGLBoolean (*EGLPostSubBufferNVProc) (EGLDisplay dpy,
+						  EGLSurface surface,
+						  EGLint x, EGLint y,
+						  EGLint width, EGLint height);
+
+    #else
     typedef void (*FuncPtr) (void);
+
     typedef FuncPtr (*GLXGetProcAddressProc) (const GLubyte *procName);
 
     typedef void    (*GLXBindTexImageProc)    (Display	 *display,
@@ -122,11 +169,6 @@
 					      const int   *attribList);
     typedef void      (*GLXDestroyPixmapProc) (Display *display,
     					       GLXPixmap pixmap);
-
-    typedef void (*GLActiveTextureProc) (GLenum texture);
-    typedef void (*GLClientActiveTextureProc) (GLenum texture);
-    typedef void (*GLMultiTexCoord2fProc) (GLenum, GLfloat, GLfloat);
-
     typedef void (*GLGenProgramsProc) (GLsizei n,
 				       GLuint  *programs);
     typedef void (*GLDeleteProgramsProc) (GLsizei n,
@@ -146,11 +188,16 @@
     typedef void (*GLGetProgramivProc) (GLenum target,
 					GLenum pname,
 					int    *params);
+    #endif
+
+    typedef void (*GLActiveTextureProc) (GLenum texture);
+    typedef void (*GLClientActiveTextureProc) (GLenum texture);
+    typedef void (*GLMultiTexCoord2fProc) (GLenum, GLfloat, GLfloat);
 
     typedef void (*GLGenFramebuffersProc) (GLsizei n,
 					   GLuint  *framebuffers);
     typedef void (*GLDeleteFramebuffersProc) (GLsizei n,
-					      GLuint  *framebuffers);
+					      const GLuint  *framebuffers);
     typedef void (*GLBindFramebufferProc) (GLenum target,
 					   GLuint framebuffer);
     typedef GLenum (*GLCheckFramebufferStatusProc) (GLenum target);
@@ -161,6 +208,96 @@
 						GLint  level);
     typedef void (*GLGenerateMipmapProc) (GLenum target);
 
+    typedef void (*GLBindBufferProc) (GLenum target,
+                                      GLuint buffer);
+    typedef void (*GLDeleteBuffersProc) (GLsizei n,
+                                         const GLuint *buffers);
+    typedef void (*GLGenBuffersProc) (GLsizei n,
+                                      GLuint *buffers);
+    typedef void (*GLBufferDataProc) (GLenum target,
+                                      GLsizeiptr size,
+                                      const GLvoid *data,
+                                      GLenum usage);
+    typedef void (*GLBufferSubDataProc) (GLenum target,
+                                         GLintptr offset,
+                                         GLsizeiptr size,
+                                         const GLvoid *data);
+
+    typedef void (*GLGetShaderivProc) (GLuint shader,
+                                       GLenum pname,
+                                       GLint *params);
+    typedef void (*GLGetShaderInfoLogProc) (GLuint shader,
+                                            GLsizei bufsize,
+                                            GLsizei *length,
+                                            GLchar *infoLog);
+    typedef void (*GLGetProgramivProc) (GLuint program,
+                                        GLenum pname,
+                                        GLint* params);
+    typedef void (*GLGetProgramInfoLogProc) (GLuint program,
+                                             GLsizei bufsize,
+                                             GLsizei *length,
+                                             GLchar *infoLog);
+    typedef GLuint (*GLCreateShaderProc) (GLenum type);
+    typedef void (*GLShaderSourceProc) (GLuint shader,
+                                        GLsizei count,
+                                        const GLchar **string,
+                                        const GLint* length);
+    typedef void (*GLCompileShaderProc) (GLuint shader);
+    typedef GLuint (*GLCreateProgramProc) ();
+    typedef void (*GLAttachShaderProc) (GLuint program,
+                                        GLuint shader);
+    typedef void (*GLLinkProgramProc) (GLuint program);
+    typedef void (*GLValidateProgramProc) (GLuint program);
+    typedef void (*GLDeleteShaderProc) (GLuint shader);
+    typedef void (*GLDeleteProgramProc) (GLuint program);
+    typedef void (*GLUseProgramProc) (GLuint program);
+    typedef int  (*GLGetUniformLocationProc) (GLuint program,
+                                              const GLchar* name);
+    typedef void (*GLUniform1fProc) (GLint location, GLfloat x);
+    typedef void (*GLUniform1iProc) (GLint location, GLint x);
+    typedef void (*GLUniform2fProc) (GLint location, GLfloat x, GLfloat y);
+    typedef void (*GLUniform3fProc) (GLint location,
+                                     GLfloat x,
+                                     GLfloat y,
+                                     GLfloat z);
+    typedef void (*GLUniform4fProc) (GLint location,
+                                     GLfloat x,
+                                     GLfloat y,
+                                     GLfloat z,
+                                     GLfloat w);
+    typedef void (*GLUniform2iProc) (GLint location, GLint x, GLint y);
+    typedef void (*GLUniform3iProc) (GLint location,
+                                     GLint x,
+                                     GLint y,
+                                     GLint z);
+    typedef void (*GLUniform4iProc) (GLint location,
+                                     GLint x,
+                                     GLint y,
+                                     GLint z,
+                                     GLint w);
+    typedef void (*GLUniformMatrix4fvProc) (GLint location,
+                                            GLsizei count,
+                                            GLboolean transpose,
+                                            const GLfloat *value);
+    typedef int (*GLGetAttribLocationProc) (GLuint program,
+                                            const GLchar *name);
+
+    typedef void (*GLEnableVertexAttribArrayProc) (GLuint index);
+    typedef void (*GLDisableVertexAttribArrayProc) (GLuint index);
+    typedef void (*GLVertexAttribPointerProc) (GLuint index,
+                                               GLint size,
+                                               GLenum type,
+                                               GLboolean normalized,
+                                               GLsizei stride,
+                                               const GLvoid *ptr);
+
+    #ifdef USE_GLES
+    extern EGLCreateImageKHRProc  createImage;
+    extern EGLDestroyImageKHRProc destroyImage;
+
+    extern GLEGLImageTargetTexture2DOESProc eglImageTargetTexture;
+
+    #else
     extern GLXBindTexImageProc      bindTexImage;
     extern GLXReleaseTexImageProc   releaseTexImage;
     extern GLXQueryDrawableProc     queryDrawable;
@@ -172,11 +309,6 @@
     extern GLXGetFBConfigAttribProc getFBConfigAttrib;
     extern GLXCreatePixmapProc      createPixmap;
     extern GLXDestroyPixmapProc     destroyPixmap;
-
-    extern GLActiveTextureProc       activeTexture;
-    extern GLClientActiveTextureProc clientActiveTexture;
-    extern GLMultiTexCoord2fProc     multiTexCoord2f;
-
     extern GLGenProgramsProc        genPrograms;
     extern GLDeleteProgramsProc     deletePrograms;
     extern GLBindProgramProc        bindProgram;
@@ -184,6 +316,11 @@
     extern GLProgramParameter4fProc programEnvParameter4f;
     extern GLProgramParameter4fProc programLocalParameter4f;
     extern GLGetProgramivProc       getProgramiv;
+    #endif
+
+    extern GLActiveTextureProc       activeTexture;
+    extern GLClientActiveTextureProc clientActiveTexture;
+    extern GLMultiTexCoord2fProc     multiTexCoord2f;
 
     extern GLGenFramebuffersProc        genFramebuffers;
     extern GLDeleteFramebuffersProc     deleteFramebuffers;
@@ -192,16 +329,56 @@
     extern GLFramebufferTexture2DProc   framebufferTexture2D;
     extern GLGenerateMipmapProc         generateMipmap;
 
+    extern GLBindBufferProc    bindBuffer;
+    extern GLDeleteBuffersProc deleteBuffers;
+    extern GLGenBuffersProc    genBuffers;
+    extern GLBufferDataProc    bufferData;
+    extern GLBufferSubDataProc bufferSubData;
+
+
+    extern GLGetShaderivProc        getShaderiv;
+    extern GLGetShaderInfoLogProc   getShaderInfoLog;
+    extern GLGetProgramivProc       getProgramiv;
+    extern GLGetProgramInfoLogProc  getProgramInfoLog;
+    extern GLCreateShaderProc       createShader;
+    extern GLShaderSourceProc       shaderSource;
+    extern GLCompileShaderProc      compileShader;
+    extern GLCreateProgramProc      createProgram;
+    extern GLAttachShaderProc       attachShader;
+    extern GLLinkProgramProc        linkProgram;
+    extern GLValidateProgramProc    validateProgram;
+    extern GLDeleteShaderProc       deleteShader;
+    extern GLDeleteProgramProc      deleteProgram;
+    extern GLUseProgramProc         useProgram;
+    extern GLGetUniformLocationProc getUniformLocation;
+    extern GLUniform1fProc          uniform1f;
+    extern GLUniform1iProc          uniform1i;
+    extern GLUniform2fProc          uniform2f;
+    extern GLUniform2iProc          uniform2i;
+    extern GLUniform3fProc          uniform3f;
+    extern GLUniform3iProc          uniform3i;
+    extern GLUniform4fProc          uniform4f;
+    extern GLUniform4iProc          uniform4i;
+    extern GLUniformMatrix4fvProc   uniformMatrix4fv;
+    extern GLGetAttribLocationProc  getAttribLocation;
+
+    extern GLEnableVertexAttribArrayProc  enableVertexAttribArray;
+    extern GLDisableVertexAttribArrayProc disableVertexAttribArray;
+    extern GLVertexAttribPointerProc      vertexAttribPointer;
+
+
     extern bool  textureFromPixmap;
     extern bool  textureRectangle;
     extern bool  textureNonPowerOfTwo;
+    extern bool  textureNonPowerOfTwoMipmap;
     extern bool  textureEnvCombine;
     extern bool  textureEnvCrossbar;
     extern bool  textureBorderClamp;
     extern bool  textureCompression;
     extern GLint maxTextureSize;
     extern bool  fbo;
-    extern bool  fragmentProgram;
+    extern bool  vbo;
+    extern bool  shaders;
     extern GLint maxTextureUnits;
 
     extern bool canDoSaturated;
@@ -220,6 +397,7 @@
 
 #define MAX_DEPTH 32
 
+#ifndef USE_GLES
 struct GLFBConfig {
     GLXFBConfig fbConfig;
     int         yInverted;
@@ -227,6 +405,7 @@
     int         textureFormat;
     int         textureTargets;
 };
+#endif
 
 #define NOTHING_TRANS_FILTER 0
 #define SCREEN_TRANS_FILTER  1
@@ -236,6 +415,7 @@
 extern GLScreenPaintAttrib defaultScreenPaintAttrib;
 
 class GLScreen;
+class GLFramebufferObject;
 
 class GLScreenInterface :
     public WrapableInterface<GLScreen, GLScreenInterface>
@@ -302,11 +482,24 @@
 					     CompOutput *);
 	virtual void glDisableOutputClipping ();
 
+	virtual GLMatrix *projectionMatrix ();
+
+	/**
+	 * Hookable function used by plugins to shade the final composited
+	 * Output.
+	 *
+	 * @param tmpRegion Describes the final composited output region
+	 * @param scratchFbo Describes the final composited FBO that is
+	 * to be rendered.
+	 */
+	virtual void glPaintCompositedOutput (const CompRegion    &region,
+					      GLFramebufferObject *fbo,
+					      unsigned int         mask);
 };
 
 
 class GLScreen :
-    public WrapableHandler<GLScreenInterface, 6>,
+    public WrapableHandler<GLScreenInterface, 7>,
     public PluginClassHandler<GLScreen, CompScreen, COMPIZ_OPENGL_ABI>,
     public CompOption::Class
 {
@@ -332,7 +525,9 @@
 	/**
 	 * Gets the libGL address of a particular openGL functor
 	 */
+	#ifndef USE_GLES
 	GL::FuncPtr getProcAddress (const char *name);
+	#endif
 
 	void updateBackground ();
 
@@ -346,8 +541,6 @@
 	 */
 	void setFilter (int, GLTexture::Filter);
 
-	GLFragment::Storage * fragmentStorage ();
-
 	/**
 	 * Sets a new compiz-wid openGL texture environment mode
 	 */
@@ -356,7 +549,6 @@
 	/**
 	 * Turns lighting on and off
 	 */
-
 	void setLighting (bool lighting);
 
 	/**
@@ -371,7 +563,28 @@
 	GLTexture::BindPixmapHandle registerBindPixmap (GLTexture::BindPixmapProc);
 	void unregisterBindPixmap (GLTexture::BindPixmapHandle);
 
+	#ifndef USE_GLES
 	GLFBConfig * glxPixmapFBConfig (unsigned int depth);
+	#endif
+
+	#ifdef USE_GLES
+	EGLContext getEGLContext ();
+	#endif
+
+	/**
+	 * Returns a GLProgram from the cache or creates one and caches it
+	 */
+	GLProgram *getProgram (std::list<const GLShaderData*>);
+
+	/**
+	 * Returns a GLShaderData from the cache or creates one and caches it
+	 */
+	const GLShaderData *getShaderData (GLShaderParameters &params);
+
+	/**
+	 * Returns the FBO compiz is using for the screen
+	 */
+	GLFramebufferObject *fbo ();
 
 	/**
 	 * Returns a default icon texture
@@ -380,12 +593,6 @@
 
 	void resetRasterPos ();
 
-	/**
-	 * Returns a 4x4 const float array which
-	 * represents the current projection matrix
-	 */
-	const float * projectionMatrix ();
-
 	bool glInitContext (XVisualInfo *);
 
 	WRAPABLE_HND (0, GLScreenInterface, bool, glPaintOutput,
@@ -402,7 +609,12 @@
 		      const GLMatrix &, const CompRegion &, CompOutput *);
 	WRAPABLE_HND (4, GLScreenInterface, void, glDisableOutputClipping);
 
+	WRAPABLE_HND (5, GLScreenInterface, GLMatrix *, projectionMatrix);
+	WRAPABLE_HND (6, GLScreenInterface, void, glPaintCompositedOutput,
+		      const CompRegion &, GLFramebufferObject *, unsigned int);
+
 	friend class GLTexture;
+	friend class GLWindow;
 
     private:
 	PrivateGLScreen *priv;
@@ -453,10 +665,10 @@
 	 * @param region Describes which region will be drawn
 	 * @param mask   Bitmask which describes how this window is drawn
 	 */
-	virtual bool glDraw (const GLMatrix 	&matrix,
-			     GLFragment::Attrib &attrib,
-			     const CompRegion 	&region,
-			     unsigned int	mask);
+	virtual bool glDraw (const GLMatrix 	       &matrix,
+			     const GLWindowPaintAttrib &attrib,
+			     const CompRegion 	       &region,
+			     unsigned int              mask);
 
 	/**
 	 * Hookable function to add points to a window
@@ -479,51 +691,18 @@
 				    const CompRegion 		&clipRegion,
 				    unsigned int		min = MAXSHORT,
 				    unsigned int		max = MAXSHORT);
-	virtual void glDrawTexture (GLTexture *texture, GLFragment::Attrib &,
-				    unsigned int);
-	virtual void glDrawGeometry ();
+	virtual void glDrawTexture (GLTexture *texture, const GLMatrix &,
+	                            const GLWindowPaintAttrib &, unsigned int);
 };
 
 class GLWindow :
-    public WrapableHandler<GLWindowInterface, 5>,
+    public WrapableHandler<GLWindowInterface, 4>,
     public PluginClassHandler<GLWindow, CompWindow, COMPIZ_OPENGL_ABI>
 {
     public:
 
-	/**
-	 * Class which describes the texture geometry and transformation points
-	 * of a window
-	 */
-	class Geometry {
-	    public:
-		Geometry ();
-		~Geometry ();
-
-		void reset ();
-
-		/**
-		 * Set the number of vertices in the texture geometry
-		 */
-		bool moreVertices (int newSize);
-
-		/**
-		 * Set the number of indices in the texture geometry
-		 */
-		bool moreIndices (int newSize);
-
-	    public:
-		GLfloat  *vertices;
-		int      vertexSize;
-		int      vertexStride;
-		GLushort *indices;
-		int      indexSize;
-		int      vCount;
-		int      texUnits;
-		int      texCoordSize;
-		int      indexCount;
-	};
-
 	static GLWindowPaintAttrib defaultPaintAttrib;
+
     public:
 
 	GLWindow (CompWindow *w);
@@ -566,9 +745,20 @@
 	void updatePaintAttribs ();
 
 	/**
-	 * Returns the window texture geometry
-	 */
-	Geometry & geometry ();
+	 * Returns the window vertex buffer object
+	 */
+	GLVertexBuffer * vertexBuffer ();
+
+	/**
+	 * Add a vertex and/or fragment shader function to the pipeline.
+	 *
+	 * @param name Name of the plugin adding the functions
+	 * @param vertex_shader Function to add to the vertex shader
+	 * @param fragment_shader Function to add to the fragment shader
+	 */
+	void addShaders (std::string name,
+	                 std::string vertex_shader,
+	                 std::string fragment_shader);
 
 	GLTexture *getIcon (int width, int height);
 
@@ -576,20 +766,24 @@
 		      const GLWindowPaintAttrib &, const GLMatrix &,
 		      const CompRegion &, unsigned int);
 	WRAPABLE_HND (1, GLWindowInterface, bool, glDraw, const GLMatrix &,
-		      GLFragment::Attrib &, const CompRegion &, unsigned int);
+		      const GLWindowPaintAttrib &, const CompRegion &,
+	              unsigned int);
 	WRAPABLE_HND (2, GLWindowInterface, void, glAddGeometry,
 		      const GLTexture::MatrixList &, const CompRegion &,
 		      const CompRegion &,
 		      unsigned int = MAXSHORT, unsigned int = MAXSHORT);
 	WRAPABLE_HND (3, GLWindowInterface, void, glDrawTexture,
-		      GLTexture *texture, GLFragment::Attrib &, unsigned int);
-	WRAPABLE_HND (4, GLWindowInterface, void, glDrawGeometry);
+		      GLTexture *texture, const GLMatrix &,
+	              const GLWindowPaintAttrib &, unsigned int);
 
 	friend class GLScreen;
 	friend class PrivateGLScreen;
+	friend class SpewScreen;
+	friend class SpewWindow;
 
     private:
 	PrivateGLWindow *priv;
 };
 
 #endif
+

=== added file 'plugins/opengl/include/opengl/program.h'
--- plugins/opengl/include/opengl/program.h	1970-01-01 00:00:00 +0000
+++ plugins/opengl/include/opengl/program.h	2012-04-10 15:45:28 +0000
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2011 Linaro Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Linaro Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Linaro Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * LINARO LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL LINARO LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Travis Watkins <[e-mail]>
+ */
+
+#ifndef _COMPIZ_GLPROGRAM_H
+#define _COMPIZ_GLPROGRAM_H
+
+#ifdef USE_GLES
+#include <GLES2/gl2.h>
+#else
+#include <GL/gl.h>
+#endif
+
+#include <core/core.h>
+#include <opengl/matrix.h>
+
+class PrivateProgram;
+
+class GLProgram
+{
+    public:
+	GLProgram (CompString &vertexShader, CompString &fragmentShader);
+	~GLProgram ();
+
+	bool valid ();
+	void bind ();
+	void unbind ();
+
+	bool setUniform   (const char *name, GLfloat value);
+	bool setUniform   (const char *name, GLint value);
+	bool setUniform   (const char *name, const GLMatrix &value);
+	bool setUniform2f (const char *name, GLfloat x, GLfloat y);
+	bool setUniform3f (const char *name, GLfloat x, GLfloat y, GLfloat z);
+	bool setUniform4f (const char *name,
+	                   GLfloat x,
+	                   GLfloat y,
+	                   GLfloat z,
+                           GLfloat w);
+	bool setUniform2i (const char *name, GLint x, GLint y);
+	bool setUniform3i (const char *name, GLint x, GLint y, GLint z);
+	bool setUniform4i (const char *name,
+	                   GLint x,
+	                   GLint y,
+	                   GLint z,
+                           GLint w);
+
+	GLuint attributeLocation (const char *name);
+
+    private:
+	PrivateProgram *priv;
+};
+
+#endif // _COMPIZ_GLPROGRAM_H
+

=== added file 'plugins/opengl/include/opengl/programcache.h'
--- plugins/opengl/include/opengl/programcache.h	1970-01-01 00:00:00 +0000
+++ plugins/opengl/include/opengl/programcache.h	2012-04-10 15:45:28 +0000
@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2011 Linaro Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Linaro Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Linaro Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * LINARO LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL LINARO LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Travis Watkins <[e-mail]>
+ */
+
+#ifndef _COMPIZ_GLPROGRAMCACHE_H
+#define _COMPIZ_GLPROGRAMCACHE_H
+
+#include <string>
+#include <list>
+#include <map>
+#include <boost/bind.hpp>
+#include <opengl/program.h>
+
+class PrivateProgramCache;
+struct GLShaderData;
+
+class GLProgramCache
+{
+    private:
+	PrivateProgramCache *priv;
+
+    public:
+	GLProgramCache (size_t);
+	~GLProgramCache ();
+
+	GLProgram* operator () (std::list<const GLShaderData*>);
+};
+
+#endif // _COMPIZ_GLPROGRAMCACHE_H
+

=== added file 'plugins/opengl/include/opengl/shadercache.h'
--- plugins/opengl/include/opengl/shadercache.h	1970-01-01 00:00:00 +0000
+++ plugins/opengl/include/opengl/shadercache.h	2012-04-10 15:45:28 +0000
@@ -0,0 +1,100 @@
+/*
+ * Copyright © 2012 Linaro Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Linaro Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Linaro Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * LINARO LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL LINARO LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Alexandros Frantzis <[e-mail]>
+ */
+#ifndef GL_SHADER_CACHE_H_
+#define GL_SHADER_CACHE_H_
+
+#include <string>
+
+/**
+ * How to use a variable in a shader.
+ */
+enum GLShaderVariableType
+{
+    /** The variable is not used */
+    GLShaderVariableNone,
+    /** The variable value is held in a uniform */
+    GLShaderVariableUniform,
+    /** The variable value is held in a varying (from a vertex attribute) */
+    GLShaderVariableVarying,
+};
+
+/**
+ * Parameters that define a vertex-fragment shader pair.
+ */
+struct GLShaderParameters
+{
+    /** Whether this shader supports opacity */
+    bool opacity;
+    /** Whether this shader supports brightness */
+    bool brightness;
+    /** Whether this shader supports saturation */
+    bool saturation;
+    /** Whether this shader supports color and how */
+    GLShaderVariableType color;
+    /** Whether this shader supports normals and how */
+    GLShaderVariableType normal;
+    /** The number of textures this shader uses */
+    int numTextures;
+
+    /** Gets a minimalistic string representation of the parameters */
+    std::string id() const;
+    /** Gets a unique hash value for this set of parameters */
+    int hash() const;
+};
+
+/**
+ * An object representing a named vertex-fragment shader pair.
+ */
+struct GLShaderData
+{
+    std::string name;
+    std::string vertexShader;
+    std::string fragmentShader;
+};
+
+class PrivateShaderCache;
+
+/**
+ * A cache of vertex-fragment shader pairs (GLShaderData).
+ */
+class GLShaderCache
+{
+public:
+    GLShaderCache ();
+
+    /**
+     * Gets the GLShaderData associated with the specified parameters.
+     *
+     * @param params the parameters to get the GLShaderData for.
+     *
+     * @return the GLShaderData
+     */
+    const GLShaderData &getShaderData (const GLShaderParameters &params);
+
+private:
+    PrivateShaderCache *priv;
+};
+
+#endif

=== modified file 'plugins/opengl/include/opengl/texture.h'
--- plugins/opengl/include/opengl/texture.h	2012-01-18 16:26:45 +0000
+++ plugins/opengl/include/opengl/texture.h	2012-04-10 15:45:28 +0000
@@ -32,7 +32,12 @@
 #include "core/string.h"
 
 #include <X11/Xlib-xcb.h>
+
+#ifdef USE_GLES
+#include <GLES2/gl2.h>
+#else
 #include <GL/gl.h>
+#endif
 
 #include <boost/function.hpp>
 

=== modified file 'plugins/opengl/include/opengl/vector.h'
--- plugins/opengl/include/opengl/vector.h	2010-04-03 16:24:05 +0000
+++ plugins/opengl/include/opengl/vector.h	2012-04-10 15:45:28 +0000
@@ -40,7 +40,7 @@
 	} VectorCoordsEnum;
 
 	GLVector ();
-	GLVector (float x, float y, float z, float w);
+	GLVector (float x, float y, float z, float w = 0.0f);
 
 	/**
 	 * Returns a reference to the x, y, z or w value by using

=== added file 'plugins/opengl/include/opengl/vertexbuffer.h'
--- plugins/opengl/include/opengl/vertexbuffer.h	1970-01-01 00:00:00 +0000
+++ plugins/opengl/include/opengl/vertexbuffer.h	2012-04-10 15:45:28 +0000
@@ -0,0 +1,109 @@
+/*
+ * Copyright © 2011 Linaro Ltd.
+ *
+ * Permission to use, copy, modify, distribute, and sell this software
+ * and its documentation for any purpose is hereby granted without
+ * fee, provided that the above copyright notice appear in all copies
+ * and that both that copyright notice and this permission notice
+ * appear in supporting documentation, and that the name of
+ * Linaro Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Linaro Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * LINARO LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL LINARO LTD. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+ * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
+ * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
+ * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ *
+ * Authors: Travis Watkins <[e-mail]>
+ *          Frederic Plourde <[e-mail]>
+ */
+
+#ifndef _COMPIZ_GLVERTEXBUFFER_H
+#define _COMPIZ_GLVERTEXBUFFER_H
+
+#ifdef USE_GLES
+#include <GLES2/gl2.h>
+#else
+#include <GL/gl.h>
+#endif
+
+#include <core/core.h>
+#include <opengl/program.h>
+#include <opengl/shadercache.h>
+
+class PrivateVertexBuffer;
+struct GLWindowPaintAttrib;
+
+class GLVertexBuffer
+{
+    public:
+	class AutoProgram
+	{
+	public:
+	    virtual GLProgram *getProgram(GLShaderParameters &params) = 0;
+	};
+
+	GLVertexBuffer ();
+	GLVertexBuffer (GLenum usage);
+	~GLVertexBuffer ();
+
+	static GLVertexBuffer *streamingBuffer ();
+
+	void begin (GLenum primitiveType);
+	// default primitiveType is GL_TRIANGLES
+	void begin ();
+	int end ();
+
+	// vertices and normals are 3 parts, count is number of xyz groups
+	void addVertices (GLuint nVertices, GLfloat *vertices);
+	void addNormals (GLuint nNormals, GLfloat *normals);
+
+	// color is always RGBA (4 parts), count is number of rgba groups
+	void addColors (GLuint nColors, GLushort *colors);
+
+	// texture is index, texcoords are 2 parts, count is number of pairs
+	void addTexCoords (GLuint texture,
+	                   GLuint nTexcoords,
+	                   GLfloat *texcoords);
+
+	void addUniform (const char *name, GLfloat value);
+	void addUniform (const char *name, GLint value);
+	bool addUniform (const char *name, const GLMatrix &value);
+	void addUniform2f (const char *name, GLfloat x, GLfloat y);
+	void addUniform3f (const char *name, GLfloat x, GLfloat y, GLfloat z);
+	void addUniform4f (const char *name, GLfloat x, GLfloat y,
+			                     GLfloat z, GLfloat w);
+	void addUniform2i (const char *name, GLint x, GLint y);
+	void addUniform3i (const char *name, GLint x, GLint y, GLint z);
+	void addUniform4i (const char *name, GLint x, GLint y,
+			                     GLint z, GLint w);
+
+	void setProgram (GLProgram *program);
+
+	void setAutoProgram (AutoProgram *autoProgram);
+
+	// This no-argument render () function is intended for use by plugins
+	// that have custom programs.
+	int render ();
+
+	int render (const GLMatrix &modelview);
+
+	int render (const GLMatrix            &modelview,
+	            const GLWindowPaintAttrib &attrib);
+
+	int render (const GLMatrix            &projection,
+	            const GLMatrix            &modelview,
+	            const GLWindowPaintAttrib &attrib);
+
+    private:
+	PrivateVertexBuffer *priv;
+};
+
+#endif // _COMPIZ_GLVERTEXBUFFER_H
+

=== modified file 'plugins/opengl/opengl.xml.in'
--- plugins/opengl/opengl.xml.in	2011-10-13 14:30:20 +0000
+++ plugins/opengl/opengl.xml.in	2012-04-10 15:45:28 +0000
@@ -36,7 +36,7 @@
 	    <option name="sync_to_vblank" type="bool">
 		<_short>Sync To VBlank</_short>
 		<_long>Only perform screen updates during vertical blanking period</_long>
-		<default>true</default>
+		<default>false</default>
 	    </option>
 	    <option name="texture_compression" type="bool">
 		<_short>Texture Compression</_short>

=== removed file 'plugins/opengl/src/fragment.cpp'
--- plugins/opengl/src/fragment.cpp	2012-01-18 16:26:45 +0000
+++ plugins/opengl/src/fragment.cpp	1970-01-01 00:00:00 +0000
@@ -1,1146 +0,0 @@
-/*
- * Copyright © 2007 Novell, Inc.
- *
- * Permission to use, copy, modify, distribute, and sell this software
- * and its documentation for any purpose is hereby granted without
- * fee, provided that the above copyright notice appear in all copies
- * and that both that copyright notice and this permission notice
- * appear in supporting documentation, and that the name of
- * Novell, Inc. not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior permission.
- * Novell, Inc. makes no representations about the suitability of this
- * software for any purpose. It is provided "as is" without express or
- * implied warranty.
- *
- * NOVELL, INC. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
- * NO EVENT SHALL NOVELL, INC. BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
- * OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
- * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- *
- * Author: David Reveman <[e-mail]>
- */
-
-#include "privatefragment.h"
-#include "privates.h"
-
-#include "core/string.h"
-
-#include <boost/function.hpp>
-#include <boost/bind.hpp>
-#include <boost/foreach.hpp>
-#define foreach BOOST_FOREACH
-
-#include <opengl/texture.h>
-
-#include <string.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#define COMP_FUNCTION_TYPE_ARB 0
-#define COMP_FUNCTION_TYPE_NUM 1
-
-#define COMP_FUNCTION_ARB_MASK (1 << 0)
-#define COMP_FUNCTION_MASK     (COMP_FUNCTION_ARB_MASK)
-
-namespace GLFragment {
-
-    class Program {
-	public:
-	    Program () :
-		signature (0),
-		blending (false),
-		name (0),
-		type (GL_FRAGMENT_PROGRAM_ARB)
-	    {};
-	    ~Program ()
-	    {
-		if (name)
-		    (*GL::deletePrograms) (1, &name);
-	    };
-
-	public:
-	    std::vector<FunctionId> signature;
-
-	    bool blending;
-
-	    GLuint name;
-	    GLenum type;
-    };
-
-    typedef enum {
-	OpTypeData,
-	OpTypeDataStore,
-	OpTypeDataOffset,
-	OpTypeDataBlend,
-	OpTypeHeaderTemp,
-	OpTypeHeaderParam,
-	OpTypeHeaderAttrib,
-	OpTypeColor,
-	OpTypeFetch,
-	OpTypeLoad
-    } OpType;
-
-    class HeaderOp {
-	public:
-	    HeaderOp () : type (OpTypeHeaderTemp), name ("") {}
-	public:
-	    OpType     type;
-	    CompString name;
-    };
-
-    class BodyOp {
-	public:
-	    BodyOp () :
-		type (OpTypeData),
-		data (""),
-		dst (""),
-		src (""),
-	        target (0)
-	    {
-		foreach (CompString &str, noOffset)
-		    str = "";
-		foreach (CompString &str, offset)
-		    str = "";
-	    };
-
-	public:
-	    OpType       type;
-	    CompString   data;
-	    CompString   dst;
-	    CompString   src;
-	    unsigned int target;
-	    CompString   noOffset[COMP_FETCH_TARGET_NUM];
-	    CompString   offset[COMP_FETCH_TARGET_NUM];
-
-    };
-
-    class PrivateFunctionData {
-	public:
-	    PrivateFunctionData () : header (0), body (0), status (true) {}
-	    PrivateFunctionData (const PrivateFunctionData&, CompString);
-
-	public:
-	    std::vector<HeaderOp> header;
-	    std::vector<BodyOp>   body;
-	    bool                  status;
-    };
-
-    class Function {
-	public:
-	    Function ():
-		id (0),
-		name (""),
-		mask (0)
-	    {};
-
-	public:
-	    FunctionId          id;
-	    CompString          name;
-	    PrivateFunctionData data[COMP_FUNCTION_TYPE_NUM];
-	    unsigned int        mask;
-    };
-
-    class PrivateAttrib {
-	public:
-	    PrivateAttrib () :
-		opacity (0xffff),
-		brightness (0xffff),
-		saturation (0xffff),
-		nTexture (0),
-		nFunction (0),
-		nParam (0)
-	    {}
-
-	    PrivateAttrib (const PrivateAttrib &pa) :
-		opacity (pa.opacity),
-		brightness (pa.brightness),
-		saturation (pa.saturation),
-		nTexture (pa.nTexture),
-		nFunction (pa.nFunction),
-		nParam (pa.nParam)
-	    {
-		for (int i = 0; i < MAX_FRAGMENT_FUNCTIONS; i++)
-		    function[i] = pa.function[i];
-	    }
-
-	public:
-	    GLushort   opacity;
-	    GLushort   brightness;
-	    GLushort   saturation;
-	    int        nTexture;
-	    FunctionId function[MAX_FRAGMENT_FUNCTIONS];
-	    int        nFunction;
-	    int        nParam;
-    };
-
-    typedef boost::function<void (BodyOp *, int)> DataOpCallBack;
-
-    class InitialLoadFunction : public Function {
-	public:
-	    InitialLoadFunction ()
-	    {
-		id   = 0;
-		name = "__core_load";
-		mask = COMP_FUNCTION_MASK;
-
-		BodyOp b;
-		b.type = OpTypeLoad;
-		b.noOffset[0] = "TEX output, fragment.texcoord[0], texture[0], 2D;";
-		b.noOffset[1] = "TEX output, fragment.texcoord[0], texture[0], RECT;";
-		b.offset[0] = "TEX output, __tmp_texcoord0, texture[0], 2D;";
-		b.offset[1] = "TEX output, __tmp_texcoord0, texture[0], RECT;";
-		data[0].body.push_back (b);
-	    };
-    };
-
-    static InitialLoadFunction initialLoadFunction;
-
-    static Function *
-    findFragmentFunction (GLScreen   *s,
-			  FunctionId id)
-    {
-	foreach (Function *f, s->fragmentStorage ()->functions)
-	    if (f->id == id)
-		return f;
-	return NULL;
-    }
-
-    static Function *
-    findFragmentFunctionWithName (GLScreen   *s,
-				  CompString name)
-    {
-	foreach (Function *f, s->fragmentStorage ()->functions)
-	    if (f->name.compare (name) == 0)
-		return f;
-	return NULL;
-    }
-
-    static Program *
-    findFragmentProgram (GLScreen     *s,
-			 FunctionId   *signature,
-			 unsigned int nSignature)
-    {
-	unsigned int i;
-
-	foreach (Program *p, s->fragmentStorage ()->programs)
-	{
-	    if (p->signature.size () != nSignature)
-		continue;
-
-	    for (i = 0; i < nSignature; i++)
-		if (signature[i] != p->signature[i])
-		    break;
-
-	    if (i == nSignature)
-		return p;
-	}
-	return NULL;
-    }
-
-    static unsigned int
-    functionMaskToType (int mask)
-    {
-	static struct {
-	    unsigned int type;
-	    unsigned int mask;
-	} maskToType[] = {
-	    { COMP_FUNCTION_TYPE_ARB, COMP_FUNCTION_ARB_MASK }
-	};
-
-	unsigned int i;
-
-	for (i = 0; i < sizeof (maskToType) / sizeof (maskToType[0]); i++)
-	    if (mask & maskToType[i].mask)
-		return maskToType[i].type;
-
-	return 0;
-    }
-
-    static void
-    forEachDataOpInFunction (std::vector<Function *> list,
-			     int                     index,
-			     int                     type,
-			     int                     loadTarget,
-			     CompString              loadOffset,
-			     bool                    *color,
-			     bool                    *blend,
-			     DataOpCallBack          callBack)
-    {
-	Function *f = list[index];
-	BodyOp   dataOp;
-	bool	 colorDone = false;
-	bool	 blendDone = false;
-
-	*color = false;
-	*blend = false;
-
-	foreach (BodyOp &bodyOp, f->data[type].body)
-	{
-	    switch (bodyOp.type) {
-		case OpTypeFetch: {
-		    CompString offset = loadOffset;
-
-		    /* add offset */
-		    if (bodyOp.data.size ())
-		    {
-			if (loadOffset.size ())
-			{
-			    dataOp.type = OpTypeDataOffset;
-			    dataOp.data =
-				compPrintf ("ADD __tmp_texcoord%d, %s, %s;",
-					    index, loadOffset.c_str (),
-					    bodyOp.data.c_str ());
-
-			    callBack (&dataOp, index);
-
-			    offset = compPrintf ("__tmp_texcoord%d", index);
-			}
-			else
-			{
-			    offset = bodyOp.data;
-			}
-		    }
-
-		    forEachDataOpInFunction (list, index - 1, type,
-					    bodyOp.target,
-					    offset, &colorDone, &blendDone,
-					    callBack);
-
-		    if (bodyOp.dst.compare ("output"))
-		    {
-			dataOp.type = OpTypeDataStore;
-			dataOp.data =
-			    compPrintf ("MOV %s, output;", bodyOp.dst.c_str ());
-
-			/* move to destination */
-			callBack (&dataOp, index);
-		    }
-		} break;
-		case OpTypeLoad:
-		    if (loadOffset.size ())
-		    {
-			dataOp.type = OpTypeDataOffset;
-			dataOp.data =
-			    compPrintf ("ADD __tmp_texcoord0, fragment.texcoord[0], %s;",
-					loadOffset.c_str ());
-
-			callBack (&dataOp, index);
-
-			dataOp.data = bodyOp.offset[loadTarget];
-		    }
-		    else
-		    {
-			dataOp.data = bodyOp.noOffset[loadTarget];
-		    }
-
-		    dataOp.type = OpTypeData;
-
-		    callBack (&dataOp, index);
-
-		    break;
-		case OpTypeColor:
-		    if (!colorDone)
-		    {
-			dataOp.type = OpTypeData;
-			dataOp.data =
-			    compPrintf ("MUL %s, fragment.color, %s;",
-					bodyOp.dst.c_str (),
-					bodyOp.src.c_str ());
-
-			callBack (&dataOp, index);
-		    }
-		    else if (bodyOp.dst.compare (bodyOp.src))
-		    {
-			dataOp.type = OpTypeData;
-			dataOp.data =
-			    compPrintf ("MOV %s, %s;",
-					bodyOp.dst.c_str (),
-					bodyOp.src.c_str ());
-
-			callBack (&dataOp, index);
-		    }
-		    *color = true;
-		    break;
-		case OpTypeDataBlend:
-		    *blend = true;
-		    /* fall-through */
-		case OpTypeData:
-		    callBack (&bodyOp, index);
-		    break;
-		case OpTypeDataStore:
-		case OpTypeDataOffset:
-		case OpTypeHeaderTemp:
-		case OpTypeHeaderParam:
-		case OpTypeHeaderAttrib:
-		    break;
-	    }
-	}
-
-	if (colorDone)
-	    *color = true;
-
-	if (blendDone)
-	    *blend = true;
-    }
-
-    static int
-    forEachHeaderOpWithType (std::vector<HeaderOp> list,
-			     int                   index,
-			     OpType                type,
-			     CompString            prefix,
-			     CompString            functionPrefix,
-			     int                   count,
-			     DataOpCallBack        callBack)
-    {
-	BodyOp dataOp;
-
-	dataOp.type = OpTypeData;
-
-	foreach (HeaderOp &header, list)
-	{
-	    if (header.type == type)
-	    {
-		if (count)
-		{
-		    dataOp.data = ", ";
-		}
-		else
-		{
-		    dataOp.data = prefix;
-		}
-
-		dataOp.data += functionPrefix;
-		dataOp.data += "_";
-		dataOp.data += header.name;
-
-		callBack (&dataOp, index);
-
-		count++;
-	    }
-	}
-
-	return count;
-    }
-
-    static bool
-    forEachDataOp (std::vector<Function *> list,
-		   int                     type,
-		   DataOpCallBack          callBack)
-    {
-	BodyOp dataOp;
-	bool   colorDone;
-	bool   blendDone;
-	int    count, nList = list.size ();
-
-	dataOp.type = OpTypeData;
-
-	count = 1;
-
-	dataOp.data = "TEMP output";
-
-	callBack (&dataOp, nList);
-
-	foreach (Function *f, list)
-	    count = forEachHeaderOpWithType (f->data[type].header,
-					     nList, OpTypeHeaderTemp,
-					     "", f->name, count, callBack);
-
-	dataOp.data = ";";
-
-	callBack (&dataOp, nList);
-
-	count = 0;
-
-	foreach (Function *f, list)
-	    count = forEachHeaderOpWithType (f->data[type].header,
-					     nList, OpTypeHeaderParam,
-					     "PARAM ", f->name, count,
-					     callBack);
-
-	if (count)
-	{
-	    dataOp.data = ";";
-
-	    callBack (&dataOp, nList);
-	}
-
-	count = 0;
-
-	foreach (Function *f, list)
-	    count = forEachHeaderOpWithType (f->data[type].header,
-					     nList, OpTypeHeaderAttrib,
-					     "ATTRIB ", f->name, count,
-					     callBack);
-
-	if (count)
-	{
-	    dataOp.data = ";";
-
-	    callBack (&dataOp, nList);
-	}
-
-	forEachDataOpInFunction (list, nList - 1, type, 0, "",
-				 &colorDone, &blendDone,
-				 callBack);
-
-	if (colorDone)
-	    dataOp.data = "MOV result.color, output;END";
-	else
-	    dataOp.data = "MUL result.color, fragment.color, output;END";
-
-	callBack (&dataOp, nList);
-
-	return blendDone;
-    }
-
-    static void
-    addFetchOffsetVariables (BodyOp     *op,
-			     int	index,
-			     bool       *indices,
-			     CompString *data)
-    {
-	if (op->type == OpTypeDataOffset)
-	{
-	    if (!indices[index])
-	    {
-		data->append (compPrintf ("TEMP __tmp_texcoord%d;", index));
-		indices[index] = true;
-	    }
-	}
-    }
-
-    static void
-    addData (BodyOp     *op,
-	     CompString *data)
-    {
-	data->append (op->data);
-    }
-
-    static Program *
-    buildFragmentProgram (GLScreen      *s,
-			  PrivateAttrib *attrib)
-    {
-	Program	                *program;
-	std::vector<Function *> functionList (1);
-	int                     mask = COMP_FUNCTION_MASK;
-	int                     type;
-	GLint                   errorPos;
-	GLenum			errorType;
-	CompString fetchData;
-	bool       indices[MAX_FRAGMENT_FUNCTIONS];
-	int        i;
-
-	program = new Program ();
-	if (!program)
-	    return NULL;
-
-	functionList[0] = &initialLoadFunction;
-
-	for (i = 0; i < attrib->nFunction; i++)
-	{
-	    Function *f = findFragmentFunction (s, attrib->function[i]);
-
-	    if (f)
-	        functionList.push_back (f);
-	}
-
-	foreach (Function *f, functionList)
-	    mask &= f->mask;
-
-	if (!mask)
-	{
-	    compLogMessage ("opengl", CompLogLevelWarn,
-			    "fragment functions can't be linked together "
-			    "because a common type doesn't exist");
-	}
-
-	if (!mask || functionList.size () == 1)
-	{
-	    delete program;
-	    return NULL;
-	}
-
-	for (i = 0; i < attrib->nFunction; i++)
-	    program->signature.push_back (attrib->function[i]);
-
-	type = functionMaskToType (mask);
-
-	fetchData = "!!ARBfp1.0";
-
-	foreach (bool &val, indices)
-	    val = false;
-
-	forEachDataOp (functionList, type,
-	    boost::bind (addFetchOffsetVariables, _1, _2, indices, &fetchData));
-
-	program->blending = forEachDataOp (functionList, type,
-				boost::bind (addData, _1, &fetchData));
-
-	program->type = GL_FRAGMENT_PROGRAM_ARB;
-
-	glGetError ();
-
-	(*GL::genPrograms) (1, &program->name);
-	(*GL::bindProgram) (GL_FRAGMENT_PROGRAM_ARB, program->name);
-	(*GL::programString) (GL_FRAGMENT_PROGRAM_ARB,
-			      GL_PROGRAM_FORMAT_ASCII_ARB,
-			      fetchData.size (), fetchData.c_str ());
-
-	glGetIntegerv (GL_PROGRAM_ERROR_POSITION_ARB, &errorPos);
-	errorType = glGetError ();
-	if (errorType != GL_NO_ERROR || errorPos != -1)
-	{
-	    compLogMessage ("opengl", CompLogLevelError,
-			    "failed to load fragment program");
-
-	    (*GL::deletePrograms) (1, &program->name);
-
-	    program->name = 0;
-	    program->type = 0;
-	}
-
-	return program;
-    }
-
-    static GLuint
-    getFragmentProgram (GLScreen      *s,
-			PrivateAttrib *attrib,
-			GLenum	      *type,
-			bool	      *blending)
-    {
-	Program	*program;
-
-	if (!attrib->nFunction)
-	    return 0;
-
-	program = findFragmentProgram (s, attrib->function, attrib->nFunction);
-	if (!program)
-	{
-	    program = buildFragmentProgram (s, attrib);
-	    if (program)
-	    {
-		s->fragmentStorage ()->programs.push_back (program);
-	    }
-	}
-
-	if (program)
-	{
-	    *type     = program->type;
-	    *blending = program->blending;
-
-	    return program->name;
-	}
-
-	return 0;
-    }
-
-
-    /* performs simple variable substitution */
-    static CompString
-    copyData (std::vector<HeaderOp> header,
-	      const CompString      prefix,
-	      CompString            data)
-    {
-	CompString inPrefix (prefix);
-	inPrefix += "_";
-
-	foreach (HeaderOp &h, header)
-	{
-	    size_t pos = data.find (h.name);
-	    while (pos != std::string::npos)
-	    {
-		bool prependPrefix = false;
-		/* It is possible to match parts of words here, so
-		 * make sure that we have found the next chunk in the
-		 * string and not just a header which matches
-		 * part of another word */
-		if (data.size () > pos + h.name.size ())
-		{
-		    const CompString &token = data.substr (pos + h.name.size (), 1);
-		    if (token == "," ||
-			token == "." ||
-			token == ";")
-		    {
-			prependPrefix = true;
-		    }
-		    else
-		    {
-			/* We matched part of another word as our
-			 * token so search for the next whole
-			 * header op */
-			pos = data.find (h.name, pos + 1);
-		    }
-		}
-		else
-		{
-		    /* If this is the last word in the string, then it must
-		     * have matched exactly our header op, so it is ok
-		     * to prepend a prefix here and go straight to
-		     * std::string::npos */
-		    prependPrefix = true;
-		}
-
-		if (prependPrefix)
-		{
-		    /* prepend the header op prefix to the header op
-		     * and seek past this word to the next instance
-		     * of the unprepended header op */
-		    data.insert (pos, inPrefix);
-		    pos += inPrefix.size () + h.name.size ();
-		    pos = data.find (h.name, pos);
-		}
-	    }
-	}
-
-	return data;
-    }
-
-    PrivateFunctionData::PrivateFunctionData (const PrivateFunctionData& src,
-					      CompString dstPrefix) :
-	header (src.header),
-	body (0),
-	status (src.status)
-    {
-
-	foreach (BodyOp b, src.body)
-	{
-	    BodyOp dst;
-	    dst.type = b.type;
-
-	    switch (b.type) {
-		case OpTypeFetch:
-		    dst.dst = copyData (header, dstPrefix, b.dst);
-		    if (b.data.size ())
-			dst.data = copyData (header, dstPrefix, b.data);
-		    else
-			dst.data = "";
-
-		    dst.target = b.target;
-		    break;
-		case OpTypeLoad:
-		case OpTypeHeaderTemp:
-		case OpTypeHeaderParam:
-		case OpTypeHeaderAttrib:
-		    break;
-		case OpTypeData:
-		case OpTypeDataBlend:
-		case OpTypeDataStore:
-		case OpTypeDataOffset:
-		    dst.data = copyData (header, dstPrefix, b.data);
-		    break;
-		case OpTypeColor:
-		    dst.dst = copyData (header, dstPrefix, b.dst);
-		    dst.src = copyData (header, dstPrefix, b.src);
-		    break;
-		}
-	    body.push_back (dst);
-	}
-    }
-
-    static bool
-    addHeaderOpToFunctionData (PrivateFunctionData *data,
-			       const char          *name,
-			       OpType              type)
-    {
-	static const char *reserved[] = {
-	    "output",
-	    "__tmp_texcoord",
-	    "fragment",
-	    "program",
-	    "result",
-	    "state",
-	    "texture"
-	};
-	HeaderOp   header;
-	CompString n (name);
-
-	foreach (const char *word, reserved)
-	{
-	    if (n.find (word) != std::string::npos)
-	    {
-		compLogMessage ("opengl", CompLogLevelWarn,
-				"%s is a reserved word", word);
-		return false;
-	    }
-	}
-
-
-	header.type = type;
-	header.name = n;
-	data->header.push_back (header);
-
-	return true;
-    }
-
-    FunctionData::FunctionData () :
-	priv (new PrivateFunctionData ())
-    {
-    }
-
-    FunctionData::~FunctionData ()
-    {
-	delete priv;
-    }
-
-    bool
-    FunctionData::status ()
-    {
-	return priv->status;
-    }
-
-    void
-    FunctionData::addTempHeaderOp (const char *name)
-    {
-	priv->status &=
-	    addHeaderOpToFunctionData (priv, name, OpTypeHeaderTemp);
-    }
-
-    void
-    FunctionData::addParamHeaderOp (const char *name)
-    {
-	priv->status &=
-	    addHeaderOpToFunctionData (priv, name, OpTypeHeaderParam);
-    }
-
-    void
-    FunctionData::addAttribHeaderOp (const char *name)
-    {
-	priv->status &=
-	    addHeaderOpToFunctionData (priv, name, OpTypeHeaderAttrib);
-    }
-
-
-    void
-    FunctionData::addFetchOp (const char *dst, const char *offset, int target)
-    {
-	BodyOp b;
-
-	b.type	 = OpTypeFetch;
-	b.dst    = CompString (dst);
-	b.target = target;
-
-	if (offset)
-	    b.data = CompString (offset);
-	else
-	    b.data = CompString ("");
-
-	priv->body.push_back (b);
-    }
-
-    void
-    FunctionData::addColorOp (const char *dst, const char *src)
-    {
-	BodyOp b;
-
-	b.type = OpTypeColor;
-	b.dst  = CompString (dst);
-	b.src  = CompString (src);
-
-	priv->body.push_back (b);
-    }
-
-    void
-    FunctionData::addDataOp (const char *str, ...)
-    {
-	BodyOp  b;
-	va_list ap;