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.309 by sf-exg, Tue Dec 20 02:52:39 2011 UTC vs.
Revision 1.347 by sf-exg, Thu Jul 14 05:10:06 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 564#if BG_IMAGE_FROM_ROOT
527 NULL, 565 NULL,
528#endif 566#endif
529#if OFF_FOCUS_FADING 567#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 568 "rgb:00/00/00",
531#endif 569#endif
… …
563 set_option (Opt_iso14755); 601 set_option (Opt_iso14755);
564 set_option (Opt_iso14755_52); 602 set_option (Opt_iso14755_52);
565 set_option (Opt_buffered); 603 set_option (Opt_buffered);
566} 604}
567 605
606#if ENABLE_PERL
607static void
608rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
609{
610 rxvt_perl.parse_resource (term, k, false, false, 0, v);
611}
612#endif
613
568/*----------------------------------------------------------------------*/ 614/*----------------------------------------------------------------------*/
569const char ** 615const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 616rxvt_term::init_resources (int argc, const char *const *argv)
571{ 617{
572 int i; 618 int i;
… …
590 xa = display->xa; 636 xa = display->xa;
591 637
592 set (display); 638 set (display);
593 extract_resources (); 639 extract_resources ();
594 640
595#if XFT 641#if ENABLE_FRILLS
596 if (rs[Rs_depth]) 642 if (rs[Rs_visual])
597 select_visual (strtol (rs[Rs_depth], 0, 0)); 643 select_visual (strtol (rs[Rs_visual], 0, 0));
644 else if (rs[Rs_depth])
645 select_depth (strtol (rs[Rs_depth], 0, 0));
598#endif 646#endif
599 647
600 for (int i = NUM_RESOURCES; i--; ) 648 for (int i = NUM_RESOURCES; i--; )
601 if (rs [i] == resval_undef) 649 if (rs [i] == resval_undef)
602 rs [i] = 0; 650 rs [i] = 0;
… …
608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 656 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
609 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 657 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
610 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 658 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
611 { 659 {
612 rxvt_perl.init (this); 660 rxvt_perl.init (this);
661 enumerate_resources (rxvt_perl_parse_resource);
613 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 662 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
614 } 663 }
615#endif 664#endif
616 665
617 // must be called after initialising the perl interpreter as it 666 // must be called after initialising the perl interpreter as it
… …
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 708 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 709 pointerBlankDelay = i;
661 else 710 else
662 pointerBlankDelay = 2; 711 pointerBlankDelay = 2;
663#endif 712#endif
713
714 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
715 multiClickTime = i;
716 else
717 multiClickTime = 500;
718
719 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
664 720
665 /* no point having a scrollbar without having any scrollback! */ 721 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 722 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 723 set_option (Opt_scrollBar, 0);
668 724
… …
741 envv->push_back (0); 797 envv->push_back (0);
742 798
743 this->argv = argv; 799 this->argv = argv;
744 this->envv = envv; 800 this->envv = envv;
745 801
802 env = new char *[this->envv->size ()];
803 for (int i = 0; i < this->envv->size (); i++)
804 env[i] = this->envv->at (i);
805
746 init2 (argv->size () - 1, argv->begin ()); 806 init2 (argv->size () - 1, argv->begin ());
747} 807}
748 808
749void 809void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 810rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
768void 828void
769rxvt_term::init2 (int argc, const char *const *argv) 829rxvt_term::init2 (int argc, const char *const *argv)
770{ 830{
771 SET_R (this); 831 SET_R (this);
772 set_locale (""); 832 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 833 set_environ (env); // a few things in X do not call setlocale :(
774 834
775 init_vars (); 835 init_vars ();
776 836
777 const char **cmd_argv = init_resources (argc, argv); 837 const char **cmd_argv = init_resources (argc, argv);
778 838
… …
793 if (option (Opt_scrollBar)) 853 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 854 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 855
796 pty = ptytty::create (); 856 pty = ptytty::create ();
797 857
798#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); 858 create_windows (argc, argv);
809 859
810 init_xlocale (); 860 init_xlocale ();
811 861
812 scr_poweron (); // initialize screen 862 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 865 XSynchronize (dpy, True);
816#endif 866#endif
817 867
818 if (option (Opt_scrollBar)) 868 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 869 scrollBar.resize (); /* create and map scrollbar */
870
820#ifdef HAVE_BG_PIXMAP 871#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init (); 872 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 873#endif
852 874
853#if ENABLE_PERL 875#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 876 rootwin_ev.start (display, display->root);
855#endif 877#endif
856 878
857 set_colorfgbg (); 879 init_done = 1;
858 880
859 init_command (cmd_argv); 881 init_command (cmd_argv);
860 882
861 if (pty->pty >= 0) 883 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 884 pty_ev.start (pty->pty, ev::READ);
… …
906/*----------------------------------------------------------------------*/ 928/*----------------------------------------------------------------------*/
907void 929void
908rxvt_term::init_env () 930rxvt_term::init_env ()
909{ 931{
910 char *val; 932 char *val;
933 char *env_display;
934 char *env_windowid;
935 char *env_colorfgbg;
936 char *env_term;
911 937
912#ifdef DISPLAY_IS_IP 938#ifdef DISPLAY_IS_IP
913 /* Fixup display_name for export over pty to any interested terminal 939 /* 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 940 * 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 941 * (for the first non-loopback interface) that we get from
… …
932 958
933 env_display = (char *)rxvt_malloc (strlen (val) + 9); 959 env_display = (char *)rxvt_malloc (strlen (val) + 9);
934 960
935 sprintf (env_display, "DISPLAY=%s", val); 961 sprintf (env_display, "DISPLAY=%s", val);
936 962
963 env_windowid = (char *)rxvt_malloc (21);
937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 964 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
938 965
939 /* add entries to the environment: 966 /* add entries to the environment:
940 * @ DISPLAY: in case we started with -display 967 * @ DISPLAY: in case we started with -display
941 * @ WINDOWID: X window id number of the window 968 * @ WINDOWID: X window id number of the window
… …
945 * @ COLORFGBG: fg;bg color codes 972 * @ COLORFGBG: fg;bg color codes
946 */ 973 */
947 putenv (env_display); 974 putenv (env_display);
948 putenv (env_windowid); 975 putenv (env_windowid);
949 976
950 if (env_colorfgbg) 977 env_colorfgbg = get_colorfgbg ();
951 putenv (env_colorfgbg); 978 putenv (env_colorfgbg);
952 979
953#ifdef RXVT_TERMINFO 980#ifdef RXVT_TERMINFO
954 putenv ("TERMINFO=" RXVT_TERMINFO); 981 putenv ("TERMINFO=" RXVT_TERMINFO);
955#endif 982#endif
956 983
… …
978 1005
979/*----------------------------------------------------------------------*/ 1006/*----------------------------------------------------------------------*/
980void 1007void
981rxvt_term::set_locale (const char *locale) 1008rxvt_term::set_locale (const char *locale)
982{ 1009{
983 set_environ (envv); 1010 set_environ (env);
984 1011
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 1012 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 1013 this->locale = setlocale (LC_CTYPE, locale);
988 1014
989 if (!this->locale) 1015 if (!this->locale)
990 { 1016 {
… …
1001 1027
1002 1028
1003 this->locale = strdup (this->locale); 1029 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 1030 SET_LOCALE (this->locale);
1005 mbstate.reset (); 1031 mbstate.reset ();
1006#endif
1007 1032
1008#if HAVE_NL_LANGINFO 1033#if HAVE_NL_LANGINFO
1009 char *codeset = nl_langinfo (CODESET); 1034 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 1035 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1036 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1018} 1043}
1019 1044
1020void 1045void
1021rxvt_term::init_xlocale () 1046rxvt_term::init_xlocale ()
1022{ 1047{
1023 set_environ (envv); 1048 set_environ (env);
1024 1049
1025#ifdef USE_XIM 1050#if USE_XIM
1026 if (!locale) 1051 if (!locale)
1027 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1052 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1028 else 1053 else
1029 { 1054 {
1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1055 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1080 run_command (argv); 1105 run_command (argv);
1081} 1106}
1082 1107
1083/*----------------------------------------------------------------------*/ 1108/*----------------------------------------------------------------------*/
1084void 1109void
1085rxvt_term::get_colours () 1110rxvt_term::get_colors ()
1086{ 1111{
1087 int i; 1112 int i;
1088 1113
1089#ifdef OFF_FOCUS_FADING 1114#ifdef OFF_FOCUS_FADING
1090 pix_colors = pix_colors_focused; 1115 pix_colors = pix_colors_focused;
1091#endif 1116#endif
1092 1117
1093 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1118 for (i = 0; i < NRS_COLORS; i++)
1094 {
1095 const char *name = rs[Rs_color + i]; 1119 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)) 1120 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 1121
1149 /* 1122 /*
1150 * get scrollBar shadow colors 1123 * get scrollBar shadow colors
1151 * 1124 *
1152 * The calculations of topShadow/bottomShadow values are adapted 1125 * The calculations of topShadow/bottomShadow values are adapted
1153 * from the fvwm window manager. 1126 * from the fvwm window manager.
1154 */ 1127 */
1155#ifdef RXVT_SCROLLBAR 1128#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]); 1129 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1166 1130
1167 rgba cscroll; 1131 rgba cscroll;
1168 pix_colors [Color_scroll].get (cscroll); 1132 pix_colors [Color_scroll].get (cscroll);
1169 1133
1170 /* topShadowColor */ 1134 /* topShadowColor */
1171 if (!pix_colors[Color_topShadow].set (this, 1135 if (!pix_colors[Color_topShadow].set (this,
1172 rgba ( 1136 rgba (
1173 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1137 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1174 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1138 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1175 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1139 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1176 cscroll.a) 1140 cscroll.a)
1177 )) 1141 ))
1178 alias_color (Color_topShadow, Color_White); 1142 alias_color (Color_topShadow, Color_White);
1179 }
1180#endif 1143#endif
1181 1144
1182#ifdef OFF_FOCUS_FADING 1145#ifdef OFF_FOCUS_FADING
1183 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1146 for (i = 0; i < NRS_COLORS; i++)
1184 update_fade_color (i); 1147 update_fade_color (i, true);
1185#endif 1148#endif
1186} 1149}
1187 1150
1188/*----------------------------------------------------------------------*/ 1151/*----------------------------------------------------------------------*/
1189/* color aliases, fg/bg bright-bold */ 1152/* color aliases, fg/bg bright-bold */
1190void 1153void
1191rxvt_term::color_aliases (int idx) 1154rxvt_term::color_aliases (int idx)
1192{ 1155{
1193 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1156 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1194 { 1157 {
1195 int i = atoi (rs[Rs_color + idx]); 1158 int i = atoi (rs[Rs_color + idx]);
1196 1159
1197 if (i >= 8 && i <= 15) 1160 if (i >= 8 && i <= 15)
1198 /* bright colors */ 1161 /* bright colors */
… …
1238 for (j = map->max_keypermod; j--; k++) 1201 for (j = map->max_keypermod; j--; k++)
1239 { 1202 {
1240 if (kc[k] == 0) 1203 if (kc[k] == 0)
1241 break; 1204 break;
1242 1205
1243 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1206 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1244 { 1207 {
1245 case XK_Num_Lock: 1208 case XK_Num_Lock:
1246 ModNumLockMask = modmasks[i - 1]; 1209 ModNumLockMask = modmasks[i - 1];
1247 continue; 1210 continue;
1248 1211
… …
1293} 1256}
1294 1257
1295void 1258void
1296rxvt_term::set_icon (const char *file) 1259rxvt_term::set_icon (const char *file)
1297{ 1260{
1298#ifdef HAVE_AFTERIMAGE 1261#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); 1262 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1351 if (!pixbuf) 1263 if (!pixbuf)
1352 { 1264 {
1353 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1265 rxvt_warn ("Loading image icon failed, continuing without.\n");
1354 return; 1266 return;
… …
1419 Window top, parent; 1331 Window top, parent;
1420 1332
1421 dLocal (Display *, dpy); 1333 dLocal (Display *, dpy);
1422 1334
1423 /* grab colors before netscape does */ 1335 /* grab colors before netscape does */
1424 get_colours (); 1336 get_colors ();
1425 1337
1426 if (!set_fonts ()) 1338 if (!set_fonts ())
1427 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1339 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1428 1340
1429 parent = display->root; 1341 parent = display->root;
… …
1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1386 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1475 &attributes); 1387 &attributes);
1476 1388
1477 this->parent = top; 1389 this->parent = top;
1478 1390
1479 old_width = szHint.width;
1480 old_height = szHint.height;
1481
1482 set_title (rs [Rs_title]); 1391 set_title (rs [Rs_title]);
1483 set_icon_name (rs [Rs_iconName]); 1392 set_icon_name (rs [Rs_iconName]);
1484 1393
1485 classHint.res_name = (char *)rs[Rs_name]; 1394 classHint.res_name = (char *)rs[Rs_name];
1486 classHint.res_class = (char *)RESCLASS; 1395 classHint.res_class = (char *)RESCLASS;
1487 1396
1488 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1397 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1489 wmHint.input = True; 1398 wmHint.input = True;
1490 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1399 wmHint.initial_state = option (Opt_iconic) ? IconicState
1400 : option (Opt_dockapp) ? WithdrawnState
1401 : NormalState;
1491 wmHint.window_group = top; 1402 wmHint.window_group = top;
1492 1403
1493 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1404 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1494 &szHint, &wmHint, &classHint); 1405 &szHint, &wmHint, &classHint);
1495#if ENABLE_EWMH 1406#if ENABLE_EWMH
… …
1497 * set up icon hint 1408 * set up icon hint
1498 * rs [Rs_iconfile] is path to icon 1409 * rs [Rs_iconfile] is path to icon
1499 */ 1410 */
1500 1411
1501 if (rs [Rs_iconfile]) 1412 if (rs [Rs_iconfile])
1502 {
1503 set_icon (rs [Rs_iconfile]); 1413 set_icon (rs [Rs_iconfile]);
1504 }
1505#endif 1414#endif
1506 1415
1507#if ENABLE_FRILLS 1416#if ENABLE_FRILLS
1508 if (mwmhints.flags) 1417 if (mwmhints.flags)
1509 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1418 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1543 | ExposureMask | StructureNotifyMask); 1452 | ExposureMask | StructureNotifyMask);
1544 1453
1545 termwin_ev.start (display, top); 1454 termwin_ev.start (display, top);
1546 1455
1547 /* vt cursor: Black-on-White is standard, but this is more popular */ 1456 /* vt cursor: Black-on-White is standard, but this is more popular */
1457 unsigned int shape = XC_xterm;
1458
1459#ifdef HAVE_XMU
1460 if (rs[Rs_pointerShape])
1461 {
1462 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1463 if (stmp >= 0)
1464 shape = stmp;
1465 }
1466#endif
1467
1548 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1468 TermWin_cursor = XCreateFontCursor (dpy, shape);
1549 1469
1550 /* the vt window */ 1470 /* the vt window */
1551 vt = XCreateSimpleWindow (dpy, top, 1471 vt = XCreateSimpleWindow (dpy, top,
1552 window_vt_x, window_vt_y, 1472 window_vt_x, window_vt_y,
1553 width, height, 1473 vt_width, vt_height,
1554 0, 1474 0,
1555 pix_colors_focused[Color_fg], 1475 pix_colors_focused[Color_fg],
1556 pix_colors_focused[Color_bg]); 1476 pix_colors_focused[Color_bg]);
1557 1477
1558 attributes.bit_gravity = NorthWestGravity; 1478 attributes.bit_gravity = NorthWestGravity;
… …
1585 if (rs[Rs_fade]) 1505 if (rs[Rs_fade])
1586 pix_colors = pix_colors_unfocused; 1506 pix_colors = pix_colors_unfocused;
1587#endif 1507#endif
1588 1508
1589 pointer_unblank (); 1509 pointer_unblank ();
1590 scr_recolour (); 1510 scr_recolor ();
1591} 1511}
1592 1512
1593/*----------------------------------------------------------------------*/ 1513/*----------------------------------------------------------------------*/
1594/* 1514/*
1595 * Run the command in a subprocess and return a file descriptor for the 1515 * Run the command in a subprocess and return a file descriptor for the
… …
1676 1596
1677 _exit (EXIT_FAILURE); 1597 _exit (EXIT_FAILURE);
1678 1598
1679 default: 1599 default:
1680 if (!option (Opt_utmpInhibit)) 1600 if (!option (Opt_utmpInhibit))
1601 {
1602#ifdef LOG_ONLY_ON_LOGIN
1603 bool login_shell = option (Opt_loginShell);
1604#else
1605 bool login_shell = true;
1606#endif
1681 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1607 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1608 }
1682 1609
1683 pty->close_tty (); 1610 pty->close_tty ();
1684 1611
1685 child_ev.start (cmd_pid); 1612 child_ev.start (cmd_pid);
1686 1613
… …
1711#elif defined (SRIOCSREDIR) 1638#elif defined (SRIOCSREDIR)
1712 int fd; 1639 int fd;
1713 1640
1714 fd = open (CONSOLE, O_WRONLY, 0); 1641 fd = open (CONSOLE, O_WRONLY, 0);
1715 if (fd >= 0) 1642 if (fd >= 0)
1716 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1643 {
1644 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1717 close (fd); 1645 close (fd);
1646 }
1718#endif /* SRIOCSREDIR */ 1647#endif /* SRIOCSREDIR */
1719 } 1648 }
1720 1649
1721 /* reset signals and spin off the command interpreter */ 1650 /* reset signals and spin off the command interpreter */
1722 signal (SIGINT, SIG_DFL); 1651 signal (SIGINT, SIG_DFL);

Diff Legend

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