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

Diff Legend

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