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.279 by sf-exg, Sun Aug 29 15:05:08 2010 UTC vs.
Revision 1.347 by sf-exg, Thu Jul 14 05:10:06 2016 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
21 * 22 *
22 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 39#include "init.h"
39#include "keyboard.h" 40#include "keyboard.h"
40 41
41#include <limits> 42#include <limits>
42 43
43#include <csignal> 44#include <signal.h>
44 45
45#include <fcntl.h> 46#include <fcntl.h>
47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
46 51
47#ifdef HAVE_XSETLOCALE 52#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 53# define X_LOCALE
49# include <X11/Xlocale.h> 54# include <X11/Xlocale.h>
50#else 55#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 56# include <locale.h>
53# endif
54#endif 57#endif
55 58
56#ifdef HAVE_NL_LANGINFO 59#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 60# include <langinfo.h>
61#endif
62
63#ifdef HAVE_STARTUP_NOTIFICATION
64# define SN_API_NOT_YET_FROZEN
65# include <libsn/sn-launchee.h>
58#endif 66#endif
59 67
60#ifdef DISPLAY_IS_IP 68#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 69/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 70#include <sys/types.h>
… …
73#include <netinet/in.h> 81#include <netinet/in.h>
74#include <arpa/inet.h> 82#include <arpa/inet.h>
75#include <net/if.h> 83#include <net/if.h>
76#include <net/if_arp.h> 84#include <net/if_arp.h>
77 85
78static char * 86static char * ecb_cold
79rxvt_network_display (const char *display) 87rxvt_network_display (const char *display)
80{ 88{
81 char buffer[1024], *rval = NULL; 89 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 90 struct ifconf ifc;
83 struct ifreq *ifr; 91 struct ifreq *ifr;
… …
143 151
144 return rval; 152 return rval;
145} 153}
146#endif 154#endif
147 155
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
180
148const char *const def_colorName[] = 181static const char *const def_colorName[] =
149 { 182 {
150 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
152 /* low-intensity colors */ 185 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 186 "rgb:00/00/00", // 0: black (Black)
… …
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
… …
558 set_option (Opt_iso14755); 601 set_option (Opt_iso14755);
559 set_option (Opt_iso14755_52); 602 set_option (Opt_iso14755_52);
560 set_option (Opt_buffered); 603 set_option (Opt_buffered);
561} 604}
562 605
606#if ENABLE_PERL
607static void
608rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
609{
610 rxvt_perl.parse_resource (term, k, false, false, 0, v);
611}
612#endif
613
563/*----------------------------------------------------------------------*/ 614/*----------------------------------------------------------------------*/
564const char ** 615const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 616rxvt_term::init_resources (int argc, const char *const *argv)
566{ 617{
567 int i, r_argc; 618 int i;
568 const char **cmd_argv, **r_argv; 619 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 620
598 rs[Rs_name] = rxvt_basename (argv[0]); 621 rs[Rs_name] = rxvt_basename (argv[0]);
599 622
600 /* 623 /*
601 * Open display, get options/resources and create the window 624 * Open display, get options/resources and create the window
602 */ 625 */
603 626
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 627 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 628 rs[Rs_display_name] = ":0";
606 629
607 get_options (r_argc, r_argv); 630 cmd_argv = get_options (argc, argv);
608 631
609 if (!(display = displays.get (rs[Rs_display_name]))) 632 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]); 633 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 634
615 // using a local pointer decreases code size a lot 635 // using a local pointer decreases code size a lot
616 xa = display->xa; 636 xa = display->xa;
617 637
618 set (display); 638 set (display);
619 extract_resources (); 639 extract_resources ();
620 640
621#if XFT 641#if ENABLE_FRILLS
622 if (rs[Rs_depth]) 642 if (rs[Rs_visual])
623 select_visual (strtol (rs[Rs_depth], 0, 0)); 643 select_visual (strtol (rs[Rs_visual], 0, 0));
644 else if (rs[Rs_depth])
645 select_depth (strtol (rs[Rs_depth], 0, 0));
624#endif 646#endif
625
626 free (r_argv);
627 647
628 for (int i = NUM_RESOURCES; i--; ) 648 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 649 if (rs [i] == resval_undef)
630 rs [i] = 0; 650 rs [i] = 0;
631 651
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#if ENABLE_PERL 652#if ENABLE_PERL
638 if (!rs[Rs_perl_ext_1]) 653 if (!rs[Rs_perl_ext_1])
639 rs[Rs_perl_ext_1] = "default"; 654 rs[Rs_perl_ext_1] = "default";
640 655
641 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 656 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
642 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 657 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
643 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 658 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
644 { 659 {
645 rxvt_perl.init (this); 660 rxvt_perl.init (this);
661 enumerate_resources (rxvt_perl_parse_resource);
646 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 662 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647 } 663 }
648#endif 664#endif
665
666 // must be called after initialising the perl interpreter as it
667 // may invoke the `on_register_command' hook
668 extract_keysym_resources ();
649 669
650 /* 670 /*
651 * set any defaults not already set 671 * set any defaults not already set
652 */ 672 */
653 if (cmd_argv && cmd_argv[0]) 673 if (cmd_argv && cmd_argv[0])
… …
688 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 708 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
689 pointerBlankDelay = i; 709 pointerBlankDelay = i;
690 else 710 else
691 pointerBlankDelay = 2; 711 pointerBlankDelay = 2;
692#endif 712#endif
713
714 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
715 multiClickTime = i;
716 else
717 multiClickTime = 500;
718
719 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
693 720
694 /* no point having a scrollbar without having any scrollback! */ 721 /* no point having a scrollbar without having any scrollback! */
695 if (!saveLines) 722 if (!saveLines)
696 set_option (Opt_scrollBar, 0); 723 set_option (Opt_scrollBar, 0);
697 724
… …
762 return cmd_argv; 789 return cmd_argv;
763} 790}
764 791
765/*----------------------------------------------------------------------*/ 792/*----------------------------------------------------------------------*/
766void 793void
767rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 794rxvt_term::init (stringvec *argv, stringvec *envv)
768{ 795{
796 argv->push_back (0);
797 envv->push_back (0);
798
799 this->argv = argv;
769 this->envv = envv; 800 this->envv = envv;
770 801
802 env = new char *[this->envv->size ()];
803 for (int i = 0; i < this->envv->size (); i++)
804 env[i] = this->envv->at (i);
805
806 init2 (argv->size () - 1, argv->begin ());
807}
808
809void
810rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
811{
812#if ENABLE_PERL
813 // perl might want to access the stringvecs later, so we need to copy them
814 stringvec *args = new stringvec;
815 for (int i = 0; i < argc; i++)
816 args->push_back (strdup (argv [i]));
817
818 stringvec *envs = new stringvec;
819 for (const char *const *var = envv; *var; var++)
820 envs->push_back (strdup (*var));
821
822 init (args, envs);
823#else
824 init2 (argc, argv);
825#endif
826}
827
828void
829rxvt_term::init2 (int argc, const char *const *argv)
830{
771 SET_R (this); 831 SET_R (this);
772 set_locale (""); 832 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 833 set_environ (env); // a few things in X do not call setlocale :(
774 834
775 init_vars (); 835 init_vars ();
776 836
777 const char **cmd_argv = init_resources (argc, argv); 837 const char **cmd_argv = init_resources (argc, argv);
778 838
… …
789 if (chdir (path)) 849 if (chdir (path))
790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 850 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
791 } 851 }
792 852
793 if (option (Opt_scrollBar)) 853 if (option (Opt_scrollBar))
794 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 854 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 855
796 pty = ptytty::create (); 856 pty = ptytty::create ();
797 857
798 create_windows (argc, argv); 858 create_windows (argc, argv);
799 859
… …
805 XSynchronize (dpy, True); 865 XSynchronize (dpy, True);
806#endif 866#endif
807 867
808 if (option (Opt_scrollBar)) 868 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */ 869 scrollBar.resize (); /* create and map scrollbar */
870
810#ifdef HAVE_BG_PIXMAP 871#ifdef HAVE_BG_PIXMAP
811 { 872 bg_init ();
812 bgPixmap.set_target (this);
813 bgPixmap.invalidate ();
814
815#ifdef ENABLE_TRANSPARENCY
816 if (option (Opt_transparent))
817 {
818 bgPixmap.set_transparent ();
819
820#ifdef HAVE_AFTERIMAGE
821 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
823#endif
824 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]);
829
830 bgPixmap.set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ())
851 update_background ();
852 }
853#endif
854 }
855#endif 873#endif
856 874
857#if ENABLE_PERL 875#if ENABLE_PERL
858 rootwin_ev.start (display, display->root); 876 rootwin_ev.start (display, display->root);
859#endif 877#endif
860 878
861 set_colorfgbg (); 879 init_done = 1;
862 880
863 init_command (cmd_argv); 881 init_command (cmd_argv);
864
865 free (cmd_argv);
866 882
867 if (pty->pty >= 0) 883 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ); 884 pty_ev.start (pty->pty, ev::READ);
869 885
870 HOOK_INVOKE ((this, HOOK_START, DT_END)); 886 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
872#if ENABLE_XEMBED 888#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 889 if (rs[Rs_embed])
874 { 890 {
875 long info[2] = { 0, XEMBED_MAPPED }; 891 long info[2] = { 0, XEMBED_MAPPED };
876 892
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 893 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 894 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 895 }
880#endif 896#endif
881 897
898#if HAVE_STARTUP_NOTIFICATION
899 SnDisplay *snDisplay;
900 SnLauncheeContext *snContext;
901
902 snDisplay = sn_display_new (dpy, NULL, NULL);
903 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
904
905 /* Tell the window manager that this window is part of the startup context */
906 if (snContext)
907 sn_launchee_context_setup_window (snContext, parent);
908#endif
909
882 XMapWindow (dpy, vt); 910 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 911 XMapWindow (dpy, parent);
912
913#if HAVE_STARTUP_NOTIFICATION
914 if (snContext)
915 {
916 /* Mark the startup process as complete */
917 sn_launchee_context_complete (snContext);
918
919 sn_launchee_context_unref (snContext);
920 }
921
922 sn_display_unref (snDisplay);
923#endif
884 924
885 refresh_check (); 925 refresh_check ();
886} 926}
887 927
888/*----------------------------------------------------------------------*/ 928/*----------------------------------------------------------------------*/
889void 929void
890rxvt_term::init_env () 930rxvt_term::init_env ()
891{ 931{
892 int i;
893 char *val; 932 char *val;
933 char *env_display;
934 char *env_windowid;
935 char *env_colorfgbg;
936 char *env_term;
894 937
895#ifdef DISPLAY_IS_IP 938#ifdef DISPLAY_IS_IP
896 /* Fixup display_name for export over pty to any interested terminal 939 /* Fixup display_name for export over pty to any interested terminal
897 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 940 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
898 * (for the first non-loopback interface) that we get from 941 * (for the first non-loopback interface) that we get from
… …
911 val = XDisplayString (dpy); 954 val = XDisplayString (dpy);
912 955
913 if (rs[Rs_display_name] == NULL) 956 if (rs[Rs_display_name] == NULL)
914 rs[Rs_display_name] = val; /* use broken `:0' value */ 957 rs[Rs_display_name] = val; /* use broken `:0' value */
915 958
916 i = strlen (val);
917 env_display = (char *)rxvt_malloc (i + 9); 959 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 960
919 sprintf (env_display, "DISPLAY=%s", val); 961 sprintf (env_display, "DISPLAY=%s", val);
920 962
963 env_windowid = (char *)rxvt_malloc (21);
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 964 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 965
923 /* add entries to the environment: 966 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 967 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 968 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 969 * @ COLORTERM: terminal sub-name and also indicates its color
… …
929 * @ COLORFGBG: fg;bg color codes 972 * @ COLORFGBG: fg;bg color codes
930 */ 973 */
931 putenv (env_display); 974 putenv (env_display);
932 putenv (env_windowid); 975 putenv (env_windowid);
933 976
934 if (env_colorfgbg) 977 env_colorfgbg = get_colorfgbg ();
935 putenv (env_colorfgbg); 978 putenv (env_colorfgbg);
936 979
937#ifdef RXVT_TERMINFO 980#ifdef RXVT_TERMINFO
938 putenv ("TERMINFO=" RXVT_TERMINFO); 981 putenv ("TERMINFO=" RXVT_TERMINFO);
939#endif 982#endif
940 983
… …
959 unsetenv ("TERMCAP"); /* terminfo should be okay */ 1002 unsetenv ("TERMCAP"); /* terminfo should be okay */
960#endif /* HAVE_UNSETENV */ 1003#endif /* HAVE_UNSETENV */
961} 1004}
962 1005
963/*----------------------------------------------------------------------*/ 1006/*----------------------------------------------------------------------*/
964/*
965 * This is more or less stolen straight from XFree86 xterm.
966 * This should support all European type languages.
967 */
968void 1007void
969rxvt_term::set_locale (const char *locale) 1008rxvt_term::set_locale (const char *locale)
970{ 1009{
971 set_environ (envv); 1010 set_environ (env);
972 1011
973#if HAVE_XSETLOCALE || HAVE_SETLOCALE
974 free (this->locale); 1012 free (this->locale);
975 this->locale = setlocale (LC_CTYPE, locale); 1013 this->locale = setlocale (LC_CTYPE, locale);
976 1014
977 if (!this->locale) 1015 if (!this->locale)
978 { 1016 {
… …
989 1027
990 1028
991 this->locale = strdup (this->locale); 1029 this->locale = strdup (this->locale);
992 SET_LOCALE (this->locale); 1030 SET_LOCALE (this->locale);
993 mbstate.reset (); 1031 mbstate.reset ();
994#endif
995 1032
996#if HAVE_NL_LANGINFO 1033#if HAVE_NL_LANGINFO
997 char *codeset = strdup (nl_langinfo (CODESET)); 1034 char *codeset = nl_langinfo (CODESET);
998 // /^UTF.?8/i 1035 // /^UTF.?8/i
999 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1036 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1000 && (codeset[1] == 'T' || codeset[1] == 't') 1037 && (codeset[1] == 'T' || codeset[1] == 't')
1001 && (codeset[2] == 'F' || codeset[2] == 'f') 1038 && (codeset[2] == 'F' || codeset[2] == 'f')
1002 && (codeset[3] == '8' || codeset[4] == '8'); 1039 && (codeset[3] == '8' || codeset[4] == '8');
1003 free (codeset);
1004#else 1040#else
1005 enc_utf8 = 0; 1041 enc_utf8 = 0;
1006#endif 1042#endif
1007} 1043}
1008 1044
1009void 1045void
1010rxvt_term::init_xlocale () 1046rxvt_term::init_xlocale ()
1011{ 1047{
1012 set_environ (envv); 1048 set_environ (env);
1013 1049
1014#ifdef USE_XIM 1050#if USE_XIM
1015 if (!locale) 1051 if (!locale)
1016 rxvt_warn ("setting locale failed, working without locale support.\n"); 1052 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017 else 1053 else
1018 { 1054 {
1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1055 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1020 1056
1021 if (!XSupportsLocale ()) 1057 if (!XSupportsLocale ())
1022 { 1058 {
1023 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1059 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1024 return; 1060 return;
1025 } 1061 }
1026 1062
1027 im_ev.start (display); 1063 im_ev.start (display);
1028 1064
… …
1069 run_command (argv); 1105 run_command (argv);
1070} 1106}
1071 1107
1072/*----------------------------------------------------------------------*/ 1108/*----------------------------------------------------------------------*/
1073void 1109void
1074rxvt_term::get_colours () 1110rxvt_term::get_colors ()
1075{ 1111{
1076 int i; 1112 int i;
1077 1113
1078#ifdef OFF_FOCUS_FADING 1114#ifdef OFF_FOCUS_FADING
1079 pix_colors = pix_colors_focused; 1115 pix_colors = pix_colors_focused;
1080#endif 1116#endif
1081 1117
1082 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1118 for (i = 0; i < NRS_COLORS; i++)
1083 {
1084 const char *name = rs[Rs_color + i]; 1119 if (const char *name = rs[Rs_color + i])
1085
1086 if (!name)
1087 continue;
1088
1089 rxvt_color xcol;
1090
1091 if (!set_color (xcol, name)) 1120 set_color (pix_colors [i], name);
1092 {
1093#ifndef XTERM_REVERSE_VIDEO
1094 if (i < 2 && option (Opt_reverseVideo))
1095 name = def_colorName [1 - i];
1096 else
1097#endif
1098 name = def_colorName [i];
1099
1100 if (!name)
1101 continue;
1102
1103 if (!set_color (xcol, name))
1104 {
1105 switch (i)
1106 {
1107 case Color_fg:
1108 case Color_bg:
1109 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1110 name = "";
1111 break;
1112#ifndef NO_CURSORCOLOR
1113 case Color_cursor2:
1114#endif
1115 case Color_pointer_fg:
1116 name = rs[Rs_color + Color_fg];
1117 xcol.set (this, name);
1118 break;
1119 default:
1120 name = rs[Rs_color + Color_bg];
1121 xcol.set (this, name);
1122 break;
1123 }
1124 }
1125 }
1126
1127 pix_colors[i] = xcol;
1128 rs[Rs_color + i] = name;
1129 }
1130
1131 if (depth <= 2)
1132 {
1133 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1134 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1135 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1136 }
1137 1121
1138 /* 1122 /*
1139 * get scrollBar shadow colors 1123 * get scrollBar shadow colors
1140 * 1124 *
1141 * The calculations of topShadow/bottomShadow values are adapted 1125 * The calculations of topShadow/bottomShadow values are adapted
1142 * from the fvwm window manager. 1126 * from the fvwm window manager.
1143 */ 1127 */
1144#ifdef RXVT_SCROLLBAR 1128#ifdef RXVT_SCROLLBAR
1145 if (depth <= 2)
1146 {
1147 /* Monochrome */
1148 alias_color (Color_scroll, Color_fg);
1149 alias_color (Color_topShadow, Color_bg);
1150 alias_color (Color_bottomShadow, Color_bg);
1151 }
1152 else
1153 {
1154 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1129 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1155 1130
1156 rgba cscroll; 1131 rgba cscroll;
1157 pix_colors [Color_scroll].get (cscroll); 1132 pix_colors [Color_scroll].get (cscroll);
1158 1133
1159 /* topShadowColor */ 1134 /* topShadowColor */
1160 if (!pix_colors[Color_topShadow].set (this, 1135 if (!pix_colors[Color_topShadow].set (this,
1161 rgba ( 1136 rgba (
1162 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1137 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1163 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1138 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1164 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1139 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1165 cscroll.a) 1140 cscroll.a)
1166 )) 1141 ))
1167 alias_color (Color_topShadow, Color_White); 1142 alias_color (Color_topShadow, Color_White);
1168 }
1169#endif 1143#endif
1170 1144
1171#ifdef OFF_FOCUS_FADING 1145#ifdef OFF_FOCUS_FADING
1172 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1146 for (i = 0; i < NRS_COLORS; i++)
1173 update_fade_color (i); 1147 update_fade_color (i, true);
1174#endif 1148#endif
1175} 1149}
1176 1150
1177/*----------------------------------------------------------------------*/ 1151/*----------------------------------------------------------------------*/
1178/* color aliases, fg/bg bright-bold */ 1152/* color aliases, fg/bg bright-bold */
1179void 1153void
1180rxvt_term::color_aliases (int idx) 1154rxvt_term::color_aliases (int idx)
1181{ 1155{
1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1156 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1183 { 1157 {
1184 int i = atoi (rs[Rs_color + idx]); 1158 int i = atoi (rs[Rs_color + idx]);
1185 1159
1186 if (i >= 8 && i <= 15) 1160 if (i >= 8 && i <= 15)
1187 /* bright colors */ 1161 /* bright colors */
… …
1227 for (j = map->max_keypermod; j--; k++) 1201 for (j = map->max_keypermod; j--; k++)
1228 { 1202 {
1229 if (kc[k] == 0) 1203 if (kc[k] == 0)
1230 break; 1204 break;
1231 1205
1232 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1206 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1233 { 1207 {
1234 case XK_Num_Lock: 1208 case XK_Num_Lock:
1235 ModNumLockMask = modmasks[i - 1]; 1209 ModNumLockMask = modmasks[i - 1];
1236 continue; 1210 continue;
1237 1211
… …
1282} 1256}
1283 1257
1284void 1258void
1285rxvt_term::set_icon (const char *file) 1259rxvt_term::set_icon (const char *file)
1286{ 1260{
1287#ifdef HAVE_AFTERIMAGE 1261#if HAVE_PIXBUF && ENABLE_EWMH
1288 init_asv (); 1262 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1289
1290 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1291 if (!im) 1263 if (!pixbuf)
1292 { 1264 {
1293 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1265 rxvt_warn ("Loading image icon failed, continuing without.\n");
1294 return; 1266 return;
1295 } 1267 }
1296 1268
1297 int w = im->width; 1269 unsigned int w = gdk_pixbuf_get_width (pixbuf);
1298 int h = im->height; 1270 unsigned int h = gdk_pixbuf_get_height (pixbuf);
1299 1271
1300 if (!IN_RANGE_INC (w, 1, 32767) || !IN_RANGE_INC (h, 1, 32767)) 1272 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1301 { 1273 {
1302 rxvt_warn ("Icon image too big, continuing without.\n"); 1274 rxvt_warn ("Icon image too big, continuing without.\n");
1303 destroy_asimage (&im); 1275 g_object_unref (pixbuf);
1304 return; 1276 return;
1305 } 1277 }
1306 1278
1307 ASImage *result = scale_asimage (asv, im,
1308 w, h, ASA_ARGB32,
1309 100, ASIMAGE_QUALITY_DEFAULT);
1310 destroy_asimage (&im);
1311
1312 if (!result)
1313 {
1314 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1315 return;
1316 }
1317
1318 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)); 1279 if (long *buffer = (long *)malloc ((2 + w * h) * sizeof (long)))
1319 if (buffer)
1320 { 1280 {
1321 ARGB32 *asbuf = result->alt.argb32; 1281 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
1282 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf);
1283 int channels = gdk_pixbuf_get_n_channels (pixbuf);
1284
1322 buffer [0] = w; 1285 buffer [0] = w;
1323 buffer [1] = h; 1286 buffer [1] = h;
1324
1325 for (unsigned int i = 0; i < w * h; ++i) 1287 for (int i = 0; i < h; i++)
1326 buffer [i + 2] = asbuf [i]; 1288 {
1289 for (int j = 0; j < w; j++)
1290 {
1291 unsigned char *pixel = row + j * channels;
1292 long value;
1327 1293
1294 if (channels == 4)
1295 value = pixel[3];
1296 else
1297 value = (unsigned char)0x00ff;
1298
1299 value = (value << 8) + pixel[0];
1300 value = (value << 8) + pixel[1];
1301 value = (value << 8) + pixel[2];
1302 buffer[(i * w + j) + 2] = value;
1303 }
1304
1305 row += rowstride;
1306 }
1307
1328 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1308 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1309 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer); 1310 free (buffer);
1331 } 1311 }
1332 else 1312 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1313 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1334 1314
1335 destroy_asimage (&result); 1315 g_object_unref (pixbuf);
1336#endif 1316#endif
1337} 1317}
1338 1318
1339/*----------------------------------------------------------------------*/ 1319/*----------------------------------------------------------------------*/
1340/* rxvt_Create_Windows () - Open and map the window */ 1320/* Open and map the window */
1341void 1321void
1342rxvt_term::create_windows (int argc, const char *const *argv) 1322rxvt_term::create_windows (int argc, const char *const *argv)
1343{ 1323{
1344 XClassHint classHint; 1324 XClassHint classHint;
1345 XWMHints wmHint; 1325 XWMHints wmHint;
… …
1351 Window top, parent; 1331 Window top, parent;
1352 1332
1353 dLocal (Display *, dpy); 1333 dLocal (Display *, dpy);
1354 1334
1355 /* grab colors before netscape does */ 1335 /* grab colors before netscape does */
1356 get_colours (); 1336 get_colors ();
1357 1337
1358 if (!set_fonts ()) 1338 if (!set_fonts ())
1359 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1339 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1360 1340
1361 parent = display->root; 1341 parent = display->root;
… …
1391 } 1371 }
1392#endif 1372#endif
1393 1373
1394 window_calc (0, 0); 1374 window_calc (0, 0);
1395 1375
1396 /* sub-window placement & size in rxvt_resize_subwindows () */ 1376 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1397 attributes.background_pixel = pix_colors_focused [Color_border]; 1377 attributes.background_pixel = pix_colors_focused [Color_border];
1398 attributes.border_pixel = pix_colors_focused [Color_border]; 1378 attributes.border_pixel = pix_colors_focused [Color_border];
1399 attributes.colormap = cmap; 1379 attributes.colormap = cmap;
1400 1380
1401 top = XCreateWindow (dpy, parent, 1381 top = XCreateWindow (dpy, parent,
… …
1404 ext_bwidth, 1384 ext_bwidth,
1405 depth, InputOutput, visual, 1385 depth, InputOutput, visual,
1406 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1386 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1407 &attributes); 1387 &attributes);
1408 1388
1409 this->parent[0] = top; 1389 this->parent = top;
1410
1411 old_width = szHint.width;
1412 old_height = szHint.height;
1413 1390
1414 set_title (rs [Rs_title]); 1391 set_title (rs [Rs_title]);
1415 set_icon_name (rs [Rs_iconName]); 1392 set_icon_name (rs [Rs_iconName]);
1416 1393
1417 classHint.res_name = (char *)rs[Rs_name]; 1394 classHint.res_name = (char *)rs[Rs_name];
1418 classHint.res_class = (char *)RESCLASS; 1395 classHint.res_class = (char *)RESCLASS;
1419 1396
1420 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1397 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1421 wmHint.input = True; 1398 wmHint.input = True;
1422 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1399 wmHint.initial_state = option (Opt_iconic) ? IconicState
1400 : option (Opt_dockapp) ? WithdrawnState
1401 : NormalState;
1423 wmHint.window_group = top; 1402 wmHint.window_group = top;
1424 1403
1425 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1426 &szHint, &wmHint, &classHint); 1405 &szHint, &wmHint, &classHint);
1427#if ENABLE_EWMH 1406#if ENABLE_EWMH
… …
1429 * set up icon hint 1408 * set up icon hint
1430 * rs [Rs_iconfile] is path to icon 1409 * rs [Rs_iconfile] is path to icon
1431 */ 1410 */
1432 1411
1433 if (rs [Rs_iconfile]) 1412 if (rs [Rs_iconfile])
1434 {
1435 set_icon (rs [Rs_iconfile]); 1413 set_icon (rs [Rs_iconfile]);
1436 }
1437#endif 1414#endif
1438 1415
1439#if ENABLE_FRILLS 1416#if ENABLE_FRILLS
1440 if (mwmhints.flags) 1417 if (mwmhints.flags)
1441 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1418 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1447#if ENABLE_EWMH 1424#if ENABLE_EWMH
1448 xa[XA_NET_WM_PING], 1425 xa[XA_NET_WM_PING],
1449#endif 1426#endif
1450 }; 1427 };
1451 1428
1452 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1429 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1453 1430
1454#if ENABLE_FRILLS 1431#if ENABLE_FRILLS
1455 if (rs[Rs_transient_for]) 1432 if (rs[Rs_transient_for])
1456 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1433 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1457#endif 1434#endif
… …
1475 | ExposureMask | StructureNotifyMask); 1452 | ExposureMask | StructureNotifyMask);
1476 1453
1477 termwin_ev.start (display, top); 1454 termwin_ev.start (display, top);
1478 1455
1479 /* vt cursor: Black-on-White is standard, but this is more popular */ 1456 /* vt cursor: Black-on-White is standard, but this is more popular */
1457 unsigned int shape = XC_xterm;
1458
1459#ifdef HAVE_XMU
1460 if (rs[Rs_pointerShape])
1461 {
1462 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1463 if (stmp >= 0)
1464 shape = stmp;
1465 }
1466#endif
1467
1480 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1468 TermWin_cursor = XCreateFontCursor (dpy, shape);
1481 1469
1482 /* the vt window */ 1470 /* the vt window */
1483 vt = XCreateSimpleWindow (dpy, top, 1471 vt = XCreateSimpleWindow (dpy, top,
1484 window_vt_x, window_vt_y, 1472 window_vt_x, window_vt_y,
1485 width, height, 1473 vt_width, vt_height,
1486 0, 1474 0,
1487 pix_colors_focused[Color_fg], 1475 pix_colors_focused[Color_fg],
1488 pix_colors_focused[Color_bg]); 1476 pix_colors_focused[Color_bg]);
1489 1477
1490 attributes.bit_gravity = NorthWestGravity; 1478 attributes.bit_gravity = NorthWestGravity;
… …
1517 if (rs[Rs_fade]) 1505 if (rs[Rs_fade])
1518 pix_colors = pix_colors_unfocused; 1506 pix_colors = pix_colors_unfocused;
1519#endif 1507#endif
1520 1508
1521 pointer_unblank (); 1509 pointer_unblank ();
1522 scr_recolour (); 1510 scr_recolor ();
1523} 1511}
1524 1512
1525/*----------------------------------------------------------------------*/ 1513/*----------------------------------------------------------------------*/
1526/* 1514/*
1527 * Run the command in a subprocess and return a file descriptor for the 1515 * Run the command in a subprocess and return a file descriptor for the
… …
1539 if (pty->pty >= 0) 1527 if (pty->pty >= 0)
1540 { 1528 {
1541 if (getfd_hook) 1529 if (getfd_hook)
1542 pty->pty = (*getfd_hook) (pty->pty); 1530 pty->pty = (*getfd_hook) (pty->pty);
1543 1531
1544 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1532 if (pty->pty < 0)
1545 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1533 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1546 } 1534 }
1547 } 1535 }
1548 else 1536 else
1549#endif 1537#endif
1550 if (!pty->get ()) 1538 if (!pty->get ())
1551 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1539 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1540
1541 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1552 1542
1553 struct termios tio = def_tio; 1543 struct termios tio = def_tio;
1554 1544
1555#ifndef NO_BACKSPACE_KEY 1545#ifndef NO_BACKSPACE_KEY
1556 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1546 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1606 1596
1607 _exit (EXIT_FAILURE); 1597 _exit (EXIT_FAILURE);
1608 1598
1609 default: 1599 default:
1610 if (!option (Opt_utmpInhibit)) 1600 if (!option (Opt_utmpInhibit))
1601 {
1602#ifdef LOG_ONLY_ON_LOGIN
1603 bool login_shell = option (Opt_loginShell);
1604#else
1605 bool login_shell = true;
1606#endif
1611 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1607 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1608 }
1612 1609
1613 pty->close_tty (); 1610 pty->close_tty ();
1614 1611
1615 child_ev.start (cmd_pid); 1612 child_ev.start (cmd_pid);
1616 1613
… …
1641#elif defined (SRIOCSREDIR) 1638#elif defined (SRIOCSREDIR)
1642 int fd; 1639 int fd;
1643 1640
1644 fd = open (CONSOLE, O_WRONLY, 0); 1641 fd = open (CONSOLE, O_WRONLY, 0);
1645 if (fd >= 0) 1642 if (fd >= 0)
1646 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1643 {
1644 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1647 close (fd); 1645 close (fd);
1646 }
1648#endif /* SRIOCSREDIR */ 1647#endif /* SRIOCSREDIR */
1649 } 1648 }
1650 1649
1651 /* reset signals and spin off the command interpreter */ 1650 /* reset signals and spin off the command interpreter */
1652 signal (SIGINT, SIG_DFL); 1651 signal (SIGINT, SIG_DFL);

Diff Legend

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