Adding patch to fix WindowMaker focus wrt GNUstep menus

3 files changed, 57 insertions, 23 deletions

diff --git a/x11-wm/windowmaker/Manifest b/x11-wm/windowmaker/Manifest
index fa39fd532bd8..d9147cbfbcb5 100644
--- a/x11-wm/windowmaker/Manifest
+++ b/x11-wm/windowmaker/Manifest
@@ -1,33 +1,24 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 3a271749ecfd32a3c27df49c9101605e ChangeLog 8907
-MD5 091028d21186597cb01d1440ed387951 metadata.xml 221
-MD5 ecb31937eebc5b0afa6785ec0afefe4d windowmaker-0.80.2-r1.ebuild 3408
+MD5 65c28a34b206cb416fac6336e6cde885 windowmaker-0.91.0-r1.ebuild 6193
 MD5 58b92f8943bac08e53aeeb01f640537a windowmaker-0.80.2-r2.ebuild 3437
-MD5 20ba3ee0e4036e307342671f74921913 windowmaker-0.80.2-r3.ebuild 3749
 MD5 3c3d6a630b21bdf50c422943b2cc79fe windowmaker-0.80.2-r4.ebuild 4034
 MD5 e843e235a5057f861aa1ed9dc43fa863 windowmaker-0.90.0.ebuild 4490
+MD5 ecb31937eebc5b0afa6785ec0afefe4d windowmaker-0.80.2-r1.ebuild 3408
 MD5 43e9d0c5bf62aaf821ba9624fd2e9e57 windowmaker-0.91.0.ebuild 4475
-MD5 4d9f160027232bb1498661fe66dce1a6 windowmaker-0.91.0-r1.ebuild 6088
-MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
+MD5 20ba3ee0e4036e307342671f74921913 windowmaker-0.80.2-r3.ebuild 3749
+MD5 3a271749ecfd32a3c27df49c9101605e ChangeLog 8907
+MD5 091028d21186597cb01d1440ed387951 metadata.xml 221
+MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/trance.patch.WM-0.80.2.diff 9738
+MD5 c8eb68627dc7b53b10143626018ff597 files/gtk2flickerfix.patch 1969
+MD5 915c0fe65c24d54a1507f662d7b24114 files/xinerama.patch 26662
+MD5 c41215f830e33a636a440ce389db01eb files/menufocus.patch 1554
+MD5 a062e261bd5aaca39bc17be01f07f1b6 files/wlist.patch 2776
+MD5 37aefa1e6f793583e8fa7890231d1721 files/wmfpo.patch 7696
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r1 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r2 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r3 144
 MD5 b5304655d4ff5441989ab94a1bdc9506 files/digest-windowmaker-0.80.2-r4 144
-MD5 c8eb68627dc7b53b10143626018ff597 files/gtk2flickerfix.patch 1969
-MD5 a42a33a349ca84fb6e2cc5fdbd627b99 files/trance.patch.WM-0.80.2.diff 9738
 MD5 9a5c9f1b2b44a678526f0fd71b2cf51d files/windowmaker-0.80.2-r1-gentoo.patch 4331
-MD5 a062e261bd5aaca39bc17be01f07f1b6 files/wlist.patch 2776
-MD5 37aefa1e6f793583e8fa7890231d1721 files/wmfpo.patch 7696
-MD5 915c0fe65c24d54a1507f662d7b24114 files/xinerama.patch 26662
+MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r1 144
+MD5 f70c1e1b121cfc32dbd802678f3b111f files/wmaker.desktop 221
 MD5 8cb3b3bf7cef606cb356c4ba82744a50 files/digest-windowmaker-0.90.0 144
 MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0 144
-MD5 8b11b75a0ece3b854bf47e03ded7e0ba files/digest-windowmaker-0.91.0-r1 144
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBo6A4ArHZZzCEUG0RAh3PAJ42C6xyYmoEB0/Wu7wmkROklBT8TwCfe5Ys
-ESQGR4p9wytEonTNohyj6Rc=
-=R5yp
------END PGP SIGNATURE-----
diff --git a/x11-wm/windowmaker/files/menufocus.patch b/x11-wm/windowmaker/files/menufocus.patch
new file mode 100644
index 000000000000..f913777bcb26
--- /dev/null
+++ b/x11-wm/windowmaker/files/menufocus.patch
@@ -0,0 +1,37 @@
+diff -Naur ./WindowMaker-0.91.0/src/switchmenu.c WindowMaker-0.91.0.mod2/src/switchmenu.c
+--- ./WindowMaker-0.91.0/src/switchmenu.c	2004-10-18 19:41:54.000000000 -0700
++++ WindowMaker-0.91.0.mod2/src/switchmenu.c	2004-11-22 03:56:48.540567984 -0800
+@@ -231,7 +231,11 @@
+         char *t;
+         int idx;
+ 
+-        if (wwin->flags.internal_window || WFLAGP(wwin, skip_window_list))
++        if (wwin->flags.internal_window || WFLAGP(wwin, skip_window_list) 
++	    || ((wwin->wm_gnustep_attr 
++	        && wwin->wm_gnustep_attr->flags & GSWindowLevelAttr) 
++	    	&& (wwin->wm_gnustep_attr->window_level  == WMMainMenuWindowLevel
++		    || wwin->wm_gnustep_attr->window_level == WMSubmenuWindowLevel)))
+             return;
+ 
+         if (wwin->frame->title)
+diff -Naur ./WindowMaker-0.91.0/src/window.c WindowMaker-0.91.0.mod2/src/window.c
+--- ./WindowMaker-0.91.0/src/window.c	2004-10-22 20:11:10.000000000 -0700
++++ WindowMaker-0.91.0.mod2/src/window.c	2004-11-22 03:56:48.540567984 -0800
+@@ -340,17 +340,6 @@
+         wwin->client_flags.no_appicon = 1;
+     }
+ 
+-    /* temporary solution to avoid GS menus in our window list.
+-     * it's temporary because it's not the proper way: windows at the
+-     * floating level are also skipped from the window list with this.
+-     * Fix it -Dan */
+-    if (gs_hints->flags & GSWindowLevelAttr) {
+-        if (gs_hints->window_level == WMMainMenuWindowLevel ||
+-            gs_hints->window_level == WMSubmenuWindowLevel) {
+-            wwin->client_flags.skip_window_list = 1;
+-        }
+-    }
+-
+ }
+ 
+ 
diff --git a/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild b/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
index d27e399aff62..7b79729074aa 100644
--- a/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
+++ b/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild,v 1.3 2004/11/23 20:40:15 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/windowmaker/windowmaker-0.91.0-r1.ebuild,v 1.4 2004/11/24 05:43:51 fafhrd Exp $
 
 inherit eutils gnustep-funcs
 
@@ -30,6 +30,12 @@ if use gnustep; then
 	egnustep_install_domain "System"
 fi
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/menufocus.patch || die "menu focus patch failed"
+}
+
 src_compile() {
 	local myconf
 	local gs_user_postfix