Attachment #52655 for bug #79746

Lines 7-13 Link Here

(-)Makefile (-3 / +1 lines)
7		7
8	PORTNAME= wsoundprefs	8	PORTNAME= wsoundprefs
9	PORTVERSION= 1.1.1	9	PORTVERSION= 1.1.1
10	PORTREVISION= 1	10	PORTREVISION= 2
11	CATEGORIES= audio windowmaker	11	CATEGORIES= audio windowmaker
12	MASTER_SITES= ${MASTER_SITE_NETBSD}	12	MASTER_SITES= ${MASTER_SITE_NETBSD}
13	DISTNAME= WSoundPrefs-${PORTVERSION}	13	DISTNAME= WSoundPrefs-${PORTVERSION}
Lines 15-22 Link Here
15	MAINTAINER= ports@FreeBSD.org	15	MAINTAINER= ports@FreeBSD.org
16	COMMENT= A utility for configuring sounds to play for Window Maker events	16	COMMENT= A utility for configuring sounds to play for Window Maker events
17		17
18	BROKEN= "Does not build with new version of windowmaker"
19
20	BUILD_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker	18	BUILD_DEPENDS= wmaker:${PORTSDIR}/x11-wm/windowmaker
21	LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \	19	LIB_DEPENDS= PropList.2:${PORTSDIR}/devel/libPropList \
22	wsound.1:${PORTSDIR}/audio/wsoundserver	20	wsound.1:${PORTSDIR}/audio/wsoundserver

Lines 1-5 Link Here

(-)files/patch-ab (-5 / +8 lines)
1	--- src/Imakefile.orig Mon Oct 18 17:35:58 1999	1	--- src/Imakefile.orig Mon Oct 18 18:35:58 1999
2	+++ src/Imakefile Sun Dec 10 17:09:01 2000	2	+++ src/Imakefile Sat Apr 9 17:20:36 2005
3	@@ -5,9 +5,9 @@	3	@@ -5,9 +5,9 @@
4		4
5	ICONS = WSoundPrefs.xpm WSoundPrefs.tiff	5	ICONS = WSoundPrefs.xpm WSoundPrefs.tiff
Lines 12-18 Link Here
12		12
13	XCOMM EFENCELIB = -lefence	13	XCOMM EFENCELIB = -lefence
14	EFENCELIB =	14	EFENCELIB =
15	@@ -18,9 +18,9 @@	15	@@ -18,19 +18,19 @@
16	WRASTERCFLAGS = `get-wraster-flags --cflags`	16	WRASTERCFLAGS = `get-wraster-flags --cflags`
17	WRASTERLFLAGS = `get-wraster-flags --lflags`	17	WRASTERLFLAGS = `get-wraster-flags --lflags`
18	WRASTERLIBS = `get-wraster-flags --libs`	18	WRASTERLIBS = `get-wraster-flags --libs`
Lines 24-31 Link Here
24	+STD_INCLUDES = $(WRASTERCFLAGS) -I${LOCALBASE}/include -I${X11BASE}/include -I${X11BASE}/include/WINGs	24	+STD_INCLUDES = $(WRASTERCFLAGS) -I${LOCALBASE}/include -I${X11BASE}/include -I${X11BASE}/include/WINGs
25	DEPLIBS = $(DEPXLIB)	25	DEPLIBS = $(DEPXLIB)
26		26
27	LOCAL_LIBRARIES = $(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB)	27	-LOCAL_LIBRARIES = $(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB)
28	@@ -30,7 +30,7 @@	28	+LOCAL_LIBRARIES = $(XLIB) $(WINGSLIBS) $(WSOUNDLFLAGS) $(WSOUNDLIBS) $(WRASTERLFLAGS) $(WRASTERLIBS) $(EFENCELIB) $(FONTCONFIGLIB) $(XFTLIB)
		29
		30	LINTLIBS = $(LINTXLIB)
		31
29	SRCS = PLFunctions.c SoundEvents.c SoundPaths.c SystemInfo.c WSoundPrefs.c main.c	32	SRCS = PLFunctions.c SoundEvents.c SoundPaths.c SystemInfo.c WSoundPrefs.c main.c
30	OBJS = PLFunctions.o SoundEvents.o SoundPaths.o SystemInfo.o WSoundPrefs.o main.o	33	OBJS = PLFunctions.o SoundEvents.o SoundPaths.o SystemInfo.o WSoundPrefs.o main.o
31		34




--- src/SoundPaths.c.orig	Mon Jun 14 17:28:21 1999
+++ src/SoundPaths.c	Sun Apr 10 21:41:00 2005
@@ -42,7 +42,8 @@
 	Panel		*panel = (Panel*)WMGetHangedData(lPtr);
 	WMScreen	*scr = WMWidgetScreen(lPtr);
 	Display		*dpy = WMScreenDisplay(scr);
-	
+	WMColor		*gray = WMGrayColor(scr);
+
 	width = rect->size.width;
 	height = rect->size.height;
 	x = rect->pos.x;
@@ -50,13 +51,16 @@
 	
 	if (state & WLDSSelected)
 		XFillRectangle(dpy, d, WMColorGC(panel->white), x, y, width, height);
-	else
-		XClearArea(dpy, d, x, y, width, height, False);
+	else 
+		XFillRectangle(dpy, d, WMColorGC(gray), x, y, width, height);
+	
 
 	if (state & 1)
-		WMDrawString(scr, d, WMColorGC(panel->red), panel->font, x+4, y, text, strlen(text));
+		WMDrawString(scr, d, panel->red, panel->font, x+4, y, text, strlen(text));
 	else
-		WMDrawString(scr, d, WMColorGC(panel->black), panel->font, x+4, y,text, strlen(text));
+		WMDrawString(scr, d, panel->black, panel->font, x+4, y,text, strlen(text));
+
+	WMReleaseColor(gray);
 }
 
 void
@@ -71,6 +75,7 @@
 			wwarning(_("bad value in option SoundPath. Using default path list"));
 		addPathToList(panel->sndL, -1, "~/GNUstep/Library/WindowMaker/Sounds");
 		addPathToList(panel->sndL, -1, "/usr/local/share/WindowMaker/Sounds");

 	} else {
 		for (i=0; i<PLGetNumberOfElements(array); i++) {
 			val = PLGetArrayElement(array, i);
@@ -91,6 +92,7 @@
 			wwarning(_("bad value in option SoundSetPath. Using default path list"));
 		addPathToList(panel->sndsetL, -1, "~/GNUstep/Library/WindowMaker/SoundSets");
 		addPathToList(panel->sndsetL, -1, "/usr/local/share/WindowMaker/SoundSets");
+		addPathToList(panel->sndsetL, -1, "/usr/X11R6/share/WindowMaker/SoundSets");
 	} else {
 		for (i=0; i<PLGetNumberOfElements(array); i++) {
 			val = PLGetArrayElement(array, i);

Return to bug 79746

Lines 1-6 Link Here

(-)files/patch-ac (-11 / +34 lines)
1	--- src/SoundPaths.c.orig Sat Jun 19 02:08:04 1999	1	--- src/SoundPaths.c.orig Mon Jun 14 17:28:21 1999
2	+++ src/SoundPaths.c Sat Jun 19 23:23:41 1999	2	+++ src/SoundPaths.c Sun Apr 10 21:41:00 2005
3	@@ -71,6 +71,7 @@	3	@@ -42,7 +42,8 @@
		4	Panel panel = (Panel)WMGetHangedData(lPtr);
		5	WMScreen *scr = WMWidgetScreen(lPtr);
		6	Display *dpy = WMScreenDisplay(scr);
		7	-
		8	+ WMColor *gray = WMGrayColor(scr);
		9	+
		10	width = rect->size.width;
		11	height = rect->size.height;
		12	x = rect->pos.x;
		13	@@ -50,13 +51,16 @@
		14
		15	if (state & WLDSSelected)
		16	XFillRectangle(dpy, d, WMColorGC(panel->white), x, y, width, height);
		17	- else
		18	- XClearArea(dpy, d, x, y, width, height, False);
		19	+ else
		20	+ XFillRectangle(dpy, d, WMColorGC(gray), x, y, width, height);
		21	+
		22
		23	if (state & 1)
		24	- WMDrawString(scr, d, WMColorGC(panel->red), panel->font, x+4, y, text, strlen(text));
		25	+ WMDrawString(scr, d, panel->red, panel->font, x+4, y, text, strlen(text));
		26	else
		27	- WMDrawString(scr, d, WMColorGC(panel->black), panel->font, x+4, y,text, strlen(text));
		28	+ WMDrawString(scr, d, panel->black, panel->font, x+4, y,text, strlen(text));
		29	+
		30	+ WMReleaseColor(gray);
		31	}
		32
		33	void
		34	@@ -71,6 +75,7 @@
4	wwarning(_("bad value in option SoundPath. Using default path list"));	35	wwarning(_("bad value in option SoundPath. Using default path list"));
5	addPathToList(panel->sndL, -1, "~/GNUstep/Library/WindowMaker/Sounds");	36	addPathToList(panel->sndL, -1, "~/GNUstep/Library/WindowMaker/Sounds");
6	addPathToList(panel->sndL, -1, "/usr/local/share/WindowMaker/Sounds");	37	addPathToList(panel->sndL, -1, "/usr/local/share/WindowMaker/Sounds");
Lines 8-18 Link Here
8	} else {	39	} else {
9	for (i=0; i<PLGetNumberOfElements(array); i++) {	40	for (i=0; i<PLGetNumberOfElements(array); i++) {
10	val = PLGetArrayElement(array, i);	41	val = PLGetArrayElement(array, i);
11	@@ -91,6 +92,7 @@
12	wwarning(_("bad value in option SoundSetPath. Using default path list"));
13	addPathToList(panel->sndsetL, -1, "~/GNUstep/Library/WindowMaker/SoundSets");
14	addPathToList(panel->sndsetL, -1, "/usr/local/share/WindowMaker/SoundSets");
15	+ addPathToList(panel->sndsetL, -1, "/usr/X11R6/share/WindowMaker/SoundSets");
16	} else {
17	for (i=0; i<PLGetNumberOfElements(array); i++) {
18	val = PLGetArrayElement(array, i);