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.314 by sf-exg, Mon Jan 9 15:30:17 2012 UTC vs.
Revision 1.346 by sf-exg, Tue Jun 21 12:03:56 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
… …
590 xa = display->xa; 628 xa = display->xa;
591 629
592 set (display); 630 set (display);
593 extract_resources (); 631 extract_resources ();
594 632
595#if XFT 633#if ENABLE_FRILLS
596 if (rs[Rs_depth]) 634 if (rs[Rs_visual])
597 select_visual (strtol (rs[Rs_depth], 0, 0)); 635 select_visual (strtol (rs[Rs_visual], 0, 0));
636 else if (rs[Rs_depth])
637 select_depth (strtol (rs[Rs_depth], 0, 0));
598#endif 638#endif
599 639
600 for (int i = NUM_RESOURCES; i--; ) 640 for (int i = NUM_RESOURCES; i--; )
601 if (rs [i] == resval_undef) 641 if (rs [i] == resval_undef)
602 rs [i] = 0; 642 rs [i] = 0;
… …
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 699 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 700 pointerBlankDelay = i;
661 else 701 else
662 pointerBlankDelay = 2; 702 pointerBlankDelay = 2;
663#endif 703#endif
704
705 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
706 multiClickTime = i;
707 else
708 multiClickTime = 500;
709
710 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
664 711
665 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 713 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
668 715
… …
741 envv->push_back (0); 788 envv->push_back (0);
742 789
743 this->argv = argv; 790 this->argv = argv;
744 this->envv = envv; 791 this->envv = envv;
745 792
793 env = new char *[this->envv->size ()];
794 for (int i = 0; i < this->envv->size (); i++)
795 env[i] = this->envv->at (i);
796
746 init2 (argv->size () - 1, argv->begin ()); 797 init2 (argv->size () - 1, argv->begin ());
747} 798}
748 799
749void 800void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 801rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
768void 819void
769rxvt_term::init2 (int argc, const char *const *argv) 820rxvt_term::init2 (int argc, const char *const *argv)
770{ 821{
771 SET_R (this); 822 SET_R (this);
772 set_locale (""); 823 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 824 set_environ (env); // a few things in X do not call setlocale :(
774 825
775 init_vars (); 826 init_vars ();
776 827
777 const char **cmd_argv = init_resources (argc, argv); 828 const char **cmd_argv = init_resources (argc, argv);
778 829
… …
793 if (option (Opt_scrollBar)) 844 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 845 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 846
796 pty = ptytty::create (); 847 pty = ptytty::create ();
797 848
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); 849 create_windows (argc, argv);
809 850
810 init_xlocale (); 851 init_xlocale ();
811 852
812 scr_poweron (); // initialize screen 853 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 856 XSynchronize (dpy, True);
816#endif 857#endif
817 858
818 if (option (Opt_scrollBar)) 859 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 860 scrollBar.resize (); /* create and map scrollbar */
861
820#ifdef HAVE_BG_PIXMAP 862#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init (); 863 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 864#endif
852 865
853#if ENABLE_PERL 866#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 867 rootwin_ev.start (display, display->root);
855#endif 868#endif
856 869
857 set_colorfgbg (); 870 init_done = 1;
858 871
859 init_command (cmd_argv); 872 init_command (cmd_argv);
860 873
861 if (pty->pty >= 0) 874 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 875 pty_ev.start (pty->pty, ev::READ);
… …
907void 920void
908rxvt_term::init_env () 921rxvt_term::init_env ()
909{ 922{
910 char *val; 923 char *val;
911 char *env_display; 924 char *env_display;
925 char *env_windowid;
926 char *env_colorfgbg;
912 char *env_term; 927 char *env_term;
913 928
914#ifdef DISPLAY_IS_IP 929#ifdef DISPLAY_IS_IP
915 /* Fixup display_name for export over pty to any interested terminal 930 /* Fixup display_name for export over pty to any interested terminal
916 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 931 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
934 949
935 env_display = (char *)rxvt_malloc (strlen (val) + 9); 950 env_display = (char *)rxvt_malloc (strlen (val) + 9);
936 951
937 sprintf (env_display, "DISPLAY=%s", val); 952 sprintf (env_display, "DISPLAY=%s", val);
938 953
954 env_windowid = (char *)rxvt_malloc (21);
939 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 955 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
940 956
941 /* add entries to the environment: 957 /* add entries to the environment:
942 * @ DISPLAY: in case we started with -display 958 * @ DISPLAY: in case we started with -display
943 * @ WINDOWID: X window id number of the window 959 * @ WINDOWID: X window id number of the window
… …
947 * @ COLORFGBG: fg;bg color codes 963 * @ COLORFGBG: fg;bg color codes
948 */ 964 */
949 putenv (env_display); 965 putenv (env_display);
950 putenv (env_windowid); 966 putenv (env_windowid);
951 967
952 if (env_colorfgbg) 968 env_colorfgbg = get_colorfgbg ();
953 putenv (env_colorfgbg); 969 putenv (env_colorfgbg);
954 970
955#ifdef RXVT_TERMINFO 971#ifdef RXVT_TERMINFO
956 putenv ("TERMINFO=" RXVT_TERMINFO); 972 putenv ("TERMINFO=" RXVT_TERMINFO);
957#endif 973#endif
958 974
… …
980 996
981/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
982void 998void
983rxvt_term::set_locale (const char *locale) 999rxvt_term::set_locale (const char *locale)
984{ 1000{
985 set_environ (envv); 1001 set_environ (env);
986 1002
987#if HAVE_XSETLOCALE || HAVE_SETLOCALE
988 free (this->locale); 1003 free (this->locale);
989 this->locale = setlocale (LC_CTYPE, locale); 1004 this->locale = setlocale (LC_CTYPE, locale);
990 1005
991 if (!this->locale) 1006 if (!this->locale)
992 { 1007 {
… …
1003 1018
1004 1019
1005 this->locale = strdup (this->locale); 1020 this->locale = strdup (this->locale);
1006 SET_LOCALE (this->locale); 1021 SET_LOCALE (this->locale);
1007 mbstate.reset (); 1022 mbstate.reset ();
1008#endif
1009 1023
1010#if HAVE_NL_LANGINFO 1024#if HAVE_NL_LANGINFO
1011 char *codeset = nl_langinfo (CODESET); 1025 char *codeset = nl_langinfo (CODESET);
1012 // /^UTF.?8/i 1026 // /^UTF.?8/i
1013 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1027 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1020} 1034}
1021 1035
1022void 1036void
1023rxvt_term::init_xlocale () 1037rxvt_term::init_xlocale ()
1024{ 1038{
1025 set_environ (envv); 1039 set_environ (env);
1026 1040
1027#ifdef USE_XIM 1041#if USE_XIM
1028 if (!locale) 1042 if (!locale)
1029 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1043 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1030 else 1044 else
1031 { 1045 {
1032 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1046 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1082 run_command (argv); 1096 run_command (argv);
1083} 1097}
1084 1098
1085/*----------------------------------------------------------------------*/ 1099/*----------------------------------------------------------------------*/
1086void 1100void
1087rxvt_term::get_colours () 1101rxvt_term::get_colors ()
1088{ 1102{
1089 int i; 1103 int i;
1090 1104
1091#ifdef OFF_FOCUS_FADING 1105#ifdef OFF_FOCUS_FADING
1092 pix_colors = pix_colors_focused; 1106 pix_colors = pix_colors_focused;
1093#endif 1107#endif
1094 1108
1095 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1109 for (i = 0; i < NRS_COLORS; i++)
1096 {
1097 const char *name = rs[Rs_color + i]; 1110 if (const char *name = rs[Rs_color + i])
1098
1099 if (!name)
1100 continue;
1101
1102 rxvt_color xcol;
1103
1104 if (!set_color (xcol, name)) 1111 set_color (pix_colors [i], name);
1105 {
1106#ifndef XTERM_REVERSE_VIDEO
1107 if (i < 2 && option (Opt_reverseVideo))
1108 name = def_colorName [1 - i];
1109 else
1110#endif
1111 name = def_colorName [i];
1112
1113 if (!name)
1114 continue;
1115
1116 if (!set_color (xcol, name))
1117 {
1118 switch (i)
1119 {
1120 case Color_fg:
1121 case Color_bg:
1122 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1123 name = "";
1124 break;
1125#ifndef NO_CURSORCOLOR
1126 case Color_cursor2:
1127#endif
1128 case Color_pointer_fg:
1129 name = rs[Rs_color + Color_fg];
1130 xcol.set (this, name);
1131 break;
1132 default:
1133 name = rs[Rs_color + Color_bg];
1134 xcol.set (this, name);
1135 break;
1136 }
1137 }
1138 }
1139
1140 pix_colors[i] = xcol;
1141 rs[Rs_color + i] = name;
1142 }
1143
1144 if (depth <= 2)
1145 {
1146 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1147 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1148 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1149 }
1150 1112
1151 /* 1113 /*
1152 * get scrollBar shadow colors 1114 * get scrollBar shadow colors
1153 * 1115 *
1154 * The calculations of topShadow/bottomShadow values are adapted 1116 * The calculations of topShadow/bottomShadow values are adapted
1155 * from the fvwm window manager. 1117 * from the fvwm window manager.
1156 */ 1118 */
1157#ifdef RXVT_SCROLLBAR 1119#ifdef RXVT_SCROLLBAR
1158 if (depth <= 2)
1159 {
1160 /* Monochrome */
1161 alias_color (Color_scroll, Color_fg);
1162 alias_color (Color_topShadow, Color_bg);
1163 alias_color (Color_bottomShadow, Color_bg);
1164 }
1165 else
1166 {
1167 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1120 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1168 1121
1169 rgba cscroll; 1122 rgba cscroll;
1170 pix_colors [Color_scroll].get (cscroll); 1123 pix_colors [Color_scroll].get (cscroll);
1171 1124
1172 /* topShadowColor */ 1125 /* topShadowColor */
1173 if (!pix_colors[Color_topShadow].set (this, 1126 if (!pix_colors[Color_topShadow].set (this,
1174 rgba ( 1127 rgba (
1175 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1128 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1176 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1129 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1177 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1130 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1178 cscroll.a) 1131 cscroll.a)
1179 )) 1132 ))
1180 alias_color (Color_topShadow, Color_White); 1133 alias_color (Color_topShadow, Color_White);
1181 }
1182#endif 1134#endif
1183 1135
1184#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1185 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1137 for (i = 0; i < NRS_COLORS; i++)
1186 update_fade_color (i); 1138 update_fade_color (i, true);
1187#endif 1139#endif
1188} 1140}
1189 1141
1190/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
1191/* color aliases, fg/bg bright-bold */ 1143/* color aliases, fg/bg bright-bold */
1192void 1144void
1193rxvt_term::color_aliases (int idx) 1145rxvt_term::color_aliases (int idx)
1194{ 1146{
1195 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1147 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1196 { 1148 {
1197 int i = atoi (rs[Rs_color + idx]); 1149 int i = atoi (rs[Rs_color + idx]);
1198 1150
1199 if (i >= 8 && i <= 15) 1151 if (i >= 8 && i <= 15)
1200 /* bright colors */ 1152 /* bright colors */
… …
1240 for (j = map->max_keypermod; j--; k++) 1192 for (j = map->max_keypermod; j--; k++)
1241 { 1193 {
1242 if (kc[k] == 0) 1194 if (kc[k] == 0)
1243 break; 1195 break;
1244 1196
1245 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1197 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1246 { 1198 {
1247 case XK_Num_Lock: 1199 case XK_Num_Lock:
1248 ModNumLockMask = modmasks[i - 1]; 1200 ModNumLockMask = modmasks[i - 1];
1249 continue; 1201 continue;
1250 1202
… …
1295} 1247}
1296 1248
1297void 1249void
1298rxvt_term::set_icon (const char *file) 1250rxvt_term::set_icon (const char *file)
1299{ 1251{
1300#ifdef HAVE_AFTERIMAGE 1252#if HAVE_PIXBUF && ENABLE_EWMH
1301 init_asv ();
1302
1303 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1304 if (!im)
1305 {
1306 rxvt_warn ("Loading image icon failed, continuing without.\n");
1307 return;
1308 }
1309
1310 unsigned int w = im->width;
1311 unsigned int h = im->height;
1312
1313 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1314 {
1315 rxvt_warn ("Icon image too big, continuing without.\n");
1316 destroy_asimage (&im);
1317 return;
1318 }
1319
1320 ASImage *result = scale_asimage (asv, im,
1321 w, h, ASA_ARGB32,
1322 100, ASIMAGE_QUALITY_DEFAULT);
1323 destroy_asimage (&im);
1324
1325 if (!result)
1326 {
1327 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1328 return;
1329 }
1330
1331 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1332 if (buffer)
1333 {
1334 ARGB32 *asbuf = result->alt.argb32;
1335 buffer [0] = w;
1336 buffer [1] = h;
1337
1338 for (unsigned int i = 0; i < w * h; ++i)
1339 buffer [i + 2] = asbuf [i];
1340
1341 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1342 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1343 free (buffer);
1344 }
1345 else
1346 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1347
1348 destroy_asimage (&result);
1349#endif
1350
1351#ifdef HAVE_PIXBUF
1352 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1253 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1353 if (!pixbuf) 1254 if (!pixbuf)
1354 { 1255 {
1355 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1256 rxvt_warn ("Loading image icon failed, continuing without.\n");
1356 return; 1257 return;
… …
1421 Window top, parent; 1322 Window top, parent;
1422 1323
1423 dLocal (Display *, dpy); 1324 dLocal (Display *, dpy);
1424 1325
1425 /* grab colors before netscape does */ 1326 /* grab colors before netscape does */
1426 get_colours (); 1327 get_colors ();
1427 1328
1428 if (!set_fonts ()) 1329 if (!set_fonts ())
1429 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1330 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1430 1331
1431 parent = display->root; 1332 parent = display->root;
… …
1484 classHint.res_name = (char *)rs[Rs_name]; 1385 classHint.res_name = (char *)rs[Rs_name];
1485 classHint.res_class = (char *)RESCLASS; 1386 classHint.res_class = (char *)RESCLASS;
1486 1387
1487 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1388 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1488 wmHint.input = True; 1389 wmHint.input = True;
1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1390 wmHint.initial_state = option (Opt_iconic) ? IconicState
1391 : option (Opt_dockapp) ? WithdrawnState
1392 : NormalState;
1490 wmHint.window_group = top; 1393 wmHint.window_group = top;
1491 1394
1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1395 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1493 &szHint, &wmHint, &classHint); 1396 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH 1397#if ENABLE_EWMH
… …
1496 * set up icon hint 1399 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon 1400 * rs [Rs_iconfile] is path to icon
1498 */ 1401 */
1499 1402
1500 if (rs [Rs_iconfile]) 1403 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]); 1404 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif 1405#endif
1505 1406
1506#if ENABLE_FRILLS 1407#if ENABLE_FRILLS
1507 if (mwmhints.flags) 1408 if (mwmhints.flags)
1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1409 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1542 | ExposureMask | StructureNotifyMask); 1443 | ExposureMask | StructureNotifyMask);
1543 1444
1544 termwin_ev.start (display, top); 1445 termwin_ev.start (display, top);
1545 1446
1546 /* vt cursor: Black-on-White is standard, but this is more popular */ 1447 /* vt cursor: Black-on-White is standard, but this is more popular */
1448 unsigned int shape = XC_xterm;
1449
1450#ifdef HAVE_XMU
1451 if (rs[Rs_pointerShape])
1452 {
1453 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1454 if (stmp >= 0)
1455 shape = stmp;
1456 }
1457#endif
1458
1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, shape);
1548 1460
1549 /* the vt window */ 1461 /* the vt window */
1550 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1551 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1552 width, height, 1464 vt_width, vt_height,
1553 0, 1465 0,
1554 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1555 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1556 1468
1557 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
… …
1584 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1585 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1586#endif 1498#endif
1587 1499
1588 pointer_unblank (); 1500 pointer_unblank ();
1589 scr_recolour (); 1501 scr_recolor ();
1590} 1502}
1591 1503
1592/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1593/* 1505/*
1594 * Run the command in a subprocess and return a file descriptor for the 1506 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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