summaryrefslogtreecommitdiff
path: root/tools/pkg/5/twm/diff/xterm.diff
blob: c2d27149453a0f8a44831bf5313f2e077aaad9e7 (plain)
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
diff --git xterm-clean/Makefile.in xterm-workdir/Makefile.in
index bb6da23..9500664 100644
--- xterm-clean/Makefile.in
+++ xterm-workdir/Makefile.in
@@ -68,7 +68,7 @@ PIXMAPDIR_DEF	= @no_pixmapdir@-DPIXMAP_ROOTDIR=\"@PIXMAPDIR@/\"
 CPPFLAGS	= -I. -I$(srcdir) -DHAVE_CONFIG_H @CPPFLAGS@ -DDEFCLASS=\"@APP_CLASS@\" $(PIXMAPDIR_DEF) $(EXTRA_CPPFLAGS)
 CFLAGS		= @CFLAGS@ $(EXTRA_CFLAGS)
 LDFLAGS		= @LDFLAGS@ @EXTRA_LDFLAGS@
-LIBS		= @LIBS@
+LIBS		= @LIBS@ -lncursesw -ltinfow
 
 prefix		= @prefix@
 exec_prefix	= @exec_prefix@
diff --git xterm-clean/main.c xterm-workdir/main.c
index 3d2ad4c..3f235d0 100644
--- xterm-clean/main.c
+++ xterm-workdir/main.c
@@ -92,6 +92,7 @@
 #include <xterm.h>
 #include <version.h>
 #include <graphics.h>
+#include <termios.h>
 
 /* xterm uses these X Toolkit resource names, which are exported in array */
 #undef XtNborderWidth
@@ -172,7 +173,7 @@ static GCC_NORETURN void HsSysError(int);
 #define KANJI
 #endif
 
-#ifdef linux
+#if defined(linux) || defined(__orange__)
 #define USE_SYSV_PGRP
 #define USE_SYSV_SIGNALS
 #define WTMP
@@ -315,7 +316,7 @@ ttyslot(void)
 #ifndef NOFILE
 #define NOFILE OPEN_MAX
 #endif
-#elif !(defined(VMS) || defined(WIN32) || defined(Lynx) || defined(__GNU__) || defined(__MVS__))
+#elif !(defined(VMS) || defined(WIN32) || defined(Lynx) || defined(__GNU__) || defined(__MVS__) || defined(__orange__))
 #include <sys/param.h>		/* for NOFILE */
 #endif
 
@@ -716,11 +717,12 @@ static struct {
 #endif
 
 #ifndef TAB3
-#if defined(OXTABS)
-#define TAB3 OXTABS
-#elif defined(XTABS)
-#define TAB3 XTABS
-#endif
+#define TAB3 0014000
+//#if defined(OXTABS)
+//#define TAB3 OXTABS
+//#elif defined(XTABS)
+//#define TAB3 XTABS
+//#endif
 #endif
 
 #ifndef TABDLY
@@ -3011,7 +3013,7 @@ main(int argc, char *argv[]ENVP_ARG)
     }
 #endif
 #endif
-#if defined(USE_ANY_SYSV_TERMIO) || defined(__MVS__) || defined(__minix)
+#if defined(USE_ANY_SYSV_TERMIO) || defined(__MVS__) || defined(__minix) || defined(__orange__)
     if (0 > (mode = fcntl(screen->respond, F_GETFL, 0)))
 	SysError(ERROR_F_GETFL);
 #ifdef O_NDELAY
@@ -3753,7 +3755,7 @@ ourValidShell(const char *pathname)
     return findValidShell(x_strtrim(resource.valid_shells), pathname);
 }
 
-#if defined(HAVE_GETUSERSHELL) && defined(HAVE_ENDUSERSHELL)
+#if defined(HAVE_GETUSERSHELL) && defined(HAVE_ENDUSERSHELL) && 0
 static Boolean
 validShell(const char *pathname)
 {
@@ -4356,7 +4358,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed)
 	    /*
 	     * now in child process
 	     */
-#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__)
+#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) || defined(__orange__)
 	    int pgrp = setsid();	/* variable may not be used... */
 #else
 	    int pgrp = getpid();
@@ -4496,7 +4498,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed)
 			/* make /dev/tty work */
 			ioctl(ttyfd, TCSETCTTY, 0);
 #endif
-#if ((defined(__GLIBC__) && defined(__FreeBSD_kernel__)) || defined(__GNU__)) && defined(TIOCSCTTY)
+#if ((defined(__GLIBC__) && defined(__FreeBSD_kernel__)) || defined(__GNU__) || defined(__orange__)) && defined(TIOCSCTTY)
 			/* make /dev/tty work */
 			ioctl(ttyfd, TIOCSCTTY, 0);
 #endif
diff --git xterm-clean/xterm.h xterm-workdir/xterm.h
index 89590cb..9a99f0c 100644
--- xterm-clean/xterm.h
+++ xterm-workdir/xterm.h
@@ -80,7 +80,7 @@
 #define HAVE_PUTENV 1
 #endif
 
-#if defined(CSRG_BASED) || defined(__GNU__) || defined(__minix)
+#if defined(CSRG_BASED) || defined(__GNU__) || defined(__minix) || defined(__orange__)
 #define USE_POSIX_TERMIOS 1
 #endif
 
@@ -176,7 +176,7 @@
 #define USE_SYSV_UTMP
 #endif
 
-#if defined(__GNU__) || defined(__MVS__) || defined(__osf__)
+#if defined(__GNU__) || defined(__MVS__) || defined(__osf__) || defined(__orange__)
 #define USE_TTY_GROUP
 #endif
 
diff --git xterm-clean/xterm_io.h xterm-workdir/xterm_io.h
index 130d365..72ebd01 100644
--- xterm-clean/xterm_io.h
+++ xterm-workdir/xterm_io.h
@@ -92,13 +92,14 @@
 #undef SYSV			/* pretend to be bsd (sgtty.h) */
 #endif /* macII */
 
-#ifdef __GNU__
+#if defined(__GNU__) || defined(__orange__)
 #define USE_POSIX_TERMIOS
 #define HAVE_POSIX_OPENPT 1
 #define HAVE_PTSNAME 1
 #define HAVE_GRANTPT_PTY_ISATTY 1
 #endif
 
+
 #if defined(__GLIBC__) && !(defined(linux) || defined(__GNU__))
 #define USE_POSIX_TERMIOS	/* GNU/KFreeBSD and GNU/KNetBSD */
 #endif
@@ -212,7 +213,7 @@
 #undef FIONCLEX
 #endif /* macII */
 
-#if defined(__QNX__) || defined(__GNU__) || defined(__MVS__) || defined(__osf__)
+#if defined(__QNX__) || defined(__GNU__) || defined(__MVS__) || defined(__osf__) || defined(__orange__)
 #undef TIOCSLTC			/* <sgtty.h> conflicts with <termios.h> */
 #undef TIOCSLTC
 #endif