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.305 by sf-exg, Tue Dec 6 11:29:52 2011 UTC vs.
Revision 1.348 by sf-exg, Thu Jul 14 05:33:26 2016 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
21 * 22 *
22 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 39#include "init.h"
39#include "keyboard.h" 40#include "keyboard.h"
40 41
41#include <limits> 42#include <limits>
42 43
43#include <csignal> 44#include <signal.h>
44 45
45#include <fcntl.h> 46#include <fcntl.h>
47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
46 51
47#ifdef HAVE_XSETLOCALE 52#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 53# define X_LOCALE
49# include <X11/Xlocale.h> 54# include <X11/Xlocale.h>
50#else 55#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 56# include <locale.h>
53# endif
54#endif 57#endif
55 58
56#ifdef HAVE_NL_LANGINFO 59#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 60# include <langinfo.h>
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 {
588 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
589
590 for (i = 0; i < argc - r_argc - 1; i++)
591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
592
593 cmd_argv[i] = NULL;
594 }
595 617
596 rs[Rs_name] = rxvt_basename (argv[0]); 618 rs[Rs_name] = rxvt_basename (argv[0]);
597 619
598 /* 620 /*
599 * Open display, get options/resources and create the window 621 * Open display, get options/resources and create the window
600 */ 622 */
601 623
602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 624 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
603 rs[Rs_display_name] = ":0"; 625 rs[Rs_display_name] = ":0";
604 626
605 get_options (r_argc, argv); 627 cmd_argv = get_options (argc, argv);
606 628
607 if (!(display = displays.get (rs[Rs_display_name]))) 629 if (!(display = displays.get (rs[Rs_display_name])))
608 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]);
609 631
610 // using a local pointer decreases code size a lot 632 // using a local pointer decreases code size a lot
611 xa = display->xa; 633 xa = display->xa;
612 634
613 set (display); 635 set (display);
614 extract_resources (); 636 extract_resources ();
615 637
616#if XFT 638#if ENABLE_FRILLS
617 if (rs[Rs_depth]) 639 if (rs[Rs_visual])
618 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));
619#endif 643#endif
620 644
621 for (int i = NUM_RESOURCES; i--; ) 645 for (int i = NUM_RESOURCES; i--; )
622 if (rs [i] == resval_undef) 646 if (rs [i] == resval_undef)
623 rs [i] = 0; 647 rs [i] = 0;
… …
629 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 653 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
630 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 654 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
631 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 655 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
632 { 656 {
633 rxvt_perl.init (this); 657 rxvt_perl.init (this);
658 enumerate_resources (rxvt_perl_parse_resource);
634 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 659 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
635 } 660 }
636#endif 661#endif
637 662
638 // must be called after initialising the perl interpreter as it 663 // must be called after initialising the perl interpreter as it
… …
680 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 705 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
681 pointerBlankDelay = i; 706 pointerBlankDelay = i;
682 else 707 else
683 pointerBlankDelay = 2; 708 pointerBlankDelay = 2;
684#endif 709#endif
710
711 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
712 multiClickTime = i;
713 else
714 multiClickTime = 500;
715
716 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
685 717
686 /* no point having a scrollbar without having any scrollback! */ 718 /* no point having a scrollbar without having any scrollback! */
687 if (!saveLines) 719 if (!saveLines)
688 set_option (Opt_scrollBar, 0); 720 set_option (Opt_scrollBar, 0);
689 721
… …
754 return cmd_argv; 786 return cmd_argv;
755} 787}
756 788
757/*----------------------------------------------------------------------*/ 789/*----------------------------------------------------------------------*/
758void 790void
791rxvt_term::init (stringvec *argv, stringvec *envv)
792{
793 argv->push_back (0);
794 envv->push_back (0);
795
796 this->argv = argv;
797 this->envv = envv;
798
799 env = new char *[this->envv->size ()];
800 for (int i = 0; i < this->envv->size (); i++)
801 env[i] = this->envv->at (i);
802
803 init2 (argv->size () - 1, argv->begin ());
804}
805
806void
807rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
808{
809#if ENABLE_PERL
810 // perl might want to access the stringvecs later, so we need to copy them
811 stringvec *args = new stringvec;
812 for (int i = 0; i < argc; i++)
813 args->push_back (strdup (argv [i]));
814
815 stringvec *envs = new stringvec;
816 for (const char *const *var = envv; *var; var++)
817 envs->push_back (strdup (*var));
818
819 init (args, envs);
820#else
821 init2 (argc, argv);
822#endif
823}
824
825void
759rxvt_term::init (int argc, const char *const *argv) 826rxvt_term::init2 (int argc, const char *const *argv)
760{ 827{
761 SET_R (this); 828 SET_R (this);
762 set_locale (""); 829 set_locale ("");
763 set_environ (envv); // a few things in X do not call setlocale :( 830 set_environ (env); // a few things in X do not call setlocale :(
764 831
765 init_vars (); 832 init_vars ();
766 833
767 const char **cmd_argv = init_resources (argc, argv); 834 const char **cmd_argv = init_resources (argc, argv);
768 835
… …
783 if (option (Opt_scrollBar)) 850 if (option (Opt_scrollBar))
784 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 851 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
785 852
786 pty = ptytty::create (); 853 pty = ptytty::create ();
787 854
788#ifdef HAVE_AFTERIMAGE
789 set_application_name ((char *)rs[Rs_name]);
790 set_output_threshold (OUTPUT_LEVEL_WARNING);
791#endif
792
793 // must be called before create_windows, because the latter may call set_icon
794#ifdef HAVE_PIXBUF
795 g_type_init ();
796#endif
797
798 create_windows (argc, argv); 855 create_windows (argc, argv);
799 856
800 init_xlocale (); 857 init_xlocale ();
801 858
802 scr_poweron (); // initialize screen 859 scr_poweron (); // initialize screen
… …
805 XSynchronize (dpy, True); 862 XSynchronize (dpy, True);
806#endif 863#endif
807 864
808 if (option (Opt_scrollBar)) 865 if (option (Opt_scrollBar))
809 scrollBar.resize (); /* create and map scrollbar */ 866 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP
811 {
812 bg_init ();
813
814#ifdef ENABLE_TRANSPARENCY
815 if (option (Opt_transparent))
816 {
817 bg_set_transparent ();
818
819 if (rs [Rs_blurradius])
820 bg_set_blur (rs [Rs_blurradius]);
821
822 if (ISSET_PIXCOLOR (Color_tint))
823 bg_set_tint (pix_colors_focused [Color_tint]);
824
825 if (rs [Rs_shade])
826 bg_set_shade (rs [Rs_shade]);
827
828 bg_set_root_pixmap ();
829 XSelectInput (dpy, display->root, PropertyChangeMask);
830 rootwin_ev.start (display, display->root);
831 }
832#endif
833
834#ifdef BG_IMAGE_FROM_FILE
835 if (rs[Rs_backgroundPixmap])
836 {
837 if (bg_set_file (rs[Rs_backgroundPixmap]))
838 if (!bg_window_position_sensitive ())
839 update_background ();
840 }
841#endif
842 }
843#endif
844 867
845#if ENABLE_PERL 868#if ENABLE_PERL
846 rootwin_ev.start (display, display->root); 869 rootwin_ev.start (display, display->root);
847#endif 870#endif
848 871
849 set_colorfgbg (); 872 init_done = 1;
850 873
851 init_command (cmd_argv); 874 init_command (cmd_argv);
852
853 free (cmd_argv);
854 875
855 if (pty->pty >= 0) 876 if (pty->pty >= 0)
856 pty_ev.start (pty->pty, ev::READ); 877 pty_ev.start (pty->pty, ev::READ);
857 878
858 HOOK_INVOKE ((this, HOOK_START, DT_END)); 879 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
900/*----------------------------------------------------------------------*/ 921/*----------------------------------------------------------------------*/
901void 922void
902rxvt_term::init_env () 923rxvt_term::init_env ()
903{ 924{
904 char *val; 925 char *val;
926 char *env_display;
927 char *env_windowid;
928 char *env_colorfgbg;
929 char *env_term;
905 930
906#ifdef DISPLAY_IS_IP 931#ifdef DISPLAY_IS_IP
907 /* Fixup display_name for export over pty to any interested terminal 932 /* Fixup display_name for export over pty to any interested terminal
908 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 933 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
909 * (for the first non-loopback interface) that we get from 934 * (for the first non-loopback interface) that we get from
… …
926 951
927 env_display = (char *)rxvt_malloc (strlen (val) + 9); 952 env_display = (char *)rxvt_malloc (strlen (val) + 9);
928 953
929 sprintf (env_display, "DISPLAY=%s", val); 954 sprintf (env_display, "DISPLAY=%s", val);
930 955
956 env_windowid = (char *)rxvt_malloc (21);
931 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 957 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
932 958
933 /* add entries to the environment: 959 /* add entries to the environment:
934 * @ DISPLAY: in case we started with -display 960 * @ DISPLAY: in case we started with -display
935 * @ WINDOWID: X window id number of the window 961 * @ WINDOWID: X window id number of the window
… …
939 * @ COLORFGBG: fg;bg color codes 965 * @ COLORFGBG: fg;bg color codes
940 */ 966 */
941 putenv (env_display); 967 putenv (env_display);
942 putenv (env_windowid); 968 putenv (env_windowid);
943 969
944 if (env_colorfgbg) 970 env_colorfgbg = get_colorfgbg ();
945 putenv (env_colorfgbg); 971 putenv (env_colorfgbg);
946 972
947#ifdef RXVT_TERMINFO 973#ifdef RXVT_TERMINFO
948 putenv ("TERMINFO=" RXVT_TERMINFO); 974 putenv ("TERMINFO=" RXVT_TERMINFO);
949#endif 975#endif
950 976
… …
969 unsetenv ("TERMCAP"); /* terminfo should be okay */ 995 unsetenv ("TERMCAP"); /* terminfo should be okay */
970#endif /* HAVE_UNSETENV */ 996#endif /* HAVE_UNSETENV */
971} 997}
972 998
973/*----------------------------------------------------------------------*/ 999/*----------------------------------------------------------------------*/
974/*
975 * This is more or less stolen straight from XFree86 xterm.
976 * This should support all European type languages.
977 */
978void 1000void
979rxvt_term::set_locale (const char *locale) 1001rxvt_term::set_locale (const char *locale)
980{ 1002{
981 set_environ (envv); 1003 set_environ (env);
982 1004
983#if HAVE_XSETLOCALE || HAVE_SETLOCALE
984 free (this->locale); 1005 free (this->locale);
985 this->locale = setlocale (LC_CTYPE, locale); 1006 this->locale = setlocale (LC_CTYPE, locale);
986 1007
987 if (!this->locale) 1008 if (!this->locale)
988 { 1009 {
… …
999 1020
1000 1021
1001 this->locale = strdup (this->locale); 1022 this->locale = strdup (this->locale);
1002 SET_LOCALE (this->locale); 1023 SET_LOCALE (this->locale);
1003 mbstate.reset (); 1024 mbstate.reset ();
1004#endif
1005 1025
1006#if HAVE_NL_LANGINFO 1026#if HAVE_NL_LANGINFO
1007 char *codeset = strdup (nl_langinfo (CODESET)); 1027 char *codeset = nl_langinfo (CODESET);
1008 // /^UTF.?8/i 1028 // /^UTF.?8/i
1009 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1029 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1010 && (codeset[1] == 'T' || codeset[1] == 't') 1030 && (codeset[1] == 'T' || codeset[1] == 't')
1011 && (codeset[2] == 'F' || codeset[2] == 'f') 1031 && (codeset[2] == 'F' || codeset[2] == 'f')
1012 && (codeset[3] == '8' || codeset[4] == '8'); 1032 && (codeset[3] == '8' || codeset[4] == '8');
1013 free (codeset);
1014#else 1033#else
1015 enc_utf8 = 0; 1034 enc_utf8 = 0;
1016#endif 1035#endif
1017} 1036}
1018 1037
1019void 1038void
1020rxvt_term::init_xlocale () 1039rxvt_term::init_xlocale ()
1021{ 1040{
1022 set_environ (envv); 1041 set_environ (env);
1023 1042
1024#ifdef USE_XIM 1043#if USE_XIM
1025 if (!locale) 1044 if (!locale)
1026 rxvt_warn ("setting locale failed, working without locale support.\n"); 1045 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1027 else 1046 else
1028 { 1047 {
1029 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1048 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1030 1049
1031 if (!XSupportsLocale ()) 1050 if (!XSupportsLocale ())
1032 { 1051 {
1033 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1052 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1034 return; 1053 return;
1035 } 1054 }
1036 1055
1037 im_ev.start (display); 1056 im_ev.start (display);
1038 1057
… …
1079 run_command (argv); 1098 run_command (argv);
1080} 1099}
1081 1100
1082/*----------------------------------------------------------------------*/ 1101/*----------------------------------------------------------------------*/
1083void 1102void
1084rxvt_term::get_colours () 1103rxvt_term::get_colors ()
1085{ 1104{
1086 int i; 1105 int i;
1087 1106
1088#ifdef OFF_FOCUS_FADING 1107#ifdef OFF_FOCUS_FADING
1089 pix_colors = pix_colors_focused; 1108 pix_colors = pix_colors_focused;
1090#endif 1109#endif
1091 1110
1092 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1111 for (i = 0; i < NRS_COLORS; i++)
1093 {
1094 const char *name = rs[Rs_color + i]; 1112 if (const char *name = rs[Rs_color + i])
1095
1096 if (!name)
1097 continue;
1098
1099 rxvt_color xcol;
1100
1101 if (!set_color (xcol, name)) 1113 set_color (pix_colors [i], name);
1102 {
1103#ifndef XTERM_REVERSE_VIDEO
1104 if (i < 2 && option (Opt_reverseVideo))
1105 name = def_colorName [1 - i];
1106 else
1107#endif
1108 name = def_colorName [i];
1109
1110 if (!name)
1111 continue;
1112
1113 if (!set_color (xcol, name))
1114 {
1115 switch (i)
1116 {
1117 case Color_fg:
1118 case Color_bg:
1119 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1120 name = "";
1121 break;
1122#ifndef NO_CURSORCOLOR
1123 case Color_cursor2:
1124#endif
1125 case Color_pointer_fg:
1126 name = rs[Rs_color + Color_fg];
1127 xcol.set (this, name);
1128 break;
1129 default:
1130 name = rs[Rs_color + Color_bg];
1131 xcol.set (this, name);
1132 break;
1133 }
1134 }
1135 }
1136
1137 pix_colors[i] = xcol;
1138 rs[Rs_color + i] = name;
1139 }
1140
1141 if (depth <= 2)
1142 {
1143 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1144 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1145 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1146 }
1147 1114
1148 /* 1115 /*
1149 * get scrollBar shadow colors 1116 * get scrollBar shadow colors
1150 * 1117 *
1151 * The calculations of topShadow/bottomShadow values are adapted 1118 * The calculations of topShadow/bottomShadow values are adapted
1152 * from the fvwm window manager. 1119 * from the fvwm window manager.
1153 */ 1120 */
1154#ifdef RXVT_SCROLLBAR 1121#ifdef RXVT_SCROLLBAR
1155 if (depth <= 2)
1156 {
1157 /* Monochrome */
1158 alias_color (Color_scroll, Color_fg);
1159 alias_color (Color_topShadow, Color_bg);
1160 alias_color (Color_bottomShadow, Color_bg);
1161 }
1162 else
1163 {
1164 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1122 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1165 1123
1166 rgba cscroll; 1124 rgba cscroll;
1167 pix_colors [Color_scroll].get (cscroll); 1125 pix_colors [Color_scroll].get (cscroll);
1168 1126
1169 /* topShadowColor */ 1127 /* topShadowColor */
1170 if (!pix_colors[Color_topShadow].set (this, 1128 if (!pix_colors[Color_topShadow].set (this,
1171 rgba ( 1129 rgba (
1172 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1130 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1173 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1131 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1174 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1132 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1175 cscroll.a) 1133 cscroll.a)
1176 )) 1134 ))
1177 alias_color (Color_topShadow, Color_White); 1135 alias_color (Color_topShadow, Color_White);
1178 }
1179#endif 1136#endif
1180 1137
1181#ifdef OFF_FOCUS_FADING 1138#ifdef OFF_FOCUS_FADING
1182 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1139 for (i = 0; i < NRS_COLORS; i++)
1183 update_fade_color (i); 1140 update_fade_color (i, true);
1184#endif 1141#endif
1185} 1142}
1186 1143
1187/*----------------------------------------------------------------------*/ 1144/*----------------------------------------------------------------------*/
1188/* color aliases, fg/bg bright-bold */ 1145/* color aliases, fg/bg bright-bold */
1189void 1146void
1190rxvt_term::color_aliases (int idx) 1147rxvt_term::color_aliases (int idx)
1191{ 1148{
1192 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1149 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1193 { 1150 {
1194 int i = atoi (rs[Rs_color + idx]); 1151 int i = atoi (rs[Rs_color + idx]);
1195 1152
1196 if (i >= 8 && i <= 15) 1153 if (i >= 8 && i <= 15)
1197 /* bright colors */ 1154 /* bright colors */
… …
1237 for (j = map->max_keypermod; j--; k++) 1194 for (j = map->max_keypermod; j--; k++)
1238 { 1195 {
1239 if (kc[k] == 0) 1196 if (kc[k] == 0)
1240 break; 1197 break;
1241 1198
1242 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1199 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1243 { 1200 {
1244 case XK_Num_Lock: 1201 case XK_Num_Lock:
1245 ModNumLockMask = modmasks[i - 1]; 1202 ModNumLockMask = modmasks[i - 1];
1246 continue; 1203 continue;
1247 1204
… …
1292} 1249}
1293 1250
1294void 1251void
1295rxvt_term::set_icon (const char *file) 1252rxvt_term::set_icon (const char *file)
1296{ 1253{
1297#ifdef HAVE_AFTERIMAGE 1254#if HAVE_PIXBUF && ENABLE_EWMH
1298 init_asv ();
1299
1300 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1301 if (!im)
1302 {
1303 rxvt_warn ("Loading image icon failed, continuing without.\n");
1304 return;
1305 }
1306
1307 unsigned int w = im->width;
1308 unsigned int h = im->height;
1309
1310 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1311 {
1312 rxvt_warn ("Icon image too big, continuing without.\n");
1313 destroy_asimage (&im);
1314 return;
1315 }
1316
1317 ASImage *result = scale_asimage (asv, im,
1318 w, h, ASA_ARGB32,
1319 100, ASIMAGE_QUALITY_DEFAULT);
1320 destroy_asimage (&im);
1321
1322 if (!result)
1323 {
1324 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1325 return;
1326 }
1327
1328 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1329 if (buffer)
1330 {
1331 ARGB32 *asbuf = result->alt.argb32;
1332 buffer [0] = w;
1333 buffer [1] = h;
1334
1335 for (unsigned int i = 0; i < w * h; ++i)
1336 buffer [i + 2] = asbuf [i];
1337
1338 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1339 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1340 free (buffer);
1341 }
1342 else
1343 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1344
1345 destroy_asimage (&result);
1346#endif
1347
1348#ifdef HAVE_PIXBUF
1349 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1255 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1350 if (!pixbuf) 1256 if (!pixbuf)
1351 { 1257 {
1352 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1258 rxvt_warn ("Loading image icon failed, continuing without.\n");
1353 return; 1259 return;
… …
1418 Window top, parent; 1324 Window top, parent;
1419 1325
1420 dLocal (Display *, dpy); 1326 dLocal (Display *, dpy);
1421 1327
1422 /* grab colors before netscape does */ 1328 /* grab colors before netscape does */
1423 get_colours (); 1329 get_colors ();
1424 1330
1425 if (!set_fonts ()) 1331 if (!set_fonts ())
1426 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1332 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1427 1333
1428 parent = display->root; 1334 parent = display->root;
… …
1473 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1379 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1474 &attributes); 1380 &attributes);
1475 1381
1476 this->parent = top; 1382 this->parent = top;
1477 1383
1478 old_width = szHint.width;
1479 old_height = szHint.height;
1480
1481 set_title (rs [Rs_title]); 1384 set_title (rs [Rs_title]);
1482 set_icon_name (rs [Rs_iconName]); 1385 set_icon_name (rs [Rs_iconName]);
1483 1386
1484 classHint.res_name = (char *)rs[Rs_name]; 1387 classHint.res_name = (char *)rs[Rs_name];
1485 classHint.res_class = (char *)RESCLASS; 1388 classHint.res_class = (char *)RESCLASS;
1486 1389
1487 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1390 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1488 wmHint.input = True; 1391 wmHint.input = True;
1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1392 wmHint.initial_state = option (Opt_iconic) ? IconicState
1393 : option (Opt_dockapp) ? WithdrawnState
1394 : NormalState;
1490 wmHint.window_group = top; 1395 wmHint.window_group = top;
1491 1396
1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1397 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1493 &szHint, &wmHint, &classHint); 1398 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH 1399#if ENABLE_EWMH
… …
1496 * set up icon hint 1401 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon 1402 * rs [Rs_iconfile] is path to icon
1498 */ 1403 */
1499 1404
1500 if (rs [Rs_iconfile]) 1405 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]); 1406 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif 1407#endif
1505 1408
1506#if ENABLE_FRILLS 1409#if ENABLE_FRILLS
1507 if (mwmhints.flags) 1410 if (mwmhints.flags)
1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1411 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1542 | ExposureMask | StructureNotifyMask); 1445 | ExposureMask | StructureNotifyMask);
1543 1446
1544 termwin_ev.start (display, top); 1447 termwin_ev.start (display, top);
1545 1448
1546 /* vt cursor: Black-on-White is standard, but this is more popular */ 1449 /* vt cursor: Black-on-White is standard, but this is more popular */
1450 unsigned int shape = XC_xterm;
1451
1452#ifdef HAVE_XMU
1453 if (rs[Rs_pointerShape])
1454 {
1455 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1456 if (stmp >= 0)
1457 shape = stmp;
1458 }
1459#endif
1460
1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1461 TermWin_cursor = XCreateFontCursor (dpy, shape);
1548 1462
1549 /* the vt window */ 1463 /* the vt window */
1550 vt = XCreateSimpleWindow (dpy, top, 1464 vt = XCreateSimpleWindow (dpy, top,
1551 window_vt_x, window_vt_y, 1465 window_vt_x, window_vt_y,
1552 width, height, 1466 vt_width, vt_height,
1553 0, 1467 0,
1554 pix_colors_focused[Color_fg], 1468 pix_colors_focused[Color_fg],
1555 pix_colors_focused[Color_bg]); 1469 pix_colors_focused[Color_bg]);
1556 1470
1557 attributes.bit_gravity = NorthWestGravity; 1471 attributes.bit_gravity = NorthWestGravity;
… …
1584 if (rs[Rs_fade]) 1498 if (rs[Rs_fade])
1585 pix_colors = pix_colors_unfocused; 1499 pix_colors = pix_colors_unfocused;
1586#endif 1500#endif
1587 1501
1588 pointer_unblank (); 1502 pointer_unblank ();
1589 scr_recolour (); 1503 scr_recolor ();
1590} 1504}
1591 1505
1592/*----------------------------------------------------------------------*/ 1506/*----------------------------------------------------------------------*/
1593/* 1507/*
1594 * Run the command in a subprocess and return a file descriptor for the 1508 * Run the command in a subprocess and return a file descriptor for the
… …
1606 if (pty->pty >= 0) 1520 if (pty->pty >= 0)
1607 { 1521 {
1608 if (getfd_hook) 1522 if (getfd_hook)
1609 pty->pty = (*getfd_hook) (pty->pty); 1523 pty->pty = (*getfd_hook) (pty->pty);
1610 1524
1611 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1525 if (pty->pty < 0)
1612 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1526 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1613 } 1527 }
1614 } 1528 }
1615 else 1529 else
1616#endif 1530#endif
1617 if (!pty->get ()) 1531 if (!pty->get ())
1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1532 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1533
1534 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1619 1535
1620 struct termios tio = def_tio; 1536 struct termios tio = def_tio;
1621 1537
1622#ifndef NO_BACKSPACE_KEY 1538#ifndef NO_BACKSPACE_KEY
1623 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1539 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1673 1589
1674 _exit (EXIT_FAILURE); 1590 _exit (EXIT_FAILURE);
1675 1591
1676 default: 1592 default:
1677 if (!option (Opt_utmpInhibit)) 1593 if (!option (Opt_utmpInhibit))
1594 {
1595#ifdef LOG_ONLY_ON_LOGIN
1596 bool login_shell = option (Opt_loginShell);
1597#else
1598 bool login_shell = true;
1599#endif
1678 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1600 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1601 }
1679 1602
1680 pty->close_tty (); 1603 pty->close_tty ();
1681 1604
1682 child_ev.start (cmd_pid); 1605 child_ev.start (cmd_pid);
1683 1606
… …
1708#elif defined (SRIOCSREDIR) 1631#elif defined (SRIOCSREDIR)
1709 int fd; 1632 int fd;
1710 1633
1711 fd = open (CONSOLE, O_WRONLY, 0); 1634 fd = open (CONSOLE, O_WRONLY, 0);
1712 if (fd >= 0) 1635 if (fd >= 0)
1713 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1636 {
1637 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1714 close (fd); 1638 close (fd);
1639 }
1715#endif /* SRIOCSREDIR */ 1640#endif /* SRIOCSREDIR */
1716 } 1641 }
1717 1642
1718 /* reset signals and spin off the command interpreter */ 1643 /* reset signals and spin off the command interpreter */
1719 signal (SIGINT, SIG_DFL); 1644 signal (SIGINT, SIG_DFL);

Diff Legend

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