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.139 by root, Wed Jan 11 03:13:26 2006 UTC vs.
Revision 1.197 by ayin, Thu Aug 2 15:01:30 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++)
… …
339 rs[Rs_name] = rxvt_r_basename (argv[0]); 296 rs[Rs_name] = rxvt_r_basename (argv[0]);
340 297
341 /* 298 /*
342 * Open display, get options/resources and create the window 299 * Open display, get options/resources and create the window
343 */ 300 */
344 {
345 TEMP_ENV;
346 301
347 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 302 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
348 rs[Rs_display_name] = ":0"; 303 rs[Rs_display_name] = ":0";
349 304
350 get_options (r_argc, r_argv); 305 get_options (r_argc, r_argv);
351 306
352 if (!(display = displays.get (rs[Rs_display_name]))) 307 if (!(display = displays.get (rs[Rs_display_name])))
353 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]);
354 309
310 // using a local pointer decreases code size a lot
311 xa = display->xa;
312
313 set (display);
355 extract_resources (); 314 extract_resources ();
356 }
357 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
358 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
359 342
360 /* 343 /*
361 * set any defaults not already set 344 * set any defaults not already set
362 */ 345 */
363 if (cmd_argv && cmd_argv[0]) 346 if (cmd_argv && cmd_argv[0])
… …
449 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]);
450#endif 433#endif
451 434
452#ifdef XTERM_REVERSE_VIDEO 435#ifdef XTERM_REVERSE_VIDEO
453 /* this is how xterm implements reverseVideo */ 436 /* this is how xterm implements reverseVideo */
454 if (OPTION (Opt_reverseVideo)) 437 if (option (Opt_reverseVideo))
455 { 438 {
456 if (!rs[Rs_color + Color_fg]) 439 if (!rs[Rs_color + Color_fg])
457 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 440 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
441
458 if (!rs[Rs_color + Color_bg]) 442 if (!rs[Rs_color + Color_bg])
459 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 443 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
460 } 444 }
461#endif 445#endif
462 446
… …
464 if (!rs[Rs_color + i]) 448 if (!rs[Rs_color + i])
465 rs[Rs_color + i] = def_colorName[i]; 449 rs[Rs_color + i] = def_colorName[i];
466 450
467#ifndef XTERM_REVERSE_VIDEO 451#ifndef XTERM_REVERSE_VIDEO
468 /* this is how we implement reverseVideo */ 452 /* this is how we implement reverseVideo */
469 if (OPTION (Opt_reverseVideo)) 453 if (option (Opt_reverseVideo))
470 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]); 454 ::swap (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg]);
471#endif 455#endif
472 456
473 /* convenient aliases for setting fg/bg to colors */ 457 /* convenient aliases for setting fg/bg to colors */
474 color_aliases (Color_fg); 458 color_aliases (Color_fg);
… …
514 val = rxvt_network_display (rs[Rs_display_name]); 498 val = rxvt_network_display (rs[Rs_display_name]);
515 rs[Rs_display_name] = (const char *)val; 499 rs[Rs_display_name] = (const char *)val;
516 500
517 if (val == NULL) 501 if (val == NULL)
518#endif /* DISPLAY_IS_IP */ 502#endif /* DISPLAY_IS_IP */
519 val = XDisplayString (display->display); 503 val = XDisplayString (dpy);
520 504
521 if (rs[Rs_display_name] == NULL) 505 if (rs[Rs_display_name] == NULL)
522 rs[Rs_display_name] = val; /* use broken `:0' value */ 506 rs[Rs_display_name] = val; /* use broken `:0' value */
523 507
524 i = strlen (val); 508 i = strlen (val);
525 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 509 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
526 510
527 sprintf (env_display, "DISPLAY=%s", val); 511 sprintf (env_display, "DISPLAY=%s", val);
528 512
529 /* avoiding the math library: 513 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]);
530 * i = (int) (ceil (log10 ((unsigned int)parent[0]))) */
531 for (i = 0, u = (unsigned int)parent[0]; u; u /= 10, i++)
532 ;
533 max_it (i, 1);
534 env_windowid = (char *)rxvt_malloc ((i + 10) * sizeof (char));
535
536 sprintf (env_windowid, "WINDOWID=%u",
537 (unsigned int)parent[0]);
538 514
539 /* add entries to the environment: 515 /* add entries to the environment:
540 * @ DISPLAY: in case we started with -display 516 * @ DISPLAY: in case we started with -display
541 * @ WINDOWID: X window id number of the window 517 * @ WINDOWID: X window id number of the window
542 * @ COLORTERM: terminal sub-name and also indicates its color 518 * @ COLORTERM: terminal sub-name and also indicates its color
… …
544 * @ TERMINFO: path to terminfo directory 520 * @ TERMINFO: path to terminfo directory
545 * @ COLORFGBG: fg;bg color codes 521 * @ COLORFGBG: fg;bg color codes
546 */ 522 */
547 putenv (env_display); 523 putenv (env_display);
548 putenv (env_windowid); 524 putenv (env_windowid);
525
549 if (env_colorfgbg) 526 if (env_colorfgbg)
550 putenv (env_colorfgbg); 527 putenv (env_colorfgbg);
551 528
552#ifdef RXVT_TERMINFO 529#ifdef RXVT_TERMINFO
553 putenv ("TERMINFO=" RXVT_TERMINFO); 530 putenv ("TERMINFO=" RXVT_TERMINFO);
554#endif 531#endif
555 532
556 if (display->depth <= 2) 533 if (depth <= 2)
557 putenv ("COLORTERM=" COLORTERMENV "-mono"); 534 putenv ("COLORTERM=" COLORTERMENV "-mono");
558 else 535 else
559 putenv ("COLORTERM=" COLORTERMENVFULL); 536 putenv ("COLORTERM=" COLORTERMENVFULL);
560 537
561 if (rs[Rs_term_name] != NULL) 538 if (rs[Rs_term_name] != NULL)
… …
581 * This should support all European type languages. 558 * This should support all European type languages.
582 */ 559 */
583void 560void
584rxvt_term::set_locale (const char *locale) 561rxvt_term::set_locale (const char *locale)
585{ 562{
586 TEMP_ENV; 563 set_environ (envv);
587 564
588#if HAVE_XSETLOCALE || HAVE_SETLOCALE 565#if HAVE_XSETLOCALE || HAVE_SETLOCALE
589 free (this->locale); 566 free (this->locale);
590 this->locale = setlocale (LC_CTYPE, locale); 567 this->locale = setlocale (LC_CTYPE, locale);
591 568
… …
622} 599}
623 600
624void 601void
625rxvt_term::init_xlocale () 602rxvt_term::init_xlocale ()
626{ 603{
627 TEMP_ENV; 604 set_environ (envv);
628 605
629#ifdef USE_XIM 606#ifdef USE_XIM
630 if (!locale) 607 if (!locale)
631 rxvt_warn ("setting locale failed, working without locale support.\n"); 608 rxvt_warn ("setting locale failed, working without locale support.\n");
632 else 609 else
… …
655 * Initialize the command connection. 632 * Initialize the command connection.
656 * This should be called after the X server connection is established. 633 * This should be called after the X server connection is established.
657 */ 634 */
658 635
659#ifdef META8_OPTION 636#ifdef META8_OPTION
660 meta_char = OPTION (Opt_meta8) ? 0x80 : C0_ESC; 637 meta_char = option (Opt_meta8) ? 0x80 : C0_ESC;
661#endif 638#endif
662 639
663 get_ourmods (); 640 get_ourmods ();
664 641
665 if (!OPTION (Opt_scrollTtyOutput)) 642 if (!option (Opt_scrollTtyOutput))
666 priv_modes |= PrivMode_TtyOutputInh; 643 priv_modes |= PrivMode_TtyOutputInh;
667 if (OPTION (Opt_scrollTtyKeypress)) 644 if (option (Opt_scrollTtyKeypress))
668 priv_modes |= PrivMode_Keypress; 645 priv_modes |= PrivMode_Keypress;
669 if (!OPTION (Opt_jumpScroll)) 646 if (!option (Opt_jumpScroll))
670 priv_modes |= PrivMode_smoothScroll; 647 priv_modes |= PrivMode_smoothScroll;
671 648
672#ifndef NO_BACKSPACE_KEY 649#ifndef NO_BACKSPACE_KEY
673 if (strcmp (key_backspace, "DEC") == 0) 650 if (strcmp (key_backspace, "DEC") == 0)
674 priv_modes |= PrivMode_HaveBackSpace; 651 priv_modes |= PrivMode_HaveBackSpace;
675#endif 652#endif
676 653
677 /* add value for scrollBar */ 654 /* add value for scrollBar */
678 if (scrollbar_visible ()) 655 if (scrollBar.state)
679 { 656 {
680 priv_modes |= PrivMode_scrollBar; 657 priv_modes |= PrivMode_scrollBar;
681 SavedModes |= PrivMode_scrollBar; 658 SavedModes |= PrivMode_scrollBar;
682 }
683
684 if (menubar_visible ())
685 {
686 priv_modes |= PrivMode_menuBar;
687 SavedModes |= PrivMode_menuBar;
688 } 659 }
689 660
690 run_command (argv); 661 run_command (argv);
691} 662}
692 663
… …
698 669
699#ifdef OFF_FOCUS_FADING 670#ifdef OFF_FOCUS_FADING
700 pix_colors = pix_colors_focused; 671 pix_colors = pix_colors_focused;
701#endif 672#endif
702 673
703 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 674 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++)
704 { 675 {
676 const char *name = rs[Rs_color + i];
677
678 if (!name)
679 continue;
680
705 rxvt_color xcol; 681 rxvt_color xcol;
706 682
707 if (!rs[Rs_color + i]) 683 if (!set_color (xcol, name))
708 continue;
709
710 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
711 { 684 {
712#ifndef XTERM_REVERSE_VIDEO 685#ifndef XTERM_REVERSE_VIDEO
713 if (i < 2 && OPTION (Opt_reverseVideo)) 686 if (i < 2 && option (Opt_reverseVideo))
714 rs[Rs_color + i] = def_colorName[!i]; 687 name = def_colorName [1 - i];
715 else 688 else
716#endif 689#endif
717 rs[Rs_color + i] = def_colorName[i]; 690 name = def_colorName [i];
718 691
719 if (!rs[Rs_color + i]) 692 if (!name)
720 continue; 693 continue;
721 694
722 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 695 if (!set_color (xcol, name))
723 { 696 {
724 switch (i) 697 switch (i)
725 { 698 {
726 case Color_fg: 699 case Color_fg:
727 case Color_bg: 700 case Color_bg:
728 /* fatal: need bg/fg color */
729 rxvt_fatal ("unable to get foreground/background colour, aborting.\n"); 701 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
730 /* NOTREACHED */ 702 name = "";
731 break; 703 break;
732#ifndef NO_CURSORCOLOR 704#ifndef NO_CURSORCOLOR
733 case Color_cursor2: 705 case Color_cursor2:
734 xcol = pix_colors[Color_fg]; 706#endif
735 break;
736#endif /* ! NO_CURSORCOLOR */
737 case Color_pointer_fg: 707 case Color_pointer_fg:
738 xcol = pix_colors[Color_fg]; 708 name = rs[Rs_color + Color_fg];
709 xcol.set (this, name);
739 break; 710 break;
740 default: 711 default:
741 xcol = pix_colors[Color_bg]; /* None */ 712 name = rs[Rs_color + Color_bg];
713 xcol.set (this, name);
742 break; 714 break;
743 } 715 }
744 } 716 }
745 } 717 }
746 718
747 pix_colors[i] = xcol; 719 pix_colors[i] = xcol;
748 SET_PIXCOLOR (i); 720 rs[Rs_color + i] = name;
749 }
750
751#ifdef OFF_FOCUS_FADING
752 if (rs[Rs_fade])
753 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
754 pix_colors_unfocused[i] = pix_colors_focused[i].fade (display, atoi (rs[Rs_fade]), pix_colors[Color_fade]);
755#endif
756
757 if (display->depth <= 2)
758 { 721 }
722
723 if (depth <= 2)
724 {
759 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);
760 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);
761 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);
762 } 728 }
763 729
764 /* 730 /*
765 * get scrollBar/menuBar shadow colors 731 * get scrollBar shadow colors
766 * 732 *
767 * The calculations of topShadow/bottomShadow values are adapted 733 * The calculations of topShadow/bottomShadow values are adapted
768 * from the fvwm window manager. 734 * from the fvwm window manager.
769 */ 735 */
770#ifdef KEEP_SCROLLCOLOR 736#ifdef KEEP_SCROLLCOLOR
771
772 if (display->depth <= 2) 737 if (depth <= 2)
773 { 738 {
774 /* Monochrome */ 739 /* Monochrome */
775 pix_colors[Color_scroll] = pix_colors[Color_fg]; 740 alias_color (Color_scroll, Color_fg);
776 pix_colors[Color_topShadow] = pix_colors[Color_bg]; 741 alias_color (Color_topShadow, Color_bg);
777 pix_colors[Color_bottomShadow] = pix_colors[Color_bg]; 742 alias_color (Color_bottomShadow, Color_bg);
778 } 743 }
779 else 744 else
780 { 745 {
781 rxvt_color xcol[2]; 746 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
782 /* xcol[0] == white
783 * xcol[1] == top shadow
784 * xcol[2] == bot shadow */
785 747
786 xcol[1] = pix_colors[Color_scroll]; 748 rgba cscroll;
787 xcol[0].set (display, 65535, 65535, 65535); 749 pix_colors [Color_scroll].get (cscroll);
788
789 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
790
791 xcol[0].get (display, pr0, pg0, pb0);
792 xcol[1].get (display, pr1, pg1, pb1);
793
794 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
795 750
796 /* topShadowColor */ 751 /* topShadowColor */
797 if (!xcol[1].set (display, 752 if (!pix_colors[Color_topShadow].set (this,
798 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 753 rgba (
799 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 754 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
800 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 755 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
801 xcol[1] = pix_colors[Color_White]; 756 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
802 757 cscroll.a)
803 pix_colors[Color_topShadow] = xcol[1]; 758 ))
759 alias_color (Color_topShadow, Color_White);
804 } 760 }
805#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
806} 767}
807 768
808/*----------------------------------------------------------------------*/ 769/*----------------------------------------------------------------------*/
809/* color aliases, fg/bg bright-bold */ 770/* color aliases, fg/bg bright-bold */
810void 771void
… …
849 810
850 if (rsmod 811 if (rsmod
851 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0) 812 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
852 requestedmeta = rsmod[3] - '0'; 813 requestedmeta = rsmod[3] - '0';
853 814
854 map = XGetModifierMapping (display->display); 815 map = XGetModifierMapping (dpy);
855 kc = map->modifiermap; 816 kc = map->modifiermap;
856 817
857 for (i = 1; i < 6; i++) 818 for (i = 1; i < 6; i++)
858 { 819 {
859 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 820 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
… …
861 for (j = map->max_keypermod; j--; k++) 822 for (j = map->max_keypermod; j--; k++)
862 { 823 {
863 if (kc[k] == 0) 824 if (kc[k] == 0)
864 break; 825 break;
865 826
866 switch (XKeycodeToKeysym (display->display, kc[k], 0)) 827 switch (XKeycodeToKeysym (dpy, kc[k], 0))
867 { 828 {
868 case XK_Num_Lock: 829 case XK_Num_Lock:
869 ModNumLockMask = modmasks[i - 1]; 830 ModNumLockMask = modmasks[i - 1];
870 continue; 831 continue;
871 832
… …
921rxvt_term::create_windows (int argc, const char *const *argv) 882rxvt_term::create_windows (int argc, const char *const *argv)
922{ 883{
923 XClassHint classHint; 884 XClassHint classHint;
924 XWMHints wmHint; 885 XWMHints wmHint;
925#if ENABLE_FRILLS 886#if ENABLE_FRILLS
926 Atom prop = None;
927 MWMHints mwmhints; 887 MWMHints mwmhints = { };
928#endif 888#endif
929 XGCValues gcvalue; 889 XGCValues gcvalue;
930 long vt_emask;
931 XSetWindowAttributes attributes; 890 XSetWindowAttributes attributes;
932 XWindowAttributes gattr;
933 Window top, parent; 891 Window top, parent;
934 dDisp;
935 892
936#ifdef USING_W11LIB 893 dLocal (Display *, dpy);
937 /* enable W11 callbacks */
938 W11AddEventHandler (disp, rxvt_W11_process_x_event);
939#endif
940 894
941 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 895 /* grab colors before netscape does */
942 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa); 896 Get_Colours ();
943 897
944 if (OPTION (Opt_transparent)) 898 if (!set_fonts ())
945 { 899 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
946 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr); 900
947 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 901 parent = display->root;
948 } 902
903 attributes.override_redirect = !!option (Opt_override_redirect);
949 904
950#if ENABLE_FRILLS 905#if ENABLE_FRILLS
951 if (OPTION (Opt_borderLess)) 906 if (option (Opt_borderLess))
952 { 907 {
953 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True); 908 if (XInternAtom (dpy, "_MOTIF_WM_INFO", True) == None)
954
955 if (prop == None)
956 { 909 {
957 /* 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");*/
958#ifdef PREFER_24BIT
959 attributes.override_redirect = TRUE; 911 attributes.override_redirect = true;
960#endif
961 mwmhints.flags = 0; 912 mwmhints.flags = 0;
962 } 913 }
963 else 914 else
964 { 915 {
965 mwmhints.flags = MWM_HINTS_DECORATIONS; 916 mwmhints.flags = MWM_HINTS_DECORATIONS;
… …
968 } 919 }
969 else 920 else
970 mwmhints.flags = 0; 921 mwmhints.flags = 0;
971#endif 922#endif
972 923
973 /* grab colors before netscape does */
974 Get_Colours ();
975
976 if (!set_fonts ())
977 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
978
979 parent = DefaultRootWindow (disp);
980
981#if ENABLE_XEMBED 924#if ENABLE_XEMBED
982 if (rs[Rs_embed]) 925 if (rs[Rs_embed])
983 { 926 {
984 XWindowAttributes wattr; 927 XWindowAttributes wattr;
985 928
986 parent = strtol (rs[Rs_embed], 0, 0); 929 parent = strtol (rs[Rs_embed], 0, 0);
987 930
988 if (!XGetWindowAttributes (disp, parent, &wattr)) 931 if (!XGetWindowAttributes (dpy, parent, &wattr))
989 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n"); 932 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
990 933
991 window_calc (wattr.width, wattr.height); 934 window_calc (wattr.width, wattr.height);
992 } 935 }
993#endif 936#endif
994 937
995 window_calc (0, 0); 938 window_calc (0, 0);
996 939
997 /* sub-window placement & size in rxvt_resize_subwindows () */ 940 /* sub-window placement & size in rxvt_resize_subwindows () */
998#ifdef PREFER_24BIT
999 attributes.background_pixel = pix_colors_focused[Color_border]; 941 attributes.background_pixel = pix_colors_focused [Color_border];
1000 attributes.border_pixel = pix_colors_focused[Color_border]; 942 attributes.border_pixel = pix_colors_focused [Color_border];
1001 attributes.colormap = display->cmap; 943 attributes.colormap = cmap;
944
1002 top = XCreateWindow (disp, parent, 945 top = XCreateWindow (dpy, parent,
1003 szHint.x, szHint.y, 946 szHint.x, szHint.y,
1004 szHint.width, szHint.height, 947 szHint.width, szHint.height,
1005 ext_bwidth, 948 ext_bwidth,
1006 display->depth, InputOutput, 949 depth, InputOutput, visual,
1007 display->visual,
1008 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 950 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1009#else 951 &attributes);
1010 top = XCreateSimpleWindow (disp, parent,
1011 szHint.x, szHint.y,
1012 szHint.width, szHint.height,
1013 ext_bwidth,
1014 pix_colors_focused[Color_border],
1015 pix_colors_focused[Color_border]);
1016#endif
1017 952
1018 this->parent[0] = top; 953 this->parent[0] = top;
1019 954
1020 old_width = szHint.width; 955 old_width = szHint.width;
1021 old_height = szHint.height; 956 old_height = szHint.height;
1022 957
1023 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 958 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1024 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 959 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1025 960
1026 classHint.res_name = (char *)rs[Rs_name]; 961 classHint.res_name = (char *)rs[Rs_name];
1027 classHint.res_class = (char *)RESCLASS; 962 classHint.res_class = (char *)RESCLASS;
1028 963
1029 wmHint.flags = InputHint | StateHint | WindowGroupHint; 964 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1030 wmHint.input = True; 965 wmHint.input = True;
1031 wmHint.initial_state = OPTION (Opt_iconic) ? IconicState : NormalState; 966 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState;
1032 wmHint.window_group = top; 967 wmHint.window_group = top;
1033 968
1034 XmbSetWMProperties (disp, top, NULL, NULL, (char **)argv, argc, 969 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1035 &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
1036 977
1037 Atom protocols[] = { 978 Atom protocols[] = {
1038 xa[XA_WM_DELETE_WINDOW], 979 xa[XA_WM_DELETE_WINDOW],
1039#if ENABLE_EWMH 980#if ENABLE_EWMH
1040 xa[XA_NET_WM_PING], 981 xa[XA_NET_WM_PING],
1041#endif 982#endif
1042 }; 983 };
1043 984
1044 XSetWMProtocols (disp, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 985 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0]));
1045 986
1046#if ENABLE_FRILLS 987#if ENABLE_FRILLS
1047 if (rs[Rs_transient_for]) 988 if (rs[Rs_transient_for])
1048 XSetTransientForHint (disp, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 989 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1049#endif 990#endif
1050 991
1051#if ENABLE_EWMH 992#if ENABLE_EWMH
1052 long pid = getpid (); 993 long pid = getpid ();
1053 994
1054 XChangeProperty (disp, top, 995 XChangeProperty (dpy, top,
1055 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 996 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1056 PropModeReplace, (unsigned char *)&pid, 1); 997 PropModeReplace, (unsigned char *)&pid, 1);
1057 998
1058 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default 999 // _NET_WM_WINDOW_TYPE is NORMAL, which is the default
1059#endif 1000#endif
1060 1001
1061 XSelectInput (disp, top, 1002 XSelectInput (dpy, top,
1062 KeyPressMask 1003 KeyPressMask
1063#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1004#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1064 | KeyReleaseMask 1005 | KeyReleaseMask
1065#endif 1006#endif
1066 | FocusChangeMask | VisibilityChangeMask 1007 | FocusChangeMask | VisibilityChangeMask
1067 | ExposureMask | StructureNotifyMask); 1008 | ExposureMask | StructureNotifyMask);
1068 1009
1069 termwin_ev.start (display, top); 1010 termwin_ev.start (display, top);
1070 1011
1071#if ENABLE_FRILLS
1072 if (mwmhints.flags)
1073 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1074 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1075#endif
1076
1077 /* 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 */
1078 TermWin_cursor = XCreateFontCursor (disp, XC_xterm); 1013 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1079 1014
1080#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1015#ifdef HAVE_SCROLLBARS
1081 /* cursor (menuBar/scrollBar): Black-on-White */ 1016 /* cursor scrollBar: Black-on-White */
1082 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr); 1017 leftptr_cursor = XCreateFontCursor (dpy, XC_left_ptr);
1083#endif 1018#endif
1084 1019
1085 /* the vt window */ 1020 /* the vt window */
1086 vt = XCreateSimpleWindow (disp, top, 1021 vt = XCreateSimpleWindow (dpy, top,
1087 window_vt_x,
1088 window_vt_y, 1022 window_vt_x, window_vt_y,
1089 width,
1090 height, 1023 width, height,
1091 0, 1024 0,
1092 pix_colors_focused[Color_fg], 1025 pix_colors_focused[Color_fg],
1093 pix_colors_focused[Color_bg]); 1026 pix_colors_focused[Color_bg]);
1094#ifdef DEBUG_X
1095 XStoreName (disp, vt, "vt window");
1096#endif
1097 1027
1098 attributes.bit_gravity = NorthWestGravity; 1028 attributes.bit_gravity = NorthWestGravity;
1099 XChangeWindowAttributes (disp, vt, CWBitGravity, &attributes); 1029 XChangeWindowAttributes (dpy, vt, CWBitGravity, &attributes);
1100 1030
1101 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1031 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1102 1032
1103 if (OPTION (Opt_pointerBlank) 1033 if (option (Opt_pointerBlank))
1104#ifdef ENABLE_PERL
1105 || perl.self
1106#endif
1107 )
1108 vt_emask |= PointerMotionMask; 1034 vt_emask |= PointerMotionMask;
1109 else 1035 else
1110 vt_emask |= Button1MotionMask | Button3MotionMask; 1036 vt_emask |= Button1MotionMask | Button3MotionMask;
1111 1037
1112 XSelectInput (disp, vt, vt_emask); 1038 vt_select_input ();
1039
1113 vt_ev.start (display, vt); 1040 vt_ev.start (display, vt);
1114 1041
1115#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1116 if (menuBar_height ())
1117 {
1118 menuBar.win = XCreateSimpleWindow (disp, top,
1119 window_vt_x, 0,
1120 width,
1121 menuBar_TotalHeight (),
1122 0,
1123 pix_colors_focused[Color_fg],
1124 pix_colors_focused[Color_scroll]);
1125
1126#ifdef DEBUG_X
1127 XStoreName (disp, menuBar.win, "menubar");
1128#endif
1129
1130 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1131
1132 XDefineCursor (disp, menuBar.win,
1133 XCreateFontCursor (disp, XC_left_ptr));
1134
1135 XSelectInput (disp, menuBar.win,
1136 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1137 menubar_ev.start (display, menuBar.win);
1138 }
1139#endif
1140
1141#ifdef XPM_BACKGROUND 1042#ifdef XPM_BACKGROUND
1142 if (rs[Rs_backgroundPixmap] != NULL 1043 if (rs[Rs_backgroundPixmap] != NULL)
1143 && ! OPTION (Opt_transparent))
1144 { 1044 {
1145 const char *p = rs[Rs_backgroundPixmap]; 1045 const char *p = rs[Rs_backgroundPixmap];
1146 1046
1147 if ((p = strchr (p, ';')) != NULL) 1047 if ((p = strchr (p, ';')) != NULL)
1148 { 1048 {
… …
1154 scr_touch (true); 1054 scr_touch (true);
1155 } 1055 }
1156#endif 1056#endif
1157 1057
1158 /* graphics context for the vt window */ 1058 /* graphics context for the vt window */
1159 gcvalue.foreground = pix_colors[Color_fg]; 1059 gcvalue.foreground = pix_colors[Color_fg];
1160 gcvalue.background = pix_colors[Color_bg]; 1060 gcvalue.background = pix_colors[Color_bg];
1161 gcvalue.graphics_exposures = 1; 1061 gcvalue.graphics_exposures = 0;
1062
1162 gc = XCreateGC (disp, vt, 1063 gc = XCreateGC (dpy, vt,
1163 GCForeground | GCBackground | GCGraphicsExposures, 1064 GCForeground | GCBackground | GCGraphicsExposures,
1164 &gcvalue); 1065 &gcvalue);
1165 1066
1166 drawable = new rxvt_drawable (display, vt); 1067 drawable = new rxvt_drawable (this, vt);
1167 1068
1168#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1069#ifdef RXVT_SCROLLBAR
1169 gcvalue.foreground = pix_colors[Color_topShadow]; 1070 gcvalue.foreground = pix_colors[Color_topShadow];
1170 topShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1071 topShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1171 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1072 gcvalue.foreground = pix_colors[Color_bottomShadow];
1172 botShadowGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1073 botShadowGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1173 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1074 gcvalue.foreground = pix_colors[ (depth <= 2 ? Color_fg : Color_scroll)];
1174 scrollbarGC = XCreateGC (disp, vt, GCForeground, &gcvalue); 1075 scrollbarGC = XCreateGC (dpy, vt, GCForeground, &gcvalue);
1175#endif 1076#endif
1176 1077
1177#ifdef OFF_FOCUS_FADING 1078#ifdef OFF_FOCUS_FADING
1178 // initially we are in unfocused state 1079 // initially we are in unfocused state
1179 if (rs[Rs_fade]) 1080 if (rs[Rs_fade])
1180 pix_colors = pix_colors_unfocused; 1081 pix_colors = pix_colors_unfocused;
1181#endif 1082#endif
1182 1083
1183 pointer_unblank (); 1084 pointer_unblank ();
1184 scr_recolour (); 1085 scr_recolour ();
1185
1186#if ENABLE_XEMBED
1187 if (rs[Rs_embed])
1188 {
1189 long info[2] = { 0, XEMBED_MAPPED };
1190
1191 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1192 32, PropModeReplace, (unsigned char *)&info, 2);
1193 }
1194#endif
1195} 1086}
1196 1087
1197/* ------------------------------------------------------------------------- * 1088/* ------------------------------------------------------------------------- *
1198 * GET TTY CURRENT STATE * 1089 * GET TTY CURRENT STATE *
1199 * ------------------------------------------------------------------------- */ 1090 * ------------------------------------------------------------------------- */
1200void 1091void
1201rxvt_get_ttymode (ttymode_t *tio, int erase) 1092rxvt_get_ttymode (ttymode_t *tio, int erase)
1202{ 1093{
1203#ifdef HAVE_TERMIOS_H
1204 /* 1094 /*
1205 * standard System V termios interface 1095 * standard System V termios interface
1206 */ 1096 */
1207 if (GET_TERMIOS (STDIN_FILENO, tio) < 0) 1097 if (GET_TERMIOS (STDIN_FILENO, tio) < 0)
1208 { 1098 {
… …
1275 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO 1165 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1276# if defined (ECHOCTL) && defined (ECHOKE) 1166# if defined (ECHOCTL) && defined (ECHOKE)
1277 | ECHOCTL | ECHOKE 1167 | ECHOCTL | ECHOKE
1278# endif 1168# endif
1279 | ECHOE | ECHOK); 1169 | ECHOE | ECHOK);
1280# else /* HAVE_TERMIOS_H */
1281
1282 /*
1283 * sgtty interface
1284 */
1285
1286 /* get parameters -- gtty */
1287 if (ioctl (STDIN_FILENO, TIOCGETP, & (tio->sg)) < 0)
1288 {
1289 tio->sg.sg_erase = CERASE; /* ^H */
1290 tio->sg.sg_kill = CKILL; /* ^U */
1291 }
1292
1293 if (erase != -1)
1294 tio->sg.sg_erase = (char)erase;
1295
1296 tio->sg.sg_flags = (CRMOD | ECHO | EVENP | ODDP);
1297
1298 /* get special characters */
1299 if (ioctl (STDIN_FILENO, TIOCGETC, & (tio->tc)) < 0)
1300 {
1301 tio->tc.t_intrc = CINTR; /* ^C */
1302 tio->tc.t_quitc = CQUIT; /* ^\ */
1303 tio->tc.t_startc = CSTART; /* ^Q */
1304 tio->tc.t_stopc = CSTOP; /* ^S */
1305 tio->tc.t_eofc = CEOF; /* ^D */
1306 tio->tc.t_brkc = -1;
1307 }
1308
1309 /* get local special chars */
1310 if (ioctl (STDIN_FILENO, TIOCGLTC, & (tio->lc)) < 0)
1311 {
1312 tio->lc.t_suspc = CSUSP; /* ^Z */
1313 tio->lc.t_dsuspc = CDSUSP; /* ^Y */
1314 tio->lc.t_rprntc = CRPRNT; /* ^R */
1315 tio->lc.t_flushc = CFLUSH; /* ^O */
1316 tio->lc.t_werasc = CWERASE; /* ^W */
1317 tio->lc.t_lnextc = CLNEXT; /* ^V */
1318 }
1319 /* get line discipline */
1320 ioctl (STDIN_FILENO, TIOCGETD, & (tio->line));
1321# ifdef NTTYDISC
1322 tio->line = NTTYDISC;
1323# endif /* NTTYDISC */
1324
1325 tio->local = (LCRTBS | LCRTERA | LCTLECH | LPASS8 | LCRTKIL);
1326#endif /* HAVE_TERMIOS_H */
1327 1170
1328 /* 1171 /*
1329 * Debugging 1172 * Debugging
1330 */ 1173 */
1331#ifdef DEBUG_TTYMODE 1174#ifdef DEBUG_TTYMODE
… …
1413 * the slave. 1256 * the slave.
1414 */ 1257 */
1415void 1258void
1416rxvt_term::run_command (const char *const *argv) 1259rxvt_term::run_command (const char *const *argv)
1417{ 1260{
1418 TEMP_ENV; // not very temporary...
1419
1420#if ENABLE_FRILLS 1261#if ENABLE_FRILLS
1421 if (rs[Rs_pty_fd]) 1262 if (rs[Rs_pty_fd])
1422 { 1263 {
1423 pty.pty = atoi (rs[Rs_pty_fd]); 1264 pty->pty = atoi (rs[Rs_pty_fd]);
1424 1265
1425 if (pty.pty >= 0) 1266 if (pty->pty >= 0)
1426 { 1267 {
1427 if (getfd_hook) 1268 if (getfd_hook)
1428 pty.pty = (*getfd_hook) (pty.pty); 1269 pty->pty = (*getfd_hook) (pty->pty);
1429 1270
1430 if (pty.pty < 0 || fcntl (pty.pty, F_SETFL, O_NONBLOCK)) 1271 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK))
1431 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1272 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1432 } 1273 }
1433 } 1274 }
1434 else 1275 else
1435#endif 1276#endif
1436 if (!pty.get ()) 1277 if (!pty->get ())
1437 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1278 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1438
1439 pty.set_utf8_mode (enc_utf8);
1440
1441 /* set initial window size */
1442 tt_winch ();
1443 1279
1444 int er; 1280 int er;
1445 1281
1446#ifndef NO_BACKSPACE_KEY 1282#ifndef NO_BACKSPACE_KEY
1447 if (key_backspace[0] && !key_backspace[1]) 1283 if (key_backspace[0] && !key_backspace[1])
… …
1451 else 1287 else
1452#endif 1288#endif
1453 er = -1; 1289 er = -1;
1454 1290
1455 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 ();
1456 1297
1457#if ENABLE_FRILLS 1298#if ENABLE_FRILLS
1458 if (rs[Rs_pty_fd]) 1299 if (rs[Rs_pty_fd])
1459 return; 1300 return;
1460#endif 1301#endif
1461 1302
1462#ifndef __QNX__
1463 /* spin off the command interpreter */ 1303 /* spin off the command interpreter */
1464 switch (cmd_pid = fork ()) 1304 switch (cmd_pid = fork ())
1465 { 1305 {
1466 case -1: 1306 case -1:
1467 { 1307 {
… …
1469 rxvt_fatal ("can't fork, aborting.\n"); 1309 rxvt_fatal ("can't fork, aborting.\n");
1470 } 1310 }
1471 case 0: 1311 case 0:
1472 init_env (); 1312 init_env ();
1473 1313
1474 if (!pty.make_controlling_tty ()) 1314 if (!pty->make_controlling_tty ())
1475 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1315 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1476 else 1316 else
1477 { 1317 {
1478 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1318 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1479 dup2 (pty.tty, STDIN_FILENO); 1319 dup2 (pty->tty, STDIN_FILENO);
1480 dup2 (pty.tty, STDOUT_FILENO); 1320 dup2 (pty->tty, STDOUT_FILENO);
1481 dup2 (pty.tty, STDERR_FILENO); 1321 dup2 (pty->tty, STDERR_FILENO);
1482 1322
1483 // close all our file handles that we do no longer need 1323 // close all our file handles that we do no longer need
1484 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++) 1324 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1485 { 1325 {
1486 if ((*t)->pty.pty > 2) close ((*t)->pty.pty); 1326 if ((*t)->pty->pty > 2) close ((*t)->pty->pty);
1487 if ((*t)->pty.tty > 2) close ((*t)->pty.tty); 1327 if ((*t)->pty->tty > 2) close ((*t)->pty->tty);
1488 } 1328 }
1489 1329
1490 run_child (argv); 1330 run_child (argv);
1491 fprintf (stderr, "%s: unable to exec child.", RESNAME); 1331 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1492 } 1332 }
1493 1333
1494 _exit (EXIT_FAILURE); 1334 _exit (EXIT_FAILURE);
1495 1335
1496 default: 1336 default:
1497 { 1337 if (!option (Opt_utmpInhibit))
1498#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1338 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]);
1499 int fdstdin;
1500 1339
1501 fdstdin = dup (STDIN_FILENO); 1340 pty->close_tty ();
1502 dup2 (pty.tty, STDIN_FILENO);
1503#endif
1504 1341
1505#ifdef UTMP_SUPPORT 1342 child_ev.start (cmd_pid);
1506 privileged_utmp (SAVE);
1507#endif
1508 1343
1509#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1344 HOOK_INVOKE ((this, HOOK_CHILD_START, DT_INT, cmd_pid, DT_END));
1510
1511 dup2 (fdstdin, STDIN_FILENO);
1512 close (fdstdin);
1513#endif
1514 }
1515
1516 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1517 break; 1345 break;
1518 } 1346 }
1519#else /* __QNX__ uses qnxspawn () */
1520 fchmod (pty.tty, 0622);
1521 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1522 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1523
1524 if (run_child (argv) == -1)
1525 exit (EXIT_FAILURE);
1526#endif
1527} 1347}
1528 1348
1529/* ------------------------------------------------------------------------- * 1349/* ------------------------------------------------------------------------- *
1530 * CHILD PROCESS OPERATIONS * 1350 * CHILD PROCESS OPERATIONS *
1531 * ------------------------------------------------------------------------- */ 1351 * ------------------------------------------------------------------------- */
… …
1536int 1356int
1537rxvt_term::run_child (const char *const *argv) 1357rxvt_term::run_child (const char *const *argv)
1538{ 1358{
1539 char *login; 1359 char *login;
1540 1360
1541 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1542
1543 if (OPTION (Opt_console)) 1361 if (option (Opt_console))
1544 { /* be virtual console, fail silently */ 1362 { /* be virtual console, fail silently */
1545#ifdef TIOCCONS 1363#ifdef TIOCCONS
1546 unsigned int on = 1; 1364 unsigned int on = 1;
1547 1365
1548 ioctl (STDIN_FILENO, TIOCCONS, &on); 1366 ioctl (STDIN_FILENO, TIOCCONS, &on);
… …
1575 // unblock signals (signals are blocked by iom.C 1393 // unblock signals (signals are blocked by iom.C
1576 sigset_t ss; 1394 sigset_t ss;
1577 sigemptyset (&ss); 1395 sigemptyset (&ss);
1578 sigprocmask (SIG_SETMASK, &ss, 0); 1396 sigprocmask (SIG_SETMASK, &ss, 0);
1579 1397
1580#ifndef __QNX__
1581 /* command interpreter path */ 1398 /* command interpreter path */
1582 if (argv != NULL) 1399 if (argv != NULL)
1583 { 1400 {
1584# ifdef DEBUG_CMD 1401# ifdef DEBUG_CMD
1585 int i; 1402 int i;
… …
1598 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0') 1415 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1599 shell = "/bin/sh"; 1416 shell = "/bin/sh";
1600 1417
1601 argv0 = (const char *)rxvt_r_basename (shell); 1418 argv0 = (const char *)rxvt_r_basename (shell);
1602 1419
1603 if (OPTION (Opt_loginShell)) 1420 if (option (Opt_loginShell))
1604 { 1421 {
1605 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char)); 1422 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1606 1423
1607 login[0] = '-'; 1424 login[0] = '-';
1608 strcpy (&login[1], argv0); 1425 strcpy (&login[1], argv0);
… …
1611 1428
1612 execlp (shell, argv0, NULL); 1429 execlp (shell, argv0, NULL);
1613 /* no error message: STDERR is closed! */ 1430 /* no error message: STDERR is closed! */
1614 } 1431 }
1615 1432
1616#else /* __QNX__ uses qnxspawn () */
1617
1618 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1619 char *command = NULL, fullcommand[_MAX_PATH];
1620 char **arg_v, *arg_a[2] = { NULL, NULL };
1621
1622 if (argv != NULL)
1623 {
1624 if (access (argv[0], X_OK) == -1)
1625 {
1626 if (strchr (argv[0], '/') == NULL)
1627 {
1628 searchenv (argv[0], "PATH", fullcommand);
1629
1630 if (fullcommand[0] != '\0')
1631 command = fullcommand;
1632 }
1633
1634 if (access (command, X_OK) == -1)
1635 return -1;
1636 }
1637 else
1638 command = argv[0];
1639
1640 arg_v = argv;
1641 }
1642 else
1643 {
1644 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1645 command = "/bin/sh";
1646
1647 arg_a[0] = my_basename (command);
1648
1649 if (OPTION (Opt_loginShell))
1650 {
1651 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1652
1653 login[0] = '-';
1654 strcpy (&login[1], arg_a[0]);
1655 arg_a[0] = login;
1656 }
1657
1658 arg_v = arg_a;
1659 }
1660
1661 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1662 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1663 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1664 command, arg_v, environ, iov_a, 0);
1665 if (login)
1666 free (login);
1667
1668 pty.close_tty ();
1669 return pty.pty;
1670#endif
1671
1672 return -1; 1433 return -1;
1673} 1434}
1674 1435
1675/*----------------------- end-of-file (C source) -----------------------*/ 1436/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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