Merge lp:~3v1n0/gtk/unity-border-radius-support into lp:~ubuntu-desktop/gtk/ubuntugtk3

[Marco Trevisan (Treviño)]

Export windows corners radius as an X11 property in unity.

It works together with lp:~3v1n0/unity/gtk-border-radius-support/+merge/288358

[lp:~3v1n0/gtk/unity-border-radius-support]

505. By Marco Trevisan (Treviño) on 2016-03-08

debian/patches/unity-border-radius.patch: Export windows corners radius as an X11 property in unity

506. By Marco Trevisan (Treviño) on 2016-03-10

debian/patches/unity-border-radius.patch:
 - Don't draw window border in unity for any theme. Add unity-csd style class.

507. By Marco Trevisan (Treviño) on 2016-03-10

Merging with lp:~ubuntu-desktop/gtk/ubuntugtk3

[Allison Lortie (desrt)]

Looks pretty good, but there are some things that I would consider changing.

I am not an expert in GTK theming by any measure, however, so my suggestions might be pure insanity. I just took a look at how some other widgets are doing things.

One comment in general: do we really need to query the title widget to find out the borders that will be drawn on the toplevel? Something seems wrong here. I would have expected that we can query this information directly from the window itself in some way (and avoid the ugly hacks about assuming zeros).

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

> One comment in general: do we really need to query the title widget to find
> out the borders that will be drawn on the toplevel? Something seems wrong
> here. I would have expected that we can query this information directly from
> the window itself in some way (and avoid the ugly hacks about assuming zeros).

Not as far I know... The window itself has not rounded corners, but it can have a titlebox which has rounded corners.
By defining a border-radius to the window itself, gives no rounded corners by default. It might be something that will work in the future, though. But not right now AFAIK.

To remove the workaround we could get these values from the toplevel, and in case a titlebox is defined we get them from that, but we can't query them from the toplevel, from what I see.

[lp:~3v1n0/gtk/unity-border-radius-support]

508. By Marco Trevisan (Treviño) on 2016-03-15

debian/patches/unity-border-radius.patch:
  - use better style
  - take care of window scaling (and update values on scale changes)
  - use memcmp instead of manual checks
  - only check changes if border radius properties changed (using "style-updated" signal)
  - remove unwanted change

509. By Marco Trevisan (Treviño) on 2016-03-15

debian/patches/unity-border-radius.patch: don't cache window borders value

Since we only update when they change, we can avoid this.

510. By Marco Trevisan (Treviño) on 2016-03-15

Merging with lp:~ubuntu-desktop/gtk/ubuntugtk3

[Allison Lortie (desrt)]

review: Needs Fixing

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

Thanks for comments, patch updated.

[lp:~3v1n0/gtk/unity-border-radius-support]

511. By Marco Trevisan (Treviño) on 2016-03-17

debian/patches/unity-border-radius.patch: remove unneeded variables to keep track of what exported

Signals are already smart enough to update us only when needed

[Allison Lortie (desrt)]

No further problems that I can see.

[Sebastien Bacher (seb128)]

thanks

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2016-03-14 12:51:46 +0000
+++ debian/changelog	2016-03-17 13:35:43 +0000
@@ -1,3 +1,12 @@
+gtk+3.0 (3.18.9-1ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/patches/unity-border-radius.patch:
+    - Export windows corners radius as an X11 property in unity (LP: #1516403)
+  * debian/patches/unity_rbga_tooltips.patch:
+    - Removed as it's now included in the border-radius patch
+
+ -- Marco Trevisan (Treviño) <[e-mail]>  Tue, 15 Mar 2016 18:40:42 +0100
+
 gtk+3.0 (3.18.9-1ubuntu1) xenial; urgency=low
 
   * Merge with Debian. Remaining changes:

=== modified file 'debian/patches/series'
--- debian/patches/series	2016-03-14 12:44:16 +0000
+++ debian/patches/series	2016-03-17 13:35:43 +0000
@@ -21,7 +21,7 @@
 restore_filechooser_typeaheadfind
 0001-calendar-always-emit-day-selected-once.patch
 git_icon_fallback.patch
-unity_rbga_tooltips.patch
 git-refresh-mir-backend.patch
 0001-gtkwindow-set-transparent-background-color.patch
 ubuntu_fileselector_behaviour.patch
+unity-border-radius.patch

=== added file 'debian/patches/unity-border-radius.patch'
--- debian/patches/unity-border-radius.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/unity-border-radius.patch	2016-03-17 13:35:43 +0000
@@ -0,0 +1,269 @@
+Description: Export windows corners radius in the _UNITY_GTK_BORDER_RADIUS
+ X11 property when such feature is supported by WM (so just in unity).
+ This has to be removed when compiz will natively support _GTK_FRAME_EXTENTS
+Author: Marco Trevisan <[e-mail]>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1516403
+
+Index: gtk+3.0-3.18.8/gtk/gtkwindow.c
+===================================================================
+--- gtk+3.0-3.18.8.orig/gtk/gtkwindow.c
++++ gtk+3.0-3.18.8/gtk/gtkwindow.c
+@@ -232,6 +232,7 @@ struct _GtkWindowPrivate
+   guint    csd_requested             : 1;
+   guint    client_decorated          : 1; /* Decorations drawn client-side */
+   guint    use_client_shadow         : 1; /* Decorations use client-side shadows */
++  guint    use_unity_border_radius   : 1; /* Unity border radius is supported */
+   guint    maximized                 : 1;
+   guint    fullscreen                : 1;
+   guint    tiled                     : 1;
+@@ -3976,14 +3977,139 @@ gtk_window_set_geometry_hints (GtkWindow
+ }
+ 
+ static void
++unity_border_radius_update (GtkWindow *window)
++{
++#ifdef GDK_WINDOWING_X11
++  Atom border_radius;
++  GtkWindowPrivate *priv;
++  GtkStyleContext *context;
++  GdkDisplay *display;
++  GdkWindow *gdk_window;
++
++  enum { TOP_LEFT, TOP_RIGHT, BOTTOM_LEFT, BOTTOM_RIGHT };
++  gulong corners[4] = {0};
++
++  priv = window->priv;
++  context = NULL;
++
++  if (!gtk_widget_get_realized (GTK_WIDGET (window)))
++    return;
++
++  if (priv->type == GTK_WINDOW_POPUP)
++    {
++      context = gtk_widget_get_style_context (GTK_WIDGET (window));
++    }
++  else if (priv->title_box)
++    {
++      context = gtk_widget_get_style_context (priv->title_box);
++    }
++
++  if (context)
++    {
++      corners[TOP_LEFT] = round (_gtk_css_corner_value_get_x (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS), 100) * priv->scale);
++      corners[TOP_RIGHT] = round (_gtk_css_corner_value_get_x (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS), 100) * priv->scale);
++
++      /* Bottom corners radius is not controlled by title box, and we can
++       * assume it's always 0 for such windows. */
++
++      if (priv->type == GTK_WINDOW_POPUP)
++        {
++          corners[BOTTOM_LEFT] = round (_gtk_css_corner_value_get_x (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS), 100) * priv->scale);
++          corners[BOTTOM_RIGHT] = round (_gtk_css_corner_value_get_x (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS), 100) * priv->scale);
++        }
++    }
++
++  gdk_window = _gtk_widget_get_window (GTK_WIDGET (window));
++  display = gdk_window_get_display (gdk_window);
++  border_radius = gdk_x11_get_xatom_by_name_for_display (display,
++                                                         "_UNITY_GTK_BORDER_RADIUS");
++
++  if (corners[TOP_LEFT] || corners[TOP_RIGHT] || corners[BOTTOM_LEFT] || corners[BOTTOM_RIGHT])
++    {
++      XChangeProperty (GDK_DISPLAY_XDISPLAY (display),
++                       GDK_WINDOW_XID (gdk_window),
++                       border_radius,
++                       gdk_x11_get_xatom_by_name_for_display (display, "CARDINAL"),
++                       32, PropModeReplace,
++                       (guchar *) &corners, G_N_ELEMENTS (corners));
++    }
++  else
++    {
++      XDeleteProperty (GDK_DISPLAY_XDISPLAY (display),
++                       GDK_WINDOW_XID (gdk_window),
++                       border_radius);
++    }
++#endif
++}
++
++static void
++on_decoration_style_changed (GtkWidget *widget,
++                             GtkWindow *window)
++{
++  GtkStyleContext *context = gtk_widget_get_style_context (widget);
++  const GtkBitmask *changes = _gtk_style_context_get_changes (context);
++
++  if (!changes)
++    return;
++
++  if (_gtk_bitmask_get(changes, GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS) ||
++      _gtk_bitmask_get(changes, GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS) ||
++      _gtk_bitmask_get(changes, GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS) ||
++      _gtk_bitmask_get(changes, GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS))
++  {
++    unity_border_radius_update (window);
++  }
++}
++
++static void
++on_window_scale_changed (GtkWidget  *widget,
++                         GParamSpec *pspec,
++                         GtkWindow  *window)
++{
++  unity_border_radius_update (window);
++}
++
++static void
++unity_border_radius_update_and_monitor (GtkWindow *window, GtkWidget *widget)
++{
++  if (!window->priv->use_unity_border_radius)
++    return;
++
++  g_signal_connect (widget, "style-updated", G_CALLBACK (on_decoration_style_changed), window);
++  unity_border_radius_update (window);
++}
++
++static gboolean
++unity_border_radius_is_supported (GtkWindow *window)
++{
++#ifdef GDK_WINDOWING_X11
++  GdkScreen *screen = _gtk_window_get_screen (window);
++
++  if (GDK_IS_X11_SCREEN (screen))
++    {
++      GdkAtom unity_atom = gdk_atom_intern_static_string ("_UNITY_GTK_BORDER_RADIUS");
++      return gdk_x11_screen_supports_net_wm_hint (screen, unity_atom);
++    }
++#endif
++
++  return FALSE;
++}
++
++static void
+ unset_titlebar (GtkWindow *window)
+ {
+   GtkWindowPrivate *priv = window->priv;
+ 
+   if (priv->titlebar != NULL)
+-    g_signal_handlers_disconnect_by_func (priv->titlebar,
+-                                          on_titlebar_title_notify,
+-                                          window);
++    {
++      g_signal_handlers_disconnect_by_func (priv->titlebar,
++                                            on_titlebar_title_notify,
++                                            window);
++
++      g_signal_handlers_disconnect_by_func (priv->titlebar,
++                                            on_decoration_style_changed,
++                                            window);
++    }
+ 
+   if (priv->title_box != NULL)
+     {
+@@ -4043,13 +4169,16 @@ gtk_window_enable_csd (GtkWindow *window
+   GdkVisual *visual;
+ 
+   /* We need a visual with alpha for client shadows */
+-  if (priv->use_client_shadow)
++  if (priv->use_client_shadow || priv->use_unity_border_radius)
+     {
+       visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (widget));
+       if (visual != NULL)
+         gtk_widget_set_visual (widget, visual);
+ 
+       gtk_style_context_add_class (gtk_widget_get_style_context (widget), GTK_STYLE_CLASS_CSD);
++
++      if (priv->use_unity_border_radius)
++        gtk_style_context_add_class (gtk_widget_get_style_context (widget), "unity-csd");
+     }
+   else
+     {
+@@ -4118,6 +4247,7 @@ gtk_window_set_titlebar (GtkWindow *wind
+     }
+ 
+   priv->use_client_shadow = gtk_window_supports_client_shadow (window);
++  priv->use_unity_border_radius = unity_border_radius_is_supported (window);
+ 
+   gtk_window_enable_csd (window);
+   priv->title_box = titlebar;
+@@ -4129,6 +4259,8 @@ gtk_window_set_titlebar (GtkWindow *wind
+       on_titlebar_title_notify (GTK_HEADER_BAR (titlebar), NULL, window);
+     }
+ 
++  unity_border_radius_update_and_monitor (window, titlebar);
++
+   gtk_style_context_add_class (gtk_widget_get_style_context (titlebar),
+                                GTK_STYLE_CLASS_TITLEBAR);
+ 
+@@ -5857,13 +5989,19 @@ create_decoration (GtkWidget *widget)
+   GtkWindowPrivate *priv = window->priv;
+ 
+   priv->use_client_shadow = gtk_window_supports_client_shadow (window);
+-  if (!priv->use_client_shadow)
++  priv->use_unity_border_radius = unity_border_radius_is_supported (window);
++
++  if (!priv->use_client_shadow && !priv->use_unity_border_radius)
+     return;
+ 
+   gtk_window_enable_csd (window);
+-
+   if (priv->type == GTK_WINDOW_POPUP)
+-    return;
++    {
++      if (priv->csd_requested)
++        unity_border_radius_update_and_monitor (window, widget);
++
++      return;
++    }
+ 
+   if (priv->title_box == NULL)
+     {
+@@ -5871,6 +6009,8 @@ create_decoration (GtkWidget *widget)
+       gtk_widget_set_parent (priv->titlebar, widget);
+       gtk_widget_show_all (priv->titlebar);
+       priv->title_box = priv->titlebar;
++
++      unity_border_radius_update_and_monitor (window, priv->title_box);
+     }
+ 
+   update_window_buttons (window);
+@@ -6547,6 +6687,9 @@ get_shadow_width (GtkWindow *window,
+   if (!priv->decorated)
+     return;
+ 
++  if (priv->client_decorated && priv->use_unity_border_radius)
++    return;
++
+   if (!priv->client_decorated &&
+       !(gtk_window_should_use_csd (window) &&
+         gtk_window_supports_client_shadow (window)))
+@@ -7141,7 +7284,7 @@ gtk_window_realize (GtkWidget *widget)
+ 
+   attributes_mask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
+ 
+-  if (priv->client_decorated && priv->type == GTK_WINDOW_TOPLEVEL)
++  if (priv->client_decorated && priv->type == GTK_WINDOW_TOPLEVEL && !priv->use_unity_border_radius)
+     {
+       const gchar *cursor[8] = {
+         "nw-resize", "n-resize", "ne-resize",
+@@ -7223,6 +7366,12 @@ gtk_window_realize (GtkWidget *widget)
+     }
+ #endif
+ 
++  if (priv->use_unity_border_radius)
++    {
++      g_signal_connect (window, "notify::scale-factor", G_CALLBACK (on_window_scale_changed), window);
++      unity_border_radius_update (window);
++    }
++
+   child_allocation.x = 0;
+   child_allocation.y = 0;
+   child_allocation.width = allocation.width;
+@@ -10587,7 +10736,7 @@ gtk_window_set_screen (GtkWindow *window
+     }
+   g_object_notify_by_pspec (G_OBJECT (window), window_props[PROP_SCREEN]);
+ 
+-  if (was_rgba && priv->use_client_shadow)
++  if (was_rgba && (priv->use_client_shadow || priv->use_unity_border_radius))
+     {
+       GdkVisual *visual;
+ 

=== removed file 'debian/patches/unity_rbga_tooltips.patch'
--- debian/patches/unity_rbga_tooltips.patch	2016-03-10 02:12:49 +0000
+++ debian/patches/unity_rbga_tooltips.patch	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-Description: Ensure that tooltips are drawn on a rgba surface in Unity
- This has to be removed once better unity/CSD integration has landed
-Author: Marco Trevisan <[e-mail]>
-Bug-Ubuntu: https://bugs.launchpad.net/bugs/1508357
-
-Index: gtk+3.0-3.18.8/gtk/gtktooltip.c
-===================================================================
---- gtk+3.0-3.18.8.orig/gtk/gtktooltip.c
-+++ gtk+3.0-3.18.8/gtk/gtktooltip.c
-@@ -166,6 +166,30 @@ gtk_tooltip_class_init (GtkTooltipClass
-   quark_current_tooltip = g_quark_from_static_string ("gdk-display-current-tooltip");
- }
- 
-+static gboolean
-+in_desktop (const gchar *name)
-+{
-+  const gchar *desktop_name_list;
-+  gchar **names;
-+  gboolean in_list = FALSE;
-+  gint i;
-+
-+  desktop_name_list = g_getenv ("XDG_CURRENT_DESKTOP");
-+  if (!desktop_name_list)
-+    return FALSE;
-+
-+  names = g_strsplit (desktop_name_list, ":", -1);
-+  for (i = 0; names[i] && !in_list; i++)
-+    if (strcmp (names[i], name) == 0)
-+      {
-+        in_list = TRUE;
-+        break;
-+      }
-+  g_strfreev (names);
-+
-+  return in_list;
-+}
-+
- static void
- gtk_tooltip_init (GtkTooltip *tooltip)
- {
-@@ -200,6 +224,14 @@ gtk_tooltip_init (GtkTooltip *tooltip)
-   context = gtk_widget_get_style_context (window);
-   gtk_style_context_add_class (context, GTK_STYLE_CLASS_TOOLTIP);
- 
-+  if (in_desktop ("Unity") == 0)
-+    {
-+      GdkVisual *visual;
-+      visual = gdk_screen_get_rgba_visual (gtk_widget_get_screen (window));
-+      if (visual)
-+        gtk_widget_set_visual (GTK_WIDGET (window), visual);
-+    }
-+
-   atk_obj = gtk_widget_get_accessible (window);
-   if (GTK_IS_ACCESSIBLE (atk_obj))
-     atk_object_set_role (atk_obj, ATK_ROLE_TOOL_TIP);