isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-26 10:00:45 -05:00
Code Issues Packages Projects Releases Wiki Activity

event: Clean up clutter_event_copy()

Browse Source 
Try to avoid duplication of variables and blocks.
This commit is contained in:
Emmanuele Bassi 2011-01-21 15:14:11 +00:00
parent 7a339d1663
commit 516366d769
1 changed files with 21 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
clutter/clutter-event.c
View File

@ -677,6 +677,8 @@ clutter_event_copy (const ClutterEvent *event)
{ {
ClutterEvent *new_event; ClutterEvent *new_event;
ClutterEventPrivate *new_real_event; ClutterEventPrivate *new_real_event;
ClutterInputDevice *device;
gint n_axes = 0;
g_return_val_if_fail (event != NULL, NULL); g_return_val_if_fail (event != NULL, NULL);
@ -692,40 +694,29 @@ clutter_event_copy (const ClutterEvent *event)
new_real_event->source_device = real_event->source_device; new_real_event->source_device = real_event->source_device;
} }
device = clutter_event_get_device (event);
if (device != NULL)
n_axes = clutter_input_device_get_n_axes (device);
switch (event->type) switch (event->type)
{ {
case CLUTTER_BUTTON_PRESS: case CLUTTER_BUTTON_PRESS:
case CLUTTER_BUTTON_RELEASE: case CLUTTER_BUTTON_RELEASE:
if (event->button.device != NULL && event->button.axes != NULL) if (event->button.axes != NULL)
{ new_event->button.axes = g_memdup (event->button.axes,
gint n_axes; sizeof (gdouble) * n_axes);
n_axes = clutter_input_device_get_n_axes (event->button.device);
new_event->button.axes = g_memdup (event->button.axes,
sizeof (gdouble) * n_axes);
}
break; break;
case CLUTTER_SCROLL: case CLUTTER_SCROLL:
if (event->scroll.device != NULL && event->scroll.axes != NULL) if (event->scroll.axes != NULL)
{ new_event->scroll.axes = g_memdup (event->scroll.axes,
gint n_axes; sizeof (gdouble) * n_axes);
n_axes = clutter_input_device_get_n_axes (event->scroll.device);
new_event->scroll.axes = g_memdup (event->scroll.axes,
sizeof (gdouble) * n_axes);
}
break; break;
case CLUTTER_MOTION: case CLUTTER_MOTION:
if (event->motion.device != NULL && event->motion.axes != NULL) if (event->motion.axes != NULL)
{ new_event->motion.axes = g_memdup (event->motion.axes,
gint n_axes; sizeof (gdouble) * n_axes);
n_axes = clutter_input_device_get_n_axes (event->motion.device);
new_event->motion.axes = g_memdup (event->motion.axes,
sizeof (gdouble) * n_axes);
}
break; break;
default: default:
@ -1051,11 +1042,14 @@ clutter_event_get_axes (const ClutterEvent *event,
case CLUTTER_DELETE: case CLUTTER_DELETE:
case CLUTTER_ENTER: case CLUTTER_ENTER:
case CLUTTER_LEAVE: case CLUTTER_LEAVE:
case CLUTTER_SCROLL:
case CLUTTER_KEY_PRESS: case CLUTTER_KEY_PRESS:
case CLUTTER_KEY_RELEASE: case CLUTTER_KEY_RELEASE:
break; break;
case CLUTTER_SCROLL:
retval = event->scroll.axes;
break;
case CLUTTER_BUTTON_PRESS: case CLUTTER_BUTTON_PRESS:
case CLUTTER_BUTTON_RELEASE: case CLUTTER_BUTTON_RELEASE:
retval = event->button.axes; retval = event->button.axes;
@ -1073,6 +1067,8 @@ clutter_event_get_axes (const ClutterEvent *event,
device = clutter_event_get_device (event); device = clutter_event_get_device (event);
if (device != NULL) if (device != NULL)
len = clutter_input_device_get_n_axes (device); len = clutter_input_device_get_n_axes (device);
else
retval = NULL;
} }
if (n_axes) if (n_axes)