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.346 by sf-exg, Tue Jun 21 12:03:56 2016 UTC

… …
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * Copyright (c) 2015 Emanuele Giaquinta <e.giaquinta@glauco.it>
16 * 17 *
17 * This program is free software; you can redistribute it and/or modify 18 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 19 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 20 * the Free Software Foundation; either version 3 of the License, or
20 * (at your option) any later version. 21 * (at your option) any later version.
21 * 22 *
22 * This program is distributed in the hope that it will be useful, 23 * This program is distributed in the hope that it will be useful,
23 * but WITHOUT ANY WARRANTY; without even the implied warranty of 24 * but WITHOUT ANY WARRANTY; without even the implied warranty of
24 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 25 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
… …
38#include "init.h" 39#include "init.h"
39#include "keyboard.h" 40#include "keyboard.h"
40 41
41#include <limits> 42#include <limits>
42 43
43#include <csignal> 44#include <signal.h>
44 45
45#include <fcntl.h> 46#include <fcntl.h>
47
48#ifdef HAVE_XMU
49# include <X11/Xmu/CurUtil.h>
50#endif
46 51
47#ifdef HAVE_XSETLOCALE 52#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 53# define X_LOCALE
49# include <X11/Xlocale.h> 54# include <X11/Xlocale.h>
50#else 55#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 56# include <locale.h>
53# endif
54#endif 57#endif
55 58
56#ifdef HAVE_NL_LANGINFO 59#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 60# include <langinfo.h>
58#endif 61#endif
… …
78#include <netinet/in.h> 81#include <netinet/in.h>
79#include <arpa/inet.h> 82#include <arpa/inet.h>
80#include <net/if.h> 83#include <net/if.h>
81#include <net/if_arp.h> 84#include <net/if_arp.h>
82 85
83static char * 86static char * ecb_cold
84rxvt_network_display (const char *display) 87rxvt_network_display (const char *display)
85{ 88{
86 char buffer[1024], *rval = NULL; 89 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 90 struct ifconf ifc;
88 struct ifreq *ifr; 91 struct ifreq *ifr;
… …
147 close (skfd); 150 close (skfd);
148 151
149 return rval; 152 return rval;
150} 153}
151#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
152 180
153static const char *const def_colorName[] = 181static const char *const def_colorName[] =
154 { 182 {
155 COLOR_FOREGROUND, 183 COLOR_FOREGROUND,
156 COLOR_BACKGROUND, 184 COLOR_BACKGROUND,
… …
253 "rgb:8b/8b/8b", 281 "rgb:8b/8b/8b",
254 "rgb:a2/a2/a2", 282 "rgb:a2/a2/a2",
255 "rgb:b9/b9/b9", 283 "rgb:b9/b9/b9",
256 "rgb:d0/d0/d0", 284 "rgb:d0/d0/d0",
257 "rgb:e7/e7/e7", 285 "rgb:e7/e7/e7",
286 NULL_100
287 NULL_40
288 NULL,
289 NULL,
290 NULL,
291 NULL,
258#else 292#else
259 // 256 xterm colours 293 // 256 xterm colours
260 "rgb:00/00/00", 294 "rgb:00/00/00",
261 "rgb:00/00/5f", 295 "rgb:00/00/5f",
262 "rgb:00/00/87", 296 "rgb:00/00/87",
… …
495 "rgb:c6/c6/c6", 529 "rgb:c6/c6/c6",
496 "rgb:d0/d0/d0", 530 "rgb:d0/d0/d0",
497 "rgb:da/da/da", 531 "rgb:da/da/da",
498 "rgb:e4/e4/e4", 532 "rgb:e4/e4/e4",
499 "rgb:ee/ee/ee", 533 "rgb:ee/ee/ee",
534 NULL_100
535 NULL_100
536 NULL_40
537 NULL_5
500#endif 538#endif
501 539
502#ifndef NO_CURSORCOLOR 540#ifndef NO_CURSORCOLOR
503 COLOR_CURSOR_BACKGROUND, 541 COLOR_CURSOR_BACKGROUND,
504 COLOR_CURSOR_FOREGROUND, 542 COLOR_CURSOR_FOREGROUND,
… …
521#endif 559#endif
522 COLOR_SCROLLBAR, 560 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 561#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 562 COLOR_SCROLLTROUGH,
525#endif 563#endif
526#if ENABLE_TRANSPARENCY 564#if BG_IMAGE_FROM_ROOT
527 NULL, 565 NULL,
528#endif 566#endif
529#if OFF_FOCUS_FADING 567#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 568 "rgb:00/00/00",
531#endif 569#endif
… …
567 605
568/*----------------------------------------------------------------------*/ 606/*----------------------------------------------------------------------*/
569const char ** 607const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 608rxvt_term::init_resources (int argc, const char *const *argv)
571{ 609{
572 int i, r_argc; 610 int i;
573 const char **cmd_argv; 611 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 612
596 rs[Rs_name] = rxvt_basename (argv[0]); 613 rs[Rs_name] = rxvt_basename (argv[0]);
597 614
598 /* 615 /*
599 * Open display, get options/resources and create the window 616 * Open display, get options/resources and create the window
600 */ 617 */
601 618
602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 619 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
603 rs[Rs_display_name] = ":0"; 620 rs[Rs_display_name] = ":0";
604 621
605 get_options (r_argc, argv); 622 cmd_argv = get_options (argc, argv);
606 623
607 if (!(display = displays.get (rs[Rs_display_name]))) 624 if (!(display = displays.get (rs[Rs_display_name])))
608 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 625 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
609 626
610 // using a local pointer decreases code size a lot 627 // using a local pointer decreases code size a lot
611 xa = display->xa; 628 xa = display->xa;
612 629
613 set (display); 630 set (display);
614 extract_resources (); 631 extract_resources ();
615 632
616#if XFT 633#if ENABLE_FRILLS
617 if (rs[Rs_depth]) 634 if (rs[Rs_visual])
618 select_visual (strtol (rs[Rs_depth], 0, 0)); 635 select_visual (strtol (rs[Rs_visual], 0, 0));
636 else if (rs[Rs_depth])
637 select_depth (strtol (rs[Rs_depth], 0, 0));
619#endif 638#endif
620 639
621 for (int i = NUM_RESOURCES; i--; ) 640 for (int i = NUM_RESOURCES; i--; )
622 if (rs [i] == resval_undef) 641 if (rs [i] == resval_undef)
623 rs [i] = 0; 642 rs [i] = 0;
… …
680 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 699 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
681 pointerBlankDelay = i; 700 pointerBlankDelay = i;
682 else 701 else
683 pointerBlankDelay = 2; 702 pointerBlankDelay = 2;
684#endif 703#endif
704
705 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
706 multiClickTime = i;
707 else
708 multiClickTime = 500;
709
710 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
685 711
686 /* no point having a scrollbar without having any scrollback! */ 712 /* no point having a scrollbar without having any scrollback! */
687 if (!saveLines) 713 if (!saveLines)
688 set_option (Opt_scrollBar, 0); 714 set_option (Opt_scrollBar, 0);
689 715
… …
754 return cmd_argv; 780 return cmd_argv;
755} 781}
756 782
757/*----------------------------------------------------------------------*/ 783/*----------------------------------------------------------------------*/
758void 784void
759rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 785rxvt_term::init (stringvec *argv, stringvec *envv)
760{ 786{
787 argv->push_back (0);
788 envv->push_back (0);
789
790 this->argv = argv;
761 this->envv = envv; 791 this->envv = envv;
762 792
793 env = new char *[this->envv->size ()];
794 for (int i = 0; i < this->envv->size (); i++)
795 env[i] = this->envv->at (i);
796
797 init2 (argv->size () - 1, argv->begin ());
798}
799
800void
801rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
802{
803#if ENABLE_PERL
804 // perl might want to access the stringvecs later, so we need to copy them
805 stringvec *args = new stringvec;
806 for (int i = 0; i < argc; i++)
807 args->push_back (strdup (argv [i]));
808
809 stringvec *envs = new stringvec;
810 for (const char *const *var = envv; *var; var++)
811 envs->push_back (strdup (*var));
812
813 init (args, envs);
814#else
815 init2 (argc, argv);
816#endif
817}
818
819void
820rxvt_term::init2 (int argc, const char *const *argv)
821{
763 SET_R (this); 822 SET_R (this);
764 set_locale (""); 823 set_locale ("");
765 set_environ (envv); // a few things in X do not call setlocale :( 824 set_environ (env); // a few things in X do not call setlocale :(
766 825
767 init_vars (); 826 init_vars ();
768 827
769 const char **cmd_argv = init_resources (argc, argv); 828 const char **cmd_argv = init_resources (argc, argv);
770 829
… …
785 if (option (Opt_scrollBar)) 844 if (option (Opt_scrollBar))
786 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 845 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
787 846
788 pty = ptytty::create (); 847 pty = ptytty::create ();
789 848
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); 849 create_windows (argc, argv);
801 850
802 init_xlocale (); 851 init_xlocale ();
803 852
804 scr_poweron (); // initialize screen 853 scr_poweron (); // initialize screen
… …
807 XSynchronize (dpy, True); 856 XSynchronize (dpy, True);
808#endif 857#endif
809 858
810 if (option (Opt_scrollBar)) 859 if (option (Opt_scrollBar))
811 scrollBar.resize (); /* create and map scrollbar */ 860 scrollBar.resize (); /* create and map scrollbar */
861
812#ifdef HAVE_BG_PIXMAP 862#ifdef HAVE_BG_PIXMAP
813 {
814 bg_init (); 863 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 864#endif
846 865
847#if ENABLE_PERL 866#if ENABLE_PERL
848 rootwin_ev.start (display, display->root); 867 rootwin_ev.start (display, display->root);
849#endif 868#endif
850 869
851 set_colorfgbg (); 870 init_done = 1;
852 871
853 init_command (cmd_argv); 872 init_command (cmd_argv);
854
855 free (cmd_argv);
856 873
857 if (pty->pty >= 0) 874 if (pty->pty >= 0)
858 pty_ev.start (pty->pty, ev::READ); 875 pty_ev.start (pty->pty, ev::READ);
859 876
860 HOOK_INVOKE ((this, HOOK_START, DT_END)); 877 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
902/*----------------------------------------------------------------------*/ 919/*----------------------------------------------------------------------*/
903void 920void
904rxvt_term::init_env () 921rxvt_term::init_env ()
905{ 922{
906 char *val; 923 char *val;
924 char *env_display;
925 char *env_windowid;
926 char *env_colorfgbg;
927 char *env_term;
907 928
908#ifdef DISPLAY_IS_IP 929#ifdef DISPLAY_IS_IP
909 /* Fixup display_name for export over pty to any interested terminal 930 /* 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 931 * 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 932 * (for the first non-loopback interface) that we get from
… …
928 949
929 env_display = (char *)rxvt_malloc (strlen (val) + 9); 950 env_display = (char *)rxvt_malloc (strlen (val) + 9);
930 951
931 sprintf (env_display, "DISPLAY=%s", val); 952 sprintf (env_display, "DISPLAY=%s", val);
932 953
954 env_windowid = (char *)rxvt_malloc (21);
933 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 955 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
934 956
935 /* add entries to the environment: 957 /* add entries to the environment:
936 * @ DISPLAY: in case we started with -display 958 * @ DISPLAY: in case we started with -display
937 * @ WINDOWID: X window id number of the window 959 * @ WINDOWID: X window id number of the window
… …
941 * @ COLORFGBG: fg;bg color codes 963 * @ COLORFGBG: fg;bg color codes
942 */ 964 */
943 putenv (env_display); 965 putenv (env_display);
944 putenv (env_windowid); 966 putenv (env_windowid);
945 967
946 if (env_colorfgbg) 968 env_colorfgbg = get_colorfgbg ();
947 putenv (env_colorfgbg); 969 putenv (env_colorfgbg);
948 970
949#ifdef RXVT_TERMINFO 971#ifdef RXVT_TERMINFO
950 putenv ("TERMINFO=" RXVT_TERMINFO); 972 putenv ("TERMINFO=" RXVT_TERMINFO);
951#endif 973#endif
952 974
… …
971 unsetenv ("TERMCAP"); /* terminfo should be okay */ 993 unsetenv ("TERMCAP"); /* terminfo should be okay */
972#endif /* HAVE_UNSETENV */ 994#endif /* HAVE_UNSETENV */
973} 995}
974 996
975/*----------------------------------------------------------------------*/ 997/*----------------------------------------------------------------------*/
976/*
977 * This is more or less stolen straight from XFree86 xterm.
978 * This should support all European type languages.
979 */
980void 998void
981rxvt_term::set_locale (const char *locale) 999rxvt_term::set_locale (const char *locale)
982{ 1000{
983 set_environ (envv); 1001 set_environ (env);
984 1002
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 1003 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 1004 this->locale = setlocale (LC_CTYPE, locale);
988 1005
989 if (!this->locale) 1006 if (!this->locale)
990 { 1007 {
… …
1001 1018
1002 1019
1003 this->locale = strdup (this->locale); 1020 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 1021 SET_LOCALE (this->locale);
1005 mbstate.reset (); 1022 mbstate.reset ();
1006#endif
1007 1023
1008#if HAVE_NL_LANGINFO 1024#if HAVE_NL_LANGINFO
1009 char *codeset = strdup (nl_langinfo (CODESET)); 1025 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 1026 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1027 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1012 && (codeset[1] == 'T' || codeset[1] == 't') 1028 && (codeset[1] == 'T' || codeset[1] == 't')
1013 && (codeset[2] == 'F' || codeset[2] == 'f') 1029 && (codeset[2] == 'F' || codeset[2] == 'f')
1014 && (codeset[3] == '8' || codeset[4] == '8'); 1030 && (codeset[3] == '8' || codeset[4] == '8');
1015 free (codeset);
1016#else 1031#else
1017 enc_utf8 = 0; 1032 enc_utf8 = 0;
1018#endif 1033#endif
1019} 1034}
1020 1035
1021void 1036void
1022rxvt_term::init_xlocale () 1037rxvt_term::init_xlocale ()
1023{ 1038{
1024 set_environ (envv); 1039 set_environ (env);
1025 1040
1026#ifdef USE_XIM 1041#if USE_XIM
1027 if (!locale) 1042 if (!locale)
1028 rxvt_warn ("setting locale failed, working without locale support.\n"); 1043 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1029 else 1044 else
1030 { 1045 {
1031 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1046 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1032 1047
1033 if (!XSupportsLocale ()) 1048 if (!XSupportsLocale ())
1034 { 1049 {
1035 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1050 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1036 return; 1051 return;
1037 } 1052 }
1038 1053
1039 im_ev.start (display); 1054 im_ev.start (display);
1040 1055
… …
1081 run_command (argv); 1096 run_command (argv);
1082} 1097}
1083 1098
1084/*----------------------------------------------------------------------*/ 1099/*----------------------------------------------------------------------*/
1085void 1100void
1086rxvt_term::get_colours () 1101rxvt_term::get_colors ()
1087{ 1102{
1088 int i; 1103 int i;
1089 1104
1090#ifdef OFF_FOCUS_FADING 1105#ifdef OFF_FOCUS_FADING
1091 pix_colors = pix_colors_focused; 1106 pix_colors = pix_colors_focused;
1092#endif 1107#endif
1093 1108
1094 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1109 for (i = 0; i < NRS_COLORS; i++)
1095 {
1096 const char *name = rs[Rs_color + i]; 1110 if (const char *name = rs[Rs_color + i])
1097
1098 if (!name)
1099 continue;
1100
1101 rxvt_color xcol;
1102
1103 if (!set_color (xcol, name)) 1111 set_color (pix_colors [i], name);
1104 {
1105#ifndef XTERM_REVERSE_VIDEO
1106 if (i < 2 && option (Opt_reverseVideo))
1107 name = def_colorName [1 - i];
1108 else
1109#endif
1110 name = def_colorName [i];
1111
1112 if (!name)
1113 continue;
1114
1115 if (!set_color (xcol, name))
1116 {
1117 switch (i)
1118 {
1119 case Color_fg:
1120 case Color_bg:
1121 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1122 name = "";
1123 break;
1124#ifndef NO_CURSORCOLOR
1125 case Color_cursor2:
1126#endif
1127 case Color_pointer_fg:
1128 name = rs[Rs_color + Color_fg];
1129 xcol.set (this, name);
1130 break;
1131 default:
1132 name = rs[Rs_color + Color_bg];
1133 xcol.set (this, name);
1134 break;
1135 }
1136 }
1137 }
1138
1139 pix_colors[i] = xcol;
1140 rs[Rs_color + i] = name;
1141 }
1142
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 1112
1150 /* 1113 /*
1151 * get scrollBar shadow colors 1114 * get scrollBar shadow colors
1152 * 1115 *
1153 * The calculations of topShadow/bottomShadow values are adapted 1116 * The calculations of topShadow/bottomShadow values are adapted
1154 * from the fvwm window manager. 1117 * from the fvwm window manager.
1155 */ 1118 */
1156#ifdef RXVT_SCROLLBAR 1119#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]); 1120 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1167 1121
1168 rgba cscroll; 1122 rgba cscroll;
1169 pix_colors [Color_scroll].get (cscroll); 1123 pix_colors [Color_scroll].get (cscroll);
1170 1124
1171 /* topShadowColor */ 1125 /* topShadowColor */
1172 if (!pix_colors[Color_topShadow].set (this, 1126 if (!pix_colors[Color_topShadow].set (this,
1173 rgba ( 1127 rgba (
1174 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1128 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), 1129 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), 1130 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1177 cscroll.a) 1131 cscroll.a)
1178 )) 1132 ))
1179 alias_color (Color_topShadow, Color_White); 1133 alias_color (Color_topShadow, Color_White);
1180 }
1181#endif 1134#endif
1182 1135
1183#ifdef OFF_FOCUS_FADING 1136#ifdef OFF_FOCUS_FADING
1184 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1137 for (i = 0; i < NRS_COLORS; i++)
1185 update_fade_color (i); 1138 update_fade_color (i, true);
1186#endif 1139#endif
1187} 1140}
1188 1141
1189/*----------------------------------------------------------------------*/ 1142/*----------------------------------------------------------------------*/
1190/* color aliases, fg/bg bright-bold */ 1143/* color aliases, fg/bg bright-bold */
1191void 1144void
1192rxvt_term::color_aliases (int idx) 1145rxvt_term::color_aliases (int idx)
1193{ 1146{
1194 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1147 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1195 { 1148 {
1196 int i = atoi (rs[Rs_color + idx]); 1149 int i = atoi (rs[Rs_color + idx]);
1197 1150
1198 if (i >= 8 && i <= 15) 1151 if (i >= 8 && i <= 15)
1199 /* bright colors */ 1152 /* bright colors */
… …
1239 for (j = map->max_keypermod; j--; k++) 1192 for (j = map->max_keypermod; j--; k++)
1240 { 1193 {
1241 if (kc[k] == 0) 1194 if (kc[k] == 0)
1242 break; 1195 break;
1243 1196
1244 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1197 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1245 { 1198 {
1246 case XK_Num_Lock: 1199 case XK_Num_Lock:
1247 ModNumLockMask = modmasks[i - 1]; 1200 ModNumLockMask = modmasks[i - 1];
1248 continue; 1201 continue;
1249 1202
… …
1294} 1247}
1295 1248
1296void 1249void
1297rxvt_term::set_icon (const char *file) 1250rxvt_term::set_icon (const char *file)
1298{ 1251{
1299#ifdef HAVE_AFTERIMAGE 1252#if HAVE_PIXBUF && ENABLE_EWMH
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
1351 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1253 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1352 if (!pixbuf) 1254 if (!pixbuf)
1353 { 1255 {
1354 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1256 rxvt_warn ("Loading image icon failed, continuing without.\n");
1355 return; 1257 return;
… …
1420 Window top, parent; 1322 Window top, parent;
1421 1323
1422 dLocal (Display *, dpy); 1324 dLocal (Display *, dpy);
1423 1325
1424 /* grab colors before netscape does */ 1326 /* grab colors before netscape does */
1425 get_colours (); 1327 get_colors ();
1426 1328
1427 if (!set_fonts ()) 1329 if (!set_fonts ())
1428 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1330 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1429 1331
1430 parent = display->root; 1332 parent = display->root;
… …
1475 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1377 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1476 &attributes); 1378 &attributes);
1477 1379
1478 this->parent = top; 1380 this->parent = top;
1479 1381
1480 old_width = szHint.width;
1481 old_height = szHint.height;
1482
1483 set_title (rs [Rs_title]); 1382 set_title (rs [Rs_title]);
1484 set_icon_name (rs [Rs_iconName]); 1383 set_icon_name (rs [Rs_iconName]);
1485 1384
1486 classHint.res_name = (char *)rs[Rs_name]; 1385 classHint.res_name = (char *)rs[Rs_name];
1487 classHint.res_class = (char *)RESCLASS; 1386 classHint.res_class = (char *)RESCLASS;
1488 1387
1489 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1388 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1490 wmHint.input = True; 1389 wmHint.input = True;
1491 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1390 wmHint.initial_state = option (Opt_iconic) ? IconicState
1391 : option (Opt_dockapp) ? WithdrawnState
1392 : NormalState;
1492 wmHint.window_group = top; 1393 wmHint.window_group = top;
1493 1394
1494 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1395 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1495 &szHint, &wmHint, &classHint); 1396 &szHint, &wmHint, &classHint);
1496#if ENABLE_EWMH 1397#if ENABLE_EWMH
… …
1498 * set up icon hint 1399 * set up icon hint
1499 * rs [Rs_iconfile] is path to icon 1400 * rs [Rs_iconfile] is path to icon
1500 */ 1401 */
1501 1402
1502 if (rs [Rs_iconfile]) 1403 if (rs [Rs_iconfile])
1503 {
1504 set_icon (rs [Rs_iconfile]); 1404 set_icon (rs [Rs_iconfile]);
1505 }
1506#endif 1405#endif
1507 1406
1508#if ENABLE_FRILLS 1407#if ENABLE_FRILLS
1509 if (mwmhints.flags) 1408 if (mwmhints.flags)
1510 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1409 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1544 | ExposureMask | StructureNotifyMask); 1443 | ExposureMask | StructureNotifyMask);
1545 1444
1546 termwin_ev.start (display, top); 1445 termwin_ev.start (display, top);
1547 1446
1548 /* vt cursor: Black-on-White is standard, but this is more popular */ 1447 /* vt cursor: Black-on-White is standard, but this is more popular */
1448 unsigned int shape = XC_xterm;
1449
1450#ifdef HAVE_XMU
1451 if (rs[Rs_pointerShape])
1452 {
1453 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1454 if (stmp >= 0)
1455 shape = stmp;
1456 }
1457#endif
1458
1549 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, shape);
1550 1460
1551 /* the vt window */ 1461 /* the vt window */
1552 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1553 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1554 width, height, 1464 vt_width, vt_height,
1555 0, 1465 0,
1556 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1557 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1558 1468
1559 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
… …
1586 if (rs[Rs_fade]) 1496 if (rs[Rs_fade])
1587 pix_colors = pix_colors_unfocused; 1497 pix_colors = pix_colors_unfocused;
1588#endif 1498#endif
1589 1499
1590 pointer_unblank (); 1500 pointer_unblank ();
1591 scr_recolour (); 1501 scr_recolor ();
1592} 1502}
1593 1503
1594/*----------------------------------------------------------------------*/ 1504/*----------------------------------------------------------------------*/
1595/* 1505/*
1596 * Run the command in a subprocess and return a file descriptor for the 1506 * Run the command in a subprocess and return a file descriptor for the
… …
1608 if (pty->pty >= 0) 1518 if (pty->pty >= 0)
1609 { 1519 {
1610 if (getfd_hook) 1520 if (getfd_hook)
1611 pty->pty = (*getfd_hook) (pty->pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1612 1522
1613 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1614 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1615 } 1525 }
1616 } 1526 }
1617 else 1527 else
1618#endif 1528#endif
1619 if (!pty->get ()) 1529 if (!pty->get ())
1620 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1530 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1531
1532 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1621 1533
1622 struct termios tio = def_tio; 1534 struct termios tio = def_tio;
1623 1535
1624#ifndef NO_BACKSPACE_KEY 1536#ifndef NO_BACKSPACE_KEY
1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1675 1587
1676 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1677 1589
1678 default: 1590 default:
1679 if (!option (Opt_utmpInhibit)) 1591 if (!option (Opt_utmpInhibit))
1592 {
1593#ifdef LOG_ONLY_ON_LOGIN
1594 bool login_shell = option (Opt_loginShell);
1595#else
1596 bool login_shell = true;
1597#endif
1680 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1599 }
1681 1600
1682 pty->close_tty (); 1601 pty->close_tty ();
1683 1602
1684 child_ev.start (cmd_pid); 1603 child_ev.start (cmd_pid);
1685 1604
… …
1710#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1711 int fd; 1630 int fd;
1712 1631
1713 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1714 if (fd >= 0) 1633 if (fd >= 0)
1715 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1716 close (fd); 1636 close (fd);
1637 }
1717#endif /* SRIOCSREDIR */ 1638#endif /* SRIOCSREDIR */
1718 } 1639 }
1719 1640
1720 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1721 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);

Diff Legend

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