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.145 by root, Tue Jan 17 12:22:59 2006 UTC vs.
Revision 1.199 by sasha, Fri Aug 3 22:40:10 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)
231 pixmap = None;
232#endif
233 188
234 MEvent.time = CurrentTime; 189 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 190 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 191 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 192 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 193 ncol = 80;
241 nrow = 24; 194 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 195 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 196 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 197 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 198 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 199 numpix_colors = TOTAL_COLORS;
247 200
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 201 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 202
252 oldcursor.row = oldcursor.col = -1; 203 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND 204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
254 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.h_scale = bgPixmap.v_scale = 0;
210 bgPixmap.h_align = bgPixmap.v_align = 0;
211 bgPixmap.flags = 0;
256 bgPixmap.pixmap = None; 212 bgPixmap.pixmap = None;
257#endif 213#endif
258 214
259 last_bot = last_state = -1; 215 last_bot = last_state = -1;
216
217 set_option (Opt_scrollBar);
218 set_option (Opt_scrollTtyOutput);
219 set_option (Opt_jumpScroll);
220 set_option (Opt_skipScroll);
221 set_option (Opt_secondaryScreen);
222 set_option (Opt_secondaryScroll);
223 set_option (Opt_pastableTabs);
224 set_option (Opt_intensityStyles);
225 set_option (Opt_iso14755_52);
260 226
261 return true; 227 return true;
262} 228}
263 229
264void 230void
… …
302 int i, r_argc; 268 int i, r_argc;
303 char *val; 269 char *val;
304 const char **cmd_argv, **r_argv; 270 const char **cmd_argv, **r_argv;
305 271
306 /* 272 /*
307 * Look for -exec option. Find => split and make cmd_argv[] of command args 273 * Look for -e option. Find => split and make cmd_argv[] of command args
308 */ 274 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 275 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 276 if (!strcmp (argv[r_argc], "-e"))
311 break; 277 break;
312 278
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 279 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 280
315 for (i = 0; i < r_argc; i++) 281 for (i = 0; i < r_argc; i++)
… …
341 get_options (r_argc, r_argv); 307 get_options (r_argc, r_argv);
342 308
343 if (!(display = displays.get (rs[Rs_display_name]))) 309 if (!(display = displays.get (rs[Rs_display_name])))
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 310 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345 311
312 // using a local pointer decreases code size a lot
313 xa = display->xa;
314
315 set (display);
346 extract_resources (); 316 extract_resources ();
347 317
318#if XFT
319 if (rs[Rs_depth])
320 select_visual (strtol (rs[Rs_depth], 0, 0));
321#endif
322
323#ifdef HAVE_AFTERIMAGE
324 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
325#endif
348 free (r_argv); 326 free (r_argv);
327
328 for (int i = NUM_RESOURCES; i--; )
329 if (rs [i] == resval_undef)
330 rs [i] = 0;
331
332#if ENABLE_PERL
333 if (!rs[Rs_perl_ext_1])
334 rs[Rs_perl_ext_1] = "default";
335
336 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
337 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
338 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
339 {
340 rxvt_perl.init (this);
341 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
342 }
343#endif
349 344
350 /* 345 /*
351 * set any defaults not already set 346 * set any defaults not already set
352 */ 347 */
353 if (cmd_argv && cmd_argv[0]) 348 if (cmd_argv && cmd_argv[0])
… …
439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 434 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
440#endif 435#endif
441 436
442#ifdef XTERM_REVERSE_VIDEO 437#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 438 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 439 if (option (Opt_reverseVideo))
445 { 440 {
446 if (!rs[Rs_color + Color_fg]) 441 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 442 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
443
448 if (!rs[Rs_color + Color_bg]) 444 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 445 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 446 }
451#endif 447#endif
452 448
… …
454 if (!rs[Rs_color + i]) 450 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 451 rs[Rs_color + i] = def_colorName[i];
456 452
457#ifndef XTERM_REVERSE_VIDEO 453#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 454 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 455 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 456 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 457#endif
462 458
463 /* convenient aliases for setting fg/bg to colors */ 459 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 460 color_aliases (Color_fg);
… …
504 val = rxvt_network_display (rs[Rs_display_name]); 500 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 501 rs[Rs_display_name] = (const char *)val;
506 502
507 if (val == NULL) 503 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 504#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 505 val = XDisplayString (dpy);
510 506
511 if (rs[Rs_display_name] == NULL) 507 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 508 rs[Rs_display_name] = val; /* use broken `:0' value */
513 509
514 i = strlen (val); 510 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 511 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
516 512
517 sprintf (env_display, "DISPLAY=%s", val); 513 sprintf (env_display, "DISPLAY=%s", val);
518 514
519 /* avoiding the math library: 515 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 516
529 /* add entries to the environment: 517 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 518 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 519 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 520 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 522 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 523 * @ COLORFGBG: fg;bg color codes
536 */ 524 */
537 putenv (env_display); 525 putenv (env_display);
538 putenv (env_windowid); 526 putenv (env_windowid);
527
539 if (env_colorfgbg) 528 if (env_colorfgbg)
540 putenv (env_colorfgbg); 529 putenv (env_colorfgbg);
541 530
542#ifdef RXVT_TERMINFO 531#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 532 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 533#endif
545 534
546 if (display->depth <= 2) 535 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 536 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 537 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 538 putenv ("COLORTERM=" COLORTERMENVFULL);
550 539
551 if (rs[Rs_term_name] != NULL) 540 if (rs[Rs_term_name] != NULL)
… …
645 * Initialize the command connection. 634 * Initialize the command connection.
646 * This should be called after the X server connection is established. 635 * This should be called after the X server connection is established.
647 */ 636 */
648 637
649#ifdef META8_OPTION 638#ifdef META8_OPTION
650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 639 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
651#endif 640#endif
652 641
653 get_ourmods (); 642 get_ourmods ();
654 643
655 if (!OPTION (Opt_scrollTtyOutput)) 644 if (!option (Opt_scrollTtyOutput))
656 priv_modes |= PrivMode_TtyOutputInh; 645 priv_modes |= PrivMode_TtyOutputInh;
657 if (OPTION (Opt_scrollTtyKeypress)) 646 if (option (Opt_scrollTtyKeypress))
658 priv_modes |= PrivMode_Keypress; 647 priv_modes |= PrivMode_Keypress;
659 if (!OPTION (Opt_jumpScroll)) 648 if (!option (Opt_jumpScroll))
660 priv_modes |= PrivMode_smoothScroll; 649 priv_modes |= PrivMode_smoothScroll;
661 650
662#ifndef NO_BACKSPACE_KEY 651#ifndef NO_BACKSPACE_KEY
663 if (strcmp (key_backspace, "DEC") == 0) 652 if (strcmp (key_backspace, "DEC") == 0)
664 priv_modes |= PrivMode_HaveBackSpace; 653 priv_modes |= PrivMode_HaveBackSpace;
… …
682 671
683#ifdef OFF_FOCUS_FADING 672#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 673 pix_colors = pix_colors_focused;
685#endif 674#endif
686 675
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 676 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 677 {
678 const char *name = rs[Rs_color + i];
679
680 if (!name)
681 continue;
682
689 rxvt_color xcol; 683 rxvt_color xcol;
690 684
691 if (!rs[Rs_color + i]) 685 if (!set_color (xcol, name))
692 continue;
693
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
695 { 686 {
696#ifndef XTERM_REVERSE_VIDEO 687#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 688 if (i < 2 && option (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 689 name = def_colorName [1 - i];
699 else 690 else
700#endif 691#endif
701 rs[Rs_color + i] = def_colorName[i]; 692 name = def_colorName [i];
702 693
703 if (!rs[Rs_color + i]) 694 if (!name)
704 continue; 695 continue;
705 696
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 697 if (!set_color (xcol, name))
707 { 698 {
708 switch (i) 699 switch (i)
709 { 700 {
710 case Color_fg: 701 case Color_fg:
711 case Color_bg: 702 case Color_bg:
712 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 703 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */ 704 name = "";
715 break; 705 break;
716#ifndef NO_CURSORCOLOR 706#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 707 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 708#endif
719 break;
720#endif /* ! NO_CURSORCOLOR */
721 case Color_pointer_fg: 709 case Color_pointer_fg:
722 xcol = pix_colors[Color_fg]; 710 name = rs[Rs_color + Color_fg];
711 xcol.set (this, name);
723 break; 712 break;
724 default: 713 default:
725 xcol = pix_colors[Color_bg]; /* None */ 714 name = rs[Rs_color + Color_bg];
715 xcol.set (this, name);
726 break; 716 break;
727 } 717 }
728 } 718 }
729 } 719 }
730 720
731 pix_colors[i] = xcol; 721 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i); 722 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 { 723 }
724
725 if (depth <= 2)
726 {
743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 727 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]; 728 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]; 729 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
746 } 730 }
747 731
748 /* 732 /*
749 * get scrollBar shadow colors 733 * get scrollBar shadow colors
750 * 734 *
751 * The calculations of topShadow/bottomShadow values are adapted 735 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 736 * from the fvwm window manager.
753 */ 737 */
754#ifdef KEEP_SCROLLCOLOR 738#ifdef KEEP_SCROLLCOLOR
755
756 if (display->depth <= 2) 739 if (depth <= 2)
757 { 740 {
758 /* Monochrome */ 741 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 742 alias_color (Color_scroll, Color_fg);
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 743 alias_color (Color_topShadow, Color_bg);
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 744 alias_color (Color_bottomShadow, Color_bg);
762 } 745 }
763 else 746 else
764 { 747 {
765 rxvt_color xcol[2]; 748 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 749
770 xcol[1] = pix_colors[Color_scroll]; 750 rgba cscroll;
771 xcol[0].set (display, 65535, 65535, 65535); 751 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 752
780 /* topShadowColor */ 753 /* topShadowColor */
781 if (!xcol[1].set (display, 754 if (!pix_colors[Color_topShadow].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 755 rgba (
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 756 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 757 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
785 xcol[1] = pix_colors[Color_White]; 758 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
786 759 cscroll.a)
787 pix_colors[Color_topShadow] = xcol[1]; 760 ))
761 alias_color (Color_topShadow, Color_White);
788 } 762 }
789#endif /* KEEP_SCROLLCOLOR */ 763#endif /* KEEP_SCROLLCOLOR */
764
765#ifdef OFF_FOCUS_FADING
766 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
767 update_fade_color (i);
768#endif
790} 769}
791 770
792/*----------------------------------------------------------------------*/ 771/*----------------------------------------------------------------------*/
793/* color aliases, fg/bg bright-bold */ 772/* color aliases, fg/bg bright-bold */
794void 773void
… …
833 812
834 if (rsmod 813 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 814 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 815 requestedmeta = rsmod[3] - '0';
837 816
838 map = XGetModifierMapping (display->display); 817 map = XGetModifierMapping (dpy);
839 kc = map->modifiermap; 818 kc = map->modifiermap;
840 819
841 for (i = 1; i < 6; i++) 820 for (i = 1; i < 6; i++)
842 { 821 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 822 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 824 for (j = map->max_keypermod; j--; k++)
846 { 825 {
847 if (kc[k] == 0) 826 if (kc[k] == 0)
848 break; 827 break;
849 828
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 829 switch (XKeycodeToKeysym (dpy, kc[k], 0))
851 { 830 {
852 case XK_Num_Lock: 831 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 832 ModNumLockMask = modmasks[i - 1];
854 continue; 833 continue;
855 834
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 884rxvt_term::create_windows (int argc, const char *const *argv)
906{ 885{
907 XClassHint classHint; 886 XClassHint classHint;
908 XWMHints wmHint; 887 XWMHints wmHint;
909#if ENABLE_FRILLS 888#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 889 MWMHints mwmhints = { };
912#endif 890#endif
913 XGCValues gcvalue; 891 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 892 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 893 Window top, parent;
917 dDisp;
918 894
919#ifdef USING_W11LIB 895 dLocal (Display *, dpy);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923 896
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 897 /* grab colors before netscape does */
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 898 Get_Colours ();
926 899
927 if (OPTION (Opt_transparent)) 900 if (!set_fonts ())
928 { 901 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 902
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 903 parent = display->root;
931 } 904
905 attributes.override_redirect = !!option (Opt_override_redirect);
932 906
933#if ENABLE_FRILLS 907#if ENABLE_FRILLS
934 if (OPTION (Opt_borderLess)) 908 if (option (Opt_borderLess))
935 { 909 {
936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 910 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
937
938 if (prop == None)
939 { 911 {
940 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 912 /* 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; 913 attributes.override_redirect = true;
943#endif
944 mwmhints.flags = 0; 914 mwmhints.flags = 0;
945 } 915 }
946 else 916 else
947 { 917 {
948 mwmhints.flags = MWM_HINTS_DECORATIONS; 918 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
951 } 921 }
952 else 922 else
953 mwmhints.flags = 0; 923 mwmhints.flags = 0;
954#endif 924#endif
955 925
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 926#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 927 if (rs[Rs_embed])
966 { 928 {
967 XWindowAttributes wattr; 929 XWindowAttributes wattr;
968 930
969 parent = strtol (rs[Rs_embed], 0, 0); 931 parent = strtol (rs[Rs_embed], 0, 0);
970 932
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 933 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 934 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 935
974 window_calc (wattr.width, wattr.height); 936 window_calc (wattr.width, wattr.height);
975 } 937 }
976#endif 938#endif
977 939
978 window_calc (0, 0); 940 window_calc (0, 0);
979 941
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 942 /* sub-window placement & size in rxvt_resize_subwindows () */
981#ifdef PREFER_24BIT
982 attributes.background_pixel = pix_colors_focused[Color_border]; 943 attributes.background_pixel = pix_colors_focused [Color_border];
983 attributes.border_pixel = pix_colors_focused[Color_border]; 944 attributes.border_pixel = pix_colors_focused [Color_border];
984 attributes.colormap = display->cmap; 945 attributes.colormap = cmap;
946
985 top = XCreateWindow (disp, parent, 947 top = XCreateWindow (dpy, parent,
986 szHint.x, szHint.y, 948 szHint.x, szHint.y,
987 szHint.width, szHint.height, 949 szHint.width, szHint.height,
988 ext_bwidth, 950 ext_bwidth,
989 display->depth, InputOutput, 951 depth, InputOutput, visual,
990 display->visual,
991 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 952 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
992#else 953 &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 954
1001 this->parent[0] = top; 955 this->parent[0] = top;
1002 956
1003 old_width = szHint.width; 957 old_width = szHint.width;
1004 old_height = szHint.height; 958 old_height = szHint.height;
1005 959
1006 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 960 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 961 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008 962
1009 classHint.res_name = (char *)rs[Rs_name]; 963 classHint.res_name = (char *)rs[Rs_name];
1010 classHint.res_class = (char *)RESCLASS; 964 classHint.res_class = (char *)RESCLASS;
1011 965
1012 wmHint.flags = InputHint | StateHint | WindowGroupHint; 966 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1013 wmHint.input = True; 967 wmHint.input = True;
1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 968 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1015 wmHint.window_group = top; 969 wmHint.window_group = top;
1016 970
1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 971 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1018 &szHint, &wmHint, &classHint); 972 &szHint, &wmHint, &classHint);
973
974#if ENABLE_FRILLS
975 if (mwmhints.flags)
976 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
977 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
978#endif
1019 979
1020 Atom protocols[] = { 980 Atom protocols[] = {
1021 xa[XA_WM_DELETE_WINDOW], 981 xa[XA_WM_DELETE_WINDOW],
1022#if ENABLE_EWMH 982#if ENABLE_EWMH
1023 xa[XA_NET_WM_PING], 983 xa[XA_NET_WM_PING],
1024#endif 984#endif
1025 }; 985 };
1026 986
1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 987 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1028 988
1029#if ENABLE_FRILLS 989#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for]) 990 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 991 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif 992#endif
1033 993
1034#if ENABLE_EWMH 994#if ENABLE_EWMH
1035 long pid = getpid (); 995 long pid = getpid ();
1036 996
1037 XChangeProperty (disp, top, 997 XChangeProperty (dpy, top,
1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 998 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1039 PropModeReplace, (unsigned char *)&pid, 1); 999 PropModeReplace, (unsigned char *)&pid, 1);
1040 1000
1041 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1001 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1042#endif 1002#endif
1043 1003
1044 XSelectInput (disp, top, 1004 XSelectInput (dpy, top,
1045 KeyPressMask 1005 KeyPressMask
1046#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1006#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1047 | KeyReleaseMask 1007 | KeyReleaseMask
1048#endif 1008#endif
1049 | FocusChangeMask | VisibilityChangeMask 1009 | FocusChangeMask | VisibilityChangeMask
1050 | ExposureMask | StructureNotifyMask); 1010 | ExposureMask | StructureNotifyMask);
1051 1011
1052 termwin_ev.start (display, top); 1012 termwin_ev.start (display, top);
1053 1013
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 */ 1014 /* vt cursor: Black-on-White is standard, but this is more popular */
1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1015 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1062 1016
1063#ifdef HAVE_SCROLLBARS 1017#ifdef HAVE_SCROLLBARS
1064 /* cursor scrollBar: Black-on-White */ 1018 /* cursor scrollBar: Black-on-White */
1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1019 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1066#endif 1020#endif
1067 1021
1068 /* the vt window */ 1022 /* the vt window */
1069 vt = XCreateSimpleWindow (disp, top, 1023 vt = XCreateSimpleWindow (dpy, top,
1070 window_vt_x,
1071 window_vt_y, 1024 window_vt_x, window_vt_y,
1072 width,
1073 height, 1025 width, height,
1074 0, 1026 0,
1075 pix_colors_focused[Color_fg], 1027 pix_colors_focused[Color_fg],
1076 pix_colors_focused[Color_bg]); 1028 pix_colors_focused[Color_bg]);
1077#ifdef DEBUG_X
1078 XStoreName (disp, vt, "vt window");
1079#endif
1080 1029
1081 attributes.bit_gravity = NorthWestGravity; 1030 attributes.bit_gravity = NorthWestGravity;
1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1031 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1083 1032
1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1033 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1085 1034
1086 if (OPTION (Opt_pointerBlank)) 1035 if (option (Opt_pointerBlank))
1087 vt_emask |= PointerMotionMask; 1036 vt_emask |= PointerMotionMask;
1088 else 1037 else
1089 vt_emask |= Button1MotionMask | Button3MotionMask; 1038 vt_emask |= Button1MotionMask | Button3MotionMask;
1090 1039
1091 vt_select_input (); 1040 vt_select_input ();
1092 1041
1093 vt_ev.start (display, vt); 1042 vt_ev.start (display, vt);
1094 1043
1095#ifdef XPM_BACKGROUND 1044#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL 1045 if (rs[Rs_backgroundPixmap] != NULL)
1097 && ! OPTION (Opt_transparent))
1098 { 1046 {
1099 const char *p = rs[Rs_backgroundPixmap]; 1047 const char *p = rs[Rs_backgroundPixmap];
1100 1048
1101 if ((p = strchr (p, ';')) != NULL) 1049 if ((p = strchr (p, ';')) != NULL)
1102 { 1050 {
1103 p++; 1051 p++;
1104 scale_pixmap (p); 1052 bgPixmap.handle_geometry (p);
1105 } 1053 }
1106 1054
1107 set_bgPixmap (rs[Rs_backgroundPixmap]); 1055 set_bgPixmap (rs[Rs_backgroundPixmap]);
1108 scr_touch (true); 1056 scr_touch (true);
1109 } 1057 }
1110#endif 1058#endif
1111 1059
1112 /* graphics context for the vt window */ 1060 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1061 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1062 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1063 gcvalue.graphics_exposures = 0;
1064
1116 gc = XCreateGC (disp, vt, 1065 gc = XCreateGC (dpy, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1066 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1067 &gcvalue);
1119 1068
1120 drawable = new rxvt_drawable (display, vt); 1069 drawable = new rxvt_drawable (this, vt);
1121 1070
1122#ifdef RXVT_SCROLLBAR 1071#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1072 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1074 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1076 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1077 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1129#endif 1078#endif
1130 1079
1131#ifdef OFF_FOCUS_FADING 1080#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1081 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1082 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1083 pix_colors = pix_colors_unfocused;
1135#endif 1084#endif
1136 1085
1137 pointer_unblank (); 1086 pointer_unblank ();
1138 scr_recolour (); 1087 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} 1088}
1150 1089
1151/* ------------------------------------------------------------------------- * 1090/* ------------------------------------------------------------------------- *
1152 * GET TTY CURRENT STATE * 1091 * GET TTY CURRENT STATE *
1153 * ------------------------------------------------------------------------- */ 1092 * ------------------------------------------------------------------------- */
1154void 1093void
1155rxvt_get_ttymode (ttymode_t *tio, int erase) 1094rxvt_get_ttymode (ttymode_t *tio, int erase)
1156{ 1095{
1157#ifdef HAVE_TERMIOS_H
1158 /* 1096 /*
1159 * standard System V termios interface 1097 * standard System V termios interface
1160 */ 1098 */
1161 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1099 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1162 { 1100 {
… …
1229 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1167 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1230# if defined (ECHOCTL) && defined (ECHOKE) 1168# if defined (ECHOCTL) && defined (ECHOKE)
1231 | ECHOCTL | ECHOKE 1169 | ECHOCTL | ECHOKE
1232# endif 1170# endif
1233 | ECHOE | ECHOK); 1171 | 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 1172
1282 /* 1173 /*
1283 * Debugging 1174 * Debugging
1284 */ 1175 */
1285#ifdef DEBUG_TTYMODE 1176#ifdef DEBUG_TTYMODE
… …
1386 else 1277 else
1387#endif 1278#endif
1388 if (!pty->get ()) 1279 if (!pty->get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1280 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390 1281
1391 pty->set_utf8_mode (enc_utf8);
1392
1393 /* set initial window size */
1394 tt_winch ();
1395
1396 int er; 1282 int er;
1397 1283
1398#ifndef NO_BACKSPACE_KEY 1284#ifndef NO_BACKSPACE_KEY
1399 if (key_backspace[0] && !key_backspace[1]) 1285 if (key_backspace[0] && !key_backspace[1])
1400 er = key_backspace[0]; 1286 er = key_backspace[0];
… …
1403 else 1289 else
1404#endif 1290#endif
1405 er = -1; 1291 er = -1;
1406 1292
1407 rxvt_get_ttymode (&tio, er); 1293 rxvt_get_ttymode (&tio, er);
1294 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1295 pty->set_utf8_mode (enc_utf8);
1296
1297 /* set initial window size */
1298 tt_winch ();
1408 1299
1409#if ENABLE_FRILLS 1300#if ENABLE_FRILLS
1410 if (rs[Rs_pty_fd]) 1301 if (rs[Rs_pty_fd])
1411 return; 1302 return;
1412#endif 1303#endif
… …
1443 } 1334 }
1444 1335
1445 _exit (EXIT_FAILURE); 1336 _exit (EXIT_FAILURE);
1446 1337
1447 default: 1338 default:
1448 { 1339 if (!option (Opt_utmpInhibit))
1449#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1340 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1450 int fdstdin;
1451
1452 fdstdin = dup (STDIN_FILENO);
1453 dup2 (pty->tty, STDIN_FILENO);
1454#endif
1455
1456#ifdef UTMP_SUPPORT
1457 privileged_utmp (SAVE);
1458#endif
1459
1460#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1461
1462 dup2 (fdstdin, STDIN_FILENO);
1463 close (fdstdin);
1464#endif
1465 }
1466 1341
1467 pty->close_tty (); 1342 pty->close_tty ();
1343
1344 child_ev.start (cmd_pid);
1345
1346 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1468 break; 1347 break;
1469 } 1348 }
1470} 1349}
1471 1350
1472/* ------------------------------------------------------------------------- * 1351/* ------------------------------------------------------------------------- *
… …
1479int 1358int
1480rxvt_term::run_child (const char *const *argv) 1359rxvt_term::run_child (const char *const *argv)
1481{ 1360{
1482 char *login; 1361 char *login;
1483 1362
1484 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1485
1486 if (OPTION (Opt_console)) 1363 if (option (Opt_console))
1487 { /* be virtual console, fail silently */ 1364 { /* be virtual console, fail silently */
1488#ifdef TIOCCONS 1365#ifdef TIOCCONS
1489 unsigned int on = 1; 1366 unsigned int on = 1;
1490 1367
1491 ioctl (STDIN_FILENO, TIOCCONS, &on); 1368 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1417 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1541 shell = "/bin/sh"; 1418 shell = "/bin/sh";
1542 1419
1543 argv0 = (const char *)rxvt_r_basename (shell); 1420 argv0 = (const char *)rxvt_r_basename (shell);
1544 1421
1545 if (OPTION (Opt_loginShell)) 1422 if (option (Opt_loginShell))
1546 { 1423 {
1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1424 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1548 1425
1549 login[0] = '-'; 1426 login[0] = '-';
1550 strcpy (&login[1], argv0); 1427 strcpy (&login[1], argv0);

Diff Legend

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