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.116 by root, Sun Feb 20 19:45:30 2005 UTC vs.
Revision 1.142 by root, Fri Jan 13 04:59:04 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
344 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 345 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
345 rs[Rs_display_name] = ":0"; 346 rs[Rs_display_name] = ":0";
346 347
347 get_options (r_argc, r_argv); 348 get_options (r_argc, r_argv);
348 349
349#ifdef LOCAL_X_IS_UNIX
350 if (rs[Rs_display_name][0] == ':')
351 {
352 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
353 strcpy (val, "unix");
354 strcat (val, rs[Rs_display_name]);
355 display = displays.get (val);
356 free (val);
357 }
358#endif
359
360 if (!display
361 && ! (display = displays.get (rs[Rs_display_name]))) 350 if (!(display = displays.get (rs[Rs_display_name])))
362 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 351 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
363 352
364 extract_resources (); 353 extract_resources ();
354
365 free (r_argv); 355 free (r_argv);
366 356
367 /* 357 /*
368 * set any defaults not already set 358 * set any defaults not already set
369 */ 359 */
… …
381 if (!rs[Rs_iconName]) 371 if (!rs[Rs_iconName])
382 rs[Rs_iconName] = rs[Rs_name]; 372 rs[Rs_iconName] = rs[Rs_name];
383 } 373 }
384 374
385 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 375 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
386 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 376 saveLines = min (i, MAX_SAVELINES);
387 377
388#if ENABLE_FRILLS 378#if ENABLE_FRILLS
389 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 379 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
390 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 380 int_bwidth = min (i, std::numeric_limits<int16_t>::max ());
381
391 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 382 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
392 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 383 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
384
393 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 385 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
394 TermWin.lineSpace = min (i, 100); /* arbitrary limit */ 386 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
395#endif 387#endif
396 388
397#ifdef POINTER_BLANK 389#ifdef POINTER_BLANK
398 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 390 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
399 pointerBlankDelay = i; 391 pointerBlankDelay = i;
400 else 392 else
401 pointerBlankDelay = 2; 393 pointerBlankDelay = 2;
402#endif 394#endif
403 395
404 /* no point having a scrollbar without having any scrollback! */ 396 /* no point having a scrollbar without having any scrollback! */
405 if (!TermWin.saveLines) 397 if (!saveLines)
406 options &= ~Opt_scrollBar; 398 set_option (Opt_scrollBar, 0);
407 399
408#ifdef PRINTPIPE 400#ifdef PRINTPIPE
409 if (!rs[Rs_print_pipe]) 401 if (!rs[Rs_print_pipe])
410 rs[Rs_print_pipe] = PRINTPIPE; 402 rs[Rs_print_pipe] = PRINTPIPE;
411#endif 403#endif
… …
454 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
455#endif 447#endif
456 448
457#ifdef XTERM_REVERSE_VIDEO 449#ifdef XTERM_REVERSE_VIDEO
458 /* this is how xterm implements reverseVideo */ 450 /* this is how xterm implements reverseVideo */
459 if (options & Opt_reverseVideo) 451 if (OPTION (Opt_reverseVideo))
460 { 452 {
461 if (!rs[Rs_color + Color_fg]) 453 if (!rs[Rs_color + Color_fg])
462 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 454 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
463 if (!rs[Rs_color + Color_bg]) 455 if (!rs[Rs_color + Color_bg])
464 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 456 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
469 if (!rs[Rs_color + i]) 461 if (!rs[Rs_color + i])
470 rs[Rs_color + i] = def_colorName[i]; 462 rs[Rs_color + i] = def_colorName[i];
471 463
472#ifndef XTERM_REVERSE_VIDEO 464#ifndef XTERM_REVERSE_VIDEO
473 /* this is how we implement reverseVideo */ 465 /* this is how we implement reverseVideo */
474 if (options & Opt_reverseVideo) 466 if (OPTION (Opt_reverseVideo))
475 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
476#endif 468#endif
477 469
478 /* convenient aliases for setting fg/bg to colors */ 470 /* convenient aliases for setting fg/bg to colors */
479 color_aliases (Color_fg); 471 color_aliases (Color_fg);
480 color_aliases (Color_bg); 472 color_aliases (Color_bg);
… …
530 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
531 523
532 sprintf (env_display, "DISPLAY=%s", val); 524 sprintf (env_display, "DISPLAY=%s", val);
533 525
534 /* avoiding the math library: 526 /* avoiding the math library:
535 * i = (int) (ceil (log10 ((unsigned int)TermWin.parent[0]))) */ 527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
536 for (i = 0, u = (unsigned int)TermWin.parent[0]; u; u /= 10, i++) 528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
537 ; 529 ;
538 MAX_IT (i, 1); 530 max_it (i, 1);
539 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char)); 531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
540 532
541 sprintf (env_windowid, "WINDOWID=%u", 533 sprintf (env_windowid, "WINDOWID=%u",
542 (unsigned int)TermWin.parent[0]); 534 (unsigned int)parent[0]);
543 535
544 /* add entries to the environment: 536 /* add entries to the environment:
545 * @ DISPLAY: in case we started with -display 537 * @ DISPLAY: in case we started with -display
546 * @ WINDOWID: X window id number of the window 538 * @ WINDOWID: X window id number of the window
547 * @ COLORTERM: terminal sub-name and also indicates its color 539 * @ COLORTERM: terminal sub-name and also indicates its color
… …
586 * This should support all European type languages. 578 * This should support all European type languages.
587 */ 579 */
588void 580void
589rxvt_term::set_locale (const char *locale) 581rxvt_term::set_locale (const char *locale)
590{ 582{
583 set_environ (envv);
584
591#if HAVE_XSETLOCALE || HAVE_SETLOCALE 585#if HAVE_XSETLOCALE || HAVE_SETLOCALE
592 free (this->locale); 586 free (this->locale);
593 this->locale = setlocale (LC_CTYPE, locale); 587 this->locale = setlocale (LC_CTYPE, locale);
594 588
595 if (!this->locale) 589 if (!this->locale)
596 { 590 {
597 if (*locale) 591 if (*locale)
598 { 592 {
599 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 593 rxvt_warn ("unable to set locale \"%s\", using C locale instead.\n", locale);
600 setlocale (LC_CTYPE, ""); 594 setlocale (LC_CTYPE, "C");
601 } 595 }
602 else 596 else
603 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 597 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
604 598
605 this->locale = ""; 599 this->locale = "C";
606 } 600 }
607 601
608 602
609 this->locale = rxvt_strdup (this->locale); 603 this->locale = rxvt_strdup (this->locale);
610 SET_LOCALE (this->locale); 604 SET_LOCALE (this->locale);
… …
625} 619}
626 620
627void 621void
628rxvt_term::init_xlocale () 622rxvt_term::init_xlocale ()
629{ 623{
624 set_environ (envv);
625
630#ifdef USE_XIM 626#ifdef USE_XIM
631 if (!locale) 627 if (!locale)
632 rxvt_warn ("setting locale failed, working without locale support.\n"); 628 rxvt_warn ("setting locale failed, working without locale support.\n");
633 else 629 else
634 { 630 {
… …
656 * Initialize the command connection. 652 * Initialize the command connection.
657 * This should be called after the X server connection is established. 653 * This should be called after the X server connection is established.
658 */ 654 */
659 655
660#ifdef META8_OPTION 656#ifdef META8_OPTION
661 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC); 657 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC;
662#endif 658#endif
663 659
664 get_ourmods (); 660 get_ourmods ();
665 661
666 if (!(options & Opt_scrollTtyOutput)) 662 if (!OPTION (Opt_scrollTtyOutput))
667 priv_modes |= PrivMode_TtyOutputInh; 663 priv_modes |= PrivMode_TtyOutputInh;
668 if (options & Opt_scrollTtyKeypress) 664 if (OPTION (Opt_scrollTtyKeypress))
669 priv_modes |= PrivMode_Keypress; 665 priv_modes |= PrivMode_Keypress;
670 if (!(options & Opt_jumpScroll)) 666 if (!OPTION (Opt_jumpScroll))
671 priv_modes |= PrivMode_smoothScroll; 667 priv_modes |= PrivMode_smoothScroll;
672 668
673#ifndef NO_BACKSPACE_KEY 669#ifndef NO_BACKSPACE_KEY
674 if (strcmp (key_backspace, "DEC") == 0) 670 if (strcmp (key_backspace, "DEC") == 0)
675 priv_modes |= PrivMode_HaveBackSpace; 671 priv_modes |= PrivMode_HaveBackSpace;
… …
685 if (menubar_visible ()) 681 if (menubar_visible ())
686 { 682 {
687 priv_modes |= PrivMode_menuBar; 683 priv_modes |= PrivMode_menuBar;
688 SavedModes |= PrivMode_menuBar; 684 SavedModes |= PrivMode_menuBar;
689 } 685 }
690
691#ifdef CURSOR_BLINK
692 if (options & Opt_cursorBlink)
693 (void)gettimeofday (&lastcursorchange, NULL);
694#endif
695 686
696 run_command (argv); 687 run_command (argv);
697} 688}
698 689
699/*----------------------------------------------------------------------*/ 690/*----------------------------------------------------------------------*/
… …
714 continue; 705 continue;
715 706
716 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
717 { 708 {
718#ifndef XTERM_REVERSE_VIDEO 709#ifndef XTERM_REVERSE_VIDEO
719 if (i < 2 && (options & Opt_reverseVideo)) 710 if (i < 2 && OPTION (Opt_reverseVideo))
720 rs[Rs_color + i] = def_colorName[!i]; 711 rs[Rs_color + i] = def_colorName[!i];
721 else 712 else
722#endif 713#endif
723 rs[Rs_color + i] = def_colorName[i]; 714 rs[Rs_color + i] = def_colorName[i];
724 715
… …
749 } 740 }
750 } 741 }
751 } 742 }
752 743
753 pix_colors[i] = xcol; 744 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i);
746 }
747
754#ifdef OFF_FOCUS_FADING 748#ifdef OFF_FOCUS_FADING
755 if (rs[Rs_fade]) 749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
756 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 751 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
757#endif 752#endif
758 SET_PIXCOLOR (i);
759 }
760 753
761 if (display->depth <= 2) 754 if (display->depth <= 2)
762 { 755 {
763 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
764 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
… …
772 * from the fvwm window manager. 765 * from the fvwm window manager.
773 */ 766 */
774#ifdef KEEP_SCROLLCOLOR 767#ifdef KEEP_SCROLLCOLOR
775 768
776 if (display->depth <= 2) 769 if (display->depth <= 2)
770 {
777 { /* Monochrome */ 771 /* Monochrome */
778 pix_colors[Color_scroll] = pix_colors[Color_fg]; 772 pix_colors[Color_scroll] = pix_colors[Color_fg];
779 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 773 pix_colors[Color_topShadow] = pix_colors[Color_bg];
780 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
781 } 775 }
782 else 776 else
… …
818 int i = atoi (rs[Rs_color + idx]); 812 int i = atoi (rs[Rs_color + idx]);
819 813
820 if (i >= 8 && i <= 15) 814 if (i >= 8 && i <= 15)
821 { /* bright colors */ 815 { /* bright colors */
822 i -= 8; 816 i -= 8;
823#ifndef NO_BRIGHTCOLOR
824 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 817 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
825 return; 818 return;
826#endif
827 } 819 }
828 820
829 if (i >= 0 && i <= 7) /* normal colors */ 821 if (i >= 0 && i <= 7) /* normal colors */
830 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 822 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
831 } 823 }
… …
930#if ENABLE_FRILLS 922#if ENABLE_FRILLS
931 Atom prop = None; 923 Atom prop = None;
932 MWMHints mwmhints; 924 MWMHints mwmhints;
933#endif 925#endif
934 XGCValues gcvalue; 926 XGCValues gcvalue;
935 long vt_emask;
936 XSetWindowAttributes attributes; 927 XSetWindowAttributes attributes;
937 XWindowAttributes gattr; 928 XWindowAttributes gattr;
938 Window top, parent; 929 Window top, parent;
939 dDisp; 930 dDisp;
940 931
… …
944#endif 935#endif
945 936
946 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
947 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
948 939
949 if (options & Opt_transparent) 940 if (OPTION (Opt_transparent))
950 { 941 {
951 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
952 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 943 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
953 } 944 }
954 945
955#if ENABLE_FRILLS 946#if ENABLE_FRILLS
956 if (options & Opt_borderLess) 947 if (OPTION (Opt_borderLess))
957 { 948 {
958 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
959 950
960 if (prop == None) 951 if (prop == None)
961 { 952 {
… …
993 if (!XGetWindowAttributes (disp, parent, &wattr)) 984 if (!XGetWindowAttributes (disp, parent, &wattr))
994 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
995 986
996 window_calc (wattr.width, wattr.height); 987 window_calc (wattr.width, wattr.height);
997 } 988 }
998
999#endif 989#endif
990
1000 window_calc (0, 0); 991 window_calc (0, 0);
1001 992
1002 /* sub-window placement & size in rxvt_resize_subwindows () */ 993 /* sub-window placement & size in rxvt_resize_subwindows () */
1003#ifdef PREFER_24BIT 994#ifdef PREFER_24BIT
1004 attributes.background_pixel = pix_colors_focused[Color_border]; 995 attributes.background_pixel = pix_colors_focused[Color_border];
1005 attributes.border_pixel = pix_colors_focused[Color_border]; 996 attributes.border_pixel = pix_colors_focused[Color_border];
1006 attributes.colormap = display->cmap; 997 attributes.colormap = display->cmap;
1007 top = XCreateWindow (disp, parent, 998 top = XCreateWindow (disp, parent,
1008 szHint.x, szHint.y, 999 szHint.x, szHint.y,
1009 szHint.width, szHint.height, 1000 szHint.width, szHint.height,
1010 TermWin.ext_bwidth, 1001 ext_bwidth,
1011 display->depth, InputOutput, 1002 display->depth, InputOutput,
1012 display->visual, 1003 display->visual,
1013 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1014#else 1005#else
1015 top = XCreateSimpleWindow (disp, parent, 1006 top = XCreateSimpleWindow (disp, parent,
1016 szHint.x, szHint.y, 1007 szHint.x, szHint.y,
1017 szHint.width, szHint.height, 1008 szHint.width, szHint.height,
1018 TermWin.ext_bwidth, 1009 ext_bwidth,
1019 pix_colors_focused[Color_border], 1010 pix_colors_focused[Color_border],
1020 pix_colors_focused[Color_border]); 1011 pix_colors_focused[Color_border]);
1021#endif 1012#endif
1022 1013
1023 TermWin.parent[0] = top; 1014 this->parent[0] = top;
1024 1015
1025 old_width = szHint.width; 1016 old_width = szHint.width;
1026 old_height = szHint.height; 1017 old_height = szHint.height;
1027 1018
1028 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
… …
1031 classHint.res_name = (char *)rs[Rs_name]; 1022 classHint.res_name = (char *)rs[Rs_name];
1032 classHint.res_class = (char *)RESCLASS; 1023 classHint.res_class = (char *)RESCLASS;
1033 1024
1034 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1025 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1035 wmHint.input = True; 1026 wmHint.input = True;
1036 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1027 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState;
1037 wmHint.window_group = top; 1028 wmHint.window_group = top;
1038 1029
1039 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc,
1040 &szHint, &wmHint, &classHint); 1031 &szHint, &wmHint, &classHint);
1041 1032
… …
1046#endif 1037#endif
1047 }; 1038 };
1048 1039
1049 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1050 1041
1042#if ENABLE_FRILLS
1043 if (rs[Rs_transient_for])
1044 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1045#endif
1046
1051#if ENABLE_EWMH 1047#if ENABLE_EWMH
1052 long pid = getpid (); 1048 long pid = getpid ();
1053 1049
1054 XChangeProperty (disp, top, 1050 XChangeProperty (disp, top,
1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1051 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
… …
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 1077 /* cursor (menuBar/scrollBar): Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1078 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1083#endif 1079#endif
1084 1080
1085 /* the vt window */ 1081 /* the vt window */
1086 TermWin.vt = XCreateSimpleWindow (disp, top, 1082 vt = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 1083 window_vt_x,
1088 window_vt_y, 1084 window_vt_y,
1089 TermWin_TotalWidth (), 1085 width,
1090 TermWin_TotalHeight (), 1086 height,
1091 0, 1087 0,
1092 pix_colors_focused[Color_fg], 1088 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1089 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X 1090#ifdef DEBUG_X
1095 XStoreName (disp, TermWin.vt, "vt window"); 1091 XStoreName (disp, vt, "vt window");
1096#endif 1092#endif
1097 1093
1098 attributes.bit_gravity = NorthWestGravity; 1094 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes); 1095 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes);
1100 1096
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1098
1103#ifdef POINTER_BLANK 1099 if (OPTION (Opt_pointerBlank))
1104 if (options & Opt_pointerBlank)
1105 vt_emask |= PointerMotionMask; 1100 vt_emask |= PointerMotionMask;
1106 else 1101 else
1107#endif
1108 vt_emask |= Button1MotionMask | Button3MotionMask; 1102 vt_emask |= Button1MotionMask | Button3MotionMask;
1109 1103
1110 XSelectInput (disp, TermWin.vt, vt_emask); 1104 vt_select_input ();
1105
1111 vt_ev.start (display, TermWin.vt); 1106 vt_ev.start (display, vt);
1112 1107
1113#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1108#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1114 if (menuBar_height ()) 1109 if (menuBar_height ())
1115 { 1110 {
1116 menuBar.win = XCreateSimpleWindow (disp, top, 1111 menuBar.win = XCreateSimpleWindow (disp, top,
1117 window_vt_x, 0, 1112 window_vt_x, 0,
1118 TermWin_TotalWidth (), 1113 width,
1119 menuBar_TotalHeight (), 1114 menuBar_TotalHeight (),
1120 0, 1115 0,
1121 pix_colors_focused[Color_fg], 1116 pix_colors_focused[Color_fg],
1122 pix_colors_focused[Color_scroll]); 1117 pix_colors_focused[Color_scroll]);
1123 1118
… …
1136 } 1131 }
1137#endif 1132#endif
1138 1133
1139#ifdef XPM_BACKGROUND 1134#ifdef XPM_BACKGROUND
1140 if (rs[Rs_backgroundPixmap] != NULL 1135 if (rs[Rs_backgroundPixmap] != NULL
1141 && ! (options & Opt_transparent)) 1136 && ! OPTION (Opt_transparent))
1142 { 1137 {
1143 const char *p = rs[Rs_backgroundPixmap]; 1138 const char *p = rs[Rs_backgroundPixmap];
1144 1139
1145 if ((p = strchr (p, ';')) != NULL) 1140 if ((p = strchr (p, ';')) != NULL)
1146 { 1141 {
… …
1155 1150
1156 /* graphics context for the vt window */ 1151 /* graphics context for the vt window */
1157 gcvalue.foreground = pix_colors[Color_fg]; 1152 gcvalue.foreground = pix_colors[Color_fg];
1158 gcvalue.background = pix_colors[Color_bg]; 1153 gcvalue.background = pix_colors[Color_bg];
1159 gcvalue.graphics_exposures = 1; 1154 gcvalue.graphics_exposures = 1;
1160 TermWin.gc = XCreateGC (disp, TermWin.vt, 1155 gc = XCreateGC (disp, vt,
1161 GCForeground | GCBackground | GCGraphicsExposures, 1156 GCForeground | GCBackground | GCGraphicsExposures,
1162 &gcvalue); 1157 &gcvalue);
1163 1158
1164 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1159 drawable = new rxvt_drawable (display, vt);
1165 1160
1166#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1161#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1167 gcvalue.foreground = pix_colors[Color_topShadow]; 1162 gcvalue.foreground = pix_colors[Color_topShadow];
1168 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1163 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1169 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1164 gcvalue.foreground = pix_colors[Color_bottomShadow];
1170 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1165 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1166 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1172 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue); 1167 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue);
1173#endif 1168#endif
1174 1169
1175#ifdef OFF_FOCUS_FADING 1170#ifdef OFF_FOCUS_FADING
1176 // initially we are in unfocused state 1171 // initially we are in unfocused state
1177 if (rs[Rs_fade]) 1172 if (rs[Rs_fade])
… …
1202 /* 1197 /*
1203 * standard System V termios interface 1198 * standard System V termios interface
1204 */ 1199 */
1205 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1200 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1206 { 1201 {
1207 /* return error - use system defaults */ 1202 // return error - use system defaults,
1203 // where possible, and zero elsewhere
1204 memset (tio, 0, sizeof (ttymode_t));
1205
1208 tio->c_cc[VINTR] = CINTR; 1206 tio->c_cc[VINTR] = CINTR;
1209 tio->c_cc[VQUIT] = CQUIT; 1207 tio->c_cc[VQUIT] = CQUIT;
1210 tio->c_cc[VERASE] = CERASE; 1208 tio->c_cc[VERASE] = CERASE;
1209#ifdef VERASE2
1210 tio->c_cc[VERASE2] = CERASE2;
1211#endif
1211 tio->c_cc[VKILL] = CKILL; 1212 tio->c_cc[VKILL] = CKILL;
1212 tio->c_cc[VSTART] = CSTART; 1213 tio->c_cc[VSTART] = CSTART;
1213 tio->c_cc[VSTOP] = CSTOP; 1214 tio->c_cc[VSTOP] = CSTOP;
1214 tio->c_cc[VSUSP] = CSUSP; 1215 tio->c_cc[VSUSP] = CSUSP;
1215# ifdef VDSUSP 1216# ifdef VDSUSP
1216
1217 tio->c_cc[VDSUSP] = CDSUSP; 1217 tio->c_cc[VDSUSP] = CDSUSP;
1218# endif 1218# endif
1219# ifdef VREPRINT 1219# ifdef VREPRINT
1220
1221 tio->c_cc[VREPRINT] = CRPRNT; 1220 tio->c_cc[VREPRINT] = CRPRNT;
1222# endif 1221# endif
1223# ifdef VDISCRD 1222# ifdef VDISCRD
1224
1225 tio->c_cc[VDISCRD] = CFLUSH; 1223 tio->c_cc[VDISCRD] = CFLUSH;
1226# endif 1224# endif
1227# ifdef VWERSE 1225# ifdef VWERSE
1228
1229 tio->c_cc[VWERSE] = CWERASE; 1226 tio->c_cc[VWERSE] = CWERASE;
1230# endif 1227# endif
1231# ifdef VLNEXT 1228# ifdef VLNEXT
1232
1233 tio->c_cc[VLNEXT] = CLNEXT; 1229 tio->c_cc[VLNEXT] = CLNEXT;
1234# endif 1230# endif
1235
1236 } 1231 }
1232
1237 tio->c_cc[VEOF] = CEOF; 1233 tio->c_cc[VEOF] = CEOF;
1238 tio->c_cc[VEOL] = VDISABLE; 1234 tio->c_cc[VEOL] = VDISABLE;
1239# ifdef VEOL2 1235# ifdef VEOL2
1240
1241 tio->c_cc[VEOL2] = VDISABLE; 1236 tio->c_cc[VEOL2] = VDISABLE;
1242# endif 1237# endif
1243# ifdef VSWTC 1238# ifdef VSWTC
1244
1245 tio->c_cc[VSWTC] = VDISABLE; 1239 tio->c_cc[VSWTC] = VDISABLE;
1246# endif 1240# endif
1247# ifdef VSWTCH 1241# ifdef VSWTCH
1248
1249 tio->c_cc[VSWTCH] = VDISABLE; 1242 tio->c_cc[VSWTCH] = VDISABLE;
1250# endif 1243# endif
1251# if VMIN != VEOF 1244# if VMIN != VEOF
1252
1253 tio->c_cc[VMIN] = 1; 1245 tio->c_cc[VMIN] = 1;
1254# endif 1246# endif
1255# if VTIME != VEOL 1247# if VTIME != VEOL
1256
1257 tio->c_cc[VTIME] = 0; 1248 tio->c_cc[VTIME] = 0;
1258# endif 1249# endif
1259 1250
1260 if (erase != -1) 1251 if (erase != -1)
1261 tio->c_cc[VERASE] = (char)erase; 1252 tio->c_cc[VERASE] = (char)erase;
… …
1289 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0) 1280 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1290 { 1281 {
1291 tio->sg.sg_erase = CERASE; /* ^H */ 1282 tio->sg.sg_erase = CERASE; /* ^H */
1292 tio->sg.sg_kill = CKILL; /* ^U */ 1283 tio->sg.sg_kill = CKILL; /* ^U */
1293 } 1284 }
1285
1294 if (erase != -1) 1286 if (erase != -1)
1295 tio->sg.sg_erase = (char)erase; 1287 tio->sg.sg_erase = (char)erase;
1296 1288
1297 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP); 1289 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1298 1290
… …
1304 tio->tc.t_startc = CSTART; /* ^Q */ 1296 tio->tc.t_startc = CSTART; /* ^Q */
1305 tio->tc.t_stopc = CSTOP; /* ^S */ 1297 tio->tc.t_stopc = CSTOP; /* ^S */
1306 tio->tc.t_eofc = CEOF; /* ^D */ 1298 tio->tc.t_eofc = CEOF; /* ^D */
1307 tio->tc.t_brkc = -1; 1299 tio->tc.t_brkc = -1;
1308 } 1300 }
1301
1309 /* get local special chars */ 1302 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0) 1303 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 { 1304 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */ 1305 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */ 1306 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
… …
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */ 1310 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 } 1311 }
1319 /* get line discipline */ 1312 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line)); 1313 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC 1314# ifdef NTTYDISC
1322
1323 tio->line = NTTYDISC; 1315 tio->line = NTTYDISC;
1324# endif /* NTTYDISC */ 1316# endif /* NTTYDISC */
1325 1317
1326 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL); 1318 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1327#endif /* HAVE_TERMIOS_H */ 1319#endif /* HAVE_TERMIOS_H */
… …
1350 FOO (IGNCR, "IGNCR"); 1342 FOO (IGNCR, "IGNCR");
1351 FOO (ICRNL, "ICRNL"); 1343 FOO (ICRNL, "ICRNL");
1352 FOO (IXON, "IXON"); 1344 FOO (IXON, "IXON");
1353 FOO (IXOFF, "IXOFF"); 1345 FOO (IXOFF, "IXOFF");
1354# ifdef IUCLC 1346# ifdef IUCLC
1355
1356 FOO (IUCLC, "IUCLC"); 1347 FOO (IUCLC, "IUCLC");
1357# endif 1348# endif
1358# ifdef IXANY 1349# ifdef IXANY
1359
1360 FOO (IXANY, "IXANY"); 1350 FOO (IXANY, "IXANY");
1361# endif 1351# endif
1362# ifdef IMAXBEL 1352# ifdef IMAXBEL
1363
1364 FOO (IMAXBEL, "IMAXBEL"); 1353 FOO (IMAXBEL, "IMAXBEL");
1365# endif 1354# endif
1366 1355
1367 fprintf (stderr, "\n"); 1356 fprintf (stderr, "\n");
1368 1357
… …
1375 FOO (VERASE, "VERASE"); 1364 FOO (VERASE, "VERASE");
1376 FOO (VKILL, "VKILL"); 1365 FOO (VKILL, "VKILL");
1377 FOO (VEOF, "VEOF"); 1366 FOO (VEOF, "VEOF");
1378 FOO (VEOL, "VEOL"); 1367 FOO (VEOL, "VEOL");
1379# ifdef VEOL2 1368# ifdef VEOL2
1380
1381 FOO (VEOL2, "VEOL2"); 1369 FOO (VEOL2, "VEOL2");
1382# endif 1370# endif
1383# ifdef VSWTC 1371# ifdef VSWTC
1384
1385 FOO (VSWTC, "VSWTC"); 1372 FOO (VSWTC, "VSWTC");
1386# endif 1373# endif
1387# ifdef VSWTCH 1374# ifdef VSWTCH
1388
1389 FOO (VSWTCH, "VSWTCH"); 1375 FOO (VSWTCH, "VSWTCH");
1390# endif 1376# endif
1391
1392 FOO (VSTART, "VSTART"); 1377 FOO (VSTART, "VSTART");
1393 FOO (VSTOP, "VSTOP"); 1378 FOO (VSTOP, "VSTOP");
1394 FOO (VSUSP, "VSUSP"); 1379 FOO (VSUSP, "VSUSP");
1395# ifdef VDSUSP 1380# ifdef VDSUSP
1396
1397 FOO (VDSUSP, "VDSUSP"); 1381 FOO (VDSUSP, "VDSUSP");
1398# endif 1382# endif
1399# ifdef VREPRINT 1383# ifdef VREPRINT
1400
1401 FOO (VREPRINT, "VREPRINT"); 1384 FOO (VREPRINT, "VREPRINT");
1402# endif 1385# endif
1403# ifdef VDISCRD 1386# ifdef VDISCRD
1404
1405 FOO (VDISCRD, "VDISCRD"); 1387 FOO (VDISCRD, "VDISCRD");
1406# endif 1388# endif
1407# ifdef VWERSE 1389# ifdef VWERSE
1408
1409 FOO (VWERSE, "VWERSE"); 1390 FOO (VWERSE, "VWERSE");
1410# endif 1391# endif
1411# ifdef VLNEXT 1392# ifdef VLNEXT
1412
1413 FOO (VLNEXT, "VLNEXT"); 1393 FOO (VLNEXT, "VLNEXT");
1414# endif 1394# endif
1415 1395
1416 fprintf (stderr, "\n"); 1396 fprintf (stderr, "\n");
1417# undef FOO 1397# undef FOO
… …
1430{ 1410{
1431#if ENABLE_FRILLS 1411#if ENABLE_FRILLS
1432 if (rs[Rs_pty_fd]) 1412 if (rs[Rs_pty_fd])
1433 { 1413 {
1434 pty.pty = atoi (rs[Rs_pty_fd]); 1414 pty.pty = atoi (rs[Rs_pty_fd]);
1415
1416 if (pty.pty >= 0)
1417 {
1418 if (getfd_hook)
1419 pty.pty = (*getfd_hook) (pty.pty);
1420
1435 fcntl (pty.pty, F_SETFL, O_NONBLOCK); 1421 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK))
1422 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1423 }
1436 } 1424 }
1437 else 1425 else
1438#endif 1426#endif
1439 if (!pty.get ()) 1427 if (!pty.get ())
1440 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1428 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
… …
1459 1447
1460#if ENABLE_FRILLS 1448#if ENABLE_FRILLS
1461 if (rs[Rs_pty_fd]) 1449 if (rs[Rs_pty_fd])
1462 return; 1450 return;
1463#endif 1451#endif
1464
1465 sw_chld.start (SIGCHLD);
1466 1452
1467#ifndef __QNX__ 1453#ifndef __QNX__
1468 /* spin off the command interpreter */ 1454 /* spin off the command interpreter */
1469 switch (cmd_pid = fork ()) 1455 switch (cmd_pid = fork ())
1470 { 1456 {
… …
1543{ 1529{
1544 char *login; 1530 char *login;
1545 1531
1546 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */ 1532 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1547 1533
1548 if (options & Opt_console) 1534 if (OPTION (Opt_console))
1549 { /* be virtual console, fail silently */ 1535 { /* be virtual console, fail silently */
1550#ifdef TIOCCONS 1536#ifdef TIOCCONS
1551 unsigned int on = 1; 1537 unsigned int on = 1;
1552 1538
1553 ioctl (STDIN_FILENO, TIOCCONS, &on); 1539 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1596 execvp (argv[0], (char *const *)argv); 1582 execvp (argv[0], (char *const *)argv);
1597 /* no error message: STDERR is closed! */ 1583 /* no error message: STDERR is closed! */
1598 } 1584 }
1599 else 1585 else
1600 { 1586 {
1601 const char *argv0, *shell; 1587 const char *argv0, *shell;
1602 1588
1603 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1589 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1604 shell = "/bin/sh"; 1590 shell = "/bin/sh";
1605 1591
1606 argv0 = (const char *)rxvt_r_basename (shell); 1592 argv0 = (const char *)rxvt_r_basename (shell);
1607 1593
1608 if (options & Opt_loginShell) 1594 if (OPTION (Opt_loginShell))
1609 { 1595 {
1610 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1596 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1611 1597
1612 login[0] = '-'; 1598 login[0] = '-';
1613 strcpy (&login[1], argv0); 1599 strcpy (&login[1], argv0);
1614 argv0 = login; 1600 argv0 = login;
1615 } 1601 }
1602
1616 execlp (shell, argv0, NULL); 1603 execlp (shell, argv0, NULL);
1617 /* no error message: STDERR is closed! */ 1604 /* no error message: STDERR is closed! */
1618 } 1605 }
1619 1606
1620#else /* __QNX__ uses qnxspawn () */ 1607#else /* __QNX__ uses qnxspawn () */
… …
1648 if ((command = getenv ("SHELL")) == NULL || *command == '\0') 1635 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1649 command = "/bin/sh"; 1636 command = "/bin/sh";
1650 1637
1651 arg_a[0] = my_basename (command); 1638 arg_a[0] = my_basename (command);
1652 1639
1653 if (options & Opt_loginShell) 1640 if (OPTION (Opt_loginShell))
1654 { 1641 {
1655 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char)); 1642 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1656 1643
1657 login[0] = '-'; 1644 login[0] = '-';
1658 strcpy (&login[1], arg_a[0]); 1645 strcpy (&login[1], arg_a[0]);

Diff Legend

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