[gtk+/xi2-playground: 5/12] Turn on multidevice support by default.

[Carlos Garnacho <carlosg src gnome org>]

commit 02841830fab74f7ddec511c40518a3f4a73f457e
Author: Carlos Garnacho <carlosg gnome org>
Date:   Mon Jun 7 15:32:05 2010 +0200

    Turn on multidevice support by default.
    
    gdk_enable_multidevice() has been replaced with gdk_disable_multidevice(), although
    there would be usually little reasons to call that function, unless the application
    is doing X calls itself that count on old fashioned core devices.

 gdk/gdk.c                      |   16 ++++++++--------
 gdk/gdk.h                      |    2 +-
 gdk/gdk.symbols                |    2 +-
 gdk/gdkdevicemanager.c         |   11 ++++++-----
 gdk/gdkglobals.c               |    2 +-
 gdk/gdkinternals.h             |    2 +-
 gdk/x11/gdkdevicemanager-x11.c |    2 +-
 7 files changed, 19 insertions(+), 18 deletions(-)
---
diff --git a/gdk/gdk.c b/gdk/gdk.c
index 89a4e2f..72d5282 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -788,26 +788,26 @@ gdk_set_program_class (const char *program_class)
 }
 
 /**
- * gdk_enable_multidevice:
+ * gdk_disable_multidevice:
  *
- * Enables multidevice support in GDK. This call must happen prior
+ * Disables multidevice support in GDK. This call must happen prior
  * to gdk_display_open(), gtk_init(), gtk_init_with_args() or
  * gtk_init_check() in order to take effect.
  *
- * Note that individual #GdkWindow<!-- -->s still need to explicitly
- * enable multidevice awareness through gdk_window_set_support_multidevice().
- *
- * This function must be called before initializing GDK.
+ * Most common GTK+ applications won't ever need to call this. Only
+ * applications that do mixed GDK/Xlib calls could want to disable
+ * multidevice support if such Xlib code deals with input devices in
+ * any way and doesn't observe the presence of XInput 2.
  *
  * Since: 3.0
  **/
 void
-gdk_enable_multidevice (void)
+gdk_disable_multidevice (void)
 {
   if (gdk_initialized)
     return;
 
-  _gdk_enable_multidevice = TRUE;
+  _gdk_disable_multidevice = TRUE;
 }
 
 #define __GDK_C__
diff --git a/gdk/gdk.h b/gdk/gdk.h
index 89a9a8b..a3cafe9 100644
--- a/gdk/gdk.h
+++ b/gdk/gdk.h
@@ -68,7 +68,7 @@ G_BEGIN_DECLS
 /* Initialization, exit and events
  */
 #define	  GDK_PRIORITY_EVENTS		(G_PRIORITY_DEFAULT)
-void      gdk_enable_multidevice        (void);
+void      gdk_disable_multidevice       (void);
 void 	  gdk_parse_args	   	(gint	   	*argc,
 					 gchar        ***argv);
 void 	  gdk_init		   	(gint	   	*argc,
diff --git a/gdk/gdk.symbols b/gdk/gdk.symbols
index c4113ff..b83b3f6 100644
--- a/gdk/gdk.symbols
+++ b/gdk/gdk.symbols
@@ -181,7 +181,7 @@ gdk_get_display_arg_name
 gdk_get_program_class
 gdk_init
 gdk_init_check
-gdk_enable_multidevice
+gdk_disable_multidevice
 gdk_pre_parse_libgtk_only
 gdk_parse_args
 gdk_set_program_class
diff --git a/gdk/gdkdevicemanager.c b/gdk/gdkdevicemanager.c
index 5bce0fc..6fa8960 100644
--- a/gdk/gdkdevicemanager.c
+++ b/gdk/gdkdevicemanager.c
@@ -34,12 +34,13 @@
  *                    additional features such as sub-pixel positioning information and additional
  *                    device-dependent information.
  * @Title: GdkDeviceManager
- * @See_also: #GdkDevice, #GdkEvent, gdk_enable_multidevice()
+ * @See_also: #GdkDevice, #GdkEvent, gdk_disable_multidevice()
  *
- * By default, GDK supports the traditional single keyboard/pointer input scheme (Plus additional
- * special input devices such as tablets. In short, backwards compatible with 2.X). Since version 3.0,
- * if gdk_enable_multidevice() is called before gdk_display_open() and the platform supports it, GDK
- * will be aware of multiple keyboard/pointer pairs interacting simultaneously with the user interface.
+ * By default, and if the platform supports it, GDK is aware of multiple keyboard/pointer pairs
+ * and multitouch devices, this behavior can be changed by calling gdk_disable_multidevice()
+ * before gdk_display_open(), although there would be rarely a reason to do that. For a widget
+ * or window to be dealt as multipointer aware, gdk_window_set_support_multidevice() or
+ * gtk_widget_set_support_multidevice() must have been called on it.
  *
  * Conceptually, in multidevice mode there are 2 device types, virtual devices (or master devices)
  * are represented by the pointer cursors and keyboard foci that are seen on the screen. physical
diff --git a/gdk/gdkglobals.c b/gdk/gdkglobals.c
index a805bcc..27ed3bd 100644
--- a/gdk/gdkglobals.c
+++ b/gdk/gdkglobals.c
@@ -40,7 +40,7 @@ gchar              *_gdk_display_name = NULL;
 gint                _gdk_screen_number = -1;
 gchar              *_gdk_display_arg_name = NULL;
 gboolean            _gdk_native_windows = FALSE;
-gboolean            _gdk_enable_multidevice = FALSE;
+gboolean            _gdk_disable_multidevice = FALSE;
 
 GSList             *_gdk_displays = NULL;
 
diff --git a/gdk/gdkinternals.h b/gdk/gdkinternals.h
index 3e5cb57..7c98d56 100644
--- a/gdk/gdkinternals.h
+++ b/gdk/gdkinternals.h
@@ -302,7 +302,7 @@ extern GSList    *_gdk_displays;
 extern gchar     *_gdk_display_name;
 extern gint       _gdk_screen_number;
 extern gchar     *_gdk_display_arg_name;
-extern gboolean   _gdk_enable_multidevice;
+extern gboolean   _gdk_disable_multidevice;
 
 void      _gdk_events_queue  (GdkDisplay *display);
 GdkEvent* _gdk_event_unqueue (GdkDisplay *display);
diff --git a/gdk/x11/gdkdevicemanager-x11.c b/gdk/x11/gdkdevicemanager-x11.c
index 335764b..9a58bf0 100644
--- a/gdk/x11/gdkdevicemanager-x11.c
+++ b/gdk/x11/gdkdevicemanager-x11.c
@@ -48,7 +48,7 @@ _gdk_device_manager_new (GdkDisplay *display)
           major = 2;
           minor = 0;
 
-          if (_gdk_enable_multidevice &&
+          if (!_gdk_disable_multidevice &&
               XIQueryVersion (xdisplay, &major, &minor) != BadRequest)
             {
               GdkDeviceManagerXI2 *device_manager_xi2;