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

Diff Legend

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