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

Diff Legend

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