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.301 by mikachu, Sun Nov 13 16:03:31 2011 UTC vs.
Revision 1.311 by sf-exg, Thu Dec 22 14:34:59 2011 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, **r_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
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 574
603 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
604 576
605 /* 577 /*
606 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
607 */ 579 */
608 580
609 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
610 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
611 583
612 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
613 585
614 if (!(display = displays.get (rs[Rs_display_name]))) 586 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]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
618 }
619 588
620 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
621 xa = display->xa; 590 xa = display->xa;
622 591
623 set (display); 592 set (display);
… …
626#if XFT 595#if XFT
627 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
628 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
629#endif 598#endif
630 599
631 free (r_argv);
632
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
637#if ENABLE_PERL 604#if ENABLE_PERL
… …
644 { 611 {
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
616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources ();
649 620
650 /* 621 /*
651 * set any defaults not already set 622 * set any defaults not already set
652 */ 623 */
653 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
762 return cmd_argv; 733 return cmd_argv;
763} 734}
764 735
765/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
766void 737void
767rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
768{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
769 this->envv = envv; 744 this->envv = envv;
770 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{
771 SET_R (this); 771 SET_R (this);
772 set_locale (""); 772 set_locale ("");
773 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 :(
774 774
775 init_vars (); 775 init_vars ();
… …
841 } 841 }
842#endif 842#endif
843 843
844#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
845 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
846 {
847 if (bg_set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
848 if (!bg_window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
849 update_background (); 848 update_background ();
850 }
851#endif 849#endif
852 } 850 }
853#endif 851#endif
854 852
855#if ENABLE_PERL 853#if ENABLE_PERL
… …
857#endif 855#endif
858 856
859 set_colorfgbg (); 857 set_colorfgbg ();
860 858
861 init_command (cmd_argv); 859 init_command (cmd_argv);
862
863 free (cmd_argv);
864 860
865 if (pty->pty >= 0) 861 if (pty->pty >= 0)
866 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
867 863
868 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 975 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 976#endif /* HAVE_UNSETENV */
981} 977}
982 978
983/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 980void
989rxvt_term::set_locale (const char *locale) 981rxvt_term::set_locale (const char *locale)
990{ 982{
991 set_environ (envv); 983 set_environ (envv);
992 984
… …
1012 SET_LOCALE (this->locale); 1004 SET_LOCALE (this->locale);
1013 mbstate.reset (); 1005 mbstate.reset ();
1014#endif 1006#endif
1015 1007
1016#if HAVE_NL_LANGINFO 1008#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 1009 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 1010 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 1012 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 1013 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 1014 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 1015#else
1025 enc_utf8 = 0; 1016 enc_utf8 = 0;
1026#endif 1017#endif
1027} 1018}
1028 1019
… …
1031{ 1022{
1032 set_environ (envv); 1023 set_environ (envv);
1033 1024
1034#ifdef USE_XIM 1025#ifdef USE_XIM
1035 if (!locale) 1026 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 1027 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 1028 else
1038 { 1029 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 1031
1041 if (!XSupportsLocale ()) 1032 if (!XSupportsLocale ())
1042 { 1033 {
1043 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1034 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1044 return; 1035 return;
1045 } 1036 }
1046 1037
1047 im_ev.start (display); 1038 im_ev.start (display);
1048 1039
… …
1616 if (pty->pty >= 0) 1607 if (pty->pty >= 0)
1617 { 1608 {
1618 if (getfd_hook) 1609 if (getfd_hook)
1619 pty->pty = (*getfd_hook) (pty->pty); 1610 pty->pty = (*getfd_hook) (pty->pty);
1620 1611
1621 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1612 if (pty->pty < 0)
1622 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1613 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1623 } 1614 }
1624 } 1615 }
1625 else 1616 else
1626#endif 1617#endif
1627 if (!pty->get ()) 1618 if (!pty->get ())
1628 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);
1629 1622
1630 struct termios tio = def_tio; 1623 struct termios tio = def_tio;
1631 1624
1632#ifndef NO_BACKSPACE_KEY 1625#ifndef NO_BACKSPACE_KEY
1633 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1626 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1683 1676
1684 _exit (EXIT_FAILURE); 1677 _exit (EXIT_FAILURE);
1685 1678
1686 default: 1679 default:
1687 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
1688 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1687 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1688 }
1689 1689
1690 pty->close_tty (); 1690 pty->close_tty ();
1691 1691
1692 child_ev.start (cmd_pid); 1692 child_ev.start (cmd_pid);
1693 1693
… …
1718#elif defined (SRIOCSREDIR) 1718#elif defined (SRIOCSREDIR)
1719 int fd; 1719 int fd;
1720 1720
1721 fd = open (CONSOLE, O_WRONLY, 0); 1721 fd = open (CONSOLE, O_WRONLY, 0);
1722 if (fd >= 0) 1722 if (fd >= 0)
1723 {
1723 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1724 ioctl (fd, SRIOCSREDIR, NULL);
1724 close (fd); 1725 close (fd);
1726 }
1725#endif /* SRIOCSREDIR */ 1727#endif /* SRIOCSREDIR */
1726 } 1728 }
1727 1729
1728 /* reset signals and spin off the command interpreter */ 1730 /* reset signals and spin off the command interpreter */
1729 signal (SIGINT, SIG_DFL); 1731 signal (SIGINT, SIG_DFL);

Diff Legend

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