Attachment #79177 for bug #113782

View | Details | Raw Unified | Return to bug 113782
Collapse All | Expand All

Lines 7-13 Link Here

(-)Makefile (-1 / +1 lines)
7		7
8	PORTNAME= mrxvt-devel	8	PORTNAME= mrxvt-devel
9	PORTVERSION= 0.5.2	9	PORTVERSION= 0.5.2
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= x11	11	CATEGORIES= x11
12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
13	MASTER_SITE_SUBDIR= materm	13	MASTER_SITE_SUBDIR= materm




--- src/init.c.orig	Sat Jun 16 23:26:00 2007
+++ src/init.c	Sat Jun 16 23:26:19 2007
--- src/init.c	(revision 195)
+++ src/init.c	(working copy)
@@ -41,7 +41,7 @@
 # define DEBUG_X
 #else

 #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;




--- 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);
 




--- 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__




--- 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,

Return to bug 113782

Lines 1-7 Link Here

(-)files/patch-src-init.c (-4 / +21 lines)
1	Index: src/init.c	1	--- src/init.c.orig Sat Jun 16 23:26:00 2007
2	===================================================================	2	+++ src/init.c Sat Jun 16 23:26:19 2007
3	--- src/init.c (revision 195)
4	+++ src/init.c (working copy)
5	@@ -41,7 +41,7 @@	3	@@ -41,7 +41,7 @@
6	# define DEBUG_X	4	# define DEBUG_X
7	#else	5	#else
Lines 11-13 Link Here
11	#endif	9	#endif
12		10
13	#if DEBUG_LEVEL	11	#if DEBUG_LEVEL
		12	@@ -3369,6 +3369,18 @@
		13	wm_hint.initial_state = ISSET_OPTION(r, Opt_iconic) ? IconicState
		14	: NormalState;
		15	wm_hint.window_group = r->TermWin.parent;
		16	+
		17	+ /* window icon hint */
		18	+ if( r->h->rs[Rs_appIcon] ) {
		19	+ XpmReadFileToPixmap(r->Xdisplay, r->TermWin.parent, r->h->rs[Rs_appIcon],
		20	+ &r->h->appIcon, &r->h->appIconMask,0);
		21	+ }
		22	+ if( r->h->appIcon != None && r->h->appIconMask != None ) {
		23	+ wm_hint.icon_pixmap = r->h->appIcon;
		24	+ wm_hint.icon_mask = r->h->appIconMask;
		25	+ wm_hint.flags \|= IconPixmapHint \| IconMaskHint;
		26	+ }
		27	+
		28	/* class hints */
		29	class_hint.res_name = (char*) r->h->rs[Rs_name];
		30	class_hint.res_class = (char*) APL_CLASS;

Added Link Here

(-)files/patch-src-main.c (+28 lines)
1	--- src/main.c.orig Sun Oct 1 23:50:39 2006
2	+++ src/main.c Sat Jun 16 23:10:08 2007
3	@@ -562,6 +562,17 @@
4	# endif
5	# endif
6
7	+ if( NOT_NULL( r->h->appIcon ) )
8	+ {
9	+ XFreePixmap (r->Xdisplay, r->h->appIcon);
10	+ SET_NULL(r->h->appIcon);
11	+ }
12	+ if( NOT_NULL( r->h->appIconMask ) )
13	+ {
14	+ XFreePixmap (r->Xdisplay, r->h->appIconMask);
15	+ SET_NULL(r->h->appIconMask);
16	+ }
17	+
18	if (IS_CURSOR(r->term_pointer))
19	{
20	XFreeCursor (r->Xdisplay, r->term_pointer);
21	@@ -599,6 +610,7 @@
22	SET_NULL(r->xftColors);
23	}
24	# endif
25	+
26	rxvt_free (r->h); SET_NULL(r->h);
27	rxvt_free (r); SET_NULL(r);
28

Added Link Here

(-)files/patch-src-rxvt.h (+23 lines)
1	--- src/rxvt.h.orig Sun Oct 1 23:50:38 2006
2	+++ src/rxvt.h Sat Jun 16 23:10:15 2007
3	@@ -1109,9 +1109,7 @@
4
5	#ifdef BACKGROUND_IMAGE
6	Rs_tabbarPixmap, /* tabbar background pixmap */
7	-# if 0 /* appicon not yet implemented */
8	Rs_appIcon, /* use pixmap as application icon */
9	-# endif
10	#endif
11
12	#ifdef HAVE_MENUBAR
13	@@ -1704,6 +1702,10 @@
14	succesfully grabbed
15	at prevPos */
16	#endif
17	+
18	+ Pixmap appIcon;
19	+ Pixmap appIconMask;
20	+
21	};
22
23	#ifndef __attribute__

Added Link Here

(-)files/patch-src-xdefaults.c (+12 lines)
1	--- src/xdefaults.c.orig Sun Oct 1 23:50:37 2006
2	+++ src/xdefaults.c Sat Jun 16 23:10:19 2007
3	@@ -234,9 +234,7 @@
4	STRG(Rs_tabbarPixmap, "tabbarPixmap", "tbpixmap", "file[;geom]", "tabbar background image", 0),
5	BOOL( "tabUsePixmap", "tupixmap", Opt_tabPixmap,
6	"use tabbar background image for tabs" ),
7	-# if 0 /* App icon not yet implemented */
8	STRG(Rs_appIcon, "appIcon", "ic", "file[;geom]", "application icon file", 0),
9	-#endif
10	#endif /* BACKGROUND_IMAGE */
11
12	BOOL( "utmpInhibit", "ut", Opt_utmpInhibit,