rpms/xorg-x11-server/devel xorg-x11-server-1.1.1-always-mouse-thyself.patch, NONE, 1.1 xorg-x11-server-1.1.1-edid-quirks-list.patch, 1.1, 1.2 xorg-x11-server.spec, 1.145, 1.146

[fedora-cvs-commits redhat com]

Author: ajackson

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

Modified Files:
	xorg-x11-server-1.1.1-edid-quirks-list.patch 
	xorg-x11-server.spec 
Added Files:
	xorg-x11-server-1.1.1-always-mouse-thyself.patch 
Log Message:
* Thu Aug 10 2006 Adam Jackson <ajackson redhat com> - 1.1.1-20.fc6
- xorg-x11-server-1.1.1-always-mouse-thyself.patch: If we lack a mouse
  device in the config, and the user hasn't asked for any void devices,
  synthesize a mouse section.  (#200347)
- xorg-x11-server-1.1.1-edid-quirks-list.patch: Better formatting.


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

--- NEW FILE xorg-x11-server-1.1.1-always-mouse-thyself.patch ---
--- 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 @@
 	return FALSE;
     }
 
+    /*
+     * hack: always synthesize a 'mouse' section configured to send core
+     * 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)) {
+	xf86Msg(X_INFO, "No default mouse found, adding one\n");
+	bzero(&defPtr, sizeof(defPtr));
+	defPtr.inp_identifier = "<default pointer>";
+	defPtr.inp_driver = "mouse";
+	confInput = &defPtr;
+	foundPointer = configInput(&Pointer, confInput, from);
+        if (foundPointer) {
+	    count++;
+	    indp = xnfrealloc(servlayoutp->inputs,
+			      (count + 1) * sizeof(IDevRec));
+	    indp[count - 1] = Pointer;
+	    indp[count - 1].extraOptions =
+				xf86addNewOption(NULL, "AlwaysCore", NULL);
+	    indp[count].identifier = NULL;
+	    servlayoutp->inputs = indp;
+	}
+    }
+
     confInput = NULL;
 
     /* 1. Check for the -keyboard command line option. */

xorg-x11-server-1.1.1-edid-quirks-list.patch:
 interpret_edid.c |   26 +++++++++++++++++++++++++-
 1 files changed, 25 insertions(+), 1 deletion(-)

Index: xorg-x11-server-1.1.1-edid-quirks-list.patch
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server-1.1.1-edid-quirks-list.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- xorg-x11-server-1.1.1-edid-quirks-list.patch	9 Aug 2006 23:34:29 -0000	1.1
+++ xorg-x11-server-1.1.1-edid-quirks-list.patch	11 Aug 2006 01:24:06 -0000	1.2
@@ -1,6 +1,6 @@
 --- xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c.edid-quirks	2006-07-05 14:31:40.000000000 -0400
-+++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-09 18:25:19.000000000 -0400
-@@ -32,6 +32,24 @@
++++ xorg-server-1.1.1/hw/xfree86/ddc/interpret_edid.c	2006-08-10 15:16:41.000000000 -0400
+@@ -32,6 +32,28 @@
  static void get_detailed_timing_section(Uchar*, struct 	detailed_timings *);
  static Bool validate_version(int scrnIndex, struct edid_version *);
  
@@ -13,10 +13,14 @@
 +    for (i = 0; i < 4; i++) {
 +	if (m->det_mon[i].type == DS_NAME) {
 +	    if (strstr(m->det_mon[i].section.name, "DELL 2000FP")) {
-+		ErrorF("Dell 2000FP Fixup: Max pixclock = 165MHz\n");
-+		for (i = 0; i < 4; i++)
-+		    if (m->det_mon[i].type == DS_RANGES)
++		for (i = 0; i < 4; i++) {
++		    if (m->det_mon[i].type == DS_RANGES) {
++			xf86Msg(X_INFO, "EDID fixup: Dell 2000FP: "
++				"Max pixclock %d -> 165MHz\n",
++				m->det_mon[i].section.ranges.max_clock);
 +			m->det_mon[i].section.ranges.max_clock = 165;
++		    }
++		}
 +		return;
 +	    }
 +	}
@@ -25,7 +29,7 @@
  
  xf86MonPtr
  xf86InterpretEDID(int scrnIndex, Uchar *block)
-@@ -54,7 +72,9 @@
+@@ -54,7 +76,9 @@
  			   &m->ver);
      get_dt_md_section(SECTION(DET_TIMING_SECTION,block),&m->ver, m->det_mon);
      m->no_sections = (int)*(char *)SECTION(NO_EDID,block);


Index: xorg-x11-server.spec
===================================================================
RCS file: /cvs/dist/rpms/xorg-x11-server/devel/xorg-x11-server.spec,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -r1.145 -r1.146
--- xorg-x11-server.spec	9 Aug 2006 23:34:29 -0000	1.145
+++ xorg-x11-server.spec	11 Aug 2006 01:24:06 -0000	1.146
@@ -8,7 +8,7 @@
 # upgrades to officially released distribution releases, if the package
 # Version field above is not changing, append and/or bump a digit /after/
 # the dist tag.  ie:  25%{?dist}.0 -> 25%{?dist}.1 ...
-Release:   19%{?dist}
+Release:   20%{?dist}
 URL:       http://www.x.org
 License:   MIT/X11
 Group:     User Interface/X
@@ -61,6 +61,7 @@
 Patch3009:  xorg-x11-server-1.1.1-module-list.patch
 Patch3010:  xorg-x11-server-1.1.1-edid-quirks-list.patch
 Patch3011:  xorg-x11-server-1.1.1-defaultdepth-24.patch
+Patch3012:  xorg-x11-server-1.1.1-always-mouse-thyself.patch
 
 %define moduledir	%{_libdir}/xorg/modules
 %define drimoduledir	%{_libdir}/dri
@@ -358,6 +359,7 @@
 %patch3009 -p1 -b .module-list
 %patch3010 -p1 -b .edid-quirks
 %patch3011 -p1 -b .defaultdepth
+%patch3012 -p1 -b .mouse-thyself
 
 %build
 #FONTDIR="${datadir}/X11/fonts"
@@ -687,6 +689,12 @@
 # -------------------------------------------------------------------
 
 %changelog
+* Thu Aug 10 2006 Adam Jackson <ajackson redhat com> - 1.1.1-20.fc6
+- xorg-x11-server-1.1.1-always-mouse-thyself.patch: If we lack a mouse
+  device in the config, and the user hasn't asked for any void devices,
+  synthesize a mouse section.  (#200347)
+- xorg-x11-server-1.1.1-edid-quirks-list.patch: Better formatting.
+
 * Wed Aug  9 2006 Adam Jackson <ajackson redhat com> - 1.1.1-19.fc6
 - xorg-x11-server-1.1.1-builderstring.patch: Enable the builder info
   string at configure time;