svn merge ^/branches/released .

4 files changed, 86 insertions, 69 deletions

diff --git a/xorg-server/hw/xfree86/common/xf86Config.c b/xorg-server/hw/xfree86/common/xf86Config.c
index 3a8380121..faeda92ee 100644
--- a/xorg-server/hw/xfree86/common/xf86Config.c
+++ b/xorg-server/hw/xfree86/common/xf86Config.c
@@ -78,19 +78,19 @@ extern DeviceAssocRec mouse_assoc;
 			"/etc/X11/%R," "%P/etc/X11/%R," \

 			"%E," "%F," \

 			"/etc/X11/%F," "%P/etc/X11/%F," \

-			"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \

-			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \

+			"/etc/X11/%X," "/etc/%X," \

+			"%P/etc/X11/%X.%H," \

 			"%P/etc/X11/%X," \

-			"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \

+			"%P/lib/X11/%X.%H," \

 			"%P/lib/X11/%X"

 #endif

 #ifndef USER_CONFIGPATH

 #define USER_CONFIGPATH	"/etc/X11/%S," "%P/etc/X11/%S," \

 			"/etc/X11/%G," "%P/etc/X11/%G," \

-			"/etc/X11/%X-%M," "/etc/X11/%X," "/etc/%X," \

-			"%P/etc/X11/%X.%H," "%P/etc/X11/%X-%M," \

+			"/etc/X11/%X," "/etc/%X," \

+			"%P/etc/X11/%X.%H," \

 			"%P/etc/X11/%X," \

-			"%P/lib/X11/%X.%H," "%P/lib/X11/%X-%M," \

+			"%P/lib/X11/%X.%H," \

 			"%P/lib/X11/%X"

 #endif

 #ifndef ROOT_CONFIGDIRPATH

@@ -524,24 +524,6 @@ fixup_video_driver_list(char **drivers)
             }

         }

     }

-    /*

-     * since the ati wrapper driver is gross and awful, sort ati before

-     * atimisc, which makes sure all the ati symbols are visible in xorgcfg.

-     */

-    for (drv = drivers; drv != end; drv++) {

-        if (!strcmp(*drv, "atimisc")) {

-            atimisc = drv;

-            for (drv = atimisc; drv != end; drv++) {

-                if (!strcmp(*drv, "ati")) {

-                    ati = drv;

-                    x = *ati; *ati = *atimisc; *atimisc = x;

-                    return;

-                }

-            }

-            /* if we get here, ati was already ahead of atimisc */

-            return;

-        }

-    }

 }

 

 static char **

@@ -549,7 +531,7 @@ GenerateDriverlist(char * dirname)
 {

     char **ret;

     const char *subdirs[] = { dirname, NULL };

-    static const char *patlist[] = {"(.*)_drv\\.so", "(.*)_drv\\.o", NULL};

+    static const char *patlist[] = {"(.*)_drv\\.so", NULL};

     ret = LoaderListDirs(subdirs, patlist);

     

     /* fix up the probe order for video drivers */

@@ -2229,15 +2211,11 @@ configDevice(GDevPtr devicep, XF86ConfDevicePtr conf_device, Bool active)
 static void

 configDRI(XF86ConfDRIPtr drip)

 {

-    int                count = 0;

-    XF86ConfBuffersPtr bufs;

     int                i;

     struct group       *grp;

 

     xf86ConfigDRI.group      = -1;

     xf86ConfigDRI.mode       = 0;

-    xf86ConfigDRI.bufs_count = 0;

-    xf86ConfigDRI.bufs       = NULL;

 

     if (drip) {

 	if (drip->dri_group_name) {

@@ -2248,24 +2226,6 @@ configDRI(XF86ConfDRIPtr drip)
 		xf86ConfigDRI.group = drip->dri_group;

 	}

 	xf86ConfigDRI.mode = drip->dri_mode;

-	for (bufs = drip->dri_buffers_lst; bufs; bufs = bufs->list.next)

-	    ++count;

-	

-	xf86ConfigDRI.bufs_count = count;

-	xf86ConfigDRI.bufs = xnfalloc(count * sizeof(*xf86ConfigDRI.bufs));

-	

-	for (i = 0, bufs = drip->dri_buffers_lst;

-	     i < count;

-	     i++, bufs = bufs->list.next) {

-	    

-	    xf86ConfigDRI.bufs[i].count = bufs->buf_count;

-	    xf86ConfigDRI.bufs[i].size  = bufs->buf_size;

-				/* FIXME: Flags not implemented.  These

-                                   could be used, for example, to specify a

-                                   contiguous block and/or write-combining

-                                   cache policy. */

-	    xf86ConfigDRI.bufs[i].flags = 0;

-	}

     }

 }

 #endif

diff --git a/xorg-server/hw/xfree86/common/xf86Mode.c b/xorg-server/hw/xfree86/common/xf86Mode.c
index af738e703..c3a190777 100644
--- a/xorg-server/hw/xfree86/common/xf86Mode.c
+++ b/xorg-server/hw/xfree86/common/xf86Mode.c
@@ -1831,8 +1831,6 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
 	numModes++;

     }

 

-#undef _VIRTUALX

-

     /*

      * If we estimated the virtual size above, we may have filtered away all

      * the modes that maximally match that size; scan again to find out and

@@ -1847,13 +1845,69 @@ xf86ValidateModes(ScrnInfoPtr scrp, DisplayModePtr availModes,
 	    }

 	}

 	if (vx < virtX || vy < virtY) {

+	    const int types[] = {

+		M_T_BUILTIN | M_T_PREFERRED,

+		M_T_BUILTIN,

+		M_T_DRIVER | M_T_PREFERRED,

+		M_T_DRIVER,

+		0

+	    };

+	    const int ntypes = sizeof(types) / sizeof(int);

+	    int n;

+

+	    /* 

+	     * We did not find the estimated virtual size. So now we want to 

+	     * find the largest mode available, but we want to search in the

+	     * modes in the order of "types" listed above.

+	     */

+	    for (n = 0; n < ntypes; n++) {

+		int type = types[n];

+

+		vx = 0; vy = 0;

+		for (p = scrp->modes; p; p = p->next) {

+		    /* scan through the modes in the sort order above */

+		    if ((p->type & type) != type)

+			continue;

+		    if (p->HDisplay > vx && p->VDisplay > vy) {

+			vx = p->HDisplay;

+			vy = p->VDisplay;

+		    }

+		}

+		if (vx && vy)

+		    /* Found one */

+		    break;

+	    }

 	    xf86DrvMsg(scrp->scrnIndex, X_WARNING,

 		       "Shrinking virtual size estimate from %dx%d to %dx%d\n",

 		       virtX, virtY, vx, vy);

-	    virtX = vx;

+	    virtX = _VIRTUALX(vx);

 	    virtY = vy;

-	    linePitch = scanLineWidth(vx, vy, minPitch, apertureSize,

-				      BankFormat, pitchInc);

+	    for (p = scrp->modes; p; p = p->next) {

+		if (numModes > 0) {

+		    if (p->HDisplay > virtX)

+			p->status = MODE_VIRTUAL_X;

+		    if (p->VDisplay > virtY)

+			p->status = MODE_VIRTUAL_Y;

+		    if (p->status != MODE_OK) {

+			numModes--;

+			printModeRejectMessage(scrp->scrnIndex, p, p->status);

+		    }

+		}

+	    }

+	    if (linePitches != NULL) {

+		for (i = 0; linePitches[i] != 0; i++) {

+		    if ((linePitches[i] >= virtX) &&

+			(linePitches[i] ==

+			scanLineWidth(virtX, virtY, linePitches[i],

+				      apertureSize, BankFormat, pitchInc))) {

+			linePitch = linePitches[i];

+			break;

+		    }

+		}

+	    } else {

+		linePitch = scanLineWidth(virtX, virtY, minPitch,

+					  apertureSize, BankFormat, pitchInc);

+	    }

 	}

     }

 

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.c b/xorg-server/hw/xfree86/common/xf86Xinput.c
index 585be69a5..3542abd4a 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.c
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.c
@@ -1238,40 +1238,43 @@ xf86FirstLocalDevice(void)
 

 /* 

  * Cx     - raw data from touch screen

- * Sxhigh - scaled highest dimension

+ * to_max - scaled highest dimension

  *          (remember, this is of rows - 1 because of 0 origin)

- * Sxlow  - scaled lowest dimension

- * Rxhigh - highest raw value from touch screen calibration

- * Rxlow  - lowest raw value from touch screen calibration

+ * to_min  - scaled lowest dimension

+ * from_max - highest raw value from touch screen calibration

+ * from_min  - lowest raw value from touch screen calibration

  *

  * This function is the same for X or Y coordinates.

  * You may have to reverse the high and low values to compensate for

  * different orgins on the touch screen vs X.

+ *

+ * e.g. to scale from device coordinates into screen coordinates, call

+ * xf86ScaleAxis(x, 0, screen_width, dev_min, dev_max);

  */

 

 int

 xf86ScaleAxis(int	Cx,

-              int	Sxhigh,

-              int	Sxlow,

-              int	Rxhigh,

-              int	Rxlow )

+              int	to_max,

+              int	to_min,

+              int	from_max,

+              int	from_min )

 {

     int X;

-    int64_t dSx = Sxhigh - Sxlow;

-    int64_t dRx = Rxhigh - Rxlow;

+    int64_t to_width = to_max - to_min;

+    int64_t from_width = from_max - from_min;

 

-    if (dRx) {

-	X = (int)(((dSx * (Cx - Rxlow)) / dRx) + Sxlow);

+    if (from_width) {

+	X = (int)(((to_width * (Cx - from_min)) / from_width) + to_min);

     }

     else {

 	X = 0;

 	ErrorF ("Divide by Zero in xf86ScaleAxis");

     }

     

-    if (X > Sxhigh)

-	X = Sxhigh;

-    if (X < Sxlow)

-	X = Sxlow;

+    if (X > to_max)

+	X = to_max;

+    if (X < to_min)

+	X = to_min;

     

     return X;

 }

diff --git a/xorg-server/hw/xfree86/common/xf86Xinput.h b/xorg-server/hw/xfree86/common/xf86Xinput.h
index 1e5671574..727f26107 100644
--- a/xorg-server/hw/xfree86/common/xf86Xinput.h
+++ b/xorg-server/hw/xfree86/common/xf86Xinput.h
@@ -184,7 +184,7 @@ extern _X_EXPORT void xf86PostKeyboardEvent(DeviceIntPtr device, unsigned int ke
                            int is_down);

 extern _X_EXPORT int xf86ActivateDevice(LocalDevicePtr local);

 extern _X_EXPORT LocalDevicePtr xf86FirstLocalDevice(void);

-extern _X_EXPORT int xf86ScaleAxis(int Cx, int Sxhigh, int Sxlow, int Rxhigh, int Rxlow);

+extern _X_EXPORT int xf86ScaleAxis(int Cx, int to_max, int to_min, int from_max, int from_min);

 extern _X_EXPORT void xf86XInputSetScreen(LocalDevicePtr local, int screen_number, int x, int y);

 extern _X_EXPORT void xf86ProcessCommonOptions(InputInfoPtr pInfo, pointer options);

 extern _X_EXPORT void xf86InitValuatorAxisStruct(DeviceIntPtr dev, int axnum, Atom label, int minval,