diff options
| author | marha <marha@users.sourceforge.net> | 2010-10-14 13:54:23 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-10-14 13:54:23 +0000 |
| commit | 579eaaac4679bf78b1d987a56f4a24e7cf616368 (patch) | |
| tree | 53977d03cd6af212b3605ae3906d5e499e6d960e /xorg-server/include/pixmap.h | |
| parent | bc5113fca69c8b05861a011426a4611985495cfe (diff) | |
| parent | d621ea397a3d181e7a0bf07d72bd21e116fccdb8 (diff) | |
| download | vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.tar.gz vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.tar.bz2 vcxsrv-579eaaac4679bf78b1d987a56f4a24e7cf616368.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/include/pixmap.h')
| -rw-r--r-- | xorg-server/include/pixmap.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xorg-server/include/pixmap.h b/xorg-server/include/pixmap.h index 9761ce48c..dc76a5b54 100644 --- a/xorg-server/include/pixmap.h +++ b/xorg-server/include/pixmap.h @@ -55,16 +55,14 @@ SOFTWARE. #define DRAWABLE_WINDOW 0
#define DRAWABLE_PIXMAP 1
#define UNDRAWABLE_WINDOW 2
-#define DRAWABLE_BUFFER 3
/* corresponding type masks for dixLookupDrawable() */
#define M_DRAWABLE_WINDOW (1<<0)
#define M_DRAWABLE_PIXMAP (1<<1)
#define M_UNDRAWABLE_WINDOW (1<<2)
-#define M_DRAWABLE_BUFFER (1<<3)
#define M_ANY (-1)
#define M_WINDOW (M_DRAWABLE_WINDOW|M_UNDRAWABLE_WINDOW)
-#define M_DRAWABLE (M_DRAWABLE_WINDOW|M_DRAWABLE_PIXMAP|M_DRAWABLE_BUFFER)
+#define M_DRAWABLE (M_DRAWABLE_WINDOW|M_DRAWABLE_PIXMAP)
#define M_UNDRAWABLE (M_UNDRAWABLE_WINDOW)
/* flags to PaintWindow() */
@@ -88,7 +86,7 @@ typedef union _PixUnion { ((as) == (bs) && (SamePixUnion (a, b, as)))
#define OnScreenDrawable(type) \
- ((type == DRAWABLE_WINDOW) || (type == DRAWABLE_BUFFER))
+ (type == DRAWABLE_WINDOW)
#define WindowDrawable(type) \
((type == DRAWABLE_WINDOW) || (type == UNDRAWABLE_WINDOW))
|