xserver: Branch 'input-hotplug' - 2 commits
Daniel Stone
daniels at kemper.freedesktop.org
Tue Aug 8 12:02:06 EEST 2006
Xext/mitmisc.c | 12 +++---------
dix/events.c | 21 +++++++++------------
dix/globals.c | 6 ------
dix/window.c | 6 +++---
hw/xfree86/loader/dixsym.c | 1 -
include/opaque.h | 1 -
os/utils.c | 2 --
7 files changed, 15 insertions(+), 34 deletions(-)
New commits:
diff-tree 31089816317f27c668b12a15c74fdd226a8df9f7 (from parents)
Merge: ab3ebfefdb7d21aba72a5030f6f93bf4fafed709 12dbd8a02f797ad57a1be683a02a1fcb1ca35438
Author: Daniel Stone <daniel at fooishbar.org>
Date: Tue Aug 8 12:01:12 2006 +0300
Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug
diff-tree 12dbd8a02f797ad57a1be683a02a1fcb1ca35438 (from f54b71b772a1f587394ae3968782b611e52f0e2d)
Author: Daniel Stone <daniel at fooishbar.org>
Date: Mon Aug 7 23:43:40 2006 +0300
remove optional R3 backwards compatibility
Remove the permitOldBugs flag, which enabled backwards compatbility with
broken R2/R3 era clients.
diff --git a/Xext/mitmisc.c b/Xext/mitmisc.c
index a11c9a8..924b880 100644
--- a/Xext/mitmisc.c
+++ b/Xext/mitmisc.c
@@ -42,8 +42,6 @@ in this Software without prior written a
#include <X11/extensions/mitmiscstr.h>
#include "modinit.h"
-extern Bool permitOldBugs;
-
#if 0
static unsigned char MITReqCode;
#endif
@@ -90,12 +88,8 @@ ProcMITSetBugMode(client)
REQUEST(xMITSetBugModeReq);
REQUEST_SIZE_MATCH(xMITSetBugModeReq);
- if ((stuff->onOff != xTrue) && (stuff->onOff != xFalse))
- {
- client->errorValue = stuff->onOff;
- return BadValue;
- }
- permitOldBugs = stuff->onOff;
+ if (stuff->onOff != xFalse)
+ return BadRequest;
return(client->noClientException);
}
@@ -110,7 +104,7 @@ ProcMITGetBugMode(client)
rep.type = X_Reply;
rep.length = 0;
rep.sequenceNumber = client->sequence;
- rep.onOff = permitOldBugs;
+ rep.onOff = FALSE;
if (client->swapped) {
swaps(&rep.sequenceNumber, n);
swapl(&rep.length, n);
diff --git a/dix/events.c b/dix/events.c
index f5101f6..20da048 100644
--- a/dix/events.c
+++ b/dix/events.c
@@ -3214,7 +3214,7 @@ EventSuppressForWindow(register WindowPt
{
register int i, free;
- if ((mask & ~PropagateMask) && !permitOldBugs)
+ if (mask & ~PropagateMask)
{
client->errorValue = mask;
return BadValue;
@@ -3765,7 +3765,7 @@ ProcGrabPointer(ClientPtr client)
client->errorValue = stuff->ownerEvents;
return BadValue;
}
- if ((stuff->eventMask & ~PointerGrabMask) && !permitOldBugs)
+ if (stuff->eventMask & ~PointerGrabMask)
{
client->errorValue = stuff->eventMask;
return BadValue;
@@ -3851,7 +3851,7 @@ ProcChangeActivePointerGrab(ClientPtr cl
TimeStamp time;
REQUEST_SIZE_MATCH(xChangeActivePointerGrabReq);
- if ((stuff->eventMask & ~PointerGrabMask) && !permitOldBugs)
+ if (stuff->eventMask & ~PointerGrabMask)
{
client->errorValue = stuff->eventMask;
return BadValue;
@@ -4152,13 +4152,12 @@ ProcSendEvent(ClientPtr client)
if (stuff->event.u.u.type == ClientMessage &&
stuff->event.u.u.detail != 8 &&
stuff->event.u.u.detail != 16 &&
- stuff->event.u.u.detail != 32 &&
- !permitOldBugs)
+ stuff->event.u.u.detail != 32)
{
client->errorValue = stuff->event.u.u.detail;
return BadValue;
}
- if ((stuff->eventMask & ~AllEventMasks) && !permitOldBugs)
+ if (stuff->eventMask & ~AllEventMasks)
{
client->errorValue = stuff->eventMask;
return BadValue;
@@ -4375,12 +4374,10 @@ ProcGrabButton(ClientPtr client)
grab = CreateGrab(client->index, inputInfo.pointer, pWin,
- permitOldBugs ? (Mask)(stuff->eventMask |
- ButtonPressMask | ButtonReleaseMask) :
- (Mask)stuff->eventMask,
- (Bool)stuff->ownerEvents, (Bool) stuff->keyboardMode,
- (Bool)stuff->pointerMode, inputInfo.keyboard, stuff->modifiers,
- ButtonPress, stuff->button, confineTo, cursor);
+ (Mask)stuff->eventMask, (Bool)stuff->ownerEvents,
+ (Bool) stuff->keyboardMode, (Bool)stuff->pointerMode,
+ inputInfo.keyboard, stuff->modifiers, ButtonPress,
+ stuff->button, confineTo, cursor);
if (!grab)
return BadAlloc;
return AddPassiveGrabToList(grab);
diff --git a/dix/globals.c b/dix/globals.c
index 1972106..5b854aa 100644
--- a/dix/globals.c
+++ b/dix/globals.c
@@ -148,12 +148,6 @@ ClientPtr requestingClient; /* XXX this
_X_EXPORT TimeStamp currentTime;
_X_EXPORT TimeStamp lastDeviceEventTime;
-/*
- * turn off some error checking, to permit old broken clients (like R2/R3
- * xterms) to work
- */
-_X_EXPORT Bool permitOldBugs = FALSE;
-
_X_EXPORT int defaultColorVisualClass = -1;
_X_EXPORT int monitorResolution = 0;
diff --git a/dix/window.c b/dix/window.c
index 0bcbf46..ebc6923 100644
--- a/dix/window.c
+++ b/dix/window.c
@@ -2093,7 +2093,7 @@ WhereDoIGoInTheStack(
else
return NullWindow;
case TopIf:
- if ((!pWin->mapped || (pSib && !pSib->mapped)) && !permitOldBugs)
+ if ((!pWin->mapped || (pSib && !pSib->mapped)))
return(pWin->nextSib);
else if (pSib)
{
@@ -2108,7 +2108,7 @@ WhereDoIGoInTheStack(
else
return(pWin->nextSib);
case BottomIf:
- if ((!pWin->mapped || (pSib && !pSib->mapped)) && !permitOldBugs)
+ if ((!pWin->mapped || (pSib && !pSib->mapped)))
return(pWin->nextSib);
else if (pSib)
{
@@ -2123,7 +2123,7 @@ WhereDoIGoInTheStack(
else
return(pWin->nextSib);
case Opposite:
- if ((!pWin->mapped || (pSib && !pSib->mapped)) && !permitOldBugs)
+ if ((!pWin->mapped || (pSib && !pSib->mapped)))
return(pWin->nextSib);
else if (pSib)
{
diff --git a/hw/xfree86/loader/dixsym.c b/hw/xfree86/loader/dixsym.c
index 0e8bb89..22fe501 100644
--- a/hw/xfree86/loader/dixsym.c
+++ b/hw/xfree86/loader/dixsym.c
@@ -244,7 +244,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(globalSerialNumber)
SYMVAR(lastDeviceEventTime)
SYMVAR(monitorResolution)
- SYMVAR(permitOldBugs)
SYMVAR(screenInfo)
SYMVAR(serverClient)
SYMVAR(serverGeneration)
diff --git a/include/opaque.h b/include/opaque.h
index bb5bc5e..4ccccd0 100644
--- a/include/opaque.h
+++ b/include/opaque.h
@@ -70,7 +70,6 @@ extern int limitStackSpace;
#ifdef RLIMIT_NOFILE
extern int limitNoFile;
#endif
-extern Bool permitOldBugs;
extern Bool defeatAccessControl;
extern long maxBigRequestSize;
extern Bool blackRoot;
diff --git a/os/utils.c b/os/utils.c
index def12be..7a4bd11 100644
--- a/os/utils.c
+++ b/os/utils.c
@@ -768,8 +768,6 @@ ProcessCommandLine(int argc, char *argv[
else
UseMsg();
}
- else if ( strcmp( argv[i], "bc") == 0)
- permitOldBugs = TRUE;
else if ( strcmp( argv[i], "-br") == 0)
blackRoot = TRUE;
else if ( strcmp( argv[i], "+bs") == 0)
More information about the xorg-commit
mailing list