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.33 by pcg, Sun Feb 22 10:37:54 2004 UTC vs.
Revision 1.49 by pcg, Fri Apr 2 15:15:25 2004 UTC

… …
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;
407#ifdef MULTICHAR_SET
408# ifdef MULTICHAR_ENCODING
409 encoding_method = MULTICHAR_ENCODING;
410# endif
411 multichar_decode = rxvt_euc2jis;
412#endif
413 400
414 oldcursor.row = oldcursor.col = -1; 401 oldcursor.row = oldcursor.col = -1;
415#ifdef XPM_BACKGROUND 402#ifdef XPM_BACKGROUND
416 /* bgPixmap.w = bgPixmap.h = 0; */ 403 /* bgPixmap.w = bgPixmap.h = 0; */
417 bgPixmap.x = bgPixmap.y = 50; 404 bgPixmap.x = bgPixmap.y = 50;
… …
511 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 498 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
512 499
513 cmd_argv[i] = NULL; 500 cmd_argv[i] = NULL;
514 } 501 }
515 502
516 /* clear all resources */
517 for (i = 0; i < NUM_RESOURCES;)
518 rs[i++] = NULL;
519
520 rs[Rs_name] = rxvt_r_basename (argv[0]); 503 rs[Rs_name] = rxvt_r_basename (argv[0]);
521 504
522 /* 505 /*
523 * Open display, get options/resources and create the window 506 * Open display, get options/resources and create the window
524 */ 507 */
… …
539 } 522 }
540#endif 523#endif
541 524
542 if (!display 525 if (!display
543 && ! (display = displays.get (rs[Rs_display_name]))) 526 && ! (display = displays.get (rs[Rs_display_name])))
544 {
545 rxvt_print_error ("can't open display %s", rs[Rs_display_name]); 527 rxvt_fatal ("can't open display %s", rs[Rs_display_name]);
546 exit (EXIT_FAILURE);
547 }
548 528
549 extract_resources (display->display, rs[Rs_name]); 529 extract_resources (display->display, rs[Rs_name]);
550 530
551 /* 531 /*
552 * set any defaults not already set 532 * set any defaults not already set
… …
597 rs[Rs_print_pipe] = PRINTPIPE; 577 rs[Rs_print_pipe] = PRINTPIPE;
598#endif 578#endif
599 579
600 if (!rs[Rs_cutchars]) 580 if (!rs[Rs_cutchars])
601 rs[Rs_cutchars] = CUTCHARS; 581 rs[Rs_cutchars] = CUTCHARS;
602
603#ifdef ACS_ASCII
604 if (!rs[Rs_acs_chars])
605 rs[Rs_acs_chars] = ACS_CHARS;
606 if ((i = STRLEN (rs[Rs_acs_chars])) < 0x20)
607 {
608 val = rxvt_realloc ((void *)rs[Rs_acs_chars], 0x20);
609 for (; i < 0x20; )
610 val[i] = ' ';
611 rs[Rs_acs_chars] = val;
612 }
613#endif
614 582
615#ifndef NO_BACKSPACE_KEY 583#ifndef NO_BACKSPACE_KEY
616 if (!rs[Rs_backspace_key]) 584 if (!rs[Rs_backspace_key])
617# ifdef DEFAULT_BACKSPACE 585# ifdef DEFAULT_BACKSPACE
618 key_backspace = DEFAULT_BACKSPACE; 586 key_backspace = DEFAULT_BACKSPACE;
… …
645#endif 613#endif
646 if (rs[Rs_answerbackstring]) 614 if (rs[Rs_answerbackstring])
647 { 615 {
648 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]); 616 rxvt_Str_trim ((char *)rs[Rs_answerbackstring]);
649 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]); 617 rxvt_Str_escaped ((char *)rs[Rs_answerbackstring]);
650 }
651
652 if (rs[Rs_selectstyle])
653 {
654 if (STRNCASECMP (rs[Rs_selectstyle], "oldword", 7) == 0)
655 selection_style = OLD_WORD_SELECT;
656#ifndef NO_OLD_SELECTION
657
658 else if (STRNCASECMP (rs[Rs_selectstyle], "old", 3) == 0)
659 selection_style = OLD_SELECT;
660#endif
661
662 } 618 }
663 619
664#ifdef HAVE_SCROLLBARS 620#ifdef HAVE_SCROLLBARS
665 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle], 621 setup_scrollbar (rs[Rs_scrollBar_align], rs[Rs_scrollstyle],
666 rs[Rs_scrollBar_thickness]); 622 rs[Rs_scrollBar_thickness]);
… …
692 color_aliases (Color_bg); 648 color_aliases (Color_bg);
693#ifndef NO_CURSORCOLOR 649#ifndef NO_CURSORCOLOR
694 color_aliases (Color_cursor); 650 color_aliases (Color_cursor);
695 color_aliases (Color_cursor2); 651 color_aliases (Color_cursor2);
696#endif /* NO_CURSORCOLOR */ 652#endif /* NO_CURSORCOLOR */
697 color_aliases (Color_pointer); 653 color_aliases (Color_pointer_fg);
654 color_aliases (Color_pointer_bg);
698 color_aliases (Color_border); 655 color_aliases (Color_border);
699#ifndef NO_BOLD_UNDERLINE_REVERSE 656#ifndef NO_BOLD_UNDERLINE_REVERSE
700 color_aliases (Color_BD); 657 color_aliases (Color_BD);
701 color_aliases (Color_UL); 658 color_aliases (Color_UL);
702 color_aliases (Color_RV); 659 color_aliases (Color_RV);
… …
800 free (this->locale); 757 free (this->locale);
801 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale)); 758 this->locale = rxvt_strdup (setlocale (LC_CTYPE, locale));
802 SET_LOCALE (this->locale); 759 SET_LOCALE (this->locale);
803 mbstate.reset (); 760 mbstate.reset ();
804#endif 761#endif
762#if 0
805#if HAVE_NL_LANGINFO 763#if HAVE_NL_LANGINFO
806 free (codeset); 764 free (codeset);
807 codeset = strdup (nl_langinfo (CODESET)); 765 codeset = strdup (nl_langinfo (CODESET));
808 enc_utf8 = !STRCASECMP (codeset, "UTF-8") 766 enc_utf8 = !STRCASECMP (codeset, "UTF-8")
809 || !STRCASECMP (codeset, "UTF8"); 767 || !STRCASECMP (codeset, "UTF8");
810#else 768#else
811 enc_utf8 = 1; 769 enc_utf8 = 1;
812#endif 770#endif
771#endif
813} 772}
814 773
815void 774void
816rxvt_term::init_xlocale () 775rxvt_term::init_xlocale ()
817{ 776{
818#ifdef USE_XIM 777#ifdef USE_XIM
819 if (!locale) 778 if (!locale)
820 rxvt_print_error ("Setting locale failed."); 779 rxvt_warn ("setting locale failed, working without locale support.\n");
821 else 780 else
822 { 781 {
823 Atom wmlocale; 782 Atom wmlocale;
824 783
825 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False); 784 wmlocale = XInternAtom (display->display, "WM_LOCALE_NAME", False);
… …
827 XA_STRING, 8, PropModeReplace, 786 XA_STRING, 8, PropModeReplace,
828 (unsigned char *)locale, STRLEN (locale)); 787 (unsigned char *)locale, STRLEN (locale));
829 788
830 if (!XSupportsLocale ()) 789 if (!XSupportsLocale ())
831 { 790 {
832 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");
833 return; 792 return;
834 } 793 }
835 794
836 im_ev.start (display); 795 im_ev.start (display);
837 796
… …
897 if (Options & Opt_cursorBlink) 856 if (Options & Opt_cursorBlink)
898 (void)gettimeofday (&lastcursorchange, NULL); 857 (void)gettimeofday (&lastcursorchange, NULL);
899#endif 858#endif
900 859
901 if ((cmd_fd = run_command (argv)) < 0) 860 if ((cmd_fd = run_command (argv)) < 0)
902 { 861 rxvt_fatal ("failure while running command, aborting");
903 rxvt_print_error ("aborting");
904 exit (EXIT_FAILURE);
905 }
906} 862}
907 863
908/*----------------------------------------------------------------------*/ 864/*----------------------------------------------------------------------*/
909void 865void
910rxvt_term::Get_Colours () 866rxvt_term::Get_Colours ()
… …
935 switch (i) 891 switch (i)
936 { 892 {
937 case Color_fg: 893 case Color_fg:
938 case Color_bg: 894 case Color_bg:
939 /* fatal: need bg/fg color */ 895 /* fatal: need bg/fg color */
940 rxvt_print_error ("aborting"); 896 rxvt_fatal ("unable to get foreground/background colour, aborting");
941 exit (EXIT_FAILURE);
942 /* NOTREACHED */ 897 /* NOTREACHED */
943 break; 898 break;
944#ifndef NO_CURSORCOLOR 899#ifndef NO_CURSORCOLOR
945 case Color_cursor2: 900 case Color_cursor2:
946 xcol = PixColors[Color_fg]; 901 xcol = PixColors[Color_fg];
947 break; 902 break;
948#endif /* ! NO_CURSORCOLOR */ 903#endif /* ! NO_CURSORCOLOR */
949 case Color_pointer: 904 case Color_pointer_fg:
950 xcol = PixColors[Color_fg]; 905 xcol = PixColors[Color_fg];
951 break; 906 break;
952 default: 907 default:
953 xcol = PixColors[Color_bg]; /* None */ 908 xcol = PixColors[Color_bg]; /* None */
954 break; 909 break;
… …
958 913
959 PixColors[i] = xcol; 914 PixColors[i] = xcol;
960 SET_PIXCOLOR (i); 915 SET_PIXCOLOR (i);
961 } 916 }
962 917
963 if (XDEPTH <= 2 || !rs[Rs_color + Color_pointer]) 918 if (XDEPTH <= 2)
964 PixColors[Color_pointer] = PixColors[Color_fg]; 919 {
965 if (XDEPTH <= 2 || !rs[Rs_color + Color_border]) 920 if (!rs[Rs_color + Color_pointer_fg]) PixColors[Color_pointer_fg] = PixColors[Color_fg];
966 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 }
967 924
968 /* 925 /*
969 * get scrollBar/menuBar shadow colors 926 * get scrollBar/menuBar shadow colors
970 * 927 *
971 * The calculations of topShadow/bottomShadow values are adapted 928 * The calculations of topShadow/bottomShadow values are adapted
… …
1169 TermWin.ext_bwidth, 1126 TermWin.ext_bwidth,
1170 PixColors[Color_border], 1127 PixColors[Color_border],
1171 PixColors[Color_fg]); 1128 PixColors[Color_fg]);
1172#endif 1129#endif
1173 1130
1174 xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST); 1131 process_xterm_seq (XTerm_title, rs[Rs_title], CHAR_ST);
1175 xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST); 1132 process_xterm_seq (XTerm_iconName, rs[Rs_iconName], CHAR_ST);
1176 1133
1177 classHint.res_name = (char *)rs[Rs_name]; 1134 classHint.res_name = (char *)rs[Rs_name];
1178 classHint.res_class = (char *)APL_CLASS; 1135 classHint.res_class = (char *)RESCLASS;
1179 1136
1180 wmHint.flags = (InputHint | StateHint | WindowGroupHint); 1137 wmHint.flags = (InputHint | StateHint | WindowGroupHint);
1181 wmHint.input = True; 1138 wmHint.input = True;
1182 wmHint.initial_state = (Options & Opt_iconic ? IconicState 1139 wmHint.initial_state = (Options & Opt_iconic ? IconicState
1183 : NormalState); 1140 : NormalState);
1184 wmHint.window_group = TermWin.parent[0]; 1141 wmHint.window_group = TermWin.parent[0];
1185 1142
1186 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL, 1143 XSetWMProperties (display->display, TermWin.parent[0], NULL, NULL,
1187 (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
1188 1152
1189 XSelectInput (display->display, TermWin.parent[0], 1153 XSelectInput (display->display, TermWin.parent[0],
1190 KeyPressMask 1154 KeyPressMask
1191#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING) 1155#if defined(MOUSE_WHEEL) && defined(MOUSE_SLIP_WHEELING)
1192 | KeyReleaseMask 1156 | KeyReleaseMask
… …
1246 1210
1247#if defined(MENUBAR) && (MENUBAR_MAX > 1) 1211#if defined(MENUBAR) && (MENUBAR_MAX > 1)
1248 if (menuBar_height ()) 1212 if (menuBar_height ())
1249 { 1213 {
1250 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0], 1214 menuBar.win = XCreateSimpleWindow (display->display, TermWin.parent[0],
1251 window_vt_x, 0, 1215 window_vt_x, 0,
1252 TermWin_TotalWidth (), 1216 TermWin_TotalWidth (),
1253 menuBar_TotalHeight (), 1217 menuBar_TotalHeight (),
1254 0, 1218 0,
1255 PixColors[Color_fg], 1219 PixColors[Color_fg],
1256 PixColors[Color_scroll]); 1220 PixColors[Color_scroll]);
1221
1257#ifdef DEBUG_X 1222#ifdef DEBUG_X
1258 XStoreName (display->display, menuBar.win, "menubar"); 1223 XStoreName (display->display, menuBar.win, "menubar");
1259#endif 1224#endif
1260 1225
1226 menuBar.drawable = new rxvt_drawable (display, menuBar.win);
1227
1261 XDefineCursor (display->display, menuBar.win, pointer_leftptr); 1228 XDefineCursor (display->display, menuBar.win,
1229 XCreateFontCursor (display->display, XC_left_ptr));
1262 1230
1263 XSelectInput (display->display, menuBar.win, 1231 XSelectInput (display->display, menuBar.win,
1264 (ExposureMask | ButtonPressMask | ButtonReleaseMask 1232 (ExposureMask | ButtonPressMask | ButtonReleaseMask
1265 | Button1MotionMask)); 1233 | Button1MotionMask));
1266 menubar_ev.start (display, menuBar.win); 1234 menubar_ev.start (display, menuBar.win);
… …
1286 /* graphics context for the vt window */ 1254 /* graphics context for the vt window */
1287 gcvalue.foreground = PixColors[Color_fg]; 1255 gcvalue.foreground = PixColors[Color_fg];
1288 gcvalue.background = PixColors[Color_bg]; 1256 gcvalue.background = PixColors[Color_bg];
1289 gcvalue.graphics_exposures = 1; 1257 gcvalue.graphics_exposures = 1;
1290 TermWin.gc = XCreateGC (display->display, TermWin.vt, 1258 TermWin.gc = XCreateGC (display->display, TermWin.vt,
1291 GCForeground | GCBackground 1259 GCForeground | GCBackground | GCGraphicsExposures,
1292 | GCGraphicsExposures, &gcvalue); 1260 &gcvalue);
1261
1262 TermWin.drawable = new rxvt_drawable (display, TermWin.vt);
1293 1263
1294#if defined(MENUBAR) || defined(RXVT_SCROLLBAR) 1264#if defined(MENUBAR) || defined(RXVT_SCROLLBAR)
1295 gcvalue.foreground = PixColors[Color_topShadow]; 1265 gcvalue.foreground = PixColors[Color_topShadow];
1296 topShadowGC = XCreateGC (display->display, TermWin.vt, 1266 topShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1297 GCForeground, &gcvalue);
1298 gcvalue.foreground = PixColors[Color_bottomShadow]; 1267 gcvalue.foreground = PixColors[Color_bottomShadow];
1299 botShadowGC = XCreateGC (display->display, TermWin.vt, 1268 botShadowGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1300 GCForeground, &gcvalue);
1301 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg 1269 gcvalue.foreground = PixColors[ (XDEPTH <= 2 ? Color_fg : Color_scroll)];
1302 : Color_scroll)];
1303 scrollbarGC = XCreateGC (display->display, TermWin.vt, 1270 scrollbarGC = XCreateGC (display->display, TermWin.vt, GCForeground, &gcvalue);
1304 GCForeground, &gcvalue);
1305#endif 1271#endif
1306} 1272}
1307 1273
1308/*----------------------------------------------------------------------*/ 1274/*----------------------------------------------------------------------*/
1309/* 1275/*
… …
1316{ 1282{
1317 int cfd, er; 1283 int cfd, er;
1318 1284
1319 /* get master (pty) */ 1285 /* get master (pty) */
1320 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0) 1286 if ((cfd = rxvt_get_pty (& (tty_fd), & (ttydev))) < 0)
1321 {
1322 rxvt_print_error ("can't open pseudo-tty"); 1287 rxvt_fatal ("can't open pseudo-tty");
1323 return -1;
1324 }
1325 1288
1326 fcntl (cfd, F_SETFL, O_NONBLOCK); 1289 fcntl (cfd, F_SETFL, O_NONBLOCK);
1327 1290
1328 /* get slave (tty) */ 1291 /* get slave (tty) */
1329 if (tty_fd < 0) 1292 if (tty_fd < 0)
… …
1333#endif 1296#endif
1334 1297
1335 if ((tty_fd = rxvt_get_tty (ttydev)) < 0) 1298 if ((tty_fd = rxvt_get_tty (ttydev)) < 0)
1336 { 1299 {
1337 close (cfd); 1300 close (cfd);
1338 rxvt_print_error ("can't open slave tty %s", ttydev); 1301 rxvt_fatal ("can't open slave tty %s", ttydev);
1339 return -1;
1340 } 1302 }
1341 } 1303 }
1342#ifndef NO_BACKSPACE_KEY 1304#ifndef NO_BACKSPACE_KEY
1343 if (key_backspace[0] && !key_backspace[1]) 1305 if (key_backspace[0] && !key_backspace[1])
1344 er = key_backspace[0]; 1306 er = key_backspace[0];
… …
1354#ifndef __QNX__ 1316#ifndef __QNX__
1355 /* spin off the command interpreter */ 1317 /* spin off the command interpreter */
1356 switch (cmd_pid = fork ()) 1318 switch (cmd_pid = fork ())
1357 { 1319 {
1358 case -1: 1320 case -1:
1359 rxvt_print_error ("can't fork"); 1321 rxvt_fatal ("can't fork");
1360 return -1;
1361 case 0: 1322 case 0:
1362 close (cfd); /* only keep tty_fd and STDERR open */ 1323 close (cfd); /* only keep tty_fd and STDERR open */
1363 1324
1364 init_env (); 1325 init_env ();
1365 1326
1366 if (rxvt_control_tty (tty_fd, ttydev) < 0) 1327 if (rxvt_control_tty (tty_fd, ttydev) < 0)
1367 rxvt_print_error ("could not obtain control of tty"); 1328 fprintf (stderr, "%s: could not obtain control of tty.", RESNAME);
1368 else 1329 else
1369 { 1330 {
1370 /* Reopen stdin, stdout and stderr over the tty file descriptor */ 1331 /* Reopen stdin, stdout and stderr over the tty file descriptor */
1371 dup2 (tty_fd, STDIN_FILENO); 1332 dup2 (tty_fd, STDIN_FILENO);
1372 dup2 (tty_fd, STDOUT_FILENO); 1333 dup2 (tty_fd, STDOUT_FILENO);
… …
1374 1335
1375 if (tty_fd > 2) 1336 if (tty_fd > 2)
1376 close (tty_fd); 1337 close (tty_fd);
1377 1338
1378 run_child (argv); 1339 run_child (argv);
1340 fprintf (stderr, "%s: unable to exec child.", RESNAME);
1379 } 1341 }
1342
1380 exit (EXIT_FAILURE); 1343 _exit (EXIT_FAILURE);
1381 /* NOTREACHED */ 1344
1382 default: 1345 default:
1383 { 1346 {
1384#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1347#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1385 int fdstdin; 1348 int fdstdin;
1386 1349
… …
1395#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT) 1358#if defined(HAVE_STRUCT_UTMP) && defined(HAVE_TTYSLOT)
1396 1359
1397 dup2 (fdstdin, STDIN_FILENO); 1360 dup2 (fdstdin, STDIN_FILENO);
1398 close (fdstdin); 1361 close (fdstdin);
1399#endif 1362#endif
1400
1401 } 1363 }
1364
1402 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */ 1365 close (tty_fd); /* keep STDERR_FILENO, cmd_fd, display->fd () open */
1403 break; 1366 break;
1404 } 1367 }
1405#else /* __QNX__ uses qnxspawn () */ 1368#else /* __QNX__ uses qnxspawn () */
1406 fchmod (tty_fd, 0622); 1369 fchmod (tty_fd, 0622);

Diff Legend

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