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.306 by sf-exg, Tue Dec 6 11:39:30 2011 UTC vs.
Revision 1.344 by sf-exg, Tue Jun 16 11:58:26 2015 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
47#ifdef HAVE_XMU
48# include <X11/Xmu/CurUtil.h>
49#endif
46 50
47#ifdef HAVE_XSETLOCALE 51#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 52# define X_LOCALE
49# include <X11/Xlocale.h> 53# include <X11/Xlocale.h>
50#else 54#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 55# include <locale.h>
53# endif
54#endif 56#endif
55 57
56#ifdef HAVE_NL_LANGINFO 58#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 59# include <langinfo.h>
58#endif 60#endif
… …
78#include <netinet/in.h> 80#include <netinet/in.h>
79#include <arpa/inet.h> 81#include <arpa/inet.h>
80#include <net/if.h> 82#include <net/if.h>
81#include <net/if_arp.h> 83#include <net/if_arp.h>
82 84
83static char * 85static char * ecb_cold
84rxvt_network_display (const char *display) 86rxvt_network_display (const char *display)
85{ 87{
86 char buffer[1024], *rval = NULL; 88 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 89 struct ifconf ifc;
88 struct ifreq *ifr; 90 struct ifreq *ifr;
… …
521#endif 523#endif
522 COLOR_SCROLLBAR, 524 COLOR_SCROLLBAR,
523#ifdef RXVT_SCROLLBAR 525#ifdef RXVT_SCROLLBAR
524 COLOR_SCROLLTROUGH, 526 COLOR_SCROLLTROUGH,
525#endif 527#endif
526#if ENABLE_TRANSPARENCY 528#if BG_IMAGE_FROM_ROOT
527 NULL, 529 NULL,
528#endif 530#endif
529#if OFF_FOCUS_FADING 531#if OFF_FOCUS_FADING
530 "rgb:00/00/00", 532 "rgb:00/00/00",
531#endif 533#endif
… …
567 569
568/*----------------------------------------------------------------------*/ 570/*----------------------------------------------------------------------*/
569const char ** 571const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 572rxvt_term::init_resources (int argc, const char *const *argv)
571{ 573{
572 int i, r_argc; 574 int i;
573 const char **cmd_argv; 575 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 cmd_argv = (const char **)argv + r_argc + 1;
588 576
589 rs[Rs_name] = rxvt_basename (argv[0]); 577 rs[Rs_name] = rxvt_basename (argv[0]);
590 578
591 /* 579 /*
592 * Open display, get options/resources and create the window 580 * Open display, get options/resources and create the window
593 */ 581 */
594 582
595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 583 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
596 rs[Rs_display_name] = ":0"; 584 rs[Rs_display_name] = ":0";
597 585
598 get_options (r_argc, argv); 586 cmd_argv = get_options (argc, argv);
599 587
600 if (!(display = displays.get (rs[Rs_display_name]))) 588 if (!(display = displays.get (rs[Rs_display_name])))
601 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 589 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
602 590
603 // using a local pointer decreases code size a lot 591 // using a local pointer decreases code size a lot
604 xa = display->xa; 592 xa = display->xa;
605 593
606 set (display); 594 set (display);
607 extract_resources (); 595 extract_resources ();
608 596
609#if XFT 597#if ENABLE_FRILLS
610 if (rs[Rs_depth]) 598 if (rs[Rs_visual])
611 select_visual (strtol (rs[Rs_depth], 0, 0)); 599 select_visual (strtol (rs[Rs_visual], 0, 0));
600 else if (rs[Rs_depth])
601 select_depth (strtol (rs[Rs_depth], 0, 0));
612#endif 602#endif
613 603
614 for (int i = NUM_RESOURCES; i--; ) 604 for (int i = NUM_RESOURCES; i--; )
615 if (rs [i] == resval_undef) 605 if (rs [i] == resval_undef)
616 rs [i] = 0; 606 rs [i] = 0;
… …
673 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 663 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
674 pointerBlankDelay = i; 664 pointerBlankDelay = i;
675 else 665 else
676 pointerBlankDelay = 2; 666 pointerBlankDelay = 2;
677#endif 667#endif
668
669 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
670 multiClickTime = i;
671 else
672 multiClickTime = 500;
673
674 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
678 675
679 /* no point having a scrollbar without having any scrollback! */ 676 /* no point having a scrollbar without having any scrollback! */
680 if (!saveLines) 677 if (!saveLines)
681 set_option (Opt_scrollBar, 0); 678 set_option (Opt_scrollBar, 0);
682 679
… …
747 return cmd_argv; 744 return cmd_argv;
748} 745}
749 746
750/*----------------------------------------------------------------------*/ 747/*----------------------------------------------------------------------*/
751void 748void
749rxvt_term::init (stringvec *argv, stringvec *envv)
750{
751 argv->push_back (0);
752 envv->push_back (0);
753
754 this->argv = argv;
755 this->envv = envv;
756
757 env = new char *[this->envv->size ()];
758 for (int i = 0; i < this->envv->size (); i++)
759 env[i] = this->envv->at (i);
760
761 init2 (argv->size () - 1, argv->begin ());
762}
763
764void
765rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
766{
767#if ENABLE_PERL
768 // perl might want to access the stringvecs later, so we need to copy them
769 stringvec *args = new stringvec;
770 for (int i = 0; i < argc; i++)
771 args->push_back (strdup (argv [i]));
772
773 stringvec *envs = new stringvec;
774 for (const char *const *var = envv; *var; var++)
775 envs->push_back (strdup (*var));
776
777 init (args, envs);
778#else
779 init2 (argc, argv);
780#endif
781}
782
783void
752rxvt_term::init (int argc, const char *const *argv) 784rxvt_term::init2 (int argc, const char *const *argv)
753{ 785{
754 SET_R (this); 786 SET_R (this);
755 set_locale (""); 787 set_locale ("");
756 set_environ (envv); // a few things in X do not call setlocale :( 788 set_environ (env); // a few things in X do not call setlocale :(
757 789
758 init_vars (); 790 init_vars ();
759 791
760 const char **cmd_argv = init_resources (argc, argv); 792 const char **cmd_argv = init_resources (argc, argv);
761 793
… …
776 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
777 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 809 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
778 810
779 pty = ptytty::create (); 811 pty = ptytty::create ();
780 812
781#ifdef HAVE_AFTERIMAGE
782 set_application_name ((char *)rs[Rs_name]);
783 set_output_threshold (OUTPUT_LEVEL_WARNING);
784#endif
785
786 // must be called before create_windows, because the latter may call set_icon
787#ifdef HAVE_PIXBUF
788 g_type_init ();
789#endif
790
791 create_windows (argc, argv); 813 create_windows (argc, argv);
792 814
793 init_xlocale (); 815 init_xlocale ();
794 816
795 scr_poweron (); // initialize screen 817 scr_poweron (); // initialize screen
… …
798 XSynchronize (dpy, True); 820 XSynchronize (dpy, True);
799#endif 821#endif
800 822
801 if (option (Opt_scrollBar)) 823 if (option (Opt_scrollBar))
802 scrollBar.resize (); /* create and map scrollbar */ 824 scrollBar.resize (); /* create and map scrollbar */
825
803#ifdef HAVE_BG_PIXMAP 826#ifdef HAVE_BG_PIXMAP
804 {
805 bg_init (); 827 bg_init ();
806
807#ifdef ENABLE_TRANSPARENCY
808 if (option (Opt_transparent))
809 {
810 bg_set_transparent ();
811
812 if (rs [Rs_blurradius])
813 bg_set_blur (rs [Rs_blurradius]);
814
815 if (ISSET_PIXCOLOR (Color_tint))
816 bg_set_tint (pix_colors_focused [Color_tint]);
817
818 if (rs [Rs_shade])
819 bg_set_shade (rs [Rs_shade]);
820
821 bg_set_root_pixmap ();
822 XSelectInput (dpy, display->root, PropertyChangeMask);
823 rootwin_ev.start (display, display->root);
824 }
825#endif
826
827#ifdef BG_IMAGE_FROM_FILE
828 if (rs[Rs_backgroundPixmap])
829 {
830 if (bg_set_file (rs[Rs_backgroundPixmap]))
831 if (!bg_window_position_sensitive ())
832 update_background ();
833 }
834#endif
835 }
836#endif 828#endif
837 829
838#if ENABLE_PERL 830#if ENABLE_PERL
839 rootwin_ev.start (display, display->root); 831 rootwin_ev.start (display, display->root);
840#endif 832#endif
841 833
842 set_colorfgbg (); 834 init_done = 1;
843 835
844 init_command (cmd_argv); 836 init_command (cmd_argv);
845 837
846 if (pty->pty >= 0) 838 if (pty->pty >= 0)
847 pty_ev.start (pty->pty, ev::READ); 839 pty_ev.start (pty->pty, ev::READ);
… …
891/*----------------------------------------------------------------------*/ 883/*----------------------------------------------------------------------*/
892void 884void
893rxvt_term::init_env () 885rxvt_term::init_env ()
894{ 886{
895 char *val; 887 char *val;
888 char *env_display;
889 char *env_windowid;
890 char *env_colorfgbg;
891 char *env_term;
896 892
897#ifdef DISPLAY_IS_IP 893#ifdef DISPLAY_IS_IP
898 /* Fixup display_name for export over pty to any interested terminal 894 /* Fixup display_name for export over pty to any interested terminal
899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 895 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
900 * (for the first non-loopback interface) that we get from 896 * (for the first non-loopback interface) that we get from
… …
917 913
918 env_display = (char *)rxvt_malloc (strlen (val) + 9); 914 env_display = (char *)rxvt_malloc (strlen (val) + 9);
919 915
920 sprintf (env_display, "DISPLAY=%s", val); 916 sprintf (env_display, "DISPLAY=%s", val);
921 917
918 env_windowid = (char *)rxvt_malloc (21);
922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
923 920
924 /* add entries to the environment: 921 /* add entries to the environment:
925 * @ DISPLAY: in case we started with -display 922 * @ DISPLAY: in case we started with -display
926 * @ WINDOWID: X window id number of the window 923 * @ WINDOWID: X window id number of the window
… …
930 * @ COLORFGBG: fg;bg color codes 927 * @ COLORFGBG: fg;bg color codes
931 */ 928 */
932 putenv (env_display); 929 putenv (env_display);
933 putenv (env_windowid); 930 putenv (env_windowid);
934 931
935 if (env_colorfgbg) 932 env_colorfgbg = get_colorfgbg ();
936 putenv (env_colorfgbg); 933 putenv (env_colorfgbg);
937 934
938#ifdef RXVT_TERMINFO 935#ifdef RXVT_TERMINFO
939 putenv ("TERMINFO=" RXVT_TERMINFO); 936 putenv ("TERMINFO=" RXVT_TERMINFO);
940#endif 937#endif
941 938
… …
960 unsetenv ("TERMCAP"); /* terminfo should be okay */ 957 unsetenv ("TERMCAP"); /* terminfo should be okay */
961#endif /* HAVE_UNSETENV */ 958#endif /* HAVE_UNSETENV */
962} 959}
963 960
964/*----------------------------------------------------------------------*/ 961/*----------------------------------------------------------------------*/
965/*
966 * This is more or less stolen straight from XFree86 xterm.
967 * This should support all European type languages.
968 */
969void 962void
970rxvt_term::set_locale (const char *locale) 963rxvt_term::set_locale (const char *locale)
971{ 964{
972 set_environ (envv); 965 set_environ (env);
973 966
974#if HAVE_XSETLOCALE || HAVE_SETLOCALE
975 free (this->locale); 967 free (this->locale);
976 this->locale = setlocale (LC_CTYPE, locale); 968 this->locale = setlocale (LC_CTYPE, locale);
977 969
978 if (!this->locale) 970 if (!this->locale)
979 { 971 {
… …
990 982
991 983
992 this->locale = strdup (this->locale); 984 this->locale = strdup (this->locale);
993 SET_LOCALE (this->locale); 985 SET_LOCALE (this->locale);
994 mbstate.reset (); 986 mbstate.reset ();
995#endif
996 987
997#if HAVE_NL_LANGINFO 988#if HAVE_NL_LANGINFO
998 char *codeset = strdup (nl_langinfo (CODESET)); 989 char *codeset = nl_langinfo (CODESET);
999 // /^UTF.?8/i 990 // /^UTF.?8/i
1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 991 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1001 && (codeset[1] == 'T' || codeset[1] == 't') 992 && (codeset[1] == 'T' || codeset[1] == 't')
1002 && (codeset[2] == 'F' || codeset[2] == 'f') 993 && (codeset[2] == 'F' || codeset[2] == 'f')
1003 && (codeset[3] == '8' || codeset[4] == '8'); 994 && (codeset[3] == '8' || codeset[4] == '8');
1004 free (codeset);
1005#else 995#else
1006 enc_utf8 = 0; 996 enc_utf8 = 0;
1007#endif 997#endif
1008} 998}
1009 999
1010void 1000void
1011rxvt_term::init_xlocale () 1001rxvt_term::init_xlocale ()
1012{ 1002{
1013 set_environ (envv); 1003 set_environ (env);
1014 1004
1015#ifdef USE_XIM 1005#if USE_XIM
1016 if (!locale) 1006 if (!locale)
1017 rxvt_warn ("setting locale failed, working without locale support.\n"); 1007 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1018 else 1008 else
1019 { 1009 {
1020 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1010 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1021 1011
1022 if (!XSupportsLocale ()) 1012 if (!XSupportsLocale ())
1023 { 1013 {
1024 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1014 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1025 return; 1015 return;
1026 } 1016 }
1027 1017
1028 im_ev.start (display); 1018 im_ev.start (display);
1029 1019
… …
1070 run_command (argv); 1060 run_command (argv);
1071} 1061}
1072 1062
1073/*----------------------------------------------------------------------*/ 1063/*----------------------------------------------------------------------*/
1074void 1064void
1075rxvt_term::get_colours () 1065rxvt_term::get_colors ()
1076{ 1066{
1077 int i; 1067 int i;
1078 1068
1079#ifdef OFF_FOCUS_FADING 1069#ifdef OFF_FOCUS_FADING
1080 pix_colors = pix_colors_focused; 1070 pix_colors = pix_colors_focused;
1081#endif 1071#endif
1082 1072
1083 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1073 for (i = 0; i < NRS_COLORS; i++)
1084 {
1085 const char *name = rs[Rs_color + i]; 1074 if (const char *name = rs[Rs_color + i])
1086
1087 if (!name)
1088 continue;
1089
1090 rxvt_color xcol;
1091
1092 if (!set_color (xcol, name)) 1075 set_color (pix_colors [i], name);
1093 {
1094#ifndef XTERM_REVERSE_VIDEO
1095 if (i < 2 && option (Opt_reverseVideo))
1096 name = def_colorName [1 - i];
1097 else
1098#endif
1099 name = def_colorName [i];
1100
1101 if (!name)
1102 continue;
1103
1104 if (!set_color (xcol, name))
1105 {
1106 switch (i)
1107 {
1108 case Color_fg:
1109 case Color_bg:
1110 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1111 name = "";
1112 break;
1113#ifndef NO_CURSORCOLOR
1114 case Color_cursor2:
1115#endif
1116 case Color_pointer_fg:
1117 name = rs[Rs_color + Color_fg];
1118 xcol.set (this, name);
1119 break;
1120 default:
1121 name = rs[Rs_color + Color_bg];
1122 xcol.set (this, name);
1123 break;
1124 }
1125 }
1126 }
1127
1128 pix_colors[i] = xcol;
1129 rs[Rs_color + i] = name;
1130 }
1131
1132 if (depth <= 2)
1133 {
1134 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1135 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1136 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1137 }
1138 1076
1139 /* 1077 /*
1140 * get scrollBar shadow colors 1078 * get scrollBar shadow colors
1141 * 1079 *
1142 * The calculations of topShadow/bottomShadow values are adapted 1080 * The calculations of topShadow/bottomShadow values are adapted
1143 * from the fvwm window manager. 1081 * from the fvwm window manager.
1144 */ 1082 */
1145#ifdef RXVT_SCROLLBAR 1083#ifdef RXVT_SCROLLBAR
1146 if (depth <= 2)
1147 {
1148 /* Monochrome */
1149 alias_color (Color_scroll, Color_fg);
1150 alias_color (Color_topShadow, Color_bg);
1151 alias_color (Color_bottomShadow, Color_bg);
1152 }
1153 else
1154 {
1155 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1084 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1156 1085
1157 rgba cscroll; 1086 rgba cscroll;
1158 pix_colors [Color_scroll].get (cscroll); 1087 pix_colors [Color_scroll].get (cscroll);
1159 1088
1160 /* topShadowColor */ 1089 /* topShadowColor */
1161 if (!pix_colors[Color_topShadow].set (this, 1090 if (!pix_colors[Color_topShadow].set (this,
1162 rgba ( 1091 rgba (
1163 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5), 1092 min ((int)rgba::MAX_CC, max (cscroll.r / 5, cscroll.r) * 7 / 5),
1164 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5), 1093 min ((int)rgba::MAX_CC, max (cscroll.g / 5, cscroll.g) * 7 / 5),
1165 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5), 1094 min ((int)rgba::MAX_CC, max (cscroll.b / 5, cscroll.b) * 7 / 5),
1166 cscroll.a) 1095 cscroll.a)
1167 )) 1096 ))
1168 alias_color (Color_topShadow, Color_White); 1097 alias_color (Color_topShadow, Color_White);
1169 }
1170#endif 1098#endif
1171 1099
1172#ifdef OFF_FOCUS_FADING 1100#ifdef OFF_FOCUS_FADING
1173 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1101 for (i = 0; i < NRS_COLORS; i++)
1174 update_fade_color (i); 1102 update_fade_color (i, true);
1175#endif 1103#endif
1176} 1104}
1177 1105
1178/*----------------------------------------------------------------------*/ 1106/*----------------------------------------------------------------------*/
1179/* color aliases, fg/bg bright-bold */ 1107/* color aliases, fg/bg bright-bold */
1180void 1108void
1181rxvt_term::color_aliases (int idx) 1109rxvt_term::color_aliases (int idx)
1182{ 1110{
1183 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1111 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1184 { 1112 {
1185 int i = atoi (rs[Rs_color + idx]); 1113 int i = atoi (rs[Rs_color + idx]);
1186 1114
1187 if (i >= 8 && i <= 15) 1115 if (i >= 8 && i <= 15)
1188 /* bright colors */ 1116 /* bright colors */
… …
1228 for (j = map->max_keypermod; j--; k++) 1156 for (j = map->max_keypermod; j--; k++)
1229 { 1157 {
1230 if (kc[k] == 0) 1158 if (kc[k] == 0)
1231 break; 1159 break;
1232 1160
1233 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1161 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1234 { 1162 {
1235 case XK_Num_Lock: 1163 case XK_Num_Lock:
1236 ModNumLockMask = modmasks[i - 1]; 1164 ModNumLockMask = modmasks[i - 1];
1237 continue; 1165 continue;
1238 1166
… …
1283} 1211}
1284 1212
1285void 1213void
1286rxvt_term::set_icon (const char *file) 1214rxvt_term::set_icon (const char *file)
1287{ 1215{
1288#ifdef HAVE_AFTERIMAGE 1216#if HAVE_PIXBUF && ENABLE_EWMH
1289 init_asv ();
1290
1291 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1292 if (!im)
1293 {
1294 rxvt_warn ("Loading image icon failed, continuing without.\n");
1295 return;
1296 }
1297
1298 unsigned int w = im->width;
1299 unsigned int h = im->height;
1300
1301 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1302 {
1303 rxvt_warn ("Icon image too big, continuing without.\n");
1304 destroy_asimage (&im);
1305 return;
1306 }
1307
1308 ASImage *result = scale_asimage (asv, im,
1309 w, h, ASA_ARGB32,
1310 100, ASIMAGE_QUALITY_DEFAULT);
1311 destroy_asimage (&im);
1312
1313 if (!result)
1314 {
1315 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1316 return;
1317 }
1318
1319 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1320 if (buffer)
1321 {
1322 ARGB32 *asbuf = result->alt.argb32;
1323 buffer [0] = w;
1324 buffer [1] = h;
1325
1326 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i];
1328
1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 destroy_asimage (&result);
1337#endif
1338
1339#ifdef HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1217 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf) 1218 if (!pixbuf)
1342 { 1219 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1220 rxvt_warn ("Loading image icon failed, continuing without.\n");
1344 return; 1221 return;
… …
1409 Window top, parent; 1286 Window top, parent;
1410 1287
1411 dLocal (Display *, dpy); 1288 dLocal (Display *, dpy);
1412 1289
1413 /* grab colors before netscape does */ 1290 /* grab colors before netscape does */
1414 get_colours (); 1291 get_colors ();
1415 1292
1416 if (!set_fonts ()) 1293 if (!set_fonts ())
1417 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n"); 1294 rxvt_fatal ("unable to load base fontset, please specify a valid one using -fn, aborting.\n");
1418 1295
1419 parent = display->root; 1296 parent = display->root;
… …
1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1341 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1465 &attributes); 1342 &attributes);
1466 1343
1467 this->parent = top; 1344 this->parent = top;
1468 1345
1469 old_width = szHint.width;
1470 old_height = szHint.height;
1471
1472 set_title (rs [Rs_title]); 1346 set_title (rs [Rs_title]);
1473 set_icon_name (rs [Rs_iconName]); 1347 set_icon_name (rs [Rs_iconName]);
1474 1348
1475 classHint.res_name = (char *)rs[Rs_name]; 1349 classHint.res_name = (char *)rs[Rs_name];
1476 classHint.res_class = (char *)RESCLASS; 1350 classHint.res_class = (char *)RESCLASS;
1477 1351
1478 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1352 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1479 wmHint.input = True; 1353 wmHint.input = True;
1480 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1354 wmHint.initial_state = option (Opt_iconic) ? IconicState
1355 : option (Opt_dockapp) ? WithdrawnState
1356 : NormalState;
1481 wmHint.window_group = top; 1357 wmHint.window_group = top;
1482 1358
1483 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1359 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1484 &szHint, &wmHint, &classHint); 1360 &szHint, &wmHint, &classHint);
1485#if ENABLE_EWMH 1361#if ENABLE_EWMH
… …
1487 * set up icon hint 1363 * set up icon hint
1488 * rs [Rs_iconfile] is path to icon 1364 * rs [Rs_iconfile] is path to icon
1489 */ 1365 */
1490 1366
1491 if (rs [Rs_iconfile]) 1367 if (rs [Rs_iconfile])
1492 {
1493 set_icon (rs [Rs_iconfile]); 1368 set_icon (rs [Rs_iconfile]);
1494 }
1495#endif 1369#endif
1496 1370
1497#if ENABLE_FRILLS 1371#if ENABLE_FRILLS
1498 if (mwmhints.flags) 1372 if (mwmhints.flags)
1499 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1373 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1533 | ExposureMask | StructureNotifyMask); 1407 | ExposureMask | StructureNotifyMask);
1534 1408
1535 termwin_ev.start (display, top); 1409 termwin_ev.start (display, top);
1536 1410
1537 /* vt cursor: Black-on-White is standard, but this is more popular */ 1411 /* vt cursor: Black-on-White is standard, but this is more popular */
1412 unsigned int shape = XC_xterm;
1413
1414#ifdef HAVE_XMU
1415 if (rs[Rs_pointerShape])
1416 {
1417 int stmp = XmuCursorNameToIndex (rs[Rs_pointerShape]);
1418 if (stmp >= 0)
1419 shape = stmp;
1420 }
1421#endif
1422
1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1423 TermWin_cursor = XCreateFontCursor (dpy, shape);
1539 1424
1540 /* the vt window */ 1425 /* the vt window */
1541 vt = XCreateSimpleWindow (dpy, top, 1426 vt = XCreateSimpleWindow (dpy, top,
1542 window_vt_x, window_vt_y, 1427 window_vt_x, window_vt_y,
1543 width, height, 1428 vt_width, vt_height,
1544 0, 1429 0,
1545 pix_colors_focused[Color_fg], 1430 pix_colors_focused[Color_fg],
1546 pix_colors_focused[Color_bg]); 1431 pix_colors_focused[Color_bg]);
1547 1432
1548 attributes.bit_gravity = NorthWestGravity; 1433 attributes.bit_gravity = NorthWestGravity;
… …
1575 if (rs[Rs_fade]) 1460 if (rs[Rs_fade])
1576 pix_colors = pix_colors_unfocused; 1461 pix_colors = pix_colors_unfocused;
1577#endif 1462#endif
1578 1463
1579 pointer_unblank (); 1464 pointer_unblank ();
1580 scr_recolour (); 1465 scr_recolor ();
1581} 1466}
1582 1467
1583/*----------------------------------------------------------------------*/ 1468/*----------------------------------------------------------------------*/
1584/* 1469/*
1585 * Run the command in a subprocess and return a file descriptor for the 1470 * Run the command in a subprocess and return a file descriptor for the
… …
1597 if (pty->pty >= 0) 1482 if (pty->pty >= 0)
1598 { 1483 {
1599 if (getfd_hook) 1484 if (getfd_hook)
1600 pty->pty = (*getfd_hook) (pty->pty); 1485 pty->pty = (*getfd_hook) (pty->pty);
1601 1486
1602 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1487 if (pty->pty < 0)
1603 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1488 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1604 } 1489 }
1605 } 1490 }
1606 else 1491 else
1607#endif 1492#endif
1608 if (!pty->get ()) 1493 if (!pty->get ())
1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1494 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1495
1496 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1610 1497
1611 struct termios tio = def_tio; 1498 struct termios tio = def_tio;
1612 1499
1613#ifndef NO_BACKSPACE_KEY 1500#ifndef NO_BACKSPACE_KEY
1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1501 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1664 1551
1665 _exit (EXIT_FAILURE); 1552 _exit (EXIT_FAILURE);
1666 1553
1667 default: 1554 default:
1668 if (!option (Opt_utmpInhibit)) 1555 if (!option (Opt_utmpInhibit))
1556 {
1557#ifdef LOG_ONLY_ON_LOGIN
1558 bool login_shell = option (Opt_loginShell);
1559#else
1560 bool login_shell = true;
1561#endif
1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1562 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1563 }
1670 1564
1671 pty->close_tty (); 1565 pty->close_tty ();
1672 1566
1673 child_ev.start (cmd_pid); 1567 child_ev.start (cmd_pid);
1674 1568
… …
1699#elif defined (SRIOCSREDIR) 1593#elif defined (SRIOCSREDIR)
1700 int fd; 1594 int fd;
1701 1595
1702 fd = open (CONSOLE, O_WRONLY, 0); 1596 fd = open (CONSOLE, O_WRONLY, 0);
1703 if (fd >= 0) 1597 if (fd >= 0)
1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1598 {
1599 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1705 close (fd); 1600 close (fd);
1601 }
1706#endif /* SRIOCSREDIR */ 1602#endif /* SRIOCSREDIR */
1707 } 1603 }
1708 1604
1709 /* reset signals and spin off the command interpreter */ 1605 /* reset signals and spin off the command interpreter */
1710 signal (SIGINT, SIG_DFL); 1606 signal (SIGINT, SIG_DFL);

Diff Legend

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