isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-12-24 12:02:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: Update the devices test

Browse Source 
Use the DeviceManager API instead of the X11 specific API.
This commit is contained in:
Emmanuele Bassi 2009-11-20 16:37:58 +00:00
parent 157da20e86
commit d5331bfb57
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -43,6 +43,7 @@ test_devices_main (int argc, char **argv)
ClutterActor *stage; ClutterActor *stage;
TestDevicesApp *app; TestDevicesApp *app;
ClutterColor stage_color = { 0x61, 0x64, 0x8c, 0xff }; ClutterColor stage_color = { 0x61, 0x64, 0x8c, 0xff };
ClutterDeviceManager *manager;
const GSList *stage_devices, *l; const GSList *stage_devices, *l;
/* force enabling X11 support */ /* force enabling X11 support */
@ -63,10 +64,11 @@ test_devices_main (int argc, char **argv)
clutter_actor_show_all (stage); clutter_actor_show_all (stage);
stage_devices = clutter_x11_get_input_devices (); manager = clutter_device_manager_get_default ();
stage_devices = clutter_device_manager_peek_devices (manager);
if (stage_devices == NULL) if (stage_devices == NULL)
g_error ("No extended input devices found."); g_error ("No input devices found.");
for (l = stage_devices; l != NULL; l = l->next) for (l = stage_devices; l != NULL; l = l->next)
{ {
@ -75,7 +77,7 @@ test_devices_main (int argc, char **argv)
ClutterActor *hand = NULL; ClutterActor *hand = NULL;
device_type = clutter_input_device_get_device_type (device); device_type = clutter_input_device_get_device_type (device);
if (device_type == CLUTTER_POINTER_DEVICE) if (device_type == CLUTTER_POINTER_DEVICE)
{ {
g_print ("got a pointer device with id %d...\n", g_print ("got a pointer device with id %d...\n",
clutter_input_device_get_device_id (device)); clutter_input_device_get_device_id (device));