andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver into input-hotplug

Browse Source
This commit is contained in:
Daniel Stone 2006-08-08 12:01:12 +03:00 committed by Daniel Stone
commit 3108981631
7 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Xext/mitmisc.c
View File

@ -42,8 +42,6 @@ in this Software without prior written authorization from The Open Group.
#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);

21
dix/events.c
View File

@ -3217,7 +3217,7 @@ EventSuppressForWindow(register WindowPtr pWin, register ClientPtr client,
{
register int i, free;
if ((mask & ~PropagateMask) && !permitOldBugs)
if (mask & ~PropagateMask)
{
client->errorValue = mask;
return BadValue;
@ -3768,7 +3768,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;
@ -3854,7 +3854,7 @@ ProcChangeActivePointerGrab(ClientPtr client)
TimeStamp time;
REQUEST_SIZE_MATCH(xChangeActivePointerGrabReq);
if ((stuff->eventMask & ~PointerGrabMask) && !permitOldBugs)
if (stuff->eventMask & ~PointerGrabMask)
{
client->errorValue = stuff->eventMask;
return BadValue;
@ -4155,13 +4155,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;
@ -4378,12 +4377,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);

6
dix/globals.c
View File

@ -148,12 +148,6 @@ ClientPtr requestingClient; /* XXX this should be obsolete now, remove? */
_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;

6
dix/window.c
View File

@ -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)
{

1
hw/xfree86/loader/dixsym.c
View File

@ -244,7 +244,6 @@ _X_HIDDEN void *dixLookupTab[] = {
SYMVAR(globalSerialNumber)
SYMVAR(lastDeviceEventTime)
SYMVAR(monitorResolution)
SYMVAR(permitOldBugs)
SYMVAR(screenInfo)
SYMVAR(serverClient)
SYMVAR(serverGeneration)

1
include/opaque.h
View File

@ -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;

2
os/utils.c
View File

@ -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)