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

Diff Legend

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