Merge lp:~muktupavels/compiz/gwd-theme-implement-calc-decoration-size into lp:compiz/0.9.12

[Alberts Muktupāvels]

GWDTheme: implement calc_decoration_size.

GWDTheme: implement calc_decoration_size.

[Sam Spilsbury (smspillaz)]

LGTM

review: Approve

[lp:~muktupavels/compiz/gwd-theme-implement-calc-decoration-size]

4034. By Alberts Muktupāvels on 2016-05-20

Merge changes from lp:~albertsmuktupavels/compiz/gwd-theme-implement-get-event-window-position.

=== modified file 'gtk/window-decorator/cairo.c'
--- gtk/window-decorator/cairo.c	2016-05-20 11:20:59 +0000
+++ gtk/window-decorator/cairo.c	2016-05-20 11:21:00 +0000
@@ -710,115 +710,3 @@
 	d->prop_xid = 0;
     }
 }
-
-static void
-calc_button_size (decor_t *d)
-{
-    gint button_width = 0;
-
-    if (d->actions & WNCK_WINDOW_ACTION_CLOSE)
-	button_width += 17;
-
-    if (d->actions & (WNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY   |
-		      WNCK_WINDOW_ACTION_MAXIMIZE_VERTICALLY     |
-		      WNCK_WINDOW_ACTION_UNMAXIMIZE_HORIZONTALLY |
-		      WNCK_WINDOW_ACTION_UNMAXIMIZE_VERTICALLY))
-	button_width += 17;
-
-    if (d->actions & WNCK_WINDOW_ACTION_MINIMIZE)
-	button_width += 17;
-
-    if (button_width)
-	++button_width;
-
-    d->button_width = button_width;
-}
-
-gboolean
-calc_decoration_size (decor_t *d,
-		      gint    w,
-		      gint    h,
-		      gint    name_width,
-		      gint    *width,
-		      gint    *height)
-{
-    decor_layout_t layout;
-    int		   top_width;
-
-    if (!d->decorated)
-	return FALSE;
-
-    /* To avoid wasting texture memory, we only calculate the minimal
-     * required decoration size then clip and stretch the texture where
-     * appropriate
-     */
-
-    if (!d->frame_window)
-    {
-	calc_button_size (d);
-
-	if (w < ICON_SPACE + d->button_width)
-	    return FALSE;
-
-	top_width = name_width + d->button_width + ICON_SPACE;
-	if (w < top_width)
-	    top_width = MAX (ICON_SPACE + d->button_width, w);
-
-	if (d->active)
-	    decor_get_default_layout (&d->frame->window_context_active, top_width, 1, &layout);
-	else
-	    decor_get_default_layout (&d->frame->window_context_inactive, top_width, 1, &layout);
-
-	if (!d->context || memcmp (&layout, &d->border_layout, sizeof (layout)))
-	{
-	    *width  = layout.width;
-	    *height = layout.height;
-
-	    d->border_layout = layout;
-	    if (d->active)
-	    {
-		d->context       = &d->frame->window_context_active;
-		d->shadow        = d->frame->border_shadow_active;
-	    }
-	    else
-	    {
-		d->context       = &d->frame->window_context_inactive;
-		d->shadow        = d->frame->border_shadow_inactive;
-	    }
-
-	    return TRUE;
-	}
-    }
-    else
-    {
-	calc_button_size (d);
-
-	/* _default_win_extents + top height */
-
-	top_width = name_width + d->button_width + ICON_SPACE;
-	if (w < top_width)
-	    top_width = MAX (ICON_SPACE + d->button_width, w);
-
-	decor_get_default_layout (&d->frame->window_context_no_shadow,
-				  d->client_width, d->client_height, &layout);
-
-	*width = layout.width;
-	*height = layout.height;
-
-	d->border_layout = layout;
-	if (d->active)
-	{
-	    d->context       = &d->frame->window_context_active;
-	    d->shadow        = d->frame->border_shadow_active;
-	}
-	else
-	{
-	    d->context       = &d->frame->window_context_inactive;
-	    d->shadow        = d->frame->border_shadow_inactive;
-	}
-
-	return TRUE;
-    }
-
-    return FALSE;
-}

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2016-05-20 11:20:59 +0000
+++ gtk/window-decorator/decorator.c	2016-05-20 11:21:00 +0000
@@ -531,7 +531,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 (!(*theme_calc_decoration_size) (d, w, h, name_width, &width, &height))
+    if (!gwd_theme_calc_decoration_size (gwd_theme, d, w, h, name_width, &width, &height))
     {
 	update_window_decoration_name (win);
 	return FALSE;

=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2016-05-20 11:20:59 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2016-05-20 11:21:00 +0000
@@ -173,20 +173,17 @@
         type = GWD_THEME_TYPE_METACITY;
 
         theme_draw_window_decoration = meta_draw_window_decoration;
-        theme_calc_decoration_size = meta_calc_decoration_size;
     } else {
         g_log ("gtk-window-decorator", G_LOG_LEVEL_INFO, "using cairo decoration");
 
         type = GWD_THEME_TYPE_CAIRO;
 
         theme_draw_window_decoration = draw_window_decoration;
-        theme_calc_decoration_size = calc_decoration_size;
     }
 #else
     type = GWD_THEME_TYPE_CAIRO;
 
     theme_draw_window_decoration = draw_window_decoration;
-    theme_calc_decoration_size = calc_decoration_size;
 #endif
 
     g_set_object (&gwd_theme, gwd_theme_new (type, settings));

=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2016-05-20 11:20:59 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2016-05-20 11:21:00 +0000
@@ -309,12 +309,6 @@
 const gchar * window_type_frames[WINDOW_TYPE_FRAMES_NUM];
 
 void     (*theme_draw_window_decoration)    (decor_t *d);
-gboolean (*theme_calc_decoration_size)      (decor_t *d,
-					     int     client_width,
-					     int     client_height,
-					     int     text_width,
-					     int     *width,
-					     int     *height);
 
 extern char *program_name;
 
@@ -538,14 +532,6 @@
 		   double  radius,
 		   int	   corner);
 
-gboolean
-calc_decoration_size (decor_t *d,
-		      gint    w,
-		      gint    h,
-		      gint    name_width,
-		      gint    *width,
-		      gint    *height);
-
 /* gdk.c */
 
 GdkWindow *
@@ -577,14 +563,6 @@
 void
 meta_draw_window_decoration (decor_t *d);
 
-gboolean
-meta_calc_decoration_size (decor_t *d,
-			   gint    w,
-			   gint    h,
-			   gint    name_width,
-			   gint    *width,
-			   gint    *height);
-
 void
 meta_update_button_layout (const char *value);
 

=== modified file 'gtk/window-decorator/gwd-theme-cairo.c'
--- gtk/window-decorator/gwd-theme-cairo.c	2016-05-20 11:20:59 +0000
+++ gtk/window-decorator/gwd-theme-cairo.c	2016-05-20 11:21:00 +0000
@@ -29,6 +29,29 @@
 
 G_DEFINE_TYPE (GWDThemeCairo, gwd_theme_cairo, GWD_TYPE_THEME)
 
+static void
+calc_button_size (decor_t *decor)
+{
+    gint button_width = 0;
+
+    if (decor->actions & WNCK_WINDOW_ACTION_CLOSE)
+        button_width += 17;
+
+    if (decor->actions & (WNCK_WINDOW_ACTION_MAXIMIZE_HORIZONTALLY |
+                          WNCK_WINDOW_ACTION_MAXIMIZE_VERTICALLY |
+                          WNCK_WINDOW_ACTION_UNMAXIMIZE_HORIZONTALLY |
+                          WNCK_WINDOW_ACTION_UNMAXIMIZE_VERTICALLY))
+        button_width += 17;
+
+    if (decor->actions & WNCK_WINDOW_ACTION_MINIMIZE)
+        button_width += 17;
+
+    if (button_width)
+        ++button_width;
+
+    decor->button_width = button_width;
+}
+
 static gboolean
 button_present (decor_t *decor,
                 gint     i)
@@ -65,6 +88,87 @@
     return FALSE;
 }
 
+static gboolean
+gwd_theme_cairo_calc_decoration_size (GWDTheme *theme,
+                                      decor_t  *decor,
+                                      gint      w,
+                                      gint      h,
+                                      gint      name_width,
+                                      gint     *width,
+                                      gint     *height)
+{
+    decor_layout_t layout;
+    gint top_width;
+
+    if (!decor->decorated)
+        return FALSE;
+
+    /* To avoid wasting texture memory, we only calculate the minimal
+     * required decoration size then clip and stretch the texture where
+     * appropriate
+     */
+
+    if (!decor->frame_window) {
+        calc_button_size (decor);
+
+        if (w < ICON_SPACE + decor->button_width)
+            return FALSE;
+
+        top_width = name_width + decor->button_width + ICON_SPACE;
+        if (w < top_width)
+            top_width = MAX (ICON_SPACE + decor->button_width, w);
+
+        if (decor->active)
+            decor_get_default_layout (&decor->frame->window_context_active, top_width, 1, &layout);
+        else
+            decor_get_default_layout (&decor->frame->window_context_inactive, top_width, 1, &layout);
+
+        if (!decor->context || memcmp (&layout, &decor->border_layout, sizeof (layout))) {
+            *width  = layout.width;
+            *height = layout.height;
+
+            decor->border_layout = layout;
+            if (decor->active) {
+                decor->context = &decor->frame->window_context_active;
+                decor->shadow = decor->frame->border_shadow_active;
+            } else {
+                decor->context = &decor->frame->window_context_inactive;
+                decor->shadow = decor->frame->border_shadow_inactive;
+            }
+
+            return TRUE;
+        }
+    } else {
+        calc_button_size (decor);
+
+        /* _default_win_extents + top height */
+
+        top_width = name_width + decor->button_width + ICON_SPACE;
+        if (w < top_width)
+            top_width = MAX (ICON_SPACE + decor->button_width, w);
+
+        decor_get_default_layout (&decor->frame->window_context_no_shadow,
+                                  decor->client_width, decor->client_height,
+                                  &layout);
+
+        *width = layout.width;
+        *height = layout.height;
+
+        decor->border_layout = layout;
+        if (decor->active) {
+            decor->context = &decor->frame->window_context_active;
+            decor->shadow = decor->frame->border_shadow_active;
+        } else {
+            decor->context = &decor->frame->window_context_inactive;
+            decor->shadow = decor->frame->border_shadow_inactive;
+        }
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
 static void
 gwd_theme_cairo_update_border_extents (GWDTheme      *theme,
                                        decor_frame_t *frame)
@@ -169,6 +273,7 @@
 {
     GWDThemeClass *theme_class = GWD_THEME_CLASS (cairo_class);
 
+    theme_class->calc_decoration_size = gwd_theme_cairo_calc_decoration_size;
     theme_class->update_border_extents = gwd_theme_cairo_update_border_extents;
     theme_class->get_event_window_position = gwd_theme_cairo_get_event_window_position;
     theme_class->get_button_position = gwd_theme_cairo_get_button_position;

=== modified file 'gtk/window-decorator/gwd-theme-metacity.c'
--- gtk/window-decorator/gwd-theme-metacity.c	2016-05-20 11:20:59 +0000
+++ gtk/window-decorator/gwd-theme-metacity.c	2016-05-20 11:21:00 +0000
@@ -31,6 +31,54 @@
 
 G_DEFINE_TYPE (GWDThemeMetacity, gwd_theme_metacity, GWD_TYPE_THEME)
 
+static void
+calc_button_size (GWDTheme *theme,
+                  decor_t  *decor)
+{
+    MetaFrameType frame_type;
+    MetaFrameFlags flags;
+    MetaFrameGeometry fgeom;
+    MetaButtonLayout button_layout;
+    gint i, min_x, x, y, w, h, width;
+
+    if (!decor->context) {
+        decor->button_width = 0;
+        return;
+    }
+
+    frame_type = meta_frame_type_from_string (decor->frame->type);
+    if (!(frame_type < META_FRAME_TYPE_LAST))
+        frame_type = META_FRAME_TYPE_NORMAL;
+
+    gwd_theme_metacity_get_decoration_geometry (GWD_THEME_METACITY (theme),
+                                                decor, &flags, &fgeom,
+                                                &button_layout, frame_type);
+
+    width = decor->border_layout.top.x2 - decor->border_layout.top.x1 -
+            decor->context->left_space - decor->context->right_space +
+            fgeom.borders.total.left + fgeom.borders.total.right;
+
+    min_x = width;
+
+    for (i = 0; i < 3; ++i) {
+        static guint button_actions[3] = {
+            WNCK_WINDOW_ACTION_CLOSE,
+            WNCK_WINDOW_ACTION_MAXIMIZE,
+            WNCK_WINDOW_ACTION_MINIMIZE
+        };
+
+        if (decor->actions & button_actions[i]) {
+            if (gwd_theme_get_button_position (theme, decor, i, width, 256,
+                                               &x, &y, &w, &h)) {
+                if (x > width / 2 && x < min_x)
+                    min_x = x;
+            }
+        }
+    }
+
+    decor->button_width = width - min_x;
+}
+
 static gboolean
 button_present (MetaButtonLayout   *button_layout,
                 MetaButtonFunction  function)
@@ -200,6 +248,90 @@
     return object;
 }
 
+static gboolean
+gwd_theme_metacity_calc_decoration_size (GWDTheme *theme,
+                                         decor_t  *decor,
+                                         gint      w,
+                                         gint      h,
+                                         gint      name_width,
+                                         gint     *width,
+                                         gint     *height)
+{
+    decor_layout_t layout;
+    decor_context_t *context;
+    decor_shadow_t *shadow;
+
+    if (!decor->decorated)
+        return FALSE;
+
+    if ((decor->state & META_MAXIMIZED) == META_MAXIMIZED) {
+        if (!decor->frame_window) {
+            if (decor->active) {
+                context = &decor->frame->max_window_context_active;
+                shadow = decor->frame->max_border_shadow_active;
+            } else {
+                context = &decor->frame->max_window_context_inactive;
+                shadow = decor->frame->max_border_shadow_inactive;
+            }
+        } else {
+            context = &decor->frame->max_window_context_no_shadow;
+            shadow = decor->frame->max_border_no_shadow;
+        }
+    } else {
+        if (!decor->frame_window) {
+            if (decor->active) {
+                context = &decor->frame->window_context_active;
+                shadow = decor->frame->border_shadow_active;
+            } else {
+                context = &decor->frame->window_context_inactive;
+                shadow = decor->frame->border_shadow_inactive;
+            }
+        } else {
+            context = &decor->frame->window_context_no_shadow;
+            shadow = decor->frame->border_no_shadow;
+        }
+    }
+
+    if (!decor->frame_window) {
+        decor_get_best_layout (context, w, h, &layout);
+
+        if (context != decor->context ||
+            memcmp (&layout, &decor->border_layout, sizeof (layout))) {
+            *width = layout.width;
+            *height = layout.height;
+
+            decor->border_layout = layout;
+            decor->context = context;
+            decor->shadow = shadow;
+
+            calc_button_size (theme, decor);
+
+            return TRUE;
+        }
+    } else {
+        if ((decor->state & META_MAXIMIZED) == META_MAXIMIZED)
+            decor_get_default_layout (context, decor->client_width,
+                                      decor->client_height - decor->frame->titlebar_height,
+                                      &layout);
+        else
+            decor_get_default_layout (context, decor->client_width,
+                                      decor->client_height, &layout);
+
+        *width = layout.width;
+        *height = layout.height;
+
+        decor->border_layout = layout;
+        decor->shadow = shadow;
+        decor->context = context;
+
+        calc_button_size (theme, decor);
+
+        return TRUE;
+    }
+
+    return FALSE;
+}
+
 static void
 gwd_theme_metacity_update_border_extents (GWDTheme      *theme,
                                           decor_frame_t *frame)
@@ -506,6 +638,7 @@
 
     object_class->constructor = gwd_theme_metacity_constructor;
 
+    theme_class->calc_decoration_size = gwd_theme_metacity_calc_decoration_size;
     theme_class->update_border_extents = gwd_theme_metacity_update_border_extents;
     theme_class->get_event_window_position = gwd_theme_metacity_get_event_window_position;
     theme_class->get_button_position = gwd_theme_metacity_get_button_position;

=== modified file 'gtk/window-decorator/metacity.c'
--- gtk/window-decorator/metacity.c	2016-05-20 11:20:59 +0000
+++ gtk/window-decorator/metacity.c	2016-05-20 11:21:00 +0000
@@ -697,158 +697,6 @@
         XDestroyRegion (right_region);
 }
 
-static void
-meta_calc_button_size (decor_t *d)
-{
-    MetaFrameType frame_type;
-    MetaFrameFlags flags;
-    MetaFrameGeometry fgeom;
-    MetaButtonLayout button_layout;
-    gint i, min_x, x, y, w, h, width;
-
-    if (!d->context)
-    {
-        d->button_width = 0;
-        return;
-    }
-
-    frame_type = meta_frame_type_from_string (d->frame->type);
-    if (!(frame_type < META_FRAME_TYPE_LAST))
-        frame_type = META_FRAME_TYPE_NORMAL;
-
-    gwd_theme_metacity_get_decoration_geometry (GWD_THEME_METACITY (gwd_theme),
-                                                d, &flags, &fgeom,
-                                                &button_layout, frame_type);
-
-    width = d->border_layout.top.x2 - d->border_layout.top.x1 -
-            d->context->left_space - d->context->right_space +
-            fgeom.borders.total.left + fgeom.borders.total.right;
-
-    min_x = width;
-
-    for (i = 0; i < 3; ++i)
-    {
-        static guint button_actions[3] = {
-            WNCK_WINDOW_ACTION_CLOSE,
-            WNCK_WINDOW_ACTION_MAXIMIZE,
-            WNCK_WINDOW_ACTION_MINIMIZE
-        };
-
-        if (d->actions & button_actions[i])
-        {
-            if (gwd_theme_get_button_position (gwd_theme, d, i, width, 256,
-                                               &x, &y, &w, &h))
-            {
-                if (x > width / 2 && x < min_x)
-                    min_x = x;
-            }
-        }
-    }
-
-    d->button_width = width - min_x;
-}
-
-gboolean
-meta_calc_decoration_size (decor_t *d,
-                           gint     w,
-                           gint     h,
-                           gint     name_width,
-                           gint    *width,
-                           gint    *height)
-{
-    decor_layout_t layout;
-    decor_context_t *context;
-    decor_shadow_t *shadow;
-
-    if (!d->decorated)
-        return FALSE;
-
-    if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
-    {
-        if (!d->frame_window)
-        {
-            if (d->active)
-            {
-                context = &d->frame->max_window_context_active;
-                shadow = d->frame->max_border_shadow_active;
-            }
-            else
-            {
-                context = &d->frame->max_window_context_inactive;
-                shadow  = d->frame->max_border_shadow_inactive;
-            }
-        }
-        else
-        {
-            context = &d->frame->max_window_context_no_shadow;
-            shadow = d->frame->max_border_no_shadow;
-        }
-    }
-    else
-    {
-        if (!d->frame_window)
-        {
-            if (d->active)
-            {
-                context = &d->frame->window_context_active;
-                shadow = d->frame->border_shadow_active;
-            }
-            else
-            {
-                context = &d->frame->window_context_inactive;
-                shadow = d->frame->border_shadow_inactive;
-            }
-        }
-        else
-        {
-            context = &d->frame->window_context_no_shadow;
-            shadow  = d->frame->border_no_shadow;
-        }
-    }
-
-    if (!d->frame_window)
-    {
-        decor_get_best_layout (context, w, h, &layout);
-
-        if (context != d->context || memcmp (&layout, &d->border_layout, sizeof (layout)))
-        {
-            *width = layout.width;
-            *height = layout.height;
-
-            d->border_layout = layout;
-            d->context = context;
-            d->shadow = shadow;
-
-            meta_calc_button_size (d);
-
-            return TRUE;
-        }
-    }
-    else
-    {
-        if ((d->state & META_MAXIMIZED) == META_MAXIMIZED)
-            decor_get_default_layout (context, d->client_width,
-                                      d->client_height - d->frame->titlebar_height,
-                                      &layout);
-        else
-            decor_get_default_layout (context, d->client_width,
-                                      d->client_height, &layout);
-
-        *width = layout.width;
-        *height = layout.height;
-
-        d->border_layout = layout;
-        d->shadow = shadow;
-        d->context = context;
-
-        meta_calc_button_size (d);
-
-        return TRUE;
-    }
-
-    return FALSE;
-}
-
 static MetaButtonFunction
 meta_button_function_from_string (const char *str)
 {