Coding style and cosmetic fixes
This commit is contained in:
Emmanuele Bassi
parent
0c919adf50
commit
6e9f474d90
1 changed files with 148 additions and 121 deletions
|
|
@ -82,162 +82,190 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
|
|||
{
|
||||
ClutterDeviceManager *device_manager;
|
||||
ClutterBackendGdk *backend_gdk;
|
||||
ClutterBackend *backend;
|
||||
ClutterStage *stage = NULL;
|
||||
ClutterEvent *event = NULL;
|
||||
gint spin = 0;
|
||||
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)
|
||||
return GDK_FILTER_CONTINUE;
|
||||
|
||||
clutter_threads_enter ();
|
||||
|
||||
backend_gdk = CLUTTER_BACKEND_GDK (clutter_get_default_backend ());
|
||||
backend_gdk = CLUTTER_BACKEND_GDK (backend);
|
||||
stage = clutter_gdk_get_stage_from_window (gdk_event->any.window);
|
||||
device_manager = clutter_device_manager_get_default ();
|
||||
|
||||
if (stage == NULL)
|
||||
goto out;
|
||||
return GDK_FILTER_CONTINUE;
|
||||
|
||||
switch (gdk_event->type) {
|
||||
case GDK_DELETE:
|
||||
event = clutter_event_new (CLUTTER_DELETE);
|
||||
break;
|
||||
clutter_threads_enter ();
|
||||
|
||||
case GDK_DESTROY:
|
||||
event = clutter_event_new (CLUTTER_DESTROY_NOTIFY);
|
||||
break;
|
||||
switch (gdk_event->type)
|
||||
{
|
||||
case GDK_DELETE:
|
||||
event = clutter_event_new (CLUTTER_DELETE);
|
||||
break;
|
||||
|
||||
case GDK_EXPOSE:
|
||||
clutter_redraw (stage);
|
||||
break;
|
||||
case GDK_DESTROY:
|
||||
event = clutter_event_new (CLUTTER_DESTROY_NOTIFY);
|
||||
break;
|
||||
|
||||
case GDK_DAMAGE:
|
||||
/* This is handled by cogl */
|
||||
goto out;
|
||||
case GDK_EXPOSE:
|
||||
clutter_redraw (stage);
|
||||
break;
|
||||
|
||||
case GDK_MOTION_NOTIFY:
|
||||
event = clutter_event_new (CLUTTER_MOTION);
|
||||
event->motion.time = gdk_event->motion.time;
|
||||
event->motion.x = gdk_event->motion.x;
|
||||
event->motion.y = gdk_event->motion.y;
|
||||
event->motion.axes = NULL;
|
||||
/* It's all X in the end, right? */
|
||||
event->motion.modifier_state = gdk_event->motion.state;
|
||||
event->motion.device = _clutter_device_manager_gdk_lookup_device (device_manager,
|
||||
gdk_event->motion.device);
|
||||
break;
|
||||
case GDK_DAMAGE:
|
||||
/* This is handled by cogl */
|
||||
break;
|
||||
|
||||
case GDK_BUTTON_PRESS:
|
||||
case GDK_BUTTON_RELEASE:
|
||||
event = clutter_event_new (gdk_event->type == GDK_BUTTON_PRESS ?
|
||||
CLUTTER_BUTTON_PRESS :
|
||||
CLUTTER_BUTTON_RELEASE);
|
||||
event->button.time = gdk_event->button.time;
|
||||
event->button.x = gdk_event->button.x;
|
||||
event->button.y = gdk_event->button.y;
|
||||
event->button.axes = NULL;
|
||||
event->button.modifier_state = gdk_event->button.state;
|
||||
event->button.button = gdk_event->button.button;
|
||||
event->button.click_count = 1;
|
||||
event->button.device = _clutter_device_manager_gdk_lookup_device (device_manager,
|
||||
gdk_event->button.device);
|
||||
break;
|
||||
case GDK_MOTION_NOTIFY:
|
||||
event = clutter_event_new (CLUTTER_MOTION);
|
||||
event->motion.time = gdk_event->motion.time;
|
||||
event->motion.x = gdk_event->motion.x;
|
||||
event->motion.y = gdk_event->motion.y;
|
||||
event->motion.axes = NULL;
|
||||
/* It's all X in the end, right? */
|
||||
event->motion.modifier_state = gdk_event->motion.state;
|
||||
event->motion.device =
|
||||
_clutter_device_manager_gdk_lookup_device (device_manager,
|
||||
gdk_event->motion.device);
|
||||
break;
|
||||
|
||||
case GDK_2BUTTON_PRESS:
|
||||
case GDK_3BUTTON_PRESS:
|
||||
/* these are handled by clutter-main.c updating click_count */
|
||||
goto out;
|
||||
case GDK_BUTTON_PRESS:
|
||||
case GDK_BUTTON_RELEASE:
|
||||
event = clutter_event_new (gdk_event->type == GDK_BUTTON_PRESS ?
|
||||
CLUTTER_BUTTON_PRESS :
|
||||
CLUTTER_BUTTON_RELEASE);
|
||||
event->button.time = gdk_event->button.time;
|
||||
event->button.x = gdk_event->button.x;
|
||||
event->button.y = gdk_event->button.y;
|
||||
event->button.axes = NULL;
|
||||
event->button.modifier_state = gdk_event->button.state;
|
||||
event->button.button = gdk_event->button.button;
|
||||
event->button.click_count = 1;
|
||||
event->button.device =
|
||||
_clutter_device_manager_gdk_lookup_device (device_manager,
|
||||
gdk_event->button.device);
|
||||
break;
|
||||
|
||||
case GDK_KEY_PRESS:
|
||||
case GDK_KEY_RELEASE:
|
||||
event = clutter_event_new (gdk_event->type == GDK_KEY_PRESS ?
|
||||
CLUTTER_KEY_PRESS :
|
||||
CLUTTER_KEY_RELEASE);
|
||||
event->key.time = gdk_event->key.time;
|
||||
event->key.modifier_state = gdk_event->key.state;
|
||||
event->key.keyval = gdk_event->key.keyval;
|
||||
event->key.hardware_keycode = gdk_event->key.hardware_keycode;
|
||||
event->key.unicode_value = g_utf8_get_char (gdk_event->key.string);
|
||||
break;
|
||||
case GDK_2BUTTON_PRESS:
|
||||
case GDK_3BUTTON_PRESS:
|
||||
/* these are handled by clutter-main.c updating click_count */
|
||||
break;
|
||||
|
||||
case GDK_ENTER_NOTIFY:
|
||||
case GDK_LEAVE_NOTIFY:
|
||||
event = clutter_event_new (gdk_event->type == GDK_ENTER_NOTIFY ?
|
||||
CLUTTER_ENTER :
|
||||
CLUTTER_LEAVE);
|
||||
event->crossing.source = CLUTTER_ACTOR (stage);
|
||||
event->crossing.time = gdk_event->crossing.time;
|
||||
event->crossing.x = gdk_event->crossing.x;
|
||||
event->crossing.y = gdk_event->crossing.y;
|
||||
case GDK_KEY_PRESS:
|
||||
case GDK_KEY_RELEASE:
|
||||
event = clutter_event_new (gdk_event->type == GDK_KEY_PRESS ?
|
||||
CLUTTER_KEY_PRESS :
|
||||
CLUTTER_KEY_RELEASE);
|
||||
event->key.time = gdk_event->key.time;
|
||||
event->key.modifier_state = gdk_event->key.state;
|
||||
event->key.keyval = gdk_event->key.keyval;
|
||||
event->key.hardware_keycode = gdk_event->key.hardware_keycode;
|
||||
event->key.unicode_value = g_utf8_get_char (gdk_event->key.string);
|
||||
break;
|
||||
|
||||
/* XXX: no better fallback here? */
|
||||
event->crossing.device = clutter_device_manager_get_core_device (device_manager,
|
||||
CLUTTER_POINTER_DEVICE);
|
||||
case GDK_ENTER_NOTIFY:
|
||||
case GDK_LEAVE_NOTIFY:
|
||||
event = clutter_event_new (gdk_event->type == GDK_ENTER_NOTIFY ?
|
||||
CLUTTER_ENTER :
|
||||
CLUTTER_LEAVE);
|
||||
event->crossing.source = CLUTTER_ACTOR (stage);
|
||||
event->crossing.time = gdk_event->crossing.time;
|
||||
event->crossing.x = gdk_event->crossing.x;
|
||||
event->crossing.y = gdk_event->crossing.y;
|
||||
|
||||
if (gdk_event->type == GDK_ENTER_NOTIFY)
|
||||
_clutter_stage_add_device (stage, event->crossing.device);
|
||||
else
|
||||
_clutter_stage_remove_device (stage, event->crossing.device);
|
||||
break;
|
||||
/* XXX: no better fallback here? */
|
||||
event->crossing.device =
|
||||
clutter_device_manager_get_core_device (device_manager,
|
||||
CLUTTER_POINTER_DEVICE);
|
||||
|
||||
case GDK_FOCUS_CHANGE:
|
||||
event = clutter_event_new (CLUTTER_STAGE_STATE);
|
||||
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.new_state = gdk_event->focus_change.in ? CLUTTER_STAGE_STATE_ACTIVATED : 0;
|
||||
break;
|
||||
if (gdk_event->type == GDK_ENTER_NOTIFY)
|
||||
_clutter_stage_add_device (stage, event->crossing.device);
|
||||
else
|
||||
_clutter_stage_remove_device (stage, event->crossing.device);
|
||||
break;
|
||||
|
||||
case GDK_CONFIGURE:
|
||||
clutter_actor_set_size (CLUTTER_ACTOR (stage),
|
||||
gdk_event->configure.width,
|
||||
gdk_event->configure.height);
|
||||
break;
|
||||
case GDK_FOCUS_CHANGE:
|
||||
event = clutter_event_new (CLUTTER_STAGE_STATE);
|
||||
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.new_state = gdk_event->focus_change.in
|
||||
? CLUTTER_STAGE_STATE_ACTIVATED
|
||||
: 0;
|
||||
break;
|
||||
|
||||
case GDK_SCROLL:
|
||||
event = clutter_event_new (CLUTTER_SCROLL);
|
||||
event->scroll.time = gdk_event->scroll.time;
|
||||
event->scroll.x = gdk_event->scroll.x;
|
||||
event->scroll.y = gdk_event->scroll.y;
|
||||
event->scroll.modifier_state = gdk_event->scroll.state;
|
||||
event->scroll.axes = NULL;
|
||||
event->scroll.direction = gdk_event->scroll.direction;
|
||||
event->scroll.device = _clutter_device_manager_gdk_lookup_device (device_manager,
|
||||
gdk_event->scroll.device);
|
||||
|
||||
case GDK_WINDOW_STATE:
|
||||
event = clutter_event_new (CLUTTER_STAGE_STATE);
|
||||
event->stage_state.changed_mask = 0;
|
||||
event->stage_state.new_state = 0;
|
||||
if (gdk_event->window_state.changed_mask & GDK_WINDOW_STATE_WITHDRAWN)
|
||||
case GDK_CONFIGURE:
|
||||
{
|
||||
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) ?
|
||||
CLUTTER_STAGE_STATE_OFFSCREEN : 0;
|
||||
}
|
||||
if (gdk_event->window_state.changed_mask & GDK_WINDOW_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) ?
|
||||
CLUTTER_STAGE_STATE_FULLSCREEN : 0;
|
||||
}
|
||||
break;
|
||||
gfloat w, h;
|
||||
|
||||
case GDK_SETTING:
|
||||
_clutter_backend_gdk_update_setting (backend_gdk, gdk_event->setting.name);
|
||||
break;
|
||||
clutter_actor_get_size (CLUTTER_ACTOR (stage), &w, &h);
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if (w != gdk_event->configure.width ||
|
||||
h != gdk_event->configure.height)
|
||||
{
|
||||
clutter_actor_set_size (CLUTTER_ACTOR (stage),
|
||||
gdk_event->configure.width,
|
||||
gdk_event->configure.height);
|
||||
}
|
||||
}
|
||||
break;
|
||||
|
||||
case GDK_SCROLL:
|
||||
event = clutter_event_new (CLUTTER_SCROLL);
|
||||
event->scroll.time = gdk_event->scroll.time;
|
||||
event->scroll.x = gdk_event->scroll.x;
|
||||
event->scroll.y = gdk_event->scroll.y;
|
||||
event->scroll.modifier_state = gdk_event->scroll.state;
|
||||
event->scroll.axes = NULL;
|
||||
event->scroll.direction = gdk_event->scroll.direction;
|
||||
event->scroll.device =
|
||||
_clutter_device_manager_gdk_lookup_device (device_manager,
|
||||
gdk_event->scroll.device);
|
||||
break;
|
||||
|
||||
case GDK_WINDOW_STATE:
|
||||
event = clutter_event_new (CLUTTER_STAGE_STATE);
|
||||
event->stage_state.changed_mask = 0;
|
||||
event->stage_state.new_state = 0;
|
||||
if (gdk_event->window_state.changed_mask & GDK_WINDOW_STATE_WITHDRAWN)
|
||||
{
|
||||
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)
|
||||
? CLUTTER_STAGE_STATE_OFFSCREEN
|
||||
: 0;
|
||||
}
|
||||
|
||||
if (gdk_event->window_state.changed_mask & GDK_WINDOW_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)
|
||||
? CLUTTER_STAGE_STATE_FULLSCREEN
|
||||
: 0;
|
||||
}
|
||||
break;
|
||||
|
||||
case GDK_SETTING:
|
||||
_clutter_backend_gdk_update_setting (backend_gdk, gdk_event->setting.name);
|
||||
break;
|
||||
|
||||
default:
|
||||
break;
|
||||
}
|
||||
|
||||
if (event != NULL)
|
||||
{
|
||||
event->any.stage = stage;
|
||||
|
||||
if (gdk_event->any.send_event)
|
||||
event->any.flags = CLUTTER_EVENT_FLAG_SYNTHETIC;
|
||||
|
||||
_clutter_event_push (event, FALSE);
|
||||
|
||||
spin = 1;
|
||||
|
||||
CLUTTER_NOTE (EVENT, "Translated one event from Gdk");
|
||||
|
|
@ -257,8 +285,7 @@ clutter_gdk_handle_event (GdkEvent *gdk_event)
|
|||
result = GDK_FILTER_REMOVE;
|
||||
}
|
||||
|
||||
out:
|
||||
|
||||
clutter_threads_leave ();
|
||||
|
||||
return result;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue