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.299 by sf-exg, Fri Aug 19 17:49:08 2011 UTC vs.
Revision 1.340 by root, Sat Dec 13 12:24:32 2014 UTC

… …
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 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;
… …
516#endif 519#endif
517 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
519 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
520#endif 523#endif
521#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
522 NULL, 525 NULL,
523#endif 526#endif
524#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
525 "rgb:00/00/00", 528 "rgb:00/00/00",
526#endif 529#endif
… …
562 565
563/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
564const char ** 567const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
566{ 569{
567 int i, r_argc; 570 int i;
568 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
569
570 /*
571 * Look for -e option. Find => split and make cmd_argv[] of command args
572 */
573 for (r_argc = 0; r_argc < argc; r_argc++)
574 if (!strcmp (argv[r_argc], "-e"))
575 break;
576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
590
591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
592
593 for (i = 0; i < r_argc; i++)
594 r_argv[i] = (const char *)argv[i];
595
596 r_argv[i] = NULL;
597 572
598 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
599 574
600 /* 575 /*
601 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
602 */ 577 */
603 578
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
606 581
607 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
608 583
609 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 586
615 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
616 xa = display->xa; 588 xa = display->xa;
617 589
618 set (display); 590 set (display);
619 extract_resources (); 591 extract_resources ();
620 592
621#if XFT 593#if ENABLE_FRILLS
622 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
623 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));
624#endif 598#endif
625
626 free (r_argv);
627 599
628 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
630 rs [i] = 0; 602 rs [i] = 0;
631 603
… …
639 { 611 {
640 rxvt_perl.init (this); 612 rxvt_perl.init (this);
641 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
642 } 614 }
643#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 ();
644 620
645 /* 621 /*
646 * set any defaults not already set 622 * set any defaults not already set
647 */ 623 */
648 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
683 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
684 pointerBlankDelay = i; 660 pointerBlankDelay = i;
685 else 661 else
686 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
687#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;
688 671
689 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
690 if (!saveLines) 673 if (!saveLines)
691 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
692 675
… …
757 return cmd_argv; 740 return cmd_argv;
758} 741}
759 742
760/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
761void 744void
762rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 745rxvt_term::init (stringvec *argv, stringvec *envv)
763{ 746{
747 argv->push_back (0);
748 envv->push_back (0);
749
750 this->argv = argv;
764 this->envv = envv; 751 this->envv = envv;
765 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{
766 SET_R (this); 782 SET_R (this);
767 set_locale (""); 783 set_locale ("");
768 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 :(
769 785
770 init_vars (); 786 init_vars ();
771 787
772 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
773 789
… …
784 if (chdir (path)) 800 if (chdir (path))
785 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");
786 } 802 }
787 803
788 if (option (Opt_scrollBar)) 804 if (option (Opt_scrollBar))
789 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 805 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
790 806
791 pty = ptytty::create (); 807 pty = ptytty::create ();
792
793#ifdef HAVE_AFTERIMAGE
794 set_application_name ((char *)rs[Rs_name]);
795 set_output_threshold (OUTPUT_LEVEL_WARNING);
796#endif
797
798 // must be called before create_windows, because the latter may call set_icon
799#ifdef HAVE_PIXBUF
800 g_type_init ();
801#endif
802 808
803 create_windows (argc, argv); 809 create_windows (argc, argv);
804 810
805 init_xlocale (); 811 init_xlocale ();
806 812
… …
810 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
811#endif 817#endif
812 818
813 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
821
815#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
816 {
817 bg_init (); 823 bg_init ();
818
819#ifdef ENABLE_TRANSPARENCY
820 if (option (Opt_transparent))
821 {
822 bg_set_transparent ();
823
824 if (rs [Rs_blurradius])
825 bg_set_blur (rs [Rs_blurradius]);
826
827 if (ISSET_PIXCOLOR (Color_tint))
828 bg_set_tint (pix_colors_focused [Color_tint]);
829
830 if (rs [Rs_shade])
831 bg_set_shade (rs [Rs_shade]);
832
833 bg_set_root_pixmap ();
834 XSelectInput (dpy, display->root, PropertyChangeMask);
835 rootwin_ev.start (display, display->root);
836 }
837#endif
838
839#ifdef BG_IMAGE_FROM_FILE
840 if (rs[Rs_backgroundPixmap])
841 {
842 if (bg_set_file (rs[Rs_backgroundPixmap]))
843 if (!bg_window_position_sensitive ())
844 update_background ();
845 }
846#endif
847 }
848#endif 824#endif
849 825
850#if ENABLE_PERL 826#if ENABLE_PERL
851 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
852#endif 828#endif
853 829
854 set_colorfgbg (); 830 init_done = 1;
855 831
856 init_command (cmd_argv); 832 init_command (cmd_argv);
857
858 free (cmd_argv);
859 833
860 if (pty->pty >= 0) 834 if (pty->pty >= 0)
861 pty_ev.start (pty->pty, ev::READ); 835 pty_ev.start (pty->pty, ev::READ);
862 836
863 HOOK_INVOKE ((this, HOOK_START, DT_END)); 837 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 844 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
871 32, PropModeReplace, (unsigned char *)&info, 2); 845 32, PropModeReplace, (unsigned char *)&info, 2);
872 } 846 }
873#endif 847#endif
874 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
875 XMapWindow (dpy, vt); 861 XMapWindow (dpy, vt);
876 XMapWindow (dpy, parent); 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
877 875
878 refresh_check (); 876 refresh_check ();
879} 877}
880 878
881/*----------------------------------------------------------------------*/ 879/*----------------------------------------------------------------------*/
882void 880void
883rxvt_term::init_env () 881rxvt_term::init_env ()
884{ 882{
885 char *val; 883 char *val;
884 char *env_display;
885 char *env_windowid;
886 char *env_colorfgbg;
887 char *env_term;
886 888
887#ifdef DISPLAY_IS_IP 889#ifdef DISPLAY_IS_IP
888 /* Fixup display_name for export over pty to any interested terminal 890 /* Fixup display_name for export over pty to any interested terminal
889 * 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
890 * (for the first non-loopback interface) that we get from 892 * (for the first non-loopback interface) that we get from
… …
907 909
908 env_display = (char *)rxvt_malloc (strlen (val) + 9); 910 env_display = (char *)rxvt_malloc (strlen (val) + 9);
909 911
910 sprintf (env_display, "DISPLAY=%s", val); 912 sprintf (env_display, "DISPLAY=%s", val);
911 913
914 env_windowid = (char *)rxvt_malloc (21);
912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 915 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
913 916
914 /* add entries to the environment: 917 /* add entries to the environment:
915 * @ DISPLAY: in case we started with -display 918 * @ DISPLAY: in case we started with -display
916 * @ WINDOWID: X window id number of the window 919 * @ WINDOWID: X window id number of the window
… …
920 * @ COLORFGBG: fg;bg color codes 923 * @ COLORFGBG: fg;bg color codes
921 */ 924 */
922 putenv (env_display); 925 putenv (env_display);
923 putenv (env_windowid); 926 putenv (env_windowid);
924 927
925 if (env_colorfgbg) 928 env_colorfgbg = get_colorfgbg ();
926 putenv (env_colorfgbg); 929 putenv (env_colorfgbg);
927 930
928#ifdef RXVT_TERMINFO 931#ifdef RXVT_TERMINFO
929 putenv ("TERMINFO=" RXVT_TERMINFO); 932 putenv ("TERMINFO=" RXVT_TERMINFO);
930#endif 933#endif
931 934
… …
950 unsetenv ("TERMCAP"); /* terminfo should be okay */ 953 unsetenv ("TERMCAP"); /* terminfo should be okay */
951#endif /* HAVE_UNSETENV */ 954#endif /* HAVE_UNSETENV */
952} 955}
953 956
954/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
955/*
956 * This is more or less stolen straight from XFree86 xterm.
957 * This should support all European type languages.
958 */
959void 958void
960rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
961{ 960{
962 set_environ (envv); 961 set_environ (env);
963 962
964#if HAVE_XSETLOCALE || HAVE_SETLOCALE
965 free (this->locale); 963 free (this->locale);
966 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
967 965
968 if (!this->locale) 966 if (!this->locale)
969 { 967 {
… …
980 978
981 979
982 this->locale = strdup (this->locale); 980 this->locale = strdup (this->locale);
983 SET_LOCALE (this->locale); 981 SET_LOCALE (this->locale);
984 mbstate.reset (); 982 mbstate.reset ();
985#endif
986 983
987#if HAVE_NL_LANGINFO 984#if HAVE_NL_LANGINFO
988 char *codeset = strdup (nl_langinfo (CODESET)); 985 char *codeset = nl_langinfo (CODESET);
989 // /^UTF.?8/i 986 // /^UTF.?8/i
990 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 987 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
991 && (codeset[1] == 'T' || codeset[1] == 't') 988 && (codeset[1] == 'T' || codeset[1] == 't')
992 && (codeset[2] == 'F' || codeset[2] == 'f') 989 && (codeset[2] == 'F' || codeset[2] == 'f')
993 && (codeset[3] == '8' || codeset[4] == '8'); 990 && (codeset[3] == '8' || codeset[4] == '8');
994 free (codeset);
995#else 991#else
996 enc_utf8 = 0; 992 enc_utf8 = 0;
997#endif 993#endif
998} 994}
999 995
1000void 996void
1001rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
1002{ 998{
1003 set_environ (envv); 999 set_environ (env);
1004 1000
1005#ifdef USE_XIM 1001#if USE_XIM
1006 if (!locale) 1002 if (!locale)
1007 rxvt_warn ("setting locale failed, working without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1008 else 1004 else
1009 { 1005 {
1010 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1011 1007
1012 if (!XSupportsLocale ()) 1008 if (!XSupportsLocale ())
1013 { 1009 {
1014 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");
1015 return; 1011 return;
1016 } 1012 }
1017 1013
1018 im_ev.start (display); 1014 im_ev.start (display);
1019 1015
… …
1060 run_command (argv); 1056 run_command (argv);
1061} 1057}
1062 1058
1063/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
1064void 1060void
1065rxvt_term::get_colours () 1061rxvt_term::get_colors ()
1066{ 1062{
1067 int i; 1063 int i;
1068 1064
1069#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1070 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
1071#endif 1067#endif
1072 1068
1073 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1069 for (i = 0; i < NRS_COLORS; i++)
1074 { 1070 {
1075 const char *name = rs[Rs_color + i]; 1071 const char *name = rs[Rs_color + i];
1076 1072
1077 if (!name) 1073 if (!name)
1078 continue; 1074 continue;
… …
1088#endif 1084#endif
1089 name = def_colorName [i]; 1085 name = def_colorName [i];
1090 1086
1091 if (!name) 1087 if (!name)
1092 continue; 1088 continue;
1089
1090 xcol.free (this);
1093 1091
1094 if (!set_color (xcol, name)) 1092 if (!set_color (xcol, name))
1095 { 1093 {
1096 switch (i) 1094 switch (i)
1097 { 1095 {
… …
1117 1115
1118 pix_colors[i] = xcol; 1116 pix_colors[i] = xcol;
1119 rs[Rs_color + i] = name; 1117 rs[Rs_color + i] = name;
1120 } 1118 }
1121 1119
1122 if (depth <= 2)
1123 {
1124 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1125 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1126 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1127 }
1128
1129 /* 1120 /*
1130 * get scrollBar shadow colors 1121 * get scrollBar shadow colors
1131 * 1122 *
1132 * The calculations of topShadow/bottomShadow values are adapted 1123 * The calculations of topShadow/bottomShadow values are adapted
1133 * from the fvwm window manager. 1124 * from the fvwm window manager.
1134 */ 1125 */
1135#ifdef RXVT_SCROLLBAR 1126#ifdef RXVT_SCROLLBAR
1136 if (depth <= 2)
1137 {
1138 /* Monochrome */
1139 alias_color (Color_scroll, Color_fg);
1140 alias_color (Color_topShadow, Color_bg);
1141 alias_color (Color_bottomShadow, Color_bg);
1142 }
1143 else
1144 {
1145 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1127 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1146 1128
1147 rgba cscroll; 1129 rgba cscroll;
1148 pix_colors [Color_scroll].get (cscroll); 1130 pix_colors [Color_scroll].get (cscroll);
1149 1131
1150 /* topShadowColor */ 1132 /* topShadowColor */
1151 if (!pix_colors[Color_topShadow].set (this, 1133 if (!pix_colors[Color_topShadow].set (this,
1152 rgba ( 1134 rgba (
1153 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1135 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1154 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1136 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1155 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1137 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1156 cscroll.a) 1138 cscroll.a)
1157 )) 1139 ))
1158 alias_color (Color_topShadow, Color_White); 1140 alias_color (Color_topShadow, Color_White);
1159 }
1160#endif 1141#endif
1161 1142
1162#ifdef OFF_FOCUS_FADING 1143#ifdef OFF_FOCUS_FADING
1163 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1144 for (i = 0; i < NRS_COLORS; i++)
1164 update_fade_color (i); 1145 update_fade_color (i, true);
1165#endif 1146#endif
1166} 1147}
1167 1148
1168/*----------------------------------------------------------------------*/ 1149/*----------------------------------------------------------------------*/
1169/* color aliases, fg/bg bright-bold */ 1150/* color aliases, fg/bg bright-bold */
1170void 1151void
1171rxvt_term::color_aliases (int idx) 1152rxvt_term::color_aliases (int idx)
1172{ 1153{
1173 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1154 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1174 { 1155 {
1175 int i = atoi (rs[Rs_color + idx]); 1156 int i = atoi (rs[Rs_color + idx]);
1176 1157
1177 if (i >= 8 && i <= 15) 1158 if (i >= 8 && i <= 15)
1178 /* bright colors */ 1159 /* bright colors */
… …
1218 for (j = map->max_keypermod; j--; k++) 1199 for (j = map->max_keypermod; j--; k++)
1219 { 1200 {
1220 if (kc[k] == 0) 1201 if (kc[k] == 0)
1221 break; 1202 break;
1222 1203
1223 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1204 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1224 { 1205 {
1225 case XK_Num_Lock: 1206 case XK_Num_Lock:
1226 ModNumLockMask = modmasks[i - 1]; 1207 ModNumLockMask = modmasks[i - 1];
1227 continue; 1208 continue;
1228 1209
… …
1273} 1254}
1274 1255
1275void 1256void
1276rxvt_term::set_icon (const char *file) 1257rxvt_term::set_icon (const char *file)
1277{ 1258{
1278#ifdef HAVE_AFTERIMAGE
1279 init_asv ();
1280
1281 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1282 if (!im)
1283 {
1284 rxvt_warn ("Loading image icon failed, continuing without.\n");
1285 return;
1286 }
1287
1288 unsigned int w = im->width;
1289 unsigned int h = im->height;
1290
1291 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1292 {
1293 rxvt_warn ("Icon image too big, continuing without.\n");
1294 destroy_asimage (&im);
1295 return;
1296 }
1297
1298 ASImage *result = scale_asimage (asv, im,
1299 w, h, ASA_ARGB32,
1300 100, ASIMAGE_QUALITY_DEFAULT);
1301 destroy_asimage (&im);
1302
1303 if (!result)
1304 {
1305 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1306 return;
1307 }
1308
1309 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1310 if (buffer)
1311 {
1312 ARGB32 *asbuf = result->alt.argb32;
1313 buffer [0] = w;
1314 buffer [1] = h;
1315
1316 for (unsigned int i = 0; i < w * h; ++i)
1317 buffer [i + 2] = asbuf [i];
1318
1319 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1320 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1321 free (buffer);
1322 }
1323 else
1324 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1325
1326 destroy_asimage (&result);
1327#endif
1328
1329#ifdef HAVE_PIXBUF 1259#if HAVE_PIXBUF
1330 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1260 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1331 if (!pixbuf) 1261 if (!pixbuf)
1332 { 1262 {
1333 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1263 rxvt_warn ("Loading image icon failed, continuing without.\n");
1334 return; 1264 return;
… …
1399 Window top, parent; 1329 Window top, parent;
1400 1330
1401 dLocal (Display *, dpy); 1331 dLocal (Display *, dpy);
1402 1332
1403 /* grab colors before netscape does */ 1333 /* grab colors before netscape does */
1404 get_colours (); 1334 get_colors ();
1405 1335
1406 if (!set_fonts ()) 1336 if (!set_fonts ())
1407 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1337 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1408 1338
1409 parent = display->root; 1339 parent = display->root;
… …
1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1384 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1455 &attributes); 1385 &attributes);
1456 1386
1457 this->parent = top; 1387 this->parent = top;
1458 1388
1459 old_width = szHint.width;
1460 old_height = szHint.height;
1461
1462 set_title (rs [Rs_title]); 1389 set_title (rs [Rs_title]);
1463 set_icon_name (rs [Rs_iconName]); 1390 set_icon_name (rs [Rs_iconName]);
1464 1391
1465 classHint.res_name = (char *)rs[Rs_name]; 1392 classHint.res_name = (char *)rs[Rs_name];
1466 classHint.res_class = (char *)RESCLASS; 1393 classHint.res_class = (char *)RESCLASS;
1467 1394
1468 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1395 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1469 wmHint.input = True; 1396 wmHint.input = True;
1470 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1397 wmHint.initial_state = option (Opt_iconic) ? IconicState
1398 : option (Opt_dockapp) ? WithdrawnState
1399 : NormalState;
1471 wmHint.window_group = top; 1400 wmHint.window_group = top;
1472 1401
1473 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1402 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1474 &szHint, &wmHint, &classHint); 1403 &szHint, &wmHint, &classHint);
1475#if ENABLE_EWMH 1404#if ENABLE_EWMH
… …
1477 * set up icon hint 1406 * set up icon hint
1478 * rs [Rs_iconfile] is path to icon 1407 * rs [Rs_iconfile] is path to icon
1479 */ 1408 */
1480 1409
1481 if (rs [Rs_iconfile]) 1410 if (rs [Rs_iconfile])
1482 {
1483 set_icon (rs [Rs_iconfile]); 1411 set_icon (rs [Rs_iconfile]);
1484 }
1485#endif 1412#endif
1486 1413
1487#if ENABLE_FRILLS 1414#if ENABLE_FRILLS
1488 if (mwmhints.flags) 1415 if (mwmhints.flags)
1489 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1416 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1528 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1455 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1529 1456
1530 /* the vt window */ 1457 /* the vt window */
1531 vt = XCreateSimpleWindow (dpy, top, 1458 vt = XCreateSimpleWindow (dpy, top,
1532 window_vt_x, window_vt_y, 1459 window_vt_x, window_vt_y,
1533 width, height, 1460 vt_width, vt_height,
1534 0, 1461 0,
1535 pix_colors_focused[Color_fg], 1462 pix_colors_focused[Color_fg],
1536 pix_colors_focused[Color_bg]); 1463 pix_colors_focused[Color_bg]);
1537 1464
1538 attributes.bit_gravity = NorthWestGravity; 1465 attributes.bit_gravity = NorthWestGravity;
… …
1565 if (rs[Rs_fade]) 1492 if (rs[Rs_fade])
1566 pix_colors = pix_colors_unfocused; 1493 pix_colors = pix_colors_unfocused;
1567#endif 1494#endif
1568 1495
1569 pointer_unblank (); 1496 pointer_unblank ();
1570 scr_recolour (); 1497 scr_recolor ();
1571} 1498}
1572 1499
1573/*----------------------------------------------------------------------*/ 1500/*----------------------------------------------------------------------*/
1574/* 1501/*
1575 * Run the command in a subprocess and return a file descriptor for the 1502 * Run the command in a subprocess and return a file descriptor for the
… …
1587 if (pty->pty >= 0) 1514 if (pty->pty >= 0)
1588 { 1515 {
1589 if (getfd_hook) 1516 if (getfd_hook)
1590 pty->pty = (*getfd_hook) (pty->pty); 1517 pty->pty = (*getfd_hook) (pty->pty);
1591 1518
1592 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1519 if (pty->pty < 0)
1593 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1520 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1594 } 1521 }
1595 } 1522 }
1596 else 1523 else
1597#endif 1524#endif
1598 if (!pty->get ()) 1525 if (!pty->get ())
1599 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1526 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1527
1528 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1600 1529
1601 struct termios tio = def_tio; 1530 struct termios tio = def_tio;
1602 1531
1603#ifndef NO_BACKSPACE_KEY 1532#ifndef NO_BACKSPACE_KEY
1604 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1533 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1654 1583
1655 _exit (EXIT_FAILURE); 1584 _exit (EXIT_FAILURE);
1656 1585
1657 default: 1586 default:
1658 if (!option (Opt_utmpInhibit)) 1587 if (!option (Opt_utmpInhibit))
1588 {
1589#ifdef LOG_ONLY_ON_LOGIN
1590 bool login_shell = option (Opt_loginShell);
1591#else
1592 bool login_shell = true;
1593#endif
1659 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1594 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1595 }
1660 1596
1661 pty->close_tty (); 1597 pty->close_tty ();
1662 1598
1663 child_ev.start (cmd_pid); 1599 child_ev.start (cmd_pid);
1664 1600
… …
1689#elif defined (SRIOCSREDIR) 1625#elif defined (SRIOCSREDIR)
1690 int fd; 1626 int fd;
1691 1627
1692 fd = open (CONSOLE, O_WRONLY, 0); 1628 fd = open (CONSOLE, O_WRONLY, 0);
1693 if (fd >= 0) 1629 if (fd >= 0)
1694 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1630 {
1631 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1695 close (fd); 1632 close (fd);
1633 }
1696#endif /* SRIOCSREDIR */ 1634#endif /* SRIOCSREDIR */
1697 } 1635 }
1698 1636
1699 /* reset signals and spin off the command interpreter */ 1637 /* reset signals and spin off the command interpreter */
1700 signal (SIGINT, SIG_DFL); 1638 signal (SIGINT, SIG_DFL);

Diff Legend

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