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
5 will work too, though it may produce an error message.
14 -environment variable, which controls which termcap/terminfo entry gets used.
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
28 # undef XTERM_FONT_CHANGE
29 -# undef DEFINE_XTERM_COLOR
30 +# undef DEFINE_XTERMi_COLOR
32 # define KFONT1 "jiskan16"
33 # define KFONT2 "jiskan18"
36 #define APL_NAME "Eterm" /* The name of our beloved program */
38 -/* COLORTERM, TERM environment variables */
40 -# define TERMENV "kterm"
41 -# define COLORTERMENV "Kterm"
43 -# define TERMENV "xterm"
44 -# define COLORTERMENV "Eterm"
46 +/* TERM environment variables */
47 +#define TERMENV "xterm-color"
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
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
62 putenv(display_string);
63 putenv(windowid_string);
65 - putenv("COLORTERM=" COLORTERMENV "-mono");
66 - putenv("COLORTERM_BCE=" COLORTERMENV "-mono");
67 putenv("TERM=" TERMENV);
69 - if (rs_term_name != NULL) {
70 - i = strlen(rs_term_name);
71 - term_string = MALLOC((i + 6) * sizeof(char));
73 - sprintf(term_string, "TERM=%s", rs_term_name);
74 - putenv(term_string);
76 -#ifdef DEFINE_XTERM_COLOR
78 - putenv("TERM=" TERMENV);
80 - putenv("TERM=" TERMENV "-color");
82 - putenv("TERM=" TERMENV);
85 - putenv("COLORTERM=" COLORTERMENV);
86 - putenv("COLORTERM_BCE=" COLORTERMENV);
88 - putenv("ETERM_VERSION=" VERSION);
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
97 char *rs_scrollbar_type = NULL;
98 unsigned long rs_scrollbar_width = 0;
99 -const char *rs_term_name = NULL;
102 const char *rs_menubar_move = NULL;
105 OPT_STR('M', "menu", "Default menubar file", &rs_menu),
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)
113 printf(" -XTERM_COLOR_CHANGE");
115 -#ifdef DEFINE_XTERM_COLOR
116 - printf(" +DEFINE_XTERM_COLOR");
118 - printf(" -DEFINE_XTERM_COLOR");
121 printf(" +NO_MAPALERT");
123 @@ -2550,9 +2543,6 @@
124 print_warning("Support for menus was not compiled in, ignoring");
127 - } else if (!BEG_STRCASECMP(buff, "term_name ")) {
128 - rs_term_name = Word(2, buff);
130 } else if (!BEG_STRCASECMP(buff, "debug ")) {
131 debug_level = (unsigned int) strtoul(PWord(2, buff), (char **) NULL, 0);
133 @@ -3232,7 +3222,6 @@
134 Options = (Opt_scrollBar);
137 - rs_term_name = NULL;
138 #ifdef CUTCHAR_OPTION
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
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
164 # File to read for menubar
167 -# Value to use for $TERM
170 # Program to exec (intended for use with themes)
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
177 # File to read for menubar
180 -# Value to use for $TERM
183 # Program to exec (intended for use with themes)
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
190 # File to read for menubar
193 -# Value to use for $TERM
196 # Program to exec (intended for use with themes)
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
203 # File to read for menubar
206 -# Value to use for $TERM
209 # Program to exec (intended for use with themes)
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
216 # File to read for menubar
219 -# Value to use for $TERM
222 # Program to exec (intended for use with themes)
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
229 # File to read for menubar
232 -# Value to use for $TERM
235 # Program to exec (intended for use with themes)
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
242 # File to read for menubar
245 -# Value to use for $TERM
248 # Program to exec (intended for use with themes)