… | |
… | |
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; |
… | |
… | |
535 | if (rs[Rs_display_name][0] == ':') |
535 | if (rs[Rs_display_name][0] == ':') |
536 | { |
536 | { |
537 | val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); |
537 | val = rxvt_malloc (5 + STRLEN (rs[Rs_display_name])); |
538 | STRCPY (val, "unix"); |
538 | STRCPY (val, "unix"); |
539 | STRCAT (val, rs[Rs_display_name]); |
539 | STRCAT (val, rs[Rs_display_name]); |
540 | Xdisplay = XOpenDisplay (val); |
540 | display = displays.get (val); |
541 | free (val); |
541 | free (val); |
542 | } |
542 | } |
543 | #endif |
543 | #endif |
544 | |
544 | |
545 | if (Xdisplay == NULL |
545 | if (!display |
546 | && (Xdisplay = XOpenDisplay (rs[Rs_display_name])) == NULL) |
546 | && !(display = displays.get (rs[Rs_display_name]))) |
547 | { |
547 | { |
548 | 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]); |
549 | exit (EXIT_FAILURE); |
549 | exit (EXIT_FAILURE); |
550 | } |
550 | } |
551 | |
551 | |
552 | extract_resources (Xdisplay, rs[Rs_name]); |
552 | extract_resources (display->display, rs[Rs_name]); |
553 | |
553 | |
554 | /* |
554 | /* |
555 | * set any defaults not already set |
555 | * set any defaults not already set |
556 | */ |
556 | */ |
557 | if (cmd_argv && cmd_argv[0]) |
557 | if (cmd_argv && cmd_argv[0]) |
… | |
… | |
736 | val = rxvt_network_display (rs[Rs_display_name]); |
736 | val = rxvt_network_display (rs[Rs_display_name]); |
737 | rs[Rs_display_name] = (const char *)val; |
737 | rs[Rs_display_name] = (const char *)val; |
738 | |
738 | |
739 | if (val == NULL) |
739 | if (val == NULL) |
740 | #endif /* DISPLAY_IS_IP */ |
740 | #endif /* DISPLAY_IS_IP */ |
741 | val = XDisplayString(Xdisplay); |
741 | val = XDisplayString(display->display); |
742 | |
742 | |
743 | if (rs[Rs_display_name] == NULL) |
743 | if (rs[Rs_display_name] == NULL) |
744 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
744 | rs[Rs_display_name] = val; /* use broken `:0' value */ |
745 | |
745 | |
746 | i = STRLEN (val); |
746 | i = STRLEN (val); |
… | |
… | |
770 | |
770 | |
771 | #ifdef RXVT_TERMINFO |
771 | #ifdef RXVT_TERMINFO |
772 | putenv ("TERMINFO=" RXVT_TERMINFO); |
772 | putenv ("TERMINFO=" RXVT_TERMINFO); |
773 | #endif |
773 | #endif |
774 | |
774 | |
775 | if (Xdepth <= 2) |
775 | if (display->depth <= 2) |
776 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
776 | putenv ("COLORTERM=" COLORTERMENV "-mono"); |
777 | else |
777 | else |
778 | putenv ("COLORTERM=" COLORTERMENVFULL); |
778 | putenv ("COLORTERM=" COLORTERMENVFULL); |
779 | |
779 | |
780 | if (rs[Rs_term_name] != NULL) |
780 | if (rs[Rs_term_name] != NULL) |
… | |
… | |
824 | rxvt_print_error ("Setting locale failed."); |
824 | rxvt_print_error ("Setting locale failed."); |
825 | else |
825 | else |
826 | { |
826 | { |
827 | Atom wmlocale; |
827 | Atom wmlocale; |
828 | |
828 | |
829 | wmlocale = XInternAtom (Xdisplay, "WM_LOCALE_NAME", False); |
829 | wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); |
830 | XChangeProperty (Xdisplay, TermWin.parent[0], wmlocale, |
830 | XChangeProperty (display->display, TermWin.parent[0], wmlocale, |
831 | XA_STRING, 8, PropModeReplace, |
831 | XA_STRING, 8, PropModeReplace, |
832 | (unsigned char *)locale, STRLEN(locale)); |
832 | (unsigned char *)locale, STRLEN(locale)); |
833 | |
833 | |
834 | if (!XSupportsLocale ()) |
834 | if (!XSupportsLocale ()) |
835 | { |
835 | { |
836 | rxvt_print_error ("The locale is not supported by Xlib"); |
836 | rxvt_print_error ("The locale is not supported by Xlib"); |
837 | return; |
837 | return; |
838 | } |
838 | } |
839 | |
839 | |
840 | /* see if we can connect yet */ |
840 | /* see if we can connect yet */ |
841 | rxvt_IMInstantiateCallback (Xdisplay, NULL, NULL); |
841 | rxvt_IMInstantiateCallback (display->display, NULL, NULL); |
842 | |
842 | |
843 | /* To avoid Segmentation Fault in C locale: Solaris only? */ |
843 | /* To avoid Segmentation Fault in C locale: Solaris only? */ |
844 | if (STRCMP (locale, "C")) |
844 | if (STRCMP (locale, "C")) |
845 | XRegisterIMInstantiateCallback (Xdisplay, NULL, NULL, NULL, |
845 | XRegisterIMInstantiateCallback (display->display, NULL, NULL, NULL, |
846 | rxvt_IMInstantiateCallback, NULL); |
846 | rxvt_IMInstantiateCallback, NULL); |
847 | } |
847 | } |
848 | #endif |
848 | #endif |
849 | } |
849 | } |
850 | |
850 | |
… | |
… | |
857 | * This should be called after the X server connection is established. |
857 | * This should be called after the X server connection is established. |
858 | */ |
858 | */ |
859 | int i; |
859 | int i; |
860 | |
860 | |
861 | for (i = 0; i < NUM_XA; i++) |
861 | for (i = 0; i < NUM_XA; i++) |
862 | xa[i] = XInternAtom(Xdisplay, xa_names[i], False); |
862 | xa[i] = XInternAtom(display->display, xa_names[i], False); |
863 | |
863 | |
864 | /* Enable delete window protocol */ |
864 | /* Enable delete window protocol */ |
865 | XSetWMProtocols (Xdisplay, TermWin.parent[0], |
865 | XSetWMProtocols (display->display, TermWin.parent[0], |
866 | &(xa[XA_WMDELETEWINDOW]), 1); |
866 | &(xa[XA_WMDELETEWINDOW]), 1); |
867 | |
867 | |
868 | #ifdef USING_W11LIB |
868 | #ifdef USING_W11LIB |
869 | /* enable W11 callbacks */ |
869 | /* enable W11 callbacks */ |
870 | W11AddEventHandler (Xdisplay, rxvt_W11_process_x_event); |
870 | W11AddEventHandler (display->display, rxvt_W11_process_x_event); |
871 | #endif |
871 | #endif |
872 | |
872 | |
873 | #ifdef META8_OPTION |
873 | #ifdef META8_OPTION |
874 | meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); |
874 | meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); |
875 | #endif |
875 | #endif |
… | |
… | |
902 | |
902 | |
903 | #ifdef GREEK_SUPPORT |
903 | #ifdef GREEK_SUPPORT |
904 | greek_init(); |
904 | greek_init(); |
905 | #endif |
905 | #endif |
906 | |
906 | |
907 | Xfd = XConnectionNumber (Xdisplay); |
|
|
908 | |
|
|
909 | #ifdef CURSOR_BLINK |
907 | #ifdef CURSOR_BLINK |
910 | |
|
|
911 | if (Options & Opt_cursorBlink) |
908 | if (Options & Opt_cursorBlink) |
912 | (void)gettimeofday (&lastcursorchange, NULL); |
909 | (void)gettimeofday (&lastcursorchange, NULL); |
913 | #endif |
910 | #endif |
914 | |
911 | |
915 | if ((cmd_fd = run_command (argv)) < 0) |
912 | if ((cmd_fd = run_command (argv)) < 0) |
… | |
… | |
934 | |
931 | |
935 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
932 | if (!rXParseAllocColor (&xcol, rs[Rs_color + i])) |
936 | { |
933 | { |
937 | #ifndef XTERM_REVERSE_VIDEO |
934 | #ifndef XTERM_REVERSE_VIDEO |
938 | if (i < 2 && (Options & Opt_reverseVideo)) |
935 | if (i < 2 && (Options & Opt_reverseVideo)) |
939 | { |
|
|
940 | rs[Rs_color + i] = def_colorName[!i]; |
936 | rs[Rs_color + i] = def_colorName[!i]; |
941 | } |
|
|
942 | else |
937 | else |
943 | #endif |
938 | #endif |
944 | rs[Rs_color + i] = def_colorName[i]; |
939 | rs[Rs_color + i] = def_colorName[i]; |
945 | |
940 | |
946 | if (!rs[Rs_color + i]) |
941 | if (!rs[Rs_color + i]) |
… | |
… | |
1002 | * xcol[1] == top shadow |
997 | * xcol[1] == top shadow |
1003 | * xcol[2] == bot shadow */ |
998 | * xcol[2] == bot shadow */ |
1004 | |
999 | |
1005 | xcol[1] = PixColors[Color_scroll]; |
1000 | xcol[1] = PixColors[Color_scroll]; |
1006 | # ifdef PREFER_24BIT |
1001 | # ifdef PREFER_24BIT |
1007 | xcol[0].set (this, 65535, 65535, 65535); |
1002 | xcol[0].set (display, 65535, 65535, 65535); |
1008 | /* XFreeColors(Xdisplay, XCMAP, &(xcol[0].pixel), 1, ~0); */ |
1003 | /* XFreeColors(display->display, XCMAP, &(xcol[0].pixel), 1, ~0); */ |
1009 | # else |
1004 | # else |
1010 | xcol[0].set (this, WhitePixel (Xdisplay, Xscreen)); |
1005 | xcol[0].set (display, WhitePixel (display->display, display->screen)); |
1011 | # endif |
1006 | # endif |
1012 | |
1007 | |
1013 | unsigned short pr1, pg1, pb1, pr0, pg0, pb0; |
1008 | unsigned short pr1, pg1, pb1, pr0, pg0, pb0; |
1014 | |
1009 | |
1015 | xcol[0].get (this, pr0, pg0, pb0); |
1010 | xcol[0].get (display, pr0, pg0, pb0); |
1016 | xcol[1].get (this, pr1, pg1, pb1); |
1011 | xcol[1].get (display, pr1, pg1, pb1); |
1017 | |
1012 | |
1018 | /* bottomShadowColor */ |
1013 | /* bottomShadowColor */ |
1019 | if (!xcol[2].set (this, pr1 / 2, pg1 / 2, pb1 / 2)) |
1014 | if (!xcol[2].set (display, pr1 / 2, pg1 / 2, pb1 / 2)) |
1020 | xcol[2] = PixColors[Color_Black]; |
1015 | xcol[2] = PixColors[Color_Black]; |
1021 | |
1016 | |
1022 | PixColors[Color_bottomShadow] = xcol[2]; |
1017 | PixColors[Color_bottomShadow] = xcol[2]; |
1023 | |
1018 | |
1024 | /* topShadowColor */ |
1019 | /* topShadowColor */ |
1025 | if (!xcol[1].set (this, |
1020 | if (!xcol[1].set (display, |
1026 | min (pr0, max (pr0 / 5, pr1) * 7 / 5), |
1021 | min (pr0, max (pr0 / 5, pr1) * 7 / 5), |
1027 | min (pg0, max (pg0 / 5, pg1) * 7 / 5), |
1022 | min (pg0, max (pg0 / 5, pg1) * 7 / 5), |
1028 | min (pb0, max (pb0 / 5, pb1) * 7 / 5))) |
1023 | min (pb0, max (pb0 / 5, pb1) * 7 / 5))) |
1029 | xcol[1] = PixColors[Color_White]; |
1024 | xcol[1] = PixColors[Color_White]; |
1030 | |
1025 | |
… | |
… | |
1079 | rsmod = rs[Rs_modifier]; |
1074 | rsmod = rs[Rs_modifier]; |
1080 | if (rsmod |
1075 | if (rsmod |
1081 | && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) |
1076 | && STRCASECMP(rsmod, "mod1") >= 0 && STRCASECMP(rsmod, "mod5") <= 0) |
1082 | requestedmeta = rsmod[3] - '0'; |
1077 | requestedmeta = rsmod[3] - '0'; |
1083 | |
1078 | |
1084 | map = XGetModifierMapping(Xdisplay); |
1079 | map = XGetModifierMapping(display->display); |
1085 | kc = map->modifiermap; |
1080 | kc = map->modifiermap; |
1086 | for (i = 1; i < 6; i++) |
1081 | for (i = 1; i < 6; i++) |
1087 | { |
1082 | { |
1088 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
1083 | k = (i + 2) * map->max_keypermod; /* skip shift/lock/control */ |
1089 | for (j = map->max_keypermod; j--; k++) |
1084 | for (j = map->max_keypermod; j--; k++) |
1090 | { |
1085 | { |
1091 | if (kc[k] == 0) |
1086 | if (kc[k] == 0) |
1092 | break; |
1087 | break; |
1093 | switch (XKeycodeToKeysym(Xdisplay, kc[k], 0)) |
1088 | switch (XKeycodeToKeysym(display->display, kc[k], 0)) |
1094 | { |
1089 | { |
1095 | case XK_Num_Lock: |
1090 | case XK_Num_Lock: |
1096 | ModNumLockMask = modmasks[i - 1]; |
1091 | ModNumLockMask = modmasks[i - 1]; |
1097 | /* FALLTHROUGH */ |
1092 | /* FALLTHROUGH */ |
1098 | default: |
1093 | default: |
… | |
… | |
1138 | XGCValues gcvalue; |
1133 | XGCValues gcvalue; |
1139 | long vt_emask; |
1134 | long vt_emask; |
1140 | |
1135 | |
1141 | XWindowAttributes gattr; |
1136 | XWindowAttributes gattr; |
1142 | |
1137 | |
1143 | Xcmap = DefaultColormap (Xdisplay, Xscreen); |
|
|
1144 | Xvisual = DefaultVisual (Xdisplay, Xscreen); |
|
|
1145 | Xscreen = DefaultScreen (Xdisplay); |
|
|
1146 | |
|
|
1147 | if (Options & Opt_transparent) |
1138 | if (Options & Opt_transparent) |
1148 | { |
1139 | { |
1149 | XGetWindowAttributes (Xdisplay, RootWindow(Xdisplay, Xscreen), &gattr); |
1140 | XGetWindowAttributes (display->display, RootWindow(display->display, display->screen), &gattr); |
1150 | Xdepth = gattr.depth; |
1141 | display->depth = gattr.depth; // doh //TODO, per-term not per-display? |
1151 | } |
|
|
1152 | else |
|
|
1153 | { |
|
|
1154 | Xdepth = DefaultDepth(Xdisplay, Xscreen); |
|
|
1155 | #ifdef PREFER_24BIT |
|
|
1156 | /* |
|
|
1157 | * If depth is not 24, look for a 24bit visual. |
|
|
1158 | */ |
|
|
1159 | if (Xdepth != 24) |
|
|
1160 | { |
|
|
1161 | XVisualInfo vinfo; |
|
|
1162 | |
|
|
1163 | if (XMatchVisualInfo(Xdisplay, Xscreen, 24, TrueColor, &vinfo)) |
|
|
1164 | { |
|
|
1165 | Xdepth = 24; |
|
|
1166 | Xvisual = vinfo.visual; |
|
|
1167 | Xcmap = XCreateColormap(Xdisplay, |
|
|
1168 | RootWindow(Xdisplay, Xscreen), |
|
|
1169 | Xvisual, AllocNone); |
|
|
1170 | } |
|
|
1171 | } |
|
|
1172 | #endif |
|
|
1173 | |
|
|
1174 | } |
1142 | } |
1175 | |
1143 | |
1176 | /* grab colors before netscape does */ |
1144 | /* grab colors before netscape does */ |
1177 | Get_Colours (); |
1145 | Get_Colours (); |
1178 | |
1146 | |
… | |
… | |
1188 | #ifdef PREFER_24BIT |
1156 | #ifdef PREFER_24BIT |
1189 | XSetWindowAttributes attributes; |
1157 | XSetWindowAttributes attributes; |
1190 | |
1158 | |
1191 | attributes.background_pixel = PixColors[Color_fg]; |
1159 | attributes.background_pixel = PixColors[Color_fg]; |
1192 | attributes.border_pixel = PixColors[Color_border]; |
1160 | attributes.border_pixel = PixColors[Color_border]; |
1193 | attributes.colormap = Xcmap; |
1161 | attributes.colormap = display->cmap; |
1194 | TermWin.parent[0] = XCreateWindow (Xdisplay, DefaultRootWindow (Xdisplay), |
1162 | TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), |
1195 | szHint.x, szHint.y, |
1163 | szHint.x, szHint.y, |
1196 | szHint.width, szHint.height, |
1164 | szHint.width, szHint.height, |
1197 | TermWin.ext_bwidth, |
1165 | TermWin.ext_bwidth, |
1198 | Xdepth, InputOutput, |
1166 | display->depth, InputOutput, |
1199 | Xvisual, |
1167 | display->visual, |
1200 | CWBackPixel | CWBorderPixel |
1168 | CWBackPixel | CWBorderPixel | CWColormap, &attributes); |
1201 | | CWColormap, &attributes); |
|
|
1202 | #else |
1169 | #else |
1203 | TermWin.parent[0] = XCreateSimpleWindow (Xdisplay, DefaultRootWindow (Xdisplay), |
1170 | TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), |
1204 | szHint.x, szHint.y, |
1171 | szHint.x, szHint.y, |
1205 | szHint.width, |
1172 | szHint.width, |
1206 | szHint.height, |
1173 | szHint.height, |
1207 | TermWin.ext_bwidth, |
1174 | TermWin.ext_bwidth, |
1208 | PixColors[Color_border], |
1175 | PixColors[Color_border], |
… | |
… | |
1219 | wmHint.input = True; |
1186 | wmHint.input = True; |
1220 | wmHint.initial_state = (Options & Opt_iconic ? IconicState |
1187 | wmHint.initial_state = (Options & Opt_iconic ? IconicState |
1221 | : NormalState); |
1188 | : NormalState); |
1222 | wmHint.window_group = TermWin.parent[0]; |
1189 | wmHint.window_group = TermWin.parent[0]; |
1223 | |
1190 | |
1224 | XSetWMProperties(Xdisplay, TermWin.parent[0], NULL, NULL, |
1191 | XSetWMProperties(display->display, TermWin.parent[0], NULL, NULL, |
1225 | (char **)argv, argc, &szHint, &wmHint, &classHint); |
1192 | (char **)argv, argc, &szHint, &wmHint, &classHint); |
|
|
1193 | |
1226 | XSelectInput(Xdisplay, TermWin.parent[0], |
1194 | XSelectInput(display->display, TermWin.parent[0], |
1227 | (KeyPressMask |
1195 | KeyPressMask |
1228 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1196 | #if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) |
1229 | | KeyReleaseMask |
1197 | | KeyReleaseMask |
1230 | #endif |
1198 | #endif |
1231 | | FocusChangeMask | VisibilityChangeMask |
1199 | | FocusChangeMask | VisibilityChangeMask |
1232 | | StructureNotifyMask)); |
1200 | | StructureNotifyMask); |
|
|
1201 | termwin_ev.start (display, TermWin.parent[0]); |
1233 | |
1202 | |
1234 | /* 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 */ |
1235 | TermWin_cursor = XCreateFontCursor(Xdisplay, XC_xterm); |
1204 | TermWin_cursor = XCreateFontCursor(display->display, XC_xterm); |
1236 | |
1205 | |
1237 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1206 | #if defined(HAVE_SCROLLBARS) || defined(MENUBAR) |
1238 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1207 | /* cursor (menuBar/scrollBar): Black-on-White */ |
1239 | leftptr_cursor = XCreateFontCursor(Xdisplay, XC_left_ptr); |
1208 | leftptr_cursor = XCreateFontCursor(display->display, XC_left_ptr); |
1240 | #endif |
1209 | #endif |
1241 | |
1210 | |
1242 | #ifdef POINTER_BLANK |
1211 | #ifdef POINTER_BLANK |
1243 | |
|
|
1244 | { |
1212 | { |
1245 | XColor blackcolour; |
1213 | XColor blackcolour; |
1246 | blackcolour.red = 0; |
1214 | blackcolour.red = 0; |
1247 | blackcolour.green = 0; |
1215 | blackcolour.green = 0; |
1248 | blackcolour.blue = 0; |
1216 | blackcolour.blue = 0; |
1249 | Font f = XLoadFont (Xdisplay, "fixed"); |
1217 | Font f = XLoadFont (display->display, "fixed"); |
1250 | blank_cursor = XCreateGlyphCursor (Xdisplay, f, f, ' ', ' ', |
1218 | blank_cursor = XCreateGlyphCursor (display->display, f, f, ' ', ' ', |
1251 | &blackcolour, &blackcolour); |
1219 | &blackcolour, &blackcolour); |
1252 | XUnloadFont (Xdisplay, f); |
1220 | XUnloadFont (display->display, f); |
1253 | } |
1221 | } |
1254 | #endif |
1222 | #endif |
1255 | |
1223 | |
1256 | /* the vt window */ |
1224 | /* the vt window */ |
1257 | TermWin.vt = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], |
1225 | TermWin.vt = XCreateSimpleWindow(display->display, TermWin.parent[0], |
1258 | window_vt_x, window_vt_y, |
1226 | window_vt_x, window_vt_y, |
1259 | TermWin_TotalWidth(), |
1227 | TermWin_TotalWidth(), |
1260 | TermWin_TotalHeight(), |
1228 | TermWin_TotalHeight(), |
1261 | 0, |
1229 | 0, |
1262 | PixColors[Color_fg], |
1230 | PixColors[Color_fg], |
1263 | PixColors[Color_bg]); |
1231 | PixColors[Color_bg]); |
|
|
1232 | |
1264 | #ifdef DEBUG_X |
1233 | #ifdef DEBUG_X |
1265 | XStoreName(Xdisplay, TermWin.vt, "vt window"); |
1234 | XStoreName(display->display, TermWin.vt, "vt window"); |
1266 | #endif |
1235 | #endif |
1267 | |
1236 | |
1268 | vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask |
1237 | vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask |
1269 | | PropertyChangeMask); |
1238 | | PropertyChangeMask); |
1270 | |
1239 | |
… | |
… | |
1275 | vt_emask |= PointerMotionMask; |
1244 | vt_emask |= PointerMotionMask; |
1276 | else |
1245 | else |
1277 | #endif |
1246 | #endif |
1278 | vt_emask |= (Button1MotionMask | Button3MotionMask); |
1247 | vt_emask |= (Button1MotionMask | Button3MotionMask); |
1279 | |
1248 | |
1280 | XSelectInput(Xdisplay, TermWin.vt, vt_emask); |
1249 | XSelectInput(display->display, TermWin.vt, vt_emask); |
|
|
1250 | vt_ev.start (display, TermWin.vt); |
1281 | |
1251 | |
1282 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
1252 | #if defined(MENUBAR) && (MENUBAR_MAX > 1) |
1283 | |
|
|
1284 | if (menuBar_height()) |
1253 | if (menuBar_height()) |
1285 | { |
1254 | { |
1286 | menuBar.win = XCreateSimpleWindow(Xdisplay, TermWin.parent[0], |
1255 | menuBar.win = XCreateSimpleWindow(display->display, TermWin.parent[0], |
1287 | window_vt_x, 0, |
1256 | window_vt_x, 0, |
1288 | TermWin_TotalWidth(), |
1257 | TermWin_TotalWidth(), |
1289 | menuBar_TotalHeight(), |
1258 | menuBar_TotalHeight(), |
1290 | 0, |
1259 | 0, |
1291 | PixColors[Color_fg], |
1260 | PixColors[Color_fg], |
1292 | PixColors[Color_scroll]); |
1261 | PixColors[Color_scroll]); |
1293 | #ifdef DEBUG_X |
1262 | #ifdef DEBUG_X |
1294 | |
|
|
1295 | XStoreName(Xdisplay, menuBar.win, "menubar"); |
1263 | XStoreName(display->display, menuBar.win, "menubar"); |
1296 | #endif |
1264 | #endif |
1297 | |
1265 | |
1298 | XDefineCursor(Xdisplay, menuBar.win, pointer_leftptr); |
1266 | XDefineCursor(display->display, menuBar.win, pointer_leftptr); |
|
|
1267 | |
1299 | XSelectInput(Xdisplay, menuBar.win, |
1268 | XSelectInput(display->display, menuBar.win, |
1300 | (ExposureMask | ButtonPressMask | ButtonReleaseMask |
1269 | (ExposureMask | ButtonPressMask | ButtonReleaseMask |
1301 | | Button1MotionMask)); |
1270 | | Button1MotionMask)); |
|
|
1271 | menubar_ev.start (display, menuBar.win); |
1302 | } |
1272 | } |
1303 | #endif |
1273 | #endif |
|
|
1274 | |
1304 | #ifdef XPM_BACKGROUND |
1275 | #ifdef XPM_BACKGROUND |
1305 | if (rs[Rs_backgroundPixmap] != NULL |
1276 | if (rs[Rs_backgroundPixmap] != NULL |
1306 | && !(Options & Opt_transparent)) |
1277 | && !(Options & Opt_transparent)) |
1307 | { |
1278 | { |
1308 | const char *p = rs[Rs_backgroundPixmap]; |
1279 | const char *p = rs[Rs_backgroundPixmap]; |
… | |
… | |
1319 | |
1290 | |
1320 | /* graphics context for the vt window */ |
1291 | /* graphics context for the vt window */ |
1321 | gcvalue.foreground = PixColors[Color_fg]; |
1292 | gcvalue.foreground = PixColors[Color_fg]; |
1322 | gcvalue.background = PixColors[Color_bg]; |
1293 | gcvalue.background = PixColors[Color_bg]; |
1323 | gcvalue.graphics_exposures = 1; |
1294 | gcvalue.graphics_exposures = 1; |
1324 | TermWin.gc = XCreateGC(Xdisplay, TermWin.vt, |
1295 | TermWin.gc = XCreateGC(display->display, TermWin.vt, |
1325 | GCForeground | GCBackground |
1296 | GCForeground | GCBackground |
1326 | | GCGraphicsExposures, &gcvalue); |
1297 | | GCGraphicsExposures, &gcvalue); |
1327 | |
1298 | |
1328 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1299 | #if defined(MENUBAR) || defined(RXVT_SCROLLBAR) |
1329 | |
|
|
1330 | gcvalue.foreground = PixColors[Color_topShadow]; |
1300 | gcvalue.foreground = PixColors[Color_topShadow]; |
1331 | topShadowGC = XCreateGC(Xdisplay, TermWin.vt, |
1301 | topShadowGC = XCreateGC(display->display, TermWin.vt, |
1332 | GCForeground, &gcvalue); |
1302 | GCForeground, &gcvalue); |
1333 | gcvalue.foreground = PixColors[Color_bottomShadow]; |
1303 | gcvalue.foreground = PixColors[Color_bottomShadow]; |
1334 | botShadowGC = XCreateGC(Xdisplay, TermWin.vt, |
1304 | botShadowGC = XCreateGC(display->display, TermWin.vt, |
1335 | GCForeground, &gcvalue); |
1305 | GCForeground, &gcvalue); |
1336 | gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg |
1306 | gcvalue.foreground = PixColors[(XDEPTH <= 2 ? Color_fg |
1337 | : Color_scroll)]; |
1307 | : Color_scroll)]; |
1338 | scrollbarGC = XCreateGC(Xdisplay, TermWin.vt, |
1308 | scrollbarGC = XCreateGC(display->display, TermWin.vt, |
1339 | GCForeground, &gcvalue); |
1309 | GCForeground, &gcvalue); |
1340 | #endif |
1310 | #endif |
1341 | } |
1311 | } |
1342 | |
1312 | |
1343 | /*----------------------------------------------------------------------*/ |
1313 | /*----------------------------------------------------------------------*/ |
… | |
… | |
1356 | { |
1326 | { |
1357 | rxvt_print_error("can't open pseudo-tty"); |
1327 | rxvt_print_error("can't open pseudo-tty"); |
1358 | return -1; |
1328 | return -1; |
1359 | } |
1329 | } |
1360 | |
1330 | |
1361 | #ifdef FD_SETSIZE |
|
|
1362 | if (Xfd > FD_SETSIZE || cfd > FD_SETSIZE) |
|
|
1363 | { |
|
|
1364 | rxvt_print_error("fd too high: %d max", FD_SETSIZE); |
|
|
1365 | rxvt_clean_exit(); |
|
|
1366 | exit(EXIT_FAILURE); |
|
|
1367 | } |
|
|
1368 | #endif |
|
|
1369 | |
|
|
1370 | fcntl (cfd, F_SETFL, O_NONBLOCK); |
1331 | fcntl (cfd, F_SETFL, O_NONBLOCK); |
1371 | |
1332 | |
1372 | /* get slave (tty) */ |
1333 | /* get slave (tty) */ |
1373 | if (tty_fd < 0) |
1334 | if (tty_fd < 0) |
1374 | { |
1335 | { |
… | |
… | |
1402 | case -1: |
1363 | case -1: |
1403 | rxvt_print_error("can't fork"); |
1364 | rxvt_print_error("can't fork"); |
1404 | return -1; |
1365 | return -1; |
1405 | case 0: |
1366 | case 0: |
1406 | close (cfd); /* only keep tty_fd and STDERR open */ |
1367 | close (cfd); /* only keep tty_fd and STDERR open */ |
1407 | close (Xfd); |
1368 | |
1408 | if (rxvt_control_tty (tty_fd, ttydev) < 0) |
1369 | if (rxvt_control_tty (tty_fd, ttydev) < 0) |
1409 | rxvt_print_error ("could not obtain control of tty"); |
1370 | rxvt_print_error ("could not obtain control of tty"); |
1410 | else |
1371 | else |
1411 | { |
1372 | { |
1412 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
1373 | /* Reopen stdin, stdout and stderr over the tty file descriptor */ |
… | |
… | |
1439 | dup2 (fdstdin, STDIN_FILENO); |
1400 | dup2 (fdstdin, STDIN_FILENO); |
1440 | close (fdstdin); |
1401 | close (fdstdin); |
1441 | #endif |
1402 | #endif |
1442 | |
1403 | |
1443 | } |
1404 | } |
1444 | close (tty_fd); /* keep STDERR_FILENO, cmd_fd, Xfd open */ |
1405 | close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ |
1445 | break; |
1406 | break; |
1446 | } |
1407 | } |
1447 | #else /* __QNX__ uses qnxspawn() */ |
1408 | #else /* __QNX__ uses qnxspawn() */ |
1448 | fchmod (tty_fd, 0622); |
1409 | fchmod (tty_fd, 0622); |
1449 | fcntl (tty_fd, F_SETFD, FD_CLOEXEC); |
1410 | fcntl (tty_fd, F_SETFD, FD_CLOEXEC); |