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.302 by sf-exg, Fri Dec 2 09:03:43 2011 UTC vs.
Revision 1.338 by sf-exg, Mon Oct 6 11:11:19 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, **r_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 {
588 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
589
590 for (i = 0; i < argc - r_argc - 1; i++)
591 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
592
593 cmd_argv[i] = NULL;
594 }
595
596 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
597
598 for (i = 0; i < r_argc; i++)
599 r_argv[i] = (const char *)argv[i];
600
601 r_argv[i] = NULL;
602 572
603 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
604 574
605 /* 575 /*
606 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
607 */ 577 */
608 578
609 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
610 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
611 581
612 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
613 583
614 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
615 {
616 free (r_argv);
617 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]);
618 }
619 586
620 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
621 xa = display->xa; 588 xa = display->xa;
622 589
623 set (display); 590 set (display);
624 extract_resources (); 591 extract_resources ();
625 592
626#if XFT 593#if ENABLE_FRILLS
627 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
628 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));
629#endif 598#endif
630
631 free (r_argv);
632 599
633 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
634 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
635 rs [i] = 0; 602 rs [i] = 0;
636 603
… …
645 rxvt_perl.init (this); 612 rxvt_perl.init (this);
646 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647 } 614 }
648#endif 615#endif
649 616
650 // must be called after initialising the perl interpreter as it
651 // may invoke the `on_register_command' hook
652 extract_keysym_resources (); 617 extract_keysym_resources ();
653 618
654 /* 619 /*
655 * set any defaults not already set 620 * set any defaults not already set
656 */ 621 */
… …
692 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0) 657 if (rs[Rs_pointerBlankDelay] && (i = atoi (rs[Rs_pointerBlankDelay])) >= 0)
693 pointerBlankDelay = i; 658 pointerBlankDelay = i;
694 else 659 else
695 pointerBlankDelay = 2; 660 pointerBlankDelay = 2;
696#endif 661#endif
662
663 if (rs[Rs_multiClickTime] && (i = atoi (rs[Rs_multiClickTime])) >= 0)
664 multiClickTime = i;
665 else
666 multiClickTime = 500;
667
668 cursor_type = option (Opt_cursorUnderline) ? 1 : 0;
697 669
698 /* no point having a scrollbar without having any scrollback! */ 670 /* no point having a scrollbar without having any scrollback! */
699 if (!saveLines) 671 if (!saveLines)
700 set_option (Opt_scrollBar, 0); 672 set_option (Opt_scrollBar, 0);
701 673
… …
766 return cmd_argv; 738 return cmd_argv;
767} 739}
768 740
769/*----------------------------------------------------------------------*/ 741/*----------------------------------------------------------------------*/
770void 742void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 743rxvt_term::init (stringvec *argv, stringvec *envv)
772{ 744{
745 argv->push_back (0);
746 envv->push_back (0);
747
748 this->argv = argv;
773 this->envv = envv; 749 this->envv = envv;
774 750
751 env = new char *[this->envv->size ()];
752 for (int i = 0; i < this->envv->size (); i++)
753 env[i] = this->envv->at (i);
754
755 init2 (argv->size () - 1, argv->begin ());
756}
757
758void
759rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
760{
761#if ENABLE_PERL
762 // perl might want to access the stringvecs later, so we need to copy them
763 stringvec *args = new stringvec;
764 for (int i = 0; i < argc; i++)
765 args->push_back (strdup (argv [i]));
766
767 stringvec *envs = new stringvec;
768 for (const char *const *var = envv; *var; var++)
769 envs->push_back (strdup (*var));
770
771 init (args, envs);
772#else
773 init2 (argc, argv);
774#endif
775}
776
777void
778rxvt_term::init2 (int argc, const char *const *argv)
779{
775 SET_R (this); 780 SET_R (this);
776 set_locale (""); 781 set_locale ("");
777 set_environ (envv); // a few things in X do not call setlocale :( 782 set_environ (env); // a few things in X do not call setlocale :(
778 783
779 init_vars (); 784 init_vars ();
780 785
781 const char **cmd_argv = init_resources (argc, argv); 786 const char **cmd_argv = init_resources (argc, argv);
782 787
… …
797 if (option (Opt_scrollBar)) 802 if (option (Opt_scrollBar))
798 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 803 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 804
800 pty = ptytty::create (); 805 pty = ptytty::create ();
801 806
802#ifdef HAVE_AFTERIMAGE
803 set_application_name ((char *)rs[Rs_name]);
804 set_output_threshold (OUTPUT_LEVEL_WARNING);
805#endif
806
807 // must be called before create_windows, because the latter may call set_icon
808#ifdef HAVE_PIXBUF
809 g_type_init ();
810#endif
811
812 create_windows (argc, argv); 807 create_windows (argc, argv);
813 808
814 init_xlocale (); 809 init_xlocale ();
815 810
816 scr_poweron (); // initialize screen 811 scr_poweron (); // initialize screen
… …
819 XSynchronize (dpy, True); 814 XSynchronize (dpy, True);
820#endif 815#endif
821 816
822 if (option (Opt_scrollBar)) 817 if (option (Opt_scrollBar))
823 scrollBar.resize (); /* create and map scrollbar */ 818 scrollBar.resize (); /* create and map scrollbar */
819
824#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
825 {
826 bg_init (); 821 bg_init ();
827
828#ifdef ENABLE_TRANSPARENCY
829 if (option (Opt_transparent))
830 {
831 bg_set_transparent ();
832
833 if (rs [Rs_blurradius])
834 bg_set_blur (rs [Rs_blurradius]);
835
836 if (ISSET_PIXCOLOR (Color_tint))
837 bg_set_tint (pix_colors_focused [Color_tint]);
838
839 if (rs [Rs_shade])
840 bg_set_shade (rs [Rs_shade]);
841
842 bg_set_root_pixmap ();
843 XSelectInput (dpy, display->root, PropertyChangeMask);
844 rootwin_ev.start (display, display->root);
845 }
846#endif
847
848#ifdef BG_IMAGE_FROM_FILE
849 if (rs[Rs_backgroundPixmap])
850 {
851 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bg_window_position_sensitive ())
853 update_background ();
854 }
855#endif
856 }
857#endif 822#endif
858 823
859#if ENABLE_PERL 824#if ENABLE_PERL
860 rootwin_ev.start (display, display->root); 825 rootwin_ev.start (display, display->root);
861#endif 826#endif
862 827
863 set_colorfgbg (); 828 init_done = 1;
864 829
865 init_command (cmd_argv); 830 init_command (cmd_argv);
866
867 free (cmd_argv);
868 831
869 if (pty->pty >= 0) 832 if (pty->pty >= 0)
870 pty_ev.start (pty->pty, ev::READ); 833 pty_ev.start (pty->pty, ev::READ);
871 834
872 HOOK_INVOKE ((this, HOOK_START, DT_END)); 835 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
914/*----------------------------------------------------------------------*/ 877/*----------------------------------------------------------------------*/
915void 878void
916rxvt_term::init_env () 879rxvt_term::init_env ()
917{ 880{
918 char *val; 881 char *val;
882 char *env_display;
883 char *env_windowid;
884 char *env_colorfgbg;
885 char *env_term;
919 886
920#ifdef DISPLAY_IS_IP 887#ifdef DISPLAY_IS_IP
921 /* Fixup display_name for export over pty to any interested terminal 888 /* Fixup display_name for export over pty to any interested terminal
922 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 889 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
923 * (for the first non-loopback interface) that we get from 890 * (for the first non-loopback interface) that we get from
… …
940 907
941 env_display = (char *)rxvt_malloc (strlen (val) + 9); 908 env_display = (char *)rxvt_malloc (strlen (val) + 9);
942 909
943 sprintf (env_display, "DISPLAY=%s", val); 910 sprintf (env_display, "DISPLAY=%s", val);
944 911
912 env_windowid = (char *)rxvt_malloc (21);
945 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 913 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
946 914
947 /* add entries to the environment: 915 /* add entries to the environment:
948 * @ DISPLAY: in case we started with -display 916 * @ DISPLAY: in case we started with -display
949 * @ WINDOWID: X window id number of the window 917 * @ WINDOWID: X window id number of the window
… …
953 * @ COLORFGBG: fg;bg color codes 921 * @ COLORFGBG: fg;bg color codes
954 */ 922 */
955 putenv (env_display); 923 putenv (env_display);
956 putenv (env_windowid); 924 putenv (env_windowid);
957 925
958 if (env_colorfgbg) 926 env_colorfgbg = get_colorfgbg ();
959 putenv (env_colorfgbg); 927 putenv (env_colorfgbg);
960 928
961#ifdef RXVT_TERMINFO 929#ifdef RXVT_TERMINFO
962 putenv ("TERMINFO=" RXVT_TERMINFO); 930 putenv ("TERMINFO=" RXVT_TERMINFO);
963#endif 931#endif
964 932
… …
983 unsetenv ("TERMCAP"); /* terminfo should be okay */ 951 unsetenv ("TERMCAP"); /* terminfo should be okay */
984#endif /* HAVE_UNSETENV */ 952#endif /* HAVE_UNSETENV */
985} 953}
986 954
987/*----------------------------------------------------------------------*/ 955/*----------------------------------------------------------------------*/
988/*
989 * This is more or less stolen straight from XFree86 xterm.
990 * This should support all European type languages.
991 */
992void 956void
993rxvt_term::set_locale (const char *locale) 957rxvt_term::set_locale (const char *locale)
994{ 958{
995 set_environ (envv); 959 set_environ (env);
996 960
997#if HAVE_XSETLOCALE || HAVE_SETLOCALE
998 free (this->locale); 961 free (this->locale);
999 this->locale = setlocale (LC_CTYPE, locale); 962 this->locale = setlocale (LC_CTYPE, locale);
1000 963
1001 if (!this->locale) 964 if (!this->locale)
1002 { 965 {
… …
1013 976
1014 977
1015 this->locale = strdup (this->locale); 978 this->locale = strdup (this->locale);
1016 SET_LOCALE (this->locale); 979 SET_LOCALE (this->locale);
1017 mbstate.reset (); 980 mbstate.reset ();
1018#endif
1019 981
1020#if HAVE_NL_LANGINFO 982#if HAVE_NL_LANGINFO
1021 char *codeset = strdup (nl_langinfo (CODESET)); 983 char *codeset = nl_langinfo (CODESET);
1022 // /^UTF.?8/i 984 // /^UTF.?8/i
1023 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 985 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1024 && (codeset[1] == 'T' || codeset[1] == 't') 986 && (codeset[1] == 'T' || codeset[1] == 't')
1025 && (codeset[2] == 'F' || codeset[2] == 'f') 987 && (codeset[2] == 'F' || codeset[2] == 'f')
1026 && (codeset[3] == '8' || codeset[4] == '8'); 988 && (codeset[3] == '8' || codeset[4] == '8');
1027 free (codeset);
1028#else 989#else
1029 enc_utf8 = 0; 990 enc_utf8 = 0;
1030#endif 991#endif
1031} 992}
1032 993
1033void 994void
1034rxvt_term::init_xlocale () 995rxvt_term::init_xlocale ()
1035{ 996{
1036 set_environ (envv); 997 set_environ (env);
1037 998
1038#ifdef USE_XIM 999#if USE_XIM
1039 if (!locale) 1000 if (!locale)
1040 rxvt_warn ("setting locale failed, working without locale support.\n"); 1001 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1041 else 1002 else
1042 { 1003 {
1043 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1004 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1044 1005
1045 if (!XSupportsLocale ()) 1006 if (!XSupportsLocale ())
1046 { 1007 {
1047 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1008 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1048 return; 1009 return;
1049 } 1010 }
1050 1011
1051 im_ev.start (display); 1012 im_ev.start (display);
1052 1013
… …
1201/*----------------------------------------------------------------------*/ 1162/*----------------------------------------------------------------------*/
1202/* color aliases, fg/bg bright-bold */ 1163/* color aliases, fg/bg bright-bold */
1203void 1164void
1204rxvt_term::color_aliases (int idx) 1165rxvt_term::color_aliases (int idx)
1205{ 1166{
1206 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1167 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1207 { 1168 {
1208 int i = atoi (rs[Rs_color + idx]); 1169 int i = atoi (rs[Rs_color + idx]);
1209 1170
1210 if (i >= 8 && i <= 15) 1171 if (i >= 8 && i <= 15)
1211 /* bright colors */ 1172 /* bright colors */
… …
1251 for (j = map->max_keypermod; j--; k++) 1212 for (j = map->max_keypermod; j--; k++)
1252 { 1213 {
1253 if (kc[k] == 0) 1214 if (kc[k] == 0)
1254 break; 1215 break;
1255 1216
1256 switch (XKeycodeToKeysym (dpy, kc[k], 0)) 1217 switch (rxvt_XKeycodeToKeysym (dpy, kc[k], 0))
1257 { 1218 {
1258 case XK_Num_Lock: 1219 case XK_Num_Lock:
1259 ModNumLockMask = modmasks[i - 1]; 1220 ModNumLockMask = modmasks[i - 1];
1260 continue; 1221 continue;
1261 1222
… …
1306} 1267}
1307 1268
1308void 1269void
1309rxvt_term::set_icon (const char *file) 1270rxvt_term::set_icon (const char *file)
1310{ 1271{
1311#ifdef HAVE_AFTERIMAGE
1312 init_asv ();
1313
1314 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1315 if (!im)
1316 {
1317 rxvt_warn ("Loading image icon failed, continuing without.\n");
1318 return;
1319 }
1320
1321 unsigned int w = im->width;
1322 unsigned int h = im->height;
1323
1324 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1325 {
1326 rxvt_warn ("Icon image too big, continuing without.\n");
1327 destroy_asimage (&im);
1328 return;
1329 }
1330
1331 ASImage *result = scale_asimage (asv, im,
1332 w, h, ASA_ARGB32,
1333 100, ASIMAGE_QUALITY_DEFAULT);
1334 destroy_asimage (&im);
1335
1336 if (!result)
1337 {
1338 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1339 return;
1340 }
1341
1342 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1343 if (buffer)
1344 {
1345 ARGB32 *asbuf = result->alt.argb32;
1346 buffer [0] = w;
1347 buffer [1] = h;
1348
1349 for (unsigned int i = 0; i < w * h; ++i)
1350 buffer [i + 2] = asbuf [i];
1351
1352 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1353 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1354 free (buffer);
1355 }
1356 else
1357 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1358
1359 destroy_asimage (&result);
1360#endif
1361
1362#ifdef HAVE_PIXBUF 1272#if HAVE_PIXBUF
1363 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1273 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1364 if (!pixbuf) 1274 if (!pixbuf)
1365 { 1275 {
1366 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1276 rxvt_warn ("Loading image icon failed, continuing without.\n");
1367 return; 1277 return;
… …
1487 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1397 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1488 &attributes); 1398 &attributes);
1489 1399
1490 this->parent = top; 1400 this->parent = top;
1491 1401
1492 old_width = szHint.width;
1493 old_height = szHint.height;
1494
1495 set_title (rs [Rs_title]); 1402 set_title (rs [Rs_title]);
1496 set_icon_name (rs [Rs_iconName]); 1403 set_icon_name (rs [Rs_iconName]);
1497 1404
1498 classHint.res_name = (char *)rs[Rs_name]; 1405 classHint.res_name = (char *)rs[Rs_name];
1499 classHint.res_class = (char *)RESCLASS; 1406 classHint.res_class = (char *)RESCLASS;
1500 1407
1501 wmHint.flags = InputHint | StateHint | WindowGroupHint; 1408 wmHint.flags = InputHint | StateHint | WindowGroupHint;
1502 wmHint.input = True; 1409 wmHint.input = True;
1503 wmHint.initial_state = option (Opt_iconic) ? IconicState : NormalState; 1410 wmHint.initial_state = option (Opt_iconic) ? IconicState
1411 : option (Opt_dockapp) ? WithdrawnState
1412 : NormalState;
1504 wmHint.window_group = top; 1413 wmHint.window_group = top;
1505 1414
1506 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc, 1415 XmbSetWMProperties (dpy, top, NULL, NULL, (char **)argv, argc,
1507 &szHint, &wmHint, &classHint); 1416 &szHint, &wmHint, &classHint);
1508#if ENABLE_EWMH 1417#if ENABLE_EWMH
… …
1510 * set up icon hint 1419 * set up icon hint
1511 * rs [Rs_iconfile] is path to icon 1420 * rs [Rs_iconfile] is path to icon
1512 */ 1421 */
1513 1422
1514 if (rs [Rs_iconfile]) 1423 if (rs [Rs_iconfile])
1515 {
1516 set_icon (rs [Rs_iconfile]); 1424 set_icon (rs [Rs_iconfile]);
1517 }
1518#endif 1425#endif
1519 1426
1520#if ENABLE_FRILLS 1427#if ENABLE_FRILLS
1521 if (mwmhints.flags) 1428 if (mwmhints.flags)
1522 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32, 1429 XChangeProperty (dpy, top, xa[XA_MOTIF_WM_HINTS], xa[XA_MOTIF_WM_HINTS], 32,
… …
1561 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1468 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1562 1469
1563 /* the vt window */ 1470 /* the vt window */
1564 vt = XCreateSimpleWindow (dpy, top, 1471 vt = XCreateSimpleWindow (dpy, top,
1565 window_vt_x, window_vt_y, 1472 window_vt_x, window_vt_y,
1566 width, height, 1473 vt_width, vt_height,
1567 0, 1474 0,
1568 pix_colors_focused[Color_fg], 1475 pix_colors_focused[Color_fg],
1569 pix_colors_focused[Color_bg]); 1476 pix_colors_focused[Color_bg]);
1570 1477
1571 attributes.bit_gravity = NorthWestGravity; 1478 attributes.bit_gravity = NorthWestGravity;
… …
1620 if (pty->pty >= 0) 1527 if (pty->pty >= 0)
1621 { 1528 {
1622 if (getfd_hook) 1529 if (getfd_hook)
1623 pty->pty = (*getfd_hook) (pty->pty); 1530 pty->pty = (*getfd_hook) (pty->pty);
1624 1531
1625 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1532 if (pty->pty < 0)
1626 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1533 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1627 } 1534 }
1628 } 1535 }
1629 else 1536 else
1630#endif 1537#endif
1631 if (!pty->get ()) 1538 if (!pty->get ())
1632 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1539 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1540
1541 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1633 1542
1634 struct termios tio = def_tio; 1543 struct termios tio = def_tio;
1635 1544
1636#ifndef NO_BACKSPACE_KEY 1545#ifndef NO_BACKSPACE_KEY
1637 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1546 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1687 1596
1688 _exit (EXIT_FAILURE); 1597 _exit (EXIT_FAILURE);
1689 1598
1690 default: 1599 default:
1691 if (!option (Opt_utmpInhibit)) 1600 if (!option (Opt_utmpInhibit))
1601 {
1602#ifdef LOG_ONLY_ON_LOGIN
1603 bool login_shell = option (Opt_loginShell);
1604#else
1605 bool login_shell = true;
1606#endif
1692 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1607 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1608 }
1693 1609
1694 pty->close_tty (); 1610 pty->close_tty ();
1695 1611
1696 child_ev.start (cmd_pid); 1612 child_ev.start (cmd_pid);
1697 1613
… …
1722#elif defined (SRIOCSREDIR) 1638#elif defined (SRIOCSREDIR)
1723 int fd; 1639 int fd;
1724 1640
1725 fd = open (CONSOLE, O_WRONLY, 0); 1641 fd = open (CONSOLE, O_WRONLY, 0);
1726 if (fd >= 0) 1642 if (fd >= 0)
1727 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1643 {
1644 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1728 close (fd); 1645 close (fd);
1646 }
1729#endif /* SRIOCSREDIR */ 1647#endif /* SRIOCSREDIR */
1730 } 1648 }
1731 1649
1732 /* reset signals and spin off the command interpreter */ 1650 /* reset signals and spin off the command interpreter */
1733 signal (SIGINT, SIG_DFL); 1651 signal (SIGINT, SIG_DFL);

Diff Legend

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