compositor: reformat

3 files changed, 132 insertions, 117 deletions

diff --git a/src/compositor/compositor-private.h b/src/compositor/compositor-private.h
index 9ced9137..f323c4ac 100644
--- a/src/compositor/compositor-private.h
+++ b/src/compositor/compositor-private.h
@@ -1,20 +1,19 @@
-/* -*- mode: C; c-file-style: "gnu"; indent-tabs-mode: nil; -*- */
-
 /*
  * Copyright (C) 2008 Iain Holmes
+ * Copyright (C) 2017 Alberts Muktupāvels
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
  *
- * This program 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
- * General Public License for more details.
+ * This program 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 General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
- * along with this program; if not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
  */
 
 #ifndef META_COMPOSITOR_PRIVATE_H
@@ -24,39 +23,45 @@
 
 struct _MetaCompositor
 {
-  void (* destroy) (MetaCompositor *compositor);
-
-  void (*manage_screen) (MetaCompositor *compositor,
-                         MetaScreen     *screen);
-  void (*unmanage_screen) (MetaCompositor *compositor,
-                           MetaScreen     *screen);
-  void (*add_window) (MetaCompositor    *compositor,
-                      MetaWindow        *window,
-                      Window             xwindow,
-                      XWindowAttributes *attrs);
-  void (*remove_window) (MetaCompositor *compositor,
-                         Window          xwindow);
-  void (*set_updates) (MetaCompositor *compositor,
-                       MetaWindow     *window,
-                       gboolean        update);
-  void (*process_event) (MetaCompositor *compositor,
-                         XEvent         *event,
-                         MetaWindow     *window);
-
-  cairo_surface_t *(* get_window_surface) (MetaCompositor *compositor,
-                                           MetaWindow     *window);
-
-  void (*set_active_window) (MetaCompositor *compositor,
-                             MetaScreen     *screen,
-                             MetaWindow     *window);
-
-  void (*free_window) (MetaCompositor *compositor,
-                       MetaWindow     *window);
-
-  void (*maximize_window)   (MetaCompositor *compositor,
-                             MetaWindow     *window);
-  void (*unmaximize_window) (MetaCompositor *compositor,
-                             MetaWindow     *window);
+  void              (* destroy)            (MetaCompositor     *compositor);
+
+  void              (* manage_screen)      (MetaCompositor     *compositor,
+                                            MetaScreen         *screen);
+
+  void              (* unmanage_screen)    (MetaCompositor     *compositor,
+                                            MetaScreen         *screen);
+
+  void              (* add_window)         (MetaCompositor     *compositor,
+                                            MetaWindow         *window,
+                                            Window              xwindow,
+                                            XWindowAttributes  *attrs);
+
+  void              (* remove_window)      (MetaCompositor     *compositor,
+                                            Window              xwindow);
+
+  void              (* set_updates)        (MetaCompositor     *compositor,
+                                            MetaWindow         *window,
+                                            gboolean            update);
+
+  void              (*process_event)       (MetaCompositor     *compositor,
+                                            XEvent             *event,
+                                            MetaWindow         *window);
+
+  cairo_surface_t * (* get_window_surface) (MetaCompositor     *compositor,
+                                            MetaWindow         *window);
+
+  void              (* set_active_window)  (MetaCompositor     *compositor,
+                                            MetaScreen         *screen,
+                                            MetaWindow         *window);
+
+  void              (* free_window)        (MetaCompositor     *compositor,
+                                            MetaWindow         *window);
+
+  void              (* maximize_window)    (MetaCompositor     *compositor,
+                                            MetaWindow         *window);
+
+  void              (* unmaximize_window)  (MetaCompositor     *compositor,
+                                            MetaWindow         *window);
 };
 
 #endif
diff --git a/src/compositor/compositor.c b/src/compositor/compositor.c
index bbb9bb1d..c3f046ff 100644
--- a/src/compositor/compositor.c
+++ b/src/compositor/compositor.c
@@ -50,6 +50,22 @@ meta_compositor_destroy (MetaCompositor *compositor)
 }
 
 void
+meta_compositor_manage_screen (MetaCompositor *compositor,
+                               MetaScreen     *screen)
+{
+  if (compositor && compositor->manage_screen)
+    compositor->manage_screen (compositor, screen);
+}
+
+void
+meta_compositor_unmanage_screen (MetaCompositor *compositor,
+                                 MetaScreen     *screen)
+{
+  if (compositor && compositor->unmanage_screen)
+    compositor->unmanage_screen (compositor, screen);
+}
+
+void
 meta_compositor_add_window (MetaCompositor    *compositor,
                             MetaWindow        *window,
                             Window             xwindow,
@@ -68,22 +84,6 @@ meta_compositor_remove_window (MetaCompositor *compositor,
 }
 
 void
-meta_compositor_manage_screen (MetaCompositor *compositor,
-                               MetaScreen     *screen)
-{
-  if (compositor && compositor->manage_screen)
-    compositor->manage_screen (compositor, screen);
-}
-
-void
-meta_compositor_unmanage_screen (MetaCompositor *compositor,
-                                 MetaScreen     *screen)
-{
-  if (compositor && compositor->unmanage_screen)
-    compositor->unmanage_screen (compositor, screen);
-}
-
-void
 meta_compositor_set_updates (MetaCompositor *compositor,
                              MetaWindow     *window,
                              gboolean        updates)
@@ -120,24 +120,26 @@ meta_compositor_set_active_window (MetaCompositor *compositor,
     compositor->set_active_window (compositor, screen, window);
 }
 
-/* These functions are unused at the moment */
-void meta_compositor_begin_move (MetaCompositor *compositor,
-                                 MetaWindow     *window,
-                                 MetaRectangle  *initial,
-                                 int             grab_x,
-                                 int             grab_y)
+void
+meta_compositor_begin_move (MetaCompositor *compositor,
+                            MetaWindow     *window,
+                            MetaRectangle  *initial,
+                            gint            grab_x,
+                            gint            grab_y)
 {
 }
 
-void meta_compositor_update_move (MetaCompositor *compositor,
-                                  MetaWindow     *window,
-                                  int             x,
-                                  int             y)
+void
+meta_compositor_update_move (MetaCompositor *compositor,
+                             MetaWindow     *window,
+                             gint            x,
+                             gint            y)
 {
 }
 
-void meta_compositor_end_move (MetaCompositor *compositor,
-                               MetaWindow     *window)
+void
+meta_compositor_end_move (MetaCompositor *compositor,
+                          MetaWindow     *window)
 {
 }
 
diff --git a/src/include/compositor.h b/src/include/compositor.h
index 1d1938a4..f3abc194 100644
--- a/src/include/compositor.h
+++ b/src/include/compositor.h
@@ -34,50 +34,58 @@ typedef enum
 MetaCompositor  *meta_compositor_new                (MetaCompositorType  type,
                                                      MetaDisplay        *display);
 
-void meta_compositor_destroy (MetaCompositor *compositor);
-
-void meta_compositor_manage_screen (MetaCompositor *compositor,
-                                    MetaScreen     *screen);
-void meta_compositor_unmanage_screen (MetaCompositor *compositor,
-                                      MetaScreen     *screen);
-
-void meta_compositor_add_window (MetaCompositor    *compositor,
-                                 MetaWindow        *window,
-                                 Window             xwindow,
-                                 XWindowAttributes *attrs);
-void meta_compositor_remove_window (MetaCompositor *compositor,
-                                    Window          xwindow);
-
-void meta_compositor_set_updates (MetaCompositor *compositor,
-                                  MetaWindow     *window,
-                                  gboolean        updates);
-
-void meta_compositor_process_event (MetaCompositor *compositor,
-                                    XEvent         *event,
-                                    MetaWindow     *window);
-
-cairo_surface_t *meta_compositor_get_window_surface (MetaCompositor *compositor,
-                                                     MetaWindow     *window);
-
-void meta_compositor_set_active_window (MetaCompositor *compositor,
-                                        MetaScreen     *screen,
-                                        MetaWindow     *window);
-
-void meta_compositor_begin_move (MetaCompositor *compositor,
-                                 MetaWindow *window,
-                                 MetaRectangle *initial,
-                                 int grab_x, int grab_y);
-void meta_compositor_update_move (MetaCompositor *compositor,
-                                  MetaWindow *window,
-                                  int x, int y);
-void meta_compositor_end_move (MetaCompositor *compositor,
-                               MetaWindow *window);
-void meta_compositor_free_window (MetaCompositor *compositor,
-                                  MetaWindow *window);
-
-void meta_compositor_maximize_window   (MetaCompositor *compositor,
-                                        MetaWindow     *window);
-void meta_compositor_unmaximize_window (MetaCompositor *compositor,
-                                        MetaWindow     *window);
+void             meta_compositor_destroy            (MetaCompositor     *compositor);
+
+void             meta_compositor_manage_screen      (MetaCompositor     *compositor,
+                                                     MetaScreen         *screen);
+
+void             meta_compositor_unmanage_screen    (MetaCompositor     *compositor,
+                                                     MetaScreen         *screen);
+
+void             meta_compositor_add_window         (MetaCompositor     *compositor,
+                                                     MetaWindow         *window,
+                                                     Window              xwindow,
+                                                     XWindowAttributes  *attrs);
+
+void             meta_compositor_remove_window      (MetaCompositor     *compositor,
+                                                     Window              xwindow);
+
+void             meta_compositor_set_updates        (MetaCompositor     *compositor,
+                                                     MetaWindow         *window,
+                                                     gboolean            updates);
+
+void             meta_compositor_process_event      (MetaCompositor     *compositor,
+                                                     XEvent             *event,
+                                                     MetaWindow         *window);
+
+cairo_surface_t *meta_compositor_get_window_surface (MetaCompositor     *compositor,
+                                                     MetaWindow         *window);
+
+void             meta_compositor_set_active_window  (MetaCompositor     *compositor,
+                                                     MetaScreen         *screen,
+                                                     MetaWindow         *window);
+
+void             meta_compositor_begin_move         (MetaCompositor     *compositor,
+                                                     MetaWindow         *window,
+                                                     MetaRectangle      *initial,
+                                                     gint                grab_x,
+                                                     gint                grab_y);
+
+void             meta_compositor_update_move        (MetaCompositor     *compositor,
+                                                     MetaWindow         *window,
+                                                     gint                x,
+                                                     gint                y);
+
+void             meta_compositor_end_move           (MetaCompositor     *compositor,
+                                                     MetaWindow         *window);
+
+void             meta_compositor_free_window        (MetaCompositor     *compositor,
+                                                     MetaWindow         *window);
+
+void             meta_compositor_maximize_window    (MetaCompositor     *compositor,
+                                                     MetaWindow         *window);
+
+void             meta_compositor_unmaximize_window  (MetaCompositor     *compositor,
+                                                     MetaWindow         *window);
 
 #endif