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.298 by sf-exg, Fri Aug 19 17:42:09 2011 UTC vs.
Revision 1.311 by sf-exg, Thu Dec 22 14:34:59 2011 UTC

… …
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#if ENABLE_PERL 604#if ENABLE_PERL
… …
639 { 611 {
640 rxvt_perl.init (this); 612 rxvt_perl.init (this);
641 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
642 } 614 }
643#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 ();
644 620
645 /* 621 /*
646 * set any defaults not already set 622 * set any defaults not already set
647 */ 623 */
648 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
757 return cmd_argv; 733 return cmd_argv;
758} 734}
759 735
760/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
761void 737void
762rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
763{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
764 this->envv = envv; 744 this->envv = envv;
765 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{
766 SET_R (this); 771 SET_R (this);
767 set_locale (""); 772 set_locale ("");
768 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 :(
769 774
770 init_vars (); 775 init_vars ();
… …
784 if (chdir (path)) 789 if (chdir (path))
785 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");
786 } 791 }
787 792
788 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
789 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
790 795
791 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
792 807
793 create_windows (argc, argv); 808 create_windows (argc, argv);
794 809
795 init_xlocale (); 810 init_xlocale ();
796 811
… …
826 } 841 }
827#endif 842#endif
828 843
829#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
830 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
831 {
832 if (bg_set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
833 if (!bg_window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
834 update_background (); 848 update_background ();
835 }
836#endif 849#endif
837 } 850 }
838#endif 851#endif
839 852
840#if ENABLE_PERL 853#if ENABLE_PERL
… …
843 856
844 set_colorfgbg (); 857 set_colorfgbg ();
845 858
846 init_command (cmd_argv); 859 init_command (cmd_argv);
847 860
848 free (cmd_argv);
849
850 if (pty->pty >= 0) 861 if (pty->pty >= 0)
851 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
852 863
853 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
854 865
… …
860 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
861 32, PropModeReplace, (unsigned char *)&info, 2); 872 32, PropModeReplace, (unsigned char *)&info, 2);
862 } 873 }
863#endif 874#endif
864 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
865 XMapWindow (dpy, vt); 888 XMapWindow (dpy, vt);
866 XMapWindow (dpy, parent); 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
867 902
868 refresh_check (); 903 refresh_check ();
869} 904}
870 905
871/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
… …
940 unsetenv ("TERMCAP"); /* terminfo should be okay */ 975 unsetenv ("TERMCAP"); /* terminfo should be okay */
941#endif /* HAVE_UNSETENV */ 976#endif /* HAVE_UNSETENV */
942} 977}
943 978
944/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
945/*
946 * This is more or less stolen straight from XFree86 xterm.
947 * This should support all European type languages.
948 */
949void 980void
950rxvt_term::set_locale (const char *locale) 981rxvt_term::set_locale (const char *locale)
951{ 982{
952 set_environ (envv); 983 set_environ (envv);
953 984
… …
973 SET_LOCALE (this->locale); 1004 SET_LOCALE (this->locale);
974 mbstate.reset (); 1005 mbstate.reset ();
975#endif 1006#endif
976 1007
977#if HAVE_NL_LANGINFO 1008#if HAVE_NL_LANGINFO
978 char *codeset = strdup (nl_langinfo (CODESET)); 1009 char *codeset = nl_langinfo (CODESET);
979 // /^UTF.?8/i 1010 // /^UTF.?8/i
980 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
981 && (codeset[1] == 'T' || codeset[1] == 't') 1012 && (codeset[1] == 'T' || codeset[1] == 't')
982 && (codeset[2] == 'F' || codeset[2] == 'f') 1013 && (codeset[2] == 'F' || codeset[2] == 'f')
983 && (codeset[3] == '8' || codeset[4] == '8'); 1014 && (codeset[3] == '8' || codeset[4] == '8');
984 free (codeset);
985#else 1015#else
986 enc_utf8 = 0; 1016 enc_utf8 = 0;
987#endif 1017#endif
988} 1018}
989 1019
… …
992{ 1022{
993 set_environ (envv); 1023 set_environ (envv);
994 1024
995#ifdef USE_XIM 1025#ifdef USE_XIM
996 if (!locale) 1026 if (!locale)
997 rxvt_warn ("setting locale failed, working without locale support.\n"); 1027 rxvt_warn ("setting locale failed, continuing without locale support.\n");
998 else 1028 else
999 { 1029 {
1000 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1001 1031
1002 if (!XSupportsLocale ()) 1032 if (!XSupportsLocale ())
1003 { 1033 {
1004 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");
1005 return; 1035 return;
1006 } 1036 }
1007 1037
1008 im_ev.start (display); 1038 im_ev.start (display);
1009 1039
… …
1577 if (pty->pty >= 0) 1607 if (pty->pty >= 0)
1578 { 1608 {
1579 if (getfd_hook) 1609 if (getfd_hook)
1580 pty->pty = (*getfd_hook) (pty->pty); 1610 pty->pty = (*getfd_hook) (pty->pty);
1581 1611
1582 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1612 if (pty->pty < 0)
1583 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1613 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1584 } 1614 }
1585 } 1615 }
1586 else 1616 else
1587#endif 1617#endif
1588 if (!pty->get ()) 1618 if (!pty->get ())
1589 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);
1590 1622
1591 struct termios tio = def_tio; 1623 struct termios tio = def_tio;
1592 1624
1593#ifndef NO_BACKSPACE_KEY 1625#ifndef NO_BACKSPACE_KEY
1594 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1626 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1644 1676
1645 _exit (EXIT_FAILURE); 1677 _exit (EXIT_FAILURE);
1646 1678
1647 default: 1679 default:
1648 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
1649 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1687 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1688 }
1650 1689
1651 pty->close_tty (); 1690 pty->close_tty ();
1652 1691
1653 child_ev.start (cmd_pid); 1692 child_ev.start (cmd_pid);
1654 1693
… …
1679#elif defined (SRIOCSREDIR) 1718#elif defined (SRIOCSREDIR)
1680 int fd; 1719 int fd;
1681 1720
1682 fd = open (CONSOLE, O_WRONLY, 0); 1721 fd = open (CONSOLE, O_WRONLY, 0);
1683 if (fd >= 0) 1722 if (fd >= 0)
1723 {
1684 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1724 ioctl (fd, SRIOCSREDIR, NULL);
1685 close (fd); 1725 close (fd);
1726 }
1686#endif /* SRIOCSREDIR */ 1727#endif /* SRIOCSREDIR */
1687 } 1728 }
1688 1729
1689 /* reset signals and spin off the command interpreter */ 1730 /* reset signals and spin off the command interpreter */
1690 signal (SIGINT, SIG_DFL); 1731 signal (SIGINT, SIG_DFL);

Diff Legend

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