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.29 by pcg, Sat Feb 21 21:43:37 2004 UTC vs.
Revision 1.50 by pcg, Thu Apr 8 20:31:45 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
… …
9 * - extensive modifications 9 * - extensive modifications
10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 10 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
11 * - extensive modifications 11 * - extensive modifications
12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com> 12 * Copyright (c) 1999 D J Hawkey Jr <hawkeyd@visi.com>
13 * - QNX support 13 * - QNX support
14 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com>
14 * 15 *
15 * This program is free software; you can redistribute it and/or modify 16 * This program is free software; you can redistribute it and/or modify
16 * it under the terms of the GNU General Public License as published by 17 * it under the terms of the GNU General Public License as published by
17 * the Free Software Foundation; either version 2 of the License, or 18 * the Free Software Foundation; either version 2 of the License, or
18 * (at your option) any later version. 19 * (at your option) any later version.
… …
312#endif 313#endif
313#ifndef NO_CURSORCOLOR 314#ifndef NO_CURSORCOLOR
314 COLOR_CURSOR_BACKGROUND, 315 COLOR_CURSOR_BACKGROUND,
315 COLOR_CURSOR_FOREGROUND, 316 COLOR_CURSOR_FOREGROUND,
316#endif /* ! NO_CURSORCOLOR */ 317#endif /* ! NO_CURSORCOLOR */
317 NULL, /* Color_pointer */ 318 NULL, /* Color_pointer_fg */
319 NULL, /* Color_pointer_bg */
318 NULL, /* Color_border */ 320 NULL, /* Color_border */
319#ifndef NO_BOLD_UNDERLINE_REVERSE 321#ifndef NO_BOLD_UNDERLINE_REVERSE
320 NULL, /* Color_BD */ 322 NULL, /* Color_BD */
321 NULL, /* Color_UL */ 323 NULL, /* Color_UL */
322 NULL, /* Color_RV */ 324 NULL, /* Color_RV */
323#endif /* ! NO_BOLD_UNDERLINE_REVERSE */ 325#endif /* ! NO_BOLD_UNDERLINE_REVERSE */
324#ifdef OPTION_HC 326#ifdef OPTION_HC
327 NULL,
328#endif
329#if TINTING
325 NULL, 330 NULL,
326#endif 331#endif
327#ifdef KEEP_SCROLLCOLOR 332#ifdef KEEP_SCROLLCOLOR
328 COLOR_SCROLLBAR, 333 COLOR_SCROLLBAR,
329 COLOR_SCROLLTROUGH, 334 COLOR_SCROLLTROUGH,
… …
383 TermWin.ext_bwidth = EXTERNALBORDERWIDTH; 388 TermWin.ext_bwidth = EXTERNALBORDERWIDTH;
384 TermWin.lineSpace = LINESPACE; 389 TermWin.lineSpace = LINESPACE;
385 TermWin.saveLines = SAVELINES; 390 TermWin.saveLines = SAVELINES;
386 numPixColors = TOTAL_COLORS; 391 numPixColors = TOTAL_COLORS;
387 392
388#ifndef NO_NEW_SELECTION
389 selection_style = NEW_SELECT;
390#else
391 selection_style = OLD_SELECT;
392#endif
393
394#ifndef NO_BRIGHTCOLOR 393#ifndef NO_BRIGHTCOLOR
395 colorfgbg = DEFAULT_RSTYLE; 394 colorfgbg = DEFAULT_RSTYLE;
396#endif
397
398#if defined (HOTKEY_CTRL) || defined (HOTKEY_META)
399 ks_bigfont = XK_greater;
400 ks_smallfont = XK_less;
401#endif
402
403#ifdef GREEK_SUPPORT
404 ks_greekmodeswith = GREEK_KEYBOARD_MODESWITCH;
405#endif 395#endif
406 396
407 refresh_limit = 1; 397 refresh_limit = 1;
408 refresh_type = SLOW_REFRESH; 398 refresh_type = SLOW_REFRESH;
409 prev_nrow = prev_ncol = 0; 399 prev_nrow = prev_ncol = 0;
410#ifdef MULTICHAR_SET
411# ifdef MULTICHAR_ENCODING
412 encoding_method = MULTICHAR_ENCODING;
413# endif
414 multichar_decode = rxvt_euc2jis;
415#endif
416 400
417 oldcursor.row = oldcursor.col = -1; 401 oldcursor.row = oldcursor.col = -1;
418#ifdef XPM_BACKGROUND 402#ifdef XPM_BACKGROUND
419 /* bgPixmap.w = bgPixmap.h = 0; */ 403 /* bgPixmap.w = bgPixmap.h = 0; */
420 bgPixmap.x = bgPixmap.y = 50; 404 bgPixmap.x = bgPixmap.y = 50;
… …
514 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 498 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
515 499
516 cmd_argv[i] = NULL; 500 cmd_argv[i] = NULL;
517 } 501 }
518 502
519 /* clear all resources */
520 for (i = 0; i < NUM_RESOURCES;)
521 rs[i++] = NULL;
522
523 rs[Rs_name] = rxvt_r_basename (argv[0]); 503 rs[Rs_name] = rxvt_r_basename (argv[0]);
524 504
525 /* 505 /*
526 * Open display, get options/resources and create the window 506 * Open display, get options/resources and create the window
527 */ 507 */
… …
542 } 522 }
543#endif 523#endif
544 524
545 if (!display 525 if (!display
546 && ! (display = displays.get (rs[Rs_display_name]))) 526 && ! (display = displays.get (rs[Rs_display_name])))
547 {
548 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 527 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
549 exit (EXIT_FAILURE);
550 }
551 528
552 extract_resources (display->display, rs[Rs_name]); 529 extract_resources (display->display, rs[Rs_name]);
553 530
554 /* 531 /*
555 * set any defaults not already set 532 * set any defaults not already set
… …
600 rs[Rs_print_pipe] = PRINTPIPE; 577 rs[Rs_print_pipe] = PRINTPIPE;
601#endif 578#endif
602 579
603 if (!rs[Rs_cutchars]) 580 if (!rs[Rs_cutchars])
604 rs[Rs_cutchars] = CUTCHARS; 581 rs[Rs_cutchars] = CUTCHARS;
605
606#ifdef ACS_ASCII
607 if (!rs[Rs_acs_chars])
608 rs[Rs_acs_chars] = ACS_CHARS;
609 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
610 {
611 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
612 for (; i < 0x20; )
613 val[i] = ' ';
614 rs[Rs_acs_chars] = val;
615 }
616#endif
617 582
618#ifndef NO_BACKSPACE_KEY 583#ifndef NO_BACKSPACE_KEY
619 if (!rs[Rs_backspace_key]) 584 if (!rs[Rs_backspace_key])
620# ifdef DEFAULT_BACKSPACE 585# ifdef DEFAULT_BACKSPACE
621 key_backspace = DEFAULT_BACKSPACE; 586 key_backspace = DEFAULT_BACKSPACE;
… …
650 { 615 {
651 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 616 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
652 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 617 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
653 } 618 }
654 619
655 if (rs[Rs_selectstyle])
656 {
657 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
658 selection_style = OLD_WORD_SELECT;
659#ifndef NO_OLD_SELECTION
660
661 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
662 selection_style = OLD_SELECT;
663#endif
664
665 }
666
667#ifdef HAVE_SCROLLBARS 620#ifdef HAVE_SCROLLBARS
668 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 621 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
669 rs[Rs_scrollBar_thickness]); 622 rs[Rs_scrollBar_thickness]);
670#endif 623#endif
671
672 TermWin.fontset = new rxvt_fontset (this);
673 TermWin.fontset->populate (rs[Rs_font]);
674 TermWin.fwidth = TermWin.fontset->base_font ()->width;
675 TermWin.fheight = TermWin.fontset->base_font ()->height;
676 TermWin.fbase = TermWin.fontset->base_font ()->ascent;
677 624
678#ifdef XTERM_REVERSE_VIDEO 625#ifdef XTERM_REVERSE_VIDEO
679 /* this is how xterm implements reverseVideo */ 626 /* this is how xterm implements reverseVideo */
680 if (Options & Opt_reverseVideo) 627 if (Options & Opt_reverseVideo)
681 { 628 {
… …
701 color_aliases (Color_bg); 648 color_aliases (Color_bg);
702#ifndef NO_CURSORCOLOR 649#ifndef NO_CURSORCOLOR
703 color_aliases (Color_cursor); 650 color_aliases (Color_cursor);
704 color_aliases (Color_cursor2); 651 color_aliases (Color_cursor2);
705#endif /* NO_CURSORCOLOR */ 652#endif /* NO_CURSORCOLOR */
706 color_aliases (Color_pointer); 653 color_aliases (Color_pointer_fg);
654 color_aliases (Color_pointer_bg);
707 color_aliases (Color_border); 655 color_aliases (Color_border);
708#ifndef NO_BOLD_UNDERLINE_REVERSE 656#ifndef NO_BOLD_UNDERLINE_REVERSE
709 color_aliases (Color_BD); 657 color_aliases (Color_BD);
710 color_aliases (Color_UL); 658 color_aliases (Color_UL);
711 color_aliases (Color_RV); 659 color_aliases (Color_RV);
… …
805void 753void
806rxvt_term::set_locale (const char *locale) 754rxvt_term::set_locale (const char *locale)
807{ 755{
808#if HAVE_XSETLOCALE || HAVE_SETLOCALE 756#if HAVE_XSETLOCALE || HAVE_SETLOCALE
809 free (this->locale); 757 free (this->locale);
810 this->locale = rxvt_strdup (setlocale (LC_CTYPE, "")); 758 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
811 SET_LOCALE (this->locale); 759 SET_LOCALE (this->locale);
812 mbstate.reset (); 760 mbstate.reset ();
813#endif 761#endif
762#if 0
814#if HAVE_NL_LANGINFO 763#if HAVE_NL_LANGINFO
815 free (codeset); 764 free (codeset);
816 codeset = strdup (nl_langinfo (CODESET)); 765 codeset = strdup (nl_langinfo (CODESET));
817 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 766 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
818 || !STRCASECMP (codeset, "UTF8"); 767 || !STRCASECMP (codeset, "UTF8");
819#else 768#else
820 enc_utf8 = 1; 769 enc_utf8 = 1;
821#endif 770#endif
771#endif
822} 772}
823 773
824void 774void
825rxvt_term::init_xlocale () 775rxvt_term::init_xlocale ()
826{ 776{
827#ifdef USE_XIM 777#ifdef USE_XIM
828 if (!locale) 778 if (!locale)
829 rxvt_print_error ("Setting locale failed."); 779 rxvt_warn ("setting locale failed, working without locale support.\n");
830 else 780 else
831 { 781 {
832 Atom wmlocale; 782 Atom wmlocale;
833 783
834 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
836 XA_STRING, 8, PropModeReplace, 786 XA_STRING, 8, PropModeReplace,
837 (unsigned char *)locale, STRLEN (locale)); 787 (unsigned char *)locale, STRLEN (locale));
838 788
839 if (!XSupportsLocale ()) 789 if (!XSupportsLocale ())
840 { 790 {
841 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");
842 return; 792 return;
843 } 793 }
844 794
845 im_ev.start (display); 795 im_ev.start (display);
846 796
… …
900 { 850 {
901 PrivateModes |= PrivMode_menuBar; 851 PrivateModes |= PrivMode_menuBar;
902 SavedModes |= PrivMode_menuBar; 852 SavedModes |= PrivMode_menuBar;
903 } 853 }
904 854
905#ifdef GREEK_SUPPORT
906 greek_init ();
907#endif
908
909#ifdef CURSOR_BLINK 855#ifdef CURSOR_BLINK
910 if (Options & Opt_cursorBlink) 856 if (Options & Opt_cursorBlink)
911 (void)gettimeofday (&lastcursorchange, NULL); 857 (void)gettimeofday (&lastcursorchange, NULL);
912#endif 858#endif
913 859
914 if ((cmd_fd = run_command (argv)) < 0) 860 if ((cmd_fd = run_command (argv)) < 0)
915 { 861 rxvt_fatal ("failure while running command, aborting");
916 rxvt_print_error ("aborting");
917 exit (EXIT_FAILURE);
918 }
919} 862}
920 863
921/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
922void 865void
923rxvt_term::Get_Colours () 866rxvt_term::Get_Colours ()
… …
948 switch (i) 891 switch (i)
949 { 892 {
950 case Color_fg: 893 case Color_fg:
951 case Color_bg: 894 case Color_bg:
952 /* fatal: need bg/fg color */ 895 /* fatal: need bg/fg color */
953 rxvt_print_error ("aborting"); 896 rxvt_fatal ("unable to get foreground/background colour, aborting");
954 exit (EXIT_FAILURE);
955 /* NOTREACHED */ 897 /* NOTREACHED */
956 break; 898 break;
957#ifndef NO_CURSORCOLOR 899#ifndef NO_CURSORCOLOR
958 case Color_cursor2: 900 case Color_cursor2:
959 xcol = PixColors[Color_fg]; 901 xcol = PixColors[Color_fg];
960 break; 902 break;
961#endif /* ! NO_CURSORCOLOR */ 903#endif /* ! NO_CURSORCOLOR */
962 case Color_pointer: 904 case Color_pointer_fg:
963 xcol = PixColors[Color_fg]; 905 xcol = PixColors[Color_fg];
964 break; 906 break;
965 default: 907 default:
966 xcol = PixColors[Color_bg]; /* None */ 908 xcol = PixColors[Color_bg]; /* None */
967 break; 909 break;
… …
971 913
972 PixColors[i] = xcol; 914 PixColors[i] = xcol;
973 SET_PIXCOLOR (i); 915 SET_PIXCOLOR (i);
974 } 916 }
975 917
976 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 918 if (XDEPTH <= 2)
977 PixColors[Color_pointer] = PixColors[Color_fg]; 919 {
978 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 920 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
979 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 }
980 924
981 /* 925 /*
982 * get scrollBar/menuBar shadow colors 926 * get scrollBar/menuBar shadow colors
983 * 927 *
984 * The calculations of topShadow/bottomShadow values are adapted 928 * The calculations of topShadow/bottomShadow values are adapted
… …
1144 } 1088 }
1145 1089
1146 /* grab colors before netscape does */ 1090 /* grab colors before netscape does */
1147 Get_Colours (); 1091 Get_Colours ();
1148 1092
1149 change_font (1, NULL); 1093 if (!change_font (rs[Rs_font]))
1094 {
1095 fprintf (stderr, "unable to load a base font, please provide one using -fn fontname\n");
1096 destroy ();
1097 return;
1098 }
1099
1150 window_calc (0, 0); 1100 window_calc (0, 0);
1151 old_width = szHint.width; 1101 old_width = szHint.width;
1152 old_height = szHint.height; 1102 old_height = szHint.height;
1153 1103
1154 /* parent window - reverse video so we can see placement errors 1104 /* parent window - reverse video so we can see placement errors
… …
1176 TermWin.ext_bwidth, 1126 TermWin.ext_bwidth,
1177 PixColors[Color_border], 1127 PixColors[Color_border],
1178 PixColors[Color_fg]); 1128 PixColors[Color_fg]);
1179#endif 1129#endif
1180 1130
1181 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1131 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1182 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1132 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1183 1133
1184 classHint.res_name = (char *)rs[Rs_name]; 1134 classHint.res_name = (char *)rs[Rs_name];
1185 classHint.res_class = (char *)APL_CLASS; 1135 classHint.res_class = (char *)RESCLASS;
1186 1136
1187 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1137 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1188 wmHint.input = True; 1138 wmHint.input = True;
1189 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1139 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1190 : NormalState); 1140 : NormalState);
1191 wmHint.window_group = TermWin.parent[0]; 1141 wmHint.window_group = TermWin.parent[0];
1192 1142
1193 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1143 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1194 (char **)argv, argc, &szHint, &wmHint, &classHint); 1144 (char **)argv, argc, &szHint, &wmHint, &classHint);
1145
1146#ifndef NO_FRILLS
1147 long pid = getpid ();
1148 XChangeProperty (display->display, TermWin.parent[0],
1149 display->atom ("_NET_WM_PID"), XA_CARDINAL, 32,
1150 PropModeReplace, (unsigned char *)&pid, 1);
1151#endif
1195 1152
1196 XSelectInput (display->display, TermWin.parent[0], 1153 XSelectInput (display->display, TermWin.parent[0],
1197 KeyPressMask 1154 KeyPressMask
1198#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1155#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1199 | KeyReleaseMask 1156 | KeyReleaseMask
… …
1253 1210
1254#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1211#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1255 if (menuBar_height ()) 1212 if (menuBar_height ())
1256 { 1213 {
1257 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1214 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1258 window_vt_x, 0, 1215 window_vt_x, 0,
1259 TermWin_TotalWidth (), 1216 TermWin_TotalWidth (),
1260 menuBar_TotalHeight (), 1217 menuBar_TotalHeight (),
1261 0, 1218 0,
1262 PixColors[Color_fg], 1219 PixColors[Color_fg],
1263 PixColors[Color_scroll]); 1220 PixColors[Color_scroll]);
1221
1264#ifdef DEBUG_X 1222#ifdef DEBUG_X
1265 XStoreName (display->display, menuBar.win, "menubar"); 1223 XStoreName (display->display, menuBar.win, "menubar");
1266#endif 1224#endif
1267 1225
1226 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1227
1268 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1228 XDefineCursor (display->display, menuBar.win,
1229 XCreateFontCursor (display->display, XC_left_ptr));
1269 1230
1270 XSelectInput (display->display, menuBar.win, 1231 XSelectInput (display->display, menuBar.win,
1271 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1232 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1272 | Button1MotionMask)); 1233 | Button1MotionMask));
1273 menubar_ev.start (display, menuBar.win); 1234 menubar_ev.start (display, menuBar.win);
… …
1293 /* graphics context for the vt window */ 1254 /* graphics context for the vt window */
1294 gcvalue.foreground = PixColors[Color_fg]; 1255 gcvalue.foreground = PixColors[Color_fg];
1295 gcvalue.background = PixColors[Color_bg]; 1256 gcvalue.background = PixColors[Color_bg];
1296 gcvalue.graphics_exposures = 1; 1257 gcvalue.graphics_exposures = 1;
1297 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1258 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1298 GCForeground | GCBackground 1259 GCForeground | GCBackground | GCGraphicsExposures,
1299 | GCGraphicsExposures, &gcvalue); 1260 &gcvalue);
1261
1262 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1300 1263
1301#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1264#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1302 gcvalue.foreground = PixColors[Color_topShadow]; 1265 gcvalue.foreground = PixColors[Color_topShadow];
1303 topShadowGC = XCreateGC (display->display, TermWin.vt, 1266 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1304 GCForeground, &gcvalue);
1305 gcvalue.foreground = PixColors[Color_bottomShadow]; 1267 gcvalue.foreground = PixColors[Color_bottomShadow];
1306 botShadowGC = XCreateGC (display->display, TermWin.vt, 1268 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1307 GCForeground, &gcvalue);
1308 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1269 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1309 : Color_scroll)];
1310 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1270 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1311 GCForeground, &gcvalue);
1312#endif 1271#endif
1313} 1272}
1314 1273
1315/*----------------------------------------------------------------------*/ 1274/*----------------------------------------------------------------------*/
1316/* 1275/*
… …
1323{ 1282{
1324 int cfd, er; 1283 int cfd, er;
1325 1284
1326 /* get master (pty) */ 1285 /* get master (pty) */
1327 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1286 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1328 {
1329 rxvt_print_error ("can't open pseudo-tty"); 1287 rxvt_fatal ("can't open pseudo-tty");
1330 return -1;
1331 }
1332 1288
1333 fcntl (cfd, F_SETFL, O_NONBLOCK); 1289 fcntl (cfd, F_SETFL, O_NONBLOCK);
1334 1290
1335 /* get slave (tty) */ 1291 /* get slave (tty) */
1336 if (tty_fd < 0) 1292 if (tty_fd < 0)
… …
1340#endif 1296#endif
1341 1297
1342 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1298 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1343 { 1299 {
1344 close (cfd); 1300 close (cfd);
1345 rxvt_print_error ("can't open slave tty %s", ttydev); 1301 rxvt_fatal ("can't open slave tty %s", ttydev);
1346 return -1;
1347 } 1302 }
1348 } 1303 }
1349#ifndef NO_BACKSPACE_KEY 1304#ifndef NO_BACKSPACE_KEY
1350 if (key_backspace[0] && !key_backspace[1]) 1305 if (key_backspace[0] && !key_backspace[1])
1351 er = key_backspace[0]; 1306 er = key_backspace[0];
… …
1361#ifndef __QNX__ 1316#ifndef __QNX__
1362 /* spin off the command interpreter */ 1317 /* spin off the command interpreter */
1363 switch (cmd_pid = fork ()) 1318 switch (cmd_pid = fork ())
1364 { 1319 {
1365 case -1: 1320 case -1:
1366 rxvt_print_error ("can't fork"); 1321 rxvt_fatal ("can't fork");
1367 return -1;
1368 case 0: 1322 case 0:
1369 close (cfd); /* only keep tty_fd and STDERR open */ 1323 close (cfd); /* only keep tty_fd and STDERR open */
1370 1324
1371 init_env (); 1325 init_env ();
1372 1326
1373 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1327 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1374 rxvt_print_error ("could not obtain control of tty"); 1328 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1375 else 1329 else
1376 { 1330 {
1377 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1331 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1378 dup2 (tty_fd, STDIN_FILENO); 1332 dup2 (tty_fd, STDIN_FILENO);
1379 dup2 (tty_fd, STDOUT_FILENO); 1333 dup2 (tty_fd, STDOUT_FILENO);
… …
1381 1335
1382 if (tty_fd > 2) 1336 if (tty_fd > 2)
1383 close (tty_fd); 1337 close (tty_fd);
1384 1338
1385 run_child (argv); 1339 run_child (argv);
1340 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1386 } 1341 }
1342
1387 exit (EXIT_FAILURE); 1343 _exit (EXIT_FAILURE);
1388 /* NOTREACHED */ 1344
1389 default: 1345 default:
1390 { 1346 {
1391#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1347#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1392 int fdstdin; 1348 int fdstdin;
1393 1349
… …
1402#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1358#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1403 1359
1404 dup2 (fdstdin, STDIN_FILENO); 1360 dup2 (fdstdin, STDIN_FILENO);
1405 close (fdstdin); 1361 close (fdstdin);
1406#endif 1362#endif
1407
1408 } 1363 }
1364
1409 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1365 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1410 break; 1366 break;
1411 } 1367 }
1412#else /* __QNX__ uses qnxspawn () */ 1368#else /* __QNX__ uses qnxspawn () */
1413 fchmod (tty_fd, 0622); 1369 fchmod (tty_fd, 0622);

Diff Legend

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