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.283 by sf-exg, Wed Oct 13 23:04:57 2010 UTC vs.
Revision 1.350 by root, Sat Jul 3 04:04:13 2021 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 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * 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 19 * 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 20 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
21 * 22 *
22 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 39#include "init.h"
39#include "keyboard.h" 40#include "keyboard.h"
40 41
41#include <limits> 42#include <limits>
42 43
43#include <csignal> 44#include <signal.h>
44 45
45#include <fcntl.h> 46#include <fcntl.h>
47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
46 51
47#ifdef HAVE_XSETLOCALE 52#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 53# define X_LOCALE
49# include <X11/Xlocale.h> 54# include <X11/Xlocale.h>
50#else 55#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 56# include <locale.h>
53# endif
54#endif 57#endif
55 58
56#ifdef HAVE_NL_LANGINFO 59#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 60# include <langinfo.h>
61#endif
62
63#ifdef HAVE_STARTUP_NOTIFICATION
64# define SN_API_NOT_YET_FROZEN
65# include <libsn/sn-launchee.h>
58#endif 66#endif
59 67
60#ifdef DISPLAY_IS_IP 68#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 69/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 70#include <sys/types.h>
… …
73#include <netinet/in.h> 81#include <netinet/in.h>
74#include <arpa/inet.h> 82#include <arpa/inet.h>
75#include <net/if.h> 83#include <net/if.h>
76#include <net/if_arp.h> 84#include <net/if_arp.h>
77 85
78static char * 86static char * ecb_cold
79rxvt_network_display (const char *display) 87rxvt_network_display (const char *display)
80{ 88{
81 char buffer[1024], *rval = NULL; 89 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 90 struct ifconf ifc;
83 struct ifreq *ifr; 91 struct ifreq *ifr;
… …
143 151
144 return rval; 152 return rval;
145} 153}
146#endif 154#endif
147 155
156#define NULL_5 \
157 NULL, \
158 NULL, \
159 NULL, \
160 NULL, \
161 NULL,
162
163#define NULL_10 \
164 NULL_5 \
165 NULL_5
166
167#define NULL_40 \
168 NULL_10 \
169 NULL_10 \
170 NULL_10 \
171 NULL_10
172
173#define NULL_50 \
174 NULL_40 \
175 NULL_10
176
177#define NULL_100 \
178 NULL_50 \
179 NULL_50
180
148const char *const def_colorName[] = 181static const char *const def_colorName[] =
149 { 182 {
150 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
152 /* low-intensity colors */ 185 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 186 "rgb:00/00/00", // 0: black (Black)
… …
248 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
249 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
250 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
251 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
252 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
253#else 292#else
254 // 256 xterm colours 293 // 256 xterm colours
255 "rgb:00/00/00", 294 "rgb:00/00/00",
256 "rgb:00/00/5f", 295 "rgb:00/00/5f",
257 "rgb:00/00/87", 296 "rgb:00/00/87",
… …
490 "rgb:c6/c6/c6", 529 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0", 530 "rgb:d0/d0/d0",
492 "rgb:da/da/da", 531 "rgb:da/da/da",
493 "rgb:e4/e4/e4", 532 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee", 533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
495#endif 538#endif
496 539
497#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
498 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
499 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
… …
516#endif 559#endif
517 COLOR_SCROLLBAR, 560 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR 561#ifdef RXVT_SCROLLBAR
519 COLOR_SCROLLTROUGH, 562 COLOR_SCROLLTROUGH,
520#endif 563#endif
521#if ENABLE_TRANSPARENCY
522 NULL,
523#endif
524#if OFF_FOCUS_FADING 564#if OFF_FOCUS_FADING
525 "rgb:00/00/00", 565 "rgb:00/00/00",
526#endif 566#endif
527 }; 567 };
528 568
… …
558 set_option (Opt_iso14755); 598 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 599 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 600 set_option (Opt_buffered);
561} 601}
562 602
603#if ENABLE_PERL
604static void
605rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
606{
607 rxvt_perl.parse_resource (term, k, false, false, 0, v);
608}
609#endif
610
563/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
564const char ** 612const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 613rxvt_term::init_resources (int argc, const char *const *argv)
566{ 614{
567 int i, r_argc; 615 int i;
568 const char **cmd_argv, **r_argv; 616 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 617
598 rs[Rs_name] = rxvt_basename (argv[0]); 618 rs[Rs_name] = rxvt_basename (argv[0]);
599 619
600 /* 620 /*
601 * Open display, get options/resources and create the window 621 * Open display, get options/resources and create the window
602 */ 622 */
603 623
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 624 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 625 rs[Rs_display_name] = ":0";
606 626
607 get_options (r_argc, r_argv); 627 cmd_argv = get_options (argc, argv);
608 628
609 if (!(display = displays.get (rs[Rs_display_name]))) 629 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]); 630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 631
615 // using a local pointer decreases code size a lot 632 // using a local pointer decreases code size a lot
616 xa = display->xa; 633 xa = display->xa;
617 634
618 set (display); 635 set (display);
619 extract_resources (); 636 extract_resources ();
620 637
621#if XFT 638#if ENABLE_FRILLS
622 if (rs[Rs_depth]) 639 if (rs[Rs_visual])
623 select_visual (strtol (rs[Rs_depth], 0, 0)); 640 select_visual (strtol (rs[Rs_visual], 0, 0));
641 else if (rs[Rs_depth])
642 select_depth (strtol (rs[Rs_depth], 0, 0));
624#endif 643#endif
625
626 free (r_argv);
627 644
628 for (int i = NUM_RESOURCES; i--; ) 645 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 646 if (rs [i] == resval_undef)
630 rs [i] = 0; 647 rs [i] = 0;
631 648
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 gdk_pixbuf_xlib_init (dpy, display->screen);
640#endif
641
642#if ENABLE_PERL 649#if ENABLE_PERL
643 if (!rs[Rs_perl_ext_1]) 650 if (!rs[Rs_perl_ext_1])
644 rs[Rs_perl_ext_1] = "default"; 651 rs[Rs_perl_ext_1] = "default";
645 652
646 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 653 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
647 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 654 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
648 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 655 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
649 { 656 {
650 rxvt_perl.init (this); 657 rxvt_perl.init (this);
658 enumerate_resources (rxvt_perl_parse_resource);
651 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 659 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
652 } 660 }
653#endif 661#endif
662
663 // must be called after initialising the perl interpreter as it
664 // may invoke the `on_register_command' hook
665 extract_keysym_resources ();
654 666
655 /* 667 /*
656 * set any defaults not already set 668 * set any defaults not already set
657 */ 669 */
658 if (cmd_argv && cmd_argv[0]) 670 if (cmd_argv && cmd_argv[0])
… …
683 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 695 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
684 696
685 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 697 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
686 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 698 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
687 699
688 if (rs[Rs_letterSpace]) 700 if (const char *v = rs[Rs_letterSpace])
689 letterSpace = atoi (rs[Rs_letterSpace]); 701 letterSpace = atoi (v);
702
703 rewrap_always = rewrap_never = 0;
704 if (const char *v = rs[Rs_rewrapMode])
705 if (!strcmp (v, "never"))
706 rewrap_never = 1;
707 else if (!strcmp (v, "always"))
708 rewrap_always = 1;
709 else if (!strcmp (v, "auto"))
710 /* nop **/;
711 else
712 rxvt_warn ("invalid rewrapMode, must be auto, always or never.\n");
690#endif 713#endif
691 714
692#ifdef POINTER_BLANK 715#ifdef POINTER_BLANK
693 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 716 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
694 pointerBlankDelay = i; 717 pointerBlankDelay = i;
695 else 718 else
696 pointerBlankDelay = 2; 719 pointerBlankDelay = 2;
697#endif 720#endif
721
722 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
723 multiClickTime = i;
724 else
725 multiClickTime = 500;
726
727 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
698 728
699 /* no point having a scrollbar without having any scrollback! */ 729 /* no point having a scrollbar without having any scrollback! */
700 if (!saveLines) 730 if (!saveLines)
701 set_option (Opt_scrollBar, 0); 731 set_option (Opt_scrollBar, 0);
702 732
… …
767 return cmd_argv; 797 return cmd_argv;
768} 798}
769 799
770/*----------------------------------------------------------------------*/ 800/*----------------------------------------------------------------------*/
771void 801void
772rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 802rxvt_term::init (stringvec *argv, stringvec *envv)
773{ 803{
804 argv->push_back (0);
805 envv->push_back (0);
806
807 this->argv = argv;
774 this->envv = envv; 808 this->envv = envv;
775 809
810 env = new char *[this->envv->size ()];
811 for (int i = 0; i < this->envv->size (); i++)
812 env[i] = this->envv->at (i);
813
814 init2 (argv->size () - 1, argv->begin ());
815}
816
817void
818rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
819{
820#if ENABLE_PERL
821 // perl might want to access the stringvecs later, so we need to copy them
822 stringvec *args = new stringvec;
823 for (int i = 0; i < argc; i++)
824 args->push_back (strdup (argv [i]));
825
826 stringvec *envs = new stringvec;
827 for (const char *const *var = envv; *var; var++)
828 envs->push_back (strdup (*var));
829
830 init (args, envs);
831#else
832 init2 (argc, argv);
833#endif
834}
835
836void
837rxvt_term::init2 (int argc, const char *const *argv)
838{
776 SET_R (this); 839 SET_R (this);
777 set_locale (""); 840 set_locale ("");
778 set_environ (envv); // a few things in X do not call setlocale :( 841 set_environ (env); // a few things in X do not call setlocale :(
779 842
780 init_vars (); 843 init_vars ();
781 844
782 const char **cmd_argv = init_resources (argc, argv); 845 const char **cmd_argv = init_resources (argc, argv);
783 846
… …
794 if (chdir (path)) 857 if (chdir (path))
795 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 858 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
796 } 859 }
797 860
798 if (option (Opt_scrollBar)) 861 if (option (Opt_scrollBar))
799 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 862 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
800 863
801 pty = ptytty::create (); 864 pty = ptytty::create ();
802 865
803 create_windows (argc, argv); 866 create_windows (argc, argv);
804 867
… …
810 XSynchronize (dpy, True); 873 XSynchronize (dpy, True);
811#endif 874#endif
812 875
813 if (option (Opt_scrollBar)) 876 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */ 877 scrollBar.resize (); /* create and map scrollbar */
815#ifdef HAVE_BG_PIXMAP
816 {
817 bgPixmap.set_target (this);
818 bgPixmap.invalidate ();
819
820#ifdef ENABLE_TRANSPARENCY
821 if (option (Opt_transparent))
822 {
823 bgPixmap.set_transparent ();
824
825 if (rs [Rs_blurradius])
826 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
827
828 if (ISSET_PIXCOLOR (Color_tint))
829 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
830
831 if (rs [Rs_shade])
832 bgPixmap.set_shade (rs [Rs_shade]);
833
834 bgPixmap.set_root_pixmap ();
835 XSelectInput (dpy, display->root, PropertyChangeMask);
836 rootwin_ev.start (display, display->root);
837 }
838#endif
839
840#ifdef BG_IMAGE_FROM_FILE
841 if (rs[Rs_backgroundPixmap])
842 {
843 const char *p = rs[Rs_backgroundPixmap];
844
845 if ((p = strchr (p, ';')) != 0)
846 {
847 p++;
848 bgPixmap.set_geometry (p);
849 }
850 else
851 bgPixmap.set_defaultGeometry ();
852
853 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
854 if (!bgPixmap.window_position_sensitive ())
855 update_background ();
856 }
857#endif
858 }
859#endif
860 878
861#if ENABLE_PERL 879#if ENABLE_PERL
862 rootwin_ev.start (display, display->root); 880 rootwin_ev.start (display, display->root);
863#endif 881#endif
864 882
865 set_colorfgbg (); 883 init_done = 1;
866 884
867 init_command (cmd_argv); 885 init_command (cmd_argv);
868
869 free (cmd_argv);
870 886
871 if (pty->pty >= 0) 887 if (pty->pty >= 0)
872 pty_ev.start (pty->pty, ev::READ); 888 pty_ev.start (pty->pty, ev::READ);
873 889
874 HOOK_INVOKE ((this, HOOK_START, DT_END)); 890 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
876#if ENABLE_XEMBED 892#if ENABLE_XEMBED
877 if (rs[Rs_embed]) 893 if (rs[Rs_embed])
878 { 894 {
879 long info[2] = { 0, XEMBED_MAPPED }; 895 long info[2] = { 0, XEMBED_MAPPED };
880 896
881 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 897 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
882 32, PropModeReplace, (unsigned char *)&info, 2); 898 32, PropModeReplace, (unsigned char *)&info, 2);
883 } 899 }
884#endif 900#endif
885 901
902#if HAVE_STARTUP_NOTIFICATION
903 SnDisplay *snDisplay;
904 SnLauncheeContext *snContext;
905
906 snDisplay = sn_display_new (dpy, NULL, NULL);
907 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
908
909 /* Tell the window manager that this window is part of the startup context */
910 if (snContext)
911 sn_launchee_context_setup_window (snContext, parent);
912#endif
913
886 XMapWindow (dpy, vt); 914 XMapWindow (dpy, vt);
887 XMapWindow (dpy, parent[0]); 915 XMapWindow (dpy, parent);
916
917#if HAVE_STARTUP_NOTIFICATION
918 if (snContext)
919 {
920 /* Mark the startup process as complete */
921 sn_launchee_context_complete (snContext);
922
923 sn_launchee_context_unref (snContext);
924 }
925
926 sn_display_unref (snDisplay);
927#endif
888 928
889 refresh_check (); 929 refresh_check ();
890} 930}
891 931
892/*----------------------------------------------------------------------*/ 932/*----------------------------------------------------------------------*/
893void 933void
894rxvt_term::init_env () 934rxvt_term::init_env ()
895{ 935{
896 int i;
897 char *val; 936 char *val;
937 char *env_display;
938 char *env_windowid;
939 char *env_colorfgbg;
940 char *env_term;
898 941
899#ifdef DISPLAY_IS_IP 942#ifdef DISPLAY_IS_IP
900 /* Fixup display_name for export over pty to any interested terminal 943 /* Fixup display_name for export over pty to any interested terminal
901 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 944 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
902 * (for the first non-loopback interface) that we get from 945 * (for the first non-loopback interface) that we get from
… …
915 val = XDisplayString (dpy); 958 val = XDisplayString (dpy);
916 959
917 if (rs[Rs_display_name] == NULL) 960 if (rs[Rs_display_name] == NULL)
918 rs[Rs_display_name] = val; /* use broken `:0' value */ 961 rs[Rs_display_name] = val; /* use broken `:0' value */
919 962
920 i = strlen (val);
921 env_display = (char *)rxvt_malloc (i + 9); 963 env_display = (char *)rxvt_malloc (strlen (val) + 9);
922 964
923 sprintf (env_display, "DISPLAY=%s", val); 965 sprintf (env_display, "DISPLAY=%s", val);
924 966
967 env_windowid = (char *)rxvt_malloc (21);
925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 968 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
926 969
927 /* add entries to the environment: 970 /* add entries to the environment:
928 * @ DISPLAY: in case we started with -display 971 * @ DISPLAY: in case we started with -display
929 * @ WINDOWID: X window id number of the window 972 * @ WINDOWID: X window id number of the window
930 * @ COLORTERM: terminal sub-name and also indicates its color 973 * @ COLORTERM: terminal sub-name and also indicates its color
… …
933 * @ COLORFGBG: fg;bg color codes 976 * @ COLORFGBG: fg;bg color codes
934 */ 977 */
935 putenv (env_display); 978 putenv (env_display);
936 putenv (env_windowid); 979 putenv (env_windowid);
937 980
938 if (env_colorfgbg) 981 env_colorfgbg = get_colorfgbg ();
939 putenv (env_colorfgbg); 982 putenv (env_colorfgbg);
940 983
941#ifdef RXVT_TERMINFO 984#ifdef RXVT_TERMINFO
942 putenv ("TERMINFO=" RXVT_TERMINFO); 985 putenv ("TERMINFO=" RXVT_TERMINFO);
943#endif 986#endif
944 987
945 if (depth <= 2) 988 if (depth <= 2)
946 putenv ("COLORTERM=" COLORTERMENV "-mono"); 989 putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
947 else 990 else
948 putenv ("COLORTERM=" COLORTERMENVFULL); 991 putenv ((char *)"COLORTERM=" COLORTERMENVFULL);
949 992
950 if (rs[Rs_term_name] != NULL) 993 if (rs[Rs_term_name] != NULL)
951 { 994 {
952 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); 995 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
953 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 996 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
954 putenv (env_term); 997 putenv (env_term);
955 } 998 }
956 else 999 else
957 putenv ("TERM=" TERMENV); 1000 putenv ((char *)"TERM=" TERMENV);
958 1001
959#ifdef HAVE_UNSETENV 1002#ifdef HAVE_UNSETENV
960 /* avoid passing old settings and confusing term size */ 1003 /* avoid passing old settings and confusing term size */
961 unsetenv ("LINES"); 1004 unsetenv ("LINES");
962 unsetenv ("COLUMNS"); 1005 unsetenv ("COLUMNS");
963 unsetenv ("TERMCAP"); /* terminfo should be okay */ 1006 unsetenv ("TERMCAP"); /* terminfo should be okay */
964#endif /* HAVE_UNSETENV */ 1007#endif /* HAVE_UNSETENV */
965} 1008}
966 1009
967/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
968/*
969 * This is more or less stolen straight from XFree86 xterm.
970 * This should support all European type languages.
971 */
972void 1011void
973rxvt_term::set_locale (const char *locale) 1012rxvt_term::set_locale (const char *locale)
974{ 1013{
975 set_environ (envv); 1014 set_environ (env);
976 1015
977#if HAVE_XSETLOCALE || HAVE_SETLOCALE
978 free (this->locale); 1016 free (this->locale);
979 this->locale = setlocale (LC_CTYPE, locale); 1017 this->locale = setlocale (LC_CTYPE, locale);
980 1018
981 if (!this->locale) 1019 if (!this->locale)
982 { 1020 {
… …
986 setlocale (LC_CTYPE, "C"); 1024 setlocale (LC_CTYPE, "C");
987 } 1025 }
988 else 1026 else
989 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 1027 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
990 1028
991 this->locale = "C"; 1029 this->locale = (char *)"C"; /* strdup'ed below */
992 } 1030 }
993 1031
994 1032
995 this->locale = strdup (this->locale); 1033 this->locale = strdup (this->locale);
996 SET_LOCALE (this->locale); 1034 SET_LOCALE (this->locale);
997 mbstate.reset (); 1035 mbstate.reset ();
998#endif
999 1036
1000#if HAVE_NL_LANGINFO 1037#if HAVE_NL_LANGINFO
1001 char *codeset = strdup (nl_langinfo (CODESET)); 1038 char *codeset = nl_langinfo (CODESET);
1002 // /^UTF.?8/i 1039 // /^UTF.?8/i
1003 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1040 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1004 && (codeset[1] == 'T' || codeset[1] == 't') 1041 && (codeset[1] == 'T' || codeset[1] == 't')
1005 && (codeset[2] == 'F' || codeset[2] == 'f') 1042 && (codeset[2] == 'F' || codeset[2] == 'f')
1006 && (codeset[3] == '8' || codeset[4] == '8'); 1043 && (codeset[3] == '8' || codeset[4] == '8');
1007 free (codeset);
1008#else 1044#else
1009 enc_utf8 = 0; 1045 enc_utf8 = 0;
1010#endif 1046#endif
1011} 1047}
1012 1048
1013void 1049void
1014rxvt_term::init_xlocale () 1050rxvt_term::init_xlocale ()
1015{ 1051{
1016 set_environ (envv); 1052 set_environ (env);
1017 1053
1018#ifdef USE_XIM 1054#if USE_XIM
1019 if (!locale) 1055 if (!locale)
1020 rxvt_warn ("setting locale failed, working without locale support.\n"); 1056 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1021 else 1057 else
1022 { 1058 {
1023 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1059 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1024 1060
1025 if (!XSupportsLocale ()) 1061 if (!XSupportsLocale ())
1026 { 1062 {
1027 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1063 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1028 return; 1064 return;
1029 } 1065 }
1030 1066
1031 im_ev.start (display); 1067 im_ev.start (display);
1032 1068
… …
1073 run_command (argv); 1109 run_command (argv);
1074} 1110}
1075 1111
1076/*----------------------------------------------------------------------*/ 1112/*----------------------------------------------------------------------*/
1077void 1113void
1078rxvt_term::get_colours () 1114rxvt_term::get_colors ()
1079{ 1115{
1080 int i; 1116 int i;
1081 1117
1082#ifdef OFF_FOCUS_FADING 1118#ifdef OFF_FOCUS_FADING
1083 pix_colors = pix_colors_focused; 1119 pix_colors = pix_colors_focused;
1084#endif 1120#endif
1085 1121
1086 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1122 for (i = 0; i < NRS_COLORS; i++)
1087 {
1088 const char *name = rs[Rs_color + i]; 1123 if (const char *name = rs[Rs_color + i])
1089
1090 if (!name)
1091 continue;
1092
1093 rxvt_color xcol;
1094
1095 if (!set_color (xcol, name)) 1124 set_color (pix_colors [i], name);
1096 {
1097#ifndef XTERM_REVERSE_VIDEO
1098 if (i < 2 && option (Opt_reverseVideo))
1099 name = def_colorName [1 - i];
1100 else
1101#endif
1102 name = def_colorName [i];
1103
1104 if (!name)
1105 continue;
1106
1107 if (!set_color (xcol, name))
1108 {
1109 switch (i)
1110 {
1111 case Color_fg:
1112 case Color_bg:
1113 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1114 name = "";
1115 break;
1116#ifndef NO_CURSORCOLOR
1117 case Color_cursor2:
1118#endif
1119 case Color_pointer_fg:
1120 name = rs[Rs_color + Color_fg];
1121 xcol.set (this, name);
1122 break;
1123 default:
1124 name = rs[Rs_color + Color_bg];
1125 xcol.set (this, name);
1126 break;
1127 }
1128 }
1129 }
1130
1131 pix_colors[i] = xcol;
1132 rs[Rs_color + i] = name;
1133 }
1134
1135 if (depth <= 2)
1136 {
1137 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1138 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1139 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1140 }
1141 1125
1142 /* 1126 /*
1143 * get scrollBar shadow colors 1127 * get scrollBar shadow colors
1144 * 1128 *
1145 * The calculations of topShadow/bottomShadow values are adapted 1129 * The calculations of topShadow/bottomShadow values are adapted
1146 * from the fvwm window manager. 1130 * from the fvwm window manager.
1147 */ 1131 */
1148#ifdef RXVT_SCROLLBAR 1132#ifdef RXVT_SCROLLBAR
1149 if (depth <= 2)
1150 {
1151 /* Monochrome */
1152 alias_color (Color_scroll, Color_fg);
1153 alias_color (Color_topShadow, Color_bg);
1154 alias_color (Color_bottomShadow, Color_bg);
1155 }
1156 else
1157 {
1158 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1133 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1159 1134
1160 rgba cscroll; 1135 rgba cscroll;
1161 pix_colors [Color_scroll].get (cscroll); 1136 pix_colors [Color_scroll].get (cscroll);
1162 1137
1163 /* topShadowColor */ 1138 /* topShadowColor */
1164 if (!pix_colors[Color_topShadow].set (this, 1139 if (!pix_colors[Color_topShadow].set (this,
1165 rgba ( 1140 rgba (
1166 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1141 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1167 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1142 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1168 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1143 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1169 cscroll.a) 1144 cscroll.a)
1170 )) 1145 ))
1171 alias_color (Color_topShadow, Color_White); 1146 alias_color (Color_topShadow, Color_White);
1172 }
1173#endif 1147#endif
1174 1148
1175#ifdef OFF_FOCUS_FADING 1149#ifdef OFF_FOCUS_FADING
1176 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1150 for (i = 0; i < NRS_COLORS; i++)
1177 update_fade_color (i); 1151 update_fade_color (i, true);
1178#endif 1152#endif
1179} 1153}
1180 1154
1181/*----------------------------------------------------------------------*/ 1155/*----------------------------------------------------------------------*/
1182/* color aliases, fg/bg bright-bold */ 1156/* color aliases, fg/bg bright-bold */
1183void 1157void
1184rxvt_term::color_aliases (int idx) 1158rxvt_term::color_aliases (int idx)
1185{ 1159{
1186 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1160 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1187 { 1161 {
1188 int i = atoi (rs[Rs_color + idx]); 1162 int i = atoi (rs[Rs_color + idx]);
1189 1163
1190 if (i >= 8 && i <= 15) 1164 if (i >= 8 && i <= 15)
1191 /* bright colors */ 1165 /* bright colors */
… …
1231 for (j = map->max_keypermod; j--; k++) 1205 for (j = map->max_keypermod; j--; k++)
1232 { 1206 {
1233 if (kc[k] == 0) 1207 if (kc[k] == 0)
1234 break; 1208 break;
1235 1209
1236 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1210 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1237 { 1211 {
1238 case XK_Num_Lock: 1212 case XK_Num_Lock:
1239 ModNumLockMask = modmasks[i - 1]; 1213 ModNumLockMask = modmasks[i - 1];
1240 continue; 1214 continue;
1241 1215
… …
1286} 1260}
1287 1261
1288void 1262void
1289rxvt_term::set_icon (const char *file) 1263rxvt_term::set_icon (const char *file)
1290{ 1264{
1291#ifdef HAVE_AFTERIMAGE 1265#if HAVE_PIXBUF && ENABLE_EWMH
1292 init_asv ();
1293
1294 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1295 if (!im)
1296 {
1297 rxvt_warn ("Loading image icon failed, continuing without.\n");
1298 return;
1299 }
1300
1301 unsigned int w = im->width;
1302 unsigned int h = im->height;
1303
1304 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1305 {
1306 rxvt_warn ("Icon image too big, continuing without.\n");
1307 destroy_asimage (&im);
1308 return;
1309 }
1310
1311 ASImage *result = scale_asimage (asv, im,
1312 w, h, ASA_ARGB32,
1313 100, ASIMAGE_QUALITY_DEFAULT);
1314 destroy_asimage (&im);
1315
1316 if (!result)
1317 {
1318 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1319 return;
1320 }
1321
1322 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1323 if (buffer)
1324 {
1325 ARGB32 *asbuf = result->alt.argb32;
1326 buffer [0] = w;
1327 buffer [1] = h;
1328
1329 for (unsigned int i = 0; i < w * h; ++i)
1330 buffer [i + 2] = asbuf [i];
1331
1332 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1333 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1334 free (buffer);
1335 }
1336 else
1337 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1338
1339 destroy_asimage (&result);
1340#endif
1341
1342#ifdef HAVE_PIXBUF
1343 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1266 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1344 if (!pixbuf) 1267 if (!pixbuf)
1345 { 1268 {
1346 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1269 rxvt_warn ("Loading image icon failed, continuing without.\n");
1347 return; 1270 return;
… …
1384 } 1307 }
1385 1308
1386 row += rowstride; 1309 row += rowstride;
1387 } 1310 }
1388 1311
1389 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1312 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1390 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1313 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1391 free (buffer); 1314 free (buffer);
1392 } 1315 }
1393 else 1316 else
1394 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1317 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1396 g_object_unref (pixbuf); 1319 g_object_unref (pixbuf);
1397#endif 1320#endif
1398} 1321}
1399 1322
1400/*----------------------------------------------------------------------*/ 1323/*----------------------------------------------------------------------*/
1401/* rxvt_Create_Windows () - Open and map the window */ 1324/* Open and map the window */
1402void 1325void
1403rxvt_term::create_windows (int argc, const char *const *argv) 1326rxvt_term::create_windows (int argc, const char *const *argv)
1404{ 1327{
1405 XClassHint classHint; 1328 XClassHint classHint;
1406 XWMHints wmHint; 1329 XWMHints wmHint;
… …
1412 Window top, parent; 1335 Window top, parent;
1413 1336
1414 dLocal (Display *, dpy); 1337 dLocal (Display *, dpy);
1415 1338
1416 /* grab colors before netscape does */ 1339 /* grab colors before netscape does */
1417 get_colours (); 1340 get_colors ();
1418 1341
1419 if (!set_fonts ()) 1342 if (!set_fonts ())
1420 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1343 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1421 1344
1422 parent = display->root; 1345 parent = display->root;
… …
1452 } 1375 }
1453#endif 1376#endif
1454 1377
1455 window_calc (0, 0); 1378 window_calc (0, 0);
1456 1379
1457 /* sub-window placement & size in rxvt_resize_subwindows () */ 1380 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1458 attributes.background_pixel = pix_colors_focused [Color_border]; 1381 attributes.background_pixel = pix_colors_focused [Color_border];
1459 attributes.border_pixel = pix_colors_focused [Color_border]; 1382 attributes.border_pixel = pix_colors_focused [Color_border];
1460 attributes.colormap = cmap; 1383 attributes.colormap = cmap;
1461 1384
1462 top = XCreateWindow (dpy, parent, 1385 top = XCreateWindow (dpy, parent,
… …
1465 ext_bwidth, 1388 ext_bwidth,
1466 depth, InputOutput, visual, 1389 depth, InputOutput, visual,
1467 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1390 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1468 &attributes); 1391 &attributes);
1469 1392
1470 this->parent[0] = top; 1393 this->parent = top;
1471
1472 old_width = szHint.width;
1473 old_height = szHint.height;
1474 1394
1475 set_title (rs [Rs_title]); 1395 set_title (rs [Rs_title]);
1476 set_icon_name (rs [Rs_iconName]); 1396 set_icon_name (rs [Rs_iconName]);
1477 1397
1478 classHint.res_name = (char *)rs[Rs_name]; 1398 classHint.res_name = (char *)rs[Rs_name];
1479 classHint.res_class = (char *)RESCLASS; 1399 classHint.res_class = (char *)RESCLASS;
1480 1400
1481 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1401 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1482 wmHint.input = True; 1402 wmHint.input = True;
1483 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1403 wmHint.initial_state = option (Opt_iconic) ? IconicState
1404 : option (Opt_dockapp) ? WithdrawnState
1405 : NormalState;
1484 wmHint.window_group = top; 1406 wmHint.window_group = top;
1485 1407
1486 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1408 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1487 &szHint, &wmHint, &classHint); 1409 &szHint, &wmHint, &classHint);
1488#if ENABLE_EWMH 1410#if ENABLE_EWMH
… …
1490 * set up icon hint 1412 * set up icon hint
1491 * rs [Rs_iconfile] is path to icon 1413 * rs [Rs_iconfile] is path to icon
1492 */ 1414 */
1493 1415
1494 if (rs [Rs_iconfile]) 1416 if (rs [Rs_iconfile])
1495 {
1496 set_icon (rs [Rs_iconfile]); 1417 set_icon (rs [Rs_iconfile]);
1497 }
1498#endif 1418#endif
1499 1419
1500#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
1501 if (mwmhints.flags) 1421 if (mwmhints.flags)
1502 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1422 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1508#if ENABLE_EWMH 1428#if ENABLE_EWMH
1509 xa[XA_NET_WM_PING], 1429 xa[XA_NET_WM_PING],
1510#endif 1430#endif
1511 }; 1431 };
1512 1432
1513 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1433 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1514 1434
1515#if ENABLE_FRILLS 1435#if ENABLE_FRILLS
1516 if (rs[Rs_transient_for]) 1436 if (rs[Rs_transient_for])
1517 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1437 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1518#endif 1438#endif
… …
1536 | ExposureMask | StructureNotifyMask); 1456 | ExposureMask | StructureNotifyMask);
1537 1457
1538 termwin_ev.start (display, top); 1458 termwin_ev.start (display, top);
1539 1459
1540 /* vt cursor: Black-on-White is standard, but this is more popular */ 1460 /* vt cursor: Black-on-White is standard, but this is more popular */
1461 unsigned int shape = XC_xterm;
1462
1463#ifdef HAVE_XMU
1464 if (rs[Rs_pointerShape])
1465 {
1466 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1467 if (stmp >= 0)
1468 shape = stmp;
1469 }
1470#endif
1471
1541 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1472 TermWin_cursor = XCreateFontCursor (dpy, shape);
1542 1473
1543 /* the vt window */ 1474 /* the vt window */
1544 vt = XCreateSimpleWindow (dpy, top, 1475 vt = XCreateSimpleWindow (dpy, top,
1545 window_vt_x, window_vt_y, 1476 window_vt_x, window_vt_y,
1546 width, height, 1477 vt_width, vt_height,
1547 0, 1478 0,
1548 pix_colors_focused[Color_fg], 1479 pix_colors_focused[Color_fg],
1549 pix_colors_focused[Color_bg]); 1480 pix_colors_focused[Color_bg]);
1550 1481
1551 attributes.bit_gravity = NorthWestGravity; 1482 attributes.bit_gravity = NorthWestGravity;
… …
1578 if (rs[Rs_fade]) 1509 if (rs[Rs_fade])
1579 pix_colors = pix_colors_unfocused; 1510 pix_colors = pix_colors_unfocused;
1580#endif 1511#endif
1581 1512
1582 pointer_unblank (); 1513 pointer_unblank ();
1583 scr_recolour (); 1514 scr_recolor ();
1584} 1515}
1585 1516
1586/*----------------------------------------------------------------------*/ 1517/*----------------------------------------------------------------------*/
1587/* 1518/*
1588 * Run the command in a subprocess and return a file descriptor for the 1519 * Run the command in a subprocess and return a file descriptor for the
… …
1600 if (pty->pty >= 0) 1531 if (pty->pty >= 0)
1601 { 1532 {
1602 if (getfd_hook) 1533 if (getfd_hook)
1603 pty->pty = (*getfd_hook) (pty->pty); 1534 pty->pty = (*getfd_hook) (pty->pty);
1604 1535
1605 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1536 if (pty->pty < 0)
1606 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1537 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1607 } 1538 }
1608 } 1539 }
1609 else 1540 else
1610#endif 1541#endif
1611 if (!pty->get ()) 1542 if (!pty->get ())
1612 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1543 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1544
1545 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1613 1546
1614 struct termios tio = def_tio; 1547 struct termios tio = def_tio;
1615 1548
1616#ifndef NO_BACKSPACE_KEY 1549#ifndef NO_BACKSPACE_KEY
1617 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1550 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1667 1600
1668 _exit (EXIT_FAILURE); 1601 _exit (EXIT_FAILURE);
1669 1602
1670 default: 1603 default:
1671 if (!option (Opt_utmpInhibit)) 1604 if (!option (Opt_utmpInhibit))
1605 {
1606#ifdef LOG_ONLY_ON_LOGIN
1607 bool login_shell = option (Opt_loginShell);
1608#else
1609 bool login_shell = true;
1610#endif
1672 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1611 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1612 }
1673 1613
1674 pty->close_tty (); 1614 pty->close_tty ();
1675 1615
1676 child_ev.start (cmd_pid); 1616 child_ev.start (cmd_pid);
1677 1617
… …
1702#elif defined (SRIOCSREDIR) 1642#elif defined (SRIOCSREDIR)
1703 int fd; 1643 int fd;
1704 1644
1705 fd = open (CONSOLE, O_WRONLY, 0); 1645 fd = open (CONSOLE, O_WRONLY, 0);
1706 if (fd >= 0) 1646 if (fd >= 0)
1707 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1647 {
1648 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1708 close (fd); 1649 close (fd);
1650 }
1709#endif /* SRIOCSREDIR */ 1651#endif /* SRIOCSREDIR */
1710 } 1652 }
1711 1653
1712 /* reset signals and spin off the command interpreter */ 1654 /* reset signals and spin off the command interpreter */
1713 signal (SIGINT, SIG_DFL); 1655 signal (SIGINT, SIG_DFL);

Diff Legend

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