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.16 by pcg, Thu Dec 18 13:33:02 2003 UTC vs.
Revision 1.24 by pcg, Mon Feb 9 07:11:49 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.c
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: init.C,v 1.16 2003/12/18 13:33:02 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * 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>
8 * - original version 7 * - original version
9 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com> 8 * Copyright (c) 1994 Robert Nation <nation@rocket.sanders.lockheed.com>
… …
327#endif 326#endif
328#ifdef KEEP_SCROLLCOLOR 327#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 328 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 329 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 330#endif /* KEEP_SCROLLCOLOR */
331
332 }; 332 };
333 333
334const char *const xa_names[NUM_XA] = 334const char *const xa_names[NUM_XA] =
335 { 335 {
336 "TEXT",
336 "COMPOUND_TEXT", 337 "COMPOUND_TEXT",
338 "UTF8_STRING",
337 "MULTIPLE", 339 "MULTIPLE",
338 "TARGETS", 340 "TARGETS",
339 "TEXT",
340 "TIMESTAMP", 341 "TIMESTAMP",
341 "VT_SELECTION", 342 "VT_SELECTION",
342 "INCR", 343 "INCR",
343 "WM_DELETE_WINDOW", 344 "WM_DELETE_WINDOW",
344#ifdef TRANSPARENT 345#ifdef TRANSPARENT
… …
371 MEvent.time = CurrentTime; 372 MEvent.time = CurrentTime;
372 MEvent.button = AnyButton; 373 MEvent.button = AnyButton;
373 Options = DEFAULT_OPTIONS; 374 Options = DEFAULT_OPTIONS;
374 want_refresh = 1; 375 want_refresh = 1;
375 cmd_pid = -1; 376 cmd_pid = -1;
376 cmd_fd = tty_fd = Xfd = -1; 377 cmd_fd = tty_fd = -1;
377 PrivateModes = SavedModes = PrivMode_Default; 378 PrivateModes = SavedModes = PrivMode_Default;
378 TermWin.focus = 0; 379 TermWin.focus = 0;
379 TermWin.ncol = 80; 380 TermWin.ncol = 80;
380 TermWin.nrow = 24; 381 TermWin.nrow = 24;
381 TermWin.int_bwidth = INTERNALBORDERWIDTH; 382 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
444 ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 445 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
445 ttygid = gr->gr_gid; 446 ttygid = gr->gr_gid;
446 } 447 }
447 else 448 else
448#endif /* TTY_GID_SUPPORT */ 449#endif /* TTY_GID_SUPPORT */
450
449 { 451 {
450 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 452 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
451 ttygid = getgid (); 453 ttygid = getgid ();
452 } 454 }
453 455
… …
524 * Open display, get options/resources and create the window 526 * Open display, get options/resources and create the window
525 */ 527 */
526 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 528 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
527 rs[Rs_display_name] = ":0"; 529 rs[Rs_display_name] = ":0";
528 530
529 rxvt_get_options (this, r_argc, r_argv); 531 get_options (r_argc, r_argv);
530 free (r_argv); 532 free (r_argv);
531 533
532#ifdef LOCAL_X_IS_UNIX 534#ifdef LOCAL_X_IS_UNIX
533 if (rs[Rs_display_name][0] == ':') 535 if (rs[Rs_display_name][0] == ':')
534 { 536 {
535 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 537 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
536 STRCPY (val, "unix"); 538 STRCPY (val, "unix");
537 STRCAT (val, rs[Rs_display_name]); 539 STRCAT (val, rs[Rs_display_name]);
538 Xdisplay = XOpenDisplay (val); 540 display = displays.get (val);
539 free (val); 541 free (val);
540 } 542 }
541#endif 543#endif
542 544
543 if (Xdisplay == NULL 545 if (!display
544 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) 546 && !(display = displays.get (rs[Rs_display_name])))
545 { 547 {
546 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]);
547 exit (EXIT_FAILURE); 549 exit (EXIT_FAILURE);
548 } 550 }
549 551
550 rxvt_extract_resources (this, Xdisplay, rs[Rs_name]); 552 extract_resources (display->display, rs[Rs_name]);
551 553
552 /* 554 /*
553 * set any defaults not already set 555 * set any defaults not already set
554 */ 556 */
555 if (cmd_argv && cmd_argv[0]) 557 if (cmd_argv && cmd_argv[0])
… …
657#ifndef NO_OLD_SELECTION 659#ifndef NO_OLD_SELECTION
658 660
659 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 661 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0)
660 selection_style = OLD_SELECT; 662 selection_style = OLD_SELECT;
661#endif 663#endif
664
662 } 665 }
663 666
664#ifdef HAVE_SCROLLBARS 667#ifdef HAVE_SCROLLBARS
665 rxvt_setup_scrollbar (this, rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 669 rs[Rs_scrollBar_thickness]);
667#endif 670#endif
668 671
669 TermWin.fontset = new rxvt_fontset (this); 672 TermWin.fontset = new rxvt_fontset (this);
670 TermWin.fontset->populate (rs[Rs_font]); 673 TermWin.fontset->populate (rs[Rs_font]);
671 TermWin.fwidth = TermWin.fontset->base_font ()->width; 674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
… …
733 val = rxvt_network_display (rs[Rs_display_name]); 736 val = rxvt_network_display (rs[Rs_display_name]);
734 rs[Rs_display_name] = (const char *)val; 737 rs[Rs_display_name] = (const char *)val;
735 738
736 if (val == NULL) 739 if (val == NULL)
737#endif /* DISPLAY_IS_IP */ 740#endif /* DISPLAY_IS_IP */
738 val = XDisplayString(Xdisplay); 741 val = XDisplayString(display->display);
739 742
740 if (rs[Rs_display_name] == NULL) 743 if (rs[Rs_display_name] == NULL)
741 rs[Rs_display_name] = val; /* use broken `:0' value */ 744 rs[Rs_display_name] = val; /* use broken `:0' value */
742 745
743 i = STRLEN (val); 746 i = STRLEN (val);
… …
767 770
768#ifdef RXVT_TERMINFO 771#ifdef RXVT_TERMINFO
769 putenv ("TERMINFO=" RXVT_TERMINFO); 772 putenv ("TERMINFO=" RXVT_TERMINFO);
770#endif 773#endif
771 774
772 if (Xdepth <= 2) 775 if (display->depth <= 2)
773 putenv ("COLORTERM=" COLORTERMENV "-mono"); 776 putenv ("COLORTERM=" COLORTERMENV "-mono");
774 else 777 else
775 putenv ("COLORTERM=" COLORTERMENVFULL); 778 putenv ("COLORTERM=" COLORTERMENVFULL);
776 779
777 if (rs[Rs_term_name] != NULL) 780 if (rs[Rs_term_name] != NULL)
… …
799void 802void
800rxvt_term::set_locale (const char *locale) 803rxvt_term::set_locale (const char *locale)
801{ 804{
802#if HAVE_XSETLOCALE || HAVE_SETLOCALE 805#if HAVE_XSETLOCALE || HAVE_SETLOCALE
803 free (this->locale); 806 free (this->locale);
804 this->locale = strdup (setlocale (LC_CTYPE, "")); 807 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
805#endif 808#endif
806#if HAVE_NL_LANGINFO 809#if HAVE_NL_LANGINFO
807 free (codeset); 810 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET)); 811 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 812 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
810 || !STRCASECMP (codeset, "UTF8"); 813 || !STRCASECMP (codeset, "UTF8");
811#else 814#else
812 enc_utf8 = 1; 815 enc_utf8 = 1;
813#endif 816#endif
814} 817}
815 818
… …
821 rxvt_print_error ("Setting locale failed."); 824 rxvt_print_error ("Setting locale failed.");
822 else 825 else
823 { 826 {
824 Atom wmlocale; 827 Atom wmlocale;
825 828
826 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 829 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
827 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 830 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
828 XA_STRING, 8, PropModeReplace, 831 XA_STRING, 8, PropModeReplace,
829 (unsigned char *)locale, STRLEN(locale)); 832 (unsigned char *)locale, STRLEN(locale));
830 833
831 if (!XSupportsLocale ()) 834 if (!XSupportsLocale ())
832 { 835 {
833 rxvt_print_error ("The locale is not supported by Xlib"); 836 rxvt_print_error ("The locale is not supported by Xlib");
834 return; 837 return;
835 } 838 }
836 839
837 /* see if we can connect yet */ 840 /* see if we can connect yet */
838 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 841 rxvt_IMInstantiateCallback (display->display, NULL, NULL);
839 842
840 /* To avoid Segmentation Fault in C locale: Solaris only? */ 843 /* To avoid Segmentation Fault in C locale: Solaris only? */
841 if (STRCMP (locale, "C")) 844 if (STRCMP (locale, "C"))
842 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL, 845 XRegisterIMInstantiateCallback (display->display, NULL, NULL, NULL,
843 rxvt_IMInstantiateCallback, NULL); 846 rxvt_IMInstantiateCallback, NULL);
844 } 847 }
845#endif 848#endif
846} 849}
847 850
… …
854 * This should be called after the X server connection is established. 857 * This should be called after the X server connection is established.
855 */ 858 */
856 int i; 859 int i;
857 860
858 for (i = 0; i < NUM_XA; i++) 861 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 862 xa[i] = XInternAtom(display->display, xa_names[i], False);
860 863
861 /* Enable delete window protocol */ 864 /* Enable delete window protocol */
862 XSetWMProtocols (Xdisplay, TermWin.parent[0], 865 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 866 &(xa[XA_WMDELETEWINDOW]), 1);
864 867
865#ifdef USING_W11LIB 868#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 869 /* enable W11 callbacks */
867 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 870 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 871#endif
869 872
870#ifdef META8_OPTION 873#ifdef META8_OPTION
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 875#endif
873 876
874 rxvt_get_ourmods (this); 877 get_ourmods ();
875 878
876 if (!(Options & Opt_scrollTtyOutput)) 879 if (!(Options & Opt_scrollTtyOutput))
877 PrivateModes |= PrivMode_TtyOutputInh; 880 PrivateModes |= PrivMode_TtyOutputInh;
878 if (Options & Opt_scrollTtyKeypress) 881 if (Options & Opt_scrollTtyKeypress)
879 PrivateModes |= PrivMode_Keypress; 882 PrivateModes |= PrivMode_Keypress;
… …
884 if (STRCMP(key_backspace, "DEC") == 0) 887 if (STRCMP(key_backspace, "DEC") == 0)
885 PrivateModes |= PrivMode_HaveBackSpace; 888 PrivateModes |= PrivMode_HaveBackSpace;
886#endif 889#endif
887 890
888 /* add value for scrollBar */ 891 /* add value for scrollBar */
889 if (scrollbar_visible (this)) 892 if (scrollbar_visible ())
890 { 893 {
891 PrivateModes |= PrivMode_scrollBar; 894 PrivateModes |= PrivMode_scrollBar;
892 SavedModes |= PrivMode_scrollBar; 895 SavedModes |= PrivMode_scrollBar;
893 } 896 }
894 if (menubar_visible (this)) 897 if (menubar_visible ())
895 { 898 {
896 PrivateModes |= PrivMode_menuBar; 899 PrivateModes |= PrivMode_menuBar;
897 SavedModes |= PrivMode_menuBar; 900 SavedModes |= PrivMode_menuBar;
898 } 901 }
899 902
900#ifdef GREEK_SUPPORT 903#ifdef GREEK_SUPPORT
901 greek_init(); 904 greek_init();
902#endif 905#endif
903 906
904 Xfd = XConnectionNumber (Xdisplay);
905
906#ifdef CURSOR_BLINK 907#ifdef CURSOR_BLINK
907
908 if (Options & Opt_cursorBlink) 908 if (Options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 909 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 910#endif
911 911
912 if ((cmd_fd = run_command (argv)) < 0) 912 if ((cmd_fd = run_command (argv)) < 0)
… …
915 exit (EXIT_FAILURE); 915 exit (EXIT_FAILURE);
916 } 916 }
917} 917}
918 918
919/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
920/* INTPROTO */
921void 920void
922rxvt_Get_Colours (pR) 921rxvt_term::Get_Colours ()
923{ 922{
924 int i; 923 int i;
925 924
926 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 925 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
927 { 926 {
928 rxvt_color xcol; 927 rxvt_color xcol;
929 928
930 if (!R->rs[Rs_color + i]) 929 if (!rs[Rs_color + i])
931 continue; 930 continue;
932 931
933 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 932 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
934 { 933 {
935#ifndef XTERM_REVERSE_VIDEO 934#ifndef XTERM_REVERSE_VIDEO
936 if (i < 2 && (R->Options & Opt_reverseVideo)) 935 if (i < 2 && (Options & Opt_reverseVideo))
937 {
938 R->rs[Rs_color + i] = def_colorName[!i]; 936 rs[Rs_color + i] = def_colorName[!i];
939 }
940 else 937 else
941#endif 938#endif
942 R->rs[Rs_color + i] = def_colorName[i]; 939 rs[Rs_color + i] = def_colorName[i];
943 940
944 if (!R->rs[Rs_color + i]) 941 if (!rs[Rs_color + i])
945 continue; 942 continue;
946 943
947 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 944 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
948 { 945 {
949 switch (i) 946 switch (i)
950 { 947 {
951 case Color_fg: 948 case Color_fg:
952 case Color_bg: 949 case Color_bg:
953 /* fatal: need bg/fg color */ 950 /* fatal: need bg/fg color */
954 rxvt_print_error ("aborting"); 951 rxvt_print_error ("aborting");
955 exit (EXIT_FAILURE); 952 exit (EXIT_FAILURE);
956 /* NOTREACHED */ 953 /* NOTREACHED */
957 break; 954 break;
958#ifndef NO_CURSORCOLOR 955#ifndef NO_CURSORCOLOR
959 case Color_cursor2: 956 case Color_cursor2:
960 xcol = R->PixColors[Color_fg]; 957 xcol = PixColors[Color_fg];
961 break; 958 break;
962#endif /* ! NO_CURSORCOLOR */ 959#endif /* ! NO_CURSORCOLOR */
963 case Color_pointer: 960 case Color_pointer:
964 xcol = R->PixColors[Color_fg]; 961 xcol = PixColors[Color_fg];
965 break; 962 break;
966 default: 963 default:
967 xcol = R->PixColors[Color_bg]; /* None */ 964 xcol = PixColors[Color_bg]; /* None */
968 break; 965 break;
969 } 966 }
970 } 967 }
971 } 968 }
972 969
973 R->PixColors[i] = xcol; 970 PixColors[i] = xcol;
974 SET_PIXCOLOR (R, i); 971 SET_PIXCOLOR (i);
975 } 972 }
976 973
977 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 974 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
978 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 975 PixColors[Color_pointer] = PixColors[Color_fg];
979 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 976 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
980 R->PixColors[Color_border] = R->PixColors[Color_fg]; 977 PixColors[Color_border] = PixColors[Color_fg];
981 978
982 /* 979 /*
983 * get scrollBar/menuBar shadow colors 980 * get scrollBar/menuBar shadow colors
984 * 981 *
985 * The calculations of topShadow/bottomShadow values are adapted 982 * The calculations of topShadow/bottomShadow values are adapted
… …
987 */ 984 */
988#ifdef KEEP_SCROLLCOLOR 985#ifdef KEEP_SCROLLCOLOR
989 986
990 if (XDEPTH <= 2) 987 if (XDEPTH <= 2)
991 { /* Monochrome */ 988 { /* Monochrome */
992 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 989 PixColors[Color_scroll] = PixColors[Color_fg];
993 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 990 PixColors[Color_topShadow] = PixColors[Color_bg];
994 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 991 PixColors[Color_bottomShadow] = PixColors[Color_bg];
995 } 992 }
996 else 993 else
997 { 994 {
998 rxvt_color xcol[3]; 995 rxvt_color xcol[3];
999 /* xcol[0] == white 996 /* xcol[0] == white
1000 * xcol[1] == top shadow 997 * xcol[1] == top shadow
1001 * xcol[2] == bot shadow */ 998 * xcol[2] == bot shadow */
1002 999
1003 xcol[1] = R->PixColors[Color_scroll]; 1000 xcol[1] = PixColors[Color_scroll];
1004# ifdef PREFER_24BIT 1001# ifdef PREFER_24BIT
1005 xcol[0].set (R, 65535, 65535, 65535); 1002 xcol[0].set (display, 65535, 65535, 65535);
1006 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1003 /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */
1007# else 1004# else
1008 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1005 xcol[0].set (display, WhitePixel (display->display, display->screen));
1009# endif 1006# endif
1010 1007
1011 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1008 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1012 1009
1013 xcol[0].get (R, pr0, pg0, pb0); 1010 xcol[0].get (display, pr0, pg0, pb0);
1014 xcol[1].get (R, pr1, pg1, pb1); 1011 xcol[1].get (display, pr1, pg1, pb1);
1015 1012
1016 /* bottomShadowColor */ 1013 /* bottomShadowColor */
1017 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 1014 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1018 xcol[2] = R->PixColors[Color_Black]; 1015 xcol[2] = PixColors[Color_Black];
1019 1016
1020 R->PixColors[Color_bottomShadow] = xcol[2]; 1017 PixColors[Color_bottomShadow] = xcol[2];
1021 1018
1022 /* topShadowColor */ 1019 /* topShadowColor */
1023 if (!xcol[1].set (aR_ 1020 if (!xcol[1].set (display,
1024 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1021 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1025 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1022 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1026 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1023 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1027 xcol[1] = R->PixColors[Color_White]; 1024 xcol[1] = PixColors[Color_White];
1028 1025
1029 R->PixColors[Color_topShadow] = xcol[1]; 1026 PixColors[Color_topShadow] = xcol[1];
1030 } 1027 }
1031#endif /* KEEP_SCROLLCOLOR */ 1028#endif /* KEEP_SCROLLCOLOR */
1032} 1029}
1033 1030
1034/*----------------------------------------------------------------------*/ 1031/*----------------------------------------------------------------------*/
… …
1042 1039
1043 if (i >= 8 && i <= 15) 1040 if (i >= 8 && i <= 15)
1044 { /* bright colors */ 1041 { /* bright colors */
1045 i -= 8; 1042 i -= 8;
1046#ifndef NO_BRIGHTCOLOR 1043#ifndef NO_BRIGHTCOLOR
1047
1048 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1044 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1049 return; 1045 return;
1050#endif 1046#endif
1051 1047
1052 } 1048 }
1049
1053 if (i >= 0 && i <= 7) /* normal colors */ 1050 if (i >= 0 && i <= 7) /* normal colors */
1054 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1051 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1055 } 1052 }
1056} 1053}
1057 1054
1058/*----------------------------------------------------------------------*/ 1055/*----------------------------------------------------------------------*/
1059/* 1056/*
1060 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings 1057 * Probe the modifier keymap to get the Meta (Alt) and Num_Lock settings
1061 * Use resource ``modifier'' to override the Meta modifier 1058 * Use resource ``modifier'' to override the Meta modifier
1062 */ 1059 */
1063/* INTPROTO */
1064void 1060void
1065rxvt_get_ourmods(pR) 1061rxvt_term::get_ourmods ()
1066{ 1062{
1067 int i, j, k; 1063 int i, j, k;
1068 int requestedmeta, realmeta, realalt; 1064 int requestedmeta, realmeta, realalt;
1069 const char *cm, *rsmod; 1065 const char *cm, *rsmod;
1070 XModifierKeymap *map; 1066 XModifierKeymap *map;
… …
1073 { 1069 {
1074 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1070 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1075 }; 1071 };
1076 1072
1077 requestedmeta = realmeta = realalt = 0; 1073 requestedmeta = realmeta = realalt = 0;
1078 rsmod = R->rs[Rs_modifier]; 1074 rsmod = rs[Rs_modifier];
1079 if (rsmod 1075 if (rsmod
1080 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1076 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0)
1081 requestedmeta = rsmod[3] - '0'; 1077 requestedmeta = rsmod[3] - '0';
1082 1078
1083 map = XGetModifierMapping(R->Xdisplay); 1079 map = XGetModifierMapping(display->display);
1084 kc = map->modifiermap; 1080 kc = map->modifiermap;
1085 for (i = 1; i < 6; i++) 1081 for (i = 1; i < 6; i++)
1086 { 1082 {
1087 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1083 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1088 for (j = map->max_keypermod; j--; k++) 1084 for (j = map->max_keypermod; j--; k++)
1089 { 1085 {
1090 if (kc[k] == 0) 1086 if (kc[k] == 0)
1091 break; 1087 break;
1092 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1088 switch (XKeycodeToKeysym(display->display, kc[k], 0))
1093 { 1089 {
1094 case XK_Num_Lock: 1090 case XK_Num_Lock:
1095 R->ModNumLockMask = modmasks[i - 1]; 1091 ModNumLockMask = modmasks[i - 1];
1096 /* FALLTHROUGH */ 1092 /* FALLTHROUGH */
1097 default: 1093 default:
1098 continue; /* for(;;) */ 1094 continue; /* for(;;) */
1099 case XK_Meta_L: 1095 case XK_Meta_L:
1100 case XK_Meta_R: 1096 case XK_Meta_R:
1101 cm = "meta"; 1097 cm = "meta";
1102 realmeta = i; 1098 realmeta = i;
1103 break; 1099 break;
1104 case XK_Alt_L: 1100 case XK_Alt_L:
1105 case XK_Alt_R: 1101 case XK_Alt_R:
1106 cm = "alt"; 1102 cm = "alt";
1107 realalt = i; 1103 realalt = i;
1108 break; 1104 break;
1109 case XK_Super_L: 1105 case XK_Super_L:
1110 case XK_Super_R: 1106 case XK_Super_R:
1111 cm = "super"; 1107 cm = "super";
1112 break; 1108 break;
1113 case XK_Hyper_L: 1109 case XK_Hyper_L:
1114 case XK_Hyper_R: 1110 case XK_Hyper_R:
1115 cm = "hyper"; 1111 cm = "hyper";
1116 break; 1112 break;
1117 } 1113 }
1118 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1114 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0)
1119 requestedmeta = i; 1115 requestedmeta = i;
1120 } 1116 }
1121 } 1117 }
1122 XFreeModifiermap(map); 1118 XFreeModifiermap(map);
1123 i = (requestedmeta ? requestedmeta 1119 i = (requestedmeta ? requestedmeta
1124 : (realmeta ? realmeta 1120 : (realmeta ? realmeta
1125 : (realalt ? realalt : 0))); 1121 : (realalt ? realalt : 0)));
1126 if (i) 1122 if (i)
1127 R->ModMetaMask = modmasks[i - 1]; 1123 ModMetaMask = modmasks[i - 1];
1128} 1124}
1129 1125
1130/*----------------------------------------------------------------------*/ 1126/*----------------------------------------------------------------------*/
1131/* rxvt_Create_Windows() - Open and map the window */ 1127/* rxvt_Create_Windows() - Open and map the window */
1132void 1128void
… …
1135 XClassHint classHint; 1131 XClassHint classHint;
1136 XWMHints wmHint; 1132 XWMHints wmHint;
1137 XGCValues gcvalue; 1133 XGCValues gcvalue;
1138 long vt_emask; 1134 long vt_emask;
1139 1135
1140#ifdef PREFER_24BIT
1141 XSetWindowAttributes attributes;
1142 XWindowAttributes gattr; 1136 XWindowAttributes gattr;
1143 1137
1144 XCMAP = DefaultColormap(Xdisplay, Xscreen);
1145 XVISUAL = DefaultVisual(Xdisplay, Xscreen);
1146
1147 if (Options & Opt_transparent) 1138 if (Options & Opt_transparent)
1148 { 1139 {
1149 XGetWindowAttributes(Xdisplay, RootWindow(Xdisplay, Xscreen), 1140 XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr);
1150 &gattr); 1141 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1151 XDEPTH = gattr.depth;
1152 }
1153 else
1154 { 1142 }
1155 XDEPTH = DefaultDepth(Xdisplay, Xscreen);
1156 /*
1157 * If depth is not 24, look for a 24bit visual.
1158 */
1159 if (XDEPTH != 24)
1160 {
1161 XVisualInfo vinfo;
1162
1163 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1164 {
1165 XDEPTH = 24;
1166 XVISUAL = vinfo.visual;
1167 XCMAP = XCreateColormap(Xdisplay,
1168 RootWindow(Xdisplay, Xscreen),
1169 XVISUAL, AllocNone);
1170 }
1171 }
1172 }
1173#endif
1174 1143
1175 /* grab colors before netscape does */ 1144 /* grab colors before netscape does */
1176 rxvt_Get_Colours (this); 1145 Get_Colours ();
1177 1146
1178 rxvt_change_font (this, 1, NULL); 1147 change_font (1, NULL);
1179 window_calc (0, 0); 1148 window_calc (0, 0);
1180 old_width = szHint.width; 1149 old_width = szHint.width;
1181 old_height = szHint.height; 1150 old_height = szHint.height;
1182 1151
1183 /* parent window - reverse video so we can see placement errors 1152 /* parent window - reverse video so we can see placement errors
1184 * sub-window placement & size in rxvt_resize_subwindows() 1153 * sub-window placement & size in rxvt_resize_subwindows()
1185 */ 1154 */
1186 1155
1187#ifdef PREFER_24BIT 1156#ifdef PREFER_24BIT
1157 XSetWindowAttributes attributes;
1158
1188 attributes.background_pixel = PixColors[Color_fg]; 1159 attributes.background_pixel = PixColors[Color_fg];
1189 attributes.border_pixel = PixColors[Color_border]; 1160 attributes.border_pixel = PixColors[Color_border];
1190 attributes.colormap = XCMAP; 1161 attributes.colormap = display->cmap;
1191 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1162 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1192 szHint.x, szHint.y, 1163 szHint.x, szHint.y,
1193 szHint.width, szHint.height, 1164 szHint.width, szHint.height,
1194 TermWin.ext_bwidth, 1165 TermWin.ext_bwidth,
1195 XDEPTH, InputOutput, 1166 display->depth, InputOutput,
1196 XVISUAL, 1167 display->visual,
1197 CWBackPixel | CWBorderPixel
1198 | CWColormap, &attributes); 1168 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1199#else 1169#else
1200 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1170 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1201 szHint.x, szHint.y, 1171 szHint.x, szHint.y,
1202 szHint.width, 1172 szHint.width,
1203 szHint.height, 1173 szHint.height,
1204 TermWin.ext_bwidth, 1174 TermWin.ext_bwidth,
1205 PixColors[Color_border], 1175 PixColors[Color_border],
1206 PixColors[Color_fg]); 1176 PixColors[Color_fg]);
1207#endif 1177#endif
1208 1178
1209 rxvt_xterm_seq (this, XTerm_title, rs[Rs_title], CHAR_ST); 1179 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1210 rxvt_xterm_seq (this, XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1180 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1211 1181
1212 classHint.res_name = (char *)rs[Rs_name]; 1182 classHint.res_name = (char *)rs[Rs_name];
1213 classHint.res_class = (char *)APL_CLASS; 1183 classHint.res_class = (char *)APL_CLASS;
1214 1184
1215 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1185 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1216 wmHint.input = True; 1186 wmHint.input = True;
1217 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1187 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1218 : NormalState); 1188 : NormalState);
1219 wmHint.window_group = TermWin.parent[0]; 1189 wmHint.window_group = TermWin.parent[0];
1220 1190
1221 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1191 XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL,
1222 (char **)argv, argc, &szHint, &wmHint, &classHint); 1192 (char **)argv, argc, &szHint, &wmHint, &classHint);
1193
1223 XSelectInput(Xdisplay, TermWin.parent[0], 1194 XSelectInput(display->display, TermWin.parent[0],
1224 (KeyPressMask 1195 KeyPressMask
1225#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1196#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1226 | KeyReleaseMask 1197 | KeyReleaseMask
1227#endif 1198#endif
1228 | FocusChangeMask | VisibilityChangeMask 1199 | FocusChangeMask | VisibilityChangeMask
1229 | StructureNotifyMask)); 1200 | StructureNotifyMask);
1201 termwin_ev.start (display, TermWin.parent[0]);
1230 1202
1231 /* vt cursor: Black-on-White is standard, but this is more popular */ 1203 /* vt cursor: Black-on-White is standard, but this is more popular */
1232 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1204 TermWin_cursor = XCreateFontCursor(display->display, XC_xterm);
1233 1205
1234#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1206#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1235 /* cursor (menuBar/scrollBar): Black-on-White */ 1207 /* cursor (menuBar/scrollBar): Black-on-White */
1236 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1208 leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr);
1237#endif 1209#endif
1238 1210
1239#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1240
1241 { 1212 {
1242 XColor blackcolour; 1213 XColor blackcolour;
1243 blackcolour.red = 0; 1214 blackcolour.red = 0;
1244 blackcolour.green = 0; 1215 blackcolour.green = 0;
1245 blackcolour.blue = 0; 1216 blackcolour.blue = 0;
1246 Font f = XLoadFont (Xdisplay, "fixed"); 1217 Font f = XLoadFont (display->display, "fixed");
1247 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1218 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1248 &blackcolour, &blackcolour); 1219 &blackcolour, &blackcolour);
1249 XUnloadFont (Xdisplay, f); 1220 XUnloadFont (display->display, f);
1250 } 1221 }
1251#endif 1222#endif
1252 1223
1253 /* the vt window */ 1224 /* the vt window */
1254 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1225 TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0],
1255 window_vt_x, window_vt_y, 1226 window_vt_x, window_vt_y,
1256 TermWin_TotalWidth(), 1227 TermWin_TotalWidth(),
1257 TermWin_TotalHeight(), 1228 TermWin_TotalHeight(),
1258 0, 1229 0,
1259 PixColors[Color_fg], 1230 PixColors[Color_fg],
1260 PixColors[Color_bg]); 1231 PixColors[Color_bg]);
1232
1261#ifdef DEBUG_X 1233#ifdef DEBUG_X
1262
1263 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1234 XStoreName(display->display, TermWin.vt, "vt window");
1264#endif 1235#endif
1265
1266 pointer_unblank ();
1267 1236
1268 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1237 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1269 | PropertyChangeMask); 1238 | PropertyChangeMask);
1239
1270#ifdef POINTER_BLANK 1240#ifdef POINTER_BLANK
1241 pointer_unblank ();
1271 1242
1272 if ((Options & Opt_pointerBlank)) 1243 if ((Options & Opt_pointerBlank))
1273 vt_emask |= PointerMotionMask; 1244 vt_emask |= PointerMotionMask;
1274 else 1245 else
1275#endif 1246#endif
1276
1277 vt_emask |= (Button1MotionMask | Button3MotionMask); 1247 vt_emask |= (Button1MotionMask | Button3MotionMask);
1248
1278 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1249 XSelectInput(display->display, TermWin.vt, vt_emask);
1250 vt_ev.start (display, TermWin.vt);
1279 1251
1280#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1252#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1281
1282 if (menuBar_height()) 1253 if (menuBar_height())
1283 { 1254 {
1284 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1255 menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0],
1285 window_vt_x, 0, 1256 window_vt_x, 0,
1286 TermWin_TotalWidth(), 1257 TermWin_TotalWidth(),
1287 menuBar_TotalHeight(), 1258 menuBar_TotalHeight(),
1288 0, 1259 0,
1289 PixColors[Color_fg], 1260 PixColors[Color_fg],
1290 PixColors[Color_scroll]); 1261 PixColors[Color_scroll]);
1291#ifdef DEBUG_X 1262#ifdef DEBUG_X
1292
1293 XStoreName(Xdisplay, menuBar.win, "menubar"); 1263 XStoreName(display->display, menuBar.win, "menubar");
1294#endif 1264#endif
1295 1265
1296 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1266 XDefineCursor(display->display, menuBar.win, pointer_leftptr);
1267
1297 XSelectInput(Xdisplay, menuBar.win, 1268 XSelectInput(display->display, menuBar.win,
1298 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1269 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1299 | Button1MotionMask)); 1270 | Button1MotionMask));
1271 menubar_ev.start (display, menuBar.win);
1300 } 1272 }
1301#endif 1273#endif
1274
1302#ifdef XPM_BACKGROUND 1275#ifdef XPM_BACKGROUND
1303 if (rs[Rs_backgroundPixmap] != NULL 1276 if (rs[Rs_backgroundPixmap] != NULL
1304 && !(Options & Opt_transparent)) 1277 && !(Options & Opt_transparent))
1305 { 1278 {
1306 const char *p = rs[Rs_backgroundPixmap]; 1279 const char *p = rs[Rs_backgroundPixmap];
1307 1280
1308 if ((p = STRCHR(p, ';')) != NULL) 1281 if ((p = STRCHR(p, ';')) != NULL)
1309 { 1282 {
1310 p++; 1283 p++;
1311 rxvt_scale_pixmap (this, p); 1284 scale_pixmap (p);
1312 } 1285 }
1313 rxvt_set_bgPixmap (this, rs[Rs_backgroundPixmap]); 1286 set_bgPixmap (rs[Rs_backgroundPixmap]);
1314 rxvt_scr_touch (this, True); 1287 scr_touch (True);
1315 } 1288 }
1316#endif 1289#endif
1317 1290
1318 /* graphics context for the vt window */ 1291 /* graphics context for the vt window */
1319 gcvalue.foreground = PixColors[Color_fg]; 1292 gcvalue.foreground = PixColors[Color_fg];
1320 gcvalue.background = PixColors[Color_bg]; 1293 gcvalue.background = PixColors[Color_bg];
1321 gcvalue.graphics_exposures = 1; 1294 gcvalue.graphics_exposures = 1;
1322 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1295 TermWin.gc = XCreateGC(display->display, TermWin.vt,
1323 GCForeground | GCBackground 1296 GCForeground | GCBackground
1324 | GCGraphicsExposures, &gcvalue); 1297 | GCGraphicsExposures, &gcvalue);
1325 1298
1326#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1299#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1327
1328 gcvalue.foreground = PixColors[Color_topShadow]; 1300 gcvalue.foreground = PixColors[Color_topShadow];
1329 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1301 topShadowGC = XCreateGC(display->display, TermWin.vt,
1330 GCForeground, &gcvalue); 1302 GCForeground, &gcvalue);
1331 gcvalue.foreground = PixColors[Color_bottomShadow]; 1303 gcvalue.foreground = PixColors[Color_bottomShadow];
1332 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1304 botShadowGC = XCreateGC(display->display, TermWin.vt,
1333 GCForeground, &gcvalue); 1305 GCForeground, &gcvalue);
1334 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1306 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1335 : Color_scroll)]; 1307 : Color_scroll)];
1336 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, 1308 scrollbarGC = XCreateGC(display->display, TermWin.vt,
1337 GCForeground, &gcvalue); 1309 GCForeground, &gcvalue);
1338#endif 1310#endif
1339} 1311}
1340 1312
1341/*----------------------------------------------------------------------*/ 1313/*----------------------------------------------------------------------*/
1342/* 1314/*
… …
1354 { 1326 {
1355 rxvt_print_error("can't open pseudo-tty"); 1327 rxvt_print_error("can't open pseudo-tty");
1356 return -1; 1328 return -1;
1357 } 1329 }
1358 1330
1359#ifdef FD_SETSIZE
1360 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1361 {
1362 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1363 rxvt_clean_exit();
1364 exit(EXIT_FAILURE);
1365 }
1366#endif
1367
1368 fcntl (cfd, F_SETFL, O_NONBLOCK); 1331 fcntl (cfd, F_SETFL, O_NONBLOCK);
1369 1332
1370 /* get slave (tty) */ 1333 /* get slave (tty) */
1371 if (tty_fd < 0) 1334 if (tty_fd < 0)
1372 { 1335 {
1373#ifndef NO_SETOWNER_TTYDEV 1336#ifndef NO_SETOWNER_TTYDEV
1374 rxvt_privileged_ttydev (aR_ SAVE); 1337 privileged_ttydev (SAVE);
1375#endif 1338#endif
1376 1339
1377 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1340 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1378 { 1341 {
1379 close(cfd); 1342 close(cfd);
… …
1395 1358
1396#ifndef __QNX__ 1359#ifndef __QNX__
1397 /* spin off the command interpreter */ 1360 /* spin off the command interpreter */
1398 switch (cmd_pid = fork ()) 1361 switch (cmd_pid = fork ())
1399 { 1362 {
1400 case -1: 1363 case -1:
1401 rxvt_print_error("can't fork"); 1364 rxvt_print_error("can't fork");
1402 return -1; 1365 return -1;
1403 case 0: 1366 case 0:
1404 close (cfd); /* only keep tty_fd and STDERR open */ 1367 close (cfd); /* only keep tty_fd and STDERR open */
1405 close (Xfd); 1368
1406 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1369 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1407 rxvt_print_error ("could not obtain control of tty"); 1370 rxvt_print_error ("could not obtain control of tty");
1408 else 1371 else
1372 {
1373 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1374 dup2 (tty_fd, STDIN_FILENO);
1375 dup2 (tty_fd, STDOUT_FILENO);
1376 dup2 (tty_fd, STDERR_FILENO);
1377
1378 if (tty_fd > 2)
1379 close (tty_fd);
1380
1381 run_child (argv);
1382 }
1383 exit (EXIT_FAILURE);
1384 /* NOTREACHED */
1385 default:
1409 { 1386 {
1410 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1387#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1388 int fdstdin;
1389
1390 fdstdin = dup (STDIN_FILENO);
1411 dup2 (tty_fd, STDIN_FILENO); 1391 dup2 (tty_fd, STDIN_FILENO);
1392#endif
1393
1394#ifdef UTMP_SUPPORT
1395 privileged_utmp (SAVE);
1396#endif
1397
1398#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1399
1412 dup2 (tty_fd, STDOUT_FILENO); 1400 dup2 (fdstdin, STDIN_FILENO);
1413 dup2 (tty_fd, STDERR_FILENO);
1414
1415 if (tty_fd > 2)
1416 close (tty_fd); 1401 close (fdstdin);
1402#endif
1417 1403
1418 run_child (argv);
1419 } 1404 }
1420 exit (EXIT_FAILURE);
1421 /* NOTREACHED */
1422 default:
1423 {
1424#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1425 int fdstdin;
1426
1427 fdstdin = dup (STDIN_FILENO);
1428 dup2 (tty_fd, STDIN_FILENO);
1429#endif
1430
1431 rxvt_privileged_utmp (this, SAVE);
1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1433
1434 dup2 (fdstdin, STDIN_FILENO);
1435 close (fdstdin);
1436#endif
1437
1438 }
1439 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1405 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1440 break; 1406 break;
1441 } 1407 }
1442#else /* __QNX__ uses qnxspawn() */ 1408#else /* __QNX__ uses qnxspawn() */
1443 fchmod (tty_fd, 0622); 1409 fchmod (tty_fd, 0622);
1444 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1410 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1445 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1411 fcntl (cfd, F_SETFD, FD_CLOEXEC);
… …
1479 { 1445 {
1480 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1446 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1481 close (fd); 1447 close (fd);
1482 } 1448 }
1483#endif /* SRIOCSREDIR */ 1449#endif /* SRIOCSREDIR */
1450
1484 } 1451 }
1485 1452
1486 /* reset signals and spin off the command interpreter */ 1453 /* reset signals and spin off the command interpreter */
1487 signal (SIGINT, SIG_DFL); 1454 signal (SIGINT, SIG_DFL);
1488 signal (SIGQUIT, SIG_DFL); 1455 signal (SIGQUIT, SIG_DFL);
… …
1583 } 1550 }
1584 arg_v = arg_a; 1551 arg_v = arg_a;
1585 } 1552 }
1586 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1553 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1587 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1554 cmd_pid = qnx_spawn(0, 0, 0, -1, -1,
1588 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1555 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1589 command, arg_v, environ, iov_a, 0); 1556 command, arg_v, environ, iov_a, 0);
1590 if (login) 1557 if (login)
1591 free(login); 1558 free(login);
1592 1559
1593 close(tty_fd); 1560 close(tty_fd);
1594 return cmd_fd; 1561 return cmd_fd;
… …
1599 1566
1600/* ------------------------------------------------------------------------- * 1567/* ------------------------------------------------------------------------- *
1601 * GET TTY CURRENT STATE * 1568 * GET TTY CURRENT STATE *
1602 * ------------------------------------------------------------------------- */ 1569 * ------------------------------------------------------------------------- */
1603/* rxvt_get_ttymode() */ 1570/* rxvt_get_ttymode() */
1604/* INTPROTO */ 1571/* EXTPROTO */
1605void 1572void
1606rxvt_get_ttymode(ttymode_t *tio, int erase) 1573rxvt_get_ttymode(ttymode_t *tio, int erase)
1607{ 1574{
1608#ifdef HAVE_TERMIOS_H 1575#ifdef HAVE_TERMIOS_H
1609 /* 1576 /*

Diff Legend

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