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.283 by sf-exg, Wed Oct 13 23:04:57 2010 UTC vs.
Revision 1.315 by sf-exg, Mon Jan 9 15:34:56 2012 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
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 <pcg@goof.com> 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 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif 58#endif
59 59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
64
60#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 67#include <sys/types.h>
63#include <sys/socket.h> 68#include <sys/socket.h>
64 69
… …
143 148
144 return rval; 149 return rval;
145} 150}
146#endif 151#endif
147 152
148const char *const def_colorName[] = 153static const char *const def_colorName[] =
149 { 154 {
150 COLOR_FOREGROUND, 155 COLOR_FOREGROUND,
151 COLOR_BACKGROUND, 156 COLOR_BACKGROUND,
152 /* low-intensity colors */ 157 /* low-intensity colors */
153 "rgb:00/00/00", // 0: black (Black) 158 "rgb:00/00/00", // 0: black (Black)
… …
562 567
563/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
564const char ** 569const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
566{ 571{
567 int i, r_argc; 572 int i;
568 const char **cmd_argv, **r_argv; 573 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 574
598 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
599 576
600 /* 577 /*
601 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
602 */ 579 */
603 580
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
606 583
607 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
608 585
609 if (!(display = displays.get (rs[Rs_display_name]))) 586 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]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 588
615 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
616 xa = display->xa; 590 xa = display->xa;
617 591
618 set (display); 592 set (display);
… …
621#if XFT 595#if XFT
622 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
623 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
624#endif 598#endif
625 599
626 free (r_argv);
627
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 gdk_pixbuf_xlib_init (dpy, display->screen);
640#endif
641
642#if ENABLE_PERL 604#if ENABLE_PERL
643 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
644 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
645 607
646 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
649 { 611 {
650 rxvt_perl.init (this); 612 rxvt_perl.init (this);
651 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
652 } 614 }
653#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 ();
654 620
655 /* 621 /*
656 * set any defaults not already set 622 * set any defaults not already set
657 */ 623 */
658 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
767 return cmd_argv; 733 return cmd_argv;
768} 734}
769 735
770/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
771void 737void
772rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
773{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
774 this->envv = envv; 744 this->envv = envv;
775 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{
776 SET_R (this); 771 SET_R (this);
777 set_locale (""); 772 set_locale ("");
778 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 :(
779 774
780 init_vars (); 775 init_vars ();
… …
794 if (chdir (path)) 789 if (chdir (path))
795 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");
796 } 791 }
797 792
798 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
799 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
800 795
801 pty = ptytty::create (); 796 pty = ptytty::create ();
797
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
802 807
803 create_windows (argc, argv); 808 create_windows (argc, argv);
804 809
805 init_xlocale (); 810 init_xlocale ();
806 811
… …
812 817
813 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
814 scrollBar.resize (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
815#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
816 { 821 {
817 bgPixmap.set_target (this); 822 bg_init ();
818 bgPixmap.invalidate ();
819 823
820#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
821 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
822 { 826 {
823 bgPixmap.set_transparent (); 827 bg_set_transparent ();
824 828
825 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
826 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
827 831
828 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
829 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
830 834
831 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
832 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
833 837
834 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
835 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
836 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
837 } 841 }
838#endif 842#endif
839 843
840#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
841 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
842 {
843 const char *p = rs[Rs_backgroundPixmap];
844
845 if ((p = strchr (p, ';')) != 0)
846 {
847 p++;
848 bgPixmap.set_geometry (p);
849 }
850 else
851 bgPixmap.set_defaultGeometry ();
852
853 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
854 if (!bgPixmap.window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
855 update_background (); 848 update_background ();
856 }
857#endif 849#endif
858 } 850 }
859#endif 851#endif
860 852
861#if ENABLE_PERL 853#if ENABLE_PERL
862 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
863#endif 855#endif
864 856
865 set_colorfgbg (); 857 set_colorfgbg ();
858 init_done = 1;
866 859
867 init_command (cmd_argv); 860 init_command (cmd_argv);
868
869 free (cmd_argv);
870 861
871 if (pty->pty >= 0) 862 if (pty->pty >= 0)
872 pty_ev.start (pty->pty, ev::READ); 863 pty_ev.start (pty->pty, ev::READ);
873 864
874 HOOK_INVOKE ((this, HOOK_START, DT_END)); 865 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
876#if ENABLE_XEMBED 867#if ENABLE_XEMBED
877 if (rs[Rs_embed]) 868 if (rs[Rs_embed])
878 { 869 {
879 long info[2] = { 0, XEMBED_MAPPED }; 870 long info[2] = { 0, XEMBED_MAPPED };
880 871
881 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 872 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
882 32, PropModeReplace, (unsigned char *)&info, 2); 873 32, PropModeReplace, (unsigned char *)&info, 2);
883 } 874 }
884#endif 875#endif
885 876
877#if HAVE_STARTUP_NOTIFICATION
878 SnDisplay *snDisplay;
879 SnLauncheeContext *snContext;
880
881 snDisplay = sn_display_new (dpy, NULL, NULL);
882 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
883
884 /* Tell the window manager that this window is part of the startup context */
885 if (snContext)
886 sn_launchee_context_setup_window (snContext, parent);
887#endif
888
886 XMapWindow (dpy, vt); 889 XMapWindow (dpy, vt);
887 XMapWindow (dpy, parent[0]); 890 XMapWindow (dpy, parent);
891
892#if HAVE_STARTUP_NOTIFICATION
893 if (snContext)
894 {
895 /* Mark the startup process as complete */
896 sn_launchee_context_complete (snContext);
897
898 sn_launchee_context_unref (snContext);
899 }
900
901 sn_display_unref (snDisplay);
902#endif
888 903
889 refresh_check (); 904 refresh_check ();
890} 905}
891 906
892/*----------------------------------------------------------------------*/ 907/*----------------------------------------------------------------------*/
893void 908void
894rxvt_term::init_env () 909rxvt_term::init_env ()
895{ 910{
896 int i;
897 char *val; 911 char *val;
912 char *env_display;
913 char *env_term;
898 914
899#ifdef DISPLAY_IS_IP 915#ifdef DISPLAY_IS_IP
900 /* Fixup display_name for export over pty to any interested terminal 916 /* Fixup display_name for export over pty to any interested terminal
901 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
902 * (for the first non-loopback interface) that we get from 918 * (for the first non-loopback interface) that we get from
… …
915 val = XDisplayString (dpy); 931 val = XDisplayString (dpy);
916 932
917 if (rs[Rs_display_name] == NULL) 933 if (rs[Rs_display_name] == NULL)
918 rs[Rs_display_name] = val; /* use broken `:0' value */ 934 rs[Rs_display_name] = val; /* use broken `:0' value */
919 935
920 i = strlen (val);
921 env_display = (char *)rxvt_malloc (i + 9); 936 env_display = (char *)rxvt_malloc (strlen (val) + 9);
922 937
923 sprintf (env_display, "DISPLAY=%s", val); 938 sprintf (env_display, "DISPLAY=%s", val);
924 939
925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
926 941
927 /* add entries to the environment: 942 /* add entries to the environment:
928 * @ DISPLAY: in case we started with -display 943 * @ DISPLAY: in case we started with -display
929 * @ WINDOWID: X window id number of the window 944 * @ WINDOWID: X window id number of the window
930 * @ COLORTERM: terminal sub-name and also indicates its color 945 * @ COLORTERM: terminal sub-name and also indicates its color
… …
963 unsetenv ("TERMCAP"); /* terminfo should be okay */ 978 unsetenv ("TERMCAP"); /* terminfo should be okay */
964#endif /* HAVE_UNSETENV */ 979#endif /* HAVE_UNSETENV */
965} 980}
966 981
967/*----------------------------------------------------------------------*/ 982/*----------------------------------------------------------------------*/
968/*
969 * This is more or less stolen straight from XFree86 xterm.
970 * This should support all European type languages.
971 */
972void 983void
973rxvt_term::set_locale (const char *locale) 984rxvt_term::set_locale (const char *locale)
974{ 985{
975 set_environ (envv); 986 set_environ (envv);
976 987
… …
996 SET_LOCALE (this->locale); 1007 SET_LOCALE (this->locale);
997 mbstate.reset (); 1008 mbstate.reset ();
998#endif 1009#endif
999 1010
1000#if HAVE_NL_LANGINFO 1011#if HAVE_NL_LANGINFO
1001 char *codeset = strdup (nl_langinfo (CODESET)); 1012 char *codeset = nl_langinfo (CODESET);
1002 // /^UTF.?8/i 1013 // /^UTF.?8/i
1003 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1014 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1004 && (codeset[1] == 'T' || codeset[1] == 't') 1015 && (codeset[1] == 'T' || codeset[1] == 't')
1005 && (codeset[2] == 'F' || codeset[2] == 'f') 1016 && (codeset[2] == 'F' || codeset[2] == 'f')
1006 && (codeset[3] == '8' || codeset[4] == '8'); 1017 && (codeset[3] == '8' || codeset[4] == '8');
1007 free (codeset);
1008#else 1018#else
1009 enc_utf8 = 0; 1019 enc_utf8 = 0;
1010#endif 1020#endif
1011} 1021}
1012 1022
… …
1015{ 1025{
1016 set_environ (envv); 1026 set_environ (envv);
1017 1027
1018#ifdef USE_XIM 1028#ifdef USE_XIM
1019 if (!locale) 1029 if (!locale)
1020 rxvt_warn ("setting locale failed, working without locale support.\n"); 1030 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1021 else 1031 else
1022 { 1032 {
1023 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1033 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1024 1034
1025 if (!XSupportsLocale ()) 1035 if (!XSupportsLocale ())
1026 { 1036 {
1027 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1037 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1028 return; 1038 return;
1029 } 1039 }
1030 1040
1031 im_ev.start (display); 1041 im_ev.start (display);
1032 1042
… …
1327 buffer [1] = h; 1337 buffer [1] = h;
1328 1338
1329 for (unsigned int i = 0; i < w * h; ++i) 1339 for (unsigned int i = 0; i < w * h; ++i)
1330 buffer [i + 2] = asbuf [i]; 1340 buffer [i + 2] = asbuf [i];
1331 1341
1332 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1342 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1333 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1343 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1334 free (buffer); 1344 free (buffer);
1335 } 1345 }
1336 else 1346 else
1337 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1347 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1384 } 1394 }
1385 1395
1386 row += rowstride; 1396 row += rowstride;
1387 } 1397 }
1388 1398
1389 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1399 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1390 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1400 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1391 free (buffer); 1401 free (buffer);
1392 } 1402 }
1393 else 1403 else
1394 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1404 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1396 g_object_unref (pixbuf); 1406 g_object_unref (pixbuf);
1397#endif 1407#endif
1398} 1408}
1399 1409
1400/*----------------------------------------------------------------------*/ 1410/*----------------------------------------------------------------------*/
1401/* rxvt_Create_Windows () - Open and map the window */ 1411/* Open and map the window */
1402void 1412void
1403rxvt_term::create_windows (int argc, const char *const *argv) 1413rxvt_term::create_windows (int argc, const char *const *argv)
1404{ 1414{
1405 XClassHint classHint; 1415 XClassHint classHint;
1406 XWMHints wmHint; 1416 XWMHints wmHint;
… …
1452 } 1462 }
1453#endif 1463#endif
1454 1464
1455 window_calc (0, 0); 1465 window_calc (0, 0);
1456 1466
1457 /* sub-window placement & size in rxvt_resize_subwindows () */ 1467 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1458 attributes.background_pixel = pix_colors_focused [Color_border]; 1468 attributes.background_pixel = pix_colors_focused [Color_border];
1459 attributes.border_pixel = pix_colors_focused [Color_border]; 1469 attributes.border_pixel = pix_colors_focused [Color_border];
1460 attributes.colormap = cmap; 1470 attributes.colormap = cmap;
1461 1471
1462 top = XCreateWindow (dpy, parent, 1472 top = XCreateWindow (dpy, parent,
… …
1465 ext_bwidth, 1475 ext_bwidth,
1466 depth, InputOutput, visual, 1476 depth, InputOutput, visual,
1467 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1477 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1468 &attributes); 1478 &attributes);
1469 1479
1470 this->parent[0] = top; 1480 this->parent = top;
1471
1472 old_width = szHint.width;
1473 old_height = szHint.height;
1474 1481
1475 set_title (rs [Rs_title]); 1482 set_title (rs [Rs_title]);
1476 set_icon_name (rs [Rs_iconName]); 1483 set_icon_name (rs [Rs_iconName]);
1477 1484
1478 classHint.res_name = (char *)rs[Rs_name]; 1485 classHint.res_name = (char *)rs[Rs_name];
… …
1508#if ENABLE_EWMH 1515#if ENABLE_EWMH
1509 xa[XA_NET_WM_PING], 1516 xa[XA_NET_WM_PING],
1510#endif 1517#endif
1511 }; 1518 };
1512 1519
1513 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1520 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1514 1521
1515#if ENABLE_FRILLS 1522#if ENABLE_FRILLS
1516 if (rs[Rs_transient_for]) 1523 if (rs[Rs_transient_for])
1517 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1524 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1518#endif 1525#endif
… …
1600 if (pty->pty >= 0) 1607 if (pty->pty >= 0)
1601 { 1608 {
1602 if (getfd_hook) 1609 if (getfd_hook)
1603 pty->pty = (*getfd_hook) (pty->pty); 1610 pty->pty = (*getfd_hook) (pty->pty);
1604 1611
1605 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1612 if (pty->pty < 0)
1606 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1613 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1607 } 1614 }
1608 } 1615 }
1609 else 1616 else
1610#endif 1617#endif
1611 if (!pty->get ()) 1618 if (!pty->get ())
1612 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1619 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1620
1621 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1613 1622
1614 struct termios tio = def_tio; 1623 struct termios tio = def_tio;
1615 1624
1616#ifndef NO_BACKSPACE_KEY 1625#ifndef NO_BACKSPACE_KEY
1617 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1626 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1667 1676
1668 _exit (EXIT_FAILURE); 1677 _exit (EXIT_FAILURE);
1669 1678
1670 default: 1679 default:
1671 if (!option (Opt_utmpInhibit)) 1680 if (!option (Opt_utmpInhibit))
1681 {
1682#ifdef LOG_ONLY_ON_LOGIN
1683 bool login_shell = option (Opt_loginShell);
1684#else
1685 bool login_shell = true;
1686#endif
1672 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1687 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1688 }
1673 1689
1674 pty->close_tty (); 1690 pty->close_tty ();
1675 1691
1676 child_ev.start (cmd_pid); 1692 child_ev.start (cmd_pid);
1677 1693
… …
1702#elif defined (SRIOCSREDIR) 1718#elif defined (SRIOCSREDIR)
1703 int fd; 1719 int fd;
1704 1720
1705 fd = open (CONSOLE, O_WRONLY, 0); 1721 fd = open (CONSOLE, O_WRONLY, 0);
1706 if (fd >= 0) 1722 if (fd >= 0)
1707 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1723 {
1724 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1708 close (fd); 1725 close (fd);
1726 }
1709#endif /* SRIOCSREDIR */ 1727#endif /* SRIOCSREDIR */
1710 } 1728 }
1711 1729
1712 /* reset signals and spin off the command interpreter */ 1730 /* reset signals and spin off the command interpreter */
1713 signal (SIGINT, SIG_DFL); 1731 signal (SIGINT, SIG_DFL);

Diff Legend

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