diff options
| author | Eric Anholt <eric@anholt.net> | 2009-02-24 18:22:20 -0800 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2009-02-26 14:20:42 -0800 |
| commit | 22dc9a5580d77cc4707bfb8e19474e611a06ae9a (patch) | |
| tree | 91a60fbcc1fba6b315549c7b112728320c5f30ec /uxa/uxa-priv.h | |
| parent | cb1f7ec0876746c1b52b63cdb508544e9e4e32e3 (diff) | |
Fix UXA for server 1.4.
Diffstat (limited to 'uxa/uxa-priv.h')
| -rw-r--r-- | uxa/uxa-priv.h | 22 |
1 files changed, 21 insertions, 1 deletions
diff --git a/uxa/uxa-priv.h b/uxa/uxa-priv.h index bdc6e82e..d1cd341e 100644 --- a/uxa/uxa-priv.h +++ b/uxa/uxa-priv.h @@ -26,6 +26,9 @@ #ifndef UXAPRIV_H #define UXAPRIV_H +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif #ifdef HAVE_DIX_CONFIG_H #include <dix-config.h> #else @@ -126,6 +129,10 @@ typedef struct { CloseScreenProcPtr SavedCloseScreen; GetImageProcPtr SavedGetImage; GetSpansProcPtr SavedGetSpans; +#ifndef SERVER_1_5 + PaintWindowBackgroundProcPtr SavedPaintWindowBackground; + PaintWindowBorderProcPtr SavedPaintWindowBorder; +#endif CreatePixmapProcPtr SavedCreatePixmap; DestroyPixmapProcPtr SavedDestroyPixmap; CopyWindowProcPtr SavedCopyWindow; @@ -161,7 +168,16 @@ typedef struct { #endif extern int uxa_screen_index; -#define uxa_get_screen(s) ((uxa_screen_t *)dixLookupPrivate(&(s)->devPrivates, &uxa_screen_index)) +static inline uxa_screen_t * +uxa_get_screen(ScreenPtr screen) +{ +#ifdef SERVER_1_5 + return (uxa_screen_t *)dixLookupPrivate(&screen->devPrivates, + &uxa_screen_index); +#else + return screen->devPrivates[uxa_screen_index].ptr; +#endif +} /** Align an offset to an arbitrary alignment */ #define UXA_ALIGN(offset, align) (((offset) + (align) - 1) - \ @@ -262,6 +278,8 @@ uxa_check_get_spans (DrawablePtr pDrawable, int nspans, char *pdstStart); +void uxa_check_paint_window (WindowPtr pWin, RegionPtr pRegion, int what); + void uxa_check_add_traps (PicturePtr pPicture, INT16 x_off, @@ -292,6 +310,8 @@ uxa_shm_put_image(DrawablePtr pDrawable, GCPtr pGC, int depth, unsigned int form int w, int h, int sx, int sy, int sw, int sh, int dx, int dy, char *data); +void uxa_paint_window(WindowPtr pWin, RegionPtr pRegion, int what); + void uxa_get_image (DrawablePtr pDrawable, int x, int y, int w, int h, unsigned int format, unsigned long planeMask, char *d); |