[gtk+/wip/matthiasc/gskpango: 15/15] cleanups

[Matthias Clasen <matthiasc src gnome org>]

commit e49da1d89a0877a2dc5ce2e402143c7c1cbe3586
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Aug 30 22:07:20 2017 -0400

    cleanups

 gtk/gskpango.c |   85 +++++++++++++++++++++----------------------------------
 1 files changed, 33 insertions(+), 52 deletions(-)
---
diff --git a/gtk/gskpango.c b/gtk/gskpango.c
index e526682..1cff71e 100644
--- a/gtk/gskpango.c
+++ b/gtk/gskpango.c
@@ -27,24 +27,6 @@
 #include <pango/pango.h>
 #include <cairo/cairo.h>
 
-#define PANGO_UNKNOWN_GLYPH_WIDTH  10
-#define PANGO_UNKNOWN_GLYPH_HEIGHT 14
-
-typedef struct _PangoCairoFontHexBoxInfo             PangoCairoFontHexBoxInfo;
-
-struct _PangoCairoFontHexBoxInfo
-{
-  PangoCairoFont *font;
-  int rows;
-  double digit_width;
-  double digit_height;
-  double pad_x;
-  double pad_y;
-  double line_width;
-  double box_descent;
-  double box_height;
-};
-
 #define GSK_PANGO_RENDERER_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GSK_TYPE_PANGO_RENDERER, 
GskPangoRendererClass))
 #define GSK_IS_PANGO_RENDERER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GSK_TYPE_PANGO_RENDERER))
 #define GSK_PANGO_RENDERER_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), GSK_TYPE_PANGO_RENDERER, 
GskPangoRendererClass))
@@ -57,11 +39,10 @@ struct _GskPangoRenderer
   const GdkRGBA *fg_color;
   gboolean has_show_text_glyphs;
   double x_offset, y_offset;
+  graphene_rect_t bounds;
 
   /* house-keeping options */
   gboolean is_cached_renderer;
-
-  graphene_rect_t bounds;
 };
 
 struct _GskPangoRendererClass
@@ -133,10 +114,10 @@ _pango_cairo_font_install (PangoFont *font,
 
 static void
 gsk_pango_renderer_draw_unknown_glyph (GskPangoRenderer *crenderer,
-                                       PangoFont          *font,
-                                       PangoGlyphInfo     *gi,
-                                       double              cx,
-                                       double              cy)
+                                       PangoFont        *font,
+                                       PangoGlyphInfo   *gi,
+                                       double            cx,
+                                       double            cy)
 {
   cairo_t *cr;
   PangoGlyphString *glyphs;
@@ -240,13 +221,13 @@ gsk_pango_renderer_show_text_glyphs (PangoRenderer        *renderer,
     }
 
   if (G_UNLIKELY (clusters))
-      cairo_show_text_glyphs (cr,
-                              text, text_len,
-                              cairo_glyphs, count,
-                              clusters, num_clusters,
-                              backward ? CAIRO_TEXT_CLUSTER_FLAG_BACKWARD : 0);
+    cairo_show_text_glyphs (cr,
+                            text, text_len,
+                            cairo_glyphs, count,
+                            clusters, num_clusters,
+                            backward ? CAIRO_TEXT_CLUSTER_FLAG_BACKWARD : 0);
   else
-      cairo_show_glyphs (cr, cairo_glyphs, count);
+    cairo_show_glyphs (cr, cairo_glyphs, count);
 
   if (cairo_glyphs != stack_glyphs)
     g_free (cairo_glyphs);
@@ -256,11 +237,11 @@ done:
 }
 
 static void
-gsk_pango_renderer_draw_glyphs (PangoRenderer     *renderer,
-                                PangoFont         *font,
-                                PangoGlyphString  *glyphs,
-                                int                x,
-                                int                y)
+gsk_pango_renderer_draw_glyphs (PangoRenderer    *renderer,
+                                PangoFont        *font,
+                                PangoGlyphString *glyphs,
+                                int               x,
+                                int               y)
 {
   gsk_pango_renderer_show_text_glyphs (renderer, NULL, 0, glyphs, NULL, 0, FALSE, font, x, y);
 }
@@ -340,11 +321,11 @@ gsk_pango_renderer_draw_glyph_item (PangoRenderer  *renderer,
 
 static void
 gsk_pango_renderer_draw_rectangle (PangoRenderer     *renderer,
-                                     PangoRenderPart    part,
-                                     int                x,
-                                     int                y,
-                                     int                width,
-                                     int                height)
+                                   PangoRenderPart    part,
+                                   int                x,
+                                   int                y,
+                                   int                width,
+                                   int                height)
 {
   GskPangoRenderer *crenderer = (GskPangoRenderer *) (renderer);
   GdkRGBA rgba;
@@ -362,14 +343,14 @@ gsk_pango_renderer_draw_rectangle (PangoRenderer     *renderer,
 }
 
 static void
-gsk_pango_renderer_draw_trapezoid (PangoRenderer     *renderer,
-                                     PangoRenderPart    part,
-                                     double             y1_,
-                                     double             x11,
-                                     double             x21,
-                                     double             y2,
-                                     double             x12,
-                                     double             x22)
+gsk_pango_renderer_draw_trapezoid (PangoRenderer   *renderer,
+                                   PangoRenderPart  part,
+                                   double           y1_,
+                                   double           x11,
+                                   double           x21,
+                                   double           y2,
+                                   double           x12,
+                                   double           x22)
 {
   GskPangoRenderer *crenderer = (GskPangoRenderer *) (renderer);
   cairo_t *cr;
@@ -471,10 +452,10 @@ draw_error_underline (cairo_t *cr,
 
 static void
 gsk_pango_renderer_draw_error_underline (PangoRenderer *renderer,
-                                           int            x,
-                                           int            y,
-                                           int            width,
-                                           int            height)
+                                         int            x,
+                                         int            y,
+                                         int            width,
+                                         int            height)
 {
   GskPangoRenderer *crenderer = (GskPangoRenderer *) (renderer);
   cairo_t *cr;