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

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

Diff Legend

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