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.23 by pcg, Sun Feb 1 01:34:41 2004 UTC vs.
Revision 1.25 by pcg, Wed Feb 11 08:13:44 2004 UTC

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

Diff Legend

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