]>
Commit | Line | Data |
---|---|---|
c64a8244 | 1 | diff -Nru Eterm-0.8.10/doc/Eterm.1.in Eterm-0.8.10.new/doc/Eterm.1.in |
2 | --- Eterm-0.8.10/doc/Eterm.1.in Mon Nov 8 23:17:08 1999 | |
3 | +++ Eterm-0.8.10.new/doc/Eterm.1.in Mon Nov 8 23:16:30 1999 | |
4 | @@ -1151,17 +1151,6 @@ | |
5 | will work too, though it may produce an error message. | |
6 | .RE | |
7 | ||
8 | -.BI term_name " name" | |
9 | -.RS 5 | |
10 | -Use | |
11 | -.I name | |
12 | -as the | |
13 | -.B $TERM | |
14 | -environment variable, which controls which termcap/terminfo entry gets used. | |
15 | -The default is | |
16 | -.BR xterm . | |
17 | -.RE | |
18 | - | |
19 | .BI exec " command" | |
20 | .RS 5 | |
21 | Rather than executing a shell, this will cause Eterm to spawn | |
22 | diff -Nru Eterm-0.8.10/src/feature.h.in Eterm-0.8.10.new/src/feature.h.in | |
23 | --- Eterm-0.8.10/src/feature.h.in Mon Nov 8 23:17:08 1999 | |
24 | +++ Eterm-0.8.10.new/src/feature.h.in Mon Nov 8 23:16:30 1999 | |
25 | @@ -418,7 +418,7 @@ | |
26 | #ifdef KANJI | |
27 | # undef GREEK_SUPPORT | |
28 | # undef XTERM_FONT_CHANGE | |
29 | -# undef DEFINE_XTERM_COLOR | |
30 | +# undef DEFINE_XTERMi_COLOR | |
31 | # define KFONT0 "k14" | |
32 | # define KFONT1 "jiskan16" | |
33 | # define KFONT2 "jiskan18" | |
34 | @@ -470,14 +470,8 @@ | |
35 | ||
36 | #define APL_NAME "Eterm" /* The name of our beloved program */ | |
37 | ||
38 | -/* COLORTERM, TERM environment variables */ | |
39 | -#ifdef KANJI | |
40 | -# define TERMENV "kterm" | |
41 | -# define COLORTERMENV "Kterm" | |
42 | -#else | |
43 | -# define TERMENV "xterm" | |
44 | -# define COLORTERMENV "Eterm" | |
45 | -#endif | |
46 | +/* TERM environment variables */ | |
47 | +#define TERMENV "xterm-color" | |
48 | ||
49 | #ifdef NO_MOUSE_REPORT | |
50 | # ifndef NO_MOUSE_REPORT_SCROLLBAR | |
51 | diff -Nru Eterm-0.8.10/src/main.c Eterm-0.8.10.new/src/main.c | |
52 | --- Eterm-0.8.10/src/main.c Mon Nov 8 23:17:08 1999 | |
53 | +++ Eterm-0.8.10.new/src/main.c Mon Nov 8 23:19:26 1999 | |
54 | @@ -413,37 +413,13 @@ | |
55 | /* add entries to the environment: | |
56 | * DISPLAY: X display name | |
57 | * WINDOWID: X windowid of the window | |
58 | - * COLORTERM: Terminal supports color | |
59 | - * COLORTERM_BCE: Terminal supports BCE | |
60 | * TERM: Terminal type for termcap/terminfo | |
61 | */ | |
62 | putenv(display_string); | |
63 | putenv(windowid_string); | |
64 | if (Xdepth <= 2) { | |
65 | - putenv("COLORTERM=" COLORTERMENV "-mono"); | |
66 | - putenv("COLORTERM_BCE=" COLORTERMENV "-mono"); | |
67 | putenv("TERM=" TERMENV); | |
68 | - } else { | |
69 | - if (rs_term_name != NULL) { | |
70 | - i = strlen(rs_term_name); | |
71 | - term_string = MALLOC((i + 6) * sizeof(char)); | |
72 | - | |
73 | - sprintf(term_string, "TERM=%s", rs_term_name); | |
74 | - putenv(term_string); | |
75 | - } else { | |
76 | -#ifdef DEFINE_XTERM_COLOR | |
77 | - if (Xdepth <= 2) | |
78 | - putenv("TERM=" TERMENV); | |
79 | - else | |
80 | - putenv("TERM=" TERMENV "-color"); | |
81 | -#else | |
82 | - putenv("TERM=" TERMENV); | |
83 | -#endif | |
84 | - } | |
85 | - putenv("COLORTERM=" COLORTERMENV); | |
86 | - putenv("COLORTERM_BCE=" COLORTERMENV); | |
87 | } | |
88 | - putenv("ETERM_VERSION=" VERSION); | |
89 | ||
90 | D_CMD(("init_command()\n")); | |
91 | init_command(rs_execArgs); | |
92 | diff -Nru Eterm-0.8.10/src/options.c Eterm-0.8.10.new/src/options.c | |
93 | --- Eterm-0.8.10/src/options.c Mon Nov 8 23:17:08 1999 | |
94 | +++ Eterm-0.8.10.new/src/options.c Mon Nov 8 23:16:30 1999 | |
95 | @@ -155,7 +155,6 @@ | |
96 | ||
97 | char *rs_scrollbar_type = NULL; | |
98 | unsigned long rs_scrollbar_width = 0; | |
99 | -const char *rs_term_name = NULL; | |
100 | ||
101 | #if MENUBAR_MAX | |
102 | const char *rs_menubar_move = NULL; | |
103 | @@ -390,7 +389,6 @@ | |
104 | #if MENUBAR_MAX | |
105 | OPT_STR('M', "menu", "Default menubar file", &rs_menu), | |
106 | #endif | |
107 | - OPT_LONG("term-name", "value to use for setting $TERM", &rs_term_name), | |
108 | OPT_BOOL('C', "console", "grab console messages", NULL, &Options, Opt_console), | |
109 | OPT_ARGS('e', "exec", "execute a command rather than a shell", &rs_execArgs) | |
110 | }; | |
111 | @@ -828,11 +826,6 @@ | |
112 | #else | |
113 | printf(" -XTERM_COLOR_CHANGE"); | |
114 | #endif | |
115 | -#ifdef DEFINE_XTERM_COLOR | |
116 | - printf(" +DEFINE_XTERM_COLOR"); | |
117 | -#else | |
118 | - printf(" -DEFINE_XTERM_COLOR"); | |
119 | -#endif | |
120 | #ifdef NO_MAPALERT | |
121 | printf(" +NO_MAPALERT"); | |
122 | #else | |
123 | @@ -2550,9 +2543,6 @@ | |
124 | print_warning("Support for menus was not compiled in, ignoring"); | |
125 | #endif | |
126 | ||
127 | - } else if (!BEG_STRCASECMP(buff, "term_name ")) { | |
128 | - rs_term_name = Word(2, buff); | |
129 | - | |
130 | } else if (!BEG_STRCASECMP(buff, "debug ")) { | |
131 | debug_level = (unsigned int) strtoul(PWord(2, buff), (char **) NULL, 0); | |
132 | ||
133 | @@ -3232,7 +3222,6 @@ | |
134 | Options = (Opt_scrollBar); | |
135 | Xdisplay = NULL; | |
136 | display_name = NULL; | |
137 | - rs_term_name = NULL; | |
138 | #ifdef CUTCHAR_OPTION | |
139 | rs_cutchars = NULL; | |
140 | #endif | |
141 | @@ -3628,7 +3617,6 @@ | |
142 | fprintf(fp, " min_anchor_size %d\n", rs_min_anchor_size); | |
143 | fprintf(fp, " border_width %d\n", TermWin.internalBorder); | |
144 | fprintf(fp, " menu %s\n", rs_menu); | |
145 | - fprintf(fp, " term_name %s\n", getenv("TERM")); | |
146 | fprintf(fp, " debug %d\n", debug_level); | |
147 | if (Options & Opt_exec && rs_execArgs) { | |
148 | fprintf(fp, " exec "); | |
149 | diff -Nru Eterm-0.8.10/src/options.h Eterm-0.8.10.new/src/options.h | |
150 | --- Eterm-0.8.10/src/options.h Mon Nov 8 23:17:08 1999 | |
151 | +++ Eterm-0.8.10.new/src/options.h Mon Nov 8 23:16:30 1999 | |
152 | @@ -46,7 +46,6 @@ | |
153 | extern const char *rs_scrollBar_floating; | |
154 | extern const char *rs_scrollbar_popup; | |
155 | extern char *rs_viewport_mode; | |
156 | -extern const char *rs_term_name; | |
157 | extern const char *rs_menubar; | |
158 | extern const char *rs_menu; | |
159 | extern const char *rs_menubar_move; | |
160 | diff -Nru Eterm-0.8.10/themes/Eterm/MAIN.in Eterm-0.8.10.new/themes/Eterm/MAIN.in | |
161 | --- Eterm-0.8.10/themes/Eterm/MAIN.in Mon Nov 8 23:17:08 1999 | |
162 | +++ Eterm-0.8.10.new/themes/Eterm/MAIN.in Mon Nov 8 23:16:30 1999 | |
163 | @@ -192,9 +192,6 @@ | |
164 | # File to read for menubar | |
165 | menu Eterm.menu | |
166 | ||
167 | -# Value to use for $TERM | |
168 | - term_name xterm | |
169 | - | |
170 | # Program to exec (intended for use with themes) | |
171 | # exec foo | |
172 | ||
173 | diff -Nru Eterm-0.8.10/themes/chooser/MAIN.in Eterm-0.8.10.new/themes/chooser/MAIN.in | |
174 | --- Eterm-0.8.10/themes/chooser/MAIN.in Mon Nov 8 23:17:09 1999 | |
175 | +++ Eterm-0.8.10.new/themes/chooser/MAIN.in Mon Nov 8 23:16:30 1999 | |
176 | @@ -192,9 +192,6 @@ | |
177 | # File to read for menubar | |
178 | menu chooser.menu | |
179 | ||
180 | -# Value to use for $TERM | |
181 | - term_name xterm | |
182 | - | |
183 | # Program to exec (intended for use with themes) | |
184 | # exec foo | |
185 | ||
186 | diff -Nru Eterm-0.8.10/themes/emacs/MAIN.in Eterm-0.8.10.new/themes/emacs/MAIN.in | |
187 | --- Eterm-0.8.10/themes/emacs/MAIN.in Mon Nov 8 23:17:09 1999 | |
188 | +++ Eterm-0.8.10.new/themes/emacs/MAIN.in Mon Nov 8 23:16:30 1999 | |
189 | @@ -192,9 +192,6 @@ | |
190 | # File to read for menubar | |
191 | menu emacs.menu | |
192 | ||
193 | -# Value to use for $TERM | |
194 | - term_name xterm | |
195 | - | |
196 | # Program to exec (intended for use with themes) | |
197 | exec emacs -nw | |
198 | ||
199 | diff -Nru Eterm-0.8.10/themes/irc/MAIN.in Eterm-0.8.10.new/themes/irc/MAIN.in | |
200 | --- Eterm-0.8.10/themes/irc/MAIN.in Mon Nov 8 23:17:09 1999 | |
201 | +++ Eterm-0.8.10.new/themes/irc/MAIN.in Mon Nov 8 23:16:30 1999 | |
202 | @@ -192,9 +192,6 @@ | |
203 | # File to read for menubar | |
204 | menu irc.menu | |
205 | ||
206 | -# Value to use for $TERM | |
207 | - term_name xterm | |
208 | - | |
209 | # Program to exec (intended for use with themes) | |
210 | exec irc | |
211 | ||
212 | diff -Nru Eterm-0.8.10/themes/mutt/MAIN.in Eterm-0.8.10.new/themes/mutt/MAIN.in | |
213 | --- Eterm-0.8.10/themes/mutt/MAIN.in Mon Nov 8 23:17:09 1999 | |
214 | +++ Eterm-0.8.10.new/themes/mutt/MAIN.in Mon Nov 8 23:16:30 1999 | |
215 | @@ -192,9 +192,6 @@ | |
216 | # File to read for menubar | |
217 | menu mutt.menu | |
218 | ||
219 | -# Value to use for $TERM | |
220 | - term_name xterm | |
221 | - | |
222 | # Program to exec (intended for use with themes) | |
223 | exec mutt | |
224 | ||
225 | diff -Nru Eterm-0.8.10/themes/tn3270/MAIN.in Eterm-0.8.10.new/themes/tn3270/MAIN.in | |
226 | --- Eterm-0.8.10/themes/tn3270/MAIN.in Mon Nov 8 23:17:09 1999 | |
227 | +++ Eterm-0.8.10.new/themes/tn3270/MAIN.in Mon Nov 8 23:16:30 1999 | |
228 | @@ -225,9 +225,6 @@ | |
229 | # File to read for menubar | |
230 | # menu tn3270.menu | |
231 | ||
232 | -# Value to use for $TERM | |
233 | - term_name xterm | |
234 | - | |
235 | # Program to exec (intended for use with themes) | |
236 | exec tn3270 | |
237 | ||
238 | diff -Nru Eterm-0.8.10/themes/trans/MAIN.in Eterm-0.8.10.new/themes/trans/MAIN.in | |
239 | --- Eterm-0.8.10/themes/trans/MAIN.in Mon Nov 8 23:17:09 1999 | |
240 | +++ Eterm-0.8.10.new/themes/trans/MAIN.in Mon Nov 8 23:16:30 1999 | |
241 | @@ -208,9 +208,6 @@ | |
242 | # File to read for menubar | |
243 | menu trans.menu | |
244 | ||
245 | -# Value to use for $TERM | |
246 | - term_name xterm | |
247 | - | |
248 | # Program to exec (intended for use with themes) | |
249 | # exec foo | |
250 |