Merge lp:~muktupavels/compiz/add-gwd-application into lp:compiz/0.9.12

[Alberts Muktupāvels]

[lp:~muktupavels/compiz/add-gwd-application]

4062. By Alberts Muktupāvels on 2016-05-22

Move GWDSettingsStorage to GWDApplication.

4063. By Alberts Muktupāvels on 2016-05-22

Move GWDSettingsXPropertyStorage to GWDApplication.

4064. By Alberts Muktupāvels on 2016-05-22

Remove GWDSettingsXPropertyStorage. We use it only for one function - move it to GWDApplication.

This also fixes memory leaks - shadow colors was strdup-ed, but not freed.

Unmerged revisions

4064. By Alberts Muktupāvels on 2016-05-22

Remove GWDSettingsXPropertyStorage. We use it only for one function - move it to GWDApplication.

This also fixes memory leaks - shadow colors was strdup-ed, but not freed.

4063. By Alberts Muktupāvels on 2016-05-22

Move GWDSettingsXPropertyStorage to GWDApplication.

4062. By Alberts Muktupāvels on 2016-05-22

Move GWDSettingsStorage to GWDApplication.

4061. By Alberts Muktupāvels on 2016-05-22

Add GWDApplication.

=== modified file 'gtk/window-decorator/CMakeLists.txt'
--- gtk/window-decorator/CMakeLists.txt	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/CMakeLists.txt	2016-05-22 15:04:14 +0000
@@ -75,11 +75,10 @@
 		    forcequit.c
 		    tooltip.c
 		    actionmenu.c
-		    settings.c
 		    util.c
 		    wnck.c
 		    decorator.c
-		    ${CMAKE_CURRENT_SOURCE_DIR}/gwd-settings-xproperty-storage.c
+		    ${CMAKE_CURRENT_SOURCE_DIR}/gwd-application.c
 		    ${CMAKE_CURRENT_SOURCE_DIR}/gwd-theme.c
 		    ${CMAKE_CURRENT_SOURCE_DIR}/gwd-theme-cairo.c
 		    ${gwd_theme_metacity}
 
=== modified file 'gtk/window-decorator/actionmenu.c'
--- gtk/window-decorator/actionmenu.c	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/actionmenu.c	2016-05-22 15:04:14 +0000
@@ -53,7 +53,8 @@
 
     if (d->decorated)
     {
-	if (gwd_theme_get_button_position (gwd_theme, d, BUTTON_MENU,
+	GWDTheme *theme = gwd_application_get_theme (application);
+	if (gwd_theme_get_button_position (theme, d, BUTTON_MENU,
 	                                   width, height, &bx, &by,
 	                                   &width, &height))
 	    *x = *x - frame->win_extents.left + bx;
 
=== modified file 'gtk/window-decorator/blurprops.c'
--- gtk/window-decorator/blurprops.c	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/blurprops.c	2016-05-22 15:04:14 +0000
@@ -20,6 +20,7 @@
  */
 
 #include "gtk-window-decorator.h"
+#include "gwd-application.h"
 #include "gwd-settings.h"
 
 void
@@ -35,7 +36,7 @@
 			    Region  right_region,
 			    int     right_offset)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     gint blur_type = gwd_settings_get_blur_type (settings);
     Display *xdisplay = GDK_DISPLAY_XDISPLAY (gdk_display_get_default ());
     long    *data = NULL;
 
=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/decorator.c	2016-05-22 15:04:14 +0000
@@ -30,7 +30,8 @@
 static void
 draw_window_decoration (decor_t *decor)
 {
-    gwd_theme_draw_window_decoration (gwd_theme, decor);
+    GWDTheme *theme = gwd_application_get_theme (application);
+    gwd_theme_draw_window_decoration (theme, decor);
 }
 
 void
@@ -55,7 +56,7 @@
 static const PangoFontDescription *
 get_titlebar_font (decor_frame_t *frame)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     const gchar *titlebar_font = gwd_settings_get_titlebar_font (settings);
 
     /* Using system font */
@@ -188,6 +189,7 @@
 void
 update_event_windows (WnckWindow *win)
 {
+    GWDTheme *theme = gwd_application_get_theme (application);
     Display *xdisplay;
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
     gint    x0, y0, width, height, x, y, w, h;
@@ -238,7 +240,7 @@
 	    h = 0;
 
 	    if (actions & event_window_actions[i][j] && i >= k && i <= l)
-		gwd_theme_get_event_window_position (gwd_theme, d, i, j, width, height,
+		gwd_theme_get_event_window_position (theme, d, i, j, width, height,
 		                                     &x, &y, &w, &h);
 
 	    /* Reparenting mode - create boxes which we monitor motionnotify on */
@@ -302,7 +304,7 @@
 	/* Reparenting mode - if there is a button position for this
 	 * button then set the geometry */
 	if (d->frame_window &&
-	    gwd_theme_get_button_position (gwd_theme, d, i, width, height,
+	    gwd_theme_get_button_position (theme, d, i, width, height,
 	                                   &x, &y, &w, &h))
 	{
 	    BoxPtr box = &d->button_windows[i].pos;
@@ -314,7 +316,7 @@
 	/* Pixmap mode - if there is a button position for this button then map the window
 	 * and resize it to this position */
 	else if (!d->frame_window &&
-		 gwd_theme_get_button_position (gwd_theme, d, i, width, height,
+		 gwd_theme_get_button_position (theme, d, i, width, height,
 		                                &x, &y, &w, &h))
 	{
 	    Window x11_win = d->button_windows[i].window;
@@ -398,6 +400,7 @@
 static void
 update_window_decoration_name (WnckWindow *win)
 {
+    GWDTheme *theme = gwd_application_get_theme (application);
     decor_t	    *d = g_object_get_data (G_OBJECT (win), "decor");
     const gchar	    *name;
     glong	    name_length;
@@ -416,7 +419,7 @@
 	gint w;
 
 	/* Cairo mode: w = SHRT_MAX */
-	if (!GWD_IS_THEME_CAIRO (gwd_theme))
+	if (!GWD_IS_THEME_CAIRO (theme))
 	{
 	    w = SHRT_MAX;
 	}
@@ -519,6 +522,7 @@
 gboolean
 request_update_window_decoration_size (WnckWindow *win)
 {
+    GWDTheme *theme = gwd_application_get_theme (application);
     decor_t           *d;
     gint              width, height;
     gint              x, y, w, h, name_width;
@@ -539,7 +543,7 @@
 
     /* Ask the theme to tell us how much space it needs. If this is not successful
      * update the decoration name and return false */
-    if (!gwd_theme_calc_decoration_size (gwd_theme, d, w, h, name_width, &width, &height))
+    if (!gwd_theme_calc_decoration_size (theme, d, w, h, name_width, &width, &height))
     {
 	update_window_decoration_name (win);
 	return FALSE;
@@ -956,6 +960,7 @@
 		       gpointer value,
 		       gpointer user_data)
 {
+    GWDTheme *theme = gwd_application_get_theme (application);
     decor_frame_t	  *frame = (decor_frame_t *) value;
     tdtd_shadow_options_t  *opts;
     decor_shadow_options_t active_o, inactive_o;
@@ -968,8 +973,8 @@
     opts->active_shadow = &active_o;
     opts->inactive_shadow = &inactive_o;
 
-    gwd_theme_get_shadow (gwd_theme, frame, opts->active_shadow, TRUE);
-    gwd_theme_get_shadow (gwd_theme, frame, opts->inactive_shadow, FALSE);
+    gwd_theme_get_shadow (theme, frame, opts->active_shadow, TRUE);
+    gwd_theme_get_shadow (theme, frame, opts->inactive_shadow, FALSE);
 
     gwd_decor_frame_ref (frame);
 
 
=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/events.c	2016-05-22 15:04:14 +0000
@@ -109,7 +109,7 @@
 		     int	max,
 		     char	*tooltip)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     gboolean use_tooltips = gwd_settings_get_use_tooltips (settings);
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
     guint   state = d->button_states[button];
@@ -456,7 +456,7 @@
 handle_mouse_wheel_title_event (WnckWindow   *win,
 				unsigned int button)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     gint wheel_action = gwd_settings_get_mouse_wheel_action (settings);
 
     switch (wheel_action) {
@@ -482,7 +482,7 @@
 	     decor_event      *gtkwd_event,
 	     decor_event_type gtkwd_type)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     static Window last_button_xwindow = None;
     static Time	  last_button_time = 0;
     gint	  titlebar_action = 0;
@@ -558,7 +558,7 @@
 		    decor_event      *gtkwd_event,
 		    decor_event_type gtkwd_type)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     gint    titlebar_action = 0;
     decor_t *d = g_object_get_data (G_OBJECT (win), "decor");
 
@@ -1034,7 +1034,7 @@
 
 	    if (screen)
 	    {
-		if (gwd_process_decor_shadow_property_update ())
+		if (gwd_application_update_shadow_property (application))
 		    decorations_changed (screen);
 	    }
 	}
 
=== modified file 'gtk/window-decorator/frames.c'
--- gtk/window-decorator/frames.c	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/frames.c	2016-05-22 15:04:14 +0000
@@ -264,7 +264,8 @@
 void
 decor_frame_refresh (decor_frame_t *frame)
 {
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
+    GWDTheme *theme = gwd_application_get_theme (application);
     const gchar *titlebar_font = gwd_settings_get_titlebar_font (settings);
     decor_shadow_options_t active_o, inactive_o;
     decor_shadow_info_t *info;
@@ -281,10 +282,10 @@
     frame_update_titlebar_font (frame);
 
     if (strcmp (frame->type, "switcher") != 0 && strcmp (frame->type, "bare") != 0)
-        gwd_theme_update_border_extents (gwd_theme, frame);
+        gwd_theme_update_border_extents (theme, frame);
 
-    gwd_theme_get_shadow (gwd_theme, frame, &active_o, TRUE);
-    gwd_theme_get_shadow (gwd_theme, frame, &inactive_o, FALSE);
+    gwd_theme_get_shadow (theme, frame, &active_o, TRUE);
+    gwd_theme_get_shadow (theme, frame, &inactive_o, FALSE);
 
     info = malloc (sizeof (decor_shadow_info_t));
 
@@ -556,11 +557,12 @@
     }
 
     if (font_str) {
+        GWDTheme *theme = gwd_application_get_theme (application);
         gint size;
 
         frame->titlebar_font = pango_font_description_from_string (font_str);
 
-        scale = gwd_theme_get_title_scale (gwd_theme, frame);
+        scale = gwd_theme_get_title_scale (theme, frame);
         size = MAX (pango_font_description_get_size (frame->titlebar_font) * scale, 1);
 
         pango_font_description_set_size (frame->titlebar_font, size);
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2016-05-22 15:04:14 +0000
@@ -26,7 +26,7 @@
 #include "gtk-window-decorator.h"
 #include "gwd-settings.h"
 
-GWDTheme *gwd_theme;
+GWDApplication *application;
 
 gdouble decoration_alpha = 0.5;
 
@@ -147,20 +147,6 @@
     gwd_frames_foreach (set_frames_scales, (gpointer) titlebar_font);
 }
 
-static void
-update_metacity_theme_cb (GWDSettings *settings,
-                          const gchar *metacity_theme,
-                          gpointer     user_data)
-{
-    GWDThemeType type;
-
-    type = GWD_THEME_TYPE_CAIRO;
-    if (metacity_theme != NULL)
-        type = GWD_THEME_TYPE_METACITY;
-
-    g_set_object (&gwd_theme, gwd_theme_new (type, settings));
-}
-
 int
 main (int argc, char *argv[])
 {
@@ -306,23 +292,17 @@
     screen = wnck_screen_get_default ();
 
     initialize_decorations ();
-
-    settings = gwd_settings_new (option_blur_type, option_meta_theme);
-
-    if (!settings)
-        return 1;
+   
+    application = gwd_application_new (option_blur_type, option_meta_theme);
+    settings = gwd_application_get_settings (application);
 
     g_signal_connect (settings, "update-decorations",
                       G_CALLBACK (update_decorations_cb), NULL);
     g_signal_connect (settings, "update-frames",
                       G_CALLBACK (update_frames_cb), NULL);
-    g_signal_connect (settings, "update-metacity-theme",
-                      G_CALLBACK (update_metacity_theme_cb), NULL);
 
     gwd_settings_freeze_updates (settings);
 
-    init_settings (settings);
-
     for (i = 0; i < 3; ++i)
     {
 	for (j = 0; j < 3; j++)
@@ -340,7 +320,7 @@
 
     if (!create_tooltip_window ())
     {
-	g_object_unref (settings);
+	g_object_unref (application);
 
 	fprintf (stderr, "%s, Couldn't create tooltip window\n", argv[0]);
 	return 1;
@@ -423,9 +403,7 @@
     gwd_decor_frame_unref (bare_p);
     gwd_decor_frame_unref (switcher_p);
 
-    g_clear_object (&gwd_theme);
-    fini_settings ();
-    g_clear_object (&settings);
+    g_clear_object (&application);
 
     return 0;
 }
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2016-05-22 15:04:14 +0000
@@ -72,7 +72,7 @@
 #define _(x)  gettext (x)
 #define N_(x) x
 
-#include "gwd-theme.h"
+#include "gwd-application.h"
 
 extern const unsigned short ICON_SPACE;
 
@@ -99,7 +99,7 @@
 
 extern gboolean minimal;
 
-extern GWDTheme *gwd_theme;
+extern GWDApplication *application;
 
 extern gdouble decoration_alpha;
 
@@ -736,13 +736,4 @@
 		   gpointer value,
 		   gpointer user_data);
 
-void
-init_settings (GWDSettings *settings);
-
-void
-fini_settings ();
-
-gboolean
-gwd_process_decor_shadow_property_update ();
-
 #endif
 
=== added file 'gtk/window-decorator/gwd-application.c'
--- gtk/window-decorator/gwd-application.c	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/gwd-application.c	2016-05-22 15:04:14 +0000
@@ -0,0 +1,284 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */
+
+/*
+ * Copyright (C) 2016 Alberts Muktupāvels
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <gdk/gdk.h>
+#include <gdk/gdkx.h>
+#include <X11/Xatom.h>
+#include <X11/Xlib.h>
+
+#include "gwd-application.h"
+#include "gwd-settings-storage.h"
+#include "gwd-theme.h"
+
+struct _GWDApplication
+{
+    GObject             parent;
+
+    gint                blur_type;
+    gchar              *metacity_theme;
+
+    GWDSettings        *settings;
+    GWDSettingsStorage *storage;
+
+    GWDTheme           *theme;
+};
+
+enum
+{
+    PROP_0,
+
+    PROP_BLUR_TYPE,
+    PROP_METACITY_THEME,
+
+    LAST_PROP
+};
+
+static GParamSpec *properties[LAST_PROP] = { NULL };
+
+G_DEFINE_TYPE (GWDApplication, gwd_application, G_TYPE_OBJECT)
+
+static void
+update_metacity_theme_cb (GWDSettings    *settings,
+                          const gchar    *metacity_theme,
+                          GWDApplication *application)
+{
+    GWDThemeType type = GWD_THEME_TYPE_CAIRO;
+
+    if (metacity_theme != NULL)
+        type = GWD_THEME_TYPE_METACITY;
+
+    g_set_object (&application->theme, gwd_theme_new (type, settings));
+}
+
+static void
+gwd_application_constructed (GObject *object)
+{
+    GWDApplication *application = GWD_APPLICATION (object);
+
+    G_OBJECT_CLASS (gwd_application_parent_class)->constructed (object);
+
+    application->settings = gwd_settings_new (application->blur_type,
+                                              application->metacity_theme);
+
+    g_signal_connect (application->settings, "update-metacity-theme",
+                      G_CALLBACK (update_metacity_theme_cb), application);
+
+    application->storage = gwd_settings_storage_new (application->settings);
+
+    gwd_application_update_shadow_property (application);
+}
+
+static void
+gwd_application_dispose (GObject *object)
+{
+    GWDApplication *application = GWD_APPLICATION (object);
+
+    g_clear_object (&application->settings);
+    g_clear_object (&application->storage);
+
+    g_clear_object (&application->theme);
+
+    G_OBJECT_CLASS (gwd_application_parent_class)->dispose (object);
+}
+
+static void
+gwd_application_finalize (GObject *object)
+{
+    GWDApplication *application = GWD_APPLICATION (object);
+
+    g_clear_pointer (&application->metacity_theme, g_free);
+
+    G_OBJECT_CLASS (gwd_application_parent_class)->finalize (object);
+}
+
+static void
+gwd_application_set_property (GObject      *object,
+                              guint         property_id,
+                              const GValue *value,
+                              GParamSpec   *pspec)
+{
+    GWDApplication *application = GWD_APPLICATION (object);
+
+    switch (property_id) {
+        case PROP_BLUR_TYPE:
+            application->blur_type = g_value_get_int (value);
+            break;
+
+        case PROP_METACITY_THEME:
+            application->metacity_theme = g_value_dup_string (value);
+            break;
+
+        default:
+            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
+            break;
+    }
+}
+
+static void
+gwd_application_class_init (GWDApplicationClass *application_class)
+{
+    GObjectClass *object_class = G_OBJECT_CLASS (application_class);
+
+    object_class->constructed = gwd_application_constructed;
+    object_class->dispose = gwd_application_dispose;
+    object_class->finalize = gwd_application_finalize;
+    object_class->set_property = gwd_application_set_property;
+
+    properties[PROP_BLUR_TYPE] =
+        g_param_spec_int ("blur-type",
+                          "Blur Type",
+                          "Blur type",
+                          BLUR_TYPE_UNSET, BLUR_TYPE_ALL, BLUR_TYPE_UNSET,
+                          G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
+                          G_PARAM_STATIC_STRINGS);
+
+    properties[PROP_METACITY_THEME] =
+        g_param_spec_string ("metacity-theme",
+                             "Metacity Theme",
+                             "Metacity Theme",
+                             NULL,
+                             G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY |
+                             G_PARAM_STATIC_STRINGS);
+
+    g_object_class_install_properties (object_class, LAST_PROP, properties);
+}
+
+static void
+gwd_application_init (GWDApplication *application)
+{
+}
+
+GWDApplication *
+gwd_application_new (gint         blur_type,
+                     const gchar *metacity_theme)
+{
+    return g_object_new (GWD_TYPE_APPLICATION,
+                         "blur-type", blur_type,
+                         "metacity-theme", metacity_theme,
+                         NULL);
+}
+
+GWDSettings *
+gwd_application_get_settings (GWDApplication *application)
+{
+    return application->settings;
+}
+
+GWDTheme *
+gwd_application_get_theme (GWDApplication *application)
+{
+    return application->theme;
+}
+
+gboolean
+gwd_application_update_shadow_property (GWDApplication *application)
+{
+    GdkDisplay *display = gdk_display_get_default ();
+    Display *xdisplay = gdk_x11_display_get_xdisplay (display);
+    Window xroot = gdk_x11_get_default_root_xwindow ();
+    gdouble active_radius, inactive_radius;
+    gdouble active_opacity, inactive_opacity;
+    gdouble active_x_offset, inactive_x_offset;
+    gdouble active_y_offset, inactive_y_offset;
+    gchar *active_color, *inactive_color;
+    gboolean retval;
+
+    {
+        Atom shadow_properties = XInternAtom (xdisplay, "_COMPIZ_NET_CM_SHADOW_PROPERTIES", False);
+        gint result, format;
+        Atom actual;
+        gulong n, left;
+        guchar *properties_data;
+        glong *properties;
+
+        result = XGetWindowProperty (xdisplay, xroot, shadow_properties,
+                                     0, 32768, 0, XA_INTEGER,
+                                     &actual, &format, &n, &left,
+                                     &properties_data);
+
+        if (result != Success || n != 8) {
+            if (properties_data != NULL)
+                XFree (properties_data);
+
+            return FALSE;
+        }
+
+        properties = (glong *) properties_data;
+
+        /* Radius and Opacity are multiplied by 1000 to keep precision,
+         * divide by that much to get our real radius and opacity.
+         */
+
+        active_radius = MAX (0.0, MIN (properties[0] / 1000.0, 48.0));
+        active_opacity = MAX (0.0, MIN (properties[1] / 1000.0, 6.0));
+        active_x_offset = MAX (-16, MIN (properties[2], 16));
+        active_y_offset = MAX (-16, MIN (properties[3], 16));
+
+        inactive_radius = MAX (0.0, MIN (properties[4] / 1000.0, 48.0));
+        inactive_opacity = MAX (0.0, MIN (properties[5] / 1000.0, 6.0));
+        inactive_x_offset = MAX (-16, MIN (properties[6], 16));
+        inactive_y_offset = MAX (-16, MIN (properties[7], 16));
+
+        XFree (properties_data);
+    }
+
+    {
+        Atom shadow_color = XInternAtom (xdisplay, "_COMPIZ_NET_CM_SHADOW_COLOR", False);
+        XTextProperty color_data;
+        gint result, n;
+        gchar **color;
+
+        result = XGetTextProperty (xdisplay, xroot, &color_data, shadow_color);
+        if (result == 0)
+            return FALSE;
+
+        result = XTextPropertyToStringList (&color_data, &color, &n);
+        if (result == 0 || n != 2) {
+            if (color_data.value != NULL)
+                XFree (color_data.value);
+
+            return FALSE;
+        }
+
+        active_color = g_strdup (color[0]);
+        inactive_color = g_strdup (color[1]);
+
+        XFree (color_data.value);
+        XFreeStringList (color);
+    }
+
+    retval = gwd_settings_shadow_property_changed (application->settings,
+                                                   active_radius,
+                                                   active_opacity,
+                                                   active_x_offset,
+                                                   active_y_offset,
+                                                   active_color,
+                                                   inactive_radius,
+                                                   inactive_opacity,
+                                                   inactive_x_offset,
+                                                   inactive_y_offset,
+                                                   inactive_color);
+
+    g_free (active_color);
+    g_free (inactive_color);
+
+    return retval;
+}
 
=== added file 'gtk/window-decorator/gwd-application.h'
--- gtk/window-decorator/gwd-application.h	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/gwd-application.h	2016-05-22 15:04:14 +0000
@@ -0,0 +1,49 @@
+/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 4; tab-width: 4 -*- */
+
+/*
+ * Copyright (C) 2016 Alberts Muktupāvels
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef GWD_APPLICATION_H
+#define GWD_APPLICATION_H
+
+#include <glib-object.h>
+
+#include "gwd-settings.h"
+#include "gwd-theme.h"
+
+G_BEGIN_DECLS
+
+#define GWD_TYPE_APPLICATION gwd_application_get_type ()
+G_DECLARE_FINAL_TYPE (GWDApplication, gwd_application,
+                      GWD, APPLICATION, GObject)
+
+GWDApplication *
+gwd_application_new                    (gint            blur_type,
+                                        const gchar    *metacity_theme);
+
+GWDSettings *
+gwd_application_get_settings           (GWDApplication *application);
+
+GWDTheme *
+gwd_application_get_theme              (GWDApplication *application);
+
+gboolean
+gwd_application_update_shadow_property (GWDApplication *application);
+
+G_END_DECLS
+
+#endif
 
=== removed file 'gtk/window-decorator/gwd-settings-xproperty-storage.c'
--- gtk/window-decorator/gwd-settings-xproperty-storage.c	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/gwd-settings-xproperty-storage.c	1970-01-01 00:00:00 +0000
@@ -1,214 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authored By: Sam Spilsbury <[e-mail]>
- */
-
-#include <glib-object.h>
-#include <string.h>
-
-#include "gtk-window-decorator.h"
-#include "gwd-settings.h"
-#include "gwd-settings-xproperty-storage.h"
-
-struct _GWDSettingsXPropertyStorage
-{
-    GObject      parent;
-
-    GWDSettings *settings;
-
-    Display     *xdpy;
-    Window       root;
-};
-
-enum
-{
-    PROP_0,
-
-    PROP_SETTINGS,
-
-    LAST_PROP
-};
-
-static GParamSpec *storage_properties[LAST_PROP] = { NULL };
-
-G_DEFINE_TYPE (GWDSettingsXPropertyStorage, gwd_settings_xproperty_storage,
-               G_TYPE_OBJECT)
-
-static void
-gwd_settings_xproperty_storage_dispose (GObject *object)
-{
-    GWDSettingsXPropertyStorage *storage;
-
-    storage = GWD_SETTINGS_XPROPERTY_STORAGE (object);
-
-    g_clear_object (&storage->settings);
-
-    G_OBJECT_CLASS (gwd_settings_xproperty_storage_parent_class)->dispose (object);
-}
-
-static void
-gwd_settings_xproperty_storage_set_property (GObject      *object,
-                                             guint         property_id,
-                                             const GValue *value,
-                                             GParamSpec   *pspec)
-{
-    GWDSettingsXPropertyStorage *storage;
-
-    storage = GWD_SETTINGS_XPROPERTY_STORAGE (object);
-
-    switch (property_id) {
-        case PROP_SETTINGS:
-            g_return_if_fail (!storage->settings);
-            storage->settings = g_value_dup_object (value);
-            break;
-
-        default:
-            G_OBJECT_WARN_INVALID_PROPERTY_ID (object, property_id, pspec);
-            break;
-    }
-}
-
-static void
-gwd_settings_xproperty_storage_class_init (GWDSettingsXPropertyStorageClass *klass)
-{
-    GObjectClass *object_class;
-
-    object_class = G_OBJECT_CLASS (klass);
-
-    object_class->dispose = gwd_settings_xproperty_storage_dispose;
-    object_class->set_property = gwd_settings_xproperty_storage_set_property;
-
-    storage_properties[PROP_SETTINGS] =
-        g_param_spec_object ("settings", "GWDSettings", "GWDSettings",
-                             GWD_TYPE_SETTINGS,
-                             G_PARAM_CONSTRUCT_ONLY | G_PARAM_WRITABLE |
-                             G_PARAM_STATIC_STRINGS);
-
-    g_object_class_install_properties (object_class, LAST_PROP,
-                                       storage_properties);
-}
-
-static void
-gwd_settings_xproperty_storage_init (GWDSettingsXPropertyStorage *storage)
-{
-    GdkDisplay *display;
-
-    display = gdk_display_get_default ();
-
-    storage->xdpy = gdk_x11_display_get_xdisplay (display);
-    storage->root = gdk_x11_get_default_root_xwindow ();
-}
-
-GWDSettingsXPropertyStorage *
-gwd_settings_xproperty_storage_new (GWDSettings *settings)
-{
-    return g_object_new (GWD_TYPE_SETTINGS_XPROPERTY_STORAGE,
-                         "settings", settings,
-                         NULL);
-}
-
-gboolean
-gwd_settings_xproperty_storage_update_all (GWDSettingsXPropertyStorage *storage)
-{
-    Atom          actual;
-    int           result, format;
-    unsigned long n, left;
-    unsigned char *prop_data;
-    XTextProperty shadow_color_xtp;
-
-    gdouble aradius;
-    gdouble aopacity;
-    gint    ax_off;
-    gint    ay_off;
-    char    *active_shadow_color = NULL;
-
-    gdouble iradius;
-    gdouble iopacity;
-    gint    ix_off;
-    gint    iy_off;
-    char    *inactive_shadow_color = NULL;
-
-    result = XGetWindowProperty (storage->xdpy, storage->root,
-                                 compiz_shadow_info_atom, 0, 32768, 0,
-                                 XA_INTEGER, &actual, &format,
-                                 &n, &left, &prop_data);
-
-    if (result != Success)
-        return FALSE;
-
-    if (n == 8) {
-        long *data = (long *) prop_data;
-        aradius = data[0];
-        aopacity = data[1];
-        ax_off = data[2];
-        ay_off = data[3];
-
-        iradius = data[4];
-        iopacity = data[5];
-        ix_off = data[6];
-        iy_off = data[7];
-
-        /* Radius and Opacity are multiplied by 1000 to keep precision,
-         * divide by that much to get our real radius and opacity
-         */
-        aradius /= 1000;
-        aopacity /= 1000;
-        iradius /= 1000;
-        iopacity /= 1000;
-
-        XFree (prop_data);
-    } else {
-        XFree (prop_data);
-        return FALSE;
-    }
-
-    result = XGetTextProperty (storage->xdpy, storage->root,
-                               &shadow_color_xtp, compiz_shadow_color_atom);
-
-    if (shadow_color_xtp.value) {
-        int ret_count = 0;
-        char **t_data = NULL;
-
-        XTextPropertyToStringList (&shadow_color_xtp, &t_data, &ret_count);
-
-        if (ret_count == 2) {
-            active_shadow_color = strdup (t_data[0]);
-            inactive_shadow_color = strdup (t_data[1]);
-
-            if (t_data)
-                XFreeStringList (t_data);
-
-            XFree (shadow_color_xtp.value);
-        } else {
-            XFree (shadow_color_xtp.value);
-            return FALSE;
-        }
-    }
-
-    return gwd_settings_shadow_property_changed (storage->settings,
-                                                 (gdouble) MAX (0.0, MIN (aradius, 48.0)),
-                                                 (gdouble) MAX (0.0, MIN (aopacity, 6.0)),
-                                                 (gdouble) MAX (-16, MIN (ax_off, 16)),
-                                                 (gdouble) MAX (-16, MIN (ay_off, 16)),
-                                                 active_shadow_color,
-                                                 (gdouble) MAX (0.0, MIN (iradius, 48.0)),
-                                                 (gdouble) MAX (0.0, MIN (iopacity, 6.0)),
-                                                 (gdouble) MAX (-16, MIN (ix_off, 16)),
-                                                 (gdouble) MAX (-16, MIN (iy_off, 16)),
-                                                 inactive_shadow_color);
-}
 
=== removed file 'gtk/window-decorator/gwd-settings-xproperty-storage.h'
--- gtk/window-decorator/gwd-settings-xproperty-storage.h	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/gwd-settings-xproperty-storage.h	1970-01-01 00:00:00 +0000
@@ -1,40 +0,0 @@
-/*
- * Copyright © 2012 Canonical Ltd
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program 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 General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- *
- * Authored By: Sam Spilsbury <[e-mail]>
- */
-
-#ifndef GWD_SETTINGS_XPROPERTY_STORAGE_H
-#define GWD_SETTINGS_XPROPERTY_STORAGE_H
-
-#include "gwd-settings.h"
-
-G_BEGIN_DECLS
-
-#define GWD_TYPE_SETTINGS_XPROPERTY_STORAGE gwd_settings_xproperty_storage_get_type ()
-G_DECLARE_FINAL_TYPE (GWDSettingsXPropertyStorage, gwd_settings_xproperty_storage,
-                      GWD, SETTINGS_XPROPERTY_STORAGE, GObject)
-
-GWDSettingsXPropertyStorage *
-gwd_settings_xproperty_storage_new        (GWDSettings                 *settings);
-
-gboolean
-gwd_settings_xproperty_storage_update_all (GWDSettingsXPropertyStorage *storage);
-
-G_END_DECLS
-
-#endif
 
=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-05-22 15:04:14 +0000
@@ -923,7 +923,7 @@
                                            decor_t  *decor)
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_theme_get_settings (theme);
     GdkDisplay *display;
     GdkScreen *screen;
     Display *xdisplay;
 
=== removed file 'gtk/window-decorator/settings.c'
--- gtk/window-decorator/settings.c	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/settings.c	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-/*
- * Copyright © 2006 Novell, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Author: David Reveman <[e-mail]>
- */
-
-#include "gtk-window-decorator.h"
-#include "gwd-settings-storage.h"
-#include "gwd-settings-xproperty-storage.h"
-
-GWDSettingsStorage *storage = NULL;
-GWDSettingsXPropertyStorage *xprop_storage = NULL;
-
-void
-init_settings (GWDSettings *settings)
-{
-    storage = gwd_settings_storage_new (settings);
-    xprop_storage = gwd_settings_xproperty_storage_new (settings);
-
-    gwd_process_decor_shadow_property_update ();
-}
-
-void
-fini_settings ()
-{
-    g_clear_object (&storage);
-    g_clear_object (&xprop_storage);
-}
-
-gboolean
-gwd_process_decor_shadow_property_update ()
-{
-    return gwd_settings_xproperty_storage_update_all (xprop_storage);
-}
 
=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2016-05-22 15:04:14 +0000
+++ gtk/window-decorator/wnck.c	2016-05-22 15:04:14 +0000
@@ -29,7 +29,8 @@
 static void
 draw_window_decoration (decor_t *decor)
 {
-    gwd_theme_draw_window_decoration (gwd_theme, decor);
+    GWDTheme *theme = gwd_application_get_theme (application);
+    gwd_theme_draw_window_decoration (theme, decor);
 }
 
 const gchar *
@@ -174,9 +175,10 @@
 			      gpointer value,
 			      gpointer user_data)
 {
+    GWDTheme *theme = gwd_application_get_theme (application);
     decor_frame_t *frame = (decor_frame_t *) value;
 
-    gwd_theme_update_border_extents (gwd_theme, frame);
+    gwd_theme_update_border_extents (theme, frame);
 }
 
 void
@@ -190,7 +192,7 @@
     gdkdisplay = gdk_display_get_default ();
     gdkscreen  = gdk_display_get_default_screen (gdkdisplay);
 
-    GWDSettings *settings = gwd_theme_get_settings (gwd_theme);
+    GWDSettings *settings = gwd_application_get_settings (application);
     const gchar *titlebar_font = gwd_settings_get_titlebar_font (settings);
 
     gwd_frames_foreach (set_frames_scales, (gpointer) titlebar_font);