svn merge ^/branches/released .

3 files changed, 731 insertions, 726 deletions

diff --git a/xorg-server/hw/kdrive/src/kdrive.c b/xorg-server/hw/kdrive/src/kdrive.c
index a7db41379..79b13520d 100644
--- a/xorg-server/hw/kdrive/src/kdrive.c
+++ b/xorg-server/hw/kdrive/src/kdrive.c
@@ -64,8 +64,7 @@ KdDepths    kdDepths[] = {
 

 #define KD_DEFAULT_BUTTONS 5

 

-static int          kdScreenPrivateKeyIndex;

-DevPrivateKey       kdScreenPrivateKey = &kdScreenPrivateKeyIndex;

+DevPrivateKeyRec    kdScreenPrivateKeyRec;

 unsigned long	    kdGeneration;

 

 Bool                kdVideoTest;

@@ -95,7 +94,7 @@ KdOsFuncs	*kdOsFuncs;
 void

 KdSetRootClip (ScreenPtr pScreen, BOOL enable)

 {

-    WindowPtr	pWin = WindowTable[pScreen->myNum];

+    WindowPtr	pWin = pScreen->root;

     WindowPtr	pChild;

     Bool	WasViewable;

     Bool	anyMarked = FALSE;

@@ -121,8 +120,8 @@ KdSetRootClip (ScreenPtr pScreen, BOOL enable)
 	    {

 		RegionPtr	borderVisible;

 

-		borderVisible = REGION_CREATE(pScreen, NullBox, 1);

-		REGION_SUBTRACT(pScreen, borderVisible,

+		borderVisible = RegionCreate(NullBox, 1);

+		RegionSubtract(borderVisible,

 				&pWin->borderClip, &pWin->winSize);

 		pWin->valdata->before.borderVisible = borderVisible;

 	    }

@@ -138,15 +137,15 @@ KdSetRootClip (ScreenPtr pScreen, BOOL enable)
 	box.y2 = pScreen->height;

 	pWin->drawable.width = pScreen->width;

 	pWin->drawable.height = pScreen->height;

-	REGION_INIT (pScreen, &pWin->winSize, &box, 1);

-	REGION_INIT (pScreen, &pWin->borderSize, &box, 1);

-	REGION_RESET(pScreen, &pWin->borderClip, &box);

-	REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList);

+	RegionInit(&pWin->winSize, &box, 1);

+	RegionInit(&pWin->borderSize, &box, 1);

+	RegionReset(&pWin->borderClip, &box);

+	RegionBreak(&pWin->clipList);

     }

     else

     {

-	REGION_EMPTY(pScreen, &pWin->borderClip);

-	REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList);

+	RegionEmpty(&pWin->borderClip);

+	RegionBreak(&pWin->clipList);

     }

 

     ResizeChildrenWinSize (pWin, 0, 0, 0, 0);

@@ -701,6 +700,9 @@ KdAllocatePrivates (ScreenPtr pScreen)
     if (kdGeneration != serverGeneration)

 	kdGeneration = serverGeneration;

 

+    if (!dixRegisterPrivateKey(&kdScreenPrivateKeyRec, PRIVATE_SCREEN, 0))

+	return FALSE;

+

     pScreenPriv = calloc(1, sizeof (*pScreenPriv));

     if (!pScreenPriv)

 	return FALSE;

@@ -838,8 +840,8 @@ KdCreateWindow (WindowPtr pWin)
 

 	if (!pScreenPriv->enabled)

 	{

-	    REGION_EMPTY (pWin->drawable.pScreen, &pWin->borderClip);

-	    REGION_BREAK (pWin->drawable.pScreen, &pWin->clipList);

+	    RegionEmpty(&pWin->borderClip);

+	    RegionBreak(&pWin->clipList);

 	}

     }

 #endif

@@ -943,9 +945,8 @@ KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv)
     pScreenPriv->card = card;

     pScreenPriv->bytesPerPixel = screen->fb.bitsPerPixel >> 3;

     pScreenPriv->dpmsState = KD_DPMS_NORMAL;

-#ifdef PANORAMIX

-    dixScreenOrigins[pScreen->myNum] = screen->origin;

-#endif

+    pScreen->x = screen->origin.x;

+    pScreen->y = screen->origin.y;

 

     if (!monitorResolution)

 	monitorResolution = 75;

diff --git a/xorg-server/hw/kdrive/src/kdrive.h b/xorg-server/hw/kdrive/src/kdrive.h
index 35ce03660..8873662ee 100644
--- a/xorg-server/hw/kdrive/src/kdrive.h
+++ b/xorg-server/hw/kdrive/src/kdrive.h
@@ -1,626 +1,628 @@
-/*
- * Copyright © 1999 Keith Packard
- *
- * Permission to use, copy, modify, distribute, and sell this software and its
- * documentation for any purpose is hereby granted without fee, provided that
- * the above copyright notice appear in all copies and that both that
- * copyright notice and this permission notice appear in supporting
- * documentation, and that the name of Keith Packard not be used in
- * advertising or publicity pertaining to distribution of the software without
- * specific, written prior permission.  Keith Packard makes no
- * representations about the suitability of this software for any purpose.  It
- * is provided "as is" without express or implied warranty.
- *
- * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
- * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- * PERFORMANCE OF THIS SOFTWARE.
- */
-
-#ifndef _KDRIVE_H_
-#define _KDRIVE_H_
-
-#include <stdio.h>
-#include <string.h>
-#include <X11/X.h>
-#include <X11/Xproto.h>
-#include <X11/Xos.h>
-#include "scrnintstr.h"
-#include "pixmapstr.h"
-#include "windowstr.h"
-#include "servermd.h"
-#include "mibstore.h"
-#include "colormapst.h"
-#include "gcstruct.h"
-#include "input.h"
-#include "mipointer.h"
-#include "mi.h"
-#include "dix.h"
-#include "fb.h"
-#include "fboverlay.h"
-#include "shadow.h"
-#include "randrstr.h"
-#include "globals.h"
-
-#include "xkbstr.h"
-
-#define KD_DPMS_NORMAL	    0
-#define KD_DPMS_STANDBY	    1
-#define KD_DPMS_SUSPEND	    2
-#define KD_DPMS_POWERDOWN   3
-#define KD_DPMS_MAX	    KD_DPMS_POWERDOWN
-
-#define Status int
-
-typedef struct _KdCardInfo {
-    struct _KdCardFuncs	    *cfuncs;
-    void		    *closure;
-    void		    *driver;
-    struct _KdScreenInfo    *screenList;
-    int			    selected;
-    struct _KdCardInfo	    *next;
-} KdCardInfo;
-
-extern KdCardInfo	*kdCardInfo;
-
-/*
- * Configuration information per X screen
- */
-typedef struct _KdFrameBuffer {
-    CARD8	*frameBuffer;
-    int		depth;
-    int		bitsPerPixel;
-    int		pixelStride;
-    int		byteStride;
-    Bool	shadow;
-    unsigned long   visuals;
-    Pixel       redMask, greenMask, blueMask;
-    void	*closure;
-} KdFrameBuffer;
-
-#define RR_Rotate_All	(RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)
-#define RR_Reflect_All	(RR_Reflect_X|RR_Reflect_Y)
-
-typedef struct _KdScreenInfo {
-    struct _KdScreenInfo    *next;
-    KdCardInfo	*card;
-    ScreenPtr	pScreen;
-    void	*driver;
-    Rotation	randr;	/* rotation and reflection */
-    int		width;
-    int		height;
-    int		rate;
-    int		width_mm;
-    int		height_mm;
-    int		subpixel_order;
-    Bool        dumb;
-    Bool        softCursor;
-    int		mynum;
-    DDXPointRec	origin;
-    KdFrameBuffer   fb;
-} KdScreenInfo;
-
-typedef struct _KdCardFuncs {
-    Bool	(*cardinit) (KdCardInfo *); /* detect and map device */
-    Bool	(*scrinit) (KdScreenInfo *);/* initialize screen information */
-    Bool	(*initScreen) (ScreenPtr);  /* initialize ScreenRec */
-    Bool	(*finishInitScreen) (ScreenPtr pScreen);
-    Bool	(*createRes) (ScreenPtr);   /* create screen resources */
-    void	(*preserve) (KdCardInfo *); /* save graphics card state */
-    Bool        (*enable) (ScreenPtr);      /* set up for rendering */
-    Bool	(*dpms) (ScreenPtr, int);   /* set DPMS screen saver */
-    void        (*disable) (ScreenPtr);     /* turn off rendering */
-    void	(*restore) (KdCardInfo *);  /* restore graphics card state */
-    void	(*scrfini) (KdScreenInfo *);/* close down screen */
-    void        (*cardfini) (KdCardInfo *); /* close down */
-
-    Bool        (*initCursor) (ScreenPtr);      /* detect and map cursor */
-    void        (*enableCursor) (ScreenPtr);    /* enable cursor */
-    void        (*disableCursor) (ScreenPtr);   /* disable cursor */
-    void        (*finiCursor) (ScreenPtr);      /* close down */
-    void        (*recolorCursor) (ScreenPtr, int, xColorItem *);
-
-    Bool        (*initAccel) (ScreenPtr);
-    void        (*enableAccel) (ScreenPtr);
-    void        (*disableAccel) (ScreenPtr);
-    void        (*finiAccel) (ScreenPtr);
-
-    void        (*getColors) (ScreenPtr, int, xColorItem *);
-    void        (*putColors) (ScreenPtr, int, xColorItem *);
-
-} KdCardFuncs;
-
-#define KD_MAX_PSEUDO_DEPTH 8
-#define KD_MAX_PSEUDO_SIZE	    (1 << KD_MAX_PSEUDO_DEPTH)
-
-typedef struct {
-    KdScreenInfo    *screen;
-    KdCardInfo	    *card;
-
-    Bool	    enabled;
-    Bool	    closed;
-    int		    bytesPerPixel;
-
-    int		    dpmsState;
-
-    ColormapPtr     pInstalledmap;                    /* current colormap */
-    xColorItem      systemPalette[KD_MAX_PSEUDO_SIZE];/* saved windows colors */
-
-    CreateScreenResourcesProcPtr    CreateScreenResources;
-    CloseScreenProcPtr  CloseScreen;
-} KdPrivScreenRec, *KdPrivScreenPtr;
-
-typedef enum _kdPointerState {
-    start,
-    button_1_pend,
-    button_1_down,
-    button_2_down,
-    button_3_pend,
-    button_3_down,
-    synth_2_down_13,
-    synth_2_down_3,
-    synth_2_down_1,
-    num_input_states
-} KdPointerState;
-
-#define KD_MAX_BUTTON  32
-
-#define KD_KEYBOARD 1
-#define KD_MOUSE 2
-#define KD_TOUCHSCREEN 3
-
-typedef struct _KdPointerInfo KdPointerInfo;
-
-typedef struct _KdPointerDriver {
-    char                    *name;
-    Status                  (*Init)    (KdPointerInfo *);
-    Status                  (*Enable)  (KdPointerInfo *);
-    void                    (*Disable) (KdPointerInfo *);
-    void                    (*Fini)    (KdPointerInfo *);
-    struct _KdPointerDriver *next;
-} KdPointerDriver;
-
-struct _KdPointerInfo {
-    DeviceIntPtr          dixdev;
-    char                  *name;
-    char                  *path;
-    char                  *protocol;
-    InputOption           *options;
-    int                   inputClass;
-
-    CARD8                 map[KD_MAX_BUTTON + 1];
-    int                   nButtons;
-    int                   nAxes;
-
-    Bool                  emulateMiddleButton;
-    unsigned long         emulationTimeout;
-    int                   emulationDx, emulationDy;
-
-    Bool                  timeoutPending;
-    KdPointerState        mouseState;
-    Bool                  eventHeld;
-    struct {
-        int type;
-        int x;
-        int y;
-        int z;
-        int flags;
-        int absrel;
-    } heldEvent;
-    unsigned char         buttonState;
-    Bool                  transformCoordinates;
-    int                   pressureThreshold;
-
-    KdPointerDriver       *driver;
-    void                  *driverPrivate;
-
-    struct _KdPointerInfo *next;
-};
-
-extern int KdCurScreen;
-
-void KdAddPointerDriver (KdPointerDriver *driver);
-void KdRemovePointerDriver (KdPointerDriver *driver);
-KdPointerInfo *KdNewPointer (void);
-void KdFreePointer (KdPointerInfo *);
-int KdAddPointer (KdPointerInfo *ki);
-int KdAddConfigPointer (char *pointer);
-void KdRemovePointer (KdPointerInfo *ki);
-
-
-#define KD_KEY_COUNT 248
-#define KD_MIN_KEYCODE  8
-#define KD_MAX_KEYCODE  255
-#define KD_MAX_WIDTH    4
-#define KD_MAX_LENGTH   (KD_MAX_KEYCODE - KD_MIN_KEYCODE + 1)
-
-typedef struct {
-    KeySym modsym;
-    int    modbit;
-} KdKeySymModsRec;
-
-typedef struct _KdKeyboardInfo KdKeyboardInfo;
-
-typedef struct _KdKeyboardDriver {
-    char                  *name;
-    Bool                  (*Init)    (KdKeyboardInfo *);
-    Bool                  (*Enable)  (KdKeyboardInfo *);
-    void                  (*Leds)    (KdKeyboardInfo *, int);
-    void                  (*Bell)    (KdKeyboardInfo *, int, int, int);
-    void                  (*Disable) (KdKeyboardInfo *);
-    void                  (*Fini)    (KdKeyboardInfo *);
-    struct _KdKeyboardDriver *next;
-} KdKeyboardDriver;
-
-struct _KdKeyboardInfo {
-    struct _KdKeyboardInfo *next;
-    DeviceIntPtr        dixdev;
-    void                *closure;
-    char                *name;
-    char                *path;
-    int                 inputClass;
-    char                *xkbRules;
-    char                *xkbModel;
-    char                *xkbLayout;
-    char                *xkbVariant;
-    char                *xkbOptions;
-    int                 LockLed;
-
-    int                 minScanCode;
-    int                 maxScanCode;
-
-    int                 leds;
-    int                 bellPitch;
-    int                 bellDuration;
-    InputOption         *options;
-
-    KdKeyboardDriver    *driver;
-    void                *driverPrivate;
-};
-
-void KdAddKeyboardDriver (KdKeyboardDriver *driver);
-void KdRemoveKeyboardDriver (KdKeyboardDriver *driver);
-KdKeyboardInfo *KdNewKeyboard (void);
-void KdFreeKeyboard (KdKeyboardInfo *ki);
-int KdAddConfigKeyboard (char *pointer);
-int KdAddKeyboard (KdKeyboardInfo *ki);
-void KdRemoveKeyboard (KdKeyboardInfo *ki);
-
-typedef struct _KdOsFuncs {
-    int		    (*Init) (void);
-    void	    (*Enable) (void);
-    Bool	    (*SpecialKey) (KeySym);
-    void	    (*Disable) (void);
-    void	    (*Fini) (void);
-    void	    (*pollEvents) (void);
-    void            (*Bell) (int, int, int);
-} KdOsFuncs;
-
-typedef enum _KdSyncPolarity {
-    KdSyncNegative, KdSyncPositive
-} KdSyncPolarity;
-
-typedef struct _KdMonitorTiming {
-    /* label */
-    int		    horizontal;
-    int		    vertical;
-    int		    rate;
-    /* pixel clock */
-    int		    clock;  /* in KHz */
-    /* horizontal timing */
-    int		    hfp;    /* front porch */
-    int		    hbp;    /* back porch */
-    int		    hblank; /* blanking */
-    KdSyncPolarity  hpol;   /* polarity */
-    /* vertical timing */
-    int		    vfp;    /* front porch */
-    int		    vbp;    /* back porch */
-    int		    vblank; /* blanking */
-    KdSyncPolarity  vpol;   /* polarity */
-} KdMonitorTiming;
-
-extern const KdMonitorTiming	kdMonitorTimings[];
-extern const int		kdNumMonitorTimings;
-
-typedef struct _KdPointerMatrix {
-    int	    matrix[2][3];
-} KdPointerMatrix;
-
-/*
- * This is the only completely portable way to
- * compute this info.
- */
-
-#ifndef BitsPerPixel
-#define BitsPerPixel(d) (\
-    PixmapWidthPaddingInfo[d].notPower2 ? \
-    (PixmapWidthPaddingInfo[d].bytesPerPixel * 8) : \
-    ((1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \
-    (PixmapWidthPaddingInfo[d].padRoundUp+1)))
-#endif
-
-extern DevPrivateKey	kdScreenPrivateKey;
-extern unsigned long	kdGeneration;
-extern Bool		kdEnabled;
-extern Bool		kdSwitchPending;
-extern Bool		kdEmulateMiddleButton;
-extern Bool		kdDisableZaphod;
-extern Bool		kdAllowZap;
-extern int		kdVirtualTerminal;
-extern char		*kdSwitchCmd;
-extern KdOsFuncs	*kdOsFuncs;
-
-#define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \
-    dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))
-#define KdSetScreenPriv(pScreen,v) \
-    dixSetPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey, v)
-#define KdScreenPriv(pScreen) KdPrivScreenPtr pScreenPriv = KdGetScreenPriv(pScreen)
-
-/* kcmap.c */
-void
-KdSetColormap (ScreenPtr pScreen);
-
-void
-KdEnableColormap (ScreenPtr pScreen);
-
-void
-KdDisableColormap (ScreenPtr pScreen);
-
-void
-KdInstallColormap (ColormapPtr pCmap);
-
-void
-KdUninstallColormap (ColormapPtr pCmap);
-
-int
-KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps);
-
-void
-KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs);
-
-/* kdrive.c */
-extern miPointerScreenFuncRec kdPointerScreenFuncs;
-
-void
-KdSetRootClip (ScreenPtr pScreen, BOOL enable);
-
-void
-KdDisableScreen (ScreenPtr pScreen);
-
-void
-KdDisableScreens (void);
-
-Bool
-KdEnableScreen (ScreenPtr pScreen);
-
-void
-KdEnableScreens (void);
-
-void
-KdSuspend (void);
-
-void
-KdResume (void);
-
-void
-KdProcessSwitch (void);
-
-Rotation
-KdAddRotation (Rotation a, Rotation b);
-
-Rotation
-KdSubRotation (Rotation a, Rotation b);
-
-void
-KdParseScreen (KdScreenInfo *screen,
-	       char	    *arg);
-
-KdPointerInfo *
-KdParsePointer (char *arg);
-
-KdKeyboardInfo *
-KdParseKeyboard (char *arg);
-
-char *
-KdParseFindNext (char *cur, char *delim, char *save, char *last);
-
-void
-KdParseRgba (char *rgba);
-
-void
-KdUseMsg (void);
-
-int
-KdProcessArgument (int argc, char **argv, int i);
-
-void
-KdOsInit (KdOsFuncs *pOsFuncs);
-
-void
-KdOsAddInputDrivers (void);
-
-Bool
-KdAllocatePrivates (ScreenPtr pScreen);
-
-Bool
-KdCreateScreenResources (ScreenPtr pScreen);
-
-Bool
-KdCloseScreen (int index, ScreenPtr pScreen);
-
-Bool
-KdSaveScreen (ScreenPtr pScreen, int on);
-
-Bool
-KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);
-
-void
-KdInitScreen (ScreenInfo    *pScreenInfo,
-	      KdScreenInfo  *screen,
-	      int	    argc,
-	      char	    **argv);
-
-void
-KdInitCard (ScreenInfo	    *pScreenInfo,
-	    KdCardInfo	    *card,
-	    int		    argc,
-	    char	    **argv);
-
-void
-KdInitOutput (ScreenInfo    *pScreenInfo,
-	      int	    argc,
-	      char	    **argv);
-
-void
-KdSetSubpixelOrder (ScreenPtr pScreen, Rotation randr);
-
-void
-KdBacktrace (int signum);
-
-/* kinfo.c */
-KdCardInfo *
-KdCardInfoAdd (KdCardFuncs  *funcs,
-	       void	    *closure);
-
-KdCardInfo *
-KdCardInfoLast (void);
-
-void
-KdCardInfoDispose (KdCardInfo *ci);
-
-KdScreenInfo *
-KdScreenInfoAdd (KdCardInfo *ci);
-
-void
-KdScreenInfoDispose (KdScreenInfo *si);
-
-
-/* kinput.c */
-void
-KdInitInput(void);
-
-void
-KdAddPointerDriver(KdPointerDriver *);
-
-void
-KdAddKeyboardDriver(KdKeyboardDriver *);
-
-Bool
-KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure);
-
-void
-KdUnregisterFds (void *closure, Bool do_close);
-
-void
-KdUnregisterFd (void *closure, int fd, Bool do_close);
-
-void
-KdEnqueueKeyboardEvent(KdKeyboardInfo *ki, unsigned char scan_code,
-                    unsigned char is_up);
-
-#define KD_BUTTON_1	0x01
-#define KD_BUTTON_2	0x02
-#define KD_BUTTON_3	0x04
-#define KD_BUTTON_4	0x08
-#define KD_BUTTON_5	0x10
-#define KD_BUTTON_8	0x80
-#define KD_MOUSE_DELTA	0x80000000
-
-void
-KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
-                      int rz);
-
-void
-_KdEnqueuePointerEvent(KdPointerInfo *pi, int type, int x, int y, int z,
-                       int b, int absrel, Bool force);
-
-void
-KdReleaseAllKeys (void);
-
-void
-KdSetLed (KdKeyboardInfo *ki, int led, Bool on);
-
-void
-KdSetPointerMatrix (KdPointerMatrix *pointer);
-
-void
-KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height);
-
-void
-KdScreenToPointerCoords (int *x, int *y);
-
-void
-KdBlockHandler (int		screen,
-		pointer		blockData,
-		pointer		timeout,
-		pointer		readmask);
-
-void
-KdWakeupHandler (int		screen,
-		 pointer    	data,
-		 unsigned long	result,
-		 pointer	readmask);
-
-void
-KdDisableInput (void);
-
-void
-KdEnableInput (void);
-
-void
-ProcessInputEvents (void);
-
-void
-KdRingBell (KdKeyboardInfo      *ki,
-            int                 volume,
-            int                 pitch,
-            int                 duration);
-
-/* kmode.c */
-const KdMonitorTiming *
-KdFindMode (KdScreenInfo    *screen,
-	    Bool	    (*supported) (KdScreenInfo *,
-					  const KdMonitorTiming *));
-
-Bool
-KdTuneMode (KdScreenInfo    *screen,
-	    Bool	    (*usable) (KdScreenInfo *),
-	    Bool	    (*supported) (KdScreenInfo *,
-					  const KdMonitorTiming *));
-
-#ifdef RANDR
-Bool
-KdRandRGetInfo (ScreenPtr pScreen,
-		int randr,
-		Bool (*supported) (ScreenPtr pScreen,
-				   const KdMonitorTiming *));
-
-const KdMonitorTiming *
-KdRandRGetTiming (ScreenPtr	    pScreen,
-		  Bool		    (*supported) (ScreenPtr pScreen,
-						  const KdMonitorTiming *),
-		  int		    rate,
-		  RRScreenSizePtr   pSize);
-#endif
-
-/* kshadow.c */
-Bool
-KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate);
-
-void
-KdShadowFbFree (KdScreenInfo *screen);
-
-Bool
-KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window);
-
-void
-KdShadowUnset (ScreenPtr pScreen);
-
-/* function prototypes to be implemented by the drivers */
-void
-InitCard (char *name);
-
-#endif /* _KDRIVE_H_ */
+/*

+ * Copyright © 1999 Keith Packard

+ *

+ * Permission to use, copy, modify, distribute, and sell this software and its

+ * documentation for any purpose is hereby granted without fee, provided that

+ * the above copyright notice appear in all copies and that both that

+ * copyright notice and this permission notice appear in supporting

+ * documentation, and that the name of Keith Packard not be used in

+ * advertising or publicity pertaining to distribution of the software without

+ * specific, written prior permission.  Keith Packard makes no

+ * representations about the suitability of this software for any purpose.  It

+ * is provided "as is" without express or implied warranty.

+ *

+ * KEITH PACKARD DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,

+ * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO

+ * EVENT SHALL KEITH PACKARD BE LIABLE FOR ANY SPECIAL, INDIRECT OR

+ * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,

+ * DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER

+ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR

+ * PERFORMANCE OF THIS SOFTWARE.

+ */

+

+#ifndef _KDRIVE_H_

+#define _KDRIVE_H_

+

+#include <stdio.h>

+#include <string.h>

+#include <X11/X.h>

+#include <X11/Xproto.h>

+#include <X11/Xos.h>

+#include "scrnintstr.h"

+#include "pixmapstr.h"

+#include "windowstr.h"

+#include "servermd.h"

+#include "mibstore.h"

+#include "colormapst.h"

+#include "gcstruct.h"

+#include "input.h"

+#include "mipointer.h"

+#include "mi.h"

+#include "dix.h"

+#include "fb.h"

+#include "fboverlay.h"

+#include "shadow.h"

+#include "randrstr.h"

+#include "globals.h"

+

+#include "xkbstr.h"

+

+#define KD_DPMS_NORMAL	    0

+#define KD_DPMS_STANDBY	    1

+#define KD_DPMS_SUSPEND	    2

+#define KD_DPMS_POWERDOWN   3

+#define KD_DPMS_MAX	    KD_DPMS_POWERDOWN

+

+#define Status int

+

+typedef struct _KdCardInfo {

+    struct _KdCardFuncs	    *cfuncs;

+    void		    *closure;

+    void		    *driver;

+    struct _KdScreenInfo    *screenList;

+    int			    selected;

+    struct _KdCardInfo	    *next;

+} KdCardInfo;

+

+extern KdCardInfo	*kdCardInfo;

+

+/*

+ * Configuration information per X screen

+ */

+typedef struct _KdFrameBuffer {

+    CARD8	*frameBuffer;

+    int		depth;

+    int		bitsPerPixel;

+    int		pixelStride;

+    int		byteStride;

+    Bool	shadow;

+    unsigned long   visuals;

+    Pixel       redMask, greenMask, blueMask;

+    void	*closure;

+} KdFrameBuffer;

+

+#define RR_Rotate_All	(RR_Rotate_0|RR_Rotate_90|RR_Rotate_180|RR_Rotate_270)

+#define RR_Reflect_All	(RR_Reflect_X|RR_Reflect_Y)

+

+typedef struct _KdScreenInfo {

+    struct _KdScreenInfo    *next;

+    KdCardInfo	*card;

+    ScreenPtr	pScreen;

+    void	*driver;

+    Rotation	randr;	/* rotation and reflection */

+    int		width;

+    int		height;

+    int		rate;

+    int		width_mm;

+    int		height_mm;

+    int		subpixel_order;

+    Bool        dumb;

+    Bool        softCursor;

+    int		mynum;

+    DDXPointRec	origin;

+    KdFrameBuffer   fb;

+} KdScreenInfo;

+

+typedef struct _KdCardFuncs {

+    Bool	(*cardinit) (KdCardInfo *); /* detect and map device */

+    Bool	(*scrinit) (KdScreenInfo *);/* initialize screen information */

+    Bool	(*initScreen) (ScreenPtr);  /* initialize ScreenRec */

+    Bool	(*finishInitScreen) (ScreenPtr pScreen);

+    Bool	(*createRes) (ScreenPtr);   /* create screen resources */

+    void	(*preserve) (KdCardInfo *); /* save graphics card state */

+    Bool        (*enable) (ScreenPtr);      /* set up for rendering */

+    Bool	(*dpms) (ScreenPtr, int);   /* set DPMS screen saver */

+    void        (*disable) (ScreenPtr);     /* turn off rendering */

+    void	(*restore) (KdCardInfo *);  /* restore graphics card state */

+    void	(*scrfini) (KdScreenInfo *);/* close down screen */

+    void        (*cardfini) (KdCardInfo *); /* close down */

+

+    Bool        (*initCursor) (ScreenPtr);      /* detect and map cursor */

+    void        (*enableCursor) (ScreenPtr);    /* enable cursor */

+    void        (*disableCursor) (ScreenPtr);   /* disable cursor */

+    void        (*finiCursor) (ScreenPtr);      /* close down */

+    void        (*recolorCursor) (ScreenPtr, int, xColorItem *);

+

+    Bool        (*initAccel) (ScreenPtr);

+    void        (*enableAccel) (ScreenPtr);

+    void        (*disableAccel) (ScreenPtr);

+    void        (*finiAccel) (ScreenPtr);

+

+    void        (*getColors) (ScreenPtr, int, xColorItem *);

+    void        (*putColors) (ScreenPtr, int, xColorItem *);

+

+} KdCardFuncs;

+

+#define KD_MAX_PSEUDO_DEPTH 8

+#define KD_MAX_PSEUDO_SIZE	    (1 << KD_MAX_PSEUDO_DEPTH)

+

+typedef struct {

+    KdScreenInfo    *screen;

+    KdCardInfo	    *card;

+

+    Bool	    enabled;

+    Bool	    closed;

+    int		    bytesPerPixel;

+

+    int		    dpmsState;

+

+    ColormapPtr     pInstalledmap;                    /* current colormap */

+    xColorItem      systemPalette[KD_MAX_PSEUDO_SIZE];/* saved windows colors */

+

+    CreateScreenResourcesProcPtr    CreateScreenResources;

+    CloseScreenProcPtr  CloseScreen;

+} KdPrivScreenRec, *KdPrivScreenPtr;

+

+typedef enum _kdPointerState {

+    start,

+    button_1_pend,

+    button_1_down,

+    button_2_down,

+    button_3_pend,

+    button_3_down,

+    synth_2_down_13,

+    synth_2_down_3,

+    synth_2_down_1,

+    num_input_states

+} KdPointerState;

+

+#define KD_MAX_BUTTON  32

+

+#define KD_KEYBOARD 1

+#define KD_MOUSE 2

+#define KD_TOUCHSCREEN 3

+

+typedef struct _KdPointerInfo KdPointerInfo;

+

+typedef struct _KdPointerDriver {

+    char                    *name;

+    Status                  (*Init)    (KdPointerInfo *);

+    Status                  (*Enable)  (KdPointerInfo *);

+    void                    (*Disable) (KdPointerInfo *);

+    void                    (*Fini)    (KdPointerInfo *);

+    struct _KdPointerDriver *next;

+} KdPointerDriver;

+

+struct _KdPointerInfo {

+    DeviceIntPtr          dixdev;

+    char                  *name;

+    char                  *path;

+    char                  *protocol;

+    InputOption           *options;

+    int                   inputClass;

+

+    CARD8                 map[KD_MAX_BUTTON + 1];

+    int                   nButtons;

+    int                   nAxes;

+

+    Bool                  emulateMiddleButton;

+    unsigned long         emulationTimeout;

+    int                   emulationDx, emulationDy;

+

+    Bool                  timeoutPending;

+    KdPointerState        mouseState;

+    Bool                  eventHeld;

+    struct {

+        int type;

+        int x;

+        int y;

+        int z;

+        int flags;

+        int absrel;

+    } heldEvent;

+    unsigned char         buttonState;

+    Bool                  transformCoordinates;

+    int                   pressureThreshold;

+

+    KdPointerDriver       *driver;

+    void                  *driverPrivate;

+

+    struct _KdPointerInfo *next;

+};

+

+extern int KdCurScreen;

+

+void KdAddPointerDriver (KdPointerDriver *driver);

+void KdRemovePointerDriver (KdPointerDriver *driver);

+KdPointerInfo *KdNewPointer (void);

+void KdFreePointer (KdPointerInfo *);

+int KdAddPointer (KdPointerInfo *ki);

+int KdAddConfigPointer (char *pointer);

+void KdRemovePointer (KdPointerInfo *ki);

+

+

+#define KD_KEY_COUNT 248

+#define KD_MIN_KEYCODE  8

+#define KD_MAX_KEYCODE  255

+#define KD_MAX_WIDTH    4

+#define KD_MAX_LENGTH   (KD_MAX_KEYCODE - KD_MIN_KEYCODE + 1)

+

+typedef struct {

+    KeySym modsym;

+    int    modbit;

+} KdKeySymModsRec;

+

+typedef struct _KdKeyboardInfo KdKeyboardInfo;

+

+typedef struct _KdKeyboardDriver {

+    char                  *name;

+    Bool                  (*Init)    (KdKeyboardInfo *);

+    Bool                  (*Enable)  (KdKeyboardInfo *);

+    void                  (*Leds)    (KdKeyboardInfo *, int);

+    void                  (*Bell)    (KdKeyboardInfo *, int, int, int);

+    void                  (*Disable) (KdKeyboardInfo *);

+    void                  (*Fini)    (KdKeyboardInfo *);

+    struct _KdKeyboardDriver *next;

+} KdKeyboardDriver;

+

+struct _KdKeyboardInfo {

+    struct _KdKeyboardInfo *next;

+    DeviceIntPtr        dixdev;

+    void                *closure;

+    char                *name;

+    char                *path;

+    int                 inputClass;

+    char                *xkbRules;

+    char                *xkbModel;

+    char                *xkbLayout;

+    char                *xkbVariant;

+    char                *xkbOptions;

+    int                 LockLed;

+

+    int                 minScanCode;

+    int                 maxScanCode;

+

+    int                 leds;

+    int                 bellPitch;

+    int                 bellDuration;

+    InputOption         *options;

+

+    KdKeyboardDriver    *driver;

+    void                *driverPrivate;

+};

+

+void KdAddKeyboardDriver (KdKeyboardDriver *driver);

+void KdRemoveKeyboardDriver (KdKeyboardDriver *driver);

+KdKeyboardInfo *KdNewKeyboard (void);

+void KdFreeKeyboard (KdKeyboardInfo *ki);

+int KdAddConfigKeyboard (char *pointer);

+int KdAddKeyboard (KdKeyboardInfo *ki);

+void KdRemoveKeyboard (KdKeyboardInfo *ki);

+

+typedef struct _KdOsFuncs {

+    int		    (*Init) (void);

+    void	    (*Enable) (void);

+    Bool	    (*SpecialKey) (KeySym);

+    void	    (*Disable) (void);

+    void	    (*Fini) (void);

+    void	    (*pollEvents) (void);

+    void            (*Bell) (int, int, int);

+} KdOsFuncs;

+

+typedef enum _KdSyncPolarity {

+    KdSyncNegative, KdSyncPositive

+} KdSyncPolarity;

+

+typedef struct _KdMonitorTiming {

+    /* label */

+    int		    horizontal;

+    int		    vertical;

+    int		    rate;

+    /* pixel clock */

+    int		    clock;  /* in KHz */

+    /* horizontal timing */

+    int		    hfp;    /* front porch */

+    int		    hbp;    /* back porch */

+    int		    hblank; /* blanking */

+    KdSyncPolarity  hpol;   /* polarity */

+    /* vertical timing */

+    int		    vfp;    /* front porch */

+    int		    vbp;    /* back porch */

+    int		    vblank; /* blanking */

+    KdSyncPolarity  vpol;   /* polarity */

+} KdMonitorTiming;

+

+extern const KdMonitorTiming	kdMonitorTimings[];

+extern const int		kdNumMonitorTimings;

+

+typedef struct _KdPointerMatrix {

+    int	    matrix[2][3];

+} KdPointerMatrix;

+

+/*

+ * This is the only completely portable way to

+ * compute this info.

+ */

+

+#ifndef BitsPerPixel

+#define BitsPerPixel(d) (\

+    PixmapWidthPaddingInfo[d].notPower2 ? \

+    (PixmapWidthPaddingInfo[d].bytesPerPixel * 8) : \

+    ((1 << PixmapWidthPaddingInfo[d].padBytesLog2) * 8 / \

+    (PixmapWidthPaddingInfo[d].padRoundUp+1)))

+#endif

+

+extern DevPrivateKeyRec	kdScreenPrivateKeyRec;

+#define kdScreenPrivateKey (&kdScreenPrivateKeyRec)

+

+extern unsigned long	kdGeneration;

+extern Bool		kdEnabled;

+extern Bool		kdSwitchPending;

+extern Bool		kdEmulateMiddleButton;

+extern Bool		kdDisableZaphod;

+extern Bool		kdAllowZap;

+extern int		kdVirtualTerminal;

+extern char		*kdSwitchCmd;

+extern KdOsFuncs	*kdOsFuncs;

+

+#define KdGetScreenPriv(pScreen) ((KdPrivScreenPtr) \

+    dixLookupPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey))

+#define KdSetScreenPriv(pScreen,v) \

+    dixSetPrivate(&(pScreen)->devPrivates, kdScreenPrivateKey, v)

+#define KdScreenPriv(pScreen) KdPrivScreenPtr pScreenPriv = KdGetScreenPriv(pScreen)

+

+/* kcmap.c */

+void

+KdSetColormap (ScreenPtr pScreen);

+

+void

+KdEnableColormap (ScreenPtr pScreen);

+

+void

+KdDisableColormap (ScreenPtr pScreen);

+

+void

+KdInstallColormap (ColormapPtr pCmap);

+

+void

+KdUninstallColormap (ColormapPtr pCmap);

+

+int

+KdListInstalledColormaps (ScreenPtr pScreen, Colormap *pCmaps);

+

+void

+KdStoreColors (ColormapPtr pCmap, int ndef, xColorItem *pdefs);

+

+/* kdrive.c */

+extern miPointerScreenFuncRec kdPointerScreenFuncs;

+

+void

+KdSetRootClip (ScreenPtr pScreen, BOOL enable);

+

+void

+KdDisableScreen (ScreenPtr pScreen);

+

+void

+KdDisableScreens (void);

+

+Bool

+KdEnableScreen (ScreenPtr pScreen);

+

+void

+KdEnableScreens (void);

+

+void

+KdSuspend (void);

+

+void

+KdResume (void);

+

+void

+KdProcessSwitch (void);

+

+Rotation

+KdAddRotation (Rotation a, Rotation b);

+

+Rotation

+KdSubRotation (Rotation a, Rotation b);

+

+void

+KdParseScreen (KdScreenInfo *screen,

+	       char	    *arg);

+

+KdPointerInfo *

+KdParsePointer (char *arg);

+

+KdKeyboardInfo *

+KdParseKeyboard (char *arg);

+

+char *

+KdParseFindNext (char *cur, char *delim, char *save, char *last);

+

+void

+KdParseRgba (char *rgba);

+

+void

+KdUseMsg (void);

+

+int

+KdProcessArgument (int argc, char **argv, int i);

+

+void

+KdOsInit (KdOsFuncs *pOsFuncs);

+

+void

+KdOsAddInputDrivers (void);

+

+Bool

+KdAllocatePrivates (ScreenPtr pScreen);

+

+Bool

+KdCreateScreenResources (ScreenPtr pScreen);

+

+Bool

+KdCloseScreen (int index, ScreenPtr pScreen);

+

+Bool

+KdSaveScreen (ScreenPtr pScreen, int on);

+

+Bool

+KdScreenInit(int index, ScreenPtr pScreen, int argc, char **argv);

+

+void

+KdInitScreen (ScreenInfo    *pScreenInfo,

+	      KdScreenInfo  *screen,

+	      int	    argc,

+	      char	    **argv);

+

+void

+KdInitCard (ScreenInfo	    *pScreenInfo,

+	    KdCardInfo	    *card,

+	    int		    argc,

+	    char	    **argv);

+

+void

+KdInitOutput (ScreenInfo    *pScreenInfo,

+	      int	    argc,

+	      char	    **argv);

+

+void

+KdSetSubpixelOrder (ScreenPtr pScreen, Rotation randr);

+

+void

+KdBacktrace (int signum);

+

+/* kinfo.c */

+KdCardInfo *

+KdCardInfoAdd (KdCardFuncs  *funcs,

+	       void	    *closure);

+

+KdCardInfo *

+KdCardInfoLast (void);

+

+void

+KdCardInfoDispose (KdCardInfo *ci);

+

+KdScreenInfo *

+KdScreenInfoAdd (KdCardInfo *ci);

+

+void

+KdScreenInfoDispose (KdScreenInfo *si);

+

+

+/* kinput.c */

+void

+KdInitInput(void);

+

+void

+KdAddPointerDriver(KdPointerDriver *);

+

+void

+KdAddKeyboardDriver(KdKeyboardDriver *);

+

+Bool

+KdRegisterFd (int fd, void (*read) (int fd, void *closure), void *closure);

+

+void

+KdUnregisterFds (void *closure, Bool do_close);

+

+void

+KdUnregisterFd (void *closure, int fd, Bool do_close);

+

+void

+KdEnqueueKeyboardEvent(KdKeyboardInfo *ki, unsigned char scan_code,

+                    unsigned char is_up);

+

+#define KD_BUTTON_1	0x01

+#define KD_BUTTON_2	0x02

+#define KD_BUTTON_3	0x04

+#define KD_BUTTON_4	0x08

+#define KD_BUTTON_5	0x10

+#define KD_BUTTON_8	0x80

+#define KD_MOUSE_DELTA	0x80000000

+

+void

+KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,

+                      int rz);

+

+void

+_KdEnqueuePointerEvent(KdPointerInfo *pi, int type, int x, int y, int z,

+                       int b, int absrel, Bool force);

+

+void

+KdReleaseAllKeys (void);

+

+void

+KdSetLed (KdKeyboardInfo *ki, int led, Bool on);

+

+void

+KdSetPointerMatrix (KdPointerMatrix *pointer);

+

+void

+KdComputePointerMatrix (KdPointerMatrix *pointer, Rotation randr, int width, int height);

+

+void

+KdScreenToPointerCoords (int *x, int *y);

+

+void

+KdBlockHandler (int		screen,

+		pointer		blockData,

+		pointer		timeout,

+		pointer		readmask);

+

+void

+KdWakeupHandler (int		screen,

+		 pointer    	data,

+		 unsigned long	result,

+		 pointer	readmask);

+

+void

+KdDisableInput (void);

+

+void

+KdEnableInput (void);

+

+void

+ProcessInputEvents (void);

+

+void

+KdRingBell (KdKeyboardInfo      *ki,

+            int                 volume,

+            int                 pitch,

+            int                 duration);

+

+/* kmode.c */

+const KdMonitorTiming *

+KdFindMode (KdScreenInfo    *screen,

+	    Bool	    (*supported) (KdScreenInfo *,

+					  const KdMonitorTiming *));

+

+Bool

+KdTuneMode (KdScreenInfo    *screen,

+	    Bool	    (*usable) (KdScreenInfo *),

+	    Bool	    (*supported) (KdScreenInfo *,

+					  const KdMonitorTiming *));

+

+#ifdef RANDR

+Bool

+KdRandRGetInfo (ScreenPtr pScreen,

+		int randr,

+		Bool (*supported) (ScreenPtr pScreen,

+				   const KdMonitorTiming *));

+

+const KdMonitorTiming *

+KdRandRGetTiming (ScreenPtr	    pScreen,

+		  Bool		    (*supported) (ScreenPtr pScreen,

+						  const KdMonitorTiming *),

+		  int		    rate,

+		  RRScreenSizePtr   pSize);

+#endif

+

+/* kshadow.c */

+Bool

+KdShadowFbAlloc (KdScreenInfo *screen, Bool rotate);

+

+void

+KdShadowFbFree (KdScreenInfo *screen);

+

+Bool

+KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window);

+

+void

+KdShadowUnset (ScreenPtr pScreen);

+

+/* function prototypes to be implemented by the drivers */

+void

+InitCard (char *name);

+

+#endif /* _KDRIVE_H_ */

diff --git a/xorg-server/hw/kdrive/src/kxv.c b/xorg-server/hw/kdrive/src/kxv.c
index 9fef34d1f..cf960e62b 100644
--- a/xorg-server/hw/kdrive/src/kxv.c
+++ b/xorg-server/hw/kdrive/src/kxv.c
@@ -103,10 +103,9 @@ static void KdXVClipNotify(WindowPtr pWin, int dx, int dy);
 /* misc */

 static Bool KdXVInitAdaptors(ScreenPtr, KdVideoAdaptorPtr*, int);

 

-static int KdXVWindowKeyIndex;

-DevPrivateKey KdXVWindowKey = &KdXVWindowKeyIndex;

-static int KdXvScreenKeyIndex;

-DevPrivateKey KdXvScreenKey = &KdXvScreenKeyIndex;

+static DevPrivateKeyRec KdXVWindowKeyRec;

+#define KdXVWindowKey (&KdXVWindowKeyRec)

+static DevPrivateKey KdXvScreenKey;

 static unsigned long KdXVGeneration = 0;

 static unsigned long PortResource = 0;

 

@@ -199,6 +198,9 @@ KdXVScreenInit(
   if(!XvGetScreenKeyProc || !XvGetRTPortProc || !XvScreenInitProc)

 	return FALSE;

 

+  if (!dixRegisterPrivateKey(&KdXVWindowKeyRec, PRIVATE_WINDOW, 0))

+      return FALSE;

+

   if(Success != (*XvScreenInitProc)(pScreen)) return FALSE;

 

   KdXvScreenKey = (*XvGetScreenKeyProc)();

@@ -268,9 +270,9 @@ KdXVFreeAdaptor(XvAdaptorPtr pAdaptor)
           pPriv = (XvPortRecPrivatePtr)pPort->devPriv.ptr;

 	  if(pPriv) {

 	     if(pPriv->clientClip)

-		REGION_DESTROY(pAdaptor->pScreen, pPriv->clientClip);

+		RegionDestroy(pPriv->clientClip);

              if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-		REGION_DESTROY(pAdaptor->pScreen, pPriv->pCompositeClip);

+		RegionDestroy(pPriv->pCompositeClip);

 	     free(pPriv);

 	  }

       }

@@ -607,18 +609,18 @@ KdXVUpdateCompositeClip(XvPortRecPrivatePtr portPriv)
 	return;

    }

 

-   pCompositeClip = REGION_CREATE(pWin->pScreen, NullBox, 1);

-   REGION_COPY(pWin->pScreen, pCompositeClip, portPriv->clientClip);

-   REGION_TRANSLATE(pWin->pScreen, pCompositeClip,

+   pCompositeClip = RegionCreate(NullBox, 1);

+   RegionCopy(pCompositeClip, portPriv->clientClip);

+   RegionTranslate(pCompositeClip,

 			portPriv->pDraw->x + portPriv->clipOrg.x,

 			portPriv->pDraw->y + portPriv->clipOrg.y);

-   REGION_INTERSECT(pWin->pScreen, pCompositeClip, pregWin, pCompositeClip);

+   RegionIntersect(pCompositeClip, pregWin, pCompositeClip);

 

    portPriv->pCompositeClip = pCompositeClip;

    portPriv->FreeCompositeClip = TRUE;

 

    if(freeCompClip) {

-   	REGION_DESTROY(pWin->pScreen, pregWin);

+	RegionDestroy(pregWin);

    }

 }

 

@@ -633,17 +635,17 @@ KdXVCopyClip(
     /* copy the new clip if it exists */

     if((pGC->clientClipType == CT_REGION) && pGC->clientClip) {

 	if(!portPriv->clientClip)

-	    portPriv->clientClip = REGION_CREATE(pGC->pScreen, NullBox, 1);

+	    portPriv->clientClip = RegionCreate(NullBox, 1);

 	/* Note: this is in window coordinates */

-	REGION_COPY(pGC->pScreen, portPriv->clientClip, pGC->clientClip);

+	RegionCopy(portPriv->clientClip, pGC->clientClip);

     } else if(portPriv->clientClip) { /* free the old clientClip */

-	REGION_DESTROY(pGC->pScreen, portPriv->clientClip);

+	RegionDestroy(portPriv->clientClip);

 	portPriv->clientClip = NULL;

     }

 

     /* get rid of the old clip list */

     if(portPriv->pCompositeClip && portPriv->FreeCompositeClip) {

-	REGION_DESTROY(pWin->pScreen, portPriv->pCompositeClip);

+	RegionDestroy(portPriv->pCompositeClip);

     }

 

     portPriv->clipOrg = pGC->clipOrg;

@@ -670,18 +672,18 @@ KdXVRegetVideo(XvPortRecPrivatePtr portPriv)
   WinBox.y2 = WinBox.y1 + portPriv->drw_h;

 

   /* clip to the window composite clip */

-  REGION_INIT(portPriv->pDraw->pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(portPriv->pDraw->pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(portPriv->pDraw->pScreen, &ClipRegion, &WinRegion, portPriv->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);

 

   /* that's all if it's totally obscured */

-  if(!REGION_NOTEMPTY(portPriv->pDraw->pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

 	clippedAway = TRUE;

 	goto CLIP_VIDEO_BAILOUT;

   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(portPriv->pDraw->pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->GetVideo)(portPriv->screen, portPriv->pDraw,

@@ -706,8 +708,8 @@ CLIP_VIDEO_BAILOUT:
   if(!portPriv->FreeCompositeClip)

      portPriv->pCompositeClip = NULL;

 

-  REGION_UNINIT(portPriv->pDraw->pScreen, &WinRegion);

-  REGION_UNINIT(portPriv->pDraw->pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -734,9 +736,9 @@ KdXVReputVideo(XvPortRecPrivatePtr portPriv)
   WinBox.y2 = WinBox.y1 + portPriv->drw_h;

 

   /* clip to the window composite clip */

-  REGION_INIT(pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(Screen, &ClipRegion, &WinRegion, portPriv->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);

 

   /* clip and translate to the viewport */

   if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

@@ -748,21 +750,21 @@ KdXVReputVideo(XvPortRecPrivatePtr portPriv)
      VPBox.x2 = screen->width;

      VPBox.y2 = screen->height;

 

-     REGION_INIT(pScreen, &VPReg, &VPBox, 1);

-     REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg);

-     REGION_UNINIT(pScreen, &VPReg);

+     RegionInit(&VPReg, &VPBox, 1);

+     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

+     RegionUninit(&VPReg);

   }

 

   /* that's all if it's totally obscured */

-  if(!REGION_NOTEMPTY(pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

 	clippedAway = TRUE;

 	goto CLIP_VIDEO_BAILOUT;

   }

 

   /* bailout if we have to clip but the hardware doesn't support it */

   if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = REGION_RECTS(&ClipRegion);

-     if(  (REGION_NUM_RECTS(&ClipRegion) != 1) ||

+     BoxPtr clipBox = RegionRects(&ClipRegion);

+     if(  (RegionNumRects(&ClipRegion) != 1) ||

 	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

 	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

      {

@@ -772,7 +774,7 @@ KdXVReputVideo(XvPortRecPrivatePtr portPriv)
   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->PutVideo)(portPriv->screen, portPriv->pDraw,

@@ -796,8 +798,8 @@ CLIP_VIDEO_BAILOUT:
   if(!portPriv->FreeCompositeClip)

      portPriv->pCompositeClip = NULL;

 

-  REGION_UNINIT(pScreen, &WinRegion);

-  REGION_UNINIT(pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -823,9 +825,9 @@ KdXVReputImage(XvPortRecPrivatePtr portPriv)
   WinBox.y2 = WinBox.y1 + portPriv->drw_h;

 

   /* clip to the window composite clip */

-  REGION_INIT(pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(Screen, &ClipRegion, &WinRegion, portPriv->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, portPriv->pCompositeClip);

 

   /* clip and translate to the viewport */

   if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

@@ -837,21 +839,21 @@ KdXVReputImage(XvPortRecPrivatePtr portPriv)
      VPBox.x2 = screen->width;

      VPBox.y2 = screen->height;

 

-     REGION_INIT(pScreen, &VPReg, &VPBox, 1);

-     REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg);

-     REGION_UNINIT(pScreen, &VPReg);

+     RegionInit(&VPReg, &VPBox, 1);

+     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

+     RegionUninit(&VPReg);

   }

 

   /* that's all if it's totally obscured */

-  if(!REGION_NOTEMPTY(pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

 	clippedAway = TRUE;

 	goto CLIP_VIDEO_BAILOUT;

   }

 

   /* bailout if we have to clip but the hardware doesn't support it */

   if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = REGION_RECTS(&ClipRegion);

-     if(  (REGION_NUM_RECTS(&ClipRegion) != 1) ||

+     BoxPtr clipBox = RegionRects(&ClipRegion);

+     if(  (RegionNumRects(&ClipRegion) != 1) ||

 	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

 	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

      {

@@ -861,7 +863,7 @@ KdXVReputImage(XvPortRecPrivatePtr portPriv)
   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->ReputImage)(portPriv->screen, portPriv->pDraw,

@@ -882,8 +884,8 @@ CLIP_VIDEO_BAILOUT:
   if(!portPriv->FreeCompositeClip)

      portPriv->pCompositeClip = NULL;

 

-  REGION_UNINIT(pScreen, &WinRegion);

-  REGION_UNINIT(pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -1021,7 +1023,7 @@ KdXVWindowExposures(WindowPtr pWin, RegionPtr reg1, RegionPtr reg2)
   XvPortRecPrivatePtr pPriv;

   Bool AreasExposed;

 

-  AreasExposed = (WinPriv && reg1 && REGION_NOTEMPTY(pScreen, reg1));

+  AreasExposed = (WinPriv && reg1 && RegionNotEmpty(reg1));

 

   pScreen->WindowExposures = ScreenPriv->WindowExposures;

   (*pScreen->WindowExposures)(pWin, reg1, reg2);

@@ -1089,7 +1091,7 @@ KdXVClipNotify(WindowPtr pWin, int dx, int dy)
      pPriv = WinPriv->PortRec;

 

      if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-	REGION_DESTROY(pScreen, pPriv->pCompositeClip);

+	RegionDestroy(pPriv->pCompositeClip);

 

      pPriv->pCompositeClip = NULL;

 

@@ -1171,7 +1173,7 @@ KdXVQueryAdaptors(
   *p_nAdaptors = pxvs->nAdaptors;

   *p_pAdaptors = pxvs->pAdaptors;

 

-  return (Success);

+  return Success;

 }

 

 static Bool

@@ -1220,7 +1222,7 @@ KdXVDisable(ScreenPtr pScreen)
 		pPriv->isOn = XV_OFF;

 

 		if(pPriv->pCompositeClip && pPriv->FreeCompositeClip)

-		    REGION_DESTROY(pScreen, pPriv->pCompositeClip);

+		    RegionDestroy(pPriv->pCompositeClip);

 

 		pPriv->pCompositeClip = NULL;

 

@@ -1330,9 +1332,9 @@ KdXVPutStill(
   WinBox.x2 = WinBox.x1 + drw_w;

   WinBox.y2 = WinBox.y1 + drw_h;

 

-  REGION_INIT(pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

 

   if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

      RegionRec VPReg;

@@ -1343,23 +1345,23 @@ KdXVPutStill(
      VPBox.x2 = screen->width;

      VPBox.y2 = screen->height;

 

-     REGION_INIT(pScreen, &VPReg, &VPBox, 1);

-     REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg);

-     REGION_UNINIT(pScreen, &VPReg);

+     RegionInit(&VPReg, &VPBox, 1);

+     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

+     RegionUninit(&VPReg);

   }

 

   if(portPriv->pDraw) {

      KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

   }

 

-  if(!REGION_NOTEMPTY(pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

      clippedAway = TRUE;

      goto PUT_STILL_BAILOUT;

   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = REGION_RECTS(&ClipRegion);

-     if(  (REGION_NUM_RECTS(&ClipRegion) != 1) ||

+     BoxPtr clipBox = RegionRects(&ClipRegion);

+     if(  (RegionNumRects(&ClipRegion) != 1) ||

 	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

 	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

      {

@@ -1369,7 +1371,7 @@ KdXVPutStill(
   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->PutStill)(portPriv->screen, pDraw,

@@ -1398,8 +1400,8 @@ PUT_STILL_BAILOUT:
         portPriv->isOn = XV_PENDING;

   }

 

-  REGION_UNINIT(pScreen, &WinRegion);

-  REGION_UNINIT(pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -1483,21 +1485,21 @@ KdXVGetStill(
   WinBox.x2 = WinBox.x1 + drw_w;

   WinBox.y2 = WinBox.y1 + drw_h;

 

-  REGION_INIT(pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

 

   if(portPriv->pDraw) {

      KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

   }

 

-  if(!REGION_NOTEMPTY(pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

      clippedAway = TRUE;

      goto GET_STILL_BAILOUT;

   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->GetStill)(portPriv->screen, pDraw,

@@ -1513,8 +1515,8 @@ GET_STILL_BAILOUT:
         portPriv->isOn = XV_PENDING;

   }

 

-  REGION_UNINIT(pScreen, &WinRegion);

-  REGION_UNINIT(pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -1630,9 +1632,9 @@ KdXVPutImage(
   WinBox.x2 = WinBox.x1 + drw_w;

   WinBox.y2 = WinBox.y1 + drw_h;

 

-  REGION_INIT(pScreen, &WinRegion, &WinBox, 1);

-  REGION_INIT(pScreen, &ClipRegion, NullBox, 1);

-  REGION_INTERSECT(pScreen, &ClipRegion, &WinRegion, pGC->pCompositeClip);

+  RegionInit(&WinRegion, &WinBox, 1);

+  RegionInit(&ClipRegion, NullBox, 1);

+  RegionIntersect(&ClipRegion, &WinRegion, pGC->pCompositeClip);

 

   if(portPriv->AdaptorRec->flags & VIDEO_CLIP_TO_VIEWPORT) {

      RegionRec VPReg;

@@ -1643,23 +1645,23 @@ KdXVPutImage(
      VPBox.x2 = pScreen->width;

      VPBox.y2 = pScreen->height;

 

-     REGION_INIT(pScreen, &VPReg, &VPBox, 1);

-     REGION_INTERSECT(Screen, &ClipRegion, &ClipRegion, &VPReg);

-     REGION_UNINIT(pScreen, &VPReg);

+     RegionInit(&VPReg, &VPBox, 1);

+     RegionIntersect(&ClipRegion, &ClipRegion, &VPReg);

+     RegionUninit(&VPReg);

   }

 

   if(portPriv->pDraw) {

      KdXVRemovePortFromWindow((WindowPtr)(portPriv->pDraw), portPriv);

   }

 

-  if(!REGION_NOTEMPTY(pScreen, &ClipRegion)) {

+  if(!RegionNotEmpty(&ClipRegion)) {

      clippedAway = TRUE;

      goto PUT_IMAGE_BAILOUT;

   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_NO_CLIPPING) {

-     BoxPtr clipBox = REGION_RECTS(&ClipRegion);

-     if(  (REGION_NUM_RECTS(&ClipRegion) != 1) ||

+     BoxPtr clipBox = RegionRects(&ClipRegion);

+     if(  (RegionNumRects(&ClipRegion) != 1) ||

 	  (clipBox->x1 != WinBox.x1) || (clipBox->x2 != WinBox.x2) ||

 	  (clipBox->y1 != WinBox.y1) || (clipBox->y2 != WinBox.y2))

      {

@@ -1669,7 +1671,7 @@ KdXVPutImage(
   }

 

   if(portPriv->AdaptorRec->flags & VIDEO_INVERT_CLIPLIST) {

-     REGION_SUBTRACT(pScreen, &ClipRegion, &WinRegion, &ClipRegion);

+     RegionSubtract(&ClipRegion, &WinRegion, &ClipRegion);

   }

 

   ret = (*portPriv->AdaptorRec->PutImage)(portPriv->screen, pDraw,

@@ -1698,8 +1700,8 @@ PUT_IMAGE_BAILOUT:
         portPriv->isOn = XV_PENDING;

   }

 

-  REGION_UNINIT(pScreen, &WinRegion);

-  REGION_UNINIT(pScreen, &ClipRegion);

+  RegionUninit(&WinRegion);

+  RegionUninit(&ClipRegion);

 

   return ret;

 }

@@ -1869,8 +1871,8 @@ KXVPaintRegion (DrawablePtr pDraw, RegionPtr pRgn, Pixel fg)
     GCPtr	pGC;

     ChangeGCVal	val[2];

     xRectangle	*rects, *r;

-    BoxPtr	pBox = REGION_RECTS (pRgn);

-    int		nBox = REGION_NUM_RECTS (pRgn);

+    BoxPtr	pBox = RegionRects (pRgn);

+    int		nBox = RegionNumRects (pRgn);

 

     rects = malloc(nBox * sizeof (xRectangle));

     if (!rects)

@@ -1897,7 +1899,7 @@ KXVPaintRegion (DrawablePtr pDraw, RegionPtr pRgn, Pixel fg)
     ValidateGC (pDraw, pGC);

 

     (*pGC->ops->PolyFillRect) (pDraw, pGC,

-			       REGION_NUM_RECTS (pRgn), rects);

+			       RegionNumRects (pRgn), rects);

 

     FreeScratchGC (pGC);

 bail1: