[Commit] Xr/src Xr.h,1.25,1.26 xr.c,1.23,1.24 xrgstate.c,1.33,1.34 xrint.h,1.39,1.40
Carl Worth
commit@keithp.com
Wed, 14 May 2003 21:59:45 -0700
Committed by: cworth
Update of /local/src/CVS/Xr/src
In directory home.keithp.com:/tmp/cvs-serv10751/src
Modified Files:
Xr.h xr.c xrgstate.c xrint.h
Log Message:
Added XrSetTargetImage.
Removed _XrGStateSetTargetDrawable, (now implemented as a convenience function in xr.c)
Index: Xr.h
===================================================================
RCS file: /local/src/CVS/Xr/src/Xr.h,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- Xr.h 15 May 2003 01:30:57 -0000 1.25
+++ Xr.h 15 May 2003 04:59:42 -0000 1.26
@@ -71,6 +71,14 @@
Display *dpy,
Drawable drawable);
+void
+XrSetTargetImage (XrState *xrs,
+ char *data,
+ XrFormat format,
+ int width,
+ int height,
+ int stride);
+
typedef enum _XrOperator {
XrOperatorClear = PictOpClear,
XrOperatorSrc = PictOpSrc,
Index: xr.c
===================================================================
RCS file: /local/src/CVS/Xr/src/xr.c,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- xr.c 15 May 2003 01:30:57 -0000 1.23
+++ xr.c 15 May 2003 04:59:42 -0000 1.24
@@ -110,13 +110,49 @@
Display *dpy,
Drawable drawable)
{
+ XrSurface *surface;
+
if (xrs->status)
return;
- xrs->status = _XrGStateSetTargetDrawable (_XR_CURRENT_GSTATE (xrs),
- dpy, drawable,
- DefaultVisual (dpy, DefaultScreen (dpy)),
- 0);
+ surface = XrSurfaceCreateForDrawable (dpy, drawable,
+ DefaultVisual (dpy, DefaultScreen (dpy)),
+ 0,
+ DefaultColormap (dpy, DefaultScreen (dpy)));
+ if (surface == NULL) {
+ xrs->status = XrStatusNoMemory;
+ return;
+ }
+
+ XrSetTargetSurface (xrs, surface);
+
+ XrSurfaceDestroy (surface);
+}
+
+void
+XrSetTargetImage (XrState *xrs,
+ char *data,
+ XrFormat format,
+ int width,
+ int height,
+ int stride)
+{
+ XrSurface *surface;
+
+ if (xrs->status)
+ return;
+
+ surface = XrSurfaceCreateForImage (data,
+ format,
+ width, height, stride);
+ if (surface == NULL) {
+ xrs->status = XrStatusNoMemory;
+ return;
+ }
+
+ XrSetTargetSurface (xrs, surface);
+
+ XrSurfaceDestroy (surface);
}
void
Index: xrgstate.c
===================================================================
RCS file: /local/src/CVS/Xr/src/xrgstate.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- xrgstate.c 15 May 2003 01:30:57 -0000 1.33
+++ xrgstate.c 15 May 2003 04:59:42 -0000 1.34
@@ -302,30 +302,6 @@
}
XrStatus
-_XrGStateSetTargetDrawable (XrGState *gstate,
- Display *dpy,
- Drawable drawable,
- Visual *visual,
- XrFormat format)
-{
- XrStatus status;
- XrSurface *surface;
-
- surface = XrSurfaceCreateForDrawable (dpy, drawable,
- visual,
- format,
- DefaultColormap (dpy, DefaultScreen (dpy)));
- if (surface == NULL)
- return XrStatusNoMemory;
-
- status = _XrGStateSetTargetSurface (gstate, surface);
-
- XrSurfaceDestroy (surface);
-
- return status;
-}
-
-XrStatus
_XrGStateSetPattern (XrGState *gstate, XrSurface *pattern)
{
XrSurfaceDestroy (gstate->pattern);
Index: xrint.h
===================================================================
RCS file: /local/src/CVS/Xr/src/xrint.h,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -d -r1.39 -r1.40
--- xrint.h 15 May 2003 01:30:57 -0000 1.39
+++ xrint.h 15 May 2003 04:59:42 -0000 1.40
@@ -337,13 +337,6 @@
_XrGStateSetPattern (XrGState *gstate, XrSurface *pattern);
XrStatus
-_XrGStateSetTargetDrawable (XrGState *gstate,
- Display *dpy,
- Drawable drawable,
- Visual *visual,
- XrFormat format);
-
-XrStatus
_XrGStateSetOperator(XrGState *gstate, XrOperator operator);
XrOperator