frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

oops

This commit is contained in:
Stuart Kreitman 2004-03-25 05:11:16 +00:00
parent f0336f18ee
commit d1e52f13ad
7 changed files with 37 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Xext/shape.c
View File

@ -61,7 +61,7 @@ static int ShapeFreeEvents(
pointer /* data */,
XID /* id */
);
void SendShapeNotify(
static void SendShapeNotify(
WindowPtr /* pWin */,
int /* which */
);
@ -87,8 +87,8 @@ RegionOperate (
#define CREATE_PROC(func) RegionPtr func(WindowPtr /* pWin */)
CREATE_PROC(CreateBoundingShape);
CREATE_PROC(CreateClipShape);
static CREATE_PROC(CreateBoundingShape);
static CREATE_PROC(CreateClipShape);
#undef CREATE_PROC
@ -261,7 +261,7 @@ RegionOperate (client, pWin, kind, destRgnp, srcRgn, op, xoff, yoff, create)
return Success;
}
RegionPtr
static RegionPtr
CreateBoundingShape (pWin)
WindowPtr pWin;
{
@ -274,7 +274,7 @@ CreateBoundingShape (pWin)
return REGION_CREATE(pWin->drawable.pScreen, &extents, 1);
}
RegionPtr
static RegionPtr
CreateClipShape (pWin)
WindowPtr pWin;
{
@ -880,7 +880,7 @@ ProcShapeSelectInput (client)
* deliver the event
*/
void
static void
SendShapeNotify (pWin, which)
WindowPtr pWin;
int which;

8
include/cursorstr.h
View File

@ -77,18 +77,10 @@ typedef struct _Cursor {
unsigned short backRed, backGreen, backBlue; /* device-independent color */
int refcnt;
pointer devPriv[MAXSCREENS]; /* set by pScr->RealizeCursor*/
#ifdef XFIXES
CARD32 serialNumber;
Atom name;
#endif
} CursorRec;
typedef struct _CursorMetric {
unsigned short width, height, xhot, yhot;
} CursorMetricRec;
typedef struct {
int x, y;
ScreenPtr pScreen;
} HotSpot;
#endif /* CURSORSTRUCT_H */

33
include/dix.h
View File

@ -379,12 +379,6 @@ extern void CopyISOLatin1Lowered(
unsigned char * /*source*/,
int /*length*/);
extern int CompareISOLatin1Lowered(
unsigned char * /*a*/,
int alen,
unsigned char * /*b*/,
int blen);
#ifdef XCSECURITY
extern WindowPtr SecurityLookupWindow(
@ -429,14 +423,12 @@ extern ClientPtr LookupClient(
extern void NoopDDA(void);
int AlterSaveSetForClient(
extern int AlterSaveSetForClient(
ClientPtr /*client*/,
WindowPtr /*pWin*/,
unsigned /*mode*/,
Bool /*toRoot*/,
Bool /*remap*/);
void DeleteWindowFromAnySaveSet(
unsigned /*mode*/);
extern void DeleteWindowFromAnySaveSet(
WindowPtr /*pWin*/);
extern void BlockHandler(
@ -793,21 +785,4 @@ typedef struct {
int count;
} DeviceEventInfoRec;
/*
* SelectionCallback stuff
*/
extern CallbackListPtr SelectionCallback;
typedef enum {
SelectionSetOwner,
SelectionWindowDestroy,
SelectionClientClose
} SelectionCallbackKind;
typedef struct {
struct _Selection *selection;
SelectionCallbackKind kind;
} SelectionInfoRec;
#endif /* DIX_H */

28
include/dixstruct.h
View File

@ -68,28 +68,6 @@ typedef enum {ClientStateInitial,
ClientStateCheckingSecurity,
ClientStateCheckedSecurity} ClientState;
#ifdef XFIXES
typedef struct _saveSet {
struct _Window *windowPtr;
Bool toRoot;
Bool remap;
} SaveSetElt;
#define SaveSetWindow(ss) ((ss).windowPtr)
#define SaveSetToRoot(ss) ((ss).toRoot)
#define SaveSetRemap(ss) ((ss).remap)
#define SaveSetAssignWindow(ss,w) ((ss).windowPtr = (w))
#define SaveSetAssignToRoot(ss,tr) ((ss).toRoot = (tr))
#define SaveSetAssignRemap(ss,rm) ((ss).remap = (rm))
#else
typedef struct _Window *SaveSetElt;
#define SaveSetWindow(ss) (ss)
#define SaveSetToRoot(ss) FALSE
#define SaveSetRemap(ss) TRUE
#define SaveSetAssignWindow(ss,w) ((ss) = (w))
#define SaveSetAssignToRoot(ss,tr)
#define SaveSetAssignRemap(ss,rm)
#endif
typedef struct _Client {
int index;
Mask clientAsMask;
@ -107,7 +85,7 @@ typedef struct _Client {
Drawable lastDrawableID;
GCPtr lastGC;
GContext lastGCID;
SaveSetElt *saveSet;
pointer *saveSet;
int numSaved;
pointer screenPrivate[MAXSCREENS];
int (**requestVector) (
@ -170,8 +148,8 @@ extern Bool SmartScheduleDisable;
extern Bool SmartScheduleIdle;
extern Bool SmartScheduleTimerStopped;
extern Bool SmartScheduleStartTimer(void);
#define SMART_MAX_PRIORITY 20
#define SMART_MIN_PRIORITY -20
#define SMART_MAX_PRIORITY (20)
#define SMART_MIN_PRIORITY (-20)
extern Bool SmartScheduleInit(void);

15
include/input.h
View File

@ -92,17 +92,6 @@ typedef void (*ProcessInputProc)(
DeviceIntPtr /*device*/,
int /*count*/);
typedef Bool (*DeviceHandleProc)(
DeviceIntPtr /*device*/,
void* /*data*/
);
typedef void (*DeviceUnwrapProc)(
DeviceIntPtr /*device*/,
DeviceHandleProc /*proc*/,
void* /*data*/
);
typedef struct _DeviceRec {
pointer devicePrivate;
ProcessInputProc processInputProc; /* current */
@ -156,10 +145,6 @@ typedef struct {
unsigned char id;
} LedCtrl;
extern int AllocateDevicePrivateIndex(void);
extern Bool AllocateDevicePrivate(DeviceIntPtr device, int index);
extern void ResetDevicePrivateIndex(void);
extern KeybdCtrl defaultKeyboardControl;
extern PtrCtrl defaultPointerControl;

51
include/regionstr.h
View File

@ -95,84 +95,81 @@ extern RegDataRec miBrokenData;
#define REGION_END(reg) REGION_BOX(reg, (reg)->data->numRects - 1)
#define REGION_SZOF(n) (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)))
/* Keith recommends weaning the region code of pScreen argument */
#define REG_pScreen screenInfo.screens[0]
#ifdef NEED_SCREEN_REGIONS
#define REGION_CREATE(_pScreen, _rect, _size) \
(*(REG_pScreen)->RegionCreate)(_rect, _size)
(*(_pScreen)->RegionCreate)(_rect, _size)
#define REGION_INIT(_pScreen, _pReg, _rect, _size) \
(*(REG_pScreen)->RegionInit)(_pReg, _rect, _size)
(*(_pScreen)->RegionInit)(_pReg, _rect, _size)
#define REGION_COPY(_pScreen, dst, src) \
(*(REG_pScreen)->RegionCopy)(dst, src)
(*(_pScreen)->RegionCopy)(dst, src)
#define REGION_DESTROY(_pScreen, _pReg) \
(*(REG_pScreen)->RegionDestroy)(_pReg)
(*(_pScreen)->RegionDestroy)(_pReg)
#define REGION_UNINIT(_pScreen, _pReg) \
(*(REG_pScreen)->RegionUninit)(_pReg)
(*(_pScreen)->RegionUninit)(_pReg)
#define REGION_INTERSECT(_pScreen, newReg, reg1, reg2) \
(*(REG_pScreen)->Intersect)(newReg, reg1, reg2)
(*(_pScreen)->Intersect)(newReg, reg1, reg2)
#define REGION_UNION(_pScreen, newReg, reg1, reg2) \
(*(REG_pScreen)->Union)(newReg, reg1, reg2)
(*(_pScreen)->Union)(newReg, reg1, reg2)
#define REGION_SUBTRACT(_pScreen, newReg, reg1, reg2) \
(*(REG_pScreen)->Subtract)(newReg, reg1, reg2)
(*(_pScreen)->Subtract)(newReg, reg1, reg2)
#define REGION_INVERSE(_pScreen, newReg, reg1, invRect) \
(*(REG_pScreen)->Inverse)(newReg, reg1, invRect)
(*(_pScreen)->Inverse)(newReg, reg1, invRect)
#define REGION_RESET(_pScreen, _pReg, _pBox) \
(*(REG_pScreen)->RegionReset)(_pReg, _pBox)
(*(_pScreen)->RegionReset)(_pReg, _pBox)
#define REGION_TRANSLATE(_pScreen, _pReg, _x, _y) \
(*(REG_pScreen)->TranslateRegion)(_pReg, _x, _y)
(*(_pScreen)->TranslateRegion)(_pReg, _x, _y)
#define RECT_IN_REGION(_pScreen, _pReg, prect) \
(*(REG_pScreen)->RectIn)(_pReg, prect)
(*(_pScreen)->RectIn)(_pReg, prect)
#define POINT_IN_REGION(_pScreen, _pReg, _x, _y, prect) \
(*(REG_pScreen)->PointInRegion)(_pReg, _x, _y, prect)
(*(_pScreen)->PointInRegion)(_pReg, _x, _y, prect)
#define REGION_NOTEMPTY(_pScreen, _pReg) \
(*(REG_pScreen)->RegionNotEmpty)(_pReg)
(*(_pScreen)->RegionNotEmpty)(_pReg)
#define REGION_EQUAL(_pScreen, _pReg1, _pReg2) \
(*(REG_pScreen)->RegionEqual)(_pReg1, _pReg2)
(*(_pScreen)->RegionEqual)(_pReg1, _pReg2)
#define REGION_BROKEN(_pScreen, _pReg) \
(*(REG_pScreen)->RegionBroken)(_pReg)
(*(_pScreen)->RegionBroken)(_pReg)
#define REGION_BREAK(_pScreen, _pReg) \
(*(REG_pScreen)->RegionBreak)(_pReg)
(*(_pScreen)->RegionBreak)(_pReg)
#define REGION_EMPTY(_pScreen, _pReg) \
(*(REG_pScreen)->RegionEmpty)(_pReg)
(*(_pScreen)->RegionEmpty)(_pReg)
#define REGION_EXTENTS(_pScreen, _pReg) \
(*(REG_pScreen)->RegionExtents)(_pReg)
(*(_pScreen)->RegionExtents)(_pReg)
#define REGION_APPEND(_pScreen, dstrgn, rgn) \
(*(REG_pScreen)->RegionAppend)(dstrgn, rgn)
(*(_pScreen)->RegionAppend)(dstrgn, rgn)
#define REGION_VALIDATE(_pScreen, badreg, pOverlap) \
(*(REG_pScreen)->RegionValidate)(badreg, pOverlap)
(*(_pScreen)->RegionValidate)(badreg, pOverlap)
#define BITMAP_TO_REGION(_pScreen, pPix) \
(*(REG_pScreen)->BitmapToRegion)(pPix)
(*(_pScreen)->BitmapToRegion)(pPix)
#define RECTS_TO_REGION(_pScreen, nrects, prect, ctype) \
(*(REG_pScreen)->RectsToRegion)(nrects, prect, ctype)
(*(_pScreen)->RectsToRegion)(nrects, prect, ctype)
#else /* !NEED_SCREEN_REGIONS */
/* Reference _pScreen macro argument and check its type */
#define REGION_SCREEN(_pScreen) (void)((REG_pScreen)->myNum)
#define REGION_SCREEN(_pScreen_) (void)((_pScreen_)->myNum)
#define REGION_CREATE(_pScreen, _rect, _size) \
(REGION_SCREEN(_pScreen), miRegionCreate(_rect, _size))

6
include/window.h
View File

@ -252,10 +252,4 @@ void ResizeChildrenWinSize(
int /*dw*/,
int /*dh*/);
RegionPtr
CreateBoundingShape (WindowPtr pWin);
RegionPtr
CreateClipShape (WindowPtr pWin);
#endif /* WINDOW_H */