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.293 by root, Mon Feb 21 07:41:01 2011 UTC vs.
Revision 1.318 by sf-exg, Fri Jan 13 13:04:59 2012 UTC

… …
53# endif 53# endif
54#endif 54#endif
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif
59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
58#endif 63#endif
59 64
60#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 67#include <sys/types.h>
… …
562 567
563/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
564const char ** 569const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
566{ 571{
567 int i, r_argc; 572 int i;
568 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
569
570 /*
571 * Look for -e option. Find => split and make cmd_argv[] of command args
572 */
573 for (r_argc = 0; r_argc < argc; r_argc++)
574 if (!strcmp (argv[r_argc], "-e"))
575 break;
576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
590
591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
592
593 for (i = 0; i < r_argc; i++)
594 r_argv[i] = (const char *)argv[i];
595
596 r_argv[i] = NULL;
597 574
598 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
599 576
600 /* 577 /*
601 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
602 */ 579 */
603 580
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
606 583
607 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
608 585
609 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 588
615 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
616 xa = display->xa; 590 xa = display->xa;
617 591
618 set (display); 592 set (display);
… …
621#if XFT 595#if XFT
622 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
623 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
624#endif 598#endif
625 599
626 free (r_argv);
627
628 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
630 rs [i] = 0; 602 rs [i] = 0;
631 603
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639#endif
640
641#if ENABLE_PERL 604#if ENABLE_PERL
642 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
643 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
644 607
645 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
648 { 611 {
649 rxvt_perl.init (this); 612 rxvt_perl.init (this);
650 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
651 } 614 }
652#endif 615#endif
616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources ();
653 620
654 /* 621 /*
655 * set any defaults not already set 622 * set any defaults not already set
656 */ 623 */
657 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
766 return cmd_argv; 733 return cmd_argv;
767} 734}
768 735
769/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
770void 737void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
772{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
773 this->envv = envv; 744 this->envv = envv;
774 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{
775 SET_R (this); 771 SET_R (this);
776 set_locale (""); 772 set_locale ("");
777 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 :(
778 774
779 init_vars (); 775 init_vars ();
… …
793 if (chdir (path)) 789 if (chdir (path))
794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
795 } 791 }
796 792
797 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 795
800 pty = ptytty::create (); 796 pty = ptytty::create ();
797
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
801 807
802 create_windows (argc, argv); 808 create_windows (argc, argv);
803 809
804 init_xlocale (); 810 init_xlocale ();
805 811
… …
835 } 841 }
836#endif 842#endif
837 843
838#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
839 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
840 {
841 const char *p = rs[Rs_backgroundPixmap];
842
843 if ((p = strchr (p, ';')) != 0)
844 {
845 p++;
846 bg_set_geometry (p);
847 }
848 else
849 bg_set_default_geometry ();
850
851 if (bg_set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bg_window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
853 update_background (); 848 update_background ();
854 }
855#endif 849#endif
856 } 850 }
857#endif 851#endif
858 852
859#if ENABLE_PERL 853#if ENABLE_PERL
860 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
861#endif 855#endif
862 856
863 set_colorfgbg (); 857 init_done = 1;
864 858
865 init_command (cmd_argv); 859 init_command (cmd_argv);
866
867 free (cmd_argv);
868 860
869 if (pty->pty >= 0) 861 if (pty->pty >= 0)
870 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
871 863
872 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
874#if ENABLE_XEMBED 866#if ENABLE_XEMBED
875 if (rs[Rs_embed]) 867 if (rs[Rs_embed])
876 { 868 {
877 long info[2] = { 0, XEMBED_MAPPED }; 869 long info[2] = { 0, XEMBED_MAPPED };
878 870
879 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
880 32, PropModeReplace, (unsigned char *)&info, 2); 872 32, PropModeReplace, (unsigned char *)&info, 2);
881 } 873 }
882#endif 874#endif
883 875
876#if HAVE_STARTUP_NOTIFICATION
877 SnDisplay *snDisplay;
878 SnLauncheeContext *snContext;
879
880 snDisplay = sn_display_new (dpy, NULL, NULL);
881 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
882
883 /* Tell the window manager that this window is part of the startup context */
884 if (snContext)
885 sn_launchee_context_setup_window (snContext, parent);
886#endif
887
884 XMapWindow (dpy, vt); 888 XMapWindow (dpy, vt);
885 XMapWindow (dpy, parent[0]); 889 XMapWindow (dpy, parent);
890
891#if HAVE_STARTUP_NOTIFICATION
892 if (snContext)
893 {
894 /* Mark the startup process as complete */
895 sn_launchee_context_complete (snContext);
896
897 sn_launchee_context_unref (snContext);
898 }
899
900 sn_display_unref (snDisplay);
901#endif
886 902
887 refresh_check (); 903 refresh_check ();
888} 904}
889 905
890/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
891void 907void
892rxvt_term::init_env () 908rxvt_term::init_env ()
893{ 909{
894 char *val; 910 char *val;
911 char *env_display;
912 char *env_windowid;
913 char *env_colorfgbg;
914 char *env_term;
895 915
896#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
897 /* Fixup display_name for export over pty to any interested terminal 917 /* Fixup display_name for export over pty to any interested terminal
898 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 918 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
899 * (for the first non-loopback interface) that we get from 919 * (for the first non-loopback interface) that we get from
… …
916 936
917 env_display = (char *)rxvt_malloc (strlen (val) + 9); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 938
919 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
920 940
941 env_windowid = (char *)rxvt_malloc (21);
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 942 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 943
923 /* add entries to the environment: 944 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 945 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 946 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 947 * @ COLORTERM: terminal sub-name and also indicates its color
… …
929 * @ COLORFGBG: fg;bg color codes 950 * @ COLORFGBG: fg;bg color codes
930 */ 951 */
931 putenv (env_display); 952 putenv (env_display);
932 putenv (env_windowid); 953 putenv (env_windowid);
933 954
934 if (env_colorfgbg) 955 env_colorfgbg = get_colorfgbg ();
935 putenv (env_colorfgbg); 956 putenv (env_colorfgbg);
936 957
937#ifdef RXVT_TERMINFO 958#ifdef RXVT_TERMINFO
938 putenv ("TERMINFO=" RXVT_TERMINFO); 959 putenv ("TERMINFO=" RXVT_TERMINFO);
939#endif 960#endif
940 961
… …
959 unsetenv ("TERMCAP"); /* terminfo should be okay */ 980 unsetenv ("TERMCAP"); /* terminfo should be okay */
960#endif /* HAVE_UNSETENV */ 981#endif /* HAVE_UNSETENV */
961} 982}
962 983
963/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
964/*
965 * This is more or less stolen straight from XFree86 xterm.
966 * This should support all European type languages.
967 */
968void 985void
969rxvt_term::set_locale (const char *locale) 986rxvt_term::set_locale (const char *locale)
970{ 987{
971 set_environ (envv); 988 set_environ (envv);
972 989
… …
992 SET_LOCALE (this->locale); 1009 SET_LOCALE (this->locale);
993 mbstate.reset (); 1010 mbstate.reset ();
994#endif 1011#endif
995 1012
996#if HAVE_NL_LANGINFO 1013#if HAVE_NL_LANGINFO
997 char *codeset = strdup (nl_langinfo (CODESET)); 1014 char *codeset = nl_langinfo (CODESET);
998 // /^UTF.?8/i 1015 // /^UTF.?8/i
999 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1016 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1000 && (codeset[1] == 'T' || codeset[1] == 't') 1017 && (codeset[1] == 'T' || codeset[1] == 't')
1001 && (codeset[2] == 'F' || codeset[2] == 'f') 1018 && (codeset[2] == 'F' || codeset[2] == 'f')
1002 && (codeset[3] == '8' || codeset[4] == '8'); 1019 && (codeset[3] == '8' || codeset[4] == '8');
1003 free (codeset);
1004#else 1020#else
1005 enc_utf8 = 0; 1021 enc_utf8 = 0;
1006#endif 1022#endif
1007} 1023}
1008 1024
… …
1011{ 1027{
1012 set_environ (envv); 1028 set_environ (envv);
1013 1029
1014#ifdef USE_XIM 1030#ifdef USE_XIM
1015 if (!locale) 1031 if (!locale)
1016 rxvt_warn ("setting locale failed, working without locale support.\n"); 1032 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017 else 1033 else
1018 { 1034 {
1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1035 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1020 1036
1021 if (!XSupportsLocale ()) 1037 if (!XSupportsLocale ())
1022 { 1038 {
1023 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1039 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1024 return; 1040 return;
1025 } 1041 }
1026 1042
1027 im_ev.start (display); 1043 im_ev.start (display);
1028 1044
… …
1177/*----------------------------------------------------------------------*/ 1193/*----------------------------------------------------------------------*/
1178/* color aliases, fg/bg bright-bold */ 1194/* color aliases, fg/bg bright-bold */
1179void 1195void
1180rxvt_term::color_aliases (int idx) 1196rxvt_term::color_aliases (int idx)
1181{ 1197{
1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1198 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1183 { 1199 {
1184 int i = atoi (rs[Rs_color + idx]); 1200 int i = atoi (rs[Rs_color + idx]);
1185 1201
1186 if (i >= 8 && i <= 15) 1202 if (i >= 8 && i <= 15)
1187 /* bright colors */ 1203 /* bright colors */
… …
1323 buffer [1] = h; 1339 buffer [1] = h;
1324 1340
1325 for (unsigned int i = 0; i < w * h; ++i) 1341 for (unsigned int i = 0; i < w * h; ++i)
1326 buffer [i + 2] = asbuf [i]; 1342 buffer [i + 2] = asbuf [i];
1327 1343
1328 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1344 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1345 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer); 1346 free (buffer);
1331 } 1347 }
1332 else 1348 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1349 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1380 } 1396 }
1381 1397
1382 row += rowstride; 1398 row += rowstride;
1383 } 1399 }
1384 1400
1385 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1401 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1386 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1402 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1387 free (buffer); 1403 free (buffer);
1388 } 1404 }
1389 else 1405 else
1390 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1406 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1392 g_object_unref (pixbuf); 1408 g_object_unref (pixbuf);
1393#endif 1409#endif
1394} 1410}
1395 1411
1396/*----------------------------------------------------------------------*/ 1412/*----------------------------------------------------------------------*/
1397/* rxvt_Create_Windows () - Open and map the window */ 1413/* Open and map the window */
1398void 1414void
1399rxvt_term::create_windows (int argc, const char *const *argv) 1415rxvt_term::create_windows (int argc, const char *const *argv)
1400{ 1416{
1401 XClassHint classHint; 1417 XClassHint classHint;
1402 XWMHints wmHint; 1418 XWMHints wmHint;
… …
1448 } 1464 }
1449#endif 1465#endif
1450 1466
1451 window_calc (0, 0); 1467 window_calc (0, 0);
1452 1468
1453 /* sub-window placement & size in rxvt_resize_subwindows () */ 1469 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1454 attributes.background_pixel = pix_colors_focused [Color_border]; 1470 attributes.background_pixel = pix_colors_focused [Color_border];
1455 attributes.border_pixel = pix_colors_focused [Color_border]; 1471 attributes.border_pixel = pix_colors_focused [Color_border];
1456 attributes.colormap = cmap; 1472 attributes.colormap = cmap;
1457 1473
1458 top = XCreateWindow (dpy, parent, 1474 top = XCreateWindow (dpy, parent,
… …
1461 ext_bwidth, 1477 ext_bwidth,
1462 depth, InputOutput, visual, 1478 depth, InputOutput, visual,
1463 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1479 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1464 &attributes); 1480 &attributes);
1465 1481
1466 this->parent[0] = top; 1482 this->parent = top;
1467
1468 old_width = szHint.width;
1469 old_height = szHint.height;
1470 1483
1471 set_title (rs [Rs_title]); 1484 set_title (rs [Rs_title]);
1472 set_icon_name (rs [Rs_iconName]); 1485 set_icon_name (rs [Rs_iconName]);
1473 1486
1474 classHint.res_name = (char *)rs[Rs_name]; 1487 classHint.res_name = (char *)rs[Rs_name];
… …
1504#if ENABLE_EWMH 1517#if ENABLE_EWMH
1505 xa[XA_NET_WM_PING], 1518 xa[XA_NET_WM_PING],
1506#endif 1519#endif
1507 }; 1520 };
1508 1521
1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1522 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1510 1523
1511#if ENABLE_FRILLS 1524#if ENABLE_FRILLS
1512 if (rs[Rs_transient_for]) 1525 if (rs[Rs_transient_for])
1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1526 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1514#endif 1527#endif
… …
1537 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1550 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1538 1551
1539 /* the vt window */ 1552 /* the vt window */
1540 vt = XCreateSimpleWindow (dpy, top, 1553 vt = XCreateSimpleWindow (dpy, top,
1541 window_vt_x, window_vt_y, 1554 window_vt_x, window_vt_y,
1542 width, height, 1555 vt_width, vt_height,
1543 0, 1556 0,
1544 pix_colors_focused[Color_fg], 1557 pix_colors_focused[Color_fg],
1545 pix_colors_focused[Color_bg]); 1558 pix_colors_focused[Color_bg]);
1546 1559
1547 attributes.bit_gravity = NorthWestGravity; 1560 attributes.bit_gravity = NorthWestGravity;
… …
1596 if (pty->pty >= 0) 1609 if (pty->pty >= 0)
1597 { 1610 {
1598 if (getfd_hook) 1611 if (getfd_hook)
1599 pty->pty = (*getfd_hook) (pty->pty); 1612 pty->pty = (*getfd_hook) (pty->pty);
1600 1613
1601 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1614 if (pty->pty < 0)
1602 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1615 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1603 } 1616 }
1604 } 1617 }
1605 else 1618 else
1606#endif 1619#endif
1607 if (!pty->get ()) 1620 if (!pty->get ())
1608 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1621 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1622
1623 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1609 1624
1610 struct termios tio = def_tio; 1625 struct termios tio = def_tio;
1611 1626
1612#ifndef NO_BACKSPACE_KEY 1627#ifndef NO_BACKSPACE_KEY
1613 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1628 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1663 1678
1664 _exit (EXIT_FAILURE); 1679 _exit (EXIT_FAILURE);
1665 1680
1666 default: 1681 default:
1667 if (!option (Opt_utmpInhibit)) 1682 if (!option (Opt_utmpInhibit))
1683 {
1684#ifdef LOG_ONLY_ON_LOGIN
1685 bool login_shell = option (Opt_loginShell);
1686#else
1687 bool login_shell = true;
1688#endif
1668 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1689 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1690 }
1669 1691
1670 pty->close_tty (); 1692 pty->close_tty ();
1671 1693
1672 child_ev.start (cmd_pid); 1694 child_ev.start (cmd_pid);
1673 1695
… …
1698#elif defined (SRIOCSREDIR) 1720#elif defined (SRIOCSREDIR)
1699 int fd; 1721 int fd;
1700 1722
1701 fd = open (CONSOLE, O_WRONLY, 0); 1723 fd = open (CONSOLE, O_WRONLY, 0);
1702 if (fd >= 0) 1724 if (fd >= 0)
1703 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1725 {
1726 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1704 close (fd); 1727 close (fd);
1728 }
1705#endif /* SRIOCSREDIR */ 1729#endif /* SRIOCSREDIR */
1706 } 1730 }
1707 1731
1708 /* reset signals and spin off the command interpreter */ 1732 /* reset signals and spin off the command interpreter */
1709 signal (SIGINT, SIG_DFL); 1733 signal (SIGINT, SIG_DFL);

Diff Legend

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