Merge lp:~muktupavels/compiz/gwd-marco-gsettings into lp:compiz/0.9.12

[Alberts Muktupāvels]

gtk-window-decorator: Use the Marco gsettings in MATE session.

This merge proposal makes gtk-window-decorator use the Marco (MATE Window Manager) gsettings when a MATE session is currently running. This ensures changes made to MATE Appearance Settings are correctly, and immediately, applied to gtk-window-decorator.

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

+1

review: Approve

=== modified file 'gtk/window-decorator/gwd-settings-storage-gsettings.c'
--- gtk/window-decorator/gwd-settings-storage-gsettings.c	2016-02-22 12:49:18 +0000
+++ gtk/window-decorator/gwd-settings-storage-gsettings.c	2016-03-15 13:00:32 +0000
@@ -18,6 +18,7 @@
  * Authored By: Sam Spilsbury <[e-mail]>
  */
 #include <glib-object.h>
+#include <glib.h>
 
 #include <gio/gio.h>
 
@@ -30,6 +31,7 @@
 const gchar * ORG_COMPIZ_GWD = "org.compiz.gwd";
 const gchar * ORG_GNOME_METACITY = "org.gnome.metacity";
 const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES = "org.gnome.desktop.wm.preferences";
+const gchar * ORG_MATE_MARCO_GENERAL = "org.mate.Marco.general";
 
 const gchar * ORG_COMPIZ_GWD_KEY_USE_TOOLTIPS = "use-tooltips";
 const gchar * ORG_COMPIZ_GWD_KEY_BLUR_TYPE = "blur-type";
@@ -47,6 +49,13 @@
 const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT = "titlebar-uses-system-font";
 const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT = "titlebar-font";
 const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT = "button-layout";
+const gchar * ORG_MATE_MARCO_GENERAL_ACTION_DOUBLE_CLICK_TITLEBAR = "action-double-click-titlebar";
+const gchar * ORG_MATE_MARCO_GENERAL_ACTION_MIDDLE_CLICK_TITLEBAR = "action-middle-click-titlebar";
+const gchar * ORG_MATE_MARCO_GENERAL_ACTION_RIGHT_CLICK_TITLEBAR = "action-right-click-titlebar";
+const gchar * ORG_MATE_MARCO_GENERAL_THEME = "theme";
+const gchar * ORG_MATE_MARCO_GENERAL_TITLEBAR_USES_SYSTEM_FONT = "titlebar-uses-system-font";
+const gchar * ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT = "titlebar-font";
+const gchar * ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT = "button-layout";
 
 #define GWD_SETTINGS_STORAGE_GSETTINGS(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GWD_TYPE_SETTINGS_STORAGE_GSETTINGS, GWDSettingsStorageGSettings));
 #define GWD_SETTINGS_STORAGE_GSETTINGS_CLASS(obj) (G_TYPE_CHECK_CLASS_CAST ((obj), GWD_TYPE_SETTINGS_STORAGE_GSETTINGS, GWDSettingsStorageGSettingsClass));
@@ -76,14 +85,19 @@
 {
     GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_DESKTOP_GSETTINGS  = 1,
     GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_METACITY_GSETTINGS = 2,
-    GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_GWD_GSETTINGS      = 3,
-    GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_WRITABLE_SETTINGS  = 4
+    GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_MARCO_GSETTINGS    = 3,
+    GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_GWD_GSETTINGS      = 4,
+    GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_WRITABLE_SETTINGS  = 5
 };
 
 typedef struct _GWDSettingsStorageGSettingsPrivate
 {
     GSettings *desktop;
     GSettings *metacity;
+
+    GSettings *marco;
+    gboolean   is_mate_desktop;
+
     GSettings *gwd;
     GWDSettingsWritable *writable;
 } GWDSettingsStorageGSettingsPrivate;
@@ -132,10 +146,12 @@
 
     use_metacity_theme = g_settings_get_boolean (priv->gwd, ORG_COMPIZ_GWD_KEY_USE_METACITY_THEME);
 
-    if (!priv->metacity)
-        return FALSE;
-
+    if (priv->is_mate_desktop)
+	theme = g_settings_get_string (priv->marco, ORG_MATE_MARCO_GENERAL_THEME);
+    else if (priv->metacity)
     theme = g_settings_get_string (priv->metacity, ORG_GNOME_METACITY_THEME);
+    else
+	return FALSE;
 
     return gwd_settings_writable_metacity_theme_changed (priv->writable,
                                                          use_metacity_theme,
@@ -167,13 +183,17 @@
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
+    gchar *button_layout;
 
-    if (!priv->desktop)
+    if (priv->is_mate_desktop)
+	button_layout = g_settings_get_string (priv->marco, ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT);
+    else if (priv->desktop)
+	button_layout = g_settings_get_string (priv->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT);
+    else
 	return FALSE;
 
     return gwd_settings_writable_button_layout_changed (priv->writable,
-							g_settings_get_string (priv->desktop,
-									       ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT));
+							button_layout);
 }
 
 static gboolean
@@ -181,15 +201,21 @@
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
+    gchar *titlebar_font;
+    gboolean titlebar_system_font;
 
-    if (!priv->desktop)
+    if (priv->is_mate_desktop) {
+	titlebar_font = g_settings_get_string (priv->marco, ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT);
+	titlebar_system_font = g_settings_get_boolean (priv->marco, ORG_MATE_MARCO_GENERAL_TITLEBAR_USES_SYSTEM_FONT);
+    } else if (priv->desktop) {
+	titlebar_font = g_settings_get_string (priv->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT);
+	titlebar_system_font = g_settings_get_boolean (priv->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT);
+    } else
 	return FALSE;
 
     return gwd_settings_writable_font_changed (priv->writable,
-					       g_settings_get_boolean (priv->desktop,
-								       ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT),
-					       g_settings_get_string (priv->desktop,
-								      ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT));
+					       titlebar_system_font,
+					       titlebar_font);
 }
 
 static inline gchar *
@@ -215,19 +241,27 @@
 {
     GWDSettingsStorageGSettings	       *storage = GWD_SETTINGS_STORAGE_GSETTINGS (settings);
     GWDSettingsStorageGSettingsPrivate *priv = GET_PRIVATE (storage);
-
-    if (!priv->desktop)
-	return FALSE;
+    gchar *double_click_action, *middle_click_action, *right_click_action;
 
     if (!priv->gwd)
 	return FALSE;
 
-    gchar *double_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->desktop,
+    if (priv->is_mate_desktop) {
+	double_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->marco,
+										      ORG_MATE_MARCO_GENERAL_ACTION_DOUBLE_CLICK_TITLEBAR));
+	middle_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->marco,
+										      ORG_MATE_MARCO_GENERAL_ACTION_MIDDLE_CLICK_TITLEBAR));
+	right_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->marco,
+										      ORG_MATE_MARCO_GENERAL_ACTION_RIGHT_CLICK_TITLEBAR));
+    } else if (priv->desktop) {
+	double_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->desktop,
 											 ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_DOUBLE_CLICK_TITLEBAR));
-    gchar *middle_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->desktop,
+	middle_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->desktop,
 											 ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_MIDDLE_CLICK_TITLEBAR));
-    gchar *right_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->desktop,
+	right_click_action = translate_dashes_to_underscores (g_settings_get_string (priv->desktop,
 											 ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_RIGHT_CLICK_TITLEBAR));
+    } else
+	return FALSE;
 
     return gwd_settings_writable_titlebar_actions_changed (priv->writable,
 							   double_click_action,
@@ -280,6 +314,12 @@
 
 	    priv->metacity = g_value_dup_object (value);
 	    break;
+	case GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_MARCO_GSETTINGS:
+	    if (priv->marco)
+		g_object_unref (priv->marco);
+
+	    priv->marco = g_value_dup_object (value);
+	    break;
 	case GWD_SETTINGS_STORAGE_GSETTINGS_PROPERTY_GWD_GSETTINGS:
 	    if (priv->gwd)
 		g_object_unref (priv->gwd);
@@ -307,6 +347,9 @@
     if (priv->metacity)
 	g_object_unref (priv->metacity);
 
+    if (priv->marco)
+	g_object_unref (priv->marco);
+
     if (priv->gwd)
 	g_object_unref (priv->gwd);
 }
@@ -334,6 +377,11 @@
 			     "GSettings Object for org.gnome.metacity",
 			     G_TYPE_SETTINGS,
 			     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY),
+	g_param_spec_object ("marco-gsettings",
+			     ORG_MATE_MARCO_GENERAL,
+			     "GSettings Object for org.mate.Marco.general",
+			     G_TYPE_SETTINGS,
+			     G_PARAM_WRITABLE | G_PARAM_CONSTRUCT_ONLY),
 	g_param_spec_object ("gwd-gsettings",
 			     ORG_COMPIZ_GWD,
 			     "GSettings Object for org.compiz.gwd",
@@ -363,28 +411,33 @@
 GWDSettingsStorage *
 gwd_settings_storage_gsettings_new (GSettings *desktop,
 				    GSettings *metacity,
+				    GSettings *marco,
 				    GSettings *gwd,
 				    GWDSettingsWritable *writable)
 {
-    static const guint gwd_settings_storage_gsettings_n_construction_params = 4;
+    static const guint gwd_settings_storage_gsettings_n_construction_params = 5;
     GParameter         param[gwd_settings_storage_gsettings_n_construction_params];
 
     GValue desktop_value = G_VALUE_INIT;
     GValue metacity_value = G_VALUE_INIT;
+    GValue marco_value = G_VALUE_INIT;
     GValue gwd_value = G_VALUE_INIT;
     GValue writable_value = G_VALUE_INIT;
 
     GWDSettingsStorage *storage = NULL;
+    GWDSettingsStorageGSettingsPrivate *priv;
 
     g_return_val_if_fail (writable != NULL, NULL);
 
     g_value_init (&desktop_value, G_TYPE_OBJECT);
     g_value_init (&metacity_value, G_TYPE_OBJECT);
+    g_value_init (&marco_value, G_TYPE_OBJECT);
     g_value_init (&gwd_value, G_TYPE_OBJECT);
     g_value_init (&writable_value, G_TYPE_POINTER);
 
     g_value_take_object (&desktop_value, desktop);
     g_value_take_object (&metacity_value, metacity);
+    g_value_take_object (&marco_value, marco);
     g_value_take_object (&gwd_value, gwd);
     g_value_set_pointer (&writable_value, writable);
 
@@ -392,10 +445,12 @@
     param[0].value = desktop_value;
     param[1].name = "metacity-gsettings";
     param[1].value = metacity_value;
-    param[2].name = "gwd-gsettings";
-    param[2].value = gwd_value;
-    param[3].name = "writable-settings";
-    param[3].value = writable_value;
+    param[2].name = "marco-gsettings";
+    param[2].value = marco_value;
+    param[3].name = "gwd-gsettings";
+    param[3].value = gwd_value;
+    param[4].name = "writable-settings";
+    param[4].value = writable_value;
 
     storage = GWD_SETTINGS_STORAGE_INTERFACE (g_object_newv (GWD_TYPE_SETTINGS_STORAGE_GSETTINGS,
 							     gwd_settings_storage_gsettings_n_construction_params,
@@ -403,9 +458,33 @@
 
     g_value_unset (&desktop_value);
     g_value_unset (&metacity_value);
+    g_value_unset (&marco_value);
     g_value_unset (&gwd_value);
     g_value_unset (&writable_value);
 
+    priv = GET_PRIVATE (storage);
+    priv->is_mate_desktop = FALSE;
+
+    if (marco) {
+        const gchar *xdg_current_desktop;
+
+        xdg_current_desktop = g_getenv ("XDG_CURRENT_DESKTOP");
+        if (xdg_current_desktop) {
+            gchar **desktops;
+            gint i;
+
+            desktops = g_strsplit (xdg_current_desktop, ":", -1);
+            for (i = 0; desktops[i] != NULL; i++) {
+                if (g_strcmp0 (desktops[i], "MATE") == 0) {
+                    priv->is_mate_desktop = TRUE;
+                    break;
+                }
+            }
+
+            g_strfreev (desktops);
+        }
+    }
+
     return storage;
 }
 
@@ -528,3 +607,43 @@
 {
     return get_settings_no_abort (ORG_GNOME_DESKTOP_WM_PREFERENCES);
 }
+
+static void
+org_mate_marco_general_settings_changed (GSettings   *settings,
+                                         const gchar *key,
+                                         gpointer     user_data)
+{
+    GWDSettingsStorage *storage;
+
+    storage = GWD_SETTINGS_STORAGE_INTERFACE (user_data);
+
+    if (strcmp (key, ORG_MATE_MARCO_GENERAL_TITLEBAR_USES_SYSTEM_FONT) == 0 ||
+	strcmp (key, ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT) == 0)
+	gwd_settings_storage_update_font (storage);
+    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT) == 0)
+	gwd_settings_storage_update_font (storage);
+    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_ACTION_DOUBLE_CLICK_TITLEBAR) == 0 ||
+	     strcmp (key, ORG_MATE_MARCO_GENERAL_ACTION_MIDDLE_CLICK_TITLEBAR) == 0 ||
+	     strcmp (key, ORG_MATE_MARCO_GENERAL_ACTION_RIGHT_CLICK_TITLEBAR) == 0)
+	gwd_settings_storage_update_titlebar_actions (storage);
+    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_THEME) == 0)
+	gwd_settings_storage_update_metacity_theme (storage);
+    else if (strcmp (key, ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT) == 0)
+	gwd_settings_storage_update_button_layout (storage);
+}
+
+void
+gwd_connect_org_mate_marco_general_settings (GSettings          *settings,
+                                             GWDSettingsStorage *storage)
+{
+    if (!settings)
+        return;
+
+    g_signal_connect (settings, "changed", (GCallback) org_mate_marco_general_settings_changed, storage);
+}
+
+GSettings *
+gwd_get_org_mate_marco_general_settings ()
+{
+    return get_settings_no_abort (ORG_MATE_MARCO_GENERAL);
+}

=== modified file 'gtk/window-decorator/gwd-settings-storage-gsettings.h'
--- gtk/window-decorator/gwd-settings-storage-gsettings.h	2016-02-22 12:27:13 +0000
+++ gtk/window-decorator/gwd-settings-storage-gsettings.h	2016-03-15 13:00:32 +0000
@@ -31,6 +31,7 @@
 GWDSettingsStorage *
 gwd_settings_storage_gsettings_new (GSettings *orgGNOMEDesktopSettings,
 				    GSettings *metacitySettings,
+				    GSettings *marcoSettings,
 				    GSettings *gwdSettings,
 				    GWDSettingsWritable *writableSettings);
 
@@ -55,9 +56,17 @@
 GSettings *
 gwd_get_org_gnome_desktop_wm_preferences_settings ();
 
+void
+gwd_connect_org_mate_marco_general_settings (GSettings          *settings,
+                                         GWDSettingsStorage *storage);
+
+GSettings *
+gwd_get_org_mate_marco_general_settings ();
+
 extern const gchar * ORG_COMPIZ_GWD;
 extern const gchar * ORG_GNOME_METACITY;
 extern const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES;
+extern const gchar * ORG_MATE_MARCO_GENERAL;
 
 extern const gchar * ORG_COMPIZ_GWD_KEY_USE_TOOLTIPS;
 extern const gchar * ORG_COMPIZ_GWD_KEY_BLUR_TYPE;
@@ -75,6 +84,13 @@
 extern const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_USES_SYSTEM_FONT;
 extern const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT;
 extern const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT;
+extern const gchar * ORG_MATE_MARCO_GENERAL_ACTION_DOUBLE_CLICK_TITLEBAR;
+extern const gchar * ORG_MATE_MARCO_GENERAL_ACTION_MIDDLE_CLICK_TITLEBAR;
+extern const gchar * ORG_MATE_MARCO_GENERAL_ACTION_RIGHT_CLICK_TITLEBAR;
+extern const gchar * ORG_MATE_MARCO_GENERAL_THEME;
+extern const gchar * ORG_MATE_MARCO_GENERAL_TITLEBAR_USES_SYSTEM_FONT;
+extern const gchar * ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT;
+extern const gchar * ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT;
 
 G_END_DECLS
 

=== modified file 'gtk/window-decorator/settings.c'
--- gtk/window-decorator/settings.c	2016-03-11 08:26:25 +0000
+++ gtk/window-decorator/settings.c	2016-03-15 13:00:32 +0000
@@ -41,12 +41,14 @@
     GSettings *compiz = gwd_get_org_compiz_gwd_settings ();
     GSettings *metacity = gwd_get_org_gnome_metacity_settings ();
     GSettings *gnome  = gwd_get_org_gnome_desktop_wm_preferences_settings ();
+    GSettings *marco = gwd_get_org_mate_marco_general_settings ();
 
-    storage = gwd_settings_storage_gsettings_new (gnome, metacity, compiz, writable);
+    storage = gwd_settings_storage_gsettings_new (gnome, metacity, marco, compiz, writable);
 
     gwd_connect_org_compiz_gwd_settings (compiz, storage);
     gwd_connect_org_gnome_metacity_settings (metacity, storage);
     gwd_connect_org_gnome_desktop_wm_preferences_settings (gnome, storage);
+    gwd_connect_org_mate_marco_general_settings (marco, storage);
 #endif
 
     xprop_storage = gwd_settings_xproperty_storage_new (writable);

=== modified file 'gtk/window-decorator/tests/CMakeLists.txt'
--- gtk/window-decorator/tests/CMakeLists.txt	2016-02-22 12:27:13 +0000
+++ gtk/window-decorator/tests/CMakeLists.txt	2016-03-15 13:00:32 +0000
@@ -90,6 +90,21 @@
 
 	add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_gnome_metacity_schema)
 
+	set (_marco_gschema_name org.mate.marco)
+	set (_marco_gschema_filename ${_marco_gschema_name}.gschema.xml)
+	set (_marco_gschema_filepath ${CMAKE_CURRENT_SOURCE_DIR}/${_marco_gschema_filename})
+	set (_marco_gschema_generated_location ${CMAKE_BINARY_DIR}/generated/glib-2.0/schemas/${_marco_gschema_filename})
+
+	add_custom_command (OUTPUT ${_marco_gschema_generated_location}
+			    COMMAND cp -r ${_marco_gschema_filepath} ${_marco_gschema_generated_location}
+			    DEPENDS ${_marco_gschema_filepath}
+			    VERBATIM)
+
+	add_custom_target (compiz_gwd_gsettings_org_mate_marco_schema ALL
+			   DEPENDS ${_marco_gschema_generated_location})
+
+	add_gsettings_schema_to_recompilation_list (compiz_gwd_gsettings_org_nate_marco_schema)
+
 	set (COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES
 	     ${COMPIZ_TEST_GWD_SETTINGS_ADDITIONAL_LIBRARIES}
 	     gtk_window_decorator_settings_storage_gsettings)

=== added file 'gtk/window-decorator/tests/org.mate.marco.gschema.xml'
--- gtk/window-decorator/tests/org.mate.marco.gschema.xml	1970-01-01 00:00:00 +0000
+++ gtk/window-decorator/tests/org.mate.marco.gschema.xml	2016-03-15 13:00:32 +0000
@@ -0,0 +1,53 @@
+<schemalist>
+  <enum id="org.mate.Marco.ActionTitlebar">
+    <value nick="toggle_shade" value="0"/>
+    <value nick="toggle_maximize" value="1"/>
+    <value nick="toggle_maximize_horizontally" value="2"/>
+    <value nick="toggle_maximize_vertically" value="3"/>
+    <value nick="minimize" value="4"/>
+    <value nick="none" value="5"/>
+    <value nick="lower" value="6"/>
+    <value nick="menu" value="7"/>
+    <value nick="last" value="8"/>
+  </enum>
+  <schema id="org.mate.Marco" path="/org/mate/marco/">
+    <child name="general" schema="org.mate.Marco.general"/>
+  </schema>
+  <schema id="org.mate.Marco.general" path="/org/mate/marco/general/">
+    <key name="button-layout" type="s">
+      <default>'menu:minimize,maximize,close'</default>
+      <summary>Arrangement of buttons on the titlebar</summary>
+      <description>Arrangement of buttons on the titlebar. The value should be a string, such as "menu:minimize,maximize,spacer,close"; the colon separates the left corner of the window from the right corner, and the button names are comma-separated. Duplicate buttons are not allowed. Unknown button names are silently ignored so that buttons can be added in future marco versions without breaking older versions. A special spacer tag can be used to insert some space between two adjacent buttons.</description>
+    </key>
+    <key name="action-double-click-titlebar" enum="org.mate.Marco.ActionTitlebar">
+      <default>'toggle_maximize'</default>
+      <summary>Action on title bar double-click</summary>
+      <description>This option determines the effects of double-clicking on the title bar.  Current valid options are 'toggle_shade', which will shade/unshade the window, 'toggle_maximize' which will maximize/unmaximize the window, 'toggle_maximize_horizontally' and 'toggle_maximize_vertically' which will maximize/unmaximize the window in that direction only, 'minimize' which will minimize the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything.</description>
+    </key>
+    <key name="action-middle-click-titlebar" enum="org.mate.Marco.ActionTitlebar">
+      <default>'lower'</default>
+      <summary>Action on title bar middle-click</summary>
+      <description>This option determines the effects of middle-clicking on the title bar.  Current valid options are 'toggle_shade', which will shade/unshade the window, 'toggle_maximize' which will maximize/unmaximize the window, 'toggle_maximize_horizontally' and 'toggle_maximize_vertically' which will maximize/unmaximize the window in that direction only, 'minimize' which will minimize the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything.</description>
+    </key>
+    <key name="action-right-click-titlebar" enum="org.mate.Marco.ActionTitlebar">
+      <default>'menu'</default>
+      <summary>Action on title bar right-click</summary>
+      <description>This option determines the effects of right-clicking on the title bar.  Current valid options are 'toggle_shade', which will shade/unshade the window, 'toggle_maximize' which will maximize/unmaximize the window, 'toggle_maximize_horizontally' and 'toggle_maximize_vertically' which will maximize/unmaximize the window in that direction only, 'minimize' which will minimize the window, 'shade' which will roll the window up, 'menu' which will display the window menu, 'lower' which will put the window behind all the others, and 'none' which will not do anything.</description>
+    </key>
+    <key name="theme" type="s">
+      <default>'Menta'</default>
+      <summary>Current theme</summary>
+      <description>The theme determines the appearance of window borders, titlebar, and so forth.</description>
+    </key>
+    <key name="titlebar-uses-system-font" type="b">
+      <default>false</default>
+      <summary>Use standard system font in window titles</summary>
+      <description>If true, ignore the titlebar_font option, and use the standard application font for window titles.</description>
+    </key>
+    <key name="titlebar-font" type="s">
+      <default>'Sans Bold 10'</default>
+      <summary>Window title font</summary>
+      <description>A font description string describing a font for window titlebars. The size from the description will only be used if the titlebar_font_size option is set to 0. Also, this option is disabled if the titlebar_uses_desktop_font option is set to true.</description>
+    </key>
+  </schema>
+</schemalist>

=== modified file 'gtk/window-decorator/tests/test_gwd_settings.cpp'
--- gtk/window-decorator/tests/test_gwd_settings.cpp	2016-02-22 12:27:13 +0000
+++ gtk/window-decorator/tests/test_gwd_settings.cpp	2016-03-15 13:00:32 +0000
@@ -1429,6 +1429,7 @@
     gwd_connect_org_compiz_gwd_settings (NULL, mStorage.get ());
     gwd_connect_org_gnome_metacity_settings (NULL, mStorage.get ());
     gwd_connect_org_gnome_desktop_wm_preferences_settings (NULL, mStorage.get ());
+    gwd_connect_org_mate_marco_settings (NULL, mStorage.get ());
 
     EXPECT_CALL (*mStorageMock, dispose ());
     EXPECT_CALL (*mStorageMock, finalize ());
@@ -1448,9 +1449,11 @@
 	    mGWDSettings = gwd_get_org_compiz_gwd_settings ();
 	    mMetacitySettings = gwd_get_org_gnome_metacity_settings ();
 	    mDesktopSettings = gwd_get_org_gnome_desktop_wm_preferences_settings ();
+	    mMarcoSettings = gwd_get_org_mate_marco_settings ();
 
 	    mStorage.reset (gwd_settings_storage_gsettings_new (mDesktopSettings,
 								mMetacitySettings,
+								mMarcoSettings,
 								mGWDSettings,
 								writable),
 			    boost::bind (gwd_settings_storage_unref, _1));
@@ -1487,6 +1490,7 @@
 	{
 	    g_settings_set_boolean (mGWDSettings, ORG_COMPIZ_GWD_KEY_USE_METACITY_THEME, useMetacityTheme);
 	    g_settings_set_string (mDesktopSettings, ORG_GNOME_DESKTOP_WM_PREFERENCES_THEME, metacityTheme.c_str ());
+	    g_settings_set_string (mMarcoSettings, ORG_MATE_MARCO_GENERAL_THEME, metacityTheme.c_str ());
 	}
 
 	virtual void SetButtonLayout (const std::string &buttonLayout)
@@ -1494,6 +1498,9 @@
 	    g_settings_set_string (mDesktopSettings,
 				   ORG_GNOME_DESKTOP_WM_PREFERENCES_BUTTON_LAYOUT,
 				   buttonLayout.c_str ());
+	    g_settings_set_string (mMarcoSettings,
+				   ORG_MATE_MARCO_GENERAL_BUTTON_LAYOUT,
+				   buttonLayout.c_str ());
 	}
 
 	virtual void SetFont (gboolean useSystemFont, const std::string &titlebarFont)
@@ -1504,6 +1511,12 @@
 	    g_settings_set_string (mDesktopSettings,
 				   ORG_GNOME_DESKTOP_WM_PREFERENCES_TITLEBAR_FONT,
 				   titlebarFont.c_str ());
+	    g_settings_set_boolean (mMarcoSettings,
+				    ORG_MATE_MARCO_GENERAL_TITLEBAR_USES_SYSTEM_FONT,
+				    useSystemFont);
+	    g_settings_set_string (mMarcoSettings,
+				   ORG_MATE_MARCO_GENERAL_TITLEBAR_FONT,
+				   titlebarFont.c_str ());
 	}
 
 	virtual void SetTitlebarActions (const std::string &doubleClickAction,
@@ -1528,6 +1541,15 @@
 	    g_settings_set_string (mDesktopSettings,
 				   ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_RIGHT_CLICK_TITLEBAR,
 				   translatedRC.c_str ());
+	    g_settings_set_string (mMarcoSettings,
+				   ORG_MATE_MARCO_GENERAL_ACTION_DOUBLE_CLICK_TITLEBAR,
+				   translatedDC.c_str ());
+	    g_settings_set_string (mMarcoSettings,
+				   ORG_MATE_MARCO_GENERAL_ACTION_MIDDLE_CLICK_TITLEBAR,
+				   translatedMC.c_str ());
+	    g_settings_set_string (mMarcoSettings,
+				   ORG_MATE_MARCO_GENERAL_ACTION_RIGHT_CLICK_TITLEBAR,
+				   translatedRC.c_str ());
 	    g_settings_set_string (mGWDSettings,
 				   ORG_COMPIZ_GWD_KEY_MOUSE_WHEEL_ACTION,
 				   mouseWheelAction.c_str ());
@@ -1539,6 +1561,7 @@
 	    mGWDSettings = NULL;
 	    mMetacitySettings = NULL;
 	    mDesktopSettings = NULL;
+	    mMarcoSettings = NULL;
 	    gsettingsEnv.TearDownEnv ();
 	    gsliceEnv.TearDownEnv ();
 	}
@@ -1548,6 +1571,7 @@
 	GSettings			       *mGWDSettings;
 	GSettings			       *mMetacitySettings;
 	GSettings			       *mDesktopSettings;
+	GSettings			       *mMarcoSettings;
 	boost::shared_ptr <GWDSettingsStorage> mStorage;
 	CompizGLibGSliceOffEnv                 gsliceEnv;
 	CompizGLibGSettingsMemoryBackendTestingEnv gsettingsEnv;