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.37 by pcg, Tue Feb 24 21:46:14 2004 UTC vs.
Revision 1.51 by pcg, Sun May 9 18:19:49 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 */
324#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
325#ifdef OPTION_HC 326#ifdef OPTION_HC
327 NULL,
328#endif
329#if TINTING
326 NULL, 330 NULL,
327#endif 331#endif
328#ifdef KEEP_SCROLLCOLOR 332#ifdef KEEP_SCROLLCOLOR
329 COLOR_SCROLLBAR, 333 COLOR_SCROLLBAR,
330 COLOR_SCROLLTROUGH, 334 COLOR_SCROLLTROUGH,
… …
384 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 388 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
385 TermWin.lineSpace = LINESPACE; 389 TermWin.lineSpace = LINESPACE;
386 TermWin.saveLines = SAVELINES; 390 TermWin.saveLines = SAVELINES;
387 numPixColors = TOTAL_COLORS; 391 numPixColors = TOTAL_COLORS;
388 392
389#ifndef NO_NEW_SELECTION
390 selection_style = NEW_SELECT;
391#else
392 selection_style = OLD_SELECT;
393#endif
394
395#ifndef NO_BRIGHTCOLOR 393#ifndef NO_BRIGHTCOLOR
396 colorfgbg = DEFAULT_RSTYLE; 394 colorfgbg = DEFAULT_RSTYLE;
397#endif
398
399#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
400 ks_bigfont = XK_greater;
401 ks_smallfont = XK_less;
402#endif 395#endif
403 396
404 refresh_limit = 1; 397 refresh_limit = 1;
405 refresh_type = SLOW_REFRESH; 398 refresh_type = SLOW_REFRESH;
406 prev_nrow = prev_ncol = 0; 399 prev_nrow = prev_ncol = 0;
… …
505 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 498 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
506 499
507 cmd_argv[i] = NULL; 500 cmd_argv[i] = NULL;
508 } 501 }
509 502
510 /* clear all resources */
511 for (i = 0; i < NUM_RESOURCES;)
512 rs[i++] = NULL;
513
514 rs[Rs_name] = rxvt_r_basename (argv[0]); 503 rs[Rs_name] = rxvt_r_basename (argv[0]);
515 504
516 /* 505 /*
517 * Open display, get options/resources and create the window 506 * Open display, get options/resources and create the window
518 */ 507 */
… …
533 } 522 }
534#endif 523#endif
535 524
536 if (!display 525 if (!display
537 && ! (display = displays.get (rs[Rs_display_name]))) 526 && ! (display = displays.get (rs[Rs_display_name])))
538 {
539 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 527 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
540 exit (EXIT_FAILURE);
541 }
542 528
543 extract_resources (display->display, rs[Rs_name]); 529 extract_resources (display->display, rs[Rs_name]);
544 530
545 /* 531 /*
546 * set any defaults not already set 532 * set any defaults not already set
… …
591 rs[Rs_print_pipe] = PRINTPIPE; 577 rs[Rs_print_pipe] = PRINTPIPE;
592#endif 578#endif
593 579
594 if (!rs[Rs_cutchars]) 580 if (!rs[Rs_cutchars])
595 rs[Rs_cutchars] = CUTCHARS; 581 rs[Rs_cutchars] = CUTCHARS;
596
597#ifdef ACS_ASCII
598 if (!rs[Rs_acs_chars])
599 rs[Rs_acs_chars] = ACS_CHARS;
600 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
601 {
602 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
603 for (; i < 0x20; )
604 val[i] = ' ';
605 rs[Rs_acs_chars] = val;
606 }
607#endif
608 582
609#ifndef NO_BACKSPACE_KEY 583#ifndef NO_BACKSPACE_KEY
610 if (!rs[Rs_backspace_key]) 584 if (!rs[Rs_backspace_key])
611# ifdef DEFAULT_BACKSPACE 585# ifdef DEFAULT_BACKSPACE
612 key_backspace = DEFAULT_BACKSPACE; 586 key_backspace = DEFAULT_BACKSPACE;
… …
639#endif 613#endif
640 if (rs[Rs_answerbackstring]) 614 if (rs[Rs_answerbackstring])
641 { 615 {
642 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 616 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
643 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 617 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
644 }
645
646 if (rs[Rs_selectstyle])
647 {
648 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
649 selection_style = OLD_WORD_SELECT;
650#ifndef NO_OLD_SELECTION
651
652 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
653 selection_style = OLD_SELECT;
654#endif
655
656 } 618 }
657 619
658#ifdef HAVE_SCROLLBARS 620#ifdef HAVE_SCROLLBARS
659 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 621 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
660 rs[Rs_scrollBar_thickness]); 622 rs[Rs_scrollBar_thickness]);
… …
686 color_aliases (Color_bg); 648 color_aliases (Color_bg);
687#ifndef NO_CURSORCOLOR 649#ifndef NO_CURSORCOLOR
688 color_aliases (Color_cursor); 650 color_aliases (Color_cursor);
689 color_aliases (Color_cursor2); 651 color_aliases (Color_cursor2);
690#endif /* NO_CURSORCOLOR */ 652#endif /* NO_CURSORCOLOR */
691 color_aliases (Color_pointer); 653 color_aliases (Color_pointer_fg);
654 color_aliases (Color_pointer_bg);
692 color_aliases (Color_border); 655 color_aliases (Color_border);
693#ifndef NO_BOLD_UNDERLINE_REVERSE 656#ifndef NO_BOLD_UNDERLINE_REVERSE
694 color_aliases (Color_BD); 657 color_aliases (Color_BD);
695 color_aliases (Color_UL); 658 color_aliases (Color_UL);
696 color_aliases (Color_RV); 659 color_aliases (Color_RV);
… …
794 free (this->locale); 757 free (this->locale);
795 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 758 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
796 SET_LOCALE (this->locale); 759 SET_LOCALE (this->locale);
797 mbstate.reset (); 760 mbstate.reset ();
798#endif 761#endif
762#if 0
799#if HAVE_NL_LANGINFO 763#if HAVE_NL_LANGINFO
800 free (codeset); 764 free (codeset);
801 codeset = strdup (nl_langinfo (CODESET)); 765 codeset = strdup (nl_langinfo (CODESET));
802 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 766 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
803 || !STRCASECMP (codeset, "UTF8"); 767 || !STRCASECMP (codeset, "UTF8");
804#else 768#else
805 enc_utf8 = 1; 769 enc_utf8 = 1;
806#endif 770#endif
771#endif
807} 772}
808 773
809void 774void
810rxvt_term::init_xlocale () 775rxvt_term::init_xlocale ()
811{ 776{
812#ifdef USE_XIM 777#ifdef USE_XIM
813 if (!locale) 778 if (!locale)
814 rxvt_print_error ("Setting locale failed."); 779 rxvt_warn ("setting locale failed, working without locale support.\n");
815 else 780 else
816 { 781 {
817 Atom wmlocale; 782 Atom wmlocale;
818 783
819 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
821 XA_STRING, 8, PropModeReplace, 786 XA_STRING, 8, PropModeReplace,
822 (unsigned char *)locale, STRLEN (locale)); 787 (unsigned char *)locale, STRLEN (locale));
823 788
824 if (!XSupportsLocale ()) 789 if (!XSupportsLocale ())
825 { 790 {
826 rxvt_print_error ("The locale is not supported by Xlib"); 791 rxvt_warn ("the locale is not supported by Xlib, working withotu locale support.\n");
827 return; 792 return;
828 } 793 }
829 794
830 im_ev.start (display); 795 im_ev.start (display);
831 796
… …
891 if (Options & Opt_cursorBlink) 856 if (Options & Opt_cursorBlink)
892 (void)gettimeofday (&lastcursorchange, NULL); 857 (void)gettimeofday (&lastcursorchange, NULL);
893#endif 858#endif
894 859
895 if ((cmd_fd = run_command (argv)) < 0) 860 if ((cmd_fd = run_command (argv)) < 0)
896 { 861 rxvt_fatal ("failure while running command, aborting");
897 rxvt_print_error ("aborting");
898 exit (EXIT_FAILURE);
899 }
900} 862}
901 863
902/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
903void 865void
904rxvt_term::Get_Colours () 866rxvt_term::Get_Colours ()
… …
929 switch (i) 891 switch (i)
930 { 892 {
931 case Color_fg: 893 case Color_fg:
932 case Color_bg: 894 case Color_bg:
933 /* fatal: need bg/fg color */ 895 /* fatal: need bg/fg color */
934 rxvt_print_error ("aborting"); 896 rxvt_fatal ("unable to get foreground/background colour, aborting");
935 exit (EXIT_FAILURE);
936 /* NOTREACHED */ 897 /* NOTREACHED */
937 break; 898 break;
938#ifndef NO_CURSORCOLOR 899#ifndef NO_CURSORCOLOR
939 case Color_cursor2: 900 case Color_cursor2:
940 xcol = PixColors[Color_fg]; 901 xcol = PixColors[Color_fg];
941 break; 902 break;
942#endif /* ! NO_CURSORCOLOR */ 903#endif /* ! NO_CURSORCOLOR */
943 case Color_pointer: 904 case Color_pointer_fg:
944 xcol = PixColors[Color_fg]; 905 xcol = PixColors[Color_fg];
945 break; 906 break;
946 default: 907 default:
947 xcol = PixColors[Color_bg]; /* None */ 908 xcol = PixColors[Color_bg]; /* None */
948 break; 909 break;
… …
952 913
953 PixColors[i] = xcol; 914 PixColors[i] = xcol;
954 SET_PIXCOLOR (i); 915 SET_PIXCOLOR (i);
955 } 916 }
956 917
957 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 918 if (XDEPTH <= 2)
958 PixColors[Color_pointer] = PixColors[Color_fg]; 919 {
959 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 920 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
960 PixColors[Color_border] = PixColors[Color_fg]; 921 if (!rs[Rs_color + Color_pointer_bg]) PixColors[Color_pointer_bg] = PixColors[Color_bg];
922 if (!rs[Rs_color + Color_border] ) PixColors[Color_border] = PixColors[Color_fg];
923 }
961 924
962 /* 925 /*
963 * get scrollBar/menuBar shadow colors 926 * get scrollBar/menuBar shadow colors
964 * 927 *
965 * The calculations of topShadow/bottomShadow values are adapted 928 * The calculations of topShadow/bottomShadow values are adapted
… …
1109/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
1110/* rxvt_Create_Windows () - Open and map the window */ 1073/* rxvt_Create_Windows () - Open and map the window */
1111void 1074void
1112rxvt_term::create_windows (int argc, const char *const *argv) 1075rxvt_term::create_windows (int argc, const char *const *argv)
1113{ 1076{
1114 XClassHint classHint; 1077 XClassHint classHint;
1115 XWMHints wmHint; 1078 XWMHints wmHint;
1116 XGCValues gcvalue; 1079 XGCValues gcvalue;
1117 long vt_emask; 1080 long vt_emask;
1118 1081 XSetWindowAttributes attributes;
1119 XWindowAttributes gattr; 1082 XWindowAttributes gattr;
1120 1083
1121 if (Options & Opt_transparent) 1084 if (Options & Opt_transparent)
1122 { 1085 {
1123 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1086 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
… …
1136 1099
1137 window_calc (0, 0); 1100 window_calc (0, 0);
1138 old_width = szHint.width; 1101 old_width = szHint.width;
1139 old_height = szHint.height; 1102 old_height = szHint.height;
1140 1103
1141 /* parent window - reverse video so we can see placement errors
1142 * sub-window placement & size in rxvt_resize_subwindows () 1104 /* sub-window placement & size in rxvt_resize_subwindows () */
1143 */
1144 1105
1145#ifdef PREFER_24BIT 1106#ifdef PREFER_24BIT
1146 XSetWindowAttributes attributes;
1147
1148 attributes.background_pixel = PixColors[Color_fg]; 1107 attributes.background_pixel = PixColors[Color_bg];
1149 attributes.border_pixel = PixColors[Color_border]; 1108 attributes.border_pixel = PixColors[Color_border];
1150 attributes.colormap = display->cmap; 1109 attributes.colormap = display->cmap;
1151 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1110 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1152 szHint.x, szHint.y, 1111 szHint.x, szHint.y,
1153 szHint.width, szHint.height, 1112 szHint.width, szHint.height,
1154 TermWin.ext_bwidth, 1113 TermWin.ext_bwidth,
1155 display->depth, InputOutput, 1114 display->depth, InputOutput,
1156 display->visual, 1115 display->visual,
1157 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1116 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1158#else 1117#else
1159 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1118 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1160 szHint.x, szHint.y, 1119 szHint.x, szHint.y,
1161 szHint.width, 1120 szHint.width, szHint.height,
1162 szHint.height,
1163 TermWin.ext_bwidth, 1121 TermWin.ext_bwidth,
1164 PixColors[Color_border], 1122 PixColors[Color_border],
1165 PixColors[Color_fg]); 1123 PixColors[Color_bg]);
1166#endif 1124#endif
1167 1125
1168 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1126 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1169 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1127 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1170 1128
1171 classHint.res_name = (char *)rs[Rs_name]; 1129 classHint.res_name = (char *)rs[Rs_name];
1172 classHint.res_class = (char *)APL_CLASS; 1130 classHint.res_class = (char *)RESCLASS;
1173 1131
1174 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1132 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1175 wmHint.input = True; 1133 wmHint.input = True;
1176 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1134 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1177 : NormalState);
1178 wmHint.window_group = TermWin.parent[0]; 1135 wmHint.window_group = TermWin.parent[0];
1179 1136
1180 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1137 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1181 (char **)argv, argc, &szHint, &wmHint, &classHint); 1138 (char **)argv, argc, &szHint, &wmHint, &classHint);
1139
1140#ifndef NO_FRILLS
1141 long pid = getpid ();
1142 XChangeProperty (display->display, TermWin.parent[0],
1143 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1144 PropModeReplace, (unsigned char *)&pid, 1);
1145#endif
1182 1146
1183 XSelectInput (display->display, TermWin.parent[0], 1147 XSelectInput (display->display, TermWin.parent[0],
1184 KeyPressMask 1148 KeyPressMask
1185#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1149#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1186 | KeyReleaseMask 1150 | KeyReleaseMask
… …
1221 1185
1222#ifdef DEBUG_X 1186#ifdef DEBUG_X
1223 XStoreName (display->display, TermWin.vt, "vt window"); 1187 XStoreName (display->display, TermWin.vt, "vt window");
1224#endif 1188#endif
1225 1189
1190 attributes.bit_gravity = NorthWestGravity;
1191 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1192
1226 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1193 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1227 | PropertyChangeMask);
1228 1194
1229#ifdef POINTER_BLANK 1195#ifdef POINTER_BLANK
1230 pointer_unblank (); 1196 pointer_unblank ();
1231 1197
1232 if ((Options & Opt_pointerBlank)) 1198 if (Options & Opt_pointerBlank)
1233 vt_emask |= PointerMotionMask; 1199 vt_emask |= PointerMotionMask;
1234 else 1200 else
1235#endif 1201#endif
1236 vt_emask |= (Button1MotionMask | Button3MotionMask); 1202 vt_emask |= Button1MotionMask | Button3MotionMask;
1237 1203
1238 XSelectInput (display->display, TermWin.vt, vt_emask); 1204 XSelectInput (display->display, TermWin.vt, vt_emask);
1239 vt_ev.start (display, TermWin.vt); 1205 vt_ev.start (display, TermWin.vt);
1240 1206
1241#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1207#if defined(MENUBAR) && (MENUBAR_MAX > 1)
… …
1284 /* graphics context for the vt window */ 1250 /* graphics context for the vt window */
1285 gcvalue.foreground = PixColors[Color_fg]; 1251 gcvalue.foreground = PixColors[Color_fg];
1286 gcvalue.background = PixColors[Color_bg]; 1252 gcvalue.background = PixColors[Color_bg];
1287 gcvalue.graphics_exposures = 1; 1253 gcvalue.graphics_exposures = 1;
1288 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1254 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1289 GCForeground | GCBackground 1255 GCForeground | GCBackground | GCGraphicsExposures,
1290 | GCGraphicsExposures, &gcvalue); 1256 &gcvalue);
1291 1257
1292 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1258 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1293 1259
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = PixColors[Color_topShadow]; 1261 gcvalue.foreground = PixColors[Color_topShadow];
… …
1312{ 1278{
1313 int cfd, er; 1279 int cfd, er;
1314 1280
1315 /* get master (pty) */ 1281 /* get master (pty) */
1316 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1282 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1317 {
1318 rxvt_print_error ("can't open pseudo-tty"); 1283 rxvt_fatal ("can't open pseudo-tty");
1319 return -1;
1320 }
1321 1284
1322 fcntl (cfd, F_SETFL, O_NONBLOCK); 1285 fcntl (cfd, F_SETFL, O_NONBLOCK);
1323 1286
1324 /* get slave (tty) */ 1287 /* get slave (tty) */
1325 if (tty_fd < 0) 1288 if (tty_fd < 0)
… …
1329#endif 1292#endif
1330 1293
1331 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1294 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1332 { 1295 {
1333 close (cfd); 1296 close (cfd);
1334 rxvt_print_error ("can't open slave tty %s", ttydev); 1297 rxvt_fatal ("can't open slave tty %s", ttydev);
1335 return -1;
1336 } 1298 }
1337 } 1299 }
1338#ifndef NO_BACKSPACE_KEY 1300#ifndef NO_BACKSPACE_KEY
1339 if (key_backspace[0] && !key_backspace[1]) 1301 if (key_backspace[0] && !key_backspace[1])
1340 er = key_backspace[0]; 1302 er = key_backspace[0];
… …
1350#ifndef __QNX__ 1312#ifndef __QNX__
1351 /* spin off the command interpreter */ 1313 /* spin off the command interpreter */
1352 switch (cmd_pid = fork ()) 1314 switch (cmd_pid = fork ())
1353 { 1315 {
1354 case -1: 1316 case -1:
1355 rxvt_print_error ("can't fork"); 1317 rxvt_fatal ("can't fork");
1356 return -1;
1357 case 0: 1318 case 0:
1358 close (cfd); /* only keep tty_fd and STDERR open */ 1319 close (cfd); /* only keep tty_fd and STDERR open */
1359 1320
1360 init_env (); 1321 init_env ();
1361 1322
1362 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1323 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1363 rxvt_print_error ("could not obtain control of tty"); 1324 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1364 else 1325 else
1365 { 1326 {
1366 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1327 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1367 dup2 (tty_fd, STDIN_FILENO); 1328 dup2 (tty_fd, STDIN_FILENO);
1368 dup2 (tty_fd, STDOUT_FILENO); 1329 dup2 (tty_fd, STDOUT_FILENO);
… …
1370 1331
1371 if (tty_fd > 2) 1332 if (tty_fd > 2)
1372 close (tty_fd); 1333 close (tty_fd);
1373 1334
1374 run_child (argv); 1335 run_child (argv);
1336 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1375 } 1337 }
1338
1376 exit (EXIT_FAILURE); 1339 _exit (EXIT_FAILURE);
1377 /* NOTREACHED */ 1340
1378 default: 1341 default:
1379 { 1342 {
1380#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1343#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1381 int fdstdin; 1344 int fdstdin;
1382 1345
… …
1391#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1354#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1392 1355
1393 dup2 (fdstdin, STDIN_FILENO); 1356 dup2 (fdstdin, STDIN_FILENO);
1394 close (fdstdin); 1357 close (fdstdin);
1395#endif 1358#endif
1396
1397 } 1359 }
1360
1398 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1361 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1399 break; 1362 break;
1400 } 1363 }
1401#else /* __QNX__ uses qnxspawn () */ 1364#else /* __QNX__ uses qnxspawn () */
1402 fchmod (tty_fd, 0622); 1365 fchmod (tty_fd, 0622);

Diff Legend

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