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.39 by pcg, Sun Mar 14 17:33:07 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 395#endif
398 396
399 refresh_limit = 1; 397 refresh_limit = 1;
… …
500 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 498 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
501 499
502 cmd_argv[i] = NULL; 500 cmd_argv[i] = NULL;
503 } 501 }
504 502
505 /* clear all resources */
506 for (i = 0; i < NUM_RESOURCES;)
507 rs[i++] = NULL;
508
509 rs[Rs_name] = rxvt_r_basename (argv[0]); 503 rs[Rs_name] = rxvt_r_basename (argv[0]);
510 504
511 /* 505 /*
512 * Open display, get options/resources and create the window 506 * Open display, get options/resources and create the window
513 */ 507 */
… …
528 } 522 }
529#endif 523#endif
530 524
531 if (!display 525 if (!display
532 && ! (display = displays.get (rs[Rs_display_name]))) 526 && ! (display = displays.get (rs[Rs_display_name])))
533 {
534 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 527 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
535 exit (EXIT_FAILURE);
536 }
537 528
538 extract_resources (display->display, rs[Rs_name]); 529 extract_resources (display->display, rs[Rs_name]);
539 530
540 /* 531 /*
541 * set any defaults not already set 532 * set any defaults not already set
… …
622#endif 613#endif
623 if (rs[Rs_answerbackstring]) 614 if (rs[Rs_answerbackstring])
624 { 615 {
625 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 616 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
626 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 617 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
627 }
628
629 if (rs[Rs_selectstyle])
630 {
631 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
632 selection_style = OLD_WORD_SELECT;
633#ifndef NO_OLD_SELECTION
634
635 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
636 selection_style = OLD_SELECT;
637#endif
638
639 } 618 }
640 619
641#ifdef HAVE_SCROLLBARS 620#ifdef HAVE_SCROLLBARS
642 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 621 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
643 rs[Rs_scrollBar_thickness]); 622 rs[Rs_scrollBar_thickness]);
… …
669 color_aliases (Color_bg); 648 color_aliases (Color_bg);
670#ifndef NO_CURSORCOLOR 649#ifndef NO_CURSORCOLOR
671 color_aliases (Color_cursor); 650 color_aliases (Color_cursor);
672 color_aliases (Color_cursor2); 651 color_aliases (Color_cursor2);
673#endif /* NO_CURSORCOLOR */ 652#endif /* NO_CURSORCOLOR */
674 color_aliases (Color_pointer); 653 color_aliases (Color_pointer_fg);
654 color_aliases (Color_pointer_bg);
675 color_aliases (Color_border); 655 color_aliases (Color_border);
676#ifndef NO_BOLD_UNDERLINE_REVERSE 656#ifndef NO_BOLD_UNDERLINE_REVERSE
677 color_aliases (Color_BD); 657 color_aliases (Color_BD);
678 color_aliases (Color_UL); 658 color_aliases (Color_UL);
679 color_aliases (Color_RV); 659 color_aliases (Color_RV);
… …
777 free (this->locale); 757 free (this->locale);
778 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 758 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
779 SET_LOCALE (this->locale); 759 SET_LOCALE (this->locale);
780 mbstate.reset (); 760 mbstate.reset ();
781#endif 761#endif
762#if 0
782#if HAVE_NL_LANGINFO 763#if HAVE_NL_LANGINFO
783 free (codeset); 764 free (codeset);
784 codeset = strdup (nl_langinfo (CODESET)); 765 codeset = strdup (nl_langinfo (CODESET));
785 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 766 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
786 || !STRCASECMP (codeset, "UTF8"); 767 || !STRCASECMP (codeset, "UTF8");
787#else 768#else
788 enc_utf8 = 1; 769 enc_utf8 = 1;
789#endif 770#endif
771#endif
790} 772}
791 773
792void 774void
793rxvt_term::init_xlocale () 775rxvt_term::init_xlocale ()
794{ 776{
795#ifdef USE_XIM 777#ifdef USE_XIM
796 if (!locale) 778 if (!locale)
797 rxvt_print_error ("Setting locale failed."); 779 rxvt_warn ("setting locale failed, working without locale support.\n");
798 else 780 else
799 { 781 {
800 Atom wmlocale; 782 Atom wmlocale;
801 783
802 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
804 XA_STRING, 8, PropModeReplace, 786 XA_STRING, 8, PropModeReplace,
805 (unsigned char *)locale, STRLEN (locale)); 787 (unsigned char *)locale, STRLEN (locale));
806 788
807 if (!XSupportsLocale ()) 789 if (!XSupportsLocale ())
808 { 790 {
809 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");
810 return; 792 return;
811 } 793 }
812 794
813 im_ev.start (display); 795 im_ev.start (display);
814 796
… …
874 if (Options & Opt_cursorBlink) 856 if (Options & Opt_cursorBlink)
875 (void)gettimeofday (&lastcursorchange, NULL); 857 (void)gettimeofday (&lastcursorchange, NULL);
876#endif 858#endif
877 859
878 if ((cmd_fd = run_command (argv)) < 0) 860 if ((cmd_fd = run_command (argv)) < 0)
879 { 861 rxvt_fatal ("failure while running command, aborting");
880 rxvt_print_error ("aborting");
881 exit (EXIT_FAILURE);
882 }
883} 862}
884 863
885/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
886void 865void
887rxvt_term::Get_Colours () 866rxvt_term::Get_Colours ()
… …
912 switch (i) 891 switch (i)
913 { 892 {
914 case Color_fg: 893 case Color_fg:
915 case Color_bg: 894 case Color_bg:
916 /* fatal: need bg/fg color */ 895 /* fatal: need bg/fg color */
917 rxvt_print_error ("aborting"); 896 rxvt_fatal ("unable to get foreground/background colour, aborting");
918 exit (EXIT_FAILURE);
919 /* NOTREACHED */ 897 /* NOTREACHED */
920 break; 898 break;
921#ifndef NO_CURSORCOLOR 899#ifndef NO_CURSORCOLOR
922 case Color_cursor2: 900 case Color_cursor2:
923 xcol = PixColors[Color_fg]; 901 xcol = PixColors[Color_fg];
924 break; 902 break;
925#endif /* ! NO_CURSORCOLOR */ 903#endif /* ! NO_CURSORCOLOR */
926 case Color_pointer: 904 case Color_pointer_fg:
927 xcol = PixColors[Color_fg]; 905 xcol = PixColors[Color_fg];
928 break; 906 break;
929 default: 907 default:
930 xcol = PixColors[Color_bg]; /* None */ 908 xcol = PixColors[Color_bg]; /* None */
931 break; 909 break;
… …
935 913
936 PixColors[i] = xcol; 914 PixColors[i] = xcol;
937 SET_PIXCOLOR (i); 915 SET_PIXCOLOR (i);
938 } 916 }
939 917
940 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 918 if (XDEPTH <= 2)
941 PixColors[Color_pointer] = PixColors[Color_fg]; 919 {
942 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 920 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
943 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 }
944 924
945 /* 925 /*
946 * get scrollBar/menuBar shadow colors 926 * get scrollBar/menuBar shadow colors
947 * 927 *
948 * The calculations of topShadow/bottomShadow values are adapted 928 * The calculations of topShadow/bottomShadow values are adapted
… …
1092/*----------------------------------------------------------------------*/ 1072/*----------------------------------------------------------------------*/
1093/* rxvt_Create_Windows () - Open and map the window */ 1073/* rxvt_Create_Windows () - Open and map the window */
1094void 1074void
1095rxvt_term::create_windows (int argc, const char *const *argv) 1075rxvt_term::create_windows (int argc, const char *const *argv)
1096{ 1076{
1097 XClassHint classHint; 1077 XClassHint classHint;
1098 XWMHints wmHint; 1078 XWMHints wmHint;
1099 XGCValues gcvalue; 1079 XGCValues gcvalue;
1100 long vt_emask; 1080 long vt_emask;
1101 1081 XSetWindowAttributes attributes;
1102 XWindowAttributes gattr; 1082 XWindowAttributes gattr;
1103 1083
1104 if (Options & Opt_transparent) 1084 if (Options & Opt_transparent)
1105 { 1085 {
1106 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr); 1086 XGetWindowAttributes (display->display, RootWindow (display->display, display->screen), &gattr);
… …
1119 1099
1120 window_calc (0, 0); 1100 window_calc (0, 0);
1121 old_width = szHint.width; 1101 old_width = szHint.width;
1122 old_height = szHint.height; 1102 old_height = szHint.height;
1123 1103
1124 /* parent window - reverse video so we can see placement errors
1125 * sub-window placement & size in rxvt_resize_subwindows () 1104 /* sub-window placement & size in rxvt_resize_subwindows () */
1126 */
1127 1105
1128#ifdef PREFER_24BIT 1106#ifdef PREFER_24BIT
1129 XSetWindowAttributes attributes;
1130
1131 attributes.background_pixel = PixColors[Color_fg]; 1107 attributes.background_pixel = PixColors[Color_bg];
1132 attributes.border_pixel = PixColors[Color_border]; 1108 attributes.border_pixel = PixColors[Color_border];
1133 attributes.colormap = display->cmap; 1109 attributes.colormap = display->cmap;
1134 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display), 1110 TermWin.parent[0] = XCreateWindow (display->display, DefaultRootWindow (display->display),
1135 szHint.x, szHint.y, 1111 szHint.x, szHint.y,
1136 szHint.width, szHint.height, 1112 szHint.width, szHint.height,
1137 TermWin.ext_bwidth, 1113 TermWin.ext_bwidth,
1138 display->depth, InputOutput, 1114 display->depth, InputOutput,
1139 display->visual, 1115 display->visual,
1140 CWBackPixel | CWBorderPixel | CWColormap, &attributes); 1116 CWColormap | CWBackPixel | CWBorderPixel, &attributes);
1141#else 1117#else
1142 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display), 1118 TermWin.parent[0] = XCreateSimpleWindow (display->display, DefaultRootWindow (display->display),
1143 szHint.x, szHint.y, 1119 szHint.x, szHint.y,
1144 szHint.width, 1120 szHint.width, szHint.height,
1145 szHint.height,
1146 TermWin.ext_bwidth, 1121 TermWin.ext_bwidth,
1147 PixColors[Color_border], 1122 PixColors[Color_border],
1148 PixColors[Color_fg]); 1123 PixColors[Color_bg]);
1149#endif 1124#endif
1150 1125
1151 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1126 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1152 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1127 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1153 1128
1154 classHint.res_name = (char *)rs[Rs_name]; 1129 classHint.res_name = (char *)rs[Rs_name];
1155 classHint.res_class = (char *)RESCLASS; 1130 classHint.res_class = (char *)RESCLASS;
1156 1131
1157 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1132 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1158 wmHint.input = True; 1133 wmHint.input = True;
1159 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1134 wmHint.initial_state = Options & Opt_iconic ? IconicState : NormalState;
1160 : NormalState);
1161 wmHint.window_group = TermWin.parent[0]; 1135 wmHint.window_group = TermWin.parent[0];
1162 1136
1163 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1137 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1164 (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
1165 1146
1166 XSelectInput (display->display, TermWin.parent[0], 1147 XSelectInput (display->display, TermWin.parent[0],
1167 KeyPressMask 1148 KeyPressMask
1168#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1149#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1169 | KeyReleaseMask 1150 | KeyReleaseMask
… …
1204 1185
1205#ifdef DEBUG_X 1186#ifdef DEBUG_X
1206 XStoreName (display->display, TermWin.vt, "vt window"); 1187 XStoreName (display->display, TermWin.vt, "vt window");
1207#endif 1188#endif
1208 1189
1190 attributes.bit_gravity = NorthWestGravity;
1191 XChangeWindowAttributes (display->display, TermWin.vt, CWBitGravity, &attributes);
1192
1209 vt_emask = (ExposureMask | ButtonPressMask | ButtonReleaseMask 1193 vt_emask = ExposureMask | ButtonPressMask | ButtonReleaseMask | PropertyChangeMask;
1210 | PropertyChangeMask);
1211 1194
1212#ifdef POINTER_BLANK 1195#ifdef POINTER_BLANK
1213 pointer_unblank (); 1196 pointer_unblank ();
1214 1197
1215 if ((Options & Opt_pointerBlank)) 1198 if (Options & Opt_pointerBlank)
1216 vt_emask |= PointerMotionMask; 1199 vt_emask |= PointerMotionMask;
1217 else 1200 else
1218#endif 1201#endif
1219 vt_emask |= (Button1MotionMask | Button3MotionMask); 1202 vt_emask |= Button1MotionMask | Button3MotionMask;
1220 1203
1221 XSelectInput (display->display, TermWin.vt, vt_emask); 1204 XSelectInput (display->display, TermWin.vt, vt_emask);
1222 vt_ev.start (display, TermWin.vt); 1205 vt_ev.start (display, TermWin.vt);
1223 1206
1224#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1207#if defined(MENUBAR) && (MENUBAR_MAX > 1)
… …
1267 /* graphics context for the vt window */ 1250 /* graphics context for the vt window */
1268 gcvalue.foreground = PixColors[Color_fg]; 1251 gcvalue.foreground = PixColors[Color_fg];
1269 gcvalue.background = PixColors[Color_bg]; 1252 gcvalue.background = PixColors[Color_bg];
1270 gcvalue.graphics_exposures = 1; 1253 gcvalue.graphics_exposures = 1;
1271 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1254 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1272 GCForeground | GCBackground 1255 GCForeground | GCBackground | GCGraphicsExposures,
1273 | GCGraphicsExposures, &gcvalue); 1256 &gcvalue);
1274 1257
1275 TermWin.drawable = new rxvt_drawable (display, TermWin.vt); 1258 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1276 1259
1277#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1260#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1278 gcvalue.foreground = PixColors[Color_topShadow]; 1261 gcvalue.foreground = PixColors[Color_topShadow];
… …
1295{ 1278{
1296 int cfd, er; 1279 int cfd, er;
1297 1280
1298 /* get master (pty) */ 1281 /* get master (pty) */
1299 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1282 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1300 {
1301 rxvt_print_error ("can't open pseudo-tty"); 1283 rxvt_fatal ("can't open pseudo-tty");
1302 return -1;
1303 }
1304 1284
1305 fcntl (cfd, F_SETFL, O_NONBLOCK); 1285 fcntl (cfd, F_SETFL, O_NONBLOCK);
1306 1286
1307 /* get slave (tty) */ 1287 /* get slave (tty) */
1308 if (tty_fd < 0) 1288 if (tty_fd < 0)
… …
1312#endif 1292#endif
1313 1293
1314 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1294 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1315 { 1295 {
1316 close (cfd); 1296 close (cfd);
1317 rxvt_print_error ("can't open slave tty %s", ttydev); 1297 rxvt_fatal ("can't open slave tty %s", ttydev);
1318 return -1;
1319 } 1298 }
1320 } 1299 }
1321#ifndef NO_BACKSPACE_KEY 1300#ifndef NO_BACKSPACE_KEY
1322 if (key_backspace[0] && !key_backspace[1]) 1301 if (key_backspace[0] && !key_backspace[1])
1323 er = key_backspace[0]; 1302 er = key_backspace[0];
… …
1333#ifndef __QNX__ 1312#ifndef __QNX__
1334 /* spin off the command interpreter */ 1313 /* spin off the command interpreter */
1335 switch (cmd_pid = fork ()) 1314 switch (cmd_pid = fork ())
1336 { 1315 {
1337 case -1: 1316 case -1:
1338 rxvt_print_error ("can't fork"); 1317 rxvt_fatal ("can't fork");
1339 return -1;
1340 case 0: 1318 case 0:
1341 close (cfd); /* only keep tty_fd and STDERR open */ 1319 close (cfd); /* only keep tty_fd and STDERR open */
1342 1320
1343 init_env (); 1321 init_env ();
1344 1322
1345 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1323 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1346 rxvt_print_error ("could not obtain control of tty"); 1324 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1347 else 1325 else
1348 { 1326 {
1349 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1327 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1350 dup2 (tty_fd, STDIN_FILENO); 1328 dup2 (tty_fd, STDIN_FILENO);
1351 dup2 (tty_fd, STDOUT_FILENO); 1329 dup2 (tty_fd, STDOUT_FILENO);
… …
1353 1331
1354 if (tty_fd > 2) 1332 if (tty_fd > 2)
1355 close (tty_fd); 1333 close (tty_fd);
1356 1334
1357 run_child (argv); 1335 run_child (argv);
1336 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1358 } 1337 }
1338
1359 exit (EXIT_FAILURE); 1339 _exit (EXIT_FAILURE);
1360 /* NOTREACHED */ 1340
1361 default: 1341 default:
1362 { 1342 {
1363#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1343#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1364 int fdstdin; 1344 int fdstdin;
1365 1345
… …
1374#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1354#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1375 1355
1376 dup2 (fdstdin, STDIN_FILENO); 1356 dup2 (fdstdin, STDIN_FILENO);
1377 close (fdstdin); 1357 close (fdstdin);
1378#endif 1358#endif
1379
1380 } 1359 }
1360
1381 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1361 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1382 break; 1362 break;
1383 } 1363 }
1384#else /* __QNX__ uses qnxspawn () */ 1364#else /* __QNX__ uses qnxspawn () */
1385 fchmod (tty_fd, 0622); 1365 fchmod (tty_fd, 0622);

Diff Legend

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