Added stacking patch

5 files changed, 260 insertions, 4 deletions

diff --git a/x11-wm/ion-devel/ChangeLog b/x11-wm/ion-devel/ChangeLog
index 00a89d5a6c7a..fd94f5600387 100644
--- a/x11-wm/ion-devel/ChangeLog
+++ b/x11-wm/ion-devel/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-wm/ion-devel
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion-devel/ChangeLog,v 1.18 2003/09/29 16:07:35 twp Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion-devel/ChangeLog,v 1.19 2003/11/05 17:21:59 twp Exp $
+
+  05 Nov 2003; Tom Payne <twp@gentoo.org> ion-devel-20030814-r4.ebuild :
+  Added stacking patch.
 
   29 Sep 2003; Tom Payne <twp@gentoo.org> ion-devel-20030131.ebuild, ion-devel-20030327.ebuild, ion-devel-20030814.ebuild, ion-devel-20030814-r1.ebuild, ion-devel-20030814-r2.ebuild :
   Removed old versions.
diff --git a/x11-wm/ion-devel/Manifest b/x11-wm/ion-devel/Manifest
index eae9f458c1bc..a1b7b037dd7b 100644
--- a/x11-wm/ion-devel/Manifest
+++ b/x11-wm/ion-devel/Manifest
@@ -1,9 +1,9 @@
-MD5 38c61eda68c4b6b6e5332c196711714d ChangeLog 2494
-MD5 94629342e38421b517395d8d61c60a42 ion-devel-20030814-r4.ebuild 2010
+MD5 48d9d8e83551ce60504c2bc6cddcb1ae ChangeLog 2592
+MD5 2312c521f3268fb034b7532fa6f68fbf ion-devel-20030814-r4.ebuild 1992
 MD5 1eef30dc0886afa4e83ced96b5b2cbaa ion-devel-20030814-r3.ebuild 1950
 MD5 d992d28bec4a3bfd72b441145091a58e metadata.xml 244
 MD5 8fdcbc4385bc96bf46343ecdec97d02b files/stripws-20030814.patch 321
-MD5 b9f104bf565b809451a3e441bce6489e files/stacking-20030814.patch 293
+MD5 e37cf29e6d41d4c538ccd03e6f068f64 files/stacking-20030814.patch 5037
 MD5 7f3e096c736a8cea2eeae99794a863ff files/digest-ion-devel-20030814-r4 70
 MD5 cc554204fb26ff1144a2b2507bcfed89 files/tabdrag-20030814.patch 398
 MD5 7f3e096c736a8cea2eeae99794a863ff files/digest-ion-devel-20030814-r3 70
diff --git a/x11-wm/ion-devel/files/digest-ion-devel-20030814-r4 b/x11-wm/ion-devel/files/digest-ion-devel-20030814-r4
new file mode 100644
index 000000000000..fb1828342d7e
--- /dev/null
+++ b/x11-wm/ion-devel/files/digest-ion-devel-20030814-r4
@@ -0,0 +1 @@
+MD5 f5c779ff79ef982d76dec2f1e57d4034 ion-devel-20030814.tar.gz 284786
diff --git a/x11-wm/ion-devel/files/stacking-20030814.patch b/x11-wm/ion-devel/files/stacking-20030814.patch
new file mode 100644
index 000000000000..4826d959c52b
--- /dev/null
+++ b/x11-wm/ion-devel/files/stacking-20030814.patch
@@ -0,0 +1,174 @@
+Index: floatws/floatws.c
+===================================================================
+RCS file: /share/cvsrepos/ion/floatws/floatws.c,v
+retrieving revision 1.49
+diff -r1.49 floatws.c
+56,57d55
+< 	XReparentWindow(wglobal.dpy, ws->dummywin, parent->win, geom->x, geom->h);
+< 					
+59c57,58
+< 	region_set_parent((WRegion*)ws, (WRegion*)parent);
+---
+> 	XReparentWindow(wglobal.dpy, ws->dummywin, parent->win, geom->x, geom->h);
+> 	region_attach_parent((WRegion*)ws, (WRegion*)parent);
+Index: ioncore/clientwin.c
+===================================================================
+RCS file: /share/cvsrepos/ion/ioncore/clientwin.c,v
+retrieving revision 1.99
+diff -r1.99 clientwin.c
+908c908,909
+< 	if(np!=NULL)
+---
+> 	if(np!=NULL){
+> 		region_detach_parent((WRegion*)cwin);
+909a911,912
+> 		region_attach_parent((WRegion*)cwin, (WRegion*)np);
+> 	}
+951,953d953
+< 	region_detach_parent((WRegion*)cwin);
+< 	region_set_parent((WRegion*)cwin, (WRegion*)par);
+< 	
+955d954
+< 	
+Index: ioncore/genframe.c
+===================================================================
+RCS file: /share/cvsrepos/ion/ioncore/genframe.c,v
+retrieving revision 1.44
+diff -r1.44 genframe.c
+339a340
+> 		region_detach_parent((WRegion*)genframe);
+342a344
+> 		region_attach_parent((WRegion*)genframe, (WRegion*)parent);
+394,395d395
+< 	region_detach_parent((WRegion*)genframe);
+< 	region_set_parent((WRegion*)genframe, (WRegion*)parent);
+397d396
+< 	
+Index: ioncore/mplex.c
+===================================================================
+RCS file: /share/cvsrepos/ion/ioncore/mplex.c,v
+retrieving revision 1.15
+diff -r1.15 mplex.c
+168a169
+> 		region_detach_parent((WRegion*)mplex);
+171a173
+> 		region_attach_parent((WRegion*)mplex, (WRegion*)parent);
+192,193d193
+< 	region_detach_parent((WRegion*)mplex);
+< 	region_set_parent((WRegion*)mplex, (WRegion*)parent);
+195d194
+< 	
+Index: ioncore/region.c
+===================================================================
+RCS file: /share/cvsrepos/ion/ioncore/region.c,v
+retrieving revision 1.63
+diff -r1.63 region.c
+55,63d54
+< 	if(parent!=NULL){
+< 		reg->rootwin=parent->rootwin;
+< 		/*link_child(parent, reg);*/
+< 		region_set_parent(reg, parent);
+< 	}else{
+< 		assert(WOBJ_IS(reg, WRootWin) || WOBJ_IS(reg, WScreen));
+< 		reg->rootwin=NULL;
+< 	}
+< 	
+71,73d61
+< 	if(!WOBJ_IS(reg, WClientWin))
+< 		region_set_name(reg, WOBJ_TYPESTR(reg));
+< 
+83a72,83
+> 	
+> 	if(parent!=NULL){
+> 		reg->rootwin=parent->rootwin;
+> 		/*link_child(parent, reg);*/
+> 		region_attach_parent(reg, parent);
+> 	}else{
+> 		assert(WOBJ_IS(reg, WRootWin) || WOBJ_IS(reg, WScreen));
+> 		reg->rootwin=NULL;
+> 	}
+> 	
+> 	if(!WOBJ_IS(reg, WClientWin))
+> 		region_set_name(reg, WOBJ_TYPESTR(reg));
+652d651
+< 	/*link_child(par, reg);*/
+654a654,660
+> }
+> 
+> 
+> void region_attach_parent(WRegion *reg, WRegion *parent)
+> {
+> 	region_set_parent(reg, parent);
+> 	region_raise(reg);
+Index: ioncore/region.h
+===================================================================
+RCS file: /share/cvsrepos/ion/ioncore/region.h,v
+retrieving revision 1.40
+diff -r1.40 region.h
+151a152
+> extern void region_attach_parent(WRegion *reg, WRegion *par);
+Index: ioncore/stacking.c
+===================================================================
+RCS file: /share/cvsrepos/ion/ioncore/stacking.c,v
+retrieving revision 1.6
+diff -r1.6 stacking.c
+84a85,86
+> 	
+> 	D(fprintf(stderr, "keep_on_top: %p\n", reg));
+169a172,173
+> 
+> 	D(fprintf(stderr, "raise: %p\n", reg));
+178a183
+> 			D(fprintf(stderr, "below %p\n", par->keep_on_top_list));
+182a188,189
+> 	}else{
+> 		D(fprintf(stderr, "kept on top\n"));
+183a191
+> 		
+205a214,215
+> 
+> 	D(fprintf(stderr, "lower: %p\n", reg));
+Index: ioncore/window.c
+===================================================================
+RCS file: /share/cvsrepos/ion/ioncore/window.c,v
+retrieving revision 1.24
+diff -r1.24 window.c
+67,68d66
+< 	region_init(&(wwin->region), (WRegion*)parent, geom);
+< 	
+72a71,72
+> 	region_init(&(wwin->region), (WRegion*)parent, geom);
+> 	
+143c143
+< static void reparent_or_fit_window(WWindow *wwin, Window parwin,
+---
+> static void reparent_or_fit_window(WWindow *wwin, WWindow *parent,
+149,150c149,151
+< 	if(parwin!=None){
+< 		XReparentWindow(wglobal.dpy, wwin->win, parwin, geom->x, geom->y);
+---
+> 	if(parent!=NULL){
+> 		region_detach_parent((WRegion*)wwin);
+> 		XReparentWindow(wglobal.dpy, wwin->win, parent->win, geom->x, geom->y);
+151a153
+> 		region_attach_parent((WRegion*)wwin, (WRegion*)parent);
+168,171c170
+< 	
+< 	region_detach((WRegion*)wwin);
+< 	region_set_parent((WRegion*)wwin, (WRegion*)parent);
+< 	reparent_or_fit_window(wwin, parent->win, geom);
+---
+> 	reparent_or_fit_window(wwin, parent, geom);
+178c177
+< 	reparent_or_fit_window(wwin, None, geom);
+---
+> 	reparent_or_fit_window(wwin, NULL, geom);
+Index: ionws/ionws.c
+===================================================================
+RCS file: /share/cvsrepos/ion/ionws/ionws.c,v
+retrieving revision 1.24
+diff -r1.24 ionws.c
+62c62
+< 	region_set_parent((WRegion*)ws, (WRegion*)parent);
+---
+> 	region_attach_parent((WRegion*)ws, (WRegion*)parent);
diff --git a/x11-wm/ion-devel/ion-devel-20030814-r4.ebuild b/x11-wm/ion-devel/ion-devel-20030814-r4.ebuild
new file mode 100644
index 000000000000..43dcc0de2bd4
--- /dev/null
+++ b/x11-wm/ion-devel/ion-devel-20030814-r4.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/ion-devel/ion-devel-20030814-r4.ebuild,v 1.1 2003/11/05 17:21:59 twp Exp $
+
+MY_P=${PN}-${PV/_p/-}
+DESCRIPTION="A tiling tabbed window manager designed with keyboard users in mind"
+HOMEPAGE="http://www.iki.fi/tuomov/ion/"
+SRC_URI="http://modeemi.fi/~tuomov/dl/${MY_P}.tar.gz"
+LICENSE="Clarified-Artistic"
+SLOT="0"
+KEYWORDS="~alpha ~arm ~hppa ~mips ~ppc ~sparc ~x86"
+IUSE="xinerama"
+DEPEND="virtual/x11
+	app-misc/run-mailcap
+	>=dev-lang/lua-5"
+S=${WORKDIR}/${MY_P}
+
+inherit eutils
+
+src_unpack() {
+
+	unpack ${A}
+
+	cd ${S}
+
+	epatch ${FILESDIR}/system.mk-${PV}-no-utf8.patch
+	epatch ${FILESDIR}/stripws-${PV}.patch
+	epatch ${FILESDIR}/tabdrag-${PV}.patch
+	epatch ${FILESDIR}/stacking-${PV}.patch
+
+	sed -i system.mk \
+		-e "s/@CFLAGS@/${CFLAGS}/g" \
+		-e "s/@PF@/${PF}/g"
+	if [ `use xinerama` ]; then
+		einfo Enabling Xinerama support
+		eend 0
+	else
+		einfo Disabling Xinerama support
+		sed -i system.mk \
+			-e 's/\(XINERAMA_LIBS=-lXinerama\)/#\1/' \
+			-e 's/#\(DEFINES += -DCF_NO_XINERAMA\)/\1/'
+		eend $?
+	fi
+
+	if has_version '<x11-base/xfree-4.3.0'; then
+		einfo Enabling Xfree\<4.3.0/Opera/UTF-8 bug workaround
+		eend 0
+	else
+		einfo Disabling Xfree\<4.3.0/Opera/UTF-8 bug workaround
+		sed -i system.mk \
+			-e 's/\(DEFINES += -DCF_XFREE86_TEXTPROP_BUG_WORKAROUND\)/#\1/'
+		eend $?
+	fi
+
+}
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+
+	make PREFIX=${D}/usr ETCDIR=${D}/etc/X11/ion-devel install || die
+	dobin scripts/pwm
+
+	echo -e "#!/bin/sh\n/usr/bin/ion" > ${T}/ion-devel
+	echo -e "#!/bin/sh\n/usr/bin/pwm" > ${T}/pwm
+	exeinto /etc/X11/Sessions
+	doexe ${T}/ion-devel ${T}/pwm
+
+}
+
+pkg_postinst() {
+	ewarn The configuration file format has changed. You may have to re-write your
+	ewarn configuration files.
+	ewarn To delete stale system-wide configuration files, run the command:
+	ewarn "\trm -f ${R}/etc/X11/ion-devel/*.conf"
+}