mirror of
https://github.com/X11Libre/xserver.git
synced 2026-09-22 20:35:43 +00:00
Merge branch 'master' into XACE-SELINUX
This commit is contained in:
Eamon Walsh
Eamon Walsh
commit
0331c6a8fc
240 changed files with 5668 additions and 6554 deletions
|
|
@ -81,59 +81,6 @@ SOFTWARE.
|
|||
return(BadIDChoice);\
|
||||
}
|
||||
|
||||
/*
|
||||
* We think that most hardware implementations of DBE will want
|
||||
* LookupID*(dbe_back_buffer_id) to return the window structure that the
|
||||
* id is a back buffer for. Since both front and back buffers will
|
||||
* return the same structure, you need to be able to distinguish
|
||||
* somewhere what kind of buffer (front/back) was being asked for, so
|
||||
* that ddx can render to the right place. That's the problem that the
|
||||
* following code solves. Note: we couldn't embed this in the LookupID*
|
||||
* functions because the VALIDATE_DRAWABLE_AND_GC macro often circumvents
|
||||
* those functions by checking a one-element cache. That's why we're
|
||||
* mucking with VALIDATE_DRAWABLE_AND_GC.
|
||||
*
|
||||
* If you put -DNEED_DBE_BUF_BITS into PervasiveDBEDefines, the window
|
||||
* structure will have two additional bits defined, srcBuffer and
|
||||
* dstBuffer, and their values will be maintained via the macros
|
||||
* SET_DBE_DSTBUF and SET_DBE_SRCBUF (below). If you also
|
||||
* put -DNEED_DBE_BUF_VALIDATE into PervasiveDBEDefines, the function
|
||||
* DbeValidateBuffer will be called any time the bits change to give you
|
||||
* a chance to do some setup. See the DBE code for more details on this
|
||||
* function. We put in these levels of conditionality so that you can do
|
||||
* just what you need to do, and no more. If neither of these defines
|
||||
* are used, the bits won't be there, and VALIDATE_DRAWABLE_AND_GC will
|
||||
* be unchanged. dpw
|
||||
*/
|
||||
|
||||
#if defined(NEED_DBE_BUF_BITS)
|
||||
#define SET_DBE_DSTBUF(_pDraw, _drawID) \
|
||||
SET_DBE_BUF(_pDraw, _drawID, dstBuffer, TRUE)
|
||||
#define SET_DBE_SRCBUF(_pDraw, _drawID) \
|
||||
SET_DBE_BUF(_pDraw, _drawID, srcBuffer, FALSE)
|
||||
#if defined (NEED_DBE_BUF_VALIDATE)
|
||||
#define SET_DBE_BUF(_pDraw, _drawID, _whichBuffer, _dstbuf) \
|
||||
if (_pDraw->type == DRAWABLE_WINDOW)\
|
||||
{\
|
||||
int thisbuf = (_pDraw->id == _drawID);\
|
||||
if (thisbuf != ((WindowPtr)_pDraw)->_whichBuffer)\
|
||||
{\
|
||||
((WindowPtr)_pDraw)->_whichBuffer = thisbuf;\
|
||||
DbeValidateBuffer((WindowPtr)_pDraw, _drawID, _dstbuf);\
|
||||
}\
|
||||
}
|
||||
#else /* want buffer bits, but don't need to call DbeValidateBuffer */
|
||||
#define SET_DBE_BUF(_pDraw, _drawID, _whichBuffer, _dstbuf) \
|
||||
if (_pDraw->type == DRAWABLE_WINDOW)\
|
||||
{\
|
||||
((WindowPtr)_pDraw)->_whichBuffer = (_pDraw->id == _drawID);\
|
||||
}
|
||||
#endif /* NEED_DBE_BUF_VALIDATE */
|
||||
#else /* don't want buffer bits in window */
|
||||
#define SET_DBE_DSTBUF(_pDraw, _drawID) /**/
|
||||
#define SET_DBE_SRCBUF(_pDraw, _drawID) /**/
|
||||
#endif /* NEED_DBE_BUF_BITS */
|
||||
|
||||
#define VALIDATE_DRAWABLE_AND_GC(drawID, pDraw, pGC, client)\
|
||||
if ((stuff->gc == INVALID) || (client->lastGCID != stuff->gc) ||\
|
||||
(client->lastDrawableID != drawID))\
|
||||
|
|
@ -158,7 +105,6 @@ SOFTWARE.
|
|||
pGC = client->lastGC;\
|
||||
pDraw = client->lastDrawable;\
|
||||
}\
|
||||
SET_DBE_DSTBUF(pDraw, drawID);\
|
||||
if (pGC->serialNumber != pDraw->serialNumber)\
|
||||
ValidateGC(pDraw, pGC);
|
||||
|
||||
|
|
@ -220,8 +166,6 @@ extern int dixDestroyPixmap(
|
|||
pointer /*value*/,
|
||||
XID /*pid*/);
|
||||
|
||||
extern void CloseDownRetainedResources(void);
|
||||
|
||||
extern void InitClient(
|
||||
ClientPtr /*client*/,
|
||||
int /*i*/,
|
||||
|
|
@ -243,25 +187,10 @@ extern void DeleteWindowFromAnySelections(
|
|||
extern void MarkClientException(
|
||||
ClientPtr /*client*/);
|
||||
|
||||
extern int GetGeometry(
|
||||
ClientPtr /*client*/,
|
||||
xGetGeometryReply* /* wa */);
|
||||
|
||||
extern int SendConnSetup(
|
||||
ClientPtr /*client*/,
|
||||
char* /*reason*/);
|
||||
|
||||
extern int DoGetImage(
|
||||
ClientPtr /*client*/,
|
||||
int /*format*/,
|
||||
Drawable /*drawable*/,
|
||||
int /*x*/,
|
||||
int /*y*/,
|
||||
int /*width*/,
|
||||
int /*height*/,
|
||||
Mask /*planemask*/,
|
||||
xGetImageReply ** /*im_return*/);
|
||||
|
||||
#if defined(DDXBEFORERESET)
|
||||
extern void ddxBeforeReset (void);
|
||||
#endif
|
||||
|
|
@ -630,10 +559,6 @@ typedef struct _CallbackProcs {
|
|||
DeleteCallbackListProcPtr DeleteCallbackList;
|
||||
} CallbackFuncsRec, *CallbackFuncsPtr;
|
||||
|
||||
extern Bool CreateCallbackList(
|
||||
CallbackListPtr * /*pcbl*/,
|
||||
CallbackFuncsPtr /*cbfuncs*/);
|
||||
|
||||
extern Bool AddCallback(
|
||||
CallbackListPtr * /*pcbl*/,
|
||||
CallbackProcPtr /*callback*/,
|
||||
|
|
|
|||
|
|
@ -148,10 +148,6 @@ extern void DeleteWindowFromAnyExtEvents(
|
|||
WindowPtr /* pWin */,
|
||||
Bool /* freeResources */);
|
||||
|
||||
extern void DeleteDeviceFromAnyExtEvents(
|
||||
WindowPtr /* pWin */,
|
||||
DeviceIntPtr /* dev */);
|
||||
|
||||
extern int MaybeSendDeviceMotionNotifyHint (
|
||||
deviceKeyButtonPointer * /* pEvents */,
|
||||
Mask /* mask */);
|
||||
|
|
@ -164,11 +160,6 @@ extern void CheckDeviceGrabAndHintWindow (
|
|||
ClientPtr /* client */,
|
||||
Mask /* deliveryMask */);
|
||||
|
||||
extern Mask DeviceEventMaskForClient(
|
||||
DeviceIntPtr /* dev */,
|
||||
WindowPtr /* pWin */,
|
||||
ClientPtr /* client */);
|
||||
|
||||
extern void MaybeStopDeviceHint(
|
||||
DeviceIntPtr /* dev */,
|
||||
ClientPtr /* client */);
|
||||
|
|
@ -179,13 +170,6 @@ extern int DeviceEventSuppressForWindow(
|
|||
Mask /* mask */,
|
||||
int /* maskndx */);
|
||||
|
||||
void FindInterestedChildren(
|
||||
DeviceIntPtr /* dev */,
|
||||
WindowPtr /* p1 */,
|
||||
Mask /* mask */,
|
||||
xEvent * /* ev */,
|
||||
int /* count */);
|
||||
|
||||
void SendEventToAllWindows(
|
||||
DeviceIntPtr /* dev */,
|
||||
Mask /* mask */,
|
||||
|
|
|
|||
|
|
@ -37,93 +37,6 @@ XInputExtensionInit(
|
|||
void
|
||||
);
|
||||
|
||||
|
||||
int
|
||||
ProcIDispatch (
|
||||
ClientPtr /* client */
|
||||
);
|
||||
|
||||
int
|
||||
SProcIDispatch(
|
||||
ClientPtr /* client */
|
||||
);
|
||||
|
||||
void
|
||||
SReplyIDispatch (
|
||||
ClientPtr /* client */,
|
||||
int /* len */,
|
||||
xGrabDeviceReply * /* rep */
|
||||
);
|
||||
|
||||
void
|
||||
SEventIDispatch (
|
||||
xEvent * /* from */,
|
||||
xEvent * /* to */
|
||||
);
|
||||
|
||||
void
|
||||
SEventDeviceValuator (
|
||||
deviceValuator * /* from */,
|
||||
deviceValuator * /* to */
|
||||
);
|
||||
|
||||
void
|
||||
SEventFocus (
|
||||
deviceFocus * /* from */,
|
||||
deviceFocus * /* to */
|
||||
);
|
||||
|
||||
void
|
||||
SDeviceStateNotifyEvent (
|
||||
deviceStateNotify * /* from */,
|
||||
deviceStateNotify * /* to */
|
||||
);
|
||||
|
||||
void
|
||||
SDeviceKeyStateNotifyEvent (
|
||||
deviceKeyStateNotify * /* from */,
|
||||
deviceKeyStateNotify * /* to */
|
||||
);
|
||||
|
||||
void
|
||||
SDeviceButtonStateNotifyEvent (
|
||||
deviceButtonStateNotify * /* from */,
|
||||
deviceButtonStateNotify * /* to */
|
||||
);
|
||||
|
||||
void
|
||||
SChangeDeviceNotifyEvent (
|
||||
changeDeviceNotify * /* from */,
|
||||
changeDeviceNotify * /* to */
|
||||
);
|
||||
|
||||
void
|
||||
SDeviceMappingNotifyEvent (
|
||||
deviceMappingNotify * /* from */,
|
||||
deviceMappingNotify * /* to */
|
||||
);
|
||||
|
||||
void
|
||||
SDevicePresenceNotifyEvent (
|
||||
devicePresenceNotify * /* from */,
|
||||
devicePresenceNotify * /* to */
|
||||
);
|
||||
|
||||
void
|
||||
FixExtensionEvents (
|
||||
ExtensionEntry * /* extEntry */
|
||||
);
|
||||
|
||||
void
|
||||
RestoreExtensionEvents (
|
||||
void
|
||||
);
|
||||
|
||||
void
|
||||
IResetProc(
|
||||
ExtensionEntry * /* unused */
|
||||
);
|
||||
|
||||
void
|
||||
AssignTypeAndName (
|
||||
DeviceIntPtr /* dev */,
|
||||
|
|
@ -131,41 +44,9 @@ AssignTypeAndName (
|
|||
char * /* name */
|
||||
);
|
||||
|
||||
void
|
||||
MakeDeviceTypeAtoms (
|
||||
void
|
||||
);
|
||||
|
||||
DeviceIntPtr
|
||||
LookupDeviceIntRec (
|
||||
CARD8 /* id */
|
||||
);
|
||||
|
||||
void
|
||||
SetExclusiveAccess (
|
||||
Mask /* mask */
|
||||
);
|
||||
|
||||
void
|
||||
AllowPropagateSuppress (
|
||||
Mask /* mask */
|
||||
);
|
||||
|
||||
Mask
|
||||
GetNextExtEventMask (
|
||||
void
|
||||
);
|
||||
|
||||
void
|
||||
SetMaskForExtEvent(
|
||||
Mask /* mask */,
|
||||
int /* event */
|
||||
);
|
||||
|
||||
void
|
||||
SetEventInfo(
|
||||
Mask /* mask */,
|
||||
int /* constant */
|
||||
);
|
||||
|
||||
#endif /* EXTINIT_H */
|
||||
|
|
|
|||
|
|
@ -85,32 +85,11 @@ extern void NotImplemented ( /* FIXME: this may move to another file... */
|
|||
xEvent *,
|
||||
xEvent *);
|
||||
|
||||
typedef void (* ExtensionLookupProc)(
|
||||
#ifdef EXTENSION_PROC_ARGS
|
||||
EXTENSION_PROC_ARGS
|
||||
#else
|
||||
/* args no longer indeterminate */
|
||||
char *name,
|
||||
GCPtr pGC
|
||||
#endif
|
||||
);
|
||||
|
||||
typedef struct _ProcEntry {
|
||||
char *name;
|
||||
ExtensionLookupProc proc;
|
||||
} ProcEntryRec, *ProcEntryPtr;
|
||||
|
||||
typedef struct _ScreenProcEntry {
|
||||
int num;
|
||||
ProcEntryPtr procList;
|
||||
} ScreenProcEntry;
|
||||
|
||||
#define SetGCVector(pGC, VectorElement, NewRoutineAddress, Atom) \
|
||||
pGC->VectorElement = NewRoutineAddress;
|
||||
|
||||
#define GetGCValue(pGC, GCElement) (pGC->GCElement)
|
||||
|
||||
|
||||
extern ExtensionEntry *AddExtension(
|
||||
char* /*name*/,
|
||||
int /*NumEvents*/,
|
||||
|
|
@ -128,20 +107,6 @@ extern Bool AddExtensionAlias(
|
|||
extern ExtensionEntry *CheckExtension(const char *extname);
|
||||
extern ExtensionEntry *GetExtensionEntry(int major);
|
||||
|
||||
extern ExtensionLookupProc LookupProc(
|
||||
char* /*name*/,
|
||||
GCPtr /*pGC*/);
|
||||
|
||||
extern Bool RegisterProc(
|
||||
char* /*name*/,
|
||||
GCPtr /*pGC*/,
|
||||
ExtensionLookupProc /*proc*/);
|
||||
|
||||
extern Bool RegisterScreenProc(
|
||||
char* /*name*/,
|
||||
ScreenPtr /*pScreen*/,
|
||||
ExtensionLookupProc /*proc*/);
|
||||
|
||||
extern void DeclareExtensionSecurity(
|
||||
char * /*extname*/,
|
||||
Bool /*secure*/);
|
||||
|
|
|
|||
|
|
@ -126,11 +126,6 @@ extern int FreeGC(
|
|||
pointer /*pGC*/,
|
||||
XID /*gid*/);
|
||||
|
||||
extern void SetGCMask(
|
||||
GCPtr /*pGC*/,
|
||||
Mask /*selectMask*/,
|
||||
Mask /*newDataMask*/);
|
||||
|
||||
extern GCPtr CreateScratchGC(
|
||||
ScreenPtr /*pScreen*/,
|
||||
unsigned /*depth*/);
|
||||
|
|
|
|||
|
|
@ -44,10 +44,6 @@ extern Bool DPMSCapableFlag;
|
|||
#endif
|
||||
|
||||
#ifdef PANORAMIX
|
||||
extern Bool PanoramiXMapped;
|
||||
extern Bool PanoramiXVisibilityNotifySent;
|
||||
extern Bool PanoramiXWindowExposureSent;
|
||||
extern Bool PanoramiXOneExposeRequest;
|
||||
extern Bool PanoramiXExtensionDisabledHack;
|
||||
#endif
|
||||
|
||||
|
|
|
|||
|
|
@ -62,7 +62,7 @@ SOFTWARE.
|
|||
|
||||
#define EMASKSIZE MAX_DEVICES
|
||||
|
||||
extern int CoreDevicePrivatesIndex, CoreDevicePrivatesGeneration;
|
||||
extern int CoreDevicePrivatesIndex;
|
||||
|
||||
/* Kludge: OtherClients and InputClients must be compatible, see code */
|
||||
|
||||
|
|
|
|||
14
include/os.h
14
include/os.h
|
|
@ -348,12 +348,6 @@ extern void InitAuthorization(char * /*filename*/);
|
|||
|
||||
extern void RegisterAuthorizations(void);
|
||||
|
||||
extern XID AuthorizationToID (
|
||||
unsigned short name_length,
|
||||
char *name,
|
||||
unsigned short data_length,
|
||||
char *data);
|
||||
|
||||
extern int AuthorizationFromID (
|
||||
XID id,
|
||||
unsigned short *name_lenp,
|
||||
|
|
@ -402,14 +396,6 @@ extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
|
|||
|
||||
extern void ddxUseMsg(void);
|
||||
|
||||
/*
|
||||
* idiom processing stuff
|
||||
*/
|
||||
|
||||
extern xReqPtr PeekNextRequest(xReqPtr req, ClientPtr client, Bool readmore);
|
||||
|
||||
extern void SkipRequests(xReqPtr req, ClientPtr client, int numskipped);
|
||||
|
||||
/* int ReqLen(xReq *req, ClientPtr client)
|
||||
* Given a pointer to a *complete* request, return its length in bytes.
|
||||
* Note that if the request is a big request (as defined in the Big
|
||||
|
|
|
|||
|
|
@ -91,9 +91,6 @@ extern void SQueryPointerReply(
|
|||
int /* size */,
|
||||
xQueryPointerReply * /* pRep */);
|
||||
|
||||
extern void SwapTimecoord(
|
||||
xTimecoord * /* pCoord */);
|
||||
|
||||
extern void SwapTimeCoordWrite(
|
||||
ClientPtr /* pClient */,
|
||||
int /* size */,
|
||||
|
|
@ -174,9 +171,6 @@ extern void SAllocColorPlanesReply(
|
|||
int /* size */,
|
||||
xAllocColorPlanesReply * /* pRep */);
|
||||
|
||||
extern void SwapRGB(
|
||||
xrgb * /* prgb */);
|
||||
|
||||
extern void SQColorsExtend(
|
||||
ClientPtr /* pClient */,
|
||||
int /* size */,
|
||||
|
|
@ -255,18 +249,6 @@ extern void WriteSConnectionInfo(
|
|||
unsigned long /* size */,
|
||||
char * /* pInfo */);
|
||||
|
||||
extern void SwapConnSetup(
|
||||
xConnSetup * /* pConnSetup */,
|
||||
xConnSetup * /* pConnSetupT */);
|
||||
|
||||
extern void SwapWinRoot(
|
||||
xWindowRoot * /* pRoot */,
|
||||
xWindowRoot * /* pRootT */);
|
||||
|
||||
extern void SwapVisual(
|
||||
xVisualType * /* pVis */,
|
||||
xVisualType * /* pVisT */);
|
||||
|
||||
extern void SwapConnSetupPrefix(
|
||||
xConnSetupPrefix * /* pcspFrom */,
|
||||
xConnSetupPrefix * /* pcspTo */);
|
||||
|
|
|
|||
|
|
@ -93,14 +93,6 @@ extern Bool CreateRootWindow(
|
|||
extern void InitRootWindow(
|
||||
WindowPtr /*pWin*/);
|
||||
|
||||
extern void ClippedRegionFromBox(
|
||||
WindowPtr /*pWin*/,
|
||||
RegionPtr /*Rgn*/,
|
||||
int /*x*/,
|
||||
int /*y*/,
|
||||
int /*w*/,
|
||||
int /*h*/);
|
||||
|
||||
typedef WindowPtr (* RealChildHeadProc) (WindowPtr pWin);
|
||||
|
||||
void RegisterRealChildHeadProc (RealChildHeadProc proc);
|
||||
|
|
@ -205,12 +197,6 @@ extern void UnmapSubwindows(
|
|||
extern void HandleSaveSet(
|
||||
ClientPtr /*client*/);
|
||||
|
||||
extern Bool VisibleBoundingBoxFromPoint(
|
||||
WindowPtr /*pWin*/,
|
||||
int /*x*/,
|
||||
int /*y*/,
|
||||
BoxPtr /*box*/);
|
||||
|
||||
extern Bool PointInWindowIsVisible(
|
||||
WindowPtr /*pWin*/,
|
||||
int /*x*/,
|
||||
|
|
@ -235,9 +221,6 @@ extern void CheckWindowOptionalNeed(
|
|||
extern Bool MakeWindowOptional(
|
||||
WindowPtr /*pWin*/);
|
||||
|
||||
extern void DisposeWindowOptional(
|
||||
WindowPtr /*pWin*/);
|
||||
|
||||
extern WindowPtr MoveWindowInStack(
|
||||
WindowPtr /*pWin*/,
|
||||
WindowPtr /*pNextSib*/);
|
||||
|
|
@ -271,7 +254,5 @@ extern void DisableMapUnmapEvents(
|
|||
WindowPtr /* pWin */ );
|
||||
extern void EnableMapUnmapEvents(
|
||||
WindowPtr /* pWin */ );
|
||||
extern Bool MapUnmapEventsEnabled(
|
||||
WindowPtr /* pWin */ );
|
||||
|
||||
#endif /* WINDOW_H */
|
||||
|
|
|
|||
|
|
@ -129,12 +129,6 @@ typedef struct _Window {
|
|||
unsigned viewable:1; /* realized && InputOutput */
|
||||
unsigned dontPropagate:3;/* index into DontPropagateMasks */
|
||||
unsigned forcedBS:1; /* system-supplied backingStore */
|
||||
#ifdef NEED_DBE_BUF_BITS
|
||||
#define DBE_FRONT_BUFFER 1
|
||||
#define DBE_BACK_BUFFER 0
|
||||
unsigned dstBuffer:1; /* destination buffer for rendering */
|
||||
unsigned srcBuffer:1; /* source buffer for rendering */
|
||||
#endif
|
||||
#ifdef COMPOSITE
|
||||
unsigned redirectDraw:1; /* rendering is redirected from here */
|
||||
#endif
|
||||
|
|
|
|||
1022
include/xkbsrv.h
Normal file
1022
include/xkbsrv.h
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue