From 3afbeb53e22657363be5398897747b136892a2e7 Mon Sep 17 00:00:00 2001
From: rlar <rlar>
Date: Thu, 4 Nov 2010 19:42:09 +0000
Subject: [PATCH] minor rewrite, fix a minor bug in the x11 zoom-in function

---
 ChangeLog                   |  6 +++++
 src/frontend/plotting/x11.c | 46 ++++++++++++++++++-------------------
 2 files changed, 29 insertions(+), 23 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7981dcab0..38eda1c8f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-11-04  Robert Larice
+ * src/frontend/plotting/x11.c :
+    minor rewrite, fix a minor bug in the x11 zoom-in function
+      the rectangle was not always drawn correct,
+      when draging the mouse in all directions.
+
 2010-11-04  Robert Larice
  * src/frontend/help/x11disp.c ,
  * src/frontend/plotting/x11.c :
diff --git a/src/frontend/plotting/x11.c b/src/frontend/plotting/x11.c
index 181b493cc..b2c95fea5 100644
--- a/src/frontend/plotting/x11.c
+++ b/src/frontend/plotting/x11.c
@@ -736,51 +736,51 @@ zoomin(GRAPH *graph)
     Window rootwindow, childwindow;
     int rootx, rooty;
     unsigned int state;
-    int x, y, upperx, uppery, lowerx, lowery;
+    int x, y, upperx, uppery;
+    unsigned width, height;
 
     /* open box and get area to zoom in on */
 
     XQueryPointer(display, DEVDEP(graph).window, &rootwindow,
 	    &childwindow, &rootx, &rooty, &x0, &y0, &state);
 
-    x = lowerx = x1 = x0 + BOXSIZE;
-    y = lowery = y1 = y0 + BOXSIZE;
+    x = x1 = x0 + BOXSIZE;
+    y = y1 = y0 + BOXSIZE;
+
     upperx = x0;
     uppery = y0;
 
-    XDrawRectangle(display, DEVDEP(graph).window, xorgc,
-	    upperx, uppery, lowerx - upperx, lowery - uppery);
+    width  = BOXSIZE;
+    height = BOXSIZE;
+
+    XDrawRectangle(display, DEVDEP(graph).window, xorgc,
+	    upperx, uppery, width, height);
 
-/* note: what are src_x, src_y, src_width, and src_height for? XXX */
     XWarpPointer(display, None, DEVDEP(graph).window, 0, 0, 0, 0, x1, y1);
 
     while (state & Button3Mask) {
       if (x != x1 || y != y1) {
-	XDrawRectangle(display, DEVDEP(graph).window, xorgc,
-	    upperx, uppery, lowerx - upperx, lowery - uppery);
+
 	x1 = x;
 	y1 = y;
-	/* figure out upper left corner */
-	/* remember X11's (and X10's) demented coordinate system */
-	if (y0 < y1) {
-	  uppery = y0;
-	  upperx = x0;
-	  lowery = y1;
-	  lowerx = x1;
-	} else {
-	  uppery = y1;
-	  upperx = x1;
-	  lowery = y0;
-	  lowerx = x0;
-	}
+
 	XDrawRectangle(display, DEVDEP(graph).window, xorgc,
-	    upperx, uppery, lowerx - upperx, lowery - uppery);
+	    upperx, uppery, width, height);
+
+        upperx = MIN(x1, x0);
+        uppery = MIN(y1, y0);
+
+        width  = (unsigned) ABS(x1 - x0);
+        height = (unsigned) ABS(y1 - y0);
+
+	XDrawRectangle(display, DEVDEP(graph).window, xorgc,
+	    upperx, uppery, width, height);
       }
       XQueryPointer(display, DEVDEP(graph).window, &rootwindow,
 	       &childwindow, &rootx, &rooty, &x, &y, &state);
     }
     XDrawRectangle(display, DEVDEP(graph).window, xorgc,
-	    upperx, uppery, lowerx - upperx, lowery - uppery);
+	    upperx, uppery, width, height);
 
     X_ScreentoData(graph, x0, y0, &fx0, &fy0);
     X_ScreentoData(graph, x1, y1, &fx1, &fy1);