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.121 by root, Wed Nov 30 21:05:39 2005 UTC vs.
Revision 1.155 by root, Wed Jan 25 02:53:13 2006 UTC

… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 14 * Copyright (c) 2003-2006 Marc Lehmann <pcg@goof.com>
15 * 15 *
16 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
17 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
18 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
19 * (at your option) any later version. 19 * (at your option) any later version.
… …
34#include "../config.h" /* NECESSARY */ 34#include "../config.h" /* NECESSARY */
35#include "rxvt.h" /* NECESSARY */ 35#include "rxvt.h" /* NECESSARY */
36#include "rxvtutil.h" 36#include "rxvtutil.h"
37#include "init.h" 37#include "init.h"
38 38
39#include <limits>
40
39#include <csignal> 41#include <csignal>
40 42
41const char *const def_colorName[] = 43const char *const def_colorName[] =
42 { 44 {
43 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
44 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
45 /* low-intensity colors */ 47 /* low-intensity colors */
46 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
47#ifndef NO_BRIGHTCOLOR
48 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
49 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
50 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
51 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
52 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
60# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
61 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
62# else 63# else
63 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
64# endif 65# endif
65#endif /* NO_BRIGHTCOLOR */
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "black",
176#endif 176#endif
177 }; 177 };
178 178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif
216 };
217
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226
227 if (pix_colors == NULL)
228 return false;
229 187
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 TermWin.pixmap = None; 189 pixmap = None;
232#endif 190#endif
233 191
234 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS; 194 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 195 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 196 priv_modes = SavedModes = PrivMode_Default;
239 TermWin.focus = 0;
240 TermWin.ncol = 80; 197 ncol = 80;
241 TermWin.nrow = 24; 198 nrow = 24;
242 TermWin.int_bwidth = INTERNALBORDERWIDTH; 199 int_bwidth = INTERNALBORDERWIDTH;
243 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 200 ext_bwidth = EXTERNALBORDERWIDTH;
244 TermWin.lineSpace = LINESPACE; 201 lineSpace = LINESPACE;
245 TermWin.saveLines = SAVELINES; 202 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 203 numpix_colors = TOTAL_COLORS;
247 204
248 refresh_limit = 1; 205 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 206 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 207
252 oldcursor.row = oldcursor.col = -1; 208 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */ 210 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 211 bgPixmap.x = bgPixmap.y = 50;
256 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
257#endif 213#endif
258 214
259 last_bot = last_state = -1; 215 last_bot = last_state = -1;
260
261#ifdef MENUBAR
262 menu_readonly = 1;
263# if ! (MENUBAR_MAX > 1)
264 CurrentBar = &BarList;
265# endif /* (MENUBAR_MAX > 1) */
266#endif
267 216
268 return true; 217 return true;
269} 218}
270 219
271void 220void
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 288 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 289
341 /* 290 /*
342 * Open display, get options/resources and create the window 291 * Open display, get options/resources and create the window
343 */ 292 */
293
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 294 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 295 rs[Rs_display_name] = ":0";
346 296
347 get_options (r_argc, r_argv); 297 get_options (r_argc, r_argv);
348 298
349 if (!(display = displays.get (rs[Rs_display_name]))) 299 if (!(display = displays.get (rs[Rs_display_name])))
350 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 300 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
351 301
352 extract_resources (); 302 extract_resources ();
303
353 free (r_argv); 304 free (r_argv);
305
306#if ENABLE_PERL
307 if (!rs[Rs_perl_ext_1])
308 rs[Rs_perl_ext_1] = "default";
309
310 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
311 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
312 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
313 {
314 rxvt_perl.init (this);
315 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
316 }
317#endif
354 318
355 /* 319 /*
356 * set any defaults not already set 320 * set any defaults not already set
357 */ 321 */
358 if (cmd_argv && cmd_argv[0]) 322 if (cmd_argv && cmd_argv[0])
… …
369 if (!rs[Rs_iconName]) 333 if (!rs[Rs_iconName])
370 rs[Rs_iconName] = rs[Rs_name]; 334 rs[Rs_iconName] = rs[Rs_name];
371 } 335 }
372 336
373 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 337 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
374 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 338 saveLines = min (i, MAX_SAVELINES);
375 339
376#if ENABLE_FRILLS 340#if ENABLE_FRILLS
377 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 341 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
378 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 342 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
343
379 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 344 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
380 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 345 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
346
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 347 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 348 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 349#endif
384 350
385#ifdef POINTER_BLANK 351#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 352 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 353 pointerBlankDelay = i;
388 else 354 else
389 pointerBlankDelay = 2; 355 pointerBlankDelay = 2;
390#endif 356#endif
391 357
392 /* no point having a scrollbar without having any scrollback! */ 358 /* no point having a scrollbar without having any scrollback! */
393 if (!TermWin.saveLines) 359 if (!saveLines)
394 options &= ~Opt_scrollBar; 360 set_option (Opt_scrollBar, 0);
395 361
396#ifdef PRINTPIPE 362#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 363 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 364 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 365#endif
… …
442 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 408 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
443#endif 409#endif
444 410
445#ifdef XTERM_REVERSE_VIDEO 411#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 412 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 413 if (OPTION (Opt_reverseVideo))
448 { 414 {
449 if (!rs[Rs_color + Color_fg]) 415 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 416 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451 if (!rs[Rs_color + Color_bg]) 417 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 418 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
457 if (!rs[Rs_color + i]) 423 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 424 rs[Rs_color + i] = def_colorName[i];
459 425
460#ifndef XTERM_REVERSE_VIDEO 426#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 427 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 428 if (OPTION (Opt_reverseVideo))
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 429 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 430#endif
465 431
466 /* convenient aliases for setting fg/bg to colors */ 432 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 433 color_aliases (Color_fg);
468 color_aliases (Color_bg); 434 color_aliases (Color_bg);
… …
517 i = strlen (val); 483 i = strlen (val);
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 484 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
519 485
520 sprintf (env_display, "DISPLAY=%s", val); 486 sprintf (env_display, "DISPLAY=%s", val);
521 487
522 /* avoiding the math library: 488 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
523 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */
524 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++)
525 ;
526 MAX_IT (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528
529 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)TermWin.parent[0]);
531 489
532 /* add entries to the environment: 490 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 491 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 492 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 493 * @ COLORTERM: terminal sub-name and also indicates its color
… …
537 * @ TERMINFO: path to terminfo directory 495 * @ TERMINFO: path to terminfo directory
538 * @ COLORFGBG: fg;bg color codes 496 * @ COLORFGBG: fg;bg color codes
539 */ 497 */
540 putenv (env_display); 498 putenv (env_display);
541 putenv (env_windowid); 499 putenv (env_windowid);
500
542 if (env_colorfgbg) 501 if (env_colorfgbg)
543 putenv (env_colorfgbg); 502 putenv (env_colorfgbg);
544 503
545#ifdef RXVT_TERMINFO 504#ifdef RXVT_TERMINFO
546 putenv ("TERMINFO=" RXVT_TERMINFO); 505 putenv ("TERMINFO=" RXVT_TERMINFO);
… …
574 * This should support all European type languages. 533 * This should support all European type languages.
575 */ 534 */
576void 535void
577rxvt_term::set_locale (const char *locale) 536rxvt_term::set_locale (const char *locale)
578{ 537{
538 set_environ (envv);
539
579#if HAVE_XSETLOCALE || HAVE_SETLOCALE 540#if HAVE_XSETLOCALE || HAVE_SETLOCALE
580 free (this->locale); 541 free (this->locale);
581 this->locale = setlocale (LC_CTYPE, locale); 542 this->locale = setlocale (LC_CTYPE, locale);
582 543
583 if (!this->locale) 544 if (!this->locale)
584 { 545 {
585 if (*locale) 546 if (*locale)
586 { 547 {
587 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 548 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
588 setlocale (LC_CTYPE, ""); 549 setlocale (LC_CTYPE, "C");
589 } 550 }
590 else 551 else
591 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 552 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
592 553
593 this->locale = ""; 554 this->locale = "C";
594 } 555 }
595 556
596 557
597 this->locale = rxvt_strdup (this->locale); 558 this->locale = rxvt_strdup (this->locale);
598 SET_LOCALE (this->locale); 559 SET_LOCALE (this->locale);
… …
613} 574}
614 575
615void 576void
616rxvt_term::init_xlocale () 577rxvt_term::init_xlocale ()
617{ 578{
579 set_environ (envv);
580
618#ifdef USE_XIM 581#ifdef USE_XIM
619 if (!locale) 582 if (!locale)
620 rxvt_warn ("setting locale failed, working without locale support.\n"); 583 rxvt_warn ("setting locale failed, working without locale support.\n");
621 else 584 else
622 { 585 {
… …
644 * Initialize the command connection. 607 * Initialize the command connection.
645 * This should be called after the X server connection is established. 608 * This should be called after the X server connection is established.
646 */ 609 */
647 610
648#ifdef META8_OPTION 611#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 612 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
650#endif 613#endif
651 614
652 get_ourmods (); 615 get_ourmods ();
653 616
654 if (!(options & Opt_scrollTtyOutput)) 617 if (!OPTION (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 618 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 619 if (OPTION (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 620 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 621 if (!OPTION (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 622 priv_modes |= PrivMode_smoothScroll;
660 623
661#ifndef NO_BACKSPACE_KEY 624#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 625 if (strcmp (key_backspace, "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 626 priv_modes |= PrivMode_HaveBackSpace;
664#endif 627#endif
665 628
666 /* add value for scrollBar */ 629 /* add value for scrollBar */
667 if (scrollbar_visible ()) 630 if (scrollBar.state)
668 { 631 {
669 priv_modes |= PrivMode_scrollBar; 632 priv_modes |= PrivMode_scrollBar;
670 SavedModes |= PrivMode_scrollBar; 633 SavedModes |= PrivMode_scrollBar;
671 } 634 }
672
673 if (menubar_visible ())
674 {
675 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar;
677 }
678
679#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink)
681 (void)gettimeofday (&lastcursorchange, NULL);
682#endif
683 635
684 run_command (argv); 636 run_command (argv);
685} 637}
686 638
687/*----------------------------------------------------------------------*/ 639/*----------------------------------------------------------------------*/
… …
702 continue; 654 continue;
703 655
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 656 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 657 {
706#ifndef XTERM_REVERSE_VIDEO 658#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 659 if (i < 2 && OPTION (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 660 rs[Rs_color + i] = def_colorName[!i];
709 else 661 else
710#endif 662#endif
711 rs[Rs_color + i] = def_colorName[i]; 663 rs[Rs_color + i] = def_colorName[i];
712 664
… …
754 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 706 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
755 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 707 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
756 } 708 }
757 709
758 /* 710 /*
759 * get scrollBar/menuBar shadow colors 711 * get scrollBar shadow colors
760 * 712 *
761 * The calculations of topShadow/bottomShadow values are adapted 713 * The calculations of topShadow/bottomShadow values are adapted
762 * from the fvwm window manager. 714 * from the fvwm window manager.
763 */ 715 */
764#ifdef KEEP_SCROLLCOLOR 716#ifdef KEEP_SCROLLCOLOR
… …
809 int i = atoi (rs[Rs_color + idx]); 761 int i = atoi (rs[Rs_color + idx]);
810 762
811 if (i >= 8 && i <= 15) 763 if (i >= 8 && i <= 15)
812 { /* bright colors */ 764 { /* bright colors */
813 i -= 8; 765 i -= 8;
814#ifndef NO_BRIGHTCOLOR
815 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 766 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
816 return; 767 return;
817#endif
818 } 768 }
819 769
820 if (i >= 0 && i <= 7) /* normal colors */ 770 if (i >= 0 && i <= 7) /* normal colors */
821 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 771 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
822 } 772 }
… …
917rxvt_term::create_windows (int argc, const char *const *argv) 867rxvt_term::create_windows (int argc, const char *const *argv)
918{ 868{
919 XClassHint classHint; 869 XClassHint classHint;
920 XWMHints wmHint; 870 XWMHints wmHint;
921#if ENABLE_FRILLS 871#if ENABLE_FRILLS
922 Atom prop = None;
923 MWMHints mwmhints; 872 MWMHints mwmhints;
924#endif 873#endif
925 XGCValues gcvalue; 874 XGCValues gcvalue;
926 long vt_emask;
927 XSetWindowAttributes attributes; 875 XSetWindowAttributes attributes;
928 XWindowAttributes gattr;
929 Window top, parent; 876 Window top, parent;
930 dDisp; 877 dDisp;
931 878
932#ifdef USING_W11LIB 879 xa = display->xa;
933 /* enable W11 callbacks */
934 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif
936 880
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 881 /* grab colors before netscape does */
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 882 Get_Colours ();
939 883
940 if (options & Opt_transparent) 884 if (!set_fonts ())
941 { 885 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 886
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 887 parent = display->root;
944 } 888
889 attributes.override_redirect = !!OPTION (Opt_override_redirect);
945 890
946#if ENABLE_FRILLS 891#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 892 if (OPTION (Opt_borderLess))
948 { 893 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 894 if (XInternAtom (disp, "_MOTIF_WM_INFO", True) == None)
950
951 if (prop == None)
952 { 895 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 896 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT
955 attributes.override_redirect = TRUE; 897 attributes.override_redirect = TRUE;
956#endif
957 mwmhints.flags = 0; 898 mwmhints.flags = 0;
958 } 899 }
959 else 900 else
960 { 901 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 902 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
964 } 905 }
965 else 906 else
966 mwmhints.flags = 0; 907 mwmhints.flags = 0;
967#endif 908#endif
968 909
969 /* grab colors before netscape does */
970 Get_Colours ();
971
972 if (!set_fonts ())
973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
974
975 parent = DefaultRootWindow (disp);
976
977#if ENABLE_XEMBED 910#if ENABLE_XEMBED
978 if (rs[Rs_embed]) 911 if (rs[Rs_embed])
979 { 912 {
980 XWindowAttributes wattr; 913 XWindowAttributes wattr;
981 914
… …
984 if (!XGetWindowAttributes (disp, parent, &wattr)) 917 if (!XGetWindowAttributes (disp, parent, &wattr))
985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 918 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 919
987 window_calc (wattr.width, wattr.height); 920 window_calc (wattr.width, wattr.height);
988 } 921 }
989
990#endif 922#endif
923
991 window_calc (0, 0); 924 window_calc (0, 0);
992 925
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 926 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 927 attributes.background_pixel = pix_colors_focused[Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 928 attributes.border_pixel = pix_colors_focused[Color_border];
997 attributes.colormap = display->cmap; 929 attributes.colormap = display->cmap;
930
998 top = XCreateWindow (disp, parent, 931 top = XCreateWindow (disp, parent,
999 szHint.x, szHint.y, 932 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 933 szHint.width, szHint.height,
1001 TermWin.ext_bwidth, 934 ext_bwidth,
1002 display->depth, InputOutput, 935 display->depth, InputOutput,
1003 display->visual, 936 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 937 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1005#else 938 &attributes);
1006 top = XCreateSimpleWindow (disp, parent,
1007 szHint.x, szHint.y,
1008 szHint.width, szHint.height,
1009 TermWin.ext_bwidth,
1010 pix_colors_focused[Color_border],
1011 pix_colors_focused[Color_border]);
1012#endif
1013 939
1014 TermWin.parent[0] = top; 940 this->parent[0] = top;
1015 941
1016 old_width = szHint.width; 942 old_width = szHint.width;
1017 old_height = szHint.height; 943 old_height = szHint.height;
1018 944
1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 945 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1020 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 946 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1021 947
1022 classHint.res_name = (char *)rs[Rs_name]; 948 classHint.res_name = (char *)rs[Rs_name];
1023 classHint.res_class = (char *)RESCLASS; 949 classHint.res_class = (char *)RESCLASS;
1024 950
1025 wmHint.flags = InputHint | StateHint | WindowGroupHint; 951 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1026 wmHint.input = True; 952 wmHint.input = True;
1027 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 953 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1028 wmHint.window_group = top; 954 wmHint.window_group = top;
1029 955
1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 956 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1031 &szHint, &wmHint, &classHint); 957 &szHint, &wmHint, &classHint);
958
959#if ENABLE_FRILLS
960 if (mwmhints.flags)
961 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
962 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
963#endif
1032 964
1033 Atom protocols[] = { 965 Atom protocols[] = {
1034 xa[XA_WM_DELETE_WINDOW], 966 xa[XA_WM_DELETE_WINDOW],
1035#if ENABLE_EWMH 967#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING], 968 xa[XA_NET_WM_PING],
1037#endif 969#endif
1038 }; 970 };
1039 971
1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 972 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1041 973
974#if ENABLE_FRILLS
975 if (rs[Rs_transient_for])
976 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
977#endif
978
1042#if ENABLE_EWMH 979#if ENABLE_EWMH
1043 long pid = getpid (); 980 long pid = getpid ();
1044 981
1045 XChangeProperty (disp, top, 982 XChangeProperty (disp, top,
1046 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 983 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1057 | FocusChangeMask | VisibilityChangeMask 994 | FocusChangeMask | VisibilityChangeMask
1058 | ExposureMask | StructureNotifyMask); 995 | ExposureMask | StructureNotifyMask);
1059 996
1060 termwin_ev.start (display, top); 997 termwin_ev.start (display, top);
1061 998
1062#if ENABLE_FRILLS
1063 if (mwmhints.flags)
1064 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1065 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1066#endif
1067
1068 /* vt cursor: Black-on-White is standard, but this is more popular */ 999 /* vt cursor: Black-on-White is standard, but this is more popular */
1069 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1000 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1070 1001
1071#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1002#ifdef HAVE_SCROLLBARS
1072 /* cursor (menuBar/scrollBar): Black-on-White */ 1003 /* cursor scrollBar: Black-on-White */
1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1004 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1074#endif 1005#endif
1075 1006
1076 /* the vt window */ 1007 /* the vt window */
1077 TermWin.vt = XCreateSimpleWindow (disp, top, 1008 vt = XCreateSimpleWindow (disp, top,
1078 window_vt_x,
1079 window_vt_y, 1009 window_vt_x, window_vt_y,
1080 TermWin_TotalWidth (), 1010 width, height,
1081 TermWin_TotalHeight (),
1082 0, 1011 0,
1083 pix_colors_focused[Color_fg], 1012 pix_colors_focused[Color_fg],
1084 pix_colors_focused[Color_bg]); 1013 pix_colors_focused[Color_bg]);
1085#ifdef DEBUG_X
1086 XStoreName (disp, TermWin.vt, "vt window");
1087#endif
1088 1014
1089 attributes.bit_gravity = NorthWestGravity; 1015 attributes.bit_gravity = NorthWestGravity;
1090 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1016 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1091 1017
1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1018 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1093 1019
1094#ifdef POINTER_BLANK 1020 if (OPTION (Opt_pointerBlank))
1095 if (options & Opt_pointerBlank)
1096 vt_emask |= PointerMotionMask; 1021 vt_emask |= PointerMotionMask;
1097 else 1022 else
1098#endif
1099 vt_emask |= Button1MotionMask | Button3MotionMask; 1023 vt_emask |= Button1MotionMask | Button3MotionMask;
1100 1024
1101 XSelectInput (disp, TermWin.vt, vt_emask); 1025 vt_select_input ();
1026
1102 vt_ev.start (display, TermWin.vt); 1027 vt_ev.start (display, vt);
1103
1104#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1105 if (menuBar_height ())
1106 {
1107 menuBar.win = XCreateSimpleWindow (disp, top,
1108 window_vt_x, 0,
1109 TermWin_TotalWidth (),
1110 menuBar_TotalHeight (),
1111 0,
1112 pix_colors_focused[Color_fg],
1113 pix_colors_focused[Color_scroll]);
1114
1115#ifdef DEBUG_X
1116 XStoreName (disp, menuBar.win, "menubar");
1117#endif
1118
1119 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1120
1121 XDefineCursor (disp, menuBar.win,
1122 XCreateFontCursor (disp, XC_left_ptr));
1123
1124 XSelectInput (disp, menuBar.win,
1125 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1126 menubar_ev.start (display, menuBar.win);
1127 }
1128#endif
1129 1028
1130#ifdef XPM_BACKGROUND 1029#ifdef XPM_BACKGROUND
1131 if (rs[Rs_backgroundPixmap] != NULL 1030 if (rs[Rs_backgroundPixmap] != NULL
1132 && ! (options & Opt_transparent)) 1031 && !OPTION (Opt_transparent))
1133 { 1032 {
1134 const char *p = rs[Rs_backgroundPixmap]; 1033 const char *p = rs[Rs_backgroundPixmap];
1135 1034
1136 if ((p = strchr (p, ';')) != NULL) 1035 if ((p = strchr (p, ';')) != NULL)
1137 { 1036 {
… …
1143 scr_touch (true); 1042 scr_touch (true);
1144 } 1043 }
1145#endif 1044#endif
1146 1045
1147 /* graphics context for the vt window */ 1046 /* graphics context for the vt window */
1148 gcvalue.foreground = pix_colors[Color_fg]; 1047 gcvalue.foreground = pix_colors[Color_fg];
1149 gcvalue.background = pix_colors[Color_bg]; 1048 gcvalue.background = pix_colors[Color_bg];
1150 gcvalue.graphics_exposures = 1; 1049 gcvalue.graphics_exposures = 1;
1050
1151 TermWin.gc = XCreateGC (disp, TermWin.vt, 1051 gc = XCreateGC (disp, vt,
1152 GCForeground | GCBackground | GCGraphicsExposures, 1052 GCForeground | GCBackground | GCGraphicsExposures,
1153 &gcvalue); 1053 &gcvalue);
1154 1054
1155 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1055 drawable = new rxvt_drawable (display, vt);
1156 1056
1157#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1057#ifdef RXVT_SCROLLBAR
1158 gcvalue.foreground = pix_colors[Color_topShadow]; 1058 gcvalue.foreground = pix_colors[Color_topShadow];
1159 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1059 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1160 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1060 gcvalue.foreground = pix_colors[Color_bottomShadow];
1161 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1061 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1162 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1062 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1163 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1063 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1164#endif 1064#endif
1165 1065
1166#ifdef OFF_FOCUS_FADING 1066#ifdef OFF_FOCUS_FADING
1167 // initially we are in unfocused state 1067 // initially we are in unfocused state
1168 if (rs[Rs_fade]) 1068 if (rs[Rs_fade])
1169 pix_colors = pix_colors_unfocused; 1069 pix_colors = pix_colors_unfocused;
1170#endif 1070#endif
1171 1071
1172 pointer_unblank (); 1072 pointer_unblank ();
1173 scr_recolour (); 1073 scr_recolour ();
1174
1175#if ENABLE_XEMBED
1176 if (rs[Rs_embed])
1177 {
1178 long info[2] = { 0, XEMBED_MAPPED };
1179
1180 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1181 32, PropModeReplace, (unsigned char *)&info, 2);
1182 }
1183#endif
1184} 1074}
1185 1075
1186/* ------------------------------------------------------------------------- * 1076/* ------------------------------------------------------------------------- *
1187 * GET TTY CURRENT STATE * 1077 * GET TTY CURRENT STATE *
1188 * ------------------------------------------------------------------------- */ 1078 * ------------------------------------------------------------------------- */
… …
1193 /* 1083 /*
1194 * standard System V termios interface 1084 * standard System V termios interface
1195 */ 1085 */
1196 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1086 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1197 { 1087 {
1198 /* return error - use system defaults */ 1088 // return error - use system defaults,
1089 // where possible, and zero elsewhere
1090 memset (tio, 0, sizeof (ttymode_t));
1091
1199 tio->c_cc[VINTR] = CINTR; 1092 tio->c_cc[VINTR] = CINTR;
1200 tio->c_cc[VQUIT] = CQUIT; 1093 tio->c_cc[VQUIT] = CQUIT;
1201 tio->c_cc[VERASE] = CERASE; 1094 tio->c_cc[VERASE] = CERASE;
1095#ifdef VERASE2
1096 tio->c_cc[VERASE2] = CERASE2;
1097#endif
1202 tio->c_cc[VKILL] = CKILL; 1098 tio->c_cc[VKILL] = CKILL;
1203 tio->c_cc[VSTART] = CSTART; 1099 tio->c_cc[VSTART] = CSTART;
1204 tio->c_cc[VSTOP] = CSTOP; 1100 tio->c_cc[VSTOP] = CSTOP;
1205 tio->c_cc[VSUSP] = CSUSP; 1101 tio->c_cc[VSUSP] = CSUSP;
1206# ifdef VDSUSP 1102# ifdef VDSUSP
… …
1399rxvt_term::run_command (const char *const *argv) 1295rxvt_term::run_command (const char *const *argv)
1400{ 1296{
1401#if ENABLE_FRILLS 1297#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1298 if (rs[Rs_pty_fd])
1403 { 1299 {
1404 pty.pty = atoi (rs[Rs_pty_fd]); 1300 pty->pty = atoi (rs[Rs_pty_fd]);
1405 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1301
1302 if (pty->pty >= 0)
1303 {
1304 if (getfd_hook)
1305 pty->pty = (*getfd_hook) (pty->pty);
1306
1307 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1308 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1309 }
1406 } 1310 }
1407 else 1311 else
1408#endif 1312#endif
1409 if (!pty.get ()) 1313 if (!pty->get ())
1410 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1314 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1411 1315
1412 pty.set_utf8_mode (enc_utf8); 1316 pty->set_utf8_mode (enc_utf8);
1413 1317
1414 /* set initial window size */ 1318 /* set initial window size */
1415 tt_winch (); 1319 tt_winch ();
1416 1320
1417 int er; 1321 int er;
… …
1430#if ENABLE_FRILLS 1334#if ENABLE_FRILLS
1431 if (rs[Rs_pty_fd]) 1335 if (rs[Rs_pty_fd])
1432 return; 1336 return;
1433#endif 1337#endif
1434 1338
1435#ifndef __QNX__
1436 /* spin off the command interpreter */ 1339 /* spin off the command interpreter */
1437 switch (cmd_pid = fork ()) 1340 switch (cmd_pid = fork ())
1438 { 1341 {
1439 case -1: 1342 case -1:
1440 { 1343 {
… …
1442 rxvt_fatal ("can't fork, aborting.\n"); 1345 rxvt_fatal ("can't fork, aborting.\n");
1443 } 1346 }
1444 case 0: 1347 case 0:
1445 init_env (); 1348 init_env ();
1446 1349
1447 if (!pty.make_controlling_tty ()) 1350 if (!pty->make_controlling_tty ())
1448 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1351 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1449 else 1352 else
1450 { 1353 {
1451 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1354 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1452 dup2 (pty.tty, STDIN_FILENO); 1355 dup2 (pty->tty, STDIN_FILENO);
1453 dup2 (pty.tty, STDOUT_FILENO); 1356 dup2 (pty->tty, STDOUT_FILENO);
1454 dup2 (pty.tty, STDERR_FILENO); 1357 dup2 (pty->tty, STDERR_FILENO);
1455 1358
1456 // close all our file handles that we do no longer need 1359 // close all our file handles that we do no longer need
1457 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1360 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1458 { 1361 {
1459 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1362 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1460 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1363 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1461 } 1364 }
1462 1365
1463 run_child (argv); 1366 run_child (argv);
1464 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1367 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1465 } 1368 }
1466 1369
1467 _exit (EXIT_FAILURE); 1370 _exit (EXIT_FAILURE);
1468 1371
1469 default: 1372 default:
1470 { 1373 if (!OPTION (Opt_utmpInhibit))
1471#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1374 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]);
1472 int fdstdin;
1473 1375
1474 fdstdin = dup (STDIN_FILENO); 1376 pty->close_tty ();
1475 dup2 (pty.tty, STDIN_FILENO);
1476#endif
1477 1377
1478#ifdef UTMP_SUPPORT 1378 child_ev.start (cmd_pid);
1479 privileged_utmp (SAVE);
1480#endif
1481 1379
1482#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1380 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1483
1484 dup2 (fdstdin, STDIN_FILENO);
1485 close (fdstdin);
1486#endif
1487 }
1488
1489 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1490 break; 1381 break;
1491 } 1382 }
1492#else /* __QNX__ uses qnxspawn () */
1493 fchmod (pty.tty, 0622);
1494 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1495 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1496
1497 if (run_child (argv) == -1)
1498 exit (EXIT_FAILURE);
1499#endif
1500} 1383}
1501 1384
1502/* ------------------------------------------------------------------------- * 1385/* ------------------------------------------------------------------------- *
1503 * CHILD PROCESS OPERATIONS * 1386 * CHILD PROCESS OPERATIONS *
1504 * ------------------------------------------------------------------------- */ 1387 * ------------------------------------------------------------------------- */
… …
1511{ 1394{
1512 char *login; 1395 char *login;
1513 1396
1514 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1397 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1515 1398
1516 if (options & Opt_console) 1399 if (OPTION (Opt_console))
1517 { /* be virtual console, fail silently */ 1400 { /* be virtual console, fail silently */
1518#ifdef TIOCCONS 1401#ifdef TIOCCONS
1519 unsigned int on = 1; 1402 unsigned int on = 1;
1520 1403
1521 ioctl (STDIN_FILENO, TIOCCONS, &on); 1404 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1548 // unblock signals (signals are blocked by iom.C 1431 // unblock signals (signals are blocked by iom.C
1549 sigset_t ss; 1432 sigset_t ss;
1550 sigemptyset (&ss); 1433 sigemptyset (&ss);
1551 sigprocmask (SIG_SETMASK, &ss, 0); 1434 sigprocmask (SIG_SETMASK, &ss, 0);
1552 1435
1553#ifndef __QNX__
1554 /* command interpreter path */ 1436 /* command interpreter path */
1555 if (argv != NULL) 1437 if (argv != NULL)
1556 { 1438 {
1557# ifdef DEBUG_CMD 1439# ifdef DEBUG_CMD
1558 int i; 1440 int i;
… …
1564 execvp (argv[0], (char *const *)argv); 1446 execvp (argv[0], (char *const *)argv);
1565 /* no error message: STDERR is closed! */ 1447 /* no error message: STDERR is closed! */
1566 } 1448 }
1567 else 1449 else
1568 { 1450 {
1569 const char *argv0, *shell; 1451 const char *argv0, *shell;
1570 1452
1571 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1453 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1572 shell = "/bin/sh"; 1454 shell = "/bin/sh";
1573 1455
1574 argv0 = (const char *)rxvt_r_basename (shell); 1456 argv0 = (const char *)rxvt_r_basename (shell);
1575 1457
1576 if (options & Opt_loginShell) 1458 if (OPTION (Opt_loginShell))
1577 { 1459 {
1578 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1460 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1579 1461
1580 login[0] = '-'; 1462 login[0] = '-';
1581 strcpy (&login[1], argv0); 1463 strcpy (&login[1], argv0);
1582 argv0 = login; 1464 argv0 = login;
1583 } 1465 }
1466
1584 execlp (shell, argv0, NULL); 1467 execlp (shell, argv0, NULL);
1585 /* no error message: STDERR is closed! */ 1468 /* no error message: STDERR is closed! */
1586 } 1469 }
1587 1470
1588#else /* __QNX__ uses qnxspawn () */
1589
1590 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1591 char *command = NULL, fullcommand[_MAX_PATH];
1592 char **arg_v, *arg_a[2] = { NULL, NULL };
1593
1594 if (argv != NULL)
1595 {
1596 if (access (argv[0], X_OK) == -1)
1597 {
1598 if (strchr (argv[0], '/') == NULL)
1599 {
1600 searchenv (argv[0], "PATH", fullcommand);
1601
1602 if (fullcommand[0] != '\0')
1603 command = fullcommand;
1604 }
1605
1606 if (access (command, X_OK) == -1)
1607 return -1;
1608 }
1609 else
1610 command = argv[0];
1611
1612 arg_v = argv;
1613 }
1614 else
1615 {
1616 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1617 command = "/bin/sh";
1618
1619 arg_a[0] = my_basename (command);
1620
1621 if (options & Opt_loginShell)
1622 {
1623 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1624
1625 login[0] = '-';
1626 strcpy (&login[1], arg_a[0]);
1627 arg_a[0] = login;
1628 }
1629
1630 arg_v = arg_a;
1631 }
1632
1633 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1634 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1635 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1636 command, arg_v, environ, iov_a, 0);
1637 if (login)
1638 free (login);
1639
1640 pty.close_tty ();
1641 return pty.pty;
1642#endif
1643
1644 return -1; 1471 return -1;
1645} 1472}
1646 1473
1647/*----------------------- end-of-file (C source) -----------------------*/ 1474/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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