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.304 by sf-exg, Tue Dec 6 10:27:15 2011 UTC vs.
Revision 1.316 by sf-exg, Mon Jan 9 15:45:45 2012 UTC

… …
567 567
568/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
569const char ** 569const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
571{ 571{
572 int i, r_argc; 572 int i;
573 const char **cmd_argv; 573 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 574
596 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
597 576
598 /* 577 /*
599 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
600 */ 579 */
601 580
602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
603 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
604 583
605 get_options (r_argc, argv); 584 cmd_argv = get_options (argc, argv);
606 585
607 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
608 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]);
609 588
610 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
… …
754 return cmd_argv; 733 return cmd_argv;
755} 734}
756 735
757/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
758void 737void
759rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
760{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
761 this->envv = envv; 744 this->envv = envv;
762 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{
763 SET_R (this); 771 SET_R (this);
764 set_locale (""); 772 set_locale ("");
765 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 :(
766 774
767 init_vars (); 775 init_vars ();
… …
833 } 841 }
834#endif 842#endif
835 843
836#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
838 {
839 if (bg_set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
841 update_background (); 848 update_background ();
842 }
843#endif 849#endif
844 } 850 }
845#endif 851#endif
846 852
847#if ENABLE_PERL 853#if ENABLE_PERL
848 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
849#endif 855#endif
850 856
851 set_colorfgbg (); 857 init_done = 1;
852 858
853 init_command (cmd_argv); 859 init_command (cmd_argv);
854
855 free (cmd_argv);
856 860
857 if (pty->pty >= 0) 861 if (pty->pty >= 0)
858 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
859 863
860 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
902/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
903void 907void
904rxvt_term::init_env () 908rxvt_term::init_env ()
905{ 909{
906 char *val; 910 char *val;
911 char *env_display;
912 char *env_windowid;
913 char *env_colorfgbg;
914 char *env_term;
907 915
908#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
909 /* Fixup display_name for export over pty to any interested terminal 917 /* Fixup display_name for export over pty to any interested terminal
910 * 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
911 * (for the first non-loopback interface) that we get from 919 * (for the first non-loopback interface) that we get from
… …
928 936
929 env_display = (char *)rxvt_malloc (strlen (val) + 9); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
930 938
931 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
932 940
941 env_windowid = (char *)rxvt_malloc (21);
933 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 942 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
934 943
935 /* add entries to the environment: 944 /* add entries to the environment:
936 * @ DISPLAY: in case we started with -display 945 * @ DISPLAY: in case we started with -display
937 * @ WINDOWID: X window id number of the window 946 * @ WINDOWID: X window id number of the window
… …
941 * @ COLORFGBG: fg;bg color codes 950 * @ COLORFGBG: fg;bg color codes
942 */ 951 */
943 putenv (env_display); 952 putenv (env_display);
944 putenv (env_windowid); 953 putenv (env_windowid);
945 954
946 if (env_colorfgbg) 955 env_colorfgbg = get_colorfgbg ();
947 putenv (env_colorfgbg); 956 putenv (env_colorfgbg);
948 957
949#ifdef RXVT_TERMINFO 958#ifdef RXVT_TERMINFO
950 putenv ("TERMINFO=" RXVT_TERMINFO); 959 putenv ("TERMINFO=" RXVT_TERMINFO);
951#endif 960#endif
952 961
… …
971 unsetenv ("TERMCAP"); /* terminfo should be okay */ 980 unsetenv ("TERMCAP"); /* terminfo should be okay */
972#endif /* HAVE_UNSETENV */ 981#endif /* HAVE_UNSETENV */
973} 982}
974 983
975/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
976/*
977 * This is more or less stolen straight from XFree86 xterm.
978 * This should support all European type languages.
979 */
980void 985void
981rxvt_term::set_locale (const char *locale) 986rxvt_term::set_locale (const char *locale)
982{ 987{
983 set_environ (envv); 988 set_environ (envv);
984 989
… …
1004 SET_LOCALE (this->locale); 1009 SET_LOCALE (this->locale);
1005 mbstate.reset (); 1010 mbstate.reset ();
1006#endif 1011#endif
1007 1012
1008#if HAVE_NL_LANGINFO 1013#if HAVE_NL_LANGINFO
1009 char *codeset = strdup (nl_langinfo (CODESET)); 1014 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 1015 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1016 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1012 && (codeset[1] == 'T' || codeset[1] == 't') 1017 && (codeset[1] == 'T' || codeset[1] == 't')
1013 && (codeset[2] == 'F' || codeset[2] == 'f') 1018 && (codeset[2] == 'F' || codeset[2] == 'f')
1014 && (codeset[3] == '8' || codeset[4] == '8'); 1019 && (codeset[3] == '8' || codeset[4] == '8');
1015 free (codeset);
1016#else 1020#else
1017 enc_utf8 = 0; 1021 enc_utf8 = 0;
1018#endif 1022#endif
1019} 1023}
1020 1024
… …
1023{ 1027{
1024 set_environ (envv); 1028 set_environ (envv);
1025 1029
1026#ifdef USE_XIM 1030#ifdef USE_XIM
1027 if (!locale) 1031 if (!locale)
1028 rxvt_warn ("setting locale failed, working without locale support.\n"); 1032 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1029 else 1033 else
1030 { 1034 {
1031 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1035 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1032 1036
1033 if (!XSupportsLocale ()) 1037 if (!XSupportsLocale ())
1034 { 1038 {
1035 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");
1036 return; 1040 return;
1037 } 1041 }
1038 1042
1039 im_ev.start (display); 1043 im_ev.start (display);
1040 1044
… …
1475 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1479 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1476 &attributes); 1480 &attributes);
1477 1481
1478 this->parent = top; 1482 this->parent = top;
1479 1483
1480 old_width = szHint.width;
1481 old_height = szHint.height;
1482
1483 set_title (rs [Rs_title]); 1484 set_title (rs [Rs_title]);
1484 set_icon_name (rs [Rs_iconName]); 1485 set_icon_name (rs [Rs_iconName]);
1485 1486
1486 classHint.res_name = (char *)rs[Rs_name]; 1487 classHint.res_name = (char *)rs[Rs_name];
1487 classHint.res_class = (char *)RESCLASS; 1488 classHint.res_class = (char *)RESCLASS;
… …
1608 if (pty->pty >= 0) 1609 if (pty->pty >= 0)
1609 { 1610 {
1610 if (getfd_hook) 1611 if (getfd_hook)
1611 pty->pty = (*getfd_hook) (pty->pty); 1612 pty->pty = (*getfd_hook) (pty->pty);
1612 1613
1613 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1614 if (pty->pty < 0)
1614 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1615 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1615 } 1616 }
1616 } 1617 }
1617 else 1618 else
1618#endif 1619#endif
1619 if (!pty->get ()) 1620 if (!pty->get ())
1620 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);
1621 1624
1622 struct termios tio = def_tio; 1625 struct termios tio = def_tio;
1623 1626
1624#ifndef NO_BACKSPACE_KEY 1627#ifndef NO_BACKSPACE_KEY
1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1628 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1675 1678
1676 _exit (EXIT_FAILURE); 1679 _exit (EXIT_FAILURE);
1677 1680
1678 default: 1681 default:
1679 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
1680 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1689 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1690 }
1681 1691
1682 pty->close_tty (); 1692 pty->close_tty ();
1683 1693
1684 child_ev.start (cmd_pid); 1694 child_ev.start (cmd_pid);
1685 1695
… …
1710#elif defined (SRIOCSREDIR) 1720#elif defined (SRIOCSREDIR)
1711 int fd; 1721 int fd;
1712 1722
1713 fd = open (CONSOLE, O_WRONLY, 0); 1723 fd = open (CONSOLE, O_WRONLY, 0);
1714 if (fd >= 0) 1724 if (fd >= 0)
1715 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1725 {
1726 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1716 close (fd); 1727 close (fd);
1728 }
1717#endif /* SRIOCSREDIR */ 1729#endif /* SRIOCSREDIR */
1718 } 1730 }
1719 1731
1720 /* reset signals and spin off the command interpreter */ 1732 /* reset signals and spin off the command interpreter */
1721 signal (SIGINT, SIG_DFL); 1733 signal (SIGINT, SIG_DFL);

Diff Legend

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