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.345 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 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
148const char *const def_colorName[] = 156static const char *const def_colorName[] =
149 { 157 {
150 COLOR_FOREGROUND, 158 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 159 COLOR_BACKGROUND,
152 /* low-intensity colors */ 160 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 161 "rgb:00/00/00", // 0: black (Black)
… …
174 "rgb:00/00/ff", // 4/12: bright blue (Blue) 182 "rgb:00/00/ff", // 4/12: bright blue (Blue)
175 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta) 183 "rgb:ff/00/ff", // 5/13: bright magenta (Magenta)
176 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan) 184 "rgb:00/ff/ff", // 6/14: bright cyan (Cyan)
177 "rgb:ff/ff/ff", // 7/15: bright white (White) 185 "rgb:ff/ff/ff", // 7/15: bright white (White)
178 186
179#ifndef USE_256_COLORS 187#if !USE_256_COLORS
180 // 88 xterm colours 188 // 88 xterm colours
181 "rgb:00/00/00", 189 "rgb:00/00/00",
182 "rgb:00/00/8b", 190 "rgb:00/00/8b",
183 "rgb:00/00/cd", 191 "rgb:00/00/cd",
184 "rgb:00/00/ff", 192 "rgb:00/00/ff",
… …
516#endif 524#endif
517 COLOR_SCROLLBAR, 525 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR 526#ifdef RXVT_SCROLLBAR
519 COLOR_SCROLLTROUGH, 527 COLOR_SCROLLTROUGH,
520#endif 528#endif
521#if ENABLE_TRANSPARENCY 529#if BG_IMAGE_FROM_ROOT
522 NULL, 530 NULL,
523#endif 531#endif
524#if OFF_FOCUS_FADING 532#if OFF_FOCUS_FADING
525 "rgb:00/00/00", 533 "rgb:00/00/00",
526#endif 534#endif
… …
558 set_option (Opt_iso14755); 566 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 567 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 568 set_option (Opt_buffered);
561} 569}
562 570
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/*----------------------------------------------------------------------*/ 571/*----------------------------------------------------------------------*/
582const char ** 572const char **
583rxvt_term::init_resources (int argc, const char *const *argv) 573rxvt_term::init_resources (int argc, const char *const *argv)
584{ 574{
585 int i, r_argc; 575 int i;
586 const char **cmd_argv, **r_argv; 576 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 577
616 rs[Rs_name] = rxvt_basename (argv[0]); 578 rs[Rs_name] = rxvt_basename (argv[0]);
617 579
618 /* 580 /*
619 * Open display, get options/resources and create the window 581 * Open display, get options/resources and create the window
620 */ 582 */
621 583
622 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 584 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
623 rs[Rs_display_name] = ":0"; 585 rs[Rs_display_name] = ":0";
624 586
625 get_options (r_argc, r_argv); 587 cmd_argv = get_options (argc, argv);
626 588
627 if (!(display = displays.get (rs[Rs_display_name]))) 589 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]); 590 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
632 591
633 // using a local pointer decreases code size a lot 592 // using a local pointer decreases code size a lot
634 xa = display->xa; 593 xa = display->xa;
635 594
636 set (display); 595 set (display);
637 extract_resources (); 596 extract_resources ();
638 597
639#if XFT 598#if ENABLE_FRILLS
640 if (rs[Rs_depth]) 599 if (rs[Rs_visual])
641 select_visual (strtol (rs[Rs_depth], 0, 0)); 600 select_visual (strtol (rs[Rs_visual], 0, 0));
601 else if (rs[Rs_depth])
602 select_depth (strtol (rs[Rs_depth], 0, 0));
642#endif 603#endif
643
644 free (r_argv);
645 604
646 for (int i = NUM_RESOURCES; i--; ) 605 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef) 606 if (rs [i] == resval_undef)
648 rs [i] = 0; 607 rs [i] = 0;
649 608
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 609#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1]) 610 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default"; 611 rs[Rs_perl_ext_1] = "default";
658 612
659 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 613 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
662 { 616 {
663 rxvt_perl.init (this); 617 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 618 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 } 619 }
666#endif 620#endif
621
622 // must be called after initialising the perl interpreter as it
623 // may invoke the `on_register_command' hook
624 extract_keysym_resources ();
667 625
668 /* 626 /*
669 * set any defaults not already set 627 * set any defaults not already set
670 */ 628 */
671 if (cmd_argv && cmd_argv[0]) 629 if (cmd_argv && cmd_argv[0])
… …
706 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 664 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
707 pointerBlankDelay = i; 665 pointerBlankDelay = i;
708 else 666 else
709 pointerBlankDelay = 2; 667 pointerBlankDelay = 2;
710#endif 668#endif
669
670 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
671 multiClickTime = i;
672 else
673 multiClickTime = 500;
674
675 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
711 676
712 /* no point having a scrollbar without having any scrollback! */ 677 /* no point having a scrollbar without having any scrollback! */
713 if (!saveLines) 678 if (!saveLines)
714 set_option (Opt_scrollBar, 0); 679 set_option (Opt_scrollBar, 0);
715 680
… …
780 return cmd_argv; 745 return cmd_argv;
781} 746}
782 747
783/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
784void 749void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 750rxvt_term::init (stringvec *argv, stringvec *envv)
786{ 751{
752 argv->push_back (0);
753 envv->push_back (0);
754
755 this->argv = argv;
787 this->envv = envv; 756 this->envv = envv;
788 757
758 env = new char *[this->envv->size ()];
759 for (int i = 0; i < this->envv->size (); i++)
760 env[i] = this->envv->at (i);
761
762 init2 (argv->size () - 1, argv->begin ());
763}
764
765void
766rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
767{
768#if ENABLE_PERL
769 // perl might want to access the stringvecs later, so we need to copy them
770 stringvec *args = new stringvec;
771 for (int i = 0; i < argc; i++)
772 args->push_back (strdup (argv [i]));
773
774 stringvec *envs = new stringvec;
775 for (const char *const *var = envv; *var; var++)
776 envs->push_back (strdup (*var));
777
778 init (args, envs);
779#else
780 init2 (argc, argv);
781#endif
782}
783
784void
785rxvt_term::init2 (int argc, const char *const *argv)
786{
789 SET_R (this); 787 SET_R (this);
790 set_locale (""); 788 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :( 789 set_environ (env); // a few things in X do not call setlocale :(
792 790
793 init_vars (); 791 init_vars ();
794
795 init_secondary ();
796 792
797 const char **cmd_argv = init_resources (argc, argv); 793 const char **cmd_argv = init_resources (argc, argv);
798 794
799#ifdef KEYSYM_RESOURCE 795#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 796 keyboard->register_done ();
… …
809 if (chdir (path)) 805 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 806 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 } 807 }
812 808
813 if (option (Opt_scrollBar)) 809 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 810 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815 811
816 pty = ptytty::create (); 812 pty = ptytty::create ();
817 813
818 create_windows (argc, argv); 814 create_windows (argc, argv);
819 815
… …
825 XSynchronize (dpy, True); 821 XSynchronize (dpy, True);
826#endif 822#endif
827 823
828 if (option (Opt_scrollBar)) 824 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */ 825 scrollBar.resize (); /* create and map scrollbar */
826
830#ifdef HAVE_BG_PIXMAP 827#ifdef HAVE_BG_PIXMAP
831 { 828 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 829#endif
876 830
877#if ENABLE_PERL 831#if ENABLE_PERL
878 rootwin_ev.start (display, display->root); 832 rootwin_ev.start (display, display->root);
879#endif 833#endif
880 834
881 set_colorfgbg (); 835 init_done = 1;
882 836
883 init_command (cmd_argv); 837 init_command (cmd_argv);
884
885 free (cmd_argv);
886 838
887 if (pty->pty >= 0) 839 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ); 840 pty_ev.start (pty->pty, ev::READ);
889 841
890 HOOK_INVOKE ((this, HOOK_START, DT_END)); 842 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
892#if ENABLE_XEMBED 844#if ENABLE_XEMBED
893 if (rs[Rs_embed]) 845 if (rs[Rs_embed])
894 { 846 {
895 long info[2] = { 0, XEMBED_MAPPED }; 847 long info[2] = { 0, XEMBED_MAPPED };
896 848
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 849 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2); 850 32, PropModeReplace, (unsigned char *)&info, 2);
899 } 851 }
900#endif 852#endif
901 853
854#if HAVE_STARTUP_NOTIFICATION
855 SnDisplay *snDisplay;
856 SnLauncheeContext *snContext;
857
858 snDisplay = sn_display_new (dpy, NULL, NULL);
859 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
860
861 /* Tell the window manager that this window is part of the startup context */
862 if (snContext)
863 sn_launchee_context_setup_window (snContext, parent);
864#endif
865
902 XMapWindow (dpy, vt); 866 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]); 867 XMapWindow (dpy, parent);
868
869#if HAVE_STARTUP_NOTIFICATION
870 if (snContext)
871 {
872 /* Mark the startup process as complete */
873 sn_launchee_context_complete (snContext);
874
875 sn_launchee_context_unref (snContext);
876 }
877
878 sn_display_unref (snDisplay);
879#endif
904 880
905 refresh_check (); 881 refresh_check ();
906} 882}
907 883
908/*----------------------------------------------------------------------*/ 884/*----------------------------------------------------------------------*/
909void 885void
910rxvt_term::init_env () 886rxvt_term::init_env ()
911{ 887{
912 int i;
913 char *val; 888 char *val;
889 char *env_display;
890 char *env_windowid;
891 char *env_colorfgbg;
892 char *env_term;
914 893
915#ifdef DISPLAY_IS_IP 894#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 895 /* 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 896 * 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 897 * (for the first non-loopback interface) that we get from
… …
931 val = XDisplayString (dpy); 910 val = XDisplayString (dpy);
932 911
933 if (rs[Rs_display_name] == NULL) 912 if (rs[Rs_display_name] == NULL)
934 rs[Rs_display_name] = val; /* use broken `:0' value */ 913 rs[Rs_display_name] = val; /* use broken `:0' value */
935 914
936 i = strlen (val);
937 env_display = (char *)rxvt_malloc (i + 9); 915 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 916
939 sprintf (env_display, "DISPLAY=%s", val); 917 sprintf (env_display, "DISPLAY=%s", val);
940 918
919 env_windowid = (char *)rxvt_malloc (21);
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 920 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 921
943 /* add entries to the environment: 922 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 923 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 924 * @ WINDOWID: X window id number of the window
946 * @ COLORTERM: terminal sub-name and also indicates its color 925 * @ COLORTERM: terminal sub-name and also indicates its color
… …
949 * @ COLORFGBG: fg;bg color codes 928 * @ COLORFGBG: fg;bg color codes
950 */ 929 */
951 putenv (env_display); 930 putenv (env_display);
952 putenv (env_windowid); 931 putenv (env_windowid);
953 932
954 if (env_colorfgbg) 933 env_colorfgbg = get_colorfgbg ();
955 putenv (env_colorfgbg); 934 putenv (env_colorfgbg);
956 935
957#ifdef RXVT_TERMINFO 936#ifdef RXVT_TERMINFO
958 putenv ("TERMINFO=" RXVT_TERMINFO); 937 putenv ("TERMINFO=" RXVT_TERMINFO);
959#endif 938#endif
960 939
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 958 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 959#endif /* HAVE_UNSETENV */
981} 960}
982 961
983/*----------------------------------------------------------------------*/ 962/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 963void
989rxvt_term::set_locale (const char *locale) 964rxvt_term::set_locale (const char *locale)
990{ 965{
991 set_environ (envv); 966 set_environ (env);
992 967
993#if HAVE_XSETLOCALE || HAVE_SETLOCALE
994 free (this->locale); 968 free (this->locale);
995 this->locale = setlocale (LC_CTYPE, locale); 969 this->locale = setlocale (LC_CTYPE, locale);
996 970
997 if (!this->locale) 971 if (!this->locale)
998 { 972 {
… …
1009 983
1010 984
1011 this->locale = strdup (this->locale); 985 this->locale = strdup (this->locale);
1012 SET_LOCALE (this->locale); 986 SET_LOCALE (this->locale);
1013 mbstate.reset (); 987 mbstate.reset ();
1014#endif
1015 988
1016#if HAVE_NL_LANGINFO 989#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 990 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 991 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 992 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 993 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 994 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 995 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 996#else
1025 enc_utf8 = 0; 997 enc_utf8 = 0;
1026#endif 998#endif
1027} 999}
1028 1000
1029void 1001void
1030rxvt_term::init_xlocale () 1002rxvt_term::init_xlocale ()
1031{ 1003{
1032 set_environ (envv); 1004 set_environ (env);
1033 1005
1034#ifdef USE_XIM 1006#if USE_XIM
1035 if (!locale) 1007 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 1008 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 1009 else
1038 { 1010 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1011 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 1012
1041 if (!XSupportsLocale ()) 1013 if (!XSupportsLocale ())
1042 { 1014 {
1043 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1015 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1044 return; 1016 return;
1045 } 1017 }
1046 1018
1047 im_ev.start (display); 1019 im_ev.start (display);
1048 1020
… …
1089 run_command (argv); 1061 run_command (argv);
1090} 1062}
1091 1063
1092/*----------------------------------------------------------------------*/ 1064/*----------------------------------------------------------------------*/
1093void 1065void
1094rxvt_term::get_colours () 1066rxvt_term::get_colors ()
1095{ 1067{
1096 int i; 1068 int i;
1097 1069
1098#ifdef OFF_FOCUS_FADING 1070#ifdef OFF_FOCUS_FADING
1099 pix_colors = pix_colors_focused; 1071 pix_colors = pix_colors_focused;
1100#endif 1072#endif
1101 1073
1102 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1074 for (i = 0; i < NRS_COLORS; i++)
1103 {
1104 const char *name = rs[Rs_color + i]; 1075 if (const char *name = rs[Rs_color + i])
1105
1106 if (!name)
1107 continue;
1108
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 }
1157 1077
1158 /* 1078 /*
1159 * get scrollBar shadow colors 1079 * get scrollBar shadow colors
1160 * 1080 *
1161 * The calculations of topShadow/bottomShadow values are adapted 1081 * The calculations of topShadow/bottomShadow values are adapted
1162 * from the fvwm window manager. 1082 * from the fvwm window manager.
1163 */ 1083 */
1164#ifdef RXVT_SCROLLBAR 1084#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]); 1085 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1175 1086
1176 rgba cscroll; 1087 rgba cscroll;
1177 pix_colors [Color_scroll].get (cscroll); 1088 pix_colors [Color_scroll].get (cscroll);
1178 1089
1179 /* topShadowColor */ 1090 /* topShadowColor */
1180 if (!pix_colors[Color_topShadow].set (this, 1091 if (!pix_colors[Color_topShadow].set (this,
1181 rgba ( 1092 rgba (
1182 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1093 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), 1094 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), 1095 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1185 cscroll.a) 1096 cscroll.a)
1186 )) 1097 ))
1187 alias_color (Color_topShadow, Color_White); 1098 alias_color (Color_topShadow, Color_White);
1188 }
1189#endif 1099#endif
1190 1100
1191#ifdef OFF_FOCUS_FADING 1101#ifdef OFF_FOCUS_FADING
1192 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < NRS_COLORS; i++)
1193 update_fade_color (i); 1103 update_fade_color (i, true);
1194#endif 1104#endif
1195} 1105}
1196 1106
1197/*----------------------------------------------------------------------*/ 1107/*----------------------------------------------------------------------*/
1198/* color aliases, fg/bg bright-bold */ 1108/* color aliases, fg/bg bright-bold */
1199void 1109void
1200rxvt_term::color_aliases (int idx) 1110rxvt_term::color_aliases (int idx)
1201{ 1111{
1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1112 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1203 { 1113 {
1204 int i = atoi (rs[Rs_color + idx]); 1114 int i = atoi (rs[Rs_color + idx]);
1205 1115
1206 if (i >= 8 && i <= 15) 1116 if (i >= 8 && i <= 15)
1207 /* bright colors */ 1117 /* bright colors */
… …
1247 for (j = map->max_keypermod; j--; k++) 1157 for (j = map->max_keypermod; j--; k++)
1248 { 1158 {
1249 if (kc[k] == 0) 1159 if (kc[k] == 0)
1250 break; 1160 break;
1251 1161
1252 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1162 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1253 { 1163 {
1254 case XK_Num_Lock: 1164 case XK_Num_Lock:
1255 ModNumLockMask = modmasks[i - 1]; 1165 ModNumLockMask = modmasks[i - 1];
1256 continue; 1166 continue;
1257 1167
… …
1299 1209
1300 if (i) 1210 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1211 ModMetaMask = modmasks[i - 1];
1302} 1212}
1303 1213
1214void
1215rxvt_term::set_icon (const char *file)
1216{
1217#if HAVE_PIXBUF && ENABLE_EWMH
1218 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1219 if (!pixbuf)
1220 {
1221 rxvt_warn ("Loading image icon failed, continuing without.\n");
1222 return;
1223 }
1224
1225 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1226 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1227
1228 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1229 {
1230 rxvt_warn ("Icon image too big, continuing without.\n");
1231 g_object_unref (pixbuf);
1232 return;
1233 }
1234
1235 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1236 {
1237 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1238 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1239 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1240
1241 buffer [0] = w;
1242 buffer [1] = h;
1243 for (int i = 0; i < h; i++)
1244 {
1245 for (int j = 0; j < w; j++)
1246 {
1247 unsigned char *pixel = row + j * channels;
1248 long value;
1249
1250 if (channels == 4)
1251 value = pixel[3];
1252 else
1253 value = (unsigned char)0x00ff;
1254
1255 value = (value << 8) + pixel[0];
1256 value = (value << 8) + pixel[1];
1257 value = (value << 8) + pixel[2];
1258 buffer[(i * w + j) + 2] = value;
1259 }
1260
1261 row += rowstride;
1262 }
1263
1264 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1265 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1266 free (buffer);
1267 }
1268 else
1269 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1270
1271 g_object_unref (pixbuf);
1272#endif
1273}
1274
1304/*----------------------------------------------------------------------*/ 1275/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1276/* Open and map the window */
1306void 1277void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1278rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1279{
1309 XClassHint classHint; 1280 XClassHint classHint;
1310 XWMHints wmHint; 1281 XWMHints wmHint;
… …
1316 Window top, parent; 1287 Window top, parent;
1317 1288
1318 dLocal (Display *, dpy); 1289 dLocal (Display *, dpy);
1319 1290
1320 /* grab colors before netscape does */ 1291 /* grab colors before netscape does */
1321 get_colours (); 1292 get_colors ();
1322 1293
1323 if (!set_fonts ()) 1294 if (!set_fonts ())
1324 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1295 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1325 1296
1326 parent = display->root; 1297 parent = display->root;
… …
1356 } 1327 }
1357#endif 1328#endif
1358 1329
1359 window_calc (0, 0); 1330 window_calc (0, 0);
1360 1331
1361 /* sub-window placement & size in rxvt_resize_subwindows () */ 1332 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border]; 1333 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border]; 1334 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap; 1335 attributes.colormap = cmap;
1365 1336
1366 top = XCreateWindow (dpy, parent, 1337 top = XCreateWindow (dpy, parent,
… …
1369 ext_bwidth, 1340 ext_bwidth,
1370 depth, InputOutput, visual, 1341 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1342 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes); 1343 &attributes);
1373 1344
1374 this->parent[0] = top; 1345 this->parent = top;
1375
1376 old_width = szHint.width;
1377 old_height = szHint.height;
1378 1346
1379 set_title (rs [Rs_title]); 1347 set_title (rs [Rs_title]);
1380 set_icon_name (rs [Rs_iconName]); 1348 set_icon_name (rs [Rs_iconName]);
1381 1349
1382 classHint.res_name = (char *)rs[Rs_name]; 1350 classHint.res_name = (char *)rs[Rs_name];
1383 classHint.res_class = (char *)RESCLASS; 1351 classHint.res_class = (char *)RESCLASS;
1384 1352
1385 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1353 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1386 wmHint.input = True; 1354 wmHint.input = True;
1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1355 wmHint.initial_state = option (Opt_iconic) ? IconicState
1356 : option (Opt_dockapp) ? WithdrawnState
1357 : NormalState;
1388 wmHint.window_group = top; 1358 wmHint.window_group = top;
1389 1359
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1360 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1361 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1362#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1363 /*
1395 * set up icon hint 1364 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1365 * rs [Rs_iconfile] is path to icon
1397 */ 1366 */
1398 1367
1399 if (rs [Rs_iconfile]) 1368 if (rs [Rs_iconfile])
1400 { 1369 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 1370#endif
1442 1371
1443#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1373 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1374 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1451#if ENABLE_EWMH 1380#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING], 1381 xa[XA_NET_WM_PING],
1453#endif 1382#endif
1454 }; 1383 };
1455 1384
1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1385 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457 1386
1458#if ENABLE_FRILLS 1387#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for]) 1388 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1389 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif 1390#endif
… …
1479 | ExposureMask | StructureNotifyMask); 1408 | ExposureMask | StructureNotifyMask);
1480 1409
1481 termwin_ev.start (display, top); 1410 termwin_ev.start (display, top);
1482 1411
1483 /* vt cursor: Black-on-White is standard, but this is more popular */ 1412 /* vt cursor: Black-on-White is standard, but this is more popular */
1413 unsigned int shape = XC_xterm;
1414
1415#ifdef HAVE_XMU
1416 if (rs[Rs_pointerShape])
1417 {
1418 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1419 if (stmp >= 0)
1420 shape = stmp;
1421 }
1422#endif
1423
1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1424 TermWin_cursor = XCreateFontCursor (dpy, shape);
1485 1425
1486 /* the vt window */ 1426 /* the vt window */
1487 vt = XCreateSimpleWindow (dpy, top, 1427 vt = XCreateSimpleWindow (dpy, top,
1488 window_vt_x, window_vt_y, 1428 window_vt_x, window_vt_y,
1489 width, height, 1429 vt_width, vt_height,
1490 0, 1430 0,
1491 pix_colors_focused[Color_fg], 1431 pix_colors_focused[Color_fg],
1492 pix_colors_focused[Color_bg]); 1432 pix_colors_focused[Color_bg]);
1493 1433
1494 attributes.bit_gravity = NorthWestGravity; 1434 attributes.bit_gravity = NorthWestGravity;
… …
1521 if (rs[Rs_fade]) 1461 if (rs[Rs_fade])
1522 pix_colors = pix_colors_unfocused; 1462 pix_colors = pix_colors_unfocused;
1523#endif 1463#endif
1524 1464
1525 pointer_unblank (); 1465 pointer_unblank ();
1526 scr_recolour (); 1466 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} 1467}
1690 1468
1691/*----------------------------------------------------------------------*/ 1469/*----------------------------------------------------------------------*/
1692/* 1470/*
1693 * Run the command in a subprocess and return a file descriptor for the 1471 * Run the command in a subprocess and return a file descriptor for the
… …
1705 if (pty->pty >= 0) 1483 if (pty->pty >= 0)
1706 { 1484 {
1707 if (getfd_hook) 1485 if (getfd_hook)
1708 pty->pty = (*getfd_hook) (pty->pty); 1486 pty->pty = (*getfd_hook) (pty->pty);
1709 1487
1710 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1488 if (pty->pty < 0)
1711 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1489 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1712 } 1490 }
1713 } 1491 }
1714 else 1492 else
1715#endif 1493#endif
1716 if (!pty->get ()) 1494 if (!pty->get ())
1717 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1495 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1718 1496
1719 int er; 1497 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1498
1499 struct termios tio = def_tio;
1720 1500
1721#ifndef NO_BACKSPACE_KEY 1501#ifndef NO_BACKSPACE_KEY
1722 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1502 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1723 er = rs[Rs_backspace_key][0]; 1503 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1724 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1504 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1725 er = '\177'; /* the initial state anyway */ 1505 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1726 else
1727#endif 1506#endif
1728 er = -1;
1729 1507
1730 rxvt_get_ttymode (&tio, er);
1731 /* init terminal attributes */ 1508 /* init terminal attributes */
1732 cfsetospeed (&tio, BAUDRATE); 1509 cfsetospeed (&tio, BAUDRATE);
1733 cfsetispeed (&tio, BAUDRATE); 1510 cfsetispeed (&tio, BAUDRATE);
1734 tcsetattr (pty->tty, TCSANOW, &tio); 1511 tcsetattr (pty->tty, TCSANOW, &tio);
1735 pty->set_utf8_mode (enc_utf8); 1512 pty->set_utf8_mode (enc_utf8);
… …
1775 1552
1776 _exit (EXIT_FAILURE); 1553 _exit (EXIT_FAILURE);
1777 1554
1778 default: 1555 default:
1779 if (!option (Opt_utmpInhibit)) 1556 if (!option (Opt_utmpInhibit))
1557 {
1558#ifdef LOG_ONLY_ON_LOGIN
1559 bool login_shell = option (Opt_loginShell);
1560#else
1561 bool login_shell = true;
1562#endif
1780 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1563 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1564 }
1781 1565
1782 pty->close_tty (); 1566 pty->close_tty ();
1783 1567
1784 child_ev.start (cmd_pid); 1568 child_ev.start (cmd_pid);
1785 1569
… …
1810#elif defined (SRIOCSREDIR) 1594#elif defined (SRIOCSREDIR)
1811 int fd; 1595 int fd;
1812 1596
1813 fd = open (CONSOLE, O_WRONLY, 0); 1597 fd = open (CONSOLE, O_WRONLY, 0);
1814 if (fd >= 0) 1598 if (fd >= 0)
1815 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1599 {
1600 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1816 close (fd); 1601 close (fd);
1602 }
1817#endif /* SRIOCSREDIR */ 1603#endif /* SRIOCSREDIR */
1818 } 1604 }
1819 1605
1820 /* reset signals and spin off the command interpreter */ 1606 /* reset signals and spin off the command interpreter */
1821 signal (SIGINT, SIG_DFL); 1607 signal (SIGINT, SIG_DFL);
1822 signal (SIGQUIT, SIG_DFL); 1608 signal (SIGQUIT, SIG_DFL);
1823 signal (SIGCHLD, SIG_DFL); 1609 signal (SIGCHLD, SIG_DFL);
1824 signal (SIGHUP, SIG_DFL); 1610 signal (SIGHUP, SIG_DFL);
1825 signal (SIGPIPE, SIG_DFL); 1611 signal (SIGPIPE, SIG_DFL);
1826 /* 1612 /*
1827 * mimick login's behavior by disabling the job control signals 1613 * mimic login's behavior by disabling the job control signals
1828 * a shell that wants them can turn them back on 1614 * a shell that wants them can turn them back on
1829 */ 1615 */
1830#ifdef SIGTSTP 1616#ifdef SIGTSTP
1831 signal (SIGTSTP, SIG_IGN); 1617 signal (SIGTSTP, SIG_IGN);
1832 signal (SIGTTIN, SIG_IGN); 1618 signal (SIGTTIN, SIG_IGN);

Diff Legend

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