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

Diff Legend

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