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.300 by sf-exg, Thu Sep 1 08:11:26 2011 UTC vs.
Revision 1.345 by sf-exg, Tue Oct 13 08:10:43 2015 UTC

… …
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 <schmorp@schmorp.de> 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;
… …
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
… …
562 570
563/*----------------------------------------------------------------------*/ 571/*----------------------------------------------------------------------*/
564const char ** 572const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 573rxvt_term::init_resources (int argc, const char *const *argv)
566{ 574{
567 int i, r_argc; 575 int i;
568 const char **cmd_argv, **r_argv; 576 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 577
598 rs[Rs_name] = rxvt_basename (argv[0]); 578 rs[Rs_name] = rxvt_basename (argv[0]);
599 579
600 /* 580 /*
601 * Open display, get options/resources and create the window 581 * Open display, get options/resources and create the window
602 */ 582 */
603 583
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 584 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 585 rs[Rs_display_name] = ":0";
606 586
607 get_options (r_argc, r_argv); 587 cmd_argv = get_options (argc, argv);
608 588
609 if (!(display = displays.get (rs[Rs_display_name]))) 589 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]); 590 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 591
615 // using a local pointer decreases code size a lot 592 // using a local pointer decreases code size a lot
616 xa = display->xa; 593 xa = display->xa;
617 594
618 set (display); 595 set (display);
619 extract_resources (); 596 extract_resources ();
620 597
621#if XFT 598#if ENABLE_FRILLS
622 if (rs[Rs_depth]) 599 if (rs[Rs_visual])
623 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));
624#endif 603#endif
625
626 free (r_argv);
627 604
628 for (int i = NUM_RESOURCES; i--; ) 605 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 606 if (rs [i] == resval_undef)
630 rs [i] = 0; 607 rs [i] = 0;
631 608
… …
639 { 616 {
640 rxvt_perl.init (this); 617 rxvt_perl.init (this);
641 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 618 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
642 } 619 }
643#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 ();
644 625
645 /* 626 /*
646 * set any defaults not already set 627 * set any defaults not already set
647 */ 628 */
648 if (cmd_argv && cmd_argv[0]) 629 if (cmd_argv && cmd_argv[0])
… …
683 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 664 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
684 pointerBlankDelay = i; 665 pointerBlankDelay = i;
685 else 666 else
686 pointerBlankDelay = 2; 667 pointerBlankDelay = 2;
687#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;
688 676
689 /* no point having a scrollbar without having any scrollback! */ 677 /* no point having a scrollbar without having any scrollback! */
690 if (!saveLines) 678 if (!saveLines)
691 set_option (Opt_scrollBar, 0); 679 set_option (Opt_scrollBar, 0);
692 680
… …
757 return cmd_argv; 745 return cmd_argv;
758} 746}
759 747
760/*----------------------------------------------------------------------*/ 748/*----------------------------------------------------------------------*/
761void 749void
762rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 750rxvt_term::init (stringvec *argv, stringvec *envv)
763{ 751{
752 argv->push_back (0);
753 envv->push_back (0);
754
755 this->argv = argv;
764 this->envv = envv; 756 this->envv = envv;
765 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{
766 SET_R (this); 787 SET_R (this);
767 set_locale (""); 788 set_locale ("");
768 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 :(
769 790
770 init_vars (); 791 init_vars ();
771 792
772 const char **cmd_argv = init_resources (argc, argv); 793 const char **cmd_argv = init_resources (argc, argv);
773 794
… …
788 if (option (Opt_scrollBar)) 809 if (option (Opt_scrollBar))
789 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 810 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
790 811
791 pty = ptytty::create (); 812 pty = ptytty::create ();
792 813
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
803 create_windows (argc, argv); 814 create_windows (argc, argv);
804 815
805 init_xlocale (); 816 init_xlocale ();
806 817
807 scr_poweron (); // initialize screen 818 scr_poweron (); // initialize screen
… …
810 XSynchronize (dpy, True); 821 XSynchronize (dpy, True);
811#endif 822#endif
812 823
813 if (option (Opt_scrollBar)) 824 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */ 825 scrollBar.resize (); /* create and map scrollbar */
826
815#ifdef HAVE_BG_PIXMAP 827#ifdef HAVE_BG_PIXMAP
816 {
817 bg_init (); 828 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 829#endif
849 830
850#if ENABLE_PERL 831#if ENABLE_PERL
851 rootwin_ev.start (display, display->root); 832 rootwin_ev.start (display, display->root);
852#endif 833#endif
853 834
854 set_colorfgbg (); 835 init_done = 1;
855 836
856 init_command (cmd_argv); 837 init_command (cmd_argv);
857
858 free (cmd_argv);
859 838
860 if (pty->pty >= 0) 839 if (pty->pty >= 0)
861 pty_ev.start (pty->pty, ev::READ); 840 pty_ev.start (pty->pty, ev::READ);
862 841
863 HOOK_INVOKE ((this, HOOK_START, DT_END)); 842 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 849 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
871 32, PropModeReplace, (unsigned char *)&info, 2); 850 32, PropModeReplace, (unsigned char *)&info, 2);
872 } 851 }
873#endif 852#endif
874 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
875 XMapWindow (dpy, vt); 866 XMapWindow (dpy, vt);
876 XMapWindow (dpy, parent); 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
877 880
878 refresh_check (); 881 refresh_check ();
879} 882}
880 883
881/*----------------------------------------------------------------------*/ 884/*----------------------------------------------------------------------*/
882void 885void
883rxvt_term::init_env () 886rxvt_term::init_env ()
884{ 887{
885 char *val; 888 char *val;
889 char *env_display;
890 char *env_windowid;
891 char *env_colorfgbg;
892 char *env_term;
886 893
887#ifdef DISPLAY_IS_IP 894#ifdef DISPLAY_IS_IP
888 /* Fixup display_name for export over pty to any interested terminal 895 /* 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 896 * 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 897 * (for the first non-loopback interface) that we get from
… …
907 914
908 env_display = (char *)rxvt_malloc (strlen (val) + 9); 915 env_display = (char *)rxvt_malloc (strlen (val) + 9);
909 916
910 sprintf (env_display, "DISPLAY=%s", val); 917 sprintf (env_display, "DISPLAY=%s", val);
911 918
919 env_windowid = (char *)rxvt_malloc (21);
912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 920 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
913 921
914 /* add entries to the environment: 922 /* add entries to the environment:
915 * @ DISPLAY: in case we started with -display 923 * @ DISPLAY: in case we started with -display
916 * @ WINDOWID: X window id number of the window 924 * @ WINDOWID: X window id number of the window
… …
920 * @ COLORFGBG: fg;bg color codes 928 * @ COLORFGBG: fg;bg color codes
921 */ 929 */
922 putenv (env_display); 930 putenv (env_display);
923 putenv (env_windowid); 931 putenv (env_windowid);
924 932
925 if (env_colorfgbg) 933 env_colorfgbg = get_colorfgbg ();
926 putenv (env_colorfgbg); 934 putenv (env_colorfgbg);
927 935
928#ifdef RXVT_TERMINFO 936#ifdef RXVT_TERMINFO
929 putenv ("TERMINFO=" RXVT_TERMINFO); 937 putenv ("TERMINFO=" RXVT_TERMINFO);
930#endif 938#endif
931 939
… …
950 unsetenv ("TERMCAP"); /* terminfo should be okay */ 958 unsetenv ("TERMCAP"); /* terminfo should be okay */
951#endif /* HAVE_UNSETENV */ 959#endif /* HAVE_UNSETENV */
952} 960}
953 961
954/*----------------------------------------------------------------------*/ 962/*----------------------------------------------------------------------*/
955/*
956 * This is more or less stolen straight from XFree86 xterm.
957 * This should support all European type languages.
958 */
959void 963void
960rxvt_term::set_locale (const char *locale) 964rxvt_term::set_locale (const char *locale)
961{ 965{
962 set_environ (envv); 966 set_environ (env);
963 967
964#if HAVE_XSETLOCALE || HAVE_SETLOCALE
965 free (this->locale); 968 free (this->locale);
966 this->locale = setlocale (LC_CTYPE, locale); 969 this->locale = setlocale (LC_CTYPE, locale);
967 970
968 if (!this->locale) 971 if (!this->locale)
969 { 972 {
… …
980 983
981 984
982 this->locale = strdup (this->locale); 985 this->locale = strdup (this->locale);
983 SET_LOCALE (this->locale); 986 SET_LOCALE (this->locale);
984 mbstate.reset (); 987 mbstate.reset ();
985#endif
986 988
987#if HAVE_NL_LANGINFO 989#if HAVE_NL_LANGINFO
988 char *codeset = strdup (nl_langinfo (CODESET)); 990 char *codeset = nl_langinfo (CODESET);
989 // /^UTF.?8/i 991 // /^UTF.?8/i
990 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 992 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
991 && (codeset[1] == 'T' || codeset[1] == 't') 993 && (codeset[1] == 'T' || codeset[1] == 't')
992 && (codeset[2] == 'F' || codeset[2] == 'f') 994 && (codeset[2] == 'F' || codeset[2] == 'f')
993 && (codeset[3] == '8' || codeset[4] == '8'); 995 && (codeset[3] == '8' || codeset[4] == '8');
994 free (codeset);
995#else 996#else
996 enc_utf8 = 0; 997 enc_utf8 = 0;
997#endif 998#endif
998} 999}
999 1000
1000void 1001void
1001rxvt_term::init_xlocale () 1002rxvt_term::init_xlocale ()
1002{ 1003{
1003 set_environ (envv); 1004 set_environ (env);
1004 1005
1005#ifdef USE_XIM 1006#if USE_XIM
1006 if (!locale) 1007 if (!locale)
1007 rxvt_warn ("setting locale failed, working without locale support.\n"); 1008 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1008 else 1009 else
1009 { 1010 {
1010 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1011 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1011 1012
1012 if (!XSupportsLocale ()) 1013 if (!XSupportsLocale ())
1013 { 1014 {
1014 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");
1015 return; 1016 return;
1016 } 1017 }
1017 1018
1018 im_ev.start (display); 1019 im_ev.start (display);
1019 1020
… …
1060 run_command (argv); 1061 run_command (argv);
1061} 1062}
1062 1063
1063/*----------------------------------------------------------------------*/ 1064/*----------------------------------------------------------------------*/
1064void 1065void
1065rxvt_term::get_colours () 1066rxvt_term::get_colors ()
1066{ 1067{
1067 int i; 1068 int i;
1068 1069
1069#ifdef OFF_FOCUS_FADING 1070#ifdef OFF_FOCUS_FADING
1070 pix_colors = pix_colors_focused; 1071 pix_colors = pix_colors_focused;
1071#endif 1072#endif
1072 1073
1073 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1074 for (i = 0; i < NRS_COLORS; i++)
1074 {
1075 const char *name = rs[Rs_color + i]; 1075 if (const char *name = rs[Rs_color + i])
1076
1077 if (!name)
1078 continue;
1079
1080 rxvt_color xcol;
1081
1082 if (!set_color (xcol, name)) 1076 set_color (pix_colors [i], name);
1083 {
1084#ifndef XTERM_REVERSE_VIDEO
1085 if (i < 2 && option (Opt_reverseVideo))
1086 name = def_colorName [1 - i];
1087 else
1088#endif
1089 name = def_colorName [i];
1090
1091 if (!name)
1092 continue;
1093
1094 if (!set_color (xcol, name))
1095 {
1096 switch (i)
1097 {
1098 case Color_fg:
1099 case Color_bg:
1100 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1101 name = "";
1102 break;
1103#ifndef NO_CURSORCOLOR
1104 case Color_cursor2:
1105#endif
1106 case Color_pointer_fg:
1107 name = rs[Rs_color + Color_fg];
1108 xcol.set (this, name);
1109 break;
1110 default:
1111 name = rs[Rs_color + Color_bg];
1112 xcol.set (this, name);
1113 break;
1114 }
1115 }
1116 }
1117
1118 pix_colors[i] = xcol;
1119 rs[Rs_color + i] = name;
1120 }
1121
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 1077
1129 /* 1078 /*
1130 * get scrollBar shadow colors 1079 * get scrollBar shadow colors
1131 * 1080 *
1132 * The calculations of topShadow/bottomShadow values are adapted 1081 * The calculations of topShadow/bottomShadow values are adapted
1133 * from the fvwm window manager. 1082 * from the fvwm window manager.
1134 */ 1083 */
1135#ifdef RXVT_SCROLLBAR 1084#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]); 1085 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1146 1086
1147 rgba cscroll; 1087 rgba cscroll;
1148 pix_colors [Color_scroll].get (cscroll); 1088 pix_colors [Color_scroll].get (cscroll);
1149 1089
1150 /* topShadowColor */ 1090 /* topShadowColor */
1151 if (!pix_colors[Color_topShadow].set (this, 1091 if (!pix_colors[Color_topShadow].set (this,
1152 rgba ( 1092 rgba (
1153 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),
1154 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),
1155 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),
1156 cscroll.a) 1096 cscroll.a)
1157 )) 1097 ))
1158 alias_color (Color_topShadow, Color_White); 1098 alias_color (Color_topShadow, Color_White);
1159 }
1160#endif 1099#endif
1161 1100
1162#ifdef OFF_FOCUS_FADING 1101#ifdef OFF_FOCUS_FADING
1163 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < NRS_COLORS; i++)
1164 update_fade_color (i); 1103 update_fade_color (i, true);
1165#endif 1104#endif
1166} 1105}
1167 1106
1168/*----------------------------------------------------------------------*/ 1107/*----------------------------------------------------------------------*/
1169/* color aliases, fg/bg bright-bold */ 1108/* color aliases, fg/bg bright-bold */
1170void 1109void
1171rxvt_term::color_aliases (int idx) 1110rxvt_term::color_aliases (int idx)
1172{ 1111{
1173 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1112 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1174 { 1113 {
1175 int i = atoi (rs[Rs_color + idx]); 1114 int i = atoi (rs[Rs_color + idx]);
1176 1115
1177 if (i >= 8 && i <= 15) 1116 if (i >= 8 && i <= 15)
1178 /* bright colors */ 1117 /* bright colors */
… …
1218 for (j = map->max_keypermod; j--; k++) 1157 for (j = map->max_keypermod; j--; k++)
1219 { 1158 {
1220 if (kc[k] == 0) 1159 if (kc[k] == 0)
1221 break; 1160 break;
1222 1161
1223 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1162 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1224 { 1163 {
1225 case XK_Num_Lock: 1164 case XK_Num_Lock:
1226 ModNumLockMask = modmasks[i - 1]; 1165 ModNumLockMask = modmasks[i - 1];
1227 continue; 1166 continue;
1228 1167
… …
1273} 1212}
1274 1213
1275void 1214void
1276rxvt_term::set_icon (const char *file) 1215rxvt_term::set_icon (const char *file)
1277{ 1216{
1278#ifdef HAVE_AFTERIMAGE 1217#if HAVE_PIXBUF && ENABLE_EWMH
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
1330 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1218 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1331 if (!pixbuf) 1219 if (!pixbuf)
1332 { 1220 {
1333 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1221 rxvt_warn ("Loading image icon failed, continuing without.\n");
1334 return; 1222 return;
… …
1399 Window top, parent; 1287 Window top, parent;
1400 1288
1401 dLocal (Display *, dpy); 1289 dLocal (Display *, dpy);
1402 1290
1403 /* grab colors before netscape does */ 1291 /* grab colors before netscape does */
1404 get_colours (); 1292 get_colors ();
1405 1293
1406 if (!set_fonts ()) 1294 if (!set_fonts ())
1407 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");
1408 1296
1409 parent = display->root; 1297 parent = display->root;
… …
1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1342 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1455 &attributes); 1343 &attributes);
1456 1344
1457 this->parent = top; 1345 this->parent = top;
1458 1346
1459 old_width = szHint.width;
1460 old_height = szHint.height;
1461
1462 set_title (rs [Rs_title]); 1347 set_title (rs [Rs_title]);
1463 set_icon_name (rs [Rs_iconName]); 1348 set_icon_name (rs [Rs_iconName]);
1464 1349
1465 classHint.res_name = (char *)rs[Rs_name]; 1350 classHint.res_name = (char *)rs[Rs_name];
1466 classHint.res_class = (char *)RESCLASS; 1351 classHint.res_class = (char *)RESCLASS;
1467 1352
1468 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1353 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1469 wmHint.input = True; 1354 wmHint.input = True;
1470 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1355 wmHint.initial_state = option (Opt_iconic) ? IconicState
1356 : option (Opt_dockapp) ? WithdrawnState
1357 : NormalState;
1471 wmHint.window_group = top; 1358 wmHint.window_group = top;
1472 1359
1473 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1360 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1474 &szHint, &wmHint, &classHint); 1361 &szHint, &wmHint, &classHint);
1475#if ENABLE_EWMH 1362#if ENABLE_EWMH
… …
1477 * set up icon hint 1364 * set up icon hint
1478 * rs [Rs_iconfile] is path to icon 1365 * rs [Rs_iconfile] is path to icon
1479 */ 1366 */
1480 1367
1481 if (rs [Rs_iconfile]) 1368 if (rs [Rs_iconfile])
1482 {
1483 set_icon (rs [Rs_iconfile]); 1369 set_icon (rs [Rs_iconfile]);
1484 }
1485#endif 1370#endif
1486 1371
1487#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
1488 if (mwmhints.flags) 1373 if (mwmhints.flags)
1489 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,
… …
1523 | ExposureMask | StructureNotifyMask); 1408 | ExposureMask | StructureNotifyMask);
1524 1409
1525 termwin_ev.start (display, top); 1410 termwin_ev.start (display, top);
1526 1411
1527 /* 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
1528 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1424 TermWin_cursor = XCreateFontCursor (dpy, shape);
1529 1425
1530 /* the vt window */ 1426 /* the vt window */
1531 vt = XCreateSimpleWindow (dpy, top, 1427 vt = XCreateSimpleWindow (dpy, top,
1532 window_vt_x, window_vt_y, 1428 window_vt_x, window_vt_y,
1533 width, height, 1429 vt_width, vt_height,
1534 0, 1430 0,
1535 pix_colors_focused[Color_fg], 1431 pix_colors_focused[Color_fg],
1536 pix_colors_focused[Color_bg]); 1432 pix_colors_focused[Color_bg]);
1537 1433
1538 attributes.bit_gravity = NorthWestGravity; 1434 attributes.bit_gravity = NorthWestGravity;
… …
1565 if (rs[Rs_fade]) 1461 if (rs[Rs_fade])
1566 pix_colors = pix_colors_unfocused; 1462 pix_colors = pix_colors_unfocused;
1567#endif 1463#endif
1568 1464
1569 pointer_unblank (); 1465 pointer_unblank ();
1570 scr_recolour (); 1466 scr_recolor ();
1571} 1467}
1572 1468
1573/*----------------------------------------------------------------------*/ 1469/*----------------------------------------------------------------------*/
1574/* 1470/*
1575 * 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
… …
1587 if (pty->pty >= 0) 1483 if (pty->pty >= 0)
1588 { 1484 {
1589 if (getfd_hook) 1485 if (getfd_hook)
1590 pty->pty = (*getfd_hook) (pty->pty); 1486 pty->pty = (*getfd_hook) (pty->pty);
1591 1487
1592 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1488 if (pty->pty < 0)
1593 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1489 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1594 } 1490 }
1595 } 1491 }
1596 else 1492 else
1597#endif 1493#endif
1598 if (!pty->get ()) 1494 if (!pty->get ())
1599 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1495 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1496
1497 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1600 1498
1601 struct termios tio = def_tio; 1499 struct termios tio = def_tio;
1602 1500
1603#ifndef NO_BACKSPACE_KEY 1501#ifndef NO_BACKSPACE_KEY
1604 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1502 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1654 1552
1655 _exit (EXIT_FAILURE); 1553 _exit (EXIT_FAILURE);
1656 1554
1657 default: 1555 default:
1658 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
1659 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1563 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1564 }
1660 1565
1661 pty->close_tty (); 1566 pty->close_tty ();
1662 1567
1663 child_ev.start (cmd_pid); 1568 child_ev.start (cmd_pid);
1664 1569
… …
1689#elif defined (SRIOCSREDIR) 1594#elif defined (SRIOCSREDIR)
1690 int fd; 1595 int fd;
1691 1596
1692 fd = open (CONSOLE, O_WRONLY, 0); 1597 fd = open (CONSOLE, O_WRONLY, 0);
1693 if (fd >= 0) 1598 if (fd >= 0)
1694 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1599 {
1600 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1695 close (fd); 1601 close (fd);
1602 }
1696#endif /* SRIOCSREDIR */ 1603#endif /* SRIOCSREDIR */
1697 } 1604 }
1698 1605
1699 /* reset signals and spin off the command interpreter */ 1606 /* reset signals and spin off the command interpreter */
1700 signal (SIGINT, SIG_DFL); 1607 signal (SIGINT, SIG_DFL);

Diff Legend

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