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.284 by sf-exg, Fri Oct 15 21:59:25 2010 UTC vs.
Revision 1.346 by sf-exg, Tue Jun 21 12:03:56 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
… …
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
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639 gdk_pixbuf_xlib_init_with_depth (dpy, display->screen, depth);
640#endif
641
642#if ENABLE_PERL 644#if ENABLE_PERL
643 if (!rs[Rs_perl_ext_1]) 645 if (!rs[Rs_perl_ext_1])
644 rs[Rs_perl_ext_1] = "default"; 646 rs[Rs_perl_ext_1] = "default";
645 647
646 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 648 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
649 { 651 {
650 rxvt_perl.init (this); 652 rxvt_perl.init (this);
651 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 653 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
652 } 654 }
653#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 ();
654 660
655 /* 661 /*
656 * set any defaults not already set 662 * set any defaults not already set
657 */ 663 */
658 if (cmd_argv && cmd_argv[0]) 664 if (cmd_argv && cmd_argv[0])
… …
693 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 699 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
694 pointerBlankDelay = i; 700 pointerBlankDelay = i;
695 else 701 else
696 pointerBlankDelay = 2; 702 pointerBlankDelay = 2;
697#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;
698 711
699 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
700 if (!saveLines) 713 if (!saveLines)
701 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
702 715
… …
767 return cmd_argv; 780 return cmd_argv;
768} 781}
769 782
770/*----------------------------------------------------------------------*/ 783/*----------------------------------------------------------------------*/
771void 784void
772rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 785rxvt_term::init (stringvec *argv, stringvec *envv)
773{ 786{
787 argv->push_back (0);
788 envv->push_back (0);
789
790 this->argv = argv;
774 this->envv = envv; 791 this->envv = envv;
775 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{
776 SET_R (this); 822 SET_R (this);
777 set_locale (""); 823 set_locale ("");
778 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 :(
779 825
780 init_vars (); 826 init_vars ();
781 827
782 const char **cmd_argv = init_resources (argc, argv); 828 const char **cmd_argv = init_resources (argc, argv);
783 829
… …
794 if (chdir (path)) 840 if (chdir (path))
795 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");
796 } 842 }
797 843
798 if (option (Opt_scrollBar)) 844 if (option (Opt_scrollBar))
799 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 845 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
800 846
801 pty = ptytty::create (); 847 pty = ptytty::create ();
802 848
803 create_windows (argc, argv); 849 create_windows (argc, argv);
804 850
… …
810 XSynchronize (dpy, True); 856 XSynchronize (dpy, True);
811#endif 857#endif
812 858
813 if (option (Opt_scrollBar)) 859 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */ 860 scrollBar.resize (); /* create and map scrollbar */
861
815#ifdef HAVE_BG_PIXMAP 862#ifdef HAVE_BG_PIXMAP
816 { 863 bg_init ();
817 bgPixmap.set_target (this);
818 bgPixmap.invalidate ();
819
820#ifdef ENABLE_TRANSPARENCY
821 if (option (Opt_transparent))
822 {
823 bgPixmap.set_transparent ();
824
825 if (rs [Rs_blurradius])
826 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
827
828 if (ISSET_PIXCOLOR (Color_tint))
829 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
830
831 if (rs [Rs_shade])
832 bgPixmap.set_shade (rs [Rs_shade]);
833
834 bgPixmap.set_root_pixmap ();
835 XSelectInput (dpy, display->root, PropertyChangeMask);
836 rootwin_ev.start (display, display->root);
837 }
838#endif
839
840#ifdef BG_IMAGE_FROM_FILE
841 if (rs[Rs_backgroundPixmap])
842 {
843 const char *p = rs[Rs_backgroundPixmap];
844
845 if ((p = strchr (p, ';')) != 0)
846 {
847 p++;
848 bgPixmap.set_geometry (p);
849 }
850 else
851 bgPixmap.set_defaultGeometry ();
852
853 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
854 if (!bgPixmap.window_position_sensitive ())
855 update_background ();
856 }
857#endif
858 }
859#endif 864#endif
860 865
861#if ENABLE_PERL 866#if ENABLE_PERL
862 rootwin_ev.start (display, display->root); 867 rootwin_ev.start (display, display->root);
863#endif 868#endif
864 869
865 set_colorfgbg (); 870 init_done = 1;
866 871
867 init_command (cmd_argv); 872 init_command (cmd_argv);
868
869 free (cmd_argv);
870 873
871 if (pty->pty >= 0) 874 if (pty->pty >= 0)
872 pty_ev.start (pty->pty, ev::READ); 875 pty_ev.start (pty->pty, ev::READ);
873 876
874 HOOK_INVOKE ((this, HOOK_START, DT_END)); 877 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
876#if ENABLE_XEMBED 879#if ENABLE_XEMBED
877 if (rs[Rs_embed]) 880 if (rs[Rs_embed])
878 { 881 {
879 long info[2] = { 0, XEMBED_MAPPED }; 882 long info[2] = { 0, XEMBED_MAPPED };
880 883
881 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 884 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
882 32, PropModeReplace, (unsigned char *)&info, 2); 885 32, PropModeReplace, (unsigned char *)&info, 2);
883 } 886 }
884#endif 887#endif
885 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
886 XMapWindow (dpy, vt); 901 XMapWindow (dpy, vt);
887 XMapWindow (dpy, parent[0]); 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
888 915
889 refresh_check (); 916 refresh_check ();
890} 917}
891 918
892/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
893void 920void
894rxvt_term::init_env () 921rxvt_term::init_env ()
895{ 922{
896 int i;
897 char *val; 923 char *val;
924 char *env_display;
925 char *env_windowid;
926 char *env_colorfgbg;
927 char *env_term;
898 928
899#ifdef DISPLAY_IS_IP 929#ifdef DISPLAY_IS_IP
900 /* Fixup display_name for export over pty to any interested terminal 930 /* Fixup display_name for export over pty to any interested terminal
901 * 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
902 * (for the first non-loopback interface) that we get from 932 * (for the first non-loopback interface) that we get from
… …
915 val = XDisplayString (dpy); 945 val = XDisplayString (dpy);
916 946
917 if (rs[Rs_display_name] == NULL) 947 if (rs[Rs_display_name] == NULL)
918 rs[Rs_display_name] = val; /* use broken `:0' value */ 948 rs[Rs_display_name] = val; /* use broken `:0' value */
919 949
920 i = strlen (val);
921 env_display = (char *)rxvt_malloc (i + 9); 950 env_display = (char *)rxvt_malloc (strlen (val) + 9);
922 951
923 sprintf (env_display, "DISPLAY=%s", val); 952 sprintf (env_display, "DISPLAY=%s", val);
924 953
954 env_windowid = (char *)rxvt_malloc (21);
925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 955 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
926 956
927 /* add entries to the environment: 957 /* add entries to the environment:
928 * @ DISPLAY: in case we started with -display 958 * @ DISPLAY: in case we started with -display
929 * @ WINDOWID: X window id number of the window 959 * @ WINDOWID: X window id number of the window
930 * @ COLORTERM: terminal sub-name and also indicates its color 960 * @ COLORTERM: terminal sub-name and also indicates its color
… …
933 * @ COLORFGBG: fg;bg color codes 963 * @ COLORFGBG: fg;bg color codes
934 */ 964 */
935 putenv (env_display); 965 putenv (env_display);
936 putenv (env_windowid); 966 putenv (env_windowid);
937 967
938 if (env_colorfgbg) 968 env_colorfgbg = get_colorfgbg ();
939 putenv (env_colorfgbg); 969 putenv (env_colorfgbg);
940 970
941#ifdef RXVT_TERMINFO 971#ifdef RXVT_TERMINFO
942 putenv ("TERMINFO=" RXVT_TERMINFO); 972 putenv ("TERMINFO=" RXVT_TERMINFO);
943#endif 973#endif
944 974
… …
963 unsetenv ("TERMCAP"); /* terminfo should be okay */ 993 unsetenv ("TERMCAP"); /* terminfo should be okay */
964#endif /* HAVE_UNSETENV */ 994#endif /* HAVE_UNSETENV */
965} 995}
966 996
967/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
968/*
969 * This is more or less stolen straight from XFree86 xterm.
970 * This should support all European type languages.
971 */
972void 998void
973rxvt_term::set_locale (const char *locale) 999rxvt_term::set_locale (const char *locale)
974{ 1000{
975 set_environ (envv); 1001 set_environ (env);
976 1002
977#if HAVE_XSETLOCALE || HAVE_SETLOCALE
978 free (this->locale); 1003 free (this->locale);
979 this->locale = setlocale (LC_CTYPE, locale); 1004 this->locale = setlocale (LC_CTYPE, locale);
980 1005
981 if (!this->locale) 1006 if (!this->locale)
982 { 1007 {
… …
993 1018
994 1019
995 this->locale = strdup (this->locale); 1020 this->locale = strdup (this->locale);
996 SET_LOCALE (this->locale); 1021 SET_LOCALE (this->locale);
997 mbstate.reset (); 1022 mbstate.reset ();
998#endif
999 1023
1000#if HAVE_NL_LANGINFO 1024#if HAVE_NL_LANGINFO
1001 char *codeset = strdup (nl_langinfo (CODESET)); 1025 char *codeset = nl_langinfo (CODESET);
1002 // /^UTF.?8/i 1026 // /^UTF.?8/i
1003 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1027 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1004 && (codeset[1] == 'T' || codeset[1] == 't') 1028 && (codeset[1] == 'T' || codeset[1] == 't')
1005 && (codeset[2] == 'F' || codeset[2] == 'f') 1029 && (codeset[2] == 'F' || codeset[2] == 'f')
1006 && (codeset[3] == '8' || codeset[4] == '8'); 1030 && (codeset[3] == '8' || codeset[4] == '8');
1007 free (codeset);
1008#else 1031#else
1009 enc_utf8 = 0; 1032 enc_utf8 = 0;
1010#endif 1033#endif
1011} 1034}
1012 1035
1013void 1036void
1014rxvt_term::init_xlocale () 1037rxvt_term::init_xlocale ()
1015{ 1038{
1016 set_environ (envv); 1039 set_environ (env);
1017 1040
1018#ifdef USE_XIM 1041#if USE_XIM
1019 if (!locale) 1042 if (!locale)
1020 rxvt_warn ("setting locale failed, working without locale support.\n"); 1043 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1021 else 1044 else
1022 { 1045 {
1023 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1046 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1024 1047
1025 if (!XSupportsLocale ()) 1048 if (!XSupportsLocale ())
1026 { 1049 {
1027 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");
1028 return; 1051 return;
1029 } 1052 }
1030 1053
1031 im_ev.start (display); 1054 im_ev.start (display);
1032 1055
… …
1073 run_command (argv); 1096 run_command (argv);
1074} 1097}
1075 1098
1076/*----------------------------------------------------------------------*/ 1099/*----------------------------------------------------------------------*/
1077void 1100void
1078rxvt_term::get_colours () 1101rxvt_term::get_colors ()
1079{ 1102{
1080 int i; 1103 int i;
1081 1104
1082#ifdef OFF_FOCUS_FADING 1105#ifdef OFF_FOCUS_FADING
1083 pix_colors = pix_colors_focused; 1106 pix_colors = pix_colors_focused;
1084#endif 1107#endif
1085 1108
1086 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1109 for (i = 0; i < NRS_COLORS; i++)
1087 {
1088 const char *name = rs[Rs_color + i]; 1110 if (const char *name = rs[Rs_color + i])
1089
1090 if (!name)
1091 continue;
1092
1093 rxvt_color xcol;
1094
1095 if (!set_color (xcol, name)) 1111 set_color (pix_colors [i], name);
1096 {
1097#ifndef XTERM_REVERSE_VIDEO
1098 if (i < 2 && option (Opt_reverseVideo))
1099 name = def_colorName [1 - i];
1100 else
1101#endif
1102 name = def_colorName [i];
1103
1104 if (!name)
1105 continue;
1106
1107 if (!set_color (xcol, name))
1108 {
1109 switch (i)
1110 {
1111 case Color_fg:
1112 case Color_bg:
1113 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1114 name = "";
1115 break;
1116#ifndef NO_CURSORCOLOR
1117 case Color_cursor2:
1118#endif
1119 case Color_pointer_fg:
1120 name = rs[Rs_color + Color_fg];
1121 xcol.set (this, name);
1122 break;
1123 default:
1124 name = rs[Rs_color + Color_bg];
1125 xcol.set (this, name);
1126 break;
1127 }
1128 }
1129 }
1130
1131 pix_colors[i] = xcol;
1132 rs[Rs_color + i] = name;
1133 }
1134
1135 if (depth <= 2)
1136 {
1137 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1138 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1139 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1140 }
1141 1112
1142 /* 1113 /*
1143 * get scrollBar shadow colors 1114 * get scrollBar shadow colors
1144 * 1115 *
1145 * The calculations of topShadow/bottomShadow values are adapted 1116 * The calculations of topShadow/bottomShadow values are adapted
1146 * from the fvwm window manager. 1117 * from the fvwm window manager.
1147 */ 1118 */
1148#ifdef RXVT_SCROLLBAR 1119#ifdef RXVT_SCROLLBAR
1149 if (depth <= 2)
1150 {
1151 /* Monochrome */
1152 alias_color (Color_scroll, Color_fg);
1153 alias_color (Color_topShadow, Color_bg);
1154 alias_color (Color_bottomShadow, Color_bg);
1155 }
1156 else
1157 {
1158 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1120 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1159 1121
1160 rgba cscroll; 1122 rgba cscroll;
1161 pix_colors [Color_scroll].get (cscroll); 1123 pix_colors [Color_scroll].get (cscroll);
1162 1124
1163 /* topShadowColor */ 1125 /* topShadowColor */
1164 if (!pix_colors[Color_topShadow].set (this, 1126 if (!pix_colors[Color_topShadow].set (this,
1165 rgba ( 1127 rgba (
1166 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),
1167 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),
1168 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),
1169 cscroll.a) 1131 cscroll.a)
1170 )) 1132 ))
1171 alias_color (Color_topShadow, Color_White); 1133 alias_color (Color_topShadow, Color_White);
1172 }
1173#endif 1134#endif
1174 1135
1175#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1176 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1137 for (i = 0; i < NRS_COLORS; i++)
1177 update_fade_color (i); 1138 update_fade_color (i, true);
1178#endif 1139#endif
1179} 1140}
1180 1141
1181/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
1182/* color aliases, fg/bg bright-bold */ 1143/* color aliases, fg/bg bright-bold */
1183void 1144void
1184rxvt_term::color_aliases (int idx) 1145rxvt_term::color_aliases (int idx)
1185{ 1146{
1186 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1147 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1187 { 1148 {
1188 int i = atoi (rs[Rs_color + idx]); 1149 int i = atoi (rs[Rs_color + idx]);
1189 1150
1190 if (i >= 8 && i <= 15) 1151 if (i >= 8 && i <= 15)
1191 /* bright colors */ 1152 /* bright colors */
… …
1231 for (j = map->max_keypermod; j--; k++) 1192 for (j = map->max_keypermod; j--; k++)
1232 { 1193 {
1233 if (kc[k] == 0) 1194 if (kc[k] == 0)
1234 break; 1195 break;
1235 1196
1236 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1197 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1237 { 1198 {
1238 case XK_Num_Lock: 1199 case XK_Num_Lock:
1239 ModNumLockMask = modmasks[i - 1]; 1200 ModNumLockMask = modmasks[i - 1];
1240 continue; 1201 continue;
1241 1202
… …
1286} 1247}
1287 1248
1288void 1249void
1289rxvt_term::set_icon (const char *file) 1250rxvt_term::set_icon (const char *file)
1290{ 1251{
1291#ifdef HAVE_AFTERIMAGE 1252#if HAVE_PIXBUF && ENABLE_EWMH
1292 init_asv ();
1293
1294 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1295 if (!im)
1296 {
1297 rxvt_warn ("Loading image icon failed, continuing without.\n");
1298 return;
1299 }
1300
1301 unsigned int w = im->width;
1302 unsigned int h = im->height;
1303
1304 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1305 {
1306 rxvt_warn ("Icon image too big, continuing without.\n");
1307 destroy_asimage (&im);
1308 return;
1309 }
1310
1311 ASImage *result = scale_asimage (asv, im,
1312 w, h, ASA_ARGB32,
1313 100, ASIMAGE_QUALITY_DEFAULT);
1314 destroy_asimage (&im);
1315
1316 if (!result)
1317 {
1318 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1319 return;
1320 }
1321
1322 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1323 if (buffer)
1324 {
1325 ARGB32 *asbuf = result->alt.argb32;
1326 buffer [0] = w;
1327 buffer [1] = h;
1328
1329 for (unsigned int i = 0; i < w * h; ++i)
1330 buffer [i + 2] = asbuf [i];
1331
1332 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1333 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1334 free (buffer);
1335 }
1336 else
1337 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1338
1339 destroy_asimage (&result);
1340#endif
1341
1342#ifdef HAVE_PIXBUF
1343 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1253 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1344 if (!pixbuf) 1254 if (!pixbuf)
1345 { 1255 {
1346 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1256 rxvt_warn ("Loading image icon failed, continuing without.\n");
1347 return; 1257 return;
… …
1384 } 1294 }
1385 1295
1386 row += rowstride; 1296 row += rowstride;
1387 } 1297 }
1388 1298
1389 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1299 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1390 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1300 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1391 free (buffer); 1301 free (buffer);
1392 } 1302 }
1393 else 1303 else
1394 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1304 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1396 g_object_unref (pixbuf); 1306 g_object_unref (pixbuf);
1397#endif 1307#endif
1398} 1308}
1399 1309
1400/*----------------------------------------------------------------------*/ 1310/*----------------------------------------------------------------------*/
1401/* rxvt_Create_Windows () - Open and map the window */ 1311/* Open and map the window */
1402void 1312void
1403rxvt_term::create_windows (int argc, const char *const *argv) 1313rxvt_term::create_windows (int argc, const char *const *argv)
1404{ 1314{
1405 XClassHint classHint; 1315 XClassHint classHint;
1406 XWMHints wmHint; 1316 XWMHints wmHint;
… …
1412 Window top, parent; 1322 Window top, parent;
1413 1323
1414 dLocal (Display *, dpy); 1324 dLocal (Display *, dpy);
1415 1325
1416 /* grab colors before netscape does */ 1326 /* grab colors before netscape does */
1417 get_colours (); 1327 get_colors ();
1418 1328
1419 if (!set_fonts ()) 1329 if (!set_fonts ())
1420 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");
1421 1331
1422 parent = display->root; 1332 parent = display->root;
… …
1452 } 1362 }
1453#endif 1363#endif
1454 1364
1455 window_calc (0, 0); 1365 window_calc (0, 0);
1456 1366
1457 /* sub-window placement & size in rxvt_resize_subwindows () */ 1367 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1458 attributes.background_pixel = pix_colors_focused [Color_border]; 1368 attributes.background_pixel = pix_colors_focused [Color_border];
1459 attributes.border_pixel = pix_colors_focused [Color_border]; 1369 attributes.border_pixel = pix_colors_focused [Color_border];
1460 attributes.colormap = cmap; 1370 attributes.colormap = cmap;
1461 1371
1462 top = XCreateWindow (dpy, parent, 1372 top = XCreateWindow (dpy, parent,
… …
1465 ext_bwidth, 1375 ext_bwidth,
1466 depth, InputOutput, visual, 1376 depth, InputOutput, visual,
1467 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1377 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1468 &attributes); 1378 &attributes);
1469 1379
1470 this->parent[0] = top; 1380 this->parent = top;
1471
1472 old_width = szHint.width;
1473 old_height = szHint.height;
1474 1381
1475 set_title (rs [Rs_title]); 1382 set_title (rs [Rs_title]);
1476 set_icon_name (rs [Rs_iconName]); 1383 set_icon_name (rs [Rs_iconName]);
1477 1384
1478 classHint.res_name = (char *)rs[Rs_name]; 1385 classHint.res_name = (char *)rs[Rs_name];
1479 classHint.res_class = (char *)RESCLASS; 1386 classHint.res_class = (char *)RESCLASS;
1480 1387
1481 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1388 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1482 wmHint.input = True; 1389 wmHint.input = True;
1483 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1390 wmHint.initial_state = option (Opt_iconic) ? IconicState
1391 : option (Opt_dockapp) ? WithdrawnState
1392 : NormalState;
1484 wmHint.window_group = top; 1393 wmHint.window_group = top;
1485 1394
1486 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1395 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1487 &szHint, &wmHint, &classHint); 1396 &szHint, &wmHint, &classHint);
1488#if ENABLE_EWMH 1397#if ENABLE_EWMH
… …
1490 * set up icon hint 1399 * set up icon hint
1491 * rs [Rs_iconfile] is path to icon 1400 * rs [Rs_iconfile] is path to icon
1492 */ 1401 */
1493 1402
1494 if (rs [Rs_iconfile]) 1403 if (rs [Rs_iconfile])
1495 {
1496 set_icon (rs [Rs_iconfile]); 1404 set_icon (rs [Rs_iconfile]);
1497 }
1498#endif 1405#endif
1499 1406
1500#if ENABLE_FRILLS 1407#if ENABLE_FRILLS
1501 if (mwmhints.flags) 1408 if (mwmhints.flags)
1502 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,
… …
1508#if ENABLE_EWMH 1415#if ENABLE_EWMH
1509 xa[XA_NET_WM_PING], 1416 xa[XA_NET_WM_PING],
1510#endif 1417#endif
1511 }; 1418 };
1512 1419
1513 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1420 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1514 1421
1515#if ENABLE_FRILLS 1422#if ENABLE_FRILLS
1516 if (rs[Rs_transient_for]) 1423 if (rs[Rs_transient_for])
1517 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1424 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1518#endif 1425#endif
… …
1536 | ExposureMask | StructureNotifyMask); 1443 | ExposureMask | StructureNotifyMask);
1537 1444
1538 termwin_ev.start (display, top); 1445 termwin_ev.start (display, top);
1539 1446
1540 /* 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
1541 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, shape);
1542 1460
1543 /* the vt window */ 1461 /* the vt window */
1544 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1545 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1546 width, height, 1464 vt_width, vt_height,
1547 0, 1465 0,
1548 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1549 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1550 1468
1551 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
… …
1578 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1579 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1580#endif 1498#endif
1581 1499
1582 pointer_unblank (); 1500 pointer_unblank ();
1583 scr_recolour (); 1501 scr_recolor ();
1584} 1502}
1585 1503
1586/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1587/* 1505/*
1588 * 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
… …
1600 if (pty->pty >= 0) 1518 if (pty->pty >= 0)
1601 { 1519 {
1602 if (getfd_hook) 1520 if (getfd_hook)
1603 pty->pty = (*getfd_hook) (pty->pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1604 1522
1605 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1606 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1607 } 1525 }
1608 } 1526 }
1609 else 1527 else
1610#endif 1528#endif
1611 if (!pty->get ()) 1529 if (!pty->get ())
1612 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);
1613 1533
1614 struct termios tio = def_tio; 1534 struct termios tio = def_tio;
1615 1535
1616#ifndef NO_BACKSPACE_KEY 1536#ifndef NO_BACKSPACE_KEY
1617 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1667 1587
1668 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1669 1589
1670 default: 1590 default:
1671 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
1672 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1599 }
1673 1600
1674 pty->close_tty (); 1601 pty->close_tty ();
1675 1602
1676 child_ev.start (cmd_pid); 1603 child_ev.start (cmd_pid);
1677 1604
… …
1702#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1703 int fd; 1630 int fd;
1704 1631
1705 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1706 if (fd >= 0) 1633 if (fd >= 0)
1707 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1708 close (fd); 1636 close (fd);
1637 }
1709#endif /* SRIOCSREDIR */ 1638#endif /* SRIOCSREDIR */
1710 } 1639 }
1711 1640
1712 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1713 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);

Diff Legend

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