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.144 by root, Tue Jan 17 11:02:10 2006 UTC vs.
Revision 1.208 by ayin, Mon Sep 3 08:48:00 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
166#endif 166#endif
167#ifdef KEEP_SCROLLCOLOR 167#ifdef KEEP_SCROLLCOLOR
168 COLOR_SCROLLBAR, 168 COLOR_SCROLLBAR,
169 COLOR_SCROLLTROUGH, 169 COLOR_SCROLLTROUGH,
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if ENABLE_TRANSPARENCY
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#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;
204#ifdef HAVE_BG_PIXMAP
205#ifdef HAVE_AFTERIMAGE
206 bgPixmap.original_asim = NULL;
207#endif
208 /* bgPixmap.w = bgPixmap.h = 0; */
253#ifdef XPM_BACKGROUND 209#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 210 bgPixmap.h_scale = bgPixmap.v_scale = 0;
211 bgPixmap.h_align = bgPixmap.v_align = 0;
212#endif
213 bgPixmap.flags = 0;
256 bgPixmap.pixmap = None; 214 bgPixmap.pixmap = None;
257#endif 215#endif
258
259 last_bot = last_state = -1; 216 last_bot = last_state = -1;
217
218 set_option (Opt_scrollBar);
219 set_option (Opt_scrollTtyOutput);
220 set_option (Opt_jumpScroll);
221 set_option (Opt_skipScroll);
222 set_option (Opt_secondaryScreen);
223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
260 227
261 return true; 228 return true;
262} 229}
263 230
264void 231void
… …
302 int i, r_argc; 269 int i, r_argc;
303 char *val; 270 char *val;
304 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
305 272
306 /* 273 /*
307 * Look for -exec option. Find => split and make cmd_argv[] of command args 274 * Look for -e option. Find => split and make cmd_argv[] of command args
308 */ 275 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
311 break; 278 break;
312 279
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 281
315 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
341 get_options (r_argc, r_argv); 308 get_options (r_argc, r_argv);
342 309
343 if (!(display = displays.get (rs[Rs_display_name]))) 310 if (!(display = displays.get (rs[Rs_display_name])))
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 311 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345 312
313 // using a local pointer decreases code size a lot
314 xa = display->xa;
315
316 set (display);
346 extract_resources (); 317 extract_resources ();
347 318
319#if XFT
320 if (rs[Rs_depth])
321 select_visual (strtol (rs[Rs_depth], 0, 0));
322#endif
323
324#ifdef HAVE_AFTERIMAGE
325 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
326#endif
348 free (r_argv); 327 free (r_argv);
328
329 for (int i = NUM_RESOURCES; i--; )
330 if (rs [i] == resval_undef)
331 rs [i] = 0;
332
333#if ENABLE_PERL
334 if (!rs[Rs_perl_ext_1])
335 rs[Rs_perl_ext_1] = "default";
336
337 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
338 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
339 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
340 {
341 rxvt_perl.init (this);
342 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
343 }
344#endif
349 345
350 /* 346 /*
351 * set any defaults not already set 347 * set any defaults not already set
352 */ 348 */
353 if (cmd_argv && cmd_argv[0]) 349 if (cmd_argv && cmd_argv[0])
… …
439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 435 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
440#endif 436#endif
441 437
442#ifdef XTERM_REVERSE_VIDEO 438#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 439 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 440 if (option (Opt_reverseVideo))
445 { 441 {
446 if (!rs[Rs_color + Color_fg]) 442 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 443 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
444
448 if (!rs[Rs_color + Color_bg]) 445 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 446 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 447 }
451#endif 448#endif
452 449
… …
454 if (!rs[Rs_color + i]) 451 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 452 rs[Rs_color + i] = def_colorName[i];
456 453
457#ifndef XTERM_REVERSE_VIDEO 454#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 455 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 456 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 457 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 458#endif
462 459
463 /* convenient aliases for setting fg/bg to colors */ 460 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 461 color_aliases (Color_fg);
… …
485/*----------------------------------------------------------------------*/ 482/*----------------------------------------------------------------------*/
486void 483void
487rxvt_term::init_env () 484rxvt_term::init_env ()
488{ 485{
489 int i; 486 int i;
490 unsigned int u;
491 char *val; 487 char *val;
492 488
493#ifdef DISPLAY_IS_IP 489#ifdef DISPLAY_IS_IP
494 /* Fixup display_name for export over pty to any interested terminal 490 /* Fixup display_name for export over pty to any interested terminal
495 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 491 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
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);
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)
552 { 541 {
553 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char)); 542 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
554 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 543 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
555 putenv (env_term); 544 putenv (env_term);
556 } 545 }
557 else 546 else
558 putenv ("TERM=" TERMENV); 547 putenv ("TERM=" TERMENV);
… …
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 // rxvt_warn("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;
945 } 914 }
946 else 915 else
947 { 916 {
948 mwmhints.flags = MWM_HINTS_DECORATIONS; 917 mwmhints.flags = MWM_HINTS_DECORATIONS;
949 mwmhints.decorations = 0;
950 } 918 }
951 } 919 }
952 else
953 mwmhints.flags = 0;
954#endif 920#endif
955
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 921
964#if ENABLE_XEMBED 922#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 923 if (rs[Rs_embed])
966 { 924 {
967 XWindowAttributes wattr; 925 XWindowAttributes wattr;
968 926
969 parent = strtol (rs[Rs_embed], 0, 0); 927 parent = strtol (rs[Rs_embed], 0, 0);
970 928
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 929 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 930 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 931
974 window_calc (wattr.width, wattr.height); 932 window_calc (wattr.width, wattr.height);
975 } 933 }
976#endif 934#endif
977 935
978 window_calc (0, 0); 936 window_calc (0, 0);
979 937
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 938 /* sub-window placement & size in rxvt_resize_subwindows () */
981#ifdef PREFER_24BIT
982 attributes.background_pixel = pix_colors_focused[Color_border]; 939 attributes.background_pixel = pix_colors_focused [Color_border];
983 attributes.border_pixel = pix_colors_focused[Color_border]; 940 attributes.border_pixel = pix_colors_focused [Color_border];
984 attributes.colormap = display->cmap; 941 attributes.colormap = cmap;
942
985 top = XCreateWindow (disp, parent, 943 top = XCreateWindow (dpy, parent,
986 szHint.x, szHint.y, 944 szHint.x, szHint.y,
987 szHint.width, szHint.height, 945 szHint.width, szHint.height,
988 ext_bwidth, 946 ext_bwidth,
989 display->depth, InputOutput, 947 depth, InputOutput, visual,
990 display->visual,
991 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 948 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
992#else 949 &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 950
1001 this->parent[0] = top; 951 this->parent[0] = top;
1002 952
1003 old_width = szHint.width; 953 old_width = szHint.width;
1004 old_height = szHint.height; 954 old_height = szHint.height;
1005 955
1006 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 956 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 957 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008 958
1009 classHint.res_name = (char *)rs[Rs_name]; 959 classHint.res_name = (char *)rs[Rs_name];
1010 classHint.res_class = (char *)RESCLASS; 960 classHint.res_class = (char *)RESCLASS;
1011 961
1012 wmHint.flags = InputHint | StateHint | WindowGroupHint; 962 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1013 wmHint.input = True; 963 wmHint.input = True;
1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 964 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1015 wmHint.window_group = top; 965 wmHint.window_group = top;
1016 966
1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 967 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1018 &szHint, &wmHint, &classHint); 968 &szHint, &wmHint, &classHint);
969
970#if ENABLE_FRILLS
971 if (mwmhints.flags)
972 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
973 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
974#endif
1019 975
1020 Atom protocols[] = { 976 Atom protocols[] = {
1021 xa[XA_WM_DELETE_WINDOW], 977 xa[XA_WM_DELETE_WINDOW],
1022#if ENABLE_EWMH 978#if ENABLE_EWMH
1023 xa[XA_NET_WM_PING], 979 xa[XA_NET_WM_PING],
1024#endif 980#endif
1025 }; 981 };
1026 982
1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 983 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1028 984
1029#if ENABLE_FRILLS 985#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for]) 986 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 987 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif 988#endif
1033 989
1034#if ENABLE_EWMH 990#if ENABLE_EWMH
1035 long pid = getpid (); 991 long pid = getpid ();
1036 992
1037 XChangeProperty (disp, top, 993 XChangeProperty (dpy, top,
1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 994 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1039 PropModeReplace, (unsigned char *)&pid, 1); 995 PropModeReplace, (unsigned char *)&pid, 1);
1040 996
1041 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 997 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1042#endif 998#endif
1043 999
1044 XSelectInput (disp, top, 1000 XSelectInput (dpy, top,
1045 KeyPressMask 1001 KeyPressMask
1046#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1002#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1047 | KeyReleaseMask 1003 | KeyReleaseMask
1048#endif 1004#endif
1049 | FocusChangeMask | VisibilityChangeMask 1005 | FocusChangeMask | VisibilityChangeMask
1050 | ExposureMask | StructureNotifyMask); 1006 | ExposureMask | StructureNotifyMask);
1051 1007
1052 termwin_ev.start (display, top); 1008 termwin_ev.start (display, top);
1053 1009
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 */ 1010 /* vt cursor: Black-on-White is standard, but this is more popular */
1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1011 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1062 1012
1063#ifdef HAVE_SCROLLBARS 1013#ifdef HAVE_SCROLLBARS
1064 /* cursor scrollBar: Black-on-White */ 1014 /* cursor scrollBar: Black-on-White */
1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1015 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1066#endif 1016#endif
1067 1017
1068 /* the vt window */ 1018 /* the vt window */
1069 vt = XCreateSimpleWindow (disp, top, 1019 vt = XCreateSimpleWindow (dpy, top,
1070 window_vt_x,
1071 window_vt_y, 1020 window_vt_x, window_vt_y,
1072 width,
1073 height, 1021 width, height,
1074 0, 1022 0,
1075 pix_colors_focused[Color_fg], 1023 pix_colors_focused[Color_fg],
1076 pix_colors_focused[Color_bg]); 1024 pix_colors_focused[Color_bg]);
1077#ifdef DEBUG_X
1078 XStoreName (disp, vt, "vt window");
1079#endif
1080 1025
1081 attributes.bit_gravity = NorthWestGravity; 1026 attributes.bit_gravity = NorthWestGravity;
1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1027 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1083 1028
1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1029 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1085 1030
1086 if (OPTION (Opt_pointerBlank)) 1031 if (option (Opt_pointerBlank))
1087 vt_emask |= PointerMotionMask; 1032 vt_emask |= PointerMotionMask;
1088 else 1033 else
1089 vt_emask |= Button1MotionMask | Button3MotionMask; 1034 vt_emask |= Button1MotionMask | Button3MotionMask;
1090 1035
1091 vt_select_input (); 1036 vt_select_input ();
1092 1037
1093 vt_ev.start (display, vt); 1038 vt_ev.start (display, vt);
1094 1039
1095#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL
1097 && ! OPTION (Opt_transparent))
1098 {
1099 const char *p = rs[Rs_backgroundPixmap];
1100
1101 if ((p = strchr (p, ';')) != NULL)
1102 {
1103 p++;
1104 scale_pixmap (p);
1105 }
1106
1107 set_bgPixmap (rs[Rs_backgroundPixmap]);
1108 scr_touch (true);
1109 }
1110#endif
1111
1112 /* graphics context for the vt window */ 1040 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1041 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1042 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1043 gcvalue.graphics_exposures = 0;
1044
1116 gc = XCreateGC (disp, vt, 1045 gc = XCreateGC (dpy, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1046 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1047 &gcvalue);
1119 1048
1120 drawable = new rxvt_drawable (display, vt); 1049 drawable = new rxvt_drawable (this, vt);
1121 1050
1122#ifdef RXVT_SCROLLBAR 1051#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1052 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1053 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1054 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1055 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1056 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1057 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1129#endif 1058#endif
1130 1059
1131#ifdef OFF_FOCUS_FADING 1060#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1061 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1062 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1063 pix_colors = pix_colors_unfocused;
1135#endif 1064#endif
1136 1065
1137 pointer_unblank (); 1066 pointer_unblank ();
1138 scr_recolour (); 1067 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} 1068}
1150 1069
1151/* ------------------------------------------------------------------------- * 1070/* ------------------------------------------------------------------------- *
1152 * GET TTY CURRENT STATE * 1071 * GET TTY CURRENT STATE *
1153 * ------------------------------------------------------------------------- */ 1072 * ------------------------------------------------------------------------- */
1154void 1073void
1155rxvt_get_ttymode (ttymode_t *tio, int erase) 1074rxvt_get_ttymode (ttymode_t *tio, int erase)
1156{ 1075{
1157#ifdef HAVE_TERMIOS_H
1158 /* 1076 /*
1159 * standard System V termios interface 1077 * standard System V termios interface
1160 */ 1078 */
1161 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1079 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1162 { 1080 {
… …
1229 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1147 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1230# if defined (ECHOCTL) && defined (ECHOKE) 1148# if defined (ECHOCTL) && defined (ECHOKE)
1231 | ECHOCTL | ECHOKE 1149 | ECHOCTL | ECHOKE
1232# endif 1150# endif
1233 | ECHOE | ECHOK); 1151 | 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 1152
1282 /* 1153 /*
1283 * Debugging 1154 * Debugging
1284 */ 1155 */
1285#ifdef DEBUG_TTYMODE 1156#ifdef DEBUG_TTYMODE
… …
1370rxvt_term::run_command (const char *const *argv) 1241rxvt_term::run_command (const char *const *argv)
1371{ 1242{
1372#if ENABLE_FRILLS 1243#if ENABLE_FRILLS
1373 if (rs[Rs_pty_fd]) 1244 if (rs[Rs_pty_fd])
1374 { 1245 {
1375 pty.pty = atoi (rs[Rs_pty_fd]); 1246 pty->pty = atoi (rs[Rs_pty_fd]);
1376 1247
1377 if (pty.pty >= 0) 1248 if (pty->pty >= 0)
1378 { 1249 {
1379 if (getfd_hook) 1250 if (getfd_hook)
1380 pty.pty = (*getfd_hook) (pty.pty); 1251 pty->pty = (*getfd_hook) (pty->pty);
1381 1252
1382 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1253 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1254 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384 } 1255 }
1385 } 1256 }
1386 else 1257 else
1387#endif 1258#endif
1388 if (!pty.get ()) 1259 if (!pty->get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1260 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1390
1391 pty.set_utf8_mode (enc_utf8);
1392
1393 /* set initial window size */
1394 tt_winch ();
1395 1261
1396 int er; 1262 int er;
1397 1263
1398#ifndef NO_BACKSPACE_KEY 1264#ifndef NO_BACKSPACE_KEY
1399 if (key_backspace[0] && !key_backspace[1]) 1265 if (key_backspace[0] && !key_backspace[1])
… …
1403 else 1269 else
1404#endif 1270#endif
1405 er = -1; 1271 er = -1;
1406 1272
1407 rxvt_get_ttymode (&tio, er); 1273 rxvt_get_ttymode (&tio, er);
1274 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1275 pty->set_utf8_mode (enc_utf8);
1276
1277 /* set initial window size */
1278 tt_winch ();
1408 1279
1409#if ENABLE_FRILLS 1280#if ENABLE_FRILLS
1410 if (rs[Rs_pty_fd]) 1281 if (rs[Rs_pty_fd])
1411 return; 1282 return;
1412#endif 1283#endif
… …
1420 rxvt_fatal ("can't fork, aborting.\n"); 1291 rxvt_fatal ("can't fork, aborting.\n");
1421 } 1292 }
1422 case 0: 1293 case 0:
1423 init_env (); 1294 init_env ();
1424 1295
1425 if (!pty.make_controlling_tty ()) 1296 if (!pty->make_controlling_tty ())
1426 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1297 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1427 else 1298 else
1428 { 1299 {
1429 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1300 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1430 dup2 (pty.tty, STDIN_FILENO); 1301 dup2 (pty->tty, STDIN_FILENO);
1431 dup2 (pty.tty, STDOUT_FILENO); 1302 dup2 (pty->tty, STDOUT_FILENO);
1432 dup2 (pty.tty, STDERR_FILENO); 1303 dup2 (pty->tty, STDERR_FILENO);
1433 1304
1434 // close all our file handles that we do no longer need 1305 // close all our file handles that we do no longer need
1435 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1306 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1436 { 1307 {
1437 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1308 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1438 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1309 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1439 } 1310 }
1440 1311
1441 run_child (argv); 1312 run_child (argv);
1442 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1313 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1443 } 1314 }
1444 1315
1445 _exit (EXIT_FAILURE); 1316 _exit (EXIT_FAILURE);
1446 1317
1447 default: 1318 default:
1448 { 1319 if (!option (Opt_utmpInhibit))
1449#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1320 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1450 int fdstdin;
1451 1321
1452 fdstdin = dup (STDIN_FILENO); 1322 pty->close_tty ();
1453 dup2 (pty.tty, STDIN_FILENO);
1454#endif
1455 1323
1456#ifdef UTMP_SUPPORT 1324 child_ev.start (cmd_pid);
1457 privileged_utmp (SAVE);
1458#endif
1459 1325
1460#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1326 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1461
1462 dup2 (fdstdin, STDIN_FILENO);
1463 close (fdstdin);
1464#endif
1465 }
1466
1467 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1468 break; 1327 break;
1469 } 1328 }
1470} 1329}
1471 1330
1472/* ------------------------------------------------------------------------- * 1331/* ------------------------------------------------------------------------- *
… …
1479int 1338int
1480rxvt_term::run_child (const char *const *argv) 1339rxvt_term::run_child (const char *const *argv)
1481{ 1340{
1482 char *login; 1341 char *login;
1483 1342
1484 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1485
1486 if (OPTION (Opt_console)) 1343 if (option (Opt_console))
1487 { /* be virtual console, fail silently */ 1344 { /* be virtual console, fail silently */
1488#ifdef TIOCCONS 1345#ifdef TIOCCONS
1489 unsigned int on = 1; 1346 unsigned int on = 1;
1490 1347
1491 ioctl (STDIN_FILENO, TIOCCONS, &on); 1348 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1540 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1397 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1541 shell = "/bin/sh"; 1398 shell = "/bin/sh";
1542 1399
1543 argv0 = (const char *)rxvt_r_basename (shell); 1400 argv0 = (const char *)rxvt_r_basename (shell);
1544 1401
1545 if (OPTION (Opt_loginShell)) 1402 if (option (Opt_loginShell))
1546 { 1403 {
1547 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1404 login = (char *)rxvt_malloc (strlen (argv0) + 2);
1548 1405
1549 login[0] = '-'; 1406 login[0] = '-';
1550 strcpy (&login[1], argv0); 1407 strcpy (&login[1], argv0);
1551 argv0 = login; 1408 argv0 = login;
1552 } 1409 }

Diff Legend

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