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

core: enable XInput2 by default

Browse Source 
Enable XI2 support in both Clutter and GDK.

https://bugzilla.gnome.org/show_bug.cgi?id=688779
This commit is contained in:
Carlos Garnacho 2011-07-09 18:49:35 +02:00 committed by Jasper St. Pierre
parent 0fd4059927
commit 946a42f13e
2 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/main.c
View File

@ -301,6 +301,8 @@ static GSourceFuncs event_funcs = {
static void static void
meta_clutter_init (void) meta_clutter_init (void)
{ {
clutter_x11_enable_xinput ();
clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ())); clutter_x11_set_display (GDK_DISPLAY_XDISPLAY (gdk_display_get_default ()));
clutter_x11_disable_event_retrieval (); clutter_x11_disable_event_retrieval ();

8
src/ui/ui.c
View File

@ -60,14 +60,6 @@ struct _MetaUI
void void
meta_ui_init (void) meta_ui_init (void)
{ {
/* As of 2.91.7, Gdk uses XI2 by default, which conflicts with the
* direct X calls we use - in particular, events caused by calls to
* XGrabPointer/XGrabKeyboard are no longer understood by GDK, while
* GDK will no longer generate the core XEvents we process.
* So at least for now, enforce the previous behavior.
*/
gdk_disable_multidevice ();
if (!gtk_init_check (NULL, NULL)) if (!gtk_init_check (NULL, NULL))
meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL)); meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));