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.307 by root, Sat Dec 17 23:17:33 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; 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 cmd_argv = (const char **)argv + r_argc + 1;
588 572
589 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
590 574
591 /* 575 /*
592 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
593 */ 577 */
594 578
595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
596 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
597 581
598 get_options (r_argc, argv); 582 cmd_argv = get_options (argc, argv);
599 583
600 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
601 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]);
602 586
603 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
604 xa = display->xa; 588 xa = display->xa;
605 589
606 set (display); 590 set (display);
607 extract_resources (); 591 extract_resources ();
608 592
609#if XFT 593#if ENABLE_FRILLS
610 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
611 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));
612#endif 598#endif
613 599
614 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
615 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
616 rs [i] = 0; 602 rs [i] = 0;
… …
673 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 659 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
674 pointerBlankDelay = i; 660 pointerBlankDelay = i;
675 else 661 else
676 pointerBlankDelay = 2; 662 pointerBlankDelay = 2;
677#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;
678 671
679 /* no point having a scrollbar without having any scrollback! */ 672 /* no point having a scrollbar without having any scrollback! */
680 if (!saveLines) 673 if (!saveLines)
681 set_option (Opt_scrollBar, 0); 674 set_option (Opt_scrollBar, 0);
682 675
… …
755 envv->push_back (0); 748 envv->push_back (0);
756 749
757 this->argv = argv; 750 this->argv = argv;
758 this->envv = envv; 751 this->envv = envv;
759 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
760 init2 (argv->size () - 1, argv->begin ()); 757 init2 (argv->size () - 1, argv->begin ());
761} 758}
762 759
763void 760void
764rxvt_term::init (int argc, const char *const *argv, const char *const *envv) 761rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
… …
782void 779void
783rxvt_term::init2 (int argc, const char *const *argv) 780rxvt_term::init2 (int argc, const char *const *argv)
784{ 781{
785 SET_R (this); 782 SET_R (this);
786 set_locale (""); 783 set_locale ("");
787 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 :(
788 785
789 init_vars (); 786 init_vars ();
790 787
791 const char **cmd_argv = init_resources (argc, argv); 788 const char **cmd_argv = init_resources (argc, argv);
792 789
… …
807 if (option (Opt_scrollBar)) 804 if (option (Opt_scrollBar))
808 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 805 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
809 806
810 pty = ptytty::create (); 807 pty = ptytty::create ();
811 808
812#ifdef HAVE_AFTERIMAGE
813 set_application_name ((char *)rs[Rs_name]);
814 set_output_threshold (OUTPUT_LEVEL_WARNING);
815#endif
816
817 // must be called before create_windows, because the latter may call set_icon
818#ifdef HAVE_PIXBUF
819 g_type_init ();
820#endif
821
822 create_windows (argc, argv); 809 create_windows (argc, argv);
823 810
824 init_xlocale (); 811 init_xlocale ();
825 812
826 scr_poweron (); // initialize screen 813 scr_poweron (); // initialize screen
… …
829 XSynchronize (dpy, True); 816 XSynchronize (dpy, True);
830#endif 817#endif
831 818
832 if (option (Opt_scrollBar)) 819 if (option (Opt_scrollBar))
833 scrollBar.resize (); /* create and map scrollbar */ 820 scrollBar.resize (); /* create and map scrollbar */
821
834#ifdef HAVE_BG_PIXMAP 822#ifdef HAVE_BG_PIXMAP
835 {
836 bg_init (); 823 bg_init ();
837
838#ifdef ENABLE_TRANSPARENCY
839 if (option (Opt_transparent))
840 {
841 bg_set_transparent ();
842
843 if (rs [Rs_blurradius])
844 bg_set_blur (rs [Rs_blurradius]);
845
846 if (ISSET_PIXCOLOR (Color_tint))
847 bg_set_tint (pix_colors_focused [Color_tint]);
848
849 if (rs [Rs_shade])
850 bg_set_shade (rs [Rs_shade]);
851
852 bg_set_root_pixmap ();
853 XSelectInput (dpy, display->root, PropertyChangeMask);
854 rootwin_ev.start (display, display->root);
855 }
856#endif
857
858#ifdef BG_IMAGE_FROM_FILE
859 if (rs[Rs_backgroundPixmap])
860 if (bg_set_file (rs[Rs_backgroundPixmap]))
861 if (!bg_window_position_sensitive ())
862 update_background ();
863#endif
864 }
865#endif 824#endif
866 825
867#if ENABLE_PERL 826#if ENABLE_PERL
868 rootwin_ev.start (display, display->root); 827 rootwin_ev.start (display, display->root);
869#endif 828#endif
870 829
871 set_colorfgbg (); 830 init_done = 1;
872 831
873 init_command (cmd_argv); 832 init_command (cmd_argv);
874 833
875 if (pty->pty >= 0) 834 if (pty->pty >= 0)
876 pty_ev.start (pty->pty, ev::READ); 835 pty_ev.start (pty->pty, ev::READ);
… …
920/*----------------------------------------------------------------------*/ 879/*----------------------------------------------------------------------*/
921void 880void
922rxvt_term::init_env () 881rxvt_term::init_env ()
923{ 882{
924 char *val; 883 char *val;
884 char *env_display;
885 char *env_windowid;
886 char *env_colorfgbg;
887 char *env_term;
925 888
926#ifdef DISPLAY_IS_IP 889#ifdef DISPLAY_IS_IP
927 /* Fixup display_name for export over pty to any interested terminal 890 /* Fixup display_name for export over pty to any interested terminal
928 * 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
929 * (for the first non-loopback interface) that we get from 892 * (for the first non-loopback interface) that we get from
… …
946 909
947 env_display = (char *)rxvt_malloc (strlen (val) + 9); 910 env_display = (char *)rxvt_malloc (strlen (val) + 9);
948 911
949 sprintf (env_display, "DISPLAY=%s", val); 912 sprintf (env_display, "DISPLAY=%s", val);
950 913
914 env_windowid = (char *)rxvt_malloc (21);
951 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 915 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
952 916
953 /* add entries to the environment: 917 /* add entries to the environment:
954 * @ DISPLAY: in case we started with -display 918 * @ DISPLAY: in case we started with -display
955 * @ WINDOWID: X window id number of the window 919 * @ WINDOWID: X window id number of the window
… …
959 * @ COLORFGBG: fg;bg color codes 923 * @ COLORFGBG: fg;bg color codes
960 */ 924 */
961 putenv (env_display); 925 putenv (env_display);
962 putenv (env_windowid); 926 putenv (env_windowid);
963 927
964 if (env_colorfgbg) 928 env_colorfgbg = get_colorfgbg ();
965 putenv (env_colorfgbg); 929 putenv (env_colorfgbg);
966 930
967#ifdef RXVT_TERMINFO 931#ifdef RXVT_TERMINFO
968 putenv ("TERMINFO=" RXVT_TERMINFO); 932 putenv ("TERMINFO=" RXVT_TERMINFO);
969#endif 933#endif
970 934
… …
992 956
993/*----------------------------------------------------------------------*/ 957/*----------------------------------------------------------------------*/
994void 958void
995rxvt_term::set_locale (const char *locale) 959rxvt_term::set_locale (const char *locale)
996{ 960{
997 set_environ (envv); 961 set_environ (env);
998 962
999#if HAVE_XSETLOCALE || HAVE_SETLOCALE
1000 free (this->locale); 963 free (this->locale);
1001 this->locale = setlocale (LC_CTYPE, locale); 964 this->locale = setlocale (LC_CTYPE, locale);
1002 965
1003 if (!this->locale) 966 if (!this->locale)
1004 { 967 {
… …
1015 978
1016 979
1017 this->locale = strdup (this->locale); 980 this->locale = strdup (this->locale);
1018 SET_LOCALE (this->locale); 981 SET_LOCALE (this->locale);
1019 mbstate.reset (); 982 mbstate.reset ();
1020#endif
1021 983
1022#if HAVE_NL_LANGINFO 984#if HAVE_NL_LANGINFO
1023 char *codeset = nl_langinfo (CODESET); 985 char *codeset = nl_langinfo (CODESET);
1024 // /^UTF.?8/i 986 // /^UTF.?8/i
1025 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 987 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1032} 994}
1033 995
1034void 996void
1035rxvt_term::init_xlocale () 997rxvt_term::init_xlocale ()
1036{ 998{
1037 set_environ (envv); 999 set_environ (env);
1038 1000
1039#ifdef USE_XIM 1001#if USE_XIM
1040 if (!locale) 1002 if (!locale)
1041 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 1003 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1042 else 1004 else
1043 { 1005 {
1044 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1006 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1094 run_command (argv); 1056 run_command (argv);
1095} 1057}
1096 1058
1097/*----------------------------------------------------------------------*/ 1059/*----------------------------------------------------------------------*/
1098void 1060void
1099rxvt_term::get_colours () 1061rxvt_term::get_colors ()
1100{ 1062{
1101 int i; 1063 int i;
1102 1064
1103#ifdef OFF_FOCUS_FADING 1065#ifdef OFF_FOCUS_FADING
1104 pix_colors = pix_colors_focused; 1066 pix_colors = pix_colors_focused;
1105#endif 1067#endif
1106 1068
1107 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1069 for (i = 0; i < NRS_COLORS; i++)
1108 {
1109 const char *name = rs[Rs_color + i]; 1070 if (const char *name = rs[Rs_color + i])
1110
1111 if (!name)
1112 continue;
1113
1114 rxvt_color xcol;
1115
1116 if (!set_color (xcol, name)) 1071 set_color (pix_colors [i], name);
1117 {
1118#ifndef XTERM_REVERSE_VIDEO
1119 if (i < 2 && option (Opt_reverseVideo))
1120 name = def_colorName [1 - i];
1121 else
1122#endif
1123 name = def_colorName [i];
1124
1125 if (!name)
1126 continue;
1127
1128 if (!set_color (xcol, name))
1129 {
1130 switch (i)
1131 {
1132 case Color_fg:
1133 case Color_bg:
1134 rxvt_warn ("unable to get foreground/background colour, continuing.\n");
1135 name = "";
1136 break;
1137#ifndef NO_CURSORCOLOR
1138 case Color_cursor2:
1139#endif
1140 case Color_pointer_fg:
1141 name = rs[Rs_color + Color_fg];
1142 xcol.set (this, name);
1143 break;
1144 default:
1145 name = rs[Rs_color + Color_bg];
1146 xcol.set (this, name);
1147 break;
1148 }
1149 }
1150 }
1151
1152 pix_colors[i] = xcol;
1153 rs[Rs_color + i] = name;
1154 }
1155
1156 if (depth <= 2)
1157 {
1158 if (!rs[Rs_color + Color_pointer_fg]) alias_color (Color_pointer_fg, Color_fg);
1159 if (!rs[Rs_color + Color_pointer_bg]) alias_color (Color_pointer_bg, Color_bg);
1160 if (!rs[Rs_color + Color_border] ) alias_color (Color_border, Color_fg);
1161 }
1162 1072
1163 /* 1073 /*
1164 * get scrollBar shadow colors 1074 * get scrollBar shadow colors
1165 * 1075 *
1166 * The calculations of topShadow/bottomShadow values are adapted 1076 * The calculations of topShadow/bottomShadow values are adapted
1167 * from the fvwm window manager. 1077 * from the fvwm window manager.
1168 */ 1078 */
1169#ifdef RXVT_SCROLLBAR 1079#ifdef RXVT_SCROLLBAR
1170 if (depth <= 2)
1171 {
1172 /* Monochrome */
1173 alias_color (Color_scroll, Color_fg);
1174 alias_color (Color_topShadow, Color_bg);
1175 alias_color (Color_bottomShadow, Color_bg);
1176 }
1177 else
1178 {
1179 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]); 1080 pix_colors [Color_scroll].fade (this, 50, pix_colors [Color_bottomShadow]);
1180 1081
1181 rgba cscroll; 1082 rgba cscroll;
1182 pix_colors [Color_scroll].get (cscroll); 1083 pix_colors [Color_scroll].get (cscroll);
1183 1084
1184 /* topShadowColor */ 1085 /* topShadowColor */
1185 if (!pix_colors[Color_topShadow].set (this, 1086 if (!pix_colors[Color_topShadow].set (this,
1186 rgba ( 1087 rgba (
1187 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),
1188 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),
1189 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),
1190 cscroll.a) 1091 cscroll.a)
1191 )) 1092 ))
1192 alias_color (Color_topShadow, Color_White); 1093 alias_color (Color_topShadow, Color_White);
1193 }
1194#endif 1094#endif
1195 1095
1196#ifdef OFF_FOCUS_FADING 1096#ifdef OFF_FOCUS_FADING
1197 for (i = 0; i < (depth <= 2 ? 2 : NRS_COLORS); i++) 1097 for (i = 0; i < NRS_COLORS; i++)
1198 update_fade_color (i); 1098 update_fade_color (i, true);
1199#endif 1099#endif
1200} 1100}
1201 1101
1202/*----------------------------------------------------------------------*/ 1102/*----------------------------------------------------------------------*/
1203/* color aliases, fg/bg bright-bold */ 1103/* color aliases, fg/bg bright-bold */
1204void 1104void
1205rxvt_term::color_aliases (int idx) 1105rxvt_term::color_aliases (int idx)
1206{ 1106{
1207 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1107 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1208 { 1108 {
1209 int i = atoi (rs[Rs_color + idx]); 1109 int i = atoi (rs[Rs_color + idx]);
1210 1110
1211 if (i >= 8 && i <= 15) 1111 if (i >= 8 && i <= 15)
1212 /* bright colors */ 1112 /* bright colors */
… …
1252 for (j = map->max_keypermod; j--; k++) 1152 for (j = map->max_keypermod; j--; k++)
1253 { 1153 {
1254 if (kc[k] == 0) 1154 if (kc[k] == 0)
1255 break; 1155 break;
1256 1156
1257 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1157 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1258 { 1158 {
1259 case XK_Num_Lock: 1159 case XK_Num_Lock:
1260 ModNumLockMask = modmasks[i - 1]; 1160 ModNumLockMask = modmasks[i - 1];
1261 continue; 1161 continue;
1262 1162
… …
1307} 1207}
1308 1208
1309void 1209void
1310rxvt_term::set_icon (const char *file) 1210rxvt_term::set_icon (const char *file)
1311{ 1211{
1312#ifdef HAVE_AFTERIMAGE
1313 init_asv ();
1314
1315 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1316 if (!im)
1317 {
1318 rxvt_warn ("Loading image icon failed, continuing without.\n");
1319 return;
1320 }
1321
1322 unsigned int w = im->width;
1323 unsigned int h = im->height;
1324
1325 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1326 {
1327 rxvt_warn ("Icon image too big, continuing without.\n");
1328 destroy_asimage (&im);
1329 return;
1330 }
1331
1332 ASImage *result = scale_asimage (asv, im,
1333 w, h, ASA_ARGB32,
1334 100, ASIMAGE_QUALITY_DEFAULT);
1335 destroy_asimage (&im);
1336
1337 if (!result)
1338 {
1339 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1340 return;
1341 }
1342
1343 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1344 if (buffer)
1345 {
1346 ARGB32 *asbuf = result->alt.argb32;
1347 buffer [0] = w;
1348 buffer [1] = h;
1349
1350 for (unsigned int i = 0; i < w * h; ++i)
1351 buffer [i + 2] = asbuf [i];
1352
1353 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1354 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1355 free (buffer);
1356 }
1357 else
1358 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1359
1360 destroy_asimage (&result);
1361#endif
1362
1363#ifdef HAVE_PIXBUF 1212#if HAVE_PIXBUF
1364 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1213 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1365 if (!pixbuf) 1214 if (!pixbuf)
1366 { 1215 {
1367 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1216 rxvt_warn ("Loading image icon failed, continuing without.\n");
1368 return; 1217 return;
… …
1433 Window top, parent; 1282 Window top, parent;
1434 1283
1435 dLocal (Display *, dpy); 1284 dLocal (Display *, dpy);
1436 1285
1437 /* grab colors before netscape does */ 1286 /* grab colors before netscape does */
1438 get_colours (); 1287 get_colors ();
1439 1288
1440 if (!set_fonts ()) 1289 if (!set_fonts ())
1441 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");
1442 1291
1443 parent = display->root; 1292 parent = display->root;
… …
1488 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1337 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1489 &attributes); 1338 &attributes);
1490 1339
1491 this->parent = top; 1340 this->parent = top;
1492 1341
1493 old_width = szHint.width;
1494 old_height = szHint.height;
1495
1496 set_title (rs [Rs_title]); 1342 set_title (rs [Rs_title]);
1497 set_icon_name (rs [Rs_iconName]); 1343 set_icon_name (rs [Rs_iconName]);
1498 1344
1499 classHint.res_name = (char *)rs[Rs_name]; 1345 classHint.res_name = (char *)rs[Rs_name];
1500 classHint.res_class = (char *)RESCLASS; 1346 classHint.res_class = (char *)RESCLASS;
1501 1347
1502 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1348 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1503 wmHint.input = True; 1349 wmHint.input = True;
1504 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1350 wmHint.initial_state = option (Opt_iconic) ? IconicState
1351 : option (Opt_dockapp) ? WithdrawnState
1352 : NormalState;
1505 wmHint.window_group = top; 1353 wmHint.window_group = top;
1506 1354
1507 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1355 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1508 &szHint, &wmHint, &classHint); 1356 &szHint, &wmHint, &classHint);
1509#if ENABLE_EWMH 1357#if ENABLE_EWMH
… …
1511 * set up icon hint 1359 * set up icon hint
1512 * rs [Rs_iconfile] is path to icon 1360 * rs [Rs_iconfile] is path to icon
1513 */ 1361 */
1514 1362
1515 if (rs [Rs_iconfile]) 1363 if (rs [Rs_iconfile])
1516 {
1517 set_icon (rs [Rs_iconfile]); 1364 set_icon (rs [Rs_iconfile]);
1518 }
1519#endif 1365#endif
1520 1366
1521#if ENABLE_FRILLS 1367#if ENABLE_FRILLS
1522 if (mwmhints.flags) 1368 if (mwmhints.flags)
1523 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,
… …
1562 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1408 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1563 1409
1564 /* the vt window */ 1410 /* the vt window */
1565 vt = XCreateSimpleWindow (dpy, top, 1411 vt = XCreateSimpleWindow (dpy, top,
1566 window_vt_x, window_vt_y, 1412 window_vt_x, window_vt_y,
1567 width, height, 1413 vt_width, vt_height,
1568 0, 1414 0,
1569 pix_colors_focused[Color_fg], 1415 pix_colors_focused[Color_fg],
1570 pix_colors_focused[Color_bg]); 1416 pix_colors_focused[Color_bg]);
1571 1417
1572 attributes.bit_gravity = NorthWestGravity; 1418 attributes.bit_gravity = NorthWestGravity;
… …
1599 if (rs[Rs_fade]) 1445 if (rs[Rs_fade])
1600 pix_colors = pix_colors_unfocused; 1446 pix_colors = pix_colors_unfocused;
1601#endif 1447#endif
1602 1448
1603 pointer_unblank (); 1449 pointer_unblank ();
1604 scr_recolour (); 1450 scr_recolor ();
1605} 1451}
1606 1452
1607/*----------------------------------------------------------------------*/ 1453/*----------------------------------------------------------------------*/
1608/* 1454/*
1609 * 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
… …
1621 if (pty->pty >= 0) 1467 if (pty->pty >= 0)
1622 { 1468 {
1623 if (getfd_hook) 1469 if (getfd_hook)
1624 pty->pty = (*getfd_hook) (pty->pty); 1470 pty->pty = (*getfd_hook) (pty->pty);
1625 1471
1626 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1472 if (pty->pty < 0)
1627 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1473 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1628 } 1474 }
1629 } 1475 }
1630 else 1476 else
1631#endif 1477#endif
1632 if (!pty->get ()) 1478 if (!pty->get ())
1633 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);
1634 1482
1635 struct termios tio = def_tio; 1483 struct termios tio = def_tio;
1636 1484
1637#ifndef NO_BACKSPACE_KEY 1485#ifndef NO_BACKSPACE_KEY
1638 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1486 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1688 1536
1689 _exit (EXIT_FAILURE); 1537 _exit (EXIT_FAILURE);
1690 1538
1691 default: 1539 default:
1692 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
1693 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1547 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1548 }
1694 1549
1695 pty->close_tty (); 1550 pty->close_tty ();
1696 1551
1697 child_ev.start (cmd_pid); 1552 child_ev.start (cmd_pid);
1698 1553
… …
1723#elif defined (SRIOCSREDIR) 1578#elif defined (SRIOCSREDIR)
1724 int fd; 1579 int fd;
1725 1580
1726 fd = open (CONSOLE, O_WRONLY, 0); 1581 fd = open (CONSOLE, O_WRONLY, 0);
1727 if (fd >= 0) 1582 if (fd >= 0)
1728 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1583 {
1584 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1729 close (fd); 1585 close (fd);
1586 }
1730#endif /* SRIOCSREDIR */ 1587#endif /* SRIOCSREDIR */
1731 } 1588 }
1732 1589
1733 /* reset signals and spin off the command interpreter */ 1590 /* reset signals and spin off the command interpreter */
1734 signal (SIGINT, SIG_DFL); 1591 signal (SIGINT, SIG_DFL);

Diff Legend

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