Bug fix: full-screen focus grabbing could be active despite Xinerama.
authorDarren Salt <linux@youmustbejoking.demon.co.uk>
Fri, 16 Feb 2007 21:30:50 +0000
changeset 1889227555c4e421
parent 1888 469d762ec109
child 1890 46307e235fcd
Bug fix: full-screen focus grabbing could be active despite Xinerama.
ChangeLog
src/noskin_window.c
     1.1 --- a/ChangeLog	Fri Feb 16 21:28:08 2007 +0000
     1.2 +++ b/ChangeLog	Fri Feb 16 21:30:50 2007 +0000
     1.3 @@ -46,6 +46,8 @@
     1.4  	* Fixed toolbar positioning with multiple monitors arranged to make a
     1.5  	  non-rectangular display. (This may require the enabling of an option
     1.6  	  such as radeon(4)'s "MergedNonRectangular" option.)
     1.7 +	* Fixed a logic error which could cause full-screen focus grabbing to
     1.8 +	  be active even when Xinerama is active.
     1.9  
    1.10  0.5.11:	2007/02/01
    1.11  	[dsalt]
     2.1 --- a/src/noskin_window.c	Fri Feb 16 21:28:08 2007 +0000
     2.2 +++ b/src/noskin_window.c	Fri Feb 16 21:30:50 2007 +0000
     2.3 @@ -632,7 +632,7 @@
     2.4        XGetInputFocus (xd, &fw, &fr);
     2.5        GdkWindow *gw = gdk_window_lookup (fw);
     2.6  #ifdef HAVE_XINERAMA
     2.7 -      if (gw == fs_toolbar->window || (!gw && !XineramaIsActive (xd)))
     2.8 +      if (gw ? gw == fs_toolbar->window : !XineramaIsActive (xd))
     2.9  #else
    2.10        if (!gw || gw == fs_toolbar->window)
    2.11  #endif