Module Name: xsrc
Committed By: mrg
Date: Thu Jul 9 07:08:07 UTC 2009
Modified Files:
xsrc/external/mit/xorg-server/dist/dix: devices.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/common: xf86Config.c
xsrc/external/mit/xorg-server/dist/hw/xfree86/dixmods/extmod:
xf86vmode.c
Removed Files:
xsrc/external/mit/xorg-server/dist: config.log
Log Message:
merge xorg-server 1.6.2
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r0 xsrc/external/mit/xorg-server/dist/config.log
cvs rdiff -u -r1.3 -r1.4 xsrc/external/mit/xorg-server/dist/dix/devices.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
cvs rdiff -u -r1.3 -r1.4 \
xsrc/external/mit/xorg-server/dist/hw/xfree86/dixmods/extmod/xf86vmode.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: xsrc/external/mit/xorg-server/dist/dix/devices.c
diff -u xsrc/external/mit/xorg-server/dist/dix/devices.c:1.3 xsrc/external/mit/xorg-server/dist/dix/devices.c:1.4
--- xsrc/external/mit/xorg-server/dist/dix/devices.c:1.3 Thu Jun 11 02:13:35 2009
+++ xsrc/external/mit/xorg-server/dist/dix/devices.c Thu Jul 9 07:08:06 2009
@@ -216,6 +216,8 @@
/* device grab defaults */
dev->deviceGrab.grabTime = currentTime;
+ dev->deviceGrab.ActivateGrab = ActivateKeyboardGrab;
+ dev->deviceGrab.DeactivateGrab = DeactivateKeyboardGrab;
dev->coreEvents = TRUE;
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c:1.3 Thu Jun 11 02:13:44 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/common/xf86Config.c Thu Jul 9 07:08:06 2009
@@ -601,7 +601,9 @@
defaultFontPath = Xprintf("%s%s%s",
fileconf->file_fontpath,
*temp_path ? "," : "", temp_path);
- must_copy = FALSE;
+ if (defaultFontPath != NULL) {
+ must_copy = FALSE;
+ }
}
else
defaultFontPath = fileconf->file_fontpath;
@@ -617,7 +619,14 @@
!((start == temp_path || start[-1] == ',') && (!*end || *end == ','))) {
defaultFontPath = Xprintf("%s%sbuilt-ins",
temp_path, *temp_path ? "," : "");
- must_copy = FALSE;
+ if (must_copy == TRUE) {
+ if (defaultFontPath != NULL) {
+ must_copy = FALSE;
+ }
+ } else {
+ /* already made a copy of the font path */
+ xfree(temp_path);
+ }
}
/* xf86ValidateFontPath modifies its argument, but returns a copy of it. */
temp_path = must_copy ? XNFstrdup(defaultFontPath) : defaultFontPath;
@@ -733,7 +742,7 @@
{ FLAG_DONTVTSWITCH, "DontVTSwitch", OPTV_BOOLEAN,
{0}, FALSE },
{ FLAG_DONTZAP, "DontZap", OPTV_BOOLEAN,
- {0}, TRUE },
+ {0}, FALSE },
{ FLAG_DONTZOOM, "DontZoom", OPTV_BOOLEAN,
{0}, FALSE },
{ FLAG_DISABLEVIDMODE, "DisableVidModeExtension", OPTV_BOOLEAN,
@@ -845,8 +854,7 @@
xf86GetOptValBool(FlagOptions, FLAG_NOTRAPSIGNALS, &xf86Info.notrapSignals);
xf86GetOptValBool(FlagOptions, FLAG_DONTVTSWITCH, &xf86Info.dontVTSwitch);
- if (!xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap))
- xf86Info.dontZap = !party_like_its_1989;
+ xf86GetOptValBool(FlagOptions, FLAG_DONTZAP, &xf86Info.dontZap);
xf86GetOptValBool(FlagOptions, FLAG_DONTZOOM, &xf86Info.dontZoom);
xf86GetOptValBool(FlagOptions, FLAG_IGNORE_ABI, &xf86Info.ignoreABI);
Index: xsrc/external/mit/xorg-server/dist/hw/xfree86/dixmods/extmod/xf86vmode.c
diff -u xsrc/external/mit/xorg-server/dist/hw/xfree86/dixmods/extmod/xf86vmode.c:1.3 xsrc/external/mit/xorg-server/dist/hw/xfree86/dixmods/extmod/xf86vmode.c:1.4
--- xsrc/external/mit/xorg-server/dist/hw/xfree86/dixmods/extmod/xf86vmode.c:1.3 Thu Jun 11 02:13:45 2009
+++ xsrc/external/mit/xorg-server/dist/hw/xfree86/dixmods/extmod/xf86vmode.c Thu Jul 9 07:08:07 2009
@@ -1545,6 +1545,7 @@
{
CARD16 *ramp = NULL;
int n, length, i;
+ size_t ramplen;
xXF86VidModeGetGammaRampReply rep;
REQUEST(xXF86VidModeGetGammaRampReq);
@@ -1559,7 +1560,8 @@
length = (stuff->size + 1) & ~1;
if(stuff->size) {
- if(!(ramp = xalloc(length * 3 * sizeof(CARD16))))
+ ramplen = length * 3 * sizeof(CARD16);
+ if (!(ramp = xalloc(ramplen)))
return BadAlloc;
if (!VidModeGetGammaRamp(stuff->screen, stuff->size,
@@ -1577,13 +1579,12 @@
swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n);
swaps(&rep.size, n);
- for(i = 0; i < length * 3; i++)
- swaps(&ramp[i],n);
+ SwapShorts(ramp, length * 3);
}
WriteToClient(client, sizeof(xXF86VidModeGetGammaRampReply), (char *)&rep);
if(stuff->size) {
- WriteToClient(client, rep.length << 2, (char*)ramp);
+ WriteToClient(client, ramplen, (char*)ramp);
xfree(ramp);
}
@@ -2064,7 +2065,6 @@
static int
SProcXF86VidModeSetGammaRamp(ClientPtr client)
{
- CARD16 *ramp;
int length, n;
REQUEST(xXF86VidModeSetGammaRampReq);
swaps(&stuff->length, n);
@@ -2073,11 +2073,7 @@
swaps(&stuff->screen, n);
length = ((stuff->size + 1) & ~1) * 6;
REQUEST_FIXED_SIZE(xXF86VidModeSetGammaRampReq, length);
- ramp = (CARD16*)&stuff[1];
- while(length--) {
- swaps(ramp, n);
- ramp++;
- }
+ SwapRestS(stuff);
return ProcXF86VidModeSetGammaRamp(client);
}
