tags 473681 +patch
thanks

On Thu, Apr 03, 2008 at 10:28:57AM -0430, Jose Luis Rivas Contreras wrote:
> Lionel Elie Mamane wrote:

>> I also get the problem, here is my config; only the DVI port is
>> covered.

> If any of you apply the patch in [1] does this fix?
> [1] http://bugs.debian.org/471920

I didn't try it, but I doubt it would help. Here is a patch that fixes
the issue; the "enclosed" check was adding X coordinates to heights
and comparing the result; that's silly and a typo. I changed it to add
Y coordinates to heights.

This was leading to problems when one screen is above another, and the
lower screen is smaller (or equal in size) to the upper screen, at
least horizontally.

-- 
Lionel
diff --recursive -u xscreensaver-5.05/debian/changelog xscreensaver-5.05.lio/debian/changelog
--- xscreensaver-5.05/debian/changelog	2008-04-03 17:28:07.000000000 +0200
+++ xscreensaver-5.05.lio/debian/changelog	2008-04-03 17:26:59.000000000 +0200
@@ -1,3 +1,9 @@
+xscreensaver (5.05-2) unstable; urgency=low
+
+  * Fix "enclosed" xinerama braindamage check (Closes: #473681)
+
+ -- Lionel Elie Mamane <[EMAIL PROTECTED]>  Thu, 03 Apr 2008 17:26:59 +0200
+
 xscreensaver (5.05-1) unstable; urgency=low
 
   * New upstream release. 
Only in xscreensaver-5.05.lio/debian: changelog~
diff --recursive -u xscreensaver-5.05/driver/xscreensaver.c xscreensaver-5.05.lio/driver/xscreensaver.c
--- xscreensaver-5.05/driver/xscreensaver.c	2008-03-01 05:05:12.000000000 +0100
+++ xscreensaver-5.05.lio/driver/xscreensaver.c	2008-04-03 17:24:44.000000000 +0200
@@ -816,7 +816,7 @@
       if (i != j &&
           xsi[i].screen_number >= 0 &&
           xsi[j].screen_number >= 0 &&
-          X1 >= X2 && Y1 >= Y2 && (X1+W1) <= (X2+W2) && (X1+H1) <= (X2+H2))
+          X1 >= X2 && Y1 >= Y2 && (X1+W1) <= (X2+W2) && (Y1+H1) <= (Y2+H2))
         {
           sprintf (err, "%dx%d+%d+%d enclosed by %dx%d+%d+%d",
                    W1, H1, X1, Y1,

Reply via email to