Fixed gdk_input_devices being NULL when compiled with --xinput=xfree but

no XInput extension in X server.

9 files changed, 66 insertions, 20 deletions

diff --git a/ChangeLog b/ChangeLog
index 9596e33bc8..74de2d90f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Nov 27 11:41:27 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkinputcommon.h (gdk_input_common_init): Fixed it so that
+	it still includes the core pointer in gdk_input_devices even
+	if the XInput extension is not present in the X server.
+
 Fri Nov 27 12:17:15 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.[ch] (gtk_drag_get_source_widget): New function to
diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 9596e33bc8..74de2d90f1 100644
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,9 @@
+Fri Nov 27 11:41:27 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkinputcommon.h (gdk_input_common_init): Fixed it so that
+	it still includes the core pointer in gdk_input_devices even
+	if the XInput extension is not present in the X server.
+
 Fri Nov 27 12:17:15 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.[ch] (gtk_drag_get_source_widget): New function to
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 9596e33bc8..74de2d90f1 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Fri Nov 27 11:41:27 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkinputcommon.h (gdk_input_common_init): Fixed it so that
+	it still includes the core pointer in gdk_input_devices even
+	if the XInput extension is not present in the X server.
+
 Fri Nov 27 12:17:15 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.[ch] (gtk_drag_get_source_widget): New function to
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 9596e33bc8..74de2d90f1 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Fri Nov 27 11:41:27 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkinputcommon.h (gdk_input_common_init): Fixed it so that
+	it still includes the core pointer in gdk_input_devices even
+	if the XInput extension is not present in the X server.
+
 Fri Nov 27 12:17:15 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.[ch] (gtk_drag_get_source_widget): New function to
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 9596e33bc8..74de2d90f1 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Fri Nov 27 11:41:27 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkinputcommon.h (gdk_input_common_init): Fixed it so that
+	it still includes the core pointer in gdk_input_devices even
+	if the XInput extension is not present in the X server.
+
 Fri Nov 27 12:17:15 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.[ch] (gtk_drag_get_source_widget): New function to
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 9596e33bc8..74de2d90f1 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Fri Nov 27 11:41:27 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkinputcommon.h (gdk_input_common_init): Fixed it so that
+	it still includes the core pointer in gdk_input_devices even
+	if the XInput extension is not present in the X server.
+
 Fri Nov 27 12:17:15 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.[ch] (gtk_drag_get_source_widget): New function to
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 9596e33bc8..74de2d90f1 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Fri Nov 27 11:41:27 1998  Raph Levien  <raph@gimp.org>
+
+	* gdk/gdkinputcommon.h (gdk_input_common_init): Fixed it so that
+	it still includes the core pointer in gdk_input_devices even
+	if the XInput extension is not present in the X server.
+
 Fri Nov 27 12:17:15 1998  Owen Taylor  <otaylor@redhat.com>
 
 	* gtk/gtkdnd.[ch] (gtk_drag_get_source_widget): New function to
diff --git a/gdk/gdkinputcommon.h b/gdk/gdkinputcommon.h
index c4e21f4f1c..e5394a37f1 100644
--- a/gdk/gdkinputcommon.h
+++ b/gdk/gdkinputcommon.h
@@ -436,20 +436,22 @@ gdk_input_common_init(gint include_core)
   for (loop = 0; loop < num_extensions &&
 	 (strcmp(extensions[loop], "XInputExtension") != 0); loop++);
   XFreeExtensionList(extensions);
-  if (loop == num_extensions)	/* XInput extension not found */
-    return FALSE;
+  gdk_input_devices = NULL;
+  if (loop < num_extensions)
+    {
+      /* XInput extension found */
 
-  gdk_input_devices = 0;
-  devices = XListInputDevices(display, &num_devices);
+      devices = XListInputDevices(display, &num_devices);
   
-  for(loop=0; loop<num_devices; loop++)
-    {
-      GdkDevicePrivate *gdkdev = gdk_input_device_new(&devices[loop],
+      for(loop=0; loop<num_devices; loop++)
+	{
+	  GdkDevicePrivate *gdkdev = gdk_input_device_new(&devices[loop],
 						      include_core);
-      if (gdkdev)
-	gdk_input_devices = g_list_append(gdk_input_devices, gdkdev);
+	  if (gdkdev)
+	    gdk_input_devices = g_list_append(gdk_input_devices, gdkdev);
+	}
+      XFreeDeviceList(devices);
     }
-  XFreeDeviceList(devices);
 
   gdk_input_devices = g_list_append (gdk_input_devices, &gdk_input_core_info);
 
diff --git a/gdk/x11/gdkinput-x11.c b/gdk/x11/gdkinput-x11.c
index c4e21f4f1c..e5394a37f1 100644
--- a/gdk/x11/gdkinput-x11.c
+++ b/gdk/x11/gdkinput-x11.c
@@ -436,20 +436,22 @@ gdk_input_common_init(gint include_core)
   for (loop = 0; loop < num_extensions &&
 	 (strcmp(extensions[loop], "XInputExtension") != 0); loop++);
   XFreeExtensionList(extensions);
-  if (loop == num_extensions)	/* XInput extension not found */
-    return FALSE;
+  gdk_input_devices = NULL;
+  if (loop < num_extensions)
+    {
+      /* XInput extension found */
 
-  gdk_input_devices = 0;
-  devices = XListInputDevices(display, &num_devices);
+      devices = XListInputDevices(display, &num_devices);
   
-  for(loop=0; loop<num_devices; loop++)
-    {
-      GdkDevicePrivate *gdkdev = gdk_input_device_new(&devices[loop],
+      for(loop=0; loop<num_devices; loop++)
+	{
+	  GdkDevicePrivate *gdkdev = gdk_input_device_new(&devices[loop],
 						      include_core);
-      if (gdkdev)
-	gdk_input_devices = g_list_append(gdk_input_devices, gdkdev);
+	  if (gdkdev)
+	    gdk_input_devices = g_list_append(gdk_input_devices, gdkdev);
+	}
+      XFreeDeviceList(devices);
     }
-  XFreeDeviceList(devices);
 
   gdk_input_devices = g_list_append (gdk_input_devices, &gdk_input_core_info);