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.57 by root, Mon Jun 21 22:24:07 2004 UTC vs.
Revision 1.92 by root, Wed Sep 8 17:23:02 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{
196 sw_term.start (SIGTERM);
197
362 PixColors = new rxvt_color [TOTAL_COLORS]; 198 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
199#ifdef OFF_FOCUS_FADING
200 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
201#endif
202 pix_colors = pix_colors_focused;
203
363 if (PixColors == NULL) 204 if (pix_colors == NULL)
364 return false; 205 return false;
365 206
366#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 207#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
367 TermWin.pixmap = None; 208 TermWin.pixmap = None;
368#endif 209#endif
369#ifdef UTMP_SUPPORT
370 next_utmp_action = SAVE;
371#endif
372#ifndef NO_SETOWNER_TTYDEV
373 next_tty_action = SAVE;
374#endif
375 210
376 MEvent.time = CurrentTime; 211 MEvent.time = CurrentTime;
377 MEvent.button = AnyButton; 212 MEvent.button = AnyButton;
378 Options = DEFAULT_OPTIONS; 213 options = DEFAULT_OPTIONS;
379 want_refresh = 1; 214 want_refresh = 1;
380 cmd_pid = -1; 215 cmd_pid = -1;
381 cmd_fd = tty_fd = -1; 216 pty.pty = pty.tty = -1;
382 PrivateModes = SavedModes = PrivMode_Default; 217 priv_modes = SavedModes = PrivMode_Default;
383 TermWin.focus = 0; 218 TermWin.focus = 0;
384 TermWin.ncol = 80; 219 TermWin.ncol = 80;
385 TermWin.nrow = 24; 220 TermWin.nrow = 24;
386 TermWin.int_bwidth = INTERNALBORDERWIDTH; 221 TermWin.int_bwidth = INTERNALBORDERWIDTH;
387 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 222 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
388 TermWin.lineSpace = LINESPACE; 223 TermWin.lineSpace = LINESPACE;
389 TermWin.saveLines = SAVELINES; 224 TermWin.saveLines = SAVELINES;
390 numPixColors = TOTAL_COLORS; 225 numpix_colors = TOTAL_COLORS;
391
392#ifndef NO_BRIGHTCOLOR
393 colorfgbg = DEFAULT_RSTYLE;
394#endif
395 226
396 refresh_limit = 1; 227 refresh_limit = 1;
397 refresh_type = SLOW_REFRESH; 228 refresh_type = SLOW_REFRESH;
398 prev_nrow = prev_ncol = 0; 229 prev_nrow = prev_ncol = 0;
399 230
… …
418 249
419void 250void
420rxvt_term::init_secondary () 251rxvt_term::init_secondary ()
421{ 252{
422 int i; 253 int i;
423#ifdef TTY_GID_SUPPORT
424 struct group *gr = getgrnam ("tty");
425
426 if (gr)
427 { /* change group ownership of tty to "tty" */
428 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
429 ttygid = gr->gr_gid;
430 }
431 else
432#endif /* TTY_GID_SUPPORT */
433
434 {
435 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
436 ttygid = getgid ();
437 }
438 254
439 /* 255 /*
440 * Close all unused file descriptors 256 * Close all unused file descriptors
441 * We don't want them, we don't need them. 257 * We don't want them, we don't need them.
442 */ 258 */
… …
475 291
476 /* 292 /*
477 * Look for -exec option. Find => split and make cmd_argv[] of command args 293 * Look for -exec option. Find => split and make cmd_argv[] of command args
478 */ 294 */
479 for (r_argc = 0; r_argc < argc; r_argc++) 295 for (r_argc = 0; r_argc < argc; r_argc++)
480 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec")) 296 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))
481 break; 297 break;
482 298
483 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 299 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
484 300
485 for (i = 0; i < r_argc; i++) 301 for (i = 0; i < r_argc; i++)
… …
511 free (r_argv); 327 free (r_argv);
512 328
513#ifdef LOCAL_X_IS_UNIX 329#ifdef LOCAL_X_IS_UNIX
514 if (rs[Rs_display_name][0] == ':') 330 if (rs[Rs_display_name][0] == ':')
515 { 331 {
516 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 332 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
517 STRCPY (val, "unix"); 333 strcpy (val, "unix");
518 STRCAT (val, rs[Rs_display_name]); 334 strcat (val, rs[Rs_display_name]);
519 display = displays.get (val); 335 display = displays.get (val);
520 free (val); 336 free (val);
521 } 337 }
522#endif 338#endif
523 339
524 if (!display 340 if (!display
525 && ! (display = displays.get (rs[Rs_display_name]))) 341 && ! (display = displays.get (rs[Rs_display_name])))
526 rxvt_fatal ("can't open display %s", rs[Rs_display_name]); 342 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
527 343
528 extract_resources (display->display, rs[Rs_name]); 344 extract_resources (display->display, rs[Rs_name]);
529 345
530 /* 346 /*
531 * set any defaults not already set 347 * set any defaults not already set
… …
546 } 362 }
547 363
548 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 364 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
549 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 365 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
550 366
551#ifndef NO_FRILLS 367#if ENABLE_FRILLS
552 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 368 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
553 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 369 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
554 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 370 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
555 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 371 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
556#endif 372#endif
… …
567 pointerBlankDelay = 2; 383 pointerBlankDelay = 2;
568#endif 384#endif
569 385
570 /* no point having a scrollbar without having any scrollback! */ 386 /* no point having a scrollbar without having any scrollback! */
571 if (!TermWin.saveLines) 387 if (!TermWin.saveLines)
572 Options &= ~Opt_scrollBar; 388 options &= ~Opt_scrollBar;
573 389
574#ifdef PRINTPIPE 390#ifdef PRINTPIPE
575 if (!rs[Rs_print_pipe]) 391 if (!rs[Rs_print_pipe])
576 rs[Rs_print_pipe] = PRINTPIPE; 392 rs[Rs_print_pipe] = PRINTPIPE;
577#endif 393#endif
… …
586# else 402# else
587 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 403 key_backspace = "DEC"; /* can toggle between \010 or \177 */
588# endif 404# endif
589 else 405 else
590 { 406 {
591 val = STRDUP (rs[Rs_backspace_key]); 407 val = strdup (rs[Rs_backspace_key]);
592 rxvt_Str_trim (val); 408 rxvt_Str_trim (val);
593 rxvt_Str_escaped (val); 409 rxvt_Str_escaped (val);
594 key_backspace = val; 410 key_backspace = val;
595 } 411 }
596#endif 412#endif
… …
602# else 418# else
603 key_delete = "\033[3~"; 419 key_delete = "\033[3~";
604# endif 420# endif
605 else 421 else
606 { 422 {
607 val = STRDUP (rs[Rs_delete_key]); 423 val = strdup (rs[Rs_delete_key]);
608 rxvt_Str_trim (val); 424 rxvt_Str_trim (val);
609 rxvt_Str_escaped (val); 425 rxvt_Str_escaped (val);
610 key_delete = val; 426 key_delete = val;
611 } 427 }
612#endif 428#endif
… …
615 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 431 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
616 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 432 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
617 } 433 }
618 434
619#ifdef HAVE_SCROLLBARS 435#ifdef HAVE_SCROLLBARS
620 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 436 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
621 rs[Rs_scrollBar_thickness]);
622#endif 437#endif
623 438
624#ifdef XTERM_REVERSE_VIDEO 439#ifdef XTERM_REVERSE_VIDEO
625 /* this is how xterm implements reverseVideo */ 440 /* this is how xterm implements reverseVideo */
626 if (Options & Opt_reverseVideo) 441 if (options & Opt_reverseVideo)
627 { 442 {
628 if (!rs[Rs_color + Color_fg]) 443 if (!rs[Rs_color + Color_fg])
629 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 444 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
630 if (!rs[Rs_color + Color_bg]) 445 if (!rs[Rs_color + Color_bg])
631 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 446 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
636 if (!rs[Rs_color + i]) 451 if (!rs[Rs_color + i])
637 rs[Rs_color + i] = def_colorName[i]; 452 rs[Rs_color + i] = def_colorName[i];
638 453
639#ifndef XTERM_REVERSE_VIDEO 454#ifndef XTERM_REVERSE_VIDEO
640 /* this is how we implement reverseVideo */ 455 /* this is how we implement reverseVideo */
641 if (Options & Opt_reverseVideo) 456 if (options & Opt_reverseVideo)
642 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 457 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
643#endif 458#endif
644 459
645 /* convenient aliases for setting fg/bg to colors */ 460 /* convenient aliases for setting fg/bg to colors */
646 color_aliases (Color_fg); 461 color_aliases (Color_fg);
… …
656 color_aliases (Color_BD); 471 color_aliases (Color_BD);
657 color_aliases (Color_UL); 472 color_aliases (Color_UL);
658 color_aliases (Color_RV); 473 color_aliases (Color_RV);
659#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 474#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
660 475
476 if (!rs[Rs_color + Color_border])
477 rs[Rs_color + Color_border] = rs[Rs_color + Color_bg];
478
661 return cmd_argv; 479 return cmd_argv;
662} 480}
663 481
664/*----------------------------------------------------------------------*/ 482/*----------------------------------------------------------------------*/
665void 483void
… …
688 val = XDisplayString (display->display); 506 val = XDisplayString (display->display);
689 507
690 if (rs[Rs_display_name] == NULL) 508 if (rs[Rs_display_name] == NULL)
691 rs[Rs_display_name] = val; /* use broken `:0' value */ 509 rs[Rs_display_name] = val; /* use broken `:0' value */
692 510
693 i = STRLEN (val); 511 i = strlen (val);
694 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 512 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
695 513
696 sprintf (env_display, "DISPLAY=%s", val); 514 sprintf (env_display, "DISPLAY=%s", val);
697 515
698 /* avoiding the math library: 516 /* avoiding the math library:
… …
727 else 545 else
728 putenv ("COLORTERM=" COLORTERMENVFULL); 546 putenv ("COLORTERM=" COLORTERMENVFULL);
729 547
730 if (rs[Rs_term_name] != NULL) 548 if (rs[Rs_term_name] != NULL)
731 { 549 {
732 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char)); 550 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char));
733 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 551 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
734 putenv (env_term); 552 putenv (env_term);
735 } 553 }
736 else 554 else
737 putenv ("TERM=" TERMENV); 555 putenv ("TERM=" TERMENV);
… …
756 free (this->locale); 574 free (this->locale);
757 this->locale = setlocale (LC_CTYPE, locale); 575 this->locale = setlocale (LC_CTYPE, locale);
758 576
759 if (!this->locale) 577 if (!this->locale)
760 { 578 {
579 if (*locale)
580 {
761 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 581 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
762 setlocale (LC_CTYPE, ""); 582 setlocale (LC_CTYPE, "");
583 }
584 else
585 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
586
763 this->locale = ""; 587 this->locale = "";
764 } 588 }
589
765 590
766 this->locale = rxvt_strdup (this->locale); 591 this->locale = rxvt_strdup (this->locale);
767 SET_LOCALE (this->locale); 592 SET_LOCALE (this->locale);
768 mbstate.reset (); 593 mbstate.reset ();
769#endif 594#endif
770#if 0 595#if 0
771#if HAVE_NL_LANGINFO 596#if HAVE_NL_LANGINFO
772 free (codeset); 597 free (codeset);
773 codeset = strdup (nl_langinfo (CODESET)); 598 codeset = strdup (nl_langinfo (CODESET));
774 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 599 enc_utf8 = !strcasecmp (codeset, "UTF-8")
775 || !STRCASECMP (codeset, "UTF8"); 600 || !strcasecmp (codeset, "UTF8");
776#else 601#else
777 enc_utf8 = 1; 602 enc_utf8 = 1;
778#endif 603#endif
779#endif 604#endif
780} 605}
… …
790 Atom wmlocale; 615 Atom wmlocale;
791 616
792 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 617 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
793 XChangeProperty (display->display, TermWin.parent[0], wmlocale, 618 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
794 XA_STRING, 8, PropModeReplace, 619 XA_STRING, 8, PropModeReplace,
795 (unsigned char *)locale, STRLEN (locale)); 620 (unsigned char *)locale, strlen (locale));
796 621
797 if (!XSupportsLocale ()) 622 if (!XSupportsLocale ())
798 { 623 {
799 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 624 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n");
800 return; 625 return;
801 } 626 }
802 627
803 im_ev.start (display); 628 im_ev.start (display);
804 629
… …
829 /* enable W11 callbacks */ 654 /* enable W11 callbacks */
830 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 655 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
831#endif 656#endif
832 657
833#ifdef META8_OPTION 658#ifdef META8_OPTION
834 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 659 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
835#endif 660#endif
836 661
837 get_ourmods (); 662 get_ourmods ();
838 663
839 if (!(Options & Opt_scrollTtyOutput)) 664 if (!(options & Opt_scrollTtyOutput))
840 PrivateModes |= PrivMode_TtyOutputInh; 665 priv_modes |= PrivMode_TtyOutputInh;
841 if (Options & Opt_scrollTtyKeypress) 666 if (options & Opt_scrollTtyKeypress)
842 PrivateModes |= PrivMode_Keypress; 667 priv_modes |= PrivMode_Keypress;
843 if (!(Options & Opt_jumpScroll)) 668 if (!(options & Opt_jumpScroll))
844 PrivateModes |= PrivMode_smoothScroll; 669 priv_modes |= PrivMode_smoothScroll;
845 670
846#ifndef NO_BACKSPACE_KEY 671#ifndef NO_BACKSPACE_KEY
847 if (STRCMP (key_backspace, "DEC") == 0) 672 if (strcmp (key_backspace, "DEC") == 0)
848 PrivateModes |= PrivMode_HaveBackSpace; 673 priv_modes |= PrivMode_HaveBackSpace;
849#endif 674#endif
850 675
851 /* add value for scrollBar */ 676 /* add value for scrollBar */
852 if (scrollbar_visible ()) 677 if (scrollbar_visible ())
853 { 678 {
854 PrivateModes |= PrivMode_scrollBar; 679 priv_modes |= PrivMode_scrollBar;
855 SavedModes |= PrivMode_scrollBar; 680 SavedModes |= PrivMode_scrollBar;
856 } 681 }
857 if (menubar_visible ()) 682 if (menubar_visible ())
858 { 683 {
859 PrivateModes |= PrivMode_menuBar; 684 priv_modes |= PrivMode_menuBar;
860 SavedModes |= PrivMode_menuBar; 685 SavedModes |= PrivMode_menuBar;
861 } 686 }
862 687
863#ifdef CURSOR_BLINK 688#ifdef CURSOR_BLINK
864 if (Options & Opt_cursorBlink) 689 if (options & Opt_cursorBlink)
865 (void)gettimeofday (&lastcursorchange, NULL); 690 (void)gettimeofday (&lastcursorchange, NULL);
866#endif 691#endif
867 692
868 if ((cmd_fd = run_command (argv)) < 0) 693 run_command (argv);
869 rxvt_fatal ("failure while running command, aborting");
870} 694}
871 695
872/*----------------------------------------------------------------------*/ 696/*----------------------------------------------------------------------*/
873void 697void
874rxvt_term::Get_Colours () 698rxvt_term::Get_Colours ()
875{ 699{
876 int i; 700 int i;
877 701
702#ifdef OFF_FOCUS_FADING
703 pix_colors = pix_colors_focused;
704#endif
705
878 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 706 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
879 { 707 {
880 rxvt_color xcol; 708 rxvt_color xcol;
881 709
882 if (!rs[Rs_color + i]) 710 if (!rs[Rs_color + i])
883 continue; 711 continue;
884 712
885 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 713 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
886 { 714 {
887#ifndef XTERM_REVERSE_VIDEO 715#ifndef XTERM_REVERSE_VIDEO
888 if (i < 2 && (Options & Opt_reverseVideo)) 716 if (i < 2 && (options & Opt_reverseVideo))
889 rs[Rs_color + i] = def_colorName[!i]; 717 rs[Rs_color + i] = def_colorName[!i];
890 else 718 else
891#endif 719#endif
892 rs[Rs_color + i] = def_colorName[i]; 720 rs[Rs_color + i] = def_colorName[i];
893 721
… …
899 switch (i) 727 switch (i)
900 { 728 {
901 case Color_fg: 729 case Color_fg:
902 case Color_bg: 730 case Color_bg:
903 /* fatal: need bg/fg color */ 731 /* fatal: need bg/fg color */
904 rxvt_fatal ("unable to get foreground/background colour, aborting"); 732 rxvt_fatal ("unable to get foreground/background colour, aborting.\n");
905 /* NOTREACHED */ 733 /* NOTREACHED */
906 break; 734 break;
907#ifndef NO_CURSORCOLOR 735#ifndef NO_CURSORCOLOR
908 case Color_cursor2: 736 case Color_cursor2:
909 xcol = PixColors[Color_fg]; 737 xcol = pix_colors[Color_fg];
910 break; 738 break;
911#endif /* ! NO_CURSORCOLOR */ 739#endif /* ! NO_CURSORCOLOR */
912 case Color_pointer_fg: 740 case Color_pointer_fg:
913 xcol = PixColors[Color_fg]; 741 xcol = pix_colors[Color_fg];
914 break; 742 break;
915 default: 743 default:
916 xcol = PixColors[Color_bg]; /* None */ 744 xcol = pix_colors[Color_bg]; /* None */
917 break; 745 break;
918 } 746 }
919 } 747 }
920 } 748 }
921 749
922 PixColors[i] = xcol; 750 pix_colors[i] = xcol;
751#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade])
753 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
754#endif
923 SET_PIXCOLOR (i); 755 SET_PIXCOLOR (i);
924 } 756 }
925 757
926 if (XDEPTH <= 2) 758 if (display->depth <= 2)
927 { 759 {
928 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg]; 760 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
929 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg]; 761 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
930 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg]; 762 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
931 } 763 }
932 764
933 /* 765 /*
934 * get scrollBar/menuBar shadow colors 766 * get scrollBar/menuBar shadow colors
935 * 767 *
936 * The calculations of topShadow/bottomShadow values are adapted 768 * The calculations of topShadow/bottomShadow values are adapted
937 * from the fvwm window manager. 769 * from the fvwm window manager.
938 */ 770 */
939#ifdef KEEP_SCROLLCOLOR 771#ifdef KEEP_SCROLLCOLOR
940 772
941 if (XDEPTH <= 2) 773 if (display->depth <= 2)
942 { /* Monochrome */ 774 { /* Monochrome */
943 PixColors[Color_scroll] = PixColors[Color_fg]; 775 pix_colors[Color_scroll] = pix_colors[Color_fg];
944 PixColors[Color_topShadow] = PixColors[Color_bg]; 776 pix_colors[Color_topShadow] = pix_colors[Color_bg];
945 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
946 } 778 }
947 else 779 else
948 { 780 {
949 rxvt_color xcol[3]; 781 rxvt_color xcol[2];
950 /* xcol[0] == white 782 /* xcol[0] == white
951 * xcol[1] == top shadow 783 * xcol[1] == top shadow
952 * xcol[2] == bot shadow */ 784 * xcol[2] == bot shadow */
953 785
954 xcol[1] = PixColors[Color_scroll]; 786 xcol[1] = pix_colors[Color_scroll];
955# ifdef PREFER_24BIT
956 xcol[0].set (display, 65535, 65535, 65535); 787 xcol[0].set (display, 65535, 65535, 65535);
957 /* XFreeColors (display->display, XCMAP, & (xcol[0].pixel), 1, ~0); */
958# else
959 xcol[0].set (display, WhitePixel (display->display, display->screen));
960# endif
961 788
962 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 789 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
963 790
964 xcol[0].get (display, pr0, pg0, pb0); 791 xcol[0].get (display, pr0, pg0, pb0);
965 xcol[1].get (display, pr1, pg1, pb1); 792 xcol[1].get (display, pr1, pg1, pb1);
966 793
967 /* bottomShadowColor */
968 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
969 xcol[2] = PixColors[Color_Black];
970
971 PixColors[Color_bottomShadow] = xcol[2]; 794 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
972 795
973 /* topShadowColor */ 796 /* topShadowColor */
974 if (!xcol[1].set (display, 797 if (!xcol[1].set (display,
975 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 798 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
976 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 799 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
977 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 800 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
978 xcol[1] = PixColors[Color_White]; 801 xcol[1] = pix_colors[Color_White];
979 802
980 PixColors[Color_topShadow] = xcol[1]; 803 pix_colors[Color_topShadow] = xcol[1];
981 } 804 }
982#endif /* KEEP_SCROLLCOLOR */ 805#endif /* KEEP_SCROLLCOLOR */
983} 806}
984 807
985/*----------------------------------------------------------------------*/ 808/*----------------------------------------------------------------------*/
… …
996 i -= 8; 819 i -= 8;
997#ifndef NO_BRIGHTCOLOR 820#ifndef NO_BRIGHTCOLOR
998 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 821 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
999 return; 822 return;
1000#endif 823#endif
1001
1002 } 824 }
1003 825
1004 if (i >= 0 && i <= 7) /* normal colors */ 826 if (i >= 0 && i <= 7) /* normal colors */
1005 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 827 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1006 } 828 }
… …
1025 }; 847 };
1026 848
1027 requestedmeta = realmeta = realalt = 0; 849 requestedmeta = realmeta = realalt = 0;
1028 rsmod = rs[Rs_modifier]; 850 rsmod = rs[Rs_modifier];
1029 if (rsmod 851 if (rsmod
1030 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0) 852 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1031 requestedmeta = rsmod[3] - '0'; 853 requestedmeta = rsmod[3] - '0';
1032 854
1033 map = XGetModifierMapping (display->display); 855 map = XGetModifierMapping (display->display);
1034 kc = map->modifiermap; 856 kc = map->modifiermap;
1035 for (i = 1; i < 6; i++) 857 for (i = 1; i < 6; i++)
… …
1063 case XK_Hyper_L: 885 case XK_Hyper_L:
1064 case XK_Hyper_R: 886 case XK_Hyper_R:
1065 cm = "hyper"; 887 cm = "hyper";
1066 break; 888 break;
1067 } 889 }
1068 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0) 890 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1069 requestedmeta = i; 891 requestedmeta = i;
1070 } 892 }
1071 } 893 }
1072 XFreeModifiermap (map); 894 XFreeModifiermap (map);
1073 i = (requestedmeta ? requestedmeta 895 i = (requestedmeta ? requestedmeta
… …
1082void 904void
1083rxvt_term::create_windows (int argc, const char *const *argv) 905rxvt_term::create_windows (int argc, const char *const *argv)
1084{ 906{
1085 XClassHint classHint; 907 XClassHint classHint;
1086 XWMHints wmHint; 908 XWMHints wmHint;
909#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints;
912#endif
1087 XGCValues gcvalue; 913 XGCValues gcvalue;
1088 long vt_emask; 914 long vt_emask;
1089 XSetWindowAttributes attributes; 915 XSetWindowAttributes attributes;
1090 XWindowAttributes gattr; 916 XWindowAttributes gattr;
1091 917
1092 if (Options & Opt_transparent) 918 if (options & Opt_transparent)
1093 { 919 {
1094 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 920 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1095 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 921 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1096 } 922 }
1097 923
924#if ENABLE_FRILLS
925 if (options & Opt_borderLess)
926 {
927 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
928 if (prop == None)
929 {
930 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
931#ifdef PREFER_24BIT
932 attributes.override_redirect = TRUE;
933#endif
934 mwmhints.flags = 0;
935 }
936 else
937 {
938 mwmhints.flags = MWM_HINTS_DECORATIONS;
939 mwmhints.decorations = 0;
940 }
941 }
942 else
943 {
944 mwmhints.flags = 0;
945 }
946#endif
947
1098 /* grab colors before netscape does */ 948 /* grab colors before netscape does */
1099 Get_Colours (); 949 Get_Colours ();
1100 950
1101 if (!change_font (rs[Rs_font])) 951 if (!set_fonts ())
1102 { 952 rxvt_fatal ("unable to load base fontset, please specify one using -fn, aborting.\n");
1103 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1104 destroy ();
1105 return;
1106 }
1107 953
1108 window_calc (0, 0); 954 window_calc (0, 0);
1109 old_width = szHint.width; 955 old_width = szHint.width;
1110 old_height = szHint.height; 956 old_height = szHint.height;
1111 957
1112 /* sub-window placement & size in rxvt_resize_subwindows () */ 958 /* sub-window placement & size in rxvt_resize_subwindows () */
1113 959
1114#ifdef PREFER_24BIT 960#ifdef PREFER_24BIT
1115 attributes.background_pixel = PixColors[Color_bg]; 961 attributes.background_pixel = pix_colors_focused[Color_border];
1116 attributes.border_pixel = PixColors[Color_border]; 962 attributes.border_pixel = pix_colors_focused[Color_border];
1117 attributes.colormap = display->cmap; 963 attributes.colormap = display->cmap;
1118 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 964 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1119 szHint.x, szHint.y, 965 szHint.x, szHint.y,
1120 szHint.width, szHint.height, 966 szHint.width, szHint.height,
1121 TermWin.ext_bwidth, 967 TermWin.ext_bwidth,
… …
1125#else 971#else
1126 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 972 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1127 szHint.x, szHint.y, 973 szHint.x, szHint.y,
1128 szHint.width, szHint.height, 974 szHint.width, szHint.height,
1129 TermWin.ext_bwidth, 975 TermWin.ext_bwidth,
1130 PixColors[Color_border], 976 pix_colors_focused[Color_border],
1131 PixColors[Color_bg]); 977 pix_colors_focused[Color_border]);
1132#endif 978#endif
1133 979
1134 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 980 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1135 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 981 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1136 982
1137 classHint.res_name = (char *)rs[Rs_name]; 983 classHint.res_name = (char *)rs[Rs_name];
1138 classHint.res_class = (char *)RESCLASS; 984 classHint.res_class = (char *)RESCLASS;
1139 985
1140 wmHint.flags = InputHint | StateHint | WindowGroupHint; 986 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1141 wmHint.input = True; 987 wmHint.input = True;
1142 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState; 988 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1143 wmHint.window_group = TermWin.parent[0]; 989 wmHint.window_group = TermWin.parent[0];
1144 990
1145 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 991 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1146 (char **)argv, argc, &szHint, &wmHint, &classHint); 992 (char **)argv, argc, &szHint, &wmHint, &classHint);
1147 993
1148#ifndef NO_FRILLS 994#if ENABLE_FRILLS
1149 long pid = getpid (); 995 long pid = getpid ();
1150 XChangeProperty (display->display, TermWin.parent[0], 996 XChangeProperty (display->display, TermWin.parent[0],
1151 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 997 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1152 PropModeReplace, (unsigned char *)&pid, 1); 998 PropModeReplace, (unsigned char *)&pid, 1);
1153#endif 999#endif
1154 1000
1155 XSelectInput (display->display, TermWin.parent[0], 1001 XSelectInput (display->display, TermWin.parent[0],
1156 KeyPressMask 1002 KeyPressMask
1157#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1003#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1158 | KeyReleaseMask 1004 | KeyReleaseMask
1159#endif 1005#endif
1160 | FocusChangeMask | VisibilityChangeMask 1006 | FocusChangeMask | VisibilityChangeMask
1007 | ExposureMask
1161 | StructureNotifyMask); 1008 | StructureNotifyMask);
1162 termwin_ev.start (display, TermWin.parent[0]); 1009 termwin_ev.start (display, TermWin.parent[0]);
1010
1011#if ENABLE_FRILLS
1012 if (mwmhints.flags)
1013 {
1014 prop = XInternAtom (display->display, "_MOTIF_WM_HINTS", False);
1015 XChangeProperty (display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1016 }
1017#endif
1163 1018
1164 /* vt cursor: Black-on-White is standard, but this is more popular */ 1019 /* vt cursor: Black-on-White is standard, but this is more popular */
1165 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1020 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm);
1166 1021
1167#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1022#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
… …
1187 window_vt_x, 1042 window_vt_x,
1188 window_vt_y, 1043 window_vt_y,
1189 TermWin_TotalWidth (), 1044 TermWin_TotalWidth (),
1190 TermWin_TotalHeight (), 1045 TermWin_TotalHeight (),
1191 0, 1046 0,
1192 PixColors[Color_fg], 1047 pix_colors_focused[Color_fg],
1193 PixColors[Color_bg]); 1048 pix_colors_focused[Color_bg]);
1194
1195#ifdef DEBUG_X 1049#ifdef DEBUG_X
1196 XStoreName (display->display, TermWin.vt, "vt window"); 1050 XStoreName (display->display, TermWin.vt, "vt window");
1197#endif 1051#endif
1198 1052
1199 attributes.bit_gravity = NorthWestGravity; 1053 attributes.bit_gravity = NorthWestGravity;
1200 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1054 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1201 1055
1202 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1056 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1203 1057
1058 pointer_unblank ();
1059
1204#ifdef POINTER_BLANK 1060#ifdef POINTER_BLANK
1205 pointer_unblank ();
1206
1207 if (Options & Opt_pointerBlank) 1061 if (options & Opt_pointerBlank)
1208 vt_emask |= PointerMotionMask; 1062 vt_emask |= PointerMotionMask;
1209 else 1063 else
1210#endif 1064#endif
1211 vt_emask |= Button1MotionMask | Button3MotionMask; 1065 vt_emask |= Button1MotionMask | Button3MotionMask;
1212 1066
… …
1219 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1073 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1220 window_vt_x, 0, 1074 window_vt_x, 0,
1221 TermWin_TotalWidth (), 1075 TermWin_TotalWidth (),
1222 menuBar_TotalHeight (), 1076 menuBar_TotalHeight (),
1223 0, 1077 0,
1224 PixColors[Color_fg], 1078 pix_colors_focused[Color_fg],
1225 PixColors[Color_scroll]); 1079 pix_colors_focused[Color_scroll]);
1226 1080
1227#ifdef DEBUG_X 1081#ifdef DEBUG_X
1228 XStoreName (display->display, menuBar.win, "menubar"); 1082 XStoreName (display->display, menuBar.win, "menubar");
1229#endif 1083#endif
1230 1084
… …
1240 } 1094 }
1241#endif 1095#endif
1242 1096
1243#ifdef XPM_BACKGROUND 1097#ifdef XPM_BACKGROUND
1244 if (rs[Rs_backgroundPixmap] != NULL 1098 if (rs[Rs_backgroundPixmap] != NULL
1245 && ! (Options & Opt_transparent)) 1099 && ! (options & Opt_transparent))
1246 { 1100 {
1247 const char *p = rs[Rs_backgroundPixmap]; 1101 const char *p = rs[Rs_backgroundPixmap];
1248 1102
1249 if ((p = STRCHR (p, ';')) != NULL) 1103 if ((p = strchr (p, ';')) != NULL)
1250 { 1104 {
1251 p++; 1105 p++;
1252 scale_pixmap (p); 1106 scale_pixmap (p);
1253 } 1107 }
1108
1254 set_bgPixmap (rs[Rs_backgroundPixmap]); 1109 set_bgPixmap (rs[Rs_backgroundPixmap]);
1255 scr_touch (True); 1110 scr_touch (true);
1256 } 1111 }
1257#endif 1112#endif
1258 1113
1259 /* graphics context for the vt window */ 1114 /* graphics context for the vt window */
1260 gcvalue.foreground = PixColors[Color_fg]; 1115 gcvalue.foreground = pix_colors[Color_fg];
1261 gcvalue.background = PixColors[Color_bg]; 1116 gcvalue.background = pix_colors[Color_bg];
1262 gcvalue.graphics_exposures = 1; 1117 gcvalue.graphics_exposures = 1;
1263 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1118 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1264 GCForeground | GCBackground | GCGraphicsExposures, 1119 GCForeground | GCBackground | GCGraphicsExposures,
1265 &gcvalue); 1120 &gcvalue);
1266 1121
1267 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1122 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1268 1123
1269#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1124#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1270 gcvalue.foreground = PixColors[Color_topShadow]; 1125 gcvalue.foreground = pix_colors[Color_topShadow];
1271 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1126 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1272 gcvalue.foreground = PixColors[Color_bottomShadow]; 1127 gcvalue.foreground = pix_colors[Color_bottomShadow];
1273 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1128 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1274 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)]; 1129 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1275 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1130 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1276#endif 1131#endif
1277}
1278 1132
1279/*----------------------------------------------------------------------*/ 1133#ifdef OFF_FOCUS_FADING
1280/* 1134 // initially we are in unfocused state
1281 * Run the command in a subprocess and return a file descriptor for the 1135 if (rs[Rs_fade])
1282 * master end of the pseudo-teletype pair with the command talking to 1136 pix_colors = pix_colors_unfocused;
1283 * the slave.
1284 */
1285int
1286rxvt_term::run_command (const char *const *argv)
1287{
1288 int cfd, er;
1289
1290 /* get master (pty) */
1291 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1292 rxvt_fatal ("can't open pseudo-tty");
1293
1294 fcntl (cfd, F_SETFL, O_NONBLOCK);
1295
1296 /* get slave (tty) */
1297 if (tty_fd < 0)
1298 {
1299#ifndef NO_SETOWNER_TTYDEV
1300 privileged_ttydev (SAVE);
1301#endif
1302
1303 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1304 {
1305 close (cfd);
1306 rxvt_fatal ("can't open slave tty %s", ttydev);
1307 }
1308 }
1309#ifndef NO_BACKSPACE_KEY
1310 if (key_backspace[0] && !key_backspace[1])
1311 er = key_backspace[0];
1312 else if (STRCMP (key_backspace, "DEC") == 0)
1313 er = '\177'; /* the initial state anyway */
1314 else
1315#endif
1316
1317 er = -1;
1318
1319 rxvt_get_ttymode (& (tio), er);
1320
1321#ifndef __QNX__
1322 /* spin off the command interpreter */
1323 switch (cmd_pid = fork ())
1324 {
1325 case -1:
1326 rxvt_fatal ("can't fork");
1327 case 0:
1328 close (cfd); /* only keep tty_fd and STDERR open */
1329
1330 init_env ();
1331
1332 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1333 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1334 else
1335 {
1336 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1337 dup2 (tty_fd, STDIN_FILENO);
1338 dup2 (tty_fd, STDOUT_FILENO);
1339 dup2 (tty_fd, STDERR_FILENO);
1340
1341 if (tty_fd > 2)
1342 close (tty_fd);
1343
1344 run_child (argv);
1345 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1346 }
1347
1348 _exit (EXIT_FAILURE);
1349
1350 default:
1351 {
1352#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1353 int fdstdin;
1354
1355 fdstdin = dup (STDIN_FILENO);
1356 dup2 (tty_fd, STDIN_FILENO);
1357#endif
1358
1359#ifdef UTMP_SUPPORT
1360 privileged_utmp (SAVE);
1361#endif
1362
1363#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1364
1365 dup2 (fdstdin, STDIN_FILENO);
1366 close (fdstdin);
1367#endif
1368 }
1369
1370 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1371 break;
1372 }
1373#else /* __QNX__ uses qnxspawn () */
1374 fchmod (tty_fd, 0622);
1375 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1376 fcntl (cfd, F_SETFD, FD_CLOEXEC);
1377
1378 if (run_child (argv) == -1)
1379 exit (EXIT_FAILURE);
1380#endif
1381
1382 return cfd;
1383}
1384
1385/* ------------------------------------------------------------------------- *
1386 * CHILD PROCESS OPERATIONS *
1387 * ------------------------------------------------------------------------- */
1388/*
1389 * The only open file descriptor is the slave tty - so no error messages.
1390 * returns are fatal
1391 */
1392int
1393rxvt_term::run_child (const char *const *argv)
1394{
1395 char *login;
1396
1397 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1398
1399 if (Options & Opt_console)
1400 { /* be virtual console, fail silently */
1401#ifdef TIOCCONS
1402 unsigned int on = 1;
1403
1404 ioctl (STDIN_FILENO, TIOCCONS, &on);
1405#elif defined (SRIOCSREDIR)
1406 int fd;
1407
1408 fd = open (CONSOLE, O_WRONLY, 0);
1409 if (fd >= 0)
1410 {
1411 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1412 close (fd);
1413 }
1414#endif /* SRIOCSREDIR */
1415
1416 }
1417
1418 /* reset signals and spin off the command interpreter */
1419 signal (SIGINT, SIG_DFL);
1420 signal (SIGQUIT, SIG_DFL);
1421 signal (SIGCHLD, SIG_DFL);
1422 /*
1423 * mimick login's behavior by disabling the job control signals
1424 * a shell that wants them can turn them back on
1425 */
1426#ifdef SIGTSTP
1427 signal (SIGTSTP, SIG_IGN);
1428 signal (SIGTTIN, SIG_IGN);
1429 signal (SIGTTOU, SIG_IGN);
1430#endif /* SIGTSTP */
1431
1432 /* set window size */
1433 struct winsize ws;
1434
1435 ws.ws_col = TermWin.ncol;
1436 ws.ws_row = TermWin.nrow;
1437 ws.ws_xpixel = ws.ws_ypixel = 0;
1438 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1439
1440 // unblock signals (signals are blocked by iom.C
1441 sigset_t ss;
1442 sigemptyset (&ss);
1443 sigprocmask (SIG_SETMASK, &ss, 0);
1444
1445#ifndef __QNX__
1446 /* command interpreter path */
1447 if (argv != NULL)
1448 {
1449# ifdef DEBUG_CMD
1450 int i;
1451
1452 for (i = 0; argv[i]; i++)
1453 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1454# endif 1137#endif
1455 1138
1456 execvp (argv[0], (char *const *)argv); 1139 scr_recolour ();
1457 /* no error message: STDERR is closed! */
1458 }
1459 else
1460 {
1461 const char *argv0, *shell;
1462
1463 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1464 shell = "/bin/sh";
1465
1466 argv0 = (const char *)rxvt_r_basename (shell);
1467 if (Options & Opt_loginShell)
1468 {
1469 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1470
1471 login[0] = '-';
1472 STRCPY (&login[1], argv0);
1473 argv0 = login;
1474 }
1475 execlp (shell, argv0, NULL);
1476 /* no error message: STDERR is closed! */
1477 }
1478
1479#else /* __QNX__ uses qnxspawn () */
1480
1481 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1482 char *command = NULL, fullcommand[_MAX_PATH];
1483 char **arg_v, *arg_a[2] = { NULL, NULL };
1484
1485 if (argv != NULL)
1486 {
1487 if (access (argv[0], X_OK) == -1)
1488 {
1489 if (STRCHR (argv[0], '/') == NULL)
1490 {
1491 searchenv (argv[0], "PATH", fullcommand);
1492 if (fullcommand[0] != '\0')
1493 command = fullcommand;
1494 }
1495 if (access (command, X_OK) == -1)
1496 return -1;
1497 }
1498 else
1499 command = argv[0];
1500 arg_v = argv;
1501 }
1502 else
1503 {
1504 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1505 command = "/bin/sh";
1506
1507 arg_a[0] = my_basename (command);
1508 if (Options & Opt_loginShell)
1509 {
1510 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1511
1512 login[0] = '-';
1513 STRCPY (&login[1], arg_a[0]);
1514 arg_a[0] = login;
1515 }
1516 arg_v = arg_a;
1517 }
1518 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1519 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1520 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1521 command, arg_v, environ, iov_a, 0);
1522 if (login)
1523 free (login);
1524
1525 close (tty_fd);
1526 return cmd_fd;
1527
1528#endif
1529 return -1;
1530} 1140}
1531 1141
1532/* ------------------------------------------------------------------------- * 1142/* ------------------------------------------------------------------------- *
1533 * GET TTY CURRENT STATE * 1143 * GET TTY CURRENT STATE *
1534 * ------------------------------------------------------------------------- */ 1144 * ------------------------------------------------------------------------- */
1535/* rxvt_get_ttymode () */
1536/* EXTPROTO */
1537void 1145void
1538rxvt_get_ttymode (ttymode_t *tio, int erase) 1146rxvt_get_ttymode (ttymode_t *tio, int erase)
1539{ 1147{
1540#ifdef HAVE_TERMIOS_H 1148#ifdef HAVE_TERMIOS_H
1541 /* 1149 /*
… …
1756# undef FOO 1364# undef FOO
1757# endif /* HAVE_TERMIOS_H */ 1365# endif /* HAVE_TERMIOS_H */
1758#endif /* DEBUG_TTYMODE */ 1366#endif /* DEBUG_TTYMODE */
1759} 1367}
1760 1368
1369/*----------------------------------------------------------------------*/
1370/*
1371 * Run the command in a subprocess and return a file descriptor for the
1372 * master end of the pseudo-teletype pair with the command talking to
1373 * the slave.
1374 */
1375void
1376rxvt_term::run_command (const char *const *argv)
1377{
1378 int er;
1379
1380 if (!pty.get ())
1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1382
1383#ifndef NO_BACKSPACE_KEY
1384 if (key_backspace[0] && !key_backspace[1])
1385 er = key_backspace[0];
1386 else if (strcmp (key_backspace, "DEC") == 0)
1387 er = '\177'; /* the initial state anyway */
1388 else
1389#endif
1390 er = -1;
1391
1392 rxvt_get_ttymode (&tio, er);
1393
1394 /* set initial window size */
1395 tt_winch ();
1396
1397 sw_chld.start (SIGCHLD);
1398
1399#ifndef __QNX__
1400 /* spin off the command interpreter */
1401 switch (cmd_pid = fork ())
1402 {
1403 case -1:
1404 rxvt_fatal ("can't fork, aborting.\n");
1405 case 0:
1406 init_env ();
1407
1408 if (!pty.make_controlling_tty ())
1409 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1410 else
1411 {
1412 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1413 dup2 (pty.tty, STDIN_FILENO);
1414 dup2 (pty.tty, STDOUT_FILENO);
1415 dup2 (pty.tty, STDERR_FILENO);
1416
1417 // close all our file handles that we do no longer need
1418 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1419 {
1420 if ((*t)->pty.pty > 2) close ((*t)->pty.pty);
1421 if ((*t)->pty.tty > 2) close ((*t)->pty.tty);
1422 }
1423
1424 run_child (argv);
1425 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1426 }
1427
1428 _exit (EXIT_FAILURE);
1429
1430 default:
1431 {
1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1433 int fdstdin;
1434
1435 fdstdin = dup (STDIN_FILENO);
1436 dup2 (pty.tty, STDIN_FILENO);
1437#endif
1438
1439#ifdef UTMP_SUPPORT
1440 privileged_utmp (SAVE);
1441#endif
1442
1443#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1444
1445 dup2 (fdstdin, STDIN_FILENO);
1446 close (fdstdin);
1447#endif
1448 }
1449
1450 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1451 break;
1452 }
1453#else /* __QNX__ uses qnxspawn () */
1454 fchmod (pty.tty, 0622);
1455 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1456 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1457
1458 if (run_child (argv) == -1)
1459 exit (EXIT_FAILURE);
1460#endif
1461}
1462
1463/* ------------------------------------------------------------------------- *
1464 * CHILD PROCESS OPERATIONS *
1465 * ------------------------------------------------------------------------- */
1466/*
1467 * The only open file descriptor is the slave tty - so no error messages.
1468 * returns are fatal
1469 */
1470int
1471rxvt_term::run_child (const char *const *argv)
1472{
1473 char *login;
1474
1475 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1476
1477 if (options & Opt_console)
1478 { /* be virtual console, fail silently */
1479#ifdef TIOCCONS
1480 unsigned int on = 1;
1481
1482 ioctl (STDIN_FILENO, TIOCCONS, &on);
1483#elif defined (SRIOCSREDIR)
1484 int fd;
1485
1486 fd = open (CONSOLE, O_WRONLY, 0);
1487 if (fd >= 0)
1488 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1489 close (fd);
1490#endif /* SRIOCSREDIR */
1491 }
1492
1493 /* reset signals and spin off the command interpreter */
1494 signal (SIGINT, SIG_DFL);
1495 signal (SIGQUIT, SIG_DFL);
1496 signal (SIGCHLD, SIG_DFL);
1497 signal (SIGHUP, SIG_DFL);
1498 signal (SIGPIPE, SIG_DFL);
1499 /*
1500 * mimick login's behavior by disabling the job control signals
1501 * a shell that wants them can turn them back on
1502 */
1503#ifdef SIGTSTP
1504 signal (SIGTSTP, SIG_IGN);
1505 signal (SIGTTIN, SIG_IGN);
1506 signal (SIGTTOU, SIG_IGN);
1507#endif /* SIGTSTP */
1508
1509 // unblock signals (signals are blocked by iom.C
1510 sigset_t ss;
1511 sigemptyset (&ss);
1512 sigprocmask (SIG_SETMASK, &ss, 0);
1513
1514#ifndef __QNX__
1515 /* command interpreter path */
1516 if (argv != NULL)
1517 {
1518# ifdef DEBUG_CMD
1519 int i;
1520
1521 for (i = 0; argv[i]; i++)
1522 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1523# endif
1524
1525 execvp (argv[0], (char *const *)argv);
1526 /* no error message: STDERR is closed! */
1527 }
1528 else
1529 {
1530 const char *argv0, *shell;
1531
1532 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1533 shell = "/bin/sh";
1534
1535 argv0 = (const char *)rxvt_r_basename (shell);
1536
1537 if (options & Opt_loginShell)
1538 {
1539 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1540
1541 login[0] = '-';
1542 strcpy (&login[1], argv0);
1543 argv0 = login;
1544 }
1545 execlp (shell, argv0, NULL);
1546 /* no error message: STDERR is closed! */
1547 }
1548
1549#else /* __QNX__ uses qnxspawn () */
1550
1551 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1552 char *command = NULL, fullcommand[_MAX_PATH];
1553 char **arg_v, *arg_a[2] = { NULL, NULL };
1554
1555 if (argv != NULL)
1556 {
1557 if (access (argv[0], X_OK) == -1)
1558 {
1559 if (strchr (argv[0], '/') == NULL)
1560 {
1561 searchenv (argv[0], "PATH", fullcommand);
1562
1563 if (fullcommand[0] != '\0')
1564 command = fullcommand;
1565 }
1566
1567 if (access (command, X_OK) == -1)
1568 return -1;
1569 }
1570 else
1571 command = argv[0];
1572
1573 arg_v = argv;
1574 }
1575 else
1576 {
1577 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1578 command = "/bin/sh";
1579
1580 arg_a[0] = my_basename (command);
1581
1582 if (options & Opt_loginShell)
1583 {
1584 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1585
1586 login[0] = '-';
1587 strcpy (&login[1], arg_a[0]);
1588 arg_a[0] = login;
1589 }
1590
1591 arg_v = arg_a;
1592 }
1593
1594 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1595 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1596 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1597 command, arg_v, environ, iov_a, 0);
1598 if (login)
1599 free (login);
1600
1601 pty.close_tty ();
1602 return pty.pty;
1603#endif
1604
1605 return -1;
1606}
1607
1761/*----------------------- end-of-file (C source) -----------------------*/ 1608/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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