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.264 by sf-exg, Sun Apr 4 18:59:19 2010 UTC vs.
Revision 1.341 by root, Mon Dec 15 00:51:06 2014 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 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
56#endif
57
58#ifdef HAVE_STARTUP_NOTIFICATION
59# define SN_API_NOT_YET_FROZEN
60# include <libsn/sn-launchee.h>
58#endif 61#endif
59 62
60#ifdef DISPLAY_IS_IP 63#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 64/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 65#include <sys/types.h>
… …
73#include <netinet/in.h> 76#include <netinet/in.h>
74#include <arpa/inet.h> 77#include <arpa/inet.h>
75#include <net/if.h> 78#include <net/if.h>
76#include <net/if_arp.h> 79#include <net/if_arp.h>
77 80
78static char * 81static char * ecb_cold
79rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
80{ 83{
81 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 85 struct ifconf ifc;
83 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
143 146
144 return rval; 147 return rval;
145} 148}
146#endif 149#endif
147 150
148const char *const def_colorName[] = 151static const char *const def_colorName[] =
149 { 152 {
150 COLOR_FOREGROUND, 153 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 154 COLOR_BACKGROUND,
152 /* low-intensity colors */ 155 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 156 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 177 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 178 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 179 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 180 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 181
179#ifndef USE_256_COLORS 182#if !USE_256_COLORS
180 // 88 xterm colours 183 // 88 xterm colours
181 "rgb:00/00/00", 184 "rgb:00/00/00",
182 "rgb:00/00/8b", 185 "rgb:00/00/8b",
183 "rgb:00/00/cd", 186 "rgb:00/00/cd",
184 "rgb:00/00/ff", 187 "rgb:00/00/ff",
… …
516#endif 519#endif
517 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
519 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
520#endif 523#endif
521#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
522 NULL, 525 NULL,
523#endif 526#endif
524#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
525 "rgb:00/00/00", 528 "rgb:00/00/00",
526#endif 529#endif
… …
558 set_option (Opt_iso14755); 561 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 562 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 563 set_option (Opt_buffered);
561} 564}
562 565
563static void
564init_secondary ()
565{
566 int i;
567
568 if ((i = open ("/dev/null", O_RDONLY)) < 0)
569 {
570 dup2 (STDERR_FILENO, STDIN_FILENO);
571 }
572 else if (i != STDIN_FILENO)
573 {
574 dup2 (i, STDIN_FILENO);
575 close (i);
576 }
577
578 dup2 (STDERR_FILENO, STDOUT_FILENO);
579}
580
581/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
582const char ** 567const char **
583rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
584{ 569{
585 int i, r_argc; 570 int i;
586 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
587
588 /*
589 * Look for -e option. Find => split and make cmd_argv[] of command args
590 */
591 for (r_argc = 0; r_argc < argc; r_argc++)
592 if (!strcmp (argv[r_argc], "-e"))
593 break;
594
595 if (r_argc == argc)
596 cmd_argv = NULL;
597 else if (!argv[r_argc + 1])
598 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
599 else
600 {
601 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
602
603 for (i = 0; i < argc - r_argc - 1; i++)
604 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
605
606 cmd_argv[i] = NULL;
607 }
608
609 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
610
611 for (i = 0; i < r_argc; i++)
612 r_argv[i] = (const char *)argv[i];
613
614 r_argv[i] = NULL;
615 572
616 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
617 574
618 /* 575 /*
619 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
620 */ 577 */
621 578
622 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
623 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
624 581
625 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
626 583
627 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
628 {
629 free (r_argv);
630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
632 586
633 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
634 xa = display->xa; 588 xa = display->xa;
635 589
636 set (display); 590 set (display);
637 extract_resources (); 591 extract_resources ();
638 592
639#if XFT 593#if ENABLE_FRILLS
640 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
641 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
642#endif 598#endif
643
644 free (r_argv);
645 599
646 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
648 rs [i] = 0; 602 rs [i] = 0;
649 603
650#ifdef HAVE_AFTERIMAGE
651 set_application_name ((char *)rs[Rs_name]);
652 set_output_threshold (OUTPUT_LEVEL_WARNING);
653#endif
654
655#if ENABLE_PERL 604#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
658 607
659 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
662 { 611 {
663 rxvt_perl.init (this); 612 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 } 614 }
666#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 ();
667 620
668 /* 621 /*
669 * set any defaults not already set 622 * set any defaults not already set
670 */ 623 */
671 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
706 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
707 pointerBlankDelay = i; 660 pointerBlankDelay = i;
708 else 661 else
709 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
710#endif 663#endif
664
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i;
667 else
668 multiClickTime = 500;
669
670 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
711 671
712 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
713 if (!saveLines) 673 if (!saveLines)
714 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
715 675
… …
780 return cmd_argv; 740 return cmd_argv;
781} 741}
782 742
783/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
784void 744void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 745rxvt_term::init (stringvec *argv, stringvec *envv)
786{ 746{
747 argv->push_back (0);
748 envv->push_back (0);
749
750 this->argv = argv;
787 this->envv = envv; 751 this->envv = envv;
788 752
753 env = new char *[this->envv->size ()];
754 for (int i = 0; i < this->envv->size (); i++)
755 env[i] = this->envv->at (i);
756
757 init2 (argv->size () - 1, argv->begin ());
758}
759
760void
761rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
762{
763#if ENABLE_PERL
764 // perl might want to access the stringvecs later, so we need to copy them
765 stringvec *args = new stringvec;
766 for (int i = 0; i < argc; i++)
767 args->push_back (strdup (argv [i]));
768
769 stringvec *envs = new stringvec;
770 for (const char *const *var = envv; *var; var++)
771 envs->push_back (strdup (*var));
772
773 init (args, envs);
774#else
775 init2 (argc, argv);
776#endif
777}
778
779void
780rxvt_term::init2 (int argc, const char *const *argv)
781{
789 SET_R (this); 782 SET_R (this);
790 set_locale (""); 783 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :( 784 set_environ (env); // a few things in X do not call setlocale :(
792 785
793 init_vars (); 786 init_vars ();
794
795 init_secondary ();
796 787
797 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
798 789
799#ifdef KEYSYM_RESOURCE 790#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 791 keyboard->register_done ();
… …
809 if (chdir (path)) 800 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 801 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 } 802 }
812 803
813 if (option (Opt_scrollBar)) 804 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 805 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815 806
816 pty = ptytty::create (); 807 pty = ptytty::create ();
817 808
818 create_windows (argc, argv); 809 create_windows (argc, argv);
819 810
… …
825 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
826#endif 817#endif
827 818
828 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
821
830#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
831 { 823 bg_init ();
832 bgPixmap.set_target (this);
833 bgPixmap.invalidate ();
834
835#ifdef ENABLE_TRANSPARENCY
836 if (option (Opt_transparent))
837 {
838 bgPixmap.set_transparent ();
839
840#ifdef HAVE_AFTERIMAGE
841 if (rs [Rs_blurradius])
842 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
843#endif
844 if (ISSET_PIXCOLOR (Color_tint))
845 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
846
847 if (rs [Rs_shade])
848 bgPixmap.set_shade (rs [Rs_shade]);
849
850 bgPixmap.set_root_pixmap ();
851 XSelectInput (dpy, display->root, PropertyChangeMask);
852 rootwin_ev.start (display, display->root);
853 }
854#endif
855
856#ifdef BG_IMAGE_FROM_FILE
857 if (rs[Rs_backgroundPixmap])
858 {
859 const char *p = rs[Rs_backgroundPixmap];
860
861 if ((p = strchr (p, ';')) != 0)
862 {
863 p++;
864 bgPixmap.set_geometry (p);
865 }
866 else
867 bgPixmap.set_defaultGeometry ();
868
869 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
870 if (!bgPixmap.window_position_sensitive ())
871 update_background ();
872 }
873#endif
874 }
875#endif 824#endif
876 825
877#if ENABLE_PERL 826#if ENABLE_PERL
878 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
879#endif 828#endif
880 829
881 set_colorfgbg (); 830 init_done = 1;
882 831
883 init_command (cmd_argv); 832 init_command (cmd_argv);
884
885 free (cmd_argv);
886 833
887 if (pty->pty >= 0) 834 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ); 835 pty_ev.start (pty->pty, ev::READ);
889 836
890 HOOK_INVOKE ((this, HOOK_START, DT_END)); 837 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
892#if ENABLE_XEMBED 839#if ENABLE_XEMBED
893 if (rs[Rs_embed]) 840 if (rs[Rs_embed])
894 { 841 {
895 long info[2] = { 0, XEMBED_MAPPED }; 842 long info[2] = { 0, XEMBED_MAPPED };
896 843
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 844 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2); 845 32, PropModeReplace, (unsigned char *)&info, 2);
899 } 846 }
900#endif 847#endif
901 848
849#if HAVE_STARTUP_NOTIFICATION
850 SnDisplay *snDisplay;
851 SnLauncheeContext *snContext;
852
853 snDisplay = sn_display_new (dpy, NULL, NULL);
854 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
855
856 /* Tell the window manager that this window is part of the startup context */
857 if (snContext)
858 sn_launchee_context_setup_window (snContext, parent);
859#endif
860
902 XMapWindow (dpy, vt); 861 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]); 862 XMapWindow (dpy, parent);
863
864#if HAVE_STARTUP_NOTIFICATION
865 if (snContext)
866 {
867 /* Mark the startup process as complete */
868 sn_launchee_context_complete (snContext);
869
870 sn_launchee_context_unref (snContext);
871 }
872
873 sn_display_unref (snDisplay);
874#endif
904 875
905 refresh_check (); 876 refresh_check ();
906} 877}
907 878
908/*----------------------------------------------------------------------*/ 879/*----------------------------------------------------------------------*/
909void 880void
910rxvt_term::init_env () 881rxvt_term::init_env ()
911{ 882{
912 int i;
913 char *val; 883 char *val;
884 char *env_display;
885 char *env_windowid;
886 char *env_colorfgbg;
887 char *env_term;
914 888
915#ifdef DISPLAY_IS_IP 889#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 890 /* Fixup display_name for export over pty to any interested terminal
917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 891 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
918 * (for the first non-loopback interface) that we get from 892 * (for the first non-loopback interface) that we get from
… …
931 val = XDisplayString (dpy); 905 val = XDisplayString (dpy);
932 906
933 if (rs[Rs_display_name] == NULL) 907 if (rs[Rs_display_name] == NULL)
934 rs[Rs_display_name] = val; /* use broken `:0' value */ 908 rs[Rs_display_name] = val; /* use broken `:0' value */
935 909
936 i = strlen (val);
937 env_display = (char *)rxvt_malloc (i + 9); 910 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 911
939 sprintf (env_display, "DISPLAY=%s", val); 912 sprintf (env_display, "DISPLAY=%s", val);
940 913
914 env_windowid = (char *)rxvt_malloc (21);
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 915 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 916
943 /* add entries to the environment: 917 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 918 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 919 * @ WINDOWID: X window id number of the window
946 * @ COLORTERM: terminal sub-name and also indicates its color 920 * @ COLORTERM: terminal sub-name and also indicates its color
… …
949 * @ COLORFGBG: fg;bg color codes 923 * @ COLORFGBG: fg;bg color codes
950 */ 924 */
951 putenv (env_display); 925 putenv (env_display);
952 putenv (env_windowid); 926 putenv (env_windowid);
953 927
954 if (env_colorfgbg) 928 env_colorfgbg = get_colorfgbg ();
955 putenv (env_colorfgbg); 929 putenv (env_colorfgbg);
956 930
957#ifdef RXVT_TERMINFO 931#ifdef RXVT_TERMINFO
958 putenv ("TERMINFO=" RXVT_TERMINFO); 932 putenv ("TERMINFO=" RXVT_TERMINFO);
959#endif 933#endif
960 934
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 953 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 954#endif /* HAVE_UNSETENV */
981} 955}
982 956
983/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 958void
989rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
990{ 960{
991 set_environ (envv); 961 set_environ (env);
992 962
993#if HAVE_XSETLOCALE || HAVE_SETLOCALE
994 free (this->locale); 963 free (this->locale);
995 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
996 965
997 if (!this->locale) 966 if (!this->locale)
998 { 967 {
… …
1009 978
1010 979
1011 this->locale = strdup (this->locale); 980 this->locale = strdup (this->locale);
1012 SET_LOCALE (this->locale); 981 SET_LOCALE (this->locale);
1013 mbstate.reset (); 982 mbstate.reset ();
1014#endif
1015 983
1016#if HAVE_NL_LANGINFO 984#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 985 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 986 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 987 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 988 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 989 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 990 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 991#else
1025 enc_utf8 = 0; 992 enc_utf8 = 0;
1026#endif 993#endif
1027} 994}
1028 995
1029void 996void
1030rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
1031{ 998{
1032 set_environ (envv); 999 set_environ (env);
1033 1000
1034#ifdef USE_XIM 1001#if USE_XIM
1035 if (!locale) 1002 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 1004 else
1038 { 1005 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 1007
1041 if (!XSupportsLocale ()) 1008 if (!XSupportsLocale ())
1042 { 1009 {
1043 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1010 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1044 return; 1011 return;
1045 } 1012 }
1046 1013
1047 im_ev.start (display); 1014 im_ev.start (display);
1048 1015
… …
1089 run_command (argv); 1056 run_command (argv);
1090} 1057}
1091 1058
1092/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
1093void 1060void
1094rxvt_term::get_colours () 1061rxvt_term::get_colors ()
1095{ 1062{
1096 int i; 1063 int i;
1097 1064
1098#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1099 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
1100#endif 1067#endif
1101 1068
1102 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1069 for (i = 0; i < NRS_COLORS; i++)
1103 { 1070 {
1104 const char *name = rs[Rs_color + i]; 1071 const char *name = rs[Rs_color + i];
1105 1072
1106 if (!name) 1073 if (!name)
1107 continue; 1074 continue;
1108 1075
1109 rxvt_color xcol;
1110
1111 if (!set_color (xcol, name)) 1076 set_color (pix_colors [i], name);
1112 {
1113#ifndef XTERM_REVERSE_VIDEO
1114 if (i < 2 && option (Opt_reverseVideo))
1115 name = def_colorName [1 - i];
1116 else
1117#endif
1118 name = def_colorName [i];
1119
1120 if (!name)
1121 continue;
1122
1123 if (!set_color (xcol, name))
1124 {
1125 switch (i)
1126 {
1127 case Color_fg:
1128 case Color_bg:
1129 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1130 name = "";
1131 break;
1132#ifndef NO_CURSORCOLOR
1133 case Color_cursor2:
1134#endif
1135 case Color_pointer_fg:
1136 name = rs[Rs_color + Color_fg];
1137 xcol.set (this, name);
1138 break;
1139 default:
1140 name = rs[Rs_color + Color_bg];
1141 xcol.set (this, name);
1142 break;
1143 }
1144 }
1145 }
1146
1147 pix_colors[i] = xcol;
1148 rs[Rs_color + i] = name;
1149 }
1150
1151 if (depth <= 2)
1152 {
1153 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1154 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1155 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1156 } 1077 }
1157 1078
1158 /* 1079 /*
1159 * get scrollBar shadow colors 1080 * get scrollBar shadow colors
1160 * 1081 *
1161 * The calculations of topShadow/bottomShadow values are adapted 1082 * The calculations of topShadow/bottomShadow values are adapted
1162 * from the fvwm window manager. 1083 * from the fvwm window manager.
1163 */ 1084 */
1164#ifdef RXVT_SCROLLBAR 1085#ifdef RXVT_SCROLLBAR
1165 if (depth <= 2)
1166 {
1167 /* Monochrome */
1168 alias_color (Color_scroll, Color_fg);
1169 alias_color (Color_topShadow, Color_bg);
1170 alias_color (Color_bottomShadow, Color_bg);
1171 }
1172 else
1173 {
1174 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1086 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1175 1087
1176 rgba cscroll; 1088 rgba cscroll;
1177 pix_colors [Color_scroll].get (cscroll); 1089 pix_colors [Color_scroll].get (cscroll);
1178 1090
1179 /* topShadowColor */ 1091 /* topShadowColor */
1180 if (!pix_colors[Color_topShadow].set (this, 1092 if (!pix_colors[Color_topShadow].set (this,
1181 rgba ( 1093 rgba (
1182 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1094 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1183 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1095 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1184 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1096 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1185 cscroll.a) 1097 cscroll.a)
1186 )) 1098 ))
1187 alias_color (Color_topShadow, Color_White); 1099 alias_color (Color_topShadow, Color_White);
1188 }
1189#endif 1100#endif
1190 1101
1191#ifdef OFF_FOCUS_FADING 1102#ifdef OFF_FOCUS_FADING
1192 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1103 for (i = 0; i < NRS_COLORS; i++)
1193 update_fade_color (i); 1104 update_fade_color (i, true);
1194#endif 1105#endif
1195} 1106}
1196 1107
1197/*----------------------------------------------------------------------*/ 1108/*----------------------------------------------------------------------*/
1198/* color aliases, fg/bg bright-bold */ 1109/* color aliases, fg/bg bright-bold */
1199void 1110void
1200rxvt_term::color_aliases (int idx) 1111rxvt_term::color_aliases (int idx)
1201{ 1112{
1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1113 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1203 { 1114 {
1204 int i = atoi (rs[Rs_color + idx]); 1115 int i = atoi (rs[Rs_color + idx]);
1205 1116
1206 if (i >= 8 && i <= 15) 1117 if (i >= 8 && i <= 15)
1207 /* bright colors */ 1118 /* bright colors */
… …
1247 for (j = map->max_keypermod; j--; k++) 1158 for (j = map->max_keypermod; j--; k++)
1248 { 1159 {
1249 if (kc[k] == 0) 1160 if (kc[k] == 0)
1250 break; 1161 break;
1251 1162
1252 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1163 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1253 { 1164 {
1254 case XK_Num_Lock: 1165 case XK_Num_Lock:
1255 ModNumLockMask = modmasks[i - 1]; 1166 ModNumLockMask = modmasks[i - 1];
1256 continue; 1167 continue;
1257 1168
… …
1299 1210
1300 if (i) 1211 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1212 ModMetaMask = modmasks[i - 1];
1302} 1213}
1303 1214
1215void
1216rxvt_term::set_icon (const char *file)
1217{
1218#if HAVE_PIXBUF
1219 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1220 if (!pixbuf)
1221 {
1222 rxvt_warn ("Loading image icon failed, continuing without.\n");
1223 return;
1224 }
1225
1226 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1227 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1228
1229 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1230 {
1231 rxvt_warn ("Icon image too big, continuing without.\n");
1232 g_object_unref (pixbuf);
1233 return;
1234 }
1235
1236 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1237 {
1238 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1239 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1240 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1241
1242 buffer [0] = w;
1243 buffer [1] = h;
1244 for (int i = 0; i < h; i++)
1245 {
1246 for (int j = 0; j < w; j++)
1247 {
1248 unsigned char *pixel = row + j * channels;
1249 long value;
1250
1251 if (channels == 4)
1252 value = pixel[3];
1253 else
1254 value = (unsigned char)0x00ff;
1255
1256 value = (value << 8) + pixel[0];
1257 value = (value << 8) + pixel[1];
1258 value = (value << 8) + pixel[2];
1259 buffer[(i * w + j) + 2] = value;
1260 }
1261
1262 row += rowstride;
1263 }
1264
1265 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1266 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1267 free (buffer);
1268 }
1269 else
1270 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1271
1272 g_object_unref (pixbuf);
1273#endif
1274}
1275
1304/*----------------------------------------------------------------------*/ 1276/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1277/* Open and map the window */
1306void 1278void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1279rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1280{
1309 XClassHint classHint; 1281 XClassHint classHint;
1310 XWMHints wmHint; 1282 XWMHints wmHint;
… …
1316 Window top, parent; 1288 Window top, parent;
1317 1289
1318 dLocal (Display *, dpy); 1290 dLocal (Display *, dpy);
1319 1291
1320 /* grab colors before netscape does */ 1292 /* grab colors before netscape does */
1321 get_colours (); 1293 get_colors ();
1322 1294
1323 if (!set_fonts ()) 1295 if (!set_fonts ())
1324 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1296 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1325 1297
1326 parent = display->root; 1298 parent = display->root;
… …
1356 } 1328 }
1357#endif 1329#endif
1358 1330
1359 window_calc (0, 0); 1331 window_calc (0, 0);
1360 1332
1361 /* sub-window placement & size in rxvt_resize_subwindows () */ 1333 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border]; 1334 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border]; 1335 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap; 1336 attributes.colormap = cmap;
1365 1337
1366 top = XCreateWindow (dpy, parent, 1338 top = XCreateWindow (dpy, parent,
… …
1369 ext_bwidth, 1341 ext_bwidth,
1370 depth, InputOutput, visual, 1342 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1343 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes); 1344 &attributes);
1373 1345
1374 this->parent[0] = top; 1346 this->parent = top;
1375
1376 old_width = szHint.width;
1377 old_height = szHint.height;
1378 1347
1379 set_title (rs [Rs_title]); 1348 set_title (rs [Rs_title]);
1380 set_icon_name (rs [Rs_iconName]); 1349 set_icon_name (rs [Rs_iconName]);
1381 1350
1382 classHint.res_name = (char *)rs[Rs_name]; 1351 classHint.res_name = (char *)rs[Rs_name];
1383 classHint.res_class = (char *)RESCLASS; 1352 classHint.res_class = (char *)RESCLASS;
1384 1353
1385 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1354 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1386 wmHint.input = True; 1355 wmHint.input = True;
1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1356 wmHint.initial_state = option (Opt_iconic) ? IconicState
1357 : option (Opt_dockapp) ? WithdrawnState
1358 : NormalState;
1388 wmHint.window_group = top; 1359 wmHint.window_group = top;
1389 1360
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1361 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1362 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1363#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1364 /*
1395 * set up icon hint 1365 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1366 * rs [Rs_iconfile] is path to icon
1397 */ 1367 */
1398 1368
1399 if (rs [Rs_iconfile]) 1369 if (rs [Rs_iconfile])
1400 { 1370 set_icon (rs [Rs_iconfile]);
1401 init_asv ();
1402
1403 ASImage *im = file2ASImage (rs [Rs_iconfile], 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1404 if (asv && im)
1405 {
1406 int w = im->width;
1407 int h = im->height;
1408 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1409 ASImage *result = scale_asimage (asv, im,
1410 w, h, ASA_ARGB32,
1411 100, ASIMAGE_QUALITY_DEFAULT);
1412 destroy_asimage (&im);
1413
1414 if (buffer && result)
1415 {
1416 ARGB32 *asbuf = result->alt.argb32;
1417 buffer [0] = w;
1418 buffer [1] = h;
1419
1420 for (unsigned int i = 0; i < w * h; ++i)
1421 buffer [i + 2] = asbuf [i];
1422
1423 destroy_asimage (&result);
1424 XChangeProperty (dpy, top, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1425 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1426 free (buffer);
1427 }
1428 else
1429 {
1430 if (!buffer)
1431 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1432
1433 if (!result)
1434 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1435 }
1436 }
1437 else
1438 rxvt_warn ("Loading image icon failed, continuing without.\n");
1439 }
1440# endif
1441#endif 1371#endif
1442 1372
1443#if ENABLE_FRILLS 1373#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1374 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1375 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1451#if ENABLE_EWMH 1381#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING], 1382 xa[XA_NET_WM_PING],
1453#endif 1383#endif
1454 }; 1384 };
1455 1385
1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1386 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457 1387
1458#if ENABLE_FRILLS 1388#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for]) 1389 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1390 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif 1391#endif
… …
1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1414 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1485 1415
1486 /* the vt window */ 1416 /* the vt window */
1487 vt = XCreateSimpleWindow (dpy, top, 1417 vt = XCreateSimpleWindow (dpy, top,
1488 window_vt_x, window_vt_y, 1418 window_vt_x, window_vt_y,
1489 width, height, 1419 vt_width, vt_height,
1490 0, 1420 0,
1491 pix_colors_focused[Color_fg], 1421 pix_colors_focused[Color_fg],
1492 pix_colors_focused[Color_bg]); 1422 pix_colors_focused[Color_bg]);
1493 1423
1494 attributes.bit_gravity = NorthWestGravity; 1424 attributes.bit_gravity = NorthWestGravity;
… …
1521 if (rs[Rs_fade]) 1451 if (rs[Rs_fade])
1522 pix_colors = pix_colors_unfocused; 1452 pix_colors = pix_colors_unfocused;
1523#endif 1453#endif
1524 1454
1525 pointer_unblank (); 1455 pointer_unblank ();
1526 scr_recolour (); 1456 scr_recolor ();
1527}
1528
1529/* ------------------------------------------------------------------------- *
1530 * GET TTY CURRENT STATE *
1531 * ------------------------------------------------------------------------- */
1532void
1533rxvt_get_ttymode (struct termios *tio, int erase)
1534{
1535 /*
1536 * standard System V termios interface
1537 */
1538 if (tcgetattr (STDIN_FILENO, tio) < 0)
1539 {
1540 // return error - use system defaults,
1541 // where possible, and zero elsewhere
1542 memset (tio, 0, sizeof (struct termios));
1543
1544 tio->c_cc[VINTR] = CINTR;
1545 tio->c_cc[VQUIT] = CQUIT;
1546 tio->c_cc[VERASE] = CERASE;
1547#ifdef VERASE2
1548 tio->c_cc[VERASE2] = CERASE2;
1549#endif
1550 tio->c_cc[VKILL] = CKILL;
1551 tio->c_cc[VSTART] = CSTART;
1552 tio->c_cc[VSTOP] = CSTOP;
1553 tio->c_cc[VSUSP] = CSUSP;
1554# ifdef VDSUSP
1555 tio->c_cc[VDSUSP] = CDSUSP;
1556# endif
1557# ifdef VREPRINT
1558 tio->c_cc[VREPRINT] = CRPRNT;
1559# endif
1560# ifdef VDISCRD
1561 tio->c_cc[VDISCRD] = CFLUSH;
1562# endif
1563# ifdef VWERSE
1564 tio->c_cc[VWERSE] = CWERASE;
1565# endif
1566# ifdef VLNEXT
1567 tio->c_cc[VLNEXT] = CLNEXT;
1568# endif
1569 }
1570
1571 tio->c_cc[VEOF] = CEOF;
1572 tio->c_cc[VEOL] = VDISABLE;
1573# ifdef VEOL2
1574 tio->c_cc[VEOL2] = VDISABLE;
1575# endif
1576# ifdef VSWTC
1577 tio->c_cc[VSWTC] = VDISABLE;
1578# endif
1579# ifdef VSWTCH
1580 tio->c_cc[VSWTCH] = VDISABLE;
1581# endif
1582# if VMIN != VEOF
1583 tio->c_cc[VMIN] = 1;
1584# endif
1585# if VTIME != VEOL
1586 tio->c_cc[VTIME] = 0;
1587# endif
1588
1589 if (erase != -1)
1590 tio->c_cc[VERASE] = (char)erase;
1591
1592 /* input modes */
1593 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1594# ifdef IMAXBEL
1595 | IMAXBEL
1596# endif
1597 | IXON);
1598
1599 /* output modes */
1600 tio->c_oflag = (OPOST | ONLCR);
1601
1602 /* control modes */
1603 tio->c_cflag = (CS8 | CREAD);
1604
1605 /* line discipline modes */
1606 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1607# if defined (ECHOCTL) && defined (ECHOKE)
1608 | ECHOCTL | ECHOKE
1609# endif
1610 | ECHOE | ECHOK);
1611
1612 /*
1613 * Debugging
1614 */
1615#ifdef DEBUG_TTYMODE
1616 /* c_iflag bits */
1617 fprintf (stderr, "Input flags\n");
1618
1619 /* cpp token stringize doesn't work on all machines <sigh> */
1620# define FOO(flag,name) \
1621 if ((tio->c_iflag) & flag) \
1622 fprintf (stderr, "%s ", name)
1623
1624 /* c_iflag bits */
1625 FOO (IGNBRK, "IGNBRK");
1626 FOO (BRKINT, "BRKINT");
1627 FOO (IGNPAR, "IGNPAR");
1628 FOO (PARMRK, "PARMRK");
1629 FOO (INPCK, "INPCK");
1630 FOO (ISTRIP, "ISTRIP");
1631 FOO (INLCR, "INLCR");
1632 FOO (IGNCR, "IGNCR");
1633 FOO (ICRNL, "ICRNL");
1634 FOO (IXON, "IXON");
1635 FOO (IXOFF, "IXOFF");
1636# ifdef IUCLC
1637 FOO (IUCLC, "IUCLC");
1638# endif
1639# ifdef IXANY
1640 FOO (IXANY, "IXANY");
1641# endif
1642# ifdef IMAXBEL
1643 FOO (IMAXBEL, "IMAXBEL");
1644# endif
1645
1646 fprintf (stderr, "\n");
1647
1648# undef FOO
1649# define FOO(entry, name) \
1650 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1651
1652 FOO (VINTR, "VINTR");
1653 FOO (VQUIT, "VQUIT");
1654 FOO (VERASE, "VERASE");
1655 FOO (VKILL, "VKILL");
1656 FOO (VEOF, "VEOF");
1657 FOO (VEOL, "VEOL");
1658# ifdef VEOL2
1659 FOO (VEOL2, "VEOL2");
1660# endif
1661# ifdef VSWTC
1662 FOO (VSWTC, "VSWTC");
1663# endif
1664# ifdef VSWTCH
1665 FOO (VSWTCH, "VSWTCH");
1666# endif
1667 FOO (VSTART, "VSTART");
1668 FOO (VSTOP, "VSTOP");
1669 FOO (VSUSP, "VSUSP");
1670# ifdef VDSUSP
1671 FOO (VDSUSP, "VDSUSP");
1672# endif
1673# ifdef VREPRINT
1674 FOO (VREPRINT, "VREPRINT");
1675# endif
1676# ifdef VDISCRD
1677 FOO (VDISCRD, "VDISCRD");
1678# endif
1679# ifdef VWERSE
1680 FOO (VWERSE, "VWERSE");
1681# endif
1682# ifdef VLNEXT
1683 FOO (VLNEXT, "VLNEXT");
1684# endif
1685
1686 fprintf (stderr, "\n");
1687# undef FOO
1688#endif /* DEBUG_TTYMODE */
1689} 1457}
1690 1458
1691/*----------------------------------------------------------------------*/ 1459/*----------------------------------------------------------------------*/
1692/* 1460/*
1693 * Run the command in a subprocess and return a file descriptor for the 1461 * Run the command in a subprocess and return a file descriptor for the
… …
1705 if (pty->pty >= 0) 1473 if (pty->pty >= 0)
1706 { 1474 {
1707 if (getfd_hook) 1475 if (getfd_hook)
1708 pty->pty = (*getfd_hook) (pty->pty); 1476 pty->pty = (*getfd_hook) (pty->pty);
1709 1477
1710 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1478 if (pty->pty < 0)
1711 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1479 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1712 } 1480 }
1713 } 1481 }
1714 else 1482 else
1715#endif 1483#endif
1716 if (!pty->get ()) 1484 if (!pty->get ())
1717 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1485 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1718 1486
1719 int er; 1487 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1488
1489 struct termios tio = def_tio;
1720 1490
1721#ifndef NO_BACKSPACE_KEY 1491#ifndef NO_BACKSPACE_KEY
1722 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1492 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1723 er = rs[Rs_backspace_key][0]; 1493 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1724 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1494 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1725 er = '\177'; /* the initial state anyway */ 1495 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1726 else
1727#endif 1496#endif
1728 er = -1;
1729 1497
1730 rxvt_get_ttymode (&tio, er);
1731 /* init terminal attributes */ 1498 /* init terminal attributes */
1732 cfsetospeed (&tio, BAUDRATE); 1499 cfsetospeed (&tio, BAUDRATE);
1733 cfsetispeed (&tio, BAUDRATE); 1500 cfsetispeed (&tio, BAUDRATE);
1734 tcsetattr (pty->tty, TCSANOW, &tio); 1501 tcsetattr (pty->tty, TCSANOW, &tio);
1735 pty->set_utf8_mode (enc_utf8); 1502 pty->set_utf8_mode (enc_utf8);
… …
1775 1542
1776 _exit (EXIT_FAILURE); 1543 _exit (EXIT_FAILURE);
1777 1544
1778 default: 1545 default:
1779 if (!option (Opt_utmpInhibit)) 1546 if (!option (Opt_utmpInhibit))
1547 {
1548#ifdef LOG_ONLY_ON_LOGIN
1549 bool login_shell = option (Opt_loginShell);
1550#else
1551 bool login_shell = true;
1552#endif
1780 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1553 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1554 }
1781 1555
1782 pty->close_tty (); 1556 pty->close_tty ();
1783 1557
1784 child_ev.start (cmd_pid); 1558 child_ev.start (cmd_pid);
1785 1559
… …
1810#elif defined (SRIOCSREDIR) 1584#elif defined (SRIOCSREDIR)
1811 int fd; 1585 int fd;
1812 1586
1813 fd = open (CONSOLE, O_WRONLY, 0); 1587 fd = open (CONSOLE, O_WRONLY, 0);
1814 if (fd >= 0) 1588 if (fd >= 0)
1815 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1589 {
1590 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1816 close (fd); 1591 close (fd);
1592 }
1817#endif /* SRIOCSREDIR */ 1593#endif /* SRIOCSREDIR */
1818 } 1594 }
1819 1595
1820 /* reset signals and spin off the command interpreter */ 1596 /* reset signals and spin off the command interpreter */
1821 signal (SIGINT, SIG_DFL); 1597 signal (SIGINT, SIG_DFL);
1822 signal (SIGQUIT, SIG_DFL); 1598 signal (SIGQUIT, SIG_DFL);
1823 signal (SIGCHLD, SIG_DFL); 1599 signal (SIGCHLD, SIG_DFL);
1824 signal (SIGHUP, SIG_DFL); 1600 signal (SIGHUP, SIG_DFL);
1825 signal (SIGPIPE, SIG_DFL); 1601 signal (SIGPIPE, SIG_DFL);
1826 /* 1602 /*
1827 * mimick login's behavior by disabling the job control signals 1603 * mimic login's behavior by disabling the job control signals
1828 * a shell that wants them can turn them back on 1604 * a shell that wants them can turn them back on
1829 */ 1605 */
1830#ifdef SIGTSTP 1606#ifdef SIGTSTP
1831 signal (SIGTSTP, SIG_IGN); 1607 signal (SIGTSTP, SIG_IGN);
1832 signal (SIGTTIN, SIG_IGN); 1608 signal (SIGTTIN, SIG_IGN);

Diff Legend

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