cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

make XPM icons work at 16 & 24 bpp and enable XPM support

Browse Source
This commit is contained in:
matthieu 1999-07-16 22:03:00 +00:00
parent 2392d0fe5a
commit 0baa3b125e
4 changed files with 48 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
x11/olvwm/patches/patch-02
View File

@ -1,5 +1,5 @@
--- Imakefile.orig Mon Jan 24 16:45:05 1994 --- Imakefile.orig Mon Jan 24 22:45:05 1994
+++ Imakefile Tue Sep 29 22:12:06 1998 +++ Imakefile Fri Jul 16 22:18:41 1999
@@ -45,8 +45,8 @@ @@ -45,8 +45,8 @@
/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT /**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
@ -7,7 +7,7 @@
-MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4 -MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
- -
+#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4 +#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
+MORECCFLAGS= -DOW_I18N_L3 -DSHAPE -DREGEXP +MORECCFLAGS= -DXPM -DOW_I18N_L3 -DSHAPE -DREGEXP
/**/# /**/#
/**/# Set MORELDFLAGS to any link options you want. Be sure to add -lxpm if you /**/# Set MORELDFLAGS to any link options you want. Be sure to add -lxpm if you
/**/# want to include XPM support. For a generic Solaris 1.x /**/# want to include XPM support. For a generic Solaris 1.x
@ -18,10 +18,19 @@
-MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl -MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
- -
+#MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl +#MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
+MORELDFLAGS=-L${OPENWINHOME}/lib -lcompat +MORELDFLAGS=-L${OPENWINHOME}/lib -lcompat -lXpm
/**/# No more changes needed /**/# No more changes needed
@@ -67,7 +67,7 @@
DEFINES = $(MORECCFLAGS)
SYS_LIBRARIES = -ll -lm
-INCLUDES = -I$(HEADER_DEST) -I$(TOP) $(XPMINCDIR)
+INCLUDES = -I$(HEADER_DEST) -I$(TOP) -I$(XPMINCDIR)
DEPLIBS =
LOCAL_LIBRARIES = $(MORELDFLAGS) $(OLGXLIB) $(XLIB)
@@ -139,7 +139,9 @@ @@ -139,7 +139,9 @@
@for i in $(MANPAGES) ;\ @for i in $(MANPAGES) ;\
do \ do \

17
x11/olvwm/patches/patch-18
View File

@ -1,5 +1,5 @@
--- pixmap.c.orig Thu Jan 13 16:36:12 1994 --- pixmap.c.orig Thu Jan 13 22:36:12 1994
+++ pixmap.c Tue Sep 29 22:08:30 1998 +++ pixmap.c Fri Jul 16 22:19:54 1999
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
*/ */
@ -13,6 +13,8 @@
#include <X11/XWDFile.h> #include <X11/XWDFile.h>
#ifdef XPM #ifdef XPM
-#include <xpm.h>
-#endif
+#ifndef NO_PIXEL_FIX +#ifndef NO_PIXEL_FIX
+/* The problem with xpm.h is that it includes <X11/Intrinsic.h> to get +/* The problem with xpm.h is that it includes <X11/Intrinsic.h> to get
+ * the typedef for Pixel. Intrinsic.h, however, also typedefs Boolean + * the typedef for Pixel. Intrinsic.h, however, also typedefs Boolean
@ -25,8 +27,7 @@
+#define _XtIntrinsic_h +#define _XtIntrinsic_h
+typedef unsigned long Pixel; /* Index into colormap */ +typedef unsigned long Pixel; /* Index into colormap */
+#endif /* NO_PIXEL_FIX */ +#endif /* NO_PIXEL_FIX */
#include <xpm.h> +#include <X11/xpm.h>
-#endif
+#endif XPM +#endif XPM
#include "i18n.h" #include "i18n.h"
@ -39,3 +40,11 @@
int ncolors; int ncolors;
XColor *colors; XColor *colors;
Colormap *colormap; Colormap *colormap;
@@ -612,6 +625,7 @@
&(pixinfo->pixmap),
(Pixmap *)0, /* ignore shape mask for now */
&xpmAttr)) != PixmapSuccess) {
+ fprintf(stderr, "olvwm: XpmRedFileToPixmap failed\n");
goto FAILURE;
}
pixinfo->width = xpmAttr.width;

11
x11/olvwm/patches/patch-27 Normal file
View File

@ -0,0 +1,11 @@
--- winipane.c.orig Thu Jan 13 22:36:26 1994
+++ winipane.c Fri Jul 16 23:42:24 1999
@@ -120,6 +120,8 @@
#else
switch(winInfo->iconDepth) {
case 8:
+ case 16:
+ case 24:
XCopyArea(dpy, winInfo->iconPixmap, pane, gc,
0, 0, winInfo->core.width, winInfo->core.height,
0, 0);

11
x11/olvwm/patches/patch-28 Normal file
View File

@ -0,0 +1,11 @@
--- usermenu.c.orig Thu Jan 13 22:36:21 1994
+++ usermenu.c Fri Jul 16 22:20:49 1999
@@ -122,7 +122,7 @@
#define _XtIntrinsic_h
typedef unsigned long Pixel; /* Index into colormap */
#endif /* NO_PIXEL_FIX */
-#include <xpm.h>
+#include <X11/xpm.h>
#endif XPM
#include <assert.h>