[fusion-commits] Expo plugin: Changes to 'master' (0bb88847065b2078b6f6940cedf01434b6cfe397)

[maniac at server.beryl-project.org]

New commits:
commit 0bb88847065b2078b6f6940cedf01434b6cfe397
Author: Danny Baumann <dannybaumann at web.de>
Date:   Mon Aug 6 14:03:24 2007 +0200

    Fix in-window calculations.


 expo.c |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)


Modified: fusion/plugins/expo/expo.c
===================================================================
--- fusion/plugins/expo/expo.c
+++ fusion/plugins/expo/expo.c
@@ -951,24 +951,20 @@ expoDonePaintScreen (CompScreen * s)
 		if (w->type & CompWindowTypeNormalMask)
 		{
 		    Bool inWindow;
-
-		    inWindow = (es->newCursorX >= WIN_X (w)) &&
-			       (es->newCursorX <= WIN_X (w) + WIN_W (w)) &&
-			       (es->newCursorY >= WIN_Y (w)) &&
-			       (es->newCursorY <= WIN_Y (w) + WIN_H (w));
-
-		    if (!inWindow)
-		    {
-			int xOffset = s->hsize * s->width;
-			int yOffset = s->vsize * s->height;
-
-			inWindow = (es->newCursorX >= (WIN_X (w) + xOffset));
-			inWindow &= (es->newCursorX <= (WIN_X (w) + WIN_W (w) + 
-							xOffset));
-			inWindow &= (es->newCursorY >= (WIN_Y (w) + yOffset));
-			inWindow &= (es->newCursorY <= (WIN_Y (w) + WIN_H (w) +
-							yOffset));
-		    }
+		    int xOffset = s->hsize * s->width;
+		    int yOffset = s->vsize * s->height;
+
+		    inWindow = ((es->newCursorX >= WIN_X (w)) &&
+				(es->newCursorX <= WIN_X (w) + WIN_W (w))) ||
+			       ((es->newCursorX >= (WIN_X (w) + xOffset)) &&
+				(es->newCursorX <= (WIN_X (w) + WIN_W (w) +
+						    xOffset)));
+
+		    inWindow &= ((es->newCursorY >= WIN_Y (w)) &&
+				 (es->newCursorY <= WIN_Y (w) + WIN_H (w))) ||
+			        ((es->newCursorY >= (WIN_Y (w) + yOffset)) &&
+				 (es->newCursorY <= (WIN_Y (w) + WIN_H (w) +
+			     			     yOffset)));
 
 		    if (!inWindow)
 			continue;