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.148 by root, Wed Jan 18 19:43:51 2006 UTC vs.
Revision 1.195 by ayin, Thu Jul 26 18:09:36 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#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif 176#endif
216 }; 177 };
217 178
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226 187
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
231 pixmap = None; 189 pixmap = None;
232#endif 190#endif
233 191
234 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 194 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 196 ncol = 80;
241 nrow = 24; 197 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 201 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
247 203
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 205
252 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
256 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
257#endif 211#endif
258 212
259 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);
260 224
261 return true; 225 return true;
262} 226}
263 227
264void 228void
… …
302 int i, r_argc; 266 int i, r_argc;
303 char *val; 267 char *val;
304 const char **cmd_argv, **r_argv; 268 const char **cmd_argv, **r_argv;
305 269
306 /* 270 /*
307 * 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
308 */ 272 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 273 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 274 if (!strcmp (argv[r_argc], "-e"))
311 break; 275 break;
312 276
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 278
315 for (i = 0; i < r_argc; i++) 279 for (i = 0; i < r_argc; i++)
… …
341 get_options (r_argc, r_argv); 305 get_options (r_argc, r_argv);
342 306
343 if (!(display = displays.get (rs[Rs_display_name]))) 307 if (!(display = displays.get (rs[Rs_display_name])))
344 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]);
345 309
310 // using a local pointer decreases code size a lot
311 xa = display->xa;
312
313 set (display);
346 extract_resources (); 314 extract_resources ();
347 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
348 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;
329
330#if ENABLE_PERL
331 if (!rs[Rs_perl_ext_1])
332 rs[Rs_perl_ext_1] = "default";
333
334 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
335 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
336 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
337 {
338 rxvt_perl.init (this);
339 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
340 }
341#endif
349 342
350 /* 343 /*
351 * set any defaults not already set 344 * set any defaults not already set
352 */ 345 */
353 if (cmd_argv && cmd_argv[0]) 346 if (cmd_argv && cmd_argv[0])
… …
439 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]);
440#endif 433#endif
441 434
442#ifdef XTERM_REVERSE_VIDEO 435#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 436 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 437 if (option (Opt_reverseVideo))
445 { 438 {
446 if (!rs[Rs_color + Color_fg]) 439 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 440 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
441
448 if (!rs[Rs_color + Color_bg]) 442 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 443 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 444 }
451#endif 445#endif
452 446
… …
454 if (!rs[Rs_color + i]) 448 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 449 rs[Rs_color + i] = def_colorName[i];
456 450
457#ifndef XTERM_REVERSE_VIDEO 451#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 452 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 453 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 454 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 455#endif
462 456
463 /* convenient aliases for setting fg/bg to colors */ 457 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 458 color_aliases (Color_fg);
… …
504 val = rxvt_network_display (rs[Rs_display_name]); 498 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 499 rs[Rs_display_name] = (const char *)val;
506 500
507 if (val == NULL) 501 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 502#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 503 val = XDisplayString (dpy);
510 504
511 if (rs[Rs_display_name] == NULL) 505 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 506 rs[Rs_display_name] = val; /* use broken `:0' value */
513 507
514 i = strlen (val); 508 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
516 510
517 sprintf (env_display, "DISPLAY=%s", val); 511 sprintf (env_display, "DISPLAY=%s", val);
518 512
519 /* avoiding the math library: 513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
520 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
521 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
522 ;
523 max_it (i, 1);
524 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
525
526 sprintf (env_windowid, "WINDOWID=%u",
527 (unsigned int)parent[0]);
528 514
529 /* add entries to the environment: 515 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 516 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 517 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 518 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 520 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 521 * @ COLORFGBG: fg;bg color codes
536 */ 522 */
537 putenv (env_display); 523 putenv (env_display);
538 putenv (env_windowid); 524 putenv (env_windowid);
525
539 if (env_colorfgbg) 526 if (env_colorfgbg)
540 putenv (env_colorfgbg); 527 putenv (env_colorfgbg);
541 528
542#ifdef RXVT_TERMINFO 529#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 530 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 531#endif
545 532
546 if (display->depth <= 2) 533 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 534 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 535 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 536 putenv ("COLORTERM=" COLORTERMENVFULL);
550 537
551 if (rs[Rs_term_name] != NULL) 538 if (rs[Rs_term_name] != NULL)
… …
645 * Initialize the command connection. 632 * Initialize the command connection.
646 * This should be called after the X server connection is established. 633 * This should be called after the X server connection is established.
647 */ 634 */
648 635
649#ifdef META8_OPTION 636#ifdef META8_OPTION
650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 637 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
651#endif 638#endif
652 639
653 get_ourmods (); 640 get_ourmods ();
654 641
655 if (!OPTION (Opt_scrollTtyOutput)) 642 if (!option (Opt_scrollTtyOutput))
656 priv_modes |= PrivMode_TtyOutputInh; 643 priv_modes |= PrivMode_TtyOutputInh;
657 if (OPTION (Opt_scrollTtyKeypress)) 644 if (option (Opt_scrollTtyKeypress))
658 priv_modes |= PrivMode_Keypress; 645 priv_modes |= PrivMode_Keypress;
659 if (!OPTION (Opt_jumpScroll)) 646 if (!option (Opt_jumpScroll))
660 priv_modes |= PrivMode_smoothScroll; 647 priv_modes |= PrivMode_smoothScroll;
661 648
662#ifndef NO_BACKSPACE_KEY 649#ifndef NO_BACKSPACE_KEY
663 if (strcmp (key_backspace, "DEC") == 0) 650 if (strcmp (key_backspace, "DEC") == 0)
664 priv_modes |= PrivMode_HaveBackSpace; 651 priv_modes |= PrivMode_HaveBackSpace;
… …
682 669
683#ifdef OFF_FOCUS_FADING 670#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 671 pix_colors = pix_colors_focused;
685#endif 672#endif
686 673
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 675 {
676 const char *name = rs[Rs_color + i];
677
678 if (!name)
679 continue;
680
689 rxvt_color xcol; 681 rxvt_color xcol;
690 682
691 if (!rs[Rs_color + i]) 683 if (!set_color (xcol, name))
692 continue;
693
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
695 { 684 {
696#ifndef XTERM_REVERSE_VIDEO 685#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 686 if (i < 2 && option (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 687 name = def_colorName [1 - i];
699 else 688 else
700#endif 689#endif
701 rs[Rs_color + i] = def_colorName[i]; 690 name = def_colorName [i];
702 691
703 if (!rs[Rs_color + i]) 692 if (!name)
704 continue; 693 continue;
705 694
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 695 if (!set_color (xcol, name))
707 { 696 {
708 switch (i) 697 switch (i)
709 { 698 {
710 case Color_fg: 699 case Color_fg:
711 case Color_bg: 700 case Color_bg:
712 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 701 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */ 702 name = "";
715 break; 703 break;
716#ifndef NO_CURSORCOLOR 704#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 705 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 706#endif
719 break;
720#endif /* ! NO_CURSORCOLOR */
721 case Color_pointer_fg: 707 case Color_pointer_fg:
722 xcol = pix_colors[Color_fg]; 708 name = rs[Rs_color + Color_fg];
709 xcol.set (this, name);
723 break; 710 break;
724 default: 711 default:
725 xcol = pix_colors[Color_bg]; /* None */ 712 name = rs[Rs_color + Color_bg];
713 xcol.set (this, name);
726 break; 714 break;
727 } 715 }
728 } 716 }
729 } 717 }
730 718
731 pix_colors[i] = xcol; 719 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i); 720 rs[Rs_color + i] = name;
733 }
734
735#ifdef OFF_FOCUS_FADING
736 if (rs[Rs_fade])
737 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
738 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
739#endif
740
741 if (display->depth <= 2)
742 { 721 }
722
723 if (depth <= 2)
724 {
743 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);
744 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);
745 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);
746 } 728 }
747 729
748 /* 730 /*
749 * get scrollBar shadow colors 731 * get scrollBar shadow colors
750 * 732 *
751 * The calculations of topShadow/bottomShadow values are adapted 733 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 734 * from the fvwm window manager.
753 */ 735 */
754#ifdef KEEP_SCROLLCOLOR 736#ifdef KEEP_SCROLLCOLOR
755
756 if (display->depth <= 2) 737 if (depth <= 2)
757 { 738 {
758 /* Monochrome */ 739 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 740 alias_color (Color_scroll, Color_fg);
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 741 alias_color (Color_topShadow, Color_bg);
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 742 alias_color (Color_bottomShadow, Color_bg);
762 } 743 }
763 else 744 else
764 { 745 {
765 rxvt_color xcol[2]; 746 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
766 /* xcol[0] == white
767 * xcol[1] == top shadow
768 * xcol[2] == bot shadow */
769 747
770 xcol[1] = pix_colors[Color_scroll]; 748 rgba cscroll;
771 xcol[0].set (display, 65535, 65535, 65535); 749 pix_colors [Color_scroll].get (cscroll);
772
773 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
774
775 xcol[0].get (display, pr0, pg0, pb0);
776 xcol[1].get (display, pr1, pg1, pb1);
777
778 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
779 750
780 /* topShadowColor */ 751 /* topShadowColor */
781 if (!xcol[1].set (display, 752 if (!pix_colors[Color_topShadow].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 753 rgba (
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 754 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 755 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
785 xcol[1] = pix_colors[Color_White]; 756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
786 757 cscroll.a)
787 pix_colors[Color_topShadow] = xcol[1]; 758 ))
759 alias_color (Color_topShadow, Color_White);
788 } 760 }
789#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
790} 767}
791 768
792/*----------------------------------------------------------------------*/ 769/*----------------------------------------------------------------------*/
793/* color aliases, fg/bg bright-bold */ 770/* color aliases, fg/bg bright-bold */
794void 771void
… …
833 810
834 if (rsmod 811 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
837 814
838 map = XGetModifierMapping (display->display); 815 map = XGetModifierMapping (dpy);
839 kc = map->modifiermap; 816 kc = map->modifiermap;
840 817
841 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
842 { 819 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
846 { 823 {
847 if (kc[k] == 0) 824 if (kc[k] == 0)
848 break; 825 break;
849 826
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 827 switch (XKeycodeToKeysym (dpy, kc[k], 0))
851 { 828 {
852 case XK_Num_Lock: 829 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
854 continue; 831 continue;
855 832
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
906{ 883{
907 XClassHint classHint; 884 XClassHint classHint;
908 XWMHints wmHint; 885 XWMHints wmHint;
909#if ENABLE_FRILLS 886#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 887 MWMHints mwmhints;
912#endif 888#endif
913 XGCValues gcvalue; 889 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 891 Window top, parent;
917 dDisp;
918 892
919#ifdef USING_W11LIB 893 dLocal (Display *, dpy);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
926
927 if (OPTION (Opt_transparent))
928 {
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
931 }
932 894
933 /* grab colors before netscape does */ 895 /* grab colors before netscape does */
934 Get_Colours (); 896 Get_Colours ();
935 897
936 if (!set_fonts ()) 898 if (!set_fonts ())
937 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");
938 900
939 parent = DefaultRootWindow (disp); 901 parent = display->root;
940 902
941 attributes.override_redirect = !!OPTION (Opt_override_redirect); 903 attributes.override_redirect = !!option (Opt_override_redirect);
942 904
943#if ENABLE_FRILLS 905#if ENABLE_FRILLS
944 if (OPTION (Opt_borderLess)) 906 if (option (Opt_borderLess))
945 { 907 {
946 prop = XInternAtom (disp, "_MOTIF_WM_INFO", True); 908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
947
948 if (prop == None)
949 { 909 {
950 /* 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");*/
951 attributes.override_redirect = TRUE; 911 attributes.override_redirect = true;
952 mwmhints.flags = 0; 912 mwmhints.flags = 0;
953 } 913 }
954 else 914 else
955 { 915 {
956 mwmhints.flags = MWM_HINTS_DECORATIONS; 916 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
966 { 926 {
967 XWindowAttributes wattr; 927 XWindowAttributes wattr;
968 928
969 parent = strtol (rs[Rs_embed], 0, 0); 929 parent = strtol (rs[Rs_embed], 0, 0);
970 930
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 931 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 933
974 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
975 } 935 }
976#endif 936#endif
977 937
978 window_calc (0, 0); 938 window_calc (0, 0);
979 939
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
981 attributes.background_pixel = pix_colors_focused[Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
982 attributes.border_pixel = pix_colors_focused[Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
983 attributes.colormap = display->cmap; 943 attributes.colormap = cmap;
944
984 top = XCreateWindow (disp, parent, 945 top = XCreateWindow (dpy, parent,
985 szHint.x, szHint.y, 946 szHint.x, szHint.y,
986 szHint.width, szHint.height, 947 szHint.width, szHint.height,
987 ext_bwidth, 948 ext_bwidth,
988 display->depth, InputOutput, 949 depth, InputOutput, visual,
989 display->visual,
990 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
991 &attributes); 951 &attributes);
992 952
993 this->parent[0] = top; 953 this->parent[0] = top;
994 954
995 old_width = szHint.width; 955 old_width = szHint.width;
996 old_height = szHint.height; 956 old_height = szHint.height;
997 957
998 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 958 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
999 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 959 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1000 960
1001 classHint.res_name = (char *)rs[Rs_name]; 961 classHint.res_name = (char *)rs[Rs_name];
1002 classHint.res_class = (char *)RESCLASS; 962 classHint.res_class = (char *)RESCLASS;
1003 963
1004 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1005 wmHint.input = True; 965 wmHint.input = True;
1006 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1007 wmHint.window_group = top; 967 wmHint.window_group = top;
1008 968
1009 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1010 &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
1011 977
1012 Atom protocols[] = { 978 Atom protocols[] = {
1013 xa[XA_WM_DELETE_WINDOW], 979 xa[XA_WM_DELETE_WINDOW],
1014#if ENABLE_EWMH 980#if ENABLE_EWMH
1015 xa[XA_NET_WM_PING], 981 xa[XA_NET_WM_PING],
1016#endif 982#endif
1017 }; 983 };
1018 984
1019 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 985 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1020 986
1021#if ENABLE_FRILLS 987#if ENABLE_FRILLS
1022 if (rs[Rs_transient_for]) 988 if (rs[Rs_transient_for])
1023 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 989 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1024#endif 990#endif
1025 991
1026#if ENABLE_EWMH 992#if ENABLE_EWMH
1027 long pid = getpid (); 993 long pid = getpid ();
1028 994
1029 XChangeProperty (disp, top, 995 XChangeProperty (dpy, top,
1030 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1031 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
1032 998
1033 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1034#endif 1000#endif
1035 1001
1036 XSelectInput (disp, top, 1002 XSelectInput (dpy, top,
1037 KeyPressMask 1003 KeyPressMask
1038#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1039 | KeyReleaseMask 1005 | KeyReleaseMask
1040#endif 1006#endif
1041 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1042 | ExposureMask | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1043 1009
1044 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1045 1011
1046#if ENABLE_FRILLS
1047 if (mwmhints.flags)
1048 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1049 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1050#endif
1051
1052 /* 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 */
1053 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1054 1014
1055#ifdef HAVE_SCROLLBARS 1015#ifdef HAVE_SCROLLBARS
1056 /* cursor scrollBar: Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1057 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1058#endif 1018#endif
1059 1019
1060 /* the vt window */ 1020 /* the vt window */
1061 vt = XCreateSimpleWindow (disp, top, 1021 vt = XCreateSimpleWindow (dpy, top,
1062 window_vt_x,
1063 window_vt_y, 1022 window_vt_x, window_vt_y,
1064 width,
1065 height, 1023 width, height,
1066 0, 1024 0,
1067 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1068 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1069#ifdef DEBUG_X
1070 XStoreName (disp, vt, "vt window");
1071#endif
1072 1027
1073 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1074 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1075 1030
1076 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1077 1032
1078 if (OPTION (Opt_pointerBlank)) 1033 if (option (Opt_pointerBlank))
1079 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
1080 else 1035 else
1081 vt_emask |= Button1MotionMask | Button3MotionMask; 1036 vt_emask |= Button1MotionMask | Button3MotionMask;
1082 1037
1083 vt_select_input (); 1038 vt_select_input ();
1084 1039
1085 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1086 1041
1087#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1088 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL
1044#ifndef HAVE_AFTERIMAGE
1089 && ! OPTION (Opt_transparent)) 1045 && !option (Opt_transparent)
1046#endif
1047 )
1090 { 1048 {
1091 const char *p = rs[Rs_backgroundPixmap]; 1049 const char *p = rs[Rs_backgroundPixmap];
1092 1050
1093 if ((p = strchr (p, ';')) != NULL) 1051 if ((p = strchr (p, ';')) != NULL)
1094 { 1052 {
… …
1100 scr_touch (true); 1058 scr_touch (true);
1101 } 1059 }
1102#endif 1060#endif
1103 1061
1104 /* graphics context for the vt window */ 1062 /* graphics context for the vt window */
1105 gcvalue.foreground = pix_colors[Color_fg]; 1063 gcvalue.foreground = pix_colors[Color_fg];
1106 gcvalue.background = pix_colors[Color_bg]; 1064 gcvalue.background = pix_colors[Color_bg];
1107 gcvalue.graphics_exposures = 1; 1065 gcvalue.graphics_exposures = 0;
1066
1108 gc = XCreateGC (disp, vt, 1067 gc = XCreateGC (dpy, vt,
1109 GCForeground | GCBackground | GCGraphicsExposures, 1068 GCForeground | GCBackground | GCGraphicsExposures,
1110 &gcvalue); 1069 &gcvalue);
1111 1070
1112 drawable = new rxvt_drawable (display, vt); 1071 drawable = new rxvt_drawable (this, vt);
1113 1072
1114#ifdef RXVT_SCROLLBAR 1073#ifdef RXVT_SCROLLBAR
1115 gcvalue.foreground = pix_colors[Color_topShadow]; 1074 gcvalue.foreground = pix_colors[Color_topShadow];
1116 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1117 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1076 gcvalue.foreground = pix_colors[Color_bottomShadow];
1118 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1077 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1119 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1078 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1120 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1079 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1121#endif 1080#endif
1122 1081
1123#ifdef OFF_FOCUS_FADING 1082#ifdef OFF_FOCUS_FADING
1124 // initially we are in unfocused state 1083 // initially we are in unfocused state
1125 if (rs[Rs_fade]) 1084 if (rs[Rs_fade])
1126 pix_colors = pix_colors_unfocused; 1085 pix_colors = pix_colors_unfocused;
1127#endif 1086#endif
1128 1087
1129 pointer_unblank (); 1088 pointer_unblank ();
1130 scr_recolour (); 1089 scr_recolour ();
1131
1132#if ENABLE_XEMBED
1133 if (rs[Rs_embed])
1134 {
1135 long info[2] = { 0, XEMBED_MAPPED };
1136
1137 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1138 32, PropModeReplace, (unsigned char *)&info, 2);
1139 }
1140#endif
1141} 1090}
1142 1091
1143/* ------------------------------------------------------------------------- * 1092/* ------------------------------------------------------------------------- *
1144 * GET TTY CURRENT STATE * 1093 * GET TTY CURRENT STATE *
1145 * ------------------------------------------------------------------------- */ 1094 * ------------------------------------------------------------------------- */
1146void 1095void
1147rxvt_get_ttymode (ttymode_t *tio, int erase) 1096rxvt_get_ttymode (ttymode_t *tio, int erase)
1148{ 1097{
1149#ifdef HAVE_TERMIOS_H
1150 /* 1098 /*
1151 * standard System V termios interface 1099 * standard System V termios interface
1152 */ 1100 */
1153 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1101 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1154 { 1102 {
… …
1221 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1169 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1222# if defined (ECHOCTL) && defined (ECHOKE) 1170# if defined (ECHOCTL) && defined (ECHOKE)
1223 | ECHOCTL | ECHOKE 1171 | ECHOCTL | ECHOKE
1224# endif 1172# endif
1225 | ECHOE | ECHOK); 1173 | ECHOE | ECHOK);
1226# else /* HAVE_TERMIOS_H */
1227
1228 /*
1229 * sgtty interface
1230 */
1231
1232 /* get parameters -- gtty */
1233 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1234 {
1235 tio->sg.sg_erase = CERASE; /* ^H */
1236 tio->sg.sg_kill = CKILL; /* ^U */
1237 }
1238
1239 if (erase != -1)
1240 tio->sg.sg_erase = (char)erase;
1241
1242 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1243
1244 /* get special characters */
1245 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1246 {
1247 tio->tc.t_intrc = CINTR; /* ^C */
1248 tio->tc.t_quitc = CQUIT; /* ^\ */
1249 tio->tc.t_startc = CSTART; /* ^Q */
1250 tio->tc.t_stopc = CSTOP; /* ^S */
1251 tio->tc.t_eofc = CEOF; /* ^D */
1252 tio->tc.t_brkc = -1;
1253 }
1254
1255 /* get local special chars */
1256 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1257 {
1258 tio->lc.t_suspc = CSUSP; /* ^Z */
1259 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1260 tio->lc.t_rprntc = CRPRNT; /* ^R */
1261 tio->lc.t_flushc = CFLUSH; /* ^O */
1262 tio->lc.t_werasc = CWERASE; /* ^W */
1263 tio->lc.t_lnextc = CLNEXT; /* ^V */
1264 }
1265 /* get line discipline */
1266 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1267# ifdef NTTYDISC
1268 tio->line = NTTYDISC;
1269# endif /* NTTYDISC */
1270
1271 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1272#endif /* HAVE_TERMIOS_H */
1273 1174
1274 /* 1175 /*
1275 * Debugging 1176 * Debugging
1276 */ 1177 */
1277#ifdef DEBUG_TTYMODE 1178#ifdef DEBUG_TTYMODE
… …
1378 else 1279 else
1379#endif 1280#endif
1380 if (!pty->get ()) 1281 if (!pty->get ())
1381 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1282 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1382 1283
1383 pty->set_utf8_mode (enc_utf8);
1384
1385 /* set initial window size */
1386 tt_winch ();
1387
1388 int er; 1284 int er;
1389 1285
1390#ifndef NO_BACKSPACE_KEY 1286#ifndef NO_BACKSPACE_KEY
1391 if (key_backspace[0] && !key_backspace[1]) 1287 if (key_backspace[0] && !key_backspace[1])
1392 er = key_backspace[0]; 1288 er = key_backspace[0];
… …
1395 else 1291 else
1396#endif 1292#endif
1397 er = -1; 1293 er = -1;
1398 1294
1399 rxvt_get_ttymode (&tio, er); 1295 rxvt_get_ttymode (&tio, er);
1296 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1297 pty->set_utf8_mode (enc_utf8);
1298
1299 /* set initial window size */
1300 tt_winch ();
1400 1301
1401#if ENABLE_FRILLS 1302#if ENABLE_FRILLS
1402 if (rs[Rs_pty_fd]) 1303 if (rs[Rs_pty_fd])
1403 return; 1304 return;
1404#endif 1305#endif
… …
1435 } 1336 }
1436 1337
1437 _exit (EXIT_FAILURE); 1338 _exit (EXIT_FAILURE);
1438 1339
1439 default: 1340 default:
1440#if UTMP_SUPPORT
1441 if (!OPTION (Opt_utmpInhibit)) 1341 if (!option (Opt_utmpInhibit))
1442 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1342 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1443#endif
1444 1343
1445 pty->close_tty (); 1344 pty->close_tty ();
1345
1346 child_ev.start (cmd_pid);
1347
1348 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1446 break; 1349 break;
1447 } 1350 }
1448} 1351}
1449 1352
1450/* ------------------------------------------------------------------------- * 1353/* ------------------------------------------------------------------------- *
… …
1457int 1360int
1458rxvt_term::run_child (const char *const *argv) 1361rxvt_term::run_child (const char *const *argv)
1459{ 1362{
1460 char *login; 1363 char *login;
1461 1364
1462 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1463
1464 if (OPTION (Opt_console)) 1365 if (option (Opt_console))
1465 { /* be virtual console, fail silently */ 1366 { /* be virtual console, fail silently */
1466#ifdef TIOCCONS 1367#ifdef TIOCCONS
1467 unsigned int on = 1; 1368 unsigned int on = 1;
1468 1369
1469 ioctl (STDIN_FILENO, TIOCCONS, &on); 1370 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1518 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1419 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1519 shell = "/bin/sh"; 1420 shell = "/bin/sh";
1520 1421
1521 argv0 = (const char *)rxvt_r_basename (shell); 1422 argv0 = (const char *)rxvt_r_basename (shell);
1522 1423
1523 if (OPTION (Opt_loginShell)) 1424 if (option (Opt_loginShell))
1524 { 1425 {
1525 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1526 1427
1527 login[0] = '-'; 1428 login[0] = '-';
1528 strcpy (&login[1], argv0); 1429 strcpy (&login[1], argv0);

Diff Legend

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