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.204 by sasha, Thu Aug 9 22:08:21 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;
260 217
261#ifdef MENUBAR 218 set_option (Opt_scrollBar);
262 menu_readonly = 1; 219 set_option (Opt_scrollTtyOutput);
263# if ! (MENUBAR_MAX > 1) 220 set_option (Opt_jumpScroll);
264 CurrentBar = &BarList; 221 set_option (Opt_skipScroll);
265# endif /* (MENUBAR_MAX > 1) */ 222 set_option (Opt_secondaryScreen);
266#endif 223 set_option (Opt_secondaryScroll);
224 set_option (Opt_pastableTabs);
225 set_option (Opt_intensityStyles);
226 set_option (Opt_iso14755_52);
267 227
268 return true; 228 return true;
269} 229}
270 230
271void 231void
… …
309 int i, r_argc; 269 int i, r_argc;
310 char *val; 270 char *val;
311 const char **cmd_argv, **r_argv; 271 const char **cmd_argv, **r_argv;
312 272
313 /* 273 /*
314 * 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
315 */ 275 */
316 for (r_argc = 0; r_argc < argc; r_argc++) 276 for (r_argc = 0; r_argc < argc; r_argc++)
317 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec")) 277 if (!strcmp (argv[r_argc], "-e"))
318 break; 278 break;
319 279
320 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 280 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
321 281
322 for (i = 0; i < r_argc; i++) 282 for (i = 0; i < r_argc; i++)
… …
348 get_options (r_argc, r_argv); 308 get_options (r_argc, r_argv);
349 309
350 if (!(display = displays.get (rs[Rs_display_name]))) 310 if (!(display = displays.get (rs[Rs_display_name])))
351 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]);
352 312
313 // using a local pointer decreases code size a lot
314 xa = display->xa;
315
316 set (display);
353 extract_resources (); 317 extract_resources ();
354 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
355 free (r_argv); 327 free (r_argv);
328
329 bgPixmap.set_target (this);
330
331 for (int i = NUM_RESOURCES; i--; )
332 if (rs [i] == resval_undef)
333 rs [i] = 0;
334
335#if ENABLE_PERL
336 if (!rs[Rs_perl_ext_1])
337 rs[Rs_perl_ext_1] = "default";
338
339 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
340 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
341 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
342 {
343 rxvt_perl.init (this);
344 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
345 }
346#endif
356 347
357 /* 348 /*
358 * set any defaults not already set 349 * set any defaults not already set
359 */ 350 */
360 if (cmd_argv && cmd_argv[0]) 351 if (cmd_argv && cmd_argv[0])
… …
446 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]); 437 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], rs[Rs_scrollBar_thickness]);
447#endif 438#endif
448 439
449#ifdef XTERM_REVERSE_VIDEO 440#ifdef XTERM_REVERSE_VIDEO
450 /* this is how xterm implements reverseVideo */ 441 /* this is how xterm implements reverseVideo */
451 if (OPTION (Opt_reverseVideo)) 442 if (option (Opt_reverseVideo))
452 { 443 {
453 if (!rs[Rs_color + Color_fg]) 444 if (!rs[Rs_color + Color_fg])
454 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 445 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
446
455 if (!rs[Rs_color + Color_bg]) 447 if (!rs[Rs_color + Color_bg])
456 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 448 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
457 } 449 }
458#endif 450#endif
459 451
… …
461 if (!rs[Rs_color + i]) 453 if (!rs[Rs_color + i])
462 rs[Rs_color + i] = def_colorName[i]; 454 rs[Rs_color + i] = def_colorName[i];
463 455
464#ifndef XTERM_REVERSE_VIDEO 456#ifndef XTERM_REVERSE_VIDEO
465 /* this is how we implement reverseVideo */ 457 /* this is how we implement reverseVideo */
466 if (OPTION (Opt_reverseVideo)) 458 if (option (Opt_reverseVideo))
467 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 459 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
468#endif 460#endif
469 461
470 /* convenient aliases for setting fg/bg to colors */ 462 /* convenient aliases for setting fg/bg to colors */
471 color_aliases (Color_fg); 463 color_aliases (Color_fg);
… …
511 val = rxvt_network_display (rs[Rs_display_name]); 503 val = rxvt_network_display (rs[Rs_display_name]);
512 rs[Rs_display_name] = (const char *)val; 504 rs[Rs_display_name] = (const char *)val;
513 505
514 if (val == NULL) 506 if (val == NULL)
515#endif /* DISPLAY_IS_IP */ 507#endif /* DISPLAY_IS_IP */
516 val = XDisplayString (display->display); 508 val = XDisplayString (dpy);
517 509
518 if (rs[Rs_display_name] == NULL) 510 if (rs[Rs_display_name] == NULL)
519 rs[Rs_display_name] = val; /* use broken `:0' value */ 511 rs[Rs_display_name] = val; /* use broken `:0' value */
520 512
521 i = strlen (val); 513 i = strlen (val);
522 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 514 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
523 515
524 sprintf (env_display, "DISPLAY=%s", val); 516 sprintf (env_display, "DISPLAY=%s", val);
525 517
526 /* avoiding the math library: 518 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 519
536 /* add entries to the environment: 520 /* add entries to the environment:
537 * @ DISPLAY: in case we started with -display 521 * @ DISPLAY: in case we started with -display
538 * @ WINDOWID: X window id number of the window 522 * @ WINDOWID: X window id number of the window
539 * @ COLORTERM: terminal sub-name and also indicates its color 523 * @ COLORTERM: terminal sub-name and also indicates its color
… …
541 * @ TERMINFO: path to terminfo directory 525 * @ TERMINFO: path to terminfo directory
542 * @ COLORFGBG: fg;bg color codes 526 * @ COLORFGBG: fg;bg color codes
543 */ 527 */
544 putenv (env_display); 528 putenv (env_display);
545 putenv (env_windowid); 529 putenv (env_windowid);
530
546 if (env_colorfgbg) 531 if (env_colorfgbg)
547 putenv (env_colorfgbg); 532 putenv (env_colorfgbg);
548 533
549#ifdef RXVT_TERMINFO 534#ifdef RXVT_TERMINFO
550 putenv ("TERMINFO=" RXVT_TERMINFO); 535 putenv ("TERMINFO=" RXVT_TERMINFO);
551#endif 536#endif
552 537
553 if (display->depth <= 2) 538 if (depth <= 2)
554 putenv ("COLORTERM=" COLORTERMENV "-mono"); 539 putenv ("COLORTERM=" COLORTERMENV "-mono");
555 else 540 else
556 putenv ("COLORTERM=" COLORTERMENVFULL); 541 putenv ("COLORTERM=" COLORTERMENVFULL);
557 542
558 if (rs[Rs_term_name] != NULL) 543 if (rs[Rs_term_name] != NULL)
… …
652 * Initialize the command connection. 637 * Initialize the command connection.
653 * This should be called after the X server connection is established. 638 * This should be called after the X server connection is established.
654 */ 639 */
655 640
656#ifdef META8_OPTION 641#ifdef META8_OPTION
657 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 642 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
658#endif 643#endif
659 644
660 get_ourmods (); 645 get_ourmods ();
661 646
662 if (!OPTION (Opt_scrollTtyOutput)) 647 if (!option (Opt_scrollTtyOutput))
663 priv_modes |= PrivMode_TtyOutputInh; 648 priv_modes |= PrivMode_TtyOutputInh;
664 if (OPTION (Opt_scrollTtyKeypress)) 649 if (option (Opt_scrollTtyKeypress))
665 priv_modes |= PrivMode_Keypress; 650 priv_modes |= PrivMode_Keypress;
666 if (!OPTION (Opt_jumpScroll)) 651 if (!option (Opt_jumpScroll))
667 priv_modes |= PrivMode_smoothScroll; 652 priv_modes |= PrivMode_smoothScroll;
668 653
669#ifndef NO_BACKSPACE_KEY 654#ifndef NO_BACKSPACE_KEY
670 if (strcmp (key_backspace, "DEC") == 0) 655 if (strcmp (key_backspace, "DEC") == 0)
671 priv_modes |= PrivMode_HaveBackSpace; 656 priv_modes |= PrivMode_HaveBackSpace;
672#endif 657#endif
673 658
674 /* add value for scrollBar */ 659 /* add value for scrollBar */
675 if (scrollbar_visible ()) 660 if (scrollBar.state)
676 { 661 {
677 priv_modes |= PrivMode_scrollBar; 662 priv_modes |= PrivMode_scrollBar;
678 SavedModes |= PrivMode_scrollBar; 663 SavedModes |= PrivMode_scrollBar;
679 }
680
681 if (menubar_visible ())
682 {
683 priv_modes |= PrivMode_menuBar;
684 SavedModes |= PrivMode_menuBar;
685 } 664 }
686 665
687 run_command (argv); 666 run_command (argv);
688} 667}
689 668
… …
695 674
696#ifdef OFF_FOCUS_FADING 675#ifdef OFF_FOCUS_FADING
697 pix_colors = pix_colors_focused; 676 pix_colors = pix_colors_focused;
698#endif 677#endif
699 678
700 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 679 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
701 { 680 {
681 const char *name = rs[Rs_color + i];
682
683 if (!name)
684 continue;
685
702 rxvt_color xcol; 686 rxvt_color xcol;
703 687
704 if (!rs[Rs_color + i]) 688 if (!set_color (xcol, name))
705 continue;
706
707 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
708 { 689 {
709#ifndef XTERM_REVERSE_VIDEO 690#ifndef XTERM_REVERSE_VIDEO
710 if (i < 2 && OPTION (Opt_reverseVideo)) 691 if (i < 2 && option (Opt_reverseVideo))
711 rs[Rs_color + i] = def_colorName[!i]; 692 name = def_colorName [1 - i];
712 else 693 else
713#endif 694#endif
714 rs[Rs_color + i] = def_colorName[i]; 695 name = def_colorName [i];
715 696
716 if (!rs[Rs_color + i]) 697 if (!name)
717 continue; 698 continue;
718 699
719 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 700 if (!set_color (xcol, name))
720 { 701 {
721 switch (i) 702 switch (i)
722 { 703 {
723 case Color_fg: 704 case Color_fg:
724 case Color_bg: 705 case Color_bg:
725 /* fatal: need bg/fg color */
726 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 706 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
727 /* NOTREACHED */ 707 name = "";
728 break; 708 break;
729#ifndef NO_CURSORCOLOR 709#ifndef NO_CURSORCOLOR
730 case Color_cursor2: 710 case Color_cursor2:
731 xcol = pix_colors[Color_fg]; 711#endif
732 break;
733#endif /* ! NO_CURSORCOLOR */
734 case Color_pointer_fg: 712 case Color_pointer_fg:
735 xcol = pix_colors[Color_fg]; 713 name = rs[Rs_color + Color_fg];
714 xcol.set (this, name);
736 break; 715 break;
737 default: 716 default:
738 xcol = pix_colors[Color_bg]; /* None */ 717 name = rs[Rs_color + Color_bg];
718 xcol.set (this, name);
739 break; 719 break;
740 } 720 }
741 } 721 }
742 } 722 }
743 723
744 pix_colors[i] = xcol; 724 pix_colors[i] = xcol;
745 SET_PIXCOLOR (i); 725 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 { 726 }
727
728 if (depth <= 2)
729 {
756 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg]; 730 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]; 731 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]; 732 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
759 } 733 }
760 734
761 /* 735 /*
762 * get scrollBar/menuBar shadow colors 736 * get scrollBar shadow colors
763 * 737 *
764 * The calculations of topShadow/bottomShadow values are adapted 738 * The calculations of topShadow/bottomShadow values are adapted
765 * from the fvwm window manager. 739 * from the fvwm window manager.
766 */ 740 */
767#ifdef KEEP_SCROLLCOLOR 741#ifdef KEEP_SCROLLCOLOR
768
769 if (display->depth <= 2) 742 if (depth <= 2)
770 { 743 {
771 /* Monochrome */ 744 /* Monochrome */
772 pix_colors[Color_scroll] = pix_colors[Color_fg]; 745 alias_color (Color_scroll, Color_fg);
773 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 746 alias_color (Color_topShadow, Color_bg);
774 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 747 alias_color (Color_bottomShadow, Color_bg);
775 } 748 }
776 else 749 else
777 { 750 {
778 rxvt_color xcol[2]; 751 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 752
783 xcol[1] = pix_colors[Color_scroll]; 753 rgba cscroll;
784 xcol[0].set (display, 65535, 65535, 65535); 754 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 755
793 /* topShadowColor */ 756 /* topShadowColor */
794 if (!xcol[1].set (display, 757 if (!pix_colors[Color_topShadow].set (this,
795 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 758 rgba (
796 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 759 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
797 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 760 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
798 xcol[1] = pix_colors[Color_White]; 761 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
799 762 cscroll.a)
800 pix_colors[Color_topShadow] = xcol[1]; 763 ))
764 alias_color (Color_topShadow, Color_White);
801 } 765 }
802#endif /* KEEP_SCROLLCOLOR */ 766#endif /* KEEP_SCROLLCOLOR */
767
768#ifdef OFF_FOCUS_FADING
769 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
770 update_fade_color (i);
771#endif
803} 772}
804 773
805/*----------------------------------------------------------------------*/ 774/*----------------------------------------------------------------------*/
806/* color aliases, fg/bg bright-bold */ 775/* color aliases, fg/bg bright-bold */
807void 776void
… …
846 815
847 if (rsmod 816 if (rsmod
848 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 817 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
849 requestedmeta = rsmod[3] - '0'; 818 requestedmeta = rsmod[3] - '0';
850 819
851 map = XGetModifierMapping (display->display); 820 map = XGetModifierMapping (dpy);
852 kc = map->modifiermap; 821 kc = map->modifiermap;
853 822
854 for (i = 1; i < 6; i++) 823 for (i = 1; i < 6; i++)
855 { 824 {
856 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 825 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
858 for (j = map->max_keypermod; j--; k++) 827 for (j = map->max_keypermod; j--; k++)
859 { 828 {
860 if (kc[k] == 0) 829 if (kc[k] == 0)
861 break; 830 break;
862 831
863 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 832 switch (XKeycodeToKeysym (dpy, kc[k], 0))
864 { 833 {
865 case XK_Num_Lock: 834 case XK_Num_Lock:
866 ModNumLockMask = modmasks[i - 1]; 835 ModNumLockMask = modmasks[i - 1];
867 continue; 836 continue;
868 837
… …
918rxvt_term::create_windows (int argc, const char *const *argv) 887rxvt_term::create_windows (int argc, const char *const *argv)
919{ 888{
920 XClassHint classHint; 889 XClassHint classHint;
921 XWMHints wmHint; 890 XWMHints wmHint;
922#if ENABLE_FRILLS 891#if ENABLE_FRILLS
923 Atom prop = None;
924 MWMHints mwmhints; 892 MWMHints mwmhints = { };
925#endif 893#endif
926 XGCValues gcvalue; 894 XGCValues gcvalue;
927 XSetWindowAttributes attributes; 895 XSetWindowAttributes attributes;
928 XWindowAttributes gattr;
929 Window top, parent; 896 Window top, parent;
930 dDisp;
931 897
932#ifdef USING_W11LIB 898 dLocal (Display *, dpy);
933 /* enable W11 callbacks */
934 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif
936 899
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 900 /* grab colors before netscape does */
938 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 901 Get_Colours ();
939 902
940 if (OPTION (Opt_transparent)) 903 if (!set_fonts ())
941 { 904 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
942 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 905
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 906 parent = display->root;
944 } 907
908 attributes.override_redirect = !!option (Opt_override_redirect);
945 909
946#if ENABLE_FRILLS 910#if ENABLE_FRILLS
947 if (OPTION (Opt_borderLess)) 911 if (option (Opt_borderLess))
948 { 912 {
949 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 913 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
950
951 if (prop == None)
952 { 914 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 915 /* 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; 916 attributes.override_redirect = true;
956#endif
957 mwmhints.flags = 0; 917 mwmhints.flags = 0;
958 } 918 }
959 else 919 else
960 { 920 {
961 mwmhints.flags = MWM_HINTS_DECORATIONS; 921 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
964 } 924 }
965 else 925 else
966 mwmhints.flags = 0; 926 mwmhints.flags = 0;
967#endif 927#endif
968 928
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 929#if ENABLE_XEMBED
978 if (rs[Rs_embed]) 930 if (rs[Rs_embed])
979 { 931 {
980 XWindowAttributes wattr; 932 XWindowAttributes wattr;
981 933
982 parent = strtol (rs[Rs_embed], 0, 0); 934 parent = strtol (rs[Rs_embed], 0, 0);
983 935
984 if (!XGetWindowAttributes (disp, parent, &wattr)) 936 if (!XGetWindowAttributes (dpy, parent, &wattr))
985 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 937 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
986 938
987 window_calc (wattr.width, wattr.height); 939 window_calc (wattr.width, wattr.height);
988 } 940 }
989#endif 941#endif
990 942
991 window_calc (0, 0); 943 window_calc (0, 0);
992 944
993 /* sub-window placement & size in rxvt_resize_subwindows () */ 945 /* sub-window placement & size in rxvt_resize_subwindows () */
994#ifdef PREFER_24BIT
995 attributes.background_pixel = pix_colors_focused[Color_border]; 946 attributes.background_pixel = pix_colors_focused [Color_border];
996 attributes.border_pixel = pix_colors_focused[Color_border]; 947 attributes.border_pixel = pix_colors_focused [Color_border];
997 attributes.colormap = display->cmap; 948 attributes.colormap = cmap;
949
998 top = XCreateWindow (disp, parent, 950 top = XCreateWindow (dpy, parent,
999 szHint.x, szHint.y, 951 szHint.x, szHint.y,
1000 szHint.width, szHint.height, 952 szHint.width, szHint.height,
1001 ext_bwidth, 953 ext_bwidth,
1002 display->depth, InputOutput, 954 depth, InputOutput, visual,
1003 display->visual,
1004 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 955 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1005#else 956 &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 957
1014 this->parent[0] = top; 958 this->parent[0] = top;
1015 959
1016 old_width = szHint.width; 960 old_width = szHint.width;
1017 old_height = szHint.height; 961 old_height = szHint.height;
1018 962
1019 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 963 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1020 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 964 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1021 965
1022 classHint.res_name = (char *)rs[Rs_name]; 966 classHint.res_name = (char *)rs[Rs_name];
1023 classHint.res_class = (char *)RESCLASS; 967 classHint.res_class = (char *)RESCLASS;
1024 968
1025 wmHint.flags = InputHint | StateHint | WindowGroupHint; 969 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1026 wmHint.input = True; 970 wmHint.input = True;
1027 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 971 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1028 wmHint.window_group = top; 972 wmHint.window_group = top;
1029 973
1030 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 974 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1031 &szHint, &wmHint, &classHint); 975 &szHint, &wmHint, &classHint);
976
977#if ENABLE_FRILLS
978 if (mwmhints.flags)
979 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
980 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
981#endif
1032 982
1033 Atom protocols[] = { 983 Atom protocols[] = {
1034 xa[XA_WM_DELETE_WINDOW], 984 xa[XA_WM_DELETE_WINDOW],
1035#if ENABLE_EWMH 985#if ENABLE_EWMH
1036 xa[XA_NET_WM_PING], 986 xa[XA_NET_WM_PING],
1037#endif 987#endif
1038 }; 988 };
1039 989
1040 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 990 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1041 991
1042#if ENABLE_FRILLS 992#if ENABLE_FRILLS
1043 if (rs[Rs_transient_for]) 993 if (rs[Rs_transient_for])
1044 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 994 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1045#endif 995#endif
1046 996
1047#if ENABLE_EWMH 997#if ENABLE_EWMH
1048 long pid = getpid (); 998 long pid = getpid ();
1049 999
1050 XChangeProperty (disp, top, 1000 XChangeProperty (dpy, top,
1051 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1001 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1052 PropModeReplace, (unsigned char *)&pid, 1); 1002 PropModeReplace, (unsigned char *)&pid, 1);
1053 1003
1054 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 1004 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1055#endif 1005#endif
1056 1006
1057 XSelectInput (disp, top, 1007 XSelectInput (dpy, top,
1058 KeyPressMask 1008 KeyPressMask
1059#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1009#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1060 | KeyReleaseMask 1010 | KeyReleaseMask
1061#endif 1011#endif
1062 | FocusChangeMask | VisibilityChangeMask 1012 | FocusChangeMask | VisibilityChangeMask
1063 | ExposureMask | StructureNotifyMask); 1013 | ExposureMask | StructureNotifyMask);
1064 1014
1065 termwin_ev.start (display, top); 1015 termwin_ev.start (display, top);
1066 1016
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 */ 1017 /* vt cursor: Black-on-White is standard, but this is more popular */
1074 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1018 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1075 1019
1076#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1020#ifdef HAVE_SCROLLBARS
1077 /* cursor (menuBar/scrollBar): Black-on-White */ 1021 /* cursor scrollBar: Black-on-White */
1078 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1022 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1079#endif 1023#endif
1080 1024
1081 /* the vt window */ 1025 /* the vt window */
1082 vt = XCreateSimpleWindow (disp, top, 1026 vt = XCreateSimpleWindow (dpy, top,
1083 window_vt_x,
1084 window_vt_y, 1027 window_vt_x, window_vt_y,
1085 width,
1086 height, 1028 width, height,
1087 0, 1029 0,
1088 pix_colors_focused[Color_fg], 1030 pix_colors_focused[Color_fg],
1089 pix_colors_focused[Color_bg]); 1031 pix_colors_focused[Color_bg]);
1090#ifdef DEBUG_X
1091 XStoreName (disp, vt, "vt window");
1092#endif
1093 1032
1094 attributes.bit_gravity = NorthWestGravity; 1033 attributes.bit_gravity = NorthWestGravity;
1095 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1034 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1096 1035
1097 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1036 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1098 1037
1099 if (OPTION (Opt_pointerBlank) 1038 if (option (Opt_pointerBlank))
1100#ifdef ENABLE_PERL
1101 || perl.self
1102#endif
1103 )
1104 vt_emask |= PointerMotionMask; 1039 vt_emask |= PointerMotionMask;
1105 else 1040 else
1106 vt_emask |= Button1MotionMask | Button3MotionMask; 1041 vt_emask |= Button1MotionMask | Button3MotionMask;
1107 1042
1108 XSelectInput (disp, vt, vt_emask); 1043 vt_select_input ();
1044
1109 vt_ev.start (display, vt); 1045 vt_ev.start (display, vt);
1110 1046
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
1137#ifdef XPM_BACKGROUND 1047#ifdef XPM_BACKGROUND
1138 if (rs[Rs_backgroundPixmap] != NULL 1048 if (rs[Rs_backgroundPixmap] != NULL)
1139 && ! OPTION (Opt_transparent))
1140 { 1049 {
1141 const char *p = rs[Rs_backgroundPixmap]; 1050 const char *p = rs[Rs_backgroundPixmap];
1142 1051
1143 if ((p = strchr (p, ';')) != NULL) 1052 if ((p = strchr (p, ';')) != NULL)
1144 { 1053 {
1145 p++; 1054 p++;
1146 scale_pixmap (p); 1055 bgPixmap.handle_geometry (p);
1147 } 1056 }
1057 else
1058 bgPixmap.set_defaultGeometry ();
1148 1059
1149 set_bgPixmap (rs[Rs_backgroundPixmap]); 1060 set_bgPixmap (rs[Rs_backgroundPixmap]);
1150 scr_touch (true); 1061 scr_touch (true);
1151 } 1062 }
1152#endif 1063#endif
1153 1064
1154 /* graphics context for the vt window */ 1065 /* graphics context for the vt window */
1155 gcvalue.foreground = pix_colors[Color_fg]; 1066 gcvalue.foreground = pix_colors[Color_fg];
1156 gcvalue.background = pix_colors[Color_bg]; 1067 gcvalue.background = pix_colors[Color_bg];
1157 gcvalue.graphics_exposures = 1; 1068 gcvalue.graphics_exposures = 0;
1069
1158 gc = XCreateGC (disp, vt, 1070 gc = XCreateGC (dpy, vt,
1159 GCForeground | GCBackground | GCGraphicsExposures, 1071 GCForeground | GCBackground | GCGraphicsExposures,
1160 &gcvalue); 1072 &gcvalue);
1161 1073
1162 drawable = new rxvt_drawable (display, vt); 1074 drawable = new rxvt_drawable (this, vt);
1163 1075
1164#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1076#ifdef RXVT_SCROLLBAR
1165 gcvalue.foreground = pix_colors[Color_topShadow]; 1077 gcvalue.foreground = pix_colors[Color_topShadow];
1166 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1078 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1167 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1079 gcvalue.foreground = pix_colors[Color_bottomShadow];
1168 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1080 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1169 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1081 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1170 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1082 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1171#endif 1083#endif
1172 1084
1173#ifdef OFF_FOCUS_FADING 1085#ifdef OFF_FOCUS_FADING
1174 // initially we are in unfocused state 1086 // initially we are in unfocused state
1175 if (rs[Rs_fade]) 1087 if (rs[Rs_fade])
1176 pix_colors = pix_colors_unfocused; 1088 pix_colors = pix_colors_unfocused;
1177#endif 1089#endif
1178 1090
1179 pointer_unblank (); 1091 pointer_unblank ();
1180 scr_recolour (); 1092 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} 1093}
1192 1094
1193/* ------------------------------------------------------------------------- * 1095/* ------------------------------------------------------------------------- *
1194 * GET TTY CURRENT STATE * 1096 * GET TTY CURRENT STATE *
1195 * ------------------------------------------------------------------------- */ 1097 * ------------------------------------------------------------------------- */
1196void 1098void
1197rxvt_get_ttymode (ttymode_t *tio, int erase) 1099rxvt_get_ttymode (ttymode_t *tio, int erase)
1198{ 1100{
1199#ifdef HAVE_TERMIOS_H
1200 /* 1101 /*
1201 * standard System V termios interface 1102 * standard System V termios interface
1202 */ 1103 */
1203 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1104 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1204 { 1105 {
… …
1271 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1172 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1272# if defined (ECHOCTL) && defined (ECHOKE) 1173# if defined (ECHOCTL) && defined (ECHOKE)
1273 | ECHOCTL | ECHOKE 1174 | ECHOCTL | ECHOKE
1274# endif 1175# endif
1275 | ECHOE | ECHOK); 1176 | 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 1177
1324 /* 1178 /*
1325 * Debugging 1179 * Debugging
1326 */ 1180 */
1327#ifdef DEBUG_TTYMODE 1181#ifdef DEBUG_TTYMODE
… …
1412rxvt_term::run_command (const char *const *argv) 1266rxvt_term::run_command (const char *const *argv)
1413{ 1267{
1414#if ENABLE_FRILLS 1268#if ENABLE_FRILLS
1415 if (rs[Rs_pty_fd]) 1269 if (rs[Rs_pty_fd])
1416 { 1270 {
1417 pty.pty = atoi (rs[Rs_pty_fd]); 1271 pty->pty = atoi (rs[Rs_pty_fd]);
1418 1272
1419 if (pty.pty >= 0) 1273 if (pty->pty >= 0)
1420 { 1274 {
1421 if (getfd_hook) 1275 if (getfd_hook)
1422 pty.pty = (*getfd_hook) (pty.pty); 1276 pty->pty = (*getfd_hook) (pty->pty);
1423 1277
1424 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1278 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1425 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1279 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1426 } 1280 }
1427 } 1281 }
1428 else 1282 else
1429#endif 1283#endif
1430 if (!pty.get ()) 1284 if (!pty->get ())
1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1285 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 1286
1438 int er; 1287 int er;
1439 1288
1440#ifndef NO_BACKSPACE_KEY 1289#ifndef NO_BACKSPACE_KEY
1441 if (key_backspace[0] && !key_backspace[1]) 1290 if (key_backspace[0] && !key_backspace[1])
… …
1445 else 1294 else
1446#endif 1295#endif
1447 er = -1; 1296 er = -1;
1448 1297
1449 rxvt_get_ttymode (&tio, er); 1298 rxvt_get_ttymode (&tio, er);
1299 SET_TERMIOS (pty->tty, &tio); /* init terminal attributes */
1300 pty->set_utf8_mode (enc_utf8);
1301
1302 /* set initial window size */
1303 tt_winch ();
1450 1304
1451#if ENABLE_FRILLS 1305#if ENABLE_FRILLS
1452 if (rs[Rs_pty_fd]) 1306 if (rs[Rs_pty_fd])
1453 return; 1307 return;
1454#endif 1308#endif
1455 1309
1456#ifndef __QNX__
1457 /* spin off the command interpreter */ 1310 /* spin off the command interpreter */
1458 switch (cmd_pid = fork ()) 1311 switch (cmd_pid = fork ())
1459 { 1312 {
1460 case -1: 1313 case -1:
1461 { 1314 {
… …
1463 rxvt_fatal ("can't fork, aborting.\n"); 1316 rxvt_fatal ("can't fork, aborting.\n");
1464 } 1317 }
1465 case 0: 1318 case 0:
1466 init_env (); 1319 init_env ();
1467 1320
1468 if (!pty.make_controlling_tty ()) 1321 if (!pty->make_controlling_tty ())
1469 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1322 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1470 else 1323 else
1471 { 1324 {
1472 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1325 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1473 dup2 (pty.tty, STDIN_FILENO); 1326 dup2 (pty->tty, STDIN_FILENO);
1474 dup2 (pty.tty, STDOUT_FILENO); 1327 dup2 (pty->tty, STDOUT_FILENO);
1475 dup2 (pty.tty, STDERR_FILENO); 1328 dup2 (pty->tty, STDERR_FILENO);
1476 1329
1477 // close all our file handles that we do no longer need 1330 // close all our file handles that we do no longer need
1478 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1331 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1479 { 1332 {
1480 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1333 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1481 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1334 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1482 } 1335 }
1483 1336
1484 run_child (argv); 1337 run_child (argv);
1485 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1338 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1486 } 1339 }
1487 1340
1488 _exit (EXIT_FAILURE); 1341 _exit (EXIT_FAILURE);
1489 1342
1490 default: 1343 default:
1491 { 1344 if (!option (Opt_utmpInhibit))
1492#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1345 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1493 int fdstdin;
1494 1346
1495 fdstdin = dup (STDIN_FILENO); 1347 pty->close_tty ();
1496 dup2 (pty.tty, STDIN_FILENO);
1497#endif
1498 1348
1499#ifdef UTMP_SUPPORT 1349 child_ev.start (cmd_pid);
1500 privileged_utmp (SAVE);
1501#endif
1502 1350
1503#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1351 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; 1352 break;
1512 } 1353 }
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} 1354}
1522 1355
1523/* ------------------------------------------------------------------------- * 1356/* ------------------------------------------------------------------------- *
1524 * CHILD PROCESS OPERATIONS * 1357 * CHILD PROCESS OPERATIONS *
1525 * ------------------------------------------------------------------------- */ 1358 * ------------------------------------------------------------------------- */
… …
1530int 1363int
1531rxvt_term::run_child (const char *const *argv) 1364rxvt_term::run_child (const char *const *argv)
1532{ 1365{
1533 char *login; 1366 char *login;
1534 1367
1535 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1536
1537 if (OPTION (Opt_console)) 1368 if (option (Opt_console))
1538 { /* be virtual console, fail silently */ 1369 { /* be virtual console, fail silently */
1539#ifdef TIOCCONS 1370#ifdef TIOCCONS
1540 unsigned int on = 1; 1371 unsigned int on = 1;
1541 1372
1542 ioctl (STDIN_FILENO, TIOCCONS, &on); 1373 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1569 // unblock signals (signals are blocked by iom.C 1400 // unblock signals (signals are blocked by iom.C
1570 sigset_t ss; 1401 sigset_t ss;
1571 sigemptyset (&ss); 1402 sigemptyset (&ss);
1572 sigprocmask (SIG_SETMASK, &ss, 0); 1403 sigprocmask (SIG_SETMASK, &ss, 0);
1573 1404
1574#ifndef __QNX__
1575 /* command interpreter path */ 1405 /* command interpreter path */
1576 if (argv != NULL) 1406 if (argv != NULL)
1577 { 1407 {
1578# ifdef DEBUG_CMD 1408# ifdef DEBUG_CMD
1579 int i; 1409 int i;
… …
1592 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1422 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1593 shell = "/bin/sh"; 1423 shell = "/bin/sh";
1594 1424
1595 argv0 = (const char *)rxvt_r_basename (shell); 1425 argv0 = (const char *)rxvt_r_basename (shell);
1596 1426
1597 if (OPTION (Opt_loginShell)) 1427 if (option (Opt_loginShell))
1598 { 1428 {
1599 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1429 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1600 1430
1601 login[0] = '-'; 1431 login[0] = '-';
1602 strcpy (&login[1], argv0); 1432 strcpy (&login[1], argv0);
… …
1605 1435
1606 execlp (shell, argv0, NULL); 1436 execlp (shell, argv0, NULL);
1607 /* no error message: STDERR is closed! */ 1437 /* no error message: STDERR is closed! */
1608 } 1438 }
1609 1439
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; 1440 return -1;
1667} 1441}
1668 1442
1669/*----------------------- end-of-file (C source) -----------------------*/ 1443/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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