ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/init.C
(Generate patch)

Comparing rxvt-unicode/src/init.C (file contents):
Revision 1.70 by root, Fri Aug 13 03:47:09 2004 UTC vs.
Revision 1.99 by root, Mon Dec 20 16:44:31 2004 UTC

… …
33 33
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "init.h" 36#include "init.h"
37 37
38#include <signal.h> 38#include <csignal>
39 39
40const char *const def_colorName[] = 40const char *const def_colorName[] =
41 { 41 {
42 COLOR_FOREGROUND, 42 COLOR_FOREGROUND,
43 COLOR_BACKGROUND, 43 COLOR_BACKGROUND,
… …
67 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 67 "Yellow", /* 3/11: bright yellow (#FFFF00) */
68 "Blue", /* 4/12: bright blue (#0000FF) */ 68 "Blue", /* 4/12: bright blue (#0000FF) */
69 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 69 "Magenta", /* 5/13: bright magenta (#FF00FF) */
70 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 70 "Cyan", /* 6/14: bright cyan (#00FFFF) */
71 "White", /* 7/15: bright white (#FFFFFF) */ 71 "White", /* 7/15: bright white (#FFFFFF) */
72#ifdef TTY_256COLOR 72
73 "rgbi:0/0/0", /* default 16-255 color table */ 73 // 88 xterm colours
74 "rgbi:0/0/.2", /* consists of 6 6x6 colour cubes */ 74 "rgb:00/00/00",
75 "rgbi:0/0/.4", /* and a 24 greyscale ramp w/o */
76 "rgbi:0/0/.6", /* black or white */
77 "rgbi:0/0/.8", 75 "rgb:00/00/8b",
78 "rgbi:0/0/1", 76 "rgb:00/00/cd",
79 "rgbi:0/.2/0", 77 "rgb:00/00/ff",
80 "rgbi:0/.2/.2",
81 "rgbi:0/.2/.4",
82 "rgbi:0/.2/.6",
83 "rgbi:0/.2/.8",
84 "rgbi:0/.2/1",
85 "rgbi:0/.4/0",
86 "rgbi:0/.4/.2",
87 "rgbi:0/.4/.4",
88 "rgbi:0/.4/.6",
89 "rgbi:0/.4/.8",
90 "rgbi:0/.4/1",
91 "rgbi:0/.6/0",
92 "rgbi:0/.6/.2",
93 "rgbi:0/.6/.4",
94 "rgbi:0/.6/.6",
95 "rgbi:0/.6/.8",
96 "rgbi:0/.6/1",
97 "rgbi:0/.8/0", 78 "rgb:00/8b/00",
98 "rgbi:0/.8/.2",
99 "rgbi:0/.8/.4",
100 "rgbi:0/.8/.6",
101 "rgbi:0/.8/.8", 79 "rgb:00/8b/8b",
102 "rgbi:0/.8/1", 80 "rgb:00/8b/cd",
81 "rgb:00/8b/ff",
103 "rgbi:0/1/0", 82 "rgb:00/cd/00",
104 "rgbi:0/1/.2",
105 "rgbi:0/1/.4",
106 "rgbi:0/1/.6",
107 "rgbi:0/1/.8", 83 "rgb:00/cd/8b",
108 "rgbi:0/1/1", 84 "rgb:00/cd/cd",
85 "rgb:00/cd/ff",
109 "rgbi:.2/0/0", 86 "rgb:00/ff/00",
110 "rgbi:.2/0/.2", 87 "rgb:00/ff/8b",
111 "rgbi:.2/0/.4", 88 "rgb:00/ff/cd",
112 "rgbi:.2/0/.6", 89 "rgb:00/ff/ff",
113 "rgbi:.2/0/.8",
114 "rgbi:.2/0/1",
115 "rgbi:.2/.2/0",
116 "rgbi:.2/.2/.2",
117 "rgbi:.2/.2/.4",
118 "rgbi:.2/.2/.6",
119 "rgbi:.2/.2/.8",
120 "rgbi:.2/.2/1",
121 "rgbi:.2/.4/0",
122 "rgbi:.2/.4/.2",
123 "rgbi:.2/.4/.4",
124 "rgbi:.2/.4/.6",
125 "rgbi:.2/.4/.8",
126 "rgbi:.2/.4/1",
127 "rgbi:.2/.6/0",
128 "rgbi:.2/.6/.2",
129 "rgbi:.2/.6/.4",
130 "rgbi:.2/.6/.6",
131 "rgbi:.2/.6/.8",
132 "rgbi:.2/.6/1",
133 "rgbi:.2/.8/0",
134 "rgbi:.2/.8/.2",
135 "rgbi:.2/.8/.4",
136 "rgbi:.2/.8/.6",
137 "rgbi:.2/.8/.8",
138 "rgbi:.2/.8/1",
139 "rgbi:.2/1/0",
140 "rgbi:.2/1/.2",
141 "rgbi:.2/1/.4",
142 "rgbi:.2/1/.6",
143 "rgbi:.2/1/.8",
144 "rgbi:.2/1/1",
145 "rgbi:.4/0/0",
146 "rgbi:.4/0/.2",
147 "rgbi:.4/0/.4",
148 "rgbi:.4/0/.6",
149 "rgbi:.4/0/.8",
150 "rgbi:.4/0/1",
151 "rgbi:.4/.2/0",
152 "rgbi:.4/.2/.2",
153 "rgbi:.4/.2/.4",
154 "rgbi:.4/.2/.6",
155 "rgbi:.4/.2/.8",
156 "rgbi:.4/.2/1",
157 "rgbi:.4/.4/0",
158 "rgbi:.4/.4/.2",
159 "rgbi:.4/.4/.4",
160 "rgbi:.4/.4/.6",
161 "rgbi:.4/.4/.8",
162 "rgbi:.4/.4/1",
163 "rgbi:.4/.6/0",
164 "rgbi:.4/.6/.2",
165 "rgbi:.4/.6/.4",
166 "rgbi:.4/.6/.6",
167 "rgbi:.4/.6/.8",
168 "rgbi:.4/.6/1",
169 "rgbi:.4/.8/0",
170 "rgbi:.4/.8/.2",
171 "rgbi:.4/.8/.4",
172 "rgbi:.4/.8/.6",
173 "rgbi:.4/.8/.8",
174 "rgbi:.4/.8/1",
175 "rgbi:.4/1/0",
176 "rgbi:.4/1/.2",
177 "rgbi:.4/1/.4",
178 "rgbi:.4/1/.6",
179 "rgbi:.4/1/.8",
180 "rgbi:.4/1/1",
181 "rgbi:.6/0/0",
182 "rgbi:.6/0/.2",
183 "rgbi:.6/0/.4",
184 "rgbi:.6/0/.6",
185 "rgbi:.6/0/.8",
186 "rgbi:.6/0/1",
187 "rgbi:.6/.2/0",
188 "rgbi:.6/.2/.2",
189 "rgbi:.6/.2/.4",
190 "rgbi:.6/.2/.6",
191 "rgbi:.6/.2/.8",
192 "rgbi:.6/.2/1",
193 "rgbi:.6/.4/0",
194 "rgbi:.6/.4/.2",
195 "rgbi:.6/.4/.4",
196 "rgbi:.6/.4/.6",
197 "rgbi:.6/.4/.8",
198 "rgbi:.6/.4/1",
199 "rgbi:.6/.6/0",
200 "rgbi:.6/.6/.2",
201 "rgbi:.6/.6/.4",
202 "rgbi:.6/.6/.6",
203 "rgbi:.6/.6/.8",
204 "rgbi:.6/.6/1",
205 "rgbi:.6/.8/0",
206 "rgbi:.6/.8/.2",
207 "rgbi:.6/.8/.4",
208 "rgbi:.6/.8/.6",
209 "rgbi:.6/.8/.8",
210 "rgbi:.6/.8/1",
211 "rgbi:.6/1/0",
212 "rgbi:.6/1/.2",
213 "rgbi:.6/1/.4",
214 "rgbi:.6/1/.6",
215 "rgbi:.6/1/.8",
216 "rgbi:.6/1/1",
217 "rgbi:.8/0/0", 90 "rgb:8b/00/00",
218 "rgbi:.8/0/.2",
219 "rgbi:.8/0/.4",
220 "rgbi:.8/0/.6",
221 "rgbi:.8/0/.8", 91 "rgb:8b/00/8b",
222 "rgbi:.8/0/1", 92 "rgb:8b/00/cd",
223 "rgbi:.8/.2/0", 93 "rgb:8b/00/ff",
224 "rgbi:.8/.2/.2",
225 "rgbi:.8/.2/.4",
226 "rgbi:.8/.2/.6",
227 "rgbi:.8/.2/.8",
228 "rgbi:.8/.2/1",
229 "rgbi:.8/.4/0",
230 "rgbi:.8/.4/.2",
231 "rgbi:.8/.4/.4",
232 "rgbi:.8/.4/.6",
233 "rgbi:.8/.4/.8",
234 "rgbi:.8/.4/1",
235 "rgbi:.8/.6/0",
236 "rgbi:.8/.6/.2",
237 "rgbi:.8/.6/.4",
238 "rgbi:.8/.6/.6",
239 "rgbi:.8/.6/.8",
240 "rgbi:.8/.6/1",
241 "rgbi:.8/.8/0", 94 "rgb:8b/8b/00",
242 "rgbi:.8/.8/.2",
243 "rgbi:.8/.8/.4",
244 "rgbi:.8/.8/.6",
245 "rgbi:.8/.8/.8",
246 "rgbi:.8/.8/1",
247 "rgbi:.8/1/0",
248 "rgbi:.8/1/.2",
249 "rgbi:.8/1/.4",
250 "rgbi:.8/1/.6",
251 "rgbi:.8/1/.8",
252 "rgbi:.8/1/1",
253 "rgbi:1/0/0",
254 "rgbi:1/0/.2",
255 "rgbi:1/0/.4",
256 "rgbi:1/0/.6",
257 "rgbi:1/0/.8",
258 "rgbi:1/0/1",
259 "rgbi:1/.2/0",
260 "rgbi:1/.2/.2",
261 "rgbi:1/.2/.4",
262 "rgbi:1/.2/.6",
263 "rgbi:1/.2/.8",
264 "rgbi:1/.2/1",
265 "rgbi:1/.4/0",
266 "rgbi:1/.4/.2",
267 "rgbi:1/.4/.4",
268 "rgbi:1/.4/.6",
269 "rgbi:1/.4/.8",
270 "rgbi:1/.4/1",
271 "rgbi:1/.6/0",
272 "rgbi:1/.6/.2",
273 "rgbi:1/.6/.4",
274 "rgbi:1/.6/.6",
275 "rgbi:1/.6/.8",
276 "rgbi:1/.6/1",
277 "rgbi:1/.8/0",
278 "rgbi:1/.8/.2",
279 "rgbi:1/.8/.4",
280 "rgbi:1/.8/.6",
281 "rgbi:1/.8/.8",
282 "rgbi:1/.8/1",
283 "rgbi:1/1/0",
284 "rgbi:1/1/.2",
285 "rgbi:1/1/.4",
286 "rgbi:1/1/.6",
287 "rgbi:1/1/.8",
288 "rgbi:1/1/1",
289 "rgb:08/08/08", 95 "rgb:8b/8b/8b",
290 "rgb:12/12/12", 96 "rgb:8b/8b/cd",
97 "rgb:8b/8b/ff",
98 "rgb:8b/cd/00",
99 "rgb:8b/cd/8b",
100 "rgb:8b/cd/cd",
101 "rgb:8b/cd/ff",
102 "rgb:8b/ff/00",
103 "rgb:8b/ff/8b",
104 "rgb:8b/ff/cd",
105 "rgb:8b/ff/ff",
106 "rgb:cd/00/00",
107 "rgb:cd/00/8b",
108 "rgb:cd/00/cd",
109 "rgb:cd/00/ff",
110 "rgb:cd/8b/00",
111 "rgb:cd/8b/8b",
112 "rgb:cd/8b/cd",
113 "rgb:cd/8b/ff",
114 "rgb:cd/cd/00",
115 "rgb:cd/cd/8b",
291 "rgb:1c/1c/1c", 116 "rgb:cd/cd/cd",
117 "rgb:cd/cd/ff",
118 "rgb:cd/ff/00",
119 "rgb:cd/ff/8b",
120 "rgb:cd/ff/cd",
121 "rgb:cd/ff/ff",
122 "rgb:ff/00/00",
123 "rgb:ff/00/8b",
124 "rgb:ff/00/cd",
125 "rgb:ff/00/ff",
126 "rgb:ff/8b/00",
127 "rgb:ff/8b/8b",
128 "rgb:ff/8b/cd",
129 "rgb:ff/8b/ff",
130 "rgb:ff/cd/00",
131 "rgb:ff/cd/8b",
132 "rgb:ff/cd/cd",
133 "rgb:ff/cd/ff",
134 "rgb:ff/ff/00",
135 "rgb:ff/ff/8b",
136 "rgb:ff/ff/cd",
137 "rgb:ff/ff/ff",
292 "rgb:26/26/26", 138 "rgb:2e/2e/2e",
293 "rgb:30/30/30",
294 "rgb:3a/3a/3a",
295 "rgb:44/44/44",
296 "rgb:4e/4e/4e",
297 "rgb:58/58/58", 139 "rgb:5c/5c/5c",
298 "rgb:62/62/62",
299 "rgb:6c/6c/6c",
300 "rgb:76/76/76", 140 "rgb:73/73/73",
301 "rgb:80/80/80", 141 "rgb:8b/8b/8b",
302 "rgb:8a/8a/8a", 142 "rgb:a2/a2/a2",
303 "rgb:94/94/94", 143 "rgb:b9/b9/b9",
304 "rgb:9e/9e/9e",
305 "rgb:a8/a8/a8",
306 "rgb:b2/b2/b2",
307 "rgb:bc/bc/bc",
308 "rgb:c6/c6/c6",
309 "rgb:d0/d0/d0", 144 "rgb:d0/d0/d0",
310 "rgb:da/da/da",
311 "rgb:e4/e4/e4", 145 "rgb:e7/e7/e7",
312 "rgb:ee/ee/ee", 146
313#endif
314#ifndef NO_CURSORCOLOR 147#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 148 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 149 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 150#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer_fg */ 151 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */ 152 NULL, /* Color_pointer_bg */
320 NULL, /* Color_border */ 153 NULL, /* Color_border */
321#ifndef NO_BOLD_UNDERLINE_REVERSE 154#ifndef NO_BOLD_UNDERLINE_REVERSE
322 NULL, /* Color_BD */ 155 NULL, /* Color_BD */
156 NULL, /* Color_IT */
323 NULL, /* Color_UL */ 157 NULL, /* Color_UL */
324 NULL, /* Color_RV */ 158 NULL, /* Color_RV */
325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 159#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
160#if ENABLE_FRILLS
161 NULL, // Color_underline
162#endif
326#ifdef OPTION_HC 163#ifdef OPTION_HC
327 NULL, 164 NULL,
328#endif 165#endif
329#ifdef KEEP_SCROLLCOLOR 166#ifdef KEEP_SCROLLCOLOR
330 COLOR_SCROLLBAR, 167 COLOR_SCROLLBAR,
… …
333#if TINTING 170#if TINTING
334 NULL, 171 NULL,
335#endif 172#endif
336 }; 173 };
337 174
338const char *const xa_names[NUM_XA] = 175const char *const xa_names[] =
339 { 176 {
340 "TEXT", 177 "TEXT",
341 "COMPOUND_TEXT", 178 "COMPOUND_TEXT",
342 "UTF8_STRING", 179 "UTF8_STRING",
343 "MULTIPLE", 180 "MULTIPLE",
344 "TARGETS", 181 "TARGETS",
345 "TIMESTAMP", 182 "TIMESTAMP",
346 "VT_SELECTION", 183 "VT_SELECTION",
347 "INCR", 184 "INCR",
348 "WM_DELETE_WINDOW", 185 "WM_DELETE_WINDOW",
186 "CLIPBOARD",
187#if ENABLE_FRILLS
188 "_NET_WM_PID",
189 "_MOTIF_WM_HINTS",
190 "_NET_WM_NAME",
191 "_NET_WM_ICON_NAME",
192#endif
193#if USE_XIM
194 "WM_LOCALE_NAME",
195#endif
349#ifdef TRANSPARENT 196#ifdef TRANSPARENT
350 "_XROOTPMAP_ID", 197 "_XROOTPMAP_ID",
198 "ESETROOT_PMAP_ID",
351#endif 199#endif
352#ifdef OFFIX_DND 200#ifdef OFFIX_DND
353 "DndProtocol", 201 "DndProtocol",
354 "DndSelection", 202 "DndSelection",
355#endif 203#endif
356 "CLIPBOARD"
357 }; 204 };
358 205
359bool 206bool
360rxvt_term::init_vars () 207rxvt_term::init_vars ()
361{ 208{
209 sw_term.start (SIGTERM);
210
362 PixColorsFocused = new rxvt_color [TOTAL_COLORS]; 211 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING 212#ifdef OFF_FOCUS_FADING
364 PixColorsUnFocused = new rxvt_color [TOTAL_COLORS]; 213 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
365#endif 214#endif
366 PixColors = PixColorsFocused; 215 pix_colors = pix_colors_focused;
367 216
368 if (PixColors == NULL) 217 if (pix_colors == NULL)
369 return false; 218 return false;
370 219
371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 220#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
372 TermWin.pixmap = None; 221 TermWin.pixmap = None;
373#endif 222#endif
374#ifdef UTMP_SUPPORT
375 next_utmp_action = SAVE;
376#endif
377#ifndef NO_SETOWNER_TTYDEV
378 next_tty_action = SAVE;
379#endif
380 223
381 MEvent.time = CurrentTime; 224 MEvent.time = CurrentTime;
382 MEvent.button = AnyButton; 225 MEvent.button = AnyButton;
383 Options = DEFAULT_OPTIONS; 226 options = DEFAULT_OPTIONS;
384 want_refresh = 1; 227 want_refresh = 1;
385 cmd_pid = -1; 228 cmd_pid = -1;
386 cmd_fd = tty_fd = -1; 229 pty.pty = pty.tty = -1;
387 PrivateModes = SavedModes = PrivMode_Default; 230 priv_modes = SavedModes = PrivMode_Default;
388 TermWin.focus = 0; 231 TermWin.focus = 0;
389 TermWin.ncol = 80; 232 TermWin.ncol = 80;
390 TermWin.nrow = 24; 233 TermWin.nrow = 24;
391 TermWin.int_bwidth = INTERNALBORDERWIDTH; 234 TermWin.int_bwidth = INTERNALBORDERWIDTH;
392 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 235 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
393 TermWin.lineSpace = LINESPACE; 236 TermWin.lineSpace = LINESPACE;
394 TermWin.saveLines = SAVELINES; 237 TermWin.saveLines = SAVELINES;
395 numPixColors = TOTAL_COLORS; 238 numpix_colors = TOTAL_COLORS;
396
397#ifndef NO_BRIGHTCOLOR
398 colorfgbg = DEFAULT_RSTYLE;
399#endif
400 239
401 refresh_limit = 1; 240 refresh_limit = 1;
402 refresh_type = SLOW_REFRESH; 241 refresh_type = SLOW_REFRESH;
403 prev_nrow = prev_ncol = 0; 242 prev_nrow = prev_ncol = 0;
404 243
… …
423 262
424void 263void
425rxvt_term::init_secondary () 264rxvt_term::init_secondary ()
426{ 265{
427 int i; 266 int i;
428#ifdef TTY_GID_SUPPORT
429 struct group *gr = getgrnam ("tty");
430
431 if (gr)
432 { /* change group ownership of tty to "tty" */
433 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
434 ttygid = gr->gr_gid;
435 }
436 else
437#endif /* TTY_GID_SUPPORT */
438
439 {
440 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
441 ttygid = getgid ();
442 }
443 267
444 /* 268 /*
445 * Close all unused file descriptors 269 * Close all unused file descriptors
446 * We don't want them, we don't need them. 270 * We don't want them, we don't need them.
447 */ 271 */
… …
480 304
481 /* 305 /*
482 * Look for -exec option. Find => split and make cmd_argv[] of command args 306 * Look for -exec option. Find => split and make cmd_argv[] of command args
483 */ 307 */
484 for (r_argc = 0; r_argc < argc; r_argc++) 308 for (r_argc = 0; r_argc < argc; r_argc++)
485 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec")) 309 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))
486 break; 310 break;
487 311
488 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 312 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
489 313
490 for (i = 0; i < r_argc; i++) 314 for (i = 0; i < r_argc; i++)
… …
516 free (r_argv); 340 free (r_argv);
517 341
518#ifdef LOCAL_X_IS_UNIX 342#ifdef LOCAL_X_IS_UNIX
519 if (rs[Rs_display_name][0] == ':') 343 if (rs[Rs_display_name][0] == ':')
520 { 344 {
521 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 345 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
522 STRCPY (val, "unix"); 346 strcpy (val, "unix");
523 STRCAT (val, rs[Rs_display_name]); 347 strcat (val, rs[Rs_display_name]);
524 display = displays.get (val); 348 display = displays.get (val);
525 free (val); 349 free (val);
526 } 350 }
527#endif 351#endif
528 352
529 if (!display 353 if (!display
530 && ! (display = displays.get (rs[Rs_display_name]))) 354 && ! (display = displays.get (rs[Rs_display_name])))
531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]); 355 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
532 356
533 extract_resources (display->display, rs[Rs_name]); 357 extract_resources (display->display, rs[Rs_name]);
534 358
535 /* 359 /*
536 * set any defaults not already set 360 * set any defaults not already set
… …
551 } 375 }
552 376
553 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 377 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
554 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 378 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
555 379
556#ifndef NO_FRILLS 380#if ENABLE_FRILLS
557 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 381 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
558 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 382 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
559 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 383 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
560 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 384 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
561#endif 385#endif
… …
572 pointerBlankDelay = 2; 396 pointerBlankDelay = 2;
573#endif 397#endif
574 398
575 /* no point having a scrollbar without having any scrollback! */ 399 /* no point having a scrollbar without having any scrollback! */
576 if (!TermWin.saveLines) 400 if (!TermWin.saveLines)
577 Options &= ~Opt_scrollBar; 401 options &= ~Opt_scrollBar;
578 402
579#ifdef PRINTPIPE 403#ifdef PRINTPIPE
580 if (!rs[Rs_print_pipe]) 404 if (!rs[Rs_print_pipe])
581 rs[Rs_print_pipe] = PRINTPIPE; 405 rs[Rs_print_pipe] = PRINTPIPE;
582#endif 406#endif
… …
591# else 415# else
592 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 416 key_backspace = "DEC"; /* can toggle between \010 or \177 */
593# endif 417# endif
594 else 418 else
595 { 419 {
596 val = STRDUP (rs[Rs_backspace_key]); 420 val = strdup (rs[Rs_backspace_key]);
597 rxvt_Str_trim (val); 421 rxvt_Str_trim (val);
598 rxvt_Str_escaped (val); 422 rxvt_Str_escaped (val);
599 key_backspace = val; 423 key_backspace = val;
600 } 424 }
601#endif 425#endif
… …
607# else 431# else
608 key_delete = "\033[3~"; 432 key_delete = "\033[3~";
609# endif 433# endif
610 else 434 else
611 { 435 {
612 val = STRDUP (rs[Rs_delete_key]); 436 val = strdup (rs[Rs_delete_key]);
613 rxvt_Str_trim (val); 437 rxvt_Str_trim (val);
614 rxvt_Str_escaped (val); 438 rxvt_Str_escaped (val);
615 key_delete = val; 439 key_delete = val;
616 } 440 }
617#endif 441#endif
… …
620 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 444 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
621 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 445 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
622 } 446 }
623 447
624#ifdef HAVE_SCROLLBARS 448#ifdef HAVE_SCROLLBARS
625 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 449 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
626 rs[Rs_scrollBar_thickness]);
627#endif 450#endif
628 451
629#ifdef XTERM_REVERSE_VIDEO 452#ifdef XTERM_REVERSE_VIDEO
630 /* this is how xterm implements reverseVideo */ 453 /* this is how xterm implements reverseVideo */
631 if (Options & Opt_reverseVideo) 454 if (options & Opt_reverseVideo)
632 { 455 {
633 if (!rs[Rs_color + Color_fg]) 456 if (!rs[Rs_color + Color_fg])
634 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 457 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
635 if (!rs[Rs_color + Color_bg]) 458 if (!rs[Rs_color + Color_bg])
636 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 459 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
641 if (!rs[Rs_color + i]) 464 if (!rs[Rs_color + i])
642 rs[Rs_color + i] = def_colorName[i]; 465 rs[Rs_color + i] = def_colorName[i];
643 466
644#ifndef XTERM_REVERSE_VIDEO 467#ifndef XTERM_REVERSE_VIDEO
645 /* this is how we implement reverseVideo */ 468 /* this is how we implement reverseVideo */
646 if (Options & Opt_reverseVideo) 469 if (options & Opt_reverseVideo)
647 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 470 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
648#endif 471#endif
649 472
650 /* convenient aliases for setting fg/bg to colors */ 473 /* convenient aliases for setting fg/bg to colors */
651 color_aliases (Color_fg); 474 color_aliases (Color_fg);
… …
661 color_aliases (Color_BD); 484 color_aliases (Color_BD);
662 color_aliases (Color_UL); 485 color_aliases (Color_UL);
663 color_aliases (Color_RV); 486 color_aliases (Color_RV);
664#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 487#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
665 488
489 if (!rs[Rs_color + Color_border])
490 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
491
666 return cmd_argv; 492 return cmd_argv;
667} 493}
668 494
669/*----------------------------------------------------------------------*/ 495/*----------------------------------------------------------------------*/
670void 496void
… …
693 val = XDisplayString (display->display); 519 val = XDisplayString (display->display);
694 520
695 if (rs[Rs_display_name] == NULL) 521 if (rs[Rs_display_name] == NULL)
696 rs[Rs_display_name] = val; /* use broken `:0' value */ 522 rs[Rs_display_name] = val; /* use broken `:0' value */
697 523
698 i = STRLEN (val); 524 i = strlen (val);
699 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
700 526
701 sprintf (env_display, "DISPLAY=%s", val); 527 sprintf (env_display, "DISPLAY=%s", val);
702 528
703 /* avoiding the math library: 529 /* avoiding the math library:
… …
732 else 558 else
733 putenv ("COLORTERM=" COLORTERMENVFULL); 559 putenv ("COLORTERM=" COLORTERMENVFULL);
734 560
735 if (rs[Rs_term_name] != NULL) 561 if (rs[Rs_term_name] != NULL)
736 { 562 {
737 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char)); 563 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char));
738 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 564 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
739 putenv (env_term); 565 putenv (env_term);
740 } 566 }
741 else 567 else
742 putenv ("TERM=" TERMENV); 568 putenv ("TERM=" TERMENV);
… …
761 free (this->locale); 587 free (this->locale);
762 this->locale = setlocale (LC_CTYPE, locale); 588 this->locale = setlocale (LC_CTYPE, locale);
763 589
764 if (!this->locale) 590 if (!this->locale)
765 { 591 {
592 if (*locale)
593 {
766 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 594 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
767 setlocale (LC_CTYPE, ""); 595 setlocale (LC_CTYPE, "");
596 }
597 else
598 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
599
768 this->locale = ""; 600 this->locale = "";
769 } 601 }
602
770 603
771 this->locale = rxvt_strdup (this->locale); 604 this->locale = rxvt_strdup (this->locale);
772 SET_LOCALE (this->locale); 605 SET_LOCALE (this->locale);
773 mbstate.reset (); 606 mbstate.reset ();
774#endif 607#endif
608
775#if 0 609#if 0
776#if HAVE_NL_LANGINFO 610#if HAVE_NL_LANGINFO
611 char *codeset = strdup (nl_langinfo (CODESET));
612 enc_utf8 = !strcasecmp (codeset, "UTF-8")
613 || !strcasecmp (codeset, "UTF8");
777 free (codeset); 614 free (codeset);
778 codeset = strdup (nl_langinfo (CODESET));
779 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
780 || !STRCASECMP (codeset, "UTF8");
781#else 615#else
782 enc_utf8 = 1; 616 enc_utf8 = 0;
783#endif 617#endif
784#endif 618#endif
785} 619}
786 620
787void 621void
… …
790#ifdef USE_XIM 624#ifdef USE_XIM
791 if (!locale) 625 if (!locale)
792 rxvt_warn ("setting locale failed, working without locale support.\n"); 626 rxvt_warn ("setting locale failed, working without locale support.\n");
793 else 627 else
794 { 628 {
795 Atom wmlocale; 629 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
796
797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
798 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
799 XA_STRING, 8, PropModeReplace,
800 (unsigned char *)locale, STRLEN (locale));
801 630
802 if (!XSupportsLocale ()) 631 if (!XSupportsLocale ())
803 { 632 {
804 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 633 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
805 return; 634 return;
806 } 635 }
807 636
808 im_ev.start (display); 637 im_ev.start (display);
809 638
… …
819{ 648{
820 /* 649 /*
821 * Initialize the command connection. 650 * Initialize the command connection.
822 * This should be called after the X server connection is established. 651 * This should be called after the X server connection is established.
823 */ 652 */
824 int i;
825
826 for (i = 0; i < NUM_XA; i++)
827 xa[i] = XInternAtom (display->display, xa_names[i], False);
828
829 /* Enable delete window protocol */
830 XSetWMProtocols (display->display, TermWin.parent[0],
831 & (xa[XA_WMDELETEWINDOW]), 1);
832
833#ifdef USING_W11LIB
834 /* enable W11 callbacks */
835 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
836#endif
837 653
838#ifdef META8_OPTION 654#ifdef META8_OPTION
839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 655 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
840#endif 656#endif
841 657
842 get_ourmods (); 658 get_ourmods ();
843 659
844 if (!(Options & Opt_scrollTtyOutput)) 660 if (!(options & Opt_scrollTtyOutput))
845 PrivateModes |= PrivMode_TtyOutputInh; 661 priv_modes |= PrivMode_TtyOutputInh;
846 if (Options & Opt_scrollTtyKeypress) 662 if (options & Opt_scrollTtyKeypress)
847 PrivateModes |= PrivMode_Keypress; 663 priv_modes |= PrivMode_Keypress;
848 if (!(Options & Opt_jumpScroll)) 664 if (!(options & Opt_jumpScroll))
849 PrivateModes |= PrivMode_smoothScroll; 665 priv_modes |= PrivMode_smoothScroll;
850 666
851#ifndef NO_BACKSPACE_KEY 667#ifndef NO_BACKSPACE_KEY
852 if (STRCMP (key_backspace, "DEC") == 0) 668 if (strcmp (key_backspace, "DEC") == 0)
853 PrivateModes |= PrivMode_HaveBackSpace; 669 priv_modes |= PrivMode_HaveBackSpace;
854#endif 670#endif
855 671
856 /* add value for scrollBar */ 672 /* add value for scrollBar */
857 if (scrollbar_visible ()) 673 if (scrollbar_visible ())
858 { 674 {
859 PrivateModes |= PrivMode_scrollBar; 675 priv_modes |= PrivMode_scrollBar;
860 SavedModes |= PrivMode_scrollBar; 676 SavedModes |= PrivMode_scrollBar;
861 } 677 }
862 if (menubar_visible ()) 678 if (menubar_visible ())
863 { 679 {
864 PrivateModes |= PrivMode_menuBar; 680 priv_modes |= PrivMode_menuBar;
865 SavedModes |= PrivMode_menuBar; 681 SavedModes |= PrivMode_menuBar;
866 } 682 }
867 683
868#ifdef CURSOR_BLINK 684#ifdef CURSOR_BLINK
869 if (Options & Opt_cursorBlink) 685 if (options & Opt_cursorBlink)
870 (void)gettimeofday (&lastcursorchange, NULL); 686 (void)gettimeofday (&lastcursorchange, NULL);
871#endif 687#endif
872 688
873 run_command (argv); 689 run_command (argv);
874} 690}
… …
878rxvt_term::Get_Colours () 694rxvt_term::Get_Colours ()
879{ 695{
880 int i; 696 int i;
881 697
882#ifdef OFF_FOCUS_FADING 698#ifdef OFF_FOCUS_FADING
883 PixColors = PixColorsFocused; 699 pix_colors = pix_colors_focused;
884#endif 700#endif
885 701
886 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 702 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
887 { 703 {
888 rxvt_color xcol; 704 rxvt_color xcol;
… …
891 continue; 707 continue;
892 708
893 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 709 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
894 { 710 {
895#ifndef XTERM_REVERSE_VIDEO 711#ifndef XTERM_REVERSE_VIDEO
896 if (i < 2 && (Options & Opt_reverseVideo)) 712 if (i < 2 && (options & Opt_reverseVideo))
897 rs[Rs_color + i] = def_colorName[!i]; 713 rs[Rs_color + i] = def_colorName[!i];
898 else 714 else
899#endif 715#endif
900 rs[Rs_color + i] = def_colorName[i]; 716 rs[Rs_color + i] = def_colorName[i];
901 717
… …
907 switch (i) 723 switch (i)
908 { 724 {
909 case Color_fg: 725 case Color_fg:
910 case Color_bg: 726 case Color_bg:
911 /* fatal: need bg/fg color */ 727 /* fatal: need bg/fg color */
912 rxvt_fatal ("unable to get foreground/background colour, aborting"); 728 rxvt_fatal ("unable to get foreground/background colour, aborting.\n");
913 /* NOTREACHED */ 729 /* NOTREACHED */
914 break; 730 break;
915#ifndef NO_CURSORCOLOR 731#ifndef NO_CURSORCOLOR
916 case Color_cursor2: 732 case Color_cursor2:
917 xcol = PixColors[Color_fg]; 733 xcol = pix_colors[Color_fg];
918 break; 734 break;
919#endif /* ! NO_CURSORCOLOR */ 735#endif /* ! NO_CURSORCOLOR */
920 case Color_pointer_fg: 736 case Color_pointer_fg:
921 xcol = PixColors[Color_fg]; 737 xcol = pix_colors[Color_fg];
922 break; 738 break;
923 default: 739 default:
924 xcol = PixColors[Color_bg]; /* None */ 740 xcol = pix_colors[Color_bg]; /* None */
925 break; 741 break;
926 } 742 }
927 } 743 }
928 } 744 }
929 745
930 PixColors[i] = xcol; 746 pix_colors[i] = xcol;
931#ifdef OFF_FOCUS_FADING 747#ifdef OFF_FOCUS_FADING
932 if (rs[Rs_fade]) 748 if (rs[Rs_fade])
933 PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 749 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
934#endif 750#endif
935 SET_PIXCOLOR (i); 751 SET_PIXCOLOR (i);
936 } 752 }
937 753
938 if (display->depth <= 2) 754 if (display->depth <= 2)
939 { 755 {
940 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg]; 756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
941 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg]; 757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
942 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg]; 758 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
943 } 759 }
944 760
945 /* 761 /*
946 * get scrollBar/menuBar shadow colors 762 * get scrollBar/menuBar shadow colors
947 * 763 *
… …
950 */ 766 */
951#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
952 768
953 if (display->depth <= 2) 769 if (display->depth <= 2)
954 { /* Monochrome */ 770 { /* Monochrome */
955 PixColors[Color_scroll] = PixColors[Color_fg]; 771 pix_colors[Color_scroll] = pix_colors[Color_fg];
956 PixColors[Color_topShadow] = PixColors[Color_bg]; 772 pix_colors[Color_topShadow] = pix_colors[Color_bg];
957 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 773 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
958 } 774 }
959 else 775 else
960 { 776 {
961 rxvt_color xcol[2]; 777 rxvt_color xcol[2];
962 /* xcol[0] == white 778 /* xcol[0] == white
963 * xcol[1] == top shadow 779 * xcol[1] == top shadow
964 * xcol[2] == bot shadow */ 780 * xcol[2] == bot shadow */
965 781
966 xcol[1] = PixColors[Color_scroll]; 782 xcol[1] = pix_colors[Color_scroll];
967 xcol[0].set (display, 65535, 65535, 65535); 783 xcol[0].set (display, 65535, 65535, 65535);
968 784
969 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 785 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
970 786
971 xcol[0].get (display, pr0, pg0, pb0); 787 xcol[0].get (display, pr0, pg0, pb0);
972 xcol[1].get (display, pr1, pg1, pb1); 788 xcol[1].get (display, pr1, pg1, pb1);
973 789
974 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50); 790 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
975 791
976 /* topShadowColor */ 792 /* topShadowColor */
977 if (!xcol[1].set (display, 793 if (!xcol[1].set (display,
978 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 794 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
979 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 795 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
980 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 796 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
981 xcol[1] = PixColors[Color_White]; 797 xcol[1] = pix_colors[Color_White];
982 798
983 PixColors[Color_topShadow] = xcol[1]; 799 pix_colors[Color_topShadow] = xcol[1];
984 } 800 }
985#endif /* KEEP_SCROLLCOLOR */ 801#endif /* KEEP_SCROLLCOLOR */
986} 802}
987 803
988/*----------------------------------------------------------------------*/ 804/*----------------------------------------------------------------------*/
… …
999 i -= 8; 815 i -= 8;
1000#ifndef NO_BRIGHTCOLOR 816#ifndef NO_BRIGHTCOLOR
1001 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1002 return; 818 return;
1003#endif 819#endif
1004
1005 } 820 }
1006 821
1007 if (i >= 0 && i <= 7) /* normal colors */ 822 if (i >= 0 && i <= 7) /* normal colors */
1008 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 823 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1009 } 824 }
… …
1028 }; 843 };
1029 844
1030 requestedmeta = realmeta = realalt = 0; 845 requestedmeta = realmeta = realalt = 0;
1031 rsmod = rs[Rs_modifier]; 846 rsmod = rs[Rs_modifier];
1032 if (rsmod 847 if (rsmod
1033 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0) 848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1034 requestedmeta = rsmod[3] - '0'; 849 requestedmeta = rsmod[3] - '0';
1035 850
1036 map = XGetModifierMapping (display->display); 851 map = XGetModifierMapping (display->display);
1037 kc = map->modifiermap; 852 kc = map->modifiermap;
1038 for (i = 1; i < 6; i++) 853 for (i = 1; i < 6; i++)
… …
1066 case XK_Hyper_L: 881 case XK_Hyper_L:
1067 case XK_Hyper_R: 882 case XK_Hyper_R:
1068 cm = "hyper"; 883 cm = "hyper";
1069 break; 884 break;
1070 } 885 }
1071 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0) 886 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1072 requestedmeta = i; 887 requestedmeta = i;
1073 } 888 }
1074 } 889 }
1075 XFreeModifiermap (map); 890 XFreeModifiermap (map);
1076 i = (requestedmeta ? requestedmeta 891 i = (requestedmeta ? requestedmeta
… …
1085void 900void
1086rxvt_term::create_windows (int argc, const char *const *argv) 901rxvt_term::create_windows (int argc, const char *const *argv)
1087{ 902{
1088 XClassHint classHint; 903 XClassHint classHint;
1089 XWMHints wmHint; 904 XWMHints wmHint;
1090#ifndef NO_FRILLS 905#if ENABLE_FRILLS
1091 Atom prop = None; 906 Atom prop = None;
1092 MWMHints mwmhints; 907 MWMHints mwmhints;
1093#endif 908#endif
1094 XGCValues gcvalue; 909 XGCValues gcvalue;
1095 long vt_emask; 910 long vt_emask;
1096 XSetWindowAttributes attributes; 911 XSetWindowAttributes attributes;
1097 XWindowAttributes gattr; 912 XWindowAttributes gattr;
1098 913
914#ifdef USING_W11LIB
915 /* enable W11 callbacks */
916 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
917#endif
918
919 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
920 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa);
921
1099 if (Options & Opt_transparent) 922 if (options & Opt_transparent)
1100 { 923 {
1101 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 924 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1102 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 925 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1103 } 926 }
1104 927
1105#ifndef NO_FRILLS 928#if ENABLE_FRILLS
1106 if (Options & Opt_borderLess) 929 if (options & Opt_borderLess)
1107 { 930 {
1108 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 931 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
932
1109 if (prop == None) 933 if (prop == None)
1110 { 934 {
1111 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 935 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
1112#ifdef PREFER_24BIT 936#ifdef PREFER_24BIT
1113 attributes.override_redirect = TRUE; 937 attributes.override_redirect = TRUE;
… …
1127#endif 951#endif
1128 952
1129 /* grab colors before netscape does */ 953 /* grab colors before netscape does */
1130 Get_Colours (); 954 Get_Colours ();
1131 955
1132 if (!change_font (rs[Rs_font])) 956 if (!set_fonts ())
1133 { 957 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1134 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1135 destroy ();
1136 return;
1137 }
1138 958
1139 window_calc (0, 0); 959 window_calc (0, 0);
1140 old_width = szHint.width; 960 old_width = szHint.width;
1141 old_height = szHint.height; 961 old_height = szHint.height;
1142 962
1143 /* sub-window placement & size in rxvt_resize_subwindows () */ 963 /* sub-window placement & size in rxvt_resize_subwindows () */
1144 964
1145#ifdef PREFER_24BIT 965#ifdef PREFER_24BIT
1146 attributes.background_pixel = PixColors[Color_bg]; 966 attributes.background_pixel = pix_colors_focused[Color_border];
1147 attributes.border_pixel = PixColors[Color_border]; 967 attributes.border_pixel = pix_colors_focused[Color_border];
1148 attributes.colormap = display->cmap; 968 attributes.colormap = display->cmap;
1149 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 969 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1150 szHint.x, szHint.y, 970 szHint.x, szHint.y,
1151 szHint.width, szHint.height, 971 szHint.width, szHint.height,
1152 TermWin.ext_bwidth, 972 TermWin.ext_bwidth,
… …
1156#else 976#else
1157 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 977 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1158 szHint.x, szHint.y, 978 szHint.x, szHint.y,
1159 szHint.width, szHint.height, 979 szHint.width, szHint.height,
1160 TermWin.ext_bwidth, 980 TermWin.ext_bwidth,
1161 PixColors[Color_border], 981 pix_colors_focused[Color_border],
1162 PixColors[Color_bg]); 982 pix_colors_focused[Color_border]);
1163#endif 983#endif
1164 984
1165 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 985 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1166 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 986 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1167 987
1168 classHint.res_name = (char *)rs[Rs_name]; 988 classHint.res_name = (char *)rs[Rs_name];
1169 classHint.res_class = (char *)RESCLASS; 989 classHint.res_class = (char *)RESCLASS;
1170 990
1171 wmHint.flags = InputHint | StateHint | WindowGroupHint; 991 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1172 wmHint.input = True; 992 wmHint.input = True;
1173 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState; 993 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1174 wmHint.window_group = TermWin.parent[0]; 994 wmHint.window_group = TermWin.parent[0];
1175 995
1176 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 996 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1177 (char **)argv, argc, &szHint, &wmHint, &classHint); 997 (char **)argv, argc, &szHint, &wmHint, &classHint);
1178 998
1179#ifndef NO_FRILLS 999 /* Enable delete window protocol */
1000 XSetWMProtocols (display->display, TermWin.parent[0],
1001 &xa[XA_WMDELETEWINDOW], 1);
1002
1003#if ENABLE_FRILLS
1180 long pid = getpid (); 1004 long pid = getpid ();
1005
1181 XChangeProperty (display->display, TermWin.parent[0], 1006 XChangeProperty (display->display, TermWin.parent[0],
1182 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1007 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1183 PropModeReplace, (unsigned char *)&pid, 1); 1008 PropModeReplace, (unsigned char *)&pid, 1);
1184#endif 1009#endif
1185 1010
1186 XSelectInput (display->display, TermWin.parent[0], 1011 XSelectInput (display->display, TermWin.parent[0],
1187 KeyPressMask 1012 KeyPressMask
1188#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1013#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1189 | KeyReleaseMask 1014 | KeyReleaseMask
1190#endif 1015#endif
1191 | FocusChangeMask | VisibilityChangeMask 1016 | FocusChangeMask | VisibilityChangeMask
1192 | ExposureMask 1017 | ExposureMask
1193 | StructureNotifyMask); 1018 | StructureNotifyMask);
1194 termwin_ev.start (display, TermWin.parent[0]); 1019 termwin_ev.start (display, TermWin.parent[0]);
1195 1020
1196#ifndef NO_FRILLS 1021#if ENABLE_FRILLS
1197 if (mwmhints.flags) 1022 if (mwmhints.flags)
1198 { 1023 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1199 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False); 1024 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1200 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1201 }
1202#endif 1025#endif
1203 1026
1204 /* vt cursor: Black-on-White is standard, but this is more popular */ 1027 /* vt cursor: Black-on-White is standard, but this is more popular */
1205 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1028 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1206 1029
… …
1227 window_vt_x, 1050 window_vt_x,
1228 window_vt_y, 1051 window_vt_y,
1229 TermWin_TotalWidth (), 1052 TermWin_TotalWidth (),
1230 TermWin_TotalHeight (), 1053 TermWin_TotalHeight (),
1231 0, 1054 0,
1232 PixColors[Color_fg], 1055 pix_colors_focused[Color_fg],
1233 PixColors[Color_bg]); 1056 pix_colors_focused[Color_bg]);
1234#ifdef DEBUG_X 1057#ifdef DEBUG_X
1235 XStoreName (display->display, TermWin.vt, "vt window"); 1058 XStoreName (display->display, TermWin.vt, "vt window");
1236#endif 1059#endif
1237 1060
1238 attributes.bit_gravity = NorthWestGravity; 1061 attributes.bit_gravity = NorthWestGravity;
… …
1241 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1064 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1242 1065
1243 pointer_unblank (); 1066 pointer_unblank ();
1244 1067
1245#ifdef POINTER_BLANK 1068#ifdef POINTER_BLANK
1246 if (Options & Opt_pointerBlank) 1069 if (options & Opt_pointerBlank)
1247 vt_emask |= PointerMotionMask; 1070 vt_emask |= PointerMotionMask;
1248 else 1071 else
1249#endif 1072#endif
1250 vt_emask |= Button1MotionMask | Button3MotionMask; 1073 vt_emask |= Button1MotionMask | Button3MotionMask;
1251 1074
… …
1258 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1081 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1259 window_vt_x, 0, 1082 window_vt_x, 0,
1260 TermWin_TotalWidth (), 1083 TermWin_TotalWidth (),
1261 menuBar_TotalHeight (), 1084 menuBar_TotalHeight (),
1262 0, 1085 0,
1263 PixColors[Color_fg], 1086 pix_colors_focused[Color_fg],
1264 PixColors[Color_scroll]); 1087 pix_colors_focused[Color_scroll]);
1265 1088
1266#ifdef DEBUG_X 1089#ifdef DEBUG_X
1267 XStoreName (display->display, menuBar.win, "menubar"); 1090 XStoreName (display->display, menuBar.win, "menubar");
1268#endif 1091#endif
1269 1092
… …
1279 } 1102 }
1280#endif 1103#endif
1281 1104
1282#ifdef XPM_BACKGROUND 1105#ifdef XPM_BACKGROUND
1283 if (rs[Rs_backgroundPixmap] != NULL 1106 if (rs[Rs_backgroundPixmap] != NULL
1284 && ! (Options & Opt_transparent)) 1107 && ! (options & Opt_transparent))
1285 { 1108 {
1286 const char *p = rs[Rs_backgroundPixmap]; 1109 const char *p = rs[Rs_backgroundPixmap];
1287 1110
1288 if ((p = STRCHR (p, ';')) != NULL) 1111 if ((p = strchr (p, ';')) != NULL)
1289 { 1112 {
1290 p++; 1113 p++;
1291 scale_pixmap (p); 1114 scale_pixmap (p);
1292 } 1115 }
1116
1293 set_bgPixmap (rs[Rs_backgroundPixmap]); 1117 set_bgPixmap (rs[Rs_backgroundPixmap]);
1294 scr_touch (True); 1118 scr_touch (true);
1295 } 1119 }
1296#endif 1120#endif
1297 1121
1298 /* graphics context for the vt window */ 1122 /* graphics context for the vt window */
1299 gcvalue.foreground = PixColors[Color_fg]; 1123 gcvalue.foreground = pix_colors[Color_fg];
1300 gcvalue.background = PixColors[Color_bg]; 1124 gcvalue.background = pix_colors[Color_bg];
1301 gcvalue.graphics_exposures = 1; 1125 gcvalue.graphics_exposures = 1;
1302 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1126 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1303 GCForeground | GCBackground | GCGraphicsExposures, 1127 GCForeground | GCBackground | GCGraphicsExposures,
1304 &gcvalue); 1128 &gcvalue);
1305 1129
1306 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1130 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1307 1131
1308#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1132#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1309 gcvalue.foreground = PixColors[Color_topShadow]; 1133 gcvalue.foreground = pix_colors[Color_topShadow];
1310 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1134 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1311 gcvalue.foreground = PixColors[Color_bottomShadow]; 1135 gcvalue.foreground = pix_colors[Color_bottomShadow];
1312 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1136 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1313 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1137 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1314 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1138 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1315#endif 1139#endif
1316 1140
1317#ifdef OFF_FOCUS_FADING 1141#ifdef OFF_FOCUS_FADING
1318 // initially we are in unfocused state 1142 // initially we are in unfocused state
1319 if (rs[Rs_fade]) 1143 if (rs[Rs_fade])
1320 PixColors = PixColorsUnFocused; 1144 pix_colors = pix_colors_unfocused;
1321#endif
1322}
1323
1324/*----------------------------------------------------------------------*/
1325/*
1326 * Run the command in a subprocess and return a file descriptor for the
1327 * master end of the pseudo-teletype pair with the command talking to
1328 * the slave.
1329 */
1330void
1331rxvt_term::run_command (const char *const *argv)
1332{
1333 int er;
1334
1335 /* get master (pty) */
1336 if ((cmd_fd = rxvt_get_pty (&tty_fd, &ttydev)) < 0)
1337 rxvt_fatal ("can't open pseudo-tty");
1338
1339 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
1340
1341 /* get slave (tty) */
1342 if (tty_fd < 0)
1343 {
1344#ifndef NO_SETOWNER_TTYDEV
1345 privileged_ttydev (SAVE);
1346#endif
1347
1348 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1349 {
1350 close (cmd_fd);
1351 cmd_fd = -1;
1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1353 }
1354 }
1355
1356#ifndef NO_BACKSPACE_KEY
1357 if (key_backspace[0] && !key_backspace[1])
1358 er = key_backspace[0];
1359 else if (STRCMP (key_backspace, "DEC") == 0)
1360 er = '\177'; /* the initial state anyway */
1361 else
1362#endif
1363 er = -1;
1364
1365 rxvt_get_ttymode (&tio, er);
1366
1367#ifndef __QNX__
1368 /* spin off the command interpreter */
1369 switch (cmd_pid = fork ())
1370 {
1371 case -1:
1372 rxvt_fatal ("can't fork");
1373 case 0:
1374 init_env ();
1375
1376 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1377 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1378 else
1379 {
1380 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1381 dup2 (tty_fd, STDIN_FILENO);
1382 dup2 (tty_fd, STDOUT_FILENO);
1383 dup2 (tty_fd, STDERR_FILENO);
1384
1385 // close all our file handles that we do no longer need
1386 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1387 {
1388 if ((*t)->cmd_fd > 2) close ((*t)->cmd_fd);
1389 if ((*t)->tty_fd > 2) close ((*t)->tty_fd);
1390 }
1391
1392 run_child (argv);
1393 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1394 }
1395
1396 _exit (EXIT_FAILURE);
1397
1398 default:
1399 {
1400#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1401 int fdstdin;
1402
1403 fdstdin = dup (STDIN_FILENO);
1404 dup2 (tty_fd, STDIN_FILENO);
1405#endif
1406
1407#ifdef UTMP_SUPPORT
1408 privileged_utmp (SAVE);
1409#endif
1410
1411#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1412
1413 dup2 (fdstdin, STDIN_FILENO);
1414 close (fdstdin);
1415#endif
1416 }
1417
1418 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1419 break;
1420 }
1421#else /* __QNX__ uses qnxspawn () */
1422 fchmod (tty_fd, 0622);
1423 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1424 fcntl (cmd_fd, F_SETFD, FD_CLOEXEC);
1425
1426 if (run_child (argv) == -1)
1427 exit (EXIT_FAILURE);
1428#endif
1429}
1430
1431/* ------------------------------------------------------------------------- *
1432 * CHILD PROCESS OPERATIONS *
1433 * ------------------------------------------------------------------------- */
1434/*
1435 * The only open file descriptor is the slave tty - so no error messages.
1436 * returns are fatal
1437 */
1438int
1439rxvt_term::run_child (const char *const *argv)
1440{
1441 char *login;
1442
1443 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1444
1445 if (Options & Opt_console)
1446 { /* be virtual console, fail silently */
1447#ifdef TIOCCONS
1448 unsigned int on = 1;
1449
1450 ioctl (STDIN_FILENO, TIOCCONS, &on);
1451#elif defined (SRIOCSREDIR)
1452 int fd;
1453
1454 fd = open (CONSOLE, O_WRONLY, 0);
1455 if (fd >= 0)
1456 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1457 close (fd);
1458#endif /* SRIOCSREDIR */
1459
1460 }
1461
1462 /* reset signals and spin off the command interpreter */
1463 signal (SIGINT, SIG_DFL);
1464 signal (SIGQUIT, SIG_DFL);
1465 signal (SIGCHLD, SIG_DFL);
1466 /*
1467 * mimick login's behavior by disabling the job control signals
1468 * a shell that wants them can turn them back on
1469 */
1470#ifdef SIGTSTP
1471 signal (SIGTSTP, SIG_IGN);
1472 signal (SIGTTIN, SIG_IGN);
1473 signal (SIGTTOU, SIG_IGN);
1474#endif /* SIGTSTP */
1475
1476 /* set window size */
1477 struct winsize ws;
1478
1479 ws.ws_col = TermWin.ncol;
1480 ws.ws_row = TermWin.nrow;
1481 ws.ws_xpixel = ws.ws_ypixel = 0;
1482 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1483
1484 // unblock signals (signals are blocked by iom.C
1485 sigset_t ss;
1486 sigemptyset (&ss);
1487 sigprocmask (SIG_SETMASK, &ss, 0);
1488
1489#ifndef __QNX__
1490 /* command interpreter path */
1491 if (argv != NULL)
1492 {
1493# ifdef DEBUG_CMD
1494 int i;
1495
1496 for (i = 0; argv[i]; i++)
1497 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1498# endif 1145#endif
1499 1146
1500 execvp (argv[0], (char *const *)argv); 1147 scr_recolour ();
1501 /* no error message: STDERR is closed! */
1502 }
1503 else
1504 {
1505 const char *argv0, *shell;
1506
1507 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1508 shell = "/bin/sh";
1509
1510 argv0 = (const char *)rxvt_r_basename (shell);
1511 if (Options & Opt_loginShell)
1512 {
1513 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1514
1515 login[0] = '-';
1516 STRCPY (&login[1], argv0);
1517 argv0 = login;
1518 }
1519 execlp (shell, argv0, NULL);
1520 /* no error message: STDERR is closed! */
1521 }
1522
1523#else /* __QNX__ uses qnxspawn () */
1524
1525 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1526 char *command = NULL, fullcommand[_MAX_PATH];
1527 char **arg_v, *arg_a[2] = { NULL, NULL };
1528
1529 if (argv != NULL)
1530 {
1531 if (access (argv[0], X_OK) == -1)
1532 {
1533 if (STRCHR (argv[0], '/') == NULL)
1534 {
1535 searchenv (argv[0], "PATH", fullcommand);
1536 if (fullcommand[0] != '\0')
1537 command = fullcommand;
1538 }
1539 if (access (command, X_OK) == -1)
1540 return -1;
1541 }
1542 else
1543 command = argv[0];
1544 arg_v = argv;
1545 }
1546 else
1547 {
1548 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1549 command = "/bin/sh";
1550
1551 arg_a[0] = my_basename (command);
1552 if (Options & Opt_loginShell)
1553 {
1554 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1555
1556 login[0] = '-';
1557 STRCPY (&login[1], arg_a[0]);
1558 arg_a[0] = login;
1559 }
1560 arg_v = arg_a;
1561 }
1562 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1563 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1564 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1565 command, arg_v, environ, iov_a, 0);
1566 if (login)
1567 free (login);
1568
1569 close (tty_fd);
1570 return cmd_fd;
1571
1572#endif
1573 return -1;
1574} 1148}
1575 1149
1576/* ------------------------------------------------------------------------- * 1150/* ------------------------------------------------------------------------- *
1577 * GET TTY CURRENT STATE * 1151 * GET TTY CURRENT STATE *
1578 * ------------------------------------------------------------------------- */ 1152 * ------------------------------------------------------------------------- */
1579/* rxvt_get_ttymode () */
1580/* EXTPROTO */
1581void 1153void
1582rxvt_get_ttymode (ttymode_t *tio, int erase) 1154rxvt_get_ttymode (ttymode_t *tio, int erase)
1583{ 1155{
1584#ifdef HAVE_TERMIOS_H 1156#ifdef HAVE_TERMIOS_H
1585 /* 1157 /*
… …
1800# undef FOO 1372# undef FOO
1801# endif /* HAVE_TERMIOS_H */ 1373# endif /* HAVE_TERMIOS_H */
1802#endif /* DEBUG_TTYMODE */ 1374#endif /* DEBUG_TTYMODE */
1803} 1375}
1804 1376
1377/*----------------------------------------------------------------------*/
1378/*
1379 * Run the command in a subprocess and return a file descriptor for the
1380 * master end of the pseudo-teletype pair with the command talking to
1381 * the slave.
1382 */
1383void
1384rxvt_term::run_command (const char *const *argv)
1385{
1386 int er;
1387
1388 if (!pty.get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390
1391#ifndef NO_BACKSPACE_KEY
1392 if (key_backspace[0] && !key_backspace[1])
1393 er = key_backspace[0];
1394 else if (strcmp (key_backspace, "DEC") == 0)
1395 er = '\177'; /* the initial state anyway */
1396 else
1397#endif
1398 er = -1;
1399
1400 rxvt_get_ttymode (&tio, er);
1401
1402 /* set initial window size */
1403 tt_winch ();
1404
1405 sw_chld.start (SIGCHLD);
1406
1407#ifndef __QNX__
1408 /* spin off the command interpreter */
1409 switch (cmd_pid = fork ())
1410 {
1411 case -1:
1412 rxvt_fatal ("can't fork, aborting.\n");
1413 case 0:
1414 init_env ();
1415
1416 if (!pty.make_controlling_tty ())
1417 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1418 else
1419 {
1420 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1421 dup2 (pty.tty, STDIN_FILENO);
1422 dup2 (pty.tty, STDOUT_FILENO);
1423 dup2 (pty.tty, STDERR_FILENO);
1424
1425 // close all our file handles that we do no longer need
1426 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1427 {
1428 if ((*t)->pty.pty > 2) close ((*t)->pty.pty);
1429 if ((*t)->pty.tty > 2) close ((*t)->pty.tty);
1430 }
1431
1432 run_child (argv);
1433 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1434 }
1435
1436 _exit (EXIT_FAILURE);
1437
1438 default:
1439 {
1440#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1441 int fdstdin;
1442
1443 fdstdin = dup (STDIN_FILENO);
1444 dup2 (pty.tty, STDIN_FILENO);
1445#endif
1446
1447#ifdef UTMP_SUPPORT
1448 privileged_utmp (SAVE);
1449#endif
1450
1451#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1452
1453 dup2 (fdstdin, STDIN_FILENO);
1454 close (fdstdin);
1455#endif
1456 }
1457
1458 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1459 break;
1460 }
1461#else /* __QNX__ uses qnxspawn () */
1462 fchmod (pty.tty, 0622);
1463 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1464 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1465
1466 if (run_child (argv) == -1)
1467 exit (EXIT_FAILURE);
1468#endif
1469}
1470
1471/* ------------------------------------------------------------------------- *
1472 * CHILD PROCESS OPERATIONS *
1473 * ------------------------------------------------------------------------- */
1474/*
1475 * The only open file descriptor is the slave tty - so no error messages.
1476 * returns are fatal
1477 */
1478int
1479rxvt_term::run_child (const char *const *argv)
1480{
1481 char *login;
1482
1483 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1484
1485 if (options & Opt_console)
1486 { /* be virtual console, fail silently */
1487#ifdef TIOCCONS
1488 unsigned int on = 1;
1489
1490 ioctl (STDIN_FILENO, TIOCCONS, &on);
1491#elif defined (SRIOCSREDIR)
1492 int fd;
1493
1494 fd = open (CONSOLE, O_WRONLY, 0);
1495 if (fd >= 0)
1496 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1497 close (fd);
1498#endif /* SRIOCSREDIR */
1499 }
1500
1501 /* reset signals and spin off the command interpreter */
1502 signal (SIGINT, SIG_DFL);
1503 signal (SIGQUIT, SIG_DFL);
1504 signal (SIGCHLD, SIG_DFL);
1505 signal (SIGHUP, SIG_DFL);
1506 signal (SIGPIPE, SIG_DFL);
1507 /*
1508 * mimick login's behavior by disabling the job control signals
1509 * a shell that wants them can turn them back on
1510 */
1511#ifdef SIGTSTP
1512 signal (SIGTSTP, SIG_IGN);
1513 signal (SIGTTIN, SIG_IGN);
1514 signal (SIGTTOU, SIG_IGN);
1515#endif /* SIGTSTP */
1516
1517 // unblock signals (signals are blocked by iom.C
1518 sigset_t ss;
1519 sigemptyset (&ss);
1520 sigprocmask (SIG_SETMASK, &ss, 0);
1521
1522#ifndef __QNX__
1523 /* command interpreter path */
1524 if (argv != NULL)
1525 {
1526# ifdef DEBUG_CMD
1527 int i;
1528
1529 for (i = 0; argv[i]; i++)
1530 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1531# endif
1532
1533 execvp (argv[0], (char *const *)argv);
1534 /* no error message: STDERR is closed! */
1535 }
1536 else
1537 {
1538 const char *argv0, *shell;
1539
1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1541 shell = "/bin/sh";
1542
1543 argv0 = (const char *)rxvt_r_basename (shell);
1544
1545 if (options & Opt_loginShell)
1546 {
1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1548
1549 login[0] = '-';
1550 strcpy (&login[1], argv0);
1551 argv0 = login;
1552 }
1553 execlp (shell, argv0, NULL);
1554 /* no error message: STDERR is closed! */
1555 }
1556
1557#else /* __QNX__ uses qnxspawn () */
1558
1559 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1560 char *command = NULL, fullcommand[_MAX_PATH];
1561 char **arg_v, *arg_a[2] = { NULL, NULL };
1562
1563 if (argv != NULL)
1564 {
1565 if (access (argv[0], X_OK) == -1)
1566 {
1567 if (strchr (argv[0], '/') == NULL)
1568 {
1569 searchenv (argv[0], "PATH", fullcommand);
1570
1571 if (fullcommand[0] != '\0')
1572 command = fullcommand;
1573 }
1574
1575 if (access (command, X_OK) == -1)
1576 return -1;
1577 }
1578 else
1579 command = argv[0];
1580
1581 arg_v = argv;
1582 }
1583 else
1584 {
1585 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1586 command = "/bin/sh";
1587
1588 arg_a[0] = my_basename (command);
1589
1590 if (options & Opt_loginShell)
1591 {
1592 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1593
1594 login[0] = '-';
1595 strcpy (&login[1], arg_a[0]);
1596 arg_a[0] = login;
1597 }
1598
1599 arg_v = arg_a;
1600 }
1601
1602 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1603 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1604 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1605 command, arg_v, environ, iov_a, 0);
1606 if (login)
1607 free (login);
1608
1609 pty.close_tty ();
1610 return pty.pty;
1611#endif
1612
1613 return -1;
1614}
1615
1805/*----------------------- end-of-file (C source) -----------------------*/ 1616/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines