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.40 by pcg, Sun Mar 14 23:14:39 2004 UTC vs.
Revision 1.57 by root, Mon Jun 21 22:24:07 2004 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*--------------------------------*-C-*---------------------------------*
2 * File: init.c 2 * File: init.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk> 6 * Copyright (c) 1992 John Bovey, University of Kent at Canterbury <jdb@ukc.ac.uk>
7 * - original version 7 * - original version
… …
313#endif 313#endif
314#ifndef NO_CURSORCOLOR 314#ifndef NO_CURSORCOLOR
315 COLOR_CURSOR_BACKGROUND, 315 COLOR_CURSOR_BACKGROUND,
316 COLOR_CURSOR_FOREGROUND, 316 COLOR_CURSOR_FOREGROUND,
317#endif /* ! NO_CURSORCOLOR */ 317#endif /* ! NO_CURSORCOLOR */
318 NULL, /* Color_pointer */ 318 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */
319 NULL, /* Color_border */ 320 NULL, /* Color_border */
320#ifndef NO_BOLD_UNDERLINE_REVERSE 321#ifndef NO_BOLD_UNDERLINE_REVERSE
321 NULL, /* Color_BD */ 322 NULL, /* Color_BD */
322 NULL, /* Color_UL */ 323 NULL, /* Color_UL */
323 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
… …
327#endif 328#endif
328#ifdef KEEP_SCROLLCOLOR 329#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 330 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 331 COLOR_SCROLLTROUGH,
331#endif /* KEEP_SCROLLCOLOR */ 332#endif /* KEEP_SCROLLCOLOR */
332 333#if TINTING
334 NULL,
335#endif
333 }; 336 };
334 337
335const char *const xa_names[NUM_XA] = 338const char *const xa_names[NUM_XA] =
336 { 339 {
337 "TEXT", 340 "TEXT",
… …
494 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 497 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
495 498
496 cmd_argv[i] = NULL; 499 cmd_argv[i] = NULL;
497 } 500 }
498 501
499 /* clear all resources */
500 for (i = 0; i < NUM_RESOURCES;)
501 rs[i++] = NULL;
502
503 rs[Rs_name] = rxvt_r_basename (argv[0]); 502 rs[Rs_name] = rxvt_r_basename (argv[0]);
504 503
505 /* 504 /*
506 * Open display, get options/resources and create the window 505 * Open display, get options/resources and create the window
507 */ 506 */
… …
522 } 521 }
523#endif 522#endif
524 523
525 if (!display 524 if (!display
526 && ! (display = displays.get (rs[Rs_display_name]))) 525 && ! (display = displays.get (rs[Rs_display_name])))
527 {
528 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 526 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
529 exit (EXIT_FAILURE);
530 }
531 527
532 extract_resources (display->display, rs[Rs_name]); 528 extract_resources (display->display, rs[Rs_name]);
533 529
534 /* 530 /*
535 * set any defaults not already set 531 * set any defaults not already set
… …
651 color_aliases (Color_bg); 647 color_aliases (Color_bg);
652#ifndef NO_CURSORCOLOR 648#ifndef NO_CURSORCOLOR
653 color_aliases (Color_cursor); 649 color_aliases (Color_cursor);
654 color_aliases (Color_cursor2); 650 color_aliases (Color_cursor2);
655#endif /* NO_CURSORCOLOR */ 651#endif /* NO_CURSORCOLOR */
656 color_aliases (Color_pointer); 652 color_aliases (Color_pointer_fg);
653 color_aliases (Color_pointer_bg);
657 color_aliases (Color_border); 654 color_aliases (Color_border);
658#ifndef NO_BOLD_UNDERLINE_REVERSE 655#ifndef NO_BOLD_UNDERLINE_REVERSE
659 color_aliases (Color_BD); 656 color_aliases (Color_BD);
660 color_aliases (Color_UL); 657 color_aliases (Color_UL);
661 color_aliases (Color_RV); 658 color_aliases (Color_RV);
… …
755void 752void
756rxvt_term::set_locale (const char *locale) 753rxvt_term::set_locale (const char *locale)
757{ 754{
758#if HAVE_XSETLOCALE || HAVE_SETLOCALE 755#if HAVE_XSETLOCALE || HAVE_SETLOCALE
759 free (this->locale); 756 free (this->locale);
760 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 757 this->locale = setlocale (LC_CTYPE, locale);
758
759 if (!this->locale)
760 {
761 rxvt_warn ("unable to set locale \"%s\", using default locale instead.\n", locale);
762 setlocale (LC_CTYPE, "");
763 this->locale = "";
764 }
765
766 this->locale = rxvt_strdup (this->locale);
761 SET_LOCALE (this->locale); 767 SET_LOCALE (this->locale);
762 mbstate.reset (); 768 mbstate.reset ();
763#endif 769#endif
770#if 0
764#if HAVE_NL_LANGINFO 771#if HAVE_NL_LANGINFO
765 free (codeset); 772 free (codeset);
766 codeset = strdup (nl_langinfo (CODESET)); 773 codeset = strdup (nl_langinfo (CODESET));
767 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 774 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
768 || !STRCASECMP (codeset, "UTF8"); 775 || !STRCASECMP (codeset, "UTF8");
769#else 776#else
770 enc_utf8 = 1; 777 enc_utf8 = 1;
771#endif 778#endif
779#endif
772} 780}
773 781
774void 782void
775rxvt_term::init_xlocale () 783rxvt_term::init_xlocale ()
776{ 784{
777#ifdef USE_XIM 785#ifdef USE_XIM
778 if (!locale) 786 if (!locale)
779 rxvt_print_error ("Setting locale failed."); 787 rxvt_warn ("setting locale failed, working without locale support.\n");
780 else 788 else
781 { 789 {
782 Atom wmlocale; 790 Atom wmlocale;
783 791
784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 792 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
786 XA_STRING, 8, PropModeReplace, 794 XA_STRING, 8, PropModeReplace,
787 (unsigned char *)locale, STRLEN (locale)); 795 (unsigned char *)locale, STRLEN (locale));
788 796
789 if (!XSupportsLocale ()) 797 if (!XSupportsLocale ())
790 { 798 {
791 rxvt_print_error ("The locale is not supported by Xlib"); 799 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
792 return; 800 return;
793 } 801 }
794 802
795 im_ev.start (display); 803 im_ev.start (display);
796 804
… …
826 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC); 834 meta_char = (Options & Opt_meta8 ? 0x80 : C0_ESC);
827#endif 835#endif
828 836
829 get_ourmods (); 837 get_ourmods ();
830 838
831 if (! (Options & Opt_scrollTtyOutput)) 839 if (!(Options & Opt_scrollTtyOutput))
832 PrivateModes |= PrivMode_TtyOutputInh; 840 PrivateModes |= PrivMode_TtyOutputInh;
833 if (Options & Opt_scrollTtyKeypress) 841 if (Options & Opt_scrollTtyKeypress)
834 PrivateModes |= PrivMode_Keypress; 842 PrivateModes |= PrivMode_Keypress;
835 if (! (Options & Opt_jumpScroll)) 843 if (!(Options & Opt_jumpScroll))
836 PrivateModes |= PrivMode_smoothScroll; 844 PrivateModes |= PrivMode_smoothScroll;
837 845
838#ifndef NO_BACKSPACE_KEY 846#ifndef NO_BACKSPACE_KEY
839 if (STRCMP (key_backspace, "DEC") == 0) 847 if (STRCMP (key_backspace, "DEC") == 0)
840 PrivateModes |= PrivMode_HaveBackSpace; 848 PrivateModes |= PrivMode_HaveBackSpace;
… …
856 if (Options & Opt_cursorBlink) 864 if (Options & Opt_cursorBlink)
857 (void)gettimeofday (&lastcursorchange, NULL); 865 (void)gettimeofday (&lastcursorchange, NULL);
858#endif 866#endif
859 867
860 if ((cmd_fd = run_command (argv)) < 0) 868 if ((cmd_fd = run_command (argv)) < 0)
861 { 869 rxvt_fatal ("failure while running command, aborting");
862 rxvt_print_error ("aborting");
863 exit (EXIT_FAILURE);
864 }
865} 870}
866 871
867/*----------------------------------------------------------------------*/ 872/*----------------------------------------------------------------------*/
868void 873void
869rxvt_term::Get_Colours () 874rxvt_term::Get_Colours ()
… …
894 switch (i) 899 switch (i)
895 { 900 {
896 case Color_fg: 901 case Color_fg:
897 case Color_bg: 902 case Color_bg:
898 /* fatal: need bg/fg color */ 903 /* fatal: need bg/fg color */
899 rxvt_print_error ("aborting"); 904 rxvt_fatal ("unable to get foreground/background colour, aborting");
900 exit (EXIT_FAILURE);
901 /* NOTREACHED */ 905 /* NOTREACHED */
902 break; 906 break;
903#ifndef NO_CURSORCOLOR 907#ifndef NO_CURSORCOLOR
904 case Color_cursor2: 908 case Color_cursor2:
905 xcol = PixColors[Color_fg]; 909 xcol = PixColors[Color_fg];
906 break; 910 break;
907#endif /* ! NO_CURSORCOLOR */ 911#endif /* ! NO_CURSORCOLOR */
908 case Color_pointer: 912 case Color_pointer_fg:
909 xcol = PixColors[Color_fg]; 913 xcol = PixColors[Color_fg];
910 break; 914 break;
911 default: 915 default:
912 xcol = PixColors[Color_bg]; /* None */ 916 xcol = PixColors[Color_bg]; /* None */
913 break; 917 break;
… …
917 921
918 PixColors[i] = xcol; 922 PixColors[i] = xcol;
919 SET_PIXCOLOR (i); 923 SET_PIXCOLOR (i);
920 } 924 }
921 925
922 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 926 if (XDEPTH <= 2)
923 PixColors[Color_pointer] = PixColors[Color_fg]; 927 {
924 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 928 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
925 PixColors[Color_border] = PixColors[Color_fg]; 929 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
930 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
931 }
926 932
927 /* 933 /*
928 * get scrollBar/menuBar shadow colors 934 * get scrollBar/menuBar shadow colors
929 * 935 *
930 * The calculations of topShadow/bottomShadow values are adapted 936 * The calculations of topShadow/bottomShadow values are adapted
… …
932 */ 938 */
933#ifdef KEEP_SCROLLCOLOR 939#ifdef KEEP_SCROLLCOLOR
934 940
935 if (XDEPTH <= 2) 941 if (XDEPTH <= 2)
936 { /* Monochrome */ 942 { /* Monochrome */
937 PixColors[Color_scroll] = PixColors[Color_fg]; 943 PixColors[Color_scroll] = PixColors[Color_fg];
938 PixColors[Color_topShadow] = PixColors[Color_bg]; 944 PixColors[Color_topShadow] = PixColors[Color_bg];
939 PixColors[Color_bottomShadow] = PixColors[Color_bg]; 945 PixColors[Color_bottomShadow] = PixColors[Color_bg];
940 } 946 }
941 else 947 else
942 { 948 {
943 rxvt_color xcol[3]; 949 rxvt_color xcol[3];
944 /* xcol[0] == white 950 /* xcol[0] == white
945 * xcol[1] == top shadow 951 * xcol[1] == top shadow
946 * xcol[2] == bot shadow */ 952 * xcol[2] == bot shadow */
947 953
948 xcol[1] = PixColors[Color_scroll]; 954 xcol[1] = PixColors[Color_scroll];
… …
1074/*----------------------------------------------------------------------*/ 1080/*----------------------------------------------------------------------*/
1075/* rxvt_Create_Windows () - Open and map the window */ 1081/* rxvt_Create_Windows () - Open and map the window */
1076void 1082void
1077rxvt_term::create_windows (int argc, const char *const *argv) 1083rxvt_term::create_windows (int argc, const char *const *argv)
1078{ 1084{
1079 XClassHint classHint; 1085 XClassHint classHint;
1080 XWMHints wmHint; 1086 XWMHints wmHint;
1081 XGCValues gcvalue; 1087 XGCValues gcvalue;
1082 long vt_emask; 1088 long vt_emask;
1083 1089 XSetWindowAttributes attributes;
1084 XWindowAttributes gattr; 1090 XWindowAttributes gattr;
1085 1091
1086 if (Options & Opt_transparent) 1092 if (Options & Opt_transparent)
1087 { 1093 {
1088 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1094 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
… …
1101 1107
1102 window_calc (0, 0); 1108 window_calc (0, 0);
1103 old_width = szHint.width; 1109 old_width = szHint.width;
1104 old_height = szHint.height; 1110 old_height = szHint.height;
1105 1111
1106 /* parent window - reverse video so we can see placement errors
1107 * sub-window placement & size in rxvt_resize_subwindows () 1112 /* sub-window placement & size in rxvt_resize_subwindows () */
1108 */
1109 1113
1110#ifdef PREFER_24BIT 1114#ifdef PREFER_24BIT
1111 XSetWindowAttributes attributes;
1112
1113 attributes.background_pixel = PixColors[Color_fg]; 1115 attributes.background_pixel = PixColors[Color_bg];
1114 attributes.border_pixel = PixColors[Color_border]; 1116 attributes.border_pixel = PixColors[Color_border];
1115 attributes.colormap = display->cmap; 1117 attributes.colormap = display->cmap;
1116 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1118 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1117 szHint.x, szHint.y, 1119 szHint.x, szHint.y,
1118 szHint.width, szHint.height, 1120 szHint.width, szHint.height,
1119 TermWin.ext_bwidth, 1121 TermWin.ext_bwidth,
1120 display->depth, InputOutput, 1122 display->depth, InputOutput,
1121 display->visual, 1123 display->visual,
1122 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1124 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1123#else 1125#else
1124 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1126 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1125 szHint.x, szHint.y, 1127 szHint.x, szHint.y,
1126 szHint.width, 1128 szHint.width, szHint.height,
1127 szHint.height,
1128 TermWin.ext_bwidth, 1129 TermWin.ext_bwidth,
1129 PixColors[Color_border], 1130 PixColors[Color_border],
1130 PixColors[Color_fg]); 1131 PixColors[Color_bg]);
1131#endif 1132#endif
1132 1133
1133 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1134 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1134 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1135 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1135 1136
1136 classHint.res_name = (char *)rs[Rs_name]; 1137 classHint.res_name = (char *)rs[Rs_name];
1137 classHint.res_class = (char *)RESCLASS; 1138 classHint.res_class = (char *)RESCLASS;
1138 1139
1139 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1140 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1140 wmHint.input = True; 1141 wmHint.input = True;
1141 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1142 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1142 : NormalState);
1143 wmHint.window_group = TermWin.parent[0]; 1143 wmHint.window_group = TermWin.parent[0];
1144 1144
1145 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1145 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1146 (char **)argv, argc, &szHint, &wmHint, &classHint); 1146 (char **)argv, argc, &szHint, &wmHint, &classHint);
1147
1148#ifndef NO_FRILLS
1149 long pid = getpid ();
1150 XChangeProperty (display->display, TermWin.parent[0],
1151 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1152 PropModeReplace, (unsigned char *)&pid, 1);
1153#endif
1147 1154
1148 XSelectInput (display->display, TermWin.parent[0], 1155 XSelectInput (display->display, TermWin.parent[0],
1149 KeyPressMask 1156 KeyPressMask
1150#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1157#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1151 | KeyReleaseMask 1158 | KeyReleaseMask
… …
1175 } 1182 }
1176#endif 1183#endif
1177 1184
1178 /* the vt window */ 1185 /* the vt window */
1179 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0], 1186 TermWin.vt = XCreateSimpleWindow (display->display, TermWin.parent[0],
1180 window_vt_x, window_vt_y, 1187 window_vt_x,
1188 window_vt_y,
1181 TermWin_TotalWidth (), 1189 TermWin_TotalWidth (),
1182 TermWin_TotalHeight (), 1190 TermWin_TotalHeight (),
1183 0, 1191 0,
1184 PixColors[Color_fg], 1192 PixColors[Color_fg],
1185 PixColors[Color_bg]); 1193 PixColors[Color_bg]);
1186 1194
1187#ifdef DEBUG_X 1195#ifdef DEBUG_X
1188 XStoreName (display->display, TermWin.vt, "vt window"); 1196 XStoreName (display->display, TermWin.vt, "vt window");
1189#endif 1197#endif
1190 1198
1199 attributes.bit_gravity = NorthWestGravity;
1200 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1201
1191 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1202 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1192 | PropertyChangeMask);
1193 1203
1194#ifdef POINTER_BLANK 1204#ifdef POINTER_BLANK
1195 pointer_unblank (); 1205 pointer_unblank ();
1196 1206
1197 if ((Options & Opt_pointerBlank)) 1207 if (Options & Opt_pointerBlank)
1198 vt_emask |= PointerMotionMask; 1208 vt_emask |= PointerMotionMask;
1199 else 1209 else
1200#endif 1210#endif
1201 vt_emask |= (Button1MotionMask | Button3MotionMask); 1211 vt_emask |= Button1MotionMask | Button3MotionMask;
1202 1212
1203 XSelectInput (display->display, TermWin.vt, vt_emask); 1213 XSelectInput (display->display, TermWin.vt, vt_emask);
1204 vt_ev.start (display, TermWin.vt); 1214 vt_ev.start (display, TermWin.vt);
1205 1215
1206#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1216#if defined(MENUBAR) && (MENUBAR_MAX > 1)
… …
1249 /* graphics context for the vt window */ 1259 /* graphics context for the vt window */
1250 gcvalue.foreground = PixColors[Color_fg]; 1260 gcvalue.foreground = PixColors[Color_fg];
1251 gcvalue.background = PixColors[Color_bg]; 1261 gcvalue.background = PixColors[Color_bg];
1252 gcvalue.graphics_exposures = 1; 1262 gcvalue.graphics_exposures = 1;
1253 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1263 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1254 GCForeground | GCBackground 1264 GCForeground | GCBackground | GCGraphicsExposures,
1255 | GCGraphicsExposures, &gcvalue); 1265 &gcvalue);
1256 1266
1257 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1267 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1258 1268
1259#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1269#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1260 gcvalue.foreground = PixColors[Color_topShadow]; 1270 gcvalue.foreground = PixColors[Color_topShadow];
… …
1277{ 1287{
1278 int cfd, er; 1288 int cfd, er;
1279 1289
1280 /* get master (pty) */ 1290 /* get master (pty) */
1281 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1291 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1282 {
1283 rxvt_print_error ("can't open pseudo-tty"); 1292 rxvt_fatal ("can't open pseudo-tty");
1284 return -1;
1285 }
1286 1293
1287 fcntl (cfd, F_SETFL, O_NONBLOCK); 1294 fcntl (cfd, F_SETFL, O_NONBLOCK);
1288 1295
1289 /* get slave (tty) */ 1296 /* get slave (tty) */
1290 if (tty_fd < 0) 1297 if (tty_fd < 0)
… …
1294#endif 1301#endif
1295 1302
1296 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1303 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1297 { 1304 {
1298 close (cfd); 1305 close (cfd);
1299 rxvt_print_error ("can't open slave tty %s", ttydev); 1306 rxvt_fatal ("can't open slave tty %s", ttydev);
1300 return -1;
1301 } 1307 }
1302 } 1308 }
1303#ifndef NO_BACKSPACE_KEY 1309#ifndef NO_BACKSPACE_KEY
1304 if (key_backspace[0] && !key_backspace[1]) 1310 if (key_backspace[0] && !key_backspace[1])
1305 er = key_backspace[0]; 1311 er = key_backspace[0];
… …
1315#ifndef __QNX__ 1321#ifndef __QNX__
1316 /* spin off the command interpreter */ 1322 /* spin off the command interpreter */
1317 switch (cmd_pid = fork ()) 1323 switch (cmd_pid = fork ())
1318 { 1324 {
1319 case -1: 1325 case -1:
1320 rxvt_print_error ("can't fork"); 1326 rxvt_fatal ("can't fork");
1321 return -1;
1322 case 0: 1327 case 0:
1323 close (cfd); /* only keep tty_fd and STDERR open */ 1328 close (cfd); /* only keep tty_fd and STDERR open */
1324 1329
1325 init_env (); 1330 init_env ();
1326 1331
1327 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1332 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1328 rxvt_print_error ("could not obtain control of tty"); 1333 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1329 else 1334 else
1330 { 1335 {
1331 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1336 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1332 dup2 (tty_fd, STDIN_FILENO); 1337 dup2 (tty_fd, STDIN_FILENO);
1333 dup2 (tty_fd, STDOUT_FILENO); 1338 dup2 (tty_fd, STDOUT_FILENO);
… …
1335 1340
1336 if (tty_fd > 2) 1341 if (tty_fd > 2)
1337 close (tty_fd); 1342 close (tty_fd);
1338 1343
1339 run_child (argv); 1344 run_child (argv);
1345 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1340 } 1346 }
1347
1341 exit (EXIT_FAILURE); 1348 _exit (EXIT_FAILURE);
1342 /* NOTREACHED */ 1349
1343 default: 1350 default:
1344 { 1351 {
1345#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1352#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1346 int fdstdin; 1353 int fdstdin;
1347 1354
… …
1356#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1363#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1357 1364
1358 dup2 (fdstdin, STDIN_FILENO); 1365 dup2 (fdstdin, STDIN_FILENO);
1359 close (fdstdin); 1366 close (fdstdin);
1360#endif 1367#endif
1361
1362 } 1368 }
1369
1363 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1370 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1364 break; 1371 break;
1365 } 1372 }
1366#else /* __QNX__ uses qnxspawn () */ 1373#else /* __QNX__ uses qnxspawn () */
1367 fchmod (tty_fd, 0622); 1374 fchmod (tty_fd, 0622);

Diff Legend

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