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

Diff Legend

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