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.146 by root, Tue Jan 17 15:17:39 2006 UTC vs.
Revision 1.186 by ayin, Sat Jun 9 09:05:38 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
227 if (pix_colors == NULL)
228 return false;
229 187
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
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; 204 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 205 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 206
252 oldcursor.row = oldcursor.col = -1; 207 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND 208#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */ 209 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.x = bgPixmap.y = 0;
256 bgPixmap.pixmap = None; 211 bgPixmap.pixmap = None;
257#endif 212#endif
258 213
259 last_bot = last_state = -1; 214 last_bot = last_state = -1;
215
216 set_option (Opt_scrollBar);
217 set_option (Opt_scrollTtyOutput);
218 set_option (Opt_jumpScroll);
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
348 free (r_argv); 321 free (r_argv);
322
323 for (int i = NUM_RESOURCES; i--; )
324 if (rs [i] == resval_undef)
325 rs [i] = 0;
326
327#if ENABLE_PERL
328 if (!rs[Rs_perl_ext_1])
329 rs[Rs_perl_ext_1] = "default";
330
331 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
332 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
333 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
334 {
335 rxvt_perl.init (this);
336 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
337 }
338#endif
349 339
350 /* 340 /*
351 * set any defaults not already set 341 * set any defaults not already set
352 */ 342 */
353 if (cmd_argv && cmd_argv[0]) 343 if (cmd_argv && cmd_argv[0])
… …
439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 429 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
440#endif 430#endif
441 431
442#ifdef XTERM_REVERSE_VIDEO 432#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 433 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 434 if (option (Opt_reverseVideo))
445 { 435 {
446 if (!rs[Rs_color + Color_fg]) 436 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 437 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
438
448 if (!rs[Rs_color + Color_bg]) 439 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 440 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 441 }
451#endif 442#endif
452 443
… …
454 if (!rs[Rs_color + i]) 445 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 446 rs[Rs_color + i] = def_colorName[i];
456 447
457#ifndef XTERM_REVERSE_VIDEO 448#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 449 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 450 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 451 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 452#endif
462 453
463 /* convenient aliases for setting fg/bg to colors */ 454 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 455 color_aliases (Color_fg);
… …
504 val = rxvt_network_display (rs[Rs_display_name]); 495 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 496 rs[Rs_display_name] = (const char *)val;
506 497
507 if (val == NULL) 498 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 499#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 500 val = XDisplayString (dpy);
510 501
511 if (rs[Rs_display_name] == NULL) 502 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 503 rs[Rs_display_name] = val; /* use broken `:0' value */
513 504
514 i = strlen (val); 505 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 506 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
516 507
517 sprintf (env_display, "DISPLAY=%s", val); 508 sprintf (env_display, "DISPLAY=%s", val);
518 509
519 /* avoiding the math library: 510 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 511
529 /* add entries to the environment: 512 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 513 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 514 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 515 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 517 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 518 * @ COLORFGBG: fg;bg color codes
536 */ 519 */
537 putenv (env_display); 520 putenv (env_display);
538 putenv (env_windowid); 521 putenv (env_windowid);
522
539 if (env_colorfgbg) 523 if (env_colorfgbg)
540 putenv (env_colorfgbg); 524 putenv (env_colorfgbg);
541 525
542#ifdef RXVT_TERMINFO 526#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 527 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 528#endif
545 529
546 if (display->depth <= 2) 530 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 531 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 532 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 533 putenv ("COLORTERM=" COLORTERMENVFULL);
550 534
551 if (rs[Rs_term_name] != NULL) 535 if (rs[Rs_term_name] != NULL)
… …
645 * Initialize the command connection. 629 * Initialize the command connection.
646 * This should be called after the X server connection is established. 630 * This should be called after the X server connection is established.
647 */ 631 */
648 632
649#ifdef META8_OPTION 633#ifdef META8_OPTION
650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 634 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
651#endif 635#endif
652 636
653 get_ourmods (); 637 get_ourmods ();
654 638
655 if (!OPTION (Opt_scrollTtyOutput)) 639 if (!option (Opt_scrollTtyOutput))
656 priv_modes |= PrivMode_TtyOutputInh; 640 priv_modes |= PrivMode_TtyOutputInh;
657 if (OPTION (Opt_scrollTtyKeypress)) 641 if (option (Opt_scrollTtyKeypress))
658 priv_modes |= PrivMode_Keypress; 642 priv_modes |= PrivMode_Keypress;
659 if (!OPTION (Opt_jumpScroll)) 643 if (!option (Opt_jumpScroll))
660 priv_modes |= PrivMode_smoothScroll; 644 priv_modes |= PrivMode_smoothScroll;
661 645
662#ifndef NO_BACKSPACE_KEY 646#ifndef NO_BACKSPACE_KEY
663 if (strcmp (key_backspace, "DEC") == 0) 647 if (strcmp (key_backspace, "DEC") == 0)
664 priv_modes |= PrivMode_HaveBackSpace; 648 priv_modes |= PrivMode_HaveBackSpace;
… …
682 666
683#ifdef OFF_FOCUS_FADING 667#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 668 pix_colors = pix_colors_focused;
685#endif 669#endif
686 670
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 671 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 672 {
673 const char *name = rs[Rs_color + i];
674
675 if (!name)
676 continue;
677
689 rxvt_color xcol; 678 rxvt_color xcol;
690 679
691 if (!rs[Rs_color + i]) 680 if (!set_color (xcol, name))
692 continue;
693
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
695 { 681 {
696#ifndef XTERM_REVERSE_VIDEO 682#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 683 if (i < 2 && option (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 684 name = def_colorName [1 - i];
699 else 685 else
700#endif 686#endif
701 rs[Rs_color + i] = def_colorName[i]; 687 name = def_colorName [i];
702 688
703 if (!rs[Rs_color + i]) 689 if (!name)
704 continue; 690 continue;
705 691
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 692 if (!set_color (xcol, name))
707 { 693 {
708 switch (i) 694 switch (i)
709 { 695 {
710 case Color_fg: 696 case Color_fg:
711 case Color_bg: 697 case Color_bg:
712 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 698 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */ 699 name = "";
715 break; 700 break;
716#ifndef NO_CURSORCOLOR 701#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 702 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 703#endif
719 break;
720#endif /* ! NO_CURSORCOLOR */
721 case Color_pointer_fg: 704 case Color_pointer_fg:
722 xcol = pix_colors[Color_fg]; 705 name = rs[Rs_color + Color_fg];
706 xcol.set (this, name);
723 break; 707 break;
724 default: 708 default:
725 xcol = pix_colors[Color_bg]; /* None */ 709 name = rs[Rs_color + Color_bg];
710 xcol.set (this, name);
726 break; 711 break;
727 } 712 }
728 } 713 }
729 } 714 }
730 715
731 pix_colors[i] = xcol; 716 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i); 717 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 { 718 }
719
720 if (depth <= 2)
721 {
743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 722 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]; 723 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]; 724 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
746 } 725 }
747 726
748 /* 727 /*
749 * get scrollBar shadow colors 728 * get scrollBar shadow colors
750 * 729 *
751 * The calculations of topShadow/bottomShadow values are adapted 730 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 731 * from the fvwm window manager.
753 */ 732 */
754#ifdef KEEP_SCROLLCOLOR 733#ifdef KEEP_SCROLLCOLOR
755
756 if (display->depth <= 2) 734 if (depth <= 2)
757 { 735 {
758 /* Monochrome */ 736 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 737 alias_color (Color_scroll, Color_fg);
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 738 alias_color (Color_topShadow, Color_bg);
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 739 alias_color (Color_bottomShadow, Color_bg);
762 } 740 }
763 else 741 else
764 { 742 {
765 rxvt_color xcol[2]; 743 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 744
770 xcol[1] = pix_colors[Color_scroll]; 745 rgba cscroll;
771 xcol[0].set (display, 65535, 65535, 65535); 746 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 747
780 /* topShadowColor */ 748 /* topShadowColor */
781 if (!xcol[1].set (display, 749 if (!pix_colors[Color_topShadow].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 750 rgba (
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 751 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 752 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
785 xcol[1] = pix_colors[Color_White]; 753 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
786 754 cscroll.a)
787 pix_colors[Color_topShadow] = xcol[1]; 755 ))
756 alias_color (Color_topShadow, Color_White);
788 } 757 }
789#endif /* KEEP_SCROLLCOLOR */ 758#endif /* KEEP_SCROLLCOLOR */
759
760#ifdef OFF_FOCUS_FADING
761 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
762 update_fade_color (i);
763#endif
790} 764}
791 765
792/*----------------------------------------------------------------------*/ 766/*----------------------------------------------------------------------*/
793/* color aliases, fg/bg bright-bold */ 767/* color aliases, fg/bg bright-bold */
794void 768void
… …
833 807
834 if (rsmod 808 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 809 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 810 requestedmeta = rsmod[3] - '0';
837 811
838 map = XGetModifierMapping (display->display); 812 map = XGetModifierMapping (dpy);
839 kc = map->modifiermap; 813 kc = map->modifiermap;
840 814
841 for (i = 1; i < 6; i++) 815 for (i = 1; i < 6; i++)
842 { 816 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 817 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 819 for (j = map->max_keypermod; j--; k++)
846 { 820 {
847 if (kc[k] == 0) 821 if (kc[k] == 0)
848 break; 822 break;
849 823
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 824 switch (XKeycodeToKeysym (dpy, kc[k], 0))
851 { 825 {
852 case XK_Num_Lock: 826 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 827 ModNumLockMask = modmasks[i - 1];
854 continue; 828 continue;
855 829
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 879rxvt_term::create_windows (int argc, const char *const *argv)
906{ 880{
907 XClassHint classHint; 881 XClassHint classHint;
908 XWMHints wmHint; 882 XWMHints wmHint;
909#if ENABLE_FRILLS 883#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 884 MWMHints mwmhints;
912#endif 885#endif
913 XGCValues gcvalue; 886 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 887 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 888 Window top, parent;
917 dDisp;
918 889
919#ifdef USING_W11LIB 890 dLocal (Display *, dpy);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923 891
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 892 /* grab colors before netscape does */
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 893 Get_Colours ();
926 894
927 if (OPTION (Opt_transparent)) 895 if (!set_fonts ())
928 { 896 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 897
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 898 parent = display->root;
931 } 899
900 attributes.override_redirect = !!option (Opt_override_redirect);
932 901
933#if ENABLE_FRILLS 902#if ENABLE_FRILLS
934 if (OPTION (Opt_borderLess)) 903 if (option (Opt_borderLess))
935 { 904 {
936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 905 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
937
938 if (prop == None)
939 { 906 {
940 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 907 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
941#ifdef PREFER_24BIT
942 attributes.override_redirect = TRUE; 908 attributes.override_redirect = true;
943#endif
944 mwmhints.flags = 0; 909 mwmhints.flags = 0;
945 } 910 }
946 else 911 else
947 { 912 {
948 mwmhints.flags = MWM_HINTS_DECORATIONS; 913 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
951 } 916 }
952 else 917 else
953 mwmhints.flags = 0; 918 mwmhints.flags = 0;
954#endif 919#endif
955 920
956 /* grab colors before netscape does */
957 Get_Colours ();
958
959 if (!set_fonts ())
960 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
961
962 parent = DefaultRootWindow (disp);
963
964#if ENABLE_XEMBED 921#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 922 if (rs[Rs_embed])
966 { 923 {
967 XWindowAttributes wattr; 924 XWindowAttributes wattr;
968 925
969 parent = strtol (rs[Rs_embed], 0, 0); 926 parent = strtol (rs[Rs_embed], 0, 0);
970 927
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 928 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 929 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 930
974 window_calc (wattr.width, wattr.height); 931 window_calc (wattr.width, wattr.height);
975 } 932 }
976#endif 933#endif
977 934
978 window_calc (0, 0); 935 window_calc (0, 0);
979 936
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 937 /* sub-window placement & size in rxvt_resize_subwindows () */
981#ifdef PREFER_24BIT
982 attributes.background_pixel = pix_colors_focused[Color_border]; 938 attributes.background_pixel = pix_colors_focused [Color_border];
983 attributes.border_pixel = pix_colors_focused[Color_border]; 939 attributes.border_pixel = pix_colors_focused [Color_border];
984 attributes.colormap = display->cmap; 940 attributes.colormap = cmap;
941
985 top = XCreateWindow (disp, parent, 942 top = XCreateWindow (dpy, parent,
986 szHint.x, szHint.y, 943 szHint.x, szHint.y,
987 szHint.width, szHint.height, 944 szHint.width, szHint.height,
988 ext_bwidth, 945 ext_bwidth,
989 display->depth, InputOutput, 946 depth, InputOutput, visual,
990 display->visual,
991 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 947 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
992#else 948 &attributes);
993 top = XCreateSimpleWindow (disp, parent,
994 szHint.x, szHint.y,
995 szHint.width, szHint.height,
996 ext_bwidth,
997 pix_colors_focused[Color_border],
998 pix_colors_focused[Color_border]);
999#endif
1000 949
1001 this->parent[0] = top; 950 this->parent[0] = top;
1002 951
1003 old_width = szHint.width; 952 old_width = szHint.width;
1004 old_height = szHint.height; 953 old_height = szHint.height;
1005 954
1006 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 955 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 956 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008 957
1009 classHint.res_name = (char *)rs[Rs_name]; 958 classHint.res_name = (char *)rs[Rs_name];
1010 classHint.res_class = (char *)RESCLASS; 959 classHint.res_class = (char *)RESCLASS;
1011 960
1012 wmHint.flags = InputHint | StateHint | WindowGroupHint; 961 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1013 wmHint.input = True; 962 wmHint.input = True;
1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 963 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1015 wmHint.window_group = top; 964 wmHint.window_group = top;
1016 965
1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 966 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1018 &szHint, &wmHint, &classHint); 967 &szHint, &wmHint, &classHint);
968
969#if ENABLE_FRILLS
970 if (mwmhints.flags)
971 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
972 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
973#endif
1019 974
1020 Atom protocols[] = { 975 Atom protocols[] = {
1021 xa[XA_WM_DELETE_WINDOW], 976 xa[XA_WM_DELETE_WINDOW],
1022#if ENABLE_EWMH 977#if ENABLE_EWMH
1023 xa[XA_NET_WM_PING], 978 xa[XA_NET_WM_PING],
1024#endif 979#endif
1025 }; 980 };
1026 981
1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 982 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1028 983
1029#if ENABLE_FRILLS 984#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for]) 985 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 986 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif 987#endif
1033 988
1034#if ENABLE_EWMH 989#if ENABLE_EWMH
1035 long pid = getpid (); 990 long pid = getpid ();
1036 991
1037 XChangeProperty (disp, top, 992 XChangeProperty (dpy, top,
1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 993 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1039 PropModeReplace, (unsigned char *)&pid, 1); 994 PropModeReplace, (unsigned char *)&pid, 1);
1040 995
1041 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 996 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1042#endif 997#endif
1043 998
1044 XSelectInput (disp, top, 999 XSelectInput (dpy, top,
1045 KeyPressMask 1000 KeyPressMask
1046#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1001#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1047 | KeyReleaseMask 1002 | KeyReleaseMask
1048#endif 1003#endif
1049 | FocusChangeMask | VisibilityChangeMask 1004 | FocusChangeMask | VisibilityChangeMask
1050 | ExposureMask | StructureNotifyMask); 1005 | ExposureMask | StructureNotifyMask);
1051 1006
1052 termwin_ev.start (display, top); 1007 termwin_ev.start (display, top);
1053 1008
1054#if ENABLE_FRILLS
1055 if (mwmhints.flags)
1056 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1057 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1058#endif
1059
1060 /* vt cursor: Black-on-White is standard, but this is more popular */ 1009 /* vt cursor: Black-on-White is standard, but this is more popular */
1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1010 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1062 1011
1063#ifdef HAVE_SCROLLBARS 1012#ifdef HAVE_SCROLLBARS
1064 /* cursor scrollBar: Black-on-White */ 1013 /* cursor scrollBar: Black-on-White */
1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1014 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1066#endif 1015#endif
1067 1016
1068 /* the vt window */ 1017 /* the vt window */
1069 vt = XCreateSimpleWindow (disp, top, 1018 vt = XCreateSimpleWindow (dpy, top,
1070 window_vt_x,
1071 window_vt_y, 1019 window_vt_x, window_vt_y,
1072 width,
1073 height, 1020 width, height,
1074 0, 1021 0,
1075 pix_colors_focused[Color_fg], 1022 pix_colors_focused[Color_fg],
1076 pix_colors_focused[Color_bg]); 1023 pix_colors_focused[Color_bg]);
1077#ifdef DEBUG_X
1078 XStoreName (disp, vt, "vt window");
1079#endif
1080 1024
1081 attributes.bit_gravity = NorthWestGravity; 1025 attributes.bit_gravity = NorthWestGravity;
1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1026 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1083 1027
1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1028 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1085 1029
1086 if (OPTION (Opt_pointerBlank)) 1030 if (option (Opt_pointerBlank))
1087 vt_emask |= PointerMotionMask; 1031 vt_emask |= PointerMotionMask;
1088 else 1032 else
1089 vt_emask |= Button1MotionMask | Button3MotionMask; 1033 vt_emask |= Button1MotionMask | Button3MotionMask;
1090 1034
1091 vt_select_input (); 1035 vt_select_input ();
1092 1036
1093 vt_ev.start (display, vt); 1037 vt_ev.start (display, vt);
1094 1038
1095#ifdef XPM_BACKGROUND 1039#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL 1040 if (rs[Rs_backgroundPixmap] != NULL
1041#ifndef HAVE_AFTERIMAGE
1097 && ! OPTION (Opt_transparent)) 1042 && !option (Opt_transparent)
1043#endif
1044 )
1098 { 1045 {
1099 const char *p = rs[Rs_backgroundPixmap]; 1046 const char *p = rs[Rs_backgroundPixmap];
1100 1047
1101 if ((p = strchr (p, ';')) != NULL) 1048 if ((p = strchr (p, ';')) != NULL)
1102 { 1049 {
… …
1108 scr_touch (true); 1055 scr_touch (true);
1109 } 1056 }
1110#endif 1057#endif
1111 1058
1112 /* graphics context for the vt window */ 1059 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1060 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1061 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1062 gcvalue.graphics_exposures = 0;
1063
1116 gc = XCreateGC (disp, vt, 1064 gc = XCreateGC (dpy, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1065 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1066 &gcvalue);
1119 1067
1120 drawable = new rxvt_drawable (display, vt); 1068 drawable = new rxvt_drawable (this, vt);
1121 1069
1122#ifdef RXVT_SCROLLBAR 1070#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1071 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1072 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1073 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1074 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1075 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1076 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1129#endif 1077#endif
1130 1078
1131#ifdef OFF_FOCUS_FADING 1079#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1080 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1081 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1082 pix_colors = pix_colors_unfocused;
1135#endif 1083#endif
1136 1084
1137 pointer_unblank (); 1085 pointer_unblank ();
1138 scr_recolour (); 1086 scr_recolour ();
1139
1140#if ENABLE_XEMBED
1141 if (rs[Rs_embed])
1142 {
1143 long info[2] = { 0, XEMBED_MAPPED };
1144
1145 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1146 32, PropModeReplace, (unsigned char *)&info, 2);
1147 }
1148#endif
1149} 1087}
1150 1088
1151/* ------------------------------------------------------------------------- * 1089/* ------------------------------------------------------------------------- *
1152 * GET TTY CURRENT STATE * 1090 * GET TTY CURRENT STATE *
1153 * ------------------------------------------------------------------------- */ 1091 * ------------------------------------------------------------------------- */
1154void 1092void
1155rxvt_get_ttymode (ttymode_t *tio, int erase) 1093rxvt_get_ttymode (ttymode_t *tio, int erase)
1156{ 1094{
1157#ifdef HAVE_TERMIOS_H
1158 /* 1095 /*
1159 * standard System V termios interface 1096 * standard System V termios interface
1160 */ 1097 */
1161 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1098 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1162 { 1099 {
… …
1229 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1166 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1230# if defined (ECHOCTL) && defined (ECHOKE) 1167# if defined (ECHOCTL) && defined (ECHOKE)
1231 | ECHOCTL | ECHOKE 1168 | ECHOCTL | ECHOKE
1232# endif 1169# endif
1233 | ECHOE | ECHOK); 1170 | ECHOE | ECHOK);
1234# else /* HAVE_TERMIOS_H */
1235
1236 /*
1237 * sgtty interface
1238 */
1239
1240 /* get parameters -- gtty */
1241 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1242 {
1243 tio->sg.sg_erase = CERASE; /* ^H */
1244 tio->sg.sg_kill = CKILL; /* ^U */
1245 }
1246
1247 if (erase != -1)
1248 tio->sg.sg_erase = (char)erase;
1249
1250 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1251
1252 /* get special characters */
1253 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1254 {
1255 tio->tc.t_intrc = CINTR; /* ^C */
1256 tio->tc.t_quitc = CQUIT; /* ^\ */
1257 tio->tc.t_startc = CSTART; /* ^Q */
1258 tio->tc.t_stopc = CSTOP; /* ^S */
1259 tio->tc.t_eofc = CEOF; /* ^D */
1260 tio->tc.t_brkc = -1;
1261 }
1262
1263 /* get local special chars */
1264 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1265 {
1266 tio->lc.t_suspc = CSUSP; /* ^Z */
1267 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1268 tio->lc.t_rprntc = CRPRNT; /* ^R */
1269 tio->lc.t_flushc = CFLUSH; /* ^O */
1270 tio->lc.t_werasc = CWERASE; /* ^W */
1271 tio->lc.t_lnextc = CLNEXT; /* ^V */
1272 }
1273 /* get line discipline */
1274 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1275# ifdef NTTYDISC
1276 tio->line = NTTYDISC;
1277# endif /* NTTYDISC */
1278
1279 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1280#endif /* HAVE_TERMIOS_H */
1281 1171
1282 /* 1172 /*
1283 * Debugging 1173 * Debugging
1284 */ 1174 */
1285#ifdef DEBUG_TTYMODE 1175#ifdef DEBUG_TTYMODE
… …
1386 else 1276 else
1387#endif 1277#endif
1388 if (!pty->get ()) 1278 if (!pty->get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1279 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1280
1391 pty->set_utf8_mode (enc_utf8);
1392
1393 /* set initial window size */
1394 tt_winch ();
1395
1396 int er; 1281 int er;
1397 1282
1398#ifndef NO_BACKSPACE_KEY 1283#ifndef NO_BACKSPACE_KEY
1399 if (key_backspace[0] && !key_backspace[1]) 1284 if (key_backspace[0] && !key_backspace[1])
1400 er = key_backspace[0]; 1285 er = key_backspace[0];
… …
1403 else 1288 else
1404#endif 1289#endif
1405 er = -1; 1290 er = -1;
1406 1291
1407 rxvt_get_ttymode (&tio, er); 1292 rxvt_get_ttymode (&tio, er);
1293 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1294 pty->set_utf8_mode (enc_utf8);
1295
1296 /* set initial window size */
1297 tt_winch ();
1408 1298
1409#if ENABLE_FRILLS 1299#if ENABLE_FRILLS
1410 if (rs[Rs_pty_fd]) 1300 if (rs[Rs_pty_fd])
1411 return; 1301 return;
1412#endif 1302#endif
… …
1443 } 1333 }
1444 1334
1445 _exit (EXIT_FAILURE); 1335 _exit (EXIT_FAILURE);
1446 1336
1447 default: 1337 default:
1448 if (!OPTION (Opt_utmpInhibit)) 1338 if (!option (Opt_utmpInhibit))
1449 pty->login (cmd_pid, OPTION (Opt_loginShell), rs[Rs_display_name]); 1339 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1450 1340
1451 pty->close_tty (); 1341 pty->close_tty ();
1342
1343 child_ev.start (cmd_pid);
1344
1345 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1452 break; 1346 break;
1453 } 1347 }
1454} 1348}
1455 1349
1456/* ------------------------------------------------------------------------- * 1350/* ------------------------------------------------------------------------- *
… …
1463int 1357int
1464rxvt_term::run_child (const char *const *argv) 1358rxvt_term::run_child (const char *const *argv)
1465{ 1359{
1466 char *login; 1360 char *login;
1467 1361
1468 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1469
1470 if (OPTION (Opt_console)) 1362 if (option (Opt_console))
1471 { /* be virtual console, fail silently */ 1363 { /* be virtual console, fail silently */
1472#ifdef TIOCCONS 1364#ifdef TIOCCONS
1473 unsigned int on = 1; 1365 unsigned int on = 1;
1474 1366
1475 ioctl (STDIN_FILENO, TIOCCONS, &on); 1367 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1524 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1416 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1525 shell = "/bin/sh"; 1417 shell = "/bin/sh";
1526 1418
1527 argv0 = (const char *)rxvt_r_basename (shell); 1419 argv0 = (const char *)rxvt_r_basename (shell);
1528 1420
1529 if (OPTION (Opt_loginShell)) 1421 if (option (Opt_loginShell))
1530 { 1422 {
1531 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1423 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1532 1424
1533 login[0] = '-'; 1425 login[0] = '-';
1534 strcpy (&login[1], argv0); 1426 strcpy (&login[1], argv0);

Diff Legend

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