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.301 by mikachu, Sun Nov 13 16:03:31 2011 UTC vs.
Revision 1.342 by root, Mon Dec 15 02:04:02 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
… …
644 { 611 {
645 rxvt_perl.init (this); 612 rxvt_perl.init (this);
646 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647 } 614 }
648#endif 615#endif
616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources ();
649 620
650 /* 621 /*
651 * set any defaults not already set 622 * set any defaults not already set
652 */ 623 */
653 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
688 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
689 pointerBlankDelay = i; 660 pointerBlankDelay = i;
690 else 661 else
691 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
692#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;
693 671
694 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
695 if (!saveLines) 673 if (!saveLines)
696 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
697 675
… …
762 return cmd_argv; 740 return cmd_argv;
763} 741}
764 742
765/*----------------------------------------------------------------------*/ 743/*----------------------------------------------------------------------*/
766void 744void
767rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 745rxvt_term::init (stringvec *argv, stringvec *envv)
768{ 746{
747 argv->push_back (0);
748 envv->push_back (0);
749
750 this->argv = argv;
769 this->envv = envv; 751 this->envv = envv;
770 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{
771 SET_R (this); 782 SET_R (this);
772 set_locale (""); 783 set_locale ("");
773 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 :(
774 785
775 init_vars (); 786 init_vars ();
776 787
777 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
778 789
… …
793 if (option (Opt_scrollBar)) 804 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 805 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 806
796 pty = ptytty::create (); 807 pty = ptytty::create ();
797 808
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); 809 create_windows (argc, argv);
809 810
810 init_xlocale (); 811 init_xlocale ();
811 812
812 scr_poweron (); // initialize screen 813 scr_poweron (); // initialize screen
… …
815 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
816#endif 817#endif
817 818
818 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
819 scrollBar.resize (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
821
820#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
821 {
822 bg_init (); 823 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 {
847 if (bg_set_file (rs[Rs_backgroundPixmap]))
848 if (!bg_window_position_sensitive ())
849 update_background ();
850 }
851#endif
852 }
853#endif 824#endif
854 825
855#if ENABLE_PERL 826#if ENABLE_PERL
856 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
857#endif 828#endif
858 829
859 set_colorfgbg (); 830 init_done = 1;
860 831
861 init_command (cmd_argv); 832 init_command (cmd_argv);
862
863 free (cmd_argv);
864 833
865 if (pty->pty >= 0) 834 if (pty->pty >= 0)
866 pty_ev.start (pty->pty, ev::READ); 835 pty_ev.start (pty->pty, ev::READ);
867 836
868 HOOK_INVOKE ((this, HOOK_START, DT_END)); 837 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
910/*----------------------------------------------------------------------*/ 879/*----------------------------------------------------------------------*/
911void 880void
912rxvt_term::init_env () 881rxvt_term::init_env ()
913{ 882{
914 char *val; 883 char *val;
884 char *env_display;
885 char *env_windowid;
886 char *env_colorfgbg;
887 char *env_term;
915 888
916#ifdef DISPLAY_IS_IP 889#ifdef DISPLAY_IS_IP
917 /* Fixup display_name for export over pty to any interested terminal 890 /* Fixup display_name for export over pty to any interested terminal
918 * 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
919 * (for the first non-loopback interface) that we get from 892 * (for the first non-loopback interface) that we get from
… …
936 909
937 env_display = (char *)rxvt_malloc (strlen (val) + 9); 910 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 911
939 sprintf (env_display, "DISPLAY=%s", val); 912 sprintf (env_display, "DISPLAY=%s", val);
940 913
914 env_windowid = (char *)rxvt_malloc (21);
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 915 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 916
943 /* add entries to the environment: 917 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 918 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 919 * @ WINDOWID: X window id number of the window
… …
949 * @ COLORFGBG: fg;bg color codes 923 * @ COLORFGBG: fg;bg color codes
950 */ 924 */
951 putenv (env_display); 925 putenv (env_display);
952 putenv (env_windowid); 926 putenv (env_windowid);
953 927
954 if (env_colorfgbg) 928 env_colorfgbg = get_colorfgbg ();
955 putenv (env_colorfgbg); 929 putenv (env_colorfgbg);
956 930
957#ifdef RXVT_TERMINFO 931#ifdef RXVT_TERMINFO
958 putenv ("TERMINFO=" RXVT_TERMINFO); 932 putenv ("TERMINFO=" RXVT_TERMINFO);
959#endif 933#endif
960 934
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 953 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 954#endif /* HAVE_UNSETENV */
981} 955}
982 956
983/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 958void
989rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
990{ 960{
991 set_environ (envv); 961 set_environ (env);
992 962
993#if HAVE_XSETLOCALE || HAVE_SETLOCALE
994 free (this->locale); 963 free (this->locale);
995 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
996 965
997 if (!this->locale) 966 if (!this->locale)
998 { 967 {
… …
1009 978
1010 979
1011 this->locale = strdup (this->locale); 980 this->locale = strdup (this->locale);
1012 SET_LOCALE (this->locale); 981 SET_LOCALE (this->locale);
1013 mbstate.reset (); 982 mbstate.reset ();
1014#endif
1015 983
1016#if HAVE_NL_LANGINFO 984#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 985 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 986 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 987 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 988 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 989 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 990 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 991#else
1025 enc_utf8 = 0; 992 enc_utf8 = 0;
1026#endif 993#endif
1027} 994}
1028 995
1029void 996void
1030rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
1031{ 998{
1032 set_environ (envv); 999 set_environ (env);
1033 1000
1034#ifdef USE_XIM 1001#if USE_XIM
1035 if (!locale) 1002 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 1004 else
1038 { 1005 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 1007
1041 if (!XSupportsLocale ()) 1008 if (!XSupportsLocale ())
1042 { 1009 {
1043 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");
1044 return; 1011 return;
1045 } 1012 }
1046 1013
1047 im_ev.start (display); 1014 im_ev.start (display);
1048 1015
… …
1089 run_command (argv); 1056 run_command (argv);
1090} 1057}
1091 1058
1092/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
1093void 1060void
1094rxvt_term::get_colours () 1061rxvt_term::get_colors ()
1095{ 1062{
1096 int i; 1063 int i;
1097 1064
1098#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1099 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
1100#endif 1067#endif
1101 1068
1102 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1069 for (i = 0; i < NRS_COLORS; i++)
1103 {
1104 const char *name = rs[Rs_color + i]; 1070 if (const char *name = rs[Rs_color + i])
1105
1106 if (!name)
1107 continue;
1108
1109 rxvt_color xcol;
1110
1111 if (!set_color (xcol, name)) 1071 set_color (pix_colors [i], name);
1112 {
1113#ifndef XTERM_REVERSE_VIDEO
1114 if (i < 2 && option (Opt_reverseVideo))
1115 name = def_colorName [1 - i];
1116 else
1117#endif
1118 name = def_colorName [i];
1119
1120 if (!name)
1121 continue;
1122
1123 if (!set_color (xcol, name))
1124 {
1125 switch (i)
1126 {
1127 case Color_fg:
1128 case Color_bg:
1129 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1130 name = "";
1131 break;
1132#ifndef NO_CURSORCOLOR
1133 case Color_cursor2:
1134#endif
1135 case Color_pointer_fg:
1136 name = rs[Rs_color + Color_fg];
1137 xcol.set (this, name);
1138 break;
1139 default:
1140 name = rs[Rs_color + Color_bg];
1141 xcol.set (this, name);
1142 break;
1143 }
1144 }
1145 }
1146
1147 pix_colors[i] = xcol;
1148 rs[Rs_color + i] = name;
1149 }
1150
1151 if (depth <= 2)
1152 {
1153 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1154 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1155 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1156 }
1157 1072
1158 /* 1073 /*
1159 * get scrollBar shadow colors 1074 * get scrollBar shadow colors
1160 * 1075 *
1161 * The calculations of topShadow/bottomShadow values are adapted 1076 * The calculations of topShadow/bottomShadow values are adapted
1162 * from the fvwm window manager. 1077 * from the fvwm window manager.
1163 */ 1078 */
1164#ifdef RXVT_SCROLLBAR 1079#ifdef RXVT_SCROLLBAR
1165 if (depth <= 2)
1166 {
1167 /* Monochrome */
1168 alias_color (Color_scroll, Color_fg);
1169 alias_color (Color_topShadow, Color_bg);
1170 alias_color (Color_bottomShadow, Color_bg);
1171 }
1172 else
1173 {
1174 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1080 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1175 1081
1176 rgba cscroll; 1082 rgba cscroll;
1177 pix_colors [Color_scroll].get (cscroll); 1083 pix_colors [Color_scroll].get (cscroll);
1178 1084
1179 /* topShadowColor */ 1085 /* topShadowColor */
1180 if (!pix_colors[Color_topShadow].set (this, 1086 if (!pix_colors[Color_topShadow].set (this,
1181 rgba ( 1087 rgba (
1182 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1088 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1183 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1089 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1184 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1090 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1185 cscroll.a) 1091 cscroll.a)
1186 )) 1092 ))
1187 alias_color (Color_topShadow, Color_White); 1093 alias_color (Color_topShadow, Color_White);
1188 }
1189#endif 1094#endif
1190 1095
1191#ifdef OFF_FOCUS_FADING 1096#ifdef OFF_FOCUS_FADING
1192 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1097 for (i = 0; i < NRS_COLORS; i++)
1193 update_fade_color (i); 1098 update_fade_color (i, true);
1194#endif 1099#endif
1195} 1100}
1196 1101
1197/*----------------------------------------------------------------------*/ 1102/*----------------------------------------------------------------------*/
1198/* color aliases, fg/bg bright-bold */ 1103/* color aliases, fg/bg bright-bold */
1199void 1104void
1200rxvt_term::color_aliases (int idx) 1105rxvt_term::color_aliases (int idx)
1201{ 1106{
1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1107 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1203 { 1108 {
1204 int i = atoi (rs[Rs_color + idx]); 1109 int i = atoi (rs[Rs_color + idx]);
1205 1110
1206 if (i >= 8 && i <= 15) 1111 if (i >= 8 && i <= 15)
1207 /* bright colors */ 1112 /* bright colors */
… …
1247 for (j = map->max_keypermod; j--; k++) 1152 for (j = map->max_keypermod; j--; k++)
1248 { 1153 {
1249 if (kc[k] == 0) 1154 if (kc[k] == 0)
1250 break; 1155 break;
1251 1156
1252 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1157 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1253 { 1158 {
1254 case XK_Num_Lock: 1159 case XK_Num_Lock:
1255 ModNumLockMask = modmasks[i - 1]; 1160 ModNumLockMask = modmasks[i - 1];
1256 continue; 1161 continue;
1257 1162
… …
1302} 1207}
1303 1208
1304void 1209void
1305rxvt_term::set_icon (const char *file) 1210rxvt_term::set_icon (const char *file)
1306{ 1211{
1307#ifdef HAVE_AFTERIMAGE
1308 init_asv ();
1309
1310 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1311 if (!im)
1312 {
1313 rxvt_warn ("Loading image icon failed, continuing without.\n");
1314 return;
1315 }
1316
1317 unsigned int w = im->width;
1318 unsigned int h = im->height;
1319
1320 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1321 {
1322 rxvt_warn ("Icon image too big, continuing without.\n");
1323 destroy_asimage (&im);
1324 return;
1325 }
1326
1327 ASImage *result = scale_asimage (asv, im,
1328 w, h, ASA_ARGB32,
1329 100, ASIMAGE_QUALITY_DEFAULT);
1330 destroy_asimage (&im);
1331
1332 if (!result)
1333 {
1334 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1335 return;
1336 }
1337
1338 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1339 if (buffer)
1340 {
1341 ARGB32 *asbuf = result->alt.argb32;
1342 buffer [0] = w;
1343 buffer [1] = h;
1344
1345 for (unsigned int i = 0; i < w * h; ++i)
1346 buffer [i + 2] = asbuf [i];
1347
1348 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1349 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1350 free (buffer);
1351 }
1352 else
1353 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1354
1355 destroy_asimage (&result);
1356#endif
1357
1358#ifdef HAVE_PIXBUF 1212#if HAVE_PIXBUF
1359 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1213 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1360 if (!pixbuf) 1214 if (!pixbuf)
1361 { 1215 {
1362 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1216 rxvt_warn ("Loading image icon failed, continuing without.\n");
1363 return; 1217 return;
… …
1428 Window top, parent; 1282 Window top, parent;
1429 1283
1430 dLocal (Display *, dpy); 1284 dLocal (Display *, dpy);
1431 1285
1432 /* grab colors before netscape does */ 1286 /* grab colors before netscape does */
1433 get_colours (); 1287 get_colors ();
1434 1288
1435 if (!set_fonts ()) 1289 if (!set_fonts ())
1436 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1290 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1437 1291
1438 parent = display->root; 1292 parent = display->root;
… …
1483 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1337 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1484 &attributes); 1338 &attributes);
1485 1339
1486 this->parent = top; 1340 this->parent = top;
1487 1341
1488 old_width = szHint.width;
1489 old_height = szHint.height;
1490
1491 set_title (rs [Rs_title]); 1342 set_title (rs [Rs_title]);
1492 set_icon_name (rs [Rs_iconName]); 1343 set_icon_name (rs [Rs_iconName]);
1493 1344
1494 classHint.res_name = (char *)rs[Rs_name]; 1345 classHint.res_name = (char *)rs[Rs_name];
1495 classHint.res_class = (char *)RESCLASS; 1346 classHint.res_class = (char *)RESCLASS;
1496 1347
1497 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1348 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1498 wmHint.input = True; 1349 wmHint.input = True;
1499 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1350 wmHint.initial_state = option (Opt_iconic) ? IconicState
1351 : option (Opt_dockapp) ? WithdrawnState
1352 : NormalState;
1500 wmHint.window_group = top; 1353 wmHint.window_group = top;
1501 1354
1502 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1355 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1503 &szHint, &wmHint, &classHint); 1356 &szHint, &wmHint, &classHint);
1504#if ENABLE_EWMH 1357#if ENABLE_EWMH
… …
1506 * set up icon hint 1359 * set up icon hint
1507 * rs [Rs_iconfile] is path to icon 1360 * rs [Rs_iconfile] is path to icon
1508 */ 1361 */
1509 1362
1510 if (rs [Rs_iconfile]) 1363 if (rs [Rs_iconfile])
1511 {
1512 set_icon (rs [Rs_iconfile]); 1364 set_icon (rs [Rs_iconfile]);
1513 }
1514#endif 1365#endif
1515 1366
1516#if ENABLE_FRILLS 1367#if ENABLE_FRILLS
1517 if (mwmhints.flags) 1368 if (mwmhints.flags)
1518 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1369 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1557 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1408 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1558 1409
1559 /* the vt window */ 1410 /* the vt window */
1560 vt = XCreateSimpleWindow (dpy, top, 1411 vt = XCreateSimpleWindow (dpy, top,
1561 window_vt_x, window_vt_y, 1412 window_vt_x, window_vt_y,
1562 width, height, 1413 vt_width, vt_height,
1563 0, 1414 0,
1564 pix_colors_focused[Color_fg], 1415 pix_colors_focused[Color_fg],
1565 pix_colors_focused[Color_bg]); 1416 pix_colors_focused[Color_bg]);
1566 1417
1567 attributes.bit_gravity = NorthWestGravity; 1418 attributes.bit_gravity = NorthWestGravity;
… …
1594 if (rs[Rs_fade]) 1445 if (rs[Rs_fade])
1595 pix_colors = pix_colors_unfocused; 1446 pix_colors = pix_colors_unfocused;
1596#endif 1447#endif
1597 1448
1598 pointer_unblank (); 1449 pointer_unblank ();
1599 scr_recolour (); 1450 scr_recolor ();
1600} 1451}
1601 1452
1602/*----------------------------------------------------------------------*/ 1453/*----------------------------------------------------------------------*/
1603/* 1454/*
1604 * Run the command in a subprocess and return a file descriptor for the 1455 * Run the command in a subprocess and return a file descriptor for the
… …
1616 if (pty->pty >= 0) 1467 if (pty->pty >= 0)
1617 { 1468 {
1618 if (getfd_hook) 1469 if (getfd_hook)
1619 pty->pty = (*getfd_hook) (pty->pty); 1470 pty->pty = (*getfd_hook) (pty->pty);
1620 1471
1621 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1472 if (pty->pty < 0)
1622 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1473 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1623 } 1474 }
1624 } 1475 }
1625 else 1476 else
1626#endif 1477#endif
1627 if (!pty->get ()) 1478 if (!pty->get ())
1628 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1479 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1480
1481 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1629 1482
1630 struct termios tio = def_tio; 1483 struct termios tio = def_tio;
1631 1484
1632#ifndef NO_BACKSPACE_KEY 1485#ifndef NO_BACKSPACE_KEY
1633 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1486 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1683 1536
1684 _exit (EXIT_FAILURE); 1537 _exit (EXIT_FAILURE);
1685 1538
1686 default: 1539 default:
1687 if (!option (Opt_utmpInhibit)) 1540 if (!option (Opt_utmpInhibit))
1541 {
1542#ifdef LOG_ONLY_ON_LOGIN
1543 bool login_shell = option (Opt_loginShell);
1544#else
1545 bool login_shell = true;
1546#endif
1688 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1547 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1548 }
1689 1549
1690 pty->close_tty (); 1550 pty->close_tty ();
1691 1551
1692 child_ev.start (cmd_pid); 1552 child_ev.start (cmd_pid);
1693 1553
… …
1718#elif defined (SRIOCSREDIR) 1578#elif defined (SRIOCSREDIR)
1719 int fd; 1579 int fd;
1720 1580
1721 fd = open (CONSOLE, O_WRONLY, 0); 1581 fd = open (CONSOLE, O_WRONLY, 0);
1722 if (fd >= 0) 1582 if (fd >= 0)
1723 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1583 {
1584 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1724 close (fd); 1585 close (fd);
1586 }
1725#endif /* SRIOCSREDIR */ 1587#endif /* SRIOCSREDIR */
1726 } 1588 }
1727 1589
1728 /* reset signals and spin off the command interpreter */ 1590 /* reset signals and spin off the command interpreter */
1729 signal (SIGINT, SIG_DFL); 1591 signal (SIGINT, SIG_DFL);

Diff Legend

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