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.306 by sf-exg, Tue Dec 6 11:39:30 2011 UTC vs.
Revision 1.350 by root, Sat Jul 3 04:04:13 2021 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>
58#endif 61#endif
… …
78#include <netinet/in.h> 81#include <netinet/in.h>
79#include <arpa/inet.h> 82#include <arpa/inet.h>
80#include <net/if.h> 83#include <net/if.h>
81#include <net/if_arp.h> 84#include <net/if_arp.h>
82 85
83static char * 86static char * ecb_cold
84rxvt_network_display (const char *display) 87rxvt_network_display (const char *display)
85{ 88{
86 char buffer[1024], *rval = NULL; 89 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 90 struct ifconf ifc;
88 struct ifreq *ifr; 91 struct ifreq *ifr;
… …
147 close (skfd); 150 close (skfd);
148 151
149 return rval; 152 return rval;
150} 153}
151#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
152 180
153static const char *const def_colorName[] = 181static const char *const def_colorName[] =
154 { 182 {
155 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
156 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
… …
253 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
254 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
255 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
256 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
257 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
258#else 292#else
259 // 256 xterm colours 293 // 256 xterm colours
260 "rgb:00/00/00", 294 "rgb:00/00/00",
261 "rgb:00/00/5f", 295 "rgb:00/00/5f",
262 "rgb:00/00/87", 296 "rgb:00/00/87",
… …
495 "rgb:c6/c6/c6", 529 "rgb:c6/c6/c6",
496 "rgb:d0/d0/d0", 530 "rgb:d0/d0/d0",
497 "rgb:da/da/da", 531 "rgb:da/da/da",
498 "rgb:e4/e4/e4", 532 "rgb:e4/e4/e4",
499 "rgb:ee/ee/ee", 533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
500#endif 538#endif
501 539
502#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
503 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
504 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
… …
521#endif 559#endif
522 COLOR_SCROLLBAR, 560 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 561#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 562 COLOR_SCROLLTROUGH,
525#endif 563#endif
526#if ENABLE_TRANSPARENCY
527 NULL,
528#endif
529#if OFF_FOCUS_FADING 564#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 565 "rgb:00/00/00",
531#endif 566#endif
532 }; 567 };
533 568
… …
563 set_option (Opt_iso14755); 598 set_option (Opt_iso14755);
564 set_option (Opt_iso14755_52); 599 set_option (Opt_iso14755_52);
565 set_option (Opt_buffered); 600 set_option (Opt_buffered);
566} 601}
567 602
603#if ENABLE_PERL
604static void
605rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
606{
607 rxvt_perl.parse_resource (term, k, false, false, 0, v);
608}
609#endif
610
568/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
569const char ** 612const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 613rxvt_term::init_resources (int argc, const char *const *argv)
571{ 614{
572 int i, r_argc; 615 int i;
573 const char **cmd_argv; 616 const char **cmd_argv;
574
575 /*
576 * Look for -e option. Find => split and make cmd_argv[] of command args
577 */
578 for (r_argc = 0; r_argc < argc; r_argc++)
579 if (!strcmp (argv[r_argc], "-e"))
580 break;
581
582 if (r_argc == argc)
583 cmd_argv = NULL;
584 else if (!argv[r_argc + 1])
585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
586 else
587 cmd_argv = (const char **)argv + r_argc + 1;
588 617
589 rs[Rs_name] = rxvt_basename (argv[0]); 618 rs[Rs_name] = rxvt_basename (argv[0]);
590 619
591 /* 620 /*
592 * Open display, get options/resources and create the window 621 * Open display, get options/resources and create the window
593 */ 622 */
594 623
595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 624 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
596 rs[Rs_display_name] = ":0"; 625 rs[Rs_display_name] = ":0";
597 626
598 get_options (r_argc, argv); 627 cmd_argv = get_options (argc, argv);
599 628
600 if (!(display = displays.get (rs[Rs_display_name]))) 629 if (!(display = displays.get (rs[Rs_display_name])))
601 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 630 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
602 631
603 // using a local pointer decreases code size a lot 632 // using a local pointer decreases code size a lot
604 xa = display->xa; 633 xa = display->xa;
605 634
606 set (display); 635 set (display);
607 extract_resources (); 636 extract_resources ();
608 637
609#if XFT 638#if ENABLE_FRILLS
610 if (rs[Rs_depth]) 639 if (rs[Rs_visual])
611 select_visual (strtol (rs[Rs_depth], 0, 0)); 640 select_visual (strtol (rs[Rs_visual], 0, 0));
641 else if (rs[Rs_depth])
642 select_depth (strtol (rs[Rs_depth], 0, 0));
612#endif 643#endif
613 644
614 for (int i = NUM_RESOURCES; i--; ) 645 for (int i = NUM_RESOURCES; i--; )
615 if (rs [i] == resval_undef) 646 if (rs [i] == resval_undef)
616 rs [i] = 0; 647 rs [i] = 0;
… …
622 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 653 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
623 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 654 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
624 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 655 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
625 { 656 {
626 rxvt_perl.init (this); 657 rxvt_perl.init (this);
658 enumerate_resources (rxvt_perl_parse_resource);
627 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 659 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
628 } 660 }
629#endif 661#endif
630 662
631 // must be called after initialising the perl interpreter as it 663 // must be called after initialising the perl interpreter as it
… …
663 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 695 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
664 696
665 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 697 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
666 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 698 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
667 699
668 if (rs[Rs_letterSpace]) 700 if (const char *v = rs[Rs_letterSpace])
669 letterSpace = atoi (rs[Rs_letterSpace]); 701 letterSpace = atoi (v);
702
703 rewrap_always = rewrap_never = 0;
704 if (const char *v = rs[Rs_rewrapMode])
705 if (!strcmp (v, "never"))
706 rewrap_never = 1;
707 else if (!strcmp (v, "always"))
708 rewrap_always = 1;
709 else if (!strcmp (v, "auto"))
710 /* nop **/;
711 else
712 rxvt_warn ("invalid rewrapMode, must be auto, always or never.\n");
670#endif 713#endif
671 714
672#ifdef POINTER_BLANK 715#ifdef POINTER_BLANK
673 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 716 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
674 pointerBlankDelay = i; 717 pointerBlankDelay = i;
675 else 718 else
676 pointerBlankDelay = 2; 719 pointerBlankDelay = 2;
677#endif 720#endif
721
722 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
723 multiClickTime = i;
724 else
725 multiClickTime = 500;
726
727 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
678 728
679 /* no point having a scrollbar without having any scrollback! */ 729 /* no point having a scrollbar without having any scrollback! */
680 if (!saveLines) 730 if (!saveLines)
681 set_option (Opt_scrollBar, 0); 731 set_option (Opt_scrollBar, 0);
682 732
… …
747 return cmd_argv; 797 return cmd_argv;
748} 798}
749 799
750/*----------------------------------------------------------------------*/ 800/*----------------------------------------------------------------------*/
751void 801void
802rxvt_term::init (stringvec *argv, stringvec *envv)
803{
804 argv->push_back (0);
805 envv->push_back (0);
806
807 this->argv = argv;
808 this->envv = envv;
809
810 env = new char *[this->envv->size ()];
811 for (int i = 0; i < this->envv->size (); i++)
812 env[i] = this->envv->at (i);
813
814 init2 (argv->size () - 1, argv->begin ());
815}
816
817void
818rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
819{
820#if ENABLE_PERL
821 // perl might want to access the stringvecs later, so we need to copy them
822 stringvec *args = new stringvec;
823 for (int i = 0; i < argc; i++)
824 args->push_back (strdup (argv [i]));
825
826 stringvec *envs = new stringvec;
827 for (const char *const *var = envv; *var; var++)
828 envs->push_back (strdup (*var));
829
830 init (args, envs);
831#else
832 init2 (argc, argv);
833#endif
834}
835
836void
752rxvt_term::init (int argc, const char *const *argv) 837rxvt_term::init2 (int argc, const char *const *argv)
753{ 838{
754 SET_R (this); 839 SET_R (this);
755 set_locale (""); 840 set_locale ("");
756 set_environ (envv); // a few things in X do not call setlocale :( 841 set_environ (env); // a few things in X do not call setlocale :(
757 842
758 init_vars (); 843 init_vars ();
759 844
760 const char **cmd_argv = init_resources (argc, argv); 845 const char **cmd_argv = init_resources (argc, argv);
761 846
… …
776 if (option (Opt_scrollBar)) 861 if (option (Opt_scrollBar))
777 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 862 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
778 863
779 pty = ptytty::create (); 864 pty = ptytty::create ();
780 865
781#ifdef HAVE_AFTERIMAGE
782 set_application_name ((char *)rs[Rs_name]);
783 set_output_threshold (OUTPUT_LEVEL_WARNING);
784#endif
785
786 // must be called before create_windows, because the latter may call set_icon
787#ifdef HAVE_PIXBUF
788 g_type_init ();
789#endif
790
791 create_windows (argc, argv); 866 create_windows (argc, argv);
792 867
793 init_xlocale (); 868 init_xlocale ();
794 869
795 scr_poweron (); // initialize screen 870 scr_poweron (); // initialize screen
… …
798 XSynchronize (dpy, True); 873 XSynchronize (dpy, True);
799#endif 874#endif
800 875
801 if (option (Opt_scrollBar)) 876 if (option (Opt_scrollBar))
802 scrollBar.resize (); /* create and map scrollbar */ 877 scrollBar.resize (); /* create and map scrollbar */
803#ifdef HAVE_BG_PIXMAP
804 {
805 bg_init ();
806
807#ifdef ENABLE_TRANSPARENCY
808 if (option (Opt_transparent))
809 {
810 bg_set_transparent ();
811
812 if (rs [Rs_blurradius])
813 bg_set_blur (rs [Rs_blurradius]);
814
815 if (ISSET_PIXCOLOR (Color_tint))
816 bg_set_tint (pix_colors_focused [Color_tint]);
817
818 if (rs [Rs_shade])
819 bg_set_shade (rs [Rs_shade]);
820
821 bg_set_root_pixmap ();
822 XSelectInput (dpy, display->root, PropertyChangeMask);
823 rootwin_ev.start (display, display->root);
824 }
825#endif
826
827#ifdef BG_IMAGE_FROM_FILE
828 if (rs[Rs_backgroundPixmap])
829 {
830 if (bg_set_file (rs[Rs_backgroundPixmap]))
831 if (!bg_window_position_sensitive ())
832 update_background ();
833 }
834#endif
835 }
836#endif
837 878
838#if ENABLE_PERL 879#if ENABLE_PERL
839 rootwin_ev.start (display, display->root); 880 rootwin_ev.start (display, display->root);
840#endif 881#endif
841 882
842 set_colorfgbg (); 883 init_done = 1;
843 884
844 init_command (cmd_argv); 885 init_command (cmd_argv);
845 886
846 if (pty->pty >= 0) 887 if (pty->pty >= 0)
847 pty_ev.start (pty->pty, ev::READ); 888 pty_ev.start (pty->pty, ev::READ);
… …
891/*----------------------------------------------------------------------*/ 932/*----------------------------------------------------------------------*/
892void 933void
893rxvt_term::init_env () 934rxvt_term::init_env ()
894{ 935{
895 char *val; 936 char *val;
937 char *env_display;
938 char *env_windowid;
939 char *env_colorfgbg;
940 char *env_term;
896 941
897#ifdef DISPLAY_IS_IP 942#ifdef DISPLAY_IS_IP
898 /* Fixup display_name for export over pty to any interested terminal 943 /* Fixup display_name for export over pty to any interested terminal
899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 944 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
900 * (for the first non-loopback interface) that we get from 945 * (for the first non-loopback interface) that we get from
… …
917 962
918 env_display = (char *)rxvt_malloc (strlen (val) + 9); 963 env_display = (char *)rxvt_malloc (strlen (val) + 9);
919 964
920 sprintf (env_display, "DISPLAY=%s", val); 965 sprintf (env_display, "DISPLAY=%s", val);
921 966
967 env_windowid = (char *)rxvt_malloc (21);
922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 968 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
923 969
924 /* add entries to the environment: 970 /* add entries to the environment:
925 * @ DISPLAY: in case we started with -display 971 * @ DISPLAY: in case we started with -display
926 * @ WINDOWID: X window id number of the window 972 * @ WINDOWID: X window id number of the window
… …
930 * @ COLORFGBG: fg;bg color codes 976 * @ COLORFGBG: fg;bg color codes
931 */ 977 */
932 putenv (env_display); 978 putenv (env_display);
933 putenv (env_windowid); 979 putenv (env_windowid);
934 980
935 if (env_colorfgbg) 981 env_colorfgbg = get_colorfgbg ();
936 putenv (env_colorfgbg); 982 putenv (env_colorfgbg);
937 983
938#ifdef RXVT_TERMINFO 984#ifdef RXVT_TERMINFO
939 putenv ("TERMINFO=" RXVT_TERMINFO); 985 putenv ("TERMINFO=" RXVT_TERMINFO);
940#endif 986#endif
941 987
942 if (depth <= 2) 988 if (depth <= 2)
943 putenv ("COLORTERM=" COLORTERMENV "-mono"); 989 putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
944 else 990 else
945 putenv ("COLORTERM=" COLORTERMENVFULL); 991 putenv ((char *)"COLORTERM=" COLORTERMENVFULL);
946 992
947 if (rs[Rs_term_name] != NULL) 993 if (rs[Rs_term_name] != NULL)
948 { 994 {
949 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); 995 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
950 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 996 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
951 putenv (env_term); 997 putenv (env_term);
952 } 998 }
953 else 999 else
954 putenv ("TERM=" TERMENV); 1000 putenv ((char *)"TERM=" TERMENV);
955 1001
956#ifdef HAVE_UNSETENV 1002#ifdef HAVE_UNSETENV
957 /* avoid passing old settings and confusing term size */ 1003 /* avoid passing old settings and confusing term size */
958 unsetenv ("LINES"); 1004 unsetenv ("LINES");
959 unsetenv ("COLUMNS"); 1005 unsetenv ("COLUMNS");
960 unsetenv ("TERMCAP"); /* terminfo should be okay */ 1006 unsetenv ("TERMCAP"); /* terminfo should be okay */
961#endif /* HAVE_UNSETENV */ 1007#endif /* HAVE_UNSETENV */
962} 1008}
963 1009
964/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
965/*
966 * This is more or less stolen straight from XFree86 xterm.
967 * This should support all European type languages.
968 */
969void 1011void
970rxvt_term::set_locale (const char *locale) 1012rxvt_term::set_locale (const char *locale)
971{ 1013{
972 set_environ (envv); 1014 set_environ (env);
973 1015
974#if HAVE_XSETLOCALE || HAVE_SETLOCALE
975 free (this->locale); 1016 free (this->locale);
976 this->locale = setlocale (LC_CTYPE, locale); 1017 this->locale = setlocale (LC_CTYPE, locale);
977 1018
978 if (!this->locale) 1019 if (!this->locale)
979 { 1020 {
… …
983 setlocale (LC_CTYPE, "C"); 1024 setlocale (LC_CTYPE, "C");
984 } 1025 }
985 else 1026 else
986 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 1027 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
987 1028
988 this->locale = "C"; 1029 this->locale = (char *)"C"; /* strdup'ed below */
989 } 1030 }
990 1031
991 1032
992 this->locale = strdup (this->locale); 1033 this->locale = strdup (this->locale);
993 SET_LOCALE (this->locale); 1034 SET_LOCALE (this->locale);
994 mbstate.reset (); 1035 mbstate.reset ();
995#endif
996 1036
997#if HAVE_NL_LANGINFO 1037#if HAVE_NL_LANGINFO
998 char *codeset = strdup (nl_langinfo (CODESET)); 1038 char *codeset = nl_langinfo (CODESET);
999 // /^UTF.?8/i 1039 // /^UTF.?8/i
1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1040 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1001 && (codeset[1] == 'T' || codeset[1] == 't') 1041 && (codeset[1] == 'T' || codeset[1] == 't')
1002 && (codeset[2] == 'F' || codeset[2] == 'f') 1042 && (codeset[2] == 'F' || codeset[2] == 'f')
1003 && (codeset[3] == '8' || codeset[4] == '8'); 1043 && (codeset[3] == '8' || codeset[4] == '8');
1004 free (codeset);
1005#else 1044#else
1006 enc_utf8 = 0; 1045 enc_utf8 = 0;
1007#endif 1046#endif
1008} 1047}
1009 1048
1010void 1049void
1011rxvt_term::init_xlocale () 1050rxvt_term::init_xlocale ()
1012{ 1051{
1013 set_environ (envv); 1052 set_environ (env);
1014 1053
1015#ifdef USE_XIM 1054#if USE_XIM
1016 if (!locale) 1055 if (!locale)
1017 rxvt_warn ("setting locale failed, working without locale support.\n"); 1056 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1018 else 1057 else
1019 { 1058 {
1020 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1059 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1021 1060
1022 if (!XSupportsLocale ()) 1061 if (!XSupportsLocale ())
1023 { 1062 {
1024 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1063 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1025 return; 1064 return;
1026 } 1065 }
1027 1066
1028 im_ev.start (display); 1067 im_ev.start (display);
1029 1068
… …
1070 run_command (argv); 1109 run_command (argv);
1071} 1110}
1072 1111
1073/*----------------------------------------------------------------------*/ 1112/*----------------------------------------------------------------------*/
1074void 1113void
1075rxvt_term::get_colours () 1114rxvt_term::get_colors ()
1076{ 1115{
1077 int i; 1116 int i;
1078 1117
1079#ifdef OFF_FOCUS_FADING 1118#ifdef OFF_FOCUS_FADING
1080 pix_colors = pix_colors_focused; 1119 pix_colors = pix_colors_focused;
1081#endif 1120#endif
1082 1121
1083 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1122 for (i = 0; i < NRS_COLORS; i++)
1084 {
1085 const char *name = rs[Rs_color + i]; 1123 if (const char *name = rs[Rs_color + i])
1086
1087 if (!name)
1088 continue;
1089
1090 rxvt_color xcol;
1091
1092 if (!set_color (xcol, name)) 1124 set_color (pix_colors [i], name);
1093 {
1094#ifndef XTERM_REVERSE_VIDEO
1095 if (i < 2 && option (Opt_reverseVideo))
1096 name = def_colorName [1 - i];
1097 else
1098#endif
1099 name = def_colorName [i];
1100
1101 if (!name)
1102 continue;
1103
1104 if (!set_color (xcol, name))
1105 {
1106 switch (i)
1107 {
1108 case Color_fg:
1109 case Color_bg:
1110 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1111 name = "";
1112 break;
1113#ifndef NO_CURSORCOLOR
1114 case Color_cursor2:
1115#endif
1116 case Color_pointer_fg:
1117 name = rs[Rs_color + Color_fg];
1118 xcol.set (this, name);
1119 break;
1120 default:
1121 name = rs[Rs_color + Color_bg];
1122 xcol.set (this, name);
1123 break;
1124 }
1125 }
1126 }
1127
1128 pix_colors[i] = xcol;
1129 rs[Rs_color + i] = name;
1130 }
1131
1132 if (depth <= 2)
1133 {
1134 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1135 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1136 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1137 }
1138 1125
1139 /* 1126 /*
1140 * get scrollBar shadow colors 1127 * get scrollBar shadow colors
1141 * 1128 *
1142 * The calculations of topShadow/bottomShadow values are adapted 1129 * The calculations of topShadow/bottomShadow values are adapted
1143 * from the fvwm window manager. 1130 * from the fvwm window manager.
1144 */ 1131 */
1145#ifdef RXVT_SCROLLBAR 1132#ifdef RXVT_SCROLLBAR
1146 if (depth <= 2)
1147 {
1148 /* Monochrome */
1149 alias_color (Color_scroll, Color_fg);
1150 alias_color (Color_topShadow, Color_bg);
1151 alias_color (Color_bottomShadow, Color_bg);
1152 }
1153 else
1154 {
1155 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1133 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1156 1134
1157 rgba cscroll; 1135 rgba cscroll;
1158 pix_colors [Color_scroll].get (cscroll); 1136 pix_colors [Color_scroll].get (cscroll);
1159 1137
1160 /* topShadowColor */ 1138 /* topShadowColor */
1161 if (!pix_colors[Color_topShadow].set (this, 1139 if (!pix_colors[Color_topShadow].set (this,
1162 rgba ( 1140 rgba (
1163 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1141 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1164 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1142 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1165 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1143 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1166 cscroll.a) 1144 cscroll.a)
1167 )) 1145 ))
1168 alias_color (Color_topShadow, Color_White); 1146 alias_color (Color_topShadow, Color_White);
1169 }
1170#endif 1147#endif
1171 1148
1172#ifdef OFF_FOCUS_FADING 1149#ifdef OFF_FOCUS_FADING
1173 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1150 for (i = 0; i < NRS_COLORS; i++)
1174 update_fade_color (i); 1151 update_fade_color (i, true);
1175#endif 1152#endif
1176} 1153}
1177 1154
1178/*----------------------------------------------------------------------*/ 1155/*----------------------------------------------------------------------*/
1179/* color aliases, fg/bg bright-bold */ 1156/* color aliases, fg/bg bright-bold */
1180void 1157void
1181rxvt_term::color_aliases (int idx) 1158rxvt_term::color_aliases (int idx)
1182{ 1159{
1183 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1160 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1184 { 1161 {
1185 int i = atoi (rs[Rs_color + idx]); 1162 int i = atoi (rs[Rs_color + idx]);
1186 1163
1187 if (i >= 8 && i <= 15) 1164 if (i >= 8 && i <= 15)
1188 /* bright colors */ 1165 /* bright colors */
… …
1228 for (j = map->max_keypermod; j--; k++) 1205 for (j = map->max_keypermod; j--; k++)
1229 { 1206 {
1230 if (kc[k] == 0) 1207 if (kc[k] == 0)
1231 break; 1208 break;
1232 1209
1233 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1210 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1234 { 1211 {
1235 case XK_Num_Lock: 1212 case XK_Num_Lock:
1236 ModNumLockMask = modmasks[i - 1]; 1213 ModNumLockMask = modmasks[i - 1];
1237 continue; 1214 continue;
1238 1215
… …
1283} 1260}
1284 1261
1285void 1262void
1286rxvt_term::set_icon (const char *file) 1263rxvt_term::set_icon (const char *file)
1287{ 1264{
1288#ifdef HAVE_AFTERIMAGE 1265#if HAVE_PIXBUF && ENABLE_EWMH
1289 init_asv ();
1290
1291 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1292 if (!im)
1293 {
1294 rxvt_warn ("Loading image icon failed, continuing without.\n");
1295 return;
1296 }
1297
1298 unsigned int w = im->width;
1299 unsigned int h = im->height;
1300
1301 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1302 {
1303 rxvt_warn ("Icon image too big, continuing without.\n");
1304 destroy_asimage (&im);
1305 return;
1306 }
1307
1308 ASImage *result = scale_asimage (asv, im,
1309 w, h, ASA_ARGB32,
1310 100, ASIMAGE_QUALITY_DEFAULT);
1311 destroy_asimage (&im);
1312
1313 if (!result)
1314 {
1315 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1316 return;
1317 }
1318
1319 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1320 if (buffer)
1321 {
1322 ARGB32 *asbuf = result->alt.argb32;
1323 buffer [0] = w;
1324 buffer [1] = h;
1325
1326 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i];
1328
1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 destroy_asimage (&result);
1337#endif
1338
1339#ifdef HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1266 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf) 1267 if (!pixbuf)
1342 { 1268 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1269 rxvt_warn ("Loading image icon failed, continuing without.\n");
1344 return; 1270 return;
… …
1409 Window top, parent; 1335 Window top, parent;
1410 1336
1411 dLocal (Display *, dpy); 1337 dLocal (Display *, dpy);
1412 1338
1413 /* grab colors before netscape does */ 1339 /* grab colors before netscape does */
1414 get_colours (); 1340 get_colors ();
1415 1341
1416 if (!set_fonts ()) 1342 if (!set_fonts ())
1417 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1343 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1418 1344
1419 parent = display->root; 1345 parent = display->root;
… …
1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1390 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1465 &attributes); 1391 &attributes);
1466 1392
1467 this->parent = top; 1393 this->parent = top;
1468 1394
1469 old_width = szHint.width;
1470 old_height = szHint.height;
1471
1472 set_title (rs [Rs_title]); 1395 set_title (rs [Rs_title]);
1473 set_icon_name (rs [Rs_iconName]); 1396 set_icon_name (rs [Rs_iconName]);
1474 1397
1475 classHint.res_name = (char *)rs[Rs_name]; 1398 classHint.res_name = (char *)rs[Rs_name];
1476 classHint.res_class = (char *)RESCLASS; 1399 classHint.res_class = (char *)RESCLASS;
1477 1400
1478 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1401 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1479 wmHint.input = True; 1402 wmHint.input = True;
1480 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1403 wmHint.initial_state = option (Opt_iconic) ? IconicState
1404 : option (Opt_dockapp) ? WithdrawnState
1405 : NormalState;
1481 wmHint.window_group = top; 1406 wmHint.window_group = top;
1482 1407
1483 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1408 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1484 &szHint, &wmHint, &classHint); 1409 &szHint, &wmHint, &classHint);
1485#if ENABLE_EWMH 1410#if ENABLE_EWMH
… …
1487 * set up icon hint 1412 * set up icon hint
1488 * rs [Rs_iconfile] is path to icon 1413 * rs [Rs_iconfile] is path to icon
1489 */ 1414 */
1490 1415
1491 if (rs [Rs_iconfile]) 1416 if (rs [Rs_iconfile])
1492 {
1493 set_icon (rs [Rs_iconfile]); 1417 set_icon (rs [Rs_iconfile]);
1494 }
1495#endif 1418#endif
1496 1419
1497#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
1498 if (mwmhints.flags) 1421 if (mwmhints.flags)
1499 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1422 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1533 | ExposureMask | StructureNotifyMask); 1456 | ExposureMask | StructureNotifyMask);
1534 1457
1535 termwin_ev.start (display, top); 1458 termwin_ev.start (display, top);
1536 1459
1537 /* vt cursor: Black-on-White is standard, but this is more popular */ 1460 /* vt cursor: Black-on-White is standard, but this is more popular */
1461 unsigned int shape = XC_xterm;
1462
1463#ifdef HAVE_XMU
1464 if (rs[Rs_pointerShape])
1465 {
1466 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1467 if (stmp >= 0)
1468 shape = stmp;
1469 }
1470#endif
1471
1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1472 TermWin_cursor = XCreateFontCursor (dpy, shape);
1539 1473
1540 /* the vt window */ 1474 /* the vt window */
1541 vt = XCreateSimpleWindow (dpy, top, 1475 vt = XCreateSimpleWindow (dpy, top,
1542 window_vt_x, window_vt_y, 1476 window_vt_x, window_vt_y,
1543 width, height, 1477 vt_width, vt_height,
1544 0, 1478 0,
1545 pix_colors_focused[Color_fg], 1479 pix_colors_focused[Color_fg],
1546 pix_colors_focused[Color_bg]); 1480 pix_colors_focused[Color_bg]);
1547 1481
1548 attributes.bit_gravity = NorthWestGravity; 1482 attributes.bit_gravity = NorthWestGravity;
… …
1575 if (rs[Rs_fade]) 1509 if (rs[Rs_fade])
1576 pix_colors = pix_colors_unfocused; 1510 pix_colors = pix_colors_unfocused;
1577#endif 1511#endif
1578 1512
1579 pointer_unblank (); 1513 pointer_unblank ();
1580 scr_recolour (); 1514 scr_recolor ();
1581} 1515}
1582 1516
1583/*----------------------------------------------------------------------*/ 1517/*----------------------------------------------------------------------*/
1584/* 1518/*
1585 * Run the command in a subprocess and return a file descriptor for the 1519 * Run the command in a subprocess and return a file descriptor for the
… …
1597 if (pty->pty >= 0) 1531 if (pty->pty >= 0)
1598 { 1532 {
1599 if (getfd_hook) 1533 if (getfd_hook)
1600 pty->pty = (*getfd_hook) (pty->pty); 1534 pty->pty = (*getfd_hook) (pty->pty);
1601 1535
1602 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1536 if (pty->pty < 0)
1603 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1537 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1604 } 1538 }
1605 } 1539 }
1606 else 1540 else
1607#endif 1541#endif
1608 if (!pty->get ()) 1542 if (!pty->get ())
1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1543 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1544
1545 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1610 1546
1611 struct termios tio = def_tio; 1547 struct termios tio = def_tio;
1612 1548
1613#ifndef NO_BACKSPACE_KEY 1549#ifndef NO_BACKSPACE_KEY
1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1550 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1664 1600
1665 _exit (EXIT_FAILURE); 1601 _exit (EXIT_FAILURE);
1666 1602
1667 default: 1603 default:
1668 if (!option (Opt_utmpInhibit)) 1604 if (!option (Opt_utmpInhibit))
1605 {
1606#ifdef LOG_ONLY_ON_LOGIN
1607 bool login_shell = option (Opt_loginShell);
1608#else
1609 bool login_shell = true;
1610#endif
1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1611 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1612 }
1670 1613
1671 pty->close_tty (); 1614 pty->close_tty ();
1672 1615
1673 child_ev.start (cmd_pid); 1616 child_ev.start (cmd_pid);
1674 1617
… …
1699#elif defined (SRIOCSREDIR) 1642#elif defined (SRIOCSREDIR)
1700 int fd; 1643 int fd;
1701 1644
1702 fd = open (CONSOLE, O_WRONLY, 0); 1645 fd = open (CONSOLE, O_WRONLY, 0);
1703 if (fd >= 0) 1646 if (fd >= 0)
1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1647 {
1648 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1705 close (fd); 1649 close (fd);
1650 }
1706#endif /* SRIOCSREDIR */ 1651#endif /* SRIOCSREDIR */
1707 } 1652 }
1708 1653
1709 /* reset signals and spin off the command interpreter */ 1654 /* reset signals and spin off the command interpreter */
1710 signal (SIGINT, SIG_DFL); 1655 signal (SIGINT, SIG_DFL);

Diff Legend

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