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.344 by sf-exg, Tue Jun 16 11:58:26 2015 UTC

… …
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 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * 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 18 * 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 19 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
21 * 21 *
22 * This program is distributed in the hope that it will be useful, 22 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 23 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46
47#ifdef HAVE_XMU
48# include <X11/Xmu/CurUtil.h>
49#endif
46 50
47#ifdef HAVE_XSETLOCALE 51#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 52# define X_LOCALE
49# include <X11/Xlocale.h> 53# include <X11/Xlocale.h>
50#else 54#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 55# include <locale.h>
53# endif
54#endif 56#endif
55 57
56#ifdef HAVE_NL_LANGINFO 58#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 59# include <langinfo.h>
58#endif 60#endif
… …
78#include <netinet/in.h> 80#include <netinet/in.h>
79#include <arpa/inet.h> 81#include <arpa/inet.h>
80#include <net/if.h> 82#include <net/if.h>
81#include <net/if_arp.h> 83#include <net/if_arp.h>
82 84
83static char * 85static char * ecb_cold
84rxvt_network_display (const char *display) 86rxvt_network_display (const char *display)
85{ 87{
86 char buffer[1024], *rval = NULL; 88 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 89 struct ifconf ifc;
88 struct ifreq *ifr; 90 struct ifreq *ifr;
… …
521#endif 523#endif
522 COLOR_SCROLLBAR, 524 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 525#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 526 COLOR_SCROLLTROUGH,
525#endif 527#endif
526#if ENABLE_TRANSPARENCY 528#if BG_IMAGE_FROM_ROOT
527 NULL, 529 NULL,
528#endif 530#endif
529#if OFF_FOCUS_FADING 531#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 532 "rgb:00/00/00",
531#endif 533#endif
… …
590 xa = display->xa; 592 xa = display->xa;
591 593
592 set (display); 594 set (display);
593 extract_resources (); 595 extract_resources ();
594 596
595#if XFT 597#if ENABLE_FRILLS
596 if (rs[Rs_depth]) 598 if (rs[Rs_visual])
597 select_visual (strtol (rs[Rs_depth], 0, 0)); 599 select_visual (strtol (rs[Rs_visual], 0, 0));
600 else if (rs[Rs_depth])
601 select_depth (strtol (rs[Rs_depth], 0, 0));
598#endif 602#endif
599 603
600 for (int i = NUM_RESOURCES; i--; ) 604 for (int i = NUM_RESOURCES; i--; )
601 if (rs [i] == resval_undef) 605 if (rs [i] == resval_undef)
602 rs [i] = 0; 606 rs [i] = 0;
… …
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 663 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 664 pointerBlankDelay = i;
661 else 665 else
662 pointerBlankDelay = 2; 666 pointerBlankDelay = 2;
663#endif 667#endif
668
669 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
670 multiClickTime = i;
671 else
672 multiClickTime = 500;
673
674 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
664 675
665 /* no point having a scrollbar without having any scrollback! */ 676 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 677 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 678 set_option (Opt_scrollBar, 0);
668 679
… …
741 envv->push_back (0); 752 envv->push_back (0);
742 753
743 this->argv = argv; 754 this->argv = argv;
744 this->envv = envv; 755 this->envv = envv;
745 756
757 env = new char *[this->envv->size ()];
758 for (int i = 0; i < this->envv->size (); i++)
759 env[i] = this->envv->at (i);
760
746 init2 (argv->size () - 1, argv->begin ()); 761 init2 (argv->size () - 1, argv->begin ());
747} 762}
748 763
749void 764void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 765rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
768void 783void
769rxvt_term::init2 (int argc, const char *const *argv) 784rxvt_term::init2 (int argc, const char *const *argv)
770{ 785{
771 SET_R (this); 786 SET_R (this);
772 set_locale (""); 787 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 788 set_environ (env); // a few things in X do not call setlocale :(
774 789
775 init_vars (); 790 init_vars ();
776 791
777 const char **cmd_argv = init_resources (argc, argv); 792 const char **cmd_argv = init_resources (argc, argv);
778 793
… …
793 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 809 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 810
796 pty = ptytty::create (); 811 pty = ptytty::create ();
797 812
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); 813 create_windows (argc, argv);
809 814
810 init_xlocale (); 815 init_xlocale ();
811 816
812 scr_poweron (); // initialize screen 817 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 820 XSynchronize (dpy, True);
816#endif 821#endif
817 822
818 if (option (Opt_scrollBar)) 823 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 824 scrollBar.resize (); /* create and map scrollbar */
825
820#ifdef HAVE_BG_PIXMAP 826#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init (); 827 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 828#endif
852 829
853#if ENABLE_PERL 830#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 831 rootwin_ev.start (display, display->root);
855#endif 832#endif
856 833
857 set_colorfgbg (); 834 init_done = 1;
858 835
859 init_command (cmd_argv); 836 init_command (cmd_argv);
860 837
861 if (pty->pty >= 0) 838 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 839 pty_ev.start (pty->pty, ev::READ);
… …
907void 884void
908rxvt_term::init_env () 885rxvt_term::init_env ()
909{ 886{
910 char *val; 887 char *val;
911 char *env_display; 888 char *env_display;
889 char *env_windowid;
890 char *env_colorfgbg;
912 char *env_term; 891 char *env_term;
913 892
914#ifdef DISPLAY_IS_IP 893#ifdef DISPLAY_IS_IP
915 /* Fixup display_name for export over pty to any interested terminal 894 /* 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 895 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
934 913
935 env_display = (char *)rxvt_malloc (strlen (val) + 9); 914 env_display = (char *)rxvt_malloc (strlen (val) + 9);
936 915
937 sprintf (env_display, "DISPLAY=%s", val); 916 sprintf (env_display, "DISPLAY=%s", val);
938 917
918 env_windowid = (char *)rxvt_malloc (21);
939 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
940 920
941 /* add entries to the environment: 921 /* add entries to the environment:
942 * @ DISPLAY: in case we started with -display 922 * @ DISPLAY: in case we started with -display
943 * @ WINDOWID: X window id number of the window 923 * @ WINDOWID: X window id number of the window
… …
947 * @ COLORFGBG: fg;bg color codes 927 * @ COLORFGBG: fg;bg color codes
948 */ 928 */
949 putenv (env_display); 929 putenv (env_display);
950 putenv (env_windowid); 930 putenv (env_windowid);
951 931
952 if (env_colorfgbg) 932 env_colorfgbg = get_colorfgbg ();
953 putenv (env_colorfgbg); 933 putenv (env_colorfgbg);
954 934
955#ifdef RXVT_TERMINFO 935#ifdef RXVT_TERMINFO
956 putenv ("TERMINFO=" RXVT_TERMINFO); 936 putenv ("TERMINFO=" RXVT_TERMINFO);
957#endif 937#endif
958 938
… …
980 960
981/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
982void 962void
983rxvt_term::set_locale (const char *locale) 963rxvt_term::set_locale (const char *locale)
984{ 964{
985 set_environ (envv); 965 set_environ (env);
986 966
987#if HAVE_XSETLOCALE || HAVE_SETLOCALE
988 free (this->locale); 967 free (this->locale);
989 this->locale = setlocale (LC_CTYPE, locale); 968 this->locale = setlocale (LC_CTYPE, locale);
990 969
991 if (!this->locale) 970 if (!this->locale)
992 { 971 {
… …
1003 982
1004 983
1005 this->locale = strdup (this->locale); 984 this->locale = strdup (this->locale);
1006 SET_LOCALE (this->locale); 985 SET_LOCALE (this->locale);
1007 mbstate.reset (); 986 mbstate.reset ();
1008#endif
1009 987
1010#if HAVE_NL_LANGINFO 988#if HAVE_NL_LANGINFO
1011 char *codeset = nl_langinfo (CODESET); 989 char *codeset = nl_langinfo (CODESET);
1012 // /^UTF.?8/i 990 // /^UTF.?8/i
1013 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 991 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1020} 998}
1021 999
1022void 1000void
1023rxvt_term::init_xlocale () 1001rxvt_term::init_xlocale ()
1024{ 1002{
1025 set_environ (envv); 1003 set_environ (env);
1026 1004
1027#ifdef USE_XIM 1005#if USE_XIM
1028 if (!locale) 1006 if (!locale)
1029 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1007 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1030 else 1008 else
1031 { 1009 {
1032 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1010 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1082 run_command (argv); 1060 run_command (argv);
1083} 1061}
1084 1062
1085/*----------------------------------------------------------------------*/ 1063/*----------------------------------------------------------------------*/
1086void 1064void
1087rxvt_term::get_colours () 1065rxvt_term::get_colors ()
1088{ 1066{
1089 int i; 1067 int i;
1090 1068
1091#ifdef OFF_FOCUS_FADING 1069#ifdef OFF_FOCUS_FADING
1092 pix_colors = pix_colors_focused; 1070 pix_colors = pix_colors_focused;
1093#endif 1071#endif
1094 1072
1095 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1073 for (i = 0; i < NRS_COLORS; i++)
1096 {
1097 const char *name = rs[Rs_color + i]; 1074 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)) 1075 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 1076
1151 /* 1077 /*
1152 * get scrollBar shadow colors 1078 * get scrollBar shadow colors
1153 * 1079 *
1154 * The calculations of topShadow/bottomShadow values are adapted 1080 * The calculations of topShadow/bottomShadow values are adapted
1155 * from the fvwm window manager. 1081 * from the fvwm window manager.
1156 */ 1082 */
1157#ifdef RXVT_SCROLLBAR 1083#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]); 1084 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1168 1085
1169 rgba cscroll; 1086 rgba cscroll;
1170 pix_colors [Color_scroll].get (cscroll); 1087 pix_colors [Color_scroll].get (cscroll);
1171 1088
1172 /* topShadowColor */ 1089 /* topShadowColor */
1173 if (!pix_colors[Color_topShadow].set (this, 1090 if (!pix_colors[Color_topShadow].set (this,
1174 rgba ( 1091 rgba (
1175 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1092 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), 1093 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), 1094 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1178 cscroll.a) 1095 cscroll.a)
1179 )) 1096 ))
1180 alias_color (Color_topShadow, Color_White); 1097 alias_color (Color_topShadow, Color_White);
1181 }
1182#endif 1098#endif
1183 1099
1184#ifdef OFF_FOCUS_FADING 1100#ifdef OFF_FOCUS_FADING
1185 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1101 for (i = 0; i < NRS_COLORS; i++)
1186 update_fade_color (i); 1102 update_fade_color (i, true);
1187#endif 1103#endif
1188} 1104}
1189 1105
1190/*----------------------------------------------------------------------*/ 1106/*----------------------------------------------------------------------*/
1191/* color aliases, fg/bg bright-bold */ 1107/* color aliases, fg/bg bright-bold */
1192void 1108void
1193rxvt_term::color_aliases (int idx) 1109rxvt_term::color_aliases (int idx)
1194{ 1110{
1195 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1111 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1196 { 1112 {
1197 int i = atoi (rs[Rs_color + idx]); 1113 int i = atoi (rs[Rs_color + idx]);
1198 1114
1199 if (i >= 8 && i <= 15) 1115 if (i >= 8 && i <= 15)
1200 /* bright colors */ 1116 /* bright colors */
… …
1240 for (j = map->max_keypermod; j--; k++) 1156 for (j = map->max_keypermod; j--; k++)
1241 { 1157 {
1242 if (kc[k] == 0) 1158 if (kc[k] == 0)
1243 break; 1159 break;
1244 1160
1245 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1161 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1246 { 1162 {
1247 case XK_Num_Lock: 1163 case XK_Num_Lock:
1248 ModNumLockMask = modmasks[i - 1]; 1164 ModNumLockMask = modmasks[i - 1];
1249 continue; 1165 continue;
1250 1166
… …
1295} 1211}
1296 1212
1297void 1213void
1298rxvt_term::set_icon (const char *file) 1214rxvt_term::set_icon (const char *file)
1299{ 1215{
1300#ifdef HAVE_AFTERIMAGE 1216#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); 1217 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1353 if (!pixbuf) 1218 if (!pixbuf)
1354 { 1219 {
1355 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1220 rxvt_warn ("Loading image icon failed, continuing without.\n");
1356 return; 1221 return;
… …
1421 Window top, parent; 1286 Window top, parent;
1422 1287
1423 dLocal (Display *, dpy); 1288 dLocal (Display *, dpy);
1424 1289
1425 /* grab colors before netscape does */ 1290 /* grab colors before netscape does */
1426 get_colours (); 1291 get_colors ();
1427 1292
1428 if (!set_fonts ()) 1293 if (!set_fonts ())
1429 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1294 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1430 1295
1431 parent = display->root; 1296 parent = display->root;
… …
1484 classHint.res_name = (char *)rs[Rs_name]; 1349 classHint.res_name = (char *)rs[Rs_name];
1485 classHint.res_class = (char *)RESCLASS; 1350 classHint.res_class = (char *)RESCLASS;
1486 1351
1487 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1352 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1488 wmHint.input = True; 1353 wmHint.input = True;
1489 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1354 wmHint.initial_state = option (Opt_iconic) ? IconicState
1355 : option (Opt_dockapp) ? WithdrawnState
1356 : NormalState;
1490 wmHint.window_group = top; 1357 wmHint.window_group = top;
1491 1358
1492 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1359 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1493 &szHint, &wmHint, &classHint); 1360 &szHint, &wmHint, &classHint);
1494#if ENABLE_EWMH 1361#if ENABLE_EWMH
… …
1496 * set up icon hint 1363 * set up icon hint
1497 * rs [Rs_iconfile] is path to icon 1364 * rs [Rs_iconfile] is path to icon
1498 */ 1365 */
1499 1366
1500 if (rs [Rs_iconfile]) 1367 if (rs [Rs_iconfile])
1501 {
1502 set_icon (rs [Rs_iconfile]); 1368 set_icon (rs [Rs_iconfile]);
1503 }
1504#endif 1369#endif
1505 1370
1506#if ENABLE_FRILLS 1371#if ENABLE_FRILLS
1507 if (mwmhints.flags) 1372 if (mwmhints.flags)
1508 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1373 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1542 | ExposureMask | StructureNotifyMask); 1407 | ExposureMask | StructureNotifyMask);
1543 1408
1544 termwin_ev.start (display, top); 1409 termwin_ev.start (display, top);
1545 1410
1546 /* vt cursor: Black-on-White is standard, but this is more popular */ 1411 /* vt cursor: Black-on-White is standard, but this is more popular */
1412 unsigned int shape = XC_xterm;
1413
1414#ifdef HAVE_XMU
1415 if (rs[Rs_pointerShape])
1416 {
1417 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1418 if (stmp >= 0)
1419 shape = stmp;
1420 }
1421#endif
1422
1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1423 TermWin_cursor = XCreateFontCursor (dpy, shape);
1548 1424
1549 /* the vt window */ 1425 /* the vt window */
1550 vt = XCreateSimpleWindow (dpy, top, 1426 vt = XCreateSimpleWindow (dpy, top,
1551 window_vt_x, window_vt_y, 1427 window_vt_x, window_vt_y,
1552 width, height, 1428 vt_width, vt_height,
1553 0, 1429 0,
1554 pix_colors_focused[Color_fg], 1430 pix_colors_focused[Color_fg],
1555 pix_colors_focused[Color_bg]); 1431 pix_colors_focused[Color_bg]);
1556 1432
1557 attributes.bit_gravity = NorthWestGravity; 1433 attributes.bit_gravity = NorthWestGravity;
… …
1584 if (rs[Rs_fade]) 1460 if (rs[Rs_fade])
1585 pix_colors = pix_colors_unfocused; 1461 pix_colors = pix_colors_unfocused;
1586#endif 1462#endif
1587 1463
1588 pointer_unblank (); 1464 pointer_unblank ();
1589 scr_recolour (); 1465 scr_recolor ();
1590} 1466}
1591 1467
1592/*----------------------------------------------------------------------*/ 1468/*----------------------------------------------------------------------*/
1593/* 1469/*
1594 * Run the command in a subprocess and return a file descriptor for the 1470 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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