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.273 by sf-exg, Mon Jul 26 22:07:38 2010 UTC vs.
Revision 1.344 by sf-exg, Tue Jun 16 11:58:26 2015 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 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
47#ifdef HAVE_XMU
48# include <X11/Xmu/CurUtil.h>
49#endif
46 50
47#ifdef HAVE_XSETLOCALE 51#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 52# define X_LOCALE
49# include <X11/Xlocale.h> 53# include <X11/Xlocale.h>
50#else 54#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 55# include <locale.h>
53# endif
54#endif 56#endif
55 57
56#ifdef HAVE_NL_LANGINFO 58#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 59# include <langinfo.h>
60#endif
61
62#ifdef HAVE_STARTUP_NOTIFICATION
63# define SN_API_NOT_YET_FROZEN
64# include <libsn/sn-launchee.h>
58#endif 65#endif
59 66
60#ifdef DISPLAY_IS_IP 67#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 68/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 69#include <sys/types.h>
… …
73#include <netinet/in.h> 80#include <netinet/in.h>
74#include <arpa/inet.h> 81#include <arpa/inet.h>
75#include <net/if.h> 82#include <net/if.h>
76#include <net/if_arp.h> 83#include <net/if_arp.h>
77 84
78static char * 85static char * ecb_cold
79rxvt_network_display (const char *display) 86rxvt_network_display (const char *display)
80{ 87{
81 char buffer[1024], *rval = NULL; 88 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 89 struct ifconf ifc;
83 struct ifreq *ifr; 90 struct ifreq *ifr;
… …
143 150
144 return rval; 151 return rval;
145} 152}
146#endif 153#endif
147 154
148const char *const def_colorName[] = 155static const char *const def_colorName[] =
149 { 156 {
150 COLOR_FOREGROUND, 157 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 158 COLOR_BACKGROUND,
152 /* low-intensity colors */ 159 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 160 "rgb:00/00/00", // 0: black (Black)
… …
516#endif 523#endif
517 COLOR_SCROLLBAR, 524 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR 525#ifdef RXVT_SCROLLBAR
519 COLOR_SCROLLTROUGH, 526 COLOR_SCROLLTROUGH,
520#endif 527#endif
521#if ENABLE_TRANSPARENCY 528#if BG_IMAGE_FROM_ROOT
522 NULL, 529 NULL,
523#endif 530#endif
524#if OFF_FOCUS_FADING 531#if OFF_FOCUS_FADING
525 "rgb:00/00/00", 532 "rgb:00/00/00",
526#endif 533#endif
… …
562 569
563/*----------------------------------------------------------------------*/ 570/*----------------------------------------------------------------------*/
564const char ** 571const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 572rxvt_term::init_resources (int argc, const char *const *argv)
566{ 573{
567 int i, r_argc; 574 int i;
568 const char **cmd_argv, **r_argv; 575 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 576
598 rs[Rs_name] = rxvt_basename (argv[0]); 577 rs[Rs_name] = rxvt_basename (argv[0]);
599 578
600 /* 579 /*
601 * Open display, get options/resources and create the window 580 * Open display, get options/resources and create the window
602 */ 581 */
603 582
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 583 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 584 rs[Rs_display_name] = ":0";
606 585
607 get_options (r_argc, r_argv); 586 cmd_argv = get_options (argc, argv);
608 587
609 if (!(display = displays.get (rs[Rs_display_name]))) 588 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]); 589 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 590
615 // using a local pointer decreases code size a lot 591 // using a local pointer decreases code size a lot
616 xa = display->xa; 592 xa = display->xa;
617 593
618 set (display); 594 set (display);
619 extract_resources (); 595 extract_resources ();
620 596
621#if XFT 597#if ENABLE_FRILLS
622 if (rs[Rs_depth]) 598 if (rs[Rs_visual])
623 select_visual (strtol (rs[Rs_depth], 0, 0)); 599 select_visual (strtol (rs[Rs_visual], 0, 0));
600 else if (rs[Rs_depth])
601 select_depth (strtol (rs[Rs_depth], 0, 0));
624#endif 602#endif
625
626 free (r_argv);
627 603
628 for (int i = NUM_RESOURCES; i--; ) 604 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 605 if (rs [i] == resval_undef)
630 rs [i] = 0; 606 rs [i] = 0;
631 607
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#if ENABLE_PERL 608#if ENABLE_PERL
638 if (!rs[Rs_perl_ext_1]) 609 if (!rs[Rs_perl_ext_1])
639 rs[Rs_perl_ext_1] = "default"; 610 rs[Rs_perl_ext_1] = "default";
640 611
641 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 612 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
644 { 615 {
645 rxvt_perl.init (this); 616 rxvt_perl.init (this);
646 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 617 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647 } 618 }
648#endif 619#endif
620
621 // must be called after initialising the perl interpreter as it
622 // may invoke the `on_register_command' hook
623 extract_keysym_resources ();
649 624
650 /* 625 /*
651 * set any defaults not already set 626 * set any defaults not already set
652 */ 627 */
653 if (cmd_argv && cmd_argv[0]) 628 if (cmd_argv && cmd_argv[0])
… …
688 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 663 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
689 pointerBlankDelay = i; 664 pointerBlankDelay = i;
690 else 665 else
691 pointerBlankDelay = 2; 666 pointerBlankDelay = 2;
692#endif 667#endif
668
669 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
670 multiClickTime = i;
671 else
672 multiClickTime = 500;
673
674 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
693 675
694 /* no point having a scrollbar without having any scrollback! */ 676 /* no point having a scrollbar without having any scrollback! */
695 if (!saveLines) 677 if (!saveLines)
696 set_option (Opt_scrollBar, 0); 678 set_option (Opt_scrollBar, 0);
697 679
… …
762 return cmd_argv; 744 return cmd_argv;
763} 745}
764 746
765/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
766void 748void
767rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 749rxvt_term::init (stringvec *argv, stringvec *envv)
768{ 750{
751 argv->push_back (0);
752 envv->push_back (0);
753
754 this->argv = argv;
769 this->envv = envv; 755 this->envv = envv;
770 756
757 env = new char *[this->envv->size ()];
758 for (int i = 0; i < this->envv->size (); i++)
759 env[i] = this->envv->at (i);
760
761 init2 (argv->size () - 1, argv->begin ());
762}
763
764void
765rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
766{
767#if ENABLE_PERL
768 // perl might want to access the stringvecs later, so we need to copy them
769 stringvec *args = new stringvec;
770 for (int i = 0; i < argc; i++)
771 args->push_back (strdup (argv [i]));
772
773 stringvec *envs = new stringvec;
774 for (const char *const *var = envv; *var; var++)
775 envs->push_back (strdup (*var));
776
777 init (args, envs);
778#else
779 init2 (argc, argv);
780#endif
781}
782
783void
784rxvt_term::init2 (int argc, const char *const *argv)
785{
771 SET_R (this); 786 SET_R (this);
772 set_locale (""); 787 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 788 set_environ (env); // a few things in X do not call setlocale :(
774 789
775 init_vars (); 790 init_vars ();
776 791
777 const char **cmd_argv = init_resources (argc, argv); 792 const char **cmd_argv = init_resources (argc, argv);
778 793
… …
789 if (chdir (path)) 804 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 805 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 } 806 }
792 807
793 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
794 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 809 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 810
796 pty = ptytty::create (); 811 pty = ptytty::create ();
797 812
798 create_windows (argc, argv); 813 create_windows (argc, argv);
799 814
… …
805 XSynchronize (dpy, True); 820 XSynchronize (dpy, True);
806#endif 821#endif
807 822
808 if (option (Opt_scrollBar)) 823 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */ 824 scrollBar.resize (); /* create and map scrollbar */
825
810#ifdef HAVE_BG_PIXMAP 826#ifdef HAVE_BG_PIXMAP
811 { 827 bg_init ();
812 bgPixmap.set_target (this);
813 bgPixmap.invalidate ();
814
815#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent))
817 {
818 bgPixmap.set_transparent ();
819
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823#endif
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.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 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 }
855#endif 828#endif
856 829
857#if ENABLE_PERL 830#if ENABLE_PERL
858 rootwin_ev.start (display, display->root); 831 rootwin_ev.start (display, display->root);
859#endif 832#endif
860 833
861 set_colorfgbg (); 834 init_done = 1;
862 835
863 init_command (cmd_argv); 836 init_command (cmd_argv);
864
865 free (cmd_argv);
866 837
867 if (pty->pty >= 0) 838 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ); 839 pty_ev.start (pty->pty, ev::READ);
869 840
870 HOOK_INVOKE ((this, HOOK_START, DT_END)); 841 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
872#if ENABLE_XEMBED 843#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 844 if (rs[Rs_embed])
874 { 845 {
875 long info[2] = { 0, XEMBED_MAPPED }; 846 long info[2] = { 0, XEMBED_MAPPED };
876 847
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 848 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 849 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 850 }
880#endif 851#endif
881 852
853#if HAVE_STARTUP_NOTIFICATION
854 SnDisplay *snDisplay;
855 SnLauncheeContext *snContext;
856
857 snDisplay = sn_display_new (dpy, NULL, NULL);
858 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
859
860 /* Tell the window manager that this window is part of the startup context */
861 if (snContext)
862 sn_launchee_context_setup_window (snContext, parent);
863#endif
864
882 XMapWindow (dpy, vt); 865 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 866 XMapWindow (dpy, parent);
867
868#if HAVE_STARTUP_NOTIFICATION
869 if (snContext)
870 {
871 /* Mark the startup process as complete */
872 sn_launchee_context_complete (snContext);
873
874 sn_launchee_context_unref (snContext);
875 }
876
877 sn_display_unref (snDisplay);
878#endif
884 879
885 refresh_check (); 880 refresh_check ();
886} 881}
887 882
888/*----------------------------------------------------------------------*/ 883/*----------------------------------------------------------------------*/
889void 884void
890rxvt_term::init_env () 885rxvt_term::init_env ()
891{ 886{
892 int i;
893 char *val; 887 char *val;
888 char *env_display;
889 char *env_windowid;
890 char *env_colorfgbg;
891 char *env_term;
894 892
895#ifdef DISPLAY_IS_IP 893#ifdef DISPLAY_IS_IP
896 /* Fixup display_name for export over pty to any interested terminal 894 /* Fixup display_name for export over pty to any interested terminal
897 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 895 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
898 * (for the first non-loopback interface) that we get from 896 * (for the first non-loopback interface) that we get from
… …
911 val = XDisplayString (dpy); 909 val = XDisplayString (dpy);
912 910
913 if (rs[Rs_display_name] == NULL) 911 if (rs[Rs_display_name] == NULL)
914 rs[Rs_display_name] = val; /* use broken `:0' value */ 912 rs[Rs_display_name] = val; /* use broken `:0' value */
915 913
916 i = strlen (val);
917 env_display = (char *)rxvt_malloc (i + 9); 914 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 915
919 sprintf (env_display, "DISPLAY=%s", val); 916 sprintf (env_display, "DISPLAY=%s", val);
920 917
918 env_windowid = (char *)rxvt_malloc (21);
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 920
923 /* add entries to the environment: 921 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 922 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 923 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 924 * @ COLORTERM: terminal sub-name and also indicates its color
… …
929 * @ COLORFGBG: fg;bg color codes 927 * @ COLORFGBG: fg;bg color codes
930 */ 928 */
931 putenv (env_display); 929 putenv (env_display);
932 putenv (env_windowid); 930 putenv (env_windowid);
933 931
934 if (env_colorfgbg) 932 env_colorfgbg = get_colorfgbg ();
935 putenv (env_colorfgbg); 933 putenv (env_colorfgbg);
936 934
937#ifdef RXVT_TERMINFO 935#ifdef RXVT_TERMINFO
938 putenv ("TERMINFO=" RXVT_TERMINFO); 936 putenv ("TERMINFO=" RXVT_TERMINFO);
939#endif 937#endif
940 938
… …
959 unsetenv ("TERMCAP"); /* terminfo should be okay */ 957 unsetenv ("TERMCAP"); /* terminfo should be okay */
960#endif /* HAVE_UNSETENV */ 958#endif /* HAVE_UNSETENV */
961} 959}
962 960
963/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
964/*
965 * This is more or less stolen straight from XFree86 xterm.
966 * This should support all European type languages.
967 */
968void 962void
969rxvt_term::set_locale (const char *locale) 963rxvt_term::set_locale (const char *locale)
970{ 964{
971 set_environ (envv); 965 set_environ (env);
972 966
973#if HAVE_XSETLOCALE || HAVE_SETLOCALE
974 free (this->locale); 967 free (this->locale);
975 this->locale = setlocale (LC_CTYPE, locale); 968 this->locale = setlocale (LC_CTYPE, locale);
976 969
977 if (!this->locale) 970 if (!this->locale)
978 { 971 {
… …
989 982
990 983
991 this->locale = strdup (this->locale); 984 this->locale = strdup (this->locale);
992 SET_LOCALE (this->locale); 985 SET_LOCALE (this->locale);
993 mbstate.reset (); 986 mbstate.reset ();
994#endif
995 987
996#if HAVE_NL_LANGINFO 988#if HAVE_NL_LANGINFO
997 char *codeset = strdup (nl_langinfo (CODESET)); 989 char *codeset = nl_langinfo (CODESET);
998 // /^UTF.?8/i 990 // /^UTF.?8/i
999 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 991 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1000 && (codeset[1] == 'T' || codeset[1] == 't') 992 && (codeset[1] == 'T' || codeset[1] == 't')
1001 && (codeset[2] == 'F' || codeset[2] == 'f') 993 && (codeset[2] == 'F' || codeset[2] == 'f')
1002 && (codeset[3] == '8' || codeset[4] == '8'); 994 && (codeset[3] == '8' || codeset[4] == '8');
1003 free (codeset);
1004#else 995#else
1005 enc_utf8 = 0; 996 enc_utf8 = 0;
1006#endif 997#endif
1007} 998}
1008 999
1009void 1000void
1010rxvt_term::init_xlocale () 1001rxvt_term::init_xlocale ()
1011{ 1002{
1012 set_environ (envv); 1003 set_environ (env);
1013 1004
1014#ifdef USE_XIM 1005#if USE_XIM
1015 if (!locale) 1006 if (!locale)
1016 rxvt_warn ("setting locale failed, working without locale support.\n"); 1007 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017 else 1008 else
1018 { 1009 {
1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1010 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1020 1011
1021 if (!XSupportsLocale ()) 1012 if (!XSupportsLocale ())
1022 { 1013 {
1023 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1014 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1024 return; 1015 return;
1025 } 1016 }
1026 1017
1027 im_ev.start (display); 1018 im_ev.start (display);
1028 1019
… …
1069 run_command (argv); 1060 run_command (argv);
1070} 1061}
1071 1062
1072/*----------------------------------------------------------------------*/ 1063/*----------------------------------------------------------------------*/
1073void 1064void
1074rxvt_term::get_colours () 1065rxvt_term::get_colors ()
1075{ 1066{
1076 int i; 1067 int i;
1077 1068
1078#ifdef OFF_FOCUS_FADING 1069#ifdef OFF_FOCUS_FADING
1079 pix_colors = pix_colors_focused; 1070 pix_colors = pix_colors_focused;
1080#endif 1071#endif
1081 1072
1082 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1073 for (i = 0; i < NRS_COLORS; i++)
1083 {
1084 const char *name = rs[Rs_color + i]; 1074 if (const char *name = rs[Rs_color + i])
1085
1086 if (!name)
1087 continue;
1088
1089 rxvt_color xcol;
1090
1091 if (!set_color (xcol, name)) 1075 set_color (pix_colors [i], name);
1092 {
1093#ifndef XTERM_REVERSE_VIDEO
1094 if (i < 2 && option (Opt_reverseVideo))
1095 name = def_colorName [1 - i];
1096 else
1097#endif
1098 name = def_colorName [i];
1099
1100 if (!name)
1101 continue;
1102
1103 if (!set_color (xcol, name))
1104 {
1105 switch (i)
1106 {
1107 case Color_fg:
1108 case Color_bg:
1109 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1110 name = "";
1111 break;
1112#ifndef NO_CURSORCOLOR
1113 case Color_cursor2:
1114#endif
1115 case Color_pointer_fg:
1116 name = rs[Rs_color + Color_fg];
1117 xcol.set (this, name);
1118 break;
1119 default:
1120 name = rs[Rs_color + Color_bg];
1121 xcol.set (this, name);
1122 break;
1123 }
1124 }
1125 }
1126
1127 pix_colors[i] = xcol;
1128 rs[Rs_color + i] = name;
1129 }
1130
1131 if (depth <= 2)
1132 {
1133 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1134 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1135 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1136 }
1137 1076
1138 /* 1077 /*
1139 * get scrollBar shadow colors 1078 * get scrollBar shadow colors
1140 * 1079 *
1141 * The calculations of topShadow/bottomShadow values are adapted 1080 * The calculations of topShadow/bottomShadow values are adapted
1142 * from the fvwm window manager. 1081 * from the fvwm window manager.
1143 */ 1082 */
1144#ifdef RXVT_SCROLLBAR 1083#ifdef RXVT_SCROLLBAR
1145 if (depth <= 2)
1146 {
1147 /* Monochrome */
1148 alias_color (Color_scroll, Color_fg);
1149 alias_color (Color_topShadow, Color_bg);
1150 alias_color (Color_bottomShadow, Color_bg);
1151 }
1152 else
1153 {
1154 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1084 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1155 1085
1156 rgba cscroll; 1086 rgba cscroll;
1157 pix_colors [Color_scroll].get (cscroll); 1087 pix_colors [Color_scroll].get (cscroll);
1158 1088
1159 /* topShadowColor */ 1089 /* topShadowColor */
1160 if (!pix_colors[Color_topShadow].set (this, 1090 if (!pix_colors[Color_topShadow].set (this,
1161 rgba ( 1091 rgba (
1162 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1092 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1163 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1093 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1164 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1094 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1165 cscroll.a) 1095 cscroll.a)
1166 )) 1096 ))
1167 alias_color (Color_topShadow, Color_White); 1097 alias_color (Color_topShadow, Color_White);
1168 }
1169#endif 1098#endif
1170 1099
1171#ifdef OFF_FOCUS_FADING 1100#ifdef OFF_FOCUS_FADING
1172 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1101 for (i = 0; i < NRS_COLORS; i++)
1173 update_fade_color (i); 1102 update_fade_color (i, true);
1174#endif 1103#endif
1175} 1104}
1176 1105
1177/*----------------------------------------------------------------------*/ 1106/*----------------------------------------------------------------------*/
1178/* color aliases, fg/bg bright-bold */ 1107/* color aliases, fg/bg bright-bold */
1179void 1108void
1180rxvt_term::color_aliases (int idx) 1109rxvt_term::color_aliases (int idx)
1181{ 1110{
1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1111 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1183 { 1112 {
1184 int i = atoi (rs[Rs_color + idx]); 1113 int i = atoi (rs[Rs_color + idx]);
1185 1114
1186 if (i >= 8 && i <= 15) 1115 if (i >= 8 && i <= 15)
1187 /* bright colors */ 1116 /* bright colors */
… …
1227 for (j = map->max_keypermod; j--; k++) 1156 for (j = map->max_keypermod; j--; k++)
1228 { 1157 {
1229 if (kc[k] == 0) 1158 if (kc[k] == 0)
1230 break; 1159 break;
1231 1160
1232 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1161 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1233 { 1162 {
1234 case XK_Num_Lock: 1163 case XK_Num_Lock:
1235 ModNumLockMask = modmasks[i - 1]; 1164 ModNumLockMask = modmasks[i - 1];
1236 continue; 1165 continue;
1237 1166
… …
1279 1208
1280 if (i) 1209 if (i)
1281 ModMetaMask = modmasks[i - 1]; 1210 ModMetaMask = modmasks[i - 1];
1282} 1211}
1283 1212
1213void
1214rxvt_term::set_icon (const char *file)
1215{
1216#if HAVE_PIXBUF && ENABLE_EWMH
1217 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1218 if (!pixbuf)
1219 {
1220 rxvt_warn ("Loading image icon failed, continuing without.\n");
1221 return;
1222 }
1223
1224 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1225 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1226
1227 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1228 {
1229 rxvt_warn ("Icon image too big, continuing without.\n");
1230 g_object_unref (pixbuf);
1231 return;
1232 }
1233
1234 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1235 {
1236 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1237 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1238 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1239
1240 buffer [0] = w;
1241 buffer [1] = h;
1242 for (int i = 0; i < h; i++)
1243 {
1244 for (int j = 0; j < w; j++)
1245 {
1246 unsigned char *pixel = row + j * channels;
1247 long value;
1248
1249 if (channels == 4)
1250 value = pixel[3];
1251 else
1252 value = (unsigned char)0x00ff;
1253
1254 value = (value << 8) + pixel[0];
1255 value = (value << 8) + pixel[1];
1256 value = (value << 8) + pixel[2];
1257 buffer[(i * w + j) + 2] = value;
1258 }
1259
1260 row += rowstride;
1261 }
1262
1263 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1264 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1265 free (buffer);
1266 }
1267 else
1268 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1269
1270 g_object_unref (pixbuf);
1271#endif
1272}
1273
1284/*----------------------------------------------------------------------*/ 1274/*----------------------------------------------------------------------*/
1285/* rxvt_Create_Windows () - Open and map the window */ 1275/* Open and map the window */
1286void 1276void
1287rxvt_term::create_windows (int argc, const char *const *argv) 1277rxvt_term::create_windows (int argc, const char *const *argv)
1288{ 1278{
1289 XClassHint classHint; 1279 XClassHint classHint;
1290 XWMHints wmHint; 1280 XWMHints wmHint;
… …
1296 Window top, parent; 1286 Window top, parent;
1297 1287
1298 dLocal (Display *, dpy); 1288 dLocal (Display *, dpy);
1299 1289
1300 /* grab colors before netscape does */ 1290 /* grab colors before netscape does */
1301 get_colours (); 1291 get_colors ();
1302 1292
1303 if (!set_fonts ()) 1293 if (!set_fonts ())
1304 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1294 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1305 1295
1306 parent = display->root; 1296 parent = display->root;
… …
1336 } 1326 }
1337#endif 1327#endif
1338 1328
1339 window_calc (0, 0); 1329 window_calc (0, 0);
1340 1330
1341 /* sub-window placement & size in rxvt_resize_subwindows () */ 1331 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1342 attributes.background_pixel = pix_colors_focused [Color_border]; 1332 attributes.background_pixel = pix_colors_focused [Color_border];
1343 attributes.border_pixel = pix_colors_focused [Color_border]; 1333 attributes.border_pixel = pix_colors_focused [Color_border];
1344 attributes.colormap = cmap; 1334 attributes.colormap = cmap;
1345 1335
1346 top = XCreateWindow (dpy, parent, 1336 top = XCreateWindow (dpy, parent,
… …
1349 ext_bwidth, 1339 ext_bwidth,
1350 depth, InputOutput, visual, 1340 depth, InputOutput, visual,
1351 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1341 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1352 &attributes); 1342 &attributes);
1353 1343
1354 this->parent[0] = top; 1344 this->parent = top;
1355
1356 old_width = szHint.width;
1357 old_height = szHint.height;
1358 1345
1359 set_title (rs [Rs_title]); 1346 set_title (rs [Rs_title]);
1360 set_icon_name (rs [Rs_iconName]); 1347 set_icon_name (rs [Rs_iconName]);
1361 1348
1362 classHint.res_name = (char *)rs[Rs_name]; 1349 classHint.res_name = (char *)rs[Rs_name];
1363 classHint.res_class = (char *)RESCLASS; 1350 classHint.res_class = (char *)RESCLASS;
1364 1351
1365 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1352 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1366 wmHint.input = True; 1353 wmHint.input = True;
1367 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1354 wmHint.initial_state = option (Opt_iconic) ? IconicState
1355 : option (Opt_dockapp) ? WithdrawnState
1356 : NormalState;
1368 wmHint.window_group = top; 1357 wmHint.window_group = top;
1369 1358
1370 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1359 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1371 &szHint, &wmHint, &classHint); 1360 &szHint, &wmHint, &classHint);
1372#if ENABLE_EWMH 1361#if ENABLE_EWMH
1373# ifdef HAVE_AFTERIMAGE
1374 /* 1362 /*
1375 * set up icon hint 1363 * set up icon hint
1376 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1364 * rs [Rs_iconfile] is path to icon
1377 */ 1365 */
1378 1366
1379 if (rs [Rs_iconfile]) 1367 if (rs [Rs_iconfile])
1380 { 1368 set_icon (rs [Rs_iconfile]);
1381 init_asv ();
1382
1383 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1384 if (asv && im)
1385 {
1386 int w = im->width;
1387 int h = im->height;
1388 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1389 ASImage *result = scale_asimage (asv, im,
1390 w, h, ASA_ARGB32,
1391 100, ASIMAGE_QUALITY_DEFAULT);
1392 destroy_asimage (&im);
1393
1394 if (buffer && result)
1395 {
1396 ARGB32 *asbuf = result->alt.argb32;
1397 buffer [0] = w;
1398 buffer [1] = h;
1399
1400 for (unsigned int i = 0; i < w * h; ++i)
1401 buffer [i + 2] = asbuf [i];
1402
1403 destroy_asimage (&result);
1404 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1405 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1406 free (buffer);
1407 }
1408 else
1409 {
1410 if (!buffer)
1411 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1412
1413 if (!result)
1414 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1415 }
1416 }
1417 else
1418 rxvt_warn ("Loading image icon failed, continuing without.\n");
1419 }
1420# endif
1421#endif 1369#endif
1422 1370
1423#if ENABLE_FRILLS 1371#if ENABLE_FRILLS
1424 if (mwmhints.flags) 1372 if (mwmhints.flags)
1425 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1373 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1431#if ENABLE_EWMH 1379#if ENABLE_EWMH
1432 xa[XA_NET_WM_PING], 1380 xa[XA_NET_WM_PING],
1433#endif 1381#endif
1434 }; 1382 };
1435 1383
1436 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1384 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1437 1385
1438#if ENABLE_FRILLS 1386#if ENABLE_FRILLS
1439 if (rs[Rs_transient_for]) 1387 if (rs[Rs_transient_for])
1440 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1388 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1441#endif 1389#endif
… …
1459 | ExposureMask | StructureNotifyMask); 1407 | ExposureMask | StructureNotifyMask);
1460 1408
1461 termwin_ev.start (display, top); 1409 termwin_ev.start (display, top);
1462 1410
1463 /* vt cursor: Black-on-White is standard, but this is more popular */ 1411 /* vt cursor: Black-on-White is standard, but this is more popular */
1412 unsigned int shape = XC_xterm;
1413
1414#ifdef HAVE_XMU
1415 if (rs[Rs_pointerShape])
1416 {
1417 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1418 if (stmp >= 0)
1419 shape = stmp;
1420 }
1421#endif
1422
1464 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1423 TermWin_cursor = XCreateFontCursor (dpy, shape);
1465 1424
1466 /* the vt window */ 1425 /* the vt window */
1467 vt = XCreateSimpleWindow (dpy, top, 1426 vt = XCreateSimpleWindow (dpy, top,
1468 window_vt_x, window_vt_y, 1427 window_vt_x, window_vt_y,
1469 width, height, 1428 vt_width, vt_height,
1470 0, 1429 0,
1471 pix_colors_focused[Color_fg], 1430 pix_colors_focused[Color_fg],
1472 pix_colors_focused[Color_bg]); 1431 pix_colors_focused[Color_bg]);
1473 1432
1474 attributes.bit_gravity = NorthWestGravity; 1433 attributes.bit_gravity = NorthWestGravity;
… …
1501 if (rs[Rs_fade]) 1460 if (rs[Rs_fade])
1502 pix_colors = pix_colors_unfocused; 1461 pix_colors = pix_colors_unfocused;
1503#endif 1462#endif
1504 1463
1505 pointer_unblank (); 1464 pointer_unblank ();
1506 scr_recolour (); 1465 scr_recolor ();
1507}
1508
1509/* ------------------------------------------------------------------------- *
1510 * GET TTY CURRENT STATE *
1511 * ------------------------------------------------------------------------- */
1512static void
1513rxvt_get_ttymode (struct termios *tio)
1514{
1515 /*
1516 * standard System V termios interface
1517 */
1518 // does not work as stdin is not a tty
1519 // if (tcgetattr (STDIN_FILENO, tio) < 0)
1520 if (1)
1521 {
1522 // return error - use system defaults,
1523 // where possible, and zero elsewhere
1524 memset (tio, 0, sizeof (struct termios));
1525 if (VDISABLE)
1526 for (int i = 0; i < NCCS; i++)
1527 tio->c_cc[i] = VDISABLE;
1528
1529 tio->c_cc[VINTR] = CINTR;
1530 tio->c_cc[VQUIT] = CQUIT;
1531 tio->c_cc[VERASE] = CERASE;
1532#ifdef VERASE2
1533 tio->c_cc[VERASE2] = CERASE2;
1534#endif
1535 tio->c_cc[VKILL] = CKILL;
1536 tio->c_cc[VSTART] = CSTART;
1537 tio->c_cc[VSTOP] = CSTOP;
1538 tio->c_cc[VSUSP] = CSUSP;
1539# ifdef VDSUSP
1540 tio->c_cc[VDSUSP] = CDSUSP;
1541# endif
1542# ifdef VREPRINT
1543 tio->c_cc[VREPRINT] = CRPRNT;
1544# endif
1545# ifdef VDISCRD
1546 tio->c_cc[VDISCRD] = CFLUSH;
1547# endif
1548# ifdef VWERSE
1549 tio->c_cc[VWERSE] = CWERASE;
1550# endif
1551# ifdef VLNEXT
1552 tio->c_cc[VLNEXT] = CLNEXT;
1553# endif
1554 }
1555
1556 tio->c_cc[VEOF] = CEOF;
1557# if VMIN != VEOF
1558 tio->c_cc[VMIN] = 1;
1559# endif
1560# if VTIME != VEOL
1561 tio->c_cc[VTIME] = 0;
1562# endif
1563
1564 /* input modes */
1565 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1566# ifdef IMAXBEL
1567 | IMAXBEL
1568# endif
1569 | IXON);
1570
1571 /* output modes */
1572 tio->c_oflag = (OPOST | ONLCR);
1573
1574 /* control modes */
1575 tio->c_cflag = (CS8 | CREAD);
1576
1577 /* line discipline modes */
1578 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1579# if defined (ECHOCTL) && defined (ECHOKE)
1580 | ECHOCTL | ECHOKE
1581# endif
1582 | ECHOE | ECHOK);
1583
1584 /*
1585 * Debugging
1586 */
1587#ifdef DEBUG_TTYMODE
1588 /* c_iflag bits */
1589 fprintf (stderr, "Input flags\n");
1590
1591 /* cpp token stringize doesn't work on all machines <sigh> */
1592# define FOO(flag,name) \
1593 if ((tio->c_iflag) & flag) \
1594 fprintf (stderr, "%s ", name)
1595
1596 /* c_iflag bits */
1597 FOO (IGNBRK, "IGNBRK");
1598 FOO (BRKINT, "BRKINT");
1599 FOO (IGNPAR, "IGNPAR");
1600 FOO (PARMRK, "PARMRK");
1601 FOO (INPCK, "INPCK");
1602 FOO (ISTRIP, "ISTRIP");
1603 FOO (INLCR, "INLCR");
1604 FOO (IGNCR, "IGNCR");
1605 FOO (ICRNL, "ICRNL");
1606 FOO (IXON, "IXON");
1607 FOO (IXOFF, "IXOFF");
1608# ifdef IUCLC
1609 FOO (IUCLC, "IUCLC");
1610# endif
1611# ifdef IXANY
1612 FOO (IXANY, "IXANY");
1613# endif
1614# ifdef IMAXBEL
1615 FOO (IMAXBEL, "IMAXBEL");
1616# endif
1617
1618 fprintf (stderr, "\n");
1619
1620# undef FOO
1621# define FOO(entry, name) \
1622 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1623
1624 FOO (VINTR, "VINTR");
1625 FOO (VQUIT, "VQUIT");
1626 FOO (VERASE, "VERASE");
1627 FOO (VKILL, "VKILL");
1628 FOO (VEOF, "VEOF");
1629 FOO (VEOL, "VEOL");
1630# ifdef VEOL2
1631 FOO (VEOL2, "VEOL2");
1632# endif
1633# ifdef VSWTC
1634 FOO (VSWTC, "VSWTC");
1635# endif
1636# ifdef VSWTCH
1637 FOO (VSWTCH, "VSWTCH");
1638# endif
1639 FOO (VSTART, "VSTART");
1640 FOO (VSTOP, "VSTOP");
1641 FOO (VSUSP, "VSUSP");
1642# ifdef VDSUSP
1643 FOO (VDSUSP, "VDSUSP");
1644# endif
1645# ifdef VREPRINT
1646 FOO (VREPRINT, "VREPRINT");
1647# endif
1648# ifdef VDISCRD
1649 FOO (VDISCRD, "VDISCRD");
1650# endif
1651# ifdef VWERSE
1652 FOO (VWERSE, "VWERSE");
1653# endif
1654# ifdef VLNEXT
1655 FOO (VLNEXT, "VLNEXT");
1656# endif
1657
1658 fprintf (stderr, "\n");
1659# undef FOO
1660#endif /* DEBUG_TTYMODE */
1661} 1466}
1662 1467
1663/*----------------------------------------------------------------------*/ 1468/*----------------------------------------------------------------------*/
1664/* 1469/*
1665 * Run the command in a subprocess and return a file descriptor for the 1470 * Run the command in a subprocess and return a file descriptor for the
… …
1677 if (pty->pty >= 0) 1482 if (pty->pty >= 0)
1678 { 1483 {
1679 if (getfd_hook) 1484 if (getfd_hook)
1680 pty->pty = (*getfd_hook) (pty->pty); 1485 pty->pty = (*getfd_hook) (pty->pty);
1681 1486
1682 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1487 if (pty->pty < 0)
1683 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1488 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1684 } 1489 }
1685 } 1490 }
1686 else 1491 else
1687#endif 1492#endif
1688 if (!pty->get ()) 1493 if (!pty->get ())
1689 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1494 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1690 1495
1691 rxvt_get_ttymode (&tio); 1496 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1497
1498 struct termios tio = def_tio;
1692 1499
1693#ifndef NO_BACKSPACE_KEY 1500#ifndef NO_BACKSPACE_KEY
1694 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1501 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1695 tio.c_cc[VERASE] = rs[Rs_backspace_key][0]; 1502 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1696 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1503 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
… …
1744 1551
1745 _exit (EXIT_FAILURE); 1552 _exit (EXIT_FAILURE);
1746 1553
1747 default: 1554 default:
1748 if (!option (Opt_utmpInhibit)) 1555 if (!option (Opt_utmpInhibit))
1556 {
1557#ifdef LOG_ONLY_ON_LOGIN
1558 bool login_shell = option (Opt_loginShell);
1559#else
1560 bool login_shell = true;
1561#endif
1749 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1562 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1563 }
1750 1564
1751 pty->close_tty (); 1565 pty->close_tty ();
1752 1566
1753 child_ev.start (cmd_pid); 1567 child_ev.start (cmd_pid);
1754 1568
… …
1779#elif defined (SRIOCSREDIR) 1593#elif defined (SRIOCSREDIR)
1780 int fd; 1594 int fd;
1781 1595
1782 fd = open (CONSOLE, O_WRONLY, 0); 1596 fd = open (CONSOLE, O_WRONLY, 0);
1783 if (fd >= 0) 1597 if (fd >= 0)
1784 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1598 {
1599 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1785 close (fd); 1600 close (fd);
1601 }
1786#endif /* SRIOCSREDIR */ 1602#endif /* SRIOCSREDIR */
1787 } 1603 }
1788 1604
1789 /* reset signals and spin off the command interpreter */ 1605 /* reset signals and spin off the command interpreter */
1790 signal (SIGINT, SIG_DFL); 1606 signal (SIGINT, SIG_DFL);

Diff Legend

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