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.107 by root, Wed Feb 2 08:09:23 2005 UTC vs.
Revision 1.114 by root, Sun Feb 20 00:09:25 2005 UTC

… …
181 "MULTIPLE", 181 "MULTIPLE",
182 "TARGETS", 182 "TARGETS",
183 "TIMESTAMP", 183 "TIMESTAMP",
184 "VT_SELECTION", 184 "VT_SELECTION",
185 "INCR", 185 "INCR",
186 "WM_PROTOCOLS",
186 "WM_DELETE_WINDOW", 187 "WM_DELETE_WINDOW",
187 "CLIPBOARD", 188 "CLIPBOARD",
188#if ENABLE_FRILLS 189#if ENABLE_FRILLS
189 "_NET_WM_PID", 190 "_NET_WM_PID",
190 "_MOTIF_WM_HINTS", 191 "_MOTIF_WM_HINTS",
… …
200#endif 201#endif
201#ifdef OFFIX_DND 202#ifdef OFFIX_DND
202 "DndProtocol", 203 "DndProtocol",
203 "DndSelection", 204 "DndSelection",
204#endif 205#endif
206#if ENABLE_XEMBED
207 "_XEMBED",
208 "_XEMBED_INFO",
209#endif
205 }; 210 };
206 211
207bool 212bool
208rxvt_term::init_vars () 213rxvt_term::init_vars ()
209{ 214{
… …
225 230
226 MEvent.time = CurrentTime; 231 MEvent.time = CurrentTime;
227 MEvent.button = AnyButton; 232 MEvent.button = AnyButton;
228 options = DEFAULT_OPTIONS; 233 options = DEFAULT_OPTIONS;
229 want_refresh = 1; 234 want_refresh = 1;
230 cmd_pid = -1;
231 pty.pty = pty.tty = -1;
232 priv_modes = SavedModes = PrivMode_Default; 235 priv_modes = SavedModes = PrivMode_Default;
233 TermWin.focus = 0; 236 TermWin.focus = 0;
234 TermWin.ncol = 80; 237 TermWin.ncol = 80;
235 TermWin.nrow = 24; 238 TermWin.nrow = 24;
236 TermWin.int_bwidth = INTERNALBORDERWIDTH; 239 TermWin.int_bwidth = INTERNALBORDERWIDTH;
… …
337 */ 340 */
338 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 341 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
339 rs[Rs_display_name] = ":0"; 342 rs[Rs_display_name] = ":0";
340 343
341 get_options (r_argc, r_argv); 344 get_options (r_argc, r_argv);
342 free (r_argv);
343 345
344#ifdef LOCAL_X_IS_UNIX 346#ifdef LOCAL_X_IS_UNIX
345 if (rs[Rs_display_name][0] == ':') 347 if (rs[Rs_display_name][0] == ':')
346 { 348 {
347 val = rxvt_malloc (5 + strlen (rs[Rs_display_name])); 349 val = rxvt_malloc (5 + strlen (rs[Rs_display_name]));
… …
354 356
355 if (!display 357 if (!display
356 && ! (display = displays.get (rs[Rs_display_name]))) 358 && ! (display = displays.get (rs[Rs_display_name])))
357 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 359 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
358 360
359 extract_resources (display->display, rs[Rs_name]); 361 extract_resources ();
362 free (r_argv);
360 363
361 /* 364 /*
362 * set any defaults not already set 365 * set any defaults not already set
363 */ 366 */
364 if (cmd_argv && cmd_argv[0]) 367 if (cmd_argv && cmd_argv[0])
… …
673 if (scrollbar_visible ()) 676 if (scrollbar_visible ())
674 { 677 {
675 priv_modes |= PrivMode_scrollBar; 678 priv_modes |= PrivMode_scrollBar;
676 SavedModes |= PrivMode_scrollBar; 679 SavedModes |= PrivMode_scrollBar;
677 } 680 }
681
678 if (menubar_visible ()) 682 if (menubar_visible ())
679 { 683 {
680 priv_modes |= PrivMode_menuBar; 684 priv_modes |= PrivMode_menuBar;
681 SavedModes |= PrivMode_menuBar; 685 SavedModes |= PrivMode_menuBar;
682 } 686 }
… …
830 * Use resource ``modifier'' to override the Meta modifier 834 * Use resource ``modifier'' to override the Meta modifier
831 */ 835 */
832void 836void
833rxvt_term::get_ourmods () 837rxvt_term::get_ourmods ()
834{ 838{
835 int i, j, k; 839 int i, j, k;
836 int requestedmeta, realmeta, realalt; 840 int requestedmeta, realmeta, realalt;
837 const char *cm, *rsmod; 841 const char *cm, *rsmod;
838 XModifierKeymap *map; 842 XModifierKeymap *map;
839 KeyCode *kc; 843 KeyCode *kc;
840 const unsigned int modmasks[] = 844 const unsigned int modmasks[] =
841 { 845 {
842 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask 846 Mod1Mask, Mod2Mask, Mod3Mask, Mod4Mask, Mod5Mask
843 }; 847 };
844 848
… …
926#endif 930#endif
927 XGCValues gcvalue; 931 XGCValues gcvalue;
928 long vt_emask; 932 long vt_emask;
929 XSetWindowAttributes attributes; 933 XSetWindowAttributes attributes;
930 XWindowAttributes gattr; 934 XWindowAttributes gattr;
935 Window top, parent;
936 dDisp;
931 937
932#ifdef USING_W11LIB 938#ifdef USING_W11LIB
933 /* enable W11 callbacks */ 939 /* enable W11 callbacks */
934 W11AddEventHandler (display->display, rxvt_W11_process_x_event); 940 W11AddEventHandler (disp, rxvt_W11_process_x_event);
935#endif 941#endif
936 942
937 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA); 943 assert (sizeof (xa_names) / sizeof (char *) == NUM_XA);
938 XInternAtoms (display->display, (char **)xa_names, NUM_XA, False, xa); 944 XInternAtoms (disp, (char **)xa_names, NUM_XA, False, xa);
939 945
940 if (options & Opt_transparent) 946 if (options & Opt_transparent)
941 { 947 {
942 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 948 XGetWindowAttributes (disp, RootWindow (disp, display->screen), &gattr);
943 display->depth = gattr.depth; // doh //TODO, per-term not per-display? 949 display->depth = gattr.depth; // doh //TODO, per-term not per-display?
944 } 950 }
945 951
946#if ENABLE_FRILLS 952#if ENABLE_FRILLS
947 if (options & Opt_borderLess) 953 if (options & Opt_borderLess)
948 { 954 {
949 prop = XInternAtom(display->display, "_MOTIF_WM_INFO", True); 955 prop = XInternAtom(disp, "_MOTIF_WM_INFO", True);
950 956
951 if (prop == None) 957 if (prop == None)
952 { 958 {
953 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/ 959 /* print_warning("Window Manager does not support MWM hints. Bypassing window manager control for borderless window.\n");*/
954#ifdef PREFER_24BIT 960#ifdef PREFER_24BIT
… …
972 Get_Colours (); 978 Get_Colours ();
973 979
974 if (!set_fonts ()) 980 if (!set_fonts ())
975 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 981 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
976 982
983 parent = DefaultRootWindow (disp);
984
985#if ENABLE_XEMBED
986 if (rs[Rs_embed])
987 {
988 XWindowAttributes wattr;
989
990 parent = strtol (rs[Rs_embed], 0, 0);
991
992 if (!XGetWindowAttributes (disp, parent, &wattr))
993 rxvt_fatal ("invalid window-id specified with -embed, aborting.\n");
994
995 window_calc (wattr.width, wattr.height);
996 }
997
998#endif
977 window_calc (0, 0); 999 window_calc (0, 0);
978 old_width = szHint.width;
979 old_height = szHint.height;
980 1000
981 /* sub-window placement & size in rxvt_resize_subwindows () */ 1001 /* sub-window placement & size in rxvt_resize_subwindows () */
982
983#ifdef PREFER_24BIT 1002#ifdef PREFER_24BIT
984 attributes.background_pixel = pix_colors_focused[Color_border]; 1003 attributes.background_pixel = pix_colors_focused[Color_border];
985 attributes.border_pixel = pix_colors_focused[Color_border]; 1004 attributes.border_pixel = pix_colors_focused[Color_border];
986 attributes.colormap = display->cmap; 1005 attributes.colormap = display->cmap;
987 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1006 top = XCreateWindow (disp, parent,
988 szHint.x, szHint.y, 1007 szHint.x, szHint.y,
989 szHint.width, szHint.height, 1008 szHint.width, szHint.height,
990 TermWin.ext_bwidth, 1009 TermWin.ext_bwidth,
991 display->depth, InputOutput, 1010 display->depth, InputOutput,
992 display->visual, 1011 display->visual,
993 CWColormap | CWBackPixel | CWBorderPixel, &attributes); 1012 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
994#else 1013#else
995 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1014 top = XCreateSimpleWindow (disp, parent,
996 szHint.x, szHint.y, 1015 szHint.x, szHint.y,
997 szHint.width, szHint.height, 1016 szHint.width, szHint.height,
998 TermWin.ext_bwidth, 1017 TermWin.ext_bwidth,
999 pix_colors_focused[Color_border], 1018 pix_colors_focused[Color_border],
1000 pix_colors_focused[Color_border]); 1019 pix_colors_focused[Color_border]);
1001#endif 1020#endif
1021
1022 TermWin.parent[0] = top;
1023
1024 old_width = szHint.width;
1025 old_height = szHint.height;
1002 1026
1003 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1027 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1004 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1028 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1005 1029
1006 classHint.res_name = (char *)rs[Rs_name]; 1030 classHint.res_name = (char *)rs[Rs_name];
1007 classHint.res_class = (char *)RESCLASS; 1031 classHint.res_class = (char *)RESCLASS;
1008 1032
1009 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1033 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1010 wmHint.input = True; 1034 wmHint.input = True;
1011 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState; 1035 wmHint.initial_state = options & Opt_iconic ? IconicState : NormalState;
1012 wmHint.window_group = TermWin.parent[0]; 1036 wmHint.window_group = top;
1013 1037
1014 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1038 XSetWMProperties (disp, top, NULL, NULL,
1015 (char **)argv, argc, &szHint, &wmHint, &classHint); 1039 (char **)argv, argc, &szHint, &wmHint, &classHint);
1016 1040
1017 /* Enable delete window protocol */ 1041 /* Enable delete window protocol */
1018 XSetWMProtocols (display->display, TermWin.parent[0], 1042 XSetWMProtocols (disp, top, &xa[XA_WM_DELETE_WINDOW], 1);
1019 &xa[XA_WMDELETEWINDOW], 1);
1020 1043
1021#if ENABLE_FRILLS 1044#if ENABLE_FRILLS
1022 long pid = getpid (); 1045 long pid = getpid ();
1023 1046
1024 XChangeProperty (display->display, TermWin.parent[0], 1047 XChangeProperty (disp, top,
1025 xa[XA_NET_WM_PID], XA_CARDINAL, 32, 1048 xa[XA_NET_WM_PID], XA_CARDINAL, 32,
1026 PropModeReplace, (unsigned char *)&pid, 1); 1049 PropModeReplace, (unsigned char *)&pid, 1);
1027#endif 1050#endif
1028 1051
1029 XSelectInput (display->display, TermWin.parent[0], 1052 XSelectInput (disp, top,
1030 KeyPressMask 1053 KeyPressMask
1031#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755 1054#if (MOUSE_WHEEL && MOUSE_SLIP_WHEELING) || ENABLE_FRILLS || ISO_14755
1032 | KeyReleaseMask 1055 | KeyReleaseMask
1033#endif 1056#endif
1034 | FocusChangeMask | VisibilityChangeMask 1057 | FocusChangeMask | VisibilityChangeMask
1035 | ExposureMask
1036 | StructureNotifyMask); 1058 | ExposureMask | StructureNotifyMask);
1059
1037 termwin_ev.start (display, TermWin.parent[0]); 1060 termwin_ev.start (display, top);
1038 1061
1039#if ENABLE_FRILLS 1062#if ENABLE_FRILLS
1040 if (mwmhints.flags) 1063 if (mwmhints.flags)
1041 XChangeProperty (display->display, TermWin.parent[0], xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1064 XChangeProperty (disp, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
1042 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS); 1065 PropModeReplace, (unsigned char *)&mwmhints, PROP_MWM_HINTS_ELEMENTS);
1043#endif 1066#endif
1044 1067
1045 /* vt cursor: Black-on-White is standard, but this is more popular */ 1068 /* vt cursor: Black-on-White is standard, but this is more popular */
1046 TermWin_cursor = XCreateFontCursor (display->display, XC_xterm); 1069 TermWin_cursor = XCreateFontCursor (disp, XC_xterm);
1047 1070
1048#if defined(HAVE_SCROLLBARS) || defined(MENUBAR) 1071#if defined(HAVE_SCROLLBARS) || defined(MENUBAR)
1049 /* cursor (menuBar/scrollBar): Black-on-White */ 1072 /* cursor (menuBar/scrollBar): Black-on-White */
1050 leftptr_cursor = XCreateFontCursor (display->display, XC_left_ptr); 1073 leftptr_cursor = XCreateFontCursor (disp, XC_left_ptr);
1051#endif 1074#endif
1052 1075
1053 /* the vt window */ 1076 /* the vt window */
1054 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1077 TermWin.vt = XCreateSimpleWindow (disp, top,
1055 window_vt_x, 1078 window_vt_x,
1056 window_vt_y, 1079 window_vt_y,
1057 TermWin_TotalWidth (), 1080 TermWin_TotalWidth (),
1058 TermWin_TotalHeight (), 1081 TermWin_TotalHeight (),
1059 0, 1082 0,
1060 pix_colors_focused[Color_fg], 1083 pix_colors_focused[Color_fg],
1061 pix_colors_focused[Color_bg]); 1084 pix_colors_focused[Color_bg]);
1062#ifdef DEBUG_X 1085#ifdef DEBUG_X
1063 XStoreName (display->display, TermWin.vt, "vt window"); 1086 XStoreName (disp, TermWin.vt, "vt window");
1064#endif 1087#endif
1065 1088
1066 attributes.bit_gravity = NorthWestGravity; 1089 attributes.bit_gravity = NorthWestGravity;
1067 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes); 1090 XChangeWindowAttributes (disp, TermWin.vt, CWBitGravity, &attributes);
1068 1091
1069 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask; 1092 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1070
1071 pointer_unblank ();
1072 1093
1073#ifdef POINTER_BLANK 1094#ifdef POINTER_BLANK
1074 if (options & Opt_pointerBlank) 1095 if (options & Opt_pointerBlank)
1075 vt_emask |= PointerMotionMask; 1096 vt_emask |= PointerMotionMask;
1076 else 1097 else
1077#endif 1098#endif
1078 vt_emask |= Button1MotionMask | Button3MotionMask; 1099 vt_emask |= Button1MotionMask | Button3MotionMask;
1079 1100
1080 XSelectInput (display->display, TermWin.vt, vt_emask); 1101 XSelectInput (disp, TermWin.vt, vt_emask);
1081 vt_ev.start (display, TermWin.vt); 1102 vt_ev.start (display, TermWin.vt);
1082 1103
1083#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1104#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1084 if (menuBar_height ()) 1105 if (menuBar_height ())
1085 { 1106 {
1086 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1107 menuBar.win = XCreateSimpleWindow (disp, top,
1087 window_vt_x, 0, 1108 window_vt_x, 0,
1088 TermWin_TotalWidth (), 1109 TermWin_TotalWidth (),
1089 menuBar_TotalHeight (), 1110 menuBar_TotalHeight (),
1090 0, 1111 0,
1091 pix_colors_focused[Color_fg], 1112 pix_colors_focused[Color_fg],
1092 pix_colors_focused[Color_scroll]); 1113 pix_colors_focused[Color_scroll]);
1093 1114
1094#ifdef DEBUG_X 1115#ifdef DEBUG_X
1095 XStoreName (display->display, menuBar.win, "menubar"); 1116 XStoreName (disp, menuBar.win, "menubar");
1096#endif 1117#endif
1097 1118
1098 menuBar.drawable = new rxvt_drawable (display, menuBar.win); 1119 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1099 1120
1100 XDefineCursor (display->display, menuBar.win, 1121 XDefineCursor (disp, menuBar.win,
1101 XCreateFontCursor (display->display, XC_left_ptr)); 1122 XCreateFontCursor (disp, XC_left_ptr));
1102 1123
1103 XSelectInput (display->display, menuBar.win, 1124 XSelectInput (disp, menuBar.win,
1104 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1125 (ExposureMask | ButtonPressMask | ButtonReleaseMask | Button1MotionMask));
1105 | Button1MotionMask));
1106 menubar_ev.start (display, menuBar.win); 1126 menubar_ev.start (display, menuBar.win);
1107 } 1127 }
1108#endif 1128#endif
1109 1129
1110#ifdef XPM_BACKGROUND 1130#ifdef XPM_BACKGROUND
… …
1126 1146
1127 /* graphics context for the vt window */ 1147 /* graphics context for the vt window */
1128 gcvalue.foreground = pix_colors[Color_fg]; 1148 gcvalue.foreground = pix_colors[Color_fg];
1129 gcvalue.background = pix_colors[Color_bg]; 1149 gcvalue.background = pix_colors[Color_bg];
1130 gcvalue.graphics_exposures = 1; 1150 gcvalue.graphics_exposures = 1;
1131 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1151 TermWin.gc = XCreateGC (disp, TermWin.vt,
1132 GCForeground | GCBackground | GCGraphicsExposures, 1152 GCForeground | GCBackground | GCGraphicsExposures,
1133 &gcvalue); 1153 &gcvalue);
1134 1154
1135 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1155 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1136 1156
1137#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1157#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1138 gcvalue.foreground = pix_colors[Color_topShadow]; 1158 gcvalue.foreground = pix_colors[Color_topShadow];
1139 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1159 topShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1140 gcvalue.foreground = pix_colors[Color_bottomShadow]; 1160 gcvalue.foreground = pix_colors[Color_bottomShadow];
1141 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1161 botShadowGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1142 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)]; 1162 gcvalue.foreground = pix_colors[ (display->depth <= 2 ? Color_fg : Color_scroll)];
1143 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue); 1163 scrollbarGC = XCreateGC (disp, TermWin.vt, GCForeground, &gcvalue);
1144#endif 1164#endif
1145 1165
1146#ifdef OFF_FOCUS_FADING 1166#ifdef OFF_FOCUS_FADING
1147 // initially we are in unfocused state 1167 // initially we are in unfocused state
1148 if (rs[Rs_fade]) 1168 if (rs[Rs_fade])
1149 pix_colors = pix_colors_unfocused; 1169 pix_colors = pix_colors_unfocused;
1150#endif 1170#endif
1151 1171
1172 pointer_unblank ();
1152 scr_recolour (); 1173 scr_recolour ();
1174
1175#if ENABLE_XEMBED
1176 if (rs[Rs_embed])
1177 {
1178 long info[2] = { 0, XEMBED_MAPPED };
1179
1180 XChangeProperty (disp, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
1181 32, PropModeReplace, (unsigned char *)&info, 2);
1182 }
1183#endif
1153} 1184}
1154 1185
1155/* ------------------------------------------------------------------------- * 1186/* ------------------------------------------------------------------------- *
1156 * GET TTY CURRENT STATE * 1187 * GET TTY CURRENT STATE *
1157 * ------------------------------------------------------------------------- */ 1188 * ------------------------------------------------------------------------- */
… …
1386 * the slave. 1417 * the slave.
1387 */ 1418 */
1388void 1419void
1389rxvt_term::run_command (const char *const *argv) 1420rxvt_term::run_command (const char *const *argv)
1390{ 1421{
1422#if ENABLE_FRILLS
1423 if (rs[Rs_pty_fd])
1424 {
1425 pty.pty = atoi (rs[Rs_pty_fd]);
1426 fcntl (pty.pty, F_SETFL, O_NONBLOCK);
1427 }
1428 else
1429#endif
1391 if (!pty.get ()) 1430 if (!pty.get ())
1392 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1431 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1393 1432
1394 pty.set_utf8_mode (enc_utf8); 1433 pty.set_utf8_mode (enc_utf8);
1395 1434
1396 /* set initial window size */ 1435 /* set initial window size */
1397 tt_winch (); 1436 tt_winch ();
… …
1407#endif 1446#endif
1408 er = -1; 1447 er = -1;
1409 1448
1410 rxvt_get_ttymode (&tio, er); 1449 rxvt_get_ttymode (&tio, er);
1411 1450
1451#if ENABLE_FRILLS
1452 if (rs[Rs_pty_fd])
1453 return;
1454#endif
1455
1412 sw_chld.start (SIGCHLD); 1456 sw_chld.start (SIGCHLD);
1413 1457
1414#ifndef __QNX__ 1458#ifndef __QNX__
1415 /* spin off the command interpreter */ 1459 /* spin off the command interpreter */
1416 switch (cmd_pid = fork ()) 1460 switch (cmd_pid = fork ())
1417 { 1461 {
1418 case -1: 1462 case -1:
1463 {
1464 cmd_pid = 0;
1419 rxvt_fatal ("can't fork, aborting.\n"); 1465 rxvt_fatal ("can't fork, aborting.\n");
1466 }
1420 case 0: 1467 case 0:
1421 init_env (); 1468 init_env ();
1422 1469
1423 if (!pty.make_controlling_tty ()) 1470 if (!pty.make_controlling_tty ())
1424 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME); 1471 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);

Diff Legend

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