[xlibs-commit] Xfixes ChangeLog,1.2,1.3 Region.c,1.2,1.3 Xfixes.h,1.3,1.4

[Keith Packard]

Committed by: keithp

Update of /cvs/xlibs/Xfixes
In directory pdx:/tmp/cvs-serv27654

Modified Files:
	ChangeLog Region.c Xfixes.h 
Log Message:
	* Region.c: (XFixesCopyRegion), (XFixesUnionRegion),
	(XFixesIntersectRegion), (XFixesSubtractRegion),
	(XFixesInvertRegion), (XFixesTranslateRegion):
	* Xfixes.h:
	Eliminate offset arguments in combining operators,
	create separate XFixesCopyRegion and XFixesTranslateRegion functions.


Index: ChangeLog
===================================================================
RCS file: /cvs/xlibs/Xfixes/ChangeLog,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- ChangeLog	3 Nov 2003 02:24:32 -0000	1.2
+++ ChangeLog	22 Nov 2003 00:45:37 -0000	1.3
@@ -1,3 +1,12 @@
+2003-11-21  Keith Packard  <keithp@keithp.com>
+
+	* Region.c: (XFixesCopyRegion), (XFixesUnionRegion),
+	(XFixesIntersectRegion), (XFixesSubtractRegion),
+	(XFixesInvertRegion), (XFixesTranslateRegion):
+	* Xfixes.h:
+	Eliminate offset arguments in combining operators,
+	create separate XFixesCopyRegion and XFixesTranslateRegion functions.
+
 2003-11-02  Keith Packard  <keithp@keithp.com>
 
 	* Cursor.c: (XFixesSelectCursorInput), (XFixesGetCursorImage),

Index: Region.c
===================================================================
RCS file: /cvs/xlibs/Xfixes/Region.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Region.c	3 Nov 2003 02:24:32 -0000	1.2
+++ Region.c	22 Nov 2003 00:45:37 -0000	1.3
@@ -163,9 +163,25 @@
 }
 
 void
+XFixesCopyRegion (Display *dpy, XserverRegion dst, XserverRegion src)
+{
+    XFixesExtDisplayInfo	*info = XFixesFindDisplay (dpy);
+    xXFixesCopyRegionReq	*req;
+
+    XFixesSimpleCheckExtension (dpy, info);
+    LockDisplay (dpy);
+    GetReq (XFixesCopyRegion, req);
+    req->reqType = info->codes->major_opcode;
+    req->xfixesReqType = X_XFixesCopyRegion;
+    req->source = src;
+    req->destination = dst;
+    UnlockDisplay (dpy);
+    SyncHandle();
+}
+
+void
 XFixesUnionRegion (Display *dpy, XserverRegion dst,
-		   XserverRegion src1, int xOff1, int yOff1,
-		   XserverRegion src2, int xOff2, int yOff2)
+		   XserverRegion src1, XserverRegion src2)
 {
     XFixesExtDisplayInfo	*info = XFixesFindDisplay (dpy);
     xXFixesUnionRegionReq	*req;
@@ -176,11 +192,7 @@
     req->reqType = info->codes->major_opcode;
     req->xfixesReqType = X_XFixesUnionRegion;
     req->source1 = src1;
-    req->xOff1 = xOff1;
-    req->yOff1 = yOff1;
     req->source2 = src2;
-    req->xOff2 = xOff2;
-    req->yOff2 = yOff2;
     req->destination = dst;
     UnlockDisplay (dpy);
     SyncHandle();
@@ -188,8 +200,7 @@
 
 void
 XFixesIntersectRegion (Display *dpy, XserverRegion dst,
-		       XserverRegion src1, int xOff1, int yOff1,
-		       XserverRegion src2, int xOff2, int yOff2)
+		       XserverRegion src1, XserverRegion src2)
 {
     XFixesExtDisplayInfo	*info = XFixesFindDisplay (dpy);
     xXFixesIntersectRegionReq	*req;
@@ -200,11 +211,7 @@
     req->reqType = info->codes->major_opcode;
     req->xfixesReqType = X_XFixesIntersectRegion;
     req->source1 = src1;
-    req->xOff1 = xOff1;
-    req->yOff1 = yOff1;
     req->source2 = src2;
-    req->xOff2 = xOff2;
-    req->yOff2 = yOff2;
     req->destination = dst;
     UnlockDisplay (dpy);
     SyncHandle();
@@ -212,8 +219,7 @@
 
 void
 XFixesSubtractRegion (Display *dpy, XserverRegion dst,
-		      XserverRegion src1, int xOff1, int yOff1,
-		      XserverRegion src2, int xOff2, int yOff2)
+		      XserverRegion src1, XserverRegion src2)
 {
     XFixesExtDisplayInfo	*info = XFixesFindDisplay (dpy);
     xXFixesSubtractRegionReq	*req;
@@ -224,11 +230,7 @@
     req->reqType = info->codes->major_opcode;
     req->xfixesReqType = X_XFixesSubtractRegion;
     req->source1 = src1;
-    req->xOff1 = xOff1;
-    req->yOff1 = yOff1;
     req->source2 = src2;
-    req->xOff2 = xOff2;
-    req->yOff2 = yOff2;
     req->destination = dst;
     UnlockDisplay (dpy);
     SyncHandle();
@@ -236,8 +238,7 @@
 
 void
 XFixesInvertRegion (Display *dpy, XserverRegion dst,
-		    XRectangle *rect, XserverRegion src,
-		    int xOff, int yOff)
+		    XRectangle *rect, XserverRegion src)
 {
     XFixesExtDisplayInfo	*info = XFixesFindDisplay (dpy);
     xXFixesInvertRegionReq	*req;
@@ -248,14 +249,30 @@
     req->reqType = info->codes->major_opcode;
     req->xfixesReqType = X_XFixesInvertRegion;
     req->source = src;
-    req->xOff = xOff;
-    req->yOff = yOff;
     req->destination = dst;
     UnlockDisplay (dpy);
     SyncHandle();
 }
 
 void
+XFixesTranslateRegion (Display *dpy, XserverRegion region, int dx, int dy)
+{
+    XFixesExtDisplayInfo	*info = XFixesFindDisplay (dpy);
+    xXFixesTranslateRegionReq	*req;
+
+    XFixesSimpleCheckExtension (dpy, info);
+    LockDisplay (dpy);
+    GetReq (XFixesTranslateRegion, req);
+    req->reqType = info->codes->major_opcode;
+    req->xfixesReqType = X_XFixesTranslateRegion;
+    req->region = region;
+    req->dx = dx;
+    req->dy = dy;
+    UnlockDisplay (dpy);
+    SyncHandle();
+}
+
+void
 XFixesRegionExtents (Display *dpy, XserverRegion dst, XserverRegion src)
 {
     XFixesExtDisplayInfo	*info = XFixesFindDisplay (dpy);

Index: Xfixes.h
===================================================================
RCS file: /cvs/xlibs/Xfixes/Xfixes.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- Xfixes.h	3 Nov 2003 02:24:32 -0000	1.3
+++ Xfixes.h	22 Nov 2003 00:45:37 -0000	1.4
@@ -137,24 +137,26 @@
 		 XRectangle *rectangles, int nrectangles);
 
 void
+XFixesCopyRegion (Display *dpy, XserverRegion dst, XserverRegion src);
+
+void
 XFixesUnionRegion (Display *dpy, XserverRegion dst,
-		   XserverRegion src1, int xOff1, int yOff1,
-		   XserverRegion src2, int xOff2, int yOff2);
+		   XserverRegion src1, XserverRegion src2);
 
 void
 XFixesIntersectRegion (Display *dpy, XserverRegion dst,
-		       XserverRegion src1, int xOff1, int yOff1,
-		       XserverRegion src2, int xOff2, int yOff2);
+		       XserverRegion src1, XserverRegion src2);
 
 void
 XFixesSubtractRegion (Display *dpy, XserverRegion dst,
-		      XserverRegion src1, int xOff1, int yOff1,
-		      XserverRegion src2, int xOff2, int yOff2);
+		      XserverRegion src1, XserverRegion src2);
 
 void
 XFixesInvertRegion (Display *dpy, XserverRegion dst,
-		    XRectangle *rect, XserverRegion src,
-		    int xOff, int yOff);
+		    XRectangle *rect, XserverRegion src);
+
+void
+XFixesTranslateRegion (Display *dpy, XserverRegion region, int dx, int dy);
 
 void
 XFixesRegionExtents (Display *dpy, XserverRegion dst, XserverRegion src);