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.325 by sf-exg, Thu May 31 05:53:46 2012 UTC vs.
Revision 1.351 by root, Fri Dec 23 21:46:46 2022 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
… …
42 43
43#include <signal.h> 44#include <signal.h>
44 45
45#include <fcntl.h> 46#include <fcntl.h>
46 47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
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# include <locale.h> 56# include <locale.h>
… …
145 close (skfd); 150 close (skfd);
146 151
147 return rval; 152 return rval;
148} 153}
149#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
150 180
151static const char *const def_colorName[] = 181static const char *const def_colorName[] =
152 { 182 {
153 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
154 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
… …
251 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
252 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
253 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
254 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
255 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
256#else 292#else
257 // 256 xterm colours 293 // 256 xterm colours
258 "rgb:00/00/00", 294 "rgb:00/00/00",
259 "rgb:00/00/5f", 295 "rgb:00/00/5f",
260 "rgb:00/00/87", 296 "rgb:00/00/87",
… …
493 "rgb:c6/c6/c6", 529 "rgb:c6/c6/c6",
494 "rgb:d0/d0/d0", 530 "rgb:d0/d0/d0",
495 "rgb:da/da/da", 531 "rgb:da/da/da",
496 "rgb:e4/e4/e4", 532 "rgb:e4/e4/e4",
497 "rgb:ee/ee/ee", 533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
498#endif 538#endif
499 539
500#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
501 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
502 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
… …
519#endif 559#endif
520 COLOR_SCROLLBAR, 560 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR 561#ifdef RXVT_SCROLLBAR
522 COLOR_SCROLLTROUGH, 562 COLOR_SCROLLTROUGH,
523#endif 563#endif
524#if ENABLE_TRANSPARENCY
525 NULL,
526#endif
527#if OFF_FOCUS_FADING 564#if OFF_FOCUS_FADING
528 "rgb:00/00/00", 565 "rgb:00/00/00",
529#endif 566#endif
530 }; 567 };
531 568
… …
561 set_option (Opt_iso14755); 598 set_option (Opt_iso14755);
562 set_option (Opt_iso14755_52); 599 set_option (Opt_iso14755_52);
563 set_option (Opt_buffered); 600 set_option (Opt_buffered);
564} 601}
565 602
603#if ENABLE_PERL
604static void
605rxvt_perl_parse_resource (rxvt_term *term, const char *k, const char *v)
606{
607 rxvt_perl.parse_resource (term, k, false, false, 0, v);
608}
609#endif
610
566/*----------------------------------------------------------------------*/ 611/*----------------------------------------------------------------------*/
567const char ** 612const char **
568rxvt_term::init_resources (int argc, const char *const *argv) 613rxvt_term::init_resources (int argc, const char *const *argv)
569{ 614{
570 int i; 615 int i;
… …
588 xa = display->xa; 633 xa = display->xa;
589 634
590 set (display); 635 set (display);
591 extract_resources (); 636 extract_resources ();
592 637
593#if XFT 638#if ENABLE_FRILLS
594 if (rs[Rs_depth]) 639 if (rs[Rs_visual])
595 select_visual (strtol (rs[Rs_depth], 0, 0)); 640 select_visual (strtol (rs[Rs_visual], 0, 0));
641 else if (rs[Rs_depth])
642 select_depth (strtol (rs[Rs_depth], 0, 0));
596#endif 643#endif
597 644
598 for (int i = NUM_RESOURCES; i--; ) 645 for (int i = NUM_RESOURCES; i--; )
599 if (rs [i] == resval_undef) 646 if (rs [i] == resval_undef)
600 rs [i] = 0; 647 rs [i] = 0;
… …
606 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 653 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
607 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2]) 654 || (rs[Rs_perl_ext_2] && *rs[Rs_perl_ext_2])
608 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval])) 655 || (rs[Rs_perl_eval] && *rs[Rs_perl_eval]))
609 { 656 {
610 rxvt_perl.init (this); 657 rxvt_perl.init (this);
658 enumerate_resources (rxvt_perl_parse_resource);
611 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 659 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
612 } 660 }
613#endif 661#endif
614 662
615 // must be called after initialising the perl interpreter as it 663 // must be called after initialising the perl interpreter as it
… …
647 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ()); 695 ext_bwidth = min (i, std::numeric_limits<int16_t>::max ());
648 696
649 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0) 697 if (rs[Rs_lineSpace] && (i = atoi (rs[Rs_lineSpace])) >= 0)
650 lineSpace = min (i, std::numeric_limits<int16_t>::max ()); 698 lineSpace = min (i, std::numeric_limits<int16_t>::max ());
651 699
652 if (rs[Rs_letterSpace]) 700 if (const char *v = rs[Rs_letterSpace])
653 letterSpace = atoi (rs[Rs_letterSpace]); 701 letterSpace = atoi (v);
702
703 rewrap_always = rewrap_never = 0;
704 if (const char *v = rs[Rs_rewrapMode])
705 if (!strcmp (v, "never"))
706 rewrap_never = 1;
707 else if (!strcmp (v, "always"))
708 rewrap_always = 1;
709 else if (!strcmp (v, "auto"))
710 /* nop **/;
711 else
712 rxvt_warn ("invalid rewrapMode, must be auto, always or never.\n");
654#endif 713#endif
655 714
656#ifdef POINTER_BLANK 715#ifdef POINTER_BLANK
657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 716 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
658 pointerBlankDelay = i; 717 pointerBlankDelay = i;
659 else 718 else
660 pointerBlankDelay = 2; 719 pointerBlankDelay = 2;
661#endif 720#endif
721
722 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
723 multiClickTime = i;
724 else
725 multiClickTime = 500;
726
727 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
662 728
663 /* no point having a scrollbar without having any scrollback! */ 729 /* no point having a scrollbar without having any scrollback! */
664 if (!saveLines) 730 if (!saveLines)
665 set_option (Opt_scrollBar, 0); 731 set_option (Opt_scrollBar, 0);
666 732
… …
739 envv->push_back (0); 805 envv->push_back (0);
740 806
741 this->argv = argv; 807 this->argv = argv;
742 this->envv = envv; 808 this->envv = envv;
743 809
810 env = new char *[this->envv->size ()];
811 for (int i = 0; i < this->envv->size (); i++)
812 env[i] = this->envv->at (i);
813
744 init2 (argv->size () - 1, argv->begin ()); 814 init2 (argv->size () - 1, argv->begin ());
745} 815}
746 816
747void 817void
748rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 818rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
766void 836void
767rxvt_term::init2 (int argc, const char *const *argv) 837rxvt_term::init2 (int argc, const char *const *argv)
768{ 838{
769 SET_R (this); 839 SET_R (this);
770 set_locale (""); 840 set_locale ("");
771 set_environ (envv); // a few things in X do not call setlocale :( 841 set_environ (env); // a few things in X do not call setlocale :(
772 842
773 init_vars (); 843 init_vars ();
774 844
775 const char **cmd_argv = init_resources (argc, argv); 845 const char **cmd_argv = init_resources (argc, argv);
776 846
777#ifdef KEYSYM_RESOURCE 847#ifdef KEYSYM_RESOURCE
778 keyboard->register_done (); 848 keyboard->register_done ();
779#endif 849#endif
850
851 {
852 ev_tstamp interval = 1. / 60.;
853
854#if ENABLE_FRILLS
855 if (rs[Rs_refreshRate])
856 {
857 interval = atof (rs[Rs_refreshRate]);
858 if (interval <= 0.)
859 interval = -interval;
860 else
861 interval = 1. / interval;
862 }
863#endif
864
865 flush_ev.set (interval, interval);
866 }
780 867
781 if (const char *path = rs[Rs_chdir]) 868 if (const char *path = rs[Rs_chdir])
782 if (*path) // ignored if empty 869 if (*path) // ignored if empty
783 { 870 {
784 if (*path != '/') 871 if (*path != '/')
… …
791 if (option (Opt_scrollBar)) 878 if (option (Opt_scrollBar))
792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 879 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
793 880
794 pty = ptytty::create (); 881 pty = ptytty::create ();
795 882
796 // must be called before create_windows, because the latter may call set_icon
797#ifdef HAVE_PIXBUF
798 g_type_init ();
799#endif
800
801 create_windows (argc, argv); 883 create_windows (argc, argv);
802 884
803 init_xlocale (); 885 init_xlocale ();
804 886
805 scr_poweron (); // initialize screen 887 scr_poweron (); // initialize screen
… …
808 XSynchronize (dpy, True); 890 XSynchronize (dpy, True);
809#endif 891#endif
810 892
811 if (option (Opt_scrollBar)) 893 if (option (Opt_scrollBar))
812 scrollBar.resize (); /* create and map scrollbar */ 894 scrollBar.resize (); /* create and map scrollbar */
813#ifdef HAVE_BG_PIXMAP
814 {
815 bg_init ();
816
817#ifdef ENABLE_TRANSPARENCY
818 if (option (Opt_transparent))
819 {
820 bg_set_transparent ();
821
822 if (rs [Rs_blurradius])
823 root_effects.set_blur (rs [Rs_blurradius]);
824
825 if (ISSET_PIXCOLOR (Color_tint))
826 root_effects.set_tint (pix_colors_focused [Color_tint]);
827
828 if (rs [Rs_shade])
829 root_effects.set_shade (rs [Rs_shade]);
830
831 bg_set_root_pixmap ();
832 XSelectInput (dpy, display->root, PropertyChangeMask);
833 rootwin_ev.start (display, display->root);
834 }
835#endif
836 }
837#endif
838 895
839#if ENABLE_PERL 896#if ENABLE_PERL
840 rootwin_ev.start (display, display->root); 897 rootwin_ev.start (display, display->root);
841#endif 898#endif
842 899
… …
944#ifdef RXVT_TERMINFO 1001#ifdef RXVT_TERMINFO
945 putenv ("TERMINFO=" RXVT_TERMINFO); 1002 putenv ("TERMINFO=" RXVT_TERMINFO);
946#endif 1003#endif
947 1004
948 if (depth <= 2) 1005 if (depth <= 2)
949 putenv ("COLORTERM=" COLORTERMENV "-mono"); 1006 putenv ((char *)"COLORTERM=" COLORTERMENV "-mono");
950 else 1007 else
951 putenv ("COLORTERM=" COLORTERMENVFULL); 1008 putenv ((char *)"COLORTERM=" COLORTERMENVFULL);
952 1009
953 if (rs[Rs_term_name] != NULL) 1010 if (rs[Rs_term_name] != NULL)
954 { 1011 {
955 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6); 1012 env_term = (char *)rxvt_malloc (strlen (rs[Rs_term_name]) + 6);
956 sprintf (env_term, "TERM=%s", rs[Rs_term_name]); 1013 sprintf (env_term, "TERM=%s", rs[Rs_term_name]);
957 putenv (env_term); 1014 putenv (env_term);
958 } 1015 }
959 else 1016 else
960 putenv ("TERM=" TERMENV); 1017 putenv ((char *)"TERM=" TERMENV);
961 1018
962#ifdef HAVE_UNSETENV 1019#ifdef HAVE_UNSETENV
963 /* avoid passing old settings and confusing term size */ 1020 /* avoid passing old settings and confusing term size */
964 unsetenv ("LINES"); 1021 unsetenv ("LINES");
965 unsetenv ("COLUMNS"); 1022 unsetenv ("COLUMNS");
… …
969 1026
970/*----------------------------------------------------------------------*/ 1027/*----------------------------------------------------------------------*/
971void 1028void
972rxvt_term::set_locale (const char *locale) 1029rxvt_term::set_locale (const char *locale)
973{ 1030{
974 set_environ (envv); 1031 set_environ (env);
975 1032
976 free (this->locale); 1033 free (this->locale);
977 this->locale = setlocale (LC_CTYPE, locale); 1034 this->locale = setlocale (LC_CTYPE, locale);
978 1035
979 if (!this->locale) 1036 if (!this->locale)
… …
984 setlocale (LC_CTYPE, "C"); 1041 setlocale (LC_CTYPE, "C");
985 } 1042 }
986 else 1043 else
987 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n"); 1044 rxvt_warn ("default locale unavailable, check LC_* and LANG variables. Continuing.\n");
988 1045
989 this->locale = "C"; 1046 this->locale = (char *)"C"; /* strdup'ed below */
990 } 1047 }
991 1048
992 1049
993 this->locale = strdup (this->locale); 1050 this->locale = strdup (this->locale);
994 SET_LOCALE (this->locale); 1051 SET_LOCALE (this->locale);
… …
1007} 1064}
1008 1065
1009void 1066void
1010rxvt_term::init_xlocale () 1067rxvt_term::init_xlocale ()
1011{ 1068{
1012 set_environ (envv); 1069 set_environ (env);
1013 1070
1014#ifdef USE_XIM 1071#if USE_XIM
1015 if (!locale) 1072 if (!locale)
1016 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1073 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017 else 1074 else
1018 { 1075 {
1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1076 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1069 run_command (argv); 1126 run_command (argv);
1070} 1127}
1071 1128
1072/*----------------------------------------------------------------------*/ 1129/*----------------------------------------------------------------------*/
1073void 1130void
1074rxvt_term::get_colours () 1131rxvt_term::get_colors ()
1075{ 1132{
1076 int i; 1133 int i;
1077 1134
1078#ifdef OFF_FOCUS_FADING 1135#ifdef OFF_FOCUS_FADING
1079 pix_colors = pix_colors_focused; 1136 pix_colors = pix_colors_focused;
1080#endif 1137#endif
1081 1138
1082 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1139 for (i = 0; i < NRS_COLORS; i++)
1083 {
1084 const char *name = rs[Rs_color + i]; 1140 if (const char *name = rs[Rs_color + i])
1085
1086 if (!name)
1087 continue;
1088
1089 rxvt_color xcol;
1090
1091 if (!set_color (xcol, name)) 1141 set_color (pix_colors [i], name);
1092 {
1093#ifndef XTERM_REVERSE_VIDEO
1094 if (i < 2 && option (Opt_reverseVideo))
1095 name = def_colorName [1 - i];
1096 else
1097#endif
1098 name = def_colorName [i];
1099
1100 if (!name)
1101 continue;
1102
1103 if (!set_color (xcol, name))
1104 {
1105 switch (i)
1106 {
1107 case Color_fg:
1108 case Color_bg:
1109 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1110 name = "";
1111 break;
1112#ifndef NO_CURSORCOLOR
1113 case Color_cursor2:
1114#endif
1115 case Color_pointer_fg:
1116 name = rs[Rs_color + Color_fg];
1117 xcol.set (this, name);
1118 break;
1119 default:
1120 name = rs[Rs_color + Color_bg];
1121 xcol.set (this, name);
1122 break;
1123 }
1124 }
1125 }
1126
1127 pix_colors[i] = xcol;
1128 rs[Rs_color + i] = name;
1129 }
1130
1131 if (depth <= 2)
1132 {
1133 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1134 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1135 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1136 }
1137 1142
1138 /* 1143 /*
1139 * get scrollBar shadow colors 1144 * get scrollBar shadow colors
1140 * 1145 *
1141 * The calculations of topShadow/bottomShadow values are adapted 1146 * The calculations of topShadow/bottomShadow values are adapted
1142 * from the fvwm window manager. 1147 * from the fvwm window manager.
1143 */ 1148 */
1144#ifdef RXVT_SCROLLBAR 1149#ifdef RXVT_SCROLLBAR
1145 if (depth <= 2)
1146 {
1147 /* Monochrome */
1148 alias_color (Color_scroll, Color_fg);
1149 alias_color (Color_topShadow, Color_bg);
1150 alias_color (Color_bottomShadow, Color_bg);
1151 }
1152 else
1153 {
1154 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1150 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1155 1151
1156 rgba cscroll; 1152 rgba cscroll;
1157 pix_colors [Color_scroll].get (cscroll); 1153 pix_colors [Color_scroll].get (cscroll);
1158 1154
1159 /* topShadowColor */ 1155 /* topShadowColor */
1160 if (!pix_colors[Color_topShadow].set (this, 1156 if (!pix_colors[Color_topShadow].set (this,
1161 rgba ( 1157 rgba (
1162 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1158 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1163 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1159 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1164 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1160 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1165 cscroll.a) 1161 cscroll.a)
1166 )) 1162 ))
1167 alias_color (Color_topShadow, Color_White); 1163 alias_color (Color_topShadow, Color_White);
1168 }
1169#endif 1164#endif
1170 1165
1171#ifdef OFF_FOCUS_FADING 1166#ifdef OFF_FOCUS_FADING
1172 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1167 for (i = 0; i < NRS_COLORS; i++)
1173 update_fade_color (i); 1168 update_fade_color (i, true);
1174#endif 1169#endif
1175} 1170}
1176 1171
1177/*----------------------------------------------------------------------*/ 1172/*----------------------------------------------------------------------*/
1178/* color aliases, fg/bg bright-bold */ 1173/* color aliases, fg/bg bright-bold */
… …
1227 for (j = map->max_keypermod; j--; k++) 1222 for (j = map->max_keypermod; j--; k++)
1228 { 1223 {
1229 if (kc[k] == 0) 1224 if (kc[k] == 0)
1230 break; 1225 break;
1231 1226
1232 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1227 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1233 { 1228 {
1234 case XK_Num_Lock: 1229 case XK_Num_Lock:
1235 ModNumLockMask = modmasks[i - 1]; 1230 ModNumLockMask = modmasks[i - 1];
1236 continue; 1231 continue;
1237 1232
… …
1282} 1277}
1283 1278
1284void 1279void
1285rxvt_term::set_icon (const char *file) 1280rxvt_term::set_icon (const char *file)
1286{ 1281{
1287#ifdef HAVE_PIXBUF 1282#if HAVE_PIXBUF && ENABLE_EWMH
1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1283 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1289 if (!pixbuf) 1284 if (!pixbuf)
1290 { 1285 {
1291 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1286 rxvt_warn ("Loading image icon failed, continuing without.\n");
1292 return; 1287 return;
… …
1357 Window top, parent; 1352 Window top, parent;
1358 1353
1359 dLocal (Display *, dpy); 1354 dLocal (Display *, dpy);
1360 1355
1361 /* grab colors before netscape does */ 1356 /* grab colors before netscape does */
1362 get_colours (); 1357 get_colors ();
1363 1358
1364 if (!set_fonts ()) 1359 if (!set_fonts ())
1365 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1360 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1366 1361
1367 parent = display->root; 1362 parent = display->root;
… …
1420 classHint.res_name = (char *)rs[Rs_name]; 1415 classHint.res_name = (char *)rs[Rs_name];
1421 classHint.res_class = (char *)RESCLASS; 1416 classHint.res_class = (char *)RESCLASS;
1422 1417
1423 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1418 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1424 wmHint.input = True; 1419 wmHint.input = True;
1425 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1420 wmHint.initial_state = option (Opt_iconic) ? IconicState
1421 : option (Opt_dockapp) ? WithdrawnState
1422 : NormalState;
1426 wmHint.window_group = top; 1423 wmHint.window_group = top;
1427 1424
1428 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1425 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1429 &szHint, &wmHint, &classHint); 1426 &szHint, &wmHint, &classHint);
1430#if ENABLE_EWMH 1427#if ENABLE_EWMH
… …
1432 * set up icon hint 1429 * set up icon hint
1433 * rs [Rs_iconfile] is path to icon 1430 * rs [Rs_iconfile] is path to icon
1434 */ 1431 */
1435 1432
1436 if (rs [Rs_iconfile]) 1433 if (rs [Rs_iconfile])
1437 {
1438 set_icon (rs [Rs_iconfile]); 1434 set_icon (rs [Rs_iconfile]);
1439 }
1440#endif 1435#endif
1441 1436
1442#if ENABLE_FRILLS 1437#if ENABLE_FRILLS
1443 if (mwmhints.flags) 1438 if (mwmhints.flags)
1444 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1439 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1478 | ExposureMask | StructureNotifyMask); 1473 | ExposureMask | StructureNotifyMask);
1479 1474
1480 termwin_ev.start (display, top); 1475 termwin_ev.start (display, top);
1481 1476
1482 /* vt cursor: Black-on-White is standard, but this is more popular */ 1477 /* vt cursor: Black-on-White is standard, but this is more popular */
1478 unsigned int shape = XC_xterm;
1479
1480#ifdef HAVE_XMU
1481 if (rs[Rs_pointerShape])
1482 {
1483 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1484 if (stmp >= 0)
1485 shape = stmp;
1486 }
1487#endif
1488
1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1489 TermWin_cursor = XCreateFontCursor (dpy, shape);
1484 1490
1485 /* the vt window */ 1491 /* the vt window */
1486 vt = XCreateSimpleWindow (dpy, top, 1492 vt = XCreateSimpleWindow (dpy, top,
1487 window_vt_x, window_vt_y, 1493 window_vt_x, window_vt_y,
1488 vt_width, vt_height, 1494 vt_width, vt_height,
… …
1520 if (rs[Rs_fade]) 1526 if (rs[Rs_fade])
1521 pix_colors = pix_colors_unfocused; 1527 pix_colors = pix_colors_unfocused;
1522#endif 1528#endif
1523 1529
1524 pointer_unblank (); 1530 pointer_unblank ();
1525 scr_recolour (); 1531 scr_recolor ();
1526} 1532}
1527 1533
1528/*----------------------------------------------------------------------*/ 1534/*----------------------------------------------------------------------*/
1529/* 1535/*
1530 * Run the command in a subprocess and return a file descriptor for the 1536 * Run the command in a subprocess and return a file descriptor for the

Diff Legend

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