From 3e5aa9ed6348008bcbf21355e9e06bb50c90baf7 Mon Sep 17 00:00:00 2001 From: Emmanuele Bassi Date: Fri, 18 Feb 2011 16:27:49 +0000 Subject: [PATCH] Add private header for event-related API --- clutter/Makefile.am | 1 + clutter/clutter-backend.c | 2 +- clutter/clutter-event-private.h | 28 +++++++++++++++++++ clutter/clutter-event.c | 2 +- clutter/clutter-input-device.c | 1 + clutter/clutter-private.h | 18 ------------ clutter/clutter-stage.c | 2 +- clutter/egl/clutter-event-tslib.c | 17 +++++------ clutter/evdev/clutter-device-manager-evdev.c | 2 +- clutter/osx/clutter-event-osx.c | 12 ++++---- .../wayland/clutter-input-device-wayland.c | 1 + clutter/win32/clutter-event-win32.c | 2 +- clutter/x11/clutter-backend-x11.c | 2 +- clutter/x11/clutter-device-manager-core-x11.c | 1 + clutter/x11/clutter-device-manager-xi2.c | 1 + clutter/x11/clutter-event-x11.c | 3 +- clutter/x11/clutter-stage-x11.c | 2 +- 17 files changed, 55 insertions(+), 42 deletions(-) create mode 100644 clutter/clutter-event-private.h diff --git a/clutter/Makefile.am b/clutter/Makefile.am index 46c4fd6f5..0a05f280d 100644 --- a/clutter/Makefile.am +++ b/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 \ diff --git a/clutter/clutter-backend.c b/clutter/clutter-backend.c index 0259e38e6..35b3d9904 100644 --- a/clutter/clutter-backend.c +++ b/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" diff --git a/clutter/clutter-event-private.h b/clutter/clutter-event-private.h new file mode 100644 index 000000000..d9673196d --- /dev/null +++ b/clutter/clutter-event-private.h @@ -0,0 +1,28 @@ +#ifndef __CLUTTER_EVENT_PRIVATE_H__ +#define __CLUTTER_EVENT_PRIVATE_H__ + +#include + +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__ */ diff --git a/clutter/clutter-event.c b/clutter/clutter-event.c index 23c39707e..036d0694d 100644 --- a/clutter/clutter-event.c +++ b/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" diff --git a/clutter/clutter-input-device.c b/clutter/clutter-input-device.c index 133abc4ee..dd277d13d 100644 --- a/clutter/clutter-input-device.c +++ b/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" diff --git a/clutter/clutter-private.h b/clutter/clutter-private.h index 846a2a585..ea5e8c228 100644 --- a/clutter/clutter-private.h +++ b/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, diff --git a/clutter/clutter-stage.c b/clutter/clutter-stage.c index 855cce383..d56fdcf21 100644 --- a/clutter/clutter-stage.c +++ b/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" diff --git a/clutter/egl/clutter-event-tslib.c b/clutter/egl/clutter-event-tslib.c index f53318c68..b346c9b00 100644 --- a/clutter/egl/clutter-event-tslib.c +++ b/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-event.h" -#include "../clutter-private.h" -#include "../clutter-debug.h" -#include "../clutter-main.h" +#include "clutter-backend.h" +#include "clutter-event-private.h" +#include "clutter-private.h" +#include "clutter-debug.h" +#include "clutter-main.h" #include @@ -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; - ClutterMainContext *clutter_context; + struct ts_sample tsevent; + 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)) diff --git a/clutter/evdev/clutter-device-manager-evdev.c b/clutter/evdev/clutter-device-manager-evdev.c index b87aa4fd6..773c3524e 100644 --- a/clutter/evdev/clutter-device-manager-evdev.c +++ b/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" diff --git a/clutter/osx/clutter-event-osx.c b/clutter/osx/clutter-event-osx.c index 86d735abd..65876ed53 100644 --- a/clutter/osx/clutter-event-osx.c +++ b/clutter/osx/clutter-event-osx.c @@ -30,11 +30,13 @@ #import #include -#include -#include -#include -#include -#include + +#include "clutter-debug.h" +#include "clutter-device-manager.h" +#include "clutter-event-private.h" +#include "clutter-keysyms.h" +#include "clutter-private.h" +#include "clutter-stage-private.h" #include "clutter-event-loop-osx.h" diff --git a/clutter/wayland/clutter-input-device-wayland.c b/clutter/wayland/clutter-input-device-wayland.c index 6e52bbaf9..854ecddea 100644 --- a/clutter/wayland/clutter-input-device-wayland.c +++ b/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" diff --git a/clutter/win32/clutter-event-win32.c b/clutter/win32/clutter-event-win32.c index c3329125f..a652d0a2c 100644 --- a/clutter/win32/clutter-event-win32.c +++ b/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" diff --git a/clutter/x11/clutter-backend-x11.c b/clutter/x11/clutter-backend-x11.c index d48320e29..6c32ff042 100644 --- a/clutter/x11/clutter-backend-x11.c +++ b/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" diff --git a/clutter/x11/clutter-device-manager-core-x11.c b/clutter/x11/clutter-device-manager-core-x11.c index 2b55f42aa..6f96ea225 100644 --- a/clutter/x11/clutter-device-manager-core-x11.c +++ b/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" diff --git a/clutter/x11/clutter-device-manager-xi2.c b/clutter/x11/clutter-device-manager-xi2.c index aff55cf10..76937a40e 100644 --- a/clutter/x11/clutter-device-manager-xi2.c +++ b/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" diff --git a/clutter/x11/clutter-event-x11.c b/clutter/x11/clutter-event-x11.c index 38d9c66bb..ac3c502f3 100644 --- a/clutter/x11/clutter-event-x11.c +++ b/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 diff --git a/clutter/x11/clutter-stage-x11.c b/clutter/x11/clutter-stage-x11.c index 4a203690a..d3928c992 100644 --- a/clutter/x11/clutter-stage-x11.c +++ b/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"