ui: Disable multidevice support in GDK

GDK now uses XI2 by default, which conflicts with the X calls done
in mutter. Enforce the previous behavior.
This commit is contained in:
Florian Müllner 2010-12-15 13:23:08 +01:00
parent 594a69317a
commit 53777b133b

View File

@ -60,6 +60,16 @@ struct _MetaUI
void void
meta_ui_init (int *argc, char ***argv) meta_ui_init (int *argc, char ***argv)
{ {
/* 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.
*/
#if GTK_CHECK_VERSION(2, 91, 7)
gdk_disable_multidevice ();
#endif
if (!gtk_init_check (argc, argv)) if (!gtk_init_check (argc, argv))
meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL)); meta_fatal ("Unable to open X display %s\n", XDisplayName (NULL));