diff options
21 files changed, 20 insertions, 1946 deletions
diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog index 71f5978809b1..9a51308dc9f8 100644 --- a/x11-terms/aterm/ChangeLog +++ b/x11-terms/aterm/ChangeLog @@ -1,6 +1,21 @@ # ChangeLog for x11-terms/aterm # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.99 2008/02/21 14:36:01 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.100 2008/03/27 20:13:39 armin76 Exp $ + + 27 Mar 2008; Raúl Porcel <armin76@gentoo.org> + -files/aterm-0.4.2-borderless.patch, -files/aterm-0.4.2-copynpaste.patch, + -files/aterm-0.4.2-copynpaste-r2.patch, + -files/aterm-0.4.2-copynpaste-r3.patch, + -files/aterm-0.4.2-internal-border.patch, + -files/aterm-0.4.2-ja-savelines.patch, -files/aterm-0.4.2-paste.patch, + -files/aterm-0.4.2-paste_mouse_outside.patch, + -files/aterm-0.4.2-patch-pack000.patch, -files/aterm-0.4.2-qtpaste.patch, + -files/aterm-0.4.2-savelines.patch, + -files/aterm-0.4.2-scroll-double-free.patch, + -files/aterm-1.00-beta2-bgfix.patch, -aterm-0.4.2-r9.ebuild, + -aterm-0.4.2-r11.ebuild, -aterm-0.4.2-r13.ebuild, -aterm-1.0.0.ebuild, + -aterm-1.0.0-r1.ebuild, aterm-1.0.1.ebuild: + alpha/ia64 stable, remove old 21 Feb 2008; Raúl Porcel <armin76@gentoo.org> aterm-1.0.1.ebuild: Re-add ~alpha/~ia64 diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest index a55aabc57667..0f581654a93f 100644 --- a/x11-terms/aterm/Manifest +++ b/x11-terms/aterm/Manifest @@ -1,25 +1,4 @@ -AUX aterm-0.4.2-borderless.patch 4692 RMD160 9415b9e2b3b42d8971f6254732a60a89cb125abb SHA1 a97c3fffa726cff1366f0240274289bba7034715 SHA256 a9dc9438a51a5fb0e59f43326d864412347a0a1e3c336c449279618ef89bb5d5 -AUX aterm-0.4.2-copynpaste-r2.patch 5308 RMD160 78c2efcfc48c145cce078bd04696ab4ddb2cb5e6 SHA1 2ba67bcbb0460580f0caccb1e8d1748aba91a041 SHA256 4b099e87869bd5a16dcd55714602c4d1b7a44c4e1fc5cb0223f22297dd5fd1c4 -AUX aterm-0.4.2-copynpaste-r3.patch 6358 RMD160 103fe2633a3d1ec7997fce00cedaa19ed84ac4a6 SHA1 d33b784428fbf85c0a4d01b8bf60681367ee1cdf SHA256 4e81f090696ef315954f5d1e7dca50eb3a66f025ffc369d47f808f828760925c -AUX aterm-0.4.2-copynpaste.patch 3668 RMD160 ca21648f695d12f671c266e123ece486b6888535 SHA1 592cef7e7a0051099285dec613dd87e58be96f87 SHA256 086ba6e316e93e6c296c4561f6694a6302b91c3b990c98e51994602517b6c17e -AUX aterm-0.4.2-internal-border.patch 3246 RMD160 7cb2f835b9c853c1236dde8e01841e7ff17ae2ae SHA1 e036165f9ce4ccb788da32a700d31ab27b4c2dcd SHA256 7ee4aa6d10aa9415e3c45664081c512bf43b7b65cda743db5948b804c776ce06 -AUX aterm-0.4.2-ja-savelines.patch 4459 RMD160 1bb926c0966bd6ced68d8ca838473260294eabba SHA1 86252c7ebb82c6d09f59f61d0b28c6a831c5f34f SHA256 88beb0577b08f78828e52477389746094494306f98842efac084287084349268 -AUX aterm-0.4.2-paste.patch 2160 RMD160 bb0cfbba7c39350977a542919e731f3a357d4bb6 SHA1 b8f47de81f7cf6fc34fe6ba2c36eb7f6232c47a3 SHA256 aced0c1b5a23864a366cfa2718babe0d850767a3d706308b656c8c43e963a5c5 -AUX aterm-0.4.2-paste_mouse_outside.patch 6267 RMD160 d5a9b7ac4a0e44976e7eeecb3fcae7a7e8e2bf27 SHA1 6040f66e5b74b0e3bf4d295a30c400ca49216a79 SHA256 c7b0f07fdece2130b8f36ffeceb0fe821166da95467c57e6d4efea7c552ad834 -AUX aterm-0.4.2-patch-pack000.patch 4124 RMD160 504a216ae6eba1ef229abeb9cc4ef552094e117c SHA1 4d1797a014fd6aabb273787f8f1b9255d2b35359 SHA256 3c51499b7130d21922bf79d3d8a2b25a328a6592e921131473d12f48f067a273 -AUX aterm-0.4.2-qtpaste.patch 2510 RMD160 66a32a4697c0805e6a92a7813f80ca5097dd4ae0 SHA1 740619feaba841d356585f6c6a8795096cdb0058 SHA256 0eb058e6a45255d2e262333849566368d0e5e7d3a8dec919c6aaf00ca9b9c6ff -AUX aterm-0.4.2-savelines.patch 4081 RMD160 03e0c0275dec9e4a4ca343202906c000f3282c9a SHA1 c8fe108b54d08cf3e5cd915c2fb6cf2a1bdfa162 SHA256 645a7c5324860b591efa52b90c181f59747a637be867885c9a3323e1a116a9f1 -AUX aterm-0.4.2-scroll-double-free.patch 1826 RMD160 a1d3467c589c4c7ac57bc461d6991e9c84120ba8 SHA1 9470ccb9a93a3056484078b9ab6a4e3401219d49 SHA256 7a2e716726f58bf14cf946a24d1753ae90c6f4cdd62af4eba87c08e99149c05b -AUX aterm-1.00-beta2-bgfix.patch 627 RMD160 16fb5961e2617da6aa57dfa778fbb72fb54bf7ad SHA1 b7f651499c23c2f6286064fc7adf4bd1e72356b2 SHA256 2b8914802682e8564d5b49a05b8288c6a6ba15d289c315f99f4327d9517a1672 -DIST aterm-0.4.2-ja.patch 84282 RMD160 0a5a75a22f3caa42c6e7fd68632d9c9d07586f07 SHA1 ab0aef726122bbe2302d627a8cc2ea73e7aaf177 SHA256 34726c41212fba7bfa9523b5de1872486586a0d174c53548a92c3625ce4f46d1 -DIST aterm-0.4.2.tar.bz2 243419 RMD160 95ce1104cb9994132fd19348e0fa5b5ffdc2c6ef SHA1 e2b976218d367b2c1315311c801eecd7547bf71d SHA256 88f3b807f918630ed338a44d854d10af83e103336ac41517cf003dd9c0f389bb -DIST aterm-1.0.0.tar.bz2 248708 RMD160 b74f54b6aa6f1d4a094671507c30f627f074eb48 SHA1 806fd20aec2851c5eea26d9e6a707985da3579a3 SHA256 1d6f7ee94b8ea54be2a212b3c71e2f70c111770ca41a7f079fd654ed78603dc0 DIST aterm-1.0.1.tar.bz2 276810 RMD160 74c46af824c19d0c24c26178f0cb38c2d4e66e21 SHA1 a975753b415306a0734efc3773de8a86129bb54b SHA256 a161c3b2d9c7149130a41963899993af21eae92e8e362f4b5b3c7c4cb16760ce -EBUILD aterm-0.4.2-r11.ebuild 2907 RMD160 62a2cdd5a187a36a3712d1b0f9d0c33b24811efe SHA1 8a24469416d873223bccd5ab3eacae5eac239fbc SHA256 94908614079c25582ed2cf973d5a9b898a17c0e350b80c1511c2415871d1c0dc -EBUILD aterm-0.4.2-r13.ebuild 3026 RMD160 a87c7e107e1e301e2782683c42617d5b7cf4d008 SHA1 cc9cb6cc587a6bff6ec5fc02b10345797c74ccb6 SHA256 55513eca55be8d38fbefb30b8e34193cc09507c7e21634f01752dc568667ecd5 -EBUILD aterm-0.4.2-r9.ebuild 2414 RMD160 f7d80364b422e33c0afe9244c4e608fe936b02ff SHA1 4ed27040ee9d6606dae2b99f06f57f28f15ef58e SHA256 a2e3769f07bd9e6b771d3392e887e42dd4620245be1a47bcd4eeb5320aaa30bc -EBUILD aterm-1.0.0-r1.ebuild 1762 RMD160 9e811a002841b92c2fe1a4d0a686353445ed2229 SHA1 0d6e9976c3890f1a5a875abe6456ade4e0d53625 SHA256 12244bb9a13bc5936e2b53d8812bd3acebe5cce8d50e7622fbdfbde74e505f82 -EBUILD aterm-1.0.0.ebuild 1679 RMD160 f5c03b07619d9e1ac66c0a93211b2391f2d9a520 SHA1 28f3d8246c183ea2f229831ed3917e2194ac501c SHA256 46788df4489d27bd1a19d2e7a99362fd9565e6eb29910477ce600b7d5a1346b1 -EBUILD aterm-1.0.1.ebuild 1775 RMD160 bd7f6f5cf6a0b0d2c3fbbd0b01e65d9750216da7 SHA1 dab93a13c94214634c00c5e541a1aa6ce6b3056f SHA256 2ac4a307fd25cda8d4122debc8a2be398c5b48401c62a26b831ee25f836fc66d -MISC ChangeLog 15893 RMD160 51ca267b4b184a5b7f5d19ae55d2e8b2f03d9c79 SHA1 66339d08e4989adfdd59e74f59e1d390b09a4e1a SHA256 39796ed35706245af3e1b2d716d638eb11bc7f2e47ef542e972ace51e5565b07 +EBUILD aterm-1.0.1.ebuild 1773 RMD160 f6f5a2356968130517703b6fca1a92a026df5731 SHA1 faa0f08ba9686e9afc1f78643c43a3132eb66a07 SHA256 607962ffe4a68a67bdae3023c7d6ef2a7b9f8ded6d62f45ef1c2d70159dc2183 +MISC ChangeLog 16644 RMD160 582c703c3081ab59b5445423b2a699ff2e471982 SHA1 77963b4b98332ffd95fbb30542a41add04aa080a SHA256 4a1adb0a0557252912b60e3fa437f6de8e501673b39fc942f7360e17352cce5d MISC metadata.xml 236 RMD160 92f49f8275e75caf57b88a3172d5204eaa4e33ae SHA1 dd1a8550a514e55ab0ed6190ab4794bb090994f8 SHA256 56075995f83836ae824c7cb01931b98d6745f6d5a7764299c8262e801486b829 diff --git a/x11-terms/aterm/aterm-0.4.2-r11.ebuild b/x11-terms/aterm/aterm-0.4.2-r11.ebuild deleted file mode 100644 index e4d4b5137f3b..000000000000 --- a/x11-terms/aterm/aterm-0.4.2-r11.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r11.ebuild,v 1.23 2008/02/06 22:10:10 grobian Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility" -HOMEPAGE="http://aterm.sourceforge.net" -SRC_URI="mirror://sourceforge/aterm/${P}.tar.bz2 - cjk? ( http://dev.gentoo.org/~spock/portage/distfiles/aterm-0.4.2-ja.patch )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 sparc x86" -IUSE="cjk" - -RDEPEND="media-libs/jpeg - media-libs/libpng - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libICE - x11-libs/libSM" - -DEPEND="${RDEPEND} - x11-proto/xproto" - -src_unpack() { - unpack ${P}.tar.bz2 - cd ${S}/src - cp feature.h feature.h.orig - sed "s:\(#define LINUX_KEYS\):/\*\1\*/:" \ - feature.h.orig > feature.h - - sed -i "s: KeySym keysym;: KeySym keysym = 0;:" command.c - - cd ${S} - epatch ${FILESDIR}/aterm-0.4.2-borderless.patch - epatch ${FILESDIR}/aterm-0.4.2-paste.patch - epatch ${FILESDIR}/aterm-0.4.2-paste_mouse_outside.patch - - if use cjk ; then - epatch ${DISTDIR}/aterm-0.4.2-ja.patch - else - epatch ${FILESDIR}/aterm-0.4.2-copynpaste-r3.patch - fi - - epatch ${FILESDIR}/aterm-0.4.2-patch-pack000.patch - - if use cjk ; then - epatch ${FILESDIR}/aterm-0.4.2-ja-savelines.patch - else - epatch ${FILESDIR}/aterm-0.4.2-savelines.patch - fi - - epatch ${FILESDIR}/aterm-0.4.2-internal-border.patch -} - -src_compile() { - local myconf - - append-ldflags $(bindnow-flags) - - # You can't --enable-big5 with aterm-0.4.2-ja.patch - # I think it's very bad thing but as nobody complains it - # and we don't have per-language flag atm, I stick to - # use --enable-kanji/--enable-thai (and leave --enable-big5) - use cjk && myconf="$myconf - --enable-kanji - --enable-thai - --enable-xim - --enable-linespace" - - econf \ - --enable-xgetdefault \ - --with-terminfo=/usr/share/terminfo \ - --enable-transparency \ - --enable-fading \ - --enable-background-image \ - --enable-menubar \ - --enable-graphics \ - --enable-utmp \ - --with-x \ - ${myconf} || die - - sed -i -re 's#^XLIB = (.*)#XLIB = \1 -lXmu#' src/Makefile - emake || die -} - -src_install () { - make DESTDIR=${D} install || die - - fowners root:utmp /usr/bin/aterm - fperms g+s /usr/bin/aterm - - doman doc/aterm.1 - dodoc ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.* - docinto menu - dodoc doc/menu/* - dohtml -r . -} - -pkg_postinst () { - echo - einfo "Hint: you can copy text from aterm to the clipboard by holding the ALT key" - einfo "while highlighting the text." - echo - ewarn "The transparent background will only work if you have the 'real' root wallpaper" - ewarn "set. Use Esetroot (x11-terms/eterm) or fbsetbg (x11-wm/fluxbox) if you are" - ewarn "experiencing problems with transparency in aterm." - echo -} diff --git a/x11-terms/aterm/aterm-0.4.2-r13.ebuild b/x11-terms/aterm/aterm-0.4.2-r13.ebuild deleted file mode 100644 index 8e349a4ae03b..000000000000 --- a/x11-terms/aterm/aterm-0.4.2-r13.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r13.ebuild,v 1.6 2008/02/06 22:10:10 grobian Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility" -HOMEPAGE="http://aterm.sourceforge.net" -SRC_URI="mirror://sourceforge/aterm/${P}.tar.bz2 - linguas_ja? ( http://dev.gentoo.org/~spock/portage/distfiles/aterm-0.4.2-ja.patch )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" -IUSE="xgetdefault" - -RDEPEND="media-libs/jpeg - media-libs/libpng - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libICE - x11-libs/libSM" - -DEPEND="${RDEPEND} - x11-proto/xproto" - -pkg_setup() { - if use linguas_ja && use linguas_zh_TW ; then - eerror - eerror "You cannot have both ja and zh_TW enabled." - eerror - die "Please remove either ja or zh_TW from your LINGUAS." - fi -} - -src_unpack() { - unpack ${P}.tar.bz2 - cd ${S}/src - cp feature.h feature.h.orig - sed "s:\(#define LINUX_KEYS\):/\*\1\*/:" \ - feature.h.orig > feature.h - - sed -i "s: KeySym keysym;: KeySym keysym = 0;:" command.c - - cd ${S} - epatch ${FILESDIR}/aterm-0.4.2-borderless.patch - epatch ${FILESDIR}/aterm-0.4.2-paste.patch - epatch ${FILESDIR}/aterm-0.4.2-paste_mouse_outside.patch - - if use linguas_ja ; then - epatch ${DISTDIR}/aterm-0.4.2-ja.patch - else - epatch ${FILESDIR}/aterm-0.4.2-copynpaste-r3.patch - fi - - epatch ${FILESDIR}/aterm-0.4.2-patch-pack000.patch - - if use linguas_ja ; then - epatch ${FILESDIR}/aterm-0.4.2-ja-savelines.patch - else - epatch ${FILESDIR}/aterm-0.4.2-savelines.patch - fi - - epatch ${FILESDIR}/aterm-0.4.2-internal-border.patch - epatch ${FILESDIR}/aterm-0.4.2-scroll-double-free.patch -} - -src_compile() { - local myconf - - append-ldflags $(bindnow-flags) - - econf \ - $(use_enable xgetdefault) \ - $(use_enable linguas_ja kanji) \ - $(use_enable linguas_zh_TW big5) \ - $(use_enable linguas_th thai) \ - --with-terminfo=/usr/share/terminfo \ - --enable-transparency \ - --enable-fading \ - --enable-background-image \ - --enable-menubar \ - --enable-graphics \ - --enable-utmp \ - --enable-linespace \ - --enable-xim \ - --with-x \ - ${myconf} || die - - sed -i -re 's#^XLIB = (.*)#XLIB = \1 -lXmu#' src/Makefile - emake || die -} - -src_install () { - make DESTDIR=${D} install || die - - fowners root:utmp /usr/bin/aterm - fperms g+s /usr/bin/aterm - - doman doc/aterm.1 - dodoc ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.* - docinto menu - dodoc doc/menu/* - dohtml -r . -} - -pkg_postinst () { - echo - einfo "Hint: you can copy text from aterm to the clipboard by holding the ALT key" - einfo "while highlighting the text." - echo - ewarn "The transparent background will only work if you have the 'real' root wallpaper" - ewarn "set. Use Esetroot (x11-terms/eterm) or fbsetbg (x11-wm/fluxbox) if you are" - ewarn "experiencing problems with transparency in aterm." - echo -} diff --git a/x11-terms/aterm/aterm-0.4.2-r9.ebuild b/x11-terms/aterm/aterm-0.4.2-r9.ebuild deleted file mode 100644 index 08ffff38e2e2..000000000000 --- a/x11-terms/aterm/aterm-0.4.2-r9.ebuild +++ /dev/null @@ -1,99 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r9.ebuild,v 1.30 2008/02/06 22:10:10 grobian Exp $ - -inherit eutils flag-o-matic - -DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility" -HOMEPAGE="http://aterm.sourceforge.net" -SRC_URI="mirror://sourceforge/aterm/${P}.tar.bz2 - cjk? ( http://dev.gentoo.org/~spock/portage/distfiles/aterm-0.4.2-ja.patch )" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86" -IUSE="cjk" - -RDEPEND="media-libs/jpeg - media-libs/libpng - x11-libs/libXmu - x11-libs/libXt - x11-libs/libX11 - x11-libs/libXpm - x11-libs/libICE - x11-libs/libSM" - -DEPEND="${RDEPEND} - x11-proto/xproto" - -src_unpack() { - unpack ${P}.tar.bz2 - cd ${S}/src - cp feature.h feature.h.orig - sed "s:\(#define LINUX_KEYS\):/\*\1\*/:" \ - feature.h.orig > feature.h - - sed -i "s: KeySym keysym;: KeySym keysym = 0;:" command.c - - cd ${S} - epatch ${FILESDIR}/aterm-0.4.2-borderless.patch - epatch ${FILESDIR}/aterm-0.4.2-paste.patch - epatch ${FILESDIR}/aterm-0.4.2-paste_mouse_outside.patch - - if use cjk ; then - epatch ${DISTDIR}/aterm-0.4.2-ja.patch - else - epatch ${FILESDIR}/aterm-0.4.2-copynpaste-r3.patch - fi - - epatch ${FILESDIR}/aterm-0.4.2-patch-pack000.patch -} - -src_compile() { - local myconf - - append-ldflags $(bindnow-flags) - - # You can't --enable-big5 with aterm-0.4.2-ja.patch - # I think it's very bad thing but as nobody complains it - # and we don't have per-language flag atm, I stick to - # use --enable-kanji/--enable-thai (and leave --enable-big5) - use cjk && myconf="$myconf - --enable-kanji - --enable-thai - --enable-xim - --enable-linespace" - - econf \ - --enable-transparency \ - --enable-fading \ - --enable-background-image \ - --enable-menubar \ - --enable-graphics \ - --enable-utmp \ - --with-x \ - ${myconf} || die - - sed -i -re 's#^XLIB = (.*)#XLIB = \1 -lXmu#' src/Makefile - emake || die -} - -src_install () { - make DESTDIR=${D} install || die - - fowners root:utmp /usr/bin/aterm - fperms g+s /usr/bin/aterm - - doman doc/aterm.1 - dodoc ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.* - docinto menu - dodoc doc/menu/* - dohtml -r . -} - -pkg_postinst () { - einfo - einfo "Hint: you can copy text from aterm to the clipboard by holding the ALT key" - einfo "while highlighting the text." - einfo -} diff --git a/x11-terms/aterm/aterm-1.0.0-r1.ebuild b/x11-terms/aterm/aterm-1.0.0-r1.ebuild deleted file mode 100644 index c3ae9c6e12be..000000000000 --- a/x11-terms/aterm/aterm-1.0.0-r1.ebuild +++ /dev/null @@ -1,73 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.0.0-r1.ebuild,v 1.9 2007/07/22 05:42:08 dberkholz Exp $ - -inherit flag-o-matic - -DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility" -HOMEPAGE="http://aterm.sourceforge.net" -SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" -IUSE="background cjk xgetdefault" - -RDEPEND="media-libs/jpeg - media-libs/libpng - background? ( x11-wm/afterstep ) - x11-libs/libX11 - x11-libs/libXext - x11-libs/libICE" - -DEPEND="${RDEPEND} - x11-libs/libXt - x11-proto/xproto" - -src_compile() { - local myconf - - append-ldflags $(bindnow-flags) - - use cjk && myconf="$myconf - --enable-kanji - --enable-thai - --enable-big5" - - econf \ - $(use_enable xgetdefault) \ - $(use_enable background background-image) \ - --with-terminfo=/usr/share/terminfo \ - --enable-transparency \ - --enable-fading \ - --enable-background-image \ - --enable-menubar \ - --enable-graphics \ - --enable-utmp \ - --enable-wtmp \ - --with-x \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - fowners root:utmp /usr/bin/aterm - fperms g+s /usr/bin/aterm - - doman doc/aterm.1 - dodoc ChangeLog doc/BUGS doc/FAQ doc/README.* - docinto menu - dodoc doc/menu/* - dohtml -r . -} - -pkg_postinst() { - echo - ewarn "The transparent background will only work if you have the 'real' root wallpaper" - ewarn "set. Use Esetroot (x11-terms/eterm) or fbsetbg (x11-wm/fluxbox) if you are" - ewarn "experiencing problems with transparency in aterm." - echo -} diff --git a/x11-terms/aterm/aterm-1.0.0.ebuild b/x11-terms/aterm/aterm-1.0.0.ebuild deleted file mode 100644 index 2976d42b377d..000000000000 --- a/x11-terms/aterm/aterm-1.0.0.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2007 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.0.0.ebuild,v 1.7 2007/07/22 05:42:08 dberkholz Exp $ - -inherit flag-o-matic - -DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility" -HOMEPAGE="http://aterm.sourceforge.net" -SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="cjk xgetdefault" - -RDEPEND="media-libs/jpeg - media-libs/libpng - x11-libs/libX11 - x11-libs/libXext - x11-libs/libICE" - -DEPEND="${RDEPEND} - x11-libs/libXt - x11-proto/xproto" - -src_compile() { - local myconf - - append-ldflags $(bindnow-flags) - - use cjk && myconf="$myconf - --enable-kanji - --enable-thai - --enable-big5" - - econf \ - $(use_enable xgetdefault) \ - --with-terminfo=/usr/share/terminfo \ - --enable-transparency \ - --enable-fading \ - --enable-background-image \ - --enable-menubar \ - --enable-graphics \ - --enable-utmp \ - --enable-wtmp \ - --with-x \ - ${myconf} || die "econf failed" - - emake || die "emake failed" -} - -src_install() { - make DESTDIR="${D}" install || die "make install failed" - - fowners root:utmp /usr/bin/aterm - fperms g+s /usr/bin/aterm - - doman doc/aterm.1 - dodoc ChangeLog doc/BUGS doc/FAQ doc/README.* - docinto menu - dodoc doc/menu/* - dohtml -r . -} - -pkg_postinst() { - echo - ewarn "The transparent background will only work if you have the 'real' root wallpaper" - ewarn "set. Use Esetroot (x11-terms/eterm) or fbsetbg (x11-wm/fluxbox) if you are" - ewarn "experiencing problems with transparency in aterm." - echo -} diff --git a/x11-terms/aterm/aterm-1.0.1.ebuild b/x11-terms/aterm/aterm-1.0.1.ebuild index 01816a0e474f..b92239dcfde9 100644 --- a/x11-terms/aterm/aterm-1.0.1.ebuild +++ b/x11-terms/aterm/aterm-1.0.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.0.1.ebuild,v 1.8 2008/02/21 14:36:01 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-1.0.1.ebuild,v 1.9 2008/03/27 20:13:39 armin76 Exp $ inherit flag-o-matic @@ -10,7 +10,7 @@ SRC_URI="ftp://ftp.afterstep.org/apps/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 hppa ~ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 hppa ia64 ~mips ppc ppc64 sparc x86 ~x86-fbsd" IUSE="background cjk xgetdefault" RDEPEND="media-libs/jpeg diff --git a/x11-terms/aterm/files/aterm-0.4.2-borderless.patch b/x11-terms/aterm/files/aterm-0.4.2-borderless.patch deleted file mode 100644 index cc742c3755fe..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-borderless.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -Bru aterm-cvs/src/main.c aterm-cvs-modif/src/main.c ---- aterm-cvs/src/main.c Thu Aug 14 02:02:05 2003 -+++ aterm-cvs-modif/src/main.c Thu Aug 14 02:05:22 2003 -@@ -434,8 +434,11 @@ - Cursor cursor; - XClassHint classHint; - XWMHints wmHint; -+ Atom prop = None; - int i, x, y, flags; - unsigned int width, height; -+ MWMHints mwmhints; -+ - #ifdef PREFER_24BIT - XSetWindowAttributes attributes; - XWindowAttributes gattr; -@@ -464,6 +467,23 @@ - } - #endif - -+ if (Options & Opt_borderLess) { -+ prop = XInternAtom(Xdisplay, "_MOTIF_WM_INFO", True); -+ if (prop == None) { -+/* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ -+#ifdef PREFER_24BIT -+ attributes.override_redirect = TRUE; -+#endif -+ mwmhints.flags = 0; -+ } else { -+ mwmhints.flags = MWM_HINTS_DECORATIONS; -+ mwmhints.decorations = 0; -+ } -+ } else { -+ mwmhints.flags = 0; -+ } -+ -+ - /* - * grab colors before netscape does - */ -@@ -687,6 +707,12 @@ - (KeyPressMask | FocusChangeMask | - StructureNotifyMask | VisibilityChangeMask) - ); -+ -+ if (mwmhints.flags) { -+ prop = XInternAtom(Xdisplay, "_MOTIF_WM_HINTS", False); -+ XChangeProperty(Xdisplay, TermWin.parent, prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS); -+ } -+ - - /* vt cursor: Black-on-White is standard, but this is more popular */ - TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); -diff -Bru aterm-cvs/src/rxvt.h aterm-cvs-modif/src/rxvt.h ---- aterm-cvs/src/rxvt.h Thu Aug 14 02:02:05 2003 -+++ aterm-cvs-modif/src/rxvt.h Thu Aug 14 02:07:39 2003 -@@ -140,6 +140,7 @@ - #include <X11/Intrinsic.h> /* Xlib, Xutil, Xresource, Xfuncproto */ - #include <X11/cursorfont.h> - #include <X11/keysym.h> -+#include <X11/Xmd.h> - - #include "libafterstep.h" - -@@ -458,6 +459,15 @@ - (tmp) = (one); (one) = (two); (two) = (tmp); \ - } while (0) - -+typedef struct _mwmhints { -+ CARD32 flags; -+ CARD32 functions; -+ CARD32 decorations; -+ INT32 input_mode; -+ CARD32 status; -+} MWMHints; -+ -+ - /* - ***************************************************************************** - * NORMAL DEFINES -@@ -690,6 +700,7 @@ - #define Opt_scrollKeypress (1LU<<12) - #define Opt_transparent (1LU<<13) - #define Opt_transparent_sb (1LU<<14) -+#define Opt_borderLess (1LU<<16) - - /* place holder used for parsing command-line options */ - #define Opt_Boolean (1LU<<31) -@@ -778,6 +789,33 @@ - * divisible by 4 (num rect) - */ - #define NGRX_PTS 1000 -+ -+/* Motif window hints */ -+#define MWM_HINTS_FUNCTIONS (1L << 0) -+#define MWM_HINTS_DECORATIONS (1L << 1) -+#define MWM_HINTS_INPUT_MODE (1L << 2) -+#define MWM_HINTS_STATUS (1L << 3) -+/* bit definitions for MwmHints.functions */ -+#define MWM_FUNC_ALL (1L << 0) -+#define MWM_FUNC_RESIZE (1L << 1) -+#define MWM_FUNC_MOVE (1L << 2) -+#define MWM_FUNC_MINIMIZE (1L << 3) -+#define MWM_FUNC_MAXIMIZE (1L << 4) -+#define MWM_FUNC_CLOSE (1L << 5) -+/* bit definitions for MwmHints.decorations */ -+#define MWM_DECOR_ALL (1L << 0) -+#define MWM_DECOR_BORDER (1L << 1) -+#define MWM_DECOR_RESIZEH (1L << 2) -+#define MWM_DECOR_TITLE (1L << 3) -+#define MWM_DECOR_MENU (1L << 4) -+#define MWM_DECOR_MINIMIZE (1L << 5) -+#define MWM_DECOR_MAXIMIZE (1L << 6) -+/* bit definitions for MwmHints.inputMode */ -+#define MWM_INPUT_MODELESS 0 -+#define MWM_INPUT_PRIMARY_APPLICATION_MODAL 1 -+#define MWM_INPUT_SYSTEM_MODAL 2 -+#define MWM_INPUT_FULL_APPLICATION_MODAL 3 -+#define PROP_MWM_HINTS_ELEMENTS 5 - - /* - ***************************************************************************** -diff -Bru aterm-cvs/src/xdefaults.c aterm-cvs-modif/src/xdefaults.c ---- aterm-cvs/src/xdefaults.c Thu Aug 14 02:02:05 2003 -+++ aterm-cvs-modif/src/xdefaults.c Thu Aug 14 02:08:31 2003 -@@ -44,6 +44,7 @@ - - /* local functions referenced */ - /*{{{ local variables */ -+static const char *rs_borderLess = NULL; - static const char *rs_loginShell = NULL; - static const char *rs_utmpInhibit = NULL; - static const char *rs_scrollBar = NULL; -@@ -299,6 +300,7 @@ - "width of border"), - STRG(rs_color[Color_border], "borderColor", "bd", "color", - "border color"), -+ BOOL(rs_borderLess, "borderLess", "bl", Opt_borderLess, "no decoration"), - BOOL(rs_loginShell, "loginShell", "ls", Opt_loginShell, "login shell"), - BOOL(rs_scrollBar, "scrollBar", "sb", Opt_scrollBar, "scrollbar"), - BOOL(rs_scrollBar_right, "scrollBar_right", "sr", Opt_scrollBar_right, diff --git a/x11-terms/aterm/files/aterm-0.4.2-copynpaste-r2.patch b/x11-terms/aterm/files/aterm-0.4.2-copynpaste-r2.patch deleted file mode 100644 index 7dc2b58b37c3..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-copynpaste-r2.patch +++ /dev/null @@ -1,175 +0,0 @@ -diff -Naur aterm-0.4.2-orig/configure aterm-0.4.2/configure ---- aterm-0.4.2-orig/configure 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/configure 2004-01-31 11:41:42.000000000 +0100 -@@ -2609,7 +2609,7 @@ - ; \ - do - ac_save_LIBS=$LIBS -- LIBS="-L$ac_dir -lXpm $LIBS -lX11" -+ LIBS="-L$ac_dir -lXpm $LIBS -lX11 -lXmu" - cat > conftest.$ac_ext <<EOF - #line 2615 "configure" - #include "confdefs.h" -diff -Naur aterm-0.4.2-orig/src/command.c aterm-0.4.2/src/command.c ---- aterm-0.4.2-orig/src/command.c 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/command.c 2004-01-31 11:41:42.000000000 +0100 -@@ -2653,7 +2653,7 @@ - switch (ev->xbutton.button) { - case Button1: - case Button3: -- selection_make(ev->xbutton.time); -+ selection_make(ev->xbutton.time, ev->xbutton.state); - break; - - case Button2: -diff -Naur aterm-0.4.2-orig/src/screen.c aterm-0.4.2/src/screen.c ---- aterm-0.4.2-orig/src/screen.c 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/screen.c 2004-01-31 16:55:17.640053616 +0100 -@@ -44,7 +44,7 @@ - - #include <X11/Xatom.h> - #include <X11/Xmd.h> /* get the typedef for CARD32 */ -- -+#include <X11/Xmu/Atoms.h> - - static screen_t screen; - -@@ -2759,21 +2759,88 @@ - long nread; - unsigned long bytes_after, nitems; - unsigned char *data; -+ XTextProperty ct; - Atom actual_type; - int actual_fmt; -- -+ int dummy_count; -+ char **cl; -+ XEvent ev; -+ XWindowAttributes wa; -+ int setpropertyevent = 0; -+ - if (prop == None) - return; -+ - for (nread = 0, bytes_after = 1; bytes_after > 0; nread += nitems) { - if ((XGetWindowProperty(Xdisplay, win, prop, (nread / 4), PROP_SIZE, -- Delete, AnyPropertyType, &actual_type, -- &actual_fmt, &nitems, &bytes_after, -- &data) != Success)) { -- XFree(data); -+ False, AnyPropertyType, &ct.encoding, &ct.format, -+ &ct.nitems, &bytes_after, &ct.value) != Success)) { -+ XFree(ct.value); - return; - } -- PasteIt(data, nitems); -- XFree(data); -+ -+ if (ct.encoding == XInternAtom(Xdisplay, "INCR", False)) { -+ /* -+ * This is an INCR (incremental large) paste -+ */ -+ XGetWindowAttributes(Xdisplay, win, &wa); -+ if ((wa.your_event_mask | PropertyChangeMask) != wa.your_event_mask) { -+ /* We need to register the PropertyNotify event */ -+ XSelectInput(Xdisplay, win, (wa.your_event_mask | PropertyChangeMask) ); -+ setpropertyevent = 1; -+ } -+ XDeleteProperty(Xdisplay, win, prop); -+ while (1) { -+ XWindowEvent(Xdisplay, win, PropertyChangeMask, &ev); -+ if (ev.xproperty.state != PropertyNewValue) -+ continue; -+ if ((XGetWindowProperty(Xdisplay, win, prop, 0, PROP_SIZE, -+ True, AnyPropertyType, &ct.encoding, &ct.format, -+ &ct.nitems, &bytes_after, &ct.value) != Success)) { -+ XFree(ct.value); -+ /* error */ -+ break; -+ } -+ -+ if (ct.nitems == 0) { -+ /* end of INCR transfer */ -+ XFree(ct.value); -+ break; -+ } -+ else { -+ if (XmbTextPropertyToTextList(Xdisplay, &ct, &cl, &dummy_count) == Success && cl) { -+ PasteIt(cl[0], strlen(cl[0])); -+ XFreeStringList(cl); -+ } else { -+ PasteIt(ct.value, (unsigned int)ct.nitems); -+ } -+ -+ XFree(ct.value); -+ } -+ } -+ if (setpropertyevent == 1) { -+ /* We need to unregister the PropertyNotify event */ -+ XGetWindowAttributes(Xdisplay, win, &wa); -+ XSelectInput(Xdisplay, win, (wa.your_event_mask ^ PropertyChangeMask)); -+ setpropertyevent = 0; -+ } -+ } else { -+ /* -+ * This is a normal 1-time paste -+ */ -+ if (Delete) { -+ XDeleteProperty(Xdisplay, win, prop); -+ } -+ -+ if (XmbTextPropertyToTextList(Xdisplay, &ct, &cl, &dummy_count) == Success && cl) { -+ PasteIt(cl[0], strlen(cl[0])); -+ XFreeStringList(cl); -+ } else { -+ PasteIt(ct.value, (unsigned int)ct.nitems); -+ } -+ -+ XFree(ct.value); -+ } - } - } - -@@ -2787,6 +2854,9 @@ - selection_request(Time tm, int x, int y) - { - Atom prop; -+ Atom xa; -+ -+ xa = XInternAtom(Xdisplay, "COMPOUND_TEXT", False); - - if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) - return; /* outside window */ -@@ -2797,7 +2867,7 @@ - selection_paste(Xroot, XA_CUT_BUFFER0, False); - } else { - prop = XInternAtom(Xdisplay, "VT_SELECTION", False); -- XConvertSelection(Xdisplay, XA_PRIMARY, XA_STRING, prop, TermWin.vt, -+ XConvertSelection(Xdisplay, XA_PRIMARY, xa, prop, TermWin.vt, - tm); - } - } -@@ -2827,7 +2897,7 @@ - */ - /* PROTO */ - void --selection_make(Time tm) -+selection_make(Time tm, unsigned int key_state) - { - int i, col, end_col, row, end_row; - unsigned char *new_selection_text; -@@ -2894,7 +2964,13 @@ - FREE(selection.text); - selection.text = new_selection_text; - -- XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm); -+ // selecting with ALT will put the text to clipboard -+ if (key_state & Mod1Mask) { -+ XSetSelectionOwner(Xdisplay, XA_CLIPBOARD(Xdisplay), TermWin.vt, tm); -+ } else { -+ XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm); -+ } -+ - if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt) - print_error("can't get primary selection"); - XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, diff --git a/x11-terms/aterm/files/aterm-0.4.2-copynpaste-r3.patch b/x11-terms/aterm/files/aterm-0.4.2-copynpaste-r3.patch deleted file mode 100644 index 7d6db9becae8..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-copynpaste-r3.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff -Naur aterm-orig/configure aterm-0.4.2/configure ---- aterm-orig/configure 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/configure 2004-03-30 18:14:38.189000472 +0200 -@@ -2609,7 +2609,7 @@ - ; \ - do - ac_save_LIBS=$LIBS -- LIBS="-L$ac_dir -lXpm $LIBS -lX11" -+ LIBS="-L$ac_dir -lXpm $LIBS -lX11 -lXmu" - cat > conftest.$ac_ext <<EOF - #line 2615 "configure" - #include "confdefs.h" -diff -Naur aterm-orig/src/command.c aterm-0.4.2/src/command.c ---- aterm-orig/src/command.c 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/command.c 2004-03-30 18:14:38.193999712 +0200 -@@ -2653,7 +2653,7 @@ - switch (ev->xbutton.button) { - case Button1: - case Button3: -- selection_make(ev->xbutton.time); -+ selection_make(ev->xbutton.time, ev->xbutton.state); - break; - - case Button2: -diff -Naur aterm-orig/src/screen.c aterm-0.4.2/src/screen.c ---- aterm-orig/src/screen.c 2004-03-30 18:13:11.070244536 +0200 -+++ aterm-0.4.2/src/screen.c 2004-03-30 18:06:42.000000000 +0200 -@@ -44,7 +44,7 @@ - - #include <X11/Xatom.h> - #include <X11/Xmd.h> /* get the typedef for CARD32 */ -- -+#include <X11/Xmu/Atoms.h> - - static screen_t screen; - -@@ -2759,21 +2759,97 @@ - long nread; - unsigned long bytes_after, nitems; - unsigned char *data; -+ XTextProperty ct; - Atom actual_type; - int actual_fmt; -+ int dummy_count; -+ char **cl; -+ XEvent ev; -+ XWindowAttributes wa; -+ int setpropertyevent = 0; -+ -+ if (prop == None) { -+ prop = XInternAtom(Xdisplay, "VT_SELECTION", False); -+ -+ if (selection.type == 0) { -+ selection.type++; -+ XConvertSelection(Xdisplay, XA_PRIMARY, XA_UTF8_STRING(Xdisplay), prop, TermWin.vt,selection.request_time); -+ } else if (selection.type == 1) { -+ selection.type++; -+ XConvertSelection(Xdisplay, XA_PRIMARY, XA_STRING, prop, TermWin.vt,selection.request_time); -+ } -+ return; -+ } - -- if (prop == None) -- return; - for (nread = 0, bytes_after = 1; bytes_after > 0; nread += nitems) { - if ((XGetWindowProperty(Xdisplay, win, prop, (nread / 4), PROP_SIZE, -- Delete, AnyPropertyType, &actual_type, -- &actual_fmt, &nitems, &bytes_after, -- &data) != Success)) { -- XFree(data); -+ False, AnyPropertyType, &ct.encoding, &ct.format, -+ &ct.nitems, &bytes_after, &ct.value) != Success)) { -+ XFree(ct.value); - return; - } -- PasteIt(data, nitems); -- XFree(data); -+ -+ if (ct.encoding == XInternAtom(Xdisplay, "INCR", False)) { -+ /* -+ * This is an INCR (incremental large) paste -+ */ -+ XGetWindowAttributes(Xdisplay, win, &wa); -+ if ((wa.your_event_mask | PropertyChangeMask) != wa.your_event_mask) { -+ /* We need to register the PropertyNotify event */ -+ XSelectInput(Xdisplay, win, (wa.your_event_mask | PropertyChangeMask) ); -+ setpropertyevent = 1; -+ } -+ XDeleteProperty(Xdisplay, win, prop); -+ while (1) { -+ XWindowEvent(Xdisplay, win, PropertyChangeMask, &ev); -+ if (ev.xproperty.state != PropertyNewValue) -+ continue; -+ if ((XGetWindowProperty(Xdisplay, win, prop, 0, PROP_SIZE, -+ True, AnyPropertyType, &ct.encoding, &ct.format, -+ &ct.nitems, &bytes_after, &ct.value) != Success)) { -+ XFree(ct.value); -+ /* error */ -+ break; -+ } -+ -+ if (ct.nitems == 0) { -+ /* end of INCR transfer */ -+ XFree(ct.value); -+ break; -+ } -+ else { -+ if (XmbTextPropertyToTextList(Xdisplay, &ct, &cl, &dummy_count) == Success && cl) { -+ PasteIt(cl[0], strlen(cl[0])); -+ XFreeStringList(cl); -+ } else { -+ PasteIt(ct.value, (unsigned int)ct.nitems); -+ } -+ -+ XFree(ct.value); -+ } -+ } -+ if (setpropertyevent == 1) { -+ /* We need to unregister the PropertyNotify event */ -+ XGetWindowAttributes(Xdisplay, win, &wa); -+ XSelectInput(Xdisplay, win, (wa.your_event_mask ^ PropertyChangeMask)); -+ setpropertyevent = 0; -+ } -+ } else { -+ /* -+ * This is a normal 1-time paste -+ */ -+ if (Delete) { -+ XDeleteProperty(Xdisplay, win, prop); -+ } -+ -+ if (XmbTextPropertyToTextList(Xdisplay, &ct, &cl, &dummy_count) == Success && cl) { -+ PasteIt(cl[0], strlen(cl[0])); -+ XFreeStringList(cl); -+ } else { -+ PasteIt(ct.value, (unsigned int)ct.nitems); -+ } -+ XFree(ct.value); -+ } - } - } - -@@ -2787,6 +2863,11 @@ - selection_request(Time tm, int x, int y) - { - Atom prop; -+ Atom xa; -+ -+ xa = XInternAtom(Xdisplay, "COMPOUND_TEXT", False); -+ -+ selection.request_time = tm; - - if (!(Options & Opt_pasteMouseOutside)) - if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) -@@ -2798,8 +2879,8 @@ - selection_paste(Xroot, XA_CUT_BUFFER0, False); - } else { - prop = XInternAtom(Xdisplay, "VT_SELECTION", False); -- XConvertSelection(Xdisplay, XA_PRIMARY, XA_STRING, prop, TermWin.vt, -- tm); -+ selection.type = 0; -+ XConvertSelection(Xdisplay, XA_PRIMARY, xa, prop, TermWin.vt,tm); - } - } - -@@ -2828,7 +2909,7 @@ - */ - /* PROTO */ - void --selection_make(Time tm) -+selection_make(Time tm, unsigned int key_state) - { - int i, col, end_col, row, end_row; - unsigned char *new_selection_text; -@@ -2895,7 +2976,13 @@ - FREE(selection.text); - selection.text = new_selection_text; - -- XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm); -+ // selecting with ALT will put the text to clipboard -+ if (key_state & Mod1Mask) { -+ XSetSelectionOwner(Xdisplay, XA_CLIPBOARD(Xdisplay), TermWin.vt, tm); -+ } else { -+ XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm); -+ } -+ - if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt) - print_error("can't get primary selection"); - XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, -diff -Naur aterm-orig/src/screen.h aterm-0.4.2/src/screen.h ---- aterm-orig/src/screen.h 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/screen.h 2004-03-30 18:00:53.000000000 +0200 -@@ -88,6 +88,8 @@ - short screen; /* screen being used */ - short clicks; /* number of clicks */ - row_col_t beg, mark, end; -+ char type; -+ int request_time; - } selection_t; - - /* ------------------------------------------------------------------------- */ diff --git a/x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch b/x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch deleted file mode 100644 index f655a241fac0..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-copynpaste.patch +++ /dev/null @@ -1,120 +0,0 @@ -diff -Naur aterm-0.4.2-orig/configure aterm-0.4.2/configure ---- aterm-0.4.2-orig/configure 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/configure 2004-01-17 01:59:10.457046704 +0100 -@@ -2609,7 +2609,7 @@ - ; \ - do - ac_save_LIBS=$LIBS -- LIBS="-L$ac_dir -lXpm $LIBS -lX11" -+ LIBS="-L$ac_dir -lXpm $LIBS -lX11 -lXmu" - cat > conftest.$ac_ext <<EOF - #line 2615 "configure" - #include "confdefs.h" -diff -Naur aterm-0.4.2-orig/src/command.c aterm-0.4.2/src/command.c ---- aterm-0.4.2-orig/src/command.c 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/command.c 2004-01-17 01:59:10.481043056 +0100 -@@ -2653,7 +2653,7 @@ - switch (ev->xbutton.button) { - case Button1: - case Button3: -- selection_make(ev->xbutton.time); -+ selection_make(ev->xbutton.time, ev->xbutton.state); - break; - - case Button2: -diff -Naur aterm-0.4.2-orig/src/screen.c aterm-0.4.2/src/screen.c ---- aterm-0.4.2-orig/src/screen.c 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/screen.c 2004-01-17 01:59:36.316115528 +0100 -@@ -44,7 +44,7 @@ - - #include <X11/Xatom.h> - #include <X11/Xmd.h> /* get the typedef for CARD32 */ -- -+#include <X11/Xmu/Atoms.h> - - static screen_t screen; - -@@ -2759,21 +2759,34 @@ - long nread; - unsigned long bytes_after, nitems; - unsigned char *data; -+ XTextProperty ct; - Atom actual_type; - int actual_fmt; -+ int dummy_count; -+ char **cl; - - if (prop == None) - return; -+ - for (nread = 0, bytes_after = 1; bytes_after > 0; nread += nitems) { - if ((XGetWindowProperty(Xdisplay, win, prop, (nread / 4), PROP_SIZE, -- Delete, AnyPropertyType, &actual_type, -- &actual_fmt, &nitems, &bytes_after, -- &data) != Success)) { -- XFree(data); -+ Delete, AnyPropertyType, &ct.encoding, &ct.format, -+ &ct.nitems, &bytes_after, &ct.value) != Success)) { -+ XFree(ct.value); - return; - } -- PasteIt(data, nitems); -- XFree(data); -+ -+ if (XmbTextPropertyToTextList(Xdisplay, &ct, &cl, &dummy_count) == Success && cl) { -+ PasteIt(cl[0], strlen(cl[0])); -+ XFreeStringList(cl); -+ } else { -+ PasteIt(ct.value, (unsigned int)ct.nitems); -+ } -+ -+ nread += ct.nitems; -+ -+ if (ct.value) -+ XFree(ct.value); - } - } - -@@ -2787,6 +2800,9 @@ - selection_request(Time tm, int x, int y) - { - Atom prop; -+ Atom xa; -+ -+ xa = XInternAtom(Xdisplay, "COMPOUND_TEXT", False); - - if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) - return; /* outside window */ -@@ -2797,7 +2813,7 @@ - selection_paste(Xroot, XA_CUT_BUFFER0, False); - } else { - prop = XInternAtom(Xdisplay, "VT_SELECTION", False); -- XConvertSelection(Xdisplay, XA_PRIMARY, XA_STRING, prop, TermWin.vt, -+ XConvertSelection(Xdisplay, XA_PRIMARY, xa, prop, TermWin.vt, - tm); - } - } -@@ -2827,7 +2843,7 @@ - */ - /* PROTO */ - void --selection_make(Time tm) -+selection_make(Time tm, unsigned int key_state) - { - int i, col, end_col, row, end_row; - unsigned char *new_selection_text; -@@ -2894,7 +2910,13 @@ - FREE(selection.text); - selection.text = new_selection_text; - -- XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm); -+ // selecting with ALT will put the text to clipboard -+ if (key_state & Mod1Mask) { -+ XSetSelectionOwner(Xdisplay, XA_CLIPBOARD(Xdisplay), TermWin.vt, tm); -+ } else { -+ XSetSelectionOwner(Xdisplay, XA_PRIMARY, TermWin.vt, tm); -+ } -+ - if (XGetSelectionOwner(Xdisplay, XA_PRIMARY) != TermWin.vt) - print_error("can't get primary selection"); - XChangeProperty(Xdisplay, Xroot, XA_CUT_BUFFER0, XA_STRING, 8, diff --git a/x11-terms/aterm/files/aterm-0.4.2-internal-border.patch b/x11-terms/aterm/files/aterm-0.4.2-internal-border.patch deleted file mode 100644 index d39f6cb7c149..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-internal-border.patch +++ /dev/null @@ -1,80 +0,0 @@ -diff -Naur aterm-0.4.2/src/main.c aterm-0.4.2-spock/src/main.c ---- aterm-0.4.2/src/main.c 2005-01-18 14:40:55.000000000 +0100 -+++ aterm-0.4.2-spock/src/main.c 2005-01-18 14:42:35.000000000 +0100 -@@ -838,7 +838,7 @@ - Resize_menuBar(x, 0, width, y); - } - } -- XMoveResizeWindow(Xdisplay, TermWin.vt, x, y, width, height + 1); -+ XMoveResizeWindow(Xdisplay, TermWin.vt, x, y, width, (height < 0xffff) ? height + 1 : height); - - if (old_width) - Gr_Resize(old_width, old_height); -@@ -1634,6 +1634,7 @@ - rs_minBufferWidth = NULL; - rs_saveLines = NULL; /* scrollback buffer [lines] */ - rs_borderWidth = NULL; -+ rs_internal_border = NULL; - rs_modifier = NULL; /* modifier */ - #if defined (HOTKEY_CTRL) || defined (HOTKEY_META) - /* recognized when combined with HOTKEY */ -@@ -1771,6 +1772,12 @@ - else - TermWin.borderWidth = t; - -+ if (!rs_internal_border|| (t = atoi(rs_internal_border)) < 0) -+ TermWin_internalBorder = 2; -+ else -+ TermWin_internalBorder = t; -+ TermWin_internalBorders = 2 * TermWin_internalBorder; -+ - /* no point having a scrollbar without having any scrollback! */ - if (!TermWin.saveLines) - Options &= ~Opt_scrollBar; -diff -Naur aterm-0.4.2/src/rxvt.h aterm-0.4.2-spock/src/rxvt.h ---- aterm-0.4.2/src/rxvt.h 2005-01-18 14:40:55.000000000 +0100 -+++ aterm-0.4.2-spock/src/rxvt.h 2005-01-18 14:41:50.000000000 +0100 -@@ -603,10 +603,6 @@ - #define scrollBar_esc 30 - #define menuBar_margin 2 /* margin below text */ - --/* gap between text and window edges (could be configurable) */ --#define TermWin_internalBorder 2 --#define TermWin_internalBorders 4 /* must be two times of value above */ -- - /* width of scrollBar, menuBar shadow, must be 1 or 2 */ - #ifdef HALFSHADOW - # define SHADOW 1 -@@ -944,6 +940,12 @@ - extern Window ParentWin[PARENTS_NUM]; - extern int ParentWinNum; - -+/* gap between text and window edges (could be configurable) */ -+EXTERN int TermWin_internalBorder; -+/* must be two times of value above */ -+EXTERN int TermWin_internalBorders; -+ -+ - EXTERN scrollBar_t scrollBar; - EXTERN menuBar_t menuBar; - EXTERN Display *Xdisplay; -@@ -968,6 +970,7 @@ - EXTERN const char *rs_minBufferWidth; /* minimum buffer width - so we can scroll horizontally */ - EXTERN const char *rs_saveLines; /* scrollback buffer [lines] */ - EXTERN const char *rs_borderWidth; /* border width [pixels] */ -+EXTERN const char *rs_internal_border; /* internal border width [pixels] */ - EXTERN const char *rs_cutchars; /* chars for selection boundaries */ - #ifdef META8_OPTION - EXTERN const char *rs_modifier; -diff -Naur aterm-0.4.2/src/xdefaults.c aterm-0.4.2-spock/src/xdefaults.c ---- aterm-0.4.2/src/xdefaults.c 2005-01-18 14:40:28.000000000 +0100 -+++ aterm-0.4.2-spock/src/xdefaults.c 2005-01-18 14:41:50.000000000 +0100 -@@ -302,6 +302,8 @@ - "pointer color"), - STRG(rs_borderWidth, "borderWidth", "bw", "number", - "width of border"), -+ STRG(rs_internal_border, "internalBorder", "ib", "number", -+ "width of the internal border"), - STRG(rs_color[Color_border], "borderColor", "bd", "color", - "border color"), - BOOL(rs_borderLess, "borderLess", "bl", Opt_borderLess, "no decoration"), diff --git a/x11-terms/aterm/files/aterm-0.4.2-ja-savelines.patch b/x11-terms/aterm/files/aterm-0.4.2-ja-savelines.patch deleted file mode 100644 index 53fae0f0377a..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-ja-savelines.patch +++ /dev/null @@ -1,130 +0,0 @@ -diff -Naur aterm-0.4.2-ja/src/main.c aterm-0.4.2-ja-savelines/src/main.c ---- aterm-0.4.2-ja/src/main.c 2004-07-13 19:53:44.000000000 +0200 -+++ aterm-0.4.2-ja-savelines/src/main.c 2004-07-13 19:51:04.000000000 +0200 -@@ -1589,6 +1589,7 @@ - int saved_argc = argc; - char **saved_argv = (char **)MALLOC((argc + 1) * sizeof(char *)); - -+ int t; - - PixColors = &(PixColorsFocused[0]); - -@@ -1768,16 +1769,27 @@ - rs_title = rs_name; - if (!rs_iconName) - rs_iconName = rs_title; -- if (!rs_minBufferWidth || (TermWin.min_bcol = atoi(rs_minBufferWidth)) < 0) -- TermWin.min_bcol = 1; -- if (!rs_saveLines || (TermWin.saveLines = atoi(rs_saveLines)) < 0) -- TermWin.saveLines = SAVELINES; -+ if (!rs_minBufferWidth || (t = atoi(rs_minBufferWidth)) < 0) -+ TermWin.min_bcol = 1; -+ else -+ TermWin.min_bcol = t; -+ -+ if (!rs_saveLines || (t = atoi(rs_saveLines)) < 0) -+ TermWin.saveLines = SAVELINES; -+ else -+ TermWin.saveLines = t; -+ -+ if (!rs_borderWidth || (t = atoi(rs_borderWidth)) < 0) -+ TermWin.borderWidth = BORDERWIDTH; -+ else -+ TermWin.borderWidth = t; -+ - #ifdef USE_LINESPACE -- if (!rs_lineSpace || (TermWin.lineSpace = atoi(rs_lineSpace)) < 0) -+ if (!rs_lineSpace || (t = atoi(rs_lineSpace)) < 0) - TermWin.lineSpace = LINESPACE; -+ else -+ TermWin.lineSpace = t; - #endif -- if (!rs_borderWidth || (TermWin.borderWidth = atoi(rs_borderWidth)) < 0) -- TermWin.borderWidth = BORDERWIDTH; - - /* no point having a scrollbar without having any scrollback! */ - if (!TermWin.saveLines) -diff -Naur aterm-0.4.2-ja/src/rxvt.h aterm-0.4.2-ja-savelines/src/rxvt.h ---- aterm-0.4.2-ja/src/rxvt.h 2004-07-13 19:53:44.000000000 +0200 -+++ aterm-0.4.2-ja-savelines/src/rxvt.h 2004-07-13 19:45:41.000000000 +0200 -@@ -259,7 +259,7 @@ - - - typedef struct { -- R_int16_t width, /* window width [pixels] */ -+ R_u_int16_t width, /* window width [pixels] */ - height, /* window height [pixels] */ - fwidth, /* font width [pixels] */ - fheight, /* font height [pixels] */ -diff -Naur aterm-0.4.2-ja/src/screen.c aterm-0.4.2-ja-savelines/src/screen.c ---- aterm-0.4.2-ja/src/screen.c 2004-07-13 19:53:44.000000000 +0200 -+++ aterm-0.4.2-ja-savelines/src/screen.c 2004-07-13 19:45:41.000000000 +0200 -@@ -239,12 +239,13 @@ - - if (TermWin.bcol == prev_bcol && TermWin.nrow == prev_nrow) - return; -- -+#if 0 - #ifdef DEBUG_STRICT - assert(TermWin.saveLines >= 0); - #else /* drive with your eyes closed */ - MAX_IT(TermWin.saveLines, 0); - #endif -+#endif - - total_rows = TermWin.nrow + TermWin.saveLines; - prev_total_rows = prev_nrow + TermWin.saveLines; -@@ -754,7 +755,10 @@ - return 0; - - if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) { -- TermWin.nscrolled += count; -+ if (TermWin.saveLines - TermWin.nscrolled < count) -+ TermWin.nscrolled += TermWin.saveLines - TermWin.nscrolled; -+ else -+ TermWin.nscrolled += count; - MIN_IT(TermWin.nscrolled, TermWin.saveLines); - } else if (!spec) - row1 += TermWin.saveLines; -@@ -1868,15 +1872,17 @@ - int - scr_move_to(int y, int len) - { -- int start; -+ int start, t; - - start = TermWin.view_start; -- TermWin.view_start = ((len - y) * (TermWin.nrow - 1 + TermWin.nscrolled) -+ t = ((len - y) * (TermWin.nrow - 1 + TermWin.nscrolled) - / (len)) - (TermWin.nrow - 1); -- D_SCREEN((stderr, "scr_move_to(%d, %d) view_start:%d", y, len, TermWin.view_start)); -+ D_SCREEN((stderr, "scr_move_to(%d, %d) view_start:%d", y, len, t)); - -- MAX_IT(TermWin.view_start, 0); -- MIN_IT(TermWin.view_start, TermWin.nscrolled); -+ MAX_IT(t, 0); -+ MIN_IT(t, TermWin.nscrolled); -+ -+ TermWin.view_start = t; - - if (Gr_Displayed()) - Gr_scroll(0); -@@ -1899,8 +1905,16 @@ - start = TermWin.view_start; - MAX_IT(nlines, 1); - MIN_IT(nlines, TermWin.nrow); -- TermWin.view_start += (nlines * dirn); -- MAX_IT(TermWin.view_start, 0); -+ -+ if ((dirn == -1 && TermWin.view_start < nlines)) -+ TermWin.view_start = 0; -+ else -+ TermWin.view_start += (nlines * dirn); -+ -+ if (dirn == 1 && start > TermWin.view_start) -+ TermWin.view_start = TermWin.nscrolled; -+ -+// MAX_IT(TermWin.view_start, 0); - MIN_IT(TermWin.view_start, TermWin.nscrolled); - - if (Gr_Displayed()) diff --git a/x11-terms/aterm/files/aterm-0.4.2-paste.patch b/x11-terms/aterm/files/aterm-0.4.2-paste.patch deleted file mode 100644 index 8d887b9acc59..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-paste.patch +++ /dev/null @@ -1,59 +0,0 @@ ---- aterm-0.4.2-orig/src/screen.c 2001-09-06 12:38:07.000000000 -0400 -+++ aterm-0.4.2/src/screen.c 2003-09-11 02:45:54.000000000 -0400 -@@ -3328,10 +3330,21 @@ - void - selection_send(XSelectionRequestEvent * rq) - { -+ /* Changes are from rxvt. This fixes #205040. */ - XEvent ev; -- Atom32 target_list[2]; -+ Atom32 target_list[4]; -+ Atom target; - static Atom xa_targets = None; -- -+ static Atom xa_compound_text = None; -+ static Atom xa_text = None; -+ XTextProperty ct; -+ XICCEncodingStyle style; -+ char *cl[4]; -+ -+ if (xa_text == None) -+ xa_text = XInternAtom(Xdisplay, "TEXT", False); -+ if (xa_compound_text == None) -+ xa_compound_text = XInternAtom(Xdisplay, "COMPOUND_TEXT", False); - if (xa_targets == None) - xa_targets = XInternAtom(Xdisplay, "TARGETS", False); - -@@ -3346,14 +3359,29 @@ - if (rq->target == xa_targets) { - target_list[0] = (Atom32) xa_targets; - target_list[1] = (Atom32) XA_STRING; -+ target_list[2] = (Atom32) xa_text; -+ target_list[3] = (Atom32) xa_compound_text; - XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target, - (8 * sizeof(target_list[0])), PropModeReplace, - (unsigned char *)target_list, - (sizeof(target_list) / sizeof(target_list[0]))); - ev.xselection.property = rq->property; -- } else if (rq->target == XA_STRING) { -- XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target, -- 8, PropModeReplace, selection.text, selection.len); -+ } else if (rq->target == XA_STRING -+ || rq->target == xa_compound_text -+ || rq->target == xa_text) { -+ if (rq->target == XA_STRING) { -+ style = XStringStyle; -+ target = XA_STRING; -+ } else { -+ target = xa_compound_text; -+ style = (rq->target == xa_compound_text) ? XCompoundTextStyle -+ : XStdICCTextStyle; -+ } -+ cl[0] = selection.text; -+ XmbTextListToTextProperty(Xdisplay, cl, 1, style, &ct); -+ XChangeProperty(Xdisplay, rq->requestor, rq->property, -+ target, 8, PropModeReplace, -+ ct.value, ct.nitems); - ev.xselection.property = rq->property; - } - XSendEvent(Xdisplay, rq->requestor, False, 0, &ev); diff --git a/x11-terms/aterm/files/aterm-0.4.2-paste_mouse_outside.patch b/x11-terms/aterm/files/aterm-0.4.2-paste_mouse_outside.patch deleted file mode 100644 index ae31a0e8730a..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-paste_mouse_outside.patch +++ /dev/null @@ -1,135 +0,0 @@ -diff -Naur aterm-0.4.2-orig/doc/aterm.1 aterm-0.4.2/doc/aterm.1 ---- aterm-0.4.2-orig/doc/aterm.1 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/doc/aterm.1 2004-01-17 01:52:18.792629208 +0100 -@@ -227,6 +227,9 @@ - .IP "\fB-st\fP|\fB+st\fP" - Display scrollbar without/with a trough; - resource \fBscrollBar_floating\fP\&. -+.IP "\fB-pmo\fP|\fB+pmo\fP" -+Enable pasting when mouse pointer is outside the aterm window; -+resource \fBpasteMouseOutside\fP\&. - .IP "\fB-iconic\fP" - Start iconified, if the window manager supports that option\&. - .IP "\fB-sl\fP \fInumber\fP" -@@ -708,6 +711,8 @@ - option \fB-vb\fP\&. - \fBFalse\fP: no visual bell [default]; - option \fB+vb\fP\&. -+.IP "\fBpasteMouseOutside:\fP \fIboolean\fP" -+\fBTrue\fP: enable text pasting when mouse pointer is outside the window; - .IP "\fBloginShell:\fP \fIboolean\fP" - \fBTrue\fP: start as a login shell by prepending a `-\' to \fBargv[0]\fP - of the shell; -diff -Naur aterm-0.4.2-orig/doc/aterm.html aterm-0.4.2/doc/aterm.html ---- aterm-0.4.2-orig/doc/aterm.html 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/doc/aterm.html 2004-01-17 01:52:18.828623736 +0100 -@@ -284,6 +284,9 @@ - <li><strong><strong>-st</strong>|<strong>+st</strong></strong> - Display scrollbar without/with a trough; - resource <strong>scrollBar_floating</strong>. -+ <li><strong><strong>-pmo</strong>|<strong>+pmo</strong></strong> -+ Enable pasting when mouse pointer is outside the aterm window; -+ resource <strong>pasteMouseOutside</strong>. - <li><strong><strong>-iconic</strong></strong> - Start iconified, if the window manager supports that option. - <li><strong><strong>-sl</strong> <em>number</em></strong> -@@ -544,6 +547,8 @@ - option <strong>-vb</strong>. - <strong>False</strong>: no visual bell [default]; - option <strong>+vb</strong>. -+ <li><strong><strong>pasteMouseOutside:</strong> <em>boolean</em></strong> -+ <strong>True</strong>: enable text pasting when mouse pointer is outside the window. - <li><strong><strong>loginShell:</strong> <em>boolean</em></strong> - <strong>True</strong>: start as a login shell by prepending a `-' to <strong>argv[0]</strong> - of the shell; -diff -Naur aterm-0.4.2-orig/doc/aterm.html.in aterm-0.4.2/doc/aterm.html.in ---- aterm-0.4.2-orig/doc/aterm.html.in 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/doc/aterm.html.in 2004-01-17 01:52:18.831623280 +0100 -@@ -284,6 +284,9 @@ - <li><strong><strong>-st</strong>|<strong>+st</strong></strong> - Display scrollbar without/with a trough; - resource <strong>scrollBar_floating</strong>. -+ <li><strong><strong>-pmo</strong>|<strong>+pmo</strong></strong> -+ Enable pasting when mouse pointer is outside the aterm window; -+ resource <strong>pasteMouseOutside</strong>. - <li><strong><strong>-iconic</strong></strong> - Start iconified, if the window manager supports that option. - <li><strong><strong>-sl</strong> <em>number</em></strong> -@@ -544,6 +547,8 @@ - option <strong>-vb</strong>. - <strong>False</strong>: no visual bell [default]; - option <strong>+vb</strong>. -+ <li><strong><strong>pasteMouseOutside:</strong> <em>boolean</em></strong> -+ <strong>True</strong>: enable text pasting when mouse pointer is outside the window. - <li><strong><strong>loginShell:</strong> <em>boolean</em></strong> - <strong>True</strong>: start as a login shell by prepending a `-' to <strong>argv[0]</strong> - of the shell; -diff -Naur aterm-0.4.2-orig/doc/aterm.pretbl aterm-0.4.2/doc/aterm.pretbl ---- aterm-0.4.2-orig/doc/aterm.pretbl 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/doc/aterm.pretbl 2004-01-17 01:52:18.846621000 +0100 -@@ -223,6 +223,9 @@ - .IP "\fB-st\fP|\fB+st\fP" - Display scrollbar without/with a trough; - resource \fBscrollBar_floating\fP\&. -+.IP "\fB-pmo\fP|\fB+pmo\fP" -+Enable pasting when mouse pointer is outside the aterm window; -+resource \fBpasteMouseOutside\fP\&. - .IP "\fB-iconic\fP" - Start iconified, if the window manager supports that option\&. - .IP "\fB-sl\fP \fInumber\fP" -@@ -472,6 +475,8 @@ - option \fB-vb\fP\&. - \fBFalse\fP: no visual bell [default]; - option \fB+vb\fP\&. -+.IP "\fBpasteMouseOutside:\fP \fIboolean\fP" -+\fBTrue\fP: enable text pasting when mouse pointer is outside the window; - .IP "\fBloginShell:\fP \fIboolean\fP" - \fBTrue\fP: start as a login shell by prepending a `-\' to \fBargv[0]\fP - of the shell; -diff -Naur aterm-0.4.2-orig/src/rxvt.h aterm-0.4.2/src/rxvt.h ---- aterm-0.4.2-orig/src/rxvt.h 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/rxvt.h 2004-01-17 01:52:28.755114680 +0100 -@@ -689,6 +689,7 @@ - #define Opt_scrollTtyOutputInh (1LU<<11) - #define Opt_scrollKeypress (1LU<<12) - #define Opt_transparent (1LU<<13) -+#define Opt_pasteMouseOutside (1LU<<15) - #define Opt_transparent_sb (1LU<<14) - - /* place holder used for parsing command-line options */ -diff -Naur aterm-0.4.2-orig/src/screen.c aterm-0.4.2/src/screen.c ---- aterm-0.4.2-orig/src/screen.c 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/screen.c 2004-01-17 01:52:18.866617960 +0100 -@@ -2788,8 +2788,9 @@ - { - Atom prop; - -- if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) -- return; /* outside window */ -+ if (!(Options & Opt_pasteMouseOutside)) -+ if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) -+ return; /* outside window */ - - if (selection.text != NULL) { - PasteIt(selection.text, selection.len); /* internal selection */ -diff -Naur aterm-0.4.2-orig/src/xdefaults.c aterm-0.4.2/src/xdefaults.c ---- aterm-0.4.2-orig/src/xdefaults.c 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/xdefaults.c 2004-01-17 01:52:18.868617656 +0100 -@@ -57,6 +57,8 @@ - static const char *rs_transparent_sb = NULL; - #endif - -+static const char *rs_paste_mouse_outside = NULL; -+ - #ifdef DONT_TILE_PIXMAP_OPTION - static const char *rs_dontTilePixmap = NULL; - static const char *rs_dontTilePixmapH = NULL; -@@ -215,6 +217,8 @@ - BOOL(rs_transparent_sb, "transpscrollbar", "trsb", Opt_transparent_sb, - "transparent scrollbar"), - #endif -+ BOOL(rs_paste_mouse_outside, "pasteMouseOutside", "pmo", Opt_pasteMouseOutside, -+ "paste with mouse when pointer is outside the window"), - #endif - #if (MENUBAR_MAX) - RSTRG(rs_menu, "menu", "name[;tag]"), diff --git a/x11-terms/aterm/files/aterm-0.4.2-patch-pack000.patch b/x11-terms/aterm/files/aterm-0.4.2-patch-pack000.patch deleted file mode 100644 index 768a5031f37b..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-patch-pack000.patch +++ /dev/null @@ -1,140 +0,0 @@ -diff -Naur aterm-0.4.2-orig/src/command.c aterm-0.4.2/src/command.c ---- aterm-0.4.2-orig/src/command.c 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/command.c 2004-01-31 20:13:29.442207872 +0100 -@@ -975,6 +975,8 @@ - signal(SIGTERM, Exit_signal); - signal(SIGCHLD, Child_signal); - -+ tt_winsize(ptyfd); /* set window size */ -+ - /* need to trap SIGURG for SVR4 (Unixware) rlogin */ - /* signal (SIGURG, SIG_DFL); */ - -@@ -1014,7 +1016,6 @@ - } - #endif /* SRIOCSREDIR */ - } -- tt_winsize(0); /* set window size */ - - /* reset signals and spin off the command interpreter */ - signal(SIGINT, SIG_DFL); -@@ -2025,19 +2026,21 @@ - - /* See if we can read from the application */ - if (FD_ISSET(cmd_fd, &readfds)) { -- unsigned int count = BUFSIZ; -+ int n; -+ unsigned int count; - - cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; -- -- /* while (count > sizeof(cmdbuf_base) / 2) */ -- while (count) { -- int n = read(cmd_fd, cmdbuf_endp, count); -- -- if (n <= 0) -+ for (count = BUFSIZ; count; count -= n, cmdbuf_endp += n) -+ if ((n = read(cmd_fd, cmdbuf_endp, count)) > 0) -+ continue; -+ else if (n == 0 || (n < 0 && errno == EAGAIN)) - break; -- cmdbuf_endp += n; -- count -= n; -- } -+ else { -+#if !defined (HAVE_ATEXIT) && !defined (__sun__) -+ clean_exit(); -+#endif -+ exit(EXIT_SUCCESS); -+ } - /* some characters read in */ - if (count != BUFSIZ) - goto Return_Char; -@@ -2116,6 +2119,11 @@ - + (MEvent.clicks > 1 ? 8 : 0) - #endif - ) << 2); -+ /* Report mouse wheel events. */ -+ if (ev->button == Button4 || ev->button == Button5) { -+ key_state |= 1 << 6; -+ button_number = ev->button - Button4; -+ } - } - - #ifdef DEBUG_MOUSEREPORT -@@ -2315,10 +2323,7 @@ - if( TermWin.background.trgType != BGT_None ) - { - SetSrcPixmap(currentRPixmap); -- RenderPixmap(1); -- /* don't want to check if pixmap is valid -- it's unlikely that user would set it to -- something bogus. */ -+ RenderPixmap(0); - } - scr_clear(); - scr_touch(); -@@ -2623,6 +2628,9 @@ - Gr_ButtonRelease(ev->xbutton.x, ev->xbutton.y); - else { - if (reportmode) { -+ /* Don't report release events for the mouse wheel */ -+ if (ev->xbutton.button == Button4 || ev->xbutton.button == Button5) -+ return; - /* mouse report from vt window */ - #ifdef MOUSE_REPORT_DOUBLECLICK - /* only report the release of 'slow' single clicks */ -diff -Naur aterm-0.4.2-orig/src/main.c aterm-0.4.2/src/main.c ---- aterm-0.4.2-orig/src/main.c 2001-09-06 18:38:07.000000000 +0200 -+++ aterm-0.4.2/src/main.c 2004-01-31 20:13:29.432209392 +0100 -@@ -129,11 +129,6 @@ - - /*}}} */ - --/* have we changed the font? Needed to avoid raceconditions -- * while window resizing */ --static int font_change_count = 0; -- -- - /*----------------------------------------------------------------------*/ - /* ARGSUSED */ - /* PROTO */ -@@ -917,12 +912,6 @@ - int x, y; - unsigned int border, depth, width, height, vt_width, vt_height; - --/* do we come from an fontchange? */ -- if (font_change_count > 0) { -- font_change_count--; -- return; -- } -- - resize_window1((ev->xconfigure).width, (ev->xconfigure).height); - - #if defined(TRANSPARENT) || defined(BACKGROUND_IMAGE) || defined(_MYSTYLE_) -@@ -936,17 +925,11 @@ - { - unsigned w, h; - XEvent evt ; -- int bNoTint = 0 ; - /* that is to make it working smooth with AfterStep shading*/ - if( XCheckMaskEvent(Xdisplay, StructureNotifyMask, &evt )) - { -- /* printf( "\n there are more ConfigureNotifyEvents there !");*/ -- if( evt.xany.type == ConfigureNotify ) bNoTint = 1 ; - XPutBackEvent( Xdisplay, &evt ); - } -- if( bNoTint ) -- scr_clear_tint(0); /* no tinting for faster redraw */ -- else - { - int abs_x, abs_y; - static int old_abs_x=0, old_abs_y=0, -@@ -1417,7 +1400,6 @@ - szHint.flags = PMinSize | PResizeInc | PBaseSize | PWinGravity; - - if (!init) { -- font_change_count++; - resize(); - } - return; diff --git a/x11-terms/aterm/files/aterm-0.4.2-qtpaste.patch b/x11-terms/aterm/files/aterm-0.4.2-qtpaste.patch deleted file mode 100644 index dff3b995ccdf..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-qtpaste.patch +++ /dev/null @@ -1,70 +0,0 @@ ---- aterm-0.4.2-orig/src/screen.c 2001-09-06 12:38:07.000000000 -0400 -+++ aterm-0.4.2/src/screen.c 2003-09-11 02:45:54.000000000 -0400 -@@ -2788,8 +2788,10 @@ - { - Atom prop; - -+#if 0 /* make shift-insert with the mouse outside the window work (#77338) */ - if (x < 0 || x >= TermWin.width || y < 0 || y >= TermWin.height) - return; /* outside window */ -+#endif - - if (selection.text != NULL) { - PasteIt(selection.text, selection.len); /* internal selection */ -@@ -3328,10 +3330,21 @@ - void - selection_send(XSelectionRequestEvent * rq) - { -+ /* Changes are from rxvt. This fixes #205040. */ - XEvent ev; -- Atom32 target_list[2]; -+ Atom32 target_list[4]; -+ Atom target; - static Atom xa_targets = None; -- -+ static Atom xa_compound_text = None; -+ static Atom xa_text = None; -+ XTextProperty ct; -+ XICCEncodingStyle style; -+ char *cl[4]; -+ -+ if (xa_text == None) -+ xa_text = XInternAtom(Xdisplay, "TEXT", False); -+ if (xa_compound_text == None) -+ xa_compound_text = XInternAtom(Xdisplay, "COMPOUND_TEXT", False); - if (xa_targets == None) - xa_targets = XInternAtom(Xdisplay, "TARGETS", False); - -@@ -3346,14 +3359,29 @@ - if (rq->target == xa_targets) { - target_list[0] = (Atom32) xa_targets; - target_list[1] = (Atom32) XA_STRING; -+ target_list[2] = (Atom32) xa_text; -+ target_list[3] = (Atom32) xa_compound_text; - XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target, - (8 * sizeof(target_list[0])), PropModeReplace, - (unsigned char *)target_list, - (sizeof(target_list) / sizeof(target_list[0]))); - ev.xselection.property = rq->property; -- } else if (rq->target == XA_STRING) { -- XChangeProperty(Xdisplay, rq->requestor, rq->property, rq->target, -- 8, PropModeReplace, selection.text, selection.len); -+ } else if (rq->target == XA_STRING -+ || rq->target == xa_compound_text -+ || rq->target == xa_text) { -+ if (rq->target == XA_STRING) { -+ style = XStringStyle; -+ target = XA_STRING; -+ } else { -+ target = xa_compound_text; -+ style = (rq->target == xa_compound_text) ? XCompoundTextStyle -+ : XStdICCTextStyle; -+ } -+ cl[0] = selection.text; -+ XmbTextListToTextProperty(Xdisplay, cl, 1, style, &ct); -+ XChangeProperty(Xdisplay, rq->requestor, rq->property, -+ target, 8, PropModeReplace, -+ ct.value, ct.nitems); - ev.xselection.property = rq->property; - } - XSendEvent(Xdisplay, rq->requestor, False, 0, &ev); diff --git a/x11-terms/aterm/files/aterm-0.4.2-savelines.patch b/x11-terms/aterm/files/aterm-0.4.2-savelines.patch deleted file mode 100644 index adcc76b68b89..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-savelines.patch +++ /dev/null @@ -1,121 +0,0 @@ -diff -Naur aterm-0.4.2/src/main.c aterm-0.4.2-new/src/main.c ---- aterm-0.4.2/src/main.c 2004-07-12 15:16:50.000000000 +0200 -+++ aterm-0.4.2-new/src/main.c 2004-07-12 13:37:52.000000000 +0200 -@@ -1582,6 +1582,7 @@ - int saved_argc = argc; - char **saved_argv = (char **)MALLOC((argc + 1) * sizeof(char *)); - -+ int t; - - PixColors = &(PixColorsFocused[0]); - -@@ -1754,12 +1755,21 @@ - rs_title = rs_name; - if (!rs_iconName) - rs_iconName = rs_title; -- if (!rs_minBufferWidth || (TermWin.min_bcol = atoi(rs_minBufferWidth)) < 0) -+ -+ if (!rs_minBufferWidth || (t = atoi(rs_minBufferWidth)) < 0) - TermWin.min_bcol = 1; -- if (!rs_saveLines || (TermWin.saveLines = atoi(rs_saveLines)) < 0) -- TermWin.saveLines = SAVELINES; -- if (!rs_borderWidth || (TermWin.borderWidth = atoi(rs_borderWidth)) < 0) -+ else -+ TermWin.min_bcol = t; -+ -+ if (!rs_saveLines || (t = atoi(rs_saveLines)) < 0) -+ TermWin.saveLines = SAVELINES; -+ else -+ TermWin.saveLines = t; -+ -+ if (!rs_borderWidth || (t = atoi(rs_borderWidth)) < 0) - TermWin.borderWidth = BORDERWIDTH; -+ else -+ TermWin.borderWidth = t; - - /* no point having a scrollbar without having any scrollback! */ - if (!TermWin.saveLines) -diff -Naur aterm-0.4.2/src/rxvt.h aterm-0.4.2-new/src/rxvt.h ---- aterm-0.4.2/src/rxvt.h 2004-07-12 15:16:50.000000000 +0200 -+++ aterm-0.4.2-new/src/rxvt.h 2004-07-12 12:32:09.000000000 +0200 -@@ -259,7 +259,7 @@ - - - typedef struct { -- R_int16_t width, /* window width [pixels] */ -+ R_u_int16_t width, /* window width [pixels] */ - height, /* window height [pixels] */ - fwidth, /* font width [pixels] */ - fheight, /* font height [pixels] */ -diff -Naur aterm-0.4.2/src/screen.c aterm-0.4.2-new/src/screen.c ---- aterm-0.4.2/src/screen.c 2004-07-12 15:16:50.000000000 +0200 -+++ aterm-0.4.2-new/src/screen.c 2004-07-12 15:20:02.029447392 +0200 -@@ -236,12 +236,13 @@ - - if (TermWin.bcol == prev_bcol && TermWin.nrow == prev_nrow) - return; -- -+#if 0 - #ifdef DEBUG_STRICT - assert(TermWin.saveLines >= 0); - #else /* drive with your eyes closed */ - MAX_IT(TermWin.saveLines, 0); - #endif -+#endif - - total_rows = TermWin.nrow + TermWin.saveLines; - prev_total_rows = prev_nrow + TermWin.saveLines; -@@ -751,7 +752,10 @@ - return 0; - - if ((count > 0) && (row1 == 0) && (current_screen == PRIMARY)) { -- TermWin.nscrolled += count; -+ if (TermWin.saveLines - TermWin.nscrolled < count) -+ TermWin.nscrolled += TermWin.saveLines - TermWin.nscrolled; -+ else -+ TermWin.nscrolled += count; - MIN_IT(TermWin.nscrolled, TermWin.saveLines); - } else if (!spec) - row1 += TermWin.saveLines; -@@ -1865,15 +1869,17 @@ - int - scr_move_to(int y, int len) - { -- int start; -+ int start, t; - - start = TermWin.view_start; -- TermWin.view_start = ((len - y) * (TermWin.nrow - 1 + TermWin.nscrolled) -+ t = ((len - y) * (TermWin.nrow - 1 + TermWin.nscrolled) - / (len)) - (TermWin.nrow - 1); -- D_SCREEN((stderr, "scr_move_to(%d, %d) view_start:%d", y, len, TermWin.view_start)); -+ D_SCREEN((stderr, "scr_move_to(%d, %d) view_start:%d", y, len, t)); - -- MAX_IT(TermWin.view_start, 0); -- MIN_IT(TermWin.view_start, TermWin.nscrolled); -+ MAX_IT(t, 0); -+ MIN_IT(t, TermWin.nscrolled); -+ -+ TermWin.view_start = t; - - if (Gr_Displayed()) - Gr_scroll(0); -@@ -1896,8 +1902,16 @@ - start = TermWin.view_start; - MAX_IT(nlines, 1); - MIN_IT(nlines, TermWin.nrow); -- TermWin.view_start += (nlines * dirn); -- MAX_IT(TermWin.view_start, 0); -+ -+ if ((dirn == -1 && TermWin.view_start < nlines)) -+ TermWin.view_start = 0; -+ else -+ TermWin.view_start += (nlines * dirn); -+ -+ if (dirn == 1 && start > TermWin.view_start) -+ TermWin.view_start = TermWin.nscrolled; -+ -+// MAX_IT(TermWin.view_start, 0); - MIN_IT(TermWin.view_start, TermWin.nscrolled); - - if (Gr_Displayed()) diff --git a/x11-terms/aterm/files/aterm-0.4.2-scroll-double-free.patch b/x11-terms/aterm/files/aterm-0.4.2-scroll-double-free.patch deleted file mode 100644 index 997de5962424..000000000000 --- a/x11-terms/aterm/files/aterm-0.4.2-scroll-double-free.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff -Naur aterm-0.4.2-orig/src/screen.c aterm-0.4.2/src/screen.c ---- aterm-0.4.2-orig/src/screen.c 2005-02-06 22:15:49.000000000 +0100 -+++ aterm-0.4.2/src/screen.c 2005-02-06 22:16:58.000000000 +0100 -@@ -448,6 +448,8 @@ - for (i = 0; i < total_rows; i++) { - if (screen.text[i]) { /* then so is screen.rend[i] */ - FREE(screen.text[i]); -+ } -+ if (screen.rend[i]) { - FREE(screen.rend[i]); - } - } -@@ -784,6 +786,8 @@ - if (count > 0) { - /* A: scroll up */ - -+ void *t; -+ - MIN_IT(count, row2 - row1 + 1); - /* A1: Copy lines that will get clobbered by the rotation */ - for (i = 0, j = row1; i < count; i++, j++) { -@@ -793,9 +797,13 @@ - } - /* A2: Rotate lines */ - for (j = row1; (j + count) <= row2; j++) { -- screen.text[j] = screen.text[j + count]; -+ t = screen.text[j + count]; -+ screen.text[j + count] = NULL; -+ screen.text[j] = t; - screen.tlen[j] = screen.tlen[j + count]; -- screen.rend[j] = screen.rend[j + count]; -+ t = screen.rend[j + count]; -+ screen.rend[j + count] = NULL; -+ screen.rend[j] = t; - } - /* A3: Resurrect lines */ - for (i = 0; i < count; i++, j++) { -@@ -805,6 +813,7 @@ - } - } else if (count < 0) { - /* B: scroll down */ -+ void *t; - - count = min(-count, row2 - row1 + 1); - /* B1: Copy lines that will get clobbered by the rotation */ -@@ -815,9 +824,13 @@ - } - /* B2: Rotate lines */ - for (j = row2; (j - count) >= row1; j--) { -- screen.text[j] = screen.text[j - count]; -+ t = screen.text[j - count]; -+ screen.text[j - count] = NULL; -+ screen.text[j] = t; - screen.tlen[j] = screen.tlen[j - count]; -- screen.rend[j] = screen.rend[j - count]; -+ t = screen.rend[j - count]; -+ screen.rend[j - count] = NULL; -+ screen.rend[j] = t; - } - /* B3: Resurrect lines */ - for (i = 0, j = row1; i < count; i++, j++) { diff --git a/x11-terms/aterm/files/aterm-1.00-beta2-bgfix.patch b/x11-terms/aterm/files/aterm-1.00-beta2-bgfix.patch deleted file mode 100644 index 30e970a61892..000000000000 --- a/x11-terms/aterm/files/aterm-1.00-beta2-bgfix.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Naur aterm-1.00.beta2/src/pixmap.c aterm-1.00.beta2-bgfix/src/pixmap.c ---- aterm-1.00.beta2/src/pixmap.c 2004-12-14 22:10:55.000000000 +0100 -+++ aterm-1.00.beta2-bgfix/src/pixmap.c 2005-05-02 13:02:59.000000000 +0200 -@@ -833,8 +833,8 @@ - { - XGCValues gcvalue; - GC gc; -- unsigned int width = TermWin_TotalWidth(); -- unsigned int height = TermWin_TotalHeight(); -+ unsigned int width = TermWin_TotalWidth() + TermWin.fwidth;; -+ unsigned int height = TermWin_TotalHeight() + TermWin.fheight; - unsigned int fin_width, fin_height ; - int (*oldXErrorHandler) (Display *, XErrorEvent *) ; - |