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

Diff Legend

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