brwin: s/.rect/.winrect/

Disambiguate this member name a bit from the other .rect uses, just
to make things a bit easier to search for.

3 files changed, 24 insertions, 24 deletions

diff --git a/recordmydesktop/src/rmd_get_frame.c b/recordmydesktop/src/rmd_get_frame.c
index cd61dd2..a75fb8e 100644
--- a/recordmydesktop/src/rmd_get_frame.c
+++ b/recordmydesktop/src/rmd_get_frame.c
@@ -269,10 +269,10 @@ static int rmdFirstFrame(ProgData *pdata, XImage **image, XShmSegmentInfo *shmin
 //make a deep copy
 static void rmdBRWinCpy(BRWindow *target, BRWindow *source) {
 
-	target->rect.x=source->rect.x;
-	target->rect.y=source->rect.y;
-	target->rect.width=source->rect.width;
-	target->rect.height=source->rect.height;
+	target->winrect.x=source->winrect.x;
+	target->winrect.y=source->winrect.y;
+	target->winrect.width=source->winrect.width;
+	target->winrect.height=source->winrect.height;
 	target->rrect.x=source->rrect.x;
 	target->rrect.y=source->rrect.y;
 	target->rrect.width=source->rrect.width;
diff --git a/recordmydesktop/src/rmd_setbrwindow.c b/recordmydesktop/src/rmd_setbrwindow.c
index b92eb9b..7b5b862 100644
--- a/recordmydesktop/src/rmd_setbrwindow.c
+++ b/recordmydesktop/src/rmd_setbrwindow.c
@@ -117,9 +117,9 @@ boolean rmdSetBRWindow(	Display *dpy,
 	if (args->windowid==0) {//root window
 		//first set it up
 		brwin->windowid=specs->root;
-		brwin->rect.x=brwin->rect.y=0;
-		brwin->rect.width=specs->width;
-		brwin->rect.height=specs->height;
+		brwin->winrect.x=brwin->winrect.y=0;
+		brwin->winrect.width=specs->width;
+		brwin->winrect.height=specs->height;
 		brwin->rrect.x=args->x;
 		brwin->rrect.y=args->y;
 		brwin->rrect.width=((args->width)? args->width:specs->width-brwin->rrect.x);
@@ -153,24 +153,24 @@ boolean rmdSetBRWindow(	Display *dpy,
 					&transl_y,
 					&wchid);
 
-		brwin->rect.x=attribs.x-transl_x;
-		brwin->rect.y=attribs.y-transl_y;
-		brwin->rect.width=attribs.width;
-		brwin->rect.height=attribs.height;
+		brwin->winrect.x=attribs.x-transl_x;
+		brwin->winrect.y=attribs.y-transl_y;
+		brwin->winrect.width=attribs.width;
+		brwin->winrect.height=attribs.height;
 
-		if ((brwin->rect.x+brwin->rect.width>specs->width)||
-			(brwin->rect.y+brwin->rect.height>specs->height)) {
+		if ((brwin->winrect.x+brwin->winrect.width>specs->width)||
+			(brwin->winrect.y+brwin->winrect.height>specs->height)) {
 			fprintf(stderr,"Window must be on visible screen area!\n");
 			return FALSE;
 		}
 
-		brwin->rrect.x=brwin->rect.x+args->x;
-		brwin->rrect.y=brwin->rect.y+args->y;
-		brwin->rrect.width=((args->width)? args->width:brwin->rect.width-args->x);
-		brwin->rrect.height=((args->height)? args->height:brwin->rect.height-args->y);
+		brwin->rrect.x=brwin->winrect.x+args->x;
+		brwin->rrect.y=brwin->winrect.y+args->y;
+		brwin->rrect.width=((args->width)? args->width:brwin->winrect.width-args->x);
+		brwin->rrect.height=((args->height)? args->height:brwin->winrect.height-args->y);
 
-		if ((args->x+brwin->rrect.width>brwin->rect.width)||
-			(args->y+brwin->rrect.height>brwin->rect.height)) {
+		if ((args->x+brwin->rrect.width>brwin->winrect.width)||
+			(args->y+brwin->rrect.height>brwin->winrect.height)) {
 			fprintf(stderr,"Specified Area is larger than window!\n");
 			return FALSE;
 		}
diff --git a/recordmydesktop/src/rmd_types.h b/recordmydesktop/src/rmd_types.h
index 9e5aa93..7cdb0cb 100644
--- a/recordmydesktop/src/rmd_types.h
+++ b/recordmydesktop/src/rmd_types.h
@@ -102,11 +102,11 @@ typedef struct _RectArea{   //an area that has been damaged gets stored
 	struct _RectArea *prev,*next;
 }RectArea;
 
-typedef struct _BRWindow{   //'basic recorded window' specs
-	XRectangle rect;		 //window attributes
-	XRectangle rrect;		//part of window that is recorded (rounded to alignment)
-	int nbytes;			 //size of zpixmap when screenshoting
-	Window windowid;		//id
+typedef struct _BRWindow{ //'basic recorded window' specs
+	XRectangle winrect;	//window attributes
+	XRectangle rrect;	//part of window that is recorded (rounded to alignment)
+	int nbytes;		//size of zpixmap when screenshoting
+	Window windowid;	//id
 }BRWindow;
 
 //defaults in the following comment lines may be out of sync with reality