Merge lp:~sil2100/compiz-core/cherry_rev3137 into lp:compiz-core

[Łukasz Zemczak]

Cherry-picked from compiz trunk (rev 3137):
Add synchronization primitives to the decoration protocol so that there isn't a race where we bind a texture that's being freed. (LP: #454218) (LP: #929989)

Cherry picked from 0.9.8 branch:

Add synchronization primitives to the decoration protocol so that there isn't a race where we bind a texture that's being freed.

Things changed

 * update_window_decoration_size made semi-private, users should use request_update_window_decoration_size instead, which prepares for a pixmap update and sends a message to the decorated process that a new pixmap is waiting.
 * decor_post_pending : tells the decorated process that a new decoration is pending
 * decor_post_request : tells the decorator that a new pixmap can be drawn to
 * decor_post_delete_pixmap : tells the decorator that a pixmap is no longer in use by the decorated process and can be deleted by the server

I also did some necessary refactoring so we could get this under test, namely:

DecorPixmap class (implements DecorPixmapInterface): a simple RAII class which ensures that a DecorPixmapDeletionInterface is invoked to delete the server side pixmap when the DecorPixmap class is destructed

X11DecorPixmapReceiver class (implements DecorPixmapReceiverInterface): a per-decoration owned class which tracks the update state of the pixmap owned by the decoration from the decorator, calls through to appropriate methods on a DecorPixmapRequestorInterface to request new pixmaps (ensuring that chattyness is reduced to when a) the decorator tells us that a new pixmap is ready and b) when a new pixmap was already pending and we need to fetch the newest one)

X11DecorPixmapRequestor class (implements DecorPixmapRequestorInterface): a per-window owned class which handles dispatch to the decorator (eg decor_post_pending) and requests from the decorator in _COMPIZ_DECOR_PENDING messages to communicate when decorations should be redrawn at new sizes

X11PixmapDeletor class (implements DecorPixmapDeletionInterface): a per-pixmap class which sends decor_post_delete_pixmap to the decorator when a pixmap is no longer in use by the decor plugin

DecorationListFindMatchingInterface: an interface implemented by DecorationList to find a decoration matching a specified criteria

DecorationInterface: an interface implemented by Decoration to get the receiver and properties about that decoration.

Tests included (Google Mock)

Resubmitted to cover a potential race condition in LP#996901

[Daniel van Vugt (vanvugt)]

I assume the ABI changes here don't affect Unity builds?... Better to ask a silly question now than later :)

[Łukasz Zemczak (sil2100)]

Good question, it seems they actually might. So hm, this cherry-pick might not be entirely safe. Daniel - could you somehow mark bug-fixes in bug reports which break the ABI? This would make picking changes for SRUs much easier.

[Daniel van Vugt (vanvugt)]

Yes, we're meant to update abiversion.h so it should be easy to tell. But people often forget :(

[Daniel van Vugt (vanvugt)]

It works and the bugs appear fixed.

I can't run the test cases for some reason, but that's not caused by this proposal in particular. See bug 1014957.

review: Approve

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2012-03-30 07:01:48 +0000
+++ gtk/window-decorator/decorator.c	2012-06-15 17:09:21 +0000
@@ -564,6 +564,52 @@
     }
 }
 
+/*
+ * request_update_window_decoration_size
+ * Description: asks the rendering process to allow a size update
+ * for pixmap synchronization */
+
+
+gboolean
+request_update_window_decoration_size (WnckWindow *win)
+{
+    decor_t           *d;
+    gint              width, height;
+    gint              x, y, w, h, name_width;
+
+    if (win == NULL)
+	return FALSE;
+
+    d = g_object_get_data (G_OBJECT (win), "decor");
+
+    if (!d->decorated)
+	return FALSE;
+
+    /* Get the geometry of the window, we'll need it later */
+    wnck_window_get_client_window_geometry (win, &x, &y, &w, &h);
+
+    /* Get the width of the name */
+    name_width = max_window_name_width (win);
+
+    /* Ask the theme to tell us how much space it needs. If this is not successful
+     * update the decoration name and return false */
+    if (!(*theme_calc_decoration_size) (d, w, h, name_width, &width, &height))
+    {
+	update_window_decoration_name (win);
+	return FALSE;
+    }
+
+    d->width  = width;
+    d->height = height;
+
+    decor_post_pending (gdk_x11_display_get_xdisplay (gdk_display_get_default ()),
+			wnck_window_get_xid (win),
+			populate_frame_type (d),
+			populate_frame_state (d),
+			populate_frame_actions (d));
+
+    return TRUE;
+}
 
 /*
  * update_window_decoration_size
@@ -581,8 +627,6 @@
     decor_t           *d;
     GdkPixmap         *pixmap, *buffer_pixmap = NULL;
     Picture           picture;
-    gint              width, height;
-    gint              x, y, w, h, name_width;
     Display           *xdisplay;
     XRenderPictFormat *format;
 
@@ -591,30 +635,19 @@
 
     d = g_object_get_data (G_OBJECT (win), "decor");
 
+    if (!d->decorated)
+	return FALSE;
+
     xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
 
-    /* Get the geometry of the window, we'll need it later */
-    wnck_window_get_client_window_geometry (win, &x, &y, &w, &h);
-
-    /* Get the width of the name */
-    name_width = max_window_name_width (win);
-
-    /* Ask the theme to tell us how much space it needs. If this is not successful
-     * update the decoration name and return false */
-    if (!(*theme_calc_decoration_size) (d, w, h, name_width, &width, &height))
-    {
-	update_window_decoration_name (win);
-	return FALSE;
-    }
-
     gdk_error_trap_push ();
 
     /* Get the correct depth for the frame window in reparenting mode, otherwise
      * enforce 32 */
     if (d->frame_window)
-	pixmap = create_pixmap (width, height, d->frame->style_window_rgb);
+	pixmap = create_pixmap (d->width, d->height, d->frame->style_window_rgb);
     else
-	pixmap = create_pixmap (width, height, d->frame->style_window_rgba);
+	pixmap = create_pixmap (d->width, d->height, d->frame->style_window_rgba);
 
     gdk_flush ();
 
@@ -628,9 +661,9 @@
     gdk_error_trap_push ();
 
     if (d->frame_window)
-	buffer_pixmap = create_pixmap (width, height, d->frame->style_window_rgb);
+	buffer_pixmap = create_pixmap (d->width, d->height, d->frame->style_window_rgb);
     else
-	buffer_pixmap = create_pixmap (width, height, d->frame->style_window_rgba);
+	buffer_pixmap = create_pixmap (d->width, d->height, d->frame->style_window_rgba);
 
     gdk_flush ();
 
@@ -649,7 +682,7 @@
 
     /* Destroy the old pixmaps and pictures */
     if (d->pixmap)
-	g_object_unref (G_OBJECT (d->pixmap));
+	g_hash_table_insert (destroyed_pixmaps_table, GINT_TO_POINTER (GDK_PIXMAP_XID (d->pixmap)), d->pixmap);
 
     if (d->buffer_pixmap)
 	g_object_unref (G_OBJECT (d->buffer_pixmap));
@@ -667,9 +700,6 @@
 
     d->picture = picture;
 
-    d->width  = width;
-    d->height = height;
-
     d->prop_xid = wnck_window_get_xid (win);
 
     update_window_decoration_name (win);
@@ -1205,7 +1235,7 @@
 	d->context = NULL;
 	d->width = d->height = 0;
 
-	update_window_decoration_size (win);
+	request_update_window_decoration_size (win);
 	update_event_windows (win);
     }
 }
 
=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2012-03-30 07:01:48 +0000
+++ gtk/window-decorator/events.c	2012-06-15 17:09:21 +0000
@@ -1014,7 +1014,7 @@
 			update_window_decoration_state (win);
 			update_window_decoration_actions (win);
 			update_window_decoration_icon (win);
-			update_window_decoration_size (win);
+			request_update_window_decoration_size (win);
 			update_event_windows (win);
 		    }
 		    else
@@ -1069,6 +1069,17 @@
 		}
 	    }
 	}
+	else if (xevent->xclient.message_type == decor_request_atom)
+	{
+	    WnckWindow *win = wnck_window_get (xevent->xclient.window);
+
+	    if (win)
+		update_window_decoration_size (win);
+	}
+	else if (xevent->xclient.message_type == decor_delete_pixmap_atom)
+	{
+	    g_hash_table_remove (destroyed_pixmaps_table, GINT_TO_POINTER (xevent->xclient.data.l[0]));
+	}
     default:
 	break;
     }
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2012-03-30 07:01:48 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2012-06-15 17:09:21 +0000
@@ -48,6 +48,9 @@
 Atom toolkit_action_atom;
 Atom toolkit_action_window_menu_atom;
 Atom toolkit_action_force_quit_dialog_atom;
+Atom decor_request_atom;
+Atom decor_pending_atom;
+Atom decor_delete_pixmap_atom;
 
 Atom net_wm_state_atom;
 Atom net_wm_state_modal_atom;
@@ -103,6 +106,7 @@
 GtkWidget     *switcher_label;
 
 GHashTable    *frame_table;
+GHashTable    *destroyed_pixmaps_table;
 GtkWidget     *action_menu = NULL;
 gboolean      action_menu_mapped = FALSE;
 decor_color_t _title_color[2];
@@ -305,6 +309,10 @@
     net_wm_state_atom = XInternAtom (xdisplay,"_NET_WM_STATE", 0);
     net_wm_state_modal_atom = XInternAtom (xdisplay, "_NET_WM_STATE_MODAL", 0);
 
+    decor_request_atom = XInternAtom (xdisplay, "_COMPIZ_DECOR_REQUEST", 0);
+    decor_pending_atom = XInternAtom (xdisplay, "_COMPIZ_DECOR_PENDING", 0);
+    decor_delete_pixmap_atom = XInternAtom (xdisplay, "_COMPIZ_DECOR_DELETE_PIXMAP", 0);
+
     status = decor_acquire_dm_session (xdisplay,
 				       gdk_screen_get_number (gdkscreen),
 				       "gwd", replace, &dm_sn_timestamp);
@@ -390,6 +398,7 @@
     xformat_rgb  = XRenderFindStandardFormat (xdisplay, PictStandardRGB24);
 
     frame_table = g_hash_table_new (NULL, NULL);
+    destroyed_pixmaps_table = g_hash_table_new_full (NULL, NULL, NULL, g_object_unref);
 
     if (!create_tooltip_window ())
     {
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2012-03-30 07:01:48 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2012-06-15 17:09:21 +0000
@@ -306,6 +306,9 @@
 extern Atom toolkit_action_force_quit_dialog_atom;
 extern Atom net_wm_state_atom;
 extern Atom net_wm_state_modal_atom;
+extern Atom decor_request_atom;
+extern Atom decor_pending_atom;
+extern Atom decor_delete_pixmap_atom;
 
 extern Time dm_sn_timestamp;
 
@@ -511,6 +514,7 @@
 
 /* list of all decorations */
 extern GHashTable    *frame_table;
+extern GHashTable    *destroyed_pixmaps_table;
 
 /* action menu */
 extern GtkWidget     *action_menu;
@@ -628,9 +632,13 @@
 void
 destroy_bare_frame ();
 
+/* Don't use directly */
 gboolean
 update_window_decoration_size (WnckWindow *win);
 
+gboolean
+request_update_window_decoration_size (WnckWindow *win);
+
 void
 update_window_decoration_name (WnckWindow *win);
 
 
=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2012-03-30 07:01:48 +0000
+++ gtk/window-decorator/wnck.c	2012-06-15 17:09:21 +0000
@@ -80,7 +80,7 @@
 
     if (d->decorated)
     {
-	if (!update_window_decoration_size (win))
+	if (!request_update_window_decoration_size (win))
 	    queue_decor_draw (d);
     }
 }
@@ -102,7 +102,7 @@
 	    d->client_width  = width;
 	    d->client_height = height;
 
-	    update_window_decoration_size (win);
+	    request_update_window_decoration_size (win);
 	    update_event_windows (win);
 	}
     }
@@ -128,7 +128,7 @@
     if (d->decorated)
     {
 	update_window_decoration_state (win);
-	if (!update_window_decoration_size (win))
+	if (!request_update_window_decoration_size (win))
 	    queue_decor_draw (d);
 
 	update_event_windows (win);
@@ -143,7 +143,7 @@
     if (d->decorated)
     {
 	update_window_decoration_actions (win);
-	if (!update_window_decoration_size (win))
+	if (!request_update_window_decoration_size (win))
 	    queue_decor_draw (d);
 
 	update_event_windows (win);
@@ -422,7 +422,7 @@
 	update_window_decoration_state (win);
 	update_window_decoration_actions (win);
 	update_window_decoration_icon (win);
-	update_window_decoration_size (win);
+	request_update_window_decoration_size (win);
 
 	update_event_windows (win);
     }
@@ -585,7 +585,7 @@
     if (win)
     {
 	d = g_object_get_data (G_OBJECT (win), "decor");
-	if (d && d->pixmap)
+	if (d)
 	{
 	    d->active = wnck_window_is_active (win);
 
@@ -642,8 +642,9 @@
 	    * then we need to redraw the decoration anyways
 	    * since the image would have changed */
 	    if (d->win != NULL &&
-		!update_window_decoration_size (d->win) &&
-		d->decorated)
+		!request_update_window_decoration_size (d->win) &&
+		d->decorated &&
+		d->pixmap)
 		queue_decor_draw (d);
 
 	}
@@ -653,7 +654,7 @@
     if (win)
     {
 	d = g_object_get_data (G_OBJECT (win), "decor");
-	if (d && d->pixmap)
+	if (d)
 	{
 	    d->active = wnck_window_is_active (win);
 
@@ -710,8 +711,9 @@
 	    * then we need to redraw the decoration anyways
 	    * since the image would have changed */
 	    if (d->win != NULL &&
-		!update_window_decoration_size (d->win) &&
-		d->decorated)
+		!request_update_window_decoration_size (d->win) &&
+		d->decorated &&
+		d->pixmap)
 		queue_decor_draw (d);
 
 	}
 
=== modified file 'include/decoration.h'
--- include/decoration.h	2012-02-09 07:48:57 +0000
+++ include/decoration.h	2012-06-15 17:09:21 +0000
@@ -492,6 +492,24 @@
 				XEvent  *event,
 				Time    dm_sn_timestamp);
 
+int
+decor_post_pending (Display *xdisplay,
+		    Window  client,
+		    unsigned int frame_state,
+		    unsigned int frame_type,
+		    unsigned int frame_actions);
+
+int
+decor_post_delete_pixmap (Display *xdisplay,
+			  Pixmap  pixmap);
+
+int
+decor_post_generate_request (Display *xdisplay,
+			     Window  client,
+			     unsigned int frame_type,
+			     unsigned int frame_state,
+			     unsigned int frame_actions);
+
 #ifdef  __cplusplus
 }
 #endif
 
=== modified file 'libdecoration/decoration.c'
--- libdecoration/decoration.c	2012-02-27 06:43:04 +0000
+++ libdecoration/decoration.c	2012-06-15 17:09:21 +0000
@@ -2877,6 +2877,92 @@
 }
 
 int
+decor_post_pending (Display *xdisplay,
+		    Window  client,
+		    unsigned int frame_state,
+		    unsigned int frame_type,
+		    unsigned int frame_actions)
+{
+    XEvent event;
+
+    Atom   decor_pending  = XInternAtom (xdisplay, "_COMPIZ_DECOR_PENDING", FALSE);
+
+    /* Send a client message indicating that a new
+     * decoration can be generated for this window
+     */
+    event.xclient.type	       = ClientMessage;
+    event.xclient.window       = client;
+    event.xclient.message_type = decor_pending;
+    event.xclient.format       = 32;
+    event.xclient.data.l[0]    = frame_type;
+    event.xclient.data.l[1]    = frame_state;
+    event.xclient.data.l[2]    = frame_actions;
+    event.xclient.data.l[3]    = 0;
+    event.xclient.data.l[4]    = 0;
+
+    XSendEvent (xdisplay, DefaultRootWindow (xdisplay), 0,
+		StructureNotifyMask, &event);
+
+    return 1;
+}
+
+int
+decor_post_generate_request (Display *xdisplay,
+			     Window  client,
+			     unsigned int frame_type,
+			     unsigned int frame_state,
+			     unsigned int frame_actions)
+{
+    XEvent event;
+
+    Atom   decor_request  = XInternAtom (xdisplay, "_COMPIZ_DECOR_REQUEST", FALSE);
+
+    /* Send a client message indicating that a new
+     * decoration can be generated for this window
+     */
+    event.xclient.type	       = ClientMessage;
+    event.xclient.window       = client;
+    event.xclient.message_type = decor_request;
+    event.xclient.format       = 32;
+    event.xclient.data.l[0]    = frame_type;
+    event.xclient.data.l[1]    = frame_state;
+    event.xclient.data.l[2]    = frame_actions;
+    event.xclient.data.l[3]    = 0;
+    event.xclient.data.l[4]    = 0;
+
+    XSendEvent (xdisplay, DefaultRootWindow (xdisplay), 0,
+		StructureNotifyMask, &event);
+
+    return 1;
+}
+
+int
+decor_post_delete_pixmap (Display *xdisplay,
+			  Pixmap  pixmap)
+{
+    XEvent event;
+
+    Atom   decor_delete_pixmap  = XInternAtom (xdisplay, "_COMPIZ_DECOR_DELETE_PIXMAP", FALSE);
+
+    /* Send a client message indicating that a new
+     * decoration can be generated for this window
+     */
+    event.xclient.type	       = ClientMessage;
+    event.xclient.window       = DefaultRootWindow (xdisplay);
+    event.xclient.message_type = decor_delete_pixmap;
+    event.xclient.format       = 32;
+    event.xclient.data.l[0]    = pixmap;
+    event.xclient.data.l[1]    = 0;
+    event.xclient.data.l[2]    = 0;
+    event.xclient.data.l[3]    = 0;
+    event.xclient.data.l[4]    = 0;
+
+    XSendEvent (xdisplay, DefaultRootWindow (xdisplay), 0,
+		StructureNotifyMask, &event);
+
+    return 1;
+}
+int
 decor_acquire_dm_session (Display    *xdisplay,
 			  int	     screen,
 			  const char *name,
 
=== modified file 'plugins/decor/CMakeLists.txt'
--- plugins/decor/CMakeLists.txt	2012-03-30 14:29:18 +0000
+++ plugins/decor/CMakeLists.txt	2012-06-15 17:09:21 +0000
@@ -4,10 +4,12 @@
 include (CompizCommon)
 
 include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/clip-groups/include/)
+include_directories (${CMAKE_CURRENT_SOURCE_DIR}/src/pixmap-requests/include/)
 
-compiz_plugin(decor PLUGINDEPS composite opengl LIBRARIES decoration compiz_decor_clip_groups)
+compiz_plugin(decor PLUGINDEPS composite opengl LIBRARIES decoration compiz_decor_clip_groups compiz_decor_pixmap_requests)
 
 add_subdirectory (src/clip-groups)
+add_subdirectory (src/pixmap-requests)
 
 if (COMPIZ_BUILD_WITH_RPATH AND NOT COMPIZ_DISABLE_PLUGIN_DECOR)
 
 
=== modified file 'plugins/decor/src/decor.cpp'
--- plugins/decor/src/decor.cpp	2012-04-23 05:50:23 +0000
+++ plugins/decor/src/decor.cpp	2012-06-15 17:09:21 +0000
@@ -303,7 +303,6 @@
 }
 
 static bool bindFailed;
-
 /*
  * DecorTexture::DecorTexture
  *
@@ -314,7 +313,7 @@
  * for this pixmap
  */
 
-DecorTexture::DecorTexture (Pixmap pixmap) :
+DecorTexture::DecorTexture (DecorPixmapInterface::Ptr pixmap) :
     status (true),
     refCount (1),
     pixmap (pixmap),
@@ -324,7 +323,7 @@
     Window	 root;
     int		 i;
 
-    if (!XGetGeometry (screen->dpy (), pixmap, &root,
+    if (!XGetGeometry (screen->dpy (), pixmap->getPixmap (), &root,
 		       &i, &i, &width, &height, &ui, &depth))
     {
 	status = false;
@@ -332,7 +331,7 @@
     }
 
     bindFailed = false;
-    textures = GLTexture::bindPixmapToTexture (pixmap, width, height, depth);
+    textures = GLTexture::bindPixmapToTexture (pixmap->getPixmap (), width, height, depth);
     if (textures.size () != 1)
     {
 	bindFailed = true;
@@ -343,7 +342,7 @@
     if (!DecorScreen::get (screen)->optionGetMipmap ())
 	textures[0]->setMipmap (false);
 
-    damage = XDamageCreate (screen->dpy (), pixmap,
+    damage = XDamageCreate (screen->dpy (), pixmap->getPixmap (),
 			     XDamageReportRawRectangles);
 }
 
@@ -378,13 +377,16 @@
 	return NULL;
 
     foreach (DecorTexture *t, textures)
-	if (t->pixmap == pixmap)
+	if (t->pixmap->getPixmap () == pixmap)
 	{
 	    t->refCount++;
 	    return t;
 	}
 
-    DecorTexture *texture = new DecorTexture (pixmap);
+    X11PixmapDeletor::Ptr dl = boost::make_shared <X11PixmapDeletor> (screen->dpy ());
+    DecorPixmap::Ptr pm = boost::make_shared <DecorPixmap> (pixmap, dl);
+
+    DecorTexture *texture = new DecorTexture (boost::shared_static_cast <DecorPixmapInterface> (pm));
 
     if (!texture->status)
     {
@@ -520,7 +522,8 @@
 		    long          *prop,
 		    unsigned int  size,
 		    unsigned int  type,
-		    unsigned int  nOffset)
+		    unsigned int  nOffset,
+		    DecorPixmapRequestorInterface *requestor)
 {
     unsigned int    frameType, frameState, frameActions;
     Pixmap	    pixmap = None;
@@ -568,7 +571,7 @@
 	throw std::exception ();
     }
 
-    return Decoration::Ptr (new Decoration (type, border, input, maxBorder, maxInput, frameType, frameState, frameActions, minWidth, minHeight, pixmap, quad, nQuad));
+    return Decoration::Ptr (new Decoration (type, border, input, maxBorder, maxInput, frameType, frameState, frameActions, minWidth, minHeight, pixmap, quad, nQuad, id, requestor));
 }
 
 Decoration::Decoration (int   type,
@@ -583,7 +586,9 @@
 			unsigned int minHeight,
 			Pixmap       pixmap,
 			const boost::shared_array <decor_quad_t> &quad,
-			unsigned int nQuad) :
+			unsigned int nQuad,
+			Window       owner,
+			DecorPixmapRequestorInterface *requestor) :
     texture (DecorScreen::get (screen)->getTexture (pixmap)),
     border (border.left, border.right, border.top, border.bottom),
     input (input.left, input.right, input.top, input.bottom),
@@ -596,7 +601,9 @@
     frameActions (frameActions),
     quad (quad),
     nQuad (nQuad),
-    type (type)
+    type (type),
+    updateState (0),
+    mPixmapReceiver (requestor, this)
 {
     int		    left, right, top, bottom;
     int		    x1, y1, x2, y2;
@@ -657,6 +664,30 @@
 	DecorScreen::get (screen)->releaseTexture (texture);
 }
 
+DecorPixmapReceiverInterface &
+Decoration::receiverInterface ()
+{
+    return mPixmapReceiver;
+}
+
+unsigned int
+Decoration::getFrameType () const
+{
+    return frameType;
+}
+
+unsigned int
+Decoration::getFrameState () const
+{
+    return frameState;
+}
+
+unsigned int
+Decoration::getFrameActions () const
+{
+    return frameActions;
+}
+
 /*
  * DecorationList is a class which allows multiple decorations
  * to be stored in a list and read from a window property, which
@@ -692,7 +723,8 @@
 
 bool
 DecorationList::updateDecoration (Window   id,
-				  Atom     decorAtom)
+				  Atom     decorAtom,
+				  DecorPixmapRequestorInterface *requestor)
 {
     unsigned long   n, nleft;
     unsigned char   *data;
@@ -701,6 +733,12 @@
     int		    result, format;
     unsigned int    type;
 
+    /* Dispatch any new updates */
+    foreach (const Decoration::Ptr &d, mList)
+    {
+	d->mPixmapReceiver.update ();
+    }
+
     result = XGetWindowProperty (screen->dpy (), id,
                                  decorAtom, 0L,
                                  PROP_HEADER_SIZE + 6 * (BASE_PROP_SIZE +
@@ -770,7 +808,9 @@
 	maxBorder.top = d->maxBorder.top;
 	maxBorder.bottom = d->maxBorder.bottom;
 
-	int num = decor_match_pixmap (prop, n, &d->texture->pixmap, &input, &border, &maxInput, &maxBorder,
+	Pixmap pm = d->texture->pixmap->getPixmap ();
+
+	int num = decor_match_pixmap (prop, n, &pm, &input, &border, &maxInput, &maxBorder,
 				     d->minWidth, d->minHeight, d->frameType, d->frameState, d->frameActions,
 				    d->quad.get (), d->nQuad);
 	if (num != -1)
@@ -788,7 +828,7 @@
 	try
 	{
 	    std::list <Decoration::Ptr>::iterator it = mList.begin ();
-	    Decoration::Ptr d = Decoration::create (id, prop, n, type, i);
+	    Decoration::Ptr d = Decoration::create (id, prop, n, type, i, requestor);
 
 	    /* Try to replace an existing decoration */
 	    for (; it != mList.end (); it++)
@@ -873,7 +913,7 @@
 {
     bindFailed = false;
 
-    decor.updateDecoration (window->id (), dScreen->winDecorAtom);
+    decor.updateDecoration (window->id (), dScreen->winDecorAtom, &mRequestor);
     if (bindFailed)
 	pixmapFailed = true;
     else
@@ -1230,6 +1270,22 @@
     return (decorActions == 0);
 }
 
+DecorationInterface::Ptr
+DecorationList::findMatchingDecoration (unsigned int frameType,
+					unsigned int frameState,
+					unsigned int frameActions)
+{
+    foreach (const Decoration::Ptr &d, mList)
+    {
+	if (d->frameType == frameType &&
+	    d->frameState == frameState &&
+	    d->frameActions == frameActions)
+	    return boost::shared_static_cast <DecorationInterface> (d);
+    }
+
+    return DecorationInterface::Ptr ();
+}
+
 /*
  * DecorationList::findMatchingDecoration
  *
@@ -2053,7 +2109,7 @@
 	{
 	    for (i = 0; i < DECOR_NUM; i++)
 	    {
-		decor[i].updateDecoration (screen->root (), decorAtom[i]);
+		decor[i].updateDecoration (screen->root (), decorAtom[i], &mRequestor);
 	    }
 	}
 	else
@@ -2261,6 +2317,7 @@
     isSwitcher = false;
 }
 
+
 /*
  * DecorScreen::handleEvent
  *
@@ -2295,6 +2352,18 @@
 		if (w)
 		    DecorWindow::get (w)->update (true);
 	    }
+	    /* A decoration is pending creation, allow it to be created */
+	    if (event->xclient.message_type == decorPendingAtom)
+	    {
+		CompWindow *w = screen->findWindow (event->xclient.window);
+
+		if (w)
+		{
+		    DecorWindow *dw = DecorWindow::get (w);
+
+		    dw->mRequestor.handlePending (event->xclient.data.l);
+		}
+	    }
 	default:
 	    /* Check for damage events. If the output or input window
 	     * or a texture is updated then damage output extents.
@@ -2309,7 +2378,7 @@
 
 		foreach (DecorTexture *t, textures)
 		{
-		    if (t->pixmap == de->drawable)
+		    if (t->pixmap->getPixmap () == de->drawable)
 		    {
 			foreach (CompWindow *w, screen->windows ())
 			{
@@ -2368,7 +2437,6 @@
 		{
 		    DECOR_WINDOW (w);
 		    dw->updateDecoration ();
-
 		    dw->update (true);
 		}
 	    }
@@ -2401,7 +2469,8 @@
 			    if (event->xproperty.atom == decorAtom[i])
 			    {
 				decor[i].updateDecoration (screen->root (),
-							   decorAtom[i]);
+							   decorAtom[i],
+							   &mRequestor);
 
 				foreach (CompWindow *w, screen->windows ())
 				    DecorWindow::get (w)->update (true);
@@ -2935,8 +3004,11 @@
 				   0,
 				   None,
 				   boost::shared_array <decor_quad_t> (NULL),
-				   0)),
-    mMenusClipGroup (CompMatch ("type=Dock | type=DropdownMenu | type=PopupMenu"))
+				   0,
+				   screen->root (),
+				   NULL)),
+    mMenusClipGroup (CompMatch ("type=Dock | type=DropdownMenu | type=PopupMenu")),
+    mRequestor (screen->dpy (), screen->root (), &(decor[DECOR_ACTIVE]))
 {
     supportingDmCheckAtom =
 	XInternAtom (s->dpy (), DECOR_SUPPORTING_DM_CHECK_ATOM_NAME, 0);
@@ -2958,6 +3030,10 @@
 	XInternAtom (s->dpy (), DECOR_TYPE_WINDOW_ATOM_NAME, 0);
     decorSwitchWindowAtom =
 	XInternAtom (s->dpy (), DECOR_SWITCH_WINDOW_ATOM_NAME, 0);
+    decorPendingAtom =
+	XInternAtom (s->dpy (), "_COMPIZ_DECOR_PENDING", 0);
+    decorRequestAtom =
+	XInternAtom (s->dpy (), "_COMPIZ_DECOR_REQUEST", 0);
     requestFrameExtentsAtom =
         XInternAtom (s->dpy (), "_NET_REQUEST_FRAME_EXTENTS", 0);
     shadowColorAtom =
@@ -3013,7 +3089,8 @@
     frameExtentsRequested (false),
     mClipGroup (NULL),
     mOutputRegion (window->outputRect ()),
-    mInputRegion (window->inputRect ())
+    mInputRegion (window->inputRect ()),
+    mRequestor (screen->dpy (), w->id (), &decor)
 {
     WindowInterface::setHandler (window);
 
 
=== modified file 'plugins/decor/src/decor.h'
--- plugins/decor/src/decor.h	2012-04-23 05:50:23 +0000
+++ plugins/decor/src/decor.h	2012-06-15 17:09:21 +0000
@@ -25,6 +25,7 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/shared_array.hpp>
+#include <boost/make_shared.hpp>
 #include <core/window.h>
 #include <core/pluginclasshandler.h>
 
@@ -34,6 +35,7 @@
 #include <core/windowextents.h>
 
 #include <clip-groups.h>
+#include <pixmap-requests.h>
 
 #include "decor_options.h"
 
@@ -76,30 +78,36 @@
 class DecorTexture {
 
     public:
-	DecorTexture (Pixmap pixmap);
+	DecorTexture (DecorPixmapInterface::Ptr pixmap);
 	~DecorTexture ();
 
     public:
 	bool            status;
 	int             refCount;
-        Pixmap          pixmap;
+	DecorPixmapInterface::Ptr pixmap;
 	Damage          damage;
 	GLTexture::List textures;
 };
 
 class DecorWindow;
 
-class Decoration {
+class Decoration :
+    public DecorationInterface
+{
 
     public:
 
 	typedef boost::shared_ptr <Decoration> Ptr;
 
+	static const unsigned int UpdateRequested = 1 << 0;
+	static const unsigned int UpdatesPending = 1 << 1;
+
 	static Decoration::Ptr create (Window        id,
 				       long          *prop,
 				       unsigned int  size,
 				       unsigned int  type,
-				       unsigned int  nOffset);
+				       unsigned int  nOffset,
+				       DecorPixmapRequestorInterface *requestor);
 
 	Decoration (int   type,
 		    const decor_extents_t &border,
@@ -113,10 +121,18 @@
 		    unsigned int minHeight,
 		    Pixmap       pixmap,
 		    const boost::shared_array <decor_quad_t> &quad,
-		    unsigned int nQuad);
+		    unsigned int nQuad,
+		    Window owner,
+		    DecorPixmapRequestorInterface *);
 
 	~Decoration ();
 
+	DecorPixmapReceiverInterface & receiverInterface ();
+
+	unsigned int getFrameType () const;
+	unsigned int getFrameState () const;
+	unsigned int getFrameActions () const;
+
     public:
 	int                       refCount;
 	DecorTexture              *texture;
@@ -133,12 +149,19 @@
 	boost::shared_array <decor_quad_t> quad;
 	int                       nQuad;
 	int                       type;
+
+	unsigned int              updateState;
+	X11DecorPixmapReceiver    mPixmapReceiver;
 };
 
-class DecorationList
+class DecorationList :
+    public DecorationListFindMatchingInterface
 {
     public:
-        bool updateDecoration  (Window id, Atom decorAtom);
+	bool updateDecoration  (Window id, Atom decorAtom, DecorPixmapRequestorInterface *requestor);
+	DecorationInterface::Ptr findMatchingDecoration(unsigned int frameType,
+								 unsigned int frameState,
+								 unsigned int frameActions);
 	const Decoration::Ptr & findMatchingDecoration (CompWindow *w, bool sizeCheck);
         void clear ()
         {
@@ -215,6 +238,8 @@
 	Atom shadowColorAtom;
 	Atom shadowInfoAtom;
 	Atom decorSwitchWindowAtom;
+	Atom decorPendingAtom;
+	Atom decorRequestAtom;
 
 	Window dmWin;
 	int    dmSupports;
@@ -229,6 +254,7 @@
 	CompTimer decoratorStart;
 
 	MatchedDecorClipGroup mMenusClipGroup;
+	X11DecorPixmapRequestor   mRequestor;
 };
 
 class DecorWindow :
@@ -335,6 +361,8 @@
 	DecorClipGroupInterface *mClipGroup;
 	CompRegion		mOutputRegion;
 	CompRegion              mInputRegion;
+
+	X11DecorPixmapRequestor   mRequestor;
 };
 
 class DecorPluginVTable :
 
=== added directory 'plugins/decor/src/pixmap-requests'
=== added file 'plugins/decor/src/pixmap-requests/CMakeLists.txt'
--- plugins/decor/src/pixmap-requests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/decor/src/pixmap-requests/CMakeLists.txt	2012-06-15 17:09:21 +0000
@@ -0,0 +1,62 @@
+pkg_check_modules (
+  GLIBMM
+  REQUIRED
+  glibmm-2.4 glib-2.0
+)
+
+INCLUDE_DIRECTORIES (  
+  ${CMAKE_CURRENT_SOURCE_DIR}/include
+  ${CMAKE_CURRENT_SOURCE_DIR}/src
+
+  ${compiz_SOURCE_DIR}/src/point/include
+  ${compiz_SOURCE_DIR}/src/rect/include
+  ${compiz_SOURCE_DIR}/src/window/geometry/include
+  ${compiz_SOURCE_DIR}/src/window/geometry-saver/include
+  ${compiz_SOURCE_DIR}/src/window/extents/include
+  ${compiz_SOURCE_DIR}/include
+    
+  ${Boost_INCLUDE_DIRS}
+  
+  ${GLIBMM_INCLUDE_DIRS}
+)
+
+LINK_DIRECTORIES (${GLIBMM_LIBRARY_DIRS}) 
+
+SET ( 
+  PUBLIC_HEADERS 
+)
+
+SET ( 
+  PRIVATE_HEADERS
+  ${CMAKE_CURRENT_SOURCE_DIR}/include/pixmap-requests.h
+)
+
+SET( 
+  SRCS 
+  ${CMAKE_CURRENT_SOURCE_DIR}/src/pixmap-requests.cpp
+)
+
+ADD_LIBRARY( 
+  compiz_decor_pixmap_requests STATIC
+  
+  ${SRCS}
+  
+  ${PUBLIC_HEADERS}
+  ${PRIVATE_HEADERS}
+)
+
+if (COMPIZ_BUILD_TESTING)
+ADD_SUBDIRECTORY( ${CMAKE_CURRENT_SOURCE_DIR}/tests )
+endif (COMPIZ_BUILD_TESTING)
+
+SET_TARGET_PROPERTIES(
+  compiz_decor_pixmap_requests PROPERTIES
+  PUBLIC_HEADER "${PUBLIC_HEADERS}"
+)
+
+TARGET_LINK_LIBRARIES(
+  compiz_decor_pixmap_requests
+
+  compiz_core
+  ${GLIBMM_LIBRARIES}
+)
 
=== added directory 'plugins/decor/src/pixmap-requests/include'
=== added file 'plugins/decor/src/pixmap-requests/include/pixmap-requests.h'
--- plugins/decor/src/pixmap-requests/include/pixmap-requests.h	1970-01-01 00:00:00 +0000
+++ plugins/decor/src/pixmap-requests/include/pixmap-requests.h	2012-06-15 17:09:21 +0000
@@ -0,0 +1,188 @@
+/*
+ * Copyright © 2005 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]>
+ */
+
+#ifndef _COMPIZ_DECOR_PIXMAP_REQUESTS_H
+#define _COMPIZ_DECOR_PIXMAP_REQUESTS_H
+
+#include <boost/shared_ptr.hpp>
+#include <boost/shared_array.hpp>
+#include <boost/make_shared.hpp>
+#include <decoration.h>
+
+#include <X11/Xlib.h>
+
+class DecorPixmapInterface
+{
+    public:
+
+	typedef boost::shared_ptr <DecorPixmapInterface> Ptr;
+
+	virtual ~DecorPixmapInterface () {};
+
+	virtual Pixmap getPixmap () = 0;
+};
+
+class DecorPixmapReceiverInterface
+{
+    public:
+
+	virtual ~DecorPixmapReceiverInterface () {}
+
+	virtual void pending () = 0;
+	virtual void update () = 0;
+};
+
+/* So far, nothing particularly interesting here
+ * we just need a way to pass around pointers for
+ * testing */
+class DecorationInterface
+{
+    public:
+
+	typedef boost::shared_ptr <DecorationInterface> Ptr;
+
+	virtual ~DecorationInterface () {}
+
+	virtual DecorPixmapReceiverInterface & receiverInterface () = 0;
+	virtual unsigned int getFrameType () const = 0;
+	virtual unsigned int getFrameState () const = 0;
+	virtual unsigned int getFrameActions () const = 0;
+};
+
+class DecorPixmapDeletionInterface
+{
+    public:
+
+	typedef boost::shared_ptr <DecorPixmapDeletionInterface> Ptr;
+
+	virtual ~DecorPixmapDeletionInterface () {}
+
+	virtual int postDeletePixmap (Pixmap pixmap) = 0;
+};
+
+class X11PixmapDeletor :
+    public DecorPixmapDeletionInterface
+{
+    public:
+
+	typedef boost::shared_ptr <X11PixmapDeletor> Ptr;
+
+	X11PixmapDeletor (Display *dpy) :
+	    mDisplay (dpy)
+	{
+	}
+
+	int postDeletePixmap (Pixmap pixmap) { return decor_post_delete_pixmap (mDisplay, pixmap); }
+
+    private:
+
+	Display *mDisplay;
+};
+
+class DecorPixmap :
+    public DecorPixmapInterface
+{
+    public:
+
+	typedef boost::shared_ptr <DecorPixmap> Ptr;
+
+	DecorPixmap (Pixmap p, DecorPixmapDeletionInterface::Ptr deletor);
+	~DecorPixmap ();
+
+	Pixmap getPixmap ();
+
+    private:
+
+	Pixmap mPixmap;
+	DecorPixmapDeletionInterface::Ptr mDeletor;
+};
+
+class DecorPixmapRequestorInterface
+{
+    public:
+
+	virtual ~DecorPixmapRequestorInterface () {}
+
+	virtual int postGenerateRequest (unsigned int frameType,
+					 unsigned int frameState,
+					 unsigned int frameActions) = 0;
+
+	virtual void handlePending (long *data) = 0;
+};
+
+class DecorationListFindMatchingInterface
+{
+    public:
+
+	virtual ~DecorationListFindMatchingInterface () {}
+
+	virtual DecorationInterface::Ptr findMatchingDecoration (unsigned int frameType,
+								 unsigned int frameState,
+								 unsigned int frameActions) = 0;
+};
+
+class X11DecorPixmapRequestor :
+    public DecorPixmapRequestorInterface
+{
+    public:
+
+	X11DecorPixmapRequestor (Display *dpy,
+				 Window  xid,
+				 DecorationListFindMatchingInterface *listFinder);
+
+	int postGenerateRequest (unsigned int frameType,
+				 unsigned int frameState,
+				 unsigned int frameActions);
+
+	void handlePending (long *data);
+
+    private:
+
+	Display *mDpy;
+	Window  mWindow;
+	DecorationListFindMatchingInterface *mListFinder;
+};
+
+class X11DecorPixmapReceiver :
+    public DecorPixmapReceiverInterface
+{
+    public:
+
+	static const unsigned int UpdateRequested = 1 << 0;
+	static const unsigned int UpdatesPending = 1 << 1;
+
+	X11DecorPixmapReceiver (DecorPixmapRequestorInterface *,
+				DecorationInterface *decor);
+
+	void pending ();
+	void update ();
+    private:
+
+	unsigned int mUpdateState;
+	DecorPixmapRequestorInterface *mDecorPixmapRequestor;
+	DecorationInterface *mDecoration;
+};
+
+#endif
 
=== added directory 'plugins/decor/src/pixmap-requests/src'
=== added file 'plugins/decor/src/pixmap-requests/src/pixmap-requests.cpp'
--- plugins/decor/src/pixmap-requests/src/pixmap-requests.cpp	1970-01-01 00:00:00 +0000
+++ plugins/decor/src/pixmap-requests/src/pixmap-requests.cpp	2012-06-15 17:09:21 +0000
@@ -0,0 +1,93 @@
+#include "pixmap-requests.h"
+#include <boost/foreach.hpp>
+#include <algorithm>
+
+#ifndef foreach
+#define foreach BOOST_FOREACH
+#endif
+
+DecorPixmap::DecorPixmap (Pixmap pixmap, DecorPixmapDeletionInterface::Ptr d) :
+    mPixmap (pixmap),
+    mDeletor (d)
+{
+}
+
+DecorPixmap::~DecorPixmap ()
+{
+    mDeletor->postDeletePixmap (mPixmap);
+}
+
+Pixmap
+DecorPixmap::getPixmap ()
+{
+    return mPixmap;
+}
+
+X11DecorPixmapReceiver::X11DecorPixmapReceiver (DecorPixmapRequestorInterface *requestor,
+						DecorationInterface *decor) :
+    mUpdateState (0),
+    mDecorPixmapRequestor (requestor),
+    mDecoration (decor)
+{
+}
+
+void
+X11DecorPixmapReceiver::pending ()
+{
+    if (mUpdateState & X11DecorPixmapReceiver::UpdateRequested)
+	mUpdateState |= X11DecorPixmapReceiver::UpdatesPending;
+    else
+    {
+	mUpdateState |= X11DecorPixmapReceiver::UpdateRequested;
+
+	mDecorPixmapRequestor->postGenerateRequest (mDecoration->getFrameType (),
+						    mDecoration->getFrameState (),
+						    mDecoration->getFrameActions ());
+    }
+}
+
+void X11DecorPixmapReceiver::update ()
+{
+    if (mUpdateState & X11DecorPixmapReceiver::UpdatesPending)
+	mDecorPixmapRequestor->postGenerateRequest (mDecoration->getFrameType (),
+						    mDecoration->getFrameState (),
+						    mDecoration->getFrameActions ());
+
+    mUpdateState = 0;
+}
+
+X11DecorPixmapRequestor::X11DecorPixmapRequestor (Display *dpy,
+						  Window  window,
+						  DecorationListFindMatchingInterface *listFinder) :
+    mDpy (dpy),
+    mWindow (window),
+    mListFinder (listFinder)
+{
+}
+
+int
+X11DecorPixmapRequestor::postGenerateRequest (unsigned int frameType,
+					      unsigned int frameState,
+					      unsigned int frameActions)
+{
+    return decor_post_generate_request (mDpy,
+					 mWindow,
+					 frameType,
+					 frameState,
+					 frameActions);
+}
+
+void
+X11DecorPixmapRequestor::handlePending (long *data)
+{
+    DecorationInterface::Ptr d = mListFinder->findMatchingDecoration (static_cast <unsigned int> (data[0]),
+								      static_cast <unsigned int> (data[1]),
+								      static_cast <unsigned int> (data[2]));
+
+    if (d)
+	d->receiverInterface ().pending ();
+    else
+	postGenerateRequest (static_cast <unsigned int> (data[0]),
+			     static_cast <unsigned int> (data[1]),
+			     static_cast <unsigned int> (data[2]));
+}
 
=== added directory 'plugins/decor/src/pixmap-requests/tests'
=== added file 'plugins/decor/src/pixmap-requests/tests/CMakeLists.txt'
--- plugins/decor/src/pixmap-requests/tests/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ plugins/decor/src/pixmap-requests/tests/CMakeLists.txt	2012-06-15 17:09:21 +0000
@@ -0,0 +1,15 @@
+include_directories(${CMAKE_CURRENT_SOURCE_DIR})
+
+add_executable (compiz_test_decor_pixmap_requests
+                ${CMAKE_CURRENT_SOURCE_DIR}/pixmap-requests/src/test-decor-pixmap-requests.cpp)
+
+target_link_libraries (compiz_test_decor_pixmap_requests
+		       compiz_decor_pixmap_requests
+		       decoration
+                       ${GTEST_BOTH_LIBRARIES}
+		       ${GMOCK_LIBRARY}
+		       ${GMOCK_MAIN_LIBRARY}
+		       ${CMAKE_THREAD_LIBS_INIT} # Link in pthread. 
+                       )
+
+gtest_add_tests (compiz_test_decor_pixmap_requests "" ${CMAKE_CURRENT_SOURCE_DIR}/pixmap-requests/src/test-decor-pixmap-requests.cpp)
 
=== added directory 'plugins/decor/src/pixmap-requests/tests/pixmap-requests'
=== added directory 'plugins/decor/src/pixmap-requests/tests/pixmap-requests/src'
=== added file 'plugins/decor/src/pixmap-requests/tests/pixmap-requests/src/test-decor-pixmap-requests.cpp'
--- plugins/decor/src/pixmap-requests/tests/pixmap-requests/src/test-decor-pixmap-requests.cpp	1970-01-01 00:00:00 +0000
+++ plugins/decor/src/pixmap-requests/tests/pixmap-requests/src/test-decor-pixmap-requests.cpp	2012-06-15 17:09:21 +0000
@@ -0,0 +1,160 @@
+/*
+ * Copyright © 2012 Canonical 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
+ * Canonical Ltd. not be used in advertising or publicity pertaining to
+ * distribution of the software without specific, written prior permission.
+ * Canonical Ltd. makes no representations about the suitability of this
+ * software for any purpose. It is provided "as is" without express or
+ * implied warranty.
+ *
+ * CANONICAL, LTD. DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN
+ * NO EVENT SHALL CANONICAL, 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.
+ *
+ * Authored by: Sam Spilsbury <[e-mail]>
+ */
+
+#include <gtest/gtest.h>
+#include <gmock/gmock.h>
+#include <iostream>
+#include "pixmap-requests.h"
+
+using ::testing::Return;
+
+class DecorPixmapRequestsTest :
+    public ::testing::Test
+{
+};
+
+class MockDecorPixmapDeletor :
+    public DecorPixmapDeletionInterface
+{
+    public:
+
+	MOCK_METHOD1 (postDeletePixmap, int (Pixmap p));
+};
+
+class MockDecorPixmapReceiver :
+    public DecorPixmapReceiverInterface
+{
+    public:
+
+	MOCK_METHOD0 (pending, void ());
+	MOCK_METHOD0 (update, void ());
+};
+
+class MockDecoration :
+    public DecorationInterface
+{
+    public:
+
+	MOCK_METHOD0 (receiverInterface, DecorPixmapReceiverInterface & ());
+	MOCK_CONST_METHOD0 (getFrameType, unsigned int ());
+	MOCK_CONST_METHOD0 (getFrameState, unsigned int ());
+	MOCK_CONST_METHOD0 (getFrameActions, unsigned int ());
+};
+
+class MockDecorationListFindMatching :
+    public DecorationListFindMatchingInterface
+{
+    public:
+
+	MOCK_METHOD3 (findMatchingDecoration, DecorationInterface::Ptr (unsigned int, unsigned int, unsigned int));
+};
+
+class MockDecorPixmapRequestor :
+    public DecorPixmapRequestorInterface
+{
+    public:
+
+	MOCK_METHOD3 (postGenerateRequest, int (unsigned int, unsigned int, unsigned int));
+	MOCK_METHOD1 (handlePending, void (long *));
+};
+
+TEST(DecorPixmapRequestsTest, TestDestroyPixmapDeletes)
+{
+    boost::shared_ptr <MockDecorPixmapDeletor> mockDeletor = boost::make_shared <MockDecorPixmapDeletor> ();
+    DecorPixmap pm (1, boost::shared_static_cast<DecorPixmapDeletionInterface> (mockDeletor));
+
+    EXPECT_CALL (*(mockDeletor.get ()), postDeletePixmap (1)).WillOnce (Return (1));
+}
+
+TEST(DecorPixmapRequestsTest, TestPendingGeneratesRequest)
+{
+    MockDecorPixmapRequestor mockRequestor;
+    MockDecoration           mockDecoration;
+    X11DecorPixmapReceiver   receiver (&mockRequestor, &mockDecoration);
+
+    EXPECT_CALL (mockDecoration, getFrameActions ()).WillOnce (Return (3));
+    EXPECT_CALL (mockDecoration, getFrameState ()).WillOnce (Return (2));
+    EXPECT_CALL (mockDecoration, getFrameType ()).WillOnce (Return (1));
+
+    EXPECT_CALL (mockRequestor, postGenerateRequest (1, 2, 3));
+
+    receiver.pending ();
+}
+
+TEST(DecorPixmapRequestsTest, TestPendingGeneratesOnlyOneRequest)
+{
+    MockDecorPixmapRequestor mockRequestor;
+    MockDecoration           mockDecoration;
+    X11DecorPixmapReceiver   receiver (&mockRequestor, &mockDecoration);
+
+    EXPECT_CALL (mockDecoration, getFrameActions ()).WillOnce (Return (3));
+    EXPECT_CALL (mockDecoration, getFrameState ()).WillOnce (Return (2));
+    EXPECT_CALL (mockDecoration, getFrameType ()).WillOnce (Return (1));
+
+    EXPECT_CALL (mockRequestor, postGenerateRequest (1, 2, 3));
+
+    receiver.pending ();
+    receiver.pending ();
+}
+
+TEST(DecorPixmapRequestsTest, TestUpdateGeneratesRequestIfNewOnePending)
+{
+    MockDecorPixmapRequestor mockRequestor;
+    MockDecoration           mockDecoration;
+    X11DecorPixmapReceiver   receiver (&mockRequestor, &mockDecoration);
+
+    EXPECT_CALL (mockDecoration, getFrameActions ()).WillOnce (Return (3));
+    EXPECT_CALL (mockDecoration, getFrameState ()).WillOnce (Return (2));
+    EXPECT_CALL (mockDecoration, getFrameType ()).WillOnce (Return (1));
+
+    EXPECT_CALL (mockRequestor, postGenerateRequest (1, 2, 3));
+
+    receiver.pending ();
+    receiver.pending ();
+
+    EXPECT_CALL (mockDecoration, getFrameActions ()).WillOnce (Return (3));
+    EXPECT_CALL (mockDecoration, getFrameState ()).WillOnce (Return (2));
+    EXPECT_CALL (mockDecoration, getFrameType ()).WillOnce (Return (1));
+
+    EXPECT_CALL (mockRequestor, postGenerateRequest (1, 2, 3));
+
+    receiver.update ();
+}
+
+TEST(DecorPixmapRequestsTest, TestUpdateGeneratesNoRequestIfNoNewOnePending)
+{
+    MockDecorPixmapRequestor mockRequestor;
+    MockDecoration           mockDecoration;
+    X11DecorPixmapReceiver   receiver (&mockRequestor, &mockDecoration);
+
+    EXPECT_CALL (mockDecoration, getFrameActions ()).WillOnce (Return (3));
+    EXPECT_CALL (mockDecoration, getFrameState ()).WillOnce (Return (2));
+    EXPECT_CALL (mockDecoration, getFrameType ()).WillOnce (Return (1));
+
+    EXPECT_CALL (mockRequestor, postGenerateRequest (1, 2, 3));
+
+    receiver.pending ();
+    receiver.update ();
+}