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

Diff Legend

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