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.117 by root, Thu Jul 7 19:37:47 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) */
… …
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING
175 "black",
176#endif
174 }; 177 };
175 178
176const char *const xa_names[] = 179const char *const xa_names[] =
177 { 180 {
178 "TEXT", 181 "TEXT",
… …
213 }; 216 };
214 217
215bool 218bool
216rxvt_term::init_vars () 219rxvt_term::init_vars ()
217{ 220{
218 sw_term.start (SIGTERM);
219 sw_int.start (SIGINT);
220
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 221 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 222#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 224#endif
225 pix_colors = pix_colors_focused; 225 pix_colors = pix_colors_focused;
226 226
227 if (pix_colors == NULL) 227 if (pix_colors == NULL)
228 return false; 228 return false;
229 229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
231 TermWin.pixmap = None; 231 pixmap = None;
232#endif 232#endif
233 233
234 MEvent.time = CurrentTime; 234 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 235 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS; 236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 237 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 238 priv_modes = SavedModes = PrivMode_Default;
239 TermWin.focus = 0; 239 focus = 0;
240 TermWin.ncol = 80; 240 ncol = 80;
241 TermWin.nrow = 24; 241 nrow = 24;
242 TermWin.int_bwidth = INTERNALBORDERWIDTH; 242 int_bwidth = INTERNALBORDERWIDTH;
243 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 243 ext_bwidth = EXTERNALBORDERWIDTH;
244 TermWin.lineSpace = LINESPACE; 244 lineSpace = LINESPACE;
245 TermWin.saveLines = SAVELINES; 245 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 246 numpix_colors = TOTAL_COLORS;
247 247
248 refresh_limit = 1; 248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 249 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0; 250 prev_nrow = prev_ncol = 0;
… …
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 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 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 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 383 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
379 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)
380 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 386 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
387
381 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 388 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
382 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 389 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
383#endif 390#endif
384 391
385#ifdef POINTER_BLANK 392#ifdef POINTER_BLANK
386 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 393 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
387 pointerBlankDelay = i; 394 pointerBlankDelay = i;
388 else 395 else
389 pointerBlankDelay = 2; 396 pointerBlankDelay = 2;
390#endif 397#endif
391 398
392 /* no point having a scrollbar without having any scrollback! */ 399 /* no point having a scrollbar without having any scrollback! */
393 if (!TermWin.saveLines) 400 if (!saveLines)
394 options &= ~Opt_scrollBar; 401 set_option (Opt_scrollBar, 0);
395 402
396#ifdef PRINTPIPE 403#ifdef PRINTPIPE
397 if (!rs[Rs_print_pipe]) 404 if (!rs[Rs_print_pipe])
398 rs[Rs_print_pipe] = PRINTPIPE; 405 rs[Rs_print_pipe] = PRINTPIPE;
399#endif 406#endif
… …
442 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]);
443#endif 450#endif
444 451
445#ifdef XTERM_REVERSE_VIDEO 452#ifdef XTERM_REVERSE_VIDEO
446 /* this is how xterm implements reverseVideo */ 453 /* this is how xterm implements reverseVideo */
447 if (options & Opt_reverseVideo) 454 if (OPTION (Opt_reverseVideo))
448 { 455 {
449 if (!rs[Rs_color + Color_fg]) 456 if (!rs[Rs_color + Color_fg])
450 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 457 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
451 if (!rs[Rs_color + Color_bg]) 458 if (!rs[Rs_color + Color_bg])
452 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 459 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
457 if (!rs[Rs_color + i]) 464 if (!rs[Rs_color + i])
458 rs[Rs_color + i] = def_colorName[i]; 465 rs[Rs_color + i] = def_colorName[i];
459 466
460#ifndef XTERM_REVERSE_VIDEO 467#ifndef XTERM_REVERSE_VIDEO
461 /* this is how we implement reverseVideo */ 468 /* this is how we implement reverseVideo */
462 if (options & Opt_reverseVideo) 469 if (OPTION (Opt_reverseVideo))
463 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 470 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
464#endif 471#endif
465 472
466 /* convenient aliases for setting fg/bg to colors */ 473 /* convenient aliases for setting fg/bg to colors */
467 color_aliases (Color_fg); 474 color_aliases (Color_fg);
468 color_aliases (Color_bg); 475 color_aliases (Color_bg);
… …
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
519 526
520 sprintf (env_display, "DISPLAY=%s", val); 527 sprintf (env_display, "DISPLAY=%s", val);
521 528
522 /* avoiding the math library: 529 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 530 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 531 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
525 ; 532 ;
526 MAX_IT (i, 1); 533 max_it (i, 1);
527 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
528 535
529 sprintf (env_windowid, "WINDOWID=%u", 536 sprintf (env_windowid, "WINDOWID=%u",
530 (unsigned int)TermWin.parent[0]); 537 (unsigned int)parent[0]);
531 538
532 /* add entries to the environment: 539 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 540 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 541 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 542 * @ COLORTERM: terminal sub-name and also indicates its color
… …
574 * This should support all European type languages. 581 * This should support all European type languages.
575 */ 582 */
576void 583void
577rxvt_term::set_locale (const char *locale) 584rxvt_term::set_locale (const char *locale)
578{ 585{
586 TEMP_ENV;
587
579#if HAVE_XSETLOCALE || HAVE_SETLOCALE 588#if HAVE_XSETLOCALE || HAVE_SETLOCALE
580 free (this->locale); 589 free (this->locale);
581 this->locale = setlocale (LC_CTYPE, locale); 590 this->locale = setlocale (LC_CTYPE, locale);
582 591
583 if (!this->locale) 592 if (!this->locale)
584 { 593 {
585 if (*locale) 594 if (*locale)
586 { 595 {
587 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);
588 setlocale (LC_CTYPE, ""); 597 setlocale (LC_CTYPE, "C");
589 } 598 }
590 else 599 else
591 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");
592 601
593 this->locale = ""; 602 this->locale = "C";
594 } 603 }
595 604
596 605
597 this->locale = rxvt_strdup (this->locale); 606 this->locale = rxvt_strdup (this->locale);
598 SET_LOCALE (this->locale); 607 SET_LOCALE (this->locale);
… …
613} 622}
614 623
615void 624void
616rxvt_term::init_xlocale () 625rxvt_term::init_xlocale ()
617{ 626{
627 TEMP_ENV;
628
618#ifdef USE_XIM 629#ifdef USE_XIM
619 if (!locale) 630 if (!locale)
620 rxvt_warn ("setting locale failed, working without locale support.\n"); 631 rxvt_warn ("setting locale failed, working without locale support.\n");
621 else 632 else
622 { 633 {
… …
644 * Initialize the command connection. 655 * Initialize the command connection.
645 * This should be called after the X server connection is established. 656 * This should be called after the X server connection is established.
646 */ 657 */
647 658
648#ifdef META8_OPTION 659#ifdef META8_OPTION
649 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 660 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
650#endif 661#endif
651 662
652 get_ourmods (); 663 get_ourmods ();
653 664
654 if (!(options & Opt_scrollTtyOutput)) 665 if (!OPTION (Opt_scrollTtyOutput))
655 priv_modes |= PrivMode_TtyOutputInh; 666 priv_modes |= PrivMode_TtyOutputInh;
656 if (options & Opt_scrollTtyKeypress) 667 if (OPTION (Opt_scrollTtyKeypress))
657 priv_modes |= PrivMode_Keypress; 668 priv_modes |= PrivMode_Keypress;
658 if (!(options & Opt_jumpScroll)) 669 if (!OPTION (Opt_jumpScroll))
659 priv_modes |= PrivMode_smoothScroll; 670 priv_modes |= PrivMode_smoothScroll;
660 671
661#ifndef NO_BACKSPACE_KEY 672#ifndef NO_BACKSPACE_KEY
662 if (strcmp (key_backspace, "DEC") == 0) 673 if (strcmp (key_backspace, "DEC") == 0)
663 priv_modes |= PrivMode_HaveBackSpace; 674 priv_modes |= PrivMode_HaveBackSpace;
… …
673 if (menubar_visible ()) 684 if (menubar_visible ())
674 { 685 {
675 priv_modes |= PrivMode_menuBar; 686 priv_modes |= PrivMode_menuBar;
676 SavedModes |= PrivMode_menuBar; 687 SavedModes |= PrivMode_menuBar;
677 } 688 }
678
679#ifdef CURSOR_BLINK
680 if (options & Opt_cursorBlink)
681 (void)gettimeofday (&lastcursorchange, NULL);
682#endif
683 689
684 run_command (argv); 690 run_command (argv);
685} 691}
686 692
687/*----------------------------------------------------------------------*/ 693/*----------------------------------------------------------------------*/
… …
702 continue; 708 continue;
703 709
704 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 710 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
705 { 711 {
706#ifndef XTERM_REVERSE_VIDEO 712#ifndef XTERM_REVERSE_VIDEO
707 if (i < 2 && (options & Opt_reverseVideo)) 713 if (i < 2 && OPTION (Opt_reverseVideo))
708 rs[Rs_color + i] = def_colorName[!i]; 714 rs[Rs_color + i] = def_colorName[!i];
709 else 715 else
710#endif 716#endif
711 rs[Rs_color + i] = def_colorName[i]; 717 rs[Rs_color + i] = def_colorName[i];
712 718
… …
737 } 743 }
738 } 744 }
739 } 745 }
740 746
741 pix_colors[i] = xcol; 747 pix_colors[i] = xcol;
748 SET_PIXCOLOR (i);
749 }
750
742#ifdef OFF_FOCUS_FADING 751#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 752 if (rs[Rs_fade])
753 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 754 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
745#endif 755#endif
746 SET_PIXCOLOR (i);
747 }
748 756
749 if (display->depth <= 2) 757 if (display->depth <= 2)
750 { 758 {
751 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 759 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
752 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 760 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
760 * from the fvwm window manager. 768 * from the fvwm window manager.
761 */ 769 */
762#ifdef KEEP_SCROLLCOLOR 770#ifdef KEEP_SCROLLCOLOR
763 771
764 if (display->depth <= 2) 772 if (display->depth <= 2)
773 {
765 { /* Monochrome */ 774 /* Monochrome */
766 pix_colors[Color_scroll] = pix_colors[Color_fg]; 775 pix_colors[Color_scroll] = pix_colors[Color_fg];
767 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 776 pix_colors[Color_topShadow] = pix_colors[Color_bg];
768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
769 } 778 }
770 else 779 else
… …
806 int i = atoi (rs[Rs_color + idx]); 815 int i = atoi (rs[Rs_color + idx]);
807 816
808 if (i >= 8 && i <= 15) 817 if (i >= 8 && i <= 15)
809 { /* bright colors */ 818 { /* bright colors */
810 i -= 8; 819 i -= 8;
811#ifndef NO_BRIGHTCOLOR
812 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 820 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
813 return; 821 return;
814#endif
815 } 822 }
816 823
817 if (i >= 0 && i <= 7) /* normal colors */ 824 if (i >= 0 && i <= 7) /* normal colors */
818 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 825 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
819 } 826 }
… …
932#endif 939#endif
933 940
934 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
935 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
936 943
937 if (options & Opt_transparent) 944 if (OPTION (Opt_transparent))
938 { 945 {
939 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
940 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 947 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
941 } 948 }
942 949
943#if ENABLE_FRILLS 950#if ENABLE_FRILLS
944 if (options & Opt_borderLess) 951 if (OPTION (Opt_borderLess))
945 { 952 {
946 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
947 954
948 if (prop == None) 955 if (prop == None)
949 { 956 {
… …
981 if (!XGetWindowAttributes (disp, parent, &wattr)) 988 if (!XGetWindowAttributes (disp, parent, &wattr))
982 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
983 990
984 window_calc (wattr.width, wattr.height); 991 window_calc (wattr.width, wattr.height);
985 } 992 }
986
987#endif 993#endif
994
988 window_calc (0, 0); 995 window_calc (0, 0);
989 996
990 /* sub-window placement & size in rxvt_resize_subwindows () */ 997 /* sub-window placement & size in rxvt_resize_subwindows () */
991#ifdef PREFER_24BIT 998#ifdef PREFER_24BIT
992 attributes.background_pixel = pix_colors_focused[Color_border]; 999 attributes.background_pixel = pix_colors_focused[Color_border];
993 attributes.border_pixel = pix_colors_focused[Color_border]; 1000 attributes.border_pixel = pix_colors_focused[Color_border];
994 attributes.colormap = display->cmap; 1001 attributes.colormap = display->cmap;
995 top = XCreateWindow (disp, parent, 1002 top = XCreateWindow (disp, parent,
996 szHint.x, szHint.y, 1003 szHint.x, szHint.y,
997 szHint.width, szHint.height, 1004 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 1005 ext_bwidth,
999 display->depth, InputOutput, 1006 display->depth, InputOutput,
1000 display->visual, 1007 display->visual,
1001 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1002#else 1009#else
1003 top = XCreateSimpleWindow (disp, parent, 1010 top = XCreateSimpleWindow (disp, parent,
1004 szHint.x, szHint.y, 1011 szHint.x, szHint.y,
1005 szHint.width, szHint.height, 1012 szHint.width, szHint.height,
1006 TermWin.ext_bwidth, 1013 ext_bwidth,
1007 pix_colors_focused[Color_border], 1014 pix_colors_focused[Color_border],
1008 pix_colors_focused[Color_border]); 1015 pix_colors_focused[Color_border]);
1009#endif 1016#endif
1010 1017
1011 TermWin.parent[0] = top; 1018 this->parent[0] = top;
1012 1019
1013 old_width = szHint.width; 1020 old_width = szHint.width;
1014 old_height = szHint.height; 1021 old_height = szHint.height;
1015 1022
1016 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1019 classHint.res_name = (char *)rs[Rs_name]; 1026 classHint.res_name = (char *)rs[Rs_name];
1020 classHint.res_class = (char *)RESCLASS; 1027 classHint.res_class = (char *)RESCLASS;
1021 1028
1022 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1029 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1023 wmHint.input = True; 1030 wmHint.input = True;
1024 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1025 wmHint.window_group = top; 1032 wmHint.window_group = top;
1026 1033
1027 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1028 &szHint, &wmHint, &classHint); 1035 &szHint, &wmHint, &classHint);
1029 1036
… …
1034#endif 1041#endif
1035 }; 1042 };
1036 1043
1037 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1038 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
1039#if ENABLE_EWMH 1051#if ENABLE_EWMH
1040 long pid = getpid (); 1052 long pid = getpid ();
1041 1053
1042 XChangeProperty (disp, top, 1054 XChangeProperty (disp, top,
1043 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1069 /* cursor (menuBar/scrollBar): Black-on-White */ 1081 /* cursor (menuBar/scrollBar): Black-on-White */
1070 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1071#endif 1083#endif
1072 1084
1073 /* the vt window */ 1085 /* the vt window */
1074 TermWin.vt = XCreateSimpleWindow (disp, top, 1086 vt = XCreateSimpleWindow (disp, top,
1075 window_vt_x, 1087 window_vt_x,
1076 window_vt_y, 1088 window_vt_y,
1077 TermWin_TotalWidth (), 1089 width,
1078 TermWin_TotalHeight (), 1090 height,
1079 0, 1091 0,
1080 pix_colors_focused[Color_fg], 1092 pix_colors_focused[Color_fg],
1081 pix_colors_focused[Color_bg]); 1093 pix_colors_focused[Color_bg]);
1082#ifdef DEBUG_X 1094#ifdef DEBUG_X
1083 XStoreName (disp, TermWin.vt, "vt window"); 1095 XStoreName (disp, vt, "vt window");
1084#endif 1096#endif
1085 1097
1086 attributes.bit_gravity = NorthWestGravity; 1098 attributes.bit_gravity = NorthWestGravity;
1087 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1099 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1088 1100
1089 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1090 1102
1091#ifdef POINTER_BLANK 1103 if (OPTION (Opt_pointerBlank)
1092 if (options & Opt_pointerBlank) 1104#ifdef ENABLE_PERL
1105 || perl.self
1106#endif
1107 )
1093 vt_emask |= PointerMotionMask; 1108 vt_emask |= PointerMotionMask;
1094 else 1109 else
1095#endif
1096 vt_emask |= Button1MotionMask | Button3MotionMask; 1110 vt_emask |= Button1MotionMask | Button3MotionMask;
1097 1111
1098 XSelectInput (disp, TermWin.vt, vt_emask); 1112 XSelectInput (disp, vt, vt_emask);
1099 vt_ev.start (display, TermWin.vt); 1113 vt_ev.start (display, vt);
1100 1114
1101#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1102 if (menuBar_height ()) 1116 if (menuBar_height ())
1103 { 1117 {
1104 menuBar.win = XCreateSimpleWindow (disp, top, 1118 menuBar.win = XCreateSimpleWindow (disp, top,
1105 window_vt_x, 0, 1119 window_vt_x, 0,
1106 TermWin_TotalWidth (), 1120 width,
1107 menuBar_TotalHeight (), 1121 menuBar_TotalHeight (),
1108 0, 1122 0,
1109 pix_colors_focused[Color_fg], 1123 pix_colors_focused[Color_fg],
1110 pix_colors_focused[Color_scroll]); 1124 pix_colors_focused[Color_scroll]);
1111 1125
… …
1124 } 1138 }
1125#endif 1139#endif
1126 1140
1127#ifdef XPM_BACKGROUND 1141#ifdef XPM_BACKGROUND
1128 if (rs[Rs_backgroundPixmap] != NULL 1142 if (rs[Rs_backgroundPixmap] != NULL
1129 && ! (options & Opt_transparent)) 1143 && ! OPTION (Opt_transparent))
1130 { 1144 {
1131 const char *p = rs[Rs_backgroundPixmap]; 1145 const char *p = rs[Rs_backgroundPixmap];
1132 1146
1133 if ((p = strchr (p, ';')) != NULL) 1147 if ((p = strchr (p, ';')) != NULL)
1134 { 1148 {
… …
1143 1157
1144 /* graphics context for the vt window */ 1158 /* graphics context for the vt window */
1145 gcvalue.foreground = pix_colors[Color_fg]; 1159 gcvalue.foreground = pix_colors[Color_fg];
1146 gcvalue.background = pix_colors[Color_bg]; 1160 gcvalue.background = pix_colors[Color_bg];
1147 gcvalue.graphics_exposures = 1; 1161 gcvalue.graphics_exposures = 1;
1148 TermWin.gc = XCreateGC (disp, TermWin.vt, 1162 gc = XCreateGC (disp, vt,
1149 GCForeground | GCBackground | GCGraphicsExposures, 1163 GCForeground | GCBackground | GCGraphicsExposures,
1150 &gcvalue); 1164 &gcvalue);
1151 1165
1152 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1166 drawable = new rxvt_drawable (display, vt);
1153 1167
1154#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1155 gcvalue.foreground = pix_colors[Color_topShadow]; 1169 gcvalue.foreground = pix_colors[Color_topShadow];
1156 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1170 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1157 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1171 gcvalue.foreground = pix_colors[Color_bottomShadow];
1158 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1172 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1160 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1174 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1161#endif 1175#endif
1162 1176
1163#ifdef OFF_FOCUS_FADING 1177#ifdef OFF_FOCUS_FADING
1164 // initially we are in unfocused state 1178 // initially we are in unfocused state
1165 if (rs[Rs_fade]) 1179 if (rs[Rs_fade])
… …
1190 /* 1204 /*
1191 * standard System V termios interface 1205 * standard System V termios interface
1192 */ 1206 */
1193 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1207 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1194 { 1208 {
1195 /* 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
1196 tio->c_cc[VINTR] = CINTR; 1213 tio->c_cc[VINTR] = CINTR;
1197 tio->c_cc[VQUIT] = CQUIT; 1214 tio->c_cc[VQUIT] = CQUIT;
1198 tio->c_cc[VERASE] = CERASE; 1215 tio->c_cc[VERASE] = CERASE;
1216#ifdef VERASE2
1217 tio->c_cc[VERASE2] = CERASE2;
1218#endif
1199 tio->c_cc[VKILL] = CKILL; 1219 tio->c_cc[VKILL] = CKILL;
1200 tio->c_cc[VSTART] = CSTART; 1220 tio->c_cc[VSTART] = CSTART;
1201 tio->c_cc[VSTOP] = CSTOP; 1221 tio->c_cc[VSTOP] = CSTOP;
1202 tio->c_cc[VSUSP] = CSUSP; 1222 tio->c_cc[VSUSP] = CSUSP;
1203# ifdef VDSUSP 1223# ifdef VDSUSP
1204
1205 tio->c_cc[VDSUSP] = CDSUSP; 1224 tio->c_cc[VDSUSP] = CDSUSP;
1206# endif 1225# endif
1207# ifdef VREPRINT 1226# ifdef VREPRINT
1208
1209 tio->c_cc[VREPRINT] = CRPRNT; 1227 tio->c_cc[VREPRINT] = CRPRNT;
1210# endif 1228# endif
1211# ifdef VDISCRD 1229# ifdef VDISCRD
1212
1213 tio->c_cc[VDISCRD] = CFLUSH; 1230 tio->c_cc[VDISCRD] = CFLUSH;
1214# endif 1231# endif
1215# ifdef VWERSE 1232# ifdef VWERSE
1216
1217 tio->c_cc[VWERSE] = CWERASE; 1233 tio->c_cc[VWERSE] = CWERASE;
1218# endif 1234# endif
1219# ifdef VLNEXT 1235# ifdef VLNEXT
1220
1221 tio->c_cc[VLNEXT] = CLNEXT; 1236 tio->c_cc[VLNEXT] = CLNEXT;
1222# endif 1237# endif
1223
1224 } 1238 }
1239
1225 tio->c_cc[VEOF] = CEOF; 1240 tio->c_cc[VEOF] = CEOF;
1226 tio->c_cc[VEOL] = VDISABLE; 1241 tio->c_cc[VEOL] = VDISABLE;
1227# ifdef VEOL2 1242# ifdef VEOL2
1228
1229 tio->c_cc[VEOL2] = VDISABLE; 1243 tio->c_cc[VEOL2] = VDISABLE;
1230# endif 1244# endif
1231# ifdef VSWTC 1245# ifdef VSWTC
1232
1233 tio->c_cc[VSWTC] = VDISABLE; 1246 tio->c_cc[VSWTC] = VDISABLE;
1234# endif 1247# endif
1235# ifdef VSWTCH 1248# ifdef VSWTCH
1236
1237 tio->c_cc[VSWTCH] = VDISABLE; 1249 tio->c_cc[VSWTCH] = VDISABLE;
1238# endif 1250# endif
1239# if VMIN != VEOF 1251# if VMIN != VEOF
1240
1241 tio->c_cc[VMIN] = 1; 1252 tio->c_cc[VMIN] = 1;
1242# endif 1253# endif
1243# if VTIME != VEOL 1254# if VTIME != VEOL
1244
1245 tio->c_cc[VTIME] = 0; 1255 tio->c_cc[VTIME] = 0;
1246# endif 1256# endif
1247 1257
1248 if (erase != -1) 1258 if (erase != -1)
1249 tio->c_cc[VERASE] = (char)erase; 1259 tio->c_cc[VERASE] = (char)erase;
… …
1277 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1287 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1278 { 1288 {
1279 tio->sg.sg_erase = CERASE; /* ^H */ 1289 tio->sg.sg_erase = CERASE; /* ^H */
1280 tio->sg.sg_kill = CKILL; /* ^U */ 1290 tio->sg.sg_kill = CKILL; /* ^U */
1281 } 1291 }
1292
1282 if (erase != -1) 1293 if (erase != -1)
1283 tio->sg.sg_erase = (char)erase; 1294 tio->sg.sg_erase = (char)erase;
1284 1295
1285 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1296 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1286 1297
… …
1292 tio->tc.t_startc = CSTART; /* ^Q */ 1303 tio->tc.t_startc = CSTART; /* ^Q */
1293 tio->tc.t_stopc = CSTOP; /* ^S */ 1304 tio->tc.t_stopc = CSTOP; /* ^S */
1294 tio->tc.t_eofc = CEOF; /* ^D */ 1305 tio->tc.t_eofc = CEOF; /* ^D */
1295 tio->tc.t_brkc = -1; 1306 tio->tc.t_brkc = -1;
1296 } 1307 }
1308
1297 /* get local special chars */ 1309 /* get local special chars */
1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1299 { 1311 {
1300 tio->lc.t_suspc = CSUSP; /* ^Z */ 1312 tio->lc.t_suspc = CSUSP; /* ^Z */
1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1305 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1317 tio->lc.t_lnextc = CLNEXT; /* ^V */
1306 } 1318 }
1307 /* get line discipline */ 1319 /* get line discipline */
1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1309# ifdef NTTYDISC 1321# ifdef NTTYDISC
1310
1311 tio->line = NTTYDISC; 1322 tio->line = NTTYDISC;
1312# endif /* NTTYDISC */ 1323# endif /* NTTYDISC */
1313 1324
1314 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1325 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1315#endif /* HAVE_TERMIOS_H */ 1326#endif /* HAVE_TERMIOS_H */
… …
1338 FOO (IGNCR, "IGNCR"); 1349 FOO (IGNCR, "IGNCR");
1339 FOO (ICRNL, "ICRNL"); 1350 FOO (ICRNL, "ICRNL");
1340 FOO (IXON, "IXON"); 1351 FOO (IXON, "IXON");
1341 FOO (IXOFF, "IXOFF"); 1352 FOO (IXOFF, "IXOFF");
1342# ifdef IUCLC 1353# ifdef IUCLC
1343
1344 FOO (IUCLC, "IUCLC"); 1354 FOO (IUCLC, "IUCLC");
1345# endif 1355# endif
1346# ifdef IXANY 1356# ifdef IXANY
1347
1348 FOO (IXANY, "IXANY"); 1357 FOO (IXANY, "IXANY");
1349# endif 1358# endif
1350# ifdef IMAXBEL 1359# ifdef IMAXBEL
1351
1352 FOO (IMAXBEL, "IMAXBEL"); 1360 FOO (IMAXBEL, "IMAXBEL");
1353# endif 1361# endif
1354 1362
1355 fprintf (stderr, "\n"); 1363 fprintf (stderr, "\n");
1356 1364
… …
1363 FOO (VERASE, "VERASE"); 1371 FOO (VERASE, "VERASE");
1364 FOO (VKILL, "VKILL"); 1372 FOO (VKILL, "VKILL");
1365 FOO (VEOF, "VEOF"); 1373 FOO (VEOF, "VEOF");
1366 FOO (VEOL, "VEOL"); 1374 FOO (VEOL, "VEOL");
1367# ifdef VEOL2 1375# ifdef VEOL2
1368
1369 FOO (VEOL2, "VEOL2"); 1376 FOO (VEOL2, "VEOL2");
1370# endif 1377# endif
1371# ifdef VSWTC 1378# ifdef VSWTC
1372
1373 FOO (VSWTC, "VSWTC"); 1379 FOO (VSWTC, "VSWTC");
1374# endif 1380# endif
1375# ifdef VSWTCH 1381# ifdef VSWTCH
1376
1377 FOO (VSWTCH, "VSWTCH"); 1382 FOO (VSWTCH, "VSWTCH");
1378# endif 1383# endif
1379
1380 FOO (VSTART, "VSTART"); 1384 FOO (VSTART, "VSTART");
1381 FOO (VSTOP, "VSTOP"); 1385 FOO (VSTOP, "VSTOP");
1382 FOO (VSUSP, "VSUSP"); 1386 FOO (VSUSP, "VSUSP");
1383# ifdef VDSUSP 1387# ifdef VDSUSP
1384
1385 FOO (VDSUSP, "VDSUSP"); 1388 FOO (VDSUSP, "VDSUSP");
1386# endif 1389# endif
1387# ifdef VREPRINT 1390# ifdef VREPRINT
1388
1389 FOO (VREPRINT, "VREPRINT"); 1391 FOO (VREPRINT, "VREPRINT");
1390# endif 1392# endif
1391# ifdef VDISCRD 1393# ifdef VDISCRD
1392
1393 FOO (VDISCRD, "VDISCRD"); 1394 FOO (VDISCRD, "VDISCRD");
1394# endif 1395# endif
1395# ifdef VWERSE 1396# ifdef VWERSE
1396
1397 FOO (VWERSE, "VWERSE"); 1397 FOO (VWERSE, "VWERSE");
1398# endif 1398# endif
1399# ifdef VLNEXT 1399# ifdef VLNEXT
1400
1401 FOO (VLNEXT, "VLNEXT"); 1400 FOO (VLNEXT, "VLNEXT");
1402# endif 1401# endif
1403 1402
1404 fprintf (stderr, "\n"); 1403 fprintf (stderr, "\n");
1405# undef FOO 1404# undef FOO
… …
1414 * the slave. 1413 * the slave.
1415 */ 1414 */
1416void 1415void
1417rxvt_term::run_command (const char *const *argv) 1416rxvt_term::run_command (const char *const *argv)
1418{ 1417{
1418 TEMP_ENV; // not very temporary...
1419
1419#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd]) 1421 if (rs[Rs_pty_fd])
1421 { 1422 {
1422 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
1423 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 }
1424 } 1433 }
1425 else 1434 else
1426#endif 1435#endif
1427 if (!pty.get ()) 1436 if (!pty.get ())
1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1437 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1447 1456
1448#if ENABLE_FRILLS 1457#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd]) 1458 if (rs[Rs_pty_fd])
1450 return; 1459 return;
1451#endif 1460#endif
1452
1453 sw_chld.start (SIGCHLD);
1454 1461
1455#ifndef __QNX__ 1462#ifndef __QNX__
1456 /* spin off the command interpreter */ 1463 /* spin off the command interpreter */
1457 switch (cmd_pid = fork ()) 1464 switch (cmd_pid = fork ())
1458 { 1465 {
… …
1531{ 1538{
1532 char *login; 1539 char *login;
1533 1540
1534 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1541 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1535 1542
1536 if (options & Opt_console) 1543 if (OPTION (Opt_console))
1537 { /* be virtual console, fail silently */ 1544 { /* be virtual console, fail silently */
1538#ifdef TIOCCONS 1545#ifdef TIOCCONS
1539 unsigned int on = 1; 1546 unsigned int on = 1;
1540 1547
1541 ioctl (STDIN_FILENO, TIOCCONS, &on); 1548 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1584 execvp (argv[0], (char *const *)argv); 1591 execvp (argv[0], (char *const *)argv);
1585 /* no error message: STDERR is closed! */ 1592 /* no error message: STDERR is closed! */
1586 } 1593 }
1587 else 1594 else
1588 { 1595 {
1589 const char *argv0, *shell; 1596 const char *argv0, *shell;
1590 1597
1591 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1592 shell = "/bin/sh"; 1599 shell = "/bin/sh";
1593 1600
1594 argv0 = (const char *)rxvt_r_basename (shell); 1601 argv0 = (const char *)rxvt_r_basename (shell);
1595 1602
1596 if (options & Opt_loginShell) 1603 if (OPTION (Opt_loginShell))
1597 { 1604 {
1598 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1605 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1599 1606
1600 login[0] = '-'; 1607 login[0] = '-';
1601 strcpy (&login[1], argv0); 1608 strcpy (&login[1], argv0);
1602 argv0 = login; 1609 argv0 = login;
1603 } 1610 }
1611
1604 execlp (shell, argv0, NULL); 1612 execlp (shell, argv0, NULL);
1605 /* no error message: STDERR is closed! */ 1613 /* no error message: STDERR is closed! */
1606 } 1614 }
1607 1615
1608#else /* __QNX__ uses qnxspawn () */ 1616#else /* __QNX__ uses qnxspawn () */
… …
1636 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1644 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1637 command = "/bin/sh"; 1645 command = "/bin/sh";
1638 1646
1639 arg_a[0] = my_basename (command); 1647 arg_a[0] = my_basename (command);
1640 1648
1641 if (options & Opt_loginShell) 1649 if (OPTION (Opt_loginShell))
1642 { 1650 {
1643 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1651 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1644 1652
1645 login[0] = '-'; 1653 login[0] = '-';
1646 strcpy (&login[1], arg_a[0]); 1654 strcpy (&login[1], arg_a[0]);

Diff Legend

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