[gtk] Fix up indentation after GdkSurface rename



commit 8d05fcd35c5cbcfc62f726419b6dc9c56a0846dd
Author: Alexander Larsson <alexl redhat com>
Date:   Wed Mar 21 09:06:31 2018 +0100

    Fix up indentation after GdkSurface rename
    
    This fixes up a lot of the indentation issues from the
    rename of windows to surfaces, at least the ones in the headers
    and many others.

 gdk/gdk-private.h                |   2 +-
 gdk/gdkdeviceprivate.h           |  26 +-
 gdk/gdkdisplayprivate.h          |  10 +-
 gdk/gdkinternals.h               |  52 +--
 gdk/gdksurface.c                 | 979 ++++++++++++++++++++-------------------
 gdk/gdksurface.h                 | 306 ++++++------
 gdk/gdksurfaceimpl.h             |  70 +--
 gdk/quartz/gdkprivate-quartz.h   |  38 +-
 gdk/wayland/gdkprivate-wayland.h |  50 +-
 gdk/wayland/gdkwaylandsurface.h  |  22 +-
 gdk/win32/gdkprivate-win32.h     | 162 +++----
 gdk/win32/gdksurface-win32.h     |   4 +-
 gdk/win32/gdkwin32misc.h         |   4 +-
 gdk/x11/gdkeventtranslator.h     |  22 +-
 gdk/x11/gdkprivate-x11.h         |  36 +-
 gdk/x11/gdkscreen-x11.h          |   2 +-
 gdk/x11/gdksurface-x11.h         |   4 +-
 gdk/x11/gdkx11display.h          |   2 +-
 gdk/x11/gdkx11surface.h          |  18 +-
 gtk/gtkwidget.h                  | 288 ++++++------
 20 files changed, 1049 insertions(+), 1048 deletions(-)
---
diff --git a/gdk/gdk-private.h b/gdk/gdk-private.h
index b037d66092..b4a16c5659 100644
--- a/gdk/gdk-private.h
+++ b/gdk/gdk-private.h
@@ -20,7 +20,7 @@ void            gdk_surface_thaw_toplevel_updates        (GdkSurface *surface);
 
 gboolean        gdk_surface_supports_edge_constraints    (GdkSurface *surface);
 
-void            gdk_surface_move_to_rect         (GdkSurface          *surface,
+void            gdk_surface_move_to_rect        (GdkSurface          *surface,
                                                  const GdkRectangle *rect,
                                                  GdkGravity          rect_anchor,
                                                  GdkGravity          surface_anchor,
diff --git a/gdk/gdkdeviceprivate.h b/gdk/gdkdeviceprivate.h
index 1614970834..33a890bd65 100644
--- a/gdk/gdkdeviceprivate.h
+++ b/gdk/gdkdeviceprivate.h
@@ -82,7 +82,7 @@ struct _GdkDeviceClass
                               gdouble         *axes,
                               GdkModifierType *mask);
 
-  void (* set_surface_cursor) (GdkDevice *device,
+  void (* set_surface_cursor)(GdkDevice *device,
                               GdkSurface *surface,
                               GdkCursor *cursor);
 
@@ -108,13 +108,13 @@ struct _GdkDeviceClass
                               guint32           time_);
 
   GdkSurface * (* surface_at_position) (GdkDevice       *device,
-                                      double          *win_x,
-                                      double          *win_y,
-                                      GdkModifierType *mask,
-                                      gboolean         get_toplevel);
-  void (* select_surface_events)      (GdkDevice       *device,
-                                      GdkSurface       *surface,
-                                      GdkEventMask     event_mask);
+                                        double          *win_x,
+                                        double          *win_y,
+                                        GdkModifierType *mask,
+                                        gboolean         get_toplevel);
+  void (* select_surface_events)       (GdkDevice       *device,
+                                        GdkSurface       *surface,
+                                        GdkEventMask     event_mask);
 };
 
 void  _gdk_device_set_associated_device (GdkDevice *device,
@@ -139,10 +139,10 @@ void _gdk_device_set_keys    (GdkDevice   *device,
                               guint        num_keys);
 
 gboolean   _gdk_device_translate_surface_coord (GdkDevice *device,
-                                               GdkSurface *surface,
-                                               guint      index,
-                                               gdouble    value,
-                                               gdouble   *axis_value);
+                                                GdkSurface *surface,
+                                                guint      index,
+                                                gdouble    value,
+                                                gdouble   *axis_value);
 
 gboolean   _gdk_device_translate_screen_coord (GdkDevice *device,
                                                GdkSurface *surface,
@@ -174,7 +174,7 @@ void _gdk_device_query_state                  (GdkDevice        *device,
                                                gdouble          *win_x,
                                                gdouble          *win_y,
                                                GdkModifierType  *mask);
-GdkSurface * _gdk_device_surface_at_position    (GdkDevice        *device,
+GdkSurface * _gdk_device_surface_at_position  (GdkDevice        *device,
                                                gdouble          *win_x,
                                                gdouble          *win_y,
                                                GdkModifierType  *mask,
diff --git a/gdk/gdkdisplayprivate.h b/gdk/gdkdisplayprivate.h
index db2ec347d7..579f266bf1 100644
--- a/gdk/gdkdisplayprivate.h
+++ b/gdk/gdkdisplayprivate.h
@@ -141,10 +141,10 @@ struct _GdkDisplayClass
   void                       (*event_data_free) (GdkDisplay     *display,
                                                  GdkEvent       *event);
   void                       (*create_surface_impl) (GdkDisplay    *display,
-                                                    GdkSurface     *surface,
-                                                    GdkSurface     *real_parent,
-                                                    GdkEventMask   event_mask,
-                                                    GdkSurfaceAttr *attributes);
+                                                     GdkSurface     *surface,
+                                                     GdkSurface     *real_parent,
+                                                     GdkEventMask   event_mask,
+                                                     GdkSurfaceAttr *attributes);
 
   GdkKeymap *                (*get_keymap)         (GdkDisplay    *display);
 
@@ -230,7 +230,7 @@ void                _gdk_display_event_data_copy      (GdkDisplay       *display
                                                        GdkEvent         *new_event);
 void                _gdk_display_event_data_free      (GdkDisplay       *display,
                                                        GdkEvent         *event);
-void                _gdk_display_create_surface_impl   (GdkDisplay       *display,
+void                _gdk_display_create_surface_impl  (GdkDisplay       *display,
                                                        GdkSurface        *surface,
                                                        GdkSurface        *real_parent,
                                                        GdkEventMask      event_mask,
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 435cd504e8..fe65fbbec3 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -269,7 +269,7 @@ void _gdk_windowing_event_data_copy (const GdkEvent *src,
 void _gdk_windowing_event_data_free (GdkEvent       *event);
 
 void gdk_surface_set_state (GdkSurface      *surface,
-                           GdkSurfaceState  new_state);
+                            GdkSurfaceState  new_state);
 
 gboolean        _gdk_cairo_surface_extents       (cairo_surface_t *surface,
                                                   GdkRectangle    *extents);
@@ -304,26 +304,26 @@ void            gdk_cairo_set_drawing_context    (cairo_t           *cr,
 cairo_surface_t *
            _gdk_surface_ref_cairo_surface (GdkSurface *surface);
 
-GdkSurface* gdk_surface_new                (GdkDisplay     *display,
-                                          GdkSurface      *parent,
-                                          GdkSurfaceAttr  *attributes);
+GdkSurface* gdk_surface_new               (GdkDisplay     *display,
+                                           GdkSurface      *parent,
+                                           GdkSurfaceAttr  *attributes);
 void       _gdk_surface_destroy           (GdkSurface      *surface,
-                                          gboolean        foreign_destroy);
+                                           gboolean        foreign_destroy);
 void       _gdk_surface_clear_update_area (GdkSurface      *surface);
 void       _gdk_surface_update_size       (GdkSurface      *surface);
 gboolean   _gdk_surface_update_viewable   (GdkSurface      *surface);
 GdkGLContext * gdk_surface_get_paint_gl_context (GdkSurface *surface,
-                                                GError   **error);
+                                                 GError   **error);
 void gdk_surface_get_unscaled_size (GdkSurface *surface,
-                                   int *unscaled_width,
-                                   int *unscaled_height);
+                                    int *unscaled_width,
+                                    int *unscaled_height);
 
 GdkDrawingContext *gdk_surface_get_drawing_context (GdkSurface *surface);
 
 cairo_region_t *gdk_surface_get_current_paint_region (GdkSurface *surface);
 
 void       _gdk_surface_process_updates_recurse (GdkSurface *surface,
-                                                cairo_region_t *expose_region);
+                                                 cairo_region_t *expose_region);
 
 /*****************************************
  * Interfaces provided by windowing code *
@@ -343,35 +343,35 @@ void _gdk_windowing_got_event                (GdkDisplay       *display,
 #define GDK_SURFACE_IS_MAPPED(surface) (((surface)->state & GDK_SURFACE_STATE_WITHDRAWN) == 0)
 
 GdkSurface * _gdk_surface_find_child_at (GdkSurface *surface,
-                                       double x, double y);
+                                         double x, double y);
 GdkSurface * _gdk_surface_find_descendant_at (GdkSurface *toplevel,
-                                            double x, double y,
-                                            double *found_x,
-                                            double *found_y);
+                                              double x, double y,
+                                              double *found_x,
+                                              double *found_y);
 
 GdkEvent * _gdk_make_event (GdkSurface    *surface,
                             GdkEventType  type,
                             GdkEvent     *event_in_queue,
                             gboolean      before_event);
 gboolean _gdk_surface_event_parent_of (GdkSurface *parent,
-                                      GdkSurface *child);
+                                       GdkSurface *child);
 
 void _gdk_synthesize_crossing_events (GdkDisplay                 *display,
                                       GdkSurface                  *src,
                                       GdkSurface                  *dest,
                                       GdkDevice                  *device,
                                       GdkDevice                  *source_device,
-                                     GdkCrossingMode             mode,
-                                     gdouble                     toplevel_x,
-                                     gdouble                     toplevel_y,
-                                     GdkModifierType             mask,
-                                     guint32                     time_,
-                                     GdkEvent                   *event_in_queue,
-                                     gulong                      serial,
-                                     gboolean                    non_linear);
+                                      GdkCrossingMode             mode,
+                                      gdouble                     toplevel_x,
+                                      gdouble                     toplevel_y,
+                                      GdkModifierType             mask,
+                                      guint32                     time_,
+                                      GdkEvent                   *event_in_queue,
+                                      gulong                      serial,
+                                      gboolean                    non_linear);
 void _gdk_display_set_surface_under_pointer (GdkDisplay *display,
-                                            GdkDevice  *device,
-                                            GdkSurface  *surface);
+                                             GdkDevice  *device,
+                                             GdkSurface  *surface);
 
 gboolean    _gdk_surface_has_impl (GdkSurface *surface);
 GdkSurface * _gdk_surface_get_impl_surface (GdkSurface *surface);
@@ -379,8 +379,8 @@ GdkSurface * _gdk_surface_get_impl_surface (GdkSurface *surface);
 void gdk_surface_destroy_notify       (GdkSurface *surface);
 
 void gdk_synthesize_surface_state (GdkSurface     *surface,
-                                  GdkSurfaceState unset_flags,
-                                  GdkSurfaceState set_flags);
+                                   GdkSurfaceState unset_flags,
+                                   GdkSurfaceState set_flags);
 
 
 G_END_DECLS
diff --git a/gdk/gdksurface.c b/gdk/gdksurface.c
index b490ebd4b7..3a32fb0a2a 100644
--- a/gdk/gdksurface.c
+++ b/gdk/gdksurface.c
@@ -114,27 +114,27 @@ enum {
 static void gdk_surface_finalize   (GObject              *object);
 
 static void gdk_surface_set_property (GObject      *object,
-                                     guint         prop_id,
-                                     const GValue *value,
-                                     GParamSpec   *pspec);
+                                      guint         prop_id,
+                                      const GValue *value,
+                                      GParamSpec   *pspec);
 static void gdk_surface_get_property (GObject      *object,
-                                     guint         prop_id,
-                                     GValue       *value,
-                                     GParamSpec   *pspec);
+                                      guint         prop_id,
+                                      GValue       *value,
+                                      GParamSpec   *pspec);
 
 static void gdk_surface_clear_backing_region (GdkSurface *surface);
 
 static void recompute_visible_regions   (GdkSurface *private,
-                                        gboolean recalculate_children);
+                                         gboolean recalculate_children);
 static void gdk_surface_invalidate_in_parent (GdkSurface *private);
 static void update_cursor               (GdkDisplay *display,
                                          GdkDevice  *device);
 static void impl_surface_add_update_area (GdkSurface *impl_surface,
-                                        cairo_region_t *region);
+                                          cairo_region_t *region);
 static cairo_surface_t *gdk_surface_ref_impl_surface (GdkSurface *surface);
 
 static void gdk_surface_set_frame_clock (GdkSurface      *surface,
-                                        GdkFrameClock  *clock);
+                                         GdkFrameClock  *clock);
 
 
 static guint signals[LAST_SIGNAL] = { 0 };
@@ -157,23 +157,23 @@ print_region (cairo_region_t *region)
       cairo_rectangle_int_t r;
 
       if (num == 1)
-       {
-         cairo_region_get_rectangle (region, 0, &r);
-         g_string_append_printf (s, "%dx%d @%d,%d", r.width, r.height, r.x, r.y);
-       }
+        {
+          cairo_region_get_rectangle (region, 0, &r);
+          g_string_append_printf (s, "%dx%d @%d,%d", r.width, r.height, r.x, r.y);
+        }
       else
-       {
-         int i;
-         cairo_region_get_extents (region, &r);
-         g_string_append_printf (s, "extent: %dx%d @%d,%d, details: ", r.width, r.height, r.x, r.y);
-         for (i = 0; i < num; i++)
-           {
+        {
+          int i;
+          cairo_region_get_extents (region, &r);
+          g_string_append_printf (s, "extent: %dx%d @%d,%d, details: ", r.width, r.height, r.x, r.y);
+          for (i = 0; i < num; i++)
+            {
               cairo_region_get_rectangle (region, i, &r);
-             g_string_append_printf (s, "[%dx%d @%d,%d]", r.width, r.height, r.x, r.y);
-             if (i != num -1)
-               g_string_append (s, ", ");
-           }
-       }
+              g_string_append_printf (s, "[%dx%d @%d,%d]", r.width, r.height, r.x, r.y);
+              if (i != num -1)
+                g_string_append (s, ", ");
+            }
+        }
     }
   g_string_append (s, "}");
   return g_string_free (s, FALSE);
@@ -344,15 +344,15 @@ gdk_surface_finalize (GObject *object)
   if (!GDK_SURFACE_DESTROYED (surface))
     {
       if (GDK_SURFACE_TYPE (surface) != GDK_SURFACE_FOREIGN)
-       {
-         g_warning ("losing last reference to undestroyed surface");
-         _gdk_surface_destroy (surface, FALSE);
-       }
+        {
+          g_warning ("losing last reference to undestroyed surface");
+          _gdk_surface_destroy (surface, FALSE);
+        }
       else
-       /* We use TRUE here, to keep us from actually calling
-        * XDestroyWindow() on the window
-        */
-       _gdk_surface_destroy (surface, TRUE);
+        /* We use TRUE here, to keep us from actually calling
+         * XDestroyWindow() on the window
+         */
+        _gdk_surface_destroy (surface, TRUE);
     }
 
   if (surface->impl)
@@ -392,9 +392,9 @@ gdk_surface_finalize (GObject *object)
 
 static void
 gdk_surface_set_property (GObject      *object,
-                         guint         prop_id,
-                         const GValue *value,
-                         GParamSpec   *pspec)
+                          guint         prop_id,
+                          const GValue *value,
+                          GParamSpec   *pspec)
 {
   GdkSurface *surface = GDK_SURFACE (object);
 
@@ -417,9 +417,9 @@ gdk_surface_set_property (GObject      *object,
 
 static void
 gdk_surface_get_property (GObject    *object,
-                         guint       prop_id,
-                         GValue     *value,
-                         GParamSpec *pspec)
+                          guint       prop_id,
+                          GValue     *value,
+                          GParamSpec *pspec)
 {
   GdkSurface *surface = GDK_SURFACE (object);
 
@@ -481,8 +481,8 @@ _gdk_surface_has_impl (GdkSurface *surface)
 
 static void
 remove_child_area (GdkSurface *surface,
-                  gboolean for_input,
-                  cairo_region_t *region)
+                   gboolean for_input,
+                   cairo_region_t *region)
 {
   GdkSurface *child;
   cairo_region_t *child_region;
@@ -494,12 +494,12 @@ remove_child_area (GdkSurface *surface,
       child = l->data;
 
       /* If region is empty already, no need to do
-        anything potentially costly */
+         anything potentially costly */
       if (cairo_region_is_empty (region))
-       break;
+        break;
 
       if (!GDK_SURFACE_IS_MAPPED (child) || child->input_only)
-       continue;
+        continue;
 
       r.x = child->x;
       r.y = child->y;
@@ -508,15 +508,15 @@ remove_child_area (GdkSurface *surface,
 
       /* Bail early if child totally outside region */
       if (cairo_region_contains_rectangle (region, &r) == CAIRO_REGION_OVERLAP_OUT)
-       continue;
+        continue;
 
       child_region = cairo_region_create_rectangle (&r);
 
       if (for_input)
-       {
-         if (child->input_shape)
-           cairo_region_intersect (child_region, child->input_shape);
-       }
+        {
+          if (child->input_shape)
+            cairo_region_intersect (child_region, child->input_shape);
+        }
 
       cairo_region_subtract (region, child_region);
       cairo_region_destroy (child_region);
@@ -525,8 +525,8 @@ remove_child_area (GdkSurface *surface,
 
 static void
 recompute_visible_regions_internal (GdkSurface *private,
-                                   gboolean   recalculate_clip,
-                                   gboolean   recalculate_children)
+                                    gboolean   recalculate_clip,
+                                    gboolean   recalculate_children)
 {
   GList *l;
   GdkSurface *child;
@@ -560,16 +560,16 @@ recompute_visible_regions_internal (GdkSurface *private,
   if ((abs_pos_changed || recalculate_children))
     {
       for (l = private->children; l; l = l->next)
-       {
-         child = l->data;
-         /* Only recalculate clip if the the clip region changed, otherwise
-          * there is no way the child clip region could change (its has not e.g. moved)
-          * Except if recalculate_children is set to force child updates
-          */
-         recompute_visible_regions_internal (child,
-                                             recalculate_clip && recalculate_children,
-                                             FALSE);
-       }
+        {
+          child = l->data;
+          /* Only recalculate clip if the the clip region changed, otherwise
+           * there is no way the child clip region could change (its has not e.g. moved)
+           * Except if recalculate_children is set to force child updates
+           */
+          recompute_visible_regions_internal (child,
+                                              recalculate_clip && recalculate_children,
+                                              FALSE);
+        }
     }
 }
 
@@ -590,11 +590,11 @@ recompute_visible_regions_internal (GdkSurface *private,
  */
 static void
 recompute_visible_regions (GdkSurface *private,
-                          gboolean recalculate_children)
+                           gboolean recalculate_children)
 {
   recompute_visible_regions_internal (private,
-                                     TRUE,
-                                     recalculate_children);
+                                      TRUE,
+                                      recalculate_children);
 }
 
 static void
@@ -614,7 +614,7 @@ gdk_surface_clear_old_updated_area (GdkSurface *surface)
 
 static void
 gdk_surface_append_old_updated_area (GdkSurface *surface,
-                                    cairo_region_t *region)
+                                     cairo_region_t *region)
 {
   if (surface->old_updated_area[1])
     cairo_region_destroy (surface->old_updated_area[1]);
@@ -649,10 +649,10 @@ get_native_device_event_mask (GdkSurface *private,
       mask = private->event_mask;
 
       /* We need thse for all native surfaces so we can
-        emulate events on children: */
+         emulate events on children: */
       mask |=
-       GDK_EXPOSURE_MASK |
-       GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
+        GDK_EXPOSURE_MASK |
+        GDK_ENTER_NOTIFY_MASK | GDK_LEAVE_NOTIFY_MASK |
         GDK_TOUCH_MASK |
         GDK_POINTER_MOTION_MASK |
         GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
@@ -670,8 +670,8 @@ get_native_event_mask (GdkSurface *private)
 
 GdkSurface*
 gdk_surface_new (GdkDisplay    *display,
-                GdkSurface     *parent,
-               GdkSurfaceAttr *attributes)
+                 GdkSurface     *parent,
+                 GdkSurfaceAttr *attributes)
 {
   GdkSurface *surface;
   gboolean native;
@@ -705,9 +705,9 @@ gdk_surface_new (GdkDisplay    *display,
        * before
        */
       if (parent == NULL)
-       surface->surface_type = GDK_SURFACE_TEMP;
+        surface->surface_type = GDK_SURFACE_TEMP;
       else
-       surface->surface_type = GDK_SURFACE_CHILD;
+        surface->surface_type = GDK_SURFACE_CHILD;
     }
   else
     surface->surface_type = attributes->surface_type;
@@ -718,7 +718,7 @@ gdk_surface_new (GdkDisplay    *display,
     case GDK_SURFACE_TOPLEVEL:
     case GDK_SURFACE_TEMP:
       if (parent != NULL)
-       g_warning (G_STRLOC "Toplevel surfaces must be created without a parent");
+        g_warning (G_STRLOC "Toplevel surfaces must be created without a parent");
       break;
     case GDK_SURFACE_SUBSURFACE:
 #ifdef GDK_WINDOWING_WAYLAND
@@ -805,8 +805,8 @@ gdk_surface_new (GdkDisplay    *display,
  **/
 GdkSurface *
 gdk_surface_new_toplevel (GdkDisplay *display,
-                         gint        width,
-                         gint        height)
+                          gint        width,
+                          gint        height)
 {
   GdkSurfaceAttr attr;
 
@@ -834,7 +834,7 @@ gdk_surface_new_toplevel (GdkDisplay *display,
  **/
 GdkSurface *
 gdk_surface_new_popup (GdkDisplay         *display,
-                      const GdkRectangle *position)
+                       const GdkRectangle *position)
 {
   GdkSurfaceAttr attr;
 
@@ -890,7 +890,7 @@ gdk_surface_new_temp (GdkDisplay *display)
  **/
 GdkSurface *
 gdk_surface_new_child (GdkSurface          *parent,
-                      const GdkRectangle *position)
+                       const GdkRectangle *position)
 {
   GdkSurfaceAttr attr;
 
@@ -923,7 +923,7 @@ update_pointer_info_foreach (GdkDisplay           *display,
 
 static void
 surface_remove_from_pointer_info (GdkSurface  *surface,
-                                 GdkDisplay *display)
+                                  GdkDisplay *display)
 {
   _gdk_display_pointer_info_foreach (display,
                                      update_pointer_info_foreach,
@@ -962,9 +962,9 @@ gdk_surface_free_current_paint (GdkSurface *surface)
  **/
 static void
 _gdk_surface_destroy_hierarchy (GdkSurface *surface,
-                              gboolean   recursing,
-                              gboolean   recursing_native,
-                              gboolean   foreign_destroy)
+                                gboolean   recursing,
+                                gboolean   recursing_native,
+                                gboolean   foreign_destroy)
 {
   GdkSurfaceImplClass *impl_class;
   GdkSurface *temp_surface;
@@ -990,22 +990,22 @@ _gdk_surface_destroy_hierarchy (GdkSurface *surface,
     case GDK_SURFACE_FOREIGN:
     case GDK_SURFACE_SUBSURFACE:
       if (surface->surface_type == GDK_SURFACE_FOREIGN && !foreign_destroy)
-       {
-       }
+        {
+        }
       else
-       {
-         if (surface->parent)
-           {
-             if (surface->parent->children)
+        {
+          if (surface->parent)
+            {
+              if (surface->parent->children)
                 surface->parent->children = g_list_remove_link (surface->parent->children, 
&surface->children_list_node);
 
-             if (!recursing &&
-                 GDK_SURFACE_IS_MAPPED (surface))
-               {
-                 recompute_visible_regions (surface, FALSE);
-                 gdk_surface_invalidate_in_parent (surface);
-               }
-           }
+              if (!recursing &&
+                  GDK_SURFACE_IS_MAPPED (surface))
+                {
+                  recompute_visible_regions (surface, FALSE);
+                  gdk_surface_invalidate_in_parent (surface);
+                }
+            }
 
           if (surface->gl_paint_context)
             {
@@ -1023,47 +1023,47 @@ _gdk_surface_destroy_hierarchy (GdkSurface *surface,
 
           gdk_surface_free_current_paint (surface);
 
-         if (surface->surface_type == GDK_SURFACE_FOREIGN)
-           g_assert (surface->children == NULL);
-         else
-           {
-             tmp = surface->children;
-             surface->children = NULL;
-             /* No need to free children list, its all made up of in-struct nodes */
-
-             while (tmp)
-               {
-                 temp_surface = tmp->data;
-                 tmp = tmp->next;
-
-                 if (temp_surface)
-                   _gdk_surface_destroy_hierarchy (temp_surface,
-                                                  TRUE,
-                                                  recursing_native || gdk_surface_has_impl (surface),
-                                                  foreign_destroy);
-               }
-           }
-
-         _gdk_surface_clear_update_area (surface);
-
-         impl_class = GDK_SURFACE_IMPL_GET_CLASS (surface->impl);
-
-         if (gdk_surface_has_impl (surface))
-           impl_class->destroy (surface, recursing_native, foreign_destroy);
-         else
-           {
-             /* hide to make sure we repaint and break grabs */
-             gdk_surface_hide (surface);
-           }
-
-         surface->state |= GDK_SURFACE_STATE_WITHDRAWN;
-         surface->parent = NULL;
-         surface->destroyed = TRUE;
-
-         surface_remove_from_pointer_info (surface, display);
+          if (surface->surface_type == GDK_SURFACE_FOREIGN)
+            g_assert (surface->children == NULL);
+          else
+            {
+              tmp = surface->children;
+              surface->children = NULL;
+              /* No need to free children list, its all made up of in-struct nodes */
+
+              while (tmp)
+                {
+                  temp_surface = tmp->data;
+                  tmp = tmp->next;
+
+                  if (temp_surface)
+                    _gdk_surface_destroy_hierarchy (temp_surface,
+                                                   TRUE,
+                                                   recursing_native || gdk_surface_has_impl (surface),
+                                                   foreign_destroy);
+                }
+            }
+
+          _gdk_surface_clear_update_area (surface);
+
+          impl_class = GDK_SURFACE_IMPL_GET_CLASS (surface->impl);
+
+          if (gdk_surface_has_impl (surface))
+            impl_class->destroy (surface, recursing_native, foreign_destroy);
+          else
+            {
+              /* hide to make sure we repaint and break grabs */
+              gdk_surface_hide (surface);
+            }
+
+          surface->state |= GDK_SURFACE_STATE_WITHDRAWN;
+          surface->parent = NULL;
+          surface->destroyed = TRUE;
+
+          surface_remove_from_pointer_info (surface, display);
 
           g_object_notify_by_pspec (G_OBJECT (surface), properties[PROP_STATE]);
-       }
+        }
       break;
     }
 }
@@ -1081,7 +1081,7 @@ _gdk_surface_destroy_hierarchy (GdkSurface *surface,
  **/
 void
 _gdk_surface_destroy (GdkSurface *surface,
-                    gboolean   foreign_destroy)
+                      gboolean   foreign_destroy)
 {
   _gdk_surface_destroy_hierarchy (surface, FALSE, FALSE, foreign_destroy);
 }
@@ -1121,7 +1121,7 @@ gdk_surface_destroy (GdkSurface *surface)
  **/
 void
 gdk_surface_set_user_data (GdkSurface *surface,
-                         gpointer   user_data)
+                           gpointer   user_data)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -1139,7 +1139,7 @@ gdk_surface_set_user_data (GdkSurface *surface,
  **/
 void
 gdk_surface_get_user_data (GdkSurface *surface,
-                         gpointer  *data)
+                           gpointer  *data)
 {
   *data = surface->user_data;
 }
@@ -1222,8 +1222,8 @@ gdk_surface_has_native (GdkSurface *surface)
  **/
 void
 gdk_surface_get_position (GdkSurface *surface,
-                        gint      *x,
-                        gint      *y)
+                          gint      *x,
+                          gint      *y)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -1278,7 +1278,7 @@ gdk_surface_get_toplevel (GdkSurface *surface)
          surface->surface_type == GDK_SURFACE_SUBSURFACE)
     {
       if (gdk_surface_is_toplevel (surface))
-       break;
+        break;
       surface = surface->parent;
     }
 
@@ -1352,7 +1352,7 @@ gdk_surface_peek_children (GdkSurface *surface)
  **/
 GList *
 gdk_surface_get_children_with_user_data (GdkSurface *surface,
-                                        gpointer   user_data)
+                                         gpointer   user_data)
 {
   GdkSurface *child;
   GList *res, *l;
@@ -1368,7 +1368,7 @@ gdk_surface_get_children_with_user_data (GdkSurface *surface,
       child = l->data;
 
       if (child->user_data == user_data)
-       res = g_list_prepend (res, child);
+        res = g_list_prepend (res, child);
     }
 
   return res;
@@ -1454,7 +1454,7 @@ gdk_surface_ref_impl_surface (GdkSurface *surface)
 
 GdkGLContext *
 gdk_surface_get_paint_gl_context (GdkSurface  *surface,
-                                 GError    **error)
+                                  GError    **error)
 {
   GError *internal_error = NULL;
 
@@ -1521,7 +1521,7 @@ gdk_surface_get_paint_gl_context (GdkSurface  *surface,
  **/
 GdkGLContext *
 gdk_surface_create_gl_context (GdkSurface    *surface,
-                              GError      **error)
+                               GError      **error)
 {
   GdkGLContext *paint_context;
 
@@ -1533,7 +1533,7 @@ gdk_surface_create_gl_context (GdkSurface    *surface,
     return NULL;
 
   return GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->create_gl_context (surface->impl_surface,
-                                                                     FALSE,
+                                                                      FALSE,
                                                                       paint_context,
                                                                       error);
 }
@@ -1552,7 +1552,7 @@ gdk_surface_create_gl_context (GdkSurface    *surface,
  **/
 GdkVulkanContext *
 gdk_surface_create_vulkan_context (GdkSurface  *surface,
-                                  GError    **error)
+                                   GError    **error)
 {
   GdkDisplay *display;
 
@@ -1584,7 +1584,7 @@ gdk_surface_create_vulkan_context (GdkSurface  *surface,
 
 static void
 gdk_surface_begin_paint_internal (GdkSurface            *surface,
-                                const cairo_region_t *region)
+                                  const cairo_region_t *region)
 {
   GdkRectangle clip_box;
   GdkSurfaceImplClass *impl_class;
@@ -1713,8 +1713,8 @@ gdk_surface_end_paint_internal (GdkSurface *surface)
  */
 GdkDrawingContext *
 gdk_surface_begin_draw_frame (GdkSurface            *surface,
-                             GdkDrawContext       *draw_context,
-                             const cairo_region_t *region)
+                              GdkDrawContext       *draw_context,
+                              const cairo_region_t *region)
 {
   GdkDrawingContext *context;
   cairo_region_t *real_region;
@@ -1776,7 +1776,7 @@ gdk_surface_begin_draw_frame (GdkSurface            *surface,
  */
 void
 gdk_surface_end_draw_frame (GdkSurface         *surface,
-                           GdkDrawingContext *context)
+                            GdkDrawingContext *context)
 {
   GdkDrawContext *paint_context;
 
@@ -1926,14 +1926,14 @@ static GSList *update_surfaces = NULL;
 
 static inline gboolean
 gdk_surface_is_ancestor (GdkSurface *surface,
-                       GdkSurface *ancestor)
+                         GdkSurface *ancestor)
 {
   while (surface)
     {
       GdkSurface *parent = surface->parent;
 
       if (parent == ancestor)
-       return TRUE;
+        return TRUE;
 
       surface = parent;
     }
@@ -1966,13 +1966,13 @@ gdk_surface_add_update_surface (GdkSurface *surface)
        *  children of "surface" or from a differen hierarchy
        */
       if (!has_ancestor_in_list && gdk_surface_is_ancestor (surface, tmp->data))
-       has_ancestor_in_list = TRUE;
+        has_ancestor_in_list = TRUE;
 
       /* insert in reverse stacking order when adding around siblings,
        * so processing updates properly paints over lower stacked surfaces
        */
       if (parent == GDK_SURFACE (tmp->data)->parent)
-       {
+        {
           if (parent != NULL)
             {
               gint index = g_list_index (parent->children, surface);
@@ -1984,37 +1984,37 @@ gdk_surface_add_update_surface (GdkSurface *surface)
                   prev = tmp;
                 }
             }
-         /* here, tmp got advanced past all lower stacked siblings */
-         tmp = g_slist_prepend (tmp, g_object_ref (surface));
-         if (prev)
-           prev->next = tmp;
-         else
-           update_surfaces = tmp;
-         return;
-       }
+          /* here, tmp got advanced past all lower stacked siblings */
+          tmp = g_slist_prepend (tmp, g_object_ref (surface));
+          if (prev)
+            prev->next = tmp;
+          else
+            update_surfaces = tmp;
+          return;
+        }
 
       /*  if "surface" has an ancestor in the list and tmp is one of
        *  "surface's" children, insert "surface" before tmp
        */
       if (has_ancestor_in_list && gdk_surface_is_ancestor (tmp->data, surface))
-       {
-         tmp = g_slist_prepend (tmp, g_object_ref (surface));
+        {
+          tmp = g_slist_prepend (tmp, g_object_ref (surface));
 
-         if (prev)
-           prev->next = tmp;
-         else
-           update_surfaces = tmp;
-         return;
-       }
+          if (prev)
+            prev->next = tmp;
+          else
+            update_surfaces = tmp;
+          return;
+        }
 
       /*  if we're at the end of the list and had an ancestor it it,
        *  append to the list
        */
       if (! tmp->next && has_ancestor_in_list)
-       {
-         tmp = g_slist_append (tmp, g_object_ref (surface));
-         return;
-       }
+        {
+          tmp = g_slist_append (tmp, g_object_ref (surface));
+          return;
+        }
 
       prev = tmp;
     }
@@ -2070,7 +2070,7 @@ gdk_surface_schedule_update (GdkSurface *surface)
 
 void
 _gdk_surface_process_updates_recurse (GdkSurface *surface,
-                                     cairo_region_t *expose_region)
+                                      cairo_region_t *expose_region)
 {
   GdkEvent *event;
 
@@ -2113,12 +2113,12 @@ gdk_surface_process_updates_internal (GdkSurface *surface)
       surface->update_area = NULL;
 
       if (gdk_surface_is_viewable (surface))
-       {
-         cairo_region_t *expose_region;
+        {
+          cairo_region_t *expose_region;
 
-         expose_region = cairo_region_copy (surface->active_update_area);
+          expose_region = cairo_region_copy (surface->active_update_area);
 
-         impl_class = GDK_SURFACE_IMPL_GET_CLASS (surface->impl);
+          impl_class = GDK_SURFACE_IMPL_GET_CLASS (surface->impl);
 
           impl_class->process_updates_recurse (surface, expose_region);
 
@@ -2138,7 +2138,7 @@ gdk_surface_process_updates_internal (GdkSurface *surface)
 
 static void
 gdk_surface_paint_on_clock (GdkFrameClock *clock,
-                          void          *data)
+                            void          *data)
 {
   GdkSurface *surface;
 
@@ -2180,7 +2180,7 @@ gdk_surface_paint_on_clock (GdkFrameClock *clock,
  **/
 void
 gdk_surface_invalidate_rect (GdkSurface        *surface,
-                           const GdkRectangle *rect)
+                             const GdkRectangle *rect)
 {
   GdkRectangle surface_rect;
   cairo_region_t *region;
@@ -2209,7 +2209,7 @@ gdk_surface_invalidate_rect (GdkSurface        *surface,
 
 static void
 impl_surface_add_update_area (GdkSurface *impl_surface,
-                            cairo_region_t *region)
+                              cairo_region_t *region)
 {
   if (impl_surface->update_area)
     cairo_region_union (impl_surface->update_area, region);
@@ -2241,7 +2241,7 @@ impl_surface_add_update_area (GdkSurface *impl_surface,
  **/
 void
 gdk_surface_invalidate_region (GdkSurface          *surface,
-                             const cairo_region_t *region)
+                               const cairo_region_t *region)
 {
   cairo_region_t *visible_region;
   cairo_rectangle_int_t r;
@@ -2261,24 +2261,24 @@ gdk_surface_invalidate_region (GdkSurface          *surface,
 
   visible_region = cairo_region_copy (region);
 
-  while (surface != NULL && 
-        !cairo_region_is_empty (visible_region))
+  while (surface != NULL &&
+         !cairo_region_is_empty (visible_region))
     {
       r.width = surface->width;
       r.height = surface->height;
       cairo_region_intersect_rectangle (visible_region, &r);
 
       if (gdk_surface_has_impl (surface))
-       {
-         impl_surface_add_update_area (surface, visible_region);
-         break;
-       }
+        {
+          impl_surface_add_update_area (surface, visible_region);
+          break;
+        }
       else
-       {
-         cairo_region_translate (visible_region,
-                                 surface->x, surface->y);
-         surface = surface->parent;
-       }
+        {
+          cairo_region_translate (visible_region,
+                                  surface->x, surface->y);
+          surface = surface->parent;
+        }
     }
 
   cairo_region_destroy (visible_region);
@@ -2384,11 +2384,11 @@ gdk_surface_thaw_toplevel_updates (GdkSurface *surface)
  */
 void
 gdk_surface_constrain_size (GdkGeometry    *geometry,
-                          GdkSurfaceHints  flags,
-                          gint            width,
-                          gint            height,
-                          gint           *new_width,
-                          gint           *new_height)
+                            GdkSurfaceHints  flags,
+                            gint            width,
+                            gint            height,
+                            gint           *new_width,
+                            gint           *new_height)
 {
   /* This routine is partially borrowed from fvwm.
    *
@@ -2407,7 +2407,7 @@ gdk_surface_constrain_size (GdkGeometry    *geometry,
   gint max_width = G_MAXINT;
   gint max_height = G_MAXINT;
 
-#define FLOOR(value, base)     ( ((gint) ((value) / (base))) * (base) )
+#define FLOOR(value, base)      ( ((gint) ((value) / (base))) * (base) )
 
   if ((flags & GDK_HINT_BASE_SIZE) && (flags & GDK_HINT_MIN_SIZE))
     {
@@ -2467,30 +2467,30 @@ gdk_surface_constrain_size (GdkGeometry    *geometry,
       gint delta;
 
       if (geometry->min_aspect * height > width)
-       {
-         delta = FLOOR (height - width / geometry->min_aspect, yinc);
-         if (height - delta >= min_height)
-           height -= delta;
-         else
-           {
-             delta = FLOOR (height * geometry->min_aspect - width, xinc);
-             if (width + delta <= max_width)
-               width += delta;
-           }
-       }
+        {
+          delta = FLOOR (height - width / geometry->min_aspect, yinc);
+          if (height - delta >= min_height)
+            height -= delta;
+          else
+            {
+              delta = FLOOR (height * geometry->min_aspect - width, xinc);
+              if (width + delta <= max_width)
+                width += delta;
+            }
+        }
 
       if (geometry->max_aspect * height < width)
-       {
-         delta = FLOOR (width - height * geometry->max_aspect, xinc);
-         if (width - delta >= min_width)
-           width -= delta;
-         else
-           {
-             delta = FLOOR (width / geometry->max_aspect - height, yinc);
-             if (height + delta <= max_height)
-               height += delta;
-           }
-       }
+        {
+          delta = FLOOR (width - height * geometry->max_aspect, xinc);
+          if (width - delta >= min_width)
+            width -= delta;
+          else
+            {
+              delta = FLOOR (width / geometry->max_aspect - height, yinc);
+              if (height + delta <= max_height)
+                height += delta;
+            }
+        }
     }
 
 #undef FLOOR
@@ -2517,10 +2517,10 @@ gdk_surface_constrain_size (GdkGeometry    *geometry,
  **/
 GdkSurface *
 gdk_surface_get_device_position_double (GdkSurface       *surface,
-                                       GdkDevice       *device,
-                                       double          *x,
-                                       double          *y,
-                                       GdkModifierType *mask)
+                                        GdkDevice       *device,
+                                        double          *x,
+                                        double          *y,
+                                        GdkModifierType *mask)
 {
   gdouble tmp_x, tmp_y;
   GdkModifierType tmp_mask;
@@ -2572,10 +2572,10 @@ gdk_surface_get_device_position_double (GdkSurface       *surface,
  **/
 GdkSurface *
 gdk_surface_get_device_position (GdkSurface       *surface,
-                                GdkDevice       *device,
-                                gint            *x,
-                                gint            *y,
-                                GdkModifierType *mask)
+                                 GdkDevice       *device,
+                                 gint            *x,
+                                 gint            *y,
+                                 GdkModifierType *mask)
 {
   gdouble tmp_x, tmp_y;
 
@@ -2615,7 +2615,7 @@ gdk_surface_raise_internal (GdkSurface *surface)
 /* Returns TRUE If the native surface was mapped or unmapped */
 static gboolean
 set_viewable (GdkSurface *w,
-             gboolean val)
+              gboolean val)
 {
   GdkSurface *child;
   GList *l;
@@ -2633,7 +2633,7 @@ set_viewable (GdkSurface *w,
       child = l->data;
 
       if (GDK_SURFACE_IS_MAPPED (child))
-       set_viewable (child, val);
+        set_viewable (child, val);
     }
 
   return FALSE;
@@ -2648,7 +2648,7 @@ _gdk_surface_update_viewable (GdkSurface *surface)
   if (surface->surface_type == GDK_SURFACE_FOREIGN)
     viewable = TRUE;
   else if (gdk_surface_is_toplevel (surface) ||
-          surface->parent->viewable)
+           surface->parent->viewable)
     viewable = GDK_SURFACE_IS_MAPPED (surface);
   else
     viewable = FALSE;
@@ -2706,10 +2706,10 @@ gdk_surface_show_internal (GdkSurface *surface, gboolean raise)
   if (!was_mapped && !gdk_surface_has_impl (surface))
     {
       if (surface->event_mask & GDK_STRUCTURE_MASK)
-       _gdk_make_event (surface, GDK_MAP, NULL, FALSE);
+        _gdk_make_event (surface, GDK_MAP, NULL, FALSE);
 
       if (surface->parent && surface->parent->event_mask & GDK_SUBSTRUCTURE_MASK)
-       _gdk_make_event (surface, GDK_MAP, NULL, FALSE);
+        _gdk_make_event (surface, GDK_MAP, NULL, FALSE);
     }
 
   if (!was_mapped || did_raise)
@@ -2861,8 +2861,8 @@ gdk_surface_lower (GdkSurface *surface)
  */
 void
 gdk_surface_restack (GdkSurface     *surface,
-                   GdkSurface     *sibling,
-                   gboolean       above)
+                     GdkSurface     *sibling,
+                     gboolean       above)
 {
   GdkSurfaceImplClass *impl_class;
   GdkSurface *parent;
@@ -2877,9 +2877,9 @@ gdk_surface_restack (GdkSurface     *surface,
   if (sibling == NULL)
     {
       if (above)
-       gdk_surface_raise (surface);
+        gdk_surface_raise (surface);
       else
-       gdk_surface_lower (surface);
+        gdk_surface_lower (surface);
       return;
     }
 
@@ -2897,15 +2897,15 @@ gdk_surface_restack (GdkSurface     *surface,
       sibling_link = g_list_find (parent->children, sibling);
       g_return_if_fail (sibling_link != NULL);
       if (sibling_link == NULL)
-       return;
+        return;
 
       parent->children = g_list_remove_link (parent->children, &surface->children_list_node);
       if (above)
-       parent->children = list_insert_link_before (parent->children,
+        parent->children = list_insert_link_before (parent->children,
                                                     sibling_link,
                                                     &surface->children_list_node);
       else
-       parent->children = list_insert_link_before (parent->children,
+        parent->children = list_insert_link_before (parent->children,
                                                     sibling_link->next,
                                                     &surface->children_list_node);
     }
@@ -2960,9 +2960,9 @@ gdk_surface_hide (GdkSurface *surface)
     {
 
       if (GDK_SURFACE_IS_MAPPED (surface))
-       gdk_synthesize_surface_state (surface,
-                                    0,
-                                    GDK_SURFACE_STATE_WITHDRAWN);
+        gdk_synthesize_surface_state (surface,
+                                     0,
+                                     GDK_SURFACE_STATE_WITHDRAWN);
     }
   else if (was_mapped)
     {
@@ -3018,10 +3018,10 @@ G_GNUC_END_IGNORE_DEPRECATIONS
   if (was_mapped && !gdk_surface_has_impl (surface))
     {
       if (surface->event_mask & GDK_STRUCTURE_MASK)
-       _gdk_make_event (surface, GDK_UNMAP, NULL, FALSE);
+        _gdk_make_event (surface, GDK_UNMAP, NULL, FALSE);
 
       if (surface->parent && surface->parent->event_mask & GDK_SUBSTRUCTURE_MASK)
-       _gdk_make_event (surface, GDK_UNMAP, NULL, FALSE);
+        _gdk_make_event (surface, GDK_UNMAP, NULL, FALSE);
     }
 
   /* Invalidate the rect */
@@ -3057,13 +3057,13 @@ gdk_surface_withdraw (GdkSurface *surface)
       impl_class->withdraw (surface);
 
       if (was_mapped)
-       {
-         if (surface->event_mask & GDK_STRUCTURE_MASK)
-           _gdk_make_event (surface, GDK_UNMAP, NULL, FALSE);
+        {
+          if (surface->event_mask & GDK_STRUCTURE_MASK)
+            _gdk_make_event (surface, GDK_UNMAP, NULL, FALSE);
 
-         if (surface->parent && surface->parent->event_mask & GDK_SUBSTRUCTURE_MASK)
-           _gdk_make_event (surface, GDK_UNMAP, NULL, FALSE);
-       }
+          if (surface->parent && surface->parent->event_mask & GDK_SUBSTRUCTURE_MASK)
+            _gdk_make_event (surface, GDK_UNMAP, NULL, FALSE);
+        }
 
       current_context = gdk_gl_context_get_current ();
       if (current_context != NULL && gdk_gl_context_get_surface (current_context) == surface)
@@ -3089,7 +3089,7 @@ gdk_surface_withdraw (GdkSurface *surface)
  **/
 void
 gdk_surface_set_events (GdkSurface       *surface,
-                      GdkEventMask     event_mask)
+                        GdkEventMask     event_mask)
 {
   GdkSurfaceImplClass *impl_class;
 
@@ -3104,7 +3104,7 @@ gdk_surface_set_events (GdkSurface       *surface,
     {
       impl_class = GDK_SURFACE_IMPL_GET_CLASS (surface->impl);
       impl_class->set_events (surface,
-                             get_native_event_mask (surface));
+                              get_native_event_mask (surface));
     }
 
 }
@@ -3145,8 +3145,8 @@ gdk_surface_get_events (GdkSurface *surface)
  **/
 void
 gdk_surface_set_device_events (GdkSurface    *surface,
-                              GdkDevice    *device,
-                              GdkEventMask  event_mask)
+                               GdkDevice    *device,
+                               GdkEventMask  event_mask)
 {
   GdkEventMask device_mask;
   GdkSurface *native;
@@ -3188,7 +3188,7 @@ gdk_surface_set_device_events (GdkSurface    *surface,
  **/
 GdkEventMask
 gdk_surface_get_device_events (GdkSurface *surface,
-                              GdkDevice *device)
+                               GdkDevice *device)
 {
   GdkEventMask mask;
 
@@ -3210,11 +3210,11 @@ gdk_surface_get_device_events (GdkSurface *surface,
 
 static void
 gdk_surface_move_resize_toplevel (GdkSurface *surface,
-                                 gboolean   with_move,
-                                 gint       x,
-                                 gint       y,
-                                 gint       width,
-                                 gint       height)
+                                  gboolean   with_move,
+                                  gint       x,
+                                  gint       y,
+                                  gint       width,
+                                  gint       height)
 {
   GdkSurfaceImplClass *impl_class;
   gboolean is_resize;
@@ -3232,11 +3232,11 @@ gdk_surface_move_resize_toplevel (GdkSurface *surface,
 
 static void
 gdk_surface_move_resize_internal (GdkSurface *surface,
-                                gboolean   with_move,
-                                gint       x,
-                                gint       y,
-                                gint       width,
-                                gint       height)
+                                  gboolean   with_move,
+                                  gint       x,
+                                  gint       y,
+                                  gint       width,
+                                  gint       height)
 {
   cairo_region_t *old_region, *new_region;
   gboolean expose;
@@ -3262,7 +3262,7 @@ gdk_surface_move_resize_internal (GdkSurface *surface,
       surface->height == height &&
       (!with_move ||
        (surface->x == x &&
-       surface->y == y)))
+        surface->y == y)))
     return;
 
   /* Handle child surfaces */
@@ -3338,8 +3338,8 @@ gdk_surface_move_resize_internal (GdkSurface *surface,
  **/
 void
 gdk_surface_move (GdkSurface *surface,
-                gint       x,
-                gint       y)
+                  gint       x,
+                  gint       y)
 {
   gdk_surface_move_resize_internal (surface, TRUE, x, y, -1, -1);
 }
@@ -3361,8 +3361,8 @@ gdk_surface_move (GdkSurface *surface,
  **/
 void
 gdk_surface_resize (GdkSurface *surface,
-                  gint       width,
-                  gint       height)
+                    gint       width,
+                    gint       height)
 {
   gdk_surface_move_resize_internal (surface, FALSE, 0, 0, width, height);
 }
@@ -3383,10 +3383,10 @@ gdk_surface_resize (GdkSurface *surface,
  **/
 void
 gdk_surface_move_resize (GdkSurface *surface,
-                       gint       x,
-                       gint       y,
-                       gint       width,
-                       gint       height)
+                         gint       x,
+                         gint       y,
+                         gint       width,
+                         gint       height)
 {
   gdk_surface_move_resize_internal (surface, TRUE, x, y, width, height);
 }
@@ -3422,12 +3422,12 @@ gdk_surface_move_resize (GdkSurface *surface,
  */
 void
 gdk_surface_move_to_rect (GdkSurface          *surface,
-                         const GdkRectangle *rect,
-                         GdkGravity          rect_anchor,
-                         GdkGravity          surface_anchor,
-                         GdkAnchorHints      anchor_hints,
-                         gint                rect_anchor_dx,
-                         gint                rect_anchor_dy)
+                          const GdkRectangle *rect,
+                          GdkGravity          rect_anchor,
+                          GdkGravity          surface_anchor,
+                          GdkAnchorHints      anchor_hints,
+                          gint                rect_anchor_dx,
+                          gint                rect_anchor_dy)
 {
   GdkSurfaceImplClass *impl_class;
 
@@ -3447,8 +3447,8 @@ gdk_surface_move_to_rect (GdkSurface          *surface,
 
 static void
 gdk_surface_set_cursor_internal (GdkSurface *surface,
-                                GdkDevice *device,
-                                GdkCursor *cursor)
+                                 GdkDevice *device,
+                                 GdkCursor *cursor)
 {
   if (GDK_SURFACE_DESTROYED (surface))
     return;
@@ -3509,7 +3509,7 @@ gdk_surface_get_cursor (GdkSurface *surface)
  */
 void
 gdk_surface_set_cursor (GdkSurface *surface,
-                      GdkCursor *cursor)
+                        GdkCursor *cursor)
 {
   GdkDisplay *display;
 
@@ -3529,7 +3529,7 @@ gdk_surface_set_cursor (GdkSurface *surface,
       GList *seats, *s;
 
       if (cursor)
-       surface->cursor = g_object_ref (cursor);
+        surface->cursor = g_object_ref (cursor);
 
       seats = gdk_display_list_seats (display);
 
@@ -3571,7 +3571,7 @@ gdk_surface_set_cursor (GdkSurface *surface,
  **/
 GdkCursor *
 gdk_surface_get_device_cursor (GdkSurface *surface,
-                              GdkDevice *device)
+                               GdkDevice *device)
 {
   g_return_val_if_fail (GDK_IS_SURFACE (surface), NULL);
   g_return_val_if_fail (GDK_IS_DEVICE (device), NULL);
@@ -3596,8 +3596,8 @@ gdk_surface_get_device_cursor (GdkSurface *surface,
  **/
 void
 gdk_surface_set_device_cursor (GdkSurface *surface,
-                              GdkDevice *device,
-                              GdkCursor *cursor)
+                               GdkDevice *device,
+                               GdkCursor *cursor)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
   g_return_if_fail (GDK_IS_DEVICE (device));
@@ -3643,10 +3643,10 @@ gdk_surface_set_device_cursor (GdkSurface *surface,
  */
 void
 gdk_surface_get_geometry (GdkSurface *surface,
-                        gint      *x,
-                        gint      *y,
-                        gint      *width,
-                        gint      *height)
+                          gint      *x,
+                          gint      *y,
+                          gint      *width,
+                          gint      *height)
 {
   GdkSurface *parent;
   GdkSurfaceImplClass *impl_class;
@@ -3656,32 +3656,32 @@ gdk_surface_get_geometry (GdkSurface *surface,
   if (!GDK_SURFACE_DESTROYED (surface))
     {
       if (gdk_surface_has_impl (surface))
-       {
-         impl_class = GDK_SURFACE_IMPL_GET_CLASS (surface->impl);
-         impl_class->get_geometry (surface, x, y,
-                                   width, height);
-         /* This reports the position wrt to the native parent, we need to convert
-            it to be relative to the client side parent */
-         parent = surface->parent;
-         if (parent && !gdk_surface_has_impl (parent))
-           {
-             if (x)
-               *x -= parent->abs_x;
-             if (y)
-               *y -= parent->abs_y;
-           }
-       }
+        {
+          impl_class = GDK_SURFACE_IMPL_GET_CLASS (surface->impl);
+          impl_class->get_geometry (surface, x, y,
+                                    width, height);
+          /* This reports the position wrt to the native parent, we need to convert
+             it to be relative to the client side parent */
+          parent = surface->parent;
+          if (parent && !gdk_surface_has_impl (parent))
+            {
+              if (x)
+                *x -= parent->abs_x;
+              if (y)
+                *y -= parent->abs_y;
+            }
+        }
       else
-       {
+        {
           if (x)
             *x = surface->x;
           if (y)
             *y = surface->y;
-         if (width)
-           *width = surface->width;
-         if (height)
-           *height = surface->height;
-       }
+          if (width)
+            *width = surface->width;
+          if (height)
+            *height = surface->height;
+        }
     }
 }
 
@@ -3740,8 +3740,8 @@ gdk_surface_get_height (GdkSurface *surface)
  */
 gint
 gdk_surface_get_origin (GdkSurface *surface,
-                      gint      *x,
-                      gint      *y)
+                        gint      *x,
+                        gint      *y)
 {
   gint dummy_x, dummy_y;
 
@@ -3770,10 +3770,10 @@ gdk_surface_get_origin (GdkSurface *surface,
  */
 void
 gdk_surface_get_root_coords (GdkSurface *surface,
-                           gint       x,
-                           gint       y,
-                           gint      *root_x,
-                           gint      *root_y)
+                             gint       x,
+                             gint       y,
+                             gint      *root_x,
+                             gint      *root_y)
 {
   GdkSurfaceImplClass *impl_class;
 
@@ -3788,9 +3788,9 @@ gdk_surface_get_root_coords (GdkSurface *surface,
   
   impl_class = GDK_SURFACE_IMPL_GET_CLASS (surface->impl);
   impl_class->get_root_coords (surface->impl_surface,
-                              x + surface->abs_x,
-                              y + surface->abs_y,
-                              root_x, root_y);
+                               x + surface->abs_x,
+                               y + surface->abs_y,
+                               root_x, root_y);
 }
 
 /**
@@ -3811,10 +3811,10 @@ gdk_surface_get_root_coords (GdkSurface *surface,
  **/
 void
 gdk_surface_coords_to_parent (GdkSurface *surface,
-                             gdouble    x,
-                             gdouble    y,
-                             gdouble   *parent_x,
-                             gdouble   *parent_y)
+                              gdouble    x,
+                              gdouble    y,
+                              gdouble   *parent_x,
+                              gdouble   *parent_y)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -3843,10 +3843,10 @@ gdk_surface_coords_to_parent (GdkSurface *surface,
  **/
 void
 gdk_surface_coords_from_parent (GdkSurface *surface,
-                               gdouble    parent_x,
-                               gdouble    parent_y,
-                               gdouble   *x,
-                               gdouble   *y)
+                                gdouble    parent_x,
+                                gdouble    parent_y,
+                                gdouble   *x,
+                                gdouble   *y)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -3883,9 +3883,9 @@ gdk_surface_coords_from_parent (GdkSurface *surface,
  */
 void
 gdk_surface_input_shape_combine_region (GdkSurface       *surface,
-                                      const cairo_region_t *shape_region,
-                                      gint             offset_x,
-                                      gint             offset_y)
+                                        const cairo_region_t *shape_region,
+                                        gint             offset_x,
+                                        gint             offset_y)
 {
   GdkSurfaceImplClass *impl_class;
 
@@ -3914,7 +3914,7 @@ gdk_surface_input_shape_combine_region (GdkSurface       *surface,
 
 static void
 do_child_input_shapes (GdkSurface *surface,
-                      gboolean merge)
+                       gboolean merge)
 {
   GdkRectangle r;
   cairo_region_t *region;
@@ -3979,7 +3979,7 @@ gdk_surface_set_child_input_shapes (GdkSurface *surface)
  **/
 void
 gdk_surface_set_pass_through (GdkSurface *surface,
-                             gboolean   pass_through)
+                              gboolean   pass_through)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -4109,7 +4109,7 @@ get_event_toplevel (GdkSurface *surface)
 
 gboolean
 _gdk_surface_event_parent_of (GdkSurface *parent,
-                            GdkSurface *child)
+                              GdkSurface *child)
 {
   GdkSurface *w;
 
@@ -4117,7 +4117,7 @@ _gdk_surface_event_parent_of (GdkSurface *parent,
   while (w != NULL)
     {
       if (w == parent)
-       return TRUE;
+        return TRUE;
 
       w = w->parent;
     }
@@ -4159,7 +4159,7 @@ update_cursor (GdkDisplay *display,
      the cursor is inherited from the parent */
   while (cursor_surface->cursor == NULL &&
          !g_hash_table_contains (cursor_surface->device_cursor, device) &&
-        (parent = cursor_surface->parent) != NULL)
+         (parent = cursor_surface->parent) != NULL)
     cursor_surface = parent;
 
   cursor = g_hash_table_lookup (cursor_surface->device_cursor, device);
@@ -4175,26 +4175,26 @@ update_cursor (GdkDisplay *display,
 
 static gboolean
 point_in_surface (GdkSurface *surface,
-                gdouble    x,
-                 gdouble    y)
+                  gdouble    x,
+                  gdouble    y)
 {
   return
     x >= 0 && x < surface->width &&
     y >= 0 && y < surface->height &&
     (surface->input_shape == NULL ||
      cairo_region_contains_point (surface->input_shape,
-                         x, y));
+                          x, y));
 }
 
 /* Same as point_in_surface, except it also takes pass_through and its
    interaction with child surfaces into account */
 static gboolean
 point_in_input_surface (GdkSurface *surface,
-                      gdouble    x,
-                      gdouble    y,
-                      GdkSurface **input_surface,
-                      gdouble   *input_surface_x,
-                      gdouble   *input_surface_y)
+                        gdouble    x,
+                        gdouble    y,
+                        GdkSurface **input_surface,
+                        gdouble   *input_surface_x,
+                        gdouble   *input_surface_y)
 {
   GdkSurface *sub;
   double child_x, child_y;
@@ -4206,11 +4206,11 @@ point_in_input_surface (GdkSurface *surface,
   if (!surface->pass_through)
     {
       if (input_surface)
-       {
-         *input_surface = surface;
-         *input_surface_x = x;
-         *input_surface_y = y;
-       }
+        {
+          *input_surface = surface;
+          *input_surface_x = x;
+          *input_surface_y = y;
+        }
       return TRUE;
     }
 
@@ -4222,22 +4222,22 @@ point_in_input_surface (GdkSurface *surface,
       sub = l->data;
 
       if (!GDK_SURFACE_IS_MAPPED (sub))
-       continue;
+        continue;
 
       gdk_surface_coords_from_parent ((GdkSurface *)sub,
-                                    x, y,
-                                    &child_x, &child_y);
+                                     x, y,
+                                     &child_x, &child_y);
       if (point_in_input_surface (sub, child_x, child_y,
-                                input_surface, input_surface_x, input_surface_y))
-       {
-         if (input_surface)
-           gdk_surface_coords_to_parent (sub,
-                                        *input_surface_x,
-                                        *input_surface_y,
-                                        input_surface_x,
-                                        input_surface_y);
-         return TRUE;
-       }
+                                 input_surface, input_surface_x, input_surface_y))
+        {
+          if (input_surface)
+            gdk_surface_coords_to_parent (sub,
+                                         *input_surface_x,
+                                         *input_surface_y,
+                                         input_surface_x,
+                                         input_surface_y);
+          return TRUE;
+        }
     }
 
   return FALSE;
@@ -4245,8 +4245,8 @@ point_in_input_surface (GdkSurface *surface,
 
 GdkSurface *
 _gdk_surface_find_child_at (GdkSurface *surface,
-                          double     x,
-                           double     y)
+                            double     x,
+                            double     y)
 {
   GdkSurface *sub;
   double child_x, child_y;
@@ -4256,19 +4256,19 @@ _gdk_surface_find_child_at (GdkSurface *surface,
     {
       /* Children is ordered in reverse stack order, i.e. first is topmost */
       for (l = surface->children; l != NULL; l = l->next)
-       {
-         sub = l->data;
+        {
+          sub = l->data;
 
-         if (!GDK_SURFACE_IS_MAPPED (sub))
-           continue;
+          if (!GDK_SURFACE_IS_MAPPED (sub))
+            continue;
 
-         gdk_surface_coords_from_parent ((GdkSurface *)sub,
+          gdk_surface_coords_from_parent ((GdkSurface *)sub,
                                          x, y,
                                          &child_x, &child_y);
-         if (point_in_input_surface (sub, child_x, child_y,
-                                    NULL, NULL, NULL))
-           return (GdkSurface *)sub;
-       }
+          if (point_in_input_surface (sub, child_x, child_y,
+                                     NULL, NULL, NULL))
+            return (GdkSurface *)sub;
+        }
     }
 
   return NULL;
@@ -4276,10 +4276,10 @@ _gdk_surface_find_child_at (GdkSurface *surface,
 
 GdkSurface *
 _gdk_surface_find_descendant_at (GdkSurface *surface,
-                               gdouble    x,
-                                gdouble    y,
-                               gdouble   *found_x,
-                               gdouble   *found_y)
+                                 gdouble    x,
+                                 gdouble    y,
+                                 gdouble   *found_x,
+                                 gdouble   *found_y)
 {
   GdkSurface *sub, *input_surface;
   gdouble child_x, child_y;
@@ -4289,30 +4289,30 @@ _gdk_surface_find_descendant_at (GdkSurface *surface,
   if (point_in_surface (surface, x, y))
     {
       do
-       {
-         found = FALSE;
-         /* Children is ordered in reverse stack order, i.e. first is topmost */
-         for (l = surface->children; l != NULL; l = l->next)
-           {
-             sub = l->data;
+        {
+          found = FALSE;
+          /* Children is ordered in reverse stack order, i.e. first is topmost */
+          for (l = surface->children; l != NULL; l = l->next)
+            {
+              sub = l->data;
 
-             if (!GDK_SURFACE_IS_MAPPED (sub))
-               continue;
+              if (!GDK_SURFACE_IS_MAPPED (sub))
+                continue;
 
-             gdk_surface_coords_from_parent ((GdkSurface *)sub,
+              gdk_surface_coords_from_parent ((GdkSurface *)sub,
                                              x, y,
                                              &child_x, &child_y);
-             if (point_in_input_surface (sub, child_x, child_y,
-                                        &input_surface, &child_x, &child_y))
-               {
-                 x = child_x;
-                 y = child_y;
-                 surface = input_surface;
-                 found = TRUE;
-                 break;
-               }
-           }
-       }
+              if (point_in_input_surface (sub, child_x, child_y,
+                                         &input_surface, &child_x, &child_y))
+                {
+                  x = child_x;
+                  y = child_y;
+                  surface = input_surface;
+                  found = TRUE;
+                  break;
+                }
+            }
+        }
       while (found);
     }
   else
@@ -4356,7 +4356,7 @@ gdk_surface_beep (GdkSurface *surface)
       if (GDK_SURFACE_IMPL_GET_CLASS (toplevel->impl)->beep (toplevel))
         return;
     }
-  
+
   /* If surfaces fail to beep, we beep the display. */
   gdk_display_beep (display);
 }
@@ -4373,7 +4373,7 @@ gdk_surface_beep (GdkSurface *surface)
  **/
 void
 gdk_surface_set_support_multidevice (GdkSurface *surface,
-                                    gboolean   support_multidevice)
+                                     gboolean   support_multidevice)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -4412,9 +4412,9 @@ gdk_surface_get_support_multidevice (GdkSurface *surface)
 
 GdkEvent *
 _gdk_make_event (GdkSurface    *surface,
-                GdkEventType  type,
-                GdkEvent     *event_in_queue,
-                gboolean      before_event)
+                 GdkEventType  type,
+                 GdkEvent     *event_in_queue,
+                 gboolean      before_event)
 {
   GdkEvent *event = gdk_event_new (type);
   guint32 the_time;
@@ -4517,8 +4517,8 @@ _gdk_make_event (GdkSurface    *surface,
 
 void
 _gdk_display_set_surface_under_pointer (GdkDisplay *display,
-                                       GdkDevice  *device,
-                                      GdkSurface  *surface)
+                                        GdkDevice  *device,
+                                        GdkSurface  *surface)
 {
   GdkPointerSurfaceInfo *device_info;
 
@@ -4536,10 +4536,10 @@ _gdk_display_set_surface_under_pointer (GdkDisplay *display,
 }
 
 #define GDK_ANY_BUTTON_MASK (GDK_BUTTON1_MASK | \
-                            GDK_BUTTON2_MASK | \
-                            GDK_BUTTON3_MASK | \
-                            GDK_BUTTON4_MASK | \
-                            GDK_BUTTON5_MASK)
+                             GDK_BUTTON2_MASK | \
+                             GDK_BUTTON3_MASK | \
+                             GDK_BUTTON4_MASK | \
+                             GDK_BUTTON5_MASK)
 
 #ifdef DEBUG_SURFACE_PRINTING
 
@@ -4549,7 +4549,7 @@ _gdk_display_set_surface_under_pointer (GdkDisplay *display,
 
 static void
 gdk_surface_print (GdkSurface *surface,
-                 int indent)
+                  int indent)
 {
   char *s;
   const char *surface_types[] = {
@@ -4563,10 +4563,10 @@ gdk_surface_print (GdkSurface *surface,
   };
 
   g_print ("%*s%p: [%s] %d,%d %dx%d", indent, "", surface,
-          surface->user_data ? g_type_name_from_instance (surface->user_data) : "no widget",
-          surface->x, surface->y,
-          surface->width, surface->height
-          );
+           surface->user_data ? g_type_name_from_instance (surface->user_data) : "no widget",
+           surface->x, surface->y,
+           surface->width, surface->height
+           );
 
   if (gdk_surface_has_impl (surface))
     {
@@ -4585,11 +4585,11 @@ gdk_surface_print (GdkSurface *surface,
     g_print (" hidden");
 
   g_print (" abs[%d,%d]",
-          surface->abs_x, surface->abs_y);
+           surface->abs_x, surface->abs_y);
 
   if (surface->alpha != 255)
     g_print (" alpha[%d]",
-          surface->alpha);
+           surface->alpha);
 
   s = print_region (surface->clip_region);
   g_print (" clipbox[%s]", s);
@@ -4600,8 +4600,8 @@ gdk_surface_print (GdkSurface *surface,
 
 static void
 gdk_surface_print_tree (GdkSurface *surface,
-                      int indent,
-                      gboolean include_input_only)
+                        int indent,
+                        gboolean include_input_only)
 {
   GList *l;
 
@@ -4743,9 +4743,9 @@ _gdk_windowing_got_event (GdkDisplay *display,
  **/
 cairo_surface_t *
 gdk_surface_create_similar_surface (GdkSurface *     surface,
-                                   cairo_content_t content,
-                                   int             width,
-                                   int             height)
+                                    cairo_content_t content,
+                                    int             width,
+                                    int             height)
 {
   cairo_surface_t *surface_surface, *similar_surface;
   double sx, sy;
@@ -4824,10 +4824,10 @@ gdk_surface_create_similar_surface (GdkSurface *     surface,
  **/
 cairo_surface_t *
 gdk_surface_create_similar_image_surface (GdkSurface *     surface,
-                                        cairo_format_t  format,
-                                        int             width,
-                                        int             height,
-                                        int             scale)
+                                          cairo_format_t  format,
+                                          int             width,
+                                          int             height,
+                                          int             scale)
 {
   cairo_surface_t *cairo_surface;
 
@@ -4875,7 +4875,7 @@ gdk_surface_create_similar_image_surface (GdkSurface *     surface,
  **/
 void
 gdk_surface_focus (GdkSurface *surface,
-                  guint32    timestamp)
+                   guint32    timestamp)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->focus (surface, timestamp);
 }
@@ -4894,7 +4894,7 @@ gdk_surface_focus (GdkSurface *surface,
  **/
 void
 gdk_surface_set_type_hint (GdkSurface        *surface,
-                         GdkSurfaceTypeHint hint)
+                           GdkSurfaceTypeHint hint)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_type_hint (surface, hint);
 }
@@ -4928,7 +4928,7 @@ gdk_surface_get_type_hint (GdkSurface *surface)
  **/
 void
 gdk_surface_set_modal_hint (GdkSurface *surface,
-                          gboolean   modal)
+                            gboolean   modal)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_modal_hint (surface, modal);
 }
@@ -4947,7 +4947,7 @@ gdk_surface_set_modal_hint (GdkSurface *surface,
  **/
 void
 gdk_surface_set_skip_taskbar_hint (GdkSurface *surface,
-                                  gboolean   skips_taskbar)
+                                   gboolean   skips_taskbar)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_skip_taskbar_hint (surface, skips_taskbar);
 }
@@ -4968,7 +4968,7 @@ gdk_surface_set_skip_taskbar_hint (GdkSurface *surface,
  **/
 void
 gdk_surface_set_skip_pager_hint (GdkSurface *surface,
-                                gboolean   skips_pager)
+                                 gboolean   skips_pager)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_skip_pager_hint (surface, skips_pager);
 }
@@ -4983,7 +4983,7 @@ gdk_surface_set_skip_pager_hint (GdkSurface *surface,
  **/
 void
 gdk_surface_set_urgency_hint (GdkSurface *surface,
-                            gboolean   urgent)
+                              gboolean   urgent)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_urgency_hint (surface, urgent);
 }
@@ -5018,8 +5018,8 @@ gdk_surface_set_urgency_hint (GdkSurface *surface,
  **/
 void
 gdk_surface_set_geometry_hints (GdkSurface         *surface,
-                              const GdkGeometry *geometry,
-                              GdkSurfaceHints     geom_mask)
+                                const GdkGeometry *geometry,
+                                GdkSurfaceHints     geom_mask)
 {
   g_return_if_fail (geometry != NULL || geom_mask == 0);
 
@@ -5039,7 +5039,7 @@ gdk_surface_set_geometry_hints (GdkSurface         *surface,
  **/
 void
 gdk_surface_set_title (GdkSurface   *surface,
-                     const gchar *title)
+                       const gchar *title)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_title (surface, title);
 }
@@ -5065,7 +5065,7 @@ gdk_surface_set_title (GdkSurface   *surface,
  **/
 void
 gdk_surface_set_role (GdkSurface   *surface,
-                    const gchar *role)
+                      const gchar *role)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_role (surface, role);
 }
@@ -5080,7 +5080,7 @@ gdk_surface_set_role (GdkSurface   *surface,
  **/
 void
 gdk_surface_set_startup_id (GdkSurface   *surface,
-                          const gchar *startup_id)
+                            const gchar *startup_id)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_startup_id (surface, startup_id);
 }
@@ -5100,7 +5100,7 @@ gdk_surface_set_startup_id (GdkSurface   *surface,
  **/
 void
 gdk_surface_set_transient_for (GdkSurface *surface,
-                             GdkSurface *parent)
+                              GdkSurface *parent)
 {
   surface->transient_for = parent;
 
@@ -5119,8 +5119,8 @@ gdk_surface_set_transient_for (GdkSurface *surface,
  **/
 void
 gdk_surface_get_root_origin (GdkSurface *surface,
-                           gint      *x,
-                           gint      *y)
+                             gint      *x,
+                             gint      *y)
 {
   GdkRectangle rect;
 
@@ -5146,7 +5146,7 @@ gdk_surface_get_root_origin (GdkSurface *surface,
  **/
 void
 gdk_surface_get_frame_extents (GdkSurface    *surface,
-                              GdkRectangle *rect)
+                               GdkRectangle *rect)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->get_frame_extents (surface, rect);
 }
@@ -5164,7 +5164,7 @@ gdk_surface_get_frame_extents (GdkSurface    *surface,
  **/
 void
 gdk_surface_set_accept_focus (GdkSurface *surface,
-                            gboolean accept_focus)
+                              gboolean accept_focus)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_accept_focus (surface, accept_focus);
 }
@@ -5185,7 +5185,7 @@ gdk_surface_set_accept_focus (GdkSurface *surface,
  **/
 void
 gdk_surface_set_focus_on_map (GdkSurface *surface,
-                            gboolean focus_on_map)
+                              gboolean focus_on_map)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_focus_on_map (surface, focus_on_map);
 }
@@ -5208,7 +5208,7 @@ gdk_surface_set_focus_on_map (GdkSurface *surface,
  */
 void
 gdk_surface_set_icon_list (GdkSurface *surface,
-                          GList     *textures)
+                           GList     *textures)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_icon_list (surface, textures);
 }
@@ -5233,7 +5233,7 @@ gdk_surface_set_icon_list (GdkSurface *surface,
  **/
 void
 gdk_surface_set_icon_name (GdkSurface   *surface,
-                         const gchar *name)
+                           const gchar *name)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_icon_name (surface, name);
 }
@@ -5389,7 +5389,7 @@ gdk_surface_fullscreen (GdkSurface *surface)
  **/
 void
 gdk_surface_fullscreen_on_monitor (GdkSurface  *surface,
-                                  GdkMonitor *monitor)
+                                   GdkMonitor *monitor)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
   g_return_if_fail (GDK_IS_MONITOR (monitor));
@@ -5427,7 +5427,7 @@ gdk_surface_fullscreen_on_monitor (GdkSurface  *surface,
  **/
 void
 gdk_surface_set_fullscreen_mode (GdkSurface        *surface,
-                                GdkFullscreenMode mode)
+                                 GdkFullscreenMode mode)
 {
   GdkSurfaceImplClass *impl_class;
 
@@ -5497,7 +5497,7 @@ gdk_surface_unfullscreen (GdkSurface *surface)
  **/
 void
 gdk_surface_set_keep_above (GdkSurface *surface,
-                           gboolean   setting)
+                            gboolean   setting)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_keep_above (surface, setting);
 }
@@ -5518,7 +5518,8 @@ gdk_surface_set_keep_above (GdkSurface *surface,
  * and GDK makes a best effort to get it to happen.
  **/
 void
-gdk_surface_set_keep_below (GdkSurface *surface, gboolean setting)
+gdk_surface_set_keep_below (GdkSurface *surface,
+                            gboolean setting)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_keep_below (surface, setting);
 }
@@ -5555,7 +5556,7 @@ gdk_surface_get_group (GdkSurface *surface)
  **/
 void
 gdk_surface_set_group (GdkSurface *surface,
-                     GdkSurface *leader)
+                       GdkSurface *leader)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_group (surface, leader);
 }
@@ -5583,7 +5584,7 @@ gdk_surface_set_group (GdkSurface *surface,
  **/
 void
 gdk_surface_set_decorations (GdkSurface      *surface,
-                           GdkWMDecoration decorations)
+                             GdkWMDecoration decorations)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_decorations (surface, decorations);
 }
@@ -5599,8 +5600,8 @@ gdk_surface_set_decorations (GdkSurface      *surface,
  * Returns: %TRUE if the surface has decorations set, %FALSE otherwise.
  **/
 gboolean
-gdk_surface_get_decorations(GdkSurface       *surface,
-                          GdkWMDecoration *decorations)
+gdk_surface_get_decorations (GdkSurface       *surface,
+                             GdkWMDecoration *decorations)
 {
   return GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->get_decorations (surface, decorations);
 }
@@ -5627,7 +5628,7 @@ gdk_surface_get_decorations(GdkSurface       *surface,
  **/
 void
 gdk_surface_set_functions (GdkSurface    *surface,
-                         GdkWMFunction functions)
+                           GdkWMFunction functions)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->set_functions (surface, functions);
 }
@@ -5651,12 +5652,12 @@ gdk_surface_set_functions (GdkSurface    *surface,
  */
 void
 gdk_surface_begin_resize_drag_for_device (GdkSurface     *surface,
-                                         GdkSurfaceEdge  edge,
-                                         GdkDevice     *device,
-                                         gint           button,
-                                         gint           root_x,
-                                         gint           root_y,
-                                         guint32        timestamp)
+                                          GdkSurfaceEdge  edge,
+                                          GdkDevice     *device,
+                                          gint           button,
+                                          gint           root_x,
+                                          gint           root_y,
+                                          guint32        timestamp)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->begin_resize_drag (surface, edge, device, button, root_x, 
root_y, timestamp);
 }
@@ -5678,11 +5679,11 @@ gdk_surface_begin_resize_drag_for_device (GdkSurface     *surface,
  */
 void
 gdk_surface_begin_resize_drag (GdkSurface     *surface,
-                              GdkSurfaceEdge  edge,
-                              gint           button,
-                              gint           root_x,
-                              gint           root_y,
-                              guint32        timestamp)
+                               GdkSurfaceEdge  edge,
+                               gint           button,
+                               gint           root_x,
+                               gint           root_y,
+                               guint32        timestamp)
 {
   GdkDisplay *display;
   GdkDevice *device;
@@ -5710,11 +5711,11 @@ gdk_surface_begin_resize_drag (GdkSurface     *surface,
  */
 void
 gdk_surface_begin_move_drag_for_device (GdkSurface *surface,
-                                       GdkDevice *device,
-                                       gint       button,
-                                       gint       root_x,
-                                       gint       root_y,
-                                       guint32    timestamp)
+                                        GdkDevice *device,
+                                        gint       button,
+                                        gint       root_x,
+                                        gint       root_y,
+                                        guint32    timestamp)
 {
   GDK_SURFACE_IMPL_GET_CLASS (surface->impl)->begin_move_drag (surface,
                                                              device, button, root_x, root_y, timestamp);
@@ -5736,10 +5737,10 @@ gdk_surface_begin_move_drag_for_device (GdkSurface *surface,
  */
 void
 gdk_surface_begin_move_drag (GdkSurface *surface,
-                            gint       button,
-                            gint       root_x,
-                            gint       root_y,
-                            guint32    timestamp)
+                             gint       button,
+                             gint       root_x,
+                             gint       root_y,
+                             guint32    timestamp)
 {
   GdkDisplay *display;
   GdkDevice *device;
@@ -5771,7 +5772,7 @@ gdk_surface_begin_move_drag (GdkSurface *surface,
  */
 void
 gdk_surface_set_opacity (GdkSurface *surface,
-                       gdouble    opacity)
+                         gdouble    opacity)
 {
   if (opacity < 0)
     opacity = 0;
@@ -5846,7 +5847,7 @@ gdk_drag_begin (GdkSurface          *surface,
 
 static void
 gdk_surface_flush_events (GdkFrameClock *clock,
-                         void          *data)
+                          void          *data)
 {
   GdkSurface *surface;
   GdkDisplay *display;
@@ -5864,7 +5865,7 @@ gdk_surface_flush_events (GdkFrameClock *clock,
 
 static void
 gdk_surface_resume_events (GdkFrameClock *clock,
-                          void          *data)
+                           void          *data)
 {
   GdkSurface *surface;
   GdkDisplay *display;
@@ -5879,7 +5880,7 @@ gdk_surface_resume_events (GdkFrameClock *clock,
 
 static void
 gdk_surface_set_frame_clock (GdkSurface     *surface,
-                            GdkFrameClock *clock)
+                             GdkFrameClock *clock)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
   g_return_if_fail (clock == NULL || GDK_IS_FRAME_CLOCK (clock));
@@ -5989,8 +5990,8 @@ gdk_surface_get_scale_factor (GdkSurface *surface)
    coordinates which are y-flipped in the real coordinates. */
 void
 gdk_surface_get_unscaled_size (GdkSurface *surface,
-                              int *unscaled_width,
-                              int *unscaled_height)
+                               int *unscaled_width,
+                               int *unscaled_height)
 {
   GdkSurfaceImplClass *impl_class;
   gint scale;
@@ -6039,7 +6040,7 @@ gdk_surface_get_unscaled_size (GdkSurface *surface,
  */
 void
 gdk_surface_set_opaque_region (GdkSurface      *surface,
-                              cairo_region_t *region)
+                               cairo_region_t *region)
 {
   GdkSurfaceImplClass *impl_class;
 
@@ -6080,10 +6081,10 @@ gdk_surface_set_opaque_region (GdkSurface      *surface,
  */
 void
 gdk_surface_set_shadow_width (GdkSurface *surface,
-                             gint       left,
-                             gint       right,
-                             gint       top,
-                             gint       bottom)
+                              gint       left,
+                              gint       right,
+                              gint       top,
+                              gint       bottom)
 {
   GdkSurfaceImplClass *impl_class;
 
@@ -6117,7 +6118,7 @@ gdk_surface_set_shadow_width (GdkSurface *surface,
  */
 gboolean
 gdk_surface_show_window_menu (GdkSurface *surface,
-                             GdkEvent  *event)
+                              GdkEvent  *event)
 {
   GdkSurfaceImplClass *impl_class;
 
@@ -6150,7 +6151,7 @@ gdk_surface_supports_edge_constraints (GdkSurface *surface)
 
 void
 gdk_surface_set_state (GdkSurface      *surface,
-                      GdkSurfaceState  new_state)
+                       GdkSurfaceState  new_state)
 {
   g_return_if_fail (GDK_IS_SURFACE (surface));
 
@@ -6186,8 +6187,8 @@ gdk_surface_set_state (GdkSurface      *surface,
 
 void
 gdk_synthesize_surface_state (GdkSurface     *surface,
-                             GdkSurfaceState unset_flags,
-                             GdkSurfaceState set_flags)
+                              GdkSurfaceState unset_flags,
+                              GdkSurfaceState set_flags)
 {
   gdk_surface_set_state (surface, (surface->state | set_flags) & ~unset_flags);
 }
diff --git a/gdk/gdksurface.h b/gdk/gdksurface.h
index 8aaea64132..0da93cb879 100644
--- a/gdk/gdksurface.h
+++ b/gdk/gdksurface.h
@@ -443,22 +443,22 @@ struct _GdkSurfaceClass
 GDK_AVAILABLE_IN_ALL
 GType         gdk_surface_get_type              (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
-GdkSurface *   gdk_surface_new_toplevel          (GdkDisplay    *display,
-                                                int            width,
-                                                int            height);
+GdkSurface *   gdk_surface_new_toplevel         (GdkDisplay    *display,
+                                                 int            width,
+                                                 int            height);
 GDK_AVAILABLE_IN_ALL
-GdkSurface *   gdk_surface_new_popup             (GdkDisplay    *display,
-                                                const GdkRectangle *position);
+GdkSurface *   gdk_surface_new_popup            (GdkDisplay    *display,
+                                                 const GdkRectangle *position);
 GDK_AVAILABLE_IN_ALL
-GdkSurface *   gdk_surface_new_temp              (GdkDisplay    *display);
+GdkSurface *   gdk_surface_new_temp             (GdkDisplay    *display);
 GDK_AVAILABLE_IN_ALL
-GdkSurface *   gdk_surface_new_child             (GdkSurface     *parent,
-                                                const GdkRectangle *position);
+GdkSurface *   gdk_surface_new_child            (GdkSurface     *parent,
+                                                 const GdkRectangle *position);
 
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_destroy               (GdkSurface     *surface);
 GDK_AVAILABLE_IN_ALL
-GdkSurfaceType gdk_surface_get_surface_type       (GdkSurface     *surface);
+GdkSurfaceType gdk_surface_get_surface_type     (GdkSurface     *surface);
 GDK_AVAILABLE_IN_ALL
 gboolean      gdk_surface_is_destroyed          (GdkSurface     *surface);
 
@@ -474,48 +474,48 @@ GDK_AVAILABLE_IN_ALL
 void          gdk_surface_show_unraised         (GdkSurface     *surface);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_move                  (GdkSurface     *surface,
-                                                gint           x,
-                                                gint           y);
+                                                 gint           x,
+                                                 gint           y);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_resize                (GdkSurface     *surface,
-                                                gint           width,
-                                                gint           height);
+                                                 gint           width,
+                                                 gint           height);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_move_resize           (GdkSurface     *surface,
-                                                gint           x,
-                                                gint           y,
-                                                gint           width,
-                                                gint           height);
+                                                 gint           x,
+                                                 gint           y,
+                                                 gint           width,
+                                                 gint           height);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_raise                 (GdkSurface     *surface);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_lower                 (GdkSurface     *surface);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_restack               (GdkSurface     *surface,
-                                               GdkSurface     *sibling,
-                                               gboolean       above);
+                                                 GdkSurface     *sibling,
+                                                 gboolean       above);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_focus                 (GdkSurface     *surface,
-                                                guint32        timestamp);
+                                                 guint32        timestamp);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_user_data         (GdkSurface     *surface,
-                                                gpointer       user_data);
+                                                 gpointer       user_data);
 GDK_AVAILABLE_IN_ALL
 gboolean      gdk_surface_get_accept_focus      (GdkSurface     *surface);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_accept_focus      (GdkSurface     *surface,
-                                               gboolean       accept_focus);
+                                                 gboolean       accept_focus);
 GDK_AVAILABLE_IN_ALL
 gboolean      gdk_surface_get_focus_on_map      (GdkSurface     *surface);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_focus_on_map      (GdkSurface     *surface,
-                                               gboolean       focus_on_map);
+                                                 gboolean       focus_on_map);
 
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_input_shape_combine_region (GdkSurface       *surface,
-                                            const cairo_region_t *shape_region,
-                                            gint             offset_x,
-                                            gint             offset_y);
+                                             const cairo_region_t *shape_region,
+                                             gint             offset_x,
+                                             gint             offset_y);
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_set_child_input_shapes     (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
@@ -524,7 +524,7 @@ void gdk_surface_merge_child_input_shapes   (GdkSurface       *surface);
 
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_set_pass_through (GdkSurface *surface,
-                                  gboolean   pass_through);
+                                   gboolean   pass_through);
 GDK_AVAILABLE_IN_ALL
 gboolean gdk_surface_get_pass_through (GdkSurface *surface);
 
@@ -551,7 +551,7 @@ GDK_AVAILABLE_IN_ALL
 gboolean      gdk_surface_has_native         (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
 void              gdk_surface_set_type_hint (GdkSurface        *surface,
-                                            GdkSurfaceTypeHint hint);
+                                             GdkSurfaceTypeHint hint);
 GDK_AVAILABLE_IN_ALL
 GdkSurfaceTypeHint gdk_surface_get_type_hint (GdkSurface        *surface);
 
@@ -559,179 +559,179 @@ GDK_AVAILABLE_IN_ALL
 gboolean      gdk_surface_get_modal_hint   (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_modal_hint   (GdkSurface       *surface,
-                                           gboolean         modal);
+                                            gboolean         modal);
 
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_set_skip_taskbar_hint (GdkSurface *surface,
-                                       gboolean   skips_taskbar);
+                                        gboolean   skips_taskbar);
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_set_skip_pager_hint   (GdkSurface *surface,
-                                       gboolean   skips_pager);
+                                        gboolean   skips_pager);
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_set_urgency_hint      (GdkSurface *surface,
-                                      gboolean   urgent);
+                                        gboolean   urgent);
 
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_geometry_hints (GdkSurface          *surface,
-                                            const GdkGeometry  *geometry,
-                                            GdkSurfaceHints      geom_mask);
+                                              const GdkGeometry  *geometry,
+                                              GdkSurfaceHints      geom_mask);
 
 GDK_AVAILABLE_IN_ALL
 GdkDrawingContext *gdk_surface_begin_draw_frame  (GdkSurface            *surface,
-                                                 GdkDrawContext       *context,
-                                                 const cairo_region_t *region);
+                                                  GdkDrawContext       *context,
+                                                  const cairo_region_t *region);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_end_draw_frame    (GdkSurface            *surface,
-                                            GdkDrawingContext    *context);
+                                             GdkDrawingContext    *context);
 
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_set_title        (GdkSurface    *surface,
-                                           const gchar   *title);
+void          gdk_surface_set_title         (GdkSurface   *surface,
+                                             const gchar  *title);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_role          (GdkSurface     *surface,
-                                           const gchar   *role);
+                                             const gchar   *role);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_startup_id    (GdkSurface     *surface,
-                                           const gchar   *startup_id);
+                                             const gchar   *startup_id);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_transient_for (GdkSurface     *surface,
-                                           GdkSurface     *parent);
+                                             GdkSurface     *parent);
 
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_set_cursor     (GdkSurface      *surface,
-                                         GdkCursor       *cursor);
+void          gdk_surface_set_cursor     (GdkSurface      *surface,
+                                          GdkCursor       *cursor);
 GDK_AVAILABLE_IN_ALL
 GdkCursor    *gdk_surface_get_cursor      (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_set_device_cursor (GdkSurface   *surface,
-                                            GdkDevice     *device,
-                                            GdkCursor    *cursor);
+void          gdk_surface_set_device_cursor (GdkSurface   *surface,
+                                             GdkDevice     *device,
+                                             GdkCursor     *cursor);
 GDK_AVAILABLE_IN_ALL
 GdkCursor    *gdk_surface_get_device_cursor (GdkSurface     *surface,
-                                            GdkDevice     *device);
+                                             GdkDevice     *device);
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_get_user_data  (GdkSurface      *surface,
-                                         gpointer        *data);
+void          gdk_surface_get_user_data  (GdkSurface      *surface,
+                                          gpointer        *data);
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_get_geometry   (GdkSurface      *surface,
-                                         gint            *x,
-                                         gint            *y,
-                                         gint            *width,
-                                         gint            *height);
+void          gdk_surface_get_geometry   (GdkSurface      *surface,
+                                          gint            *x,
+                                          gint            *y,
+                                          gint            *width,
+                                          gint            *height);
 GDK_AVAILABLE_IN_ALL
 int           gdk_surface_get_width       (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
 int           gdk_surface_get_height      (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_get_position   (GdkSurface      *surface,
-                                         gint            *x,
-                                         gint            *y);
+void          gdk_surface_get_position   (GdkSurface      *surface,
+                                          gint            *x,
+                                          gint            *y);
 GDK_AVAILABLE_IN_ALL
-gint         gdk_surface_get_origin     (GdkSurface      *surface,
-                                         gint            *x,
-                                         gint            *y);
+gint          gdk_surface_get_origin     (GdkSurface      *surface,
+                                          gint            *x,
+                                          gint            *y);
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_get_root_coords (GdkSurface     *surface,
-                                         gint             x,
-                                         gint             y,
-                                         gint            *root_x,
-                                         gint            *root_y);
+void          gdk_surface_get_root_coords (GdkSurface     *surface,
+                                           gint             x,
+                                           gint             y,
+                                           gint            *root_x,
+                                           gint            *root_y);
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_coords_to_parent   (GdkSurface       *surface,
-                                          gdouble          x,
-                                          gdouble          y,
-                                          gdouble         *parent_x,
-                                          gdouble         *parent_y);
+                                           gdouble          x,
+                                           gdouble          y,
+                                           gdouble         *parent_x,
+                                           gdouble         *parent_y);
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_coords_from_parent (GdkSurface       *surface,
-                                          gdouble          parent_x,
-                                          gdouble          parent_y,
-                                          gdouble         *x,
-                                          gdouble         *y);
+                                           gdouble          parent_x,
+                                           gdouble          parent_y,
+                                           gdouble         *x,
+                                           gdouble         *y);
 
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_get_root_origin (GdkSurface     *surface,
-                                         gint            *x,
-                                         gint            *y);
+void          gdk_surface_get_root_origin (GdkSurface     *surface,
+                                           gint            *x,
+                                           gint            *y);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_get_frame_extents (GdkSurface     *surface,
-                                            GdkRectangle  *rect);
+                                             GdkRectangle  *rect);
 
 GDK_AVAILABLE_IN_ALL
 gint          gdk_surface_get_scale_factor  (GdkSurface     *surface);
 
 GDK_AVAILABLE_IN_ALL
 GdkSurface *   gdk_surface_get_device_position (GdkSurface       *surface,
-                                              GdkDevice       *device,
-                                              gint            *x,
-                                              gint            *y,
-                                              GdkModifierType *mask);
+                                                GdkDevice       *device,
+                                                gint            *x,
+                                                gint            *y,
+                                                GdkModifierType *mask);
 GDK_AVAILABLE_IN_ALL
 GdkSurface *   gdk_surface_get_device_position_double (GdkSurface       *surface,
-                                                     GdkDevice       *device,
-                                                     gdouble         *x,
-                                                     gdouble         *y,
-                                                     GdkModifierType *mask);
+                                                       GdkDevice       *device,
+                                                       gdouble         *x,
+                                                       gdouble         *y,
+                                                       GdkModifierType *mask);
 GDK_AVAILABLE_IN_ALL
 GdkSurface *   gdk_surface_get_parent      (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
 GdkSurface *   gdk_surface_get_toplevel    (GdkSurface       *surface);
 
 GDK_AVAILABLE_IN_ALL
-GList *              gdk_surface_get_children   (GdkSurface      *surface);
+GList *       gdk_surface_get_children   (GdkSurface      *surface);
 GDK_AVAILABLE_IN_ALL
 GList *       gdk_surface_peek_children   (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
 GList *       gdk_surface_get_children_with_user_data (GdkSurface *surface,
-                                                     gpointer   user_data);
+                                                       gpointer   user_data);
 
 GDK_AVAILABLE_IN_ALL
-GdkEventMask  gdk_surface_get_events    (GdkSurface      *surface);
+GdkEventMask  gdk_surface_get_events     (GdkSurface      *surface);
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_set_events     (GdkSurface      *surface,
-                                         GdkEventMask     event_mask);
+void          gdk_surface_set_events     (GdkSurface      *surface,
+                                          GdkEventMask     event_mask);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_device_events (GdkSurface    *surface,
-                                            GdkDevice    *device,
-                                            GdkEventMask  event_mask);
+                                             GdkDevice    *device,
+                                             GdkEventMask  event_mask);
 GDK_AVAILABLE_IN_ALL
 GdkEventMask  gdk_surface_get_device_events (GdkSurface    *surface,
-                                            GdkDevice    *device);
+                                             GdkDevice    *device);
 
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_icon_list   (GdkSurface       *surface,
-                                         GList           *surfaces);
+                                           GList           *surfaces);
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_set_icon_name  (GdkSurface      *surface, 
-                                         const gchar     *name);
+void          gdk_surface_set_icon_name  (GdkSurface      *surface,
+                                          const gchar     *name);
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_set_group      (GdkSurface      *surface, 
-                                         GdkSurface      *leader);
+void          gdk_surface_set_group      (GdkSurface      *surface,
+                                          GdkSurface      *leader);
 GDK_AVAILABLE_IN_ALL
-GdkSurface*    gdk_surface_get_group    (GdkSurface      *surface);
+GdkSurface*    gdk_surface_get_group     (GdkSurface      *surface);
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_set_decorations (GdkSurface     *surface,
-                                         GdkWMDecoration  decorations);
+void          gdk_surface_set_decorations (GdkSurface     *surface,
+                                           GdkWMDecoration  decorations);
 GDK_AVAILABLE_IN_ALL
 gboolean      gdk_surface_get_decorations (GdkSurface       *surface,
-                                         GdkWMDecoration *decorations);
+                                           GdkWMDecoration *decorations);
 GDK_AVAILABLE_IN_ALL
-void         gdk_surface_set_functions  (GdkSurface      *surface,
-                                         GdkWMFunction    functions);
+void          gdk_surface_set_functions  (GdkSurface      *surface,
+                                          GdkWMFunction    functions);
 
 GDK_AVAILABLE_IN_ALL
 cairo_surface_t *
               gdk_surface_create_similar_surface (GdkSurface *surface,
-                                          cairo_content_t  content,
-                                          int              width,
-                                          int              height);
+                                                  cairo_content_t  content,
+                                                  int              width,
+                                                  int              height);
 GDK_AVAILABLE_IN_ALL
 cairo_surface_t *
               gdk_surface_create_similar_image_surface (GdkSurface *surface,
-                                                      cairo_format_t format,
-                                                      int            width,
-                                                      int            height,
-                                                      int            scale);
+                                                        cairo_format_t format,
+                                                        int            width,
+                                                        int            height,
+                                                        int            scale);
 
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_beep            (GdkSurface       *surface);
@@ -751,10 +751,10 @@ GDK_AVAILABLE_IN_ALL
 void          gdk_surface_fullscreen      (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_fullscreen_on_monitor (GdkSurface      *surface,
-                                                GdkMonitor     *monitor);
+                                                 GdkMonitor     *monitor);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_fullscreen_mode (GdkSurface   *surface,
-                                          GdkFullscreenMode mode);
+                                               GdkFullscreenMode mode);
 GDK_AVAILABLE_IN_ALL
 GdkFullscreenMode
               gdk_surface_get_fullscreen_mode (GdkSurface   *surface);
@@ -762,52 +762,52 @@ GDK_AVAILABLE_IN_ALL
 void          gdk_surface_unfullscreen    (GdkSurface       *surface);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_keep_above  (GdkSurface       *surface,
-                                          gboolean         setting);
+                                           gboolean         setting);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_keep_below  (GdkSurface       *surface,
-                                          gboolean         setting);
+                                           gboolean         setting);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_set_opacity     (GdkSurface       *surface,
-                                          gdouble          opacity);
+                                           gdouble          opacity);
 GDK_AVAILABLE_IN_ALL
 void          gdk_surface_register_dnd    (GdkSurface       *surface);
 
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_begin_resize_drag            (GdkSurface     *surface,
-                                              GdkSurfaceEdge  edge,
-                                              gint           button,
-                                              gint           root_x,
-                                              gint           root_y,
-                                              guint32        timestamp);
+                                               GdkSurfaceEdge  edge,
+                                               gint           button,
+                                               gint           root_x,
+                                               gint           root_y,
+                                               guint32        timestamp);
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_begin_resize_drag_for_device (GdkSurface     *surface,
-                                              GdkSurfaceEdge  edge,
-                                              GdkDevice     *device,
-                                              gint           button,
-                                              gint           root_x,
-                                              gint           root_y,
-                                              guint32        timestamp);
+                                               GdkSurfaceEdge  edge,
+                                               GdkDevice     *device,
+                                               gint           button,
+                                               gint           root_x,
+                                               gint           root_y,
+                                               guint32        timestamp);
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_begin_move_drag              (GdkSurface     *surface,
-                                              gint           button,
-                                              gint           root_x,
-                                              gint           root_y,
-                                              guint32        timestamp);
+                                               gint           button,
+                                               gint           root_x,
+                                               gint           root_y,
+                                               guint32        timestamp);
 GDK_AVAILABLE_IN_ALL
 void gdk_surface_begin_move_drag_for_device   (GdkSurface     *surface,
-                                              GdkDevice     *device,
-                                              gint           button,
-                                              gint           root_x,
-                                              gint           root_y,
-                                              guint32        timestamp);
+                                               GdkDevice     *device,
+                                               gint           button,
+                                               gint           root_x,
+                                               gint           root_y,
+                                               guint32        timestamp);
 
 /* Interface for dirty-region queueing */
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_invalidate_rect           (GdkSurface          *surface,
-                                                const GdkRectangle   *rect);
+                                                  const GdkRectangle   *rect);
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_invalidate_region         (GdkSurface          *surface,
-                                                const cairo_region_t *region);
+                                                  const cairo_region_t *region);
 
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_freeze_updates      (GdkSurface    *surface);
@@ -816,16 +816,16 @@ void       gdk_surface_thaw_updates        (GdkSurface    *surface);
 
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_constrain_size      (GdkGeometry    *geometry,
-                                           GdkSurfaceHints  flags,
-                                           gint            width,
-                                           gint            height,
-                                           gint           *new_width,
-                                           gint           *new_height);
+                                            GdkSurfaceHints  flags,
+                                            gint            width,
+                                            gint            height,
+                                            gint           *new_width,
+                                            gint           *new_height);
 
 /* Multidevice support */
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_set_support_multidevice (GdkSurface *surface,
-                                               gboolean   support_multidevice);
+                                                gboolean   support_multidevice);
 GDK_AVAILABLE_IN_ALL
 gboolean   gdk_surface_get_support_multidevice (GdkSurface *surface);
 
@@ -835,25 +835,25 @@ GdkFrameClock* gdk_surface_get_frame_clock      (GdkSurface     *surface);
 
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_set_opaque_region        (GdkSurface      *surface,
-                                                cairo_region_t *region);
+                                                 cairo_region_t *region);
 
 GDK_AVAILABLE_IN_ALL
 void       gdk_surface_set_shadow_width         (GdkSurface      *surface,
-                                                gint            left,
-                                                gint            right,
-                                                gint            top,
-                                                gint            bottom);
+                                                 gint            left,
+                                                 gint            right,
+                                                 gint            top,
+                                                 gint            bottom);
 GDK_AVAILABLE_IN_ALL
 gboolean  gdk_surface_show_window_menu          (GdkSurface      *surface,
-                                                GdkEvent       *event);
+                                                 GdkEvent       *event);
 
 GDK_AVAILABLE_IN_ALL
 GdkGLContext * gdk_surface_create_gl_context    (GdkSurface      *surface,
-                                                GError        **error);
+                                                 GError        **error);
 GDK_AVAILABLE_IN_ALL
 GdkVulkanContext *
                gdk_surface_create_vulkan_context(GdkSurface      *surface,
-                                                GError        **error);
+                                                 GError        **error);
 
 G_END_DECLS
 
diff --git a/gdk/gdksurfaceimpl.h b/gdk/gdksurfaceimpl.h
index 9eb005424c..a2488db5e3 100644
--- a/gdk/gdksurfaceimpl.h
+++ b/gdk/gdksurfaceimpl.h
@@ -58,14 +58,14 @@ struct _GdkSurfaceImplClass
                                                  int             height);
 
   void         (* show)                 (GdkSurface       *surface,
-                                        gboolean         already_mapped);
+                                         gboolean         already_mapped);
   void         (* hide)                 (GdkSurface       *surface);
   void         (* withdraw)             (GdkSurface       *surface);
   void         (* raise)                (GdkSurface       *surface);
   void         (* lower)                (GdkSurface       *surface);
   void         (* restack_toplevel)     (GdkSurface       *surface,
-                                        GdkSurface       *sibling,
-                                        gboolean        above);
+                                         GdkSurface       *sibling,
+                                         gboolean        above);
 
   void         (* move_resize)          (GdkSurface       *surface,
                                          gboolean         with_move,
@@ -91,8 +91,8 @@ struct _GdkSurfaceImplClass
                                          gint            *width,
                                          gint            *height);
   void         (* get_root_coords)      (GdkSurface       *surface,
-                                        gint             x,
-                                        gint             y,
+                                         gint             x,
+                                         gint             y,
                                          gint            *root_x,
                                          gint            *root_y);
   gboolean     (* get_device_state)     (GdkSurface       *surface,
@@ -108,9 +108,9 @@ struct _GdkSurfaceImplClass
                                          gint             offset_x,
                                          gint             offset_y);
   void         (* input_shape_combine_region) (GdkSurface       *surface,
-                                              const cairo_region_t *shape_region,
-                                              gint             offset_x,
-                                              gint             offset_y);
+                                               const cairo_region_t *shape_region,
+                                               gint             offset_x,
+                                               gint             offset_y);
 
 /* Called to do the windowing system specific part of gdk_surface_destroy(),
  *
@@ -126,47 +126,47 @@ struct _GdkSurfaceImplClass
  *     for some windowing systems.)
  */
   void         (* destroy)              (GdkSurface       *surface,
-                                        gboolean         recursing,
-                                        gboolean         foreign_destroy);
+                                         gboolean         recursing,
+                                         gboolean         foreign_destroy);
 
 
   /* optional */
   gboolean     (* beep)                 (GdkSurface       *surface);
 
   void         (* focus)                (GdkSurface       *surface,
-                                        guint32          timestamp);
+                                         guint32          timestamp);
   void         (* set_type_hint)        (GdkSurface       *surface,
-                                        GdkSurfaceTypeHint hint);
+                                         GdkSurfaceTypeHint hint);
   GdkSurfaceTypeHint (* get_type_hint)   (GdkSurface       *surface);
   void         (* set_modal_hint)       (GdkSurface *surface,
-                                        gboolean   modal);
+                                         gboolean   modal);
   void         (* set_skip_taskbar_hint) (GdkSurface *surface,
-                                         gboolean   skips_taskbar);
+                                          gboolean   skips_taskbar);
   void         (* set_skip_pager_hint)  (GdkSurface *surface,
-                                        gboolean   skips_pager);
+                                         gboolean   skips_pager);
   void         (* set_urgency_hint)     (GdkSurface *surface,
-                                        gboolean   urgent);
+                                         gboolean   urgent);
   void         (* set_geometry_hints)   (GdkSurface         *surface,
-                                        const GdkGeometry *geometry,
-                                        GdkSurfaceHints     geom_mask);
+                                         const GdkGeometry *geometry,
+                                         GdkSurfaceHints     geom_mask);
   void         (* set_title)            (GdkSurface   *surface,
-                                        const gchar *title);
+                                         const gchar *title);
   void         (* set_role)             (GdkSurface   *surface,
-                                        const gchar *role);
+                                         const gchar *role);
   void         (* set_startup_id)       (GdkSurface   *surface,
-                                        const gchar *startup_id);
+                                         const gchar *startup_id);
   void         (* set_transient_for)    (GdkSurface *surface,
-                                        GdkSurface *parent);
+                                         GdkSurface *parent);
   void         (* get_frame_extents)    (GdkSurface    *surface,
-                                        GdkRectangle *rect);
+                                         GdkRectangle *rect);
   void         (* set_accept_focus)     (GdkSurface *surface,
-                                        gboolean accept_focus);
+                                         gboolean accept_focus);
   void         (* set_focus_on_map)     (GdkSurface *surface,
-                                        gboolean focus_on_map);
+                                         gboolean focus_on_map);
   void         (* set_icon_list)        (GdkSurface *surface,
-                                        GList     *pixbufs);
+                                         GList     *pixbufs);
   void         (* set_icon_name)        (GdkSurface   *surface,
-                                        const gchar *name);
+                                         const gchar *name);
   void         (* iconify)              (GdkSurface *surface);
   void         (* deiconify)            (GdkSurface *surface);
   void         (* stick)                (GdkSurface *surface);
@@ -179,18 +179,18 @@ struct _GdkSurfaceImplClass
   void         (* apply_fullscreen_mode) (GdkSurface *surface);
   void         (* unfullscreen)         (GdkSurface *surface);
   void         (* set_keep_above)       (GdkSurface *surface,
-                                        gboolean   setting);
+                                         gboolean   setting);
   void         (* set_keep_below)       (GdkSurface *surface,
-                                        gboolean   setting);
+                                         gboolean   setting);
   GdkSurface *  (* get_group)            (GdkSurface *surface);
   void         (* set_group)            (GdkSurface *surface,
-                                        GdkSurface *leader);
+                                         GdkSurface *leader);
   void         (* set_decorations)      (GdkSurface      *surface,
-                                        GdkWMDecoration decorations);
+                                         GdkWMDecoration decorations);
   gboolean     (* get_decorations)      (GdkSurface       *surface,
-                                        GdkWMDecoration *decorations);
+                                         GdkWMDecoration *decorations);
   void         (* set_functions)        (GdkSurface    *surface,
-                                        GdkWMFunction functions);
+                                         GdkWMFunction functions);
   void         (* begin_resize_drag)    (GdkSurface     *surface,
                                          GdkSurfaceEdge  edge,
                                          GdkDevice     *device,
@@ -207,7 +207,7 @@ struct _GdkSurfaceImplClass
   void         (* enable_synchronized_configure) (GdkSurface *surface);
   void         (* configure_finished)   (GdkSurface *surface);
   void         (* set_opacity)          (GdkSurface *surface,
-                                        gdouble    opacity);
+                                         gdouble    opacity);
   void         (* destroy_notify)       (GdkSurface *surface);
   void         (* register_dnd)         (GdkSurface *surface);
   GdkDragContext * (*drag_begin)        (GdkSurface        *surface,
@@ -235,7 +235,7 @@ struct _GdkSurfaceImplClass
   gboolean     (* show_window_menu)       (GdkSurface      *surface,
                                            GdkEvent       *event);
   GdkGLContext *(*create_gl_context)      (GdkSurface      *surface,
-                                          gboolean        attached,
+                                           gboolean        attached,
                                            GdkGLContext   *share,
                                            GError        **error);
   gboolean     (* supports_edge_constraints)(GdkSurface    *surface);
diff --git a/gdk/quartz/gdkprivate-quartz.h b/gdk/quartz/gdkprivate-quartz.h
index e65a5f227f..24b9db564d 100644
--- a/gdk/quartz/gdkprivate-quartz.h
+++ b/gdk/quartz/gdkprivate-quartz.h
@@ -78,10 +78,10 @@ void         _gdk_quartz_synthesize_null_key_event (GdkSurface *window);
 /* Drag and Drop */
 void        _gdk_quartz_surface_register_dnd      (GdkSurface   *window);
 GdkDragContext * _gdk_quartz_surface_drag_begin   (GdkSurface   *window,
-                                                  GdkDevice   *device,
-                                                  GList       *targets,
-                                                  gint         x_root,
-                                                  gint         y_root);
+                                                   GdkDevice   *device,
+                                                   GList       *targets,
+                                                   gint         x_root,
+                                                   gint         y_root);
 
 /* Display */
 
@@ -98,35 +98,35 @@ gboolean    _gdk_quartz_get_setting                 (const gchar *name,
 
 
 /* Window */
-gboolean    _gdk_quartz_surface_is_ancestor          (GdkSurface *ancestor,
+gboolean    _gdk_quartz_surface_is_ancestor         (GdkSurface *ancestor,
                                                      GdkSurface *window);
-void       _gdk_quartz_surface_gdk_xy_to_xy          (gint       gdk_x,
+void       _gdk_quartz_surface_gdk_xy_to_xy         (gint       gdk_x,
                                                      gint       gdk_y,
                                                      gint      *ns_x,
                                                      gint      *ns_y);
-void       _gdk_quartz_surface_xy_to_gdk_xy          (gint       ns_x,
+void       _gdk_quartz_surface_xy_to_gdk_xy         (gint       ns_x,
                                                      gint       ns_y,
                                                      gint      *gdk_x,
                                                      gint      *gdk_y);
-void       _gdk_quartz_surface_nspoint_to_gdk_xy     (NSPoint    point,
+void       _gdk_quartz_surface_nspoint_to_gdk_xy    (NSPoint    point,
                                                      gint      *x,
                                                      gint      *y);
-GdkSurface *_gdk_quartz_surface_find_child            (GdkSurface *window,
-                                                    gint       x,
-                                                    gint       y,
+GdkSurface *_gdk_quartz_surface_find_child          (GdkSurface *window,
+                                                     gint       x,
+                                                     gint       y,
                                                      gboolean   get_toplevel);
-void       _gdk_quartz_surface_attach_to_parent      (GdkSurface *window);
-void       _gdk_quartz_surface_detach_from_parent    (GdkSurface *window);
-void       _gdk_quartz_surface_did_become_main       (GdkSurface *window);
-void       _gdk_quartz_surface_did_resign_main       (GdkSurface *window);
-void       _gdk_quartz_surface_debug_highlight       (GdkSurface *window,
+void       _gdk_quartz_surface_attach_to_parent     (GdkSurface *window);
+void       _gdk_quartz_surface_detach_from_parent   (GdkSurface *window);
+void       _gdk_quartz_surface_did_become_main      (GdkSurface *window);
+void       _gdk_quartz_surface_did_resign_main      (GdkSurface *window);
+void       _gdk_quartz_surface_debug_highlight      (GdkSurface *window,
                                                      gint       number);
 
 void       _gdk_quartz_surface_update_position           (GdkSurface    *window);
 void       _gdk_quartz_surface_update_fullscreen_state   (GdkSurface    *window);
 
 /* Window methods - property */
-gboolean _gdk_quartz_surface_get_property      (GdkSurface    *window,
+gboolean _gdk_quartz_surface_get_property     (GdkSurface    *window,
                                                GdkAtom       property,
                                                GdkAtom       type,
                                                gulong        offset,
@@ -136,14 +136,14 @@ gboolean _gdk_quartz_surface_get_property      (GdkSurface    *window,
                                                gint         *actual_format_type,
                                                gint         *actual_length,
                                                guchar      **data);
-void     _gdk_quartz_surface_change_property   (GdkSurface    *window,
+void     _gdk_quartz_surface_change_property  (GdkSurface    *window,
                                                GdkAtom       property,
                                                GdkAtom       type,
                                                gint          format,
                                                GdkPropMode   mode,
                                                const guchar *data,
                                                gint          nelements);
-void     _gdk_quartz_surface_delete_property   (GdkSurface    *window,
+void     _gdk_quartz_surface_delete_property  (GdkSurface    *window,
                                                GdkAtom       property);
 
 
diff --git a/gdk/wayland/gdkprivate-wayland.h b/gdk/wayland/gdkprivate-wayland.h
index 5ef028c134..4df2f33ffd 100644
--- a/gdk/wayland/gdkprivate-wayland.h
+++ b/gdk/wayland/gdkprivate-wayland.h
@@ -62,11 +62,11 @@ struct wl_cursor_theme * _gdk_wayland_display_get_scaled_cursor_theme (GdkWaylan
                                                                        guint              scale);
 
 void       _gdk_wayland_display_get_default_cursor_size (GdkDisplay *display,
-                                                        guint       *width,
-                                                        guint       *height);
+                                                         guint       *width,
+                                                         guint       *height);
 void       _gdk_wayland_display_get_maximal_cursor_size (GdkDisplay *display,
-                                                        guint       *width,
-                                                        guint       *height);
+                                                         guint       *width,
+                                                         guint       *height);
 gboolean   _gdk_wayland_display_supports_cursor_alpha (GdkDisplay *display);
 gboolean   _gdk_wayland_display_supports_cursor_color (GdkDisplay *display);
 
@@ -81,7 +81,7 @@ struct wl_buffer *_gdk_wayland_cursor_get_buffer (GdkWaylandDisplay *display,
                                                   int               *hotspot_y,
                                                   int               *w,
                                                   int               *h,
-                                                 int               *scale);
+                                                  int               *scale);
 guint      _gdk_wayland_cursor_get_next_image_index (GdkWaylandDisplay *display,
                                                      GdkCursor         *cursor,
                                                      guint              scale,
@@ -92,21 +92,21 @@ void       gdk_wayland_surface_sync (GdkSurface *surface);
 
 void            _gdk_wayland_surface_register_dnd          (GdkSurface *surface);
 GdkDragContext *_gdk_wayland_surface_drag_begin            (GdkSurface *surface,
-                                                          GdkDevice *device,
-                                                          GdkContentProvider *content,
-                                                           GdkDragAction actions,
-                                                           gint       dx,
-                                                           gint       dy);
+                                                            GdkDevice *device,
+                                                            GdkContentProvider *content,
+                                                            GdkDragAction actions,
+                                                            gint       dx,
+                                                            gint       dy);
 void            _gdk_wayland_surface_offset_next_wl_buffer (GdkSurface *surface,
-                                                           int        x,
-                                                           int        y);
+                                                            int        x,
+                                                            int        y);
 GdkDragContext * _gdk_wayland_drop_context_new (GdkDisplay            *display,
                                                 struct wl_data_device *data_device);
 void _gdk_wayland_drag_context_set_source_surface (GdkDragContext *context,
                                                   GdkSurface      *surface);
 void _gdk_wayland_drag_context_set_dest_surface (GdkDragContext *context,
-                                                GdkSurface      *dest_surface,
-                                                uint32_t        serial);
+                                                 GdkSurface      *dest_surface,
+                                                 uint32_t        serial);
 void _gdk_wayland_drag_context_emit_event (GdkDragContext *context,
                                            GdkEventType    type,
                                            guint32         time_);
@@ -124,19 +124,19 @@ struct wl_data_source * gdk_wayland_drag_context_get_data_source  (GdkDragContex
 void gdk_wayland_drop_context_update_targets (GdkDragContext *context);
 
 void _gdk_wayland_display_create_surface_impl (GdkDisplay    *display,
-                                             GdkSurface     *surface,
-                                             GdkSurface     *real_parent,
-                                             GdkEventMask   event_mask,
-                                             GdkSurfaceAttr *attributes);
+                                              GdkSurface     *surface,
+                                              GdkSurface     *real_parent,
+                                              GdkEventMask   event_mask,
+                                              GdkSurfaceAttr *attributes);
 
 gint        _gdk_wayland_display_text_property_to_utf8_list (GdkDisplay    *display,
-                                                            GdkAtom        encoding,
-                                                            gint           format,
-                                                            const guchar  *text,
-                                                            gint           length,
-                                                            gchar       ***list);
+                                                             GdkAtom        encoding,
+                                                             gint           format,
+                                                             const guchar  *text,
+                                                             gint           length,
+                                                             gchar       ***list);
 gchar *     _gdk_wayland_display_utf8_to_string_target (GdkDisplay  *display,
-                                                       const gchar *str);
+                                                        const gchar *str);
 
 void        _gdk_wayland_display_create_seat    (GdkWaylandDisplay *display,
                                                  guint32                  id,
@@ -213,7 +213,7 @@ gboolean gdk_wayland_selection_set_current_offer_actions (GdkDisplay *display,
 EGLSurface gdk_wayland_surface_get_egl_surface (GdkSurface *surface,
                                                EGLConfig config);
 EGLSurface gdk_wayland_surface_get_dummy_egl_surface (GdkSurface *surface,
-                                                    EGLConfig config);
+                                                     EGLConfig config);
 
 struct gtk_surface1 * gdk_wayland_surface_get_gtk_surface (GdkSurface *surface);
 
diff --git a/gdk/wayland/gdkwaylandsurface.h b/gdk/wayland/gdkwaylandsurface.h
index 49dafde67f..f407e9921f 100644
--- a/gdk/wayland/gdkwaylandsurface.h
+++ b/gdk/wayland/gdkwaylandsurface.h
@@ -47,7 +47,7 @@ GType                    gdk_wayland_surface_get_type             (void);
 
 GDK_AVAILABLE_IN_ALL
 GdkSurface *              gdk_wayland_surface_new_subsurface       (GdkDisplay            *display,
-                                                                  const GdkRectangle    *position);
+                                                                    const GdkRectangle    *position);
 GDK_AVAILABLE_IN_ALL
 struct wl_surface       *gdk_wayland_surface_get_wl_surface       (GdkSurface *surface);
 
@@ -56,12 +56,12 @@ void                     gdk_wayland_surface_set_use_custom_surface (GdkSurface
 
 GDK_AVAILABLE_IN_ALL
 void                     gdk_wayland_surface_set_dbus_properties_libgtk_only (GdkSurface  *surface,
-                                                                            const char *application_id,
-                                                                            const char *app_menu_path,
-                                                                            const char *menubar_path,
-                                                                            const char *window_object_path,
-                                                                            const char 
*application_object_path,
-                                                                            const char *unique_bus_name);
+                                                                              const char *application_id,
+                                                                              const char *app_menu_path,
+                                                                              const char *menubar_path,
+                                                                              const char *window_object_path,
+                                                                              const char 
*application_object_path,
+                                                                              const char *unique_bus_name);
 
 typedef void (*GdkWaylandSurfaceExported) (GdkSurface  *surface,
                                           const char *handle,
@@ -69,16 +69,16 @@ typedef void (*GdkWaylandSurfaceExported) (GdkSurface  *surface,
 
 GDK_AVAILABLE_IN_ALL
 gboolean                 gdk_wayland_surface_export_handle (GdkSurface               *surface,
-                                                           GdkWaylandSurfaceExported callback,
-                                                           gpointer                 user_data,
-                                                           GDestroyNotify           destroy_func);
+                                                            GdkWaylandSurfaceExported callback,
+                                                            gpointer                 user_data,
+                                                            GDestroyNotify           destroy_func);
 
 GDK_AVAILABLE_IN_ALL
 void                     gdk_wayland_surface_unexport_handle (GdkSurface *surface);
 
 GDK_AVAILABLE_IN_ALL
 gboolean                 gdk_wayland_surface_set_transient_for_exported (GdkSurface *surface,
-                                                                        char      *parent_handle_str);
+                                                                         char      *parent_handle_str);
 
 void gdk_wayland_surface_announce_csd                        (GdkSurface *surface);
 
diff --git a/gdk/win32/gdkprivate-win32.h b/gdk/win32/gdkprivate-win32.h
index 6e51091ff5..967618538d 100644
--- a/gdk/win32/gdkprivate-win32.h
+++ b/gdk/win32/gdkprivate-win32.h
@@ -8,7 +8,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -156,40 +156,40 @@ gulong _gdk_win32_get_next_tick (gulong suggested_tick);
 
 void _gdk_surface_init_position     (GdkSurface *window);
 void _gdk_surface_move_resize_child (GdkSurface *window,
-                                   gint       x,
-                                   gint       y,
-                                   gint       width,
-                                   gint       height);
+                                     gint       x,
+                                     gint       y,
+                                     gint       width,
+                                     gint       height);
 
 gboolean _gdk_win32_surface_enable_transparency (GdkSurface *window);
 
 
 /* GdkSurfaceImpl methods */
 void _gdk_win32_surface_scroll (GdkSurface *window,
-                              gint       dx,
-                              gint       dy);
+                                gint       dx,
+                                gint       dy);
 void _gdk_win32_surface_move_region (GdkSurface       *window,
-                                   const cairo_region_t *region,
-                                   gint             dx,
-                                   gint             dy);
+                                     const cairo_region_t *region,
+                                     gint             dx,
+                                     gint             dy);
 
 
 void _gdk_win32_selection_init (void);
 void _gdk_win32_dnd_exit (void);
 
-void    gdk_win32_handle_table_insert  (HANDLE   *handle,
-                                        gpointer data);
-void    gdk_win32_handle_table_remove  (HANDLE handle);
+void     gdk_win32_handle_table_insert  (HANDLE   *handle,
+                                         gpointer data);
+void     gdk_win32_handle_table_remove  (HANDLE handle);
 
-HRGN     _gdk_win32_cairo_region_to_hrgn (const cairo_region_t *region,
-                                          gint                  x_origin,
-                                          gint                  y_origin);
+HRGN      _gdk_win32_cairo_region_to_hrgn (const cairo_region_t *region,
+                                           gint                  x_origin,
+                                           gint                  y_origin);
 
 cairo_region_t *_gdk_win32_hrgn_to_region    (HRGN  hrgn,
                                               guint scale);
 
-void   _gdk_win32_adjust_client_rect   (GdkSurface *window,
-                                        RECT      *RECT);
+void    _gdk_win32_adjust_client_rect   (GdkSurface *window,
+                                         RECT      *RECT);
 
 void    _gdk_selection_property_delete (GdkSurface *);
 
@@ -202,7 +202,7 @@ gboolean   _gdk_modal_blocked       (GdkSurface *window);
 
 #ifdef G_ENABLE_DEBUG
 void   _gdk_win32_print_paletteentries (const PALETTEENTRY *pep,
-                                       const int           nentries);
+                                        const int           nentries);
 void   _gdk_win32_print_system_palette (void);
 void   _gdk_win32_print_hpalette       (HPALETTE     hpal);
 void   _gdk_win32_print_dc             (HDC          hdc);
@@ -225,7 +225,7 @@ gchar *_gdk_win32_message_to_string    (UINT         msg);
 gchar *_gdk_win32_key_to_string        (LONG         lParam);
 gchar *_gdk_win32_cf_to_string         (UINT         format);
 gchar *_gdk_win32_data_to_string       (const guchar*data,
-                                       int          nbytes);
+                                        int          nbytes);
 gchar *_gdk_win32_rect_to_string       (const RECT  *rect);
 
 gchar *_gdk_win32_gdkrectangle_to_string (const GdkRectangle *rect);
@@ -237,9 +237,9 @@ void   _gdk_win32_print_event            (const GdkEvent     *event);
 
 gchar  *_gdk_win32_last_error_string (void);
 void    _gdk_win32_api_failed        (const gchar *where,
-                                    const gchar *api);
+                                      const gchar *api);
 void    _gdk_other_api_failed        (const gchar *where,
-                                    const gchar *api);
+                                      const gchar *api);
 
 #define WIN32_API_FAILED(api) _gdk_win32_api_failed (G_STRLOC , api)
 #define WIN32_GDI_FAILED(api) WIN32_API_FAILED (api)
@@ -265,31 +265,31 @@ extern GdkDeviceManagerWin32 *_gdk_device_manager;
  * to the left and/or above the primary monitor) to get GDK
  * coordinates, which should be non-negative on the whole screen.
  */
-extern gint             _gdk_offset_x, _gdk_offset_y;
+extern gint              _gdk_offset_x, _gdk_offset_y;
 
-extern HDC              _gdk_display_hdc;
-extern HINSTANCE        _gdk_dll_hinstance;
-extern HINSTANCE        _gdk_app_hmodule;
+extern HDC               _gdk_display_hdc;
+extern HINSTANCE         _gdk_dll_hinstance;
+extern HINSTANCE         _gdk_app_hmodule;
 
-extern gint             _gdk_input_ignore_core;
+extern gint              _gdk_input_ignore_core;
 
 /* These are thread specific, but GDK/win32 works OK only when invoked
  * from a single thread anyway.
  */
-extern HKL              _gdk_input_locale;
-extern gboolean                 _gdk_input_locale_is_ime;
-extern UINT             _gdk_input_codepage;
+extern HKL               _gdk_input_locale;
+extern gboolean          _gdk_input_locale_is_ime;
+extern UINT              _gdk_input_codepage;
 
-extern guint            _gdk_keymap_serial;
+extern guint             _gdk_keymap_serial;
 
 /* The singleton selection object pointer */
 GdkWin32Selection *_win32_selection;
 
 void _gdk_win32_dnd_do_dragdrop (void);
 void _gdk_win32_ole2_dnd_property_change (GdkAtom       type,
-                                         gint          format,
-                                         const guchar *data,
-                                         gint          nelements);
+                                          gint          format,
+                                          const guchar *data,
+                                          gint          nelements);
 
 typedef enum {
   GDK_WIN32_MODAL_OP_NONE = 0x0,
@@ -304,23 +304,23 @@ typedef enum {
 /* Non-zero while a modal sizing, moving, or dnd operation is in progress */
 extern GdkWin32ModalOpKind _modal_operation_in_progress;
 
-extern HWND            _modal_move_resize_window;
+extern HWND             _modal_move_resize_window;
 
 void  _gdk_win32_begin_modal_call (GdkWin32ModalOpKind kind);
 void  _gdk_win32_end_modal_call (GdkWin32ModalOpKind kind);
 
 
 /* Options */
-extern gboolean                 _gdk_input_ignore_wintab;
-extern gint             _gdk_max_colors;
+extern gboolean          _gdk_input_ignore_wintab;
+extern gint              _gdk_max_colors;
 
 /* Convert a pixbuf to an HICON (or HCURSOR).  Supports alpha under
  * Windows XP, thresholds alpha otherwise.
  */
 HICON _gdk_win32_texture_to_hicon  (GdkTexture *texture);
 HICON _gdk_win32_pixbuf_to_hcursor (GdkPixbuf *pixbuf,
-                                   gint       x_hotspot,
-                                   gint       y_hotspot);
+                                    gint       x_hotspot,
+                                    gint       y_hotspot);
 
 void _gdk_win32_display_init_cursors (GdkWin32Display     *display);
 void _gdk_win32_display_finalize_cursors (GdkWin32Display *display);
@@ -361,11 +361,11 @@ Win32CursorTheme *_gdk_win32_display_get_cursor_theme (GdkWin32Display  *win32_d
 
 /* GdkDisplay member functions */
 void     _gdk_win32_display_get_default_cursor_size (GdkDisplay  *display,
-                                                    guint       *width,
-                                                    guint       *height);
+                                                     guint       *width,
+                                                     guint       *height);
 void     _gdk_win32_display_get_maximal_cursor_size (GdkDisplay  *display,
-                                                    guint       *width,
-                                                    guint       *height);
+                                                     guint       *width,
+                                                     guint       *height);
 gboolean _gdk_win32_display_supports_cursor_alpha (GdkDisplay    *display);
 gboolean _gdk_win32_display_supports_cursor_color (GdkDisplay    *display);
 
@@ -375,32 +375,32 @@ gboolean _gdk_win32_display_has_pending (GdkDisplay *display);
 void _gdk_win32_display_queue_events (GdkDisplay *display);
 
 gboolean _gdk_win32_selection_owner_set_for_display (GdkDisplay *display,
-                                                    GdkSurface  *owner,
-                                                    GdkAtom     selection,
-                                                    guint32     time,
-                                                    gboolean    send_event);
+                                                     GdkSurface  *owner,
+                                                     GdkAtom     selection,
+                                                     guint32     time,
+                                                     gboolean    send_event);
 void       _gdk_win32_display_send_selection_notify (GdkDisplay      *display,
-                                                    GdkSurface       *requestor,
-                                                    GdkAtom          selection,
-                                                    GdkAtom          target,
-                                                    GdkAtom          property,
-                                                    guint32          time);
+                                                     GdkSurface       *requestor,
+                                                     GdkAtom          selection,
+                                                     GdkAtom          target,
+                                                     GdkAtom          property,
+                                                     guint32          time);
 gint      _gdk_win32_display_get_selection_property (GdkDisplay *display,
-                                                    GdkSurface  *requestor,
-                                                    guchar    **data,
-                                                    GdkAtom    *ret_type,
-                                                    gint       *ret_format);
+                                                     GdkSurface  *requestor,
+                                                     guchar    **data,
+                                                     GdkAtom    *ret_type,
+                                                     gint       *ret_format);
 void      _gdk_win32_display_convert_selection (GdkDisplay *display,
-                                               GdkSurface *requestor,
-                                               GdkAtom    selection,
-                                               GdkAtom    target,
-                                               guint32    time);
+                                                GdkSurface *requestor,
+                                                GdkAtom    selection,
+                                                GdkAtom    target,
+                                                guint32    time);
 gint      _gdk_win32_display_text_property_to_utf8_list (GdkDisplay    *display,
-                                                        GdkAtom        encoding,
-                                                        gint           format,
-                                                        const guchar  *text,
-                                                        gint           length,
-                                                        gchar       ***list);
+                                                         GdkAtom        encoding,
+                                                         gint           format,
+                                                         const guchar  *text,
+                                                         gint           length,
+                                                         gchar       ***list);
 gchar     *_gdk_win32_display_utf8_to_string_target (GdkDisplay *display, const gchar *str);
 
 gboolean   _gdk_win32_keymap_has_altgr           (GdkWin32Keymap *keymap);
@@ -413,19 +413,19 @@ void       _gdk_win32_keymap_set_active_layout   (GdkWin32Keymap *keymap,
 GdkKeymap *_gdk_win32_display_get_keymap (GdkDisplay *display);
 
 void       _gdk_win32_display_create_surface_impl   (GdkDisplay    *display,
-                                                    GdkSurface     *window,
-                                                    GdkSurface     *real_parent,
-                                                    GdkEventMask   event_mask,
-                                                    GdkSurfaceAttr *attributes);
+                                                     GdkSurface     *window,
+                                                     GdkSurface     *real_parent,
+                                                     GdkEventMask   event_mask,
+                                                     GdkSurfaceAttr *attributes);
 
 /* stray GdkSurfaceImplWin32 members */
 void _gdk_win32_surface_register_dnd (GdkSurface *window);
 GdkDragContext *_gdk_win32_surface_drag_begin (GdkSurface         *window,
-                                              GdkDevice         *device,
-                                              GdkContentFormats *formats,
-                                              GdkDragAction      actions,
-                                              gint               x_root,
-                                              gint               y_root);
+                                               GdkDevice         *device,
+                                               GdkContentFormats *formats,
+                                               GdkDragAction      actions,
+                                               gint               x_root,
+                                               gint               y_root);
 
 /* Stray GdkWin32Screen members */
 gboolean _gdk_win32_get_setting (const gchar *name, GValue *value);
@@ -436,10 +436,10 @@ GdkSurface *gdk_win32_display_get_root_window (GdkDisplay *display);
 /* Distributed display manager implementation */
 GdkDisplay *_gdk_win32_display_open (const gchar *display_name);
 GdkAtom _gdk_win32_display_manager_atom_intern (GdkDisplayManager *manager,
-                                               const gchar *atom_name,
-                                               gint         only_if_exists);
+                                                const gchar *atom_name,
+                                                gint         only_if_exists);
 gchar *_gdk_win32_display_manager_get_atom_name (GdkDisplayManager *manager,
-                                                GdkAtom            atom);
+                                                 GdkAtom            atom);
 void _gdk_win32_append_event (GdkEvent *event);
 void _gdk_win32_emit_configure_event (GdkSurface *window);
 
@@ -447,18 +447,18 @@ void _gdk_win32_emit_configure_event (GdkSurface *window);
 guint32 _gdk_win32_keymap_get_decimal_mark (GdkWin32Keymap *keymap);
 
 void     _gdk_win32_surface_handle_aerosnap      (GdkSurface            *window,
-                                                 GdkWin32AeroSnapCombo combo);
+                                                  GdkWin32AeroSnapCombo combo);
 
 gboolean _gdk_win32_get_window_rect             (GdkSurface  *window,
                                                  RECT       *rect);
 void     _gdk_win32_do_emit_configure_event     (GdkSurface  *window,
                                                  RECT        rect);
 void      gdk_win32_surface_do_move_resize_drag  (GdkSurface  *window,
-                                                 gint        x,
-                                                 gint        y);
+                                                  gint        x,
+                                                  gint        y);
 void      gdk_win32_surface_end_move_resize_drag (GdkSurface  *window);
 gboolean _gdk_win32_surface_fill_min_max_info    (GdkSurface  *window,
-                                                 MINMAXINFO *mmi);
+                                                  MINMAXINFO *mmi);
 
 gboolean _gdk_win32_surface_lacks_wm_decorations (GdkSurface *window);
 
diff --git a/gdk/win32/gdksurface-win32.h b/gdk/win32/gdksurface-win32.h
index c037a33281..d99fdd0fcb 100644
--- a/gdk/win32/gdksurface-win32.h
+++ b/gdk/win32/gdksurface-win32.h
@@ -360,9 +360,9 @@ struct _GdkSurfaceImplWin32Class
 GType _gdk_surface_impl_win32_get_type (void);
 
 void  _gdk_win32_surface_tmp_unset_bg  (GdkSurface *window,
-                                      gboolean   recurse);
+                                        gboolean   recurse);
 void  _gdk_win32_surface_tmp_reset_bg  (GdkSurface *window,
-                                      gboolean   recurse);
+                                        gboolean   recurse);
 
 void  _gdk_win32_surface_tmp_unset_parent_bg (GdkSurface *window);
 void  _gdk_win32_surface_tmp_reset_parent_bg (GdkSurface *window);
diff --git a/gdk/win32/gdkwin32misc.h b/gdk/win32/gdkwin32misc.h
index 75c5fc7ca1..7a32ba96a3 100644
--- a/gdk/win32/gdkwin32misc.h
+++ b/gdk/win32/gdkwin32misc.h
@@ -83,10 +83,10 @@ HGDIOBJ       gdk_win32_surface_get_handle (GdkSurface *window);
 
 GDK_AVAILABLE_IN_ALL
 GdkSurface *   gdk_win32_surface_foreign_new_for_display (GdkDisplay *display,
-                                                        HWND        anid);
+                                                          HWND        anid);
 GDK_AVAILABLE_IN_ALL
 GdkSurface *   gdk_win32_surface_lookup_for_display (GdkDisplay *display,
-                                                   HWND        anid);
+                                                     HWND        anid);
 
 #if defined (INSIDE_GDK_WIN32) || defined (GDK_COMPILATION) || defined (GTK_COMPILATION)
 
diff --git a/gdk/x11/gdkeventtranslator.h b/gdk/x11/gdkeventtranslator.h
index 5cbc41d539..96a3a0b69e 100644
--- a/gdk/x11/gdkeventtranslator.h
+++ b/gdk/x11/gdkeventtranslator.h
@@ -43,12 +43,12 @@ struct _GdkEventTranslatorIface
                                 GdkEvent           *event,
                                 const XEvent       *xevent);
 
-  GdkEventMask (* get_handled_events)   (GdkEventTranslator *translator);
+  GdkEventMask (* get_handled_events)    (GdkEventTranslator *translator);
   void         (* select_surface_events) (GdkEventTranslator *translator,
-                                         Window              window,
-                                         GdkEventMask        event_mask);
-  GdkSurface *  (* get_surface)         (GdkEventTranslator *translator,
-                                         const XEvent       *xevent);
+                                          Window              window,
+                                          GdkEventMask        event_mask);
+  GdkSurface *  (* get_surface)          (GdkEventTranslator *translator,
+                                          const XEvent       *xevent);
 };
 
 GType      _gdk_x11_event_translator_get_type (void) G_GNUC_CONST;
@@ -56,13 +56,13 @@ GType      _gdk_x11_event_translator_get_type (void) G_GNUC_CONST;
 GdkEvent * _gdk_x11_event_translator_translate (GdkEventTranslator *translator,
                                                 GdkDisplay         *display,
                                                 const XEvent       *xevent);
-GdkEventMask _gdk_x11_event_translator_get_handled_events   (GdkEventTranslator *translator);
+GdkEventMask _gdk_x11_event_translator_get_handled_events    (GdkEventTranslator *translator);
 void         _gdk_x11_event_translator_select_surface_events (GdkEventTranslator *translator,
-                                                             Window              window,
-                                                             GdkEventMask        event_mask);
-GdkSurface *  _gdk_x11_event_translator_get_surface         (GdkEventTranslator *translator,
-                                                             GdkDisplay         *display,
-                                                             const XEvent       *xevent);
+                                                              Window              window,
+                                                              GdkEventMask        event_mask);
+GdkSurface *  _gdk_x11_event_translator_get_surface          (GdkEventTranslator *translator,
+                                                              GdkDisplay         *display,
+                                                              const XEvent       *xevent);
 
 G_END_DECLS
 
diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 3c9f6ca7ad..67d38b71f6 100644
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -103,7 +103,7 @@ void     _gdk_x11_keymap_add_virt_mods   (GdkKeymap       *keymap,
 void _gdk_x11_surfaceing_init    (void);
 
 void _gdk_x11_surface_grab_check_unmap   (GdkSurface *window,
-                                         gulong     serial);
+                                          gulong     serial);
 void _gdk_x11_surface_grab_check_destroy (GdkSurface *window);
 
 gboolean _gdk_x11_display_is_root_window (GdkDisplay *display,
@@ -183,11 +183,11 @@ void       _gdk_x11_display_get_maximal_cursor_size (GdkDisplay *display,
                                                      guint      *width,
                                                      guint      *height);
 void       _gdk_x11_display_create_surface_impl     (GdkDisplay    *display,
-                                                    GdkSurface     *window,
-                                                    GdkSurface     *real_parent,
-                                                    GdkEventMask   event_mask,
-                                                    GdkSurfaceAttr *attributes);
-GList *    gdk_x11_display_get_toplevel_windows    (GdkDisplay *display);
+                                                     GdkSurface     *window,
+                                                     GdkSurface     *real_parent,
+                                                     GdkEventMask   event_mask,
+                                                     GdkSurfaceAttr *attributes);
+GList *    gdk_x11_display_get_toplevel_windows     (GdkDisplay *display);
 
 void _gdk_x11_precache_atoms (GdkDisplay          *display,
                               const gchar * const *atom_names,
@@ -204,8 +204,8 @@ _gdk_x11_dnd_filter (const XEvent *xevent,
 
 GdkFilterReturn
 xdnd_source_surface_filter (const XEvent *xevent,
-                           GdkEvent     *event,
-                           gpointer      data);
+                            GdkEvent     *event,
+                            gpointer      data);
 
 typedef struct _GdkSurfaceCache GdkSurfaceCache;
 
@@ -214,30 +214,30 @@ gdk_surface_cache_get (GdkDisplay *display);
 
 GdkFilterReturn
 gdk_surface_cache_filter (const XEvent *xevent,
-                         GdkEvent     *event,
-                         gpointer      data);
+                          GdkEvent     *event,
+                          gpointer      data);
 GdkFilterReturn
 gdk_surface_cache_shape_filter (const XEvent *xevent,
-                               GdkEvent     *event,
-                               gpointer      data);
+                                GdkEvent     *event,
+                                gpointer      data);
 
 void _gdk_x11_cursor_display_finalize (GdkDisplay *display);
 
 void _gdk_x11_surface_register_dnd (GdkSurface *window);
 
 GdkDragContext * _gdk_x11_surface_drag_begin (GdkSurface          *window,
-                                             GdkDevice          *device,
-                                             GdkContentProvider *content,
-                                             GdkDragAction       actions,
-                                             gint                dx,
-                                             gint                dy);
+                                              GdkDevice          *device,
+                                              GdkContentProvider *content,
+                                              GdkDragAction       actions,
+                                              gint                dx,
+                                              gint                dy);
 
 GdkGrabStatus _gdk_x11_convert_grab_status (gint status);
 
 cairo_surface_t * _gdk_x11_display_create_bitmap_surface (GdkDisplay *display,
                                                           int         width,
                                                           int         height);
- 
+
 extern const gint        _gdk_x11_event_mask_table[];
 extern const gint        _gdk_x11_event_mask_table_size;
 
diff --git a/gdk/x11/gdkscreen-x11.h b/gdk/x11/gdkscreen-x11.h
index 08e3e8ba87..af39131adb 100644
--- a/gdk/x11/gdkscreen-x11.h
+++ b/gdk/x11/gdkscreen-x11.h
@@ -108,7 +108,7 @@ void _gdk_x11_screen_get_edge_monitors      (GdkX11Screen *screen,
                                              gint         *bottom,
                                              gint         *left,
                                              gint         *right);
-void _gdk_x11_screen_set_surface_scale       (GdkX11Screen *x11_screen,
+void _gdk_x11_screen_set_surface_scale      (GdkX11Screen *x11_screen,
                                              int           scale);
 void gdk_x11_screen_get_work_area           (GdkX11Screen *screen,
                                              GdkRectangle *area);
diff --git a/gdk/x11/gdksurface-x11.h b/gdk/x11/gdksurface-x11.h
index 08f3befe43..1beda132d8 100644
--- a/gdk/x11/gdksurface-x11.h
+++ b/gdk/x11/gdksurface-x11.h
@@ -191,8 +191,8 @@ GdkToplevelX11 *_gdk_x11_surface_get_toplevel        (GdkSurface *window);
 GdkCursor      *_gdk_x11_surface_get_cursor          (GdkSurface *window);
 
 void            _gdk_x11_surface_update_size         (GdkSurfaceImplX11 *impl);
-void            _gdk_x11_surface_set_surface_scale    (GdkSurface *window,
-                                                    int        scale);
+void            _gdk_x11_surface_set_surface_scale   (GdkSurface *window,
+                                                      int        scale);
 
 G_END_DECLS
 
diff --git a/gdk/x11/gdkx11display.h b/gdk/x11/gdkx11display.h
index 4bf8de7452..570d08b0fa 100644
--- a/gdk/x11/gdkx11display.h
+++ b/gdk/x11/gdkx11display.h
@@ -112,7 +112,7 @@ void        gdk_x11_display_ungrab            (GdkDisplay *display);
 
 GDK_AVAILABLE_IN_ALL
 void        gdk_x11_display_set_surface_scale (GdkDisplay *display,
-                                              gint scale);
+                                               gint scale);
 
 GDK_AVAILABLE_IN_ALL
 void                           gdk_x11_display_error_trap_push        (GdkDisplay *display);
diff --git a/gdk/x11/gdkx11surface.h b/gdk/x11/gdkx11surface.h
index 85f46c120e..279efed8f0 100644
--- a/gdk/x11/gdkx11surface.h
+++ b/gdk/x11/gdkx11surface.h
@@ -57,14 +57,14 @@ GDK_AVAILABLE_IN_ALL
 Window   gdk_x11_surface_get_xid           (GdkSurface   *surface);
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_surface_set_user_time     (GdkSurface   *surface,
-                                           guint32      timestamp);
+                                            guint32      timestamp);
 GDK_AVAILABLE_IN_ALL
-void     gdk_x11_surface_set_utf8_property    (GdkSurface *surface,
-                                             const gchar *name,
-                                             const gchar *value);
+void     gdk_x11_surface_set_utf8_property (GdkSurface *surface,
+                                            const gchar *name,
+                                            const gchar *value);
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_surface_set_theme_variant (GdkSurface   *surface,
-                                           const char  *variant);
+                                            const char  *variant);
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_surface_move_to_current_desktop (GdkSurface   *surface);
 
@@ -72,11 +72,11 @@ GDK_AVAILABLE_IN_ALL
 guint32  gdk_x11_surface_get_desktop             (GdkSurface   *surface);
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_surface_move_to_desktop         (GdkSurface   *surface,
-                                                 guint32      desktop);
+                                                  guint32      desktop);
 
 GDK_AVAILABLE_IN_ALL
 void     gdk_x11_surface_set_frame_sync_enabled (GdkSurface *surface,
-                                                gboolean   frame_sync_enabled);
+                                                 gboolean   frame_sync_enabled);
 
 /**
  * GDK_SURFACE_XDISPLAY:
@@ -103,10 +103,10 @@ guint32       gdk_x11_get_server_time  (GdkSurface       *surface);
 
 GDK_AVAILABLE_IN_ALL
 GdkSurface  *gdk_x11_surface_foreign_new_for_display (GdkDisplay *display,
-                                                    Window      window);
+                                                      Window      window);
 GDK_AVAILABLE_IN_ALL
 GdkSurface  *gdk_x11_surface_lookup_for_display      (GdkDisplay *display,
-                                                    Window      window);
+                                                      Window      window);
 
 G_END_DECLS
 
diff --git a/gtk/gtkwidget.h b/gtk/gtkwidget.h
index 093ffefc37..e8118fb343 100644
--- a/gtk/gtkwidget.h
+++ b/gtk/gtkwidget.h
@@ -8,7 +8,7 @@
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.         See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
@@ -41,17 +41,17 @@ G_BEGIN_DECLS
 /* Macro for casting a pointer to a GtkWidget or GtkWidgetClass pointer.
  * Macros for testing whether widget or klass are of type GTK_TYPE_WIDGET.
  */
-#define GTK_TYPE_WIDGET                          (gtk_widget_get_type ())
-#define GTK_WIDGET(widget)               (G_TYPE_CHECK_INSTANCE_CAST ((widget), GTK_TYPE_WIDGET, GtkWidget))
-#define GTK_WIDGET_CLASS(klass)                  (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET, 
GtkWidgetClass))
-#define GTK_IS_WIDGET(widget)            (G_TYPE_CHECK_INSTANCE_TYPE ((widget), GTK_TYPE_WIDGET))
-#define GTK_IS_WIDGET_CLASS(klass)       (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WIDGET))
+#define GTK_TYPE_WIDGET                   (gtk_widget_get_type ())
+#define GTK_WIDGET(widget)                (G_TYPE_CHECK_INSTANCE_CAST ((widget), GTK_TYPE_WIDGET, GtkWidget))
+#define GTK_WIDGET_CLASS(klass)           (G_TYPE_CHECK_CLASS_CAST ((klass), GTK_TYPE_WIDGET, 
GtkWidgetClass))
+#define GTK_IS_WIDGET(widget)             (G_TYPE_CHECK_INSTANCE_TYPE ((widget), GTK_TYPE_WIDGET))
+#define GTK_IS_WIDGET_CLASS(klass)        (G_TYPE_CHECK_CLASS_TYPE ((klass), GTK_TYPE_WIDGET))
 #define GTK_WIDGET_GET_CLASS(obj)         (G_TYPE_INSTANCE_GET_CLASS ((obj), GTK_TYPE_WIDGET, 
GtkWidgetClass))
 
 #define GTK_TYPE_REQUISITION              (gtk_requisition_get_type ())
 
 typedef struct _GtkWidgetPrivate       GtkWidgetPrivate;
-typedef struct _GtkWidgetClass        GtkWidgetClass;
+typedef struct _GtkWidgetClass         GtkWidgetClass;
 typedef struct _GtkWidgetClassPrivate  GtkWidgetClassPrivate;
 
 /**
@@ -67,7 +67,7 @@ typedef struct _GtkWidgetClassPrivate  GtkWidgetClassPrivate;
  * [GtkWidget’s geometry management section][geometry-management] for
  * more information.
  */
-typedef        GdkRectangle       GtkAllocation;
+typedef         GdkRectangle       GtkAllocation;
 
 /**
  * GtkCallback:
@@ -78,7 +78,7 @@ typedef       GdkRectangle       GtkAllocation;
  * the children of a container, see gtk_container_foreach().
  */
 typedef void    (*GtkCallback)     (GtkWidget        *widget,
-                                   gpointer          data);
+                                    gpointer          data);
 
 /**
  * GtkTickCallback:
@@ -244,32 +244,32 @@ struct _GtkWidgetClass
 
   /* seldomly overidden */
   void (*dispatch_child_properties_changed) (GtkWidget   *widget,
-                                            guint        n_pspecs,
-                                            GParamSpec **pspecs);
+                                             guint        n_pspecs,
+                                             GParamSpec **pspecs);
 
   /* basics */
   void (* destroy)             (GtkWidget        *widget);
-  void (* show)                       (GtkWidget        *widget);
-  void (* hide)                       (GtkWidget        *widget);
-  void (* map)                (GtkWidget        *widget);
-  void (* unmap)              (GtkWidget        *widget);
-  void (* realize)            (GtkWidget        *widget);
-  void (* unrealize)          (GtkWidget        *widget);
+  void (* show)                (GtkWidget        *widget);
+  void (* hide)                (GtkWidget        *widget);
+  void (* map)                 (GtkWidget        *widget);
+  void (* unmap)               (GtkWidget        *widget);
+  void (* realize)             (GtkWidget        *widget);
+  void (* unrealize)           (GtkWidget        *widget);
   void (* size_allocate)       (GtkWidget           *widget,
                                 const GtkAllocation *allocation,
                                 int                  baseline,
                                 GtkAllocation       *out_clip);
   void (* state_flags_changed) (GtkWidget        *widget,
-                               GtkStateFlags     previous_state_flags);
+                                GtkStateFlags     previous_state_flags);
   void (* hierarchy_changed)   (GtkWidget        *widget,
-                               GtkWidget        *previous_toplevel);
+                                GtkWidget        *previous_toplevel);
   void (* direction_changed)   (GtkWidget        *widget,
-                               GtkTextDirection  previous_direction);
+                                GtkTextDirection  previous_direction);
   void (* grab_notify)         (GtkWidget        *widget,
-                               gboolean          was_grabbed);
-  void (* child_notify)        (GtkWidget       *widget,
-                               GParamSpec       *child_property);
-  gboolean (* draw)           (GtkWidget        *widget,
+                                gboolean          was_grabbed);
+  void (* child_notify)        (GtkWidget        *widget,
+                                GParamSpec       *child_property);
+  gboolean (* draw)            (GtkWidget        *widget,
                                 cairo_t          *cr);
 
   /* size requests */
@@ -298,43 +298,43 @@ struct _GtkWidgetClass
                                          GtkDirectionType     direction);
 
   /* events */
-  gboolean (* event)                   (GtkWidget           *widget,
-                                        GdkEvent            *event);
-  gboolean (* key_press_event)         (GtkWidget           *widget,
-                                        GdkEventKey         *event);
-  gboolean (* key_release_event)       (GtkWidget           *widget,
-                                        GdkEventKey         *event);
+  gboolean (* event)                    (GtkWidget           *widget,
+                                         GdkEvent            *event);
+  gboolean (* key_press_event)          (GtkWidget           *widget,
+                                         GdkEventKey         *event);
+  gboolean (* key_release_event)        (GtkWidget           *widget,
+                                         GdkEventKey         *event);
 
   /* Source side drag signals */
   void     (* drag_begin)          (GtkWidget         *widget,
-                                   GdkDragContext     *context);
-  void     (* drag_end)                   (GtkWidget          *widget,
-                                   GdkDragContext     *context);
+                                    GdkDragContext     *context);
+  void     (* drag_end)            (GtkWidget          *widget,
+                                    GdkDragContext     *context);
   void     (* drag_data_get)       (GtkWidget          *widget,
-                                   GdkDragContext     *context,
-                                   GtkSelectionData   *selection_data,
-                                   guint               time_);
+                                    GdkDragContext     *context,
+                                    GtkSelectionData   *selection_data,
+                                    guint               time_);
   void     (* drag_data_delete)    (GtkWidget          *widget,
-                                   GdkDragContext     *context);
+                                    GdkDragContext     *context);
 
   /* Target side drag signals */
   void     (* drag_leave)          (GtkWidget          *widget,
-                                   GdkDragContext     *context,
-                                   guint               time_);
-  gboolean (* drag_motion)         (GtkWidget         *widget,
-                                   GdkDragContext     *context,
-                                   gint                x,
-                                   gint                y,
-                                   guint               time_);
-  gboolean (* drag_drop)           (GtkWidget         *widget,
-                                   GdkDragContext     *context,
-                                   gint                x,
-                                   gint                y,
-                                   guint               time_);
+                                    GdkDragContext     *context,
+                                    guint               time_);
+  gboolean (* drag_motion)         (GtkWidget          *widget,
+                                    GdkDragContext     *context,
+                                    gint                x,
+                                    gint                y,
+                                    guint               time_);
+  gboolean (* drag_drop)           (GtkWidget          *widget,
+                                    GdkDragContext     *context,
+                                    gint                x,
+                                    gint                y,
+                                    guint               time_);
   void     (* drag_data_received)  (GtkWidget          *widget,
-                                   GdkDragContext     *context,
-                                   GtkSelectionData   *selection_data,
-                                   guint               time_);
+                                    GdkDragContext     *context,
+                                    GtkSelectionData   *selection_data,
+                                    guint               time_);
   gboolean (* drag_failed)         (GtkWidget          *widget,
                                     GdkDragContext     *context,
                                     GtkDragResult       result);
@@ -353,10 +353,10 @@ struct _GtkWidgetClass
 
 
   gboolean     (* query_tooltip)      (GtkWidget  *widget,
-                                      gint        x,
-                                      gint        y,
-                                      gboolean    keyboard_tooltip,
-                                      GtkTooltip *tooltip);
+                                       gint        x,
+                                       gint        y,
+                                       gboolean    keyboard_tooltip,
+                                       GtkTooltip *tooltip);
 
   void         (* compute_expand)     (GtkWidget  *widget,
                                        gboolean   *hexpand_p,
@@ -384,57 +384,57 @@ struct _GtkWidgetClass
 
 
 GDK_AVAILABLE_IN_ALL
-GType     gtk_widget_get_type            (void) G_GNUC_CONST;
+GType      gtk_widget_get_type            (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
-GtkWidget* gtk_widget_new                (GType                type,
-                                          const gchar         *first_property_name,
-                                          ...);
+GtkWidget* gtk_widget_new                 (GType                type,
+                                           const gchar         *first_property_name,
+                                           ...);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_destroy             (GtkWidget           *widget);
+void       gtk_widget_destroy             (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_destroyed           (GtkWidget           *widget,
-                                          GtkWidget          **widget_pointer);
+void       gtk_widget_destroyed           (GtkWidget           *widget,
+                                           GtkWidget          **widget_pointer);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_unparent            (GtkWidget           *widget);
+void       gtk_widget_unparent            (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_show                (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_hide                (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_map                 (GtkWidget           *widget);
+void       gtk_widget_map                 (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_unmap               (GtkWidget           *widget);
+void       gtk_widget_unmap               (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_realize             (GtkWidget           *widget);
+void       gtk_widget_realize             (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_unrealize           (GtkWidget           *widget);
+void       gtk_widget_unrealize           (GtkWidget           *widget);
 
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_draw                (GtkWidget           *widget,
                                            cairo_t             *cr);
 /* Queuing draws */
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_queue_draw          (GtkWidget           *widget);
+void       gtk_widget_queue_draw          (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_queue_draw_area     (GtkWidget           *widget,
-                                          gint                 x,
-                                          gint                 y,
-                                          gint                 width,
-                                          gint                 height);
+void       gtk_widget_queue_draw_area     (GtkWidget           *widget,
+                                           gint                 x,
+                                           gint                 y,
+                                           gint                 width,
+                                           gint                 height);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_queue_draw_region   (GtkWidget           *widget,
+void       gtk_widget_queue_draw_region   (GtkWidget           *widget,
                                            const cairo_region_t*region);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_queue_resize        (GtkWidget           *widget);
+void       gtk_widget_queue_resize        (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
+void       gtk_widget_queue_resize_no_redraw (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_queue_allocate      (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
 GdkFrameClock* gtk_widget_get_frame_clock (GtkWidget           *widget);
 
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_size_allocate       (GtkWidget           *widget,
+void       gtk_widget_size_allocate       (GtkWidget           *widget,
                                            const GtkAllocation *allocation,
                                            int                  baseline,
                                            GtkAllocation       *out_clip);
@@ -455,51 +455,51 @@ void                gtk_widget_get_preferred_size             (GtkWidget      *w
                                                                GtkRequisition *natural_size);
 
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_add_accelerator     (GtkWidget           *widget,
-                                          const gchar         *accel_signal,
-                                          GtkAccelGroup       *accel_group,
-                                          guint                accel_key,
-                                          GdkModifierType      accel_mods,
-                                          GtkAccelFlags        accel_flags);
+void       gtk_widget_add_accelerator     (GtkWidget           *widget,
+                                           const gchar         *accel_signal,
+                                           GtkAccelGroup       *accel_group,
+                                           guint                accel_key,
+                                           GdkModifierType      accel_mods,
+                                           GtkAccelFlags        accel_flags);
 GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_remove_accelerator  (GtkWidget           *widget,
-                                          GtkAccelGroup       *accel_group,
-                                          guint                accel_key,
-                                          GdkModifierType      accel_mods);
+                                           GtkAccelGroup       *accel_group,
+                                           guint                accel_key,
+                                           GdkModifierType      accel_mods);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_accel_path      (GtkWidget           *widget,
-                                          const gchar         *accel_path,
-                                          GtkAccelGroup       *accel_group);
+                                           const gchar         *accel_path,
+                                           GtkAccelGroup       *accel_group);
 GDK_AVAILABLE_IN_ALL
-GList*     gtk_widget_list_accel_closures (GtkWidget          *widget);
+GList*     gtk_widget_list_accel_closures (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_can_activate_accel  (GtkWidget           *widget,
                                            guint                signal_id);
 GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_mnemonic_activate   (GtkWidget           *widget,
-                                          gboolean             group_cycling);
+                                           gboolean             group_cycling);
 GDK_AVAILABLE_IN_ALL
-gboolean   gtk_widget_event              (GtkWidget           *widget,
+gboolean   gtk_widget_event               (GtkWidget           *widget,
                                            const GdkEvent      *event);
 GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_send_focus_change   (GtkWidget           *widget,
                                            GdkEvent            *event);
 
 GDK_AVAILABLE_IN_ALL
-gboolean   gtk_widget_activate              (GtkWidget        *widget);
+gboolean   gtk_widget_activate               (GtkWidget        *widget);
 
 GDK_AVAILABLE_IN_ALL
-gboolean   gtk_widget_intersect                  (GtkWidget           *widget,
-                                          const GdkRectangle  *area,
-                                          GdkRectangle        *intersection);
+gboolean   gtk_widget_intersect           (GtkWidget           *widget,
+                                           const GdkRectangle  *area,
+                                           GdkRectangle        *intersection);
 
 GDK_AVAILABLE_IN_ALL
-void   gtk_widget_freeze_child_notify    (GtkWidget           *widget);
+void    gtk_widget_freeze_child_notify    (GtkWidget           *widget);
 GDK_AVAILABLE_IN_ALL
-void   gtk_widget_child_notify           (GtkWidget           *widget,
-                                          const gchar         *child_property);
+void    gtk_widget_child_notify           (GtkWidget           *widget,
+                                           const gchar         *child_property);
 GDK_AVAILABLE_IN_ALL
-void   gtk_widget_thaw_child_notify      (GtkWidget           *widget);
+void    gtk_widget_thaw_child_notify      (GtkWidget           *widget);
 
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_can_focus       (GtkWidget           *widget,
@@ -546,7 +546,7 @@ gboolean   gtk_widget_device_is_shadowed  (GtkWidget           *widget,
 
 GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_name               (GtkWidget    *widget,
-                                                        const gchar  *name);
+                                                         const gchar  *name);
 GDK_AVAILABLE_IN_ALL
 const gchar *         gtk_widget_get_name               (GtkWidget    *widget);
 
@@ -563,7 +563,7 @@ GtkStateFlags         gtk_widget_get_state_flags        (GtkWidget     *widget);
 
 GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_sensitive          (GtkWidget    *widget,
-                                                        gboolean      sensitive);
+                                                         gboolean      sensitive);
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_sensitive          (GtkWidget    *widget);
 GDK_AVAILABLE_IN_ALL
@@ -578,10 +578,10 @@ GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_is_visible             (GtkWidget    *widget);
 
 GDK_AVAILABLE_IN_ALL
-void                  gtk_widget_set_has_surface         (GtkWidget    *widget,
+void                  gtk_widget_set_has_surface        (GtkWidget    *widget,
                                                          gboolean      has_surface);
 GDK_AVAILABLE_IN_ALL
-gboolean              gtk_widget_get_has_surface         (GtkWidget    *widget);
+gboolean              gtk_widget_get_has_surface        (GtkWidget    *widget);
 
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_is_toplevel            (GtkWidget    *widget);
@@ -597,32 +597,32 @@ gboolean              gtk_widget_get_mapped             (GtkWidget    *widget);
 
 GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_parent             (GtkWidget    *widget,
-                                                        GtkWidget    *parent);
+                                                         GtkWidget    *parent);
 GDK_AVAILABLE_IN_ALL
 GtkWidget           * gtk_widget_get_parent             (GtkWidget    *widget);
 
 GDK_AVAILABLE_IN_ALL
-void                  gtk_widget_set_parent_surface      (GtkWidget    *widget,
-                                                        GdkSurface    *parent_surface);
+void                  gtk_widget_set_parent_surface     (GtkWidget    *widget,
+                                                         GdkSurface    *parent_surface);
 GDK_AVAILABLE_IN_ALL
-GdkSurface           * gtk_widget_get_parent_surface      (GtkWidget    *widget);
+GdkSurface           * gtk_widget_get_parent_surface    (GtkWidget    *widget);
 
 GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_child_visible      (GtkWidget    *widget,
-                                                        gboolean      is_visible);
+                                                         gboolean      is_visible);
 GDK_AVAILABLE_IN_ALL
 gboolean              gtk_widget_get_child_visible      (GtkWidget    *widget);
 
 GDK_AVAILABLE_IN_ALL
-void                  gtk_widget_set_surface             (GtkWidget    *widget,
+void                  gtk_widget_set_surface            (GtkWidget    *widget,
                                                          GdkSurface    *surface);
 GDK_AVAILABLE_IN_ALL
-GdkSurface           * gtk_widget_get_surface             (GtkWidget    *widget);
+GdkSurface           * gtk_widget_get_surface           (GtkWidget    *widget);
 GDK_AVAILABLE_IN_ALL
-void                  gtk_widget_register_surface        (GtkWidget    *widget,
+void                  gtk_widget_register_surface       (GtkWidget    *widget,
                                                          GdkSurface    *surface);
 GDK_AVAILABLE_IN_ALL
-void                  gtk_widget_unregister_surface      (GtkWidget    *widget,
+void                  gtk_widget_unregister_surface     (GtkWidget    *widget,
                                                          GdkSurface    *surface);
 
 GDK_AVAILABLE_IN_ALL
@@ -666,16 +666,16 @@ void       gtk_widget_get_size_request    (GtkWidget           *widget,
                                            gint                *width,
                                            gint                *height);
 GDK_AVAILABLE_IN_ALL
-void      gtk_widget_set_opacity         (GtkWidget           *widget,
-                                          double               opacity);
+void       gtk_widget_set_opacity         (GtkWidget           *widget,
+                                           double               opacity);
 GDK_AVAILABLE_IN_ALL
-double    gtk_widget_get_opacity         (GtkWidget           *widget);
+double     gtk_widget_get_opacity         (GtkWidget           *widget);
 
 GDK_AVAILABLE_IN_ALL
-GtkWidget*   gtk_widget_get_toplevel   (GtkWidget      *widget);
+GtkWidget*   gtk_widget_get_toplevel    (GtkWidget      *widget);
 GDK_AVAILABLE_IN_ALL
-GtkWidget*   gtk_widget_get_ancestor   (GtkWidget      *widget,
-                                        GType           widget_type);
+GtkWidget*   gtk_widget_get_ancestor    (GtkWidget      *widget,
+                                         GType           widget_type);
 
 GDK_AVAILABLE_IN_ALL
 gint          gtk_widget_get_scale_factor (GtkWidget *widget);
@@ -768,16 +768,16 @@ void     gtk_widget_set_margin_bottom (GtkWidget *widget,
                                        gint       margin);
 
 GDK_AVAILABLE_IN_ALL
-gboolean     gtk_widget_is_ancestor    (GtkWidget      *widget,
-                                        GtkWidget      *ancestor);
+gboolean     gtk_widget_is_ancestor     (GtkWidget      *widget,
+                                         GtkWidget      *ancestor);
 
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_widget_translate_coordinates (GtkWidget  *src_widget,
-                                              GtkWidget  *dest_widget,
-                                              gint        src_x,
-                                              gint        src_y,
-                                              gint       *dest_x,
-                                              gint       *dest_y);
+                                               GtkWidget  *dest_widget,
+                                               gint        src_x,
+                                               gint        src_y,
+                                               gint       *dest_x,
+                                               gint       *dest_y);
 
 GDK_AVAILABLE_IN_ALL
 gboolean     gtk_widget_contains              (GtkWidget  *widget,
@@ -802,13 +802,13 @@ GDK_AVAILABLE_IN_ALL
 const cairo_font_options_t *gtk_widget_get_font_options (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
 PangoLayout  *gtk_widget_create_pango_layout  (GtkWidget   *widget,
-                                              const gchar *text);
+                                               const gchar *text);
 
 /* Functions for setting directionality for widgets */
 
 GDK_AVAILABLE_IN_ALL
 void             gtk_widget_set_direction         (GtkWidget        *widget,
-                                                  GtkTextDirection  dir);
+                                                   GtkTextDirection  dir);
 GDK_AVAILABLE_IN_ALL
 GtkTextDirection gtk_widget_get_direction         (GtkWidget        *widget);
 
@@ -820,7 +820,7 @@ GtkTextDirection gtk_widget_get_default_direction (void);
 /* Counterpart to gdk_surface_shape_combine_region.
  */
 GDK_AVAILABLE_IN_ALL
-void        gtk_widget_input_shape_combine_region (GtkWidget *widget,
+void         gtk_widget_input_shape_combine_region (GtkWidget *widget,
                                                     cairo_region_t *region);
 
 GDK_AVAILABLE_IN_ALL
@@ -836,10 +836,10 @@ GDK_AVAILABLE_IN_ALL
 GList* gtk_widget_list_mnemonic_labels  (GtkWidget *widget);
 GDK_AVAILABLE_IN_ALL
 void   gtk_widget_add_mnemonic_label    (GtkWidget *widget,
-                                        GtkWidget *label);
+                                         GtkWidget *label);
 GDK_AVAILABLE_IN_ALL
 void   gtk_widget_remove_mnemonic_label (GtkWidget *widget,
-                                        GtkWidget *label);
+                                         GtkWidget *label);
 
 GDK_AVAILABLE_IN_ALL
 void                  gtk_widget_set_tooltip_window    (GtkWidget   *widget,
@@ -860,7 +860,7 @@ GDK_AVAILABLE_IN_ALL
 gchar *    gtk_widget_get_tooltip_markup    (GtkWidget   *widget);
 GDK_AVAILABLE_IN_ALL
 void       gtk_widget_set_has_tooltip       (GtkWidget   *widget,
-                                            gboolean     has_tooltip);
+                                             gboolean     has_tooltip);
 GDK_AVAILABLE_IN_ALL
 gboolean   gtk_widget_get_has_tooltip       (GtkWidget   *widget);
 
@@ -1013,28 +1013,28 @@ GDK_AVAILABLE_IN_ALL
 void    gtk_widget_init_template                        (GtkWidget             *widget);
 GDK_AVAILABLE_IN_ALL
 GObject *gtk_widget_get_template_child                  (GtkWidget             *widget,
-                                                        GType                  widget_type,
-                                                        const gchar           *name);
+                                                         GType                  widget_type,
+                                                         const gchar           *name);
 GDK_AVAILABLE_IN_ALL
 void    gtk_widget_class_set_template                   (GtkWidgetClass        *widget_class,
-                                                        GBytes                *template_bytes);
+                                                         GBytes                *template_bytes);
 GDK_AVAILABLE_IN_ALL
 void    gtk_widget_class_set_template_from_resource     (GtkWidgetClass        *widget_class,
-                                                        const gchar           *resource_name);
+                                                         const gchar           *resource_name);
 GDK_AVAILABLE_IN_ALL
 void    gtk_widget_class_bind_template_callback_full    (GtkWidgetClass        *widget_class,
-                                                        const gchar           *callback_name,
-                                                        GCallback              callback_symbol);
+                                                         const gchar           *callback_name,
+                                                         GCallback              callback_symbol);
 GDK_AVAILABLE_IN_ALL
 void    gtk_widget_class_set_connect_func               (GtkWidgetClass        *widget_class,
-                                                        GtkBuilderConnectFunc  connect_func,
-                                                        gpointer               connect_data,
-                                                        GDestroyNotify         connect_data_destroy);
+                                                         GtkBuilderConnectFunc  connect_func,
+                                                         gpointer               connect_data,
+                                                         GDestroyNotify         connect_data_destroy);
 GDK_AVAILABLE_IN_ALL
 void    gtk_widget_class_bind_template_child_full       (GtkWidgetClass        *widget_class,
-                                                        const gchar           *name,
-                                                        gboolean               internal_child,
-                                                        gssize                 struct_offset);
+                                                         const gchar           *name,
+                                                         gboolean               internal_child,
+                                                         gssize                 struct_offset);
 
 GDK_AVAILABLE_IN_ALL
 GActionGroup           *gtk_widget_get_action_group     (GtkWidget             *widget,



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]