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.21 by pcg, Sat Jan 31 02:14:58 2004 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.21 2004/01/31 02:14:58 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 "TEXT",
… …
372 MEvent.time = CurrentTime; 372 MEvent.time = CurrentTime;
373 MEvent.button = AnyButton; 373 MEvent.button = AnyButton;
374 Options = DEFAULT_OPTIONS; 374 Options = DEFAULT_OPTIONS;
375 want_refresh = 1; 375 want_refresh = 1;
376 cmd_pid = -1; 376 cmd_pid = -1;
377 cmd_fd = tty_fd = Xfd = -1; 377 cmd_fd = tty_fd = -1;
378 PrivateModes = SavedModes = PrivMode_Default; 378 PrivateModes = SavedModes = PrivMode_Default;
379 TermWin.focus = 0; 379 TermWin.focus = 0;
380 TermWin.ncol = 80; 380 TermWin.ncol = 80;
381 TermWin.nrow = 24; 381 TermWin.nrow = 24;
382 TermWin.int_bwidth = INTERNALBORDERWIDTH; 382 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
445 ttymode = S_IRUSR | S_IWUSR | S_IWGRP; 445 ttymode = S_IRUSR | S_IWUSR | S_IWGRP;
446 ttygid = gr->gr_gid; 446 ttygid = gr->gr_gid;
447 } 447 }
448 else 448 else
449#endif /* TTY_GID_SUPPORT */ 449#endif /* TTY_GID_SUPPORT */
450
450 { 451 {
451 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH; 452 ttymode = S_IRUSR | S_IWUSR | S_IWGRP | S_IWOTH;
452 ttygid = getgid (); 453 ttygid = getgid ();
453 } 454 }
454 455
… …
534 if (rs[Rs_display_name][0] == ':') 535 if (rs[Rs_display_name][0] == ':')
535 { 536 {
536 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); 537 val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name]));
537 STRCPY (val, "unix"); 538 STRCPY (val, "unix");
538 STRCAT (val, rs[Rs_display_name]); 539 STRCAT (val, rs[Rs_display_name]);
539 Xdisplay = XOpenDisplay (val); 540 display = displays.get (val);
540 free (val); 541 free (val);
541 } 542 }
542#endif 543#endif
543 544
544 if (Xdisplay == NULL 545 if (!display
545 && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) 546 && !(display = displays.get (rs[Rs_display_name])))
546 { 547 {
547 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]);
548 exit (EXIT_FAILURE); 549 exit (EXIT_FAILURE);
549 } 550 }
550 551
551 extract_resources (Xdisplay, rs[Rs_name]); 552 extract_resources (display->display, rs[Rs_name]);
552 553
553 /* 554 /*
554 * set any defaults not already set 555 * set any defaults not already set
555 */ 556 */
556 if (cmd_argv && cmd_argv[0]) 557 if (cmd_argv && cmd_argv[0])
… …
658#ifndef NO_OLD_SELECTION 659#ifndef NO_OLD_SELECTION
659 660
660 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0) 661 else if (STRNCASECMP(rs[Rs_selectstyle], "old", 3) == 0)
661 selection_style = OLD_SELECT; 662 selection_style = OLD_SELECT;
662#endif 663#endif
664
663 } 665 }
664 666
665#ifdef HAVE_SCROLLBARS 667#ifdef HAVE_SCROLLBARS
666 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
667 rs[Rs_scrollBar_thickness]); 669 rs[Rs_scrollBar_thickness]);
668#endif 670#endif
669 671
670 TermWin.fontset = new rxvt_fontset (this); 672 TermWin.fontset = new rxvt_fontset (this);
671 TermWin.fontset->populate (rs[Rs_font]); 673 TermWin.fontset->populate (rs[Rs_font]);
672 TermWin.fwidth = TermWin.fontset->base_font ()->width; 674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
… …
734 val = rxvt_network_display (rs[Rs_display_name]); 736 val = rxvt_network_display (rs[Rs_display_name]);
735 rs[Rs_display_name] = (const char *)val; 737 rs[Rs_display_name] = (const char *)val;
736 738
737 if (val == NULL) 739 if (val == NULL)
738#endif /* DISPLAY_IS_IP */ 740#endif /* DISPLAY_IS_IP */
739 val = XDisplayString(Xdisplay); 741 val = XDisplayString(display->display);
740 742
741 if (rs[Rs_display_name] == NULL) 743 if (rs[Rs_display_name] == NULL)
742 rs[Rs_display_name] = val; /* use broken `:0' value */ 744 rs[Rs_display_name] = val; /* use broken `:0' value */
743 745
744 i = STRLEN (val); 746 i = STRLEN (val);
… …
768 770
769#ifdef RXVT_TERMINFO 771#ifdef RXVT_TERMINFO
770 putenv ("TERMINFO=" RXVT_TERMINFO); 772 putenv ("TERMINFO=" RXVT_TERMINFO);
771#endif 773#endif
772 774
773 if (Xdepth <= 2) 775 if (display->depth <= 2)
774 putenv ("COLORTERM=" COLORTERMENV "-mono"); 776 putenv ("COLORTERM=" COLORTERMENV "-mono");
775 else 777 else
776 putenv ("COLORTERM=" COLORTERMENVFULL); 778 putenv ("COLORTERM=" COLORTERMENVFULL);
777 779
778 if (rs[Rs_term_name] != NULL) 780 if (rs[Rs_term_name] != NULL)
… …
806#endif 808#endif
807#if HAVE_NL_LANGINFO 809#if HAVE_NL_LANGINFO
808 free (codeset); 810 free (codeset);
809 codeset = strdup (nl_langinfo (CODESET)); 811 codeset = strdup (nl_langinfo (CODESET));
810 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 812 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
811 || !STRCASECMP (codeset, "UTF8"); 813 || !STRCASECMP (codeset, "UTF8");
812#else 814#else
813 enc_utf8 = 1; 815 enc_utf8 = 1;
814#endif 816#endif
815} 817}
816 818
… …
822 rxvt_print_error ("Setting locale failed."); 824 rxvt_print_error ("Setting locale failed.");
823 else 825 else
824 { 826 {
825 Atom wmlocale; 827 Atom wmlocale;
826 828
827 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 829 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
828 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 830 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
829 XA_STRING, 8, PropModeReplace, 831 XA_STRING, 8, PropModeReplace,
830 (unsigned char *)locale, STRLEN(locale)); 832 (unsigned char *)locale, STRLEN(locale));
831 833
832 if (!XSupportsLocale ()) 834 if (!XSupportsLocale ())
833 { 835 {
834 rxvt_print_error ("The locale is not supported by Xlib"); 836 rxvt_print_error ("The locale is not supported by Xlib");
835 return; 837 return;
836 } 838 }
837 839
838 /* see if we can connect yet */ 840 /* see if we can connect yet */
839 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 841 rxvt_IMInstantiateCallback (display->display, NULL, NULL);
840 842
841 /* To avoid Segmentation Fault in C locale: Solaris only? */ 843 /* To avoid Segmentation Fault in C locale: Solaris only? */
842 if (STRCMP (locale, "C")) 844 if (STRCMP (locale, "C"))
843 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL, 845 XRegisterIMInstantiateCallback (display->display, NULL, NULL, NULL,
844 rxvt_IMInstantiateCallback, NULL); 846 rxvt_IMInstantiateCallback, NULL);
845 } 847 }
846#endif 848#endif
847} 849}
848 850
… …
855 * This should be called after the X server connection is established. 857 * This should be called after the X server connection is established.
856 */ 858 */
857 int i; 859 int i;
858 860
859 for (i = 0; i < NUM_XA; i++) 861 for (i = 0; i < NUM_XA; i++)
860 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 862 xa[i] = XInternAtom(display->display, xa_names[i], False);
861 863
862 /* Enable delete window protocol */ 864 /* Enable delete window protocol */
863 XSetWMProtocols (Xdisplay, TermWin.parent[0], 865 XSetWMProtocols (display->display, TermWin.parent[0],
864 &(xa[XA_WMDELETEWINDOW]), 1); 866 &(xa[XA_WMDELETEWINDOW]), 1);
865 867
866#ifdef USING_W11LIB 868#ifdef USING_W11LIB
867 /* enable W11 callbacks */ 869 /* enable W11 callbacks */
868 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 870 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
869#endif 871#endif
870 872
871#ifdef META8_OPTION 873#ifdef META8_OPTION
872 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
873#endif 875#endif
… …
900 902
901#ifdef GREEK_SUPPORT 903#ifdef GREEK_SUPPORT
902 greek_init(); 904 greek_init();
903#endif 905#endif
904 906
905 Xfd = XConnectionNumber (Xdisplay);
906
907#ifdef CURSOR_BLINK 907#ifdef CURSOR_BLINK
908
909 if (Options & Opt_cursorBlink) 908 if (Options & Opt_cursorBlink)
910 (void)gettimeofday (&lastcursorchange, NULL); 909 (void)gettimeofday (&lastcursorchange, NULL);
911#endif 910#endif
912 911
913 if ((cmd_fd = run_command (argv)) < 0) 912 if ((cmd_fd = run_command (argv)) < 0)
… …
932 931
933 if (!rXParseAllocColor (&xcol, 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 && (Options & Opt_reverseVideo)) 935 if (i < 2 && (Options & Opt_reverseVideo))
937 {
938 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 rs[Rs_color + i] = def_colorName[i]; 939 rs[Rs_color + i] = def_colorName[i];
943 940
944 if (!rs[Rs_color + i]) 941 if (!rs[Rs_color + i])
… …
946 943
947 if (!rXParseAllocColor (&xcol, 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 = 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 = PixColors[Color_fg]; 961 xcol = PixColors[Color_fg];
965 break; 962 break;
966 default: 963 default:
967 xcol = PixColors[Color_bg]; /* None */ 964 xcol = PixColors[Color_bg]; /* None */
968 break; 965 break;
969 } 966 }
970 } 967 }
971 } 968 }
972 969
973 PixColors[i] = xcol; 970 PixColors[i] = xcol;
… …
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] = PixColors[Color_scroll]; 1000 xcol[1] = PixColors[Color_scroll];
1004# ifdef PREFER_24BIT 1001# ifdef PREFER_24BIT
1005 xcol[0].set (this, 65535, 65535, 65535); 1002 xcol[0].set (display, 65535, 65535, 65535);
1006 /* XFreeColors(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 (this, WhitePixel (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 (this, pr0, pg0, pb0); 1010 xcol[0].get (display, pr0, pg0, pb0);
1014 xcol[1].get (this, pr1, pg1, pb1); 1011 xcol[1].get (display, pr1, pg1, pb1);
1015 1012
1016 /* bottomShadowColor */ 1013 /* bottomShadowColor */
1017 if (!xcol[2].set (this, pr1 / 2, pg1 / 2, pb1 / 2)) 1014 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1018 xcol[2] = PixColors[Color_Black]; 1015 xcol[2] = PixColors[Color_Black];
1019 1016
1020 PixColors[Color_bottomShadow] = xcol[2]; 1017 PixColors[Color_bottomShadow] = xcol[2];
1021 1018
1022 /* topShadowColor */ 1019 /* topShadowColor */
1023 if (!xcol[1].set (this, 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] = PixColors[Color_White]; 1024 xcol[1] = PixColors[Color_White];
1028 1025
… …
1045 i -= 8; 1042 i -= 8;
1046#ifndef NO_BRIGHTCOLOR 1043#ifndef NO_BRIGHTCOLOR
1047 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1044 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1048 return; 1045 return;
1049#endif 1046#endif
1047
1050 } 1048 }
1051 1049
1052 if (i >= 0 && i <= 7) /* normal colors */ 1050 if (i >= 0 && i <= 7) /* normal colors */
1053 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1051 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1054 } 1052 }
… …
1076 rsmod = rs[Rs_modifier]; 1074 rsmod = rs[Rs_modifier];
1077 if (rsmod 1075 if (rsmod
1078 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1076 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0)
1079 requestedmeta = rsmod[3] - '0'; 1077 requestedmeta = rsmod[3] - '0';
1080 1078
1081 map = XGetModifierMapping(Xdisplay); 1079 map = XGetModifierMapping(display->display);
1082 kc = map->modifiermap; 1080 kc = map->modifiermap;
1083 for (i = 1; i < 6; i++) 1081 for (i = 1; i < 6; i++)
1084 { 1082 {
1085 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1083 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1086 for (j = map->max_keypermod; j--; k++) 1084 for (j = map->max_keypermod; j--; k++)
1087 { 1085 {
1088 if (kc[k] == 0) 1086 if (kc[k] == 0)
1089 break; 1087 break;
1090 switch (XKeycodeToKeysym(Xdisplay, kc[k], 0)) 1088 switch (XKeycodeToKeysym(display->display, kc[k], 0))
1091 { 1089 {
1092 case XK_Num_Lock: 1090 case XK_Num_Lock:
1093 ModNumLockMask = modmasks[i - 1]; 1091 ModNumLockMask = modmasks[i - 1];
1094 /* FALLTHROUGH */ 1092 /* FALLTHROUGH */
1095 default: 1093 default:
1096 continue; /* for(;;) */ 1094 continue; /* for(;;) */
1097 case XK_Meta_L: 1095 case XK_Meta_L:
1098 case XK_Meta_R: 1096 case XK_Meta_R:
1099 cm = "meta"; 1097 cm = "meta";
1100 realmeta = i; 1098 realmeta = i;
1101 break; 1099 break;
1102 case XK_Alt_L: 1100 case XK_Alt_L:
1103 case XK_Alt_R: 1101 case XK_Alt_R:
1104 cm = "alt"; 1102 cm = "alt";
1105 realalt = i; 1103 realalt = i;
1106 break; 1104 break;
1107 case XK_Super_L: 1105 case XK_Super_L:
1108 case XK_Super_R: 1106 case XK_Super_R:
1109 cm = "super"; 1107 cm = "super";
1110 break; 1108 break;
1111 case XK_Hyper_L: 1109 case XK_Hyper_L:
1112 case XK_Hyper_R: 1110 case XK_Hyper_R:
1113 cm = "hyper"; 1111 cm = "hyper";
1114 break; 1112 break;
1115 } 1113 }
1116 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1114 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0)
1117 requestedmeta = i; 1115 requestedmeta = i;
1118 } 1116 }
1119 } 1117 }
… …
1135 XGCValues gcvalue; 1133 XGCValues gcvalue;
1136 long vt_emask; 1134 long vt_emask;
1137 1135
1138 XWindowAttributes gattr; 1136 XWindowAttributes gattr;
1139 1137
1140 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1141 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1142 Xscreen = DefaultScreen (Xdisplay);
1143
1144 if (Options & Opt_transparent) 1138 if (Options & Opt_transparent)
1145 { 1139 {
1146 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 1140 XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr);
1147 Xdepth = gattr.depth; 1141 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1148 }
1149 else
1150 {
1151 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1152#ifdef PREFER_24BIT
1153 /*
1154 * If depth is not 24, look for a 24bit visual.
1155 */
1156 if (Xdepth != 24)
1157 {
1158 XVisualInfo vinfo;
1159
1160 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1161 {
1162 Xdepth = 24;
1163 Xvisual = vinfo.visual;
1164 Xcmap = XCreateColormap(Xdisplay,
1165 RootWindow(Xdisplay, Xscreen),
1166 Xvisual, AllocNone);
1167 }
1168 }
1169#endif
1170 } 1142 }
1171 1143
1172 /* grab colors before netscape does */ 1144 /* grab colors before netscape does */
1173 Get_Colours (); 1145 Get_Colours ();
1174 1146
… …
1184#ifdef PREFER_24BIT 1156#ifdef PREFER_24BIT
1185 XSetWindowAttributes attributes; 1157 XSetWindowAttributes attributes;
1186 1158
1187 attributes.background_pixel = PixColors[Color_fg]; 1159 attributes.background_pixel = PixColors[Color_fg];
1188 attributes.border_pixel = PixColors[Color_border]; 1160 attributes.border_pixel = PixColors[Color_border];
1189 attributes.colormap = Xcmap; 1161 attributes.colormap = display->cmap;
1190 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1162 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1191 szHint.x, szHint.y, 1163 szHint.x, szHint.y,
1192 szHint.width, szHint.height, 1164 szHint.width, szHint.height,
1193 TermWin.ext_bwidth, 1165 TermWin.ext_bwidth,
1194 Xdepth, InputOutput, 1166 display->depth, InputOutput,
1195 Xvisual, 1167 display->visual,
1196 CWBackPixel | CWBorderPixel
1197 | CWColormap, &attributes); 1168 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1198#else 1169#else
1199 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1170 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1200 szHint.x, szHint.y, 1171 szHint.x, szHint.y,
1201 szHint.width, 1172 szHint.width,
1202 szHint.height, 1173 szHint.height,
1203 TermWin.ext_bwidth, 1174 TermWin.ext_bwidth,
1204 PixColors[Color_border], 1175 PixColors[Color_border],
1205 PixColors[Color_fg]); 1176 PixColors[Color_fg]);
1206#endif 1177#endif
1207 1178
1208 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1179 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1209 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1180 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1210 1181
… …
1215 wmHint.input = True; 1186 wmHint.input = True;
1216 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1187 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1217 : NormalState); 1188 : NormalState);
1218 wmHint.window_group = TermWin.parent[0]; 1189 wmHint.window_group = TermWin.parent[0];
1219 1190
1220 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1191 XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL,
1221 (char **)argv, argc, &szHint, &wmHint, &classHint); 1192 (char **)argv, argc, &szHint, &wmHint, &classHint);
1193
1222 XSelectInput(Xdisplay, TermWin.parent[0], 1194 XSelectInput(display->display, TermWin.parent[0],
1223 (KeyPressMask 1195 KeyPressMask
1224#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1196#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1225 | KeyReleaseMask 1197 | KeyReleaseMask
1226#endif 1198#endif
1227 | FocusChangeMask | VisibilityChangeMask 1199 | FocusChangeMask | VisibilityChangeMask
1228 | StructureNotifyMask)); 1200 | StructureNotifyMask);
1201 termwin_ev.start (display, TermWin.parent[0]);
1229 1202
1230 /* 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 */
1231 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1204 TermWin_cursor = XCreateFontCursor(display->display, XC_xterm);
1232 1205
1233#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1206#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1234 /* cursor (menuBar/scrollBar): Black-on-White */ 1207 /* cursor (menuBar/scrollBar): Black-on-White */
1235 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1208 leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr);
1236#endif 1209#endif
1237 1210
1238#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1239
1240 { 1212 {
1241 XColor blackcolour; 1213 XColor blackcolour;
1242 blackcolour.red = 0; 1214 blackcolour.red = 0;
1243 blackcolour.green = 0; 1215 blackcolour.green = 0;
1244 blackcolour.blue = 0; 1216 blackcolour.blue = 0;
1245 Font f = XLoadFont (Xdisplay, "fixed"); 1217 Font f = XLoadFont (display->display, "fixed");
1246 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1218 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1247 &blackcolour, &blackcolour); 1219 &blackcolour, &blackcolour);
1248 XUnloadFont (Xdisplay, f); 1220 XUnloadFont (display->display, f);
1249 } 1221 }
1250#endif 1222#endif
1251 1223
1252 /* the vt window */ 1224 /* the vt window */
1253 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1225 TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0],
1254 window_vt_x, window_vt_y, 1226 window_vt_x, window_vt_y,
1255 TermWin_TotalWidth(), 1227 TermWin_TotalWidth(),
1256 TermWin_TotalHeight(), 1228 TermWin_TotalHeight(),
1257 0, 1229 0,
1258 PixColors[Color_fg], 1230 PixColors[Color_fg],
1259 PixColors[Color_bg]); 1231 PixColors[Color_bg]);
1232
1260#ifdef DEBUG_X 1233#ifdef DEBUG_X
1261 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1234 XStoreName(display->display, TermWin.vt, "vt window");
1262#endif 1235#endif
1263 1236
1264 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1237 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1265 | PropertyChangeMask); 1238 | PropertyChangeMask);
1266 1239
… …
1271 vt_emask |= PointerMotionMask; 1244 vt_emask |= PointerMotionMask;
1272 else 1245 else
1273#endif 1246#endif
1274 vt_emask |= (Button1MotionMask | Button3MotionMask); 1247 vt_emask |= (Button1MotionMask | Button3MotionMask);
1275 1248
1276 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1249 XSelectInput(display->display, TermWin.vt, vt_emask);
1250 vt_ev.start (display, TermWin.vt);
1277 1251
1278#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1252#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1279
1280 if (menuBar_height()) 1253 if (menuBar_height())
1281 { 1254 {
1282 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1255 menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0],
1283 window_vt_x, 0, 1256 window_vt_x, 0,
1284 TermWin_TotalWidth(), 1257 TermWin_TotalWidth(),
1285 menuBar_TotalHeight(), 1258 menuBar_TotalHeight(),
1286 0, 1259 0,
1287 PixColors[Color_fg], 1260 PixColors[Color_fg],
1288 PixColors[Color_scroll]); 1261 PixColors[Color_scroll]);
1289#ifdef DEBUG_X 1262#ifdef DEBUG_X
1290
1291 XStoreName(Xdisplay, menuBar.win, "menubar"); 1263 XStoreName(display->display, menuBar.win, "menubar");
1292#endif 1264#endif
1293 1265
1294 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1266 XDefineCursor(display->display, menuBar.win, pointer_leftptr);
1267
1295 XSelectInput(Xdisplay, menuBar.win, 1268 XSelectInput(display->display, menuBar.win,
1296 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1269 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1297 | Button1MotionMask)); 1270 | Button1MotionMask));
1271 menubar_ev.start (display, menuBar.win);
1298 } 1272 }
1299#endif 1273#endif
1274
1300#ifdef XPM_BACKGROUND 1275#ifdef XPM_BACKGROUND
1301 if (rs[Rs_backgroundPixmap] != NULL 1276 if (rs[Rs_backgroundPixmap] != NULL
1302 && !(Options & Opt_transparent)) 1277 && !(Options & Opt_transparent))
1303 { 1278 {
1304 const char *p = rs[Rs_backgroundPixmap]; 1279 const char *p = rs[Rs_backgroundPixmap];
… …
1315 1290
1316 /* graphics context for the vt window */ 1291 /* graphics context for the vt window */
1317 gcvalue.foreground = PixColors[Color_fg]; 1292 gcvalue.foreground = PixColors[Color_fg];
1318 gcvalue.background = PixColors[Color_bg]; 1293 gcvalue.background = PixColors[Color_bg];
1319 gcvalue.graphics_exposures = 1; 1294 gcvalue.graphics_exposures = 1;
1320 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1295 TermWin.gc = XCreateGC(display->display, TermWin.vt,
1321 GCForeground | GCBackground 1296 GCForeground | GCBackground
1322 | GCGraphicsExposures, &gcvalue); 1297 | GCGraphicsExposures, &gcvalue);
1323 1298
1324#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1299#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1325
1326 gcvalue.foreground = PixColors[Color_topShadow]; 1300 gcvalue.foreground = PixColors[Color_topShadow];
1327 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1301 topShadowGC = XCreateGC(display->display, TermWin.vt,
1328 GCForeground, &gcvalue); 1302 GCForeground, &gcvalue);
1329 gcvalue.foreground = PixColors[Color_bottomShadow]; 1303 gcvalue.foreground = PixColors[Color_bottomShadow];
1330 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1304 botShadowGC = XCreateGC(display->display, TermWin.vt,
1331 GCForeground, &gcvalue); 1305 GCForeground, &gcvalue);
1332 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1306 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1333 : Color_scroll)]; 1307 : Color_scroll)];
1334 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, 1308 scrollbarGC = XCreateGC(display->display, TermWin.vt,
1335 GCForeground, &gcvalue); 1309 GCForeground, &gcvalue);
1336#endif 1310#endif
1337} 1311}
1338 1312
1339/*----------------------------------------------------------------------*/ 1313/*----------------------------------------------------------------------*/
1340/* 1314/*
… …
1352 { 1326 {
1353 rxvt_print_error("can't open pseudo-tty"); 1327 rxvt_print_error("can't open pseudo-tty");
1354 return -1; 1328 return -1;
1355 } 1329 }
1356 1330
1357#ifdef FD_SETSIZE
1358 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1359 {
1360 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1361 rxvt_clean_exit();
1362 exit(EXIT_FAILURE);
1363 }
1364#endif
1365
1366 fcntl (cfd, F_SETFL, O_NONBLOCK); 1331 fcntl (cfd, F_SETFL, O_NONBLOCK);
1367 1332
1368 /* get slave (tty) */ 1333 /* get slave (tty) */
1369 if (tty_fd < 0) 1334 if (tty_fd < 0)
1370 { 1335 {
… …
1393 1358
1394#ifndef __QNX__ 1359#ifndef __QNX__
1395 /* spin off the command interpreter */ 1360 /* spin off the command interpreter */
1396 switch (cmd_pid = fork ()) 1361 switch (cmd_pid = fork ())
1397 { 1362 {
1398 case -1: 1363 case -1:
1399 rxvt_print_error("can't fork"); 1364 rxvt_print_error("can't fork");
1400 return -1; 1365 return -1;
1401 case 0: 1366 case 0:
1402 close (cfd); /* only keep tty_fd and STDERR open */ 1367 close (cfd); /* only keep tty_fd and STDERR open */
1403 close (Xfd); 1368
1404 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1369 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1405 rxvt_print_error ("could not obtain control of tty"); 1370 rxvt_print_error ("could not obtain control of tty");
1406 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:
1407 { 1386 {
1408 /* 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);
1409 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
1410 dup2 (tty_fd, STDOUT_FILENO); 1400 dup2 (fdstdin, STDIN_FILENO);
1411 dup2 (tty_fd, STDERR_FILENO);
1412
1413 if (tty_fd > 2)
1414 close (tty_fd); 1401 close (fdstdin);
1402#endif
1415 1403
1416 run_child (argv);
1417 } 1404 }
1418 exit (EXIT_FAILURE);
1419 /* NOTREACHED */
1420 default:
1421 {
1422#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1423 int fdstdin;
1424
1425 fdstdin = dup (STDIN_FILENO);
1426 dup2 (tty_fd, STDIN_FILENO);
1427#endif
1428
1429#ifdef UTMP_SUPPORT
1430 privileged_utmp (SAVE);
1431#endif
1432
1433#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1434
1435 dup2 (fdstdin, STDIN_FILENO);
1436 close (fdstdin);
1437#endif
1438
1439 }
1440 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1405 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1441 break; 1406 break;
1442 } 1407 }
1443#else /* __QNX__ uses qnxspawn() */ 1408#else /* __QNX__ uses qnxspawn() */
1444 fchmod (tty_fd, 0622); 1409 fchmod (tty_fd, 0622);
1445 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1410 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1446 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1411 fcntl (cfd, F_SETFD, FD_CLOEXEC);
… …
1480 { 1445 {
1481 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1446 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1482 close (fd); 1447 close (fd);
1483 } 1448 }
1484#endif /* SRIOCSREDIR */ 1449#endif /* SRIOCSREDIR */
1450
1485 } 1451 }
1486 1452
1487 /* reset signals and spin off the command interpreter */ 1453 /* reset signals and spin off the command interpreter */
1488 signal (SIGINT, SIG_DFL); 1454 signal (SIGINT, SIG_DFL);
1489 signal (SIGQUIT, SIG_DFL); 1455 signal (SIGQUIT, SIG_DFL);
… …
1584 } 1550 }
1585 arg_v = arg_a; 1551 arg_v = arg_a;
1586 } 1552 }
1587 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1553 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1588 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1554 cmd_pid = qnx_spawn(0, 0, 0, -1, -1,
1589 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1555 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1590 command, arg_v, environ, iov_a, 0); 1556 command, arg_v, environ, iov_a, 0);
1591 if (login) 1557 if (login)
1592 free(login); 1558 free(login);
1593 1559
1594 close(tty_fd); 1560 close(tty_fd);
1595 return cmd_fd; 1561 return cmd_fd;

Diff Legend

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