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.151 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.204 by sasha, Thu Aug 9 22:08:21 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",
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
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#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
249#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
250 /* bgPixmap.w = bgPixmap.h = 0; */
251 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
252 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
253#endif 215#endif
254
255 last_bot = last_state = -1; 216 last_bot = last_state = -1;
217
218 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
256 227
257 return true; 228 return true;
258} 229}
259 230
260void 231void
… …
298 int i, r_argc; 269 int i, r_argc;
299 char *val; 270 char *val;
300 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
301 272
302 /* 273 /*
303 * Look for -exec option. Find => split and make cmd_argv[] of command args 274 * Look for -e option. Find => split and make cmd_argv[] of command args
304 */ 275 */
305 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
306 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
307 break; 278 break;
308 279
309 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
310 281
311 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
337 get_options (r_argc, r_argv); 308 get_options (r_argc, r_argv);
338 309
339 if (!(display = displays.get (rs[Rs_display_name]))) 310 if (!(display = displays.get (rs[Rs_display_name])))
340 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
341 312
313 // using a local pointer decreases code size a lot
314 xa = display->xa;
315
316 set (display);
342 extract_resources (); 317 extract_resources ();
343 318
319#if XFT
320 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif
323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
344 free (r_argv); 327 free (r_argv);
328
329 bgPixmap.set_target (this);
330
331 for (int i = NUM_RESOURCES; i--; )
332 if (rs [i] == resval_undef)
333 rs [i] = 0;
345 334
346#if ENABLE_PERL 335#if ENABLE_PERL
347 if (!rs[Rs_perl_ext_1]) 336 if (!rs[Rs_perl_ext_1])
348 rs[Rs_perl_ext_1] = "default"; 337 rs[Rs_perl_ext_1] = "default";
349 338
… …
448 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 437 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
449#endif 438#endif
450 439
451#ifdef XTERM_REVERSE_VIDEO 440#ifdef XTERM_REVERSE_VIDEO
452 /* this is how xterm implements reverseVideo */ 441 /* this is how xterm implements reverseVideo */
453 if (OPTION (Opt_reverseVideo)) 442 if (option (Opt_reverseVideo))
454 { 443 {
455 if (!rs[Rs_color + Color_fg]) 444 if (!rs[Rs_color + Color_fg])
456 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 445 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
446
457 if (!rs[Rs_color + Color_bg]) 447 if (!rs[Rs_color + Color_bg])
458 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 448 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
459 } 449 }
460#endif 450#endif
461 451
… …
463 if (!rs[Rs_color + i]) 453 if (!rs[Rs_color + i])
464 rs[Rs_color + i] = def_colorName[i]; 454 rs[Rs_color + i] = def_colorName[i];
465 455
466#ifndef XTERM_REVERSE_VIDEO 456#ifndef XTERM_REVERSE_VIDEO
467 /* this is how we implement reverseVideo */ 457 /* this is how we implement reverseVideo */
468 if (OPTION (Opt_reverseVideo)) 458 if (option (Opt_reverseVideo))
469 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 459 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
470#endif 460#endif
471 461
472 /* convenient aliases for setting fg/bg to colors */ 462 /* convenient aliases for setting fg/bg to colors */
473 color_aliases (Color_fg); 463 color_aliases (Color_fg);
… …
513 val = rxvt_network_display (rs[Rs_display_name]); 503 val = rxvt_network_display (rs[Rs_display_name]);
514 rs[Rs_display_name] = (const char *)val; 504 rs[Rs_display_name] = (const char *)val;
515 505
516 if (val == NULL) 506 if (val == NULL)
517#endif /* DISPLAY_IS_IP */ 507#endif /* DISPLAY_IS_IP */
518 val = XDisplayString (display->display); 508 val = XDisplayString (dpy);
519 509
520 if (rs[Rs_display_name] == NULL) 510 if (rs[Rs_display_name] == NULL)
521 rs[Rs_display_name] = val; /* use broken `:0' value */ 511 rs[Rs_display_name] = val; /* use broken `:0' value */
522 512
523 i = strlen (val); 513 i = strlen (val);
524 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 514 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
525 515
526 sprintf (env_display, "DISPLAY=%s", val); 516 sprintf (env_display, "DISPLAY=%s", val);
527 517
528 /* avoiding the math library: 518 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 519
538 /* add entries to the environment: 520 /* add entries to the environment:
539 * @ DISPLAY: in case we started with -display 521 * @ DISPLAY: in case we started with -display
540 * @ WINDOWID: X window id number of the window 522 * @ WINDOWID: X window id number of the window
541 * @ COLORTERM: terminal sub-name and also indicates its color 523 * @ COLORTERM: terminal sub-name and also indicates its color
… …
543 * @ TERMINFO: path to terminfo directory 525 * @ TERMINFO: path to terminfo directory
544 * @ COLORFGBG: fg;bg color codes 526 * @ COLORFGBG: fg;bg color codes
545 */ 527 */
546 putenv (env_display); 528 putenv (env_display);
547 putenv (env_windowid); 529 putenv (env_windowid);
530
548 if (env_colorfgbg) 531 if (env_colorfgbg)
549 putenv (env_colorfgbg); 532 putenv (env_colorfgbg);
550 533
551#ifdef RXVT_TERMINFO 534#ifdef RXVT_TERMINFO
552 putenv ("TERMINFO=" RXVT_TERMINFO); 535 putenv ("TERMINFO=" RXVT_TERMINFO);
553#endif 536#endif
554 537
555 if (display->depth <= 2) 538 if (depth <= 2)
556 putenv ("COLORTERM=" COLORTERMENV "-mono"); 539 putenv ("COLORTERM=" COLORTERMENV "-mono");
557 else 540 else
558 putenv ("COLORTERM=" COLORTERMENVFULL); 541 putenv ("COLORTERM=" COLORTERMENVFULL);
559 542
560 if (rs[Rs_term_name] != NULL) 543 if (rs[Rs_term_name] != NULL)
… …
654 * Initialize the command connection. 637 * Initialize the command connection.
655 * This should be called after the X server connection is established. 638 * This should be called after the X server connection is established.
656 */ 639 */
657 640
658#ifdef META8_OPTION 641#ifdef META8_OPTION
659 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 642 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
660#endif 643#endif
661 644
662 get_ourmods (); 645 get_ourmods ();
663 646
664 if (!OPTION (Opt_scrollTtyOutput)) 647 if (!option (Opt_scrollTtyOutput))
665 priv_modes |= PrivMode_TtyOutputInh; 648 priv_modes |= PrivMode_TtyOutputInh;
666 if (OPTION (Opt_scrollTtyKeypress)) 649 if (option (Opt_scrollTtyKeypress))
667 priv_modes |= PrivMode_Keypress; 650 priv_modes |= PrivMode_Keypress;
668 if (!OPTION (Opt_jumpScroll)) 651 if (!option (Opt_jumpScroll))
669 priv_modes |= PrivMode_smoothScroll; 652 priv_modes |= PrivMode_smoothScroll;
670 653
671#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
672 if (strcmp (key_backspace, "DEC") == 0) 655 if (strcmp (key_backspace, "DEC") == 0)
673 priv_modes |= PrivMode_HaveBackSpace; 656 priv_modes |= PrivMode_HaveBackSpace;
… …
691 674
692#ifdef OFF_FOCUS_FADING 675#ifdef OFF_FOCUS_FADING
693 pix_colors = pix_colors_focused; 676 pix_colors = pix_colors_focused;
694#endif 677#endif
695 678
696 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 679 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
697 { 680 {
681 const char *name = rs[Rs_color + i];
682
683 if (!name)
684 continue;
685
698 rxvt_color xcol; 686 rxvt_color xcol;
699 687
700 if (!rs[Rs_color + i]) 688 if (!set_color (xcol, name))
701 continue;
702
703 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
704 { 689 {
705#ifndef XTERM_REVERSE_VIDEO 690#ifndef XTERM_REVERSE_VIDEO
706 if (i < 2 && OPTION (Opt_reverseVideo)) 691 if (i < 2 && option (Opt_reverseVideo))
707 rs[Rs_color + i] = def_colorName[!i]; 692 name = def_colorName [1 - i];
708 else 693 else
709#endif 694#endif
710 rs[Rs_color + i] = def_colorName[i]; 695 name = def_colorName [i];
711 696
712 if (!rs[Rs_color + i]) 697 if (!name)
713 continue; 698 continue;
714 699
715 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 700 if (!set_color (xcol, name))
716 { 701 {
717 switch (i) 702 switch (i)
718 { 703 {
719 case Color_fg: 704 case Color_fg:
720 case Color_bg: 705 case Color_bg:
721 /* fatal: need bg/fg color */
722 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 706 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
723 /* NOTREACHED */ 707 name = "";
724 break; 708 break;
725#ifndef NO_CURSORCOLOR 709#ifndef NO_CURSORCOLOR
726 case Color_cursor2: 710 case Color_cursor2:
727 xcol = pix_colors[Color_fg]; 711#endif
728 break;
729#endif /* ! NO_CURSORCOLOR */
730 case Color_pointer_fg: 712 case Color_pointer_fg:
731 xcol = pix_colors[Color_fg]; 713 name = rs[Rs_color + Color_fg];
714 xcol.set (this, name);
732 break; 715 break;
733 default: 716 default:
734 xcol = pix_colors[Color_bg]; /* None */ 717 name = rs[Rs_color + Color_bg];
718 xcol.set (this, name);
735 break; 719 break;
736 } 720 }
737 } 721 }
738 } 722 }
739 723
740 pix_colors[i] = xcol; 724 pix_colors[i] = xcol;
741 SET_PIXCOLOR (i); 725 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 { 726 }
727
728 if (depth <= 2)
729 {
752 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 730 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]; 731 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]; 732 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
755 } 733 }
756 734
757 /* 735 /*
758 * get scrollBar shadow colors 736 * get scrollBar shadow colors
759 * 737 *
760 * The calculations of topShadow/bottomShadow values are adapted 738 * The calculations of topShadow/bottomShadow values are adapted
761 * from the fvwm window manager. 739 * from the fvwm window manager.
762 */ 740 */
763#ifdef KEEP_SCROLLCOLOR 741#ifdef KEEP_SCROLLCOLOR
764
765 if (display->depth <= 2) 742 if (depth <= 2)
766 { 743 {
767 /* Monochrome */ 744 /* Monochrome */
768 pix_colors[Color_scroll] = pix_colors[Color_fg]; 745 alias_color (Color_scroll, Color_fg);
769 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 746 alias_color (Color_topShadow, Color_bg);
770 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 747 alias_color (Color_bottomShadow, Color_bg);
771 } 748 }
772 else 749 else
773 { 750 {
774 rxvt_color xcol[2]; 751 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 752
779 xcol[1] = pix_colors[Color_scroll]; 753 rgba cscroll;
780 xcol[0].set (display, 65535, 65535, 65535); 754 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 755
789 /* topShadowColor */ 756 /* topShadowColor */
790 if (!xcol[1].set (display, 757 if (!pix_colors[Color_topShadow].set (this,
791 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 758 rgba (
792 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 759 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
793 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 760 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
794 xcol[1] = pix_colors[Color_White]; 761 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
795 762 cscroll.a)
796 pix_colors[Color_topShadow] = xcol[1]; 763 ))
764 alias_color (Color_topShadow, Color_White);
797 } 765 }
798#endif /* KEEP_SCROLLCOLOR */ 766#endif /* KEEP_SCROLLCOLOR */
767
768#ifdef OFF_FOCUS_FADING
769 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
770 update_fade_color (i);
771#endif
799} 772}
800 773
801/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
802/* color aliases, fg/bg bright-bold */ 775/* color aliases, fg/bg bright-bold */
803void 776void
… …
842 815
843 if (rsmod 816 if (rsmod
844 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 817 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
845 requestedmeta = rsmod[3] - '0'; 818 requestedmeta = rsmod[3] - '0';
846 819
847 map = XGetModifierMapping (display->display); 820 map = XGetModifierMapping (dpy);
848 kc = map->modifiermap; 821 kc = map->modifiermap;
849 822
850 for (i = 1; i < 6; i++) 823 for (i = 1; i < 6; i++)
851 { 824 {
852 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 825 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
854 for (j = map->max_keypermod; j--; k++) 827 for (j = map->max_keypermod; j--; k++)
855 { 828 {
856 if (kc[k] == 0) 829 if (kc[k] == 0)
857 break; 830 break;
858 831
859 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 832 switch (XKeycodeToKeysym (dpy, kc[k], 0))
860 { 833 {
861 case XK_Num_Lock: 834 case XK_Num_Lock:
862 ModNumLockMask = modmasks[i - 1]; 835 ModNumLockMask = modmasks[i - 1];
863 continue; 836 continue;
864 837
… …
914rxvt_term::create_windows (int argc, const char *const *argv) 887rxvt_term::create_windows (int argc, const char *const *argv)
915{ 888{
916 XClassHint classHint; 889 XClassHint classHint;
917 XWMHints wmHint; 890 XWMHints wmHint;
918#if ENABLE_FRILLS 891#if ENABLE_FRILLS
919 Atom prop = None;
920 MWMHints mwmhints; 892 MWMHints mwmhints = { };
921#endif 893#endif
922 XGCValues gcvalue; 894 XGCValues gcvalue;
923 XSetWindowAttributes attributes; 895 XSetWindowAttributes attributes;
924 XWindowAttributes gattr;
925 Window top, parent; 896 Window top, parent;
926 dDisp;
927 897
928#ifdef USING_W11LIB 898 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 899
942 /* grab colors before netscape does */ 900 /* grab colors before netscape does */
943 Get_Colours (); 901 Get_Colours ();
944 902
945 if (!set_fonts ()) 903 if (!set_fonts ())
946 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 904 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
947 905
948 parent = DefaultRootWindow (disp); 906 parent = display->root;
949 907
950 attributes.override_redirect = !!OPTION (Opt_override_redirect); 908 attributes.override_redirect = !!option (Opt_override_redirect);
951 909
952#if ENABLE_FRILLS 910#if ENABLE_FRILLS
953 if (OPTION (Opt_borderLess)) 911 if (option (Opt_borderLess))
954 { 912 {
955 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
956
957 if (prop == None)
958 { 914 {
959 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 915 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
960 attributes.override_redirect = TRUE; 916 attributes.override_redirect = true;
961 mwmhints.flags = 0; 917 mwmhints.flags = 0;
962 } 918 }
963 else 919 else
964 { 920 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 921 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
975 { 931 {
976 XWindowAttributes wattr; 932 XWindowAttributes wattr;
977 933
978 parent = strtol (rs[Rs_embed], 0, 0); 934 parent = strtol (rs[Rs_embed], 0, 0);
979 935
980 if (!XGetWindowAttributes (disp, parent, &wattr)) 936 if (!XGetWindowAttributes (dpy, parent, &wattr))
981 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 937 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
982 938
983 window_calc (wattr.width, wattr.height); 939 window_calc (wattr.width, wattr.height);
984 } 940 }
985#endif 941#endif
986 942
987 window_calc (0, 0); 943 window_calc (0, 0);
988 944
989 /* sub-window placement & size in rxvt_resize_subwindows () */ 945 /* sub-window placement & size in rxvt_resize_subwindows () */
990 attributes.background_pixel = pix_colors_focused[Color_border]; 946 attributes.background_pixel = pix_colors_focused [Color_border];
991 attributes.border_pixel = pix_colors_focused[Color_border]; 947 attributes.border_pixel = pix_colors_focused [Color_border];
992 attributes.colormap = display->cmap; 948 attributes.colormap = cmap;
949
993 top = XCreateWindow (disp, parent, 950 top = XCreateWindow (dpy, parent,
994 szHint.x, szHint.y, 951 szHint.x, szHint.y,
995 szHint.width, szHint.height, 952 szHint.width, szHint.height,
996 ext_bwidth, 953 ext_bwidth,
997 display->depth, InputOutput, 954 depth, InputOutput, visual,
998 display->visual,
999 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 955 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1000 &attributes); 956 &attributes);
1001 957
1002 this->parent[0] = top; 958 this->parent[0] = top;
1003 959
1004 old_width = szHint.width; 960 old_width = szHint.width;
1005 old_height = szHint.height; 961 old_height = szHint.height;
1006 962
1007 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 963 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1008 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 964 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1009 965
1010 classHint.res_name = (char *)rs[Rs_name]; 966 classHint.res_name = (char *)rs[Rs_name];
1011 classHint.res_class = (char *)RESCLASS; 967 classHint.res_class = (char *)RESCLASS;
1012 968
1013 wmHint.flags = InputHint | StateHint | WindowGroupHint; 969 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1014 wmHint.input = True; 970 wmHint.input = True;
1015 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 971 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1016 wmHint.window_group = top; 972 wmHint.window_group = top;
1017 973
1018 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 974 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1019 &szHint, &wmHint, &classHint); 975 &szHint, &wmHint, &classHint);
976
977#if ENABLE_FRILLS
978 if (mwmhints.flags)
979 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
980 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
981#endif
1020 982
1021 Atom protocols[] = { 983 Atom protocols[] = {
1022 xa[XA_WM_DELETE_WINDOW], 984 xa[XA_WM_DELETE_WINDOW],
1023#if ENABLE_EWMH 985#if ENABLE_EWMH
1024 xa[XA_NET_WM_PING], 986 xa[XA_NET_WM_PING],
1025#endif 987#endif
1026 }; 988 };
1027 989
1028 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 990 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1029 991
1030#if ENABLE_FRILLS 992#if ENABLE_FRILLS
1031 if (rs[Rs_transient_for]) 993 if (rs[Rs_transient_for])
1032 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 994 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1033#endif 995#endif
1034 996
1035#if ENABLE_EWMH 997#if ENABLE_EWMH
1036 long pid = getpid (); 998 long pid = getpid ();
1037 999
1038 XChangeProperty (disp, top, 1000 XChangeProperty (dpy, top,
1039 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1001 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1040 PropModeReplace, (unsigned char *)&pid, 1); 1002 PropModeReplace, (unsigned char *)&pid, 1);
1041 1003
1042 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1004 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1043#endif 1005#endif
1044 1006
1045 XSelectInput (disp, top, 1007 XSelectInput (dpy, top,
1046 KeyPressMask 1008 KeyPressMask
1047#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1009#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1048 | KeyReleaseMask 1010 | KeyReleaseMask
1049#endif 1011#endif
1050 | FocusChangeMask | VisibilityChangeMask 1012 | FocusChangeMask | VisibilityChangeMask
1051 | ExposureMask | StructureNotifyMask); 1013 | ExposureMask | StructureNotifyMask);
1052 1014
1053 termwin_ev.start (display, top); 1015 termwin_ev.start (display, top);
1054 1016
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 */ 1017 /* vt cursor: Black-on-White is standard, but this is more popular */
1062 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1018 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1063 1019
1064#ifdef HAVE_SCROLLBARS 1020#ifdef HAVE_SCROLLBARS
1065 /* cursor scrollBar: Black-on-White */ 1021 /* cursor scrollBar: Black-on-White */
1066 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1022 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1067#endif 1023#endif
1068 1024
1069 /* the vt window */ 1025 /* the vt window */
1070 vt = XCreateSimpleWindow (disp, top, 1026 vt = XCreateSimpleWindow (dpy, top,
1071 window_vt_x,
1072 window_vt_y, 1027 window_vt_x, window_vt_y,
1073 width,
1074 height, 1028 width, height,
1075 0, 1029 0,
1076 pix_colors_focused[Color_fg], 1030 pix_colors_focused[Color_fg],
1077 pix_colors_focused[Color_bg]); 1031 pix_colors_focused[Color_bg]);
1078#ifdef DEBUG_X
1079 XStoreName (disp, vt, "vt window");
1080#endif
1081 1032
1082 attributes.bit_gravity = NorthWestGravity; 1033 attributes.bit_gravity = NorthWestGravity;
1083 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1034 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1084 1035
1085 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1036 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1086 1037
1087 if (OPTION (Opt_pointerBlank)) 1038 if (option (Opt_pointerBlank))
1088 vt_emask |= PointerMotionMask; 1039 vt_emask |= PointerMotionMask;
1089 else 1040 else
1090 vt_emask |= Button1MotionMask | Button3MotionMask; 1041 vt_emask |= Button1MotionMask | Button3MotionMask;
1091 1042
1092 vt_select_input (); 1043 vt_select_input ();
1093 1044
1094 vt_ev.start (display, vt); 1045 vt_ev.start (display, vt);
1095 1046
1096#ifdef XPM_BACKGROUND 1047#ifdef XPM_BACKGROUND
1097 if (rs[Rs_backgroundPixmap] != NULL 1048 if (rs[Rs_backgroundPixmap] != NULL)
1098 && ! OPTION (Opt_transparent))
1099 { 1049 {
1100 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1101 1051
1102 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1103 { 1053 {
1104 p++; 1054 p++;
1105 scale_pixmap (p); 1055 bgPixmap.handle_geometry (p);
1106 } 1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1107 1059
1108 set_bgPixmap (rs[Rs_backgroundPixmap]); 1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1109 scr_touch (true); 1061 scr_touch (true);
1110 } 1062 }
1111#endif 1063#endif
1112 1064
1113 /* graphics context for the vt window */ 1065 /* graphics context for the vt window */
1114 gcvalue.foreground = pix_colors[Color_fg]; 1066 gcvalue.foreground = pix_colors[Color_fg];
1115 gcvalue.background = pix_colors[Color_bg]; 1067 gcvalue.background = pix_colors[Color_bg];
1116 gcvalue.graphics_exposures = 1; 1068 gcvalue.graphics_exposures = 0;
1069
1117 gc = XCreateGC (disp, vt, 1070 gc = XCreateGC (dpy, vt,
1118 GCForeground | GCBackground | GCGraphicsExposures, 1071 GCForeground | GCBackground | GCGraphicsExposures,
1119 &gcvalue); 1072 &gcvalue);
1120 1073
1121 drawable = new rxvt_drawable (display, vt); 1074 drawable = new rxvt_drawable (this, vt);
1122 1075
1123#ifdef RXVT_SCROLLBAR 1076#ifdef RXVT_SCROLLBAR
1124 gcvalue.foreground = pix_colors[Color_topShadow]; 1077 gcvalue.foreground = pix_colors[Color_topShadow];
1125 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1078 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1126 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1079 gcvalue.foreground = pix_colors[Color_bottomShadow];
1127 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1080 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1128 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1081 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1129 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1082 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1130#endif 1083#endif
1131 1084
1132#ifdef OFF_FOCUS_FADING 1085#ifdef OFF_FOCUS_FADING
1133 // initially we are in unfocused state 1086 // initially we are in unfocused state
1134 if (rs[Rs_fade]) 1087 if (rs[Rs_fade])
1135 pix_colors = pix_colors_unfocused; 1088 pix_colors = pix_colors_unfocused;
1136#endif 1089#endif
1137 1090
1138 pointer_unblank (); 1091 pointer_unblank ();
1139 scr_recolour (); 1092 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} 1093}
1151 1094
1152/* ------------------------------------------------------------------------- * 1095/* ------------------------------------------------------------------------- *
1153 * GET TTY CURRENT STATE * 1096 * GET TTY CURRENT STATE *
1154 * ------------------------------------------------------------------------- */ 1097 * ------------------------------------------------------------------------- */
1155void 1098void
1156rxvt_get_ttymode (ttymode_t *tio, int erase) 1099rxvt_get_ttymode (ttymode_t *tio, int erase)
1157{ 1100{
1158#ifdef HAVE_TERMIOS_H
1159 /* 1101 /*
1160 * standard System V termios interface 1102 * standard System V termios interface
1161 */ 1103 */
1162 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1104 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1163 { 1105 {
… …
1230 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1172 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1231# if defined (ECHOCTL) && defined (ECHOKE) 1173# if defined (ECHOCTL) && defined (ECHOKE)
1232 | ECHOCTL | ECHOKE 1174 | ECHOCTL | ECHOKE
1233# endif 1175# endif
1234 | ECHOE | ECHOK); 1176 | 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 1177
1283 /* 1178 /*
1284 * Debugging 1179 * Debugging
1285 */ 1180 */
1286#ifdef DEBUG_TTYMODE 1181#ifdef DEBUG_TTYMODE
… …
1387 else 1282 else
1388#endif 1283#endif
1389 if (!pty->get ()) 1284 if (!pty->get ())
1390 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1285 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1391 1286
1392 pty->set_utf8_mode (enc_utf8);
1393
1394 /* set initial window size */
1395 tt_winch ();
1396
1397 int er; 1287 int er;
1398 1288
1399#ifndef NO_BACKSPACE_KEY 1289#ifndef NO_BACKSPACE_KEY
1400 if (key_backspace[0] && !key_backspace[1]) 1290 if (key_backspace[0] && !key_backspace[1])
1401 er = key_backspace[0]; 1291 er = key_backspace[0];
… …
1404 else 1294 else
1405#endif 1295#endif
1406 er = -1; 1296 er = -1;
1407 1297
1408 rxvt_get_ttymode (&tio, er); 1298 rxvt_get_ttymode (&tio, er);
1299 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1300 pty->set_utf8_mode (enc_utf8);
1301
1302 /* set initial window size */
1303 tt_winch ();
1409 1304
1410#if ENABLE_FRILLS 1305#if ENABLE_FRILLS
1411 if (rs[Rs_pty_fd]) 1306 if (rs[Rs_pty_fd])
1412 return; 1307 return;
1413#endif 1308#endif
… …
1444 } 1339 }
1445 1340
1446 _exit (EXIT_FAILURE); 1341 _exit (EXIT_FAILURE);
1447 1342
1448 default: 1343 default:
1449#if UTMP_SUPPORT
1450 if (!OPTION (Opt_utmpInhibit)) 1344 if (!option (Opt_utmpInhibit))
1451 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1345 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1452#endif
1453 1346
1454 pty->close_tty (); 1347 pty->close_tty ();
1455 1348
1456 child_ev.start (cmd_pid); 1349 child_ev.start (cmd_pid);
1457 1350
… …
1470int 1363int
1471rxvt_term::run_child (const char *const *argv) 1364rxvt_term::run_child (const char *const *argv)
1472{ 1365{
1473 char *login; 1366 char *login;
1474 1367
1475 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1476
1477 if (OPTION (Opt_console)) 1368 if (option (Opt_console))
1478 { /* be virtual console, fail silently */ 1369 { /* be virtual console, fail silently */
1479#ifdef TIOCCONS 1370#ifdef TIOCCONS
1480 unsigned int on = 1; 1371 unsigned int on = 1;
1481 1372
1482 ioctl (STDIN_FILENO, TIOCCONS, &on); 1373 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1531 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1532 shell = "/bin/sh"; 1423 shell = "/bin/sh";
1533 1424
1534 argv0 = (const char *)rxvt_r_basename (shell); 1425 argv0 = (const char *)rxvt_r_basename (shell);
1535 1426
1536 if (OPTION (Opt_loginShell)) 1427 if (option (Opt_loginShell))
1537 { 1428 {
1538 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1539 1430
1540 login[0] = '-'; 1431 login[0] = '-';
1541 strcpy (&login[1], argv0); 1432 strcpy (&login[1], argv0);

Diff Legend

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