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.111 by root, Thu Feb 17 20:52:48 2005 UTC

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

Diff Legend

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