brl/mutter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Coding style and cosmetic fixes

Browse Source
This commit is contained in:
Emmanuele Bassi 2011-09-30 17:29:40 +01:00
parent 0c919adf50
commit 6e9f474d90
1 changed files with 148 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
clutter/gdk/clutter-event-gdk.c
View File

@ -82,24 +82,30 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
{ {
ClutterDeviceManager *device_manager; ClutterDeviceManager *device_manager;
ClutterBackendGdk *backend_gdk; ClutterBackendGdk *backend_gdk;
ClutterBackend *backend;
ClutterStage *stage = NULL; ClutterStage *stage = NULL;
ClutterEvent *event = NULL; ClutterEvent *event = NULL;
gint spin = 0; gint spin = 0;
GdkFilterReturn result = GDK_FILTER_CONTINUE; GdkFilterReturn result = GDK_FILTER_CONTINUE;
backend = clutter_get_default_backend ();
if (!CLUTTER_IS_BACKEND_GDK (backend))
return GDK_FILTER_CONTINUE;
if (gdk_event->any.window == NULL) if (gdk_event->any.window == NULL)
return GDK_FILTER_CONTINUE; return GDK_FILTER_CONTINUE;
clutter_threads_enter (); backend_gdk = CLUTTER_BACKEND_GDK (backend);
backend_gdk = CLUTTER_BACKEND_GDK (clutter_get_default_backend ());
stage = clutter_gdk_get_stage_from_window (gdk_event->any.window); stage = clutter_gdk_get_stage_from_window (gdk_event->any.window);
device_manager = clutter_device_manager_get_default (); device_manager = clutter_device_manager_get_default ();
if (stage == NULL) if (stage == NULL)
goto out; return GDK_FILTER_CONTINUE;
switch (gdk_event->type) { clutter_threads_enter ();
switch (gdk_event->type)
{
case GDK_DELETE: case GDK_DELETE:
event = clutter_event_new (CLUTTER_DELETE); event = clutter_event_new (CLUTTER_DELETE);
break; break;
@ -114,7 +120,7 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
case GDK_DAMAGE: case GDK_DAMAGE:
/* This is handled by cogl */ /* This is handled by cogl */
goto out; break;
case GDK_MOTION_NOTIFY: case GDK_MOTION_NOTIFY:
event = clutter_event_new (CLUTTER_MOTION); event = clutter_event_new (CLUTTER_MOTION);
@ -124,7 +130,8 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
event->motion.axes = NULL; event->motion.axes = NULL;
/* It's all X in the end, right? */ /* It's all X in the end, right? */
event->motion.modifier_state = gdk_event->motion.state; event->motion.modifier_state = gdk_event->motion.state;
event->motion.device = _clutter_device_manager_gdk_lookup_device (device_manager, event->motion.device =
_clutter_device_manager_gdk_lookup_device (device_manager,
gdk_event->motion.device); gdk_event->motion.device);
break; break;
@ -140,14 +147,15 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
event->button.modifier_state = gdk_event->button.state; event->button.modifier_state = gdk_event->button.state;
event->button.button = gdk_event->button.button; event->button.button = gdk_event->button.button;
event->button.click_count = 1; event->button.click_count = 1;
event->button.device = _clutter_device_manager_gdk_lookup_device (device_manager, event->button.device =
_clutter_device_manager_gdk_lookup_device (device_manager,
gdk_event->button.device); gdk_event->button.device);
break; break;
case GDK_2BUTTON_PRESS: case GDK_2BUTTON_PRESS:
case GDK_3BUTTON_PRESS: case GDK_3BUTTON_PRESS:
/* these are handled by clutter-main.c updating click_count */ /* these are handled by clutter-main.c updating click_count */
goto out; break;
case GDK_KEY_PRESS: case GDK_KEY_PRESS:
case GDK_KEY_RELEASE: case GDK_KEY_RELEASE:
@ -172,7 +180,8 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
event->crossing.y = gdk_event->crossing.y; event->crossing.y = gdk_event->crossing.y;
/* XXX: no better fallback here? */ /* XXX: no better fallback here? */
event->crossing.device = clutter_device_manager_get_core_device (device_manager, event->crossing.device =
clutter_device_manager_get_core_device (device_manager,
CLUTTER_POINTER_DEVICE); CLUTTER_POINTER_DEVICE);
if (gdk_event->type == GDK_ENTER_NOTIFY) if (gdk_event->type == GDK_ENTER_NOTIFY)
@ -185,13 +194,25 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
event = clutter_event_new (CLUTTER_STAGE_STATE); event = clutter_event_new (CLUTTER_STAGE_STATE);
event->stage_state.time = 0; /* XXX: there is no timestamp in this GdkEvent */ event->stage_state.time = 0; /* XXX: there is no timestamp in this GdkEvent */
event->stage_state.changed_mask = CLUTTER_STAGE_STATE_ACTIVATED; event->stage_state.changed_mask = CLUTTER_STAGE_STATE_ACTIVATED;
event->stage_state.new_state = gdk_event->focus_change.in ? CLUTTER_STAGE_STATE_ACTIVATED : 0; event->stage_state.new_state = gdk_event->focus_change.in
? CLUTTER_STAGE_STATE_ACTIVATED
: 0;
break; break;
case GDK_CONFIGURE: case GDK_CONFIGURE:
{
gfloat w, h;
clutter_actor_get_size (CLUTTER_ACTOR (stage), &w, &h);
if (w != gdk_event->configure.width ||
h != gdk_event->configure.height)
{
clutter_actor_set_size (CLUTTER_ACTOR (stage), clutter_actor_set_size (CLUTTER_ACTOR (stage),
gdk_event->configure.width, gdk_event->configure.width,
gdk_event->configure.height); gdk_event->configure.height);
}
}
break; break;
case GDK_SCROLL: case GDK_SCROLL:
@ -202,8 +223,10 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
event->scroll.modifier_state = gdk_event->scroll.state; event->scroll.modifier_state = gdk_event->scroll.state;
event->scroll.axes = NULL; event->scroll.axes = NULL;
event->scroll.direction = gdk_event->scroll.direction; event->scroll.direction = gdk_event->scroll.direction;
event->scroll.device = _clutter_device_manager_gdk_lookup_device (device_manager, event->scroll.device =
_clutter_device_manager_gdk_lookup_device (device_manager,
gdk_event->scroll.device); gdk_event->scroll.device);
break;
case GDK_WINDOW_STATE: case GDK_WINDOW_STATE:
event = clutter_event_new (CLUTTER_STAGE_STATE); event = clutter_event_new (CLUTTER_STAGE_STATE);
@ -212,14 +235,17 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
if (gdk_event->window_state.changed_mask & GDK_WINDOW_STATE_WITHDRAWN) if (gdk_event->window_state.changed_mask & GDK_WINDOW_STATE_WITHDRAWN)
{ {
event->stage_state.changed_mask |= CLUTTER_STAGE_STATE_OFFSCREEN; event->stage_state.changed_mask |= CLUTTER_STAGE_STATE_OFFSCREEN;
event->stage_state.new_state |= (gdk_event->window_state.new_window_state & GDK_WINDOW_STATE_WITHDRAWN) ? event->stage_state.new_state |= (gdk_event->window_state.new_window_state & GDK_WINDOW_STATE_WITHDRAWN)
CLUTTER_STAGE_STATE_OFFSCREEN : 0; ? CLUTTER_STAGE_STATE_OFFSCREEN
: 0;
} }
if (gdk_event->window_state.changed_mask & GDK_WINDOW_STATE_FULLSCREEN) if (gdk_event->window_state.changed_mask & GDK_WINDOW_STATE_FULLSCREEN)
{ {
event->stage_state.changed_mask |= CLUTTER_STAGE_STATE_FULLSCREEN; event->stage_state.changed_mask |= CLUTTER_STAGE_STATE_FULLSCREEN;
event->stage_state.new_state |= (gdk_event->window_state.new_window_state & GDK_WINDOW_STATE_FULLSCREEN) ? event->stage_state.new_state |= (gdk_event->window_state.new_window_state & GDK_WINDOW_STATE_FULLSCREEN)
CLUTTER_STAGE_STATE_FULLSCREEN : 0; ? CLUTTER_STAGE_STATE_FULLSCREEN
: 0;
} }
break; break;
@ -234,10 +260,12 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
if (event != NULL) if (event != NULL)
{ {
event->any.stage = stage; event->any.stage = stage;
if (gdk_event->any.send_event) if (gdk_event->any.send_event)
event->any.flags = CLUTTER_EVENT_FLAG_SYNTHETIC; event->any.flags = CLUTTER_EVENT_FLAG_SYNTHETIC;
_clutter_event_push (event, FALSE); _clutter_event_push (event, FALSE);
spin = 1; spin = 1;
CLUTTER_NOTE (EVENT, "Translated one event from Gdk"); CLUTTER_NOTE (EVENT, "Translated one event from Gdk");
@ -257,8 +285,7 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
result = GDK_FILTER_REMOVE; result = GDK_FILTER_REMOVE;
} }
out:
clutter_threads_leave (); clutter_threads_leave ();
return result; return result;
} }