Add private header for event-related API

This commit is contained in:
Emmanuele Bassi 2011-02-18 16:27:49 +00:00
parent d27b335b61
commit 3e5aa9ed63
17 changed files with 55 additions and 42 deletions

View File

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

View File

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

View File

@ -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__ */

View File

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

View File

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

View File

@ -199,13 +199,6 @@ G_CONST_RETURN gchar *_clutter_gettext (const gchar *str);
gboolean _clutter_feature_init (GError **error); 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 */ /* Picking code */
ClutterActor *_clutter_do_pick (ClutterStage *stage, ClutterActor *_clutter_do_pick (ClutterStage *stage,
gint x, gint x,
@ -232,17 +225,6 @@ void _clutter_constraint_update_allocation (ClutterConstraint *constraint,
GType _clutter_layout_manager_get_child_meta_type (ClutterLayoutManager *manager); 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, void _clutter_util_fully_transform_vertices (const CoglMatrix *modelview,
const CoglMatrix *projection, const CoglMatrix *projection,
const int *viewport, const int *viewport,

View File

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

View File

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

View File

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

View File

@ -30,11 +30,13 @@
#import <AppKit/AppKit.h> #import <AppKit/AppKit.h>
#include <glib.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" #include "clutter-event-loop-osx.h"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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