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.302 by sf-exg, Fri Dec 2 09:03:43 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, **r_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
596 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
597
598 for (i = 0; i < r_argc; i++)
599 r_argv[i] = (const char *)argv[i];
600
601 r_argv[i] = NULL;
602 572
603 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
604 574
605 /* 575 /*
606 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
607 */ 577 */
608 578
609 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
610 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
611 581
612 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
613 583
614 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
615 {
616 free (r_argv);
617 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]);
618 }
619 586
620 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
621 xa = display->xa; 588 xa = display->xa;
622 589
623 set (display); 590 set (display);
624 extract_resources (); 591 extract_resources ();
625 592
626#if XFT 593#if ENABLE_FRILLS
627 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
628 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));
629#endif 598#endif
630
631 free (r_argv);
632 599
633 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
634 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
635 rs [i] = 0; 602 rs [i] = 0;
636 603
… …
692 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
693 pointerBlankDelay = i; 660 pointerBlankDelay = i;
694 else 661 else
695 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
696#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;
697 671
698 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
699 if (!saveLines) 673 if (!saveLines)
700 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
701 675
… …
766 return cmd_argv; 740 return cmd_argv;
767} 741}
768 742
769/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
770void 744void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 745rxvt_term::init (stringvec *argv, stringvec *envv)
772{ 746{
747 argv->push_back (0);
748 envv->push_back (0);
749
750 this->argv = argv;
773 this->envv = envv; 751 this->envv = envv;
774 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{
775 SET_R (this); 782 SET_R (this);
776 set_locale (""); 783 set_locale ("");
777 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 :(
778 785
779 init_vars (); 786 init_vars ();
780 787
781 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
782 789
… …
797 if (option (Opt_scrollBar)) 804 if (option (Opt_scrollBar))
798 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 805 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 806
800 pty = ptytty::create (); 807 pty = ptytty::create ();
801 808
802#ifdef HAVE_AFTERIMAGE
803 set_application_name ((char *)rs[Rs_name]);
804 set_output_threshold (OUTPUT_LEVEL_WARNING);
805#endif
806
807 // must be called before create_windows, because the latter may call set_icon
808#ifdef HAVE_PIXBUF
809 g_type_init ();
810#endif
811
812 create_windows (argc, argv); 809 create_windows (argc, argv);
813 810
814 init_xlocale (); 811 init_xlocale ();
815 812
816 scr_poweron (); // initialize screen 813 scr_poweron (); // initialize screen
… …
819 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
820#endif 817#endif
821 818
822 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
823 scrollBar.resize (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
821
824#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
825 {
826 bg_init (); 823 bg_init ();
827
828#ifdef ENABLE_TRANSPARENCY
829 if (option (Opt_transparent))
830 {
831 bg_set_transparent ();
832
833 if (rs [Rs_blurradius])
834 bg_set_blur (rs [Rs_blurradius]);
835
836 if (ISSET_PIXCOLOR (Color_tint))
837 bg_set_tint (pix_colors_focused [Color_tint]);
838
839 if (rs [Rs_shade])
840 bg_set_shade (rs [Rs_shade]);
841
842 bg_set_root_pixmap ();
843 XSelectInput (dpy, display->root, PropertyChangeMask);
844 rootwin_ev.start (display, display->root);
845 }
846#endif
847
848#ifdef BG_IMAGE_FROM_FILE
849 if (rs[Rs_backgroundPixmap])
850 {
851 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bg_window_position_sensitive ())
853 update_background ();
854 }
855#endif
856 }
857#endif 824#endif
858 825
859#if ENABLE_PERL 826#if ENABLE_PERL
860 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
861#endif 828#endif
862 829
863 set_colorfgbg (); 830 init_done = 1;
864 831
865 init_command (cmd_argv); 832 init_command (cmd_argv);
866
867 free (cmd_argv);
868 833
869 if (pty->pty >= 0) 834 if (pty->pty >= 0)
870 pty_ev.start (pty->pty, ev::READ); 835 pty_ev.start (pty->pty, ev::READ);
871 836
872 HOOK_INVOKE ((this, HOOK_START, DT_END)); 837 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
914/*----------------------------------------------------------------------*/ 879/*----------------------------------------------------------------------*/
915void 880void
916rxvt_term::init_env () 881rxvt_term::init_env ()
917{ 882{
918 char *val; 883 char *val;
884 char *env_display;
885 char *env_windowid;
886 char *env_colorfgbg;
887 char *env_term;
919 888
920#ifdef DISPLAY_IS_IP 889#ifdef DISPLAY_IS_IP
921 /* Fixup display_name for export over pty to any interested terminal 890 /* Fixup display_name for export over pty to any interested terminal
922 * 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
923 * (for the first non-loopback interface) that we get from 892 * (for the first non-loopback interface) that we get from
… …
940 909
941 env_display = (char *)rxvt_malloc (strlen (val) + 9); 910 env_display = (char *)rxvt_malloc (strlen (val) + 9);
942 911
943 sprintf (env_display, "DISPLAY=%s", val); 912 sprintf (env_display, "DISPLAY=%s", val);
944 913
914 env_windowid = (char *)rxvt_malloc (21);
945 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 915 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
946 916
947 /* add entries to the environment: 917 /* add entries to the environment:
948 * @ DISPLAY: in case we started with -display 918 * @ DISPLAY: in case we started with -display
949 * @ WINDOWID: X window id number of the window 919 * @ WINDOWID: X window id number of the window
… …
953 * @ COLORFGBG: fg;bg color codes 923 * @ COLORFGBG: fg;bg color codes
954 */ 924 */
955 putenv (env_display); 925 putenv (env_display);
956 putenv (env_windowid); 926 putenv (env_windowid);
957 927
958 if (env_colorfgbg) 928 env_colorfgbg = get_colorfgbg ();
959 putenv (env_colorfgbg); 929 putenv (env_colorfgbg);
960 930
961#ifdef RXVT_TERMINFO 931#ifdef RXVT_TERMINFO
962 putenv ("TERMINFO=" RXVT_TERMINFO); 932 putenv ("TERMINFO=" RXVT_TERMINFO);
963#endif 933#endif
964 934
… …
983 unsetenv ("TERMCAP"); /* terminfo should be okay */ 953 unsetenv ("TERMCAP"); /* terminfo should be okay */
984#endif /* HAVE_UNSETENV */ 954#endif /* HAVE_UNSETENV */
985} 955}
986 956
987/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
988/*
989 * This is more or less stolen straight from XFree86 xterm.
990 * This should support all European type languages.
991 */
992void 958void
993rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
994{ 960{
995 set_environ (envv); 961 set_environ (env);
996 962
997#if HAVE_XSETLOCALE || HAVE_SETLOCALE
998 free (this->locale); 963 free (this->locale);
999 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
1000 965
1001 if (!this->locale) 966 if (!this->locale)
1002 { 967 {
… …
1013 978
1014 979
1015 this->locale = strdup (this->locale); 980 this->locale = strdup (this->locale);
1016 SET_LOCALE (this->locale); 981 SET_LOCALE (this->locale);
1017 mbstate.reset (); 982 mbstate.reset ();
1018#endif
1019 983
1020#if HAVE_NL_LANGINFO 984#if HAVE_NL_LANGINFO
1021 char *codeset = strdup (nl_langinfo (CODESET)); 985 char *codeset = nl_langinfo (CODESET);
1022 // /^UTF.?8/i 986 // /^UTF.?8/i
1023 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 987 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1024 && (codeset[1] == 'T' || codeset[1] == 't') 988 && (codeset[1] == 'T' || codeset[1] == 't')
1025 && (codeset[2] == 'F' || codeset[2] == 'f') 989 && (codeset[2] == 'F' || codeset[2] == 'f')
1026 && (codeset[3] == '8' || codeset[4] == '8'); 990 && (codeset[3] == '8' || codeset[4] == '8');
1027 free (codeset);
1028#else 991#else
1029 enc_utf8 = 0; 992 enc_utf8 = 0;
1030#endif 993#endif
1031} 994}
1032 995
1033void 996void
1034rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
1035{ 998{
1036 set_environ (envv); 999 set_environ (env);
1037 1000
1038#ifdef USE_XIM 1001#if USE_XIM
1039 if (!locale) 1002 if (!locale)
1040 rxvt_warn ("setting locale failed, working without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1041 else 1004 else
1042 { 1005 {
1043 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1044 1007
1045 if (!XSupportsLocale ()) 1008 if (!XSupportsLocale ())
1046 { 1009 {
1047 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");
1048 return; 1011 return;
1049 } 1012 }
1050 1013
1051 im_ev.start (display); 1014 im_ev.start (display);
1052 1015
… …
1093 run_command (argv); 1056 run_command (argv);
1094} 1057}
1095 1058
1096/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
1097void 1060void
1098rxvt_term::get_colours () 1061rxvt_term::get_colors ()
1099{ 1062{
1100 int i; 1063 int i;
1101 1064
1102#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1103 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
1104#endif 1067#endif
1105 1068
1106 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1069 for (i = 0; i < NRS_COLORS; i++)
1107 { 1070 {
1108 const char *name = rs[Rs_color + i]; 1071 const char *name = rs[Rs_color + i];
1109 1072
1110 if (!name) 1073 if (!name)
1111 continue; 1074 continue;
… …
1121#endif 1084#endif
1122 name = def_colorName [i]; 1085 name = def_colorName [i];
1123 1086
1124 if (!name) 1087 if (!name)
1125 continue; 1088 continue;
1089
1090 xcol.free (this);
1126 1091
1127 if (!set_color (xcol, name)) 1092 if (!set_color (xcol, name))
1128 { 1093 {
1129 switch (i) 1094 switch (i)
1130 { 1095 {
… …
1150 1115
1151 pix_colors[i] = xcol; 1116 pix_colors[i] = xcol;
1152 rs[Rs_color + i] = name; 1117 rs[Rs_color + i] = name;
1153 } 1118 }
1154 1119
1155 if (depth <= 2)
1156 {
1157 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1158 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1159 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1160 }
1161
1162 /* 1120 /*
1163 * get scrollBar shadow colors 1121 * get scrollBar shadow colors
1164 * 1122 *
1165 * The calculations of topShadow/bottomShadow values are adapted 1123 * The calculations of topShadow/bottomShadow values are adapted
1166 * from the fvwm window manager. 1124 * from the fvwm window manager.
1167 */ 1125 */
1168#ifdef RXVT_SCROLLBAR 1126#ifdef RXVT_SCROLLBAR
1169 if (depth <= 2)
1170 {
1171 /* Monochrome */
1172 alias_color (Color_scroll, Color_fg);
1173 alias_color (Color_topShadow, Color_bg);
1174 alias_color (Color_bottomShadow, Color_bg);
1175 }
1176 else
1177 {
1178 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1127 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1179 1128
1180 rgba cscroll; 1129 rgba cscroll;
1181 pix_colors [Color_scroll].get (cscroll); 1130 pix_colors [Color_scroll].get (cscroll);
1182 1131
1183 /* topShadowColor */ 1132 /* topShadowColor */
1184 if (!pix_colors[Color_topShadow].set (this, 1133 if (!pix_colors[Color_topShadow].set (this,
1185 rgba ( 1134 rgba (
1186 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),
1187 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),
1188 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),
1189 cscroll.a) 1138 cscroll.a)
1190 )) 1139 ))
1191 alias_color (Color_topShadow, Color_White); 1140 alias_color (Color_topShadow, Color_White);
1192 }
1193#endif 1141#endif
1194 1142
1195#ifdef OFF_FOCUS_FADING 1143#ifdef OFF_FOCUS_FADING
1196 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1144 for (i = 0; i < NRS_COLORS; i++)
1197 update_fade_color (i); 1145 update_fade_color (i, true);
1198#endif 1146#endif
1199} 1147}
1200 1148
1201/*----------------------------------------------------------------------*/ 1149/*----------------------------------------------------------------------*/
1202/* color aliases, fg/bg bright-bold */ 1150/* color aliases, fg/bg bright-bold */
1203void 1151void
1204rxvt_term::color_aliases (int idx) 1152rxvt_term::color_aliases (int idx)
1205{ 1153{
1206 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1154 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1207 { 1155 {
1208 int i = atoi (rs[Rs_color + idx]); 1156 int i = atoi (rs[Rs_color + idx]);
1209 1157
1210 if (i >= 8 && i <= 15) 1158 if (i >= 8 && i <= 15)
1211 /* bright colors */ 1159 /* bright colors */
… …
1251 for (j = map->max_keypermod; j--; k++) 1199 for (j = map->max_keypermod; j--; k++)
1252 { 1200 {
1253 if (kc[k] == 0) 1201 if (kc[k] == 0)
1254 break; 1202 break;
1255 1203
1256 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1204 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1257 { 1205 {
1258 case XK_Num_Lock: 1206 case XK_Num_Lock:
1259 ModNumLockMask = modmasks[i - 1]; 1207 ModNumLockMask = modmasks[i - 1];
1260 continue; 1208 continue;
1261 1209
… …
1306} 1254}
1307 1255
1308void 1256void
1309rxvt_term::set_icon (const char *file) 1257rxvt_term::set_icon (const char *file)
1310{ 1258{
1311#ifdef HAVE_AFTERIMAGE
1312 init_asv ();
1313
1314 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1315 if (!im)
1316 {
1317 rxvt_warn ("Loading image icon failed, continuing without.\n");
1318 return;
1319 }
1320
1321 unsigned int w = im->width;
1322 unsigned int h = im->height;
1323
1324 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1325 {
1326 rxvt_warn ("Icon image too big, continuing without.\n");
1327 destroy_asimage (&im);
1328 return;
1329 }
1330
1331 ASImage *result = scale_asimage (asv, im,
1332 w, h, ASA_ARGB32,
1333 100, ASIMAGE_QUALITY_DEFAULT);
1334 destroy_asimage (&im);
1335
1336 if (!result)
1337 {
1338 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1339 return;
1340 }
1341
1342 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1343 if (buffer)
1344 {
1345 ARGB32 *asbuf = result->alt.argb32;
1346 buffer [0] = w;
1347 buffer [1] = h;
1348
1349 for (unsigned int i = 0; i < w * h; ++i)
1350 buffer [i + 2] = asbuf [i];
1351
1352 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1353 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1354 free (buffer);
1355 }
1356 else
1357 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1358
1359 destroy_asimage (&result);
1360#endif
1361
1362#ifdef HAVE_PIXBUF 1259#if HAVE_PIXBUF
1363 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1260 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1364 if (!pixbuf) 1261 if (!pixbuf)
1365 { 1262 {
1366 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1263 rxvt_warn ("Loading image icon failed, continuing without.\n");
1367 return; 1264 return;
… …
1432 Window top, parent; 1329 Window top, parent;
1433 1330
1434 dLocal (Display *, dpy); 1331 dLocal (Display *, dpy);
1435 1332
1436 /* grab colors before netscape does */ 1333 /* grab colors before netscape does */
1437 get_colours (); 1334 get_colors ();
1438 1335
1439 if (!set_fonts ()) 1336 if (!set_fonts ())
1440 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");
1441 1338
1442 parent = display->root; 1339 parent = display->root;
… …
1487 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1384 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1488 &attributes); 1385 &attributes);
1489 1386
1490 this->parent = top; 1387 this->parent = top;
1491 1388
1492 old_width = szHint.width;
1493 old_height = szHint.height;
1494
1495 set_title (rs [Rs_title]); 1389 set_title (rs [Rs_title]);
1496 set_icon_name (rs [Rs_iconName]); 1390 set_icon_name (rs [Rs_iconName]);
1497 1391
1498 classHint.res_name = (char *)rs[Rs_name]; 1392 classHint.res_name = (char *)rs[Rs_name];
1499 classHint.res_class = (char *)RESCLASS; 1393 classHint.res_class = (char *)RESCLASS;
1500 1394
1501 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1395 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1502 wmHint.input = True; 1396 wmHint.input = True;
1503 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1397 wmHint.initial_state = option (Opt_iconic) ? IconicState
1398 : option (Opt_dockapp) ? WithdrawnState
1399 : NormalState;
1504 wmHint.window_group = top; 1400 wmHint.window_group = top;
1505 1401
1506 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1402 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1507 &szHint, &wmHint, &classHint); 1403 &szHint, &wmHint, &classHint);
1508#if ENABLE_EWMH 1404#if ENABLE_EWMH
… …
1510 * set up icon hint 1406 * set up icon hint
1511 * rs [Rs_iconfile] is path to icon 1407 * rs [Rs_iconfile] is path to icon
1512 */ 1408 */
1513 1409
1514 if (rs [Rs_iconfile]) 1410 if (rs [Rs_iconfile])
1515 {
1516 set_icon (rs [Rs_iconfile]); 1411 set_icon (rs [Rs_iconfile]);
1517 }
1518#endif 1412#endif
1519 1413
1520#if ENABLE_FRILLS 1414#if ENABLE_FRILLS
1521 if (mwmhints.flags) 1415 if (mwmhints.flags)
1522 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,
… …
1561 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1455 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1562 1456
1563 /* the vt window */ 1457 /* the vt window */
1564 vt = XCreateSimpleWindow (dpy, top, 1458 vt = XCreateSimpleWindow (dpy, top,
1565 window_vt_x, window_vt_y, 1459 window_vt_x, window_vt_y,
1566 width, height, 1460 vt_width, vt_height,
1567 0, 1461 0,
1568 pix_colors_focused[Color_fg], 1462 pix_colors_focused[Color_fg],
1569 pix_colors_focused[Color_bg]); 1463 pix_colors_focused[Color_bg]);
1570 1464
1571 attributes.bit_gravity = NorthWestGravity; 1465 attributes.bit_gravity = NorthWestGravity;
… …
1598 if (rs[Rs_fade]) 1492 if (rs[Rs_fade])
1599 pix_colors = pix_colors_unfocused; 1493 pix_colors = pix_colors_unfocused;
1600#endif 1494#endif
1601 1495
1602 pointer_unblank (); 1496 pointer_unblank ();
1603 scr_recolour (); 1497 scr_recolor ();
1604} 1498}
1605 1499
1606/*----------------------------------------------------------------------*/ 1500/*----------------------------------------------------------------------*/
1607/* 1501/*
1608 * 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
… …
1620 if (pty->pty >= 0) 1514 if (pty->pty >= 0)
1621 { 1515 {
1622 if (getfd_hook) 1516 if (getfd_hook)
1623 pty->pty = (*getfd_hook) (pty->pty); 1517 pty->pty = (*getfd_hook) (pty->pty);
1624 1518
1625 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1519 if (pty->pty < 0)
1626 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1520 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1627 } 1521 }
1628 } 1522 }
1629 else 1523 else
1630#endif 1524#endif
1631 if (!pty->get ()) 1525 if (!pty->get ())
1632 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);
1633 1529
1634 struct termios tio = def_tio; 1530 struct termios tio = def_tio;
1635 1531
1636#ifndef NO_BACKSPACE_KEY 1532#ifndef NO_BACKSPACE_KEY
1637 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1533 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1687 1583
1688 _exit (EXIT_FAILURE); 1584 _exit (EXIT_FAILURE);
1689 1585
1690 default: 1586 default:
1691 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
1692 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1594 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1595 }
1693 1596
1694 pty->close_tty (); 1597 pty->close_tty ();
1695 1598
1696 child_ev.start (cmd_pid); 1599 child_ev.start (cmd_pid);
1697 1600
… …
1722#elif defined (SRIOCSREDIR) 1625#elif defined (SRIOCSREDIR)
1723 int fd; 1626 int fd;
1724 1627
1725 fd = open (CONSOLE, O_WRONLY, 0); 1628 fd = open (CONSOLE, O_WRONLY, 0);
1726 if (fd >= 0) 1629 if (fd >= 0)
1727 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1630 {
1631 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1728 close (fd); 1632 close (fd);
1633 }
1729#endif /* SRIOCSREDIR */ 1634#endif /* SRIOCSREDIR */
1730 } 1635 }
1731 1636
1732 /* reset signals and spin off the command interpreter */ 1637 /* reset signals and spin off the command interpreter */
1733 signal (SIGINT, SIG_DFL); 1638 signal (SIGINT, SIG_DFL);

Diff Legend

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