summaryrefslogtreecommitdiffstats
path: root/xorg/server/module/rdpPixmap.c
diff options
context:
space:
mode:
Diffstat (limited to 'xorg/server/module/rdpPixmap.c')
-rw-r--r--xorg/server/module/rdpPixmap.c30
1 files changed, 29 insertions, 1 deletions
diff --git a/xorg/server/module/rdpPixmap.c b/xorg/server/module/rdpPixmap.c
index 08b76735..967438e0 100644
--- a/xorg/server/module/rdpPixmap.c
+++ b/xorg/server/module/rdpPixmap.c
@@ -1,5 +1,5 @@
/*
-Copyright 2005-2013 Jay Sorg
+Copyright 2005-2014 Jay Sorg
Permission to use, copy, modify, distribute, and sell this software and its
documentation for any purpose is hereby granted without fee, provided that
@@ -27,6 +27,7 @@ pixmap calls
/* this should be before all X11 .h files */
#include <xorg-server.h>
+#include <xorgVersion.h>
/* all driver need this */
#include <xf86.h>
@@ -34,12 +35,19 @@ pixmap calls
#include "rdp.h"
#include "rdpDraw.h"
+#include "rdpPixmap.h"
+
+#ifndef XRDP_PIX
+#warning XRDP_PIX not defined
+#endif
/******************************************************************************/
#define LOG_LEVEL 1
#define LLOGLN(_level, _args) \
do { if (_level < LOG_LEVEL) { ErrorF _args ; ErrorF("\n"); } } while (0)
+#if XRDP_PIX == 2
+
/*****************************************************************************/
PixmapPtr
rdpCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
@@ -57,6 +65,26 @@ rdpCreatePixmap(ScreenPtr pScreen, int width, int height, int depth,
return rv;
}
+#else
+
+/*****************************************************************************/
+PixmapPtr
+rdpCreatePixmap(ScreenPtr pScreen, int width, int height, int depth)
+{
+ rdpPtr dev;
+ PixmapPtr rv;
+
+ LLOGLN(10, ("rdpCreatePixmap: width %d height %d depth %d",
+ width, height, depth));
+ dev = rdpGetDevFromScreen(pScreen);
+ pScreen->CreatePixmap = dev->CreatePixmap;
+ rv = pScreen->CreatePixmap(pScreen, width, height, depth);
+ pScreen->CreatePixmap = rdpCreatePixmap;
+ return rv;
+}
+
+#endif
+
/******************************************************************************/
Bool
rdpDestroyPixmap(PixmapPtr pPixmap)