isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2025-02-14 20:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

* clutter/clutter-main.c: (emit_event): renamed from deliver_event,

Browse Source 
(emit_pointer_event): utility function to emit pointer event signals
(which takes pointer grab into account).
(emit_keyboard_event): utility function to emit keyboard event signals
(which takes keyboard grab into account).
(clutter_do_event): use the above utility functions, also reindented
the source.
This commit is contained in:
Øyvind Kolås 2007-11-16 13:41:07 +00:00
parent 8339cf3fce
commit 3c0897a102
2 changed files with 162 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,4 +1,14 @@
2007-11-16 Øyvind Kolås <pippin@gimp.org>
2007-11-16 Øyvind Kolås <pippin@o-hand.com>
* clutter/clutter-main.c: (emit_event): renamed from deliver_event,
(emit_pointer_event): utility function to emit pointer event signals
(which takes pointer grab into account).
(emit_keyboard_event): utility function to emit keyboard event signals
(which takes keyboard grab into account).
(clutter_do_event): use the above utility functions, also reindented
the source.
2007-11-16 Øyvind Kolås <pippin@o-hand.com>
* tests/test-grab.c: (main): fix use of clutter_actor_set_reactive

107
clutter/clutter-main.c
View File

@ -1151,8 +1151,10 @@ event_click_count_generate (ClutterEvent *event)
}
}
static inline void
deliver_event (ClutterEvent *event)
emit_event (ClutterEvent *event,
gboolean is_key_event)
{
#define MAX_EVENT_DEPTH 512
@ -1173,14 +1175,21 @@ deliver_event (ClutterEvent *event)
actor = event->any.source;
/* Build 'tree' of events */
/* Build 'tree' of emitters for the event */
while (actor && n_tree_events < MAX_EVENT_DEPTH)
{
if (clutter_actor_get_reactive (actor) ||
clutter_actor_get_parent (actor) == NULL)
event_tree[n_tree_events++] = g_object_ref (actor);
ClutterActor *parent;
actor = clutter_actor_get_parent (actor);
parent = clutter_actor_get_parent (actor);
if (clutter_actor_get_reactive (actor) ||
parent == NULL || /* stage gets all events */
is_key_event) /* keyboard events are always emitted */
{
event_tree[n_tree_events++] = g_object_ref (actor);
}
actor = parent;
}
/* Capture */
@ -1204,11 +1213,37 @@ done:
}
static inline void
generate_enter_leave_events (ClutterMainContext *context,
ClutterActor *motion_current_actor,
ClutterEvent *event)
emit_pointer_event (ClutterEvent *event)
{
/* Using the global variable directly, since it has to be initialized
* at this point
*/
ClutterMainContext *context = ClutterCntx;
if (G_UNLIKELY (context->pointer_grab_actor != NULL))
clutter_actor_event (context->pointer_grab_actor, event, FALSE);
else
emit_event (event, FALSE);
}
static inline void
emit_keyboard_event (ClutterEvent *event)
{
ClutterMainContext *context = ClutterCntx;
if (G_UNLIKELY (context->keyboard_grab_actor != NULL))
clutter_actor_event (context->keyboard_grab_actor, event, FALSE);
else
emit_event (event, TRUE);
}
static inline void
generate_enter_leave_events (ClutterEvent *event)
{
ClutterMainContext *context = ClutterCntx;
static ClutterActor *motion_last_actor = NULL;
ClutterActor *motion_current_actor = event->motion.source;
if (motion_last_actor != motion_current_actor)
{
@ -1262,7 +1297,6 @@ clutter_do_event (ClutterEvent *event)
ClutterBackend *backend;
ClutterActor *stage;
context = clutter_context_get_default ();
backend = context->backend;
stage = _clutter_backend_get_stage (backend);
@ -1277,22 +1311,19 @@ clutter_do_event (ClutterEvent *event)
case CLUTTER_NOTHING:
event->any.source = stage;
break;
case CLUTTER_ENTER:
case CLUTTER_LEAVE:
if (context->pointer_grab_actor != NULL)
{
clutter_actor_event (context->pointer_grab_actor, event, FALSE);
return;
}
deliver_event (event);
emit_pointer_event (event);
break;
case CLUTTER_DESTROY_NOTIFY:
case CLUTTER_DELETE:
event->any.source = stage;
if (clutter_stage_event (CLUTTER_STAGE (stage), event))
clutter_main_quit ();
break;
case CLUTTER_KEY_PRESS:
case CLUTTER_KEY_RELEASE:
{
@ -1303,14 +1334,10 @@ clutter_do_event (ClutterEvent *event)
g_return_if_fail (actor != NULL);
if (context->keyboard_grab_actor != NULL)
{
clutter_actor_event (context->keyboard_grab_actor, event, FALSE);
return;
}
deliver_event (event);
emit_keyboard_event (event);
}
break;
case CLUTTER_MOTION:
if (context->motion_events_per_actor == FALSE)
{
@ -1320,7 +1347,7 @@ clutter_do_event (ClutterEvent *event)
if (context->pointer_grab_actor != NULL)
{
clutter_actor_event (context->pointer_grab_actor, event, FALSE);
return;
break;
}
/* Trigger handlers on stage in both capture .. */
@ -1329,9 +1356,11 @@ clutter_do_event (ClutterEvent *event)
/* and bubbling phase */
clutter_actor_event (stage, event, FALSE);
}
break;
}
/* fallthrough */
case CLUTTER_BUTTON_PRESS:
case CLUTTER_BUTTON_RELEASE:
case CLUTTER_SCROLL:
@ -1346,20 +1375,13 @@ clutter_do_event (ClutterEvent *event)
y >= CLUTTER_STAGE_HEIGHT() ||
x < 0 || y < 0))
{
if (event->type == CLUTTER_BUTTON_RELEASE)
{
CLUTTER_NOTE (EVENT, "Release off stage received at %i, %i", x, y);
CLUTTER_NOTE (EVENT, "Release off stage received at %i, %i",
x, y);
event->button.source = stage;
if (context->pointer_grab_actor != NULL)
{
clutter_actor_event (context->pointer_grab_actor,
event, FALSE);
return;
}
deliver_event (event);
emit_pointer_event (event);
}
break;
}
@ -1382,31 +1404,26 @@ clutter_do_event (ClutterEvent *event)
CLUTTER_NOTE (EVENT, "Reactive event received at %i, %i - actor: %p",
x, y, actor);
if (event->type == CLUTTER_MOTION)
{
/* Generate enter leave events (if any) */
generate_enter_leave_events (context, actor, event);
generate_enter_leave_events (event);
}
else /* (button event) */
{
/* Generate click count */
event_click_count_generate (event);
}
if (context->pointer_grab_actor != NULL)
{
clutter_actor_event (context->pointer_grab_actor, event, FALSE);
return;
}
deliver_event (event);
}
emit_pointer_event (event);
break;
}
case CLUTTER_STAGE_STATE:
/* fullscreen / focus - forward to stage */
event->any.source = stage;
clutter_stage_event (CLUTTER_STAGE (stage), event);
break;
case CLUTTER_CLIENT_MESSAGE:
break;
}