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.14 by pcg, Thu Dec 18 05:45:11 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.14 2003/12/18 05:45:11 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)
… …
795/* 798/*
796 * This is more or less stolen straight from XFree86 xterm. 799 * This is more or less stolen straight from XFree86 xterm.
797 * This should support all European type languages. 800 * This should support all European type languages.
798 */ 801 */
799void 802void
803rxvt_term::set_locale (const char *locale)
804{
805#if HAVE_XSETLOCALE || HAVE_SETLOCALE
806 free (this->locale);
807 this->locale = rxvt_strdup (setlocale (LC_CTYPE, ""));
808#endif
809#if HAVE_NL_LANGINFO
810 free (codeset);
811 codeset = strdup (nl_langinfo (CODESET));
812 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
813 || !STRCASECMP (codeset, "UTF8");
814#else
815 enc_utf8 = 1;
816#endif
817}
818
819void
800rxvt_term::init_xlocale () 820rxvt_term::init_xlocale ()
801{ 821{
802#ifdef USE_XIM 822#ifdef USE_XIM
803 if (!locale) 823 if (!locale)
804 rxvt_print_error ("Setting locale failed."); 824 rxvt_print_error ("Setting locale failed.");
805 else 825 else
806 { 826 {
807 Atom wmlocale; 827 Atom wmlocale;
808 828
809 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 829 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
810 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 830 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
811 XA_STRING, 8, PropModeReplace, 831 XA_STRING, 8, PropModeReplace,
812 (unsigned char *)locale, STRLEN(locale)); 832 (unsigned char *)locale, STRLEN(locale));
813 833
814 if (!XSupportsLocale ()) 834 if (!XSupportsLocale ())
815 { 835 {
816 rxvt_print_error ("The locale is not supported by Xlib"); 836 rxvt_print_error ("The locale is not supported by Xlib");
817 return; 837 return;
818 } 838 }
819 839
820 rxvt_setTermFontSet (this, 0);
821
822 /* see if we can connect yet */ 840 /* see if we can connect yet */
823 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 841 rxvt_IMInstantiateCallback (display->display, NULL, NULL);
824 842
825 /* To avoid Segmentation Fault in C locale: Solaris only? */ 843 /* To avoid Segmentation Fault in C locale: Solaris only? */
826 if (STRCMP (locale, "C")) 844 if (STRCMP (locale, "C"))
827 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL, 845 XRegisterIMInstantiateCallback (display->display, NULL, NULL, NULL,
828 rxvt_IMInstantiateCallback, NULL); 846 rxvt_IMInstantiateCallback, NULL);
829 } 847 }
830#endif 848#endif
831} 849}
832 850
… …
839 * This should be called after the X server connection is established. 857 * This should be called after the X server connection is established.
840 */ 858 */
841 int i; 859 int i;
842 860
843 for (i = 0; i < NUM_XA; i++) 861 for (i = 0; i < NUM_XA; i++)
844 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 862 xa[i] = XInternAtom(display->display, xa_names[i], False);
845 863
846 /* Enable delete window protocol */ 864 /* Enable delete window protocol */
847 XSetWMProtocols (Xdisplay, TermWin.parent[0], 865 XSetWMProtocols (display->display, TermWin.parent[0],
848 &(xa[XA_WMDELETEWINDOW]), 1); 866 &(xa[XA_WMDELETEWINDOW]), 1);
849 867
850#ifdef USING_W11LIB 868#ifdef USING_W11LIB
851 /* enable W11 callbacks */ 869 /* enable W11 callbacks */
852 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 870 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
853#endif 871#endif
854 872
855#ifdef META8_OPTION 873#ifdef META8_OPTION
856 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
857#endif 875#endif
858 876
859 rxvt_get_ourmods (this); 877 get_ourmods ();
860 878
861 if (!(Options & Opt_scrollTtyOutput)) 879 if (!(Options & Opt_scrollTtyOutput))
862 PrivateModes |= PrivMode_TtyOutputInh; 880 PrivateModes |= PrivMode_TtyOutputInh;
863 if (Options & Opt_scrollTtyKeypress) 881 if (Options & Opt_scrollTtyKeypress)
864 PrivateModes |= PrivMode_Keypress; 882 PrivateModes |= PrivMode_Keypress;
… …
869 if (STRCMP(key_backspace, "DEC") == 0) 887 if (STRCMP(key_backspace, "DEC") == 0)
870 PrivateModes |= PrivMode_HaveBackSpace; 888 PrivateModes |= PrivMode_HaveBackSpace;
871#endif 889#endif
872 890
873 /* add value for scrollBar */ 891 /* add value for scrollBar */
874 if (scrollbar_visible (this)) 892 if (scrollbar_visible ())
875 { 893 {
876 PrivateModes |= PrivMode_scrollBar; 894 PrivateModes |= PrivMode_scrollBar;
877 SavedModes |= PrivMode_scrollBar; 895 SavedModes |= PrivMode_scrollBar;
878 } 896 }
879 if (menubar_visible (this)) 897 if (menubar_visible ())
880 { 898 {
881 PrivateModes |= PrivMode_menuBar; 899 PrivateModes |= PrivMode_menuBar;
882 SavedModes |= PrivMode_menuBar; 900 SavedModes |= PrivMode_menuBar;
883 } 901 }
884 902
885#ifdef GREEK_SUPPORT 903#ifdef GREEK_SUPPORT
886 greek_init(); 904 greek_init();
887#endif 905#endif
888 906
889 Xfd = XConnectionNumber (Xdisplay);
890
891#ifdef CURSOR_BLINK 907#ifdef CURSOR_BLINK
892
893 if (Options & Opt_cursorBlink) 908 if (Options & Opt_cursorBlink)
894 (void)gettimeofday (&lastcursorchange, NULL); 909 (void)gettimeofday (&lastcursorchange, NULL);
895#endif 910#endif
896 911
897 if ((cmd_fd = run_command (argv)) < 0) 912 if ((cmd_fd = run_command (argv)) < 0)
… …
900 exit (EXIT_FAILURE); 915 exit (EXIT_FAILURE);
901 } 916 }
902} 917}
903 918
904/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
905/* INTPROTO */
906void 920void
907rxvt_Get_Colours (pR) 921rxvt_term::Get_Colours ()
908{ 922{
909 int i; 923 int i;
910 924
911 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++) 925 for (i = 0; i < (XDEPTH <= 2 ? 2 : NRS_COLORS); i++)
912 { 926 {
913 rxvt_color xcol; 927 rxvt_color xcol;
914 928
915 if (!R->rs[Rs_color + i]) 929 if (!rs[Rs_color + i])
916 continue; 930 continue;
917 931
918 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 932 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
919 { 933 {
920#ifndef XTERM_REVERSE_VIDEO 934#ifndef XTERM_REVERSE_VIDEO
921 if (i < 2 && (R->Options & Opt_reverseVideo)) 935 if (i < 2 && (Options & Opt_reverseVideo))
922 {
923 R->rs[Rs_color + i] = def_colorName[!i]; 936 rs[Rs_color + i] = def_colorName[!i];
924 }
925 else 937 else
926#endif 938#endif
927 R->rs[Rs_color + i] = def_colorName[i]; 939 rs[Rs_color + i] = def_colorName[i];
928 940
929 if (!R->rs[Rs_color + i]) 941 if (!rs[Rs_color + i])
930 continue; 942 continue;
931 943
932 if (!rxvt_rXParseAllocColor(aR_ &xcol, R->rs[Rs_color + i])) 944 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
933 { 945 {
934 switch (i) 946 switch (i)
935 { 947 {
936 case Color_fg: 948 case Color_fg:
937 case Color_bg: 949 case Color_bg:
938 /* fatal: need bg/fg color */ 950 /* fatal: need bg/fg color */
939 rxvt_print_error ("aborting"); 951 rxvt_print_error ("aborting");
940 exit (EXIT_FAILURE); 952 exit (EXIT_FAILURE);
941 /* NOTREACHED */ 953 /* NOTREACHED */
942 break; 954 break;
943#ifndef NO_CURSORCOLOR 955#ifndef NO_CURSORCOLOR
944 case Color_cursor2: 956 case Color_cursor2:
945 xcol = R->PixColors[Color_fg]; 957 xcol = PixColors[Color_fg];
946 break; 958 break;
947#endif /* ! NO_CURSORCOLOR */ 959#endif /* ! NO_CURSORCOLOR */
948 case Color_pointer: 960 case Color_pointer:
949 xcol = R->PixColors[Color_fg]; 961 xcol = PixColors[Color_fg];
950 break; 962 break;
951 default: 963 default:
952 xcol = R->PixColors[Color_bg]; /* None */ 964 xcol = PixColors[Color_bg]; /* None */
953 break; 965 break;
954 } 966 }
955 } 967 }
956 } 968 }
957 969
958 R->PixColors[i] = xcol; 970 PixColors[i] = xcol;
959 SET_PIXCOLOR (R, i); 971 SET_PIXCOLOR (i);
960 } 972 }
961 973
962 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_pointer]) 974 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer])
963 R->PixColors[Color_pointer] = R->PixColors[Color_fg]; 975 PixColors[Color_pointer] = PixColors[Color_fg];
964 if (XDEPTH <= 2 || !R->rs[Rs_color + Color_border]) 976 if (XDEPTH <= 2 || !rs[Rs_color + Color_border])
965 R->PixColors[Color_border] = R->PixColors[Color_fg]; 977 PixColors[Color_border] = PixColors[Color_fg];
966 978
967 /* 979 /*
968 * get scrollBar/menuBar shadow colors 980 * get scrollBar/menuBar shadow colors
969 * 981 *
970 * The calculations of topShadow/bottomShadow values are adapted 982 * The calculations of topShadow/bottomShadow values are adapted
… …
972 */ 984 */
973#ifdef KEEP_SCROLLCOLOR 985#ifdef KEEP_SCROLLCOLOR
974 986
975 if (XDEPTH <= 2) 987 if (XDEPTH <= 2)
976 { /* Monochrome */ 988 { /* Monochrome */
977 R->PixColors[Color_scroll] = R->PixColors[Color_fg]; 989 PixColors[Color_scroll] = PixColors[Color_fg];
978 R->PixColors[Color_topShadow] = R->PixColors[Color_bg]; 990 PixColors[Color_topShadow] = PixColors[Color_bg];
979 R->PixColors[Color_bottomShadow] = R->PixColors[Color_bg]; 991 PixColors[Color_bottomShadow] = PixColors[Color_bg];
980 } 992 }
981 else 993 else
982 { 994 {
983 rxvt_color xcol[3]; 995 rxvt_color xcol[3];
984 /* xcol[0] == white 996 /* xcol[0] == white
985 * xcol[1] == top shadow 997 * xcol[1] == top shadow
986 * xcol[2] == bot shadow */ 998 * xcol[2] == bot shadow */
987 999
988 xcol[1] = R->PixColors[Color_scroll]; 1000 xcol[1] = PixColors[Color_scroll];
989# ifdef PREFER_24BIT 1001# ifdef PREFER_24BIT
990 xcol[0].set (R, 65535, 65535, 65535); 1002 xcol[0].set (display, 65535, 65535, 65535);
991 /* XFreeColors(R->Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1003 /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */
992# else 1004# else
993 xcol[0].set (WhitePixel(R->Xdisplay, Xscreen)); 1005 xcol[0].set (display, WhitePixel (display->display, display->screen));
994# endif 1006# endif
995 1007
996 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1008 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
997 1009
998 xcol[0].get (R, pr0, pg0, pb0); 1010 xcol[0].get (display, pr0, pg0, pb0);
999 xcol[1].get (R, pr1, pg1, pb1); 1011 xcol[1].get (display, pr1, pg1, pb1);
1000 1012
1001 /* bottomShadowColor */ 1013 /* bottomShadowColor */
1002 if (!xcol[2].set (aR_ pr1 / 2, pg1 / 2, pb1 / 2)) 1014 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1003 xcol[2] = R->PixColors[Color_Black]; 1015 xcol[2] = PixColors[Color_Black];
1004 1016
1005 R->PixColors[Color_bottomShadow] = xcol[2]; 1017 PixColors[Color_bottomShadow] = xcol[2];
1006 1018
1007 /* topShadowColor */ 1019 /* topShadowColor */
1008 if (!xcol[1].set (aR_ 1020 if (!xcol[1].set (display,
1009 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1021 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1010 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1022 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1011 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1023 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1012 xcol[1] = R->PixColors[Color_White]; 1024 xcol[1] = PixColors[Color_White];
1013 1025
1014 R->PixColors[Color_topShadow] = xcol[1]; 1026 PixColors[Color_topShadow] = xcol[1];
1015 } 1027 }
1016#endif /* KEEP_SCROLLCOLOR */ 1028#endif /* KEEP_SCROLLCOLOR */
1017} 1029}
1018 1030
1019/*----------------------------------------------------------------------*/ 1031/*----------------------------------------------------------------------*/
… …
1027 1039
1028 if (i >= 8 && i <= 15) 1040 if (i >= 8 && i <= 15)
1029 { /* bright colors */ 1041 { /* bright colors */
1030 i -= 8; 1042 i -= 8;
1031#ifndef NO_BRIGHTCOLOR 1043#ifndef NO_BRIGHTCOLOR
1032
1033 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1044 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1034 return; 1045 return;
1035#endif 1046#endif
1036 1047
1037 } 1048 }
1049
1038 if (i >= 0 && i <= 7) /* normal colors */ 1050 if (i >= 0 && i <= 7) /* normal colors */
1039 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1051 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1040 } 1052 }
1041} 1053}
1042 1054
1043/*----------------------------------------------------------------------*/ 1055/*----------------------------------------------------------------------*/
1044/* 1056/*
1045 * 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
1046 * Use resource ``modifier'' to override the Meta modifier 1058 * Use resource ``modifier'' to override the Meta modifier
1047 */ 1059 */
1048/* INTPROTO */
1049void 1060void
1050rxvt_get_ourmods(pR) 1061rxvt_term::get_ourmods ()
1051{ 1062{
1052 int i, j, k; 1063 int i, j, k;
1053 int requestedmeta, realmeta, realalt; 1064 int requestedmeta, realmeta, realalt;
1054 const char *cm, *rsmod; 1065 const char *cm, *rsmod;
1055 XModifierKeymap *map; 1066 XModifierKeymap *map;
… …
1058 { 1069 {
1059 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 1070 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
1060 }; 1071 };
1061 1072
1062 requestedmeta = realmeta = realalt = 0; 1073 requestedmeta = realmeta = realalt = 0;
1063 rsmod = R->rs[Rs_modifier]; 1074 rsmod = rs[Rs_modifier];
1064 if (rsmod 1075 if (rsmod
1065 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1076 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0)
1066 requestedmeta = rsmod[3] - '0'; 1077 requestedmeta = rsmod[3] - '0';
1067 1078
1068 map = XGetModifierMapping(R->Xdisplay); 1079 map = XGetModifierMapping(display->display);
1069 kc = map->modifiermap; 1080 kc = map->modifiermap;
1070 for (i = 1; i < 6; i++) 1081 for (i = 1; i < 6; i++)
1071 { 1082 {
1072 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1083 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1073 for (j = map->max_keypermod; j--; k++) 1084 for (j = map->max_keypermod; j--; k++)
1074 { 1085 {
1075 if (kc[k] == 0) 1086 if (kc[k] == 0)
1076 break; 1087 break;
1077 switch (XKeycodeToKeysym(R->Xdisplay, kc[k], 0)) 1088 switch (XKeycodeToKeysym(display->display, kc[k], 0))
1078 { 1089 {
1079 case XK_Num_Lock: 1090 case XK_Num_Lock:
1080 R->ModNumLockMask = modmasks[i - 1]; 1091 ModNumLockMask = modmasks[i - 1];
1081 /* FALLTHROUGH */ 1092 /* FALLTHROUGH */
1082 default: 1093 default:
1083 continue; /* for(;;) */ 1094 continue; /* for(;;) */
1084 case XK_Meta_L: 1095 case XK_Meta_L:
1085 case XK_Meta_R: 1096 case XK_Meta_R:
1086 cm = "meta"; 1097 cm = "meta";
1087 realmeta = i; 1098 realmeta = i;
1088 break; 1099 break;
1089 case XK_Alt_L: 1100 case XK_Alt_L:
1090 case XK_Alt_R: 1101 case XK_Alt_R:
1091 cm = "alt"; 1102 cm = "alt";
1092 realalt = i; 1103 realalt = i;
1093 break; 1104 break;
1094 case XK_Super_L: 1105 case XK_Super_L:
1095 case XK_Super_R: 1106 case XK_Super_R:
1096 cm = "super"; 1107 cm = "super";
1097 break; 1108 break;
1098 case XK_Hyper_L: 1109 case XK_Hyper_L:
1099 case XK_Hyper_R: 1110 case XK_Hyper_R:
1100 cm = "hyper"; 1111 cm = "hyper";
1101 break; 1112 break;
1102 } 1113 }
1103 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1114 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0)
1104 requestedmeta = i; 1115 requestedmeta = i;
1105 } 1116 }
1106 } 1117 }
1107 XFreeModifiermap(map); 1118 XFreeModifiermap(map);
1108 i = (requestedmeta ? requestedmeta 1119 i = (requestedmeta ? requestedmeta
1109 : (realmeta ? realmeta 1120 : (realmeta ? realmeta
1110 : (realalt ? realalt : 0))); 1121 : (realalt ? realalt : 0)));
1111 if (i) 1122 if (i)
1112 R->ModMetaMask = modmasks[i - 1]; 1123 ModMetaMask = modmasks[i - 1];
1113} 1124}
1114 1125
1115/*----------------------------------------------------------------------*/ 1126/*----------------------------------------------------------------------*/
1116/* rxvt_Create_Windows() - Open and map the window */ 1127/* rxvt_Create_Windows() - Open and map the window */
1117/* EXTPROTO */
1118void 1128void
1119rxvt_Create_Windows(pR_ int argc, const char *const *argv) 1129rxvt_term::create_windows (int argc, const char *const *argv)
1120{ 1130{
1121 XClassHint classHint; 1131 XClassHint classHint;
1122 XWMHints wmHint; 1132 XWMHints wmHint;
1123 XGCValues gcvalue; 1133 XGCValues gcvalue;
1124 long vt_emask; 1134 long vt_emask;
1125 1135
1126#ifdef PREFER_24BIT
1127
1128 XSetWindowAttributes attributes;
1129 XWindowAttributes gattr; 1136 XWindowAttributes gattr;
1130 1137
1131 XCMAP = DefaultColormap(R->Xdisplay, Xscreen);
1132 XVISUAL = DefaultVisual(R->Xdisplay, Xscreen);
1133
1134 if (R->Options & Opt_transparent) 1138 if (Options & Opt_transparent)
1135 {
1136 XGetWindowAttributes(R->Xdisplay, RootWindow(R->Xdisplay, Xscreen),
1137 &gattr);
1138 XDEPTH = gattr.depth;
1139 } 1139 {
1140 else 1140 XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr);
1141 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1141 { 1142 }
1142 XDEPTH = DefaultDepth(R->Xdisplay, Xscreen);
1143 /*
1144 * If depth is not 24, look for a 24bit visual.
1145 */
1146 if (XDEPTH != 24)
1147 {
1148 XVisualInfo vinfo;
1149
1150 if (XMatchVisualInfo(R->Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1151 {
1152 XDEPTH = 24;
1153 XVISUAL = vinfo.visual;
1154 XCMAP = XCreateColormap(R->Xdisplay,
1155 RootWindow(R->Xdisplay, Xscreen),
1156 XVISUAL, AllocNone);
1157 }
1158 }
1159 }
1160#endif
1161 1143
1162 /* grab colors before netscape does */ 1144 /* grab colors before netscape does */
1163 rxvt_Get_Colours(aR); 1145 Get_Colours ();
1164 1146
1165 rxvt_change_font(aR_ 1, NULL); 1147 change_font (1, NULL);
1166 rxvt_window_calc(aR_ 0, 0); 1148 window_calc (0, 0);
1167 R->old_width = R->szHint.width; 1149 old_width = szHint.width;
1168 R->old_height = R->szHint.height; 1150 old_height = szHint.height;
1169 1151
1170 /* parent window - reverse video so we can see placement errors 1152 /* parent window - reverse video so we can see placement errors
1171 * sub-window placement & size in rxvt_resize_subwindows() 1153 * sub-window placement & size in rxvt_resize_subwindows()
1172 */ 1154 */
1173 1155
1174#ifdef PREFER_24BIT 1156#ifdef PREFER_24BIT
1157 XSetWindowAttributes attributes;
1175 1158
1176 attributes.background_pixel = R->PixColors[Color_fg]; 1159 attributes.background_pixel = PixColors[Color_fg];
1177 attributes.border_pixel = R->PixColors[Color_border]; 1160 attributes.border_pixel = PixColors[Color_border];
1178 attributes.colormap = XCMAP; 1161 attributes.colormap = display->cmap;
1179 R->TermWin.parent[0] = XCreateWindow(R->Xdisplay, Xroot, 1162 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1180 R->szHint.x, R->szHint.y, 1163 szHint.x, szHint.y,
1181 R->szHint.width, R->szHint.height, 1164 szHint.width, szHint.height,
1182 R->TermWin.ext_bwidth, 1165 TermWin.ext_bwidth,
1183 XDEPTH, InputOutput, 1166 display->depth, InputOutput,
1184 XVISUAL, 1167 display->visual,
1185 CWBackPixel | CWBorderPixel
1186 | CWColormap, &attributes); 1168 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1187#else 1169#else
1188 1170 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1189 R->TermWin.parent[0] = XCreateSimpleWindow(R->Xdisplay, Xroot,
1190 R->szHint.x, R->szHint.y, 1171 szHint.x, szHint.y,
1191 R->szHint.width, 1172 szHint.width,
1192 R->szHint.height, 1173 szHint.height,
1193 R->TermWin.ext_bwidth, 1174 TermWin.ext_bwidth,
1194 R->PixColors[Color_border], 1175 PixColors[Color_border],
1195 R->PixColors[Color_fg]); 1176 PixColors[Color_fg]);
1196#endif 1177#endif
1197 1178
1198 rxvt_xterm_seq(aR_ XTerm_title, R->rs[Rs_title], CHAR_ST); 1179 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1199 rxvt_xterm_seq(aR_ XTerm_iconName, R->rs[Rs_iconName], CHAR_ST); 1180 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1200 1181
1201 classHint.res_name = (char *)R->rs[Rs_name]; 1182 classHint.res_name = (char *)rs[Rs_name];
1202 classHint.res_class = (char *)APL_CLASS; 1183 classHint.res_class = (char *)APL_CLASS;
1203 1184
1204 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1185 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1205 wmHint.input = True; 1186 wmHint.input = True;
1206 wmHint.initial_state = (R->Options & Opt_iconic ? IconicState 1187 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1207 : NormalState); 1188 : NormalState);
1208 wmHint.window_group = R->TermWin.parent[0]; 1189 wmHint.window_group = TermWin.parent[0];
1209 1190
1210 XSetWMProperties(R->Xdisplay, R->TermWin.parent[0], NULL, NULL, 1191 XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL,
1211 (char **)argv, argc, &R->szHint, &wmHint, &classHint); 1192 (char **)argv, argc, &szHint, &wmHint, &classHint);
1193
1212 XSelectInput(R->Xdisplay, R->TermWin.parent[0], 1194 XSelectInput(display->display, TermWin.parent[0],
1213 (KeyPressMask 1195 KeyPressMask
1214#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1196#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1215 | KeyReleaseMask 1197 | KeyReleaseMask
1216#endif 1198#endif
1217 | FocusChangeMask | VisibilityChangeMask 1199 | FocusChangeMask | VisibilityChangeMask
1218 | StructureNotifyMask)); 1200 | StructureNotifyMask);
1201 termwin_ev.start (display, TermWin.parent[0]);
1219 1202
1220 /* 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 */
1221 R->TermWin_cursor = XCreateFontCursor(R->Xdisplay, XC_xterm); 1204 TermWin_cursor = XCreateFontCursor(display->display, XC_xterm);
1222 1205
1223#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1206#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1224 /* cursor (menuBar/scrollBar): Black-on-White */ 1207 /* cursor (menuBar/scrollBar): Black-on-White */
1225 R->leftptr_cursor = XCreateFontCursor(R->Xdisplay, XC_left_ptr); 1208 leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr);
1226#endif 1209#endif
1227 1210
1228#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1229
1230 { 1212 {
1231 XColor blackcolour; 1213 XColor blackcolour;
1232 blackcolour.red = 0; 1214 blackcolour.red = 0;
1233 blackcolour.green = 0; 1215 blackcolour.green = 0;
1234 blackcolour.blue = 0; 1216 blackcolour.blue = 0;
1235 Font f = XLoadFont (R->Xdisplay, "fixed"); 1217 Font f = XLoadFont (display->display, "fixed");
1236 R->blank_cursor = XCreateGlyphCursor (R->Xdisplay, f, f, ' ', ' ', 1218 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1237 &blackcolour, &blackcolour); 1219 &blackcolour, &blackcolour);
1238 XUnloadFont (R->Xdisplay, f); 1220 XUnloadFont (display->display, f);
1239 } 1221 }
1240#endif 1222#endif
1241 1223
1242 /* the vt window */ 1224 /* the vt window */
1243 R->TermWin.vt = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1225 TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0],
1244 R->window_vt_x, R->window_vt_y, 1226 window_vt_x, window_vt_y,
1245 TermWin_TotalWidth(), 1227 TermWin_TotalWidth(),
1246 TermWin_TotalHeight(), 1228 TermWin_TotalHeight(),
1247 0, 1229 0,
1248 R->PixColors[Color_fg], 1230 PixColors[Color_fg],
1249 R->PixColors[Color_bg]); 1231 PixColors[Color_bg]);
1232
1250#ifdef DEBUG_X 1233#ifdef DEBUG_X
1251
1252 XStoreName(R->Xdisplay, R->TermWin.vt, "vt window"); 1234 XStoreName(display->display, TermWin.vt, "vt window");
1253#endif 1235#endif
1254
1255 R->pointer_unblank ();
1256 1236
1257 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1237 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1258 | PropertyChangeMask); 1238 | PropertyChangeMask);
1239
1259#ifdef POINTER_BLANK 1240#ifdef POINTER_BLANK
1241 pointer_unblank ();
1260 1242
1261 if ((R->Options & Opt_pointerBlank)) 1243 if ((Options & Opt_pointerBlank))
1262 vt_emask |= PointerMotionMask; 1244 vt_emask |= PointerMotionMask;
1263 else 1245 else
1264#endif 1246#endif
1265
1266 vt_emask |= (Button1MotionMask | Button3MotionMask); 1247 vt_emask |= (Button1MotionMask | Button3MotionMask);
1248
1267 XSelectInput(R->Xdisplay, R->TermWin.vt, vt_emask); 1249 XSelectInput(display->display, TermWin.vt, vt_emask);
1250 vt_ev.start (display, TermWin.vt);
1268 1251
1269#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1252#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1270
1271 if (menuBar_height()) 1253 if (menuBar_height())
1272 { 1254 {
1273 R->menuBar.win = XCreateSimpleWindow(R->Xdisplay, R->TermWin.parent[0], 1255 menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0],
1274 R->window_vt_x, 0, 1256 window_vt_x, 0,
1275 TermWin_TotalWidth(), 1257 TermWin_TotalWidth(),
1276 menuBar_TotalHeight(), 1258 menuBar_TotalHeight(),
1277 0, 1259 0,
1278 R->PixColors[Color_fg], 1260 PixColors[Color_fg],
1279 R->PixColors[Color_scroll]); 1261 PixColors[Color_scroll]);
1280#ifdef DEBUG_X 1262#ifdef DEBUG_X
1281
1282 XStoreName(R->Xdisplay, R->menuBar.win, "menubar"); 1263 XStoreName(display->display, menuBar.win, "menubar");
1283#endif 1264#endif
1284 1265
1285 XDefineCursor(R->Xdisplay, R->menuBar.win, R->pointer_leftptr); 1266 XDefineCursor(display->display, menuBar.win, pointer_leftptr);
1267
1286 XSelectInput(R->Xdisplay, R->menuBar.win, 1268 XSelectInput(display->display, menuBar.win,
1287 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1269 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1288 | Button1MotionMask)); 1270 | Button1MotionMask));
1271 menubar_ev.start (display, menuBar.win);
1289 } 1272 }
1290#endif 1273#endif
1274
1291#ifdef XPM_BACKGROUND 1275#ifdef XPM_BACKGROUND
1292 if (R->rs[Rs_backgroundPixmap] != NULL 1276 if (rs[Rs_backgroundPixmap] != NULL
1293 && !(R->Options & Opt_transparent)) 1277 && !(Options & Opt_transparent))
1294 { 1278 {
1295 const char *p = R->rs[Rs_backgroundPixmap]; 1279 const char *p = rs[Rs_backgroundPixmap];
1296 1280
1297 if ((p = STRCHR(p, ';')) != NULL) 1281 if ((p = STRCHR(p, ';')) != NULL)
1298 { 1282 {
1299 p++; 1283 p++;
1300 rxvt_scale_pixmap(aR_ p); 1284 scale_pixmap (p);
1301 } 1285 }
1302 rxvt_set_bgPixmap(aR_ R->rs[Rs_backgroundPixmap]); 1286 set_bgPixmap (rs[Rs_backgroundPixmap]);
1303 rxvt_scr_touch(aR_ True); 1287 scr_touch (True);
1304 } 1288 }
1305#endif 1289#endif
1306 1290
1307 /* graphics context for the vt window */ 1291 /* graphics context for the vt window */
1308 gcvalue.foreground = R->PixColors[Color_fg]; 1292 gcvalue.foreground = PixColors[Color_fg];
1309 gcvalue.background = R->PixColors[Color_bg]; 1293 gcvalue.background = PixColors[Color_bg];
1310 gcvalue.graphics_exposures = 1; 1294 gcvalue.graphics_exposures = 1;
1311 R->TermWin.gc = XCreateGC(R->Xdisplay, R->TermWin.vt, 1295 TermWin.gc = XCreateGC(display->display, TermWin.vt,
1312 GCForeground | GCBackground 1296 GCForeground | GCBackground
1313 | GCGraphicsExposures, &gcvalue); 1297 | GCGraphicsExposures, &gcvalue);
1314 1298
1315#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1299#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1316
1317 gcvalue.foreground = R->PixColors[Color_topShadow]; 1300 gcvalue.foreground = PixColors[Color_topShadow];
1318 R->topShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1301 topShadowGC = XCreateGC(display->display, TermWin.vt,
1319 GCForeground, &gcvalue); 1302 GCForeground, &gcvalue);
1320 gcvalue.foreground = R->PixColors[Color_bottomShadow]; 1303 gcvalue.foreground = PixColors[Color_bottomShadow];
1321 R->botShadowGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1304 botShadowGC = XCreateGC(display->display, TermWin.vt,
1322 GCForeground, &gcvalue); 1305 GCForeground, &gcvalue);
1323 gcvalue.foreground = R->PixColors[(XDEPTH <= 2 ? Color_fg 1306 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1324 : Color_scroll)]; 1307 : Color_scroll)];
1325 R->scrollbarGC = XCreateGC(R->Xdisplay, R->TermWin.vt, 1308 scrollbarGC = XCreateGC(display->display, TermWin.vt,
1326 GCForeground, &gcvalue); 1309 GCForeground, &gcvalue);
1327#endif 1310#endif
1328} 1311}
1329 1312
1330/*----------------------------------------------------------------------*/ 1313/*----------------------------------------------------------------------*/
1331/* 1314/*
… …
1343 { 1326 {
1344 rxvt_print_error("can't open pseudo-tty"); 1327 rxvt_print_error("can't open pseudo-tty");
1345 return -1; 1328 return -1;
1346 } 1329 }
1347 1330
1348#ifdef FD_SETSIZE
1349 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1350 {
1351 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1352 rxvt_clean_exit();
1353 exit(EXIT_FAILURE);
1354 }
1355#endif
1356
1357 fcntl (cfd, F_SETFL, O_NONBLOCK); 1331 fcntl (cfd, F_SETFL, O_NONBLOCK);
1358 1332
1359 /* get slave (tty) */ 1333 /* get slave (tty) */
1360 if (tty_fd < 0) 1334 if (tty_fd < 0)
1361 { 1335 {
1362#ifndef NO_SETOWNER_TTYDEV 1336#ifndef NO_SETOWNER_TTYDEV
1363 rxvt_privileged_ttydev (aR_ SAVE); 1337 privileged_ttydev (SAVE);
1364#endif 1338#endif
1365 1339
1366 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1340 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1367 { 1341 {
1368 close(cfd); 1342 close(cfd);
… …
1384 1358
1385#ifndef __QNX__ 1359#ifndef __QNX__
1386 /* spin off the command interpreter */ 1360 /* spin off the command interpreter */
1387 switch (cmd_pid = fork ()) 1361 switch (cmd_pid = fork ())
1388 { 1362 {
1389 case -1: 1363 case -1:
1390 rxvt_print_error("can't fork"); 1364 rxvt_print_error("can't fork");
1391 return -1; 1365 return -1;
1392 case 0: 1366 case 0:
1393 close (cfd); /* only keep tty_fd and STDERR open */ 1367 close (cfd); /* only keep tty_fd and STDERR open */
1394 close (Xfd); 1368
1395 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1369 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1396 rxvt_print_error ("could not obtain control of tty"); 1370 rxvt_print_error ("could not obtain control of tty");
1397 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:
1398 { 1386 {
1399 /* 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);
1400 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
1401 dup2 (tty_fd, STDOUT_FILENO); 1400 dup2 (fdstdin, STDIN_FILENO);
1402 dup2 (tty_fd, STDERR_FILENO);
1403
1404 if (tty_fd > 2)
1405 close (tty_fd); 1401 close (fdstdin);
1402#endif
1406 1403
1407 run_child (argv);
1408 } 1404 }
1409 exit (EXIT_FAILURE);
1410 /* NOTREACHED */
1411 default:
1412 {
1413#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1414 int fdstdin;
1415
1416 fdstdin = dup (STDIN_FILENO);
1417 dup2 (tty_fd, STDIN_FILENO);
1418#endif
1419
1420 rxvt_privileged_utmp (this, SAVE);
1421#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1422
1423 dup2 (fdstdin, STDIN_FILENO);
1424 close (fdstdin);
1425#endif
1426
1427 }
1428 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1405 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1429 break; 1406 break;
1430 } 1407 }
1431#else /* __QNX__ uses qnxspawn() */ 1408#else /* __QNX__ uses qnxspawn() */
1432 fchmod (tty_fd, 0622); 1409 fchmod (tty_fd, 0622);
1433 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1410 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1434 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1411 fcntl (cfd, F_SETFD, FD_CLOEXEC);
… …
1468 { 1445 {
1469 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1446 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1470 close (fd); 1447 close (fd);
1471 } 1448 }
1472#endif /* SRIOCSREDIR */ 1449#endif /* SRIOCSREDIR */
1450
1473 } 1451 }
1474 1452
1475 /* reset signals and spin off the command interpreter */ 1453 /* reset signals and spin off the command interpreter */
1476 signal (SIGINT, SIG_DFL); 1454 signal (SIGINT, SIG_DFL);
1477 signal (SIGQUIT, SIG_DFL); 1455 signal (SIGQUIT, SIG_DFL);
… …
1572 } 1550 }
1573 arg_v = arg_a; 1551 arg_v = arg_a;
1574 } 1552 }
1575 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1553 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1576 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1554 cmd_pid = qnx_spawn(0, 0, 0, -1, -1,
1577 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1555 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1578 command, arg_v, environ, iov_a, 0); 1556 command, arg_v, environ, iov_a, 0);
1579 if (login) 1557 if (login)
1580 free(login); 1558 free(login);
1581 1559
1582 close(tty_fd); 1560 close(tty_fd);
1583 return cmd_fd; 1561 return cmd_fd;
… …
1588 1566
1589/* ------------------------------------------------------------------------- * 1567/* ------------------------------------------------------------------------- *
1590 * GET TTY CURRENT STATE * 1568 * GET TTY CURRENT STATE *
1591 * ------------------------------------------------------------------------- */ 1569 * ------------------------------------------------------------------------- */
1592/* rxvt_get_ttymode() */ 1570/* rxvt_get_ttymode() */
1593/* INTPROTO */ 1571/* EXTPROTO */
1594void 1572void
1595rxvt_get_ttymode(ttymode_t *tio, int erase) 1573rxvt_get_ttymode(ttymode_t *tio, int erase)
1596{ 1574{
1597#ifdef HAVE_TERMIOS_H 1575#ifdef HAVE_TERMIOS_H
1598 /* 1576 /*

Diff Legend

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