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

test-devices: Actually print the axis data

Browse Source 
Returning in an if() block whose condition we assume to be true doesn't
play nicely with having statements after the block. Let's fix that.
This commit is contained in:
Emmanuele Bassi 2011-01-21 15:27:56 +00:00
parent e46571d639
commit b7d26b2d02
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
tests/interactive/test-devices.c
View File

@ -84,19 +84,22 @@ stage_button_event_cb (ClutterActor *actor,
ClutterInputDevice *device; ClutterInputDevice *device;
ClutterInputDevice *source_device; ClutterInputDevice *source_device;
ClutterActor *hand = NULL; ClutterActor *hand = NULL;
gdouble *axes;
guint n_axes, i;
device = clutter_event_get_device (event); device = clutter_event_get_device (event);
source_device = clutter_event_get_source_device (event); source_device = clutter_event_get_source_device (event);
hand = g_hash_table_lookup (app->devices, device); hand = g_hash_table_lookup (app->devices, device);
g_print ("Device: '%s' (id:%d, type: %s, source: '%s')\n", g_print ("Device: '%s' (id:%d, type: %s, source: '%s', axes: %d)\n",
clutter_input_device_get_device_name (device), clutter_input_device_get_device_name (device),
clutter_input_device_get_device_id (device), clutter_input_device_get_device_id (device),
device_type_name (device), device_type_name (device),
source_device != device source_device != device
? clutter_input_device_get_device_name (source_device) ? clutter_input_device_get_device_name (source_device)
: "<same>"); : "<same>",
clutter_input_device_get_n_axes (device));
if (hand != NULL) if (hand != NULL)
{ {
@ -104,23 +107,21 @@ stage_button_event_cb (ClutterActor *actor,
clutter_event_get_coords (event, &event_x, &event_y); clutter_event_get_coords (event, &event_x, &event_y);
clutter_actor_set_position (hand, event_x, event_y); clutter_actor_set_position (hand, event_x, event_y);
return TRUE;
} }
if (event->motion.axes != NULL) axes = clutter_event_get_axes (event, &n_axes);
for (i = 0; i < n_axes; i++)
{ {
gdouble *axes; ClutterInputAxis axis;
guint n_axes, i;
axes = clutter_event_get_axes (event, &n_axes); axis = clutter_input_device_get_axis (device, i);
for (i = 0; i < n_axes; i++) if (axis == CLUTTER_INPUT_AXIS_IGNORE)
{ continue;
g_print ("Axis[%02d][%s].value: %.2f\n",
i, g_print ("\tAxis[%2d][%s].value: %.2f\n",
axis_type_name (clutter_input_device_get_axis (device, i)), i,
axes[i]); axis_type_name (axis),
} axes[i]);
} }
return FALSE; return FALSE;