removes region.h

3 files changed, 4 insertions, 51 deletions

diff --git a/Makefile b/Makefile
index 68b4075..9250308 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ install_OSX: OSXvnc-server
 .c.o:
 	$(CC) $(CFLAGS) -c $<
 
-$(OBJS): Makefile rfb.h
+$(OBJS) pnmshow24.o pnmshow.o example.o mac.o blooptest.o: Makefile rfb.h
 
 libvncserver.a: $(OBJS)
 	$(AR) cru $@ $(OBJS)
@@ -73,11 +73,10 @@ blooptest.o: example.c rfb.h
 pnmshow24: pnmshow24.o libvncserver.a
 	$(CC) -o pnmshow24 pnmshow24.o $(LIBS)
 
-pnmshow24.o: Makefile
-
 clean:
 	rm -f $(OBJS) *~ core "#"* *.bak *.orig storepasswd.o \
-	     	mac.o example.o pnmshow.o sratest.o $(OBJS)
+	     	mac.o example.o pnmshow.o pnmshow24.o sratest.o \
+		blooptest.o $(OBJS)
 
 realclean: clean
 	rm -f OSXvnc-server storepasswd example pnmshow libvncserver.a
diff --git a/region.h b/region.h
deleted file mode 100644
index 1e43aa2..0000000
--- a/region.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef REGION_H
-#define REGION_H
-
-#include "sraRegion.h"
-
-#if 0
-#define NullRegion ((RegionPtr)0)
-#define NullBox ((BoxPtr)0)
-
-typedef struct RegDataRec {
-    long	size;
-    long 	numRects;
-/*  BoxRec	rects[size];   in memory but not explicitly declared */
-} RegDataRec;
-
-extern void miRegionInit(RegionPtr,BoxPtr,int);
-extern void miRegionUninit(RegionPtr);
-extern Bool miRegionEmpty(RegionPtr);
-extern Bool miRegionNotEmpty(RegionPtr);
-extern Bool miIntersect(RegionPtr,RegionPtr,RegionPtr);
-extern Bool miSubtract(RegionPtr,RegionPtr,RegionPtr);
-extern Bool miUnion(RegionPtr,RegionPtr,RegionPtr);
-extern void miTranslateRegion(RegionPtr,int,int);
-
-#define REGION_NIL(reg) ((reg)->data && !(reg)->data->numRects)
-#define REGION_NUM_RECTS(reg) ((reg)->data ? (reg)->data->numRects : 1)
-#define REGION_SIZE(reg) ((reg)->data ? (reg)->data->size : 0)
-#define REGION_RECTS(reg) ((reg)->data ? (BoxPtr)((reg)->data + 1) \
-			               : &(reg)->extents)
-#define REGION_BOXPTR(reg) ((BoxPtr)((reg)->data + 1))
-#define REGION_BOX(reg,i) (&REGION_BOXPTR(reg)[i])
-#define REGION_TOP(reg) REGION_BOX(reg, (reg)->data->numRects)
-#define REGION_END(reg) REGION_BOX(reg, (reg)->data->numRects - 1)
-#define REGION_SZOF(n) (sizeof(RegDataRec) + ((n) * sizeof(BoxRec)))
-
-#define REGION_INIT(s,pReg,rect,size) miRegionInit(pReg,rect,size)
-#define REGION_EMPTY(s,pReg) miRegionEmpty(pReg)
-#define REGION_UNINIT(s,pReg) miRegionUninit(pReg)
-#define REGION_NOTEMPTY(s,pReg) miRegionNotEmpty(pReg)
-#define REGION_INTERSECT(s,newReg,reg1,reg2) miIntersect(newReg,reg1,reg2)
-#define REGION_SUBTRACT(s,newReg,reg1,reg2) miSubtract(newReg,reg1,reg2)
-#define REGION_UNION(s,newReg,reg1,reg2) miUnion(newReg,reg1,reg2)
-#define REGION_TRANSLATE(s,pReg,x,y) miTranslateRegion(pReg,x,y)
-#endif
-
-#endif
diff --git a/rfbserver.c b/rfbserver.c
index e8d3f76..283d8ce 100644
--- a/rfbserver.c
+++ b/rfbserver.c
@@ -1100,7 +1100,7 @@ rfbSendCopyRegion(cl, reg, dx, dy)
     sraRectangleIterator* i;
     sraRect rect1;
 
-    /* printf("copyrect: "); sraRgnPrint(reg); putchar('\n'); fflush(stdout); */
+    printf("copyrect: "); sraRgnPrint(reg); putchar('\n'); fflush(stdout);
     i = sraRgnGetReverseIterator(reg,dx>0,dy>0);
 
     while(sraRgnIteratorNext(i,&rect1)) {