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.294 by sf-exg, Thu Apr 7 12:19:40 2011 UTC vs.
Revision 1.330 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

… …
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>
56#endif
57
58#ifdef HAVE_STARTUP_NOTIFICATION
59# define SN_API_NOT_YET_FROZEN
60# include <libsn/sn-launchee.h>
58#endif 61#endif
59 62
60#ifdef DISPLAY_IS_IP 63#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 64/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 65#include <sys/types.h>
… …
73#include <netinet/in.h> 76#include <netinet/in.h>
74#include <arpa/inet.h> 77#include <arpa/inet.h>
75#include <net/if.h> 78#include <net/if.h>
76#include <net/if_arp.h> 79#include <net/if_arp.h>
77 80
78static char * 81static char * ecb_cold
79rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
80{ 83{
81 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
82 struct ifconf ifc; 85 struct ifconf ifc;
83 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
516#endif 519#endif
517 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
518#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
519 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
520#endif 523#endif
521#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
522 NULL, 525 NULL,
523#endif 526#endif
524#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
525 "rgb:00/00/00", 528 "rgb:00/00/00",
526#endif 529#endif
… …
562 565
563/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
564const char ** 567const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
566{ 569{
567 int i, r_argc; 570 int i;
568 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
569
570 /*
571 * Look for -e option. Find => split and make cmd_argv[] of command args
572 */
573 for (r_argc = 0; r_argc < argc; r_argc++)
574 if (!strcmp (argv[r_argc], "-e"))
575 break;
576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
590
591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
592
593 for (i = 0; i < r_argc; i++)
594 r_argv[i] = (const char *)argv[i];
595
596 r_argv[i] = NULL;
597 572
598 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
599 574
600 /* 575 /*
601 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
602 */ 577 */
603 578
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
606 581
607 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
608 583
609 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
612 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]);
613 }
614 586
615 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
616 xa = display->xa; 588 xa = display->xa;
617 589
618 set (display); 590 set (display);
619 extract_resources (); 591 extract_resources ();
620 592
621#if XFT 593#if ENABLE_FRILLS
622 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
623 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));
624#endif 598#endif
625
626 free (r_argv);
627 599
628 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
630 rs [i] = 0; 602 rs [i] = 0;
631 603
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639#endif
640
641#if ENABLE_PERL 604#if ENABLE_PERL
642 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
643 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
644 607
645 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
648 { 611 {
649 rxvt_perl.init (this); 612 rxvt_perl.init (this);
650 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
651 } 614 }
652#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 ();
653 620
654 /* 621 /*
655 * set any defaults not already set 622 * set any defaults not already set
656 */ 623 */
657 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
766 return cmd_argv; 733 return cmd_argv;
767} 734}
768 735
769/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
770void 737void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
772{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
773 this->envv = envv; 744 this->envv = envv;
774 745
746 init2 (argv->size () - 1, argv->begin ());
747}
748
749void
750rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
751{
752#if ENABLE_PERL
753 // perl might want to access the stringvecs later, so we need to copy them
754 stringvec *args = new stringvec;
755 for (int i = 0; i < argc; i++)
756 args->push_back (strdup (argv [i]));
757
758 stringvec *envs = new stringvec;
759 for (const char *const *var = envv; *var; var++)
760 envs->push_back (strdup (*var));
761
762 init (args, envs);
763#else
764 init2 (argc, argv);
765#endif
766}
767
768void
769rxvt_term::init2 (int argc, const char *const *argv)
770{
775 SET_R (this); 771 SET_R (this);
776 set_locale (""); 772 set_locale ("");
777 set_environ (envv); // a few things in X do not call setlocale :( 773 set_environ (envv); // a few things in X do not call setlocale :(
778 774
779 init_vars (); 775 init_vars ();
… …
793 if (chdir (path)) 789 if (chdir (path))
794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
795 } 791 }
796 792
797 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 795
800 pty = ptytty::create (); 796 pty = ptytty::create ();
801 797
802 create_windows (argc, argv); 798 create_windows (argc, argv);
803 799
… …
809 XSynchronize (dpy, True); 805 XSynchronize (dpy, True);
810#endif 806#endif
811 807
812 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
813 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
810
814#ifdef HAVE_BG_PIXMAP 811#ifdef HAVE_BG_PIXMAP
815 {
816 bg_init (); 812 bg_init ();
817
818#ifdef ENABLE_TRANSPARENCY
819 if (option (Opt_transparent))
820 {
821 bg_set_transparent ();
822
823 if (rs [Rs_blurradius])
824 bg_set_blur (rs [Rs_blurradius]);
825
826 if (ISSET_PIXCOLOR (Color_tint))
827 bg_set_tint (pix_colors_focused [Color_tint]);
828
829 if (rs [Rs_shade])
830 bg_set_shade (rs [Rs_shade]);
831
832 bg_set_root_pixmap ();
833 XSelectInput (dpy, display->root, PropertyChangeMask);
834 rootwin_ev.start (display, display->root);
835 }
836#endif
837
838#ifdef BG_IMAGE_FROM_FILE
839 if (rs[Rs_backgroundPixmap])
840 {
841 const char *p = rs[Rs_backgroundPixmap];
842
843 if ((p = strchr (p, ';')) != 0)
844 {
845 p++;
846 bg_set_geometry (p);
847 }
848 else
849 bg_set_default_geometry ();
850
851 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bg_window_position_sensitive ())
853 update_background ();
854 }
855#endif
856 }
857#endif 813#endif
858 814
859#if ENABLE_PERL 815#if ENABLE_PERL
860 rootwin_ev.start (display, display->root); 816 rootwin_ev.start (display, display->root);
861#endif 817#endif
862 818
863 set_colorfgbg (); 819 init_done = 1;
864 820
865 init_command (cmd_argv); 821 init_command (cmd_argv);
866
867 free (cmd_argv);
868 822
869 if (pty->pty >= 0) 823 if (pty->pty >= 0)
870 pty_ev.start (pty->pty, ev::READ); 824 pty_ev.start (pty->pty, ev::READ);
871 825
872 HOOK_INVOKE ((this, HOOK_START, DT_END)); 826 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
879 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 833 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
880 32, PropModeReplace, (unsigned char *)&info, 2); 834 32, PropModeReplace, (unsigned char *)&info, 2);
881 } 835 }
882#endif 836#endif
883 837
838#if HAVE_STARTUP_NOTIFICATION
839 SnDisplay *snDisplay;
840 SnLauncheeContext *snContext;
841
842 snDisplay = sn_display_new (dpy, NULL, NULL);
843 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
844
845 /* Tell the window manager that this window is part of the startup context */
846 if (snContext)
847 sn_launchee_context_setup_window (snContext, parent);
848#endif
849
884 XMapWindow (dpy, vt); 850 XMapWindow (dpy, vt);
885 XMapWindow (dpy, parent); 851 XMapWindow (dpy, parent);
852
853#if HAVE_STARTUP_NOTIFICATION
854 if (snContext)
855 {
856 /* Mark the startup process as complete */
857 sn_launchee_context_complete (snContext);
858
859 sn_launchee_context_unref (snContext);
860 }
861
862 sn_display_unref (snDisplay);
863#endif
886 864
887 refresh_check (); 865 refresh_check ();
888} 866}
889 867
890/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
891void 869void
892rxvt_term::init_env () 870rxvt_term::init_env ()
893{ 871{
894 char *val; 872 char *val;
873 char *env_display;
874 char *env_windowid;
875 char *env_colorfgbg;
876 char *env_term;
895 877
896#ifdef DISPLAY_IS_IP 878#ifdef DISPLAY_IS_IP
897 /* Fixup display_name for export over pty to any interested terminal 879 /* Fixup display_name for export over pty to any interested terminal
898 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 880 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
899 * (for the first non-loopback interface) that we get from 881 * (for the first non-loopback interface) that we get from
… …
916 898
917 env_display = (char *)rxvt_malloc (strlen (val) + 9); 899 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 900
919 sprintf (env_display, "DISPLAY=%s", val); 901 sprintf (env_display, "DISPLAY=%s", val);
920 902
903 env_windowid = (char *)rxvt_malloc (21);
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 904 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 905
923 /* add entries to the environment: 906 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 907 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 908 * @ WINDOWID: X window id number of the window
… …
929 * @ COLORFGBG: fg;bg color codes 912 * @ COLORFGBG: fg;bg color codes
930 */ 913 */
931 putenv (env_display); 914 putenv (env_display);
932 putenv (env_windowid); 915 putenv (env_windowid);
933 916
934 if (env_colorfgbg) 917 env_colorfgbg = get_colorfgbg ();
935 putenv (env_colorfgbg); 918 putenv (env_colorfgbg);
936 919
937#ifdef RXVT_TERMINFO 920#ifdef RXVT_TERMINFO
938 putenv ("TERMINFO=" RXVT_TERMINFO); 921 putenv ("TERMINFO=" RXVT_TERMINFO);
939#endif 922#endif
940 923
… …
959 unsetenv ("TERMCAP"); /* terminfo should be okay */ 942 unsetenv ("TERMCAP"); /* terminfo should be okay */
960#endif /* HAVE_UNSETENV */ 943#endif /* HAVE_UNSETENV */
961} 944}
962 945
963/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
964/*
965 * This is more or less stolen straight from XFree86 xterm.
966 * This should support all European type languages.
967 */
968void 947void
969rxvt_term::set_locale (const char *locale) 948rxvt_term::set_locale (const char *locale)
970{ 949{
971 set_environ (envv); 950 set_environ (envv);
972 951
973#if HAVE_XSETLOCALE || HAVE_SETLOCALE
974 free (this->locale); 952 free (this->locale);
975 this->locale = setlocale (LC_CTYPE, locale); 953 this->locale = setlocale (LC_CTYPE, locale);
976 954
977 if (!this->locale) 955 if (!this->locale)
978 { 956 {
… …
989 967
990 968
991 this->locale = strdup (this->locale); 969 this->locale = strdup (this->locale);
992 SET_LOCALE (this->locale); 970 SET_LOCALE (this->locale);
993 mbstate.reset (); 971 mbstate.reset ();
994#endif
995 972
996#if HAVE_NL_LANGINFO 973#if HAVE_NL_LANGINFO
997 char *codeset = strdup (nl_langinfo (CODESET)); 974 char *codeset = nl_langinfo (CODESET);
998 // /^UTF.?8/i 975 // /^UTF.?8/i
999 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 976 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1000 && (codeset[1] == 'T' || codeset[1] == 't') 977 && (codeset[1] == 'T' || codeset[1] == 't')
1001 && (codeset[2] == 'F' || codeset[2] == 'f') 978 && (codeset[2] == 'F' || codeset[2] == 'f')
1002 && (codeset[3] == '8' || codeset[4] == '8'); 979 && (codeset[3] == '8' || codeset[4] == '8');
1003 free (codeset);
1004#else 980#else
1005 enc_utf8 = 0; 981 enc_utf8 = 0;
1006#endif 982#endif
1007} 983}
1008 984
1009void 985void
1010rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
1011{ 987{
1012 set_environ (envv); 988 set_environ (envv);
1013 989
1014#ifdef USE_XIM 990#if USE_XIM
1015 if (!locale) 991 if (!locale)
1016 rxvt_warn ("setting locale failed, working without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017 else 993 else
1018 { 994 {
1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1020 996
1021 if (!XSupportsLocale ()) 997 if (!XSupportsLocale ())
1022 { 998 {
1023 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 999 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1024 return; 1000 return;
1025 } 1001 }
1026 1002
1027 im_ev.start (display); 1003 im_ev.start (display);
1028 1004
… …
1177/*----------------------------------------------------------------------*/ 1153/*----------------------------------------------------------------------*/
1178/* color aliases, fg/bg bright-bold */ 1154/* color aliases, fg/bg bright-bold */
1179void 1155void
1180rxvt_term::color_aliases (int idx) 1156rxvt_term::color_aliases (int idx)
1181{ 1157{
1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1158 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1183 { 1159 {
1184 int i = atoi (rs[Rs_color + idx]); 1160 int i = atoi (rs[Rs_color + idx]);
1185 1161
1186 if (i >= 8 && i <= 15) 1162 if (i >= 8 && i <= 15)
1187 /* bright colors */ 1163 /* bright colors */
… …
1282} 1258}
1283 1259
1284void 1260void
1285rxvt_term::set_icon (const char *file) 1261rxvt_term::set_icon (const char *file)
1286{ 1262{
1287#ifdef HAVE_AFTERIMAGE
1288 init_asv ();
1289
1290 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1291 if (!im)
1292 {
1293 rxvt_warn ("Loading image icon failed, continuing without.\n");
1294 return;
1295 }
1296
1297 unsigned int w = im->width;
1298 unsigned int h = im->height;
1299
1300 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1301 {
1302 rxvt_warn ("Icon image too big, continuing without.\n");
1303 destroy_asimage (&im);
1304 return;
1305 }
1306
1307 ASImage *result = scale_asimage (asv, im,
1308 w, h, ASA_ARGB32,
1309 100, ASIMAGE_QUALITY_DEFAULT);
1310 destroy_asimage (&im);
1311
1312 if (!result)
1313 {
1314 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1315 return;
1316 }
1317
1318 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1319 if (buffer)
1320 {
1321 ARGB32 *asbuf = result->alt.argb32;
1322 buffer [0] = w;
1323 buffer [1] = h;
1324
1325 for (unsigned int i = 0; i < w * h; ++i)
1326 buffer [i + 2] = asbuf [i];
1327
1328 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer);
1331 }
1332 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1334
1335 destroy_asimage (&result);
1336#endif
1337
1338#ifdef HAVE_PIXBUF 1263#if HAVE_PIXBUF
1339 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1340 if (!pixbuf) 1265 if (!pixbuf)
1341 { 1266 {
1342 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1343 return; 1268 return;
… …
1392 g_object_unref (pixbuf); 1317 g_object_unref (pixbuf);
1393#endif 1318#endif
1394} 1319}
1395 1320
1396/*----------------------------------------------------------------------*/ 1321/*----------------------------------------------------------------------*/
1397/* rxvt_Create_Windows () - Open and map the window */ 1322/* Open and map the window */
1398void 1323void
1399rxvt_term::create_windows (int argc, const char *const *argv) 1324rxvt_term::create_windows (int argc, const char *const *argv)
1400{ 1325{
1401 XClassHint classHint; 1326 XClassHint classHint;
1402 XWMHints wmHint; 1327 XWMHints wmHint;
… …
1448 } 1373 }
1449#endif 1374#endif
1450 1375
1451 window_calc (0, 0); 1376 window_calc (0, 0);
1452 1377
1453 /* sub-window placement & size in rxvt_resize_subwindows () */ 1378 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1454 attributes.background_pixel = pix_colors_focused [Color_border]; 1379 attributes.background_pixel = pix_colors_focused [Color_border];
1455 attributes.border_pixel = pix_colors_focused [Color_border]; 1380 attributes.border_pixel = pix_colors_focused [Color_border];
1456 attributes.colormap = cmap; 1381 attributes.colormap = cmap;
1457 1382
1458 top = XCreateWindow (dpy, parent, 1383 top = XCreateWindow (dpy, parent,
… …
1463 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1388 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1464 &attributes); 1389 &attributes);
1465 1390
1466 this->parent = top; 1391 this->parent = top;
1467 1392
1468 old_width = szHint.width;
1469 old_height = szHint.height;
1470
1471 set_title (rs [Rs_title]); 1393 set_title (rs [Rs_title]);
1472 set_icon_name (rs [Rs_iconName]); 1394 set_icon_name (rs [Rs_iconName]);
1473 1395
1474 classHint.res_name = (char *)rs[Rs_name]; 1396 classHint.res_name = (char *)rs[Rs_name];
1475 classHint.res_class = (char *)RESCLASS; 1397 classHint.res_class = (char *)RESCLASS;
… …
1504#if ENABLE_EWMH 1426#if ENABLE_EWMH
1505 xa[XA_NET_WM_PING], 1427 xa[XA_NET_WM_PING],
1506#endif 1428#endif
1507 }; 1429 };
1508 1430
1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1431 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1510 1432
1511#if ENABLE_FRILLS 1433#if ENABLE_FRILLS
1512 if (rs[Rs_transient_for]) 1434 if (rs[Rs_transient_for])
1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1435 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1514#endif 1436#endif
… …
1537 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1538 1460
1539 /* the vt window */ 1461 /* the vt window */
1540 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1541 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1542 width, height, 1464 vt_width, vt_height,
1543 0, 1465 0,
1544 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1545 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1546 1468
1547 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
… …
1596 if (pty->pty >= 0) 1518 if (pty->pty >= 0)
1597 { 1519 {
1598 if (getfd_hook) 1520 if (getfd_hook)
1599 pty->pty = (*getfd_hook) (pty->pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1600 1522
1601 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1602 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1603 } 1525 }
1604 } 1526 }
1605 else 1527 else
1606#endif 1528#endif
1607 if (!pty->get ()) 1529 if (!pty->get ())
1608 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);
1609 1533
1610 struct termios tio = def_tio; 1534 struct termios tio = def_tio;
1611 1535
1612#ifndef NO_BACKSPACE_KEY 1536#ifndef NO_BACKSPACE_KEY
1613 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1663 1587
1664 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1665 1589
1666 default: 1590 default:
1667 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
1668 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1599 }
1669 1600
1670 pty->close_tty (); 1601 pty->close_tty ();
1671 1602
1672 child_ev.start (cmd_pid); 1603 child_ev.start (cmd_pid);
1673 1604
… …
1698#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1699 int fd; 1630 int fd;
1700 1631
1701 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1702 if (fd >= 0) 1633 if (fd >= 0)
1703 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1704 close (fd); 1636 close (fd);
1637 }
1705#endif /* SRIOCSREDIR */ 1638#endif /* SRIOCSREDIR */
1706 } 1639 }
1707 1640
1708 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1709 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);

Diff Legend

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