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.125 by root, Wed Dec 21 19:50:16 2005 UTC vs.
Revision 1.142 by root, Fri Jan 13 04:59:04 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.
… …
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "Black", /* 0: black (#000000) */
49#ifndef NO_BRIGHTCOLOR
50 "Red3", /* 1: red (#CD0000) */ 49 "Red3", /* 1: red (#CD0000) */
51 "Green3", /* 2: green (#00CD00) */ 50 "Green3", /* 2: green (#00CD00) */
52 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "Yellow3", /* 3: yellow (#CDCD00) */
53 "Blue3", /* 4: blue (#0000CD) */ 52 "Blue3", /* 4: blue (#0000CD) */
54 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "Magenta3", /* 5: magenta (#CD00CD) */
… …
62# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
63 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "Grey30", /* 8: bright black (#4D4D4D) */
64# else 63# else
65 "Grey25", /* 8: bright black (#404040) */ 64 "Grey25", /* 8: bright black (#404040) */
66# endif 65# endif
67#endif /* NO_BRIGHTCOLOR */
68 "Red", /* 1/9: bright red (#FF0000) */ 66 "Red", /* 1/9: bright red (#FF0000) */
69 "Green", /* 2/10: bright green (#00FF00) */ 67 "Green", /* 2/10: bright green (#00FF00) */
70 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "Yellow", /* 3/11: bright yellow (#FFFF00) */
71 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "Blue", /* 4/12: bright blue (#0000FF) */
72 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "Magenta", /* 5/13: bright magenta (#FF00FF) */
… …
341 rs[Rs_name] = rxvt_r_basename (argv[0]); 339 rs[Rs_name] = rxvt_r_basename (argv[0]);
342 340
343 /* 341 /*
344 * Open display, get options/resources and create the window 342 * Open display, get options/resources and create the window
345 */ 343 */
344
346 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 345 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
347 rs[Rs_display_name] = ":0"; 346 rs[Rs_display_name] = ":0";
348 347
349 get_options (r_argc, r_argv); 348 get_options (r_argc, r_argv);
350 349
351 if (!(display = displays.get (rs[Rs_display_name]))) 350 if (!(display = displays.get (rs[Rs_display_name])))
352 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 351 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
353 352
354 extract_resources (); 353 extract_resources ();
354
355 free (r_argv); 355 free (r_argv);
356 356
357 /* 357 /*
358 * set any defaults not already set 358 * set any defaults not already set
359 */ 359 */
… …
371 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
372 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
373 } 373 }
374 374
375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
376 saveLines = min (i, std::numeric_limits<int16_t>::max ()); 376 saveLines = min (i, MAX_SAVELINES);
377 377
378#if ENABLE_FRILLS 378#if ENABLE_FRILLS
379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381 381
… …
393 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
394#endif 394#endif
395 395
396 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
397 if (!saveLines) 397 if (!saveLines)
398 options &= ~Opt_scrollBar; 398 set_option (Opt_scrollBar, 0);
399 399
400#ifdef PRINTPIPE 400#ifdef PRINTPIPE
401 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
402 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
403#endif 403#endif
… …
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 447#endif
448 448
449#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
451 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
452 { 452 {
453 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
455 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
461 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
463 463
464#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
466 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 468#endif
469 469
470 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 471 color_aliases (Color_fg);
… …
578 * This should support all European type languages. 578 * This should support all European type languages.
579 */ 579 */
580void 580void
581rxvt_term::set_locale (const char *locale) 581rxvt_term::set_locale (const char *locale)
582{ 582{
583 set_environ (envv);
584
583#if HAVE_XSETLOCALE || HAVE_SETLOCALE 585#if HAVE_XSETLOCALE || HAVE_SETLOCALE
584 free (this->locale); 586 free (this->locale);
585 this->locale = setlocale (LC_CTYPE, locale); 587 this->locale = setlocale (LC_CTYPE, locale);
586 588
587 if (!this->locale) 589 if (!this->locale)
588 { 590 {
589 if (*locale) 591 if (*locale)
590 { 592 {
591 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 593 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
592 setlocale (LC_CTYPE, ""); 594 setlocale (LC_CTYPE, "C");
593 } 595 }
594 else 596 else
595 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 597 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
596 598
597 this->locale = ""; 599 this->locale = "C";
598 } 600 }
599 601
600 602
601 this->locale = rxvt_strdup (this->locale); 603 this->locale = rxvt_strdup (this->locale);
602 SET_LOCALE (this->locale); 604 SET_LOCALE (this->locale);
… …
617} 619}
618 620
619void 621void
620rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
621{ 623{
624 set_environ (envv);
625
622#ifdef USE_XIM 626#ifdef USE_XIM
623 if (!locale) 627 if (!locale)
624 rxvt_warn ("setting locale failed, working without locale support.\n"); 628 rxvt_warn ("setting locale failed, working without locale support.\n");
625 else 629 else
626 { 630 {
… …
648 * Initialize the command connection. 652 * Initialize the command connection.
649 * This should be called after the X server connection is established. 653 * This should be called after the X server connection is established.
650 */ 654 */
651 655
652#ifdef META8_OPTION 656#ifdef META8_OPTION
653 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 657 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
654#endif 658#endif
655 659
656 get_ourmods (); 660 get_ourmods ();
657 661
658 if (!(options & Opt_scrollTtyOutput)) 662 if (!OPTION (Opt_scrollTtyOutput))
659 priv_modes |= PrivMode_TtyOutputInh; 663 priv_modes |= PrivMode_TtyOutputInh;
660 if (options & Opt_scrollTtyKeypress) 664 if (OPTION (Opt_scrollTtyKeypress))
661 priv_modes |= PrivMode_Keypress; 665 priv_modes |= PrivMode_Keypress;
662 if (!(options & Opt_jumpScroll)) 666 if (!OPTION (Opt_jumpScroll))
663 priv_modes |= PrivMode_smoothScroll; 667 priv_modes |= PrivMode_smoothScroll;
664 668
665#ifndef NO_BACKSPACE_KEY 669#ifndef NO_BACKSPACE_KEY
666 if (strcmp (key_backspace, "DEC") == 0) 670 if (strcmp (key_backspace, "DEC") == 0)
667 priv_modes |= PrivMode_HaveBackSpace; 671 priv_modes |= PrivMode_HaveBackSpace;
… …
677 if (menubar_visible ()) 681 if (menubar_visible ())
678 { 682 {
679 priv_modes |= PrivMode_menuBar; 683 priv_modes |= PrivMode_menuBar;
680 SavedModes |= PrivMode_menuBar; 684 SavedModes |= PrivMode_menuBar;
681 } 685 }
682
683#ifdef CURSOR_BLINK
684 if (options & Opt_cursorBlink)
685 (void)gettimeofday (&lastcursorchange, NULL);
686#endif
687 686
688 run_command (argv); 687 run_command (argv);
689} 688}
690 689
691/*----------------------------------------------------------------------*/ 690/*----------------------------------------------------------------------*/
… …
706 continue; 705 continue;
707 706
708 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
709 { 708 {
710#ifndef XTERM_REVERSE_VIDEO 709#ifndef XTERM_REVERSE_VIDEO
711 if (i < 2 && (options & Opt_reverseVideo)) 710 if (i < 2 && OPTION (Opt_reverseVideo))
712 rs[Rs_color + i] = def_colorName[!i]; 711 rs[Rs_color + i] = def_colorName[!i];
713 else 712 else
714#endif 713#endif
715 rs[Rs_color + i] = def_colorName[i]; 714 rs[Rs_color + i] = def_colorName[i];
716 715
… …
813 int i = atoi (rs[Rs_color + idx]); 812 int i = atoi (rs[Rs_color + idx]);
814 813
815 if (i >= 8 && i <= 15) 814 if (i >= 8 && i <= 15)
816 { /* bright colors */ 815 { /* bright colors */
817 i -= 8; 816 i -= 8;
818#ifndef NO_BRIGHTCOLOR
819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
820 return; 818 return;
821#endif
822 } 819 }
823 820
824 if (i >= 0 && i <= 7) /* normal colors */ 821 if (i >= 0 && i <= 7) /* normal colors */
825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
826 } 823 }
… …
925#if ENABLE_FRILLS 922#if ENABLE_FRILLS
926 Atom prop = None; 923 Atom prop = None;
927 MWMHints mwmhints; 924 MWMHints mwmhints;
928#endif 925#endif
929 XGCValues gcvalue; 926 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 927 XSetWindowAttributes attributes;
932 XWindowAttributes gattr; 928 XWindowAttributes gattr;
933 Window top, parent; 929 Window top, parent;
934 dDisp; 930 dDisp;
935 931
… …
939#endif 935#endif
940 936
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
943 939
944 if (options & Opt_transparent) 940 if (OPTION (Opt_transparent))
945 { 941 {
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 943 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
948 } 944 }
949 945
950#if ENABLE_FRILLS 946#if ENABLE_FRILLS
951 if (options & Opt_borderLess) 947 if (OPTION (Opt_borderLess))
952 { 948 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
954 950
955 if (prop == None) 951 if (prop == None)
956 { 952 {
… …
1026 classHint.res_name = (char *)rs[Rs_name]; 1022 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 1023 classHint.res_class = (char *)RESCLASS;
1028 1024
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1025 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 1026 wmHint.input = True;
1031 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1027 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 1028 wmHint.window_group = top;
1033 1029
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1035 &szHint, &wmHint, &classHint); 1031 &szHint, &wmHint, &classHint);
1036 1032
… …
1041#endif 1037#endif
1042 }; 1038 };
1043 1039
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 1041
1042#if ENABLE_FRILLS
1043 if (rs[Rs_transient_for])
1044 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1045#endif
1046
1046#if ENABLE_EWMH 1047#if ENABLE_EWMH
1047 long pid = getpid (); 1048 long pid = getpid ();
1048 1049
1049 XChangeProperty (disp, top, 1050 XChangeProperty (disp, top,
1050 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1051 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1079 1080
1080 /* the vt window */ 1081 /* the vt window */
1081 vt = XCreateSimpleWindow (disp, top, 1082 vt = XCreateSimpleWindow (disp, top,
1082 window_vt_x, 1083 window_vt_x,
1083 window_vt_y, 1084 window_vt_y,
1084 TermWin_TotalWidth (), 1085 width,
1085 TermWin_TotalHeight (), 1086 height,
1086 0, 1087 0,
1087 pix_colors_focused[Color_fg], 1088 pix_colors_focused[Color_fg],
1088 pix_colors_focused[Color_bg]); 1089 pix_colors_focused[Color_bg]);
1089#ifdef DEBUG_X 1090#ifdef DEBUG_X
1090 XStoreName (disp, vt, "vt window"); 1091 XStoreName (disp, vt, "vt window");
… …
1093 attributes.bit_gravity = NorthWestGravity; 1094 attributes.bit_gravity = NorthWestGravity;
1094 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1095 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1095 1096
1096 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1097 1098
1098#ifdef POINTER_BLANK 1099 if (OPTION (Opt_pointerBlank))
1099 if (options & Opt_pointerBlank)
1100 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1101 else 1101 else
1102#endif
1103 vt_emask |= Button1MotionMask | Button3MotionMask; 1102 vt_emask |= Button1MotionMask | Button3MotionMask;
1104 1103
1105 XSelectInput (disp, vt, vt_emask); 1104 vt_select_input ();
1105
1106 vt_ev.start (display, vt); 1106 vt_ev.start (display, vt);
1107 1107
1108#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1109 if (menuBar_height ()) 1109 if (menuBar_height ())
1110 { 1110 {
1111 menuBar.win = XCreateSimpleWindow (disp, top, 1111 menuBar.win = XCreateSimpleWindow (disp, top,
1112 window_vt_x, 0, 1112 window_vt_x, 0,
1113 TermWin_TotalWidth (), 1113 width,
1114 menuBar_TotalHeight (), 1114 menuBar_TotalHeight (),
1115 0, 1115 0,
1116 pix_colors_focused[Color_fg], 1116 pix_colors_focused[Color_fg],
1117 pix_colors_focused[Color_scroll]); 1117 pix_colors_focused[Color_scroll]);
1118 1118
… …
1131 } 1131 }
1132#endif 1132#endif
1133 1133
1134#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1135 if (rs[Rs_backgroundPixmap] != NULL 1135 if (rs[Rs_backgroundPixmap] != NULL
1136 && ! (options & Opt_transparent)) 1136 && ! OPTION (Opt_transparent))
1137 { 1137 {
1138 const char *p = rs[Rs_backgroundPixmap]; 1138 const char *p = rs[Rs_backgroundPixmap];
1139 1139
1140 if ((p = strchr (p, ';')) != NULL) 1140 if ((p = strchr (p, ';')) != NULL)
1141 { 1141 {
… …
1197 /* 1197 /*
1198 * standard System V termios interface 1198 * standard System V termios interface
1199 */ 1199 */
1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1201 { 1201 {
1202 /* return error - use system defaults */ 1202 // return error - use system defaults,
1203 // where possible, and zero elsewhere
1204 memset (tio, 0, sizeof (ttymode_t));
1205
1203 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1204 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1205 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1206 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1207 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1208 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1209 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1210# ifdef VDSUSP 1216# ifdef VDSUSP
… …
1404{ 1410{
1405#if ENABLE_FRILLS 1411#if ENABLE_FRILLS
1406 if (rs[Rs_pty_fd]) 1412 if (rs[Rs_pty_fd])
1407 { 1413 {
1408 pty.pty = atoi (rs[Rs_pty_fd]); 1414 pty.pty = atoi (rs[Rs_pty_fd]);
1415
1416 if (pty.pty >= 0)
1417 {
1418 if (getfd_hook)
1419 pty.pty = (*getfd_hook) (pty.pty);
1420
1409 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1421 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1422 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1423 }
1410 } 1424 }
1411 else 1425 else
1412#endif 1426#endif
1413 if (!pty.get ()) 1427 if (!pty.get ())
1414 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1515{ 1529{
1516 char *login; 1530 char *login;
1517 1531
1518 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1532 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1519 1533
1520 if (options & Opt_console) 1534 if (OPTION (Opt_console))
1521 { /* be virtual console, fail silently */ 1535 { /* be virtual console, fail silently */
1522#ifdef TIOCCONS 1536#ifdef TIOCCONS
1523 unsigned int on = 1; 1537 unsigned int on = 1;
1524 1538
1525 ioctl (STDIN_FILENO, TIOCCONS, &on); 1539 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1568 execvp (argv[0], (char *const *)argv); 1582 execvp (argv[0], (char *const *)argv);
1569 /* no error message: STDERR is closed! */ 1583 /* no error message: STDERR is closed! */
1570 } 1584 }
1571 else 1585 else
1572 { 1586 {
1573 const char *argv0, *shell; 1587 const char *argv0, *shell;
1574 1588
1575 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1589 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1576 shell = "/bin/sh"; 1590 shell = "/bin/sh";
1577 1591
1578 argv0 = (const char *)rxvt_r_basename (shell); 1592 argv0 = (const char *)rxvt_r_basename (shell);
1579 1593
1580 if (options & Opt_loginShell) 1594 if (OPTION (Opt_loginShell))
1581 { 1595 {
1582 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1596 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1583 1597
1584 login[0] = '-'; 1598 login[0] = '-';
1585 strcpy (&login[1], argv0); 1599 strcpy (&login[1], argv0);
1586 argv0 = login; 1600 argv0 = login;
1587 } 1601 }
1602
1588 execlp (shell, argv0, NULL); 1603 execlp (shell, argv0, NULL);
1589 /* no error message: STDERR is closed! */ 1604 /* no error message: STDERR is closed! */
1590 } 1605 }
1591 1606
1592#else /* __QNX__ uses qnxspawn () */ 1607#else /* __QNX__ uses qnxspawn () */
… …
1620 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1635 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1621 command = "/bin/sh"; 1636 command = "/bin/sh";
1622 1637
1623 arg_a[0] = my_basename (command); 1638 arg_a[0] = my_basename (command);
1624 1639
1625 if (options & Opt_loginShell) 1640 if (OPTION (Opt_loginShell))
1626 { 1641 {
1627 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1642 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1628 1643
1629 login[0] = '-'; 1644 login[0] = '-';
1630 strcpy (&login[1], arg_a[0]); 1645 strcpy (&login[1], arg_a[0]);

Diff Legend

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