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.267 by sf-exg, Mon Jun 14 15:47:52 2010 UTC vs.
Revision 1.344 by sf-exg, Tue Jun 16 11:58:26 2015 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46
47#ifdef HAVE_XMU
48# include <X11/Xmu/CurUtil.h>
49#endif
46 50
47#ifdef HAVE_XSETLOCALE 51#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 52# define X_LOCALE
49# include <X11/Xlocale.h> 53# include <X11/Xlocale.h>
50#else 54#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 55# include <locale.h>
53# endif
54#endif 56#endif
55 57
56#ifdef HAVE_NL_LANGINFO 58#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 59# include <langinfo.h>
60#endif
61
62#ifdef HAVE_STARTUP_NOTIFICATION
63# define SN_API_NOT_YET_FROZEN
64# include <libsn/sn-launchee.h>
58#endif 65#endif
59 66
60#ifdef DISPLAY_IS_IP 67#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 68/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 69#include <sys/types.h>
… …
73#include <netinet/in.h> 80#include <netinet/in.h>
74#include <arpa/inet.h> 81#include <arpa/inet.h>
75#include <net/if.h> 82#include <net/if.h>
76#include <net/if_arp.h> 83#include <net/if_arp.h>
77 84
78static char * 85static char * ecb_cold
79rxvt_network_display (const char *display) 86rxvt_network_display (const char *display)
80{ 87{
81 char buffer[1024], *rval = NULL; 88 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 89 struct ifconf ifc;
83 struct ifreq *ifr; 90 struct ifreq *ifr;
… …
143 150
144 return rval; 151 return rval;
145} 152}
146#endif 153#endif
147 154
148const char *const def_colorName[] = 155static const char *const def_colorName[] =
149 { 156 {
150 COLOR_FOREGROUND, 157 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 158 COLOR_BACKGROUND,
152 /* low-intensity colors */ 159 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 160 "rgb:00/00/00", // 0: black (Black)
… …
516#endif 523#endif
517 COLOR_SCROLLBAR, 524 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR 525#ifdef RXVT_SCROLLBAR
519 COLOR_SCROLLTROUGH, 526 COLOR_SCROLLTROUGH,
520#endif 527#endif
521#if ENABLE_TRANSPARENCY 528#if BG_IMAGE_FROM_ROOT
522 NULL, 529 NULL,
523#endif 530#endif
524#if OFF_FOCUS_FADING 531#if OFF_FOCUS_FADING
525 "rgb:00/00/00", 532 "rgb:00/00/00",
526#endif 533#endif
… …
558 set_option (Opt_iso14755); 565 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 566 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 567 set_option (Opt_buffered);
561} 568}
562 569
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/*----------------------------------------------------------------------*/ 570/*----------------------------------------------------------------------*/
582const char ** 571const char **
583rxvt_term::init_resources (int argc, const char *const *argv) 572rxvt_term::init_resources (int argc, const char *const *argv)
584{ 573{
585 int i, r_argc; 574 int i;
586 const char **cmd_argv, **r_argv; 575 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 576
616 rs[Rs_name] = rxvt_basename (argv[0]); 577 rs[Rs_name] = rxvt_basename (argv[0]);
617 578
618 /* 579 /*
619 * Open display, get options/resources and create the window 580 * Open display, get options/resources and create the window
620 */ 581 */
621 582
622 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 583 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
623 rs[Rs_display_name] = ":0"; 584 rs[Rs_display_name] = ":0";
624 585
625 get_options (r_argc, r_argv); 586 cmd_argv = get_options (argc, argv);
626 587
627 if (!(display = displays.get (rs[Rs_display_name]))) 588 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]); 589 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
631 }
632 590
633 // using a local pointer decreases code size a lot 591 // using a local pointer decreases code size a lot
634 xa = display->xa; 592 xa = display->xa;
635 593
636 set (display); 594 set (display);
637 extract_resources (); 595 extract_resources ();
638 596
639#if XFT 597#if ENABLE_FRILLS
640 if (rs[Rs_depth]) 598 if (rs[Rs_visual])
641 select_visual (strtol (rs[Rs_depth], 0, 0)); 599 select_visual (strtol (rs[Rs_visual], 0, 0));
600 else if (rs[Rs_depth])
601 select_depth (strtol (rs[Rs_depth], 0, 0));
642#endif 602#endif
643
644 free (r_argv);
645 603
646 for (int i = NUM_RESOURCES; i--; ) 604 for (int i = NUM_RESOURCES; i--; )
647 if (rs [i] == resval_undef) 605 if (rs [i] == resval_undef)
648 rs [i] = 0; 606 rs [i] = 0;
649 607
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 608#if ENABLE_PERL
656 if (!rs[Rs_perl_ext_1]) 609 if (!rs[Rs_perl_ext_1])
657 rs[Rs_perl_ext_1] = "default"; 610 rs[Rs_perl_ext_1] = "default";
658 611
659 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 612 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
662 { 615 {
663 rxvt_perl.init (this); 616 rxvt_perl.init (this);
664 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 617 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
665 } 618 }
666#endif 619#endif
620
621 // must be called after initialising the perl interpreter as it
622 // may invoke the `on_register_command' hook
623 extract_keysym_resources ();
667 624
668 /* 625 /*
669 * set any defaults not already set 626 * set any defaults not already set
670 */ 627 */
671 if (cmd_argv && cmd_argv[0]) 628 if (cmd_argv && cmd_argv[0])
… …
706 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 663 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
707 pointerBlankDelay = i; 664 pointerBlankDelay = i;
708 else 665 else
709 pointerBlankDelay = 2; 666 pointerBlankDelay = 2;
710#endif 667#endif
668
669 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
670 multiClickTime = i;
671 else
672 multiClickTime = 500;
673
674 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
711 675
712 /* no point having a scrollbar without having any scrollback! */ 676 /* no point having a scrollbar without having any scrollback! */
713 if (!saveLines) 677 if (!saveLines)
714 set_option (Opt_scrollBar, 0); 678 set_option (Opt_scrollBar, 0);
715 679
… …
780 return cmd_argv; 744 return cmd_argv;
781} 745}
782 746
783/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
784void 748void
785rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 749rxvt_term::init (stringvec *argv, stringvec *envv)
786{ 750{
751 argv->push_back (0);
752 envv->push_back (0);
753
754 this->argv = argv;
787 this->envv = envv; 755 this->envv = envv;
788 756
757 env = new char *[this->envv->size ()];
758 for (int i = 0; i < this->envv->size (); i++)
759 env[i] = this->envv->at (i);
760
761 init2 (argv->size () - 1, argv->begin ());
762}
763
764void
765rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
766{
767#if ENABLE_PERL
768 // perl might want to access the stringvecs later, so we need to copy them
769 stringvec *args = new stringvec;
770 for (int i = 0; i < argc; i++)
771 args->push_back (strdup (argv [i]));
772
773 stringvec *envs = new stringvec;
774 for (const char *const *var = envv; *var; var++)
775 envs->push_back (strdup (*var));
776
777 init (args, envs);
778#else
779 init2 (argc, argv);
780#endif
781}
782
783void
784rxvt_term::init2 (int argc, const char *const *argv)
785{
789 SET_R (this); 786 SET_R (this);
790 set_locale (""); 787 set_locale ("");
791 set_environ (envv); // a few things in X do not call setlocale :( 788 set_environ (env); // a few things in X do not call setlocale :(
792 789
793 init_vars (); 790 init_vars ();
794
795 init_secondary ();
796 791
797 const char **cmd_argv = init_resources (argc, argv); 792 const char **cmd_argv = init_resources (argc, argv);
798 793
799#ifdef KEYSYM_RESOURCE 794#ifdef KEYSYM_RESOURCE
800 keyboard->register_done (); 795 keyboard->register_done ();
… …
809 if (chdir (path)) 804 if (chdir (path))
810 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 805 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
811 } 806 }
812 807
813 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
814 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 809 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
815 810
816 pty = ptytty::create (); 811 pty = ptytty::create ();
817 812
818 create_windows (argc, argv); 813 create_windows (argc, argv);
819 814
… …
825 XSynchronize (dpy, True); 820 XSynchronize (dpy, True);
826#endif 821#endif
827 822
828 if (option (Opt_scrollBar)) 823 if (option (Opt_scrollBar))
829 scrollBar.resize (); /* create and map scrollbar */ 824 scrollBar.resize (); /* create and map scrollbar */
825
830#ifdef HAVE_BG_PIXMAP 826#ifdef HAVE_BG_PIXMAP
831 { 827 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 828#endif
876 829
877#if ENABLE_PERL 830#if ENABLE_PERL
878 rootwin_ev.start (display, display->root); 831 rootwin_ev.start (display, display->root);
879#endif 832#endif
880 833
881 set_colorfgbg (); 834 init_done = 1;
882 835
883 init_command (cmd_argv); 836 init_command (cmd_argv);
884
885 free (cmd_argv);
886 837
887 if (pty->pty >= 0) 838 if (pty->pty >= 0)
888 pty_ev.start (pty->pty, ev::READ); 839 pty_ev.start (pty->pty, ev::READ);
889 840
890 HOOK_INVOKE ((this, HOOK_START, DT_END)); 841 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
892#if ENABLE_XEMBED 843#if ENABLE_XEMBED
893 if (rs[Rs_embed]) 844 if (rs[Rs_embed])
894 { 845 {
895 long info[2] = { 0, XEMBED_MAPPED }; 846 long info[2] = { 0, XEMBED_MAPPED };
896 847
897 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 848 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
898 32, PropModeReplace, (unsigned char *)&info, 2); 849 32, PropModeReplace, (unsigned char *)&info, 2);
899 } 850 }
900#endif 851#endif
901 852
853#if HAVE_STARTUP_NOTIFICATION
854 SnDisplay *snDisplay;
855 SnLauncheeContext *snContext;
856
857 snDisplay = sn_display_new (dpy, NULL, NULL);
858 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
859
860 /* Tell the window manager that this window is part of the startup context */
861 if (snContext)
862 sn_launchee_context_setup_window (snContext, parent);
863#endif
864
902 XMapWindow (dpy, vt); 865 XMapWindow (dpy, vt);
903 XMapWindow (dpy, parent[0]); 866 XMapWindow (dpy, parent);
867
868#if HAVE_STARTUP_NOTIFICATION
869 if (snContext)
870 {
871 /* Mark the startup process as complete */
872 sn_launchee_context_complete (snContext);
873
874 sn_launchee_context_unref (snContext);
875 }
876
877 sn_display_unref (snDisplay);
878#endif
904 879
905 refresh_check (); 880 refresh_check ();
906} 881}
907 882
908/*----------------------------------------------------------------------*/ 883/*----------------------------------------------------------------------*/
909void 884void
910rxvt_term::init_env () 885rxvt_term::init_env ()
911{ 886{
912 int i;
913 char *val; 887 char *val;
888 char *env_display;
889 char *env_windowid;
890 char *env_colorfgbg;
891 char *env_term;
914 892
915#ifdef DISPLAY_IS_IP 893#ifdef DISPLAY_IS_IP
916 /* Fixup display_name for export over pty to any interested terminal 894 /* 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 895 * 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 896 * (for the first non-loopback interface) that we get from
… …
931 val = XDisplayString (dpy); 909 val = XDisplayString (dpy);
932 910
933 if (rs[Rs_display_name] == NULL) 911 if (rs[Rs_display_name] == NULL)
934 rs[Rs_display_name] = val; /* use broken `:0' value */ 912 rs[Rs_display_name] = val; /* use broken `:0' value */
935 913
936 i = strlen (val);
937 env_display = (char *)rxvt_malloc (i + 9); 914 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 915
939 sprintf (env_display, "DISPLAY=%s", val); 916 sprintf (env_display, "DISPLAY=%s", val);
940 917
918 env_windowid = (char *)rxvt_malloc (21);
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 920
943 /* add entries to the environment: 921 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 922 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 923 * @ WINDOWID: X window id number of the window
946 * @ COLORTERM: terminal sub-name and also indicates its color 924 * @ COLORTERM: terminal sub-name and also indicates its color
… …
949 * @ COLORFGBG: fg;bg color codes 927 * @ COLORFGBG: fg;bg color codes
950 */ 928 */
951 putenv (env_display); 929 putenv (env_display);
952 putenv (env_windowid); 930 putenv (env_windowid);
953 931
954 if (env_colorfgbg) 932 env_colorfgbg = get_colorfgbg ();
955 putenv (env_colorfgbg); 933 putenv (env_colorfgbg);
956 934
957#ifdef RXVT_TERMINFO 935#ifdef RXVT_TERMINFO
958 putenv ("TERMINFO=" RXVT_TERMINFO); 936 putenv ("TERMINFO=" RXVT_TERMINFO);
959#endif 937#endif
960 938
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 957 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 958#endif /* HAVE_UNSETENV */
981} 959}
982 960
983/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 962void
989rxvt_term::set_locale (const char *locale) 963rxvt_term::set_locale (const char *locale)
990{ 964{
991 set_environ (envv); 965 set_environ (env);
992 966
993#if HAVE_XSETLOCALE || HAVE_SETLOCALE
994 free (this->locale); 967 free (this->locale);
995 this->locale = setlocale (LC_CTYPE, locale); 968 this->locale = setlocale (LC_CTYPE, locale);
996 969
997 if (!this->locale) 970 if (!this->locale)
998 { 971 {
… …
1009 982
1010 983
1011 this->locale = strdup (this->locale); 984 this->locale = strdup (this->locale);
1012 SET_LOCALE (this->locale); 985 SET_LOCALE (this->locale);
1013 mbstate.reset (); 986 mbstate.reset ();
1014#endif
1015 987
1016#if HAVE_NL_LANGINFO 988#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 989 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 990 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 991 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 992 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 993 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 994 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 995#else
1025 enc_utf8 = 0; 996 enc_utf8 = 0;
1026#endif 997#endif
1027} 998}
1028 999
1029void 1000void
1030rxvt_term::init_xlocale () 1001rxvt_term::init_xlocale ()
1031{ 1002{
1032 set_environ (envv); 1003 set_environ (env);
1033 1004
1034#ifdef USE_XIM 1005#if USE_XIM
1035 if (!locale) 1006 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 1007 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 1008 else
1038 { 1009 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1010 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 1011
1041 if (!XSupportsLocale ()) 1012 if (!XSupportsLocale ())
1042 { 1013 {
1043 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1014 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1044 return; 1015 return;
1045 } 1016 }
1046 1017
1047 im_ev.start (display); 1018 im_ev.start (display);
1048 1019
… …
1089 run_command (argv); 1060 run_command (argv);
1090} 1061}
1091 1062
1092/*----------------------------------------------------------------------*/ 1063/*----------------------------------------------------------------------*/
1093void 1064void
1094rxvt_term::get_colours () 1065rxvt_term::get_colors ()
1095{ 1066{
1096 int i; 1067 int i;
1097 1068
1098#ifdef OFF_FOCUS_FADING 1069#ifdef OFF_FOCUS_FADING
1099 pix_colors = pix_colors_focused; 1070 pix_colors = pix_colors_focused;
1100#endif 1071#endif
1101 1072
1102 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1073 for (i = 0; i < NRS_COLORS; i++)
1103 {
1104 const char *name = rs[Rs_color + i]; 1074 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)) 1075 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 1076
1158 /* 1077 /*
1159 * get scrollBar shadow colors 1078 * get scrollBar shadow colors
1160 * 1079 *
1161 * The calculations of topShadow/bottomShadow values are adapted 1080 * The calculations of topShadow/bottomShadow values are adapted
1162 * from the fvwm window manager. 1081 * from the fvwm window manager.
1163 */ 1082 */
1164#ifdef RXVT_SCROLLBAR 1083#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]); 1084 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1175 1085
1176 rgba cscroll; 1086 rgba cscroll;
1177 pix_colors [Color_scroll].get (cscroll); 1087 pix_colors [Color_scroll].get (cscroll);
1178 1088
1179 /* topShadowColor */ 1089 /* topShadowColor */
1180 if (!pix_colors[Color_topShadow].set (this, 1090 if (!pix_colors[Color_topShadow].set (this,
1181 rgba ( 1091 rgba (
1182 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1092 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1183 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1093 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1184 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1094 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1185 cscroll.a) 1095 cscroll.a)
1186 )) 1096 ))
1187 alias_color (Color_topShadow, Color_White); 1097 alias_color (Color_topShadow, Color_White);
1188 }
1189#endif 1098#endif
1190 1099
1191#ifdef OFF_FOCUS_FADING 1100#ifdef OFF_FOCUS_FADING
1192 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1101 for (i = 0; i < NRS_COLORS; i++)
1193 update_fade_color (i); 1102 update_fade_color (i, true);
1194#endif 1103#endif
1195} 1104}
1196 1105
1197/*----------------------------------------------------------------------*/ 1106/*----------------------------------------------------------------------*/
1198/* color aliases, fg/bg bright-bold */ 1107/* color aliases, fg/bg bright-bold */
1199void 1108void
1200rxvt_term::color_aliases (int idx) 1109rxvt_term::color_aliases (int idx)
1201{ 1110{
1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1111 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1203 { 1112 {
1204 int i = atoi (rs[Rs_color + idx]); 1113 int i = atoi (rs[Rs_color + idx]);
1205 1114
1206 if (i >= 8 && i <= 15) 1115 if (i >= 8 && i <= 15)
1207 /* bright colors */ 1116 /* bright colors */
… …
1247 for (j = map->max_keypermod; j--; k++) 1156 for (j = map->max_keypermod; j--; k++)
1248 { 1157 {
1249 if (kc[k] == 0) 1158 if (kc[k] == 0)
1250 break; 1159 break;
1251 1160
1252 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1161 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1253 { 1162 {
1254 case XK_Num_Lock: 1163 case XK_Num_Lock:
1255 ModNumLockMask = modmasks[i - 1]; 1164 ModNumLockMask = modmasks[i - 1];
1256 continue; 1165 continue;
1257 1166
… …
1299 1208
1300 if (i) 1209 if (i)
1301 ModMetaMask = modmasks[i - 1]; 1210 ModMetaMask = modmasks[i - 1];
1302} 1211}
1303 1212
1213void
1214rxvt_term::set_icon (const char *file)
1215{
1216#if HAVE_PIXBUF && ENABLE_EWMH
1217 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1218 if (!pixbuf)
1219 {
1220 rxvt_warn ("Loading image icon failed, continuing without.\n");
1221 return;
1222 }
1223
1224 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1225 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1226
1227 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1228 {
1229 rxvt_warn ("Icon image too big, continuing without.\n");
1230 g_object_unref (pixbuf);
1231 return;
1232 }
1233
1234 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1235 {
1236 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1237 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1238 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1239
1240 buffer [0] = w;
1241 buffer [1] = h;
1242 for (int i = 0; i < h; i++)
1243 {
1244 for (int j = 0; j < w; j++)
1245 {
1246 unsigned char *pixel = row + j * channels;
1247 long value;
1248
1249 if (channels == 4)
1250 value = pixel[3];
1251 else
1252 value = (unsigned char)0x00ff;
1253
1254 value = (value << 8) + pixel[0];
1255 value = (value << 8) + pixel[1];
1256 value = (value << 8) + pixel[2];
1257 buffer[(i * w + j) + 2] = value;
1258 }
1259
1260 row += rowstride;
1261 }
1262
1263 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1264 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1265 free (buffer);
1266 }
1267 else
1268 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1269
1270 g_object_unref (pixbuf);
1271#endif
1272}
1273
1304/*----------------------------------------------------------------------*/ 1274/*----------------------------------------------------------------------*/
1305/* rxvt_Create_Windows () - Open and map the window */ 1275/* Open and map the window */
1306void 1276void
1307rxvt_term::create_windows (int argc, const char *const *argv) 1277rxvt_term::create_windows (int argc, const char *const *argv)
1308{ 1278{
1309 XClassHint classHint; 1279 XClassHint classHint;
1310 XWMHints wmHint; 1280 XWMHints wmHint;
… …
1316 Window top, parent; 1286 Window top, parent;
1317 1287
1318 dLocal (Display *, dpy); 1288 dLocal (Display *, dpy);
1319 1289
1320 /* grab colors before netscape does */ 1290 /* grab colors before netscape does */
1321 get_colours (); 1291 get_colors ();
1322 1292
1323 if (!set_fonts ()) 1293 if (!set_fonts ())
1324 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1294 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1325 1295
1326 parent = display->root; 1296 parent = display->root;
… …
1356 } 1326 }
1357#endif 1327#endif
1358 1328
1359 window_calc (0, 0); 1329 window_calc (0, 0);
1360 1330
1361 /* sub-window placement & size in rxvt_resize_subwindows () */ 1331 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1362 attributes.background_pixel = pix_colors_focused [Color_border]; 1332 attributes.background_pixel = pix_colors_focused [Color_border];
1363 attributes.border_pixel = pix_colors_focused [Color_border]; 1333 attributes.border_pixel = pix_colors_focused [Color_border];
1364 attributes.colormap = cmap; 1334 attributes.colormap = cmap;
1365 1335
1366 top = XCreateWindow (dpy, parent, 1336 top = XCreateWindow (dpy, parent,
… …
1369 ext_bwidth, 1339 ext_bwidth,
1370 depth, InputOutput, visual, 1340 depth, InputOutput, visual,
1371 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1341 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1372 &attributes); 1342 &attributes);
1373 1343
1374 this->parent[0] = top; 1344 this->parent = top;
1375
1376 old_width = szHint.width;
1377 old_height = szHint.height;
1378 1345
1379 set_title (rs [Rs_title]); 1346 set_title (rs [Rs_title]);
1380 set_icon_name (rs [Rs_iconName]); 1347 set_icon_name (rs [Rs_iconName]);
1381 1348
1382 classHint.res_name = (char *)rs[Rs_name]; 1349 classHint.res_name = (char *)rs[Rs_name];
1383 classHint.res_class = (char *)RESCLASS; 1350 classHint.res_class = (char *)RESCLASS;
1384 1351
1385 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1352 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1386 wmHint.input = True; 1353 wmHint.input = True;
1387 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1354 wmHint.initial_state = option (Opt_iconic) ? IconicState
1355 : option (Opt_dockapp) ? WithdrawnState
1356 : NormalState;
1388 wmHint.window_group = top; 1357 wmHint.window_group = top;
1389 1358
1390 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1359 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1391 &szHint, &wmHint, &classHint); 1360 &szHint, &wmHint, &classHint);
1392#if ENABLE_EWMH 1361#if ENABLE_EWMH
1393# ifdef HAVE_AFTERIMAGE
1394 /* 1362 /*
1395 * set up icon hint 1363 * set up icon hint
1396 * rs [Rs_iconfile] is path to icon, asv has been created in init_resources 1364 * rs [Rs_iconfile] is path to icon
1397 */ 1365 */
1398 1366
1399 if (rs [Rs_iconfile]) 1367 if (rs [Rs_iconfile])
1400 { 1368 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 1369#endif
1442 1370
1443#if ENABLE_FRILLS 1371#if ENABLE_FRILLS
1444 if (mwmhints.flags) 1372 if (mwmhints.flags)
1445 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1373 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1451#if ENABLE_EWMH 1379#if ENABLE_EWMH
1452 xa[XA_NET_WM_PING], 1380 xa[XA_NET_WM_PING],
1453#endif 1381#endif
1454 }; 1382 };
1455 1383
1456 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1384 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1457 1385
1458#if ENABLE_FRILLS 1386#if ENABLE_FRILLS
1459 if (rs[Rs_transient_for]) 1387 if (rs[Rs_transient_for])
1460 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1388 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1461#endif 1389#endif
… …
1479 | ExposureMask | StructureNotifyMask); 1407 | ExposureMask | StructureNotifyMask);
1480 1408
1481 termwin_ev.start (display, top); 1409 termwin_ev.start (display, top);
1482 1410
1483 /* vt cursor: Black-on-White is standard, but this is more popular */ 1411 /* vt cursor: Black-on-White is standard, but this is more popular */
1412 unsigned int shape = XC_xterm;
1413
1414#ifdef HAVE_XMU
1415 if (rs[Rs_pointerShape])
1416 {
1417 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1418 if (stmp >= 0)
1419 shape = stmp;
1420 }
1421#endif
1422
1484 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1423 TermWin_cursor = XCreateFontCursor (dpy, shape);
1485 1424
1486 /* the vt window */ 1425 /* the vt window */
1487 vt = XCreateSimpleWindow (dpy, top, 1426 vt = XCreateSimpleWindow (dpy, top,
1488 window_vt_x, window_vt_y, 1427 window_vt_x, window_vt_y,
1489 width, height, 1428 vt_width, vt_height,
1490 0, 1429 0,
1491 pix_colors_focused[Color_fg], 1430 pix_colors_focused[Color_fg],
1492 pix_colors_focused[Color_bg]); 1431 pix_colors_focused[Color_bg]);
1493 1432
1494 attributes.bit_gravity = NorthWestGravity; 1433 attributes.bit_gravity = NorthWestGravity;
… …
1521 if (rs[Rs_fade]) 1460 if (rs[Rs_fade])
1522 pix_colors = pix_colors_unfocused; 1461 pix_colors = pix_colors_unfocused;
1523#endif 1462#endif
1524 1463
1525 pointer_unblank (); 1464 pointer_unblank ();
1526 scr_recolour (); 1465 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 // does not work as stdin is not a tty
1539 // if (tcgetattr (STDIN_FILENO, tio) < 0)
1540 if (1)
1541 {
1542 // return error - use system defaults,
1543 // where possible, and zero elsewhere
1544 memset (tio, 0, sizeof (struct termios));
1545 for (int i = 0; i < NCCS; i++)
1546 tio->c_cc[i] = VDISABLE;
1547
1548 tio->c_cc[VINTR] = CINTR;
1549 tio->c_cc[VQUIT] = CQUIT;
1550 tio->c_cc[VERASE] = CERASE;
1551#ifdef VERASE2
1552 tio->c_cc[VERASE2] = CERASE2;
1553#endif
1554 tio->c_cc[VKILL] = CKILL;
1555 tio->c_cc[VSTART] = CSTART;
1556 tio->c_cc[VSTOP] = CSTOP;
1557 tio->c_cc[VSUSP] = CSUSP;
1558# ifdef VDSUSP
1559 tio->c_cc[VDSUSP] = CDSUSP;
1560# endif
1561# ifdef VREPRINT
1562 tio->c_cc[VREPRINT] = CRPRNT;
1563# endif
1564# ifdef VDISCRD
1565 tio->c_cc[VDISCRD] = CFLUSH;
1566# endif
1567# ifdef VWERSE
1568 tio->c_cc[VWERSE] = CWERASE;
1569# endif
1570# ifdef VLNEXT
1571 tio->c_cc[VLNEXT] = CLNEXT;
1572# endif
1573 }
1574
1575 tio->c_cc[VEOF] = CEOF;
1576# if VMIN != VEOF
1577 tio->c_cc[VMIN] = 1;
1578# endif
1579# if VTIME != VEOL
1580 tio->c_cc[VTIME] = 0;
1581# endif
1582
1583 if (erase != -1)
1584 tio->c_cc[VERASE] = (char)erase;
1585
1586 /* input modes */
1587 tio->c_iflag = (BRKINT | IGNPAR | ICRNL
1588# ifdef IMAXBEL
1589 | IMAXBEL
1590# endif
1591 | IXON);
1592
1593 /* output modes */
1594 tio->c_oflag = (OPOST | ONLCR);
1595
1596 /* control modes */
1597 tio->c_cflag = (CS8 | CREAD);
1598
1599 /* line discipline modes */
1600 tio->c_lflag = (ISIG | ICANON | IEXTEN | ECHO
1601# if defined (ECHOCTL) && defined (ECHOKE)
1602 | ECHOCTL | ECHOKE
1603# endif
1604 | ECHOE | ECHOK);
1605
1606 /*
1607 * Debugging
1608 */
1609#ifdef DEBUG_TTYMODE
1610 /* c_iflag bits */
1611 fprintf (stderr, "Input flags\n");
1612
1613 /* cpp token stringize doesn't work on all machines <sigh> */
1614# define FOO(flag,name) \
1615 if ((tio->c_iflag) & flag) \
1616 fprintf (stderr, "%s ", name)
1617
1618 /* c_iflag bits */
1619 FOO (IGNBRK, "IGNBRK");
1620 FOO (BRKINT, "BRKINT");
1621 FOO (IGNPAR, "IGNPAR");
1622 FOO (PARMRK, "PARMRK");
1623 FOO (INPCK, "INPCK");
1624 FOO (ISTRIP, "ISTRIP");
1625 FOO (INLCR, "INLCR");
1626 FOO (IGNCR, "IGNCR");
1627 FOO (ICRNL, "ICRNL");
1628 FOO (IXON, "IXON");
1629 FOO (IXOFF, "IXOFF");
1630# ifdef IUCLC
1631 FOO (IUCLC, "IUCLC");
1632# endif
1633# ifdef IXANY
1634 FOO (IXANY, "IXANY");
1635# endif
1636# ifdef IMAXBEL
1637 FOO (IMAXBEL, "IMAXBEL");
1638# endif
1639
1640 fprintf (stderr, "\n");
1641
1642# undef FOO
1643# define FOO(entry, name) \
1644 fprintf (stderr, "%-8s = %#04o\n", name, tio->c_cc [entry])
1645
1646 FOO (VINTR, "VINTR");
1647 FOO (VQUIT, "VQUIT");
1648 FOO (VERASE, "VERASE");
1649 FOO (VKILL, "VKILL");
1650 FOO (VEOF, "VEOF");
1651 FOO (VEOL, "VEOL");
1652# ifdef VEOL2
1653 FOO (VEOL2, "VEOL2");
1654# endif
1655# ifdef VSWTC
1656 FOO (VSWTC, "VSWTC");
1657# endif
1658# ifdef VSWTCH
1659 FOO (VSWTCH, "VSWTCH");
1660# endif
1661 FOO (VSTART, "VSTART");
1662 FOO (VSTOP, "VSTOP");
1663 FOO (VSUSP, "VSUSP");
1664# ifdef VDSUSP
1665 FOO (VDSUSP, "VDSUSP");
1666# endif
1667# ifdef VREPRINT
1668 FOO (VREPRINT, "VREPRINT");
1669# endif
1670# ifdef VDISCRD
1671 FOO (VDISCRD, "VDISCRD");
1672# endif
1673# ifdef VWERSE
1674 FOO (VWERSE, "VWERSE");
1675# endif
1676# ifdef VLNEXT
1677 FOO (VLNEXT, "VLNEXT");
1678# endif
1679
1680 fprintf (stderr, "\n");
1681# undef FOO
1682#endif /* DEBUG_TTYMODE */
1683} 1466}
1684 1467
1685/*----------------------------------------------------------------------*/ 1468/*----------------------------------------------------------------------*/
1686/* 1469/*
1687 * Run the command in a subprocess and return a file descriptor for the 1470 * Run the command in a subprocess and return a file descriptor for the
… …
1699 if (pty->pty >= 0) 1482 if (pty->pty >= 0)
1700 { 1483 {
1701 if (getfd_hook) 1484 if (getfd_hook)
1702 pty->pty = (*getfd_hook) (pty->pty); 1485 pty->pty = (*getfd_hook) (pty->pty);
1703 1486
1704 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1487 if (pty->pty < 0)
1705 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1488 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1706 } 1489 }
1707 } 1490 }
1708 else 1491 else
1709#endif 1492#endif
1710 if (!pty->get ()) 1493 if (!pty->get ())
1711 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1494 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1712 1495
1713 int er; 1496 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1497
1498 struct termios tio = def_tio;
1714 1499
1715#ifndef NO_BACKSPACE_KEY 1500#ifndef NO_BACKSPACE_KEY
1716 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1501 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
1717 er = rs[Rs_backspace_key][0]; 1502 tio.c_cc[VERASE] = rs[Rs_backspace_key][0];
1718 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0) 1503 else if (strcmp (rs[Rs_backspace_key], "DEC") == 0)
1719 er = '\177'; /* the initial state anyway */ 1504 tio.c_cc[VERASE] = '\177'; /* the initial state anyway */
1720 else
1721#endif 1505#endif
1722 er = -1;
1723 1506
1724 rxvt_get_ttymode (&tio, er);
1725 /* init terminal attributes */ 1507 /* init terminal attributes */
1726 cfsetospeed (&tio, BAUDRATE); 1508 cfsetospeed (&tio, BAUDRATE);
1727 cfsetispeed (&tio, BAUDRATE); 1509 cfsetispeed (&tio, BAUDRATE);
1728 tcsetattr (pty->tty, TCSANOW, &tio); 1510 tcsetattr (pty->tty, TCSANOW, &tio);
1729 pty->set_utf8_mode (enc_utf8); 1511 pty->set_utf8_mode (enc_utf8);
… …
1769 1551
1770 _exit (EXIT_FAILURE); 1552 _exit (EXIT_FAILURE);
1771 1553
1772 default: 1554 default:
1773 if (!option (Opt_utmpInhibit)) 1555 if (!option (Opt_utmpInhibit))
1556 {
1557#ifdef LOG_ONLY_ON_LOGIN
1558 bool login_shell = option (Opt_loginShell);
1559#else
1560 bool login_shell = true;
1561#endif
1774 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1562 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1563 }
1775 1564
1776 pty->close_tty (); 1565 pty->close_tty ();
1777 1566
1778 child_ev.start (cmd_pid); 1567 child_ev.start (cmd_pid);
1779 1568
… …
1804#elif defined (SRIOCSREDIR) 1593#elif defined (SRIOCSREDIR)
1805 int fd; 1594 int fd;
1806 1595
1807 fd = open (CONSOLE, O_WRONLY, 0); 1596 fd = open (CONSOLE, O_WRONLY, 0);
1808 if (fd >= 0) 1597 if (fd >= 0)
1809 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1598 {
1599 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1810 close (fd); 1600 close (fd);
1601 }
1811#endif /* SRIOCSREDIR */ 1602#endif /* SRIOCSREDIR */
1812 } 1603 }
1813 1604
1814 /* reset signals and spin off the command interpreter */ 1605 /* reset signals and spin off the command interpreter */
1815 signal (SIGINT, SIG_DFL); 1606 signal (SIGINT, SIG_DFL);
1816 signal (SIGQUIT, SIG_DFL); 1607 signal (SIGQUIT, SIG_DFL);
1817 signal (SIGCHLD, SIG_DFL); 1608 signal (SIGCHLD, SIG_DFL);
1818 signal (SIGHUP, SIG_DFL); 1609 signal (SIGHUP, SIG_DFL);
1819 signal (SIGPIPE, SIG_DFL); 1610 signal (SIGPIPE, SIG_DFL);
1820 /* 1611 /*
1821 * mimick login's behavior by disabling the job control signals 1612 * mimic login's behavior by disabling the job control signals
1822 * a shell that wants them can turn them back on 1613 * a shell that wants them can turn them back on
1823 */ 1614 */
1824#ifdef SIGTSTP 1615#ifdef SIGTSTP
1825 signal (SIGTSTP, SIG_IGN); 1616 signal (SIGTSTP, SIG_IGN);
1826 signal (SIGTTIN, SIG_IGN); 1617 signal (SIGTTIN, SIG_IGN);

Diff Legend

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