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

Diff Legend

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