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.308 by sf-exg, Sun Dec 18 02:14:59 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; 615 int i;
… …
590 xa = display->xa; 633 xa = display->xa;
591 634
592 set (display); 635 set (display);
593 extract_resources (); 636 extract_resources ();
594 637
595#if XFT 638#if ENABLE_FRILLS
596 if (rs[Rs_depth]) 639 if (rs[Rs_visual])
597 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));
598#endif 643#endif
599 644
600 for (int i = NUM_RESOURCES; i--; ) 645 for (int i = NUM_RESOURCES; i--; )
601 if (rs [i] == resval_undef) 646 if (rs [i] == resval_undef)
602 rs [i] = 0; 647 rs [i] = 0;
… …
608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 653 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
609 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 654 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
610 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 655 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
611 { 656 {
612 rxvt_perl.init (this); 657 rxvt_perl.init (this);
658 enumerate_resources (rxvt_perl_parse_resource);
613 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 659 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
614 } 660 }
615#endif 661#endif
616 662
617 // must be called after initialising the perl interpreter as it 663 // must be called after initialising the perl interpreter as it
… …
649 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 695 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
650 696
651 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 697 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
652 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 698 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
653 699
654 if (rs[Rs_letterSpace]) 700 if (const char *v = rs[Rs_letterSpace])
655 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");
656#endif 713#endif
657 714
658#ifdef POINTER_BLANK 715#ifdef POINTER_BLANK
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 716 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 717 pointerBlankDelay = i;
661 else 718 else
662 pointerBlankDelay = 2; 719 pointerBlankDelay = 2;
663#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;
664 728
665 /* no point having a scrollbar without having any scrollback! */ 729 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 730 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 731 set_option (Opt_scrollBar, 0);
668 732
… …
741 envv->push_back (0); 805 envv->push_back (0);
742 806
743 this->argv = argv; 807 this->argv = argv;
744 this->envv = envv; 808 this->envv = envv;
745 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
746 init2 (argv->size () - 1, argv->begin ()); 814 init2 (argv->size () - 1, argv->begin ());
747} 815}
748 816
749void 817void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 818rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
768void 836void
769rxvt_term::init2 (int argc, const char *const *argv) 837rxvt_term::init2 (int argc, const char *const *argv)
770{ 838{
771 SET_R (this); 839 SET_R (this);
772 set_locale (""); 840 set_locale ("");
773 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 :(
774 842
775 init_vars (); 843 init_vars ();
776 844
777 const char **cmd_argv = init_resources (argc, argv); 845 const char **cmd_argv = init_resources (argc, argv);
778 846
… …
793 if (option (Opt_scrollBar)) 861 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 862 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 863
796 pty = ptytty::create (); 864 pty = ptytty::create ();
797 865
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
807
808 create_windows (argc, argv); 866 create_windows (argc, argv);
809 867
810 init_xlocale (); 868 init_xlocale ();
811 869
812 scr_poweron (); // initialize screen 870 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 873 XSynchronize (dpy, True);
816#endif 874#endif
817 875
818 if (option (Opt_scrollBar)) 876 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 877 scrollBar.resize (); /* create and map scrollbar */
820#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init ();
823
824#ifdef ENABLE_TRANSPARENCY
825 if (option (Opt_transparent))
826 {
827 bg_set_transparent ();
828
829 if (rs [Rs_blurradius])
830 bg_set_blur (rs [Rs_blurradius]);
831
832 if (ISSET_PIXCOLOR (Color_tint))
833 bg_set_tint (pix_colors_focused [Color_tint]);
834
835 if (rs [Rs_shade])
836 bg_set_shade (rs [Rs_shade]);
837
838 bg_set_root_pixmap ();
839 XSelectInput (dpy, display->root, PropertyChangeMask);
840 rootwin_ev.start (display, display->root);
841 }
842#endif
843
844#ifdef BG_IMAGE_FROM_FILE
845 if (rs[Rs_backgroundPixmap])
846 if (bg_set_file (rs[Rs_backgroundPixmap]))
847 if (!bg_window_position_sensitive ())
848 update_background ();
849#endif
850 }
851#endif
852 878
853#if ENABLE_PERL 879#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 880 rootwin_ev.start (display, display->root);
855#endif 881#endif
856 882
857 set_colorfgbg (); 883 init_done = 1;
858 884
859 init_command (cmd_argv); 885 init_command (cmd_argv);
860 886
861 if (pty->pty >= 0) 887 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 888 pty_ev.start (pty->pty, ev::READ);
… …
906/*----------------------------------------------------------------------*/ 932/*----------------------------------------------------------------------*/
907void 933void
908rxvt_term::init_env () 934rxvt_term::init_env ()
909{ 935{
910 char *val; 936 char *val;
937 char *env_display;
938 char *env_windowid;
939 char *env_colorfgbg;
940 char *env_term;
911 941
912#ifdef DISPLAY_IS_IP 942#ifdef DISPLAY_IS_IP
913 /* Fixup display_name for export over pty to any interested terminal 943 /* Fixup display_name for export over pty to any interested terminal
914 * 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
915 * (for the first non-loopback interface) that we get from 945 * (for the first non-loopback interface) that we get from
… …
932 962
933 env_display = (char *)rxvt_malloc (strlen (val) + 9); 963 env_display = (char *)rxvt_malloc (strlen (val) + 9);
934 964
935 sprintf (env_display, "DISPLAY=%s", val); 965 sprintf (env_display, "DISPLAY=%s", val);
936 966
967 env_windowid = (char *)rxvt_malloc (21);
937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 968 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
938 969
939 /* add entries to the environment: 970 /* add entries to the environment:
940 * @ DISPLAY: in case we started with -display 971 * @ DISPLAY: in case we started with -display
941 * @ WINDOWID: X window id number of the window 972 * @ WINDOWID: X window id number of the window
… …
945 * @ COLORFGBG: fg;bg color codes 976 * @ COLORFGBG: fg;bg color codes
946 */ 977 */
947 putenv (env_display); 978 putenv (env_display);
948 putenv (env_windowid); 979 putenv (env_windowid);
949 980
950 if (env_colorfgbg) 981 env_colorfgbg = get_colorfgbg ();
951 putenv (env_colorfgbg); 982 putenv (env_colorfgbg);
952 983
953#ifdef RXVT_TERMINFO 984#ifdef RXVT_TERMINFO
954 putenv ("TERMINFO=" RXVT_TERMINFO); 985 putenv ("TERMINFO=" RXVT_TERMINFO);
955#endif 986#endif
956 987
957 if (depth <= 2) 988 if (depth <= 2)
958 putenv ("COLORTERM=" COLORTERMENV "-mono"); 989 putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
959 else 990 else
960 putenv ("COLORTERM=" COLORTERMENVFULL); 991 putenv ((char *)"COLORTERM=" COLORTERMENVFULL);
961 992
962 if (rs[Rs_term_name] != NULL) 993 if (rs[Rs_term_name] != NULL)
963 { 994 {
964 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); 995 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
965 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 996 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
966 putenv (env_term); 997 putenv (env_term);
967 } 998 }
968 else 999 else
969 putenv ("TERM=" TERMENV); 1000 putenv ((char *)"TERM=" TERMENV);
970 1001
971#ifdef HAVE_UNSETENV 1002#ifdef HAVE_UNSETENV
972 /* avoid passing old settings and confusing term size */ 1003 /* avoid passing old settings and confusing term size */
973 unsetenv ("LINES"); 1004 unsetenv ("LINES");
974 unsetenv ("COLUMNS"); 1005 unsetenv ("COLUMNS");
… …
978 1009
979/*----------------------------------------------------------------------*/ 1010/*----------------------------------------------------------------------*/
980void 1011void
981rxvt_term::set_locale (const char *locale) 1012rxvt_term::set_locale (const char *locale)
982{ 1013{
983 set_environ (envv); 1014 set_environ (env);
984 1015
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 1016 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 1017 this->locale = setlocale (LC_CTYPE, locale);
988 1018
989 if (!this->locale) 1019 if (!this->locale)
990 { 1020 {
… …
994 setlocale (LC_CTYPE, "C"); 1024 setlocale (LC_CTYPE, "C");
995 } 1025 }
996 else 1026 else
997 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");
998 1028
999 this->locale = "C"; 1029 this->locale = (char *)"C"; /* strdup'ed below */
1000 } 1030 }
1001 1031
1002 1032
1003 this->locale = strdup (this->locale); 1033 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 1034 SET_LOCALE (this->locale);
1005 mbstate.reset (); 1035 mbstate.reset ();
1006#endif
1007 1036
1008#if HAVE_NL_LANGINFO 1037#if HAVE_NL_LANGINFO
1009 char *codeset = nl_langinfo (CODESET); 1038 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 1039 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1040 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1018} 1047}
1019 1048
1020void 1049void
1021rxvt_term::init_xlocale () 1050rxvt_term::init_xlocale ()
1022{ 1051{
1023 set_environ (envv); 1052 set_environ (env);
1024 1053
1025#ifdef USE_XIM 1054#if USE_XIM
1026 if (!locale) 1055 if (!locale)
1027 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1056 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1028 else 1057 else
1029 { 1058 {
1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1059 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1080 run_command (argv); 1109 run_command (argv);
1081} 1110}
1082 1111
1083/*----------------------------------------------------------------------*/ 1112/*----------------------------------------------------------------------*/
1084void 1113void
1085rxvt_term::get_colours () 1114rxvt_term::get_colors ()
1086{ 1115{
1087 int i; 1116 int i;
1088 1117
1089#ifdef OFF_FOCUS_FADING 1118#ifdef OFF_FOCUS_FADING
1090 pix_colors = pix_colors_focused; 1119 pix_colors = pix_colors_focused;
1091#endif 1120#endif
1092 1121
1093 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1122 for (i = 0; i < NRS_COLORS; i++)
1094 {
1095 const char *name = rs[Rs_color + i]; 1123 if (const char *name = rs[Rs_color + i])
1096
1097 if (!name)
1098 continue;
1099
1100 rxvt_color xcol;
1101
1102 if (!set_color (xcol, name)) 1124 set_color (pix_colors [i], name);
1103 {
1104#ifndef XTERM_REVERSE_VIDEO
1105 if (i < 2 && option (Opt_reverseVideo))
1106 name = def_colorName [1 - i];
1107 else
1108#endif
1109 name = def_colorName [i];
1110
1111 if (!name)
1112 continue;
1113
1114 if (!set_color (xcol, name))
1115 {
1116 switch (i)
1117 {
1118 case Color_fg:
1119 case Color_bg:
1120 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1121 name = "";
1122 break;
1123#ifndef NO_CURSORCOLOR
1124 case Color_cursor2:
1125#endif
1126 case Color_pointer_fg:
1127 name = rs[Rs_color + Color_fg];
1128 xcol.set (this, name);
1129 break;
1130 default:
1131 name = rs[Rs_color + Color_bg];
1132 xcol.set (this, name);
1133 break;
1134 }
1135 }
1136 }
1137
1138 pix_colors[i] = xcol;
1139 rs[Rs_color + i] = name;
1140 }
1141
1142 if (depth <= 2)
1143 {
1144 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1145 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1146 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1147 }
1148 1125
1149 /* 1126 /*
1150 * get scrollBar shadow colors 1127 * get scrollBar shadow colors
1151 * 1128 *
1152 * The calculations of topShadow/bottomShadow values are adapted 1129 * The calculations of topShadow/bottomShadow values are adapted
1153 * from the fvwm window manager. 1130 * from the fvwm window manager.
1154 */ 1131 */
1155#ifdef RXVT_SCROLLBAR 1132#ifdef RXVT_SCROLLBAR
1156 if (depth <= 2)
1157 {
1158 /* Monochrome */
1159 alias_color (Color_scroll, Color_fg);
1160 alias_color (Color_topShadow, Color_bg);
1161 alias_color (Color_bottomShadow, Color_bg);
1162 }
1163 else
1164 {
1165 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1133 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1166 1134
1167 rgba cscroll; 1135 rgba cscroll;
1168 pix_colors [Color_scroll].get (cscroll); 1136 pix_colors [Color_scroll].get (cscroll);
1169 1137
1170 /* topShadowColor */ 1138 /* topShadowColor */
1171 if (!pix_colors[Color_topShadow].set (this, 1139 if (!pix_colors[Color_topShadow].set (this,
1172 rgba ( 1140 rgba (
1173 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),
1174 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),
1175 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),
1176 cscroll.a) 1144 cscroll.a)
1177 )) 1145 ))
1178 alias_color (Color_topShadow, Color_White); 1146 alias_color (Color_topShadow, Color_White);
1179 }
1180#endif 1147#endif
1181 1148
1182#ifdef OFF_FOCUS_FADING 1149#ifdef OFF_FOCUS_FADING
1183 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1150 for (i = 0; i < NRS_COLORS; i++)
1184 update_fade_color (i); 1151 update_fade_color (i, true);
1185#endif 1152#endif
1186} 1153}
1187 1154
1188/*----------------------------------------------------------------------*/ 1155/*----------------------------------------------------------------------*/
1189/* color aliases, fg/bg bright-bold */ 1156/* color aliases, fg/bg bright-bold */
1190void 1157void
1191rxvt_term::color_aliases (int idx) 1158rxvt_term::color_aliases (int idx)
1192{ 1159{
1193 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1160 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1194 { 1161 {
1195 int i = atoi (rs[Rs_color + idx]); 1162 int i = atoi (rs[Rs_color + idx]);
1196 1163
1197 if (i >= 8 && i <= 15) 1164 if (i >= 8 && i <= 15)
1198 /* bright colors */ 1165 /* bright colors */
… …
1238 for (j = map->max_keypermod; j--; k++) 1205 for (j = map->max_keypermod; j--; k++)
1239 { 1206 {
1240 if (kc[k] == 0) 1207 if (kc[k] == 0)
1241 break; 1208 break;
1242 1209
1243 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1210 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1244 { 1211 {
1245 case XK_Num_Lock: 1212 case XK_Num_Lock:
1246 ModNumLockMask = modmasks[i - 1]; 1213 ModNumLockMask = modmasks[i - 1];
1247 continue; 1214 continue;
1248 1215
… …
1293} 1260}
1294 1261
1295void 1262void
1296rxvt_term::set_icon (const char *file) 1263rxvt_term::set_icon (const char *file)
1297{ 1264{
1298#ifdef HAVE_AFTERIMAGE 1265#if HAVE_PIXBUF && ENABLE_EWMH
1299 init_asv ();
1300
1301 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1302 if (!im)
1303 {
1304 rxvt_warn ("Loading image icon failed, continuing without.\n");
1305 return;
1306 }
1307
1308 unsigned int w = im->width;
1309 unsigned int h = im->height;
1310
1311 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1312 {
1313 rxvt_warn ("Icon image too big, continuing without.\n");
1314 destroy_asimage (&im);
1315 return;
1316 }
1317
1318 ASImage *result = scale_asimage (asv, im,
1319 w, h, ASA_ARGB32,
1320 100, ASIMAGE_QUALITY_DEFAULT);
1321 destroy_asimage (&im);
1322
1323 if (!result)
1324 {
1325 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1326 return;
1327 }
1328
1329 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1330 if (buffer)
1331 {
1332 ARGB32 *asbuf = result->alt.argb32;
1333 buffer [0] = w;
1334 buffer [1] = h;
1335
1336 for (unsigned int i = 0; i < w * h; ++i)
1337 buffer [i + 2] = asbuf [i];
1338
1339 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1340 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1341 free (buffer);
1342 }
1343 else
1344 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1345
1346 destroy_asimage (&result);
1347#endif
1348
1349#ifdef HAVE_PIXBUF
1350 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1266 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1351 if (!pixbuf) 1267 if (!pixbuf)
1352 { 1268 {
1353 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1269 rxvt_warn ("Loading image icon failed, continuing without.\n");
1354 return; 1270 return;
… …
1419 Window top, parent; 1335 Window top, parent;
1420 1336
1421 dLocal (Display *, dpy); 1337 dLocal (Display *, dpy);
1422 1338
1423 /* grab colors before netscape does */ 1339 /* grab colors before netscape does */
1424 get_colours (); 1340 get_colors ();
1425 1341
1426 if (!set_fonts ()) 1342 if (!set_fonts ())
1427 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");
1428 1344
1429 parent = display->root; 1345 parent = display->root;
… …
1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1390 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1475 &attributes); 1391 &attributes);
1476 1392
1477 this->parent = top; 1393 this->parent = top;
1478 1394
1479 old_width = szHint.width;
1480 old_height = szHint.height;
1481
1482 set_title (rs [Rs_title]); 1395 set_title (rs [Rs_title]);
1483 set_icon_name (rs [Rs_iconName]); 1396 set_icon_name (rs [Rs_iconName]);
1484 1397
1485 classHint.res_name = (char *)rs[Rs_name]; 1398 classHint.res_name = (char *)rs[Rs_name];
1486 classHint.res_class = (char *)RESCLASS; 1399 classHint.res_class = (char *)RESCLASS;
1487 1400
1488 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1401 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1489 wmHint.input = True; 1402 wmHint.input = True;
1490 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1403 wmHint.initial_state = option (Opt_iconic) ? IconicState
1404 : option (Opt_dockapp) ? WithdrawnState
1405 : NormalState;
1491 wmHint.window_group = top; 1406 wmHint.window_group = top;
1492 1407
1493 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1408 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1494 &szHint, &wmHint, &classHint); 1409 &szHint, &wmHint, &classHint);
1495#if ENABLE_EWMH 1410#if ENABLE_EWMH
… …
1497 * set up icon hint 1412 * set up icon hint
1498 * rs [Rs_iconfile] is path to icon 1413 * rs [Rs_iconfile] is path to icon
1499 */ 1414 */
1500 1415
1501 if (rs [Rs_iconfile]) 1416 if (rs [Rs_iconfile])
1502 {
1503 set_icon (rs [Rs_iconfile]); 1417 set_icon (rs [Rs_iconfile]);
1504 }
1505#endif 1418#endif
1506 1419
1507#if ENABLE_FRILLS 1420#if ENABLE_FRILLS
1508 if (mwmhints.flags) 1421 if (mwmhints.flags)
1509 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,
… …
1543 | ExposureMask | StructureNotifyMask); 1456 | ExposureMask | StructureNotifyMask);
1544 1457
1545 termwin_ev.start (display, top); 1458 termwin_ev.start (display, top);
1546 1459
1547 /* 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
1548 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1472 TermWin_cursor = XCreateFontCursor (dpy, shape);
1549 1473
1550 /* the vt window */ 1474 /* the vt window */
1551 vt = XCreateSimpleWindow (dpy, top, 1475 vt = XCreateSimpleWindow (dpy, top,
1552 window_vt_x, window_vt_y, 1476 window_vt_x, window_vt_y,
1553 width, height, 1477 vt_width, vt_height,
1554 0, 1478 0,
1555 pix_colors_focused[Color_fg], 1479 pix_colors_focused[Color_fg],
1556 pix_colors_focused[Color_bg]); 1480 pix_colors_focused[Color_bg]);
1557 1481
1558 attributes.bit_gravity = NorthWestGravity; 1482 attributes.bit_gravity = NorthWestGravity;
… …
1585 if (rs[Rs_fade]) 1509 if (rs[Rs_fade])
1586 pix_colors = pix_colors_unfocused; 1510 pix_colors = pix_colors_unfocused;
1587#endif 1511#endif
1588 1512
1589 pointer_unblank (); 1513 pointer_unblank ();
1590 scr_recolour (); 1514 scr_recolor ();
1591} 1515}
1592 1516
1593/*----------------------------------------------------------------------*/ 1517/*----------------------------------------------------------------------*/
1594/* 1518/*
1595 * 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
… …
1607 if (pty->pty >= 0) 1531 if (pty->pty >= 0)
1608 { 1532 {
1609 if (getfd_hook) 1533 if (getfd_hook)
1610 pty->pty = (*getfd_hook) (pty->pty); 1534 pty->pty = (*getfd_hook) (pty->pty);
1611 1535
1612 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1536 if (pty->pty < 0)
1613 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1537 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1614 } 1538 }
1615 } 1539 }
1616 else 1540 else
1617#endif 1541#endif
1618 if (!pty->get ()) 1542 if (!pty->get ())
1619 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);
1620 1546
1621 struct termios tio = def_tio; 1547 struct termios tio = def_tio;
1622 1548
1623#ifndef NO_BACKSPACE_KEY 1549#ifndef NO_BACKSPACE_KEY
1624 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1550 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1674 1600
1675 _exit (EXIT_FAILURE); 1601 _exit (EXIT_FAILURE);
1676 1602
1677 default: 1603 default:
1678 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
1679 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1611 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1612 }
1680 1613
1681 pty->close_tty (); 1614 pty->close_tty ();
1682 1615
1683 child_ev.start (cmd_pid); 1616 child_ev.start (cmd_pid);
1684 1617
… …
1709#elif defined (SRIOCSREDIR) 1642#elif defined (SRIOCSREDIR)
1710 int fd; 1643 int fd;
1711 1644
1712 fd = open (CONSOLE, O_WRONLY, 0); 1645 fd = open (CONSOLE, O_WRONLY, 0);
1713 if (fd >= 0) 1646 if (fd >= 0)
1714 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1647 {
1648 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1715 close (fd); 1649 close (fd);
1650 }
1716#endif /* SRIOCSREDIR */ 1651#endif /* SRIOCSREDIR */
1717 } 1652 }
1718 1653
1719 /* reset signals and spin off the command interpreter */ 1654 /* reset signals and spin off the command interpreter */
1720 signal (SIGINT, SIG_DFL); 1655 signal (SIGINT, SIG_DFL);

Diff Legend

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