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.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) */
… …
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]);
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 TermWin.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 TermWin.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 TermWin.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 TermWin.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;
388 else 394 else
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 (!TermWin.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);
… …
518 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
519 525
520 sprintf (env_display, "DISPLAY=%s", val); 526 sprintf (env_display, "DISPLAY=%s", val);
521 527
522 /* avoiding the math library: 528 /* avoiding the math library:
523 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
524 for (i = 0, u = (unsigned int)TermWin.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)TermWin.parent[0]); 536 (unsigned int)parent[0]);
531 537
532 /* add entries to the environment: 538 /* add entries to the environment:
533 * @ DISPLAY: in case we started with -display 539 * @ DISPLAY: in case we started with -display
534 * @ WINDOWID: X window id number of the window 540 * @ WINDOWID: X window id number of the window
535 * @ COLORTERM: terminal sub-name and also indicates its color 541 * @ COLORTERM: terminal sub-name and also indicates its color
… …
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
… …
737 } 742 }
738 } 743 }
739 } 744 }
740 745
741 pix_colors[i] = xcol; 746 pix_colors[i] = xcol;
747 SET_PIXCOLOR (i);
748 }
749
742#ifdef OFF_FOCUS_FADING 750#ifdef OFF_FOCUS_FADING
743 if (rs[Rs_fade]) 751 if (rs[Rs_fade])
752 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
744 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 753 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
745#endif 754#endif
746 SET_PIXCOLOR (i);
747 }
748 755
749 if (display->depth <= 2) 756 if (display->depth <= 2)
750 { 757 {
751 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 758 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]; 759 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
760 * from the fvwm window manager. 767 * from the fvwm window manager.
761 */ 768 */
762#ifdef KEEP_SCROLLCOLOR 769#ifdef KEEP_SCROLLCOLOR
763 770
764 if (display->depth <= 2) 771 if (display->depth <= 2)
772 {
765 { /* Monochrome */ 773 /* Monochrome */
766 pix_colors[Color_scroll] = pix_colors[Color_fg]; 774 pix_colors[Color_scroll] = pix_colors[Color_fg];
767 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 775 pix_colors[Color_topShadow] = pix_colors[Color_bg];
768 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 776 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
769 } 777 }
770 else 778 else
… …
806 int i = atoi (rs[Rs_color + idx]); 814 int i = atoi (rs[Rs_color + idx]);
807 815
808 if (i >= 8 && i <= 15) 816 if (i >= 8 && i <= 15)
809 { /* bright colors */ 817 { /* bright colors */
810 i -= 8; 818 i -= 8;
811#ifndef NO_BRIGHTCOLOR
812 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 819 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
813 return; 820 return;
814#endif
815 } 821 }
816 822
817 if (i >= 0 && i <= 7) /* normal colors */ 823 if (i >= 0 && i <= 7) /* normal colors */
818 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 824 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
819 } 825 }
… …
932#endif 938#endif
933 939
934 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 940 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
935 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 941 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
936 942
937 if (options & Opt_transparent) 943 if (OPTION (Opt_transparent))
938 { 944 {
939 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 945 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
940 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 946 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
941 } 947 }
942 948
943#if ENABLE_FRILLS 949#if ENABLE_FRILLS
944 if (options & Opt_borderLess) 950 if (OPTION (Opt_borderLess))
945 { 951 {
946 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 952 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
947 953
948 if (prop == None) 954 if (prop == None)
949 { 955 {
… …
981 if (!XGetWindowAttributes (disp, parent, &wattr)) 987 if (!XGetWindowAttributes (disp, parent, &wattr))
982 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 988 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
983 989
984 window_calc (wattr.width, wattr.height); 990 window_calc (wattr.width, wattr.height);
985 } 991 }
986
987#endif 992#endif
993
988 window_calc (0, 0); 994 window_calc (0, 0);
989 995
990 /* sub-window placement & size in rxvt_resize_subwindows () */ 996 /* sub-window placement & size in rxvt_resize_subwindows () */
991#ifdef PREFER_24BIT 997#ifdef PREFER_24BIT
992 attributes.background_pixel = pix_colors_focused[Color_border]; 998 attributes.background_pixel = pix_colors_focused[Color_border];
993 attributes.border_pixel = pix_colors_focused[Color_border]; 999 attributes.border_pixel = pix_colors_focused[Color_border];
994 attributes.colormap = display->cmap; 1000 attributes.colormap = display->cmap;
995 top = XCreateWindow (disp, parent, 1001 top = XCreateWindow (disp, parent,
996 szHint.x, szHint.y, 1002 szHint.x, szHint.y,
997 szHint.width, szHint.height, 1003 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 1004 ext_bwidth,
999 display->depth, InputOutput, 1005 display->depth, InputOutput,
1000 display->visual, 1006 display->visual,
1001 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1007 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1002#else 1008#else
1003 top = XCreateSimpleWindow (disp, parent, 1009 top = XCreateSimpleWindow (disp, parent,
1004 szHint.x, szHint.y, 1010 szHint.x, szHint.y,
1005 szHint.width, szHint.height, 1011 szHint.width, szHint.height,
1006 TermWin.ext_bwidth, 1012 ext_bwidth,
1007 pix_colors_focused[Color_border], 1013 pix_colors_focused[Color_border],
1008 pix_colors_focused[Color_border]); 1014 pix_colors_focused[Color_border]);
1009#endif 1015#endif
1010 1016
1011 TermWin.parent[0] = top; 1017 this->parent[0] = top;
1012 1018
1013 old_width = szHint.width; 1019 old_width = szHint.width;
1014 old_height = szHint.height; 1020 old_height = szHint.height;
1015 1021
1016 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1022 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1019 classHint.res_name = (char *)rs[Rs_name]; 1025 classHint.res_name = (char *)rs[Rs_name];
1020 classHint.res_class = (char *)RESCLASS; 1026 classHint.res_class = (char *)RESCLASS;
1021 1027
1022 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1028 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1023 wmHint.input = True; 1029 wmHint.input = True;
1024 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1030 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1025 wmHint.window_group = top; 1031 wmHint.window_group = top;
1026 1032
1027 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1033 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1028 &szHint, &wmHint, &classHint); 1034 &szHint, &wmHint, &classHint);
1029 1035
… …
1034#endif 1040#endif
1035 }; 1041 };
1036 1042
1037 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1043 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1038 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
1039#if ENABLE_EWMH 1050#if ENABLE_EWMH
1040 long pid = getpid (); 1051 long pid = getpid ();
1041 1052
1042 XChangeProperty (disp, top, 1053 XChangeProperty (disp, top,
1043 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1054 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1069 /* cursor (menuBar/scrollBar): Black-on-White */ 1080 /* cursor (menuBar/scrollBar): Black-on-White */
1070 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1081 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1071#endif 1082#endif
1072 1083
1073 /* the vt window */ 1084 /* the vt window */
1074 TermWin.vt = XCreateSimpleWindow (disp, top, 1085 vt = XCreateSimpleWindow (disp, top,
1075 window_vt_x, 1086 window_vt_x,
1076 window_vt_y, 1087 window_vt_y,
1077 TermWin_TotalWidth (), 1088 width,
1078 TermWin_TotalHeight (), 1089 height,
1079 0, 1090 0,
1080 pix_colors_focused[Color_fg], 1091 pix_colors_focused[Color_fg],
1081 pix_colors_focused[Color_bg]); 1092 pix_colors_focused[Color_bg]);
1082#ifdef DEBUG_X 1093#ifdef DEBUG_X
1083 XStoreName (disp, TermWin.vt, "vt window"); 1094 XStoreName (disp, vt, "vt window");
1084#endif 1095#endif
1085 1096
1086 attributes.bit_gravity = NorthWestGravity; 1097 attributes.bit_gravity = NorthWestGravity;
1087 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1098 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1088 1099
1089 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1100 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1090 1101
1091#ifdef POINTER_BLANK 1102 if (OPTION (Opt_pointerBlank)
1092 if (options & Opt_pointerBlank) 1103#ifdef ENABLE_PERL
1104 || perl.self
1105#endif
1106 )
1093 vt_emask |= PointerMotionMask; 1107 vt_emask |= PointerMotionMask;
1094 else 1108 else
1095#endif
1096 vt_emask |= Button1MotionMask | Button3MotionMask; 1109 vt_emask |= Button1MotionMask | Button3MotionMask;
1097 1110
1098 XSelectInput (disp, TermWin.vt, vt_emask); 1111 XSelectInput (disp, vt, vt_emask);
1099 vt_ev.start (display, TermWin.vt); 1112 vt_ev.start (display, vt);
1100 1113
1101#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1114#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1102 if (menuBar_height ()) 1115 if (menuBar_height ())
1103 { 1116 {
1104 menuBar.win = XCreateSimpleWindow (disp, top, 1117 menuBar.win = XCreateSimpleWindow (disp, top,
1105 window_vt_x, 0, 1118 window_vt_x, 0,
1106 TermWin_TotalWidth (), 1119 width,
1107 menuBar_TotalHeight (), 1120 menuBar_TotalHeight (),
1108 0, 1121 0,
1109 pix_colors_focused[Color_fg], 1122 pix_colors_focused[Color_fg],
1110 pix_colors_focused[Color_scroll]); 1123 pix_colors_focused[Color_scroll]);
1111 1124
… …
1124 } 1137 }
1125#endif 1138#endif
1126 1139
1127#ifdef XPM_BACKGROUND 1140#ifdef XPM_BACKGROUND
1128 if (rs[Rs_backgroundPixmap] != NULL 1141 if (rs[Rs_backgroundPixmap] != NULL
1129 && ! (options & Opt_transparent)) 1142 && ! OPTION (Opt_transparent))
1130 { 1143 {
1131 const char *p = rs[Rs_backgroundPixmap]; 1144 const char *p = rs[Rs_backgroundPixmap];
1132 1145
1133 if ((p = strchr (p, ';')) != NULL) 1146 if ((p = strchr (p, ';')) != NULL)
1134 { 1147 {
… …
1143 1156
1144 /* graphics context for the vt window */ 1157 /* graphics context for the vt window */
1145 gcvalue.foreground = pix_colors[Color_fg]; 1158 gcvalue.foreground = pix_colors[Color_fg];
1146 gcvalue.background = pix_colors[Color_bg]; 1159 gcvalue.background = pix_colors[Color_bg];
1147 gcvalue.graphics_exposures = 1; 1160 gcvalue.graphics_exposures = 1;
1148 TermWin.gc = XCreateGC (disp, TermWin.vt, 1161 gc = XCreateGC (disp, vt,
1149 GCForeground | GCBackground | GCGraphicsExposures, 1162 GCForeground | GCBackground | GCGraphicsExposures,
1150 &gcvalue); 1163 &gcvalue);
1151 1164
1152 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1165 drawable = new rxvt_drawable (display, vt);
1153 1166
1154#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1167#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1155 gcvalue.foreground = pix_colors[Color_topShadow]; 1168 gcvalue.foreground = pix_colors[Color_topShadow];
1156 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1169 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1157 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1170 gcvalue.foreground = pix_colors[Color_bottomShadow];
1158 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1171 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1159 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1172 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1160 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1173 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1161#endif 1174#endif
1162 1175
1163#ifdef OFF_FOCUS_FADING 1176#ifdef OFF_FOCUS_FADING
1164 // initially we are in unfocused state 1177 // initially we are in unfocused state
1165 if (rs[Rs_fade]) 1178 if (rs[Rs_fade])
… …
1190 /* 1203 /*
1191 * standard System V termios interface 1204 * standard System V termios interface
1192 */ 1205 */
1193 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1206 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1194 { 1207 {
1195 /* 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
1196 tio->c_cc[VINTR] = CINTR; 1212 tio->c_cc[VINTR] = CINTR;
1197 tio->c_cc[VQUIT] = CQUIT; 1213 tio->c_cc[VQUIT] = CQUIT;
1198 tio->c_cc[VERASE] = CERASE; 1214 tio->c_cc[VERASE] = CERASE;
1215#ifdef VERASE2
1216 tio->c_cc[VERASE2] = CERASE2;
1217#endif
1199 tio->c_cc[VKILL] = CKILL; 1218 tio->c_cc[VKILL] = CKILL;
1200 tio->c_cc[VSTART] = CSTART; 1219 tio->c_cc[VSTART] = CSTART;
1201 tio->c_cc[VSTOP] = CSTOP; 1220 tio->c_cc[VSTOP] = CSTOP;
1202 tio->c_cc[VSUSP] = CSUSP; 1221 tio->c_cc[VSUSP] = CSUSP;
1203# ifdef VDSUSP 1222# ifdef VDSUSP
1204
1205 tio->c_cc[VDSUSP] = CDSUSP; 1223 tio->c_cc[VDSUSP] = CDSUSP;
1206# endif 1224# endif
1207# ifdef VREPRINT 1225# ifdef VREPRINT
1208
1209 tio->c_cc[VREPRINT] = CRPRNT; 1226 tio->c_cc[VREPRINT] = CRPRNT;
1210# endif 1227# endif
1211# ifdef VDISCRD 1228# ifdef VDISCRD
1212
1213 tio->c_cc[VDISCRD] = CFLUSH; 1229 tio->c_cc[VDISCRD] = CFLUSH;
1214# endif 1230# endif
1215# ifdef VWERSE 1231# ifdef VWERSE
1216
1217 tio->c_cc[VWERSE] = CWERASE; 1232 tio->c_cc[VWERSE] = CWERASE;
1218# endif 1233# endif
1219# ifdef VLNEXT 1234# ifdef VLNEXT
1220
1221 tio->c_cc[VLNEXT] = CLNEXT; 1235 tio->c_cc[VLNEXT] = CLNEXT;
1222# endif 1236# endif
1223
1224 } 1237 }
1238
1225 tio->c_cc[VEOF] = CEOF; 1239 tio->c_cc[VEOF] = CEOF;
1226 tio->c_cc[VEOL] = VDISABLE; 1240 tio->c_cc[VEOL] = VDISABLE;
1227# ifdef VEOL2 1241# ifdef VEOL2
1228
1229 tio->c_cc[VEOL2] = VDISABLE; 1242 tio->c_cc[VEOL2] = VDISABLE;
1230# endif 1243# endif
1231# ifdef VSWTC 1244# ifdef VSWTC
1232
1233 tio->c_cc[VSWTC] = VDISABLE; 1245 tio->c_cc[VSWTC] = VDISABLE;
1234# endif 1246# endif
1235# ifdef VSWTCH 1247# ifdef VSWTCH
1236
1237 tio->c_cc[VSWTCH] = VDISABLE; 1248 tio->c_cc[VSWTCH] = VDISABLE;
1238# endif 1249# endif
1239# if VMIN != VEOF 1250# if VMIN != VEOF
1240
1241 tio->c_cc[VMIN] = 1; 1251 tio->c_cc[VMIN] = 1;
1242# endif 1252# endif
1243# if VTIME != VEOL 1253# if VTIME != VEOL
1244
1245 tio->c_cc[VTIME] = 0; 1254 tio->c_cc[VTIME] = 0;
1246# endif 1255# endif
1247 1256
1248 if (erase != -1) 1257 if (erase != -1)
1249 tio->c_cc[VERASE] = (char)erase; 1258 tio->c_cc[VERASE] = (char)erase;
… …
1277 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1286 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1278 { 1287 {
1279 tio->sg.sg_erase = CERASE; /* ^H */ 1288 tio->sg.sg_erase = CERASE; /* ^H */
1280 tio->sg.sg_kill = CKILL; /* ^U */ 1289 tio->sg.sg_kill = CKILL; /* ^U */
1281 } 1290 }
1291
1282 if (erase != -1) 1292 if (erase != -1)
1283 tio->sg.sg_erase = (char)erase; 1293 tio->sg.sg_erase = (char)erase;
1284 1294
1285 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1295 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1286 1296
… …
1292 tio->tc.t_startc = CSTART; /* ^Q */ 1302 tio->tc.t_startc = CSTART; /* ^Q */
1293 tio->tc.t_stopc = CSTOP; /* ^S */ 1303 tio->tc.t_stopc = CSTOP; /* ^S */
1294 tio->tc.t_eofc = CEOF; /* ^D */ 1304 tio->tc.t_eofc = CEOF; /* ^D */
1295 tio->tc.t_brkc = -1; 1305 tio->tc.t_brkc = -1;
1296 } 1306 }
1307
1297 /* get local special chars */ 1308 /* get local special chars */
1298 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1309 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1299 { 1310 {
1300 tio->lc.t_suspc = CSUSP; /* ^Z */ 1311 tio->lc.t_suspc = CSUSP; /* ^Z */
1301 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1312 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1305 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1316 tio->lc.t_lnextc = CLNEXT; /* ^V */
1306 } 1317 }
1307 /* get line discipline */ 1318 /* get line discipline */
1308 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1319 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1309# ifdef NTTYDISC 1320# ifdef NTTYDISC
1310
1311 tio->line = NTTYDISC; 1321 tio->line = NTTYDISC;
1312# endif /* NTTYDISC */ 1322# endif /* NTTYDISC */
1313 1323
1314 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1324 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1315#endif /* HAVE_TERMIOS_H */ 1325#endif /* HAVE_TERMIOS_H */
… …
1338 FOO (IGNCR, "IGNCR"); 1348 FOO (IGNCR, "IGNCR");
1339 FOO (ICRNL, "ICRNL"); 1349 FOO (ICRNL, "ICRNL");
1340 FOO (IXON, "IXON"); 1350 FOO (IXON, "IXON");
1341 FOO (IXOFF, "IXOFF"); 1351 FOO (IXOFF, "IXOFF");
1342# ifdef IUCLC 1352# ifdef IUCLC
1343
1344 FOO (IUCLC, "IUCLC"); 1353 FOO (IUCLC, "IUCLC");
1345# endif 1354# endif
1346# ifdef IXANY 1355# ifdef IXANY
1347
1348 FOO (IXANY, "IXANY"); 1356 FOO (IXANY, "IXANY");
1349# endif 1357# endif
1350# ifdef IMAXBEL 1358# ifdef IMAXBEL
1351
1352 FOO (IMAXBEL, "IMAXBEL"); 1359 FOO (IMAXBEL, "IMAXBEL");
1353# endif 1360# endif
1354 1361
1355 fprintf (stderr, "\n"); 1362 fprintf (stderr, "\n");
1356 1363
… …
1363 FOO (VERASE, "VERASE"); 1370 FOO (VERASE, "VERASE");
1364 FOO (VKILL, "VKILL"); 1371 FOO (VKILL, "VKILL");
1365 FOO (VEOF, "VEOF"); 1372 FOO (VEOF, "VEOF");
1366 FOO (VEOL, "VEOL"); 1373 FOO (VEOL, "VEOL");
1367# ifdef VEOL2 1374# ifdef VEOL2
1368
1369 FOO (VEOL2, "VEOL2"); 1375 FOO (VEOL2, "VEOL2");
1370# endif 1376# endif
1371# ifdef VSWTC 1377# ifdef VSWTC
1372
1373 FOO (VSWTC, "VSWTC"); 1378 FOO (VSWTC, "VSWTC");
1374# endif 1379# endif
1375# ifdef VSWTCH 1380# ifdef VSWTCH
1376
1377 FOO (VSWTCH, "VSWTCH"); 1381 FOO (VSWTCH, "VSWTCH");
1378# endif 1382# endif
1379
1380 FOO (VSTART, "VSTART"); 1383 FOO (VSTART, "VSTART");
1381 FOO (VSTOP, "VSTOP"); 1384 FOO (VSTOP, "VSTOP");
1382 FOO (VSUSP, "VSUSP"); 1385 FOO (VSUSP, "VSUSP");
1383# ifdef VDSUSP 1386# ifdef VDSUSP
1384
1385 FOO (VDSUSP, "VDSUSP"); 1387 FOO (VDSUSP, "VDSUSP");
1386# endif 1388# endif
1387# ifdef VREPRINT 1389# ifdef VREPRINT
1388
1389 FOO (VREPRINT, "VREPRINT"); 1390 FOO (VREPRINT, "VREPRINT");
1390# endif 1391# endif
1391# ifdef VDISCRD 1392# ifdef VDISCRD
1392
1393 FOO (VDISCRD, "VDISCRD"); 1393 FOO (VDISCRD, "VDISCRD");
1394# endif 1394# endif
1395# ifdef VWERSE 1395# ifdef VWERSE
1396
1397 FOO (VWERSE, "VWERSE"); 1396 FOO (VWERSE, "VWERSE");
1398# endif 1397# endif
1399# ifdef VLNEXT 1398# ifdef VLNEXT
1400
1401 FOO (VLNEXT, "VLNEXT"); 1399 FOO (VLNEXT, "VLNEXT");
1402# endif 1400# endif
1403 1401
1404 fprintf (stderr, "\n"); 1402 fprintf (stderr, "\n");
1405# undef FOO 1403# undef FOO
… …
1414 * the slave. 1412 * the slave.
1415 */ 1413 */
1416void 1414void
1417rxvt_term::run_command (const char *const *argv) 1415rxvt_term::run_command (const char *const *argv)
1418{ 1416{
1417 TEMP_ENV; // not very temporary...
1418
1419#if ENABLE_FRILLS 1419#if ENABLE_FRILLS
1420 if (rs[Rs_pty_fd]) 1420 if (rs[Rs_pty_fd])
1421 { 1421 {
1422 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
1423 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 }
1424 } 1432 }
1425 else 1433 else
1426#endif 1434#endif
1427 if (!pty.get ()) 1435 if (!pty.get ())
1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1436 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1447 1455
1448#if ENABLE_FRILLS 1456#if ENABLE_FRILLS
1449 if (rs[Rs_pty_fd]) 1457 if (rs[Rs_pty_fd])
1450 return; 1458 return;
1451#endif 1459#endif
1452
1453 sw_chld.start (SIGCHLD);
1454 1460
1455#ifndef __QNX__ 1461#ifndef __QNX__
1456 /* spin off the command interpreter */ 1462 /* spin off the command interpreter */
1457 switch (cmd_pid = fork ()) 1463 switch (cmd_pid = fork ())
1458 { 1464 {
… …
1531{ 1537{
1532 char *login; 1538 char *login;
1533 1539
1534 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1540 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1535 1541
1536 if (options & Opt_console) 1542 if (OPTION (Opt_console))
1537 { /* be virtual console, fail silently */ 1543 { /* be virtual console, fail silently */
1538#ifdef TIOCCONS 1544#ifdef TIOCCONS
1539 unsigned int on = 1; 1545 unsigned int on = 1;
1540 1546
1541 ioctl (STDIN_FILENO, TIOCCONS, &on); 1547 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1584 execvp (argv[0], (char *const *)argv); 1590 execvp (argv[0], (char *const *)argv);
1585 /* no error message: STDERR is closed! */ 1591 /* no error message: STDERR is closed! */
1586 } 1592 }
1587 else 1593 else
1588 { 1594 {
1589 const char *argv0, *shell; 1595 const char *argv0, *shell;
1590 1596
1591 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1597 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1592 shell = "/bin/sh"; 1598 shell = "/bin/sh";
1593 1599
1594 argv0 = (const char *)rxvt_r_basename (shell); 1600 argv0 = (const char *)rxvt_r_basename (shell);
1595 1601
1596 if (options & Opt_loginShell) 1602 if (OPTION (Opt_loginShell))
1597 { 1603 {
1598 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1604 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1599 1605
1600 login[0] = '-'; 1606 login[0] = '-';
1601 strcpy (&login[1], argv0); 1607 strcpy (&login[1], argv0);
1602 argv0 = login; 1608 argv0 = login;
1603 } 1609 }
1610
1604 execlp (shell, argv0, NULL); 1611 execlp (shell, argv0, NULL);
1605 /* no error message: STDERR is closed! */ 1612 /* no error message: STDERR is closed! */
1606 } 1613 }
1607 1614
1608#else /* __QNX__ uses qnxspawn () */ 1615#else /* __QNX__ uses qnxspawn () */
… …
1636 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1643 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1637 command = "/bin/sh"; 1644 command = "/bin/sh";
1638 1645
1639 arg_a[0] = my_basename (command); 1646 arg_a[0] = my_basename (command);
1640 1647
1641 if (options & Opt_loginShell) 1648 if (OPTION (Opt_loginShell))
1642 { 1649 {
1643 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1650 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1644 1651
1645 login[0] = '-'; 1652 login[0] = '-';
1646 strcpy (&login[1], arg_a[0]); 1653 strcpy (&login[1], arg_a[0]);

Diff Legend

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