Merge lp:~muktupavels/compiz/gwd-cleanup into lp:compiz/0.9.12

[Alberts Muktupāvels]

gtk-window-decorator: more code cleanup.

[lp:~muktupavels/compiz/gwd-cleanup]

4061. By Alberts Muktupāvels on 2016-06-08

Remove also gdk_flush.

[Sam Spilsbury (smspillaz)]

LGTM otherwise

[lp:~muktupavels/compiz/gwd-cleanup]

4062. By Alberts Muktupāvels on 2016-06-09

Use function to get titlebar height in GWDThemeCairo.

[Alberts Muktupāvels (muktupavels)]

Updated.

[lp:~muktupavels/compiz/gwd-cleanup]

4063. By Alberts Muktupāvels on 2016-06-09

Add back gdk_flush and gdk_display_sync.

4064. By Alberts Muktupāvels on 2016-06-09

Use existing variable.

[Sam Spilsbury (smspillaz)]

Great, thanks :)

review: Approve

=== modified file 'gtk/window-decorator/CMakeLists.txt'
--- gtk/window-decorator/CMakeLists.txt	2016-05-21 11:06:24 +0000
+++ gtk/window-decorator/CMakeLists.txt	2016-06-09 14:54:36 +0000
@@ -66,7 +66,6 @@
     add_executable (gtk-window-decorator
 		    gtk-window-decorator.c
 		    blurprops.c
-		    decorprops.c
 		    cairo.c
 		    frames.c
 		    gdk.c
 
=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2016-05-26 21:20:20 +0000
+++ gtk/window-decorator/decorator.c	2016-06-09 14:54:36 +0000
@@ -583,7 +583,7 @@
     gdk_flush ();
 
     /* Handle failure */
-    if (!surface || gdk_error_trap_pop ())
+    if (gdk_error_trap_pop () || !surface)
     {
 	if (surface)
 	    cairo_surface_destroy (surface);
@@ -597,7 +597,7 @@
     gdk_flush ();
 
     /* Handle failure */
-    if (!buffer_surface || gdk_error_trap_pop ())
+    if (gdk_error_trap_pop () || !buffer_surface)
     {
 	if (buffer_surface)
 	    cairo_surface_destroy (buffer_surface);
@@ -846,13 +846,13 @@
 						 1, 1,
 						 frame->win_extents.left,
 						 frame->win_extents.right,
-						 frame->win_extents.top + frame->titlebar_height,
+						 frame->win_extents.top,
 						 frame->win_extents.bottom,
 						 frame->win_extents.left -
 						 TRANSLUCENT_CORNER_SIZE,
 						 frame->win_extents.right -
 						 TRANSLUCENT_CORNER_SIZE,
-						 frame->win_extents.top + frame->titlebar_height -
+						 frame->win_extents.top -
 						 TRANSLUCENT_CORNER_SIZE,
 						 frame->win_extents.bottom -
 						 TRANSLUCENT_CORNER_SIZE,
@@ -877,12 +877,11 @@
 			     1, 1,
 			     frame->max_win_extents.left,
 			     frame->max_win_extents.right,
-			     frame->max_win_extents.top + frame->max_titlebar_height,
+			     frame->max_win_extents.top,
 			     frame->max_win_extents.bottom,
 			     frame->max_win_extents.left - TRANSLUCENT_CORNER_SIZE,
 			     frame->max_win_extents.right - TRANSLUCENT_CORNER_SIZE,
-			     frame->max_win_extents.top + frame->max_titlebar_height -
-			     TRANSLUCENT_CORNER_SIZE,
+			     frame->max_win_extents.top - TRANSLUCENT_CORNER_SIZE,
 			     frame->max_win_extents.bottom - TRANSLUCENT_CORNER_SIZE,
 			     opt_no_shadow,  /* No shadow when maximized */
 			     context_max,
@@ -1328,8 +1327,6 @@
         default_frames[i].d->frame = frame;
         default_frames[i].d->active = i < WINDOW_TYPE_FRAMES_NUM ? TRUE : FALSE;
 
-        extents.top += frame->titlebar_height;
-
         default_frames[i].d->draw = draw_window_decoration;
 	default_frames[i].d->surface = create_native_surface_and_wrap (default_frames[i].d->width,
 	                                                               default_frames[i].d->height,
 
=== removed file 'gtk/window-decorator/decorprops.c'
--- gtk/window-decorator/decorprops.c	2016-05-26 19:52:15 +0000
+++ gtk/window-decorator/decorprops.c	1970-01-01 00:00:00 +0000
@@ -1,173 +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"
-
-void
-decor_update_window_property (decor_t *d)
-{
-    long	    *data;
-    Display	    *xdisplay =
-	GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-    decor_extents_t extents = d->frame->win_extents;
-    gint	    nQuad;
-    unsigned int    nOffset = 1;
-    unsigned int   frame_type = populate_frame_type (d);
-    unsigned int   frame_state = populate_frame_state (d);
-    unsigned int   frame_actions = populate_frame_actions (d);
-    decor_quad_t    quads[N_QUADS_MAX];
-    int		    w, h;
-    gint	    stretch_offset;
-    REGION	    top, bottom, left, right;
-
-    w = d->border_layout.top.x2 - d->border_layout.top.x1 -
-	d->context->left_space - d->context->right_space;
-
-    if (d->border_layout.rotation)
-	h = d->border_layout.left.x2 - d->border_layout.left.x1;
-    else
-	h = d->border_layout.left.y2 - d->border_layout.left.y1;
-
-    stretch_offset = w - d->button_width - 1;
-
-    nQuad = decor_set_lSrStXbS_window_quads (quads, d->context,
-					     &d->border_layout,
-					     stretch_offset);
-
-    extents.top += d->frame->titlebar_height;
-
-    data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);
-    decor_quads_to_property (data, nOffset - 1, cairo_xlib_surface_get_drawable (d->surface),
-                             &extents, &extents,
-                             &extents, &extents,
-                             ICON_SPACE + d->button_width,
-                             0,
-                             quads, nQuad, frame_type, frame_state, frame_actions);
-
-    gdk_error_trap_push ();
-    XChangeProperty (xdisplay, d->prop_xid,
-		     win_decor_atom,
-		     XA_INTEGER,
-		     32, PropModeReplace, (guchar *) data,
-		     PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX);
-    gdk_display_sync (gdk_display_get_default ());
-    gdk_error_trap_pop_ignored ();
-
-    top.rects = &top.extents;
-    top.numRects = top.size = 1;
-
-    top.extents.x1 = -extents.left;
-    top.extents.y1 = -extents.top;
-    top.extents.x2 = w + extents.right;
-    top.extents.y2 = 0;
-
-    bottom.rects = &bottom.extents;
-    bottom.numRects = bottom.size = 1;
-
-    bottom.extents.x1 = -extents.left;
-    bottom.extents.y1 = 0;
-    bottom.extents.x2 = w + extents.right;
-    bottom.extents.y2 = extents.bottom;
-
-    left.rects = &left.extents;
-    left.numRects = left.size = 1;
-
-    left.extents.x1 = -extents.left;
-    left.extents.y1 = 0;
-    left.extents.x2 = 0;
-    left.extents.y2 = h;
-
-    right.rects = &right.extents;
-    right.numRects = right.size = 1;
-
-    right.extents.x1 = 0;
-    right.extents.y1 = 0;
-    right.extents.x2 = extents.right;
-    right.extents.y2 = h;
-
-    decor_update_blur_property (d,
-				w, h,
-				&top, stretch_offset,
-				&bottom, w / 2,
-				&left, h / 2,
-				&right, h / 2);
-
-    free (data);
-}
-
-void
-decor_update_switcher_property (decor_t *d)
-{
-    long	 *data;
-    Display	 *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-    gint	 nQuad;
-    decor_quad_t quads[N_QUADS_MAX];
-    unsigned int    nOffset = 1;
-    unsigned int   frame_type = populate_frame_type (d);
-    unsigned int   frame_state = populate_frame_state (d);
-    unsigned int   frame_actions = populate_frame_actions (d);
-    GtkStyleContext *context;
-    GdkRGBA fg;
-    long         fgColor[4];
-    
-    nQuad = decor_set_lSrStSbX_window_quads (quads, &d->frame->window_context_active,
-					     &d->border_layout,
-					     d->border_layout.top.x2 -
-					     d->border_layout.top.x1 -
-					     d->frame->window_context_active.extents.left -
-						 d->frame->window_context_active.extents.right -
-						     32);
-    
-    data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);
-    decor_quads_to_property (data, nOffset - 1, cairo_xlib_surface_get_drawable (d->surface),
-			     &d->frame->win_extents, &d->frame->win_extents,
-			     &d->frame->win_extents, &d->frame->win_extents,
-			     0, 0, quads, nQuad, frame_type, frame_state, frame_actions);
-
-    context = gtk_widget_get_style_context (d->frame->style_window_rgba);
-
-    gtk_style_context_save (context);
-    gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
-    gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &fg);
-    gtk_style_context_restore (context);
-
-    fgColor[0] = fg.red;
-    fgColor[1] = fg.green;
-    fgColor[2] = fg.blue;
-    fgColor[3] = SWITCHER_ALPHA;
-    
-    gdk_error_trap_push ();
-    XChangeProperty (xdisplay, d->prop_xid,
-		     win_decor_atom,
-		     XA_INTEGER,
-		     32, PropModeReplace, (guchar *) data,
-		     PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX);
-    XChangeProperty (xdisplay, d->prop_xid, switcher_fg_atom,
-		     XA_INTEGER, 32, PropModeReplace, (guchar *) fgColor, 4);
-    gdk_display_sync (gdk_display_get_default ());
-    gdk_error_trap_pop_ignored ();
-
-    free (data);
-}
 
=== modified file 'gtk/window-decorator/frames.c'
--- gtk/window-decorator/frames.c	2016-06-01 11:29:21 +0000
+++ gtk/window-decorator/frames.c	2016-06-09 14:54:36 +0000
@@ -437,8 +437,6 @@
 
     frame->type = strdup (type);
     frame->refcount = 0;
-    frame->titlebar_height = 17;
-    frame->max_titlebar_height = 17;
     frame->border_shadow_active = NULL;
     frame->border_shadow_inactive = NULL;
     frame->max_border_shadow_active = NULL;
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2016-06-09 14:54:36 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2016-06-09 14:54:36 +0000
@@ -209,8 +209,6 @@
 struct _decor_frame {
     decor_extents_t win_extents;
     decor_extents_t max_win_extents;
-    int		    titlebar_height;
-    int		    max_titlebar_height;
     decor_shadow_t *border_shadow_active;
     decor_shadow_t *border_shadow_inactive;
     decor_shadow_t *max_border_shadow_active;
@@ -442,14 +440,6 @@
 			    Region  right_region,
 			    int     right_offset);
 
-/* decorprops.c */
-
-void
-decor_update_window_property (decor_t *d);
-
-void
-decor_update_switcher_property (decor_t *d);
-
 /* cairo.c */
 
 #define CORNER_TOPLEFT     (1 << 0)
 
=== modified file 'gtk/window-decorator/gwd-theme-cairo.c'
--- gtk/window-decorator/gwd-theme-cairo.c	2016-05-26 19:52:15 +0000
+++ gtk/window-decorator/gwd-theme-cairo.c	2016-06-09 14:54:36 +0000
@@ -38,6 +38,96 @@
 
 G_DEFINE_TYPE (GWDThemeCairo, gwd_theme_cairo, GWD_TYPE_THEME)
 
+static gint
+get_titlebar_height (decor_frame_t *frame)
+{
+    return frame->text_height < 17 ? 17 : frame->text_height;
+}
+
+static void
+decor_update_window_property (decor_t *d)
+{
+    GdkDisplay *display = gdk_display_get_default ();
+    Display *xdisplay = gdk_x11_display_get_xdisplay (display);
+    decor_extents_t extents = d->frame->win_extents;
+    unsigned int nOffset = 1;
+    unsigned int frame_type = populate_frame_type (d);
+    unsigned int frame_state = populate_frame_state (d);
+    unsigned int frame_actions = populate_frame_actions (d);
+    long *data;
+    gint nQuad;
+    decor_quad_t quads[N_QUADS_MAX];
+    int w, h;
+    gint stretch_offset;
+    REGION top, bottom, left, right;
+
+    w = d->border_layout.top.x2 - d->border_layout.top.x1 -
+	d->context->left_space - d->context->right_space;
+
+    if (d->border_layout.rotation)
+        h = d->border_layout.left.x2 - d->border_layout.left.x1;
+    else
+        h = d->border_layout.left.y2 - d->border_layout.left.y1;
+
+    stretch_offset = w - d->button_width - 1;
+
+    nQuad = decor_set_lSrStXbS_window_quads (quads, d->context,
+                                             &d->border_layout,
+                                             stretch_offset);
+
+    data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);
+    decor_quads_to_property (data, nOffset - 1, cairo_xlib_surface_get_drawable (d->surface),
+                             &extents, &extents,
+                             &extents, &extents,
+                             ICON_SPACE + d->button_width,
+                             0,
+                             quads, nQuad, frame_type, frame_state, frame_actions);
+
+    gdk_error_trap_push ();
+    XChangeProperty (xdisplay, d->prop_xid, win_decor_atom, XA_INTEGER,
+                     32, PropModeReplace, (guchar *) data,
+                     PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX);
+    gdk_display_sync (display);
+    gdk_error_trap_pop_ignored ();
+
+    top.rects = &top.extents;
+    top.numRects = top.size = 1;
+
+    top.extents.x1 = -extents.left;
+    top.extents.y1 = -extents.top;
+    top.extents.x2 = w + extents.right;
+    top.extents.y2 = 0;
+
+    bottom.rects = &bottom.extents;
+    bottom.numRects = bottom.size = 1;
+
+    bottom.extents.x1 = -extents.left;
+    bottom.extents.y1 = 0;
+    bottom.extents.x2 = w + extents.right;
+    bottom.extents.y2 = extents.bottom;
+
+    left.rects = &left.extents;
+    left.numRects = left.size = 1;
+
+    left.extents.x1 = -extents.left;
+    left.extents.y1 = 0;
+    left.extents.x2 = 0;
+    left.extents.y2 = h;
+
+    right.rects = &right.extents;
+    right.numRects = right.size = 1;
+
+    right.extents.x1 = 0;
+    right.extents.y1 = 0;
+    right.extents.x2 = extents.right;
+    right.extents.y2 = h;
+
+    decor_update_blur_property (d, w, h, &top, stretch_offset,
+                                &bottom, w / 2, &left, h / 2, &right, h / 2);
+
+    free (data);
+}
+
 static void
 button_state_offsets (gdouble  x,
                       gdouble  y,
@@ -243,6 +333,7 @@
     gint corners = SHADE_LEFT | SHADE_RIGHT | SHADE_TOP | SHADE_BOTTOM;
     gint top;
     gint button_x;
+    gint titlebar_height;
 
     if (!decor->surface)
         return;
@@ -275,10 +366,10 @@
 
     cairo_set_operator (cr, CAIRO_OPERATOR_SOURCE);
 
-    top = decor->frame->win_extents.top + decor->frame->titlebar_height;
+    top = decor->frame->win_extents.top;
 
     x1 = decor->context->left_space - decor->frame->win_extents.left;
-    y1 = decor->context->top_space - decor->frame->win_extents.top - decor->frame->titlebar_height;
+    y1 = decor->context->top_space - decor->frame->win_extents.top;
     x2 = decor->width - decor->context->right_space + decor->frame->win_extents.right;
     y2 = decor->height - decor->context->bottom_space + decor->frame->win_extents.bottom;
 
@@ -474,10 +565,11 @@
     cairo_set_line_width (cr, 2.0);
 
     button_x = decor->width - decor->context->right_space - 13;
+    titlebar_height = get_titlebar_height (decor->frame);
 
     if (decor->actions & WNCK_WINDOW_ACTION_CLOSE) {
         button_state_offsets (button_x,
-                              y1 - 3.0 + decor->frame->titlebar_height / 2,
+                              y1 - 3.0 + titlebar_height / 2,
                               decor->button_states[BUTTON_CLOSE], &x, &y);
 
         button_x -= 17;
@@ -499,7 +591,7 @@
 
     if (decor->actions & WNCK_WINDOW_ACTION_MAXIMIZE) {
         button_state_offsets (button_x,
-                              y1 - 3.0 + decor->frame->titlebar_height / 2,
+                              y1 - 3.0 + titlebar_height / 2,
                               decor->button_states[BUTTON_MAX], &x, &y);
 
         button_x -= 17;
@@ -538,7 +630,7 @@
 
     if (decor->actions & WNCK_WINDOW_ACTION_MINIMIZE) {
         button_state_offsets (button_x,
-                              y1 - 3.0 + decor->frame->titlebar_height / 2,
+                              y1 - 3.0 + titlebar_height / 2,
                               decor->button_states[BUTTON_MIN], &x, &y);
 
         button_x -= 17;
@@ -565,7 +657,7 @@
         if (decor->active) {
             cairo_move_to (cr,
                            decor->context->left_space + 21.0,
-                           y1 + 2.0 + (decor->frame->titlebar_height - decor->frame->text_height) / 2.0);
+                           y1 + 2.0 + (titlebar_height - decor->frame->text_height) / 2.0);
 
             fg.alpha = STROKE_ALPHA;
             gdk_cairo_set_source_rgba (cr, &fg);
@@ -581,7 +673,7 @@
 
         cairo_move_to (cr,
                        decor->context->left_space + 21.0,
-                        y1 + 2.0 + (decor->frame->titlebar_height - decor->frame->text_height) / 2.0);
+                        y1 + 2.0 + (titlebar_height - decor->frame->text_height) / 2.0);
 
         pango_cairo_show_layout (cr, decor->layout);
     }
@@ -589,7 +681,7 @@
     if (decor->icon) {
         cairo_translate (cr,
                          decor->context->left_space + 1,
-                         y1 - 5.0 + decor->frame->titlebar_height / 2);
+                         y1 - 5.0 + titlebar_height / 2);
         cairo_set_source (cr, decor->icon);
         cairo_rectangle (cr, 0.0, 0.0, 16.0, 16.0);
         cairo_clip (cr);
@@ -669,15 +761,16 @@
 {
     decor_extents_t win_extents = { 6, 6, 10, 6 };
     decor_extents_t max_win_extents = { 6, 6, 4, 6 };
+    gint titlebar_height = get_titlebar_height (frame);
 
     frame = gwd_decor_frame_ref (frame);
 
+    win_extents.top += titlebar_height;
+    max_win_extents.top += titlebar_height;
+
     frame->win_extents = win_extents;
     frame->max_win_extents = max_win_extents;
 
-    frame->titlebar_height = frame->max_titlebar_height =
-        (frame->text_height < 17) ? 17 : frame->text_height;
-
     gwd_decor_frame_unref (frame);
 }
 
@@ -693,9 +786,11 @@
                                            gint     *w,
                                            gint     *h)
 {
+    gint titlebar_height = get_titlebar_height (decor->frame);
+
     *x = pos[i][j].x + pos[i][j].xw * width;
     *y = pos[i][j].y +
-         pos[i][j].yh * height + pos[i][j].yth * (decor->frame->titlebar_height - 17);
+         pos[i][j].yh * height + pos[i][j].yth * (titlebar_height - 17);
 
     if ((decor->state & WNCK_WINDOW_STATE_MAXIMIZED_HORIZONTALLY) && (j == 0 || j == 2)) {
         *w = 0;
@@ -707,7 +802,7 @@
         *h = 0;
     } else {
         *h = pos[i][j].h +
-             pos[i][j].hh * height + pos[i][j].hth * (decor->frame->titlebar_height - 17);
+             pos[i][j].hh * height + pos[i][j].hth * (titlebar_height - 17);
     }
 }
 
@@ -722,16 +817,16 @@
                                      gint     *w,
                                      gint     *h)
 {
+    gint titlebar_height = get_titlebar_height (decor->frame);
+
     if (i > BUTTON_MENU)
         return FALSE;
 
     *x = bpos[i].x + bpos[i].xw * width;
-    *y = bpos[i].y + bpos[i].yh * height + bpos[i].yth *
-         (decor->frame->titlebar_height - 17);
+    *y = bpos[i].y + bpos[i].yh * height + bpos[i].yth * (titlebar_height - 17);
 
     *w = bpos[i].w + bpos[i].ww * width;
-    *h = bpos[i].h + bpos[i].hh * height + bpos[i].hth +
-         (decor->frame->titlebar_height - 17);
+    *h = bpos[i].h + bpos[i].hh * height + bpos[i].hth + (titlebar_height - 17);
 
     /* hack to position multiple buttons on the right */
     if (i != BUTTON_MENU) {
 
=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-06-09 14:54:36 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-06-09 14:54:36 +0000
@@ -662,11 +662,6 @@
                                              left_stretch_offset, right_stretch_offset,
                                              top_stretch_offset, bottom_stretch_offset);
 
-    win_extents.top += d->frame->titlebar_height;
-    frame_win_extents.top += d->frame->titlebar_height;
-    max_win_extents.top += d->frame->max_titlebar_height;
-    frame_max_win_extents.top += d->frame->max_titlebar_height;
-
     data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);
     decor_quads_to_property (data, nOffset - 1, cairo_xlib_surface_get_drawable (d->surface),
                              &frame_win_extents, &win_extents,
@@ -1183,24 +1178,20 @@
     meta_theme_get_frame_borders (metacity->theme, style_info, frame_type,
                                   frame->text_height, 0, &borders);
 
-    frame->win_extents.top = frame->win_extents.top;
+    frame->win_extents.top = borders.visible.top;
     frame->win_extents.bottom = borders.visible.bottom;
     frame->win_extents.left = borders.visible.left;
     frame->win_extents.right = borders.visible.right;
 
-    frame->titlebar_height = borders.visible.top - frame->win_extents.top;
-
     meta_theme_get_frame_borders (metacity->theme, style_info, frame_type,
                                   frame->text_height, META_FRAME_MAXIMIZED,
                                   &borders);
 
-    frame->max_win_extents.top = frame->win_extents.top;
+    frame->max_win_extents.top = borders.visible.top;
     frame->max_win_extents.bottom = borders.visible.bottom;
     frame->max_win_extents.left = borders.visible.left;
     frame->max_win_extents.right = borders.visible.right;
 
-    frame->max_titlebar_height = borders.visible.top - frame->max_win_extents.top;
-
     meta_style_info_unref (style_info);
 
     gwd_decor_frame_unref (frame);
 
=== modified file 'gtk/window-decorator/switcher.c'
--- gtk/window-decorator/switcher.c	2016-05-26 20:11:19 +0000
+++ gtk/window-decorator/switcher.c	2016-06-09 14:54:36 +0000
@@ -27,6 +27,61 @@
 
 #define SWITCHER_SPACE 40
 
+static void
+decor_update_switcher_property (decor_t *d)
+{
+    long	 *data;
+    Display	 *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+    gint	 nQuad;
+    decor_quad_t quads[N_QUADS_MAX];
+    unsigned int    nOffset = 1;
+    unsigned int   frame_type = populate_frame_type (d);
+    unsigned int   frame_state = populate_frame_state (d);
+    unsigned int   frame_actions = populate_frame_actions (d);
+    GtkStyleContext *context;
+    GdkRGBA fg;
+    long         fgColor[4];
+    
+    nQuad = decor_set_lSrStSbX_window_quads (quads, &d->frame->window_context_active,
+					     &d->border_layout,
+					     d->border_layout.top.x2 -
+					     d->border_layout.top.x1 -
+					     d->frame->window_context_active.extents.left -
+						 d->frame->window_context_active.extents.right -
+						     32);
+    
+    data = decor_alloc_property (nOffset, WINDOW_DECORATION_TYPE_PIXMAP);
+    decor_quads_to_property (data, nOffset - 1, cairo_xlib_surface_get_drawable (d->surface),
+			     &d->frame->win_extents, &d->frame->win_extents,
+			     &d->frame->win_extents, &d->frame->win_extents,
+			     0, 0, quads, nQuad, frame_type, frame_state, frame_actions);
+
+    context = gtk_widget_get_style_context (d->frame->style_window_rgba);
+
+    gtk_style_context_save (context);
+    gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
+    gtk_style_context_get_color (context, GTK_STATE_FLAG_NORMAL, &fg);
+    gtk_style_context_restore (context);
+
+    fgColor[0] = fg.red;
+    fgColor[1] = fg.green;
+    fgColor[2] = fg.blue;
+    fgColor[3] = SWITCHER_ALPHA;
+    
+    gdk_error_trap_push ();
+    XChangeProperty (xdisplay, d->prop_xid,
+		     win_decor_atom,
+		     XA_INTEGER,
+		     32, PropModeReplace, (guchar *) data,
+		     PROP_HEADER_SIZE + BASE_PROP_SIZE + QUAD_PROP_SIZE * N_QUADS_MAX);
+    XChangeProperty (xdisplay, d->prop_xid, switcher_fg_atom,
+		     XA_INTEGER, 32, PropModeReplace, (guchar *) fgColor, 4);
+    gdk_display_sync (gdk_display_get_default ());
+    gdk_error_trap_pop_ignored ();
+
+    free (data);
+}
+
 decor_frame_t *
 create_switcher_frame (const gchar *type)
 {