Add private header for event-related API

clutter/Makefile.am

@@ -234,6 +234,7 @@ source_h_priv = \
 	$(srcdir)/clutter-device-manager-private.h	\
 	$(srcdir)/clutter-effect-private.h		\
 	$(srcdir)/clutter-event-translator.h		\
+	$(srcdir)/clutter-event-private.h		\
 	$(srcdir)/clutter-id-pool.h 			\
 	$(srcdir)/clutter-keysyms-table.h		\
 	$(srcdir)/clutter-master-clock.h		\

clutter/clutter-backend.c

@@ -44,7 +44,7 @@
 
 #include "clutter-backend-private.h"
 #include "clutter-debug.h"
-#include "clutter-fixed.h"
+#include "clutter-event-private.h"
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 #include "clutter-profile.h"

clutter/clutter-event-private.h

@@ -0,0 +1,28 @@
+#ifndef __CLUTTER_EVENT_PRIVATE_H__
+#define __CLUTTER_EVENT_PRIVATE_H__
+
+#include <clutter/clutter-event.h>
+
+G_BEGIN_DECLS
+
+/* Reinjecting queued events for processing */
+void            _clutter_process_event                  (ClutterEvent       *event);
+
+/* clears the event queue inside the main context */
+void            _clutter_clear_events_queue             (void);
+void            _clutter_clear_events_queue_for_stage   (ClutterStage       *stage);
+
+void            _clutter_event_set_platform_data        (ClutterEvent       *event,
+                                                         gpointer            data);
+gpointer        _clutter_event_get_platform_data        (const ClutterEvent *event);
+
+void            _clutter_event_push                     (const ClutterEvent *event,
+                                                         gboolean            do_copy);
+void            _clutter_event_set_device               (ClutterEvent       *event,
+                                                         ClutterInputDevice *device);
+void            _clutter_event_set_source_device        (ClutterEvent       *event,
+                                                         ClutterInputDevice *device);
+
+G_END_DECLS
+
+#endif /* __CLUTTER_EVENT_PRIVATE_H__ */

clutter/clutter-event.c

@@ -29,7 +29,7 @@
 
 #include "clutter-backend-private.h"
 #include "clutter-debug.h"
-#include "clutter-event.h"
+#include "clutter-event-private.h"
 #include "clutter-keysyms.h"
 #include "clutter-keysyms-table.h"
 #include "clutter-private.h"

clutter/clutter-input-device.c

@@ -41,6 +41,7 @@
 #include "clutter-debug.h"
 #include "clutter-device-manager-private.h"
 #include "clutter-enum-types.h"
+#include "clutter-event-private.h"
 #include "clutter-marshal.h"
 #include "clutter-private.h"
 #include "clutter-stage-private.h"

clutter/clutter-private.h

@@ -199,13 +199,6 @@ G_CONST_RETURN gchar *_clutter_gettext (const gchar *str);
 
 gboolean      _clutter_feature_init (GError **error);
 
-/* Reinjecting queued events for processing */
-void _clutter_process_event (ClutterEvent *event);
-
-/* clears the event queue inside the main context */
-void _clutter_clear_events_queue           (void);
-void _clutter_clear_events_queue_for_stage (ClutterStage *stage);
-
 /* Picking code */
 ClutterActor *_clutter_do_pick (ClutterStage    *stage,
 				gint             x,
@@ -232,17 +225,6 @@ void _clutter_constraint_update_allocation (ClutterConstraint *constraint,
 
 GType _clutter_layout_manager_get_child_meta_type (ClutterLayoutManager *manager);
 
-void     _clutter_event_set_platform_data (ClutterEvent       *event,
-                                           gpointer            data);
-gpointer _clutter_event_get_platform_data (const ClutterEvent *event);
-
-void     _clutter_event_push              (const ClutterEvent *event,
-                                           gboolean            do_copy);
-void     _clutter_event_set_device        (ClutterEvent       *event,
-                                           ClutterInputDevice *device);
-void     _clutter_event_set_source_device (ClutterEvent       *event,
-                                           ClutterInputDevice *device);
-
 void                _clutter_util_fully_transform_vertices (const CoglMatrix *modelview,
                                                             const CoglMatrix *projection,
                                                             const int *viewport,

clutter/clutter-stage.c

@@ -62,7 +62,7 @@
 #include "clutter-debug.h"
 #include "clutter-device-manager-private.h"
 #include "clutter-enum-types.h"
-#include "clutter-id-pool.h"
+#include "clutter-event-private.h"
 #include "clutter-main.h"
 #include "clutter-marshal.h"
 #include "clutter-master-clock.h"

clutter/egl/clutter-event-tslib.c

@@ -27,11 +27,11 @@
 #include "clutter-backend-egl.h"
 #include "clutter-egl.h"
 
-#include "../clutter-backend.h"
+#include "clutter-backend.h"
-#include "../clutter-event.h"
+#include "clutter-event-private.h"
-#include "../clutter-private.h"
+#include "clutter-private.h"
-#include "../clutter-debug.h"
+#include "clutter-debug.h"
-#include "../clutter-main.h"
+#include "clutter-main.h"
 
 #include <string.h>
 
@@ -217,15 +217,12 @@ clutter_event_dispatch (GSource     *source,
                         GSourceFunc  callback,
                         gpointer     user_data)
 {
-  ClutterEvent *event;
   ClutterEventSource *event_source = (ClutterEventSource *) source;
-  struct ts_sample    tsevent;
+  struct ts_sample tsevent;
-  ClutterMainContext *clutter_context;
+  ClutterEvent *event;
 
   clutter_threads_enter ();
 
-  clutter_context = _clutter_context_get_default ();
-
   /* FIXME while would be better here but need to deal with lockups */
   if ((!clutter_events_pending()) &&
       (ts_read(event_source->ts_device, &tsevent, 1) == 1))

clutter/evdev/clutter-device-manager-evdev.c

@@ -40,7 +40,7 @@
 #include "clutter-debug.h"
 #include "clutter-device-manager.h"
 #include "clutter-device-manager-private.h"
-#include "clutter-event.h"
+#include "clutter-event-private.h"
 #include "clutter-input-device-evdev.h"
 #include "clutter-main.h"
 #include "clutter-private.h"

clutter/osx/clutter-event-osx.c

@@ -30,11 +30,13 @@
 #import <AppKit/AppKit.h>
 
 #include <glib.h>
-#include <clutter/clutter-debug.h>
+
-#include <clutter/clutter-device-manager.h>
+#include "clutter-debug.h"
-#include <clutter/clutter-keysyms.h>
+#include "clutter-device-manager.h"
-#include <clutter/clutter-private.h>
+#include "clutter-event-private.h"
-#include <clutter/clutter-stage-private.h>
+#include "clutter-keysyms.h"
+#include "clutter-private.h"
+#include "clutter-stage-private.h"
 
 #include "clutter-event-loop-osx.h"
 

clutter/wayland/clutter-input-device-wayland.c

@@ -34,6 +34,7 @@
 
 #include "clutter-debug.h"
 #include "clutter-device-manager-private.h"
+#include "clutter-event-private.h"
 #include "clutter-private.h"
 #include "clutter-keysyms.h"
 #include "clutter-xkb-utils.h"

clutter/win32/clutter-event-win32.c

@@ -30,7 +30,7 @@
 #include "clutter-backend.h"
 #include "clutter-debug.h"
 #include "clutter-device-manager-private.h"
-#include "clutter-event.h"
+#include "clutter-event-private.h"
 #include "clutter-keysyms.h"
 #include "clutter-main.h"
 #include "clutter-private.h"

clutter/x11/clutter-backend-x11.c

@@ -64,7 +64,7 @@
 #include "clutter-backend.h"
 #include "clutter-debug.h"
 #include "clutter-device-manager-private.h"
-#include "clutter-event.h"
+#include "clutter-event-private.h"
 #include "clutter-main.h"
 #include "clutter-private.h"
 

clutter/x11/clutter-device-manager-core-x11.c

@@ -32,6 +32,7 @@
 #include "clutter-backend.h"
 #include "clutter-debug.h"
 #include "clutter-device-manager-private.h"
+#include "clutter-event-private.h"
 #include "clutter-event-translator.h"
 #include "clutter-stage-private.h"
 #include "clutter-private.h"

clutter/x11/clutter-device-manager-xi2.c

@@ -34,6 +34,7 @@
 #include "clutter-backend.h"
 #include "clutter-debug.h"
 #include "clutter-device-manager-private.h"
+#include "clutter-event-private.h"
 #include "clutter-event-translator.h"
 #include "clutter-stage-private.h"
 #include "clutter-private.h"

clutter/x11/clutter-event-x11.c

@@ -31,9 +31,8 @@
 
 #include "clutter-backend-private.h"
 #include "clutter-debug.h"
-#include "clutter-event.h"
+#include "clutter-event-private.h"
 #include "clutter-main.h"
-#include "clutter-private.h"
 
 #include <string.h>
 

clutter/x11/clutter-stage-x11.c

@@ -36,7 +36,7 @@
 #include "clutter-device-manager-private.h"
 #include "clutter-enum-types.h"
 #include "clutter-event-translator.h"
-#include "clutter-event.h"
+#include "clutter-event-private.h"
 #include "clutter-feature.h"
 #include "clutter-main.h"
 #include "clutter-paint-volume-private.h"