Added borderless patch.

5 files changed, 222 insertions, 5 deletions

diff --git a/x11-terms/aterm/ChangeLog b/x11-terms/aterm/ChangeLog
index 67c5248c66ab..c6f7dbf584ce 100644
--- a/x11-terms/aterm/ChangeLog
+++ b/x11-terms/aterm/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for x11-terms/aterm
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.13 2003/10/02 14:59:11 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/ChangeLog,v 1.14 2003/10/31 18:08:28 nakano Exp $
+
+*aterm-0.4.2-r5 (31 Oct 2003)
+
+  31 Oct 2003; Masatomo Nakano <nakano@gentoo.org> aterm-0.4.2-r5.ebuild,
+  files/aterm-0.4.2-borderless.patch:
+  Added a pacth to allow for a borderless aterm.
+  Thanks to Rob Kruus <crowbar@netcom.ca>. Close #32387
+
+*aterm-0.4.2-r4 (19 Jan 2003)
 
   02 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> aterm-0.4.2-r4.ebuild:
   Install man page. This closes Bug #30042
@@ -8,8 +17,6 @@
   11 Mar 2003; Daniel Ahlberg <aliz@gentoo.org> aterm-0.4.2-r3.ebuild aterm-0.4.2-r4.ebuild :
   Chmod and chown aterm bin. Closes #15548.
 
-*aterm-0.4.2-r4 (19 Jan 2003)
-
   27 Mar 2003; Masatomo Nakano <nakano@genoo.org> aterm-0.4.2-r4.ebuild:
   Marked as stable.
 
diff --git a/x11-terms/aterm/Manifest b/x11-terms/aterm/Manifest
index c4192da536bc..0b417b62ba4b 100644
--- a/x11-terms/aterm/Manifest
+++ b/x11-terms/aterm/Manifest
@@ -1,5 +1,5 @@
-MD5 d3c8fde7a439e0ad49f1fd69b35c328e aterm-0.4.2-r5.ebuild 1678
-MD5 8b0b60949c22d3383a2f8b559b27519e ChangeLog 2317
+MD5 e50de4507048571e8371727823a89ad0 aterm-0.4.2-r5.ebuild 1680
+MD5 16139f1169d4fcb6cd38412b35a709b6 ChangeLog 2567
 MD5 2d93bf72ffa2ddabf05b54d5717cbd93 aterm-0.4.2-r4.ebuild 1626
 MD5 1109dcca55994f56324dc3b15ca2d04b files/aterm-0.4.2-borderless.patch 4692
 MD5 4f1a0f3cc352be6439ac5810085e1be0 files/digest-aterm-0.4.2-r5 128
diff --git a/x11-terms/aterm/aterm-0.4.2-r5.ebuild b/x11-terms/aterm/aterm-0.4.2-r5.ebuild
new file mode 100644
index 000000000000..01a511d4fe41
--- /dev/null
+++ b/x11-terms/aterm/aterm-0.4.2-r5.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-terms/aterm/aterm-0.4.2-r5.ebuild,v 1.1 2003/10/31 18:08:28 nakano Exp $
+
+IUSE="cjk"
+S=${WORKDIR}/${P}
+DESCRIPTION="A terminal emulator with transparency support as well as rxvt backwards compatibility"
+SRC_URI="mirror://sourceforge/aterm/${P}.tar.bz2
+	cjk? (http://wakaba.com/~tsann/aterm/aterm-0.4.2-ja.patch)"
+HOMEPAGE="http://aterm.sourceforge.net"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc ~alpha"
+
+DEPEND="media-libs/jpeg
+	media-libs/libpng
+	virtual/x11"
+
+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
+
+	cd ${S}
+	epatch ${FILESDIR}/aterm-0.4.2-borderless.patch
+	use cjk && epatch ${DISTDIR}/aterm-0.4.2-ja.patch
+}
+
+src_compile() {
+	local myconf
+
+	# 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
+
+	emake || die
+}
+
+src_install () {
+	make DESTDIR=${D} install || die
+
+	fperms g+s /usr/bin/aterm
+	fowners root:utmp /usr/bin/aterm
+
+	doman doc/aterm.1
+	dodoc ChangeLog INSTALL doc/BUGS doc/FAQ doc/README.*
+	docinto menu
+	dodoc doc/menu/*
+	dohtml -r .
+}
diff --git a/x11-terms/aterm/files/aterm-0.4.2-borderless.patch b/x11-terms/aterm/files/aterm-0.4.2-borderless.patch
new file mode 100644
index 000000000000..28083c36802b
--- /dev/null
+++ b/x11-terms/aterm/files/aterm-0.4.2-borderless.patch
@@ -0,0 +1,140 @@
+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<<15)
+ 
+ /* 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/digest-aterm-0.4.2-r5 b/x11-terms/aterm/files/digest-aterm-0.4.2-r5
new file mode 100644
index 000000000000..a1aafd5e085e
--- /dev/null
+++ b/x11-terms/aterm/files/digest-aterm-0.4.2-r5
@@ -0,0 +1,2 @@
+MD5 5c29d0cde4225bdbd63ccb6a4dd94c56 aterm-0.4.2.tar.bz2 243419
+MD5 2bd8629ea2a1926bca13841b0aca6604 aterm-0.4.2-ja.patch 84282