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.22 by pcg, Sat Jan 31 03:27:45 2004 UTC vs.
Revision 1.24 by pcg, Mon Feb 9 07:11:49 2004 UTC

… …
326#endif 326#endif
327#ifdef KEEP_SCROLLCOLOR 327#ifdef KEEP_SCROLLCOLOR
328 COLOR_SCROLLBAR, 328 COLOR_SCROLLBAR,
329 COLOR_SCROLLTROUGH, 329 COLOR_SCROLLTROUGH,
330#endif /* KEEP_SCROLLCOLOR */ 330#endif /* KEEP_SCROLLCOLOR */
331
331 }; 332 };
332 333
333const char *const xa_names[NUM_XA] = 334const char *const xa_names[NUM_XA] =
334 { 335 {
335 "TEXT", 336 "TEXT",
… …
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
… …
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 extract_resources (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 setup_scrollbar (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)
… …
805#endif 808#endif
806#if HAVE_NL_LANGINFO 809#if HAVE_NL_LANGINFO
807 free (codeset); 810 free (codeset);
808 codeset = strdup (nl_langinfo (CODESET)); 811 codeset = strdup (nl_langinfo (CODESET));
809 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 812 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
810 || !STRCASECMP (codeset, "UTF8"); 813 || !STRCASECMP (codeset, "UTF8");
811#else 814#else
812 enc_utf8 = 1; 815 enc_utf8 = 1;
813#endif 816#endif
814} 817}
815 818
… …
821 rxvt_print_error ("Setting locale failed."); 824 rxvt_print_error ("Setting locale failed.");
822 else 825 else
823 { 826 {
824 Atom wmlocale; 827 Atom wmlocale;
825 828
826 wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); 829 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
827 XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, 830 XChangeProperty (display->display, TermWin.parent[0], wmlocale,
828 XA_STRING, 8, PropModeReplace, 831 XA_STRING, 8, PropModeReplace,
829 (unsigned char *)locale, STRLEN(locale)); 832 (unsigned char *)locale, STRLEN(locale));
830 833
831 if (!XSupportsLocale ()) 834 if (!XSupportsLocale ())
832 { 835 {
833 rxvt_print_error ("The locale is not supported by Xlib"); 836 rxvt_print_error ("The locale is not supported by Xlib");
834 return; 837 return;
835 } 838 }
836 839
837 /* see if we can connect yet */ 840 /* see if we can connect yet */
838 rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); 841 rxvt_IMInstantiateCallback (display->display, NULL, NULL);
839 842
840 /* To avoid Segmentation Fault in C locale: Solaris only? */ 843 /* To avoid Segmentation Fault in C locale: Solaris only? */
841 if (STRCMP (locale, "C")) 844 if (STRCMP (locale, "C"))
842 XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL, 845 XRegisterIMInstantiateCallback (display->display, NULL, NULL, NULL,
843 rxvt_IMInstantiateCallback, NULL); 846 rxvt_IMInstantiateCallback, NULL);
844 } 847 }
845#endif 848#endif
846} 849}
847 850
… …
854 * This should be called after the X server connection is established. 857 * This should be called after the X server connection is established.
855 */ 858 */
856 int i; 859 int i;
857 860
858 for (i = 0; i < NUM_XA; i++) 861 for (i = 0; i < NUM_XA; i++)
859 xa[i] = XInternAtom(Xdisplay, xa_names[i], False); 862 xa[i] = XInternAtom(display->display, xa_names[i], False);
860 863
861 /* Enable delete window protocol */ 864 /* Enable delete window protocol */
862 XSetWMProtocols (Xdisplay, TermWin.parent[0], 865 XSetWMProtocols (display->display, TermWin.parent[0],
863 &(xa[XA_WMDELETEWINDOW]), 1); 866 &(xa[XA_WMDELETEWINDOW]), 1);
864 867
865#ifdef USING_W11LIB 868#ifdef USING_W11LIB
866 /* enable W11 callbacks */ 869 /* enable W11 callbacks */
867 W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); 870 W11AddEventHandler (display->display, rxvt_W11_process_x_event);
868#endif 871#endif
869 872
870#ifdef META8_OPTION 873#ifdef META8_OPTION
871 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 874 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
872#endif 875#endif
… …
899 902
900#ifdef GREEK_SUPPORT 903#ifdef GREEK_SUPPORT
901 greek_init(); 904 greek_init();
902#endif 905#endif
903 906
904 Xfd = XConnectionNumber (Xdisplay);
905
906#ifdef CURSOR_BLINK 907#ifdef CURSOR_BLINK
907
908 if (Options & Opt_cursorBlink) 908 if (Options & Opt_cursorBlink)
909 (void)gettimeofday (&lastcursorchange, NULL); 909 (void)gettimeofday (&lastcursorchange, NULL);
910#endif 910#endif
911 911
912 if ((cmd_fd = run_command (argv)) < 0) 912 if ((cmd_fd = run_command (argv)) < 0)
… …
931 931
932 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 932 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
933 { 933 {
934#ifndef XTERM_REVERSE_VIDEO 934#ifndef XTERM_REVERSE_VIDEO
935 if (i < 2 && (Options & Opt_reverseVideo)) 935 if (i < 2 && (Options & Opt_reverseVideo))
936 {
937 rs[Rs_color + i] = def_colorName[!i]; 936 rs[Rs_color + i] = def_colorName[!i];
938 }
939 else 937 else
940#endif 938#endif
941 rs[Rs_color + i] = def_colorName[i]; 939 rs[Rs_color + i] = def_colorName[i];
942 940
943 if (!rs[Rs_color + i]) 941 if (!rs[Rs_color + i])
… …
945 943
946 if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) 944 if (!rXParseAllocColor (&xcol, rs[Rs_color + i]))
947 { 945 {
948 switch (i) 946 switch (i)
949 { 947 {
950 case Color_fg: 948 case Color_fg:
951 case Color_bg: 949 case Color_bg:
952 /* fatal: need bg/fg color */ 950 /* fatal: need bg/fg color */
953 rxvt_print_error ("aborting"); 951 rxvt_print_error ("aborting");
954 exit (EXIT_FAILURE); 952 exit (EXIT_FAILURE);
955 /* NOTREACHED */ 953 /* NOTREACHED */
956 break; 954 break;
957#ifndef NO_CURSORCOLOR 955#ifndef NO_CURSORCOLOR
958 case Color_cursor2: 956 case Color_cursor2:
959 xcol = PixColors[Color_fg]; 957 xcol = PixColors[Color_fg];
960 break; 958 break;
961#endif /* ! NO_CURSORCOLOR */ 959#endif /* ! NO_CURSORCOLOR */
962 case Color_pointer: 960 case Color_pointer:
963 xcol = PixColors[Color_fg]; 961 xcol = PixColors[Color_fg];
964 break; 962 break;
965 default: 963 default:
966 xcol = PixColors[Color_bg]; /* None */ 964 xcol = PixColors[Color_bg]; /* None */
967 break; 965 break;
968 } 966 }
969 } 967 }
970 } 968 }
971 969
972 PixColors[i] = xcol; 970 PixColors[i] = xcol;
… …
999 * xcol[1] == top shadow 997 * xcol[1] == top shadow
1000 * xcol[2] == bot shadow */ 998 * xcol[2] == bot shadow */
1001 999
1002 xcol[1] = PixColors[Color_scroll]; 1000 xcol[1] = PixColors[Color_scroll];
1003# ifdef PREFER_24BIT 1001# ifdef PREFER_24BIT
1004 xcol[0].set (this, 65535, 65535, 65535); 1002 xcol[0].set (display, 65535, 65535, 65535);
1005 /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ 1003 /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */
1006# else 1004# else
1007 xcol[0].set (this, WhitePixel (Xdisplay, Xscreen)); 1005 xcol[0].set (display, WhitePixel (display->display, display->screen));
1008# endif 1006# endif
1009 1007
1010 unsigned short pr1, pg1, pb1, pr0, pg0, pb0; 1008 unsigned short pr1, pg1, pb1, pr0, pg0, pb0;
1011 1009
1012 xcol[0].get (this, pr0, pg0, pb0); 1010 xcol[0].get (display, pr0, pg0, pb0);
1013 xcol[1].get (this, pr1, pg1, pb1); 1011 xcol[1].get (display, pr1, pg1, pb1);
1014 1012
1015 /* bottomShadowColor */ 1013 /* bottomShadowColor */
1016 if (!xcol[2].set (this, pr1 / 2, pg1 / 2, pb1 / 2)) 1014 if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2))
1017 xcol[2] = PixColors[Color_Black]; 1015 xcol[2] = PixColors[Color_Black];
1018 1016
1019 PixColors[Color_bottomShadow] = xcol[2]; 1017 PixColors[Color_bottomShadow] = xcol[2];
1020 1018
1021 /* topShadowColor */ 1019 /* topShadowColor */
1022 if (!xcol[1].set (this, 1020 if (!xcol[1].set (display,
1023 min (pr0, max (pr0 / 5, pr1) * 7 / 5), 1021 min (pr0, max (pr0 / 5, pr1) * 7 / 5),
1024 min (pg0, max (pg0 / 5, pg1) * 7 / 5), 1022 min (pg0, max (pg0 / 5, pg1) * 7 / 5),
1025 min (pb0, max (pb0 / 5, pb1) * 7 / 5))) 1023 min (pb0, max (pb0 / 5, pb1) * 7 / 5)))
1026 xcol[1] = PixColors[Color_White]; 1024 xcol[1] = PixColors[Color_White];
1027 1025
… …
1044 i -= 8; 1042 i -= 8;
1045#ifndef NO_BRIGHTCOLOR 1043#ifndef NO_BRIGHTCOLOR
1046 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i]; 1044 rs[Rs_color + idx] = rs[Rs_color + minBrightCOLOR + i];
1047 return; 1045 return;
1048#endif 1046#endif
1047
1049 } 1048 }
1050 1049
1051 if (i >= 0 && i <= 7) /* normal colors */ 1050 if (i >= 0 && i <= 7) /* normal colors */
1052 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i]; 1051 rs[Rs_color + idx] = rs[Rs_color + minCOLOR + i];
1053 } 1052 }
… …
1075 rsmod = rs[Rs_modifier]; 1074 rsmod = rs[Rs_modifier];
1076 if (rsmod 1075 if (rsmod
1077 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) 1076 && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0)
1078 requestedmeta = rsmod[3] - '0'; 1077 requestedmeta = rsmod[3] - '0';
1079 1078
1080 map = XGetModifierMapping(Xdisplay); 1079 map = XGetModifierMapping(display->display);
1081 kc = map->modifiermap; 1080 kc = map->modifiermap;
1082 for (i = 1; i < 6; i++) 1081 for (i = 1; i < 6; i++)
1083 { 1082 {
1084 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ 1083 k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */
1085 for (j = map->max_keypermod; j--; k++) 1084 for (j = map->max_keypermod; j--; k++)
1086 { 1085 {
1087 if (kc[k] == 0) 1086 if (kc[k] == 0)
1088 break; 1087 break;
1089 switch (XKeycodeToKeysym(Xdisplay, kc[k], 0)) 1088 switch (XKeycodeToKeysym(display->display, kc[k], 0))
1090 { 1089 {
1091 case XK_Num_Lock: 1090 case XK_Num_Lock:
1092 ModNumLockMask = modmasks[i - 1]; 1091 ModNumLockMask = modmasks[i - 1];
1093 /* FALLTHROUGH */ 1092 /* FALLTHROUGH */
1094 default: 1093 default:
1095 continue; /* for(;;) */ 1094 continue; /* for(;;) */
1096 case XK_Meta_L: 1095 case XK_Meta_L:
1097 case XK_Meta_R: 1096 case XK_Meta_R:
1098 cm = "meta"; 1097 cm = "meta";
1099 realmeta = i; 1098 realmeta = i;
1100 break; 1099 break;
1101 case XK_Alt_L: 1100 case XK_Alt_L:
1102 case XK_Alt_R: 1101 case XK_Alt_R:
1103 cm = "alt"; 1102 cm = "alt";
1104 realalt = i; 1103 realalt = i;
1105 break; 1104 break;
1106 case XK_Super_L: 1105 case XK_Super_L:
1107 case XK_Super_R: 1106 case XK_Super_R:
1108 cm = "super"; 1107 cm = "super";
1109 break; 1108 break;
1110 case XK_Hyper_L: 1109 case XK_Hyper_L:
1111 case XK_Hyper_R: 1110 case XK_Hyper_R:
1112 cm = "hyper"; 1111 cm = "hyper";
1113 break; 1112 break;
1114 } 1113 }
1115 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0) 1114 if (rsmod && STRNCASECMP(rsmod, cm, STRLEN(cm)) == 0)
1116 requestedmeta = i; 1115 requestedmeta = i;
1117 } 1116 }
1118 } 1117 }
… …
1134 XGCValues gcvalue; 1133 XGCValues gcvalue;
1135 long vt_emask; 1134 long vt_emask;
1136 1135
1137 XWindowAttributes gattr; 1136 XWindowAttributes gattr;
1138 1137
1139 Xcmap = DefaultColormap (Xdisplay, Xscreen);
1140 Xvisual = DefaultVisual (Xdisplay, Xscreen);
1141 Xscreen = DefaultScreen (Xdisplay);
1142
1143 if (Options & Opt_transparent) 1138 if (Options & Opt_transparent)
1144 { 1139 {
1145 XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); 1140 XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr);
1146 Xdepth = gattr.depth; 1141 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
1147 }
1148 else
1149 {
1150 Xdepth = DefaultDepth(Xdisplay, Xscreen);
1151#ifdef PREFER_24BIT
1152 /*
1153 * If depth is not 24, look for a 24bit visual.
1154 */
1155 if (Xdepth != 24)
1156 {
1157 XVisualInfo vinfo;
1158
1159 if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo))
1160 {
1161 Xdepth = 24;
1162 Xvisual = vinfo.visual;
1163 Xcmap = XCreateColormap(Xdisplay,
1164 RootWindow(Xdisplay, Xscreen),
1165 Xvisual, AllocNone);
1166 }
1167 }
1168#endif
1169 } 1142 }
1170 1143
1171 /* grab colors before netscape does */ 1144 /* grab colors before netscape does */
1172 Get_Colours (); 1145 Get_Colours ();
1173 1146
… …
1183#ifdef PREFER_24BIT 1156#ifdef PREFER_24BIT
1184 XSetWindowAttributes attributes; 1157 XSetWindowAttributes attributes;
1185 1158
1186 attributes.background_pixel = PixColors[Color_fg]; 1159 attributes.background_pixel = PixColors[Color_fg];
1187 attributes.border_pixel = PixColors[Color_border]; 1160 attributes.border_pixel = PixColors[Color_border];
1188 attributes.colormap = Xcmap; 1161 attributes.colormap = display->cmap;
1189 TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1162 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1190 szHint.x, szHint.y, 1163 szHint.x, szHint.y,
1191 szHint.width, szHint.height, 1164 szHint.width, szHint.height,
1192 TermWin.ext_bwidth, 1165 TermWin.ext_bwidth,
1193 Xdepth, InputOutput, 1166 display->depth, InputOutput,
1194 Xvisual, 1167 display->visual,
1195 CWBackPixel | CWBorderPixel
1196 | CWColormap, &attributes); 1168 CWBackPixel | CWBorderPixel | CWColormap, &attributes);
1197#else 1169#else
1198 TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), 1170 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1199 szHint.x, szHint.y, 1171 szHint.x, szHint.y,
1200 szHint.width, 1172 szHint.width,
1201 szHint.height, 1173 szHint.height,
1202 TermWin.ext_bwidth, 1174 TermWin.ext_bwidth,
1203 PixColors[Color_border], 1175 PixColors[Color_border],
1204 PixColors[Color_fg]); 1176 PixColors[Color_fg]);
1205#endif 1177#endif
1206 1178
1207 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1179 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1208 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1180 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1209 1181
… …
1214 wmHint.input = True; 1186 wmHint.input = True;
1215 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1187 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1216 : NormalState); 1188 : NormalState);
1217 wmHint.window_group = TermWin.parent[0]; 1189 wmHint.window_group = TermWin.parent[0];
1218 1190
1219 XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, 1191 XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL,
1220 (char **)argv, argc, &szHint, &wmHint, &classHint); 1192 (char **)argv, argc, &szHint, &wmHint, &classHint);
1193
1221 XSelectInput(Xdisplay, TermWin.parent[0], 1194 XSelectInput(display->display, TermWin.parent[0],
1222 (KeyPressMask 1195 KeyPressMask
1223#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1196#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1224 | KeyReleaseMask 1197 | KeyReleaseMask
1225#endif 1198#endif
1226 | FocusChangeMask | VisibilityChangeMask 1199 | FocusChangeMask | VisibilityChangeMask
1227 | StructureNotifyMask)); 1200 | StructureNotifyMask);
1201 termwin_ev.start (display, TermWin.parent[0]);
1228 1202
1229 /* 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 */
1230 TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); 1204 TermWin_cursor = XCreateFontCursor(display->display, XC_xterm);
1231 1205
1232#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1206#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1233 /* cursor (menuBar/scrollBar): Black-on-White */ 1207 /* cursor (menuBar/scrollBar): Black-on-White */
1234 leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); 1208 leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr);
1235#endif 1209#endif
1236 1210
1237#ifdef POINTER_BLANK 1211#ifdef POINTER_BLANK
1238
1239 { 1212 {
1240 XColor blackcolour; 1213 XColor blackcolour;
1241 blackcolour.red = 0; 1214 blackcolour.red = 0;
1242 blackcolour.green = 0; 1215 blackcolour.green = 0;
1243 blackcolour.blue = 0; 1216 blackcolour.blue = 0;
1244 Font f = XLoadFont (Xdisplay, "fixed"); 1217 Font f = XLoadFont (display->display, "fixed");
1245 blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', 1218 blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ',
1246 &blackcolour, &blackcolour); 1219 &blackcolour, &blackcolour);
1247 XUnloadFont (Xdisplay, f); 1220 XUnloadFont (display->display, f);
1248 } 1221 }
1249#endif 1222#endif
1250 1223
1251 /* the vt window */ 1224 /* the vt window */
1252 TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1225 TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0],
1253 window_vt_x, window_vt_y, 1226 window_vt_x, window_vt_y,
1254 TermWin_TotalWidth(), 1227 TermWin_TotalWidth(),
1255 TermWin_TotalHeight(), 1228 TermWin_TotalHeight(),
1256 0, 1229 0,
1257 PixColors[Color_fg], 1230 PixColors[Color_fg],
1258 PixColors[Color_bg]); 1231 PixColors[Color_bg]);
1232
1259#ifdef DEBUG_X 1233#ifdef DEBUG_X
1260 XStoreName(Xdisplay, TermWin.vt, "vt window"); 1234 XStoreName(display->display, TermWin.vt, "vt window");
1261#endif 1235#endif
1262 1236
1263 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1237 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask
1264 | PropertyChangeMask); 1238 | PropertyChangeMask);
1265 1239
… …
1270 vt_emask |= PointerMotionMask; 1244 vt_emask |= PointerMotionMask;
1271 else 1245 else
1272#endif 1246#endif
1273 vt_emask |= (Button1MotionMask | Button3MotionMask); 1247 vt_emask |= (Button1MotionMask | Button3MotionMask);
1274 1248
1275 XSelectInput(Xdisplay, TermWin.vt, vt_emask); 1249 XSelectInput(display->display, TermWin.vt, vt_emask);
1250 vt_ev.start (display, TermWin.vt);
1276 1251
1277#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1252#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1278
1279 if (menuBar_height()) 1253 if (menuBar_height())
1280 { 1254 {
1281 menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], 1255 menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0],
1282 window_vt_x, 0, 1256 window_vt_x, 0,
1283 TermWin_TotalWidth(), 1257 TermWin_TotalWidth(),
1284 menuBar_TotalHeight(), 1258 menuBar_TotalHeight(),
1285 0, 1259 0,
1286 PixColors[Color_fg], 1260 PixColors[Color_fg],
1287 PixColors[Color_scroll]); 1261 PixColors[Color_scroll]);
1288#ifdef DEBUG_X 1262#ifdef DEBUG_X
1289
1290 XStoreName(Xdisplay, menuBar.win, "menubar"); 1263 XStoreName(display->display, menuBar.win, "menubar");
1291#endif 1264#endif
1292 1265
1293 XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); 1266 XDefineCursor(display->display, menuBar.win, pointer_leftptr);
1267
1294 XSelectInput(Xdisplay, menuBar.win, 1268 XSelectInput(display->display, menuBar.win,
1295 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1269 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1296 | Button1MotionMask)); 1270 | Button1MotionMask));
1271 menubar_ev.start (display, menuBar.win);
1297 } 1272 }
1298#endif 1273#endif
1274
1299#ifdef XPM_BACKGROUND 1275#ifdef XPM_BACKGROUND
1300 if (rs[Rs_backgroundPixmap] != NULL 1276 if (rs[Rs_backgroundPixmap] != NULL
1301 && !(Options & Opt_transparent)) 1277 && !(Options & Opt_transparent))
1302 { 1278 {
1303 const char *p = rs[Rs_backgroundPixmap]; 1279 const char *p = rs[Rs_backgroundPixmap];
… …
1314 1290
1315 /* graphics context for the vt window */ 1291 /* graphics context for the vt window */
1316 gcvalue.foreground = PixColors[Color_fg]; 1292 gcvalue.foreground = PixColors[Color_fg];
1317 gcvalue.background = PixColors[Color_bg]; 1293 gcvalue.background = PixColors[Color_bg];
1318 gcvalue.graphics_exposures = 1; 1294 gcvalue.graphics_exposures = 1;
1319 TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, 1295 TermWin.gc = XCreateGC(display->display, TermWin.vt,
1320 GCForeground | GCBackground 1296 GCForeground | GCBackground
1321 | GCGraphicsExposures, &gcvalue); 1297 | GCGraphicsExposures, &gcvalue);
1322 1298
1323#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1299#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1324
1325 gcvalue.foreground = PixColors[Color_topShadow]; 1300 gcvalue.foreground = PixColors[Color_topShadow];
1326 topShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1301 topShadowGC = XCreateGC(display->display, TermWin.vt,
1327 GCForeground, &gcvalue); 1302 GCForeground, &gcvalue);
1328 gcvalue.foreground = PixColors[Color_bottomShadow]; 1303 gcvalue.foreground = PixColors[Color_bottomShadow];
1329 botShadowGC = XCreateGC(Xdisplay, TermWin.vt, 1304 botShadowGC = XCreateGC(display->display, TermWin.vt,
1330 GCForeground, &gcvalue); 1305 GCForeground, &gcvalue);
1331 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg 1306 gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg
1332 : Color_scroll)]; 1307 : Color_scroll)];
1333 scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, 1308 scrollbarGC = XCreateGC(display->display, TermWin.vt,
1334 GCForeground, &gcvalue); 1309 GCForeground, &gcvalue);
1335#endif 1310#endif
1336} 1311}
1337 1312
1338/*----------------------------------------------------------------------*/ 1313/*----------------------------------------------------------------------*/
1339/* 1314/*
… …
1351 { 1326 {
1352 rxvt_print_error("can't open pseudo-tty"); 1327 rxvt_print_error("can't open pseudo-tty");
1353 return -1; 1328 return -1;
1354 } 1329 }
1355 1330
1356#ifdef FD_SETSIZE
1357 if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE)
1358 {
1359 rxvt_print_error("fd too high: %d max", FD_SETSIZE);
1360 rxvt_clean_exit();
1361 exit(EXIT_FAILURE);
1362 }
1363#endif
1364
1365 fcntl (cfd, F_SETFL, O_NONBLOCK); 1331 fcntl (cfd, F_SETFL, O_NONBLOCK);
1366 1332
1367 /* get slave (tty) */ 1333 /* get slave (tty) */
1368 if (tty_fd < 0) 1334 if (tty_fd < 0)
1369 { 1335 {
… …
1392 1358
1393#ifndef __QNX__ 1359#ifndef __QNX__
1394 /* spin off the command interpreter */ 1360 /* spin off the command interpreter */
1395 switch (cmd_pid = fork ()) 1361 switch (cmd_pid = fork ())
1396 { 1362 {
1397 case -1: 1363 case -1:
1398 rxvt_print_error("can't fork"); 1364 rxvt_print_error("can't fork");
1399 return -1; 1365 return -1;
1400 case 0: 1366 case 0:
1401 close (cfd); /* only keep tty_fd and STDERR open */ 1367 close (cfd); /* only keep tty_fd and STDERR open */
1402 close (Xfd); 1368
1403 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1369 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1404 rxvt_print_error ("could not obtain control of tty"); 1370 rxvt_print_error ("could not obtain control of tty");
1405 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:
1406 { 1386 {
1407 /* 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);
1408 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
1409 dup2 (tty_fd, STDOUT_FILENO); 1400 dup2 (fdstdin, STDIN_FILENO);
1410 dup2 (tty_fd, STDERR_FILENO);
1411
1412 if (tty_fd > 2)
1413 close (tty_fd); 1401 close (fdstdin);
1402#endif
1414 1403
1415 run_child (argv);
1416 } 1404 }
1417 exit (EXIT_FAILURE);
1418 /* NOTREACHED */
1419 default:
1420 {
1421#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1422 int fdstdin;
1423
1424 fdstdin = dup (STDIN_FILENO);
1425 dup2 (tty_fd, STDIN_FILENO);
1426#endif
1427
1428#ifdef UTMP_SUPPORT
1429 privileged_utmp (SAVE);
1430#endif
1431
1432#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1433
1434 dup2 (fdstdin, STDIN_FILENO);
1435 close (fdstdin);
1436#endif
1437
1438 }
1439 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ 1405 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1440 break; 1406 break;
1441 } 1407 }
1442#else /* __QNX__ uses qnxspawn() */ 1408#else /* __QNX__ uses qnxspawn() */
1443 fchmod (tty_fd, 0622); 1409 fchmod (tty_fd, 0622);
1444 fcntl (tty_fd, F_SETFD, FD_CLOEXEC); 1410 fcntl (tty_fd, F_SETFD, FD_CLOEXEC);
1445 fcntl (cfd, F_SETFD, FD_CLOEXEC); 1411 fcntl (cfd, F_SETFD, FD_CLOEXEC);
… …
1479 { 1445 {
1480 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1446 if (ioctl (fd, SRIOCSREDIR, NULL) < 0)
1481 close (fd); 1447 close (fd);
1482 } 1448 }
1483#endif /* SRIOCSREDIR */ 1449#endif /* SRIOCSREDIR */
1450
1484 } 1451 }
1485 1452
1486 /* reset signals and spin off the command interpreter */ 1453 /* reset signals and spin off the command interpreter */
1487 signal (SIGINT, SIG_DFL); 1454 signal (SIGINT, SIG_DFL);
1488 signal (SIGQUIT, SIG_DFL); 1455 signal (SIGQUIT, SIG_DFL);
… …
1583 } 1550 }
1584 arg_v = arg_a; 1551 arg_v = arg_a;
1585 } 1552 }
1586 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd; 1553 iov_a[0] = iov_a[1] = iov_a[2] = tty_fd;
1587 cmd_pid = qnx_spawn(0, 0, 0, -1, -1, 1554 cmd_pid = qnx_spawn(0, 0, 0, -1, -1,
1588 _SPAWN_SETSID | _SPAWN_TCSETPGRP, 1555 _SPAWN_SETSID | _SPAWN_TCSETPGRP,
1589 command, arg_v, environ, iov_a, 0); 1556 command, arg_v, environ, iov_a, 0);
1590 if (login) 1557 if (login)
1591 free(login); 1558 free(login);
1592 1559
1593 close(tty_fd); 1560 close(tty_fd);
1594 return cmd_fd; 1561 return cmd_fd;

Diff Legend

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