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

[x11] Disable XInput by default

Browse Source 
The XInput support in Clutter is still using XI 1.x. This will never
work correctly, and we are all waiting for XInput 2 anyway. The changes
internally should be minimal, so we can leave everything in place, but
it's better to disable XInput support by default -- at least for the
time being.
This commit is contained in:
Emmanuele Bassi 2009-06-05 12:26:29 +01:00
parent 3ee093e356
commit cbb748f7c0
3 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -638,11 +638,10 @@ clutter_x11_remove_filter (ClutterX11FilterFunc func,
}
}
#ifdef HAVE_XINPUT
void
_clutter_x11_register_xinput ()
{
#ifdef HAVE_XINPUT
XDeviceInfo *xdevices = NULL;
XDeviceInfo *info = NULL;
@ -823,6 +822,7 @@ _clutter_x11_register_xinput ()
g_slist_free (context->input_devices);
context->input_devices = NULL;
}
#endif /* HAVE_XINPUT */
}
void
@ -834,6 +834,7 @@ _clutter_x11_unregister_xinput ()
void
_clutter_x11_select_events (Window xwin)
{
#ifdef HAVE_XINPUT
GSList *list_it;
ClutterX11XInputDevice *device = NULL;
@ -858,11 +859,13 @@ _clutter_x11_select_events (Window xwin)
device->xevent_list,
device->num_events);
}
#endif /* HAVE_XINPUT */
}
ClutterX11XInputDevice *
_clutter_x11_get_device_for_xid (XID id)
{
#ifdef HAVE_XINPUT
GSList *list_it;
ClutterX11XInputDevice *device = NULL;
ClutterMainContext *context;
@ -885,17 +888,18 @@ _clutter_x11_get_device_for_xid (XID id)
return device;
}
#endif /* HAVE_XINPUT */
return NULL;
}
#endif
/* FIXME: This nasty little func needs moving elsewhere.. */
GSList*
GSList *
clutter_x11_get_input_devices (void)
{
#ifdef HAVE_XINPUT
ClutterMainContext *context;
#ifdef HAVE_XINPUT
if (!backend_singleton)
{
g_critical ("X11 backend has not been initialised");
@ -955,9 +959,9 @@ clutter_x11_has_xinput (void)
gboolean
clutter_x11_has_composite_extension (void)
{
static gboolean have_composite = FALSE, done_check = FALSE;
int error = 0, event = 0;
Display *dpy;
static gboolean have_composite = FALSE, done_check = FALSE;
int error = 0, event = 0;
Display *dpy;
if (done_check)
return have_composite;

6
clutter/x11/clutter-event-x11.c
View File

@ -798,8 +798,7 @@ event_translate (ClutterBackend *backend,
xbev->button == 6 ||
xbev->button == 7)
{
res = FALSE;
goto out;
return FALSE;
}
event->button.type = event->type = CLUTTER_BUTTON_RELEASE;
@ -862,7 +861,7 @@ event_translate (ClutterBackend *backend,
}
#endif
else
#endif
#endif /* HAVE_XINPUT */
{
CLUTTER_NOTE (EVENT, "Uknown Event");
res = FALSE;
@ -870,7 +869,6 @@ event_translate (ClutterBackend *backend,
}
}
out:
return res;
}

2
configure.ac
View File

@ -485,7 +485,7 @@ AS_IF([test "x$clutterbackend" = "xglx" || test "x$clutterbackend" = "xeglx"],
[PKG_CHECK_MODULES(XINPUT, [xi], [xinput=yes], [xinput=no])]
)
],
[xinput=yes])
[xinput=no])
AS_CASE([$xinput],