diff options
| author | Keith Packard <keithp@keithp.com> | 2003-11-02 19:56:10 +0000 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2003-11-02 19:56:10 +0000 |
| commit | 5378236aa647ec9a723a3e5fbd2a57eb286a1938 (patch) | |
| tree | b178d5f95a4882d617dbbdab8cb5e0b40003a704 /hw/kdrive/src/kdrive.h | |
| parent | 9e94665cf9cf0f74dff5b3cdaa4cde99e234fa45 (diff) | |
merge xfixes_2_branch back to HEAD
Diffstat (limited to 'hw/kdrive/src/kdrive.h')
| -rw-r--r-- | hw/kdrive/src/kdrive.h | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/hw/kdrive/src/kdrive.h b/hw/kdrive/src/kdrive.h index 6cc976913..8969e6f83 100644 --- a/hw/kdrive/src/kdrive.h +++ b/hw/kdrive/src/kdrive.h @@ -93,6 +93,7 @@ typedef struct _KdFrameBuffer { int bitsPerPixel; int pixelStride; int byteStride; + Bool shadow; unsigned long visuals; Pixel redMask, greenMask, blueMask; void *closure; @@ -119,8 +120,8 @@ typedef struct _KdScreenInfo { DDXPointRec origin; KdFrameBuffer fb[KD_MAX_FB]; CARD8 *memory_base; - int off_screen_base; - int off_screen_size; + unsigned long memory_size; + unsigned long off_screen_base; struct _RealOffscreenArea *off_screen_areas; } KdScreenInfo; @@ -128,6 +129,8 @@ 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 */ @@ -151,7 +154,6 @@ typedef struct _KdCardFuncs { void (*getColors) (ScreenPtr, int, int, xColorItem *); void (*putColors) (ScreenPtr, int, int, xColorItem *); - Bool (*finishInitScreen) (ScreenPtr pScreen); } KdCardFuncs; #define KD_MAX_PSEUDO_DEPTH 8 @@ -170,6 +172,7 @@ typedef struct { ColormapPtr pInstalledmap[KD_MAX_FB]; /* current colormap */ xColorItem systemPalette[KD_MAX_PSEUDO_SIZE];/* saved windows colors */ + CreateScreenResourcesProcPtr CreateScreenResources; CloseScreenProcPtr CloseScreen; #ifdef FB_OLD_SCREEN miBSFuncRec BackingStoreFuncs; @@ -216,6 +219,7 @@ extern KdMouseInfo *kdMouseInfo; extern int KdCurScreen; KdMouseInfo *KdMouseInfoAdd (void); +void KdMouseInfoDispose (KdMouseInfo *mi); void KdParseMouse (char *); typedef struct _KdMouseFuncs { @@ -352,6 +356,9 @@ kaaDrawInit (ScreenPtr pScreen, KaaScreenInfoPtr pScreenInfo); void +kaaDrawFini (ScreenPtr pScreen); + +void kaaWrapGC (GCPtr pGC); void @@ -565,6 +572,9 @@ Bool KdAllocatePrivates (ScreenPtr pScreen); Bool +KdCreateScreenResources (ScreenPtr pScreen); + +Bool KdCloseScreen (int index, ScreenPtr pScreen); Bool @@ -689,7 +699,7 @@ void KdEnableInput (void); void -ProcessInputEvents (); +ProcessInputEvents (void); extern KdMouseFuncs LinuxMouseFuncs; extern KdMouseFuncs Ps2MouseFuncs; @@ -771,13 +781,16 @@ KdCheckComposite (CARD8 op, /* kshadow.c */ Bool -KdShadowScreenInit (KdScreenInfo *screen); +KdShadowFbAlloc (KdScreenInfo *screen, int fb, Bool rotate); -Bool -KdShadowInitScreen (ScreenPtr pScreen, ShadowUpdateProc update, ShadowWindowProc window); +void +KdShadowFbFree (KdScreenInfo *screen, int fb); +Bool +KdShadowSet (ScreenPtr pScreen, int randr, ShadowUpdateProc update, ShadowWindowProc window); + void -KdShadowScreenFini (KdScreenInfo *screen); +KdShadowUnset (ScreenPtr pScreen); /* ktest.c */ Bool |