rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-always-mouse-thyself.patch, 1.1, 1.2 xorg-x11-server.spec, 1.165, 1.166

[fedora-cvs-commits at redhat.com]

Author: ajackson

Update of /cvs/dist/rpms/xorg-x11-server/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv24728

Modified Files:
	xorg-x11-server-1.1.1-always-mouse-thyself.patch 
	xorg-x11-server.spec 
Log Message:
* Tue Sep  5 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-35.fc6
- xorg-x11-server-1.1.1-always-mouse-thyself.patch: Fix the check to look
  for mouse/void drivers in the running layout, as opposed to the config file,
  so as not to synthesize two mouse devices.


xorg-x11-server-1.1.1-always-mouse-thyself.patch:
 xf86Config.c |   31 +++++++++++++++++++++++++++++++
 1 files changed, 31 insertions(+)

Index: xorg-x11-server-1.1.1-always-mouse-thyself.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-always-mouse-thyself.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.1-always-mouse-thyself.patch	11 Aug 2006 01:24:06 -0000	1.1
+++ xorg-x11-server-1.1.1-always-mouse-thyself.patch	5 Sep 2006 22:07:50 -0000	1.2
@@ -1,6 +1,6 @@
---- xorg-server-1.1.1/hw/xfree86/common/xf86Config.c.mouse-thyself	2006-08-10 14:00:15.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/common/xf86Config.c	2006-08-10 14:19:13.000000000 -0400
-@@ -1625,6 +1625,31 @@
+--- xorg-server-1.1.1/hw/xfree86/common/xf86Config.c.mouse-thyself	2006-09-05 14:52:12.000000000 -0400
++++ xorg-server-1.1.1/hw/xfree86/common/xf86Config.c	2006-09-05 15:23:06.000000000 -0400
+@@ -1625,6 +1625,37 @@ checkCoreInputDevices(serverLayoutPtr se
  	return FALSE;
      }
  
@@ -9,8 +9,14 @@
 +     * events, unless a 'void' section is found, in which case the user
 +     * probably wants to run footless.
 +     */
-+    if (!xf86findInputByDriver("void", xf86configptr->conf_input_lst) &&
-+	    !xf86findInputByDriver("mouse", xf86configptr->conf_input_lst)) {
++    int _found = 0;
++    IDevPtr i;
++    for (i = servlayoutp->inputs; i->driver; i++) {
++	if (!strcmp(i->driver, "void") || !strcmp(i->driver, "mouse")) {
++	    _found = 1; break;
++	}
++    }
++    if (!_found) {
 +	xf86Msg(X_INFO, "No default mouse found, adding one\n");
 +	bzero(&defPtr, sizeof(defPtr));
 +	defPtr.inp_identifier = "<default pointer>";


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.165
retrieving revision 1.166
diff -u -r1.165 -r1.166
--- xorg-x11-server.spec	31 Aug 2006 19:05:51 -0000	1.165
+++ xorg-x11-server.spec	5 Sep 2006 22:07:50 -0000	1.166
@@ -3,7 +3,7 @@
 Summary:   X.Org X11 X server
 Name:      xorg-x11-server
 Version:   1.1.1
-Release:   34%{?dist}
+Release:   35%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -703,6 +703,11 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Tue Sep  5 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-35.fc6
+- xorg-x11-server-1.1.1-always-mouse-thyself.patch: Fix the check to look
+  for mouse/void drivers in the running layout, as opposed to the config file,
+  so as not to synthesize two mouse devices.
+
 * Thu Aug 31 2006 Adam Jackson <ajackson at redhat.com> - 1.1.1-34.fc6
 - xorg-x11-server-1.1.1-infer-virtual.patch: Be slightly more paranoid about
   setting line pitch, and rescan the mode list after pruning to re-validate