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