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
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
|
Index: Imakefile
*** /build/x11r6/XFree86-3.1.2Bn/xc/programs/xterm/Imakefile Fri Jan 26 11:43:22 1996
--- /build/x11r6/XFree86-current/xc/programs/xterm/Imakefile Sun Jan 28 20:45:35 1996
***************
*** 10,15 ****
--- 10,30 ----
XCOMM
/*
+ * Fixes to allow compile with X11R5
+ */
+ #ifndef XkbClientDefines
+ #define XkbClientDefines /**/
+ #endif
+
+ #ifndef XkbClientDepLibs
+ #define XkbClientDepLibs /**/
+ #endif
+
+ #ifndef XkbClientLibs
+ #define XkbClientLibs /**/
+ #endif
+
+ /*
* add -DWTMP and -DLASTLOG if you want them; make sure that bcopy can
* handle overlapping copies before using it.
*/
Index: Tekproc.c
*** /build/x11r6/XFree86-3.1.2Bn/xc/programs/xterm/Tekproc.c Tue Jan 16 15:43:01 1996
--- /build/x11r6/XFree86-current/xc/programs/xterm/Tekproc.c Sun Jan 28 20:45:35 1996
***************
*** 64,70 ****
--- 64,77 ----
#include <X11/StringDefs.h>
#include <X11/Shell.h>
#include <X11/Xmu/CharSet.h>
+
+ #if XtSpecificationRelease >= 6
#include <X11/Xpoll.h>
+ #else
+ #define Select(n,r,w,e,t) select(0,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval *)t)
+ #define XFD_COPYSET(src,dst) bcopy((src)->fds_bits, (dst)->fds_bits, sizeof(fd_set))
+ #endif
+
#include <stdio.h>
#include <errno.h>
#include <setjmp.h>
Index: charproc.c
*** /build/x11r6/XFree86-3.1.2Bn/xc/programs/xterm/charproc.c Fri Jan 26 11:43:22 1996
--- /build/x11r6/XFree86-current/xc/programs/xterm/charproc.c Sun Jan 28 20:45:35 1996
***************
*** 63,70 ****
--- 63,77 ----
#include <X11/Xmu/Atoms.h>
#include <X11/Xmu/CharSet.h>
#include <X11/Xmu/Converters.h>
+
+ #if XtSpecificationRelease >= 6
#include <X11/Xaw/XawImP.h>
#include <X11/Xpoll.h>
+ #else
+ #define Select(n,r,w,e,t) select(0,(fd_set*)r,(fd_set*)w,(fd_set*)e,(struct timeval *)t)
+ #define XFD_COPYSET(src,dst) bcopy((src)->fds_bits, (dst)->fds_bits, sizeof(fd_set))
+ #endif
+
#include <stdio.h>
#include <errno.h>
#include <setjmp.h>
***************
*** 572,577 ****
--- 579,585 ----
{"font6", "Font6", XtRString, sizeof(String),
XtOffsetOf(XtermWidgetRec, screen.menu_font_names[fontMenu_font6]),
XtRString, (XtPointer) NULL},
+ #if XtSpecificationRelease >= 6
{XtNinputMethod, XtCInputMethod, XtRString, sizeof(char*),
XtOffsetOf(XtermWidgetRec, misc.input_method),
XtRString, (XtPointer)NULL},
***************
*** 581,586 ****
--- 589,595 ----
{XtNopenIm, XtCOpenIm, XtRBoolean, sizeof(Boolean),
XtOffsetOf(XtermWidgetRec, misc.open_im),
XtRImmediate, (XtPointer)TRUE},
+ #endif
{XtNcolor0, XtCForeground, XtRPixel, sizeof(Pixel),
XtOffsetOf(XtermWidgetRec, screen.colors[COLOR_0]),
XtRString, "XtDefaultForeground"},
***************
*** 1153,1158 ****
--- 1162,1172 ----
? 8 : 0));
}
break;
+ case 39:
+ if( screen->colorMode ) {
+ SGR_Foreground(-1);
+ }
+ break;
case 40:
case 41:
case 42:
***************
*** 1165,1170 ****
--- 1179,1189 ----
SGR_Background(param[row] - 40);
}
break;
+ case 49:
+ if( screen->colorMode ) {
+ SGR_Background(-1);
+ }
+ break;
case 100:
if( screen->colorMode ) {
if (term->flags & FG_COLOR)
***************
*** 2639,2644 ****
--- 2658,2666 ----
for (i = 0; i < MAXCOLORS; i++) {
new->screen.colors[i] = request->screen.colors[i];
}
+
+ new->cur_foreground = 0;
+ new->cur_background = 0;
/*
* The definition of -rv now is that it changes the definition of
Index: data.c
*** /build/x11r6/XFree86-3.1.2Bn/xc/programs/xterm/data.c Sat Jan 6 08:11:01 1996
--- /build/x11r6/XFree86-current/xc/programs/xterm/data.c Sun Jan 28 20:45:35 1996
***************
*** 26,32 ****
--- 26,36 ----
*/
#include "ptyx.h" /* gets Xt stuff, too */
+
+ #if XtSpecificationRelease >= 6
#include <X11/Xpoll.h>
+ #endif
+
#include "data.h"
#include <setjmp.h>
Index: main.c
*** /build/x11r6/XFree86-3.1.2Bn/xc/programs/xterm/main.c Thu Jan 11 14:01:01 1996
--- /build/x11r6/XFree86-current/xc/programs/xterm/main.c Sun Jan 28 20:45:35 1996
***************
*** 75,82 ****
--- 75,87 ----
#include <X11/Xos.h>
#include <X11/cursorfont.h>
#include <X11/Xaw/SimpleMenu.h>
+
+ #if XtSpecificationRelease >= 6
#include <X11/Xpoll.h>
+ #endif
+
#include <X11/Xlocale.h>
+
#include <pwd.h>
#include <ctype.h>
#include "data.h"
***************
*** 127,132 ****
--- 132,138 ----
#endif
#ifdef SVR4
+ #undef SYSV /* predefined on Solaris 2.4 */
#define SYSV /* SVR4 is (approx) superset of SVR3 */
#define ATT
#define USE_SYSV_UTMP
***************
*** 453,459 ****
#endif
#ifdef SYSV
! extern char *ptsname();
#endif
#include "xterm.h"
--- 459,465 ----
#endif
#ifdef SYSV
! extern char *ptsname PROTO((int));
#endif
#include "xterm.h"
***************
*** 1293,1303 ****
if (setegid(rgid) == -1)
(void) fprintf(stderr, "setegid(%d): %s\n",
! rgid, strerror(errno));
if (seteuid(ruid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
! ruid, strerror(errno));
#endif
XtSetErrorHandler(xt_error);
--- 1299,1309 ----
if (setegid(rgid) == -1)
(void) fprintf(stderr, "setegid(%d): %s\n",
! (int) rgid, strerror(errno));
if (seteuid(ruid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
! (int) ruid, strerror(errno));
#endif
XtSetErrorHandler(xt_error);
***************
*** 1317,1327 ****
#ifdef HAS_POSIX_SAVED_IDS
if (seteuid(euid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
! euid, strerror(errno));
if (setegid(egid) == -1)
(void) fprintf(stderr, "setegid(%d): %s\n",
! egid, strerror(errno));
#endif
}
--- 1323,1333 ----
#ifdef HAS_POSIX_SAVED_IDS
if (seteuid(euid) == -1)
(void) fprintf(stderr, "seteuid(%d): %s\n",
! (int) euid, strerror(errno));
if (setegid(egid) == -1)
(void) fprintf(stderr, "setegid(%d): %s\n",
! (int) egid, strerror(errno));
#endif
}
***************
*** 1985,1992 ****
register TScreen *screen = &term->screen;
#ifdef USE_HANDSHAKE
handshake_t handshake;
- #else
- int fds[2];
#endif
int tty = -1;
int done;
--- 1991,1996 ----
***************
*** 2458,2464 ****
{
#include <grp.h>
struct group *ttygrp;
! if (ttygrp = getgrnam("tty")) {
/* change ownership of tty to real uid, "tty" gid */
chown (ttydev, screen->uid, ttygrp->gr_gid);
chmod (ttydev, 0620);
--- 2462,2468 ----
{
#include <grp.h>
struct group *ttygrp;
! if ((ttygrp = getgrnam("tty")) != 0) {
/* change ownership of tty to real uid, "tty" gid */
chown (ttydev, screen->uid, ttygrp->gr_gid);
chmod (ttydev, 0620);
Index: menu.c
*** /build/x11r6/XFree86-3.1.2Bn/xc/programs/xterm/menu.c Tue Jan 16 15:43:01 1996
--- /build/x11r6/XFree86-current/xc/programs/xterm/menu.c Sun Jan 28 20:45:35 1996
***************
*** 397,411 ****
XtPointer closure, data;
{
register TScreen *screen = &term->screen;
! Time time = CurrentTime; /* XXX - wrong */
if (screen->grabbedKbd) {
! XUngrabKeyboard (screen->display, time);
ReverseVideo (term);
screen->grabbedKbd = FALSE;
} else {
if (XGrabKeyboard (screen->display, term->core.window,
! True, GrabModeAsync, GrabModeAsync, time)
!= GrabSuccess) {
Bell(XkbBI_MinorError, 100);
} else {
--- 397,411 ----
XtPointer closure, data;
{
register TScreen *screen = &term->screen;
! Time now = CurrentTime; /* XXX - wrong */
if (screen->grabbedKbd) {
! XUngrabKeyboard (screen->display, now);
ReverseVideo (term);
screen->grabbedKbd = FALSE;
} else {
if (XGrabKeyboard (screen->display, term->core.window,
! True, GrabModeAsync, GrabModeAsync, now)
!= GrabSuccess) {
Bell(XkbBI_MinorError, 100);
} else {
Index: misc.c
*** /build/x11r6/XFree86-3.1.2Bn/xc/programs/xterm/misc.c Fri Jan 26 11:43:22 1996
--- /build/x11r6/XFree86-current/xc/programs/xterm/misc.c Sun Jan 28 20:45:35 1996
***************
*** 50,55 ****
--- 50,61 ----
#include "xterm.h"
+ #if XtSpecificationRelease < 6
+ #ifndef X_GETTIMEOFDAY
+ #define X_GETTIMEOFDAY(t) gettimeofday(t,(struct timezone *)0)
+ #endif
+ #endif
+
#ifdef AMOEBA
#include "amoeba.h"
#include "module/proc.h"
Index: scrollbar.c
*** /build/x11r6/XFree86-3.1.2Bn/xc/programs/xterm/scrollbar.c Tue Jan 16 15:43:01 1996
--- /build/x11r6/XFree86-current/xc/programs/xterm/scrollbar.c Sun Jan 28 20:45:35 1996
***************
*** 221,227 ****
register Widget scrollWidget;
{
Arg args[4];
! int nargs = XtNumber(args);
unsigned long bg, fg, bdr;
Pixmap bdpix;
--- 221,227 ----
register Widget scrollWidget;
{
Arg args[4];
! Cardinal nargs = XtNumber(args);
unsigned long bg, fg, bdr;
Pixmap bdpix;
|
