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.70 by root, Fri Aug 13 03:47:09 2004 UTC vs.
Revision 1.79 by root, Sun Aug 15 22:09:24 2004 UTC

… …
357 }; 357 };
358 358
359bool 359bool
360rxvt_term::init_vars () 360rxvt_term::init_vars ()
361{ 361{
362 PixColorsFocused = new rxvt_color [TOTAL_COLORS]; 362 pix_colors_focused = new rxvt_color [TOTAL_COLORS];
363#ifdef OFF_FOCUS_FADING 363#ifdef OFF_FOCUS_FADING
364 PixColorsUnFocused = new rxvt_color [TOTAL_COLORS]; 364 pix_colors_unfocused = new rxvt_color [TOTAL_COLORS];
365#endif 365#endif
366 PixColors = PixColorsFocused; 366 pix_colors = pix_colors_focused;
367 367
368 if (PixColors == NULL) 368 if (pix_colors == NULL)
369 return false; 369 return false;
370 370
371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT) 371#if defined(XPM_BACKGROUND) || defined(TRANSPARENT)
372 TermWin.pixmap = None; 372 TermWin.pixmap = None;
373#endif 373#endif
374#ifdef UTMP_SUPPORT
375 next_utmp_action = SAVE;
376#endif
377#ifndef NO_SETOWNER_TTYDEV
378 next_tty_action = SAVE;
379#endif
380 374
381 MEvent.time = CurrentTime; 375 MEvent.time = CurrentTime;
382 MEvent.button = AnyButton; 376 MEvent.button = AnyButton;
383 Options = DEFAULT_OPTIONS; 377 options = DEFAULT_OPTIONS;
384 want_refresh = 1; 378 want_refresh = 1;
385 cmd_pid = -1; 379 cmd_pid = -1;
386 cmd_fd = tty_fd = -1; 380 pty.pty = pty.tty = -1;
387 PrivateModes = SavedModes = PrivMode_Default; 381 priv_modes = SavedModes = PrivMode_Default;
388 TermWin.focus = 0; 382 TermWin.focus = 0;
389 TermWin.ncol = 80; 383 TermWin.ncol = 80;
390 TermWin.nrow = 24; 384 TermWin.nrow = 24;
391 TermWin.int_bwidth = INTERNALBORDERWIDTH; 385 TermWin.int_bwidth = INTERNALBORDERWIDTH;
392 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 386 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
393 TermWin.lineSpace = LINESPACE; 387 TermWin.lineSpace = LINESPACE;
394 TermWin.saveLines = SAVELINES; 388 TermWin.saveLines = SAVELINES;
395 numPixColors = TOTAL_COLORS; 389 numpix_colors = TOTAL_COLORS;
396 390
397#ifndef NO_BRIGHTCOLOR 391#ifndef NO_BRIGHTCOLOR
398 colorfgbg = DEFAULT_RSTYLE; 392 colorfgbg = DEFAULT_RSTYLE;
399#endif 393#endif
400 394
… …
423 417
424void 418void
425rxvt_term::init_secondary () 419rxvt_term::init_secondary ()
426{ 420{
427 int i; 421 int i;
428#ifdef TTY_GID_SUPPORT
429 struct group *gr = getgrnam ("tty");
430
431 if (gr)
432 { /* change group ownership of tty to "tty" */
433 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
434 ttygid = gr->gr_gid;
435 }
436 else
437#endif /* TTY_GID_SUPPORT */
438
439 {
440 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
441 ttygid = getgid ();
442 }
443 422
444 /* 423 /*
445 * Close all unused file descriptors 424 * Close all unused file descriptors
446 * We don't want them, we don't need them. 425 * We don't want them, we don't need them.
447 */ 426 */
… …
480 459
481 /* 460 /*
482 * Look for -exec option. Find => split and make cmd_argv[] of command args 461 * Look for -exec option. Find => split and make cmd_argv[] of command args
483 */ 462 */
484 for (r_argc = 0; r_argc < argc; r_argc++) 463 for (r_argc = 0; r_argc < argc; r_argc++)
485 if (!STRCMP (argv[r_argc], "-e") || !STRCMP (argv[r_argc], "-exec")) 464 if (!strcmp (argv[r_argc], "-e") || !strcmp (argv[r_argc], "-exec"))
486 break; 465 break;
487 466
488 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1)); 467 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
489 468
490 for (i = 0; i < r_argc; i++) 469 for (i = 0; i < r_argc; i++)
… …
516 free (r_argv); 495 free (r_argv);
517 496
518#ifdef LOCAL_X_IS_UNIX 497#ifdef LOCAL_X_IS_UNIX
519 if (rs[Rs_display_name][0] == ':') 498 if (rs[Rs_display_name][0] == ':')
520 { 499 {
521 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 500 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
522 STRCPY (val, "unix"); 501 strcpy (val, "unix");
523 STRCAT (val, rs[Rs_display_name]); 502 strcat (val, rs[Rs_display_name]);
524 display = displays.get (val); 503 display = displays.get (val);
525 free (val); 504 free (val);
526 } 505 }
527#endif 506#endif
528 507
529 if (!display 508 if (!display
530 && ! (display = displays.get (rs[Rs_display_name]))) 509 && ! (display = displays.get (rs[Rs_display_name])))
531 rxvt_fatal ("can't open display %s", rs[Rs_display_name]); 510 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
532 511
533 extract_resources (display->display, rs[Rs_name]); 512 extract_resources (display->display, rs[Rs_name]);
534 513
535 /* 514 /*
536 * set any defaults not already set 515 * set any defaults not already set
… …
551 } 530 }
552 531
553 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0) 532 if (rs[Rs_saveLines] && (i = atoi (rs[Rs_saveLines])) >= 0)
554 TermWin.saveLines = BOUND_POSITIVE_INT16 (i); 533 TermWin.saveLines = BOUND_POSITIVE_INT16 (i);
555 534
556#ifndef NO_FRILLS 535#if ENABLE_FRILLS
557 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0) 536 if (rs[Rs_int_bwidth] && (i = atoi (rs[Rs_int_bwidth])) >= 0)
558 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */ 537 TermWin.int_bwidth = min (i, 100); /* arbitrary limit */
559 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0) 538 if (rs[Rs_ext_bwidth] && (i = atoi (rs[Rs_ext_bwidth])) >= 0)
560 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */ 539 TermWin.ext_bwidth = min (i, 100); /* arbitrary limit */
561#endif 540#endif
… …
572 pointerBlankDelay = 2; 551 pointerBlankDelay = 2;
573#endif 552#endif
574 553
575 /* no point having a scrollbar without having any scrollback! */ 554 /* no point having a scrollbar without having any scrollback! */
576 if (!TermWin.saveLines) 555 if (!TermWin.saveLines)
577 Options &= ~Opt_scrollBar; 556 options &= ~Opt_scrollBar;
578 557
579#ifdef PRINTPIPE 558#ifdef PRINTPIPE
580 if (!rs[Rs_print_pipe]) 559 if (!rs[Rs_print_pipe])
581 rs[Rs_print_pipe] = PRINTPIPE; 560 rs[Rs_print_pipe] = PRINTPIPE;
582#endif 561#endif
… …
591# else 570# else
592 key_backspace = "DEC"; /* can toggle between \010 or \177 */ 571 key_backspace = "DEC"; /* can toggle between \010 or \177 */
593# endif 572# endif
594 else 573 else
595 { 574 {
596 val = STRDUP (rs[Rs_backspace_key]); 575 val = strdup (rs[Rs_backspace_key]);
597 rxvt_Str_trim (val); 576 rxvt_Str_trim (val);
598 rxvt_Str_escaped (val); 577 rxvt_Str_escaped (val);
599 key_backspace = val; 578 key_backspace = val;
600 } 579 }
601#endif 580#endif
… …
607# else 586# else
608 key_delete = "\033[3~"; 587 key_delete = "\033[3~";
609# endif 588# endif
610 else 589 else
611 { 590 {
612 val = STRDUP (rs[Rs_delete_key]); 591 val = strdup (rs[Rs_delete_key]);
613 rxvt_Str_trim (val); 592 rxvt_Str_trim (val);
614 rxvt_Str_escaped (val); 593 rxvt_Str_escaped (val);
615 key_delete = val; 594 key_delete = val;
616 } 595 }
617#endif 596#endif
… …
626 rs[Rs_scrollBar_thickness]); 605 rs[Rs_scrollBar_thickness]);
627#endif 606#endif
628 607
629#ifdef XTERM_REVERSE_VIDEO 608#ifdef XTERM_REVERSE_VIDEO
630 /* this is how xterm implements reverseVideo */ 609 /* this is how xterm implements reverseVideo */
631 if (Options & Opt_reverseVideo) 610 if (options & Opt_reverseVideo)
632 { 611 {
633 if (!rs[Rs_color + Color_fg]) 612 if (!rs[Rs_color + Color_fg])
634 rs[Rs_color + Color_fg] = def_colorName[Color_bg]; 613 rs[Rs_color + Color_fg] = def_colorName[Color_bg];
635 if (!rs[Rs_color + Color_bg]) 614 if (!rs[Rs_color + Color_bg])
636 rs[Rs_color + Color_bg] = def_colorName[Color_fg]; 615 rs[Rs_color + Color_bg] = def_colorName[Color_fg];
… …
641 if (!rs[Rs_color + i]) 620 if (!rs[Rs_color + i])
642 rs[Rs_color + i] = def_colorName[i]; 621 rs[Rs_color + i] = def_colorName[i];
643 622
644#ifndef XTERM_REVERSE_VIDEO 623#ifndef XTERM_REVERSE_VIDEO
645 /* this is how we implement reverseVideo */ 624 /* this is how we implement reverseVideo */
646 if (Options & Opt_reverseVideo) 625 if (options & Opt_reverseVideo)
647 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *); 626 SWAP_IT (rs[Rs_color + Color_fg], rs[Rs_color + Color_bg], const char *);
648#endif 627#endif
649 628
650 /* convenient aliases for setting fg/bg to colors */ 629 /* convenient aliases for setting fg/bg to colors */
651 color_aliases (Color_fg); 630 color_aliases (Color_fg);
… …
693 val = XDisplayString (display->display); 672 val = XDisplayString (display->display);
694 673
695 if (rs[Rs_display_name] == NULL) 674 if (rs[Rs_display_name] == NULL)
696 rs[Rs_display_name] = val; /* use broken `:0' value */ 675 rs[Rs_display_name] = val; /* use broken `:0' value */
697 676
698 i = STRLEN (val); 677 i = strlen (val);
699 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char)); 678 env_display = (char *)rxvt_malloc ((i + 9) * sizeof (char));
700 679
701 sprintf (env_display, "DISPLAY=%s", val); 680 sprintf (env_display, "DISPLAY=%s", val);
702 681
703 /* avoiding the math library: 682 /* avoiding the math library:
… …
732 else 711 else
733 putenv ("COLORTERM=" COLORTERMENVFULL); 712 putenv ("COLORTERM=" COLORTERMENVFULL);
734 713
735 if (rs[Rs_term_name] != NULL) 714 if (rs[Rs_term_name] != NULL)
736 { 715 {
737 env_term = (char *)rxvt_malloc ((STRLEN (rs[Rs_term_name]) + 6) * sizeof (char)); 716 env_term = (char *)rxvt_malloc ((strlen (rs[Rs_term_name]) + 6) * sizeof (char));
738 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 717 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
739 putenv (env_term); 718 putenv (env_term);
740 } 719 }
741 else 720 else
742 putenv ("TERM=" TERMENV); 721 putenv ("TERM=" TERMENV);
… …
761 free (this->locale); 740 free (this->locale);
762 this->locale = setlocale (LC_CTYPE, locale); 741 this->locale = setlocale (LC_CTYPE, locale);
763 742
764 if (!this->locale) 743 if (!this->locale)
765 { 744 {
745 if (*locale)
746 {
766 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale); 747 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
767 setlocale (LC_CTYPE, ""); 748 setlocale (LC_CTYPE, "");
749 }
750 else
751 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
752
768 this->locale = ""; 753 this->locale = "";
769 } 754 }
755
770 756
771 this->locale = rxvt_strdup (this->locale); 757 this->locale = rxvt_strdup (this->locale);
772 SET_LOCALE (this->locale); 758 SET_LOCALE (this->locale);
773 mbstate.reset (); 759 mbstate.reset ();
774#endif 760#endif
775#if 0 761#if 0
776#if HAVE_NL_LANGINFO 762#if HAVE_NL_LANGINFO
777 free (codeset); 763 free (codeset);
778 codeset = strdup (nl_langinfo (CODESET)); 764 codeset = strdup (nl_langinfo (CODESET));
779 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 765 enc_utf8 = !strcasecmp (codeset, "UTF-8")
780 || !STRCASECMP (codeset, "UTF8"); 766 || !strcasecmp (codeset, "UTF8");
781#else 767#else
782 enc_utf8 = 1; 768 enc_utf8 = 1;
783#endif 769#endif
784#endif 770#endif
785} 771}
… …
795 Atom wmlocale; 781 Atom wmlocale;
796 782
797 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 783 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
798 XChangeProperty (display->display, TermWin.parent[0], wmlocale, 784 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
799 XA_STRING, 8, PropModeReplace, 785 XA_STRING, 8, PropModeReplace,
800 (unsigned char *)locale, STRLEN (locale)); 786 (unsigned char *)locale, strlen (locale));
801 787
802 if (!XSupportsLocale ()) 788 if (!XSupportsLocale ())
803 { 789 {
804 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n"); 790 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
805 return; 791 return;
… …
834 /* enable W11 callbacks */ 820 /* enable W11 callbacks */
835 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 821 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
836#endif 822#endif
837 823
838#ifdef META8_OPTION 824#ifdef META8_OPTION
839 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 825 meta_char = (options & Opt_meta8 ? 0x80 : C0_ESC);
840#endif 826#endif
841 827
842 get_ourmods (); 828 get_ourmods ();
843 829
844 if (!(Options & Opt_scrollTtyOutput)) 830 if (!(options & Opt_scrollTtyOutput))
845 PrivateModes |= PrivMode_TtyOutputInh; 831 priv_modes |= PrivMode_TtyOutputInh;
846 if (Options & Opt_scrollTtyKeypress) 832 if (options & Opt_scrollTtyKeypress)
847 PrivateModes |= PrivMode_Keypress; 833 priv_modes |= PrivMode_Keypress;
848 if (!(Options & Opt_jumpScroll)) 834 if (!(options & Opt_jumpScroll))
849 PrivateModes |= PrivMode_smoothScroll; 835 priv_modes |= PrivMode_smoothScroll;
850 836
851#ifndef NO_BACKSPACE_KEY 837#ifndef NO_BACKSPACE_KEY
852 if (STRCMP (key_backspace, "DEC") == 0) 838 if (strcmp (key_backspace, "DEC") == 0)
853 PrivateModes |= PrivMode_HaveBackSpace; 839 priv_modes |= PrivMode_HaveBackSpace;
854#endif 840#endif
855 841
856 /* add value for scrollBar */ 842 /* add value for scrollBar */
857 if (scrollbar_visible ()) 843 if (scrollbar_visible ())
858 { 844 {
859 PrivateModes |= PrivMode_scrollBar; 845 priv_modes |= PrivMode_scrollBar;
860 SavedModes |= PrivMode_scrollBar; 846 SavedModes |= PrivMode_scrollBar;
861 } 847 }
862 if (menubar_visible ()) 848 if (menubar_visible ())
863 { 849 {
864 PrivateModes |= PrivMode_menuBar; 850 priv_modes |= PrivMode_menuBar;
865 SavedModes |= PrivMode_menuBar; 851 SavedModes |= PrivMode_menuBar;
866 } 852 }
867 853
868#ifdef CURSOR_BLINK 854#ifdef CURSOR_BLINK
869 if (Options & Opt_cursorBlink) 855 if (options & Opt_cursorBlink)
870 (void)gettimeofday (&lastcursorchange, NULL); 856 (void)gettimeofday (&lastcursorchange, NULL);
871#endif 857#endif
872 858
873 run_command (argv); 859 run_command (argv);
874} 860}
… …
878rxvt_term::Get_Colours () 864rxvt_term::Get_Colours ()
879{ 865{
880 int i; 866 int i;
881 867
882#ifdef OFF_FOCUS_FADING 868#ifdef OFF_FOCUS_FADING
883 PixColors = PixColorsFocused; 869 pix_colors = pix_colors_focused;
884#endif 870#endif
885 871
886 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++) 872 for (i = 0; i < (display->depth <= 2 ? 2 : NRS_COLORS); i++)
887 { 873 {
888 rxvt_color xcol; 874 rxvt_color xcol;
… …
891 continue; 877 continue;
892 878
893 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 879 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
894 { 880 {
895#ifndef XTERM_REVERSE_VIDEO 881#ifndef XTERM_REVERSE_VIDEO
896 if (i < 2 && (Options & Opt_reverseVideo)) 882 if (i < 2 && (options & Opt_reverseVideo))
897 rs[Rs_color + i] = def_colorName[!i]; 883 rs[Rs_color + i] = def_colorName[!i];
898 else 884 else
899#endif 885#endif
900 rs[Rs_color + i] = def_colorName[i]; 886 rs[Rs_color + i] = def_colorName[i];
901 887
… …
907 switch (i) 893 switch (i)
908 { 894 {
909 case Color_fg: 895 case Color_fg:
910 case Color_bg: 896 case Color_bg:
911 /* fatal: need bg/fg color */ 897 /* fatal: need bg/fg color */
912 rxvt_fatal ("unable to get foreground/background colour, aborting"); 898 rxvt_fatal ("unable to get foreground/background colour, aborting.\n");
913 /* NOTREACHED */ 899 /* NOTREACHED */
914 break; 900 break;
915#ifndef NO_CURSORCOLOR 901#ifndef NO_CURSORCOLOR
916 case Color_cursor2: 902 case Color_cursor2:
917 xcol = PixColors[Color_fg]; 903 xcol = pix_colors[Color_fg];
918 break; 904 break;
919#endif /* ! NO_CURSORCOLOR */ 905#endif /* ! NO_CURSORCOLOR */
920 case Color_pointer_fg: 906 case Color_pointer_fg:
921 xcol = PixColors[Color_fg]; 907 xcol = pix_colors[Color_fg];
922 break; 908 break;
923 default: 909 default:
924 xcol = PixColors[Color_bg]; /* None */ 910 xcol = pix_colors[Color_bg]; /* None */
925 break; 911 break;
926 } 912 }
927 } 913 }
928 } 914 }
929 915
930 PixColors[i] = xcol; 916 pix_colors[i] = xcol;
931#ifdef OFF_FOCUS_FADING 917#ifdef OFF_FOCUS_FADING
932 if (rs[Rs_fade]) 918 if (rs[Rs_fade])
933 PixColorsUnFocused[i] = xcol.fade (display, atoi (rs[Rs_fade])); 919 pix_colors_unfocused[i] = xcol.fade (display, atoi (rs[Rs_fade]));
934#endif 920#endif
935 SET_PIXCOLOR (i); 921 SET_PIXCOLOR (i);
936 } 922 }
937 923
938 if (display->depth <= 2) 924 if (display->depth <= 2)
939 { 925 {
940 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg]; 926 if (!rs[Rs_color + Color_pointer_fg]) pix_colors[Color_pointer_fg] = pix_colors[Color_fg];
941 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg]; 927 if (!rs[Rs_color + Color_pointer_bg]) pix_colors[Color_pointer_bg] = pix_colors[Color_bg];
942 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg]; 928 if (!rs[Rs_color + Color_border] ) pix_colors[Color_border] = pix_colors[Color_fg];
943 } 929 }
944 930
945 /* 931 /*
946 * get scrollBar/menuBar shadow colors 932 * get scrollBar/menuBar shadow colors
947 * 933 *
… …
950 */ 936 */
951#ifdef KEEP_SCROLLCOLOR 937#ifdef KEEP_SCROLLCOLOR
952 938
953 if (display->depth <= 2) 939 if (display->depth <= 2)
954 { /* Monochrome */ 940 { /* Monochrome */
955 PixColors[Color_scroll] = PixColors[Color_fg]; 941 pix_colors[Color_scroll] = pix_colors[Color_fg];
956 PixColors[Color_topShadow] = PixColors[Color_bg]; 942 pix_colors[Color_topShadow] = pix_colors[Color_bg];
957 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 943 pix_colors[Color_bottomShadow] = pix_colors[Color_bg];
958 } 944 }
959 else 945 else
960 { 946 {
961 rxvt_color xcol[2]; 947 rxvt_color xcol[2];
962 /* xcol[0] == white 948 /* xcol[0] == white
963 * xcol[1] == top shadow 949 * xcol[1] == top shadow
964 * xcol[2] == bot shadow */ 950 * xcol[2] == bot shadow */
965 951
966 xcol[1] = PixColors[Color_scroll]; 952 xcol[1] = pix_colors[Color_scroll];
967 xcol[0].set (display, 65535, 65535, 65535); 953 xcol[0].set (display, 65535, 65535, 65535);
968 954
969 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 955 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
970 956
971 xcol[0].get (display, pr0, pg0, pb0); 957 xcol[0].get (display, pr0, pg0, pb0);
972 xcol[1].get (display, pr1, pg1, pb1); 958 xcol[1].get (display, pr1, pg1, pb1);
973 959
974 PixColors[Color_bottomShadow] = xcol[1].fade (display, 50); 960 pix_colors[Color_bottomShadow] = xcol[1].fade (display, 50);
975 961
976 /* topShadowColor */ 962 /* topShadowColor */
977 if (!xcol[1].set (display, 963 if (!xcol[1].set (display,
978 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 964 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
979 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 965 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
980 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 966 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
981 xcol[1] = PixColors[Color_White]; 967 xcol[1] = pix_colors[Color_White];
982 968
983 PixColors[Color_topShadow] = xcol[1]; 969 pix_colors[Color_topShadow] = xcol[1];
984 } 970 }
985#endif /* KEEP_SCROLLCOLOR */ 971#endif /* KEEP_SCROLLCOLOR */
986} 972}
987 973
988/*----------------------------------------------------------------------*/ 974/*----------------------------------------------------------------------*/
… …
1028 }; 1014 };
1029 1015
1030 requestedmeta = realmeta = realalt = 0; 1016 requestedmeta = realmeta = realalt = 0;
1031 rsmod = rs[Rs_modifier]; 1017 rsmod = rs[Rs_modifier];
1032 if (rsmod 1018 if (rsmod
1033 && STRCASECMP (rsmod, "mod1") >= 0 && STRCASECMP (rsmod, "mod5") <= 0) 1019 && strcasecmp (rsmod, "mod1") >= 0 && strcasecmp (rsmod, "mod5") <= 0)
1034 requestedmeta = rsmod[3] - '0'; 1020 requestedmeta = rsmod[3] - '0';
1035 1021
1036 map = XGetModifierMapping (display->display); 1022 map = XGetModifierMapping (display->display);
1037 kc = map->modifiermap; 1023 kc = map->modifiermap;
1038 for (i = 1; i < 6; i++) 1024 for (i = 1; i < 6; i++)
… …
1066 case XK_Hyper_L: 1052 case XK_Hyper_L:
1067 case XK_Hyper_R: 1053 case XK_Hyper_R:
1068 cm = "hyper"; 1054 cm = "hyper";
1069 break; 1055 break;
1070 } 1056 }
1071 if (rsmod && STRNCASECMP (rsmod, cm, STRLEN (cm)) == 0) 1057 if (rsmod && strncasecmp (rsmod, cm, strlen (cm)) == 0)
1072 requestedmeta = i; 1058 requestedmeta = i;
1073 } 1059 }
1074 } 1060 }
1075 XFreeModifiermap (map); 1061 XFreeModifiermap (map);
1076 i = (requestedmeta ? requestedmeta 1062 i = (requestedmeta ? requestedmeta
… …
1085void 1071void
1086rxvt_term::create_windows (int argc, const char *const *argv) 1072rxvt_term::create_windows (int argc, const char *const *argv)
1087{ 1073{
1088 XClassHint classHint; 1074 XClassHint classHint;
1089 XWMHints wmHint; 1075 XWMHints wmHint;
1090#ifndef NO_FRILLS 1076#if ENABLE_FRILLS
1091 Atom prop = None; 1077 Atom prop = None;
1092 MWMHints mwmhints; 1078 MWMHints mwmhints;
1093#endif 1079#endif
1094 XGCValues gcvalue; 1080 XGCValues gcvalue;
1095 long vt_emask; 1081 long vt_emask;
1096 XSetWindowAttributes attributes; 1082 XSetWindowAttributes attributes;
1097 XWindowAttributes gattr; 1083 XWindowAttributes gattr;
1098 1084
1099 if (Options & Opt_transparent) 1085 if (options & Opt_transparent)
1100 { 1086 {
1101 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1087 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
1102 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 1088 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1103 } 1089 }
1104 1090
1105#ifndef NO_FRILLS 1091#if ENABLE_FRILLS
1106 if (Options & Opt_borderLess) 1092 if (options & Opt_borderLess)
1107 { 1093 {
1108 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 1094 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True);
1109 if (prop == None) 1095 if (prop == None)
1110 { 1096 {
1111 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 1097 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
… …
1141 old_height = szHint.height; 1127 old_height = szHint.height;
1142 1128
1143 /* sub-window placement & size in rxvt_resize_subwindows () */ 1129 /* sub-window placement & size in rxvt_resize_subwindows () */
1144 1130
1145#ifdef PREFER_24BIT 1131#ifdef PREFER_24BIT
1146 attributes.background_pixel = PixColors[Color_bg]; 1132 attributes.background_pixel = pix_colors[Color_bg];
1147 attributes.border_pixel = PixColors[Color_border]; 1133 attributes.border_pixel = pix_colors[Color_border];
1148 attributes.colormap = display->cmap; 1134 attributes.colormap = display->cmap;
1149 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1135 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1150 szHint.x, szHint.y, 1136 szHint.x, szHint.y,
1151 szHint.width, szHint.height, 1137 szHint.width, szHint.height,
1152 TermWin.ext_bwidth, 1138 TermWin.ext_bwidth,
… …
1156#else 1142#else
1157 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1143 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1158 szHint.x, szHint.y, 1144 szHint.x, szHint.y,
1159 szHint.width, szHint.height, 1145 szHint.width, szHint.height,
1160 TermWin.ext_bwidth, 1146 TermWin.ext_bwidth,
1161 PixColors[Color_border], 1147 pix_colors[Color_border],
1162 PixColors[Color_bg]); 1148 pix_colors[Color_bg]);
1163#endif 1149#endif
1164 1150
1165 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1151 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1166 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1152 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1167 1153
1168 classHint.res_name = (char *)rs[Rs_name]; 1154 classHint.res_name = (char *)rs[Rs_name];
1169 classHint.res_class = (char *)RESCLASS; 1155 classHint.res_class = (char *)RESCLASS;
1170 1156
1171 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1157 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1172 wmHint.input = True; 1158 wmHint.input = True;
1173 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState; 1159 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1174 wmHint.window_group = TermWin.parent[0]; 1160 wmHint.window_group = TermWin.parent[0];
1175 1161
1176 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1162 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1177 (char **)argv, argc, &szHint, &wmHint, &classHint); 1163 (char **)argv, argc, &szHint, &wmHint, &classHint);
1178 1164
1179#ifndef NO_FRILLS 1165#if ENABLE_FRILLS
1180 long pid = getpid (); 1166 long pid = getpid ();
1181 XChangeProperty (display->display, TermWin.parent[0], 1167 XChangeProperty (display->display, TermWin.parent[0],
1182 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32, 1168 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1183 PropModeReplace, (unsigned char *)&pid, 1); 1169 PropModeReplace, (unsigned char *)&pid, 1);
1184#endif 1170#endif
… …
1191 | FocusChangeMask | VisibilityChangeMask 1177 | FocusChangeMask | VisibilityChangeMask
1192 | ExposureMask 1178 | ExposureMask
1193 | StructureNotifyMask); 1179 | StructureNotifyMask);
1194 termwin_ev.start (display, TermWin.parent[0]); 1180 termwin_ev.start (display, TermWin.parent[0]);
1195 1181
1196#ifndef NO_FRILLS 1182#if ENABLE_FRILLS
1197 if (mwmhints.flags) 1183 if (mwmhints.flags)
1198 { 1184 {
1199 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False); 1185 prop = XInternAtom(display->display, "_MOTIF_WM_HINTS", False);
1200 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS); 1186 XChangeProperty(display->display, TermWin.parent[0], prop, prop, 32, PropModeReplace, (unsigned char *) &mwmhints, PROP_MWM_HINTS_ELEMENTS);
1201 } 1187 }
… …
1227 window_vt_x, 1213 window_vt_x,
1228 window_vt_y, 1214 window_vt_y,
1229 TermWin_TotalWidth (), 1215 TermWin_TotalWidth (),
1230 TermWin_TotalHeight (), 1216 TermWin_TotalHeight (),
1231 0, 1217 0,
1232 PixColors[Color_fg], 1218 pix_colors[Color_fg],
1233 PixColors[Color_bg]); 1219 pix_colors[Color_bg]);
1234#ifdef DEBUG_X 1220#ifdef DEBUG_X
1235 XStoreName (display->display, TermWin.vt, "vt window"); 1221 XStoreName (display->display, TermWin.vt, "vt window");
1236#endif 1222#endif
1237 1223
1238 attributes.bit_gravity = NorthWestGravity; 1224 attributes.bit_gravity = NorthWestGravity;
… …
1241 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1227 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1242 1228
1243 pointer_unblank (); 1229 pointer_unblank ();
1244 1230
1245#ifdef POINTER_BLANK 1231#ifdef POINTER_BLANK
1246 if (Options & Opt_pointerBlank) 1232 if (options & Opt_pointerBlank)
1247 vt_emask |= PointerMotionMask; 1233 vt_emask |= PointerMotionMask;
1248 else 1234 else
1249#endif 1235#endif
1250 vt_emask |= Button1MotionMask | Button3MotionMask; 1236 vt_emask |= Button1MotionMask | Button3MotionMask;
1251 1237
… …
1258 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1244 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1259 window_vt_x, 0, 1245 window_vt_x, 0,
1260 TermWin_TotalWidth (), 1246 TermWin_TotalWidth (),
1261 menuBar_TotalHeight (), 1247 menuBar_TotalHeight (),
1262 0, 1248 0,
1263 PixColors[Color_fg], 1249 pix_colors[Color_fg],
1264 PixColors[Color_scroll]); 1250 pix_colors[Color_scroll]);
1265 1251
1266#ifdef DEBUG_X 1252#ifdef DEBUG_X
1267 XStoreName (display->display, menuBar.win, "menubar"); 1253 XStoreName (display->display, menuBar.win, "menubar");
1268#endif 1254#endif
1269 1255
… …
1279 } 1265 }
1280#endif 1266#endif
1281 1267
1282#ifdef XPM_BACKGROUND 1268#ifdef XPM_BACKGROUND
1283 if (rs[Rs_backgroundPixmap] != NULL 1269 if (rs[Rs_backgroundPixmap] != NULL
1284 && ! (Options & Opt_transparent)) 1270 && ! (options & Opt_transparent))
1285 { 1271 {
1286 const char *p = rs[Rs_backgroundPixmap]; 1272 const char *p = rs[Rs_backgroundPixmap];
1287 1273
1288 if ((p = STRCHR (p, ';')) != NULL) 1274 if ((p = strchr (p, ';')) != NULL)
1289 { 1275 {
1290 p++; 1276 p++;
1291 scale_pixmap (p); 1277 scale_pixmap (p);
1292 } 1278 }
1293 set_bgPixmap (rs[Rs_backgroundPixmap]); 1279 set_bgPixmap (rs[Rs_backgroundPixmap]);
1294 scr_touch (True); 1280 scr_touch (True);
1295 } 1281 }
1296#endif 1282#endif
1297 1283
1298 /* graphics context for the vt window */ 1284 /* graphics context for the vt window */
1299 gcvalue.foreground = PixColors[Color_fg]; 1285 gcvalue.foreground = pix_colors[Color_fg];
1300 gcvalue.background = PixColors[Color_bg]; 1286 gcvalue.background = pix_colors[Color_bg];
1301 gcvalue.graphics_exposures = 1; 1287 gcvalue.graphics_exposures = 1;
1302 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1288 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1303 GCForeground | GCBackground | GCGraphicsExposures, 1289 GCForeground | GCBackground | GCGraphicsExposures,
1304 &gcvalue); 1290 &gcvalue);
1305 1291
1306 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1307 1293
1308#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1309 gcvalue.foreground = PixColors[Color_topShadow]; 1295 gcvalue.foreground = pix_colors[Color_topShadow];
1310 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1296 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1311 gcvalue.foreground = PixColors[Color_bottomShadow]; 1297 gcvalue.foreground = pix_colors[Color_bottomShadow];
1312 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1298 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1313 gcvalue.foreground = PixColors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1299 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1314 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1300 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1315#endif 1301#endif
1316 1302
1317#ifdef OFF_FOCUS_FADING 1303#ifdef OFF_FOCUS_FADING
1318 // initially we are in unfocused state 1304 // initially we are in unfocused state
1319 if (rs[Rs_fade]) 1305 if (rs[Rs_fade])
1320 PixColors = PixColorsUnFocused; 1306 pix_colors = pix_colors_unfocused;
1321#endif
1322}
1323
1324/*----------------------------------------------------------------------*/
1325/*
1326 * Run the command in a subprocess and return a file descriptor for the
1327 * master end of the pseudo-teletype pair with the command talking to
1328 * the slave.
1329 */
1330void
1331rxvt_term::run_command (const char *const *argv)
1332{
1333 int er;
1334
1335 /* get master (pty) */
1336 if ((cmd_fd = rxvt_get_pty (&tty_fd, &ttydev)) < 0)
1337 rxvt_fatal ("can't open pseudo-tty");
1338
1339 fcntl (cmd_fd, F_SETFL, O_NONBLOCK);
1340
1341 /* get slave (tty) */
1342 if (tty_fd < 0)
1343 {
1344#ifndef NO_SETOWNER_TTYDEV
1345 privileged_ttydev (SAVE);
1346#endif
1347
1348 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1349 {
1350 close (cmd_fd);
1351 cmd_fd = -1;
1352 rxvt_fatal ("can't open slave tty %s", ttydev);
1353 }
1354 }
1355
1356#ifndef NO_BACKSPACE_KEY
1357 if (key_backspace[0] && !key_backspace[1])
1358 er = key_backspace[0];
1359 else if (STRCMP (key_backspace, "DEC") == 0)
1360 er = '\177'; /* the initial state anyway */
1361 else
1362#endif
1363 er = -1;
1364
1365 rxvt_get_ttymode (&tio, er);
1366
1367#ifndef __QNX__
1368 /* spin off the command interpreter */
1369 switch (cmd_pid = fork ())
1370 {
1371 case -1:
1372 rxvt_fatal ("can't fork");
1373 case 0:
1374 init_env ();
1375
1376 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1377 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1378 else
1379 {
1380 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1381 dup2 (tty_fd, STDIN_FILENO);
1382 dup2 (tty_fd, STDOUT_FILENO);
1383 dup2 (tty_fd, STDERR_FILENO);
1384
1385 // close all our file handles that we do no longer need
1386 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1387 {
1388 if ((*t)->cmd_fd > 2) close ((*t)->cmd_fd);
1389 if ((*t)->tty_fd > 2) close ((*t)->tty_fd);
1390 }
1391
1392 run_child (argv);
1393 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1394 }
1395
1396 _exit (EXIT_FAILURE);
1397
1398 default:
1399 {
1400#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1401 int fdstdin;
1402
1403 fdstdin = dup (STDIN_FILENO);
1404 dup2 (tty_fd, STDIN_FILENO);
1405#endif
1406
1407#ifdef UTMP_SUPPORT
1408 privileged_utmp (SAVE);
1409#endif
1410
1411#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1412
1413 dup2 (fdstdin, STDIN_FILENO);
1414 close (fdstdin);
1415#endif
1416 }
1417
1418 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1419 break;
1420 }
1421#else /* __QNX__ uses qnxspawn () */
1422 fchmod (tty_fd, 0622);
1423 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1424 fcntl (cmd_fd, F_SETFD, FD_CLOEXEC);
1425
1426 if (run_child (argv) == -1)
1427 exit (EXIT_FAILURE);
1428#endif
1429}
1430
1431/* ------------------------------------------------------------------------- *
1432 * CHILD PROCESS OPERATIONS *
1433 * ------------------------------------------------------------------------- */
1434/*
1435 * The only open file descriptor is the slave tty - so no error messages.
1436 * returns are fatal
1437 */
1438int
1439rxvt_term::run_child (const char *const *argv)
1440{
1441 char *login;
1442
1443 SET_TTYMODE (STDIN_FILENO, & (tio)); /* init terminal attributes */
1444
1445 if (Options & Opt_console)
1446 { /* be virtual console, fail silently */
1447#ifdef TIOCCONS
1448 unsigned int on = 1;
1449
1450 ioctl (STDIN_FILENO, TIOCCONS, &on);
1451#elif defined (SRIOCSREDIR)
1452 int fd;
1453
1454 fd = open (CONSOLE, O_WRONLY, 0);
1455 if (fd >= 0)
1456 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1457 close (fd);
1458#endif /* SRIOCSREDIR */
1459
1460 }
1461
1462 /* reset signals and spin off the command interpreter */
1463 signal (SIGINT, SIG_DFL);
1464 signal (SIGQUIT, SIG_DFL);
1465 signal (SIGCHLD, SIG_DFL);
1466 /*
1467 * mimick login's behavior by disabling the job control signals
1468 * a shell that wants them can turn them back on
1469 */
1470#ifdef SIGTSTP
1471 signal (SIGTSTP, SIG_IGN);
1472 signal (SIGTTIN, SIG_IGN);
1473 signal (SIGTTOU, SIG_IGN);
1474#endif /* SIGTSTP */
1475
1476 /* set window size */
1477 struct winsize ws;
1478
1479 ws.ws_col = TermWin.ncol;
1480 ws.ws_row = TermWin.nrow;
1481 ws.ws_xpixel = ws.ws_ypixel = 0;
1482 (void)ioctl (STDIN_FILENO, TIOCSWINSZ, &ws);
1483
1484 // unblock signals (signals are blocked by iom.C
1485 sigset_t ss;
1486 sigemptyset (&ss);
1487 sigprocmask (SIG_SETMASK, &ss, 0);
1488
1489#ifndef __QNX__
1490 /* command interpreter path */
1491 if (argv != NULL)
1492 {
1493# ifdef DEBUG_CMD
1494 int i;
1495
1496 for (i = 0; argv[i]; i++)
1497 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1498# endif 1307#endif
1499
1500 execvp (argv[0], (char *const *)argv);
1501 /* no error message: STDERR is closed! */
1502 }
1503 else
1504 {
1505 const char *argv0, *shell;
1506
1507 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1508 shell = "/bin/sh";
1509
1510 argv0 = (const char *)rxvt_r_basename (shell);
1511 if (Options & Opt_loginShell)
1512 {
1513 login = (char *)rxvt_malloc ((STRLEN (argv0) + 2) * sizeof (char));
1514
1515 login[0] = '-';
1516 STRCPY (&login[1], argv0);
1517 argv0 = login;
1518 }
1519 execlp (shell, argv0, NULL);
1520 /* no error message: STDERR is closed! */
1521 }
1522
1523#else /* __QNX__ uses qnxspawn () */
1524
1525 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1526 char *command = NULL, fullcommand[_MAX_PATH];
1527 char **arg_v, *arg_a[2] = { NULL, NULL };
1528
1529 if (argv != NULL)
1530 {
1531 if (access (argv[0], X_OK) == -1)
1532 {
1533 if (STRCHR (argv[0], '/') == NULL)
1534 {
1535 searchenv (argv[0], "PATH", fullcommand);
1536 if (fullcommand[0] != '\0')
1537 command = fullcommand;
1538 }
1539 if (access (command, X_OK) == -1)
1540 return -1;
1541 }
1542 else
1543 command = argv[0];
1544 arg_v = argv;
1545 }
1546 else
1547 {
1548 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1549 command = "/bin/sh";
1550
1551 arg_a[0] = my_basename (command);
1552 if (Options & Opt_loginShell)
1553 {
1554 login = rxvt_malloc ((STRLEN (arg_a[0]) + 2) * sizeof (char));
1555
1556 login[0] = '-';
1557 STRCPY (&login[1], arg_a[0]);
1558 arg_a[0] = login;
1559 }
1560 arg_v = arg_a;
1561 }
1562 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1563 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1564 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1565 command, arg_v, environ, iov_a, 0);
1566 if (login)
1567 free (login);
1568
1569 close (tty_fd);
1570 return cmd_fd;
1571
1572#endif
1573 return -1;
1574} 1308}
1575 1309
1576/* ------------------------------------------------------------------------- * 1310/* ------------------------------------------------------------------------- *
1577 * GET TTY CURRENT STATE * 1311 * GET TTY CURRENT STATE *
1578 * ------------------------------------------------------------------------- */ 1312 * ------------------------------------------------------------------------- */
1579/* rxvt_get_ttymode () */
1580/* EXTPROTO */
1581void 1313void
1582rxvt_get_ttymode (ttymode_t *tio, int erase) 1314rxvt_get_ttymode (ttymode_t *tio, int erase)
1583{ 1315{
1584#ifdef HAVE_TERMIOS_H 1316#ifdef HAVE_TERMIOS_H
1585 /* 1317 /*
… …
1800# undef FOO 1532# undef FOO
1801# endif /* HAVE_TERMIOS_H */ 1533# endif /* HAVE_TERMIOS_H */
1802#endif /* DEBUG_TTYMODE */ 1534#endif /* DEBUG_TTYMODE */
1803} 1535}
1804 1536
1537/*----------------------------------------------------------------------*/
1538/*
1539 * Run the command in a subprocess and return a file descriptor for the
1540 * master end of the pseudo-teletype pair with the command talking to
1541 * the slave.
1542 */
1543void
1544rxvt_term::run_command (const char *const *argv)
1545{
1546 int er;
1547
1548 if (!pty.get ())
1549 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1550
1551#ifndef NO_BACKSPACE_KEY
1552 if (key_backspace[0] && !key_backspace[1])
1553 er = key_backspace[0];
1554 else if (strcmp (key_backspace, "DEC") == 0)
1555 er = '\177'; /* the initial state anyway */
1556 else
1557#endif
1558 er = -1;
1559
1560 rxvt_get_ttymode (&tio, er);
1561
1562 /* set initial window size */
1563 tt_winch ();
1564
1565#ifndef __QNX__
1566 /* spin off the command interpreter */
1567 switch (cmd_pid = fork ())
1568 {
1569 case -1:
1570 rxvt_fatal ("can't fork, aborting.\n");
1571 case 0:
1572 init_env ();
1573
1574 if (!pty.make_controlling_tty ())
1575 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1576 else
1577 {
1578 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1579 dup2 (pty.tty, STDIN_FILENO);
1580 dup2 (pty.tty, STDOUT_FILENO);
1581 dup2 (pty.tty, STDERR_FILENO);
1582
1583 // close all our file handles that we do no longer need
1584 for (rxvt_term **t = termlist.begin (); t < termlist.end (); t++)
1585 {
1586 if ((*t)->pty.pty > 2) close ((*t)->pty.pty);
1587 if ((*t)->pty.tty > 2) close ((*t)->pty.tty);
1588 }
1589
1590 run_child (argv);
1591 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1592 }
1593
1594 _exit (EXIT_FAILURE);
1595
1596 default:
1597 {
1598#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1599 int fdstdin;
1600
1601 fdstdin = dup (STDIN_FILENO);
1602 dup2 (pty.tty, STDIN_FILENO);
1603#endif
1604
1605#ifdef UTMP_SUPPORT
1606 privileged_utmp (SAVE);
1607#endif
1608
1609#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1610
1611 dup2 (fdstdin, STDIN_FILENO);
1612 close (fdstdin);
1613#endif
1614 }
1615
1616 pty.close_tty (); /* keep STDERR_FILENO, pty.pty, display->fd () open */
1617 break;
1618 }
1619#else /* __QNX__ uses qnxspawn () */
1620 fchmod (pty.tty, 0622);
1621 fcntl (pty.tty, F_SETFD, FD_CLOEXEC);
1622 fcntl (pty.pty, F_SETFD, FD_CLOEXEC);
1623
1624 if (run_child (argv) == -1)
1625 exit (EXIT_FAILURE);
1626#endif
1627}
1628
1629/* ------------------------------------------------------------------------- *
1630 * CHILD PROCESS OPERATIONS *
1631 * ------------------------------------------------------------------------- */
1632/*
1633 * The only open file descriptor is the slave tty - so no error messages.
1634 * returns are fatal
1635 */
1636int
1637rxvt_term::run_child (const char *const *argv)
1638{
1639 char *login;
1640
1641 SET_TTYMODE (STDIN_FILENO, &tio); /* init terminal attributes */
1642
1643 if (options & Opt_console)
1644 { /* be virtual console, fail silently */
1645#ifdef TIOCCONS
1646 unsigned int on = 1;
1647
1648 ioctl (STDIN_FILENO, TIOCCONS, &on);
1649#elif defined (SRIOCSREDIR)
1650 int fd;
1651
1652 fd = open (CONSOLE, O_WRONLY, 0);
1653 if (fd >= 0)
1654 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1655 close (fd);
1656#endif /* SRIOCSREDIR */
1657 }
1658
1659 /* reset signals and spin off the command interpreter */
1660 signal (SIGINT, SIG_DFL);
1661 signal (SIGQUIT, SIG_DFL);
1662 signal (SIGCHLD, SIG_DFL);
1663 signal (SIGHUP, SIG_DFL);
1664 signal (SIGPIPE, SIG_DFL);
1665 /*
1666 * mimick login's behavior by disabling the job control signals
1667 * a shell that wants them can turn them back on
1668 */
1669#ifdef SIGTSTP
1670 signal (SIGTSTP, SIG_IGN);
1671 signal (SIGTTIN, SIG_IGN);
1672 signal (SIGTTOU, SIG_IGN);
1673#endif /* SIGTSTP */
1674
1675 // unblock signals (signals are blocked by iom.C
1676 sigset_t ss;
1677 sigemptyset (&ss);
1678 sigprocmask (SIG_SETMASK, &ss, 0);
1679
1680#ifndef __QNX__
1681 /* command interpreter path */
1682 if (argv != NULL)
1683 {
1684# ifdef DEBUG_CMD
1685 int i;
1686
1687 for (i = 0; argv[i]; i++)
1688 fprintf (stderr, "argv [%d] = \"%s\"\n", i, argv[i]);
1689# endif
1690
1691 execvp (argv[0], (char *const *)argv);
1692 /* no error message: STDERR is closed! */
1693 }
1694 else
1695 {
1696 const char *argv0, *shell;
1697
1698 if ((shell = getenv ("SHELL")) == NULL || *shell == '\0')
1699 shell = "/bin/sh";
1700
1701 argv0 = (const char *)rxvt_r_basename (shell);
1702
1703 if (options & Opt_loginShell)
1704 {
1705 login = (char *)rxvt_malloc ((strlen (argv0) + 2) * sizeof (char));
1706
1707 login[0] = '-';
1708 strcpy (&login[1], argv0);
1709 argv0 = login;
1710 }
1711 execlp (shell, argv0, NULL);
1712 /* no error message: STDERR is closed! */
1713 }
1714
1715#else /* __QNX__ uses qnxspawn () */
1716
1717 char iov_a[10] = { -1, -1, -1, -1, -1, -1, -1, -1, -1, -1 };
1718 char *command = NULL, fullcommand[_MAX_PATH];
1719 char **arg_v, *arg_a[2] = { NULL, NULL };
1720
1721 if (argv != NULL)
1722 {
1723 if (access (argv[0], X_OK) == -1)
1724 {
1725 if (strchr (argv[0], '/') == NULL)
1726 {
1727 searchenv (argv[0], "PATH", fullcommand);
1728
1729 if (fullcommand[0] != '\0')
1730 command = fullcommand;
1731 }
1732
1733 if (access (command, X_OK) == -1)
1734 return -1;
1735 }
1736 else
1737 command = argv[0];
1738
1739 arg_v = argv;
1740 }
1741 else
1742 {
1743 if ((command = getenv ("SHELL")) == NULL || *command == '\0')
1744 command = "/bin/sh";
1745
1746 arg_a[0] = my_basename (command);
1747
1748 if (options & Opt_loginShell)
1749 {
1750 login = rxvt_malloc ((strlen (arg_a[0]) + 2) * sizeof (char));
1751
1752 login[0] = '-';
1753 strcpy (&login[1], arg_a[0]);
1754 arg_a[0] = login;
1755 }
1756
1757 arg_v = arg_a;
1758 }
1759
1760 iov_a[0] = iov_a[1] = iov_a[2] = pty.tty;
1761 cmd_pid = qnx_spawn (0, 0, 0, -1, -1,
1762 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1763 command, arg_v, environ, iov_a, 0);
1764 if (login)
1765 free (login);
1766
1767 pty.close_tty ();
1768 return pty.pty;
1769#endif
1770
1771 return -1;
1772}
1773
1805/*----------------------- end-of-file (C source) -----------------------*/ 1774/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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