Merge lp:~muktupavels/compiz/gwd-theme-style-window into lp:compiz/0.9.12

[Alberts Muktupāvels]

gtk-window-decorator: use only one style window.

- Use only one style window - there is no reason to keep multiple windows. More windows just meant that on style-updated signal we called decorations_changed multiple times for no reason - just extra work.

- Switcher label was added to style window, but my tests shows that it is not needed...

- On style-updated signal _title_color was updated multiple times, but it is used only by Cairo theme.

- Use only one style window - there is no reason to keep multiple windows. More windows just meant that on style-updated signal we called decorations_changed multiple times for no reason - just extra work.

- Switcher label was added to style window, but my tests shows that it is not needed...

- On style-updated signal _title_color was updated multiple times, but it is used only by Cairo theme.

[lp:~muktupavels/compiz/gwd-theme-style-window]

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

Merge with lp:~albertsmuktupavels/compiz/gwd-titlebar-font.

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

Merge with lp:~albertsmuktupavels/compiz/gwd-titlebar-font.

[Marco Trevisan (Treviño) (3v1n0)]

Fine. Good a try to an offscreenwindow once you've time.

review: Approve

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2016-06-09 14:58:49 +0000
+++ gtk/window-decorator/decorator.c	2016-06-09 14:58:49 +0000
@@ -55,15 +55,19 @@
 void
 frame_update_titlebar_font (decor_frame_t *frame)
 {
+    GtkWidget *style_window = gwd_theme_get_style_window (gwd_theme);
     PangoFontDescription *font_desc = gwd_theme_get_titlebar_font (gwd_theme, frame);
-    PangoLanguage *lang = pango_context_get_language (frame->pango_context);
+    PangoLanguage *lang;
     PangoFontMetrics *metrics;
     gint ascent, descent;
 
     frame = gwd_decor_frame_ref (frame);
 
+    if (frame->pango_context == NULL)
+        frame->pango_context = gtk_widget_create_pango_context (style_window);
     pango_context_set_font_description (frame->pango_context, font_desc);
 
+    lang = pango_context_get_language (frame->pango_context);
     metrics = pango_context_get_metrics (frame->pango_context, font_desc, lang);
     ascent = pango_font_metrics_get_ascent (metrics);
     descent = pango_font_metrics_get_descent (metrics);
@@ -76,14 +80,6 @@
     gwd_decor_frame_unref (frame);
 }
 
-void
-update_frames_titlebar_fonts (gpointer key,
-			      gpointer value,
-			      gpointer user_data)
-{
-    frame_update_titlebar_font ((decor_frame_t *) value);
-}
-
 /*
  * update_event_windows
  *
@@ -284,8 +280,6 @@
     if (!d->layout)
     {
 	d->layout = pango_layout_new (d->frame->pango_context);
-	if (!d->layout)
-	    return 0;
 
 	pango_layout_set_wrap (d->layout, PANGO_WRAP_CHAR);
     }
@@ -353,6 +347,10 @@
 		w = 1;
 	}
 
+        /* Ensure that a layout is created */
+        if (d->layout == NULL)
+            d->layout = pango_layout_new (d->frame->pango_context);
+
 	/* Set the maximum width for the layout (in case
 	 * decoration size < text width) since we
 	 * still need to show the buttons and the window name */
@@ -417,6 +415,7 @@
 update_window_decoration_icon (WnckWindow *win)
 {
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
+    GtkWidget *style_window = gwd_theme_get_style_window (gwd_theme);
 
     /* Destroy old stuff */
     if (d->icon)
@@ -442,8 +441,7 @@
 
 	g_object_ref (G_OBJECT (d->icon_pixbuf));
 
-	d->icon_surface = surface_new_from_pixbuf (d->icon_pixbuf,
-	                                           d->frame->style_window_rgba);
+	d->icon_surface = surface_new_from_pixbuf (d->icon_pixbuf, style_window);
 
 	cr = cairo_create (d->icon_surface);
 	d->icon = cairo_pattern_create_for_surface (cairo_get_target (cr));
@@ -514,6 +512,7 @@
     cairo_surface_t   *surface, *buffer_surface = NULL;
     Picture           picture;
     Display           *xdisplay;
+    GtkWidget         *style_window;
 
     if (win == NULL)
 	return FALSE;
@@ -524,10 +523,11 @@
 	return FALSE;
 
     xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+    style_window = gwd_theme_get_style_window (gwd_theme);
 
     gdk_error_trap_push ();
 
-    surface = create_native_surface_and_wrap (d->width, d->height, d->frame->style_window_rgba);
+    surface = create_native_surface_and_wrap (d->width, d->height, style_window);
 
     gdk_flush ();
 
@@ -541,7 +541,7 @@
 
     gdk_error_trap_push ();
 
-    buffer_surface = create_surface (d->width, d->height, d->frame->style_window_rgba);
+    buffer_surface = create_surface (d->width, d->height, style_window);
 
     gdk_flush ();
 
@@ -1174,21 +1174,18 @@
 void
 update_default_decorations (GdkScreen *screen)
 {
+    GdkDisplay *display = gdk_display_get_default ();
+    Display *xdisplay = gdk_x11_display_get_xdisplay (display);
+    Window xroot = RootWindowOfScreen (gdk_x11_screen_get_xscreen (screen));
+    Atom bareAtom = XInternAtom (xdisplay, DECOR_BARE_ATOM_NAME, FALSE);
+    Atom activeAtom = XInternAtom (xdisplay, DECOR_ACTIVE_ATOM_NAME, FALSE);
+    GtkWidget *style_window = gwd_theme_get_style_window (gwd_theme);
     long	    *data;
-    Window	    xroot;
-    GdkDisplay	    *gdkdisplay = gdk_display_get_default ();
-    Display	    *xdisplay = gdk_x11_display_get_xdisplay (gdkdisplay);
-    Atom	    bareAtom, activeAtom;
     decor_frame_t   *frame;
     decor_frame_t   *bare_frame = gwd_get_decor_frame ("bare");
     decor_extents_t extents;
     unsigned int    i;
 
-    xroot = RootWindowOfScreen (gdk_x11_screen_get_xscreen (screen));
-
-    bareAtom   = XInternAtom (xdisplay, DECOR_BARE_ATOM_NAME, FALSE);
-    activeAtom = XInternAtom (xdisplay, DECOR_ACTIVE_ATOM_NAME, FALSE);
-
     if (bare_frame->border_shadow_active)
     {
 	decor_layout_t layout;
@@ -1266,7 +1263,7 @@
 
         default_frames[i].d->context = i < WINDOW_TYPE_FRAMES_NUM ? &frame->window_context_active : &frame->window_context_inactive;
         default_frames[i].d->shadow  =  i < WINDOW_TYPE_FRAMES_NUM ? frame->border_shadow_active : frame->border_shadow_inactive;
-        default_frames[i].d->layout  = pango_layout_new (frame->pango_context);
+        default_frames[i].d->layout = NULL;
 
         decor_get_default_layout (default_frames[i].d->context, 1, 1, &default_frames[i].d->border_layout);
 
@@ -1279,7 +1276,7 @@
         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,
-	                                                               frame->style_window_rgba);
+	                                                               style_window);
 
 	unsigned int j, k;
 

=== modified file 'gtk/window-decorator/frames.c'
--- gtk/window-decorator/frames.c	2016-06-09 14:58:49 +0000
+++ gtk/window-decorator/frames.c	2016-06-09 14:58:49 +0000
@@ -32,236 +32,7 @@
 GHashTable    *frame_info_table;
 GHashTable    *frames_table;
 
-/* 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;
-    }
-}
-
-static 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;
-}
-
-static void
-update_style (GtkWidget *widget)
-{
-    GtkStyleContext *context;
-    GdkRGBA bg;
-    decor_color_t spot_color;
-
-    context = gtk_widget_get_style_context (widget);
-
-    gtk_style_context_save (context);
-    gtk_style_context_set_state (context, GTK_STATE_FLAG_SELECTED);
-    gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &bg);
-    gtk_style_context_restore (context);
-
-    spot_color.r = bg.red;
-    spot_color.g = bg.green;
-    spot_color.b = bg.blue;
-
-    shade (&spot_color, &_title_color[0], 1.05);
-    shade (&_title_color[0], &_title_color[1], 0.85);
-}
-
-static void
-style_updated (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);
-}
-
-void
+static void
 decor_frame_refresh (decor_frame_t *frame)
 {
     decor_shadow_options_t active_o, inactive_o;
@@ -269,8 +40,6 @@
 
     gwd_decor_frame_ref (frame);
 
-    update_style (frame->style_window_rgba);
-
     frame_update_titlebar_font (frame);
 
     if (strcmp (frame->type, "switcher") != 0 && strcmp (frame->type, "bare") != 0)
@@ -421,8 +190,6 @@
 decor_frame_t *
 decor_frame_new (const gchar *type)
 {
-    GdkScreen     *gdkscreen = gdk_screen_get_default ();
-    GdkVisual     *visual;
     decor_frame_t *frame = malloc (sizeof (decor_frame_t));
 
     if (!frame)
@@ -438,21 +205,7 @@
     frame->max_border_shadow_active = NULL;
     frame->max_border_shadow_inactive = NULL;
 
-    frame->style_window_rgba = gtk_window_new (GTK_WINDOW_POPUP);
-
-    visual = gdk_screen_get_rgba_visual (gdkscreen);
-    if (visual)
-	gtk_widget_set_visual (frame->style_window_rgba, visual);
-
-    gtk_widget_realize (frame->style_window_rgba);
-
-    gtk_window_move (GTK_WINDOW (frame->style_window_rgba), -100, -100);
-
-    frame->pango_context = gtk_widget_create_pango_context (frame->style_window_rgba);
-
-    g_signal_connect_data (frame->style_window_rgba, "style-updated",
-			   G_CALLBACK (style_updated),
-			   (gpointer) frame->pango_context, 0, 0);
+    frame->pango_context = NULL;
 
     return frame;
 }
@@ -474,9 +227,6 @@
     if (frame->max_border_shadow_inactive)
 	decor_shadow_destroy (xdisplay, frame->max_border_shadow_inactive);
 
-    if (frame->style_window_rgba)
-	gtk_widget_destroy (GTK_WIDGET (frame->style_window_rgba));
-
     if (frame->pango_context)
 	g_object_unref (G_OBJECT (frame->pango_context));
 

=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2016-06-09 14:58:49 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2016-06-09 14:58:49 +0000
@@ -107,7 +107,6 @@
 GHashTable    *frame_table;
 GtkWidget     *action_menu = NULL;
 gboolean      action_menu_mapped = FALSE;
-decor_color_t _title_color[2];
 gint	     double_click_timeout = 250;
 
 GtkWidget     *tip_window;

=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2016-06-09 14:58:49 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2016-06-09 14:58:49 +0000
@@ -218,7 +218,6 @@
     decor_context_t max_window_context_active;
     decor_context_t max_window_context_inactive;
     PangoContext	 *pango_context;
-    GtkWidget	         *style_window_rgba;
     gint		 text_height;
     gchar		 *type;
 
@@ -279,7 +278,6 @@
 /* action menu */
 extern GtkWidget     *action_menu;
 extern gboolean      action_menu_mapped;
-extern decor_color_t _title_color[2];
 extern gint	     double_click_timeout;
 
 
@@ -387,11 +385,6 @@
 update_shadow (void);
 
 void
-update_frames_titlebar_fonts (gpointer key,
-                              gpointer value,
-                              gpointer user_data);
-
-void
 update_window_decoration (WnckWindow *win);
 
 void

=== modified file 'gtk/window-decorator/gwd-theme-cairo.c'
--- gtk/window-decorator/gwd-theme-cairo.c	2016-06-09 14:58:49 +0000
+++ gtk/window-decorator/gwd-theme-cairo.c	2016-06-09 14:58:49 +0000
@@ -33,7 +33,9 @@
 
 struct _GWDThemeCairo
 {
-    GObject parent;
+    GObject       parent;
+
+    decor_color_t title_color[2];
 };
 
 G_DEFINE_TYPE (GWDThemeCairo, gwd_theme_cairo, GWD_TYPE_THEME)
@@ -45,6 +47,195 @@
 }
 
 static void
+rgb_to_hls (gdouble *r,
+            gdouble *g,
+            gdouble *b)
+{
+    gdouble red = *r;
+    gdouble green = *g;
+    gdouble blue = *b;
+    gdouble min;
+    gdouble max;
+    gdouble h, l, s;
+    gdouble delta;
+
+    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 lightness = *l;
+    gdouble saturation = *s;
+    gdouble hue;
+    gdouble m1, m2;
+    gdouble r, g, b;
+
+    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;
+    }
+}
+
+static void
+shade (const decor_color_t *a,
+       decor_color_t       *b,
+       gfloat               k)
+{
+    gdouble red = a->r;
+    gdouble green = a->g;
+    gdouble 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;
+}
+
+static void
+update_title_colors (GWDThemeCairo *cairo)
+{
+    GWDTheme *theme = GWD_THEME (cairo);
+    GtkWidget *style_window = gwd_theme_get_style_window (theme);
+    GtkStyleContext *context = gtk_widget_get_style_context (style_window);
+    GdkRGBA bg;
+    decor_color_t spot_color;
+
+    gtk_style_context_save (context);
+    gtk_style_context_set_state (context, GTK_STATE_FLAG_SELECTED);
+    gtk_style_context_get_background_color (context, GTK_STATE_FLAG_SELECTED, &bg);
+    gtk_style_context_restore (context);
+
+    spot_color.r = bg.red;
+    spot_color.g = bg.green;
+    spot_color.b = bg.blue;
+
+    shade (&spot_color, &cairo->title_color[0], 1.05);
+    shade (&cairo->title_color[0], &cairo->title_color[1], 0.85);
+}
+
+static void
 decor_update_window_property (decor_t *d)
 {
     GdkDisplay *display = gdk_display_get_default ();
@@ -320,11 +511,31 @@
 }
 
 static void
+gwd_theme_cairo_constructed (GObject *object)
+{
+    GWDThemeCairo *cairo = GWD_THEME_CAIRO (object);
+
+    G_OBJECT_CLASS (gwd_theme_cairo_parent_class)->constructed (object);
+
+    update_title_colors (cairo);
+}
+
+static void
+gwd_theme_cairo_style_updated (GWDTheme *theme)
+{
+    GWDThemeCairo *cairo = GWD_THEME_CAIRO (theme);
+
+    update_title_colors (cairo);
+}
+
+static void
 gwd_theme_cairo_draw_window_decoration (GWDTheme *theme,
                                         decor_t  *decor)
 {
+    GWDThemeCairo *cairo = GWD_THEME_CAIRO (theme);
+    GtkWidget *style_window = gwd_theme_get_style_window (theme);
+    GtkStyleContext *context = gtk_widget_get_style_context (style_window);
     cairo_t *cr;
-    GtkStyleContext *context;
     GdkRGBA bg, fg;
     cairo_surface_t *surface;
     decor_color_t color;
@@ -338,8 +549,6 @@
     if (!decor->surface)
         return;
 
-    context = gtk_widget_get_style_context (decor->frame->style_window_rgba);
-
     gtk_style_context_save (context);
     gtk_style_context_set_state (context, GTK_STATE_FLAG_NORMAL);
     gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
@@ -380,7 +589,7 @@
     draw_shadow_background (decor, cr, decor->shadow, decor->context);
 
     if (decor->active) {
-        decor_color_t *title_color = _title_color;
+        decor_color_t *title_color = cairo->title_color;
 
         alpha = decoration_alpha + 0.3;
 
@@ -848,8 +1057,12 @@
 static void
 gwd_theme_cairo_class_init (GWDThemeCairoClass *cairo_class)
 {
+    GObjectClass *object_class = G_OBJECT_CLASS (cairo_class);
     GWDThemeClass *theme_class = GWD_THEME_CLASS (cairo_class);
 
+    object_class->constructed = gwd_theme_cairo_constructed;
+
+    theme_class->style_updated = gwd_theme_cairo_style_updated;
     theme_class->draw_window_decoration = gwd_theme_cairo_draw_window_decoration;
     theme_class->calc_decoration_size = gwd_theme_cairo_calc_decoration_size;
     theme_class->update_border_extents = gwd_theme_cairo_update_border_extents;

=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-06-09 14:58:49 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-06-09 14:58:49 +0000
@@ -572,14 +572,14 @@
 }
 
 static void
-decor_update_meta_window_property (decor_t        *d,
-                                   MetaTheme      *theme,
-                                   MetaFrameFlags  flags,
-                                   MetaFrameType   type,
-                                   Region          top,
-                                   Region          bottom,
-                                   Region          left,
-                                   Region          right)
+decor_update_meta_window_property (GWDThemeMetacity *metacity,
+                                   decor_t          *d,
+                                   MetaFrameFlags    flags,
+                                   MetaFrameType     type,
+                                   Region            top,
+                                   Region            bottom,
+                                   Region            left,
+                                   Region            right)
 {
     long *data;
     GdkDisplay *display;
@@ -616,11 +616,13 @@
 
     /* Add the invisible grab area padding */
     {
-        GdkScreen *screen = gtk_widget_get_screen (d->frame->style_window_rgba);
+        GWDTheme *theme = GWD_THEME (metacity);
+        GtkWidget *style_window = gwd_theme_get_style_window (theme);
+        GdkScreen *screen = gtk_widget_get_screen (style_window);
         MetaStyleInfo *style_info = meta_theme_create_style_info (screen, d->gtk_theme_variant);
         MetaFrameBorders borders;
 
-        meta_theme_get_frame_borders (theme, style_info, type,
+        meta_theme_get_frame_borders (metacity->theme, style_info, type,
                                       d->frame->text_height,
                                       flags, &borders);
 
@@ -696,7 +698,9 @@
                          MetaFrameGeometry *fgeom,
                          MetaFrameType      frame_type)
 {
-    GdkScreen *screen = gtk_widget_get_screen (decor->frame->style_window_rgba);
+    GWDTheme *theme = GWD_THEME (metacity);
+    GtkWidget *style_window = gwd_theme_get_style_window (theme);
+    GdkScreen *screen = gtk_widget_get_screen (style_window);
     MetaStyleInfo *style_info = meta_theme_create_style_info (screen, decor->gtk_theme_variant);
     gint client_width;
     gint client_height;
@@ -936,6 +940,11 @@
 }
 
 static void
+gwd_theme_metacity_style_updated (GWDTheme *theme)
+{
+}
+
+static void
 gwd_theme_metacity_draw_window_decoration (GWDTheme *theme,
                                            decor_t  *decor)
 {
@@ -943,9 +952,9 @@
     GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
     GdkDisplay *display = gdk_display_get_default ();
     Display *xdisplay = gdk_x11_display_get_xdisplay (display);
-    GdkScreen *screen = gtk_widget_get_screen (decor->frame->style_window_rgba);
+    GtkWidget *style_window = gwd_theme_get_style_window (theme);
+    GdkScreen *screen = gtk_widget_get_screen (style_window);
     MetaStyleInfo *style_info = meta_theme_create_style_info (screen, decor->gtk_theme_variant);
-    GtkWidget *style_window = decor->frame->style_window_rgba;
     GtkStyleContext *context = gtk_widget_get_style_context (style_window);
     cairo_surface_t *surface;
     Picture src;
@@ -1018,7 +1027,7 @@
 
     cairo_destroy (cr);
 
-    surface = create_surface (fgeom.width, fgeom.height, decor->frame->style_window_rgba);
+    surface = create_surface (fgeom.width, fgeom.height, style_window);
 
     cr = cairo_create (surface);
 
@@ -1096,8 +1105,7 @@
         if (left_region)
             XOffsetRegion (left_region, -fgeom.borders.total.left, 0);
 
-        decor_update_meta_window_property (decor, metacity->theme, flags,
-                                           frame_type,
+        decor_update_meta_window_property (metacity, decor, flags, frame_type,
                                            top_region, bottom_region,
                                            left_region, right_region);
 
@@ -1172,7 +1180,8 @@
                                           decor_frame_t *frame)
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
-    GdkScreen *screen = gtk_widget_get_screen (frame->style_window_rgba);
+    GtkWidget *style_window = gwd_theme_get_style_window (theme);
+    GdkScreen *screen = gtk_widget_get_screen (style_window);
     MetaStyleInfo *style_info = meta_theme_create_style_info (screen, NULL);
     MetaFrameType frame_type = frame_type_from_string (frame->type);
     MetaFrameBorders borders;
@@ -1414,7 +1423,8 @@
                                       decor_frame_t *frame)
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
-    GdkScreen *screen = gtk_widget_get_screen (frame->style_window_rgba);
+    GtkWidget *style_window = gwd_theme_get_style_window (theme);
+    GdkScreen *screen = gtk_widget_get_screen (style_window);
     MetaStyleInfo *style_info = meta_theme_create_style_info (screen, NULL);
     PangoFontDescription *font_desc = meta_style_info_create_font_desc (style_info);
     MetaFrameType type = frame_type_from_string (frame->type);
@@ -1436,6 +1446,7 @@
     object_class->constructed = gwd_theme_metacity_constructed;
     object_class->dispose = gwd_theme_metacity_dispose;
 
+    theme_class->style_updated = gwd_theme_metacity_style_updated;
     theme_class->draw_window_decoration = gwd_theme_metacity_draw_window_decoration;
     theme_class->calc_decoration_size = gwd_theme_metacity_calc_decoration_size;
     theme_class->update_border_extents = gwd_theme_metacity_update_border_extents;

=== modified file 'gtk/window-decorator/gwd-theme.c'
--- gtk/window-decorator/gwd-theme.c	2016-06-09 14:58:49 +0000
+++ gtk/window-decorator/gwd-theme.c	2016-06-09 14:58:49 +0000
@@ -32,6 +32,8 @@
     GWDSettings          *settings;
 
     PangoFontDescription *titlebar_font;
+
+    GtkWidget            *style_window;
 } GWDThemePrivate;
 
 enum
@@ -48,6 +50,59 @@
 G_DEFINE_TYPE_WITH_PRIVATE (GWDTheme, gwd_theme, G_TYPE_OBJECT)
 
 static void
+frames_update_pango_contexts (gpointer key,
+                              gpointer value,
+                              gpointer user_data)
+{
+    decor_frame_t *frame = (decor_frame_t *) value;
+    GdkDisplay *display = gdk_display_get_default ();
+    GdkScreen *screen = gdk_display_get_default_screen (display);
+    gdouble dpi = gdk_screen_get_resolution (screen);
+
+    if (frame->pango_context == NULL)
+        return;
+
+    /* FIXME: PangoContext created by gtk_widget_create_pango_context is not
+     * automatically updated. Resolution is not only thing that can change...
+     */
+    pango_cairo_context_set_resolution (frame->pango_context, dpi);
+}
+
+static void
+style_updated_cb (GtkWidget *widget,
+                  GWDTheme  *theme)
+{
+    gwd_frames_foreach (frames_update_pango_contexts, NULL);
+
+    GWD_THEME_GET_CLASS (theme)->style_updated (theme);
+
+    decorations_changed (wnck_screen_get_default ());
+}
+
+static void
+create_style_window (GWDTheme *theme)
+{
+    GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
+    GdkScreen *screen = gdk_screen_get_default ();
+    GdkVisual *visual = gdk_screen_get_rgba_visual (screen);
+    GtkWindow *window;
+
+    priv->style_window = gtk_window_new (GTK_WINDOW_POPUP);
+    window = GTK_WINDOW (priv->style_window);
+
+    if (visual)
+	    gtk_widget_set_visual (priv->style_window, visual);
+
+    gtk_window_move (window, -100, -100);
+    gtk_window_resize (window, 1, 1);
+
+    gtk_widget_show (priv->style_window);
+
+    g_signal_connect (priv->style_window, "style-updated",
+                      G_CALLBACK (style_updated_cb), theme);
+}
+
+static void
 gwd_theme_constructed (GObject *object)
 {
     GWDTheme *theme = GWD_THEME (object);
@@ -55,6 +110,7 @@
     G_OBJECT_CLASS (gwd_theme_parent_class)->constructed (object);
 
     gwd_theme_update_titlebar_font (theme);
+    create_style_window (theme);
 }
 
 static void
@@ -68,6 +124,8 @@
     pango_font_description_free (priv->titlebar_font);
     priv->titlebar_font = NULL;
 
+    g_clear_pointer (&priv->style_window, gtk_widget_destroy);
+
     G_OBJECT_CLASS (gwd_theme_parent_class)->dispose (object);
 }
 
@@ -112,6 +170,11 @@
 }
 
 static void
+gwd_theme_real_style_updated (GWDTheme *theme)
+{
+}
+
+static void
 gwd_theme_real_get_shadow (GWDTheme               *theme,
                            decor_frame_t          *frame,
                            decor_shadow_options_t *options,
@@ -205,6 +268,7 @@
     object_class->get_property = gwd_theme_get_property;
     object_class->set_property = gwd_theme_set_property;
 
+    theme_class->style_updated = gwd_theme_real_style_updated;
     theme_class->get_shadow = gwd_theme_real_get_shadow;
     theme_class->draw_window_decoration = gwd_theme_real_draw_window_decoration;
     theme_class->calc_decoration_size = gwd_theme_real_calc_decoration_size;
@@ -269,6 +333,14 @@
     return priv->settings;
 }
 
+GtkWidget *
+gwd_theme_get_style_window (GWDTheme *theme)
+{
+    GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
+
+    return priv->style_window;
+}
+
 void
 gwd_theme_get_shadow (GWDTheme               *theme,
                       decor_frame_t          *frame,
@@ -360,7 +432,7 @@
 {
     PangoFontDescription *font_desc = NULL;
     GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
-    GtkStyleContext *context = gtk_widget_get_style_context (frame->style_window_rgba);
+    GtkStyleContext *context = gtk_widget_get_style_context (priv->style_window);
 
     /* Check if Metacity or Cairo will create titlebar font */
     font_desc = GWD_THEME_GET_CLASS (theme)->get_titlebar_font (theme, frame);

=== modified file 'gtk/window-decorator/gwd-theme.h'
--- gtk/window-decorator/gwd-theme.h	2016-06-09 14:58:49 +0000
+++ gtk/window-decorator/gwd-theme.h	2016-06-09 14:58:49 +0000
@@ -22,7 +22,7 @@
 
 #include <decoration.h>
 #include <glib-object.h>
-#include <pango/pango.h>
+#include <gtk/gtk.h>
 
 G_BEGIN_DECLS
 
@@ -37,6 +37,8 @@
 {
     GObjectClass parent_class;
 
+    void     (* style_updated)                      (GWDTheme                   *theme);
+
     void     (* get_shadow)                         (GWDTheme                   *theme,
                                                      decor_frame_t              *frame,
                                                      decor_shadow_options_t     *options,
@@ -97,6 +99,9 @@
 GWDSettings *
 gwd_theme_get_settings              (GWDTheme               *theme);
 
+GtkWidget *
+gwd_theme_get_style_window          (GWDTheme               *theme);
+
 void
 gwd_theme_get_shadow                (GWDTheme               *theme,
                                      decor_frame_t          *frame,

=== modified file 'gtk/window-decorator/switcher.c'
--- gtk/window-decorator/switcher.c	2016-06-09 14:58:49 +0000
+++ gtk/window-decorator/switcher.c	2016-06-09 14:58:49 +0000
@@ -30,18 +30,20 @@
 static void
 decor_update_switcher_property (decor_t *d)
 {
+    GdkDisplay *display = gdk_display_get_default ();
+    Display *xdisplay = gdk_x11_display_get_xdisplay (display);
+    GtkWidget *style_window = gwd_theme_get_style_window (gwd_theme);
+    GtkStyleContext *context = gtk_widget_get_style_context (style_window);
     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 -
@@ -56,8 +58,6 @@
 			     &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);
@@ -112,7 +112,6 @@
     switcher_label = gtk_label_new ("");
     switcher_label_obj = gtk_widget_get_accessible (switcher_label);
     atk_object_set_role (switcher_label_obj, ATK_ROLE_STATUSBAR);
-    gtk_container_add (GTK_CONTAINER (frame->style_window_rgba), switcher_label);
 
     return frame;
 }
@@ -127,9 +126,11 @@
 static void
 draw_switcher_background (decor_t *d)
 {
-    Display	  *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
+    GdkDisplay *display = gdk_display_get_default ();
+    Display *xdisplay = gdk_x11_display_get_xdisplay (display);
+    GtkWidget *style_window = gwd_theme_get_style_window (gwd_theme);
+    GtkStyleContext *context = gtk_widget_get_style_context (style_window);
     cairo_t	  *cr;
-    GtkStyleContext *context;
     GdkRGBA bg, fg;
     decor_color_t color;
     double	  alpha = SWITCHER_ALPHA / 65535.0;
@@ -141,8 +142,6 @@
     if (!d->buffer_surface)
 	return;
 
-    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_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
@@ -329,16 +328,15 @@
 static void
 draw_switcher_foreground (decor_t *d)
 {
-    cairo_t	  *cr;
-    GtkStyleContext *context;
+    GtkWidget *style_window = gwd_theme_get_style_window (gwd_theme);
+    GtkStyleContext *context = gtk_widget_get_style_context (style_window);
+    cairo_t *cr;
     GdkRGBA bg, fg;
     double	  alpha = SWITCHER_ALPHA / 65535.0;
 
     if (!d->surface || !d->buffer_surface)
 	return;
 
-    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_background_color (context, GTK_STATE_FLAG_NORMAL, &bg);
@@ -436,24 +434,23 @@
     return d;
 }
 
-
 gboolean
 update_switcher_window (Window     popup,
 			Window     selected)
 {
+    GdkDisplay *display = gdk_display_get_default ();
+    Display *xdisplay = gdk_x11_display_get_xdisplay (display);
+    GtkWidget *style_window = gwd_theme_get_style_window (gwd_theme);
     decor_t           *d = switcher_window;
     cairo_surface_t   *surface, *buffer_surface = NULL;
     unsigned int      height, width = 0, border, depth;
     int		      x, y;
     Window	      root_return;
     WnckWindow        *selected_win;
-    Display           *xdisplay;
 
     if (!d)
 	d = switcher_window_opened (popup, selected);
 
-    xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
-
     /* FIXME: Thats a round-trip */
     XGetGeometry (gdk_x11_get_default_xdisplay (), popup, &root_return,
 		  &x, &y, &width, &height, &border, &depth);
@@ -486,8 +483,8 @@
 	    if (!d->layout)
 	    {
 		d->layout = pango_layout_new (d->frame->pango_context);
-		if (d->layout)
-		    pango_layout_set_wrap (d->layout, PANGO_WRAP_CHAR);
+
+		pango_layout_set_wrap (d->layout, PANGO_WRAP_CHAR);
 	    }
 
 	    if (d->layout)
@@ -538,11 +535,11 @@
 	switcher_selected_window = selected;
     }
 
-    surface = create_native_surface_and_wrap (width, height, d->frame->style_window_rgba);
+    surface = create_native_surface_and_wrap (width, height, style_window);
     if (!surface)
 	return FALSE;
 
-    buffer_surface = create_surface (width, height, d->frame->style_window_rgba);
+    buffer_surface = create_surface (width, height, style_window);
     if (!buffer_surface)
     {
 	cairo_surface_destroy (surface);

=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2016-06-09 14:58:49 +0000
+++ gtk/window-decorator/wnck.c	2016-06-09 14:58:49 +0000
@@ -170,6 +170,16 @@
 }
 
 static void
+update_frames_titlebar_fonts (gpointer key,
+                              gpointer value,
+                              gpointer user_data)
+{
+    decor_frame_t *frame = (decor_frame_t *) value;
+
+    frame_update_titlebar_font (frame);
+}
+
+static void
 update_frames_border_extents (gpointer key,
 			      gpointer value,
 			      gpointer user_data)