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
|
*** Unix/ui.c.orig Sun Feb 13 17:45:57 1994
--- Unix/ui.c Sun Nov 27 15:06:44 1994
***************
*** 69,74 ****
--- 69,76 ----
*
*/
+ #include "defs.h"
+
#ifdef dec
#define stub_only
#endif
***************
*** 82,92 ****
#include <sys/termio.h>
#endif
#ifdef __386BSD__
#include <sys/ioctl.h>
#endif
#include <stdio.h>
#include <signal.h>
- #include "defs.h"
#include "extern.h"
#include "tags.h"
#include "prefs.h"
--- 84,95 ----
#include <sys/termio.h>
#endif
#ifdef __386BSD__
+ #include <fcntl.h>
#include <sys/ioctl.h>
+ #define termio termios
#endif
#include <stdio.h>
#include <signal.h>
#include "extern.h"
#include "tags.h"
#include "prefs.h"
***************
*** 193,198 ****
--- 196,202 ----
if (run_in_fg())
{
#ifdef __386BSD__
+ fcntl(fileno(stdin), F_SETFL, O_NONBLOCK);
tcgetattr(fileno(stdin), &zap);
#else
ioctl(fileno(stdin), TCGETA, &zap);
***************
*** 217,223 ****
#endif
zap.c_lflag &= ~(ICANON | ECHO);
#ifdef __386BSD__
! tcsetattr(fileno(stdin, TCSANOW, &zap);
#else
ioctl(fileno(stdin), TCSETA, &zap);
#endif
--- 221,227 ----
#endif
zap.c_lflag &= ~(ICANON | ECHO);
#ifdef __386BSD__
! tcsetattr(fileno(stdin), TCSANOW, &zap);
#else
ioctl(fileno(stdin), TCSETA, &zap);
#endif
***************
*** 227,232 ****
--- 231,245 ----
is_fg = FALSE;
}
+ /* if_fg_sane_tty():
+ * restore tty modes, if running in foreground
+ */
+ LOCAL void if_fg_sane_tty()
+ {
+ if (run_in_fg())
+ sane_tty();
+ }
+
/* nonblocking_io():
* try to setup the keyboard to non blocking io
*/
***************
*** 240,252 ****
{
psanity = &sanity;
#ifdef __386BSD__
! tcgetattr(fileno(stdin), &sanity);
#else
ioctl(fileno(stdin), TCGETA, psanity);
#endif
}
switch_mode();
! at_end(sane_tty);
}
--- 253,265 ----
{
psanity = &sanity;
#ifdef __386BSD__
! tcgetattr(fileno(stdin), psanity);
#else
ioctl(fileno(stdin), TCGETA, psanity);
#endif
}
switch_mode();
! at_end(if_fg_sane_tty);
}
***************
*** 255,261 ****
LOCAL void sane_tty()
{
#ifdef __386BSD__
! tcsetattr(fileno(stdin), &sanity);
#else
ioctl(fileno(stdin), TCSETA, psanity);
#endif
--- 268,274 ----
LOCAL void sane_tty()
{
#ifdef __386BSD__
! tcsetattr(fileno(stdin), TCSADRAIN, psanity);
#else
ioctl(fileno(stdin), TCSETA, psanity);
#endif
|
