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

Diff Legend

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