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.304 by sf-exg, Tue Dec 6 10:27:15 2011 UTC vs.
Revision 1.333 by mikachu, Tue Jul 29 13:50:05 2014 UTC

… …
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
58#endif 56#endif
… …
78#include <netinet/in.h> 76#include <netinet/in.h>
79#include <arpa/inet.h> 77#include <arpa/inet.h>
80#include <net/if.h> 78#include <net/if.h>
81#include <net/if_arp.h> 79#include <net/if_arp.h>
82 80
83static char * 81static char * ecb_cold
84rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
85{ 83{
86 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 85 struct ifconf ifc;
88 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
521#endif 519#endif
522 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
525#endif 523#endif
526#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
527 NULL, 525 NULL,
528#endif 526#endif
529#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 528 "rgb:00/00/00",
531#endif 529#endif
… …
567 565
568/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
569const char ** 567const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
571{ 569{
572 int i, r_argc; 570 int i;
573 const char **cmd_argv; 571 const char **cmd_argv;
574
575 /*
576 * Look for -e option. Find => split and make cmd_argv[] of command args
577 */
578 for (r_argc = 0; r_argc < argc; r_argc++)
579 if (!strcmp (argv[r_argc], "-e"))
580 break;
581
582 if (r_argc == argc)
583 cmd_argv = NULL;
584 else if (!argv[r_argc + 1])
585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
586 else
587 {
588 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
589
590 for (i = 0; i < argc - r_argc - 1; i++)
591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
592
593 cmd_argv[i] = NULL;
594 }
595 572
596 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
597 574
598 /* 575 /*
599 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
600 */ 577 */
601 578
602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
603 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
604 581
605 get_options (r_argc, argv); 582 cmd_argv = get_options (argc, argv);
606 583
607 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
609 586
610 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
611 xa = display->xa; 588 xa = display->xa;
612 589
613 set (display); 590 set (display);
614 extract_resources (); 591 extract_resources ();
615 592
616#if XFT 593#if ENABLE_FRILLS
617 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
618 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
619#endif 598#endif
620 599
621 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
622 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
623 rs [i] = 0; 602 rs [i] = 0;
… …
754 return cmd_argv; 733 return cmd_argv;
755} 734}
756 735
757/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
758void 737void
759rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
760{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
761 this->envv = envv; 744 this->envv = envv;
762 745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
763 SET_R (this); 771 SET_R (this);
764 set_locale (""); 772 set_locale ("");
765 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
766 774
767 init_vars (); 775 init_vars ();
… …
785 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
786 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
787 795
788 pty = ptytty::create (); 796 pty = ptytty::create ();
789 797
790#ifdef HAVE_AFTERIMAGE
791 set_application_name ((char *)rs[Rs_name]);
792 set_output_threshold (OUTPUT_LEVEL_WARNING);
793#endif
794
795 // must be called before create_windows, because the latter may call set_icon
796#ifdef HAVE_PIXBUF
797 g_type_init ();
798#endif
799
800 create_windows (argc, argv); 798 create_windows (argc, argv);
801 799
802 init_xlocale (); 800 init_xlocale ();
803 801
804 scr_poweron (); // initialize screen 802 scr_poweron (); // initialize screen
… …
807 XSynchronize (dpy, True); 805 XSynchronize (dpy, True);
808#endif 806#endif
809 807
810 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
811 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
810
812#ifdef HAVE_BG_PIXMAP 811#ifdef HAVE_BG_PIXMAP
813 {
814 bg_init (); 812 bg_init ();
815
816#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent))
818 {
819 bg_set_transparent ();
820
821 if (rs [Rs_blurradius])
822 bg_set_blur (rs [Rs_blurradius]);
823
824 if (ISSET_PIXCOLOR (Color_tint))
825 bg_set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bg_set_shade (rs [Rs_shade]);
829
830 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 if (bg_set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ())
841 update_background ();
842 }
843#endif
844 }
845#endif 813#endif
846 814
847#if ENABLE_PERL 815#if ENABLE_PERL
848 rootwin_ev.start (display, display->root); 816 rootwin_ev.start (display, display->root);
849#endif 817#endif
850 818
851 set_colorfgbg (); 819 init_done = 1;
852 820
853 init_command (cmd_argv); 821 init_command (cmd_argv);
854
855 free (cmd_argv);
856 822
857 if (pty->pty >= 0) 823 if (pty->pty >= 0)
858 pty_ev.start (pty->pty, ev::READ); 824 pty_ev.start (pty->pty, ev::READ);
859 825
860 HOOK_INVOKE ((this, HOOK_START, DT_END)); 826 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
902/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
903void 869void
904rxvt_term::init_env () 870rxvt_term::init_env ()
905{ 871{
906 char *val; 872 char *val;
873 char *env_display;
874 char *env_windowid;
875 char *env_colorfgbg;
876 char *env_term;
907 877
908#ifdef DISPLAY_IS_IP 878#ifdef DISPLAY_IS_IP
909 /* Fixup display_name for export over pty to any interested terminal 879 /* Fixup display_name for export over pty to any interested terminal
910 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 880 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
911 * (for the first non-loopback interface) that we get from 881 * (for the first non-loopback interface) that we get from
… …
928 898
929 env_display = (char *)rxvt_malloc (strlen (val) + 9); 899 env_display = (char *)rxvt_malloc (strlen (val) + 9);
930 900
931 sprintf (env_display, "DISPLAY=%s", val); 901 sprintf (env_display, "DISPLAY=%s", val);
932 902
903 env_windowid = (char *)rxvt_malloc (21);
933 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 904 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
934 905
935 /* add entries to the environment: 906 /* add entries to the environment:
936 * @ DISPLAY: in case we started with -display 907 * @ DISPLAY: in case we started with -display
937 * @ WINDOWID: X window id number of the window 908 * @ WINDOWID: X window id number of the window
… …
941 * @ COLORFGBG: fg;bg color codes 912 * @ COLORFGBG: fg;bg color codes
942 */ 913 */
943 putenv (env_display); 914 putenv (env_display);
944 putenv (env_windowid); 915 putenv (env_windowid);
945 916
946 if (env_colorfgbg) 917 env_colorfgbg = get_colorfgbg ();
947 putenv (env_colorfgbg); 918 putenv (env_colorfgbg);
948 919
949#ifdef RXVT_TERMINFO 920#ifdef RXVT_TERMINFO
950 putenv ("TERMINFO=" RXVT_TERMINFO); 921 putenv ("TERMINFO=" RXVT_TERMINFO);
951#endif 922#endif
952 923
… …
971 unsetenv ("TERMCAP"); /* terminfo should be okay */ 942 unsetenv ("TERMCAP"); /* terminfo should be okay */
972#endif /* HAVE_UNSETENV */ 943#endif /* HAVE_UNSETENV */
973} 944}
974 945
975/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
976/*
977 * This is more or less stolen straight from XFree86 xterm.
978 * This should support all European type languages.
979 */
980void 947void
981rxvt_term::set_locale (const char *locale) 948rxvt_term::set_locale (const char *locale)
982{ 949{
983 set_environ (envv); 950 set_environ (envv);
984 951
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 952 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 953 this->locale = setlocale (LC_CTYPE, locale);
988 954
989 if (!this->locale) 955 if (!this->locale)
990 { 956 {
… …
1001 967
1002 968
1003 this->locale = strdup (this->locale); 969 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 970 SET_LOCALE (this->locale);
1005 mbstate.reset (); 971 mbstate.reset ();
1006#endif
1007 972
1008#if HAVE_NL_LANGINFO 973#if HAVE_NL_LANGINFO
1009 char *codeset = strdup (nl_langinfo (CODESET)); 974 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 975 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 976 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1012 && (codeset[1] == 'T' || codeset[1] == 't') 977 && (codeset[1] == 'T' || codeset[1] == 't')
1013 && (codeset[2] == 'F' || codeset[2] == 'f') 978 && (codeset[2] == 'F' || codeset[2] == 'f')
1014 && (codeset[3] == '8' || codeset[4] == '8'); 979 && (codeset[3] == '8' || codeset[4] == '8');
1015 free (codeset);
1016#else 980#else
1017 enc_utf8 = 0; 981 enc_utf8 = 0;
1018#endif 982#endif
1019} 983}
1020 984
1021void 985void
1022rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
1023{ 987{
1024 set_environ (envv); 988 set_environ (envv);
1025 989
1026#ifdef USE_XIM 990#if USE_XIM
1027 if (!locale) 991 if (!locale)
1028 rxvt_warn ("setting locale failed, working without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1029 else 993 else
1030 { 994 {
1031 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1032 996
1033 if (!XSupportsLocale ()) 997 if (!XSupportsLocale ())
1034 { 998 {
1035 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 999 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1036 return; 1000 return;
1037 } 1001 }
1038 1002
1039 im_ev.start (display); 1003 im_ev.start (display);
1040 1004
… …
1189/*----------------------------------------------------------------------*/ 1153/*----------------------------------------------------------------------*/
1190/* color aliases, fg/bg bright-bold */ 1154/* color aliases, fg/bg bright-bold */
1191void 1155void
1192rxvt_term::color_aliases (int idx) 1156rxvt_term::color_aliases (int idx)
1193{ 1157{
1194 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1158 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1195 { 1159 {
1196 int i = atoi (rs[Rs_color + idx]); 1160 int i = atoi (rs[Rs_color + idx]);
1197 1161
1198 if (i >= 8 && i <= 15) 1162 if (i >= 8 && i <= 15)
1199 /* bright colors */ 1163 /* bright colors */
… …
1294} 1258}
1295 1259
1296void 1260void
1297rxvt_term::set_icon (const char *file) 1261rxvt_term::set_icon (const char *file)
1298{ 1262{
1299#ifdef HAVE_AFTERIMAGE
1300 init_asv ();
1301
1302 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1303 if (!im)
1304 {
1305 rxvt_warn ("Loading image icon failed, continuing without.\n");
1306 return;
1307 }
1308
1309 unsigned int w = im->width;
1310 unsigned int h = im->height;
1311
1312 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1313 {
1314 rxvt_warn ("Icon image too big, continuing without.\n");
1315 destroy_asimage (&im);
1316 return;
1317 }
1318
1319 ASImage *result = scale_asimage (asv, im,
1320 w, h, ASA_ARGB32,
1321 100, ASIMAGE_QUALITY_DEFAULT);
1322 destroy_asimage (&im);
1323
1324 if (!result)
1325 {
1326 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1327 return;
1328 }
1329
1330 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1331 if (buffer)
1332 {
1333 ARGB32 *asbuf = result->alt.argb32;
1334 buffer [0] = w;
1335 buffer [1] = h;
1336
1337 for (unsigned int i = 0; i < w * h; ++i)
1338 buffer [i + 2] = asbuf [i];
1339
1340 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1341 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1342 free (buffer);
1343 }
1344 else
1345 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1346
1347 destroy_asimage (&result);
1348#endif
1349
1350#ifdef HAVE_PIXBUF 1263#if HAVE_PIXBUF
1351 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1352 if (!pixbuf) 1265 if (!pixbuf)
1353 { 1266 {
1354 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1355 return; 1268 return;
… …
1475 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1388 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1476 &attributes); 1389 &attributes);
1477 1390
1478 this->parent = top; 1391 this->parent = top;
1479 1392
1480 old_width = szHint.width;
1481 old_height = szHint.height;
1482
1483 set_title (rs [Rs_title]); 1393 set_title (rs [Rs_title]);
1484 set_icon_name (rs [Rs_iconName]); 1394 set_icon_name (rs [Rs_iconName]);
1485 1395
1486 classHint.res_name = (char *)rs[Rs_name]; 1396 classHint.res_name = (char *)rs[Rs_name];
1487 classHint.res_class = (char *)RESCLASS; 1397 classHint.res_class = (char *)RESCLASS;
1488 1398
1489 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1399 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1490 wmHint.input = True; 1400 wmHint.input = True;
1491 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1401 wmHint.initial_state = option (Opt_iconic) ? IconicState
1402 : option (Opt_dockapp) ? WithdrawnState
1403 : NormalState;
1492 wmHint.window_group = top; 1404 wmHint.window_group = top;
1493 1405
1494 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1406 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1495 &szHint, &wmHint, &classHint); 1407 &szHint, &wmHint, &classHint);
1496#if ENABLE_EWMH 1408#if ENABLE_EWMH
… …
1498 * set up icon hint 1410 * set up icon hint
1499 * rs [Rs_iconfile] is path to icon 1411 * rs [Rs_iconfile] is path to icon
1500 */ 1412 */
1501 1413
1502 if (rs [Rs_iconfile]) 1414 if (rs [Rs_iconfile])
1503 {
1504 set_icon (rs [Rs_iconfile]); 1415 set_icon (rs [Rs_iconfile]);
1505 }
1506#endif 1416#endif
1507 1417
1508#if ENABLE_FRILLS 1418#if ENABLE_FRILLS
1509 if (mwmhints.flags) 1419 if (mwmhints.flags)
1510 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1420 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1549 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1550 1460
1551 /* the vt window */ 1461 /* the vt window */
1552 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1553 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1554 width, height, 1464 vt_width, vt_height,
1555 0, 1465 0,
1556 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1557 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1558 1468
1559 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
… …
1608 if (pty->pty >= 0) 1518 if (pty->pty >= 0)
1609 { 1519 {
1610 if (getfd_hook) 1520 if (getfd_hook)
1611 pty->pty = (*getfd_hook) (pty->pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1612 1522
1613 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1614 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1615 } 1525 }
1616 } 1526 }
1617 else 1527 else
1618#endif 1528#endif
1619 if (!pty->get ()) 1529 if (!pty->get ())
1620 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1530 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1531
1532 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1621 1533
1622 struct termios tio = def_tio; 1534 struct termios tio = def_tio;
1623 1535
1624#ifndef NO_BACKSPACE_KEY 1536#ifndef NO_BACKSPACE_KEY
1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1675 1587
1676 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1677 1589
1678 default: 1590 default:
1679 if (!option (Opt_utmpInhibit)) 1591 if (!option (Opt_utmpInhibit))
1592 {
1593#ifdef LOG_ONLY_ON_LOGIN
1594 bool login_shell = option (Opt_loginShell);
1595#else
1596 bool login_shell = true;
1597#endif
1680 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1599 }
1681 1600
1682 pty->close_tty (); 1601 pty->close_tty ();
1683 1602
1684 child_ev.start (cmd_pid); 1603 child_ev.start (cmd_pid);
1685 1604
… …
1710#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1711 int fd; 1630 int fd;
1712 1631
1713 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1714 if (fd >= 0) 1633 if (fd >= 0)
1715 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1716 close (fd); 1636 close (fd);
1637 }
1717#endif /* SRIOCSREDIR */ 1638#endif /* SRIOCSREDIR */
1718 } 1639 }
1719 1640
1720 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1721 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);

Diff Legend

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