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.68 by root, Tue Aug 10 20:39:19 2004 UTC vs.
Revision 1.90 by root, Wed Aug 25 03:47:20 2004 UTC

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

Diff Legend

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