summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/cursor.h2
-rw-r--r--include/cursorstr.h12
-rw-r--r--include/dix.h29
-rw-r--r--include/dixstruct.h24
-rw-r--r--include/globals.h13
-rw-r--r--include/input.h17
-rw-r--r--include/inputstr.h5
-rw-r--r--include/os.h4
-rw-r--r--include/pixmapstr.h4
-rw-r--r--include/regionstr.h53
-rw-r--r--include/screenint.h2
-rw-r--r--include/servermd.h4
-rw-r--r--include/window.h10
-rw-r--r--include/windowstr.h7
14 files changed, 151 insertions, 35 deletions
diff --git a/include/cursor.h b/include/cursor.h
index 40b2fbf59..7e2a9d82d 100644
--- a/include/cursor.h
+++ b/include/cursor.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/include/cursor.h,v 1.1.4.4.4.3 2004/03/04 20:17:01 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/include/cursor.h,v 1.2 2004/04/23 19:54:23 eich Exp $ */
/* $XFree86: xc/programs/Xserver/include/cursor.h,v 1.6 2002/09/17 01:15:14 dawes Exp $ */
/***********************************************************
diff --git a/include/cursorstr.h b/include/cursorstr.h
index 3984245ad..c877d6cc9 100644
--- a/include/cursorstr.h
+++ b/include/cursorstr.h
@@ -77,10 +77,22 @@ 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;
+
+#ifdef XEVIE
+extern HotSpot xeviehot;
+#endif
#endif /* CURSORSTRUCT_H */
diff --git a/include/dix.h b/include/dix.h
index 20a182d2e..a7d71ef68 100644
--- a/include/dix.h
+++ b/include/dix.h
@@ -383,6 +383,12 @@ 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(
@@ -430,8 +436,10 @@ extern void NoopDDA(void);
extern int AlterSaveSetForClient(
ClientPtr /*client*/,
WindowPtr /*pWin*/,
- unsigned /*mode*/);
-
+ unsigned /*mode*/,
+ Bool /*toRoot*/,
+ Bool /*remap*/);
+
extern void DeleteWindowFromAnySaveSet(
WindowPtr /*pWin*/);
@@ -789,4 +797,21 @@ 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 */
diff --git a/include/dixstruct.h b/include/dixstruct.h
index 9c39a8aec..d7d810272 100644
--- a/include/dixstruct.h
+++ b/include/dixstruct.h
@@ -68,6 +68,28 @@ 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;
@@ -85,7 +107,7 @@ typedef struct _Client {
Drawable lastDrawableID;
GCPtr lastGC;
GContext lastGCID;
- pointer *saveSet;
+ SaveSetElt *saveSet;
int numSaved;
pointer screenPrivate[MAXSCREENS];
int (**requestVector) (
diff --git a/include/globals.h b/include/globals.h
index c2e98ea22..9fd55f4b6 100644
--- a/include/globals.h
+++ b/include/globals.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.1.4.2.2.3 2004/03/04 20:17:01 kaleb Exp $ */
+/* $XdotOrg: xc/programs/Xserver/include/globals.h,v 1.4 2004/07/31 09:14:06 kem Exp $ */
/* $XFree86: xc/programs/Xserver/include/globals.h,v 1.3 1999/09/25 14:38:21 dawes Exp $ */
#ifndef _XSERV_GLOBAL_H_
@@ -49,5 +49,16 @@ extern Bool PanoramiXWindowExposureSent;
extern Bool PanoramiXOneExposeRequest;
#endif
+#ifdef RENDER
+extern Bool noRenderExtension;
+#endif
+
+#ifdef XEVIE
+extern Bool noXevieExtension;
+#endif
+
+#ifdef COMPOSITE
+extern Bool noCompositeExtension;
+#endif
#endif /* _XSERV_GLOBAL_H_ */
diff --git a/include/input.h b/include/input.h
index fa88febda..9bcdd9f58 100644
--- a/include/input.h
+++ b/include/input.h
@@ -45,7 +45,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
SOFTWARE.
********************************************************/
-/* $XFree86: xc/programs/Xserver/include/input.h,v 3.7 2001/12/14 19:59:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/input.h,v 3.8 2003/04/27 21:31:04 herrb Exp $ */
#ifndef INPUT_H
#define INPUT_H
@@ -92,6 +92,17 @@ 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 */
@@ -145,6 +156,10 @@ 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;
diff --git a/include/inputstr.h b/include/inputstr.h
index 70627629b..b54e8a1d5 100644
--- a/include/inputstr.h
+++ b/include/inputstr.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.5 2001/12/14 19:59:54 dawes Exp $ */
+/* $XFree86: xc/programs/Xserver/include/inputstr.h,v 1.6 2003/04/27 21:31:04 herrb Exp $ */
/************************************************************
Copyright 1987, 1998 The Open Group
@@ -285,6 +285,9 @@ typedef struct _DeviceIntRec {
#ifdef XKB
struct _XkbInterest * xkb_interest;
#endif
+ DevUnion *devPrivates;
+ int nPrivates;
+ DeviceUnwrapProc unwrapProc;
} DeviceIntRec;
typedef struct {
diff --git a/include/os.h b/include/os.h
index d82652c2d..b553e06e1 100644
--- a/include/os.h
+++ b/include/os.h
@@ -231,6 +231,8 @@ extern SIGVAL GiveUp(int /*sig*/);
extern void UseMsg(void);
+extern void InitGlobals(void);
+
extern void ProcessCommandLine(int /*argc*/, char* /*argv*/[]);
extern int set_font_authorizations(
@@ -412,6 +414,8 @@ extern XID GenerateAuthorization(
extern void ExpandCommandLine(int * /*pargc*/, char *** /*pargv*/);
#endif
+extern void ddxInitGlobals(void);
+
extern int ddxProcessArgument(int /*argc*/, char * /*argv*/ [], int /*i*/);
extern void ddxUseMsg(void);
diff --git a/include/pixmapstr.h b/include/pixmapstr.h
index 1b0df9fd3..22a1f1025 100644
--- a/include/pixmapstr.h
+++ b/include/pixmapstr.h
@@ -79,6 +79,10 @@ typedef struct _Pixmap {
#ifdef PIXPRIV
DevUnion *devPrivates; /* real devPrivates like gcs & windows */
#endif
+#ifdef COMPOSITE
+ short screen_x;
+ short screen_y;
+#endif
} PixmapRec;
#endif /* PIXMAPSTRUCT_H */
diff --git a/include/regionstr.h b/include/regionstr.h
index 1d068ecc5..c47706709 100644
--- a/include/regionstr.h
+++ b/include/regionstr.h
@@ -1,4 +1,4 @@
-/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.1.4.7.4.1 2004/03/04 17:48:21 eich Exp $ */
+/* $XdotOrg: xc/programs/Xserver/include/regionstr.h,v 1.3 2004/07/29 18:16:56 stukreit Exp $ */
/* $Xorg: regionstr.h,v 1.4 2001/02/09 02:05:15 xorgcvs Exp $ */
/***********************************************************
@@ -95,81 +95,84 @@ 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) \
- (*(_pScreen)->RegionCreate)(_rect, _size)
+ (*(REG_pScreen)->RegionCreate)(_rect, _size)
#define REGION_INIT(_pScreen, _pReg, _rect, _size) \
- (*(_pScreen)->RegionInit)(_pReg, _rect, _size)
+ (*(REG_pScreen)->RegionInit)(_pReg, _rect, _size)
#define REGION_COPY(_pScreen, dst, src) \
- (*(_pScreen)->RegionCopy)(dst, src)
+ (*(REG_pScreen)->RegionCopy)(dst, src)
#define REGION_DESTROY(_pScreen, _pReg) \
- (*(_pScreen)->RegionDestroy)(_pReg)
+ (*(REG_pScreen)->RegionDestroy)(_pReg)
#define REGION_UNINIT(_pScreen, _pReg) \
- (*(_pScreen)->RegionUninit)(_pReg)
+ (*(REG_pScreen)->RegionUninit)(_pReg)
#define REGION_INTERSECT(_pScreen, newReg, reg1, reg2) \
- (*(_pScreen)->Intersect)(newReg, reg1, reg2)
+ (*(REG_pScreen)->Intersect)(newReg, reg1, reg2)
#define REGION_UNION(_pScreen, newReg, reg1, reg2) \
- (*(_pScreen)->Union)(newReg, reg1, reg2)
+ (*(REG_pScreen)->Union)(newReg, reg1, reg2)
#define REGION_SUBTRACT(_pScreen, newReg, reg1, reg2) \
- (*(_pScreen)->Subtract)(newReg, reg1, reg2)
+ (*(REG_pScreen)->Subtract)(newReg, reg1, reg2)
#define REGION_INVERSE(_pScreen, newReg, reg1, invRect) \
- (*(_pScreen)->Inverse)(newReg, reg1, invRect)
+ (*(REG_pScreen)->Inverse)(newReg, reg1, invRect)
#define REGION_RESET(_pScreen, _pReg, _pBox) \
- (*(_pScreen)->RegionReset)(_pReg, _pBox)
+ (*(REG_pScreen)->RegionReset)(_pReg, _pBox)
#define REGION_TRANSLATE(_pScreen, _pReg, _x, _y) \
- (*(_pScreen)->TranslateRegion)(_pReg, _x, _y)
+ (*(REG_pScreen)->TranslateRegion)(_pReg, _x, _y)
#define RECT_IN_REGION(_pScreen, _pReg, prect) \
- (*(_pScreen)->RectIn)(_pReg, prect)
+ (*(REG_pScreen)->RectIn)(_pReg, prect)
#define POINT_IN_REGION(_pScreen, _pReg, _x, _y, prect) \
- (*(_pScreen)->PointInRegion)(_pReg, _x, _y, prect)
+ (*(REG_pScreen)->PointInRegion)(_pReg, _x, _y, prect)
#define REGION_NOTEMPTY(_pScreen, _pReg) \
- (*(_pScreen)->RegionNotEmpty)(_pReg)
+ (*(REG_pScreen)->RegionNotEmpty)(_pReg)
#define REGION_EQUAL(_pScreen, _pReg1, _pReg2) \
- (*(_pScreen)->RegionEqual)(_pReg1, _pReg2)
+ (*(REG_pScreen)->RegionEqual)(_pReg1, _pReg2)
#define REGION_BROKEN(_pScreen, _pReg) \
- (*(_pScreen)->RegionBroken)(_pReg)
+ (*(REG_pScreen)->RegionBroken)(_pReg)
#define REGION_BREAK(_pScreen, _pReg) \
- (*(_pScreen)->RegionBreak)(_pReg)
+ (*(REG_pScreen)->RegionBreak)(_pReg)
#define REGION_EMPTY(_pScreen, _pReg) \
- (*(_pScreen)->RegionEmpty)(_pReg)
+ (*(REG_pScreen)->RegionEmpty)(_pReg)
#define REGION_EXTENTS(_pScreen, _pReg) \
- (*(_pScreen)->RegionExtents)(_pReg)
+ (*(REG_pScreen)->RegionExtents)(_pReg)
#define REGION_APPEND(_pScreen, dstrgn, rgn) \
- (*(_pScreen)->RegionAppend)(dstrgn, rgn)
+ (*(REG_pScreen)->RegionAppend)(dstrgn, rgn)
#define REGION_VALIDATE(_pScreen, badreg, pOverlap) \
- (*(_pScreen)->RegionValidate)(badreg, pOverlap)
+ (*(REG_pScreen)->RegionValidate)(badreg, pOverlap)
#define BITMAP_TO_REGION(_pScreen, pPix) \
- (*(_pScreen)->BitmapToRegion)(pPix)
+ (*(REG_pScreen)->BitmapToRegion)(pPix)
#define RECTS_TO_REGION(_pScreen, nrects, prect, ctype) \
- (*(_pScreen)->RectsToRegion)(nrects, prect, ctype)
+ (*(REG_pScreen)->RectsToRegion)(nrects, prect, ctype)
#else /* !NEED_SCREEN_REGIONS */
/* Reference _pScreen macro argument and check its type */
-#define REGION_SCREEN(_pScreen_) (void)((_pScreen_)->myNum)
+#define REGION_SCREEN(_pScreen) (void)((REG_pScreen)->myNum)
#define REGION_CREATE(_pScreen, _rect, _size) \
(REGION_SCREEN(_pScreen), miRegionCreate(_rect, _size))
diff --git a/include/screenint.h b/include/screenint.h
index b3e76c4c2..1c836952e 100644
--- a/include/screenint.h
+++ b/include/screenint.h
@@ -104,7 +104,7 @@ extern void ResetColormapPrivates(void);
typedef struct _ColormapRec *ColormapPtr;
-typedef int (*InitCmapPrivFunc)(ColormapPtr);
+typedef int (*InitCmapPrivFunc)(ColormapPtr, int);
extern int AllocateColormapPrivateIndex(
InitCmapPrivFunc /* initPrivFunc */);
diff --git a/include/servermd.h b/include/servermd.h
index 994f5c087..c2c11fa73 100644
--- a/include/servermd.h
+++ b/include/servermd.h
@@ -153,7 +153,7 @@ SOFTWARE.
#endif /* __arm32__ */
-#if defined (hpux)
+#if defined (hpux) || defined __hppa__
#define IMAGE_BYTE_ORDER MSBFirst
#define BITMAP_BIT_ORDER MSBFirst
@@ -165,7 +165,7 @@ SOFTWARE.
#define LARGE_INSTRUCTION_CACHE
#define PLENTIFUL_REGISTERS
-#endif /* hpux */
+#endif /* hpux || __hppa__ */
#if defined(__powerpc__)
diff --git a/include/window.h b/include/window.h
index 5056512b8..1a2845f90 100644
--- a/include/window.h
+++ b/include/window.h
@@ -252,4 +252,14 @@ void ResizeChildrenWinSize(
int /*dw*/,
int /*dh*/);
+extern void SendShapeNotify(
+ WindowPtr /* pWin */,
+ int /* which */ );
+
+extern RegionPtr CreateBoundingShape(
+ WindowPtr /* pWin */ );
+
+extern RegionPtr CreateClipShape(
+ WindowPtr /* pWin */ );
+
#endif /* WINDOW_H */
diff --git a/include/windowstr.h b/include/windowstr.h
index 8e8d2542a..c89c7b18e 100644
--- a/include/windowstr.h
+++ b/include/windowstr.h
@@ -136,6 +136,9 @@ typedef struct _Window {
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
DevUnion *devPrivates;
} WindowRec;
@@ -222,4 +225,8 @@ extern ScreenSaverStuffRec savedScreenInfo[MAXSCREENS];
extern int numSaveUndersViewable;
extern int deltaSaveUndersViewable;
+#ifdef XEVIE
+extern WindowPtr xeviewin;
+#endif
+
#endif /* WINDOWSTRUCT_H */
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-22 22:45:51 +0000