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.141 by root, Fri Jan 13 04:19:41 2006 UTC vs.
Revision 1.194 by sasha, Thu Jul 26 16:17:50 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1 /*----------------------------------------------------------------------*
2 * File: init.C 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
… …
43const char *const def_colorName[] = 43const char *const def_colorName[] =
44 { 44 {
45 COLOR_FOREGROUND, 45 COLOR_FOREGROUND,
46 COLOR_BACKGROUND, 46 COLOR_BACKGROUND,
47 /* low-intensity colors */ 47 /* low-intensity colors */
48 "Black", /* 0: black (#000000) */ 48 "rgb:00/00/00", // 0: black (Black)
49 "Red3", /* 1: red (#CD0000) */ 49 "rgb:cd/00/00", // 1: red (Red3)
50 "Green3", /* 2: green (#00CD00) */ 50 "rgb:00/cd/00", // 2: green (Green3)
51 "Yellow3", /* 3: yellow (#CDCD00) */ 51 "rgb:cd/cd/00", // 3: yellow (Yellow3)
52 "Blue3", /* 4: blue (#0000CD) */ 52 "rgb:00/00/cd", // 4: blue (Blue3)
53 "Magenta3", /* 5: magenta (#CD00CD) */ 53 "rgb:cd/00/cd", // 5: magenta (Magenta3)
54 "Cyan3", /* 6: cyan (#00CDCD) */ 54 "rgb:00/cd/cd", // 6: cyan (Cyan3)
55# ifdef XTERM_COLORS 55# ifdef XTERM_COLORS
56 "Grey90", /* 7: white (#E5E5E5) */ 56 "rgb:e5/e5/e5", // 7: white (Grey90)
57# else 57# else
58 "AntiqueWhite", /* 7: white (#FAEBD7) */ 58 "rgb:fa/eb/d7", // 7: white (AntiqueWhite)
59# endif 59# endif
60 /* high-intensity colors */ 60 /* high-intensity colors */
61# ifdef XTERM_COLORS 61# ifdef XTERM_COLORS
62 "Grey30", /* 8: bright black (#4D4D4D) */ 62 "rgb:4d/4d/4d", // 8: bright black (Grey30)
63# else 63# else
64 "Grey25", /* 8: bright black (#404040) */ 64 "rgb:40/40/40", // 8: bright black (Grey25)
65# endif 65# endif
66 "Red", /* 1/9: bright red (#FF0000) */ 66 "rgb:ff/00/00", // 1/9: bright red (Reed)
67 "Green", /* 2/10: bright green (#00FF00) */ 67 "rgb:00/ff/00", // 2/10: bright green (Green)
68 "Yellow", /* 3/11: bright yellow (#FFFF00) */ 68 "rgb:ff/ff/00", // 3/11: bright yellow (Yellow)
69 "Blue", /* 4/12: bright blue (#0000FF) */ 69 "rgb:00/00/ff", // 4/12: bright blue (Blue)
70 "Magenta", /* 5/13: bright magenta (#FF00FF) */ 70 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
71 "Cyan", /* 6/14: bright cyan (#00FFFF) */ 71 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
72 "White", /* 7/15: bright white (#FFFFFF) */ 72 "rgb:ff/ff/ff", // 7/15: bright white (White)
73 73
74 // 88 xterm colours 74 // 88 xterm colours
75 "rgb:00/00/00", 75 "rgb:00/00/00",
76 "rgb:00/00/8b", 76 "rgb:00/00/8b",
77 "rgb:00/00/cd", 77 "rgb:00/00/cd",
… …
170#endif /* KEEP_SCROLLCOLOR */ 170#endif /* KEEP_SCROLLCOLOR */
171#if TINTING 171#if TINTING
172 NULL, 172 NULL,
173#endif 173#endif
174#if OFF_FOCUS_FADING 174#if OFF_FOCUS_FADING
175 "black", 175 "rgb:00/00/00",
176#endif
177 };
178
179const char *const xa_names[] =
180 {
181 "TEXT",
182 "COMPOUND_TEXT",
183 "UTF8_STRING",
184 "MULTIPLE",
185 "TARGETS",
186 "TIMESTAMP",
187 "VT_SELECTION",
188 "INCR",
189 "WM_PROTOCOLS",
190 "WM_DELETE_WINDOW",
191 "CLIPBOARD",
192#if ENABLE_FRILLS
193 "_MOTIF_WM_HINTS",
194#endif
195#if ENABLE_EWMH
196 "_NET_WM_PID",
197 "_NET_WM_NAME",
198 "_NET_WM_ICON_NAME",
199 "_NET_WM_PING",
200#endif
201#if USE_XIM
202 "WM_LOCALE_NAME",
203#endif
204#ifdef TRANSPARENT
205 "_XROOTPMAP_ID",
206 "ESETROOT_PMAP_ID",
207#endif
208#ifdef OFFIX_DND
209 "DndProtocol",
210 "DndSelection",
211#endif
212#if ENABLE_XEMBED
213 "_XEMBED",
214 "_XEMBED_INFO",
215#endif 176#endif
216 }; 177 };
217 178
218bool 179bool
219rxvt_term::init_vars () 180rxvt_term::init_vars ()
220{ 181{
182 pix_colors = //
221 pix_colors_focused = new rxvt_color [TOTAL_COLORS]; 183 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
222#ifdef OFF_FOCUS_FADING 184#ifdef OFF_FOCUS_FADING
223 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS]; 185 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
224#endif 186#endif
225 pix_colors = pix_colors_focused;
226 187
227 if (pix_colors == NULL)
228 return false;
229
230#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 188#if defined(XPM_BACKGROUND) || defined(ENABLE_TRANSPARENCY)
231 pixmap = None; 189 pixmap = None;
232#endif 190#endif
233 191
234 MEvent.time = CurrentTime; 192 MEvent.time = CurrentTime;
235 MEvent.button = AnyButton; 193 MEvent.button = AnyButton;
236 options = DEFAULT_OPTIONS;
237 want_refresh = 1; 194 want_refresh = 1;
238 priv_modes = SavedModes = PrivMode_Default; 195 priv_modes = SavedModes = PrivMode_Default;
239 focus = 0;
240 ncol = 80; 196 ncol = 80;
241 nrow = 24; 197 nrow = 24;
242 int_bwidth = INTERNALBORDERWIDTH; 198 int_bwidth = INTERNALBORDERWIDTH;
243 ext_bwidth = EXTERNALBORDERWIDTH; 199 ext_bwidth = EXTERNALBORDERWIDTH;
244 lineSpace = LINESPACE; 200 lineSpace = LINESPACE;
245 saveLines = SAVELINES; 201 saveLines = SAVELINES;
246 numpix_colors = TOTAL_COLORS; 202 numpix_colors = TOTAL_COLORS;
247 203
248 refresh_limit = 1;
249 refresh_type = SLOW_REFRESH; 204 refresh_type = SLOW_REFRESH;
250 prev_nrow = prev_ncol = 0;
251 205
252 oldcursor.row = oldcursor.col = -1; 206 oldcursor.row = oldcursor.col = -1;
253#ifdef XPM_BACKGROUND 207#ifdef XPM_BACKGROUND
254 /* bgPixmap.w = bgPixmap.h = 0; */ 208 /* bgPixmap.w = bgPixmap.h = 0; */
255 bgPixmap.x = bgPixmap.y = 50; 209 bgPixmap.x = bgPixmap.y = 0;
256 bgPixmap.pixmap = None; 210 bgPixmap.pixmap = None;
257#endif 211#endif
258 212
259 last_bot = last_state = -1; 213 last_bot = last_state = -1;
260 214
261#ifdef MENUBAR 215 set_option (Opt_scrollBar);
262 menu_readonly = 1; 216 set_option (Opt_scrollTtyOutput);
263# if ! (MENUBAR_MAX > 1) 217 set_option (Opt_jumpScroll);
264 CurrentBar = &BarList; 218 set_option (Opt_skipScroll);
265# endif /* (MENUBAR_MAX > 1) */ 219 set_option (Opt_secondaryScreen);
266#endif 220 set_option (Opt_secondaryScroll);
221 set_option (Opt_pastableTabs);
222 set_option (Opt_intensityStyles);
223 set_option (Opt_iso14755_52);
267 224
268 return true; 225 return true;
269} 226}
270 227
271void 228void
… …
309 int i, r_argc; 266 int i, r_argc;
310 char *val; 267 char *val;
311 const char **cmd_argv, **r_argv; 268 const char **cmd_argv, **r_argv;
312 269
313 /* 270 /*
314 * Look for -exec option. Find => split and make cmd_argv[] of command args 271 * Look for -e option. Find => split and make cmd_argv[] of command args
315 */ 272 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 273 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 274 if (!strcmp (argv[r_argc], "-e"))
318 break; 275 break;
319 276
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 277 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 278
322 for (i = 0; i < r_argc; i++) 279 for (i = 0; i < r_argc; i++)
… …
348 get_options (r_argc, r_argv); 305 get_options (r_argc, r_argv);
349 306
350 if (!(display = displays.get (rs[Rs_display_name]))) 307 if (!(display = displays.get (rs[Rs_display_name])))
351 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 308 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
352 309
310 // using a local pointer decreases code size a lot
311 xa = display->xa;
312
313 set (display);
353 extract_resources (); 314 extract_resources ();
354 315
316#if XFT
317 if (rs[Rs_depth])
318 select_visual (strtol (rs[Rs_depth], 0, 0));
319#endif
320
321#ifdef HAVE_AFTERIMAGE
322 asv = create_asvisual_for_id (dpy, display->screen, depth, XVisualIDFromVisual (visual), cmap, NULL);
323#endif
355 free (r_argv); 324 free (r_argv);
325
326 for (int i = NUM_RESOURCES; i--; )
327 if (rs [i] == resval_undef)
328 rs [i] = 0;
329
330#if ENABLE_PERL
331 if (!rs[Rs_perl_ext_1])
332 rs[Rs_perl_ext_1] = "default";
333
334 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
335 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
336 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
337 {
338 rxvt_perl.init (this);
339 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
340 }
341#endif
356 342
357 /* 343 /*
358 * set any defaults not already set 344 * set any defaults not already set
359 */ 345 */
360 if (cmd_argv && cmd_argv[0]) 346 if (cmd_argv && cmd_argv[0])
… …
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 432 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 433#endif
448 434
449#ifdef XTERM_REVERSE_VIDEO 435#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 436 /* this is how xterm implements reverseVideo */
451 if (OPTION (Opt_reverseVideo)) 437 if (option (Opt_reverseVideo))
452 { 438 {
453 if (!rs[Rs_color + Color_fg]) 439 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 440 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
441
455 if (!rs[Rs_color + Color_bg]) 442 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 443 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457 } 444 }
458#endif 445#endif
459 446
… …
461 if (!rs[Rs_color + i]) 448 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 449 rs[Rs_color + i] = def_colorName[i];
463 450
464#ifndef XTERM_REVERSE_VIDEO 451#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 452 /* this is how we implement reverseVideo */
466 if (OPTION (Opt_reverseVideo)) 453 if (option (Opt_reverseVideo))
467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 454 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 455#endif
469 456
470 /* convenient aliases for setting fg/bg to colors */ 457 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 458 color_aliases (Color_fg);
… …
511 val = rxvt_network_display (rs[Rs_display_name]); 498 val = rxvt_network_display (rs[Rs_display_name]);
512 rs[Rs_display_name] = (const char *)val; 499 rs[Rs_display_name] = (const char *)val;
513 500
514 if (val == NULL) 501 if (val == NULL)
515#endif /* DISPLAY_IS_IP */ 502#endif /* DISPLAY_IS_IP */
516 val = XDisplayString (display->display); 503 val = XDisplayString (dpy);
517 504
518 if (rs[Rs_display_name] == NULL) 505 if (rs[Rs_display_name] == NULL)
519 rs[Rs_display_name] = val; /* use broken `:0' value */ 506 rs[Rs_display_name] = val; /* use broken `:0' value */
520 507
521 i = strlen (val); 508 i = strlen (val);
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 510
524 sprintf (env_display, "DISPLAY=%s", val); 511 sprintf (env_display, "DISPLAY=%s", val);
525 512
526 /* avoiding the math library: 513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
527 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
528 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
529 ;
530 max_it (i, 1);
531 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
532
533 sprintf (env_windowid, "WINDOWID=%u",
534 (unsigned int)parent[0]);
535 514
536 /* add entries to the environment: 515 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 516 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 517 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 518 * @ COLORTERM: terminal sub-name and also indicates its color
… …
541 * @ TERMINFO: path to terminfo directory 520 * @ TERMINFO: path to terminfo directory
542 * @ COLORFGBG: fg;bg color codes 521 * @ COLORFGBG: fg;bg color codes
543 */ 522 */
544 putenv (env_display); 523 putenv (env_display);
545 putenv (env_windowid); 524 putenv (env_windowid);
525
546 if (env_colorfgbg) 526 if (env_colorfgbg)
547 putenv (env_colorfgbg); 527 putenv (env_colorfgbg);
548 528
549#ifdef RXVT_TERMINFO 529#ifdef RXVT_TERMINFO
550 putenv ("TERMINFO=" RXVT_TERMINFO); 530 putenv ("TERMINFO=" RXVT_TERMINFO);
551#endif 531#endif
552 532
553 if (display->depth <= 2) 533 if (depth <= 2)
554 putenv ("COLORTERM=" COLORTERMENV "-mono"); 534 putenv ("COLORTERM=" COLORTERMENV "-mono");
555 else 535 else
556 putenv ("COLORTERM=" COLORTERMENVFULL); 536 putenv ("COLORTERM=" COLORTERMENVFULL);
557 537
558 if (rs[Rs_term_name] != NULL) 538 if (rs[Rs_term_name] != NULL)
… …
652 * Initialize the command connection. 632 * Initialize the command connection.
653 * This should be called after the X server connection is established. 633 * This should be called after the X server connection is established.
654 */ 634 */
655 635
656#ifdef META8_OPTION 636#ifdef META8_OPTION
657 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 637 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
658#endif 638#endif
659 639
660 get_ourmods (); 640 get_ourmods ();
661 641
662 if (!OPTION (Opt_scrollTtyOutput)) 642 if (!option (Opt_scrollTtyOutput))
663 priv_modes |= PrivMode_TtyOutputInh; 643 priv_modes |= PrivMode_TtyOutputInh;
664 if (OPTION (Opt_scrollTtyKeypress)) 644 if (option (Opt_scrollTtyKeypress))
665 priv_modes |= PrivMode_Keypress; 645 priv_modes |= PrivMode_Keypress;
666 if (!OPTION (Opt_jumpScroll)) 646 if (!option (Opt_jumpScroll))
667 priv_modes |= PrivMode_smoothScroll; 647 priv_modes |= PrivMode_smoothScroll;
668 648
669#ifndef NO_BACKSPACE_KEY 649#ifndef NO_BACKSPACE_KEY
670 if (strcmp (key_backspace, "DEC") == 0) 650 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 651 priv_modes |= PrivMode_HaveBackSpace;
672#endif 652#endif
673 653
674 /* add value for scrollBar */ 654 /* add value for scrollBar */
675 if (scrollbar_visible ()) 655 if (scrollBar.state)
676 { 656 {
677 priv_modes |= PrivMode_scrollBar; 657 priv_modes |= PrivMode_scrollBar;
678 SavedModes |= PrivMode_scrollBar; 658 SavedModes |= PrivMode_scrollBar;
679 }
680
681 if (menubar_visible ())
682 {
683 priv_modes |= PrivMode_menuBar;
684 SavedModes |= PrivMode_menuBar;
685 } 659 }
686 660
687 run_command (argv); 661 run_command (argv);
688} 662}
689 663
… …
695 669
696#ifdef OFF_FOCUS_FADING 670#ifdef OFF_FOCUS_FADING
697 pix_colors = pix_colors_focused; 671 pix_colors = pix_colors_focused;
698#endif 672#endif
699 673
700 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
701 { 675 {
676 const char *name = rs[Rs_color + i];
677
678 if (!name)
679 continue;
680
702 rxvt_color xcol; 681 rxvt_color xcol;
703 682
704 if (!rs[Rs_color + i]) 683 if (!set_color (xcol, name))
705 continue;
706
707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708 { 684 {
709#ifndef XTERM_REVERSE_VIDEO 685#ifndef XTERM_REVERSE_VIDEO
710 if (i < 2 && OPTION (Opt_reverseVideo)) 686 if (i < 2 && option (Opt_reverseVideo))
711 rs[Rs_color + i] = def_colorName[!i]; 687 name = def_colorName [1 - i];
712 else 688 else
713#endif 689#endif
714 rs[Rs_color + i] = def_colorName[i]; 690 name = def_colorName [i];
715 691
716 if (!rs[Rs_color + i]) 692 if (!name)
717 continue; 693 continue;
718 694
719 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 695 if (!set_color (xcol, name))
720 { 696 {
721 switch (i) 697 switch (i)
722 { 698 {
723 case Color_fg: 699 case Color_fg:
724 case Color_bg: 700 case Color_bg:
725 /* fatal: need bg/fg color */
726 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 701 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
727 /* NOTREACHED */ 702 name = "";
728 break; 703 break;
729#ifndef NO_CURSORCOLOR 704#ifndef NO_CURSORCOLOR
730 case Color_cursor2: 705 case Color_cursor2:
731 xcol = pix_colors[Color_fg]; 706#endif
732 break;
733#endif /* ! NO_CURSORCOLOR */
734 case Color_pointer_fg: 707 case Color_pointer_fg:
735 xcol = pix_colors[Color_fg]; 708 name = rs[Rs_color + Color_fg];
709 xcol.set (this, name);
736 break; 710 break;
737 default: 711 default:
738 xcol = pix_colors[Color_bg]; /* None */ 712 name = rs[Rs_color + Color_bg];
713 xcol.set (this, name);
739 break; 714 break;
740 } 715 }
741 } 716 }
742 } 717 }
743 718
744 pix_colors[i] = xcol; 719 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i); 720 rs[Rs_color + i] = name;
746 }
747
748#ifdef OFF_FOCUS_FADING
749 if (rs[Rs_fade])
750 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
751 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
752#endif
753
754 if (display->depth <= 2)
755 { 721 }
722
723 if (depth <= 2)
724 {
756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 725 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
757 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg]; 726 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
758 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg]; 727 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
759 } 728 }
760 729
761 /* 730 /*
762 * get scrollBar/menuBar shadow colors 731 * get scrollBar shadow colors
763 * 732 *
764 * The calculations of topShadow/bottomShadow values are adapted 733 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 734 * from the fvwm window manager.
766 */ 735 */
767#ifdef KEEP_SCROLLCOLOR 736#ifdef KEEP_SCROLLCOLOR
768
769 if (display->depth <= 2) 737 if (depth <= 2)
770 { 738 {
771 /* Monochrome */ 739 /* Monochrome */
772 pix_colors[Color_scroll] = pix_colors[Color_fg]; 740 alias_color (Color_scroll, Color_fg);
773 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 741 alias_color (Color_topShadow, Color_bg);
774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 742 alias_color (Color_bottomShadow, Color_bg);
775 } 743 }
776 else 744 else
777 { 745 {
778 rxvt_color xcol[2]; 746 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
779 /* xcol[0] == white
780 * xcol[1] == top shadow
781 * xcol[2] == bot shadow */
782 747
783 xcol[1] = pix_colors[Color_scroll]; 748 rgba cscroll;
784 xcol[0].set (display, 65535, 65535, 65535); 749 pix_colors [Color_scroll].get (cscroll);
785
786 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
787
788 xcol[0].get (display, pr0, pg0, pb0);
789 xcol[1].get (display, pr1, pg1, pb1);
790
791 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
792 750
793 /* topShadowColor */ 751 /* topShadowColor */
794 if (!xcol[1].set (display, 752 if (!pix_colors[Color_topShadow].set (this,
795 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 753 rgba (
796 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 754 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
797 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 755 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
798 xcol[1] = pix_colors[Color_White]; 756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
799 757 cscroll.a)
800 pix_colors[Color_topShadow] = xcol[1]; 758 ))
759 alias_color (Color_topShadow, Color_White);
801 } 760 }
802#endif /* KEEP_SCROLLCOLOR */ 761#endif /* KEEP_SCROLLCOLOR */
762
763#ifdef OFF_FOCUS_FADING
764 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
765 update_fade_color (i);
766#endif
803} 767}
804 768
805/*----------------------------------------------------------------------*/ 769/*----------------------------------------------------------------------*/
806/* color aliases, fg/bg bright-bold */ 770/* color aliases, fg/bg bright-bold */
807void 771void
… …
846 810
847 if (rsmod 811 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
850 814
851 map = XGetModifierMapping (display->display); 815 map = XGetModifierMapping (dpy);
852 kc = map->modifiermap; 816 kc = map->modifiermap;
853 817
854 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
855 { 819 {
856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
858 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
859 { 823 {
860 if (kc[k] == 0) 824 if (kc[k] == 0)
861 break; 825 break;
862 826
863 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 827 switch (XKeycodeToKeysym (dpy, kc[k], 0))
864 { 828 {
865 case XK_Num_Lock: 829 case XK_Num_Lock:
866 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
867 continue; 831 continue;
868 832
… …
918rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
919{ 883{
920 XClassHint classHint; 884 XClassHint classHint;
921 XWMHints wmHint; 885 XWMHints wmHint;
922#if ENABLE_FRILLS 886#if ENABLE_FRILLS
923 Atom prop = None;
924 MWMHints mwmhints; 887 MWMHints mwmhints;
925#endif 888#endif
926 XGCValues gcvalue; 889 XGCValues gcvalue;
927 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
928 XWindowAttributes gattr;
929 Window top, parent; 891 Window top, parent;
930 dDisp;
931 892
932#ifdef USING_W11LIB 893 dLocal (Display *, dpy);
933 /* enable W11 callbacks */
934 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif
936 894
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 895 /* grab colors before netscape does */
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 896 Get_Colours ();
939 897
940 if (OPTION (Opt_transparent)) 898 if (!set_fonts ())
941 { 899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 900
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 901 parent = display->root;
944 } 902
903 attributes.override_redirect = !!option (Opt_override_redirect);
945 904
946#if ENABLE_FRILLS 905#if ENABLE_FRILLS
947 if (OPTION (Opt_borderLess)) 906 if (option (Opt_borderLess))
948 { 907 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
950
951 if (prop == None)
952 { 909 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 910 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT
955 attributes.override_redirect = TRUE; 911 attributes.override_redirect = true;
956#endif
957 mwmhints.flags = 0; 912 mwmhints.flags = 0;
958 } 913 }
959 else 914 else
960 { 915 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 916 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
964 } 919 }
965 else 920 else
966 mwmhints.flags = 0; 921 mwmhints.flags = 0;
967#endif 922#endif
968 923
969 /* grab colors before netscape does */
970 Get_Colours ();
971
972 if (!set_fonts ())
973 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
974
975 parent = DefaultRootWindow (disp);
976
977#if ENABLE_XEMBED 924#if ENABLE_XEMBED
978 if (rs[Rs_embed]) 925 if (rs[Rs_embed])
979 { 926 {
980 XWindowAttributes wattr; 927 XWindowAttributes wattr;
981 928
982 parent = strtol (rs[Rs_embed], 0, 0); 929 parent = strtol (rs[Rs_embed], 0, 0);
983 930
984 if (!XGetWindowAttributes (disp, parent, &wattr)) 931 if (!XGetWindowAttributes (dpy, parent, &wattr))
985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 933
987 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
988 } 935 }
989#endif 936#endif
990 937
991 window_calc (0, 0); 938 window_calc (0, 0);
992 939
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
997 attributes.colormap = display->cmap; 943 attributes.colormap = cmap;
944
998 top = XCreateWindow (disp, parent, 945 top = XCreateWindow (dpy, parent,
999 szHint.x, szHint.y, 946 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 947 szHint.width, szHint.height,
1001 ext_bwidth, 948 ext_bwidth,
1002 display->depth, InputOutput, 949 depth, InputOutput, visual,
1003 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1005#else 951 &attributes);
1006 top = XCreateSimpleWindow (disp, parent,
1007 szHint.x, szHint.y,
1008 szHint.width, szHint.height,
1009 ext_bwidth,
1010 pix_colors_focused[Color_border],
1011 pix_colors_focused[Color_border]);
1012#endif
1013 952
1014 this->parent[0] = top; 953 this->parent[0] = top;
1015 954
1016 old_width = szHint.width; 955 old_width = szHint.width;
1017 old_height = szHint.height; 956 old_height = szHint.height;
1018 957
1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 958 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1020 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 959 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1021 960
1022 classHint.res_name = (char *)rs[Rs_name]; 961 classHint.res_name = (char *)rs[Rs_name];
1023 classHint.res_class = (char *)RESCLASS; 962 classHint.res_class = (char *)RESCLASS;
1024 963
1025 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1026 wmHint.input = True; 965 wmHint.input = True;
1027 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1028 wmHint.window_group = top; 967 wmHint.window_group = top;
1029 968
1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1031 &szHint, &wmHint, &classHint); 970 &szHint, &wmHint, &classHint);
971
972#if ENABLE_FRILLS
973 if (mwmhints.flags)
974 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
975 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
976#endif
1032 977
1033 Atom protocols[] = { 978 Atom protocols[] = {
1034 xa[XA_WM_DELETE_WINDOW], 979 xa[XA_WM_DELETE_WINDOW],
1035#if ENABLE_EWMH 980#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING], 981 xa[XA_NET_WM_PING],
1037#endif 982#endif
1038 }; 983 };
1039 984
1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 985 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1041 986
1042#if ENABLE_FRILLS 987#if ENABLE_FRILLS
1043 if (rs[Rs_transient_for]) 988 if (rs[Rs_transient_for])
1044 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 989 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1045#endif 990#endif
1046 991
1047#if ENABLE_EWMH 992#if ENABLE_EWMH
1048 long pid = getpid (); 993 long pid = getpid ();
1049 994
1050 XChangeProperty (disp, top, 995 XChangeProperty (dpy, top,
1051 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1052 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
1053 998
1054 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1055#endif 1000#endif
1056 1001
1057 XSelectInput (disp, top, 1002 XSelectInput (dpy, top,
1058 KeyPressMask 1003 KeyPressMask
1059#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1060 | KeyReleaseMask 1005 | KeyReleaseMask
1061#endif 1006#endif
1062 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1063 | ExposureMask | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1064 1009
1065 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1066 1011
1067#if ENABLE_FRILLS
1068 if (mwmhints.flags)
1069 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1070 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1071#endif
1072
1073 /* vt cursor: Black-on-White is standard, but this is more popular */ 1012 /* vt cursor: Black-on-White is standard, but this is more popular */
1074 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1075 1014
1076#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1015#ifdef HAVE_SCROLLBARS
1077 /* cursor (menuBar/scrollBar): Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1078 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1079#endif 1018#endif
1080 1019
1081 /* the vt window */ 1020 /* the vt window */
1082 vt = XCreateSimpleWindow (disp, top, 1021 vt = XCreateSimpleWindow (dpy, top,
1083 window_vt_x,
1084 window_vt_y, 1022 window_vt_x, window_vt_y,
1085 width,
1086 height, 1023 width, height,
1087 0, 1024 0,
1088 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1089 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1090#ifdef DEBUG_X
1091 XStoreName (disp, vt, "vt window");
1092#endif
1093 1027
1094 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1095 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1096 1030
1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1098 1032
1099 if (OPTION (Opt_pointerBlank) 1033 if (option (Opt_pointerBlank))
1100#ifdef ENABLE_PERL
1101 || perl.self
1102#endif
1103 )
1104 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
1105 else 1035 else
1106 vt_emask |= Button1MotionMask | Button3MotionMask; 1036 vt_emask |= Button1MotionMask | Button3MotionMask;
1107 1037
1108 XSelectInput (disp, vt, vt_emask); 1038 vt_select_input ();
1039
1109 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1110
1111#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1112 if (menuBar_height ())
1113 {
1114 menuBar.win = XCreateSimpleWindow (disp, top,
1115 window_vt_x, 0,
1116 width,
1117 menuBar_TotalHeight (),
1118 0,
1119 pix_colors_focused[Color_fg],
1120 pix_colors_focused[Color_scroll]);
1121
1122#ifdef DEBUG_X
1123 XStoreName (disp, menuBar.win, "menubar");
1124#endif
1125
1126 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1127
1128 XDefineCursor (disp, menuBar.win,
1129 XCreateFontCursor (disp, XC_left_ptr));
1130
1131 XSelectInput (disp, menuBar.win,
1132 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1133 menubar_ev.start (display, menuBar.win);
1134 }
1135#endif
1136 1041
1137#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1138 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL
1044#ifndef HAVE_AFTERIMAGE
1139 && ! OPTION (Opt_transparent)) 1045 && !option (Opt_transparent)
1046#endif
1047 )
1140 { 1048 {
1141 const char *p = rs[Rs_backgroundPixmap]; 1049 const char *p = rs[Rs_backgroundPixmap];
1142 1050
1143 if ((p = strchr (p, ';')) != NULL) 1051 if ((p = strchr (p, ';')) != NULL)
1144 { 1052 {
… …
1150 scr_touch (true); 1058 scr_touch (true);
1151 } 1059 }
1152#endif 1060#endif
1153 1061
1154 /* graphics context for the vt window */ 1062 /* graphics context for the vt window */
1155 gcvalue.foreground = pix_colors[Color_fg]; 1063 gcvalue.foreground = pix_colors[Color_fg];
1156 gcvalue.background = pix_colors[Color_bg]; 1064 gcvalue.background = pix_colors[Color_bg];
1157 gcvalue.graphics_exposures = 1; 1065 gcvalue.graphics_exposures = 0;
1066
1158 gc = XCreateGC (disp, vt, 1067 gc = XCreateGC (dpy, vt,
1159 GCForeground | GCBackground | GCGraphicsExposures, 1068 GCForeground | GCBackground | GCGraphicsExposures,
1160 &gcvalue); 1069 &gcvalue);
1161 1070
1162 drawable = new rxvt_drawable (display, vt); 1071 drawable = new rxvt_drawable (this, vt);
1163 1072
1164#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1073#ifdef RXVT_SCROLLBAR
1165 gcvalue.foreground = pix_colors[Color_topShadow]; 1074 gcvalue.foreground = pix_colors[Color_topShadow];
1166 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1167 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1076 gcvalue.foreground = pix_colors[Color_bottomShadow];
1168 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1077 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1169 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1078 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1170 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1079 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1171#endif 1080#endif
1172 1081
1173#ifdef OFF_FOCUS_FADING 1082#ifdef OFF_FOCUS_FADING
1174 // initially we are in unfocused state 1083 // initially we are in unfocused state
1175 if (rs[Rs_fade]) 1084 if (rs[Rs_fade])
1176 pix_colors = pix_colors_unfocused; 1085 pix_colors = pix_colors_unfocused;
1177#endif 1086#endif
1178 1087
1179 pointer_unblank (); 1088 pointer_unblank ();
1180 scr_recolour (); 1089 scr_recolour ();
1181
1182#if ENABLE_XEMBED
1183 if (rs[Rs_embed])
1184 {
1185 long info[2] = { 0, XEMBED_MAPPED };
1186
1187 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1188 32, PropModeReplace, (unsigned char *)&info, 2);
1189 }
1190#endif
1191} 1090}
1192 1091
1193/* ------------------------------------------------------------------------- * 1092/* ------------------------------------------------------------------------- *
1194 * GET TTY CURRENT STATE * 1093 * GET TTY CURRENT STATE *
1195 * ------------------------------------------------------------------------- */ 1094 * ------------------------------------------------------------------------- */
1196void 1095void
1197rxvt_get_ttymode (ttymode_t *tio, int erase) 1096rxvt_get_ttymode (ttymode_t *tio, int erase)
1198{ 1097{
1199#ifdef HAVE_TERMIOS_H
1200 /* 1098 /*
1201 * standard System V termios interface 1099 * standard System V termios interface
1202 */ 1100 */
1203 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1101 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1204 { 1102 {
… …
1271 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1169 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1272# if defined (ECHOCTL) && defined (ECHOKE) 1170# if defined (ECHOCTL) && defined (ECHOKE)
1273 | ECHOCTL | ECHOKE 1171 | ECHOCTL | ECHOKE
1274# endif 1172# endif
1275 | ECHOE | ECHOK); 1173 | ECHOE | ECHOK);
1276# else /* HAVE_TERMIOS_H */
1277
1278 /*
1279 * sgtty interface
1280 */
1281
1282 /* get parameters -- gtty */
1283 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1284 {
1285 tio->sg.sg_erase = CERASE; /* ^H */
1286 tio->sg.sg_kill = CKILL; /* ^U */
1287 }
1288
1289 if (erase != -1)
1290 tio->sg.sg_erase = (char)erase;
1291
1292 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1293
1294 /* get special characters */
1295 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1296 {
1297 tio->tc.t_intrc = CINTR; /* ^C */
1298 tio->tc.t_quitc = CQUIT; /* ^\ */
1299 tio->tc.t_startc = CSTART; /* ^Q */
1300 tio->tc.t_stopc = CSTOP; /* ^S */
1301 tio->tc.t_eofc = CEOF; /* ^D */
1302 tio->tc.t_brkc = -1;
1303 }
1304
1305 /* get local special chars */
1306 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1307 {
1308 tio->lc.t_suspc = CSUSP; /* ^Z */
1309 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1310 tio->lc.t_rprntc = CRPRNT; /* ^R */
1311 tio->lc.t_flushc = CFLUSH; /* ^O */
1312 tio->lc.t_werasc = CWERASE; /* ^W */
1313 tio->lc.t_lnextc = CLNEXT; /* ^V */
1314 }
1315 /* get line discipline */
1316 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1317# ifdef NTTYDISC
1318 tio->line = NTTYDISC;
1319# endif /* NTTYDISC */
1320
1321 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1322#endif /* HAVE_TERMIOS_H */
1323 1174
1324 /* 1175 /*
1325 * Debugging 1176 * Debugging
1326 */ 1177 */
1327#ifdef DEBUG_TTYMODE 1178#ifdef DEBUG_TTYMODE
… …
1412rxvt_term::run_command (const char *const *argv) 1263rxvt_term::run_command (const char *const *argv)
1413{ 1264{
1414#if ENABLE_FRILLS 1265#if ENABLE_FRILLS
1415 if (rs[Rs_pty_fd]) 1266 if (rs[Rs_pty_fd])
1416 { 1267 {
1417 pty.pty = atoi (rs[Rs_pty_fd]); 1268 pty->pty = atoi (rs[Rs_pty_fd]);
1418 1269
1419 if (pty.pty >= 0) 1270 if (pty->pty >= 0)
1420 { 1271 {
1421 if (getfd_hook) 1272 if (getfd_hook)
1422 pty.pty = (*getfd_hook) (pty.pty); 1273 pty->pty = (*getfd_hook) (pty->pty);
1423 1274
1424 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1275 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1425 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1276 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1426 } 1277 }
1427 } 1278 }
1428 else 1279 else
1429#endif 1280#endif
1430 if (!pty.get ()) 1281 if (!pty->get ())
1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1282 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1432
1433 pty.set_utf8_mode (enc_utf8);
1434
1435 /* set initial window size */
1436 tt_winch ();
1437 1283
1438 int er; 1284 int er;
1439 1285
1440#ifndef NO_BACKSPACE_KEY 1286#ifndef NO_BACKSPACE_KEY
1441 if (key_backspace[0] && !key_backspace[1]) 1287 if (key_backspace[0] && !key_backspace[1])
… …
1445 else 1291 else
1446#endif 1292#endif
1447 er = -1; 1293 er = -1;
1448 1294
1449 rxvt_get_ttymode (&tio, er); 1295 rxvt_get_ttymode (&tio, er);
1296 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1297 pty->set_utf8_mode (enc_utf8);
1298
1299 /* set initial window size */
1300 tt_winch ();
1450 1301
1451#if ENABLE_FRILLS 1302#if ENABLE_FRILLS
1452 if (rs[Rs_pty_fd]) 1303 if (rs[Rs_pty_fd])
1453 return; 1304 return;
1454#endif 1305#endif
1455 1306
1456#ifndef __QNX__
1457 /* spin off the command interpreter */ 1307 /* spin off the command interpreter */
1458 switch (cmd_pid = fork ()) 1308 switch (cmd_pid = fork ())
1459 { 1309 {
1460 case -1: 1310 case -1:
1461 { 1311 {
… …
1463 rxvt_fatal ("can't fork, aborting.\n"); 1313 rxvt_fatal ("can't fork, aborting.\n");
1464 } 1314 }
1465 case 0: 1315 case 0:
1466 init_env (); 1316 init_env ();
1467 1317
1468 if (!pty.make_controlling_tty ()) 1318 if (!pty->make_controlling_tty ())
1469 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1319 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1470 else 1320 else
1471 { 1321 {
1472 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1322 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1473 dup2 (pty.tty, STDIN_FILENO); 1323 dup2 (pty->tty, STDIN_FILENO);
1474 dup2 (pty.tty, STDOUT_FILENO); 1324 dup2 (pty->tty, STDOUT_FILENO);
1475 dup2 (pty.tty, STDERR_FILENO); 1325 dup2 (pty->tty, STDERR_FILENO);
1476 1326
1477 // close all our file handles that we do no longer need 1327 // close all our file handles that we do no longer need
1478 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1328 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1479 { 1329 {
1480 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1330 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1481 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1331 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1482 } 1332 }
1483 1333
1484 run_child (argv); 1334 run_child (argv);
1485 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1335 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1486 } 1336 }
1487 1337
1488 _exit (EXIT_FAILURE); 1338 _exit (EXIT_FAILURE);
1489 1339
1490 default: 1340 default:
1491 { 1341 if (!option (Opt_utmpInhibit))
1492#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1342 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1493 int fdstdin;
1494 1343
1495 fdstdin = dup (STDIN_FILENO); 1344 pty->close_tty ();
1496 dup2 (pty.tty, STDIN_FILENO);
1497#endif
1498 1345
1499#ifdef UTMP_SUPPORT 1346 child_ev.start (cmd_pid);
1500 privileged_utmp (SAVE);
1501#endif
1502 1347
1503#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1348 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1504
1505 dup2 (fdstdin, STDIN_FILENO);
1506 close (fdstdin);
1507#endif
1508 }
1509
1510 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1511 break; 1349 break;
1512 } 1350 }
1513#else /* __QNX__ uses qnxspawn () */
1514 fchmod (pty.tty, 0622);
1515 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1516 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1517
1518 if (run_child (argv) == -1)
1519 exit (EXIT_FAILURE);
1520#endif
1521} 1351}
1522 1352
1523/* ------------------------------------------------------------------------- * 1353/* ------------------------------------------------------------------------- *
1524 * CHILD PROCESS OPERATIONS * 1354 * CHILD PROCESS OPERATIONS *
1525 * ------------------------------------------------------------------------- */ 1355 * ------------------------------------------------------------------------- */
… …
1530int 1360int
1531rxvt_term::run_child (const char *const *argv) 1361rxvt_term::run_child (const char *const *argv)
1532{ 1362{
1533 char *login; 1363 char *login;
1534 1364
1535 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1536
1537 if (OPTION (Opt_console)) 1365 if (option (Opt_console))
1538 { /* be virtual console, fail silently */ 1366 { /* be virtual console, fail silently */
1539#ifdef TIOCCONS 1367#ifdef TIOCCONS
1540 unsigned int on = 1; 1368 unsigned int on = 1;
1541 1369
1542 ioctl (STDIN_FILENO, TIOCCONS, &on); 1370 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1569 // unblock signals (signals are blocked by iom.C 1397 // unblock signals (signals are blocked by iom.C
1570 sigset_t ss; 1398 sigset_t ss;
1571 sigemptyset (&ss); 1399 sigemptyset (&ss);
1572 sigprocmask (SIG_SETMASK, &ss, 0); 1400 sigprocmask (SIG_SETMASK, &ss, 0);
1573 1401
1574#ifndef __QNX__
1575 /* command interpreter path */ 1402 /* command interpreter path */
1576 if (argv != NULL) 1403 if (argv != NULL)
1577 { 1404 {
1578# ifdef DEBUG_CMD 1405# ifdef DEBUG_CMD
1579 int i; 1406 int i;
… …
1592 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1419 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1593 shell = "/bin/sh"; 1420 shell = "/bin/sh";
1594 1421
1595 argv0 = (const char *)rxvt_r_basename (shell); 1422 argv0 = (const char *)rxvt_r_basename (shell);
1596 1423
1597 if (OPTION (Opt_loginShell)) 1424 if (option (Opt_loginShell))
1598 { 1425 {
1599 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1426 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1600 1427
1601 login[0] = '-'; 1428 login[0] = '-';
1602 strcpy (&login[1], argv0); 1429 strcpy (&login[1], argv0);
… …
1605 1432
1606 execlp (shell, argv0, NULL); 1433 execlp (shell, argv0, NULL);
1607 /* no error message: STDERR is closed! */ 1434 /* no error message: STDERR is closed! */
1608 } 1435 }
1609 1436
1610#else /* __QNX__ uses qnxspawn () */
1611
1612 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1613 char *command = NULL, fullcommand[_MAX_PATH];
1614 char **arg_v, *arg_a[2] = { NULL, NULL };
1615
1616 if (argv != NULL)
1617 {
1618 if (access (argv[0], X_OK) == -1)
1619 {
1620 if (strchr (argv[0], '/') == NULL)
1621 {
1622 searchenv (argv[0], "PATH", fullcommand);
1623
1624 if (fullcommand[0] != '\0')
1625 command = fullcommand;
1626 }
1627
1628 if (access (command, X_OK) == -1)
1629 return -1;
1630 }
1631 else
1632 command = argv[0];
1633
1634 arg_v = argv;
1635 }
1636 else
1637 {
1638 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1639 command = "/bin/sh";
1640
1641 arg_a[0] = my_basename (command);
1642
1643 if (OPTION (Opt_loginShell))
1644 {
1645 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1646
1647 login[0] = '-';
1648 strcpy (&login[1], arg_a[0]);
1649 arg_a[0] = login;
1650 }
1651
1652 arg_v = arg_a;
1653 }
1654
1655 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1656 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1657 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1658 command, arg_v, environ, iov_a, 0);
1659 if (login)
1660 free (login);
1661
1662 pty.close_tty ();
1663 return pty.pty;
1664#endif
1665
1666 return -1; 1437 return -1;
1667} 1438}
1668 1439
1669/*----------------------- end-of-file (C source) -----------------------*/ 1440/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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