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.312 by sf-exg, Tue Dec 27 11:09:31 2011 UTC vs.
Revision 1.345 by sf-exg, Tue Oct 13 08:10:43 2015 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;
… …
521#endif 524#endif
522 COLOR_SCROLLBAR, 525 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 526#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 527 COLOR_SCROLLTROUGH,
525#endif 528#endif
526#if ENABLE_TRANSPARENCY 529#if BG_IMAGE_FROM_ROOT
527 NULL, 530 NULL,
528#endif 531#endif
529#if OFF_FOCUS_FADING 532#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 533 "rgb:00/00/00",
531#endif 534#endif
… …
590 xa = display->xa; 593 xa = display->xa;
591 594
592 set (display); 595 set (display);
593 extract_resources (); 596 extract_resources ();
594 597
595#if XFT 598#if ENABLE_FRILLS
596 if (rs[Rs_depth]) 599 if (rs[Rs_visual])
597 select_visual (strtol (rs[Rs_depth], 0, 0)); 600 select_visual (strtol (rs[Rs_visual], 0, 0));
601 else if (rs[Rs_depth])
602 select_depth (strtol (rs[Rs_depth], 0, 0));
598#endif 603#endif
599 604
600 for (int i = NUM_RESOURCES; i--; ) 605 for (int i = NUM_RESOURCES; i--; )
601 if (rs [i] == resval_undef) 606 if (rs [i] == resval_undef)
602 rs [i] = 0; 607 rs [i] = 0;
… …
659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 664 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
660 pointerBlankDelay = i; 665 pointerBlankDelay = i;
661 else 666 else
662 pointerBlankDelay = 2; 667 pointerBlankDelay = 2;
663#endif 668#endif
669
670 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
671 multiClickTime = i;
672 else
673 multiClickTime = 500;
674
675 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
664 676
665 /* no point having a scrollbar without having any scrollback! */ 677 /* no point having a scrollbar without having any scrollback! */
666 if (!saveLines) 678 if (!saveLines)
667 set_option (Opt_scrollBar, 0); 679 set_option (Opt_scrollBar, 0);
668 680
… …
741 envv->push_back (0); 753 envv->push_back (0);
742 754
743 this->argv = argv; 755 this->argv = argv;
744 this->envv = envv; 756 this->envv = envv;
745 757
758 env = new char *[this->envv->size ()];
759 for (int i = 0; i < this->envv->size (); i++)
760 env[i] = this->envv->at (i);
761
746 init2 (argv->size () - 1, argv->begin ()); 762 init2 (argv->size () - 1, argv->begin ());
747} 763}
748 764
749void 765void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 766rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
768void 784void
769rxvt_term::init2 (int argc, const char *const *argv) 785rxvt_term::init2 (int argc, const char *const *argv)
770{ 786{
771 SET_R (this); 787 SET_R (this);
772 set_locale (""); 788 set_locale ("");
773 set_environ (envv); // a few things in X do not call setlocale :( 789 set_environ (env); // a few things in X do not call setlocale :(
774 790
775 init_vars (); 791 init_vars ();
776 792
777 const char **cmd_argv = init_resources (argc, argv); 793 const char **cmd_argv = init_resources (argc, argv);
778 794
… …
793 if (option (Opt_scrollBar)) 809 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 810 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 811
796 pty = ptytty::create (); 812 pty = ptytty::create ();
797 813
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); 814 create_windows (argc, argv);
809 815
810 init_xlocale (); 816 init_xlocale ();
811 817
812 scr_poweron (); // initialize screen 818 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 821 XSynchronize (dpy, True);
816#endif 822#endif
817 823
818 if (option (Opt_scrollBar)) 824 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 825 scrollBar.resize (); /* create and map scrollbar */
826
820#ifdef HAVE_BG_PIXMAP 827#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init (); 828 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 829#endif
852 830
853#if ENABLE_PERL 831#if ENABLE_PERL
854 rootwin_ev.start (display, display->root); 832 rootwin_ev.start (display, display->root);
855#endif 833#endif
856 834
857 set_colorfgbg (); 835 init_done = 1;
858 836
859 init_command (cmd_argv); 837 init_command (cmd_argv);
860 838
861 if (pty->pty >= 0) 839 if (pty->pty >= 0)
862 pty_ev.start (pty->pty, ev::READ); 840 pty_ev.start (pty->pty, ev::READ);
… …
906/*----------------------------------------------------------------------*/ 884/*----------------------------------------------------------------------*/
907void 885void
908rxvt_term::init_env () 886rxvt_term::init_env ()
909{ 887{
910 char *val; 888 char *val;
889 char *env_display;
890 char *env_windowid;
891 char *env_colorfgbg;
892 char *env_term;
911 893
912#ifdef DISPLAY_IS_IP 894#ifdef DISPLAY_IS_IP
913 /* Fixup display_name for export over pty to any interested terminal 895 /* 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 896 * 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 897 * (for the first non-loopback interface) that we get from
… …
932 914
933 env_display = (char *)rxvt_malloc (strlen (val) + 9); 915 env_display = (char *)rxvt_malloc (strlen (val) + 9);
934 916
935 sprintf (env_display, "DISPLAY=%s", val); 917 sprintf (env_display, "DISPLAY=%s", val);
936 918
919 env_windowid = (char *)rxvt_malloc (21);
937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 920 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
938 921
939 /* add entries to the environment: 922 /* add entries to the environment:
940 * @ DISPLAY: in case we started with -display 923 * @ DISPLAY: in case we started with -display
941 * @ WINDOWID: X window id number of the window 924 * @ WINDOWID: X window id number of the window
… …
945 * @ COLORFGBG: fg;bg color codes 928 * @ COLORFGBG: fg;bg color codes
946 */ 929 */
947 putenv (env_display); 930 putenv (env_display);
948 putenv (env_windowid); 931 putenv (env_windowid);
949 932
950 if (env_colorfgbg) 933 env_colorfgbg = get_colorfgbg ();
951 putenv (env_colorfgbg); 934 putenv (env_colorfgbg);
952 935
953#ifdef RXVT_TERMINFO 936#ifdef RXVT_TERMINFO
954 putenv ("TERMINFO=" RXVT_TERMINFO); 937 putenv ("TERMINFO=" RXVT_TERMINFO);
955#endif 938#endif
956 939
… …
978 961
979/*----------------------------------------------------------------------*/ 962/*----------------------------------------------------------------------*/
980void 963void
981rxvt_term::set_locale (const char *locale) 964rxvt_term::set_locale (const char *locale)
982{ 965{
983 set_environ (envv); 966 set_environ (env);
984 967
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 968 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 969 this->locale = setlocale (LC_CTYPE, locale);
988 970
989 if (!this->locale) 971 if (!this->locale)
990 { 972 {
… …
1001 983
1002 984
1003 this->locale = strdup (this->locale); 985 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 986 SET_LOCALE (this->locale);
1005 mbstate.reset (); 987 mbstate.reset ();
1006#endif
1007 988
1008#if HAVE_NL_LANGINFO 989#if HAVE_NL_LANGINFO
1009 char *codeset = nl_langinfo (CODESET); 990 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 991 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 992 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1018} 999}
1019 1000
1020void 1001void
1021rxvt_term::init_xlocale () 1002rxvt_term::init_xlocale ()
1022{ 1003{
1023 set_environ (envv); 1004 set_environ (env);
1024 1005
1025#ifdef USE_XIM 1006#if USE_XIM
1026 if (!locale) 1007 if (!locale)
1027 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1008 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1028 else 1009 else
1029 { 1010 {
1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1011 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1080 run_command (argv); 1061 run_command (argv);
1081} 1062}
1082 1063
1083/*----------------------------------------------------------------------*/ 1064/*----------------------------------------------------------------------*/
1084void 1065void
1085rxvt_term::get_colours () 1066rxvt_term::get_colors ()
1086{ 1067{
1087 int i; 1068 int i;
1088 1069
1089#ifdef OFF_FOCUS_FADING 1070#ifdef OFF_FOCUS_FADING
1090 pix_colors = pix_colors_focused; 1071 pix_colors = pix_colors_focused;
1091#endif 1072#endif
1092 1073
1093 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1074 for (i = 0; i < NRS_COLORS; i++)
1094 {
1095 const char *name = rs[Rs_color + i]; 1075 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)) 1076 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 1077
1149 /* 1078 /*
1150 * get scrollBar shadow colors 1079 * get scrollBar shadow colors
1151 * 1080 *
1152 * The calculations of topShadow/bottomShadow values are adapted 1081 * The calculations of topShadow/bottomShadow values are adapted
1153 * from the fvwm window manager. 1082 * from the fvwm window manager.
1154 */ 1083 */
1155#ifdef RXVT_SCROLLBAR 1084#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]); 1085 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1166 1086
1167 rgba cscroll; 1087 rgba cscroll;
1168 pix_colors [Color_scroll].get (cscroll); 1088 pix_colors [Color_scroll].get (cscroll);
1169 1089
1170 /* topShadowColor */ 1090 /* topShadowColor */
1171 if (!pix_colors[Color_topShadow].set (this, 1091 if (!pix_colors[Color_topShadow].set (this,
1172 rgba ( 1092 rgba (
1173 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1093 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), 1094 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), 1095 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1176 cscroll.a) 1096 cscroll.a)
1177 )) 1097 ))
1178 alias_color (Color_topShadow, Color_White); 1098 alias_color (Color_topShadow, Color_White);
1179 }
1180#endif 1099#endif
1181 1100
1182#ifdef OFF_FOCUS_FADING 1101#ifdef OFF_FOCUS_FADING
1183 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1102 for (i = 0; i < NRS_COLORS; i++)
1184 update_fade_color (i); 1103 update_fade_color (i, true);
1185#endif 1104#endif
1186} 1105}
1187 1106
1188/*----------------------------------------------------------------------*/ 1107/*----------------------------------------------------------------------*/
1189/* color aliases, fg/bg bright-bold */ 1108/* color aliases, fg/bg bright-bold */
1190void 1109void
1191rxvt_term::color_aliases (int idx) 1110rxvt_term::color_aliases (int idx)
1192{ 1111{
1193 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1112 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1194 { 1113 {
1195 int i = atoi (rs[Rs_color + idx]); 1114 int i = atoi (rs[Rs_color + idx]);
1196 1115
1197 if (i >= 8 && i <= 15) 1116 if (i >= 8 && i <= 15)
1198 /* bright colors */ 1117 /* bright colors */
… …
1238 for (j = map->max_keypermod; j--; k++) 1157 for (j = map->max_keypermod; j--; k++)
1239 { 1158 {
1240 if (kc[k] == 0) 1159 if (kc[k] == 0)
1241 break; 1160 break;
1242 1161
1243 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1162 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1244 { 1163 {
1245 case XK_Num_Lock: 1164 case XK_Num_Lock:
1246 ModNumLockMask = modmasks[i - 1]; 1165 ModNumLockMask = modmasks[i - 1];
1247 continue; 1166 continue;
1248 1167
… …
1293} 1212}
1294 1213
1295void 1214void
1296rxvt_term::set_icon (const char *file) 1215rxvt_term::set_icon (const char *file)
1297{ 1216{
1298#ifdef HAVE_AFTERIMAGE 1217#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); 1218 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1351 if (!pixbuf) 1219 if (!pixbuf)
1352 { 1220 {
1353 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1221 rxvt_warn ("Loading image icon failed, continuing without.\n");
1354 return; 1222 return;
… …
1419 Window top, parent; 1287 Window top, parent;
1420 1288
1421 dLocal (Display *, dpy); 1289 dLocal (Display *, dpy);
1422 1290
1423 /* grab colors before netscape does */ 1291 /* grab colors before netscape does */
1424 get_colours (); 1292 get_colors ();
1425 1293
1426 if (!set_fonts ()) 1294 if (!set_fonts ())
1427 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1295 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1428 1296
1429 parent = display->root; 1297 parent = display->root;
… …
1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1342 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1475 &attributes); 1343 &attributes);
1476 1344
1477 this->parent = top; 1345 this->parent = top;
1478 1346
1479 old_width = szHint.width;
1480 old_height = szHint.height;
1481
1482 set_title (rs [Rs_title]); 1347 set_title (rs [Rs_title]);
1483 set_icon_name (rs [Rs_iconName]); 1348 set_icon_name (rs [Rs_iconName]);
1484 1349
1485 classHint.res_name = (char *)rs[Rs_name]; 1350 classHint.res_name = (char *)rs[Rs_name];
1486 classHint.res_class = (char *)RESCLASS; 1351 classHint.res_class = (char *)RESCLASS;
1487 1352
1488 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1353 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1489 wmHint.input = True; 1354 wmHint.input = True;
1490 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1355 wmHint.initial_state = option (Opt_iconic) ? IconicState
1356 : option (Opt_dockapp) ? WithdrawnState
1357 : NormalState;
1491 wmHint.window_group = top; 1358 wmHint.window_group = top;
1492 1359
1493 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1360 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1494 &szHint, &wmHint, &classHint); 1361 &szHint, &wmHint, &classHint);
1495#if ENABLE_EWMH 1362#if ENABLE_EWMH
… …
1497 * set up icon hint 1364 * set up icon hint
1498 * rs [Rs_iconfile] is path to icon 1365 * rs [Rs_iconfile] is path to icon
1499 */ 1366 */
1500 1367
1501 if (rs [Rs_iconfile]) 1368 if (rs [Rs_iconfile])
1502 {
1503 set_icon (rs [Rs_iconfile]); 1369 set_icon (rs [Rs_iconfile]);
1504 }
1505#endif 1370#endif
1506 1371
1507#if ENABLE_FRILLS 1372#if ENABLE_FRILLS
1508 if (mwmhints.flags) 1373 if (mwmhints.flags)
1509 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1374 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1543 | ExposureMask | StructureNotifyMask); 1408 | ExposureMask | StructureNotifyMask);
1544 1409
1545 termwin_ev.start (display, top); 1410 termwin_ev.start (display, top);
1546 1411
1547 /* vt cursor: Black-on-White is standard, but this is more popular */ 1412 /* vt cursor: Black-on-White is standard, but this is more popular */
1413 unsigned int shape = XC_xterm;
1414
1415#ifdef HAVE_XMU
1416 if (rs[Rs_pointerShape])
1417 {
1418 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1419 if (stmp >= 0)
1420 shape = stmp;
1421 }
1422#endif
1423
1548 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1424 TermWin_cursor = XCreateFontCursor (dpy, shape);
1549 1425
1550 /* the vt window */ 1426 /* the vt window */
1551 vt = XCreateSimpleWindow (dpy, top, 1427 vt = XCreateSimpleWindow (dpy, top,
1552 window_vt_x, window_vt_y, 1428 window_vt_x, window_vt_y,
1553 width, height, 1429 vt_width, vt_height,
1554 0, 1430 0,
1555 pix_colors_focused[Color_fg], 1431 pix_colors_focused[Color_fg],
1556 pix_colors_focused[Color_bg]); 1432 pix_colors_focused[Color_bg]);
1557 1433
1558 attributes.bit_gravity = NorthWestGravity; 1434 attributes.bit_gravity = NorthWestGravity;
… …
1585 if (rs[Rs_fade]) 1461 if (rs[Rs_fade])
1586 pix_colors = pix_colors_unfocused; 1462 pix_colors = pix_colors_unfocused;
1587#endif 1463#endif
1588 1464
1589 pointer_unblank (); 1465 pointer_unblank ();
1590 scr_recolour (); 1466 scr_recolor ();
1591} 1467}
1592 1468
1593/*----------------------------------------------------------------------*/ 1469/*----------------------------------------------------------------------*/
1594/* 1470/*
1595 * Run the command in a subprocess and return a file descriptor for the 1471 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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