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.288 by sf-exg, Sat Dec 18 18:17:38 2010 UTC vs.
Revision 1.317 by sf-exg, Mon Jan 9 21:12:08 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.
… …
53# endif 53# endif
54#endif 54#endif
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif
59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
58#endif 63#endif
59 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>
… …
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#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 ();
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
801 807
802 create_windows (argc, argv); 808 create_windows (argc, argv);
803 809
804 init_xlocale (); 810 init_xlocale ();
805 811
… …
811 817
812 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
813 scrollBar.resize (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
814#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
815 { 821 {
816 bgPixmap.set_target (this); 822 bg_init ();
817 bgPixmap.invalidate ();
818 823
819#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
820 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
821 { 826 {
822 bgPixmap.set_transparent (); 827 bg_set_transparent ();
823 828
824 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
825 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
826 831
827 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
828 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
829 834
830 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
831 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
832 837
833 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
834 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
835 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
836 } 841 }
837#endif 842#endif
838 843
839#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
840 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
841 {
842 const char *p = rs[Rs_backgroundPixmap];
843
844 if ((p = strchr (p, ';')) != 0)
845 {
846 p++;
847 bgPixmap.set_geometry (p);
848 }
849 else
850 bgPixmap.set_defaultGeometry ();
851
852 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
853 if (!bgPixmap.window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
854 update_background (); 848 update_background ();
855 }
856#endif 849#endif
857 } 850 }
858#endif 851#endif
859 852
860#if ENABLE_PERL 853#if ENABLE_PERL
861 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
862#endif 855#endif
863 856
864 set_colorfgbg (); 857 init_done = 1;
865 858
866 init_command (cmd_argv); 859 init_command (cmd_argv);
867
868 free (cmd_argv);
869 860
870 if (pty->pty >= 0) 861 if (pty->pty >= 0)
871 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
872 863
873 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
875#if ENABLE_XEMBED 866#if ENABLE_XEMBED
876 if (rs[Rs_embed]) 867 if (rs[Rs_embed])
877 { 868 {
878 long info[2] = { 0, XEMBED_MAPPED }; 869 long info[2] = { 0, XEMBED_MAPPED };
879 870
880 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
881 32, PropModeReplace, (unsigned char *)&info, 2); 872 32, PropModeReplace, (unsigned char *)&info, 2);
882 } 873 }
883#endif 874#endif
884 875
876#if HAVE_STARTUP_NOTIFICATION
877 SnDisplay *snDisplay;
878 SnLauncheeContext *snContext;
879
880 snDisplay = sn_display_new (dpy, NULL, NULL);
881 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
882
883 /* Tell the window manager that this window is part of the startup context */
884 if (snContext)
885 sn_launchee_context_setup_window (snContext, parent);
886#endif
887
885 XMapWindow (dpy, vt); 888 XMapWindow (dpy, vt);
886 XMapWindow (dpy, parent[0]); 889 XMapWindow (dpy, parent);
890
891#if HAVE_STARTUP_NOTIFICATION
892 if (snContext)
893 {
894 /* Mark the startup process as complete */
895 sn_launchee_context_complete (snContext);
896
897 sn_launchee_context_unref (snContext);
898 }
899
900 sn_display_unref (snDisplay);
901#endif
887 902
888 refresh_check (); 903 refresh_check ();
889} 904}
890 905
891/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
892void 907void
893rxvt_term::init_env () 908rxvt_term::init_env ()
894{ 909{
895 char *val; 910 char *val;
911 char *env_display;
912 char *env_windowid;
913 char *env_colorfgbg;
914 char *env_term;
896 915
897#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
898 /* Fixup display_name for export over pty to any interested terminal 917 /* 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 918 * 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 919 * (for the first non-loopback interface) that we get from
… …
917 936
918 env_display = (char *)rxvt_malloc (strlen (val) + 9); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
919 938
920 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
921 940
941 env_windowid = (char *)rxvt_malloc (21);
922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 942 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
923 943
924 /* add entries to the environment: 944 /* add entries to the environment:
925 * @ DISPLAY: in case we started with -display 945 * @ DISPLAY: in case we started with -display
926 * @ WINDOWID: X window id number of the window 946 * @ WINDOWID: X window id number of the window
927 * @ COLORTERM: terminal sub-name and also indicates its color 947 * @ COLORTERM: terminal sub-name and also indicates its color
… …
930 * @ COLORFGBG: fg;bg color codes 950 * @ COLORFGBG: fg;bg color codes
931 */ 951 */
932 putenv (env_display); 952 putenv (env_display);
933 putenv (env_windowid); 953 putenv (env_windowid);
934 954
935 if (env_colorfgbg) 955 env_colorfgbg = get_colorfgbg ();
936 putenv (env_colorfgbg); 956 putenv (env_colorfgbg);
937 957
938#ifdef RXVT_TERMINFO 958#ifdef RXVT_TERMINFO
939 putenv ("TERMINFO=" RXVT_TERMINFO); 959 putenv ("TERMINFO=" RXVT_TERMINFO);
940#endif 960#endif
941 961
… …
960 unsetenv ("TERMCAP"); /* terminfo should be okay */ 980 unsetenv ("TERMCAP"); /* terminfo should be okay */
961#endif /* HAVE_UNSETENV */ 981#endif /* HAVE_UNSETENV */
962} 982}
963 983
964/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
965/*
966 * This is more or less stolen straight from XFree86 xterm.
967 * This should support all European type languages.
968 */
969void 985void
970rxvt_term::set_locale (const char *locale) 986rxvt_term::set_locale (const char *locale)
971{ 987{
972 set_environ (envv); 988 set_environ (envv);
973 989
… …
993 SET_LOCALE (this->locale); 1009 SET_LOCALE (this->locale);
994 mbstate.reset (); 1010 mbstate.reset ();
995#endif 1011#endif
996 1012
997#if HAVE_NL_LANGINFO 1013#if HAVE_NL_LANGINFO
998 char *codeset = strdup (nl_langinfo (CODESET)); 1014 char *codeset = nl_langinfo (CODESET);
999 // /^UTF.?8/i 1015 // /^UTF.?8/i
1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1016 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1001 && (codeset[1] == 'T' || codeset[1] == 't') 1017 && (codeset[1] == 'T' || codeset[1] == 't')
1002 && (codeset[2] == 'F' || codeset[2] == 'f') 1018 && (codeset[2] == 'F' || codeset[2] == 'f')
1003 && (codeset[3] == '8' || codeset[4] == '8'); 1019 && (codeset[3] == '8' || codeset[4] == '8');
1004 free (codeset);
1005#else 1020#else
1006 enc_utf8 = 0; 1021 enc_utf8 = 0;
1007#endif 1022#endif
1008} 1023}
1009 1024
… …
1012{ 1027{
1013 set_environ (envv); 1028 set_environ (envv);
1014 1029
1015#ifdef USE_XIM 1030#ifdef USE_XIM
1016 if (!locale) 1031 if (!locale)
1017 rxvt_warn ("setting locale failed, working without locale support.\n"); 1032 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1018 else 1033 else
1019 { 1034 {
1020 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1035 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1021 1036
1022 if (!XSupportsLocale ()) 1037 if (!XSupportsLocale ())
1023 { 1038 {
1024 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1039 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1025 return; 1040 return;
1026 } 1041 }
1027 1042
1028 im_ev.start (display); 1043 im_ev.start (display);
1029 1044
… …
1324 buffer [1] = h; 1339 buffer [1] = h;
1325 1340
1326 for (unsigned int i = 0; i < w * h; ++i) 1341 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i]; 1342 buffer [i + 2] = asbuf [i];
1328 1343
1329 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1344 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1345 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer); 1346 free (buffer);
1332 } 1347 }
1333 else 1348 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1349 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1381 } 1396 }
1382 1397
1383 row += rowstride; 1398 row += rowstride;
1384 } 1399 }
1385 1400
1386 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1401 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1402 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1388 free (buffer); 1403 free (buffer);
1389 } 1404 }
1390 else 1405 else
1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1406 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1393 g_object_unref (pixbuf); 1408 g_object_unref (pixbuf);
1394#endif 1409#endif
1395} 1410}
1396 1411
1397/*----------------------------------------------------------------------*/ 1412/*----------------------------------------------------------------------*/
1398/* rxvt_Create_Windows () - Open and map the window */ 1413/* Open and map the window */
1399void 1414void
1400rxvt_term::create_windows (int argc, const char *const *argv) 1415rxvt_term::create_windows (int argc, const char *const *argv)
1401{ 1416{
1402 XClassHint classHint; 1417 XClassHint classHint;
1403 XWMHints wmHint; 1418 XWMHints wmHint;
… …
1449 } 1464 }
1450#endif 1465#endif
1451 1466
1452 window_calc (0, 0); 1467 window_calc (0, 0);
1453 1468
1454 /* sub-window placement & size in rxvt_resize_subwindows () */ 1469 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1455 attributes.background_pixel = pix_colors_focused [Color_border]; 1470 attributes.background_pixel = pix_colors_focused [Color_border];
1456 attributes.border_pixel = pix_colors_focused [Color_border]; 1471 attributes.border_pixel = pix_colors_focused [Color_border];
1457 attributes.colormap = cmap; 1472 attributes.colormap = cmap;
1458 1473
1459 top = XCreateWindow (dpy, parent, 1474 top = XCreateWindow (dpy, parent,
… …
1462 ext_bwidth, 1477 ext_bwidth,
1463 depth, InputOutput, visual, 1478 depth, InputOutput, visual,
1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1479 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1465 &attributes); 1480 &attributes);
1466 1481
1467 this->parent[0] = top; 1482 this->parent = top;
1468
1469 old_width = szHint.width;
1470 old_height = szHint.height;
1471 1483
1472 set_title (rs [Rs_title]); 1484 set_title (rs [Rs_title]);
1473 set_icon_name (rs [Rs_iconName]); 1485 set_icon_name (rs [Rs_iconName]);
1474 1486
1475 classHint.res_name = (char *)rs[Rs_name]; 1487 classHint.res_name = (char *)rs[Rs_name];
… …
1505#if ENABLE_EWMH 1517#if ENABLE_EWMH
1506 xa[XA_NET_WM_PING], 1518 xa[XA_NET_WM_PING],
1507#endif 1519#endif
1508 }; 1520 };
1509 1521
1510 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1522 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1511 1523
1512#if ENABLE_FRILLS 1524#if ENABLE_FRILLS
1513 if (rs[Rs_transient_for]) 1525 if (rs[Rs_transient_for])
1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1526 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1515#endif 1527#endif
… …
1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1550 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1539 1551
1540 /* the vt window */ 1552 /* the vt window */
1541 vt = XCreateSimpleWindow (dpy, top, 1553 vt = XCreateSimpleWindow (dpy, top,
1542 window_vt_x, window_vt_y, 1554 window_vt_x, window_vt_y,
1543 width, height, 1555 vt_width, vt_height,
1544 0, 1556 0,
1545 pix_colors_focused[Color_fg], 1557 pix_colors_focused[Color_fg],
1546 pix_colors_focused[Color_bg]); 1558 pix_colors_focused[Color_bg]);
1547 1559
1548 attributes.bit_gravity = NorthWestGravity; 1560 attributes.bit_gravity = NorthWestGravity;
… …
1597 if (pty->pty >= 0) 1609 if (pty->pty >= 0)
1598 { 1610 {
1599 if (getfd_hook) 1611 if (getfd_hook)
1600 pty->pty = (*getfd_hook) (pty->pty); 1612 pty->pty = (*getfd_hook) (pty->pty);
1601 1613
1602 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1614 if (pty->pty < 0)
1603 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1615 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1604 } 1616 }
1605 } 1617 }
1606 else 1618 else
1607#endif 1619#endif
1608 if (!pty->get ()) 1620 if (!pty->get ())
1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1621 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1622
1623 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1610 1624
1611 struct termios tio = def_tio; 1625 struct termios tio = def_tio;
1612 1626
1613#ifndef NO_BACKSPACE_KEY 1627#ifndef NO_BACKSPACE_KEY
1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1628 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1664 1678
1665 _exit (EXIT_FAILURE); 1679 _exit (EXIT_FAILURE);
1666 1680
1667 default: 1681 default:
1668 if (!option (Opt_utmpInhibit)) 1682 if (!option (Opt_utmpInhibit))
1683 {
1684#ifdef LOG_ONLY_ON_LOGIN
1685 bool login_shell = option (Opt_loginShell);
1686#else
1687 bool login_shell = true;
1688#endif
1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1689 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1690 }
1670 1691
1671 pty->close_tty (); 1692 pty->close_tty ();
1672 1693
1673 child_ev.start (cmd_pid); 1694 child_ev.start (cmd_pid);
1674 1695
… …
1699#elif defined (SRIOCSREDIR) 1720#elif defined (SRIOCSREDIR)
1700 int fd; 1721 int fd;
1701 1722
1702 fd = open (CONSOLE, O_WRONLY, 0); 1723 fd = open (CONSOLE, O_WRONLY, 0);
1703 if (fd >= 0) 1724 if (fd >= 0)
1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1725 {
1726 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1705 close (fd); 1727 close (fd);
1728 }
1706#endif /* SRIOCSREDIR */ 1729#endif /* SRIOCSREDIR */
1707 } 1730 }
1708 1731
1709 /* reset signals and spin off the command interpreter */ 1732 /* reset signals and spin off the command interpreter */
1710 signal (SIGINT, SIG_DFL); 1733 signal (SIGINT, SIG_DFL);

Diff Legend

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