Merge lp:~muktupavels/compiz/gwd-support-metacity-3-20 into lp:compiz/0.9.12

[Alberts Muktupāvels]

gtk-window-decorator: support Metacity 3.20.

Support Metacity 3.20.

[lp:~muktupavels/compiz/gwd-support-metacity-3-20]

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

If MetaThemeType is META_THEME_TYPE_GTK then use system GTK+ theme.

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

Fix build

[Alberts Muktupāvels (muktupavels)]

"These members aren't strictly dependent on having megacity 3.20 around, so the ifdefs are probably not necessary here."

style_variants and titlebar_font is not used with Metacity 3.20. So there is no need to create and later destroy hash table. Also ifdefs was added to make sure that I don't try to use them with 3.20.

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

review: Approve

=== modified file 'gtk/CMakeLists.txt'
--- gtk/CMakeLists.txt	2015-12-10 16:34:35 +0000
+++ gtk/CMakeLists.txt	2016-06-09 20:28:29 +0000
@@ -25,10 +25,25 @@
         set (CMAKE_REQUIRED_LIBRARIES "")
 
         if (USE_METACITY)
-            pkg_check_modules (METACITY libmetacity-private>=3.16.0)
-            if (NOT METACITY_FOUND)
-                compiz_set (USE_METACITY 0)
-            endif (NOT METACITY_FOUND)
+            pkg_check_modules (LIBMETACITY libmetacity>=3.19.1)
+
+            if (LIBMETACITY_FOUND)
+                compiz_set (HAVE_METACITY_3_20_0 1)
+
+                set (METACITY_INCLUDE_DIRS ${LIBMETACITY_INCLUDE_DIRS})
+                set (METACITY_LIBRARIES ${LIBMETACITY_LIBRARIES})
+            else (LIBMETACITY_FOUND)
+                pkg_check_modules (LIBMETACITY_PRIVATE libmetacity-private>=3.16.0)
+
+                if (LIBMETACITY_PRIVATE_FOUND)
+                    compiz_set (HAVE_METACITY_3_20_0 0)
+
+                    set (METACITY_INCLUDE_DIRS ${LIBMETACITY_PRIVATE_INCLUDE_DIRS})
+                    set (METACITY_LIBRARIES ${LIBMETACITY_PRIVATE_LIBRARIES})
+                else (LIBMETACITY_PRIVATE_FOUND)
+                    compiz_set (USE_METACITY 0)
+                endif (LIBMETACITY_PRIVATE_FOUND)
+            endif (LIBMETACITY_FOUND)
         endif (USE_METACITY)
 
 	if (USE_GNOME)
 
=== modified file 'gtk/config.h.gtk.in'
--- gtk/config.h.gtk.in	2015-06-12 18:43:05 +0000
+++ gtk/config.h.gtk.in	2016-06-09 20:28:29 +0000
@@ -1,4 +1,7 @@
 /* Define to 1 if Metacity support is enabled */
 #cmakedefine USE_METACITY 1
 
+/* Define to 1 if Metacity version >= 3.20.0 */
+#cmakedefine HAVE_METACITY_3_20_0 1
+
 #define GETTEXT_PACKAGE "${GETTEXT_PACKAGE}"
 
=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2016-06-09 20:28:29 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2016-06-09 20:28:29 +0000
@@ -152,6 +152,8 @@
         type = GWD_THEME_TYPE_METACITY;
 
     g_set_object (&gwd_theme, gwd_theme_new (type, settings));
+
+    gwd_theme_update_titlebar_font (gwd_theme);
 }
 
 int
 
=== modified file 'gtk/window-decorator/gwd-settings-storage.c'
--- gtk/window-decorator/gwd-settings-storage.c	2016-06-09 20:28:29 +0000
+++ gtk/window-decorator/gwd-settings-storage.c	2016-06-09 20:28:29 +0000
@@ -24,12 +24,22 @@
 
 #include <gtk/gtk.h>
 
+#ifdef HAVE_METACITY_3_20_0
+#include <libmetacity/meta-theme.h>
+#endif
+
 #include "gwd-settings.h"
 #include "gwd-settings-storage.h"
 
 static const gchar * ORG_COMPIZ_GWD = "org.compiz.gwd";
 static const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES = "org.gnome.desktop.wm.preferences";
+
+#ifdef HAVE_METACITY_3_20_0
+static const gchar * ORG_GNOME_METACITY_THEME = "org.gnome.metacity.theme";
+#else
 static const gchar * ORG_GNOME_METACITY = "org.gnome.metacity";
+#endif
+
 static const gchar * ORG_MATE_MARCO_GENERAL = "org.mate.Marco.general";
 
 static const gchar * ORG_COMPIZ_GWD_KEY_USE_TOOLTIPS = "use-tooltips";
@@ -41,7 +51,12 @@
 static const gchar * ORG_COMPIZ_GWD_KEY_USE_METACITY_THEME = "use-metacity-theme";
 static const gchar * ORG_COMPIZ_GWD_KEY_MOUSE_WHEEL_ACTION = "mouse-wheel-action";
 
+#ifdef HAVE_METACITY_3_20_0
+static const gchar * ORG_GNOME_METACITY_THEME_NAME = "name";
+static const gchar * ORG_GNOME_METACITY_THEME_TYPE = "type";
+#else
 static const gchar * ORG_GNOME_METACITY_THEME = "theme";
+#endif
 
 static const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_DOUBLE_CLICK_TITLEBAR = "action-double-click-titlebar";
 static const gchar * ORG_GNOME_DESKTOP_WM_PREFERENCES_ACTION_MIDDLE_CLICK_TITLEBAR = "action-middle-click-titlebar";
@@ -80,6 +95,7 @@
     GSettings   *marco;
 
     gulong       gtk_decoration_layout_id;
+    gulong       gtk_theme_name_id;
 };
 
 enum
@@ -197,7 +213,17 @@
     if (storage->current_desktop == GWD_DESKTOP_MATE && storage->marco) {
         metacity_theme_name = g_settings_get_string (storage->marco, ORG_MATE_MARCO_GENERAL_THEME);
     } else if (storage->current_desktop == GWD_DESKTOP_GNOME_FLASHBACK && storage->metacity) {
+#ifdef HAVE_METACITY_3_20_0
+        metacity_theme_type = g_settings_get_enum (storage->metacity, ORG_GNOME_METACITY_THEME_TYPE);
+
+        if (metacity_theme_type == META_THEME_TYPE_GTK) {
+            g_object_get (gtk_settings_get_default (), "gtk-theme-name", &metacity_theme_name, NULL);
+        } else {
+            metacity_theme_name = g_settings_get_string (storage->metacity, ORG_GNOME_METACITY_THEME_NAME);
+        }
+#else
         metacity_theme_name = g_settings_get_string (storage->metacity, ORG_GNOME_METACITY_THEME);
+#endif
     } else if (storage->desktop) {
         metacity_theme_name = g_settings_get_string (storage->desktop, ORG_GNOME_DESKTOP_WM_PREFERENCES_THEME);
     } else {
@@ -359,8 +385,14 @@
                                      const gchar        *key,
                                      GWDSettingsStorage *storage)
 {
+#ifdef HAVE_METACITY_3_20_0
+    if (strcmp (key, ORG_GNOME_METACITY_THEME_NAME) == 0 ||
+        strcmp (key, ORG_GNOME_METACITY_THEME_TYPE) == 0)
+        update_metacity_theme (storage);
+#else
     if (strcmp (key, ORG_GNOME_METACITY_THEME) == 0)
         update_metacity_theme (storage);
+#endif
 }
 
 static void
@@ -391,6 +423,24 @@
     update_button_layout (storage);
 }
 
+#ifdef HAVE_METACITY_3_20_0
+static void
+gtk_theme_name_changed (GtkSettings        *settings,
+                        GParamSpec         *pspec,
+                        GWDSettingsStorage *storage)
+{
+    MetaThemeType type;
+
+    if (!storage->metacity)
+        return;
+
+    type = g_settings_get_enum (storage->metacity, ORG_GNOME_METACITY_THEME_TYPE);
+
+    if (type == META_THEME_TYPE_GTK)
+        update_metacity_theme (storage);
+}
+#endif
+
 static void
 gwd_settings_storage_constructed (GObject *object)
 {
@@ -435,6 +485,7 @@
 gwd_settings_storage_dispose (GObject *object)
 {
     GWDSettingsStorage *storage = GWD_SETTINGS_STORAGE (object);
+    GtkSettings *settings = gtk_settings_get_default ();
 
     g_clear_object (&storage->settings);
 
@@ -444,12 +495,15 @@
     g_clear_object (&storage->marco);
 
     if (storage->gtk_decoration_layout_id > 0) {
-        GtkSettings *settings = gtk_settings_get_default ();
-
         g_signal_handler_disconnect (settings, storage->gtk_decoration_layout_id);
         storage->gtk_decoration_layout_id = 0;
     }
 
+    if (storage->gtk_theme_name_id > 0) {
+        g_signal_handler_disconnect (settings, storage->gtk_theme_name_id);
+        storage->gtk_theme_name_id = 0;
+    }
+
     G_OBJECT_CLASS (gwd_settings_storage_parent_class)->dispose (object);
 }
 
@@ -519,11 +573,22 @@
         case GWD_DESKTOP_GNOME_FLASHBACK:
             storage->gwd = get_settings_no_abort (ORG_COMPIZ_GWD);
             storage->desktop = get_settings_no_abort (ORG_GNOME_DESKTOP_WM_PREFERENCES);
+
+#ifdef HAVE_METACITY_3_20_0
+            storage->metacity = get_settings_no_abort (ORG_GNOME_METACITY_THEME);
+#else
             storage->metacity = get_settings_no_abort (ORG_GNOME_METACITY);
+#endif
 
             storage->gtk_decoration_layout_id =
                 g_signal_connect (gtk_settings_get_default (), "notify::gtk-decoration-layout",
                                   G_CALLBACK (gtk_decoration_layout_changed), storage);
+
+#ifdef HAVE_METACITY_3_20_0
+            storage->gtk_theme_name_id =
+                g_signal_connect (gtk_settings_get_default (), "notify::gtk-theme-name",
+                                  G_CALLBACK (gtk_theme_name_changed), storage);
+#endif
             break;
 
         case GWD_DESKTOP_MATE:
 
=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-06-09 20:28:29 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-06-09 20:28:29 +0000
@@ -27,8 +27,12 @@
 
 #include "config.h"
 
+#ifdef HAVE_METACITY_3_20_0
+#include <libmetacity/meta-theme.h>
+#else
 #include <metacity-private/theme.h>
 #include <metacity-private/theme-parser.h>
+#endif
 
 #include "gtk-window-decorator.h"
 #include "gwd-settings.h"
@@ -40,16 +44,21 @@
 
     MetaTheme                  *theme;
 
+#ifndef HAVE_METACITY_3_20_0
     GHashTable                 *style_variants;
+#endif
 
     gulong                      button_layout_id;
     MetaButtonLayout            button_layout;
 
+#ifndef HAVE_METACITY_3_20_0
     const PangoFontDescription *titlebar_font;
+#endif
 };
 
 G_DEFINE_TYPE (GWDThemeMetacity, gwd_theme_metacity, GWD_TYPE_THEME)
 
+#ifndef HAVE_METACITY_3_20_0
 static MetaStyleInfo *
 get_style_info (GWDThemeMetacity *metacity,
                 decor_t          *decor)
@@ -70,6 +79,7 @@
 
     return style;
 }
+#endif
 
 static MetaFrameType
 frame_type_from_string (const gchar *str)
@@ -86,6 +96,7 @@
     return META_FRAME_TYPE_NORMAL;
 }
 
+#ifndef HAVE_METACITY_3_20_0
 static void
 initialize_button_layout (MetaButtonLayout *layout)
 {
@@ -151,12 +162,18 @@
             return META_BUTTON_FUNCTION_LAST;
     }
 }
+#endif
 
 static void
 update_metacity_button_layout_cb (GWDSettings      *settings,
                                   const gchar      *button_layout,
                                   GWDThemeMetacity *metacity)
 {
+#ifdef HAVE_METACITY_3_20_0
+    gboolean invert = gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL;
+
+    metacity->button_layout = meta_button_layout_new (button_layout, invert);
+#else
     MetaButtonLayout new_layout;
 
     initialize_button_layout (&new_layout);
@@ -304,6 +321,7 @@
     }
 
     metacity->button_layout = new_layout;
+#endif
 }
 
 static MetaButtonType
@@ -634,8 +652,13 @@
         MetaFrameBorders borders;
 
         tmp_flags = flags & ~META_FRAME_MAXIMIZED;
+#ifdef HAVE_METACITY_3_20_0
+        meta_theme_get_frame_borders (metacity->theme, d->gtk_theme_variant,
+                                      type, tmp_flags, &borders);
+#else
         meta_theme_get_frame_borders (metacity->theme, get_style_info (metacity, d),
                                       type, d->frame->text_height, tmp_flags, &borders);
+#endif
 
         if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE) {
             frame_win_extents.left += borders.invisible.left;
@@ -648,8 +671,13 @@
         }
 
         tmp_flags = flags | META_FRAME_MAXIMIZED;
+#ifdef HAVE_METACITY_3_20_0
+        meta_theme_get_frame_borders (metacity->theme, d->gtk_theme_variant,
+                                      type, tmp_flags, &borders);
+#else
         meta_theme_get_frame_borders (metacity->theme, get_style_info (metacity, d),
                                       type, d->frame->text_height, tmp_flags, &borders);
+#endif
 
         if (flags & META_FRAME_ALLOWS_HORIZONTAL_RESIZE) {
             frame_max_win_extents.left += borders.invisible.left;
@@ -779,9 +807,15 @@
     else
         client_height = decor->border_layout.left.y2 - decor->border_layout.left.y1;
 
+#ifdef HAVE_METACITY_3_20_0
+    meta_theme_calc_geometry (metacity->theme, decor->gtk_theme_variant,
+                              frame_type, *flags, client_width, client_height,
+                              &metacity->button_layout, fgeom);
+#else
     meta_theme_calc_geometry (metacity->theme, get_style_info (metacity, decor),
                               frame_type, decor->frame->text_height, *flags, client_width,
                               client_height, &metacity->button_layout, fgeom);
+#endif
 }
 
 static void
@@ -834,11 +868,11 @@
 {
     int i;
 
-    for (i = 0; i < MAX_BUTTONS_PER_CORNER; ++i)
+    for (i = 0; i < META_BUTTON_FUNCTION_LAST; ++i)
         if (metacity->button_layout.left_buttons[i] == function)
             return TRUE;
 
-    for (i = 0; i < MAX_BUTTONS_PER_CORNER; ++i)
+    for (i = 0; i < META_BUTTON_FUNCTION_LAST; ++i)
         if (metacity->button_layout.right_buttons[i] == function)
             return TRUE;
 
@@ -881,7 +915,12 @@
 {
     GWDSettings *settings = gwd_theme_get_settings (GWD_THEME (metacity));
     const gchar *metacity_theme_name = gwd_settings_get_metacity_theme_name (settings);
+#ifdef HAVE_METACITY_3_20_0
+    gint metacity_theme_type = gwd_settings_get_metacity_theme_type (settings);
+    GError *error = NULL;
+#else
     MetaTheme *theme;
+#endif
 
     /* metacity_theme can be NULL only in one case - if user has disabled
      * metacity theme with use-metacity-theme setting. In that case
@@ -889,6 +928,23 @@
      */
     g_assert (metacity_theme_name != NULL);
 
+#ifdef HAVE_METACITY_3_20_0
+    if (metacity_theme_type == -1)
+        metacity_theme_type = META_THEME_TYPE_METACITY;
+
+    metacity->theme = meta_theme_new (metacity_theme_type);
+
+    if (!meta_theme_load (metacity->theme, metacity_theme_name, &error)) {
+        g_warning ("Failed to load metacity theme '%s': %s",
+                   metacity_theme_name, error->message);
+
+        g_error_free (error);
+        g_clear_object (&metacity->theme);
+
+        return FALSE;
+    }
+#else
+
     /* meta_theme_get_current returns the last good theme, so we will try to
      * load theme manually to know that theme is 100% valid.
      */
@@ -905,6 +961,7 @@
     /* If we are here then we know that this will not fail. */
     meta_theme_set_current (metacity_theme_name, TRUE);
     metacity->theme = meta_theme_get_current ();
+#endif
 
     return TRUE;
 }
@@ -940,7 +997,11 @@
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (object);
 
+#ifdef HAVE_METACITY_3_20_0
+    g_clear_object (&metacity->theme);
+#else
     g_clear_pointer (&metacity->style_variants, g_hash_table_destroy);
+#endif
 
     if (metacity->button_layout_id != 0) {
         GWDSettings *settings = gwd_theme_get_settings (GWD_THEME (metacity));
@@ -949,7 +1010,9 @@
         metacity->button_layout_id = 0;
     }
 
+#ifndef HAVE_METACITY_3_20_0
     metacity->titlebar_font = NULL;
+#endif
 
     G_OBJECT_CLASS (gwd_theme_metacity_parent_class)->dispose (object);
 }
@@ -959,7 +1022,11 @@
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
 
+#ifdef HAVE_METACITY_3_20_0
+    meta_theme_invalidate (metacity->theme);
+#else
     g_hash_table_remove_all (metacity->style_variants);
+#endif
 }
 
 static void
@@ -971,8 +1038,10 @@
     GdkDisplay *display = gdk_display_get_default ();
     Display *xdisplay = gdk_x11_display_get_xdisplay (display);
     GtkWidget *style_window = gwd_theme_get_style_window (theme);
+#ifndef HAVE_METACITY_3_20_0
     MetaStyleInfo *style_info = get_style_info (metacity, decor);
     GtkStyleContext *context = gtk_widget_get_style_context (style_window);
+#endif
     cairo_surface_t *surface;
     Picture src;
     MetaButtonState button_states [META_BUTTON_TYPE_LAST];
@@ -987,8 +1056,10 @@
     Region right_region;
     double alpha;
     gboolean shade_alpha;
+#ifndef HAVE_METACITY_3_20_0
     MetaFrameStyle *frame_style;
     GdkRGBA bg_rgba;
+#endif
 
     if (!decor->surface || !decor->picture)
         return;
@@ -1023,6 +1094,7 @@
     for (i = 0; i < META_BUTTON_TYPE_LAST; ++i)
         button_states[i] = meta_button_state_for_button_type (metacity, decor, i);
 
+#ifndef HAVE_METACITY_3_20_0
     frame_style = meta_theme_get_frame_style (metacity->theme, frame_type, flags);
 
     gtk_style_context_get_background_color (context, GTK_STATE_FLAG_NORMAL, &bg_rgba);
@@ -1034,6 +1106,7 @@
 
         bg_rgba.alpha = frame_style->window_background_alpha / 255.0;
     }
+#endif
 
     /* Draw something that will be almost invisible to user. This is hacky way
      * to fix invisible decorations. */
@@ -1048,19 +1121,28 @@
 
     cr = cairo_create (surface);
 
+#ifndef HAVE_METACITY_3_20_0
     gdk_cairo_set_source_rgba (cr, &bg_rgba);
     cairo_set_operator (cr, CAIRO_OPERATOR_OVER);
     cairo_paint (cr);
+#endif
 
     src = XRenderCreatePicture (xdisplay, cairo_xlib_surface_get_drawable (surface),
                                 xformat_rgba, 0, NULL);
 
+#ifdef HAVE_METACITY_3_20_0
+    meta_theme_draw_frame (metacity->theme, decor->gtk_theme_variant, cr, frame_type, flags,
+                           fgeom.width - fgeom.borders.total.left - fgeom.borders.total.right,
+                           fgeom.height - fgeom.borders.total.top - fgeom.borders.total.bottom,
+                           decor->name, &metacity->button_layout,
+                           button_states, decor->icon_pixbuf, NULL);
+#else
     meta_theme_draw_frame (metacity->theme, style_info, cr, frame_type, flags,
                            fgeom.width - fgeom.borders.total.left - fgeom.borders.total.right,
                            fgeom.height - fgeom.borders.total.top - fgeom.borders.total.bottom,
                            decor->layout, decor->frame->text_height, &metacity->button_layout,
                            button_states, decor->icon_pixbuf, NULL);
-
+#endif
 
     if (fgeom.borders.visible.top) {
         top_region = get_top_border_region (&fgeom, fgeom.width);
@@ -1196,23 +1278,35 @@
                                           decor_frame_t *frame)
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
+#ifndef HAVE_METACITY_3_20_0
     MetaStyleInfo *style_info = get_style_info (metacity, NULL);
+#endif
     MetaFrameType frame_type = frame_type_from_string (frame->type);
     MetaFrameBorders borders;
 
     gwd_decor_frame_ref (frame);
 
+#ifdef HAVE_METACITY_3_20_0
+    meta_theme_get_frame_borders (metacity->theme, NULL, frame_type,
+                                  0, &borders);
+#else
     meta_theme_get_frame_borders (metacity->theme, style_info, frame_type,
                                   frame->text_height, 0, &borders);
+#endif
 
     frame->win_extents.top = borders.visible.top;
     frame->win_extents.bottom = borders.visible.bottom;
     frame->win_extents.left = borders.visible.left;
     frame->win_extents.right = borders.visible.right;
 
+#ifdef HAVE_METACITY_3_20_0
+    meta_theme_get_frame_borders (metacity->theme, NULL, frame_type,
+                                  META_FRAME_MAXIMIZED, &borders);
+#else
     meta_theme_get_frame_borders (metacity->theme, style_info, frame_type,
                                   frame->text_height, META_FRAME_MAXIMIZED,
                                   &borders);
+#endif
 
     frame->max_win_extents.top = borders.visible.top;
     frame->max_win_extents.bottom = borders.visible.bottom;
@@ -1427,13 +1521,20 @@
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
 
+#ifdef HAVE_METACITY_3_20_0
+    meta_theme_set_titlebar_font (metacity->theme, titlebar_font);
+#else
     metacity->titlebar_font = titlebar_font;
+#endif
 }
 
 static PangoFontDescription *
 gwd_theme_metacity_get_titlebar_font (GWDTheme      *theme,
                                       decor_frame_t *frame)
 {
+#ifdef HAVE_METACITY_3_20_0
+    return NULL;
+#else
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
     MetaStyleInfo *style_info = get_style_info (metacity, NULL);
     PangoFontDescription *font_desc = meta_style_info_create_font_desc (style_info);
@@ -1445,6 +1546,7 @@
     meta_frame_style_apply_scale (style, font_desc);
 
     return font_desc;
+#endif
 }
 
 static void
@@ -1469,8 +1571,10 @@
 static void
 gwd_theme_metacity_init (GWDThemeMetacity *metacity)
 {
+#ifndef HAVE_METACITY_3_20_0
     metacity->style_variants = g_hash_table_new_full (g_str_hash, g_str_equal, g_free,
                                                       (GDestroyNotify) meta_style_info_unref);
+#endif
 }
 
 /**
 
=== modified file 'gtk/window-decorator/gwd-theme.c'
--- gtk/window-decorator/gwd-theme.c	2016-06-09 20:28:29 +0000
+++ gtk/window-decorator/gwd-theme.c	2016-06-09 20:28:29 +0000
@@ -109,7 +109,6 @@
 
     G_OBJECT_CLASS (gwd_theme_parent_class)->constructed (object);
 
-    gwd_theme_update_titlebar_font (theme);
     create_style_window (theme);
 }