- Add a application icon to mrxvt. (by Stanislav Mekhanoshin <rampitec AT gmail.com> )

- Bump PORTREVISION

PR:		113782
Submitted by:	Lars Engels <lars.engels@0x20.net> (maintainer)

5 files changed, 85 insertions, 5 deletions

diff --git a/x11/mrxvt-devel/Makefile b/x11/mrxvt-devel/Makefile
index 0556dcf92e89..e718b743c02f 100644
--- a/x11/mrxvt-devel/Makefile
+++ b/x11/mrxvt-devel/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mrxvt-devel
 PORTVERSION=	0.5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	materm
diff --git a/x11/mrxvt-devel/files/patch-src-init.c b/x11/mrxvt-devel/files/patch-src-init.c
index ca2f9789c978..741d774d4aed 100644
--- a/x11/mrxvt-devel/files/patch-src-init.c
+++ b/x11/mrxvt-devel/files/patch-src-init.c
@@ -1,7 +1,5 @@
-Index: src/init.c
-===================================================================
---- src/init.c	(revision 195)
-+++ src/init.c	(working copy)
+--- src/init.c.orig	Sat Jun 16 23:26:00 2007
++++ src/init.c	Sat Jun 16 23:26:19 2007
 @@ -41,7 +41,7 @@
  # define DEBUG_X
  #else
@@ -11,3 +9,22 @@ Index: src/init.c
  #endif
  
  #if DEBUG_LEVEL
+@@ -3369,6 +3369,18 @@
+     wm_hint.initial_state = ISSET_OPTION(r, Opt_iconic) ? IconicState
+ 			    : NormalState;
+     wm_hint.window_group = r->TermWin.parent;
++
++    /* window icon hint */
++    if( r->h->rs[Rs_appIcon] ) {
++        XpmReadFileToPixmap(r->Xdisplay, r->TermWin.parent, r->h->rs[Rs_appIcon],
++            &r->h->appIcon, &r->h->appIconMask,0);
++    }
++    if( r->h->appIcon != None &&  r->h->appIconMask != None ) {
++        wm_hint.icon_pixmap = r->h->appIcon;
++        wm_hint.icon_mask = r->h->appIconMask;
++        wm_hint.flags |= IconPixmapHint | IconMaskHint;
++    }
++    
+     /* class hints */
+     class_hint.res_name = (char*) r->h->rs[Rs_name];
+     class_hint.res_class = (char*) APL_CLASS;
diff --git a/x11/mrxvt-devel/files/patch-src-main.c b/x11/mrxvt-devel/files/patch-src-main.c
new file mode 100644
index 000000000000..b2e76efcddad
--- /dev/null
+++ b/x11/mrxvt-devel/files/patch-src-main.c
@@ -0,0 +1,28 @@
+--- src/main.c.orig	Sun Oct  1 23:50:39 2006
++++ src/main.c	Sat Jun 16 23:10:08 2007
+@@ -562,6 +562,17 @@
+ #  endif
+ # endif
+ 
++    if( NOT_NULL( r->h->appIcon ) )
++    {
++        XFreePixmap (r->Xdisplay, r->h->appIcon);
++        SET_NULL(r->h->appIcon);
++    }
++    if( NOT_NULL( r->h->appIconMask ) )
++    {
++        XFreePixmap (r->Xdisplay, r->h->appIconMask);
++        SET_NULL(r->h->appIconMask);
++    }
++
+     if (IS_CURSOR(r->term_pointer))
+     {
+ 	XFreeCursor (r->Xdisplay, r->term_pointer);
+@@ -599,6 +610,7 @@
+ 	SET_NULL(r->xftColors);
+     }
+ # endif
++
+     rxvt_free (r->h);		    SET_NULL(r->h);
+     rxvt_free (r);		    SET_NULL(r);
+ 
diff --git a/x11/mrxvt-devel/files/patch-src-rxvt.h b/x11/mrxvt-devel/files/patch-src-rxvt.h
new file mode 100644
index 000000000000..6915a879d582
--- /dev/null
+++ b/x11/mrxvt-devel/files/patch-src-rxvt.h
@@ -0,0 +1,23 @@
+--- src/rxvt.h.orig	Sun Oct  1 23:50:38 2006
++++ src/rxvt.h	Sat Jun 16 23:10:15 2007
+@@ -1109,9 +1109,7 @@
+ 
+ #ifdef BACKGROUND_IMAGE
+     Rs_tabbarPixmap,	/* tabbar background pixmap */
+-# if 0 /* appicon not yet implemented */
+     Rs_appIcon,		/* use pixmap as application icon */
+-# endif
+ #endif
+ 
+ #ifdef HAVE_MENUBAR
+@@ -1704,6 +1702,10 @@
+ 							   succesfully grabbed
+ 							   at prevPos */
+ #endif
++
++    Pixmap          appIcon;
++    Pixmap          appIconMask;
++
+ };
+ 
+ #ifndef __attribute__
diff --git a/x11/mrxvt-devel/files/patch-src-xdefaults.c b/x11/mrxvt-devel/files/patch-src-xdefaults.c
new file mode 100644
index 000000000000..61c504b024f3
--- /dev/null
+++ b/x11/mrxvt-devel/files/patch-src-xdefaults.c
@@ -0,0 +1,12 @@
+--- src/xdefaults.c.orig	Sun Oct  1 23:50:37 2006
++++ src/xdefaults.c	Sat Jun 16 23:10:19 2007
+@@ -234,9 +234,7 @@
+     STRG(Rs_tabbarPixmap, "tabbarPixmap", "tbpixmap", "file[;geom]", "tabbar background image", 0),
+     BOOL( "tabUsePixmap", "tupixmap", Opt_tabPixmap,
+ 	    "use tabbar background image for tabs" ),
+-# if 0 /* App icon not yet implemented */
+     STRG(Rs_appIcon, "appIcon", "ic", "file[;geom]", "application icon file", 0),
+-#endif
+ #endif	/* BACKGROUND_IMAGE */
+ 
+     BOOL( "utmpInhibit", "ut", Opt_utmpInhibit,