[mutter] wayland: Fix header file style
- From: Jasper St. Pierre <jstpierre src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] wayland: Fix header file style
- Date: Tue, 22 Apr 2014 22:28:16 +0000 (UTC)
commit 003ff3d255e1e7ae12fd7738a89cfb33e20a0420
Author: Jasper St. Pierre <jstpierre mecheye net>
Date: Tue Apr 22 18:09:38 2014 -0400
wayland: Fix header file style
src/wayland/meta-wayland-data-device.h | 12 ++---
src/wayland/meta-wayland-keyboard.h | 70 ++++++++++++++------------------
src/wayland/meta-wayland-pointer.h | 66 ++++++++++++------------------
src/wayland/meta-wayland-seat.h | 29 +++++--------
src/wayland/meta-wayland.h | 8 ++--
5 files changed, 77 insertions(+), 108 deletions(-)
---
diff --git a/src/wayland/meta-wayland-data-device.h b/src/wayland/meta-wayland-data-device.h
index d00ea66..b9d4cc8 100644
--- a/src/wayland/meta-wayland-data-device.h
+++ b/src/wayland/meta-wayland-data-device.h
@@ -20,17 +20,15 @@
* OF THIS SOFTWARE.
*/
-#ifndef __META_WAYLAND_DATA_DEVICE_H__
-#define __META_WAYLAND_DATA_DEVICE_H__
+#ifndef META_WAYLAND_DATA_DEVICE_H
+#define META_WAYLAND_DATA_DEVICE_H
#include <wayland-server.h>
#include "meta-wayland-private.h"
-void
-meta_wayland_data_device_manager_init (MetaWaylandCompositor *compositor);
+void meta_wayland_data_device_manager_init (MetaWaylandCompositor *compositor);
-void
-meta_wayland_data_device_set_keyboard_focus (MetaWaylandSeat *seat);
+void meta_wayland_data_device_set_keyboard_focus (MetaWaylandSeat *seat);
-#endif /* __META_WAYLAND_DATA_DEVICE_H__ */
+#endif /* META_WAYLAND_DATA_DEVICE_H */
diff --git a/src/wayland/meta-wayland-keyboard.h b/src/wayland/meta-wayland-keyboard.h
index c935fdd..0845012 100644
--- a/src/wayland/meta-wayland-keyboard.h
+++ b/src/wayland/meta-wayland-keyboard.h
@@ -42,8 +42,8 @@
* CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/
-#ifndef __META_WAYLAND_KEYBOARD_H__
-#define __META_WAYLAND_KEYBOARD_H__
+#ifndef META_WAYLAND_KEYBOARD_H
+#define META_WAYLAND_KEYBOARD_H
#include <clutter/clutter.h>
#include <wayland-server.h>
@@ -101,52 +101,42 @@ struct _MetaWaylandKeyboard
struct wl_resource *input_method_resource;
};
-void
-meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
- struct wl_display *display);
+void meta_wayland_keyboard_init (MetaWaylandKeyboard *keyboard,
+ struct wl_display *display);
-void
-meta_wayland_keyboard_release (MetaWaylandKeyboard *keyboard);
+void meta_wayland_keyboard_release (MetaWaylandKeyboard *keyboard);
-void
-meta_wayland_keyboard_update (MetaWaylandKeyboard *keyboard,
- const ClutterKeyEvent *event);
+void meta_wayland_keyboard_update (MetaWaylandKeyboard *keyboard,
+ const ClutterKeyEvent *event);
-gboolean
-meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
- const ClutterKeyEvent *event);
+gboolean meta_wayland_keyboard_handle_event (MetaWaylandKeyboard *keyboard,
+ const ClutterKeyEvent *event);
-void
-meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
- MetaWaylandSurface *surface);
+void meta_wayland_keyboard_set_focus (MetaWaylandKeyboard *keyboard,
+ MetaWaylandSurface *surface);
-void
-meta_wayland_keyboard_start_grab (MetaWaylandKeyboard *device,
- MetaWaylandKeyboardGrab *grab);
+void meta_wayland_keyboard_start_grab (MetaWaylandKeyboard *device,
+ MetaWaylandKeyboardGrab *grab);
-void
-meta_wayland_keyboard_end_grab (MetaWaylandKeyboard *keyboard);
+void meta_wayland_keyboard_end_grab (MetaWaylandKeyboard *keyboard);
typedef enum {
META_WAYLAND_KEYBOARD_SKIP_XCLIENTS = 1,
} MetaWaylandKeyboardSetKeymapFlags;
-void
-meta_wayland_keyboard_set_keymap_names (MetaWaylandKeyboard *keyboard,
- const char *rules,
- const char *model,
- const char *layout,
- const char *variant,
- const char *options,
- int flags);
-
-struct wl_client *
-meta_wayland_keyboard_get_focus_client (MetaWaylandKeyboard *keyboard);
-
-void
-meta_wayland_keyboard_create_new_resource (MetaWaylandKeyboard *keyboard,
- struct wl_client *client,
- struct wl_resource *seat_resource,
- uint32_t id);
-
-#endif /* __META_WAYLAND_KEYBOARD_H__ */
+void meta_wayland_keyboard_set_keymap_names (MetaWaylandKeyboard *keyboard,
+ const char *rules,
+ const char *model,
+ const char *layout,
+ const char *variant,
+ const char *options,
+ int flags);
+
+struct wl_client * meta_wayland_keyboard_get_focus_client (MetaWaylandKeyboard *keyboard);
+
+void meta_wayland_keyboard_create_new_resource (MetaWaylandKeyboard *keyboard,
+ struct wl_client *client,
+ struct wl_resource *seat_resource,
+ uint32_t id);
+
+#endif /* META_WAYLAND_KEYBOARD_H */
diff --git a/src/wayland/meta-wayland-pointer.h b/src/wayland/meta-wayland-pointer.h
index 4ee9990..ec957a1 100644
--- a/src/wayland/meta-wayland-pointer.h
+++ b/src/wayland/meta-wayland-pointer.h
@@ -17,8 +17,8 @@
* License along with this library. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef __META_WAYLAND_POINTER_H__
-#define __META_WAYLAND_POINTER_H__
+#ifndef META_WAYLAND_POINTER_H
+#define META_WAYLAND_POINTER_H
#include <wayland-server.h>
@@ -74,52 +74,40 @@ struct _MetaWaylandPointer
guint32 button_count;
};
-void
-meta_wayland_pointer_init (MetaWaylandPointer *pointer,
- struct wl_display *display);
+void meta_wayland_pointer_init (MetaWaylandPointer *pointer,
+ struct wl_display *display);
-void
-meta_wayland_pointer_release (MetaWaylandPointer *pointer);
+void meta_wayland_pointer_release (MetaWaylandPointer *pointer);
-void
-meta_wayland_pointer_update (MetaWaylandPointer *pointer,
- const ClutterEvent *event);
+void meta_wayland_pointer_update (MetaWaylandPointer *pointer,
+ const ClutterEvent *event);
-gboolean
-meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer,
- const ClutterEvent *event);
+gboolean meta_wayland_pointer_handle_event (MetaWaylandPointer *pointer,
+ const ClutterEvent *event);
-void
-meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
- MetaWaylandSurface *surface);
+void meta_wayland_pointer_set_focus (MetaWaylandPointer *pointer,
+ MetaWaylandSurface *surface);
-void
-meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer,
- MetaWaylandPointerGrab *grab);
+void meta_wayland_pointer_start_grab (MetaWaylandPointer *pointer,
+ MetaWaylandPointerGrab *grab);
-void
-meta_wayland_pointer_end_grab (MetaWaylandPointer *pointer);
+void meta_wayland_pointer_end_grab (MetaWaylandPointer *pointer);
-gboolean
-meta_wayland_pointer_start_popup_grab (MetaWaylandPointer *pointer,
- MetaWaylandSurface *popup);
+gboolean meta_wayland_pointer_start_popup_grab (MetaWaylandPointer *pointer,
+ MetaWaylandSurface *popup);
-void
-meta_wayland_pointer_repick (MetaWaylandPointer *pointer);
+void meta_wayland_pointer_repick (MetaWaylandPointer *pointer);
-void
-meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer,
- MetaWaylandSurface *surface,
- wl_fixed_t *x,
- wl_fixed_t *y);
+void meta_wayland_pointer_get_relative_coordinates (MetaWaylandPointer *pointer,
+ MetaWaylandSurface *surface,
+ wl_fixed_t *x,
+ wl_fixed_t *y);
-void
-meta_wayland_pointer_update_cursor_surface (MetaWaylandPointer *pointer);
+void meta_wayland_pointer_update_cursor_surface (MetaWaylandPointer *pointer);
-void
-meta_wayland_pointer_create_new_resource (MetaWaylandPointer *pointer,
- struct wl_client *client,
- struct wl_resource *seat_resource,
- uint32_t id);
+void meta_wayland_pointer_create_new_resource (MetaWaylandPointer *pointer,
+ struct wl_client *client,
+ struct wl_resource *seat_resource,
+ uint32_t id);
-#endif /* __META_WAYLAND_POINTER_H__ */
+#endif /* META_WAYLAND_POINTER_H */
diff --git a/src/wayland/meta-wayland-seat.h b/src/wayland/meta-wayland-seat.h
index 94ba76c..d0d0c5d 100644
--- a/src/wayland/meta-wayland-seat.h
+++ b/src/wayland/meta-wayland-seat.h
@@ -19,8 +19,8 @@
* 02111-1307, USA.
*/
-#ifndef __META_WAYLAND_SEAT_H__
-#define __META_WAYLAND_SEAT_H__
+#ifndef META_WAYLAND_SEAT_H
+#define META_WAYLAND_SEAT_H
#include <wayland-server.h>
#include <clutter/clutter.h>
@@ -57,24 +57,17 @@ struct _MetaWaylandSeat
struct wl_display *display;
};
-void
-meta_wayland_seat_init (MetaWaylandCompositor *compositor);
+void meta_wayland_seat_init (MetaWaylandCompositor *compositor);
-void
-meta_wayland_seat_free (MetaWaylandSeat *seat);
+void meta_wayland_seat_free (MetaWaylandSeat *seat);
-void
-meta_wayland_seat_update (MetaWaylandSeat *seat,
- const ClutterEvent *event);
+void meta_wayland_seat_update (MetaWaylandSeat *seat,
+ const ClutterEvent *event);
-gboolean
-meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
- const ClutterEvent *event);
+gboolean meta_wayland_seat_handle_event (MetaWaylandSeat *seat,
+ const ClutterEvent *event);
-void
-meta_wayland_seat_repick (MetaWaylandSeat *seat);
+void meta_wayland_seat_repick (MetaWaylandSeat *seat);
+void meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat);
-void
-meta_wayland_seat_update_cursor_surface (MetaWaylandSeat *seat);
-
-#endif /* __META_WAYLAND_SEAT_H__ */
+#endif /* META_WAYLAND_SEAT_H */
diff --git a/src/wayland/meta-wayland.h b/src/wayland/meta-wayland.h
index 4f12660..6feed48 100644
--- a/src/wayland/meta-wayland.h
+++ b/src/wayland/meta-wayland.h
@@ -32,15 +32,15 @@ void meta_wayland_finalize (void);
* API after meta_wayland_init() has been called. */
MetaWaylandCompositor *meta_wayland_compositor_get_default (void);
+void meta_wayland_compositor_update (MetaWaylandCompositor *compositor,
+ const ClutterEvent *event);
+gboolean meta_wayland_compositor_handle_event (MetaWaylandCompositor *compositor,
+ const ClutterEvent *event);
void meta_wayland_compositor_repick (MetaWaylandCompositor *compositor);
void meta_wayland_compositor_set_input_focus (MetaWaylandCompositor *compositor,
MetaWindow *window);
-gboolean meta_wayland_compositor_handle_event (MetaWaylandCompositor *compositor,
- const ClutterEvent *event);
-void meta_wayland_compositor_update (MetaWaylandCompositor *compositor,
- const ClutterEvent *event);
void meta_wayland_compositor_paint_finished (MetaWaylandCompositor *compositor);
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]