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.304 by sf-exg, Tue Dec 6 10:27:15 2011 UTC vs.
Revision 1.340 by root, Sat Dec 13 12:24:32 2014 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 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
58#endif 56#endif
… …
78#include <netinet/in.h> 76#include <netinet/in.h>
79#include <arpa/inet.h> 77#include <arpa/inet.h>
80#include <net/if.h> 78#include <net/if.h>
81#include <net/if_arp.h> 79#include <net/if_arp.h>
82 80
83static char * 81static char * ecb_cold
84rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
85{ 83{
86 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 85 struct ifconf ifc;
88 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
521#endif 519#endif
522 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
525#endif 523#endif
526#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
527 NULL, 525 NULL,
528#endif 526#endif
529#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 528 "rgb:00/00/00",
531#endif 529#endif
… …
567 565
568/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
569const char ** 567const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
571{ 569{
572 int i, r_argc; 570 int i;
573 const char **cmd_argv; 571 const char **cmd_argv;
574
575 /*
576 * Look for -e option. Find => split and make cmd_argv[] of command args
577 */
578 for (r_argc = 0; r_argc < argc; r_argc++)
579 if (!strcmp (argv[r_argc], "-e"))
580 break;
581
582 if (r_argc == argc)
583 cmd_argv = NULL;
584 else if (!argv[r_argc + 1])
585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
586 else
587 {
588 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
589
590 for (i = 0; i < argc - r_argc - 1; i++)
591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
592
593 cmd_argv[i] = NULL;
594 }
595 572
596 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
597 574
598 /* 575 /*
599 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
600 */ 577 */
601 578
602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
603 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
604 581
605 get_options (r_argc, argv); 582 cmd_argv = get_options (argc, argv);
606 583
607 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
609 586
610 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
611 xa = display->xa; 588 xa = display->xa;
612 589
613 set (display); 590 set (display);
614 extract_resources (); 591 extract_resources ();
615 592
616#if XFT 593#if ENABLE_FRILLS
617 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
618 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
619#endif 598#endif
620 599
621 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
622 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
623 rs [i] = 0; 602 rs [i] = 0;
… …
680 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
681 pointerBlankDelay = i; 660 pointerBlankDelay = i;
682 else 661 else
683 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
684#endif 663#endif
664
665 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
666 multiClickTime = i;
667 else
668 multiClickTime = 500;
669
670 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
685 671
686 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
687 if (!saveLines) 673 if (!saveLines)
688 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
689 675
… …
754 return cmd_argv; 740 return cmd_argv;
755} 741}
756 742
757/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
758void 744void
759rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 745rxvt_term::init (stringvec *argv, stringvec *envv)
760{ 746{
747 argv->push_back (0);
748 envv->push_back (0);
749
750 this->argv = argv;
761 this->envv = envv; 751 this->envv = envv;
762 752
753 env = new char *[this->envv->size ()];
754 for (int i = 0; i < this->envv->size (); i++)
755 env[i] = this->envv->at (i);
756
757 init2 (argv->size () - 1, argv->begin ());
758}
759
760void
761rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
762{
763#if ENABLE_PERL
764 // perl might want to access the stringvecs later, so we need to copy them
765 stringvec *args = new stringvec;
766 for (int i = 0; i < argc; i++)
767 args->push_back (strdup (argv [i]));
768
769 stringvec *envs = new stringvec;
770 for (const char *const *var = envv; *var; var++)
771 envs->push_back (strdup (*var));
772
773 init (args, envs);
774#else
775 init2 (argc, argv);
776#endif
777}
778
779void
780rxvt_term::init2 (int argc, const char *const *argv)
781{
763 SET_R (this); 782 SET_R (this);
764 set_locale (""); 783 set_locale ("");
765 set_environ (envv); // a few things in X do not call setlocale :( 784 set_environ (env); // a few things in X do not call setlocale :(
766 785
767 init_vars (); 786 init_vars ();
768 787
769 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
770 789
… …
785 if (option (Opt_scrollBar)) 804 if (option (Opt_scrollBar))
786 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 805 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
787 806
788 pty = ptytty::create (); 807 pty = ptytty::create ();
789 808
790#ifdef HAVE_AFTERIMAGE
791 set_application_name ((char *)rs[Rs_name]);
792 set_output_threshold (OUTPUT_LEVEL_WARNING);
793#endif
794
795 // must be called before create_windows, because the latter may call set_icon
796#ifdef HAVE_PIXBUF
797 g_type_init ();
798#endif
799
800 create_windows (argc, argv); 809 create_windows (argc, argv);
801 810
802 init_xlocale (); 811 init_xlocale ();
803 812
804 scr_poweron (); // initialize screen 813 scr_poweron (); // initialize screen
… …
807 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
808#endif 817#endif
809 818
810 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
811 scrollBar.resize (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
821
812#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
813 {
814 bg_init (); 823 bg_init ();
815
816#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent))
818 {
819 bg_set_transparent ();
820
821 if (rs [Rs_blurradius])
822 bg_set_blur (rs [Rs_blurradius]);
823
824 if (ISSET_PIXCOLOR (Color_tint))
825 bg_set_tint (pix_colors_focused [Color_tint]);
826
827 if (rs [Rs_shade])
828 bg_set_shade (rs [Rs_shade]);
829
830 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root);
833 }
834#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 if (bg_set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ())
841 update_background ();
842 }
843#endif
844 }
845#endif 824#endif
846 825
847#if ENABLE_PERL 826#if ENABLE_PERL
848 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
849#endif 828#endif
850 829
851 set_colorfgbg (); 830 init_done = 1;
852 831
853 init_command (cmd_argv); 832 init_command (cmd_argv);
854
855 free (cmd_argv);
856 833
857 if (pty->pty >= 0) 834 if (pty->pty >= 0)
858 pty_ev.start (pty->pty, ev::READ); 835 pty_ev.start (pty->pty, ev::READ);
859 836
860 HOOK_INVOKE ((this, HOOK_START, DT_END)); 837 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
902/*----------------------------------------------------------------------*/ 879/*----------------------------------------------------------------------*/
903void 880void
904rxvt_term::init_env () 881rxvt_term::init_env ()
905{ 882{
906 char *val; 883 char *val;
884 char *env_display;
885 char *env_windowid;
886 char *env_colorfgbg;
887 char *env_term;
907 888
908#ifdef DISPLAY_IS_IP 889#ifdef DISPLAY_IS_IP
909 /* Fixup display_name for export over pty to any interested terminal 890 /* Fixup display_name for export over pty to any interested terminal
910 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 891 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
911 * (for the first non-loopback interface) that we get from 892 * (for the first non-loopback interface) that we get from
… …
928 909
929 env_display = (char *)rxvt_malloc (strlen (val) + 9); 910 env_display = (char *)rxvt_malloc (strlen (val) + 9);
930 911
931 sprintf (env_display, "DISPLAY=%s", val); 912 sprintf (env_display, "DISPLAY=%s", val);
932 913
914 env_windowid = (char *)rxvt_malloc (21);
933 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 915 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
934 916
935 /* add entries to the environment: 917 /* add entries to the environment:
936 * @ DISPLAY: in case we started with -display 918 * @ DISPLAY: in case we started with -display
937 * @ WINDOWID: X window id number of the window 919 * @ WINDOWID: X window id number of the window
… …
941 * @ COLORFGBG: fg;bg color codes 923 * @ COLORFGBG: fg;bg color codes
942 */ 924 */
943 putenv (env_display); 925 putenv (env_display);
944 putenv (env_windowid); 926 putenv (env_windowid);
945 927
946 if (env_colorfgbg) 928 env_colorfgbg = get_colorfgbg ();
947 putenv (env_colorfgbg); 929 putenv (env_colorfgbg);
948 930
949#ifdef RXVT_TERMINFO 931#ifdef RXVT_TERMINFO
950 putenv ("TERMINFO=" RXVT_TERMINFO); 932 putenv ("TERMINFO=" RXVT_TERMINFO);
951#endif 933#endif
952 934
… …
971 unsetenv ("TERMCAP"); /* terminfo should be okay */ 953 unsetenv ("TERMCAP"); /* terminfo should be okay */
972#endif /* HAVE_UNSETENV */ 954#endif /* HAVE_UNSETENV */
973} 955}
974 956
975/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
976/*
977 * This is more or less stolen straight from XFree86 xterm.
978 * This should support all European type languages.
979 */
980void 958void
981rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
982{ 960{
983 set_environ (envv); 961 set_environ (env);
984 962
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 963 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
988 965
989 if (!this->locale) 966 if (!this->locale)
990 { 967 {
… …
1001 978
1002 979
1003 this->locale = strdup (this->locale); 980 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 981 SET_LOCALE (this->locale);
1005 mbstate.reset (); 982 mbstate.reset ();
1006#endif
1007 983
1008#if HAVE_NL_LANGINFO 984#if HAVE_NL_LANGINFO
1009 char *codeset = strdup (nl_langinfo (CODESET)); 985 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 986 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 987 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1012 && (codeset[1] == 'T' || codeset[1] == 't') 988 && (codeset[1] == 'T' || codeset[1] == 't')
1013 && (codeset[2] == 'F' || codeset[2] == 'f') 989 && (codeset[2] == 'F' || codeset[2] == 'f')
1014 && (codeset[3] == '8' || codeset[4] == '8'); 990 && (codeset[3] == '8' || codeset[4] == '8');
1015 free (codeset);
1016#else 991#else
1017 enc_utf8 = 0; 992 enc_utf8 = 0;
1018#endif 993#endif
1019} 994}
1020 995
1021void 996void
1022rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
1023{ 998{
1024 set_environ (envv); 999 set_environ (env);
1025 1000
1026#ifdef USE_XIM 1001#if USE_XIM
1027 if (!locale) 1002 if (!locale)
1028 rxvt_warn ("setting locale failed, working without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1029 else 1004 else
1030 { 1005 {
1031 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1032 1007
1033 if (!XSupportsLocale ()) 1008 if (!XSupportsLocale ())
1034 { 1009 {
1035 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1010 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1036 return; 1011 return;
1037 } 1012 }
1038 1013
1039 im_ev.start (display); 1014 im_ev.start (display);
1040 1015
… …
1081 run_command (argv); 1056 run_command (argv);
1082} 1057}
1083 1058
1084/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
1085void 1060void
1086rxvt_term::get_colours () 1061rxvt_term::get_colors ()
1087{ 1062{
1088 int i; 1063 int i;
1089 1064
1090#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1091 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
1092#endif 1067#endif
1093 1068
1094 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1069 for (i = 0; i < NRS_COLORS; i++)
1095 { 1070 {
1096 const char *name = rs[Rs_color + i]; 1071 const char *name = rs[Rs_color + i];
1097 1072
1098 if (!name) 1073 if (!name)
1099 continue; 1074 continue;
… …
1109#endif 1084#endif
1110 name = def_colorName [i]; 1085 name = def_colorName [i];
1111 1086
1112 if (!name) 1087 if (!name)
1113 continue; 1088 continue;
1089
1090 xcol.free (this);
1114 1091
1115 if (!set_color (xcol, name)) 1092 if (!set_color (xcol, name))
1116 { 1093 {
1117 switch (i) 1094 switch (i)
1118 { 1095 {
… …
1138 1115
1139 pix_colors[i] = xcol; 1116 pix_colors[i] = xcol;
1140 rs[Rs_color + i] = name; 1117 rs[Rs_color + i] = name;
1141 } 1118 }
1142 1119
1143 if (depth <= 2)
1144 {
1145 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1146 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1147 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1148 }
1149
1150 /* 1120 /*
1151 * get scrollBar shadow colors 1121 * get scrollBar shadow colors
1152 * 1122 *
1153 * The calculations of topShadow/bottomShadow values are adapted 1123 * The calculations of topShadow/bottomShadow values are adapted
1154 * from the fvwm window manager. 1124 * from the fvwm window manager.
1155 */ 1125 */
1156#ifdef RXVT_SCROLLBAR 1126#ifdef RXVT_SCROLLBAR
1157 if (depth <= 2)
1158 {
1159 /* Monochrome */
1160 alias_color (Color_scroll, Color_fg);
1161 alias_color (Color_topShadow, Color_bg);
1162 alias_color (Color_bottomShadow, Color_bg);
1163 }
1164 else
1165 {
1166 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1127 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1167 1128
1168 rgba cscroll; 1129 rgba cscroll;
1169 pix_colors [Color_scroll].get (cscroll); 1130 pix_colors [Color_scroll].get (cscroll);
1170 1131
1171 /* topShadowColor */ 1132 /* topShadowColor */
1172 if (!pix_colors[Color_topShadow].set (this, 1133 if (!pix_colors[Color_topShadow].set (this,
1173 rgba ( 1134 rgba (
1174 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1135 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1175 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1136 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1176 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1137 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1177 cscroll.a) 1138 cscroll.a)
1178 )) 1139 ))
1179 alias_color (Color_topShadow, Color_White); 1140 alias_color (Color_topShadow, Color_White);
1180 }
1181#endif 1141#endif
1182 1142
1183#ifdef OFF_FOCUS_FADING 1143#ifdef OFF_FOCUS_FADING
1184 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1144 for (i = 0; i < NRS_COLORS; i++)
1185 update_fade_color (i); 1145 update_fade_color (i, true);
1186#endif 1146#endif
1187} 1147}
1188 1148
1189/*----------------------------------------------------------------------*/ 1149/*----------------------------------------------------------------------*/
1190/* color aliases, fg/bg bright-bold */ 1150/* color aliases, fg/bg bright-bold */
1191void 1151void
1192rxvt_term::color_aliases (int idx) 1152rxvt_term::color_aliases (int idx)
1193{ 1153{
1194 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1154 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1195 { 1155 {
1196 int i = atoi (rs[Rs_color + idx]); 1156 int i = atoi (rs[Rs_color + idx]);
1197 1157
1198 if (i >= 8 && i <= 15) 1158 if (i >= 8 && i <= 15)
1199 /* bright colors */ 1159 /* bright colors */
… …
1239 for (j = map->max_keypermod; j--; k++) 1199 for (j = map->max_keypermod; j--; k++)
1240 { 1200 {
1241 if (kc[k] == 0) 1201 if (kc[k] == 0)
1242 break; 1202 break;
1243 1203
1244 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1204 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1245 { 1205 {
1246 case XK_Num_Lock: 1206 case XK_Num_Lock:
1247 ModNumLockMask = modmasks[i - 1]; 1207 ModNumLockMask = modmasks[i - 1];
1248 continue; 1208 continue;
1249 1209
… …
1294} 1254}
1295 1255
1296void 1256void
1297rxvt_term::set_icon (const char *file) 1257rxvt_term::set_icon (const char *file)
1298{ 1258{
1299#ifdef HAVE_AFTERIMAGE
1300 init_asv ();
1301
1302 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1303 if (!im)
1304 {
1305 rxvt_warn ("Loading image icon failed, continuing without.\n");
1306 return;
1307 }
1308
1309 unsigned int w = im->width;
1310 unsigned int h = im->height;
1311
1312 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1313 {
1314 rxvt_warn ("Icon image too big, continuing without.\n");
1315 destroy_asimage (&im);
1316 return;
1317 }
1318
1319 ASImage *result = scale_asimage (asv, im,
1320 w, h, ASA_ARGB32,
1321 100, ASIMAGE_QUALITY_DEFAULT);
1322 destroy_asimage (&im);
1323
1324 if (!result)
1325 {
1326 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1327 return;
1328 }
1329
1330 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1331 if (buffer)
1332 {
1333 ARGB32 *asbuf = result->alt.argb32;
1334 buffer [0] = w;
1335 buffer [1] = h;
1336
1337 for (unsigned int i = 0; i < w * h; ++i)
1338 buffer [i + 2] = asbuf [i];
1339
1340 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1341 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1342 free (buffer);
1343 }
1344 else
1345 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1346
1347 destroy_asimage (&result);
1348#endif
1349
1350#ifdef HAVE_PIXBUF 1259#if HAVE_PIXBUF
1351 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1260 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1352 if (!pixbuf) 1261 if (!pixbuf)
1353 { 1262 {
1354 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1263 rxvt_warn ("Loading image icon failed, continuing without.\n");
1355 return; 1264 return;
… …
1420 Window top, parent; 1329 Window top, parent;
1421 1330
1422 dLocal (Display *, dpy); 1331 dLocal (Display *, dpy);
1423 1332
1424 /* grab colors before netscape does */ 1333 /* grab colors before netscape does */
1425 get_colours (); 1334 get_colors ();
1426 1335
1427 if (!set_fonts ()) 1336 if (!set_fonts ())
1428 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1337 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1429 1338
1430 parent = display->root; 1339 parent = display->root;
… …
1475 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1384 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1476 &attributes); 1385 &attributes);
1477 1386
1478 this->parent = top; 1387 this->parent = top;
1479 1388
1480 old_width = szHint.width;
1481 old_height = szHint.height;
1482
1483 set_title (rs [Rs_title]); 1389 set_title (rs [Rs_title]);
1484 set_icon_name (rs [Rs_iconName]); 1390 set_icon_name (rs [Rs_iconName]);
1485 1391
1486 classHint.res_name = (char *)rs[Rs_name]; 1392 classHint.res_name = (char *)rs[Rs_name];
1487 classHint.res_class = (char *)RESCLASS; 1393 classHint.res_class = (char *)RESCLASS;
1488 1394
1489 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1395 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1490 wmHint.input = True; 1396 wmHint.input = True;
1491 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1397 wmHint.initial_state = option (Opt_iconic) ? IconicState
1398 : option (Opt_dockapp) ? WithdrawnState
1399 : NormalState;
1492 wmHint.window_group = top; 1400 wmHint.window_group = top;
1493 1401
1494 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1402 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1495 &szHint, &wmHint, &classHint); 1403 &szHint, &wmHint, &classHint);
1496#if ENABLE_EWMH 1404#if ENABLE_EWMH
… …
1498 * set up icon hint 1406 * set up icon hint
1499 * rs [Rs_iconfile] is path to icon 1407 * rs [Rs_iconfile] is path to icon
1500 */ 1408 */
1501 1409
1502 if (rs [Rs_iconfile]) 1410 if (rs [Rs_iconfile])
1503 {
1504 set_icon (rs [Rs_iconfile]); 1411 set_icon (rs [Rs_iconfile]);
1505 }
1506#endif 1412#endif
1507 1413
1508#if ENABLE_FRILLS 1414#if ENABLE_FRILLS
1509 if (mwmhints.flags) 1415 if (mwmhints.flags)
1510 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1416 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1549 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1455 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1550 1456
1551 /* the vt window */ 1457 /* the vt window */
1552 vt = XCreateSimpleWindow (dpy, top, 1458 vt = XCreateSimpleWindow (dpy, top,
1553 window_vt_x, window_vt_y, 1459 window_vt_x, window_vt_y,
1554 width, height, 1460 vt_width, vt_height,
1555 0, 1461 0,
1556 pix_colors_focused[Color_fg], 1462 pix_colors_focused[Color_fg],
1557 pix_colors_focused[Color_bg]); 1463 pix_colors_focused[Color_bg]);
1558 1464
1559 attributes.bit_gravity = NorthWestGravity; 1465 attributes.bit_gravity = NorthWestGravity;
… …
1586 if (rs[Rs_fade]) 1492 if (rs[Rs_fade])
1587 pix_colors = pix_colors_unfocused; 1493 pix_colors = pix_colors_unfocused;
1588#endif 1494#endif
1589 1495
1590 pointer_unblank (); 1496 pointer_unblank ();
1591 scr_recolour (); 1497 scr_recolor ();
1592} 1498}
1593 1499
1594/*----------------------------------------------------------------------*/ 1500/*----------------------------------------------------------------------*/
1595/* 1501/*
1596 * Run the command in a subprocess and return a file descriptor for the 1502 * Run the command in a subprocess and return a file descriptor for the
… …
1608 if (pty->pty >= 0) 1514 if (pty->pty >= 0)
1609 { 1515 {
1610 if (getfd_hook) 1516 if (getfd_hook)
1611 pty->pty = (*getfd_hook) (pty->pty); 1517 pty->pty = (*getfd_hook) (pty->pty);
1612 1518
1613 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1519 if (pty->pty < 0)
1614 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1520 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1615 } 1521 }
1616 } 1522 }
1617 else 1523 else
1618#endif 1524#endif
1619 if (!pty->get ()) 1525 if (!pty->get ())
1620 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1526 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1527
1528 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1621 1529
1622 struct termios tio = def_tio; 1530 struct termios tio = def_tio;
1623 1531
1624#ifndef NO_BACKSPACE_KEY 1532#ifndef NO_BACKSPACE_KEY
1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1533 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1675 1583
1676 _exit (EXIT_FAILURE); 1584 _exit (EXIT_FAILURE);
1677 1585
1678 default: 1586 default:
1679 if (!option (Opt_utmpInhibit)) 1587 if (!option (Opt_utmpInhibit))
1588 {
1589#ifdef LOG_ONLY_ON_LOGIN
1590 bool login_shell = option (Opt_loginShell);
1591#else
1592 bool login_shell = true;
1593#endif
1680 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1594 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1595 }
1681 1596
1682 pty->close_tty (); 1597 pty->close_tty ();
1683 1598
1684 child_ev.start (cmd_pid); 1599 child_ev.start (cmd_pid);
1685 1600
… …
1710#elif defined (SRIOCSREDIR) 1625#elif defined (SRIOCSREDIR)
1711 int fd; 1626 int fd;
1712 1627
1713 fd = open (CONSOLE, O_WRONLY, 0); 1628 fd = open (CONSOLE, O_WRONLY, 0);
1714 if (fd >= 0) 1629 if (fd >= 0)
1715 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1630 {
1631 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1716 close (fd); 1632 close (fd);
1633 }
1717#endif /* SRIOCSREDIR */ 1634#endif /* SRIOCSREDIR */
1718 } 1635 }
1719 1636
1720 /* reset signals and spin off the command interpreter */ 1637 /* reset signals and spin off the command interpreter */
1721 signal (SIGINT, SIG_DFL); 1638 signal (SIGINT, SIG_DFL);

Diff Legend

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