summaryrefslogtreecommitdiff
path: root/fb
diff options
context:
space:
mode:
authorMaarten Maathuis <madman2003@gmail.com>2009-02-11 14:31:17 +0100
committerMaarten Maathuis <madman2003@gmail.com>2009-02-11 14:35:17 +0100
commit734b23e5982e171031077a2d5d6b5dc2a12e1a70 (patch)
treeecb77bb44ca28b6fc622ed9f7485c0ddaaad9327 /fb
parent619c4d60eb3a8a51a8300ccf8ab5b98a688e6e12 (diff)
fb: add fbDoCopy and fbCopyRegion compatibility wrappers.
Diffstat (limited to 'fb')
-rw-r--r--fb/fb.h40
-rw-r--r--fb/fbcopy.c33
2 files changed, 73 insertions, 0 deletions
diff --git a/fb/fb.h b/fb/fb.h
index cadb9a0c7..8ff186a4d 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1306,6 +1306,19 @@ fbInitVisuals (VisualPtr *visualp,
* fbcopy.c
*/
+/* Compatibility definition, to be removed at next ABI change. */
+typedef void (*fbCopyProc) (DrawablePtr pSrcDrawable,
+ DrawablePtr pDstDrawable,
+ GCPtr pGC,
+ BoxPtr pDstBox,
+ int nbox,
+ int dx,
+ int dy,
+ Bool reverse,
+ Bool upsidedown,
+ Pixel bitplane,
+ void *closure);
+
extern _X_EXPORT void
fbCopyNtoN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
@@ -1319,6 +1332,33 @@ fbCopyNtoN (DrawablePtr pSrcDrawable,
Pixel bitplane,
void *closure);
+/* Compatibility wrapper, to be removed at next ABI change. */
+extern _X_EXPORT void
+fbCopyRegion (DrawablePtr pSrcDrawable,
+ DrawablePtr pDstDrawable,
+ GCPtr pGC,
+ RegionPtr pDstRegion,
+ int dx,
+ int dy,
+ fbCopyProc copyProc,
+ Pixel bitPlane,
+ void *closure);
+
+/* Compatibility wrapper, to be removed at next ABI change. */
+extern _X_EXPORT RegionPtr
+fbDoCopy (DrawablePtr pSrcDrawable,
+ DrawablePtr pDstDrawable,
+ GCPtr pGC,
+ int xIn,
+ int yIn,
+ int widthSrc,
+ int heightSrc,
+ int xOut,
+ int yOut,
+ fbCopyProc copyProc,
+ Pixel bitplane,
+ void *closure);
+
extern _X_EXPORT void
fbCopy1toN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,
diff --git a/fb/fbcopy.c b/fb/fbcopy.c
index fed87a599..07eb663c6 100644
--- a/fb/fbcopy.c
+++ b/fb/fbcopy.c
@@ -28,6 +28,39 @@
#include "fb.h"
+/* Compatibility wrapper, to be removed at next ABI change. */
+void
+fbCopyRegion (DrawablePtr pSrcDrawable,
+ DrawablePtr pDstDrawable,
+ GCPtr pGC,
+ RegionPtr pDstRegion,
+ int dx,
+ int dy,
+ fbCopyProc copyProc,
+ Pixel bitPlane,
+ void *closure)
+{
+ miCopyRegion(pSrcDrawable, pDstDrawable, pGC, pDstRegion, dx, dy, copyProc, bitPlane, closure);
+}
+
+/* Compatibility wrapper, to be removed at next ABI change. */
+RegionPtr
+fbDoCopy (DrawablePtr pSrcDrawable,
+ DrawablePtr pDstDrawable,
+ GCPtr pGC,
+ int xIn,
+ int yIn,
+ int widthSrc,
+ int heightSrc,
+ int xOut,
+ int yOut,
+ fbCopyProc copyProc,
+ Pixel bitPlane,
+ void *closure)
+{
+ return miDoCopy(pSrcDrawable, pDstDrawable, pGC, xIn, yIn, widthSrc, heightSrc, xOut, yOut, copyProc, bitPlane, closure);
+}
+
void
fbCopyNtoN (DrawablePtr pSrcDrawable,
DrawablePtr pDstDrawable,