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

2008-06-25 Matthew Allum <mallum@openedhand.com>

Browse Source 
* clutter/x11/clutter-backend-x11.c: (_clutter_x11_register_xinput)
        Add extra safety and fallback if no useable pointing devices are
        found.
This commit is contained in:
Matthew Allum 2008-06-25 12:02:11 +00:00
parent 8b1385ed23
commit 6371f0c621
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2008-06-25 Matthew Allum <mallum@openedhand.com>
* clutter/x11/clutter-backend-x11.c: (_clutter_x11_register_xinput)
Add extra safety and fallback if no useable pointing devices are
found.
2008-06-25 Emmanuele Bassi <ebassi@openedhand.com> 2008-06-25 Emmanuele Bassi <ebassi@openedhand.com>
* clutter/clutter-stage.c: * clutter/clutter-stage.c:

24
clutter/x11/clutter-backend-x11.c
View File

@ -568,7 +568,8 @@ _clutter_x11_register_xinput ()
gint num_devices = 0; gint num_devices = 0;
gint num_events = 0; gint num_events = 0;
gint i = 0, j = 0; gint i = 0, j = 0;
gboolean have_an_xpointer = FALSE;
ClutterBackendX11 *x11b; ClutterBackendX11 *x11b;
ClutterX11XInputDevice *device = NULL; ClutterX11XInputDevice *device = NULL;
@ -617,11 +618,15 @@ _clutter_x11_register_xinput ()
info->use == IsXExtensionKeyboard || info->use == IsXExtensionKeyboard ||
info->use == IsXExtensionDevice) info->use == IsXExtensionDevice)
{ {
clutter_x11_trap_x_errors ();
xdevice = XOpenDevice (x11b->xdpy, info->id);
if (clutter_x11_untrap_x_errors () || xdevice == NULL)
continue;
/* Create the appropriate Clutter device */ /* Create the appropriate Clutter device */
device = g_new0 (ClutterX11XInputDevice, 1); device = g_new0 (ClutterX11XInputDevice, 1);
context->input_devices = g_slist_append (context->input_devices, device); context->input_devices = g_slist_append (context->input_devices, device);
xdevice = XOpenDevice (x11b->xdpy, info->id);
device->device.id = info->id; device->device.id = info->id;
/* FIXME: some kind of general device_init() call should do below */ /* FIXME: some kind of general device_init() call should do below */
@ -638,6 +643,7 @@ _clutter_x11_register_xinput ()
{ {
case IsXExtensionPointer: case IsXExtensionPointer:
device->type = CLUTTER_X11_XINPUT_POINTER_DEVICE; device->type = CLUTTER_X11_XINPUT_POINTER_DEVICE;
have_an_xpointer = TRUE;
break; break;
case IsXExtensionKeyboard: case IsXExtensionKeyboard:
device->type = CLUTTER_X11_XINPUT_KEYBOARD_DEVICE; device->type = CLUTTER_X11_XINPUT_KEYBOARD_DEVICE;
@ -694,11 +700,25 @@ _clutter_x11_register_xinput ()
} }
} }
if (info->use == IsXExtensionPointer && num_events > 0)
have_an_xpointer = TRUE;
device->num_events = num_events; device->num_events = num_events;
} }
} }
XFree (xdevices); XFree (xdevices);
if (!have_an_xpointer)
{
/* Something is likely wrong with Xinput setup so we basically
* abort here and fall back to lofi regular xinput.
*/
g_warning ("No usuable XInput pointing devices found");
backend_singleton->have_xinput = FALSE;
g_slist_free (context->input_devices);
context->input_devices = NULL;
}
} }
void void