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.297 by sf-exg, Mon Aug 15 11:01:54 2011 UTC vs.
Revision 1.346 by sf-exg, Tue Jun 21 12:03:56 2016 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;
… …
142 close (skfd); 150 close (skfd);
143 151
144 return rval; 152 return rval;
145} 153}
146#endif 154#endif
155
156#define NULL_5 \
157 NULL, \
158 NULL, \
159 NULL, \
160 NULL, \
161 NULL,
162
163#define NULL_10 \
164 NULL_5 \
165 NULL_5
166
167#define NULL_40 \
168 NULL_10 \
169 NULL_10 \
170 NULL_10 \
171 NULL_10
172
173#define NULL_50 \
174 NULL_40 \
175 NULL_10
176
177#define NULL_100 \
178 NULL_50 \
179 NULL_50
147 180
148static const char *const def_colorName[] = 181static const char *const def_colorName[] =
149 { 182 {
150 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
… …
248 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
249 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
250 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
251 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
252 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
253#else 292#else
254 // 256 xterm colours 293 // 256 xterm colours
255 "rgb:00/00/00", 294 "rgb:00/00/00",
256 "rgb:00/00/5f", 295 "rgb:00/00/5f",
257 "rgb:00/00/87", 296 "rgb:00/00/87",
… …
490 "rgb:c6/c6/c6", 529 "rgb:c6/c6/c6",
491 "rgb:d0/d0/d0", 530 "rgb:d0/d0/d0",
492 "rgb:da/da/da", 531 "rgb:da/da/da",
493 "rgb:e4/e4/e4", 532 "rgb:e4/e4/e4",
494 "rgb:ee/ee/ee", 533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
495#endif 538#endif
496 539
497#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
498 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
499 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
… …
516#endif 559#endif
517 COLOR_SCROLLBAR, 560 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR 561#ifdef RXVT_SCROLLBAR
519 COLOR_SCROLLTROUGH, 562 COLOR_SCROLLTROUGH,
520#endif 563#endif
521#if ENABLE_TRANSPARENCY 564#if BG_IMAGE_FROM_ROOT
522 NULL, 565 NULL,
523#endif 566#endif
524#if OFF_FOCUS_FADING 567#if OFF_FOCUS_FADING
525 "rgb:00/00/00", 568 "rgb:00/00/00",
526#endif 569#endif
… …
562 605
563/*----------------------------------------------------------------------*/ 606/*----------------------------------------------------------------------*/
564const char ** 607const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 608rxvt_term::init_resources (int argc, const char *const *argv)
566{ 609{
567 int i, r_argc; 610 int i;
568 const char **cmd_argv, **r_argv; 611 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 612
598 rs[Rs_name] = rxvt_basename (argv[0]); 613 rs[Rs_name] = rxvt_basename (argv[0]);
599 614
600 /* 615 /*
601 * Open display, get options/resources and create the window 616 * Open display, get options/resources and create the window
602 */ 617 */
603 618
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 619 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 620 rs[Rs_display_name] = ":0";
606 621
607 get_options (r_argc, r_argv); 622 cmd_argv = get_options (argc, argv);
608 623
609 if (!(display = displays.get (rs[Rs_display_name]))) 624 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]); 625 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 626
615 // using a local pointer decreases code size a lot 627 // using a local pointer decreases code size a lot
616 xa = display->xa; 628 xa = display->xa;
617 629
618 set (display); 630 set (display);
619 extract_resources (); 631 extract_resources ();
620 632
621#if XFT 633#if ENABLE_FRILLS
622 if (rs[Rs_depth]) 634 if (rs[Rs_visual])
623 select_visual (strtol (rs[Rs_depth], 0, 0)); 635 select_visual (strtol (rs[Rs_visual], 0, 0));
636 else if (rs[Rs_depth])
637 select_depth (strtol (rs[Rs_depth], 0, 0));
624#endif 638#endif
625
626 free (r_argv);
627 639
628 for (int i = NUM_RESOURCES; i--; ) 640 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 641 if (rs [i] == resval_undef)
630 rs [i] = 0; 642 rs [i] = 0;
631 643
… …
639 { 651 {
640 rxvt_perl.init (this); 652 rxvt_perl.init (this);
641 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 653 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
642 } 654 }
643#endif 655#endif
656
657 // must be called after initialising the perl interpreter as it
658 // may invoke the `on_register_command' hook
659 extract_keysym_resources ();
644 660
645 /* 661 /*
646 * set any defaults not already set 662 * set any defaults not already set
647 */ 663 */
648 if (cmd_argv && cmd_argv[0]) 664 if (cmd_argv && cmd_argv[0])
… …
683 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 699 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
684 pointerBlankDelay = i; 700 pointerBlankDelay = i;
685 else 701 else
686 pointerBlankDelay = 2; 702 pointerBlankDelay = 2;
687#endif 703#endif
704
705 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
706 multiClickTime = i;
707 else
708 multiClickTime = 500;
709
710 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
688 711
689 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
690 if (!saveLines) 713 if (!saveLines)
691 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
692 715
… …
757 return cmd_argv; 780 return cmd_argv;
758} 781}
759 782
760/*----------------------------------------------------------------------*/ 783/*----------------------------------------------------------------------*/
761void 784void
762rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 785rxvt_term::init (stringvec *argv, stringvec *envv)
763{ 786{
787 argv->push_back (0);
788 envv->push_back (0);
789
790 this->argv = argv;
764 this->envv = envv; 791 this->envv = envv;
765 792
793 env = new char *[this->envv->size ()];
794 for (int i = 0; i < this->envv->size (); i++)
795 env[i] = this->envv->at (i);
796
797 init2 (argv->size () - 1, argv->begin ());
798}
799
800void
801rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
802{
803#if ENABLE_PERL
804 // perl might want to access the stringvecs later, so we need to copy them
805 stringvec *args = new stringvec;
806 for (int i = 0; i < argc; i++)
807 args->push_back (strdup (argv [i]));
808
809 stringvec *envs = new stringvec;
810 for (const char *const *var = envv; *var; var++)
811 envs->push_back (strdup (*var));
812
813 init (args, envs);
814#else
815 init2 (argc, argv);
816#endif
817}
818
819void
820rxvt_term::init2 (int argc, const char *const *argv)
821{
766 SET_R (this); 822 SET_R (this);
767 set_locale (""); 823 set_locale ("");
768 set_environ (envv); // a few things in X do not call setlocale :( 824 set_environ (env); // a few things in X do not call setlocale :(
769 825
770 init_vars (); 826 init_vars ();
771 827
772 const char **cmd_argv = init_resources (argc, argv); 828 const char **cmd_argv = init_resources (argc, argv);
773 829
… …
784 if (chdir (path)) 840 if (chdir (path))
785 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 841 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
786 } 842 }
787 843
788 if (option (Opt_scrollBar)) 844 if (option (Opt_scrollBar))
789 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 845 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
790 846
791 pty = ptytty::create (); 847 pty = ptytty::create ();
792 848
793 create_windows (argc, argv); 849 create_windows (argc, argv);
794 850
… …
800 XSynchronize (dpy, True); 856 XSynchronize (dpy, True);
801#endif 857#endif
802 858
803 if (option (Opt_scrollBar)) 859 if (option (Opt_scrollBar))
804 scrollBar.resize (); /* create and map scrollbar */ 860 scrollBar.resize (); /* create and map scrollbar */
861
805#ifdef HAVE_BG_PIXMAP 862#ifdef HAVE_BG_PIXMAP
806 {
807 bg_init (); 863 bg_init ();
808
809#ifdef ENABLE_TRANSPARENCY
810 if (option (Opt_transparent))
811 {
812 bg_set_transparent ();
813
814 if (rs [Rs_blurradius])
815 bg_set_blur (rs [Rs_blurradius]);
816
817 if (ISSET_PIXCOLOR (Color_tint))
818 bg_set_tint (pix_colors_focused [Color_tint]);
819
820 if (rs [Rs_shade])
821 bg_set_shade (rs [Rs_shade]);
822
823 bg_set_root_pixmap ();
824 XSelectInput (dpy, display->root, PropertyChangeMask);
825 rootwin_ev.start (display, display->root);
826 }
827#endif
828
829#ifdef BG_IMAGE_FROM_FILE
830 if (rs[Rs_backgroundPixmap])
831 {
832 const char *p = rs[Rs_backgroundPixmap];
833
834 if ((p = strchr (p, ';')) != 0)
835 {
836 p++;
837 bg_set_geometry (p);
838 }
839 else
840 bg_set_default_geometry ();
841
842 if (bg_set_file (rs[Rs_backgroundPixmap]))
843 if (!bg_window_position_sensitive ())
844 update_background ();
845 }
846#endif
847 }
848#endif 864#endif
849 865
850#if ENABLE_PERL 866#if ENABLE_PERL
851 rootwin_ev.start (display, display->root); 867 rootwin_ev.start (display, display->root);
852#endif 868#endif
853 869
854 set_colorfgbg (); 870 init_done = 1;
855 871
856 init_command (cmd_argv); 872 init_command (cmd_argv);
857
858 free (cmd_argv);
859 873
860 if (pty->pty >= 0) 874 if (pty->pty >= 0)
861 pty_ev.start (pty->pty, ev::READ); 875 pty_ev.start (pty->pty, ev::READ);
862 876
863 HOOK_INVOKE ((this, HOOK_START, DT_END)); 877 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
870 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 884 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
871 32, PropModeReplace, (unsigned char *)&info, 2); 885 32, PropModeReplace, (unsigned char *)&info, 2);
872 } 886 }
873#endif 887#endif
874 888
889#if HAVE_STARTUP_NOTIFICATION
890 SnDisplay *snDisplay;
891 SnLauncheeContext *snContext;
892
893 snDisplay = sn_display_new (dpy, NULL, NULL);
894 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
895
896 /* Tell the window manager that this window is part of the startup context */
897 if (snContext)
898 sn_launchee_context_setup_window (snContext, parent);
899#endif
900
875 XMapWindow (dpy, vt); 901 XMapWindow (dpy, vt);
876 XMapWindow (dpy, parent); 902 XMapWindow (dpy, parent);
903
904#if HAVE_STARTUP_NOTIFICATION
905 if (snContext)
906 {
907 /* Mark the startup process as complete */
908 sn_launchee_context_complete (snContext);
909
910 sn_launchee_context_unref (snContext);
911 }
912
913 sn_display_unref (snDisplay);
914#endif
877 915
878 refresh_check (); 916 refresh_check ();
879} 917}
880 918
881/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
882void 920void
883rxvt_term::init_env () 921rxvt_term::init_env ()
884{ 922{
885 char *val; 923 char *val;
924 char *env_display;
925 char *env_windowid;
926 char *env_colorfgbg;
927 char *env_term;
886 928
887#ifdef DISPLAY_IS_IP 929#ifdef DISPLAY_IS_IP
888 /* Fixup display_name for export over pty to any interested terminal 930 /* 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 931 * 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 932 * (for the first non-loopback interface) that we get from
… …
907 949
908 env_display = (char *)rxvt_malloc (strlen (val) + 9); 950 env_display = (char *)rxvt_malloc (strlen (val) + 9);
909 951
910 sprintf (env_display, "DISPLAY=%s", val); 952 sprintf (env_display, "DISPLAY=%s", val);
911 953
954 env_windowid = (char *)rxvt_malloc (21);
912 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 955 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
913 956
914 /* add entries to the environment: 957 /* add entries to the environment:
915 * @ DISPLAY: in case we started with -display 958 * @ DISPLAY: in case we started with -display
916 * @ WINDOWID: X window id number of the window 959 * @ WINDOWID: X window id number of the window
… …
920 * @ COLORFGBG: fg;bg color codes 963 * @ COLORFGBG: fg;bg color codes
921 */ 964 */
922 putenv (env_display); 965 putenv (env_display);
923 putenv (env_windowid); 966 putenv (env_windowid);
924 967
925 if (env_colorfgbg) 968 env_colorfgbg = get_colorfgbg ();
926 putenv (env_colorfgbg); 969 putenv (env_colorfgbg);
927 970
928#ifdef RXVT_TERMINFO 971#ifdef RXVT_TERMINFO
929 putenv ("TERMINFO=" RXVT_TERMINFO); 972 putenv ("TERMINFO=" RXVT_TERMINFO);
930#endif 973#endif
931 974
… …
950 unsetenv ("TERMCAP"); /* terminfo should be okay */ 993 unsetenv ("TERMCAP"); /* terminfo should be okay */
951#endif /* HAVE_UNSETENV */ 994#endif /* HAVE_UNSETENV */
952} 995}
953 996
954/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
955/*
956 * This is more or less stolen straight from XFree86 xterm.
957 * This should support all European type languages.
958 */
959void 998void
960rxvt_term::set_locale (const char *locale) 999rxvt_term::set_locale (const char *locale)
961{ 1000{
962 set_environ (envv); 1001 set_environ (env);
963 1002
964#if HAVE_XSETLOCALE || HAVE_SETLOCALE
965 free (this->locale); 1003 free (this->locale);
966 this->locale = setlocale (LC_CTYPE, locale); 1004 this->locale = setlocale (LC_CTYPE, locale);
967 1005
968 if (!this->locale) 1006 if (!this->locale)
969 { 1007 {
… …
980 1018
981 1019
982 this->locale = strdup (this->locale); 1020 this->locale = strdup (this->locale);
983 SET_LOCALE (this->locale); 1021 SET_LOCALE (this->locale);
984 mbstate.reset (); 1022 mbstate.reset ();
985#endif
986 1023
987#if HAVE_NL_LANGINFO 1024#if HAVE_NL_LANGINFO
988 char *codeset = strdup (nl_langinfo (CODESET)); 1025 char *codeset = nl_langinfo (CODESET);
989 // /^UTF.?8/i 1026 // /^UTF.?8/i
990 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1027 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
991 && (codeset[1] == 'T' || codeset[1] == 't') 1028 && (codeset[1] == 'T' || codeset[1] == 't')
992 && (codeset[2] == 'F' || codeset[2] == 'f') 1029 && (codeset[2] == 'F' || codeset[2] == 'f')
993 && (codeset[3] == '8' || codeset[4] == '8'); 1030 && (codeset[3] == '8' || codeset[4] == '8');
994 free (codeset);
995#else 1031#else
996 enc_utf8 = 0; 1032 enc_utf8 = 0;
997#endif 1033#endif
998} 1034}
999 1035
1000void 1036void
1001rxvt_term::init_xlocale () 1037rxvt_term::init_xlocale ()
1002{ 1038{
1003 set_environ (envv); 1039 set_environ (env);
1004 1040
1005#ifdef USE_XIM 1041#if USE_XIM
1006 if (!locale) 1042 if (!locale)
1007 rxvt_warn ("setting locale failed, working without locale support.\n"); 1043 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1008 else 1044 else
1009 { 1045 {
1010 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1046 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1011 1047
1012 if (!XSupportsLocale ()) 1048 if (!XSupportsLocale ())
1013 { 1049 {
1014 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1050 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1015 return; 1051 return;
1016 } 1052 }
1017 1053
1018 im_ev.start (display); 1054 im_ev.start (display);
1019 1055
… …
1060 run_command (argv); 1096 run_command (argv);
1061} 1097}
1062 1098
1063/*----------------------------------------------------------------------*/ 1099/*----------------------------------------------------------------------*/
1064void 1100void
1065rxvt_term::get_colours () 1101rxvt_term::get_colors ()
1066{ 1102{
1067 int i; 1103 int i;
1068 1104
1069#ifdef OFF_FOCUS_FADING 1105#ifdef OFF_FOCUS_FADING
1070 pix_colors = pix_colors_focused; 1106 pix_colors = pix_colors_focused;
1071#endif 1107#endif
1072 1108
1073 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1109 for (i = 0; i < NRS_COLORS; i++)
1074 {
1075 const char *name = rs[Rs_color + i]; 1110 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)) 1111 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 1112
1129 /* 1113 /*
1130 * get scrollBar shadow colors 1114 * get scrollBar shadow colors
1131 * 1115 *
1132 * The calculations of topShadow/bottomShadow values are adapted 1116 * The calculations of topShadow/bottomShadow values are adapted
1133 * from the fvwm window manager. 1117 * from the fvwm window manager.
1134 */ 1118 */
1135#ifdef RXVT_SCROLLBAR 1119#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]); 1120 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1146 1121
1147 rgba cscroll; 1122 rgba cscroll;
1148 pix_colors [Color_scroll].get (cscroll); 1123 pix_colors [Color_scroll].get (cscroll);
1149 1124
1150 /* topShadowColor */ 1125 /* topShadowColor */
1151 if (!pix_colors[Color_topShadow].set (this, 1126 if (!pix_colors[Color_topShadow].set (this,
1152 rgba ( 1127 rgba (
1153 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1128 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), 1129 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), 1130 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1156 cscroll.a) 1131 cscroll.a)
1157 )) 1132 ))
1158 alias_color (Color_topShadow, Color_White); 1133 alias_color (Color_topShadow, Color_White);
1159 }
1160#endif 1134#endif
1161 1135
1162#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1163 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1137 for (i = 0; i < NRS_COLORS; i++)
1164 update_fade_color (i); 1138 update_fade_color (i, true);
1165#endif 1139#endif
1166} 1140}
1167 1141
1168/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
1169/* color aliases, fg/bg bright-bold */ 1143/* color aliases, fg/bg bright-bold */
1170void 1144void
1171rxvt_term::color_aliases (int idx) 1145rxvt_term::color_aliases (int idx)
1172{ 1146{
1173 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1147 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1174 { 1148 {
1175 int i = atoi (rs[Rs_color + idx]); 1149 int i = atoi (rs[Rs_color + idx]);
1176 1150
1177 if (i >= 8 && i <= 15) 1151 if (i >= 8 && i <= 15)
1178 /* bright colors */ 1152 /* bright colors */
… …
1218 for (j = map->max_keypermod; j--; k++) 1192 for (j = map->max_keypermod; j--; k++)
1219 { 1193 {
1220 if (kc[k] == 0) 1194 if (kc[k] == 0)
1221 break; 1195 break;
1222 1196
1223 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1197 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1224 { 1198 {
1225 case XK_Num_Lock: 1199 case XK_Num_Lock:
1226 ModNumLockMask = modmasks[i - 1]; 1200 ModNumLockMask = modmasks[i - 1];
1227 continue; 1201 continue;
1228 1202
… …
1273} 1247}
1274 1248
1275void 1249void
1276rxvt_term::set_icon (const char *file) 1250rxvt_term::set_icon (const char *file)
1277{ 1251{
1278#ifdef HAVE_AFTERIMAGE 1252#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); 1253 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1331 if (!pixbuf) 1254 if (!pixbuf)
1332 { 1255 {
1333 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1256 rxvt_warn ("Loading image icon failed, continuing without.\n");
1334 return; 1257 return;
… …
1399 Window top, parent; 1322 Window top, parent;
1400 1323
1401 dLocal (Display *, dpy); 1324 dLocal (Display *, dpy);
1402 1325
1403 /* grab colors before netscape does */ 1326 /* grab colors before netscape does */
1404 get_colours (); 1327 get_colors ();
1405 1328
1406 if (!set_fonts ()) 1329 if (!set_fonts ())
1407 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1330 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1408 1331
1409 parent = display->root; 1332 parent = display->root;
… …
1454 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1377 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1455 &attributes); 1378 &attributes);
1456 1379
1457 this->parent = top; 1380 this->parent = top;
1458 1381
1459 old_width = szHint.width;
1460 old_height = szHint.height;
1461
1462 set_title (rs [Rs_title]); 1382 set_title (rs [Rs_title]);
1463 set_icon_name (rs [Rs_iconName]); 1383 set_icon_name (rs [Rs_iconName]);
1464 1384
1465 classHint.res_name = (char *)rs[Rs_name]; 1385 classHint.res_name = (char *)rs[Rs_name];
1466 classHint.res_class = (char *)RESCLASS; 1386 classHint.res_class = (char *)RESCLASS;
1467 1387
1468 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1388 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1469 wmHint.input = True; 1389 wmHint.input = True;
1470 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1390 wmHint.initial_state = option (Opt_iconic) ? IconicState
1391 : option (Opt_dockapp) ? WithdrawnState
1392 : NormalState;
1471 wmHint.window_group = top; 1393 wmHint.window_group = top;
1472 1394
1473 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1395 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1474 &szHint, &wmHint, &classHint); 1396 &szHint, &wmHint, &classHint);
1475#if ENABLE_EWMH 1397#if ENABLE_EWMH
… …
1477 * set up icon hint 1399 * set up icon hint
1478 * rs [Rs_iconfile] is path to icon 1400 * rs [Rs_iconfile] is path to icon
1479 */ 1401 */
1480 1402
1481 if (rs [Rs_iconfile]) 1403 if (rs [Rs_iconfile])
1482 {
1483 set_icon (rs [Rs_iconfile]); 1404 set_icon (rs [Rs_iconfile]);
1484 }
1485#endif 1405#endif
1486 1406
1487#if ENABLE_FRILLS 1407#if ENABLE_FRILLS
1488 if (mwmhints.flags) 1408 if (mwmhints.flags)
1489 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1409 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1523 | ExposureMask | StructureNotifyMask); 1443 | ExposureMask | StructureNotifyMask);
1524 1444
1525 termwin_ev.start (display, top); 1445 termwin_ev.start (display, top);
1526 1446
1527 /* vt cursor: Black-on-White is standard, but this is more popular */ 1447 /* vt cursor: Black-on-White is standard, but this is more popular */
1448 unsigned int shape = XC_xterm;
1449
1450#ifdef HAVE_XMU
1451 if (rs[Rs_pointerShape])
1452 {
1453 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1454 if (stmp >= 0)
1455 shape = stmp;
1456 }
1457#endif
1458
1528 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, shape);
1529 1460
1530 /* the vt window */ 1461 /* the vt window */
1531 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1532 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1533 width, height, 1464 vt_width, vt_height,
1534 0, 1465 0,
1535 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1536 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1537 1468
1538 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
… …
1565 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1566 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1567#endif 1498#endif
1568 1499
1569 pointer_unblank (); 1500 pointer_unblank ();
1570 scr_recolour (); 1501 scr_recolor ();
1571} 1502}
1572 1503
1573/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1574/* 1505/*
1575 * Run the command in a subprocess and return a file descriptor for the 1506 * Run the command in a subprocess and return a file descriptor for the
… …
1587 if (pty->pty >= 0) 1518 if (pty->pty >= 0)
1588 { 1519 {
1589 if (getfd_hook) 1520 if (getfd_hook)
1590 pty->pty = (*getfd_hook) (pty->pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1591 1522
1592 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1593 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1594 } 1525 }
1595 } 1526 }
1596 else 1527 else
1597#endif 1528#endif
1598 if (!pty->get ()) 1529 if (!pty->get ())
1599 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1530 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1531
1532 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1600 1533
1601 struct termios tio = def_tio; 1534 struct termios tio = def_tio;
1602 1535
1603#ifndef NO_BACKSPACE_KEY 1536#ifndef NO_BACKSPACE_KEY
1604 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1654 1587
1655 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1656 1589
1657 default: 1590 default:
1658 if (!option (Opt_utmpInhibit)) 1591 if (!option (Opt_utmpInhibit))
1592 {
1593#ifdef LOG_ONLY_ON_LOGIN
1594 bool login_shell = option (Opt_loginShell);
1595#else
1596 bool login_shell = true;
1597#endif
1659 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1599 }
1660 1600
1661 pty->close_tty (); 1601 pty->close_tty ();
1662 1602
1663 child_ev.start (cmd_pid); 1603 child_ev.start (cmd_pid);
1664 1604
… …
1689#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1690 int fd; 1630 int fd;
1691 1631
1692 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1693 if (fd >= 0) 1633 if (fd >= 0)
1694 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1695 close (fd); 1636 close (fd);
1637 }
1696#endif /* SRIOCSREDIR */ 1638#endif /* SRIOCSREDIR */
1697 } 1639 }
1698 1640
1699 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1700 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);

Diff Legend

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