Merge lp:~muktupavels/compiz/gwd-hidpi into lp:compiz

[Alberts Muktupāvels]

gtk-window-decorator: scale window decorations on HiDPI

This change should add full HiDPI support to gtk-window-decorator. Should work automatically and also by using GDK_SCALE and GDK_DPI_SCALE env.

This requires libmetacity 3.25.1 or newer.

P.S. This adds HiDPI support to Metacity themes, Cairo theme is still unscaled...

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

Ack

review: Approve

=== modified file 'gtk/CMakeLists.txt'
--- gtk/CMakeLists.txt	2017-04-25 09:26:05 +0000
+++ gtk/CMakeLists.txt	2017-04-25 09:26:05 +0000
@@ -28,6 +28,8 @@
             pkg_check_modules (LIBMETACITY libmetacity>=3.22.0)
 
             if (LIBMETACITY_FOUND)
+                compiz_pkg_check_modules (HAVE_METACITY_3_26_0 libmetacity>=3.25.1)
+
                 set (METACITY_INCLUDE_DIRS ${LIBMETACITY_INCLUDE_DIRS})
                 set (METACITY_LIBRARIES ${LIBMETACITY_LIBRARIES})
             else (LIBMETACITY_FOUND)

=== modified file 'gtk/config.h.gtk.in'
--- gtk/config.h.gtk.in	2017-04-25 09:26:05 +0000
+++ gtk/config.h.gtk.in	2017-04-25 09:26:05 +0000
@@ -1,4 +1,7 @@
 /* Define to 1 if Metacity support is enabled */
 #cmakedefine USE_METACITY 1
 
+/* Define to 1 if Metacity version >= 3.25.1 */
+#cmakedefine HAVE_METACITY_3_26_0 1
+
 #define GETTEXT_PACKAGE "${GETTEXT_PACKAGE}"

=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2017-04-25 09:26:05 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2017-04-25 09:26:05 +0000
@@ -628,6 +628,11 @@
         return;
 
     setup_button_layout (metacity);
+
+#ifdef HAVE_METACITY_3_26_0
+    meta_theme_set_scale (metacity->theme, gwd_theme_get_scale (GWD_THEME (object)));
+    meta_theme_set_dpi (metacity->theme, gwd_theme_get_dpi (GWD_THEME (object)));
+#endif
 }
 
 static void
@@ -648,6 +653,26 @@
 }
 
 static void
+gwd_theme_metacity_dpi_changed (GWDTheme *theme)
+{
+#ifdef HAVE_METACITY_3_26_0
+    GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
+
+    meta_theme_set_dpi (metacity->theme, gwd_theme_get_dpi (theme));
+#endif
+}
+
+static void
+gwd_theme_metacity_scale_changed (GWDTheme *theme)
+{
+#ifdef HAVE_METACITY_3_26_0
+    GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
+
+    meta_theme_set_scale (metacity->theme, gwd_theme_get_scale (theme));
+#endif
+}
+
+static void
 gwd_theme_metacity_style_updated (GWDTheme *theme)
 {
     GWDThemeMetacity *metacity = GWD_THEME_METACITY (theme);
@@ -1112,6 +1137,8 @@
     object_class->constructed = gwd_theme_metacity_constructed;
     object_class->dispose = gwd_theme_metacity_dispose;
 
+    theme_class->dpi_changed = gwd_theme_metacity_dpi_changed;
+    theme_class->scale_changed = gwd_theme_metacity_scale_changed;
     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;

=== modified file 'gtk/window-decorator/gwd-theme.c'
--- gtk/window-decorator/gwd-theme.c	2016-08-31 17:33:17 +0000
+++ gtk/window-decorator/gwd-theme.c	2017-04-25 09:26:05 +0000
@@ -34,6 +34,13 @@
     PangoFontDescription *titlebar_font;
 
     GtkWidget            *style_window;
+
+    gulong                monitors_changed_id;
+    gboolean              fixed_scale;
+    gint                  scale;
+
+    gulong                gtk_xft_dpi_id;
+    gdouble               dpi;
 } GWDThemePrivate;
 
 enum
@@ -55,9 +62,8 @@
                               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);
+    GWDTheme *theme = GWD_THEME (user_data);
+    GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
 
     if (frame->pango_context == NULL)
         return;
@@ -65,14 +71,15 @@
     /* 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);
+    pango_cairo_context_set_resolution (frame->pango_context,
+                                        priv->dpi * priv->scale);
 }
 
 static void
 style_updated_cb (GtkWidget *widget,
                   GWDTheme  *theme)
 {
-    gwd_frames_foreach (frames_update_pango_contexts, NULL);
+    gwd_frames_foreach (frames_update_pango_contexts, theme);
 
     GWD_THEME_GET_CLASS (theme)->style_updated (theme);
 
@@ -103,6 +110,115 @@
 }
 
 static void
+monitors_changed_cb (GdkScreen *screen,
+                     GWDTheme  *theme)
+{
+    GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
+    gint scale = gtk_widget_get_scale_factor (priv->style_window);
+
+    if (priv->scale == scale)
+        return;
+
+    priv->scale = scale;
+
+    GWD_THEME_GET_CLASS (theme)->scale_changed (theme);
+
+    decorations_changed (wnck_screen_get_default ());
+}
+
+static void
+track_window_scale (GWDTheme *theme)
+{
+    GdkScreen *screen = gdk_screen_get_default ();
+    GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
+ 
+    priv->monitors_changed_id = g_signal_connect (screen, "monitors-changed",
+                                                  G_CALLBACK (monitors_changed_cb),
+                                                  theme);
+
+    priv->fixed_scale = g_getenv ("GDK_SCALE") != NULL;
+    priv->scale = gtk_widget_get_scale_factor (priv->style_window);
+}
+
+static gdouble
+get_unscaled_dpi (GWDTheme *theme)
+{
+    GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
+    gint xft_dpi;
+    gdouble dpi;
+
+    g_object_get (gtk_settings_get_default (), "gtk-xft-dpi", &xft_dpi, NULL);
+
+    if (xft_dpi > 0) {
+        const gchar *scale_env;
+
+        dpi = xft_dpi / 1024.0;
+
+        /* When using automatic scaling gtk-xft-dpi value is unscaled, but
+         * when it is disabled with GDK_SCALE or gdk_display_x11_set_scale then
+         * this value will be already scaled.
+         */
+        if (priv->fixed_scale) {
+            GdkScreen *screen = gdk_screen_get_default ();
+            GValue value = G_VALUE_INIT;
+
+            g_value_init (&value, G_TYPE_INT);
+
+            if (gdk_screen_get_setting (screen, "gdk-window-scaling-factor", &value))
+                dpi /= g_value_get_int (&value);
+        }
+
+        /* gtk-xft-dpi value is not scaled with GDK_DPI_SCALE, we need to do
+         * that manually if we want GDK_DPI_SCALE support in decorations.
+         */
+        scale_env = g_getenv ("GDK_DPI_SCALE");
+        if (scale_env) {
+            gdouble scale = g_ascii_strtod (scale_env, NULL);
+
+            if (scale != 0)
+                dpi *= scale;
+        }
+    } else {
+        dpi = 96.0;
+    }
+
+    return dpi;
+}
+
+static void
+notify_gtk_xft_dpi_cb (GtkSettings *settings,
+                       GParamSpec  *pspec,
+                       GWDTheme    *theme)
+{
+    GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
+    gdouble dpi = get_unscaled_dpi (theme);
+
+    if (priv->dpi == dpi)
+        return;
+
+    priv->dpi = dpi;
+
+    gwd_frames_foreach (frames_update_pango_contexts, theme);
+
+    GWD_THEME_GET_CLASS (theme)->dpi_changed (theme);
+
+    decorations_changed (wnck_screen_get_default ());
+}
+
+static void
+track_xft_dpi (GWDTheme *theme)
+{
+    GtkSettings *settings = gtk_settings_get_default ();
+    GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
+
+    priv->gtk_xft_dpi_id = g_signal_connect (settings, "notify::gtk-xft-dpi",
+                                             G_CALLBACK (notify_gtk_xft_dpi_cb),
+                                             theme);
+
+    priv->dpi = get_unscaled_dpi (theme);
+}
+
+static void
 gwd_theme_constructed (GObject *object)
 {
     GWDTheme *theme = GWD_THEME (object);
@@ -110,6 +226,8 @@
     G_OBJECT_CLASS (gwd_theme_parent_class)->constructed (object);
 
     create_style_window (theme);
+    track_window_scale (theme);
+    track_xft_dpi (theme);
 }
 
 static void
@@ -125,6 +243,20 @@
 
     g_clear_pointer (&priv->style_window, gtk_widget_destroy);
 
+    if (priv->monitors_changed_id != 0) {
+        GdkScreen *screen = gdk_screen_get_default ();
+
+        g_signal_handler_disconnect (screen, priv->monitors_changed_id);
+        priv->monitors_changed_id = 0;
+    }
+
+    if (priv->gtk_xft_dpi_id != 0) {
+        GtkSettings *settings = gtk_settings_get_default ();
+
+        g_signal_handler_disconnect (settings, priv->gtk_xft_dpi_id);
+        priv->gtk_xft_dpi_id = 0;
+    }
+
     G_OBJECT_CLASS (gwd_theme_parent_class)->dispose (object);
 }
 
@@ -169,6 +301,16 @@
 }
 
 static void
+gwd_theme_real_dpi_changed (GWDTheme *theme)
+{
+}
+
+static void
+gwd_theme_real_scale_changed (GWDTheme *theme)
+{
+}
+
+static void
 gwd_theme_real_style_updated (GWDTheme *theme)
 {
 }
@@ -260,6 +402,8 @@
     object_class->get_property = gwd_theme_get_property;
     object_class->set_property = gwd_theme_set_property;
 
+    theme_class->dpi_changed = gwd_theme_real_dpi_changed;
+    theme_class->scale_changed = gwd_theme_real_scale_changed;
     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;
@@ -324,6 +468,22 @@
     return priv->settings;
 }
 
+gdouble
+gwd_theme_get_dpi (GWDTheme *theme)
+{
+    GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
+
+    return priv->dpi;
+}
+
+gint
+gwd_theme_get_scale (GWDTheme *theme)
+{
+    GWDThemePrivate *priv = gwd_theme_get_instance_private (theme);
+
+    return priv->scale;
+}
+
 GtkWidget *
 gwd_theme_get_style_window (GWDTheme *theme)
 {

=== modified file 'gtk/window-decorator/gwd-theme.h'
--- gtk/window-decorator/gwd-theme.h	2016-08-31 17:33:17 +0000
+++ gtk/window-decorator/gwd-theme.h	2017-04-25 09:26:05 +0000
@@ -37,6 +37,10 @@
 {
     GObjectClass parent_class;
 
+    void     (* dpi_changed)               (GWDTheme                   *theme);
+
+    void     (* scale_changed)             (GWDTheme                   *theme);
+
     void     (* style_updated)             (GWDTheme                   *theme);
 
     void     (* get_shadow)                (GWDTheme                   *theme,
@@ -96,6 +100,12 @@
 GWDSettings *
 gwd_theme_get_settings              (GWDTheme               *theme);
 
+gdouble
+gwd_theme_get_dpi                   (GWDTheme               *theme);
+
+gint
+gwd_theme_get_scale                 (GWDTheme               *theme);
+
 GtkWidget *
 gwd_theme_get_style_window          (GWDTheme               *theme);