1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
|
--- Imakefile.orig Mon Oct 26 09:16:54 1998
+++ Imakefile Mon Oct 26 09:27:43 1998
@@ -48,8 +48,10 @@
/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DIDENT
/**/# For a generic Solaris 2.x system, I'd suggest
-MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
+/**/#MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DSVR4 -DSYSV -DIDENT -x O4
+/**/# For FreeBSD
+MORECCFLAGS=-DOW_I18N_L3 -DSHAPE -DMAXPID=30000 -DREGEXP -DXPM
/**/#
/**/# 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
@@ -57,8 +59,11 @@
/**/#MORELDFLAGS=-L${OPENWINHOME}/lib
/**/#
/**/# For Solaris 2.x, I'd suggest
-MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
+/**/#MORELDFLAGS=-L${OPENWINHOME}/lib -R ${OPENWINHOME}/lib -lintl
+/**/# For FreeBSD
+MORELDFLAGS=-L$(USRLIBDIR) -lXpm
+XPMINCDIR=-I$(INCROOT)/X11
/**/# No more changes needed
@@ -72,6 +77,7 @@
SYS_LIBRARIES = -ll -lm
INCLUDES = -I$(HEADER_DEST) -I$(TOP) $(XPMINCDIR)
DEPLIBS =
+EXTENSIONLIB = -lXext
LOCAL_LIBRARIES = $(MORELDFLAGS) $(OLGXLIB) $(XLIB)
HEADERS = cmdstream.h cursors.h debug.h defaults.h dsdm.h environ.h error.h \
@@ -115,26 +121,29 @@
${HEADERS} ${BITMAPS} ${SRCS} \
${MISC} ${INFOFILES} ${MANPAGES} ${SCRIPTS}
-ComplexProgramTarget(olvwm)
-
-#if NeedMenuFile
-InstallNonExecList($(MISC),$(LIBRARY_DEST))
-#endif
+depend:: olvwmrc.c
parse.c: parse.l
- lex -t parse.l > parse.c
+ $(LEX) $(LFALGS) parse.l
+ $(MV) lex.yy.c parse.c
-olvwmrc.c: olvwmrc.y
- yacc olvwmrc.y
- mv y.tab.c olvwmrc.c
+olvwmrc.c: parse.c olvwmrc.y
+ $(YACC) olvwmrc.y
+ $(MV) y.tab.c olvwmrc.c
olvwmrc.o: parse.c olvwmrc.c
+ComplexProgramTarget(olvwm)
+
+#if NeedMenuFile
+InstallNonExecList($(MISC),$(LIBRARY_DEST))
+#endif
+
version.c: ${SRCS} ${HEADERS}
@echo '#ident "@(#)olvwm version compiled '`date`'"' > version.c
clean::
- /bin/rm -f parse.c olvwmrc.c version.c
+ /bin/rm -f parse.c olvwmrc.c version.c .depend
install.man:: $(MANPAGES)
@if [ -d $(DESTDIR)$(MANDIR) ]; then set +x; \
@@ -142,7 +151,11 @@
@for i in $(MANPAGES) ;\
do \
echo "installing $$i"; \
+ $(RM) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX)* ; \
$(INSTALL) -c $(INSTMANFLAGS) $$i $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \
+ $(COMPRESSMANCMD) $(DESTDIR)$(MANDIR)/`basename $$i .man`.$(MANSUFFIX) ; \
done
+
+depend:: olvwmrc.c
#include <XView.prog>
--- defaults.c.orig Thu Jan 13 15:36:03 1994
+++ defaults.c Mon Oct 19 12:52:39 1998
@@ -30,9 +30,7 @@
#include <X11/Xutil.h>
#include <X11/Xatom.h>
#include <X11/Xresource.h>
-#ifdef OW_I18N_L4
#include <sys/param.h>
-#endif
#include "i18n.h"
#include "ollocale.h"
@@ -90,7 +88,11 @@
#ifdef SVR4
if (sysinfo(SI_HOSTNAME, hostname, sizeof(hostname)) != -1) {
#else
+#ifdef BSD
+ if (0 == gethostname(hostname, sizeof(hostname))) {
+#else
if (0 == gethostname(hostname, sizeof(hostname), &namelen)) {
+#endif
#endif
(void) strcat(filename, hostname);
fileDB = XrmGetFileDatabase(filename);
--- gif.c.orig Thu Jan 13 15:36:06 1994
+++ gif.c Mon Oct 19 13:46:15 1998
@@ -56,6 +56,10 @@
int disposal;
} Gif89 = { -1, -1, -1, 0 };
+static ReadColorMap();
+static DoExtension();
+static GetDataBlock();
+
extern XImage* ReadImage();
XImage *ReadGIF(dpy, fd, pNcolors, pColors)
@@ -456,7 +460,7 @@
return code;
}
-static XImage*
+extern XImage*
ReadImage(dpy, fd, len, height, cmap, interlace, ignore)
Display *dpy;
FILE *fd;
--- mem.c.orig Thu Jan 13 15:36:08 1994
+++ mem.c Mon Oct 19 13:47:49 1998
@@ -18,7 +18,12 @@
#include <sys/types.h>
+#include <sys/param.h>
+#if !(defined(BSD) && (BSD >= 199306))
#include <malloc.h>
+#else
+#include <stdlib.h>
+#endif
#include <memory.h>
#include <stdio.h>
--- olvwmrc.y.orig Mon Oct 19 14:21:34 1998
+++ olvwmrc.y Mon Oct 19 14:04:33 1998
@@ -37,7 +37,7 @@
char *LookupToken();
char *FindOlvwmRC();
void resetKeys();
-char *strexpand();
+static char *strexpand();
typedef struct progscreen {
char *target;
@@ -527,7 +527,9 @@
}
%%
/* Programs */
+#ifndef YYDEBUG
#define YYDEBUG 1
+#endif
#include "parse.c"
extern List *ActiveClientList;
--- olwm.c.orig Thu Jan 13 15:36:12 1994
+++ olwm.c Mon Oct 19 14:08:54 1998
@@ -677,9 +677,15 @@
pid_t pid;
int status;
#else
+#ifdef BSD
+ int oldmask;
+ int pid;
+ int status;
+#else
int oldmask;
int pid;
union wait status;
+#endif
#endif
if (!deadChildren)
--- screen.c.orig Mon Oct 19 14:21:32 1998
+++ screen.c Fri Nov 20 16:55:00 1998
@@ -66,6 +66,13 @@
*-------------------------------------------------------------------------*/
List *ScreenInfoList; /* List of managed screens */
extern Bool BoolString();
+static updateScreenWorkspaceColor();
+static updateScreenWindowColor();
+static updateScreenForegroundColor();
+static updateScreenBackgroundColor();
+static updateScreenBorderColor();
+static updateScreenInputFocusColor();
+static updateScreenGlyphFont();
/*-------------------------------------------------------------------------
* Local Data
@@ -282,6 +289,7 @@
case PseudoColor:
case GrayScale:
case DirectColor:
+ case TrueColor:
return True;
/*NOTREACHED*/
break;
--- st.c.orig Thu Jan 13 15:36:18 1994
+++ st.c Mon Oct 19 14:12:31 1998
@@ -14,6 +14,7 @@
#include "st.h"
#include "mem.h"
+static rehash();
#define max(a,b) ((a) > (b) ? (a) : (b))
#define nil(type) ((type *) 0)
--- virtual.c.orig Thu Jan 13 15:36:22 1994
+++ virtual.c Mon Oct 19 14:13:27 1998
@@ -48,6 +48,9 @@
#ident "@(#)virtual.c 1.6 olvwm version 07 Jan 1994"
#endif
+static rexMatch();
+static rexInit();
+
/* Class Function Vector; a virtual pane is the VDM window in which all
* the little virtual windows appear (and to which said windows are
* parented)
@@ -2108,7 +2111,9 @@
}
}
+#ifndef REGEXP
static char expbuf[256];
+#endif
static
rexMatch(string)
--- winframe.c.orig Thu Jan 13 15:36:25 1994
+++ winframe.c Mon Oct 19 14:14:26 1998
@@ -52,6 +52,8 @@
extern Time TimeFresh();
+static headerHeight();
+
/***************************************************************************
* private data
***************************************************************************/
--- winicon.c.orig Thu Jan 13 15:36:26 1994
+++ winicon.c Mon Oct 19 14:15:05 1998
@@ -37,6 +37,10 @@
extern Bool PropGetWMName();
extern Bool PropGetWMIconName();
+static heightTopIcon();
+static heightBottomIcon();
+static widthBothIcon();
+
/***************************************************************************
* private data
***************************************************************************/
|
