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.143 by root, Mon Jan 16 15:00:20 2006 UTC vs.
Revision 1.185 by ayin, Sat Jun 9 08:12: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);
260 223
261 return true; 224 return true;
262} 225}
263 226
264void 227void
… …
302 int i, r_argc; 265 int i, r_argc;
303 char *val; 266 char *val;
304 const char **cmd_argv, **r_argv; 267 const char **cmd_argv, **r_argv;
305 268
306 /* 269 /*
307 * Look for -exec option. Find => split and make cmd_argv[] of command args 270 * Look for -e option. Find => split and make cmd_argv[] of command args
308 */ 271 */
309 for (r_argc = 0; r_argc < argc; r_argc++) 272 for (r_argc = 0; r_argc < argc; r_argc++)
310 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 273 if (!strcmp (argv[r_argc], "-e"))
311 break; 274 break;
312 275
313 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 276 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
314 277
315 for (i = 0; i < r_argc; i++) 278 for (i = 0; i < r_argc; i++)
… …
341 get_options (r_argc, r_argv); 304 get_options (r_argc, r_argv);
342 305
343 if (!(display = displays.get (rs[Rs_display_name]))) 306 if (!(display = displays.get (rs[Rs_display_name])))
344 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 307 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
345 308
309 // using a local pointer decreases code size a lot
310 xa = display->xa;
311
312 set (display);
346 extract_resources (); 313 extract_resources ();
347 314
315#if XFT
316 if (rs[Rs_depth])
317 select_visual (strtol (rs[Rs_depth], 0, 0));
318#endif
319
348 free (r_argv); 320 free (r_argv);
321
322 for (int i = NUM_RESOURCES; i--; )
323 if (rs [i] == resval_undef)
324 rs [i] = 0;
325
326#if ENABLE_PERL
327 if (!rs[Rs_perl_ext_1])
328 rs[Rs_perl_ext_1] = "default";
329
330 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
331 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
332 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
333 {
334 rxvt_perl.init (this);
335 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
336 }
337#endif
349 338
350 /* 339 /*
351 * set any defaults not already set 340 * set any defaults not already set
352 */ 341 */
353 if (cmd_argv && cmd_argv[0]) 342 if (cmd_argv && cmd_argv[0])
… …
439 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 428 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
440#endif 429#endif
441 430
442#ifdef XTERM_REVERSE_VIDEO 431#ifdef XTERM_REVERSE_VIDEO
443 /* this is how xterm implements reverseVideo */ 432 /* this is how xterm implements reverseVideo */
444 if (OPTION (Opt_reverseVideo)) 433 if (option (Opt_reverseVideo))
445 { 434 {
446 if (!rs[Rs_color + Color_fg]) 435 if (!rs[Rs_color + Color_fg])
447 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 436 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
437
448 if (!rs[Rs_color + Color_bg]) 438 if (!rs[Rs_color + Color_bg])
449 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 439 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
450 } 440 }
451#endif 441#endif
452 442
… …
454 if (!rs[Rs_color + i]) 444 if (!rs[Rs_color + i])
455 rs[Rs_color + i] = def_colorName[i]; 445 rs[Rs_color + i] = def_colorName[i];
456 446
457#ifndef XTERM_REVERSE_VIDEO 447#ifndef XTERM_REVERSE_VIDEO
458 /* this is how we implement reverseVideo */ 448 /* this is how we implement reverseVideo */
459 if (OPTION (Opt_reverseVideo)) 449 if (option (Opt_reverseVideo))
460 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 450 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
461#endif 451#endif
462 452
463 /* convenient aliases for setting fg/bg to colors */ 453 /* convenient aliases for setting fg/bg to colors */
464 color_aliases (Color_fg); 454 color_aliases (Color_fg);
… …
504 val = rxvt_network_display (rs[Rs_display_name]); 494 val = rxvt_network_display (rs[Rs_display_name]);
505 rs[Rs_display_name] = (const char *)val; 495 rs[Rs_display_name] = (const char *)val;
506 496
507 if (val == NULL) 497 if (val == NULL)
508#endif /* DISPLAY_IS_IP */ 498#endif /* DISPLAY_IS_IP */
509 val = XDisplayString (display->display); 499 val = XDisplayString (dpy);
510 500
511 if (rs[Rs_display_name] == NULL) 501 if (rs[Rs_display_name] == NULL)
512 rs[Rs_display_name] = val; /* use broken `:0' value */ 502 rs[Rs_display_name] = val; /* use broken `:0' value */
513 503
514 i = strlen (val); 504 i = strlen (val);
515 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 505 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
516 506
517 sprintf (env_display, "DISPLAY=%s", val); 507 sprintf (env_display, "DISPLAY=%s", val);
518 508
519 /* avoiding the math library: 509 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 510
529 /* add entries to the environment: 511 /* add entries to the environment:
530 * @ DISPLAY: in case we started with -display 512 * @ DISPLAY: in case we started with -display
531 * @ WINDOWID: X window id number of the window 513 * @ WINDOWID: X window id number of the window
532 * @ COLORTERM: terminal sub-name and also indicates its color 514 * @ COLORTERM: terminal sub-name and also indicates its color
… …
534 * @ TERMINFO: path to terminfo directory 516 * @ TERMINFO: path to terminfo directory
535 * @ COLORFGBG: fg;bg color codes 517 * @ COLORFGBG: fg;bg color codes
536 */ 518 */
537 putenv (env_display); 519 putenv (env_display);
538 putenv (env_windowid); 520 putenv (env_windowid);
521
539 if (env_colorfgbg) 522 if (env_colorfgbg)
540 putenv (env_colorfgbg); 523 putenv (env_colorfgbg);
541 524
542#ifdef RXVT_TERMINFO 525#ifdef RXVT_TERMINFO
543 putenv ("TERMINFO=" RXVT_TERMINFO); 526 putenv ("TERMINFO=" RXVT_TERMINFO);
544#endif 527#endif
545 528
546 if (display->depth <= 2) 529 if (depth <= 2)
547 putenv ("COLORTERM=" COLORTERMENV "-mono"); 530 putenv ("COLORTERM=" COLORTERMENV "-mono");
548 else 531 else
549 putenv ("COLORTERM=" COLORTERMENVFULL); 532 putenv ("COLORTERM=" COLORTERMENVFULL);
550 533
551 if (rs[Rs_term_name] != NULL) 534 if (rs[Rs_term_name] != NULL)
… …
645 * Initialize the command connection. 628 * Initialize the command connection.
646 * This should be called after the X server connection is established. 629 * This should be called after the X server connection is established.
647 */ 630 */
648 631
649#ifdef META8_OPTION 632#ifdef META8_OPTION
650 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 633 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
651#endif 634#endif
652 635
653 get_ourmods (); 636 get_ourmods ();
654 637
655 if (!OPTION (Opt_scrollTtyOutput)) 638 if (!option (Opt_scrollTtyOutput))
656 priv_modes |= PrivMode_TtyOutputInh; 639 priv_modes |= PrivMode_TtyOutputInh;
657 if (OPTION (Opt_scrollTtyKeypress)) 640 if (option (Opt_scrollTtyKeypress))
658 priv_modes |= PrivMode_Keypress; 641 priv_modes |= PrivMode_Keypress;
659 if (!OPTION (Opt_jumpScroll)) 642 if (!option (Opt_jumpScroll))
660 priv_modes |= PrivMode_smoothScroll; 643 priv_modes |= PrivMode_smoothScroll;
661 644
662#ifndef NO_BACKSPACE_KEY 645#ifndef NO_BACKSPACE_KEY
663 if (strcmp (key_backspace, "DEC") == 0) 646 if (strcmp (key_backspace, "DEC") == 0)
664 priv_modes |= PrivMode_HaveBackSpace; 647 priv_modes |= PrivMode_HaveBackSpace;
… …
682 665
683#ifdef OFF_FOCUS_FADING 666#ifdef OFF_FOCUS_FADING
684 pix_colors = pix_colors_focused; 667 pix_colors = pix_colors_focused;
685#endif 668#endif
686 669
687 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 670 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
688 { 671 {
672 const char *name = rs[Rs_color + i];
673
674 if (!name)
675 continue;
676
689 rxvt_color xcol; 677 rxvt_color xcol;
690 678
691 if (!rs[Rs_color + i]) 679 if (!set_color (xcol, name))
692 continue;
693
694 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
695 { 680 {
696#ifndef XTERM_REVERSE_VIDEO 681#ifndef XTERM_REVERSE_VIDEO
697 if (i < 2 && OPTION (Opt_reverseVideo)) 682 if (i < 2 && option (Opt_reverseVideo))
698 rs[Rs_color + i] = def_colorName[!i]; 683 name = def_colorName [1 - i];
699 else 684 else
700#endif 685#endif
701 rs[Rs_color + i] = def_colorName[i]; 686 name = def_colorName [i];
702 687
703 if (!rs[Rs_color + i]) 688 if (!name)
704 continue; 689 continue;
705 690
706 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 691 if (!set_color (xcol, name))
707 { 692 {
708 switch (i) 693 switch (i)
709 { 694 {
710 case Color_fg: 695 case Color_fg:
711 case Color_bg: 696 case Color_bg:
712 /* fatal: need bg/fg color */
713 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 697 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
714 /* NOTREACHED */ 698 name = "";
715 break; 699 break;
716#ifndef NO_CURSORCOLOR 700#ifndef NO_CURSORCOLOR
717 case Color_cursor2: 701 case Color_cursor2:
718 xcol = pix_colors[Color_fg]; 702#endif
719 break;
720#endif /* ! NO_CURSORCOLOR */
721 case Color_pointer_fg: 703 case Color_pointer_fg:
722 xcol = pix_colors[Color_fg]; 704 name = rs[Rs_color + Color_fg];
705 xcol.set (this, name);
723 break; 706 break;
724 default: 707 default:
725 xcol = pix_colors[Color_bg]; /* None */ 708 name = rs[Rs_color + Color_bg];
709 xcol.set (this, name);
726 break; 710 break;
727 } 711 }
728 } 712 }
729 } 713 }
730 714
731 pix_colors[i] = xcol; 715 pix_colors[i] = xcol;
732 SET_PIXCOLOR (i); 716 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 { 717 }
718
719 if (depth <= 2)
720 {
743 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 721 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]; 722 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]; 723 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
746 } 724 }
747 725
748 /* 726 /*
749 * get scrollBar shadow colors 727 * get scrollBar shadow colors
750 * 728 *
751 * The calculations of topShadow/bottomShadow values are adapted 729 * The calculations of topShadow/bottomShadow values are adapted
752 * from the fvwm window manager. 730 * from the fvwm window manager.
753 */ 731 */
754#ifdef KEEP_SCROLLCOLOR 732#ifdef KEEP_SCROLLCOLOR
755
756 if (display->depth <= 2) 733 if (depth <= 2)
757 { 734 {
758 /* Monochrome */ 735 /* Monochrome */
759 pix_colors[Color_scroll] = pix_colors[Color_fg]; 736 alias_color (Color_scroll, Color_fg);
760 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 737 alias_color (Color_topShadow, Color_bg);
761 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 738 alias_color (Color_bottomShadow, Color_bg);
762 } 739 }
763 else 740 else
764 { 741 {
765 rxvt_color xcol[2]; 742 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 743
770 xcol[1] = pix_colors[Color_scroll]; 744 rgba cscroll;
771 xcol[0].set (display, 65535, 65535, 65535); 745 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 746
780 /* topShadowColor */ 747 /* topShadowColor */
781 if (!xcol[1].set (display, 748 if (!pix_colors[Color_topShadow].set (this,
782 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 749 rgba (
783 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 750 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
784 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 751 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
785 xcol[1] = pix_colors[Color_White]; 752 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
786 753 cscroll.a)
787 pix_colors[Color_topShadow] = xcol[1]; 754 ))
755 alias_color (Color_topShadow, Color_White);
788 } 756 }
789#endif /* KEEP_SCROLLCOLOR */ 757#endif /* KEEP_SCROLLCOLOR */
758
759#ifdef OFF_FOCUS_FADING
760 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
761 update_fade_color (i);
762#endif
790} 763}
791 764
792/*----------------------------------------------------------------------*/ 765/*----------------------------------------------------------------------*/
793/* color aliases, fg/bg bright-bold */ 766/* color aliases, fg/bg bright-bold */
794void 767void
… …
833 806
834 if (rsmod 807 if (rsmod
835 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 808 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
836 requestedmeta = rsmod[3] - '0'; 809 requestedmeta = rsmod[3] - '0';
837 810
838 map = XGetModifierMapping (display->display); 811 map = XGetModifierMapping (dpy);
839 kc = map->modifiermap; 812 kc = map->modifiermap;
840 813
841 for (i = 1; i < 6; i++) 814 for (i = 1; i < 6; i++)
842 { 815 {
843 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 816 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
845 for (j = map->max_keypermod; j--; k++) 818 for (j = map->max_keypermod; j--; k++)
846 { 819 {
847 if (kc[k] == 0) 820 if (kc[k] == 0)
848 break; 821 break;
849 822
850 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 823 switch (XKeycodeToKeysym (dpy, kc[k], 0))
851 { 824 {
852 case XK_Num_Lock: 825 case XK_Num_Lock:
853 ModNumLockMask = modmasks[i - 1]; 826 ModNumLockMask = modmasks[i - 1];
854 continue; 827 continue;
855 828
… …
905rxvt_term::create_windows (int argc, const char *const *argv) 878rxvt_term::create_windows (int argc, const char *const *argv)
906{ 879{
907 XClassHint classHint; 880 XClassHint classHint;
908 XWMHints wmHint; 881 XWMHints wmHint;
909#if ENABLE_FRILLS 882#if ENABLE_FRILLS
910 Atom prop = None;
911 MWMHints mwmhints; 883 MWMHints mwmhints;
912#endif 884#endif
913 XGCValues gcvalue; 885 XGCValues gcvalue;
914 XSetWindowAttributes attributes; 886 XSetWindowAttributes attributes;
915 XWindowAttributes gattr;
916 Window top, parent; 887 Window top, parent;
917 dDisp;
918 888
919#ifdef USING_W11LIB 889 dLocal (Display *, dpy);
920 /* enable W11 callbacks */
921 W11AddEventHandler (disp, rxvt_W11_process_x_event);
922#endif
923 890
924 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 891 /* grab colors before netscape does */
925 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 892 Get_Colours ();
926 893
927 if (OPTION (Opt_transparent)) 894 if (!set_fonts ())
928 { 895 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
929 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 896
930 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 897 parent = display->root;
931 } 898
899 attributes.override_redirect = !!option (Opt_override_redirect);
932 900
933#if ENABLE_FRILLS 901#if ENABLE_FRILLS
934 if (OPTION (Opt_borderLess)) 902 if (option (Opt_borderLess))
935 { 903 {
936 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 904 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
937
938 if (prop == None)
939 { 905 {
940 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 906 /* 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; 907 attributes.override_redirect = true;
943#endif
944 mwmhints.flags = 0; 908 mwmhints.flags = 0;
945 } 909 }
946 else 910 else
947 { 911 {
948 mwmhints.flags = MWM_HINTS_DECORATIONS; 912 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
951 } 915 }
952 else 916 else
953 mwmhints.flags = 0; 917 mwmhints.flags = 0;
954#endif 918#endif
955 919
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 920#if ENABLE_XEMBED
965 if (rs[Rs_embed]) 921 if (rs[Rs_embed])
966 { 922 {
967 XWindowAttributes wattr; 923 XWindowAttributes wattr;
968 924
969 parent = strtol (rs[Rs_embed], 0, 0); 925 parent = strtol (rs[Rs_embed], 0, 0);
970 926
971 if (!XGetWindowAttributes (disp, parent, &wattr)) 927 if (!XGetWindowAttributes (dpy, parent, &wattr))
972 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 928 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
973 929
974 window_calc (wattr.width, wattr.height); 930 window_calc (wattr.width, wattr.height);
975 } 931 }
976#endif 932#endif
977 933
978 window_calc (0, 0); 934 window_calc (0, 0);
979 935
980 /* sub-window placement & size in rxvt_resize_subwindows () */ 936 /* sub-window placement & size in rxvt_resize_subwindows () */
981#ifdef PREFER_24BIT
982 attributes.background_pixel = pix_colors_focused[Color_border]; 937 attributes.background_pixel = pix_colors_focused [Color_border];
983 attributes.border_pixel = pix_colors_focused[Color_border]; 938 attributes.border_pixel = pix_colors_focused [Color_border];
984 attributes.colormap = display->cmap; 939 attributes.colormap = cmap;
940
985 top = XCreateWindow (disp, parent, 941 top = XCreateWindow (dpy, parent,
986 szHint.x, szHint.y, 942 szHint.x, szHint.y,
987 szHint.width, szHint.height, 943 szHint.width, szHint.height,
988 ext_bwidth, 944 ext_bwidth,
989 display->depth, InputOutput, 945 depth, InputOutput, visual,
990 display->visual,
991 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 946 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
992#else 947 &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 948
1001 this->parent[0] = top; 949 this->parent[0] = top;
1002 950
1003 old_width = szHint.width; 951 old_width = szHint.width;
1004 old_height = szHint.height; 952 old_height = szHint.height;
1005 953
1006 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 954 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1007 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 955 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1008 956
1009 classHint.res_name = (char *)rs[Rs_name]; 957 classHint.res_name = (char *)rs[Rs_name];
1010 classHint.res_class = (char *)RESCLASS; 958 classHint.res_class = (char *)RESCLASS;
1011 959
1012 wmHint.flags = InputHint | StateHint | WindowGroupHint; 960 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1013 wmHint.input = True; 961 wmHint.input = True;
1014 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 962 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1015 wmHint.window_group = top; 963 wmHint.window_group = top;
1016 964
1017 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 965 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1018 &szHint, &wmHint, &classHint); 966 &szHint, &wmHint, &classHint);
967
968#if ENABLE_FRILLS
969 if (mwmhints.flags)
970 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
971 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
972#endif
1019 973
1020 Atom protocols[] = { 974 Atom protocols[] = {
1021 xa[XA_WM_DELETE_WINDOW], 975 xa[XA_WM_DELETE_WINDOW],
1022#if ENABLE_EWMH 976#if ENABLE_EWMH
1023 xa[XA_NET_WM_PING], 977 xa[XA_NET_WM_PING],
1024#endif 978#endif
1025 }; 979 };
1026 980
1027 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 981 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1028 982
1029#if ENABLE_FRILLS 983#if ENABLE_FRILLS
1030 if (rs[Rs_transient_for]) 984 if (rs[Rs_transient_for])
1031 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 985 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1032#endif 986#endif
1033 987
1034#if ENABLE_EWMH 988#if ENABLE_EWMH
1035 long pid = getpid (); 989 long pid = getpid ();
1036 990
1037 XChangeProperty (disp, top, 991 XChangeProperty (dpy, top,
1038 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 992 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1039 PropModeReplace, (unsigned char *)&pid, 1); 993 PropModeReplace, (unsigned char *)&pid, 1);
1040 994
1041 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 995 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1042#endif 996#endif
1043 997
1044 XSelectInput (disp, top, 998 XSelectInput (dpy, top,
1045 KeyPressMask 999 KeyPressMask
1046#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1000#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1047 | KeyReleaseMask 1001 | KeyReleaseMask
1048#endif 1002#endif
1049 | FocusChangeMask | VisibilityChangeMask 1003 | FocusChangeMask | VisibilityChangeMask
1050 | ExposureMask | StructureNotifyMask); 1004 | ExposureMask | StructureNotifyMask);
1051 1005
1052 termwin_ev.start (display, top); 1006 termwin_ev.start (display, top);
1053 1007
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 */ 1008 /* vt cursor: Black-on-White is standard, but this is more popular */
1061 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1009 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1062 1010
1063#ifdef HAVE_SCROLLBARS 1011#ifdef HAVE_SCROLLBARS
1064 /* cursor scrollBar: Black-on-White */ 1012 /* cursor scrollBar: Black-on-White */
1065 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1013 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1066#endif 1014#endif
1067 1015
1068 /* the vt window */ 1016 /* the vt window */
1069 vt = XCreateSimpleWindow (disp, top, 1017 vt = XCreateSimpleWindow (dpy, top,
1070 window_vt_x,
1071 window_vt_y, 1018 window_vt_x, window_vt_y,
1072 width,
1073 height, 1019 width, height,
1074 0, 1020 0,
1075 pix_colors_focused[Color_fg], 1021 pix_colors_focused[Color_fg],
1076 pix_colors_focused[Color_bg]); 1022 pix_colors_focused[Color_bg]);
1077#ifdef DEBUG_X
1078 XStoreName (disp, vt, "vt window");
1079#endif
1080 1023
1081 attributes.bit_gravity = NorthWestGravity; 1024 attributes.bit_gravity = NorthWestGravity;
1082 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1025 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1083 1026
1084 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1027 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1085 1028
1086 if (OPTION (Opt_pointerBlank)) 1029 if (option (Opt_pointerBlank))
1087 vt_emask |= PointerMotionMask; 1030 vt_emask |= PointerMotionMask;
1088 else 1031 else
1089 vt_emask |= Button1MotionMask | Button3MotionMask; 1032 vt_emask |= Button1MotionMask | Button3MotionMask;
1090 1033
1091 vt_select_input (); 1034 vt_select_input ();
1092 1035
1093 vt_ev.start (display, vt); 1036 vt_ev.start (display, vt);
1094 1037
1095#ifdef XPM_BACKGROUND 1038#ifdef XPM_BACKGROUND
1096 if (rs[Rs_backgroundPixmap] != NULL 1039 if (rs[Rs_backgroundPixmap] != NULL
1040#ifndef HAVE_AFTERIMAGE
1097 && ! OPTION (Opt_transparent)) 1041 && !option (Opt_transparent)
1042#endif
1043 )
1098 { 1044 {
1099 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1100 1046
1101 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1102 { 1048 {
… …
1108 scr_touch (true); 1054 scr_touch (true);
1109 } 1055 }
1110#endif 1056#endif
1111 1057
1112 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1113 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1114 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1115 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 0;
1062
1116 gc = XCreateGC (disp, vt, 1063 gc = XCreateGC (dpy, vt,
1117 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1118 &gcvalue); 1065 &gcvalue);
1119 1066
1120 drawable = new rxvt_drawable (display, vt); 1067 drawable = new rxvt_drawable (this, vt);
1121 1068
1122#ifdef RXVT_SCROLLBAR 1069#ifdef RXVT_SCROLLBAR
1123 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1124 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1125 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1126 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1127 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1128 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1129#endif 1076#endif
1130 1077
1131#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
1132 // initially we are in unfocused state 1079 // initially we are in unfocused state
1133 if (rs[Rs_fade]) 1080 if (rs[Rs_fade])
1134 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1135#endif 1082#endif
1136 1083
1137 pointer_unblank (); 1084 pointer_unblank ();
1138 scr_recolour (); 1085 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} 1086}
1150 1087
1151/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1152 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1153 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1154void 1091void
1155rxvt_get_ttymode (ttymode_t *tio, int erase) 1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1156{ 1093{
1157#ifdef HAVE_TERMIOS_H
1158 /* 1094 /*
1159 * standard System V termios interface 1095 * standard System V termios interface
1160 */ 1096 */
1161 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1162 { 1098 {
… …
1229 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1230# if defined (ECHOCTL) && defined (ECHOKE) 1166# if defined (ECHOCTL) && defined (ECHOKE)
1231 | ECHOCTL | ECHOKE 1167 | ECHOCTL | ECHOKE
1232# endif 1168# endif
1233 | ECHOE | ECHOK); 1169 | 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 1170
1282 /* 1171 /*
1283 * Debugging 1172 * Debugging
1284 */ 1173 */
1285#ifdef DEBUG_TTYMODE 1174#ifdef DEBUG_TTYMODE
… …
1370rxvt_term::run_command (const char *const *argv) 1259rxvt_term::run_command (const char *const *argv)
1371{ 1260{
1372#if ENABLE_FRILLS 1261#if ENABLE_FRILLS
1373 if (rs[Rs_pty_fd]) 1262 if (rs[Rs_pty_fd])
1374 { 1263 {
1375 pty.pty = atoi (rs[Rs_pty_fd]); 1264 pty->pty = atoi (rs[Rs_pty_fd]);
1376 1265
1377 if (pty.pty >= 0) 1266 if (pty->pty >= 0)
1378 { 1267 {
1379 if (getfd_hook) 1268 if (getfd_hook)
1380 pty.pty = (*getfd_hook) (pty.pty); 1269 pty->pty = (*getfd_hook) (pty->pty);
1381 1270
1382 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1271 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1383 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1272 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1384 } 1273 }
1385 } 1274 }
1386 else 1275 else
1387#endif 1276#endif
1388 if (!pty.get ()) 1277 if (!pty->get ())
1389 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1278 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 1279
1396 int er; 1280 int er;
1397 1281
1398#ifndef NO_BACKSPACE_KEY 1282#ifndef NO_BACKSPACE_KEY
1399 if (key_backspace[0] && !key_backspace[1]) 1283 if (key_backspace[0] && !key_backspace[1])
… …
1403 else 1287 else
1404#endif 1288#endif
1405 er = -1; 1289 er = -1;
1406 1290
1407 rxvt_get_ttymode (&tio, er); 1291 rxvt_get_ttymode (&tio, er);
1292 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1293 pty->set_utf8_mode (enc_utf8);
1294
1295 /* set initial window size */
1296 tt_winch ();
1408 1297
1409#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1410 if (rs[Rs_pty_fd]) 1299 if (rs[Rs_pty_fd])
1411 return; 1300 return;
1412#endif 1301#endif
1413 1302
1414#ifndef __QNX__
1415 /* spin off the command interpreter */ 1303 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1304 switch (cmd_pid = fork ())
1417 { 1305 {
1418 case -1: 1306 case -1:
1419 { 1307 {
… …
1421 rxvt_fatal ("can't fork, aborting.\n"); 1309 rxvt_fatal ("can't fork, aborting.\n");
1422 } 1310 }
1423 case 0: 1311 case 0:
1424 init_env (); 1312 init_env ();
1425 1313
1426 if (!pty.make_controlling_tty ()) 1314 if (!pty->make_controlling_tty ())
1427 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1315 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1428 else 1316 else
1429 { 1317 {
1430 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1318 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1431 dup2 (pty.tty, STDIN_FILENO); 1319 dup2 (pty->tty, STDIN_FILENO);
1432 dup2 (pty.tty, STDOUT_FILENO); 1320 dup2 (pty->tty, STDOUT_FILENO);
1433 dup2 (pty.tty, STDERR_FILENO); 1321 dup2 (pty->tty, STDERR_FILENO);
1434 1322
1435 // close all our file handles that we do no longer need 1323 // close all our file handles that we do no longer need
1436 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1324 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1437 { 1325 {
1438 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1326 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1439 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1327 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1440 } 1328 }
1441 1329
1442 run_child (argv); 1330 run_child (argv);
1443 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1331 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1444 } 1332 }
1445 1333
1446 _exit (EXIT_FAILURE); 1334 _exit (EXIT_FAILURE);
1447 1335
1448 default: 1336 default:
1449 { 1337 if (!option (Opt_utmpInhibit))
1450#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1338 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1451 int fdstdin;
1452 1339
1453 fdstdin = dup (STDIN_FILENO); 1340 pty->close_tty ();
1454 dup2 (pty.tty, STDIN_FILENO);
1455#endif
1456 1341
1457#ifdef UTMP_SUPPORT 1342 child_ev.start (cmd_pid);
1458 privileged_utmp (SAVE);
1459#endif
1460 1343
1461#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1344 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1462
1463 dup2 (fdstdin, STDIN_FILENO);
1464 close (fdstdin);
1465#endif
1466 }
1467
1468 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1469 break; 1345 break;
1470 } 1346 }
1471#else /* __QNX__ uses qnxspawn () */
1472 fchmod (pty.tty, 0622);
1473 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1474 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1475
1476 if (run_child (argv) == -1)
1477 exit (EXIT_FAILURE);
1478#endif
1479} 1347}
1480 1348
1481/* ------------------------------------------------------------------------- * 1349/* ------------------------------------------------------------------------- *
1482 * CHILD PROCESS OPERATIONS * 1350 * CHILD PROCESS OPERATIONS *
1483 * ------------------------------------------------------------------------- */ 1351 * ------------------------------------------------------------------------- */
… …
1488int 1356int
1489rxvt_term::run_child (const char *const *argv) 1357rxvt_term::run_child (const char *const *argv)
1490{ 1358{
1491 char *login; 1359 char *login;
1492 1360
1493 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1494
1495 if (OPTION (Opt_console)) 1361 if (option (Opt_console))
1496 { /* be virtual console, fail silently */ 1362 { /* be virtual console, fail silently */
1497#ifdef TIOCCONS 1363#ifdef TIOCCONS
1498 unsigned int on = 1; 1364 unsigned int on = 1;
1499 1365
1500 ioctl (STDIN_FILENO, TIOCCONS, &on); 1366 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1527 // unblock signals (signals are blocked by iom.C 1393 // unblock signals (signals are blocked by iom.C
1528 sigset_t ss; 1394 sigset_t ss;
1529 sigemptyset (&ss); 1395 sigemptyset (&ss);
1530 sigprocmask (SIG_SETMASK, &ss, 0); 1396 sigprocmask (SIG_SETMASK, &ss, 0);
1531 1397
1532#ifndef __QNX__
1533 /* command interpreter path */ 1398 /* command interpreter path */
1534 if (argv != NULL) 1399 if (argv != NULL)
1535 { 1400 {
1536# ifdef DEBUG_CMD 1401# ifdef DEBUG_CMD
1537 int i; 1402 int i;
… …
1550 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1551 shell = "/bin/sh"; 1416 shell = "/bin/sh";
1552 1417
1553 argv0 = (const char *)rxvt_r_basename (shell); 1418 argv0 = (const char *)rxvt_r_basename (shell);
1554 1419
1555 if (OPTION (Opt_loginShell)) 1420 if (option (Opt_loginShell))
1556 { 1421 {
1557 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1558 1423
1559 login[0] = '-'; 1424 login[0] = '-';
1560 strcpy (&login[1], argv0); 1425 strcpy (&login[1], argv0);
… …
1563 1428
1564 execlp (shell, argv0, NULL); 1429 execlp (shell, argv0, NULL);
1565 /* no error message: STDERR is closed! */ 1430 /* no error message: STDERR is closed! */
1566 } 1431 }
1567 1432
1568#else /* __QNX__ uses qnxspawn () */
1569
1570 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1571 char *command = NULL, fullcommand[_MAX_PATH];
1572 char **arg_v, *arg_a[2] = { NULL, NULL };
1573
1574 if (argv != NULL)
1575 {
1576 if (access (argv[0], X_OK) == -1)
1577 {
1578 if (strchr (argv[0], '/') == NULL)
1579 {
1580 searchenv (argv[0], "PATH", fullcommand);
1581
1582 if (fullcommand[0] != '\0')
1583 command = fullcommand;
1584 }
1585
1586 if (access (command, X_OK) == -1)
1587 return -1;
1588 }
1589 else
1590 command = argv[0];
1591
1592 arg_v = argv;
1593 }
1594 else
1595 {
1596 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1597 command = "/bin/sh";
1598
1599 arg_a[0] = my_basename (command);
1600
1601 if (OPTION (Opt_loginShell))
1602 {
1603 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1604
1605 login[0] = '-';
1606 strcpy (&login[1], arg_a[0]);
1607 arg_a[0] = login;
1608 }
1609
1610 arg_v = arg_a;
1611 }
1612
1613 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1614 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1615 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1616 command, arg_v, environ, iov_a, 0);
1617 if (login)
1618 free (login);
1619
1620 pty.close_tty ();
1621 return pty.pty;
1622#endif
1623
1624 return -1; 1433 return -1;
1625} 1434}
1626 1435
1627/*----------------------- end-of-file (C source) -----------------------*/ 1436/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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