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.152 by root, Sat Jan 21 22:38:05 2006 UTC vs.
Revision 1.198 by sasha, Fri Aug 3 05:33:04 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
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 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#if ENABLE_XEMBED
209 "_XEMBED",
210 "_XEMBED_INFO",
211#endif 176#endif
212 }; 177 };
213 178
214bool 179bool
215rxvt_term::init_vars () 180rxvt_term::init_vars ()
216{ 181{
182 pix_colors = //
217 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
218#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
219 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
220#endif 186#endif
221 pix_colors = pix_colors_focused;
222 187
223 if (pix_colors == NULL)
224 return false;
225
226#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
227 pixmap = None;
228#endif
229 188
230 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
231 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
232 options = DEFAULT_OPTIONS;
233 want_refresh = 1; 191 want_refresh = 1;
234 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
235 focus = 0;
236 ncol = 80; 193 ncol = 80;
237 nrow = 24; 194 nrow = 24;
238 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
239 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
240 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
241 saveLines = SAVELINES; 198 saveLines = SAVELINES;
242 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
243 200
244 refresh_limit = 1;
245 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
246 prev_nrow = prev_ncol = 0;
247 202
248 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
204#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
249#ifdef XPM_BACKGROUND 205#ifdef XPM_BACKGROUND
206 bgPixmap.original_asim = NULL;
207#endif
250 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
251 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
252 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
253#endif 211#endif
254 212
255 last_bot = last_state = -1; 213 last_bot = last_state = -1;
214
215 set_option (Opt_scrollBar);
216 set_option (Opt_scrollTtyOutput);
217 set_option (Opt_jumpScroll);
218 set_option (Opt_skipScroll);
219 set_option (Opt_secondaryScreen);
220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
256 224
257 return true; 225 return true;
258} 226}
259 227
260void 228void
… …
298 int i, r_argc; 266 int i, r_argc;
299 char *val; 267 char *val;
300 const char **cmd_argv, **r_argv; 268 const char **cmd_argv, **r_argv;
301 269
302 /* 270 /*
303 * Look for -exec option. Find => split and make cmd_argv[] of command args 271 * Look for -e option. Find => split and make cmd_argv[] of command args
304 */ 272 */
305 for (r_argc = 0; r_argc < argc; r_argc++) 273 for (r_argc = 0; r_argc < argc; r_argc++)
306 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 274 if (!strcmp (argv[r_argc], "-e"))
307 break; 275 break;
308 276
309 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
310 278
311 for (i = 0; i < r_argc; i++) 279 for (i = 0; i < r_argc; i++)
… …
337 get_options (r_argc, r_argv); 305 get_options (r_argc, r_argv);
338 306
339 if (!(display = displays.get (rs[Rs_display_name]))) 307 if (!(display = displays.get (rs[Rs_display_name])))
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341 309
310 // using a local pointer decreases code size a lot
311 xa = display->xa;
312
313 set (display);
342 extract_resources (); 314 extract_resources ();
343 315
316#if XFT
317 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif
320
321#ifdef HAVE_AFTERIMAGE
322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
323#endif
344 free (r_argv); 324 free (r_argv);
325
326 for (int i = NUM_RESOURCES; i--; )
327 if (rs [i] == resval_undef)
328 rs [i] = 0;
345 329
346#if ENABLE_PERL 330#if ENABLE_PERL
347 if (!rs[Rs_perl_ext_1]) 331 if (!rs[Rs_perl_ext_1])
348 rs[Rs_perl_ext_1] = "default"; 332 rs[Rs_perl_ext_1] = "default";
349 333
… …
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif 433#endif
450 434
451#ifdef XTERM_REVERSE_VIDEO 435#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 436 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 437 if (option (Opt_reverseVideo))
454 { 438 {
455 if (!rs[Rs_color + Color_fg]) 439 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 440 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
441
457 if (!rs[Rs_color + Color_bg]) 442 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 443 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 444 }
460#endif 445#endif
461 446
… …
463 if (!rs[Rs_color + i]) 448 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 449 rs[Rs_color + i] = def_colorName[i];
465 450
466#ifndef XTERM_REVERSE_VIDEO 451#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 452 /* this is how we implement reverseVideo */
468 if (OPTION (Opt_reverseVideo)) 453 if (option (Opt_reverseVideo))
469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 454 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 455#endif
471 456
472 /* convenient aliases for setting fg/bg to colors */ 457 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 458 color_aliases (Color_fg);
… …
513 val = rxvt_network_display (rs[Rs_display_name]); 498 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 499 rs[Rs_display_name] = (const char *)val;
515 500
516 if (val == NULL) 501 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 502#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 503 val = XDisplayString (dpy);
519 504
520 if (rs[Rs_display_name] == NULL) 505 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 506 rs[Rs_display_name] = val; /* use broken `:0' value */
522 507
523 i = strlen (val); 508 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 510
526 sprintf (env_display, "DISPLAY=%s", val); 511 sprintf (env_display, "DISPLAY=%s", val);
527 512
528 /* avoiding the math library: 513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
529 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
530 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
531 ;
532 max_it (i, 1);
533 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
534
535 sprintf (env_windowid, "WINDOWID=%u",
536 (unsigned int)parent[0]);
537 514
538 /* add entries to the environment: 515 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 516 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 517 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 518 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 520 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 521 * @ COLORFGBG: fg;bg color codes
545 */ 522 */
546 putenv (env_display); 523 putenv (env_display);
547 putenv (env_windowid); 524 putenv (env_windowid);
525
548 if (env_colorfgbg) 526 if (env_colorfgbg)
549 putenv (env_colorfgbg); 527 putenv (env_colorfgbg);
550 528
551#ifdef RXVT_TERMINFO 529#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 530 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 531#endif
554 532
555 if (display->depth <= 2) 533 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 534 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 535 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 536 putenv ("COLORTERM=" COLORTERMENVFULL);
559 537
560 if (rs[Rs_term_name] != NULL) 538 if (rs[Rs_term_name] != NULL)
… …
654 * Initialize the command connection. 632 * Initialize the command connection.
655 * This should be called after the X server connection is established. 633 * This should be called after the X server connection is established.
656 */ 634 */
657 635
658#ifdef META8_OPTION 636#ifdef META8_OPTION
659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 637 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 638#endif
661 639
662 get_ourmods (); 640 get_ourmods ();
663 641
664 if (!OPTION (Opt_scrollTtyOutput)) 642 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 643 priv_modes |= PrivMode_TtyOutputInh;
666 if (OPTION (Opt_scrollTtyKeypress)) 644 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 645 priv_modes |= PrivMode_Keypress;
668 if (!OPTION (Opt_jumpScroll)) 646 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 647 priv_modes |= PrivMode_smoothScroll;
670 648
671#ifndef NO_BACKSPACE_KEY 649#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 650 if (strcmp (key_backspace, "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 651 priv_modes |= PrivMode_HaveBackSpace;
… …
691 669
692#ifdef OFF_FOCUS_FADING 670#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 671 pix_colors = pix_colors_focused;
694#endif 672#endif
695 673
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 675 {
676 const char *name = rs[Rs_color + i];
677
678 if (!name)
679 continue;
680
698 rxvt_color xcol; 681 rxvt_color xcol;
699 682
700 if (!rs[Rs_color + i]) 683 if (!set_color (xcol, name))
701 continue;
702
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704 { 684 {
705#ifndef XTERM_REVERSE_VIDEO 685#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 686 if (i < 2 && option (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 687 name = def_colorName [1 - i];
708 else 688 else
709#endif 689#endif
710 rs[Rs_color + i] = def_colorName[i]; 690 name = def_colorName [i];
711 691
712 if (!rs[Rs_color + i]) 692 if (!name)
713 continue; 693 continue;
714 694
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 695 if (!set_color (xcol, name))
716 { 696 {
717 switch (i) 697 switch (i)
718 { 698 {
719 case Color_fg: 699 case Color_fg:
720 case Color_bg: 700 case Color_bg:
721 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 701 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */ 702 name = "";
724 break; 703 break;
725#ifndef NO_CURSORCOLOR 704#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 705 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 706#endif
728 break;
729#endif /* ! NO_CURSORCOLOR */
730 case Color_pointer_fg: 707 case Color_pointer_fg:
731 xcol = pix_colors[Color_fg]; 708 name = rs[Rs_color + Color_fg];
709 xcol.set (this, name);
732 break; 710 break;
733 default: 711 default:
734 xcol = pix_colors[Color_bg]; /* None */ 712 name = rs[Rs_color + Color_bg];
713 xcol.set (this, name);
735 break; 714 break;
736 } 715 }
737 } 716 }
738 } 717 }
739 718
740 pix_colors[i] = xcol; 719 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i); 720 rs[Rs_color + i] = name;
742 }
743
744#ifdef OFF_FOCUS_FADING
745 if (rs[Rs_fade])
746 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
747 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
748#endif
749
750 if (display->depth <= 2)
751 { 721 }
722
723 if (depth <= 2)
724 {
752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 725 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
753 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 726 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
754 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 727 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
755 } 728 }
756 729
757 /* 730 /*
758 * get scrollBar shadow colors 731 * get scrollBar shadow colors
759 * 732 *
760 * The calculations of topShadow/bottomShadow values are adapted 733 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 734 * from the fvwm window manager.
762 */ 735 */
763#ifdef KEEP_SCROLLCOLOR 736#ifdef KEEP_SCROLLCOLOR
764
765 if (display->depth <= 2) 737 if (depth <= 2)
766 { 738 {
767 /* Monochrome */ 739 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 740 alias_color (Color_scroll, Color_fg);
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 741 alias_color (Color_topShadow, Color_bg);
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 742 alias_color (Color_bottomShadow, Color_bg);
771 } 743 }
772 else 744 else
773 { 745 {
774 rxvt_color xcol[2]; 746 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
775 /* xcol[0] == white
776 * xcol[1] == top shadow
777 * xcol[2] == bot shadow */
778 747
779 xcol[1] = pix_colors[Color_scroll]; 748 rgba cscroll;
780 xcol[0].set (display, 65535, 65535, 65535); 749 pix_colors [Color_scroll].get (cscroll);
781
782 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
783
784 xcol[0].get (display, pr0, pg0, pb0);
785 xcol[1].get (display, pr1, pg1, pb1);
786
787 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
788 750
789 /* topShadowColor */ 751 /* topShadowColor */
790 if (!xcol[1].set (display, 752 if (!pix_colors[Color_topShadow].set (this,
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 753 rgba (
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 754 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 755 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794 xcol[1] = pix_colors[Color_White]; 756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795 757 cscroll.a)
796 pix_colors[Color_topShadow] = xcol[1]; 758 ))
759 alias_color (Color_topShadow, Color_White);
797 } 760 }
798#endif /* KEEP_SCROLLCOLOR */ 761#endif /* KEEP_SCROLLCOLOR */
762
763#ifdef OFF_FOCUS_FADING
764 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
765 update_fade_color (i);
766#endif
799} 767}
800 768
801/*----------------------------------------------------------------------*/ 769/*----------------------------------------------------------------------*/
802/* color aliases, fg/bg bright-bold */ 770/* color aliases, fg/bg bright-bold */
803void 771void
… …
842 810
843 if (rsmod 811 if (rsmod
844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
846 814
847 map = XGetModifierMapping (display->display); 815 map = XGetModifierMapping (dpy);
848 kc = map->modifiermap; 816 kc = map->modifiermap;
849 817
850 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
851 { 819 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
854 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
855 { 823 {
856 if (kc[k] == 0) 824 if (kc[k] == 0)
857 break; 825 break;
858 826
859 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 827 switch (XKeycodeToKeysym (dpy, kc[k], 0))
860 { 828 {
861 case XK_Num_Lock: 829 case XK_Num_Lock:
862 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
863 continue; 831 continue;
864 832
… …
914rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
915{ 883{
916 XClassHint classHint; 884 XClassHint classHint;
917 XWMHints wmHint; 885 XWMHints wmHint;
918#if ENABLE_FRILLS 886#if ENABLE_FRILLS
919 Atom prop = None;
920 MWMHints mwmhints; 887 MWMHints mwmhints = { };
921#endif 888#endif
922 XGCValues gcvalue; 889 XGCValues gcvalue;
923 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
924 XWindowAttributes gattr;
925 Window top, parent; 891 Window top, parent;
926 dDisp;
927 892
928#ifdef USING_W11LIB 893 dLocal (Display *, dpy);
929 /* enable W11 callbacks */
930 W11AddEventHandler (disp, rxvt_W11_process_x_event);
931#endif
932
933 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
934 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
935
936 if (OPTION (Opt_transparent))
937 {
938 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
939 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
940 }
941 894
942 /* grab colors before netscape does */ 895 /* grab colors before netscape does */
943 Get_Colours (); 896 Get_Colours ();
944 897
945 if (!set_fonts ()) 898 if (!set_fonts ())
946 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947 900
948 parent = DefaultRootWindow (disp); 901 parent = display->root;
949 902
950 attributes.override_redirect = !!OPTION (Opt_override_redirect); 903 attributes.override_redirect = !!option (Opt_override_redirect);
951 904
952#if ENABLE_FRILLS 905#if ENABLE_FRILLS
953 if (OPTION (Opt_borderLess)) 906 if (option (Opt_borderLess))
954 { 907 {
955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
956
957 if (prop == None)
958 { 909 {
959 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
960 attributes.override_redirect = TRUE; 911 attributes.override_redirect = true;
961 mwmhints.flags = 0; 912 mwmhints.flags = 0;
962 } 913 }
963 else 914 else
964 { 915 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 916 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
975 { 926 {
976 XWindowAttributes wattr; 927 XWindowAttributes wattr;
977 928
978 parent = strtol (rs[Rs_embed], 0, 0); 929 parent = strtol (rs[Rs_embed], 0, 0);
979 930
980 if (!XGetWindowAttributes (disp, parent, &wattr)) 931 if (!XGetWindowAttributes (dpy, parent, &wattr))
981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982 933
983 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
984 } 935 }
985#endif 936#endif
986 937
987 window_calc (0, 0); 938 window_calc (0, 0);
988 939
989 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
990 attributes.background_pixel = pix_colors_focused[Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
992 attributes.colormap = display->cmap; 943 attributes.colormap = cmap;
944
993 top = XCreateWindow (disp, parent, 945 top = XCreateWindow (dpy, parent,
994 szHint.x, szHint.y, 946 szHint.x, szHint.y,
995 szHint.width, szHint.height, 947 szHint.width, szHint.height,
996 ext_bwidth, 948 ext_bwidth,
997 display->depth, InputOutput, 949 depth, InputOutput, visual,
998 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000 &attributes); 951 &attributes);
1001 952
1002 this->parent[0] = top; 953 this->parent[0] = top;
1003 954
1004 old_width = szHint.width; 955 old_width = szHint.width;
1005 old_height = szHint.height; 956 old_height = szHint.height;
1006 957
1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 958 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 959 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009 960
1010 classHint.res_name = (char *)rs[Rs_name]; 961 classHint.res_name = (char *)rs[Rs_name];
1011 classHint.res_class = (char *)RESCLASS; 962 classHint.res_class = (char *)RESCLASS;
1012 963
1013 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1014 wmHint.input = True; 965 wmHint.input = True;
1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1016 wmHint.window_group = top; 967 wmHint.window_group = top;
1017 968
1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1019 &szHint, &wmHint, &classHint); 970 &szHint, &wmHint, &classHint);
971
972#if ENABLE_FRILLS
973 if (mwmhints.flags)
974 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif
1020 977
1021 Atom protocols[] = { 978 Atom protocols[] = {
1022 xa[XA_WM_DELETE_WINDOW], 979 xa[XA_WM_DELETE_WINDOW],
1023#if ENABLE_EWMH 980#if ENABLE_EWMH
1024 xa[XA_NET_WM_PING], 981 xa[XA_NET_WM_PING],
1025#endif 982#endif
1026 }; 983 };
1027 984
1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 985 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029 986
1030#if ENABLE_FRILLS 987#if ENABLE_FRILLS
1031 if (rs[Rs_transient_for]) 988 if (rs[Rs_transient_for])
1032 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 989 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033#endif 990#endif
1034 991
1035#if ENABLE_EWMH 992#if ENABLE_EWMH
1036 long pid = getpid (); 993 long pid = getpid ();
1037 994
1038 XChangeProperty (disp, top, 995 XChangeProperty (dpy, top,
1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
1041 998
1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043#endif 1000#endif
1044 1001
1045 XSelectInput (disp, top, 1002 XSelectInput (dpy, top,
1046 KeyPressMask 1003 KeyPressMask
1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1048 | KeyReleaseMask 1005 | KeyReleaseMask
1049#endif 1006#endif
1050 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1051 | ExposureMask | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1052 1009
1053 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1054 1011
1055#if ENABLE_FRILLS
1056 if (mwmhints.flags)
1057 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1058 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1059#endif
1060
1061 /* vt cursor: Black-on-White is standard, but this is more popular */ 1012 /* vt cursor: Black-on-White is standard, but this is more popular */
1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1063 1014
1064#ifdef HAVE_SCROLLBARS 1015#ifdef HAVE_SCROLLBARS
1065 /* cursor scrollBar: Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1067#endif 1018#endif
1068 1019
1069 /* the vt window */ 1020 /* the vt window */
1070 vt = XCreateSimpleWindow (disp, top, 1021 vt = XCreateSimpleWindow (dpy, top,
1071 window_vt_x,
1072 window_vt_y, 1022 window_vt_x, window_vt_y,
1073 width,
1074 height, 1023 width, height,
1075 0, 1024 0,
1076 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1078#ifdef DEBUG_X
1079 XStoreName (disp, vt, "vt window");
1080#endif
1081 1027
1082 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1084 1030
1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1086 1032
1087 if (OPTION (Opt_pointerBlank)) 1033 if (option (Opt_pointerBlank))
1088 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
1089 else 1035 else
1090 vt_emask |= Button1MotionMask | Button3MotionMask; 1036 vt_emask |= Button1MotionMask | Button3MotionMask;
1091 1037
1092 vt_select_input (); 1038 vt_select_input ();
1093 1039
1094 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1095 1041
1096#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1097 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL)
1098 && ! OPTION (Opt_transparent))
1099 { 1044 {
1100 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1101 1046
1102 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1103 { 1048 {
… …
1109 scr_touch (true); 1054 scr_touch (true);
1110 } 1055 }
1111#endif 1056#endif
1112 1057
1113 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1114 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1115 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1116 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 0;
1062
1117 gc = XCreateGC (disp, vt, 1063 gc = XCreateGC (dpy, vt,
1118 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1065 &gcvalue);
1120 1066
1121 drawable = new rxvt_drawable (display, vt); 1067 drawable = new rxvt_drawable (this, vt);
1122 1068
1123#ifdef RXVT_SCROLLBAR 1069#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130#endif 1076#endif
1131 1077
1132#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1079 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1080 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1136#endif 1082#endif
1137 1083
1138 pointer_unblank (); 1084 pointer_unblank ();
1139 scr_recolour (); 1085 scr_recolour ();
1140
1141#if ENABLE_XEMBED
1142 if (rs[Rs_embed])
1143 {
1144 long info[2] = { 0, XEMBED_MAPPED };
1145
1146 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1147 32, PropModeReplace, (unsigned char *)&info, 2);
1148 }
1149#endif
1150} 1086}
1151 1087
1152/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1153 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1154 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1155void 1091void
1156rxvt_get_ttymode (ttymode_t *tio, int erase) 1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1157{ 1093{
1158#ifdef HAVE_TERMIOS_H
1159 /* 1094 /*
1160 * standard System V termios interface 1095 * standard System V termios interface
1161 */ 1096 */
1162 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1163 { 1098 {
… …
1230 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1231# if defined (ECHOCTL) && defined (ECHOKE) 1166# if defined (ECHOCTL) && defined (ECHOKE)
1232 | ECHOCTL | ECHOKE 1167 | ECHOCTL | ECHOKE
1233# endif 1168# endif
1234 | ECHOE | ECHOK); 1169 | ECHOE | ECHOK);
1235# else /* HAVE_TERMIOS_H */
1236
1237 /*
1238 * sgtty interface
1239 */
1240
1241 /* get parameters -- gtty */
1242 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1243 {
1244 tio->sg.sg_erase = CERASE; /* ^H */
1245 tio->sg.sg_kill = CKILL; /* ^U */
1246 }
1247
1248 if (erase != -1)
1249 tio->sg.sg_erase = (char)erase;
1250
1251 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1252
1253 /* get special characters */
1254 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1255 {
1256 tio->tc.t_intrc = CINTR; /* ^C */
1257 tio->tc.t_quitc = CQUIT; /* ^\ */
1258 tio->tc.t_startc = CSTART; /* ^Q */
1259 tio->tc.t_stopc = CSTOP; /* ^S */
1260 tio->tc.t_eofc = CEOF; /* ^D */
1261 tio->tc.t_brkc = -1;
1262 }
1263
1264 /* get local special chars */
1265 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1266 {
1267 tio->lc.t_suspc = CSUSP; /* ^Z */
1268 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1269 tio->lc.t_rprntc = CRPRNT; /* ^R */
1270 tio->lc.t_flushc = CFLUSH; /* ^O */
1271 tio->lc.t_werasc = CWERASE; /* ^W */
1272 tio->lc.t_lnextc = CLNEXT; /* ^V */
1273 }
1274 /* get line discipline */
1275 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1276# ifdef NTTYDISC
1277 tio->line = NTTYDISC;
1278# endif /* NTTYDISC */
1279
1280 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1281#endif /* HAVE_TERMIOS_H */
1282 1170
1283 /* 1171 /*
1284 * Debugging 1172 * Debugging
1285 */ 1173 */
1286#ifdef DEBUG_TTYMODE 1174#ifdef DEBUG_TTYMODE
… …
1387 else 1275 else
1388#endif 1276#endif
1389 if (!pty->get ()) 1277 if (!pty->get ())
1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1391 1279
1392 pty->set_utf8_mode (enc_utf8);
1393
1394 /* set initial window size */
1395 tt_winch ();
1396
1397 int er; 1280 int er;
1398 1281
1399#ifndef NO_BACKSPACE_KEY 1282#ifndef NO_BACKSPACE_KEY
1400 if (key_backspace[0] && !key_backspace[1]) 1283 if (key_backspace[0] && !key_backspace[1])
1401 er = key_backspace[0]; 1284 er = key_backspace[0];
… …
1404 else 1287 else
1405#endif 1288#endif
1406 er = -1; 1289 er = -1;
1407 1290
1408 rxvt_get_ttymode (&tio, er); 1291 rxvt_get_ttymode (&tio, er);
1292 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1293 pty->set_utf8_mode (enc_utf8);
1294
1295 /* set initial window size */
1296 tt_winch ();
1409 1297
1410#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1411 if (rs[Rs_pty_fd]) 1299 if (rs[Rs_pty_fd])
1412 return; 1300 return;
1413#endif 1301#endif
… …
1444 } 1332 }
1445 1333
1446 _exit (EXIT_FAILURE); 1334 _exit (EXIT_FAILURE);
1447 1335
1448 default: 1336 default:
1449 if (!OPTION (Opt_utmpInhibit)) 1337 if (!option (Opt_utmpInhibit))
1450 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1338 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1451 1339
1452 pty->close_tty (); 1340 pty->close_tty ();
1453 1341
1454 child_ev.start (cmd_pid); 1342 child_ev.start (cmd_pid);
1455 1343
… …
1468int 1356int
1469rxvt_term::run_child (const char *const *argv) 1357rxvt_term::run_child (const char *const *argv)
1470{ 1358{
1471 char *login; 1359 char *login;
1472 1360
1473 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1474
1475 if (OPTION (Opt_console)) 1361 if (option (Opt_console))
1476 { /* be virtual console, fail silently */ 1362 { /* be virtual console, fail silently */
1477#ifdef TIOCCONS 1363#ifdef TIOCCONS
1478 unsigned int on = 1; 1364 unsigned int on = 1;
1479 1365
1480 ioctl (STDIN_FILENO, TIOCCONS, &on); 1366 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1529 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1530 shell = "/bin/sh"; 1416 shell = "/bin/sh";
1531 1417
1532 argv0 = (const char *)rxvt_r_basename (shell); 1418 argv0 = (const char *)rxvt_r_basename (shell);
1533 1419
1534 if (OPTION (Opt_loginShell)) 1420 if (option (Opt_loginShell))
1535 { 1421 {
1536 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1537 1423
1538 login[0] = '-'; 1424 login[0] = '-';
1539 strcpy (&login[1], argv0); 1425 strcpy (&login[1], argv0);

Diff Legend

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