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.317 by sf-exg, Mon Jan 9 21:12:08 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, **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
856 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
857#endif 855#endif
858 856
859 set_colorfgbg (); 857 init_done = 1;
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));
… …
910/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
911void 907void
912rxvt_term::init_env () 908rxvt_term::init_env ()
913{ 909{
914 char *val; 910 char *val;
911 char *env_display;
912 char *env_windowid;
913 char *env_colorfgbg;
914 char *env_term;
915 915
916#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
917 /* Fixup display_name for export over pty to any interested terminal 917 /* Fixup display_name for export over pty to any interested terminal
918 * 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
919 * (for the first non-loopback interface) that we get from 919 * (for the first non-loopback interface) that we get from
… …
936 936
937 env_display = (char *)rxvt_malloc (strlen (val) + 9); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 938
939 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
940 940
941 env_windowid = (char *)rxvt_malloc (21);
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 942 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 943
943 /* add entries to the environment: 944 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 945 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 946 * @ WINDOWID: X window id number of the window
… …
949 * @ COLORFGBG: fg;bg color codes 950 * @ COLORFGBG: fg;bg color codes
950 */ 951 */
951 putenv (env_display); 952 putenv (env_display);
952 putenv (env_windowid); 953 putenv (env_windowid);
953 954
954 if (env_colorfgbg) 955 env_colorfgbg = get_colorfgbg ();
955 putenv (env_colorfgbg); 956 putenv (env_colorfgbg);
956 957
957#ifdef RXVT_TERMINFO 958#ifdef RXVT_TERMINFO
958 putenv ("TERMINFO=" RXVT_TERMINFO); 959 putenv ("TERMINFO=" RXVT_TERMINFO);
959#endif 960#endif
960 961
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 980 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 981#endif /* HAVE_UNSETENV */
981} 982}
982 983
983/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 985void
989rxvt_term::set_locale (const char *locale) 986rxvt_term::set_locale (const char *locale)
990{ 987{
991 set_environ (envv); 988 set_environ (envv);
992 989
… …
1012 SET_LOCALE (this->locale); 1009 SET_LOCALE (this->locale);
1013 mbstate.reset (); 1010 mbstate.reset ();
1014#endif 1011#endif
1015 1012
1016#if HAVE_NL_LANGINFO 1013#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 1014 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 1015 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1016 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 1017 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 1018 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 1019 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 1020#else
1025 enc_utf8 = 0; 1021 enc_utf8 = 0;
1026#endif 1022#endif
1027} 1023}
1028 1024
… …
1031{ 1027{
1032 set_environ (envv); 1028 set_environ (envv);
1033 1029
1034#ifdef USE_XIM 1030#ifdef USE_XIM
1035 if (!locale) 1031 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 1032 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 1033 else
1038 { 1034 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1035 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 1036
1041 if (!XSupportsLocale ()) 1037 if (!XSupportsLocale ())
1042 { 1038 {
1043 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");
1044 return; 1040 return;
1045 } 1041 }
1046 1042
1047 im_ev.start (display); 1043 im_ev.start (display);
1048 1044
… …
1483 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1479 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1484 &attributes); 1480 &attributes);
1485 1481
1486 this->parent = top; 1482 this->parent = top;
1487 1483
1488 old_width = szHint.width;
1489 old_height = szHint.height;
1490
1491 set_title (rs [Rs_title]); 1484 set_title (rs [Rs_title]);
1492 set_icon_name (rs [Rs_iconName]); 1485 set_icon_name (rs [Rs_iconName]);
1493 1486
1494 classHint.res_name = (char *)rs[Rs_name]; 1487 classHint.res_name = (char *)rs[Rs_name];
1495 classHint.res_class = (char *)RESCLASS; 1488 classHint.res_class = (char *)RESCLASS;
… …
1557 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1550 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1558 1551
1559 /* the vt window */ 1552 /* the vt window */
1560 vt = XCreateSimpleWindow (dpy, top, 1553 vt = XCreateSimpleWindow (dpy, top,
1561 window_vt_x, window_vt_y, 1554 window_vt_x, window_vt_y,
1562 width, height, 1555 vt_width, vt_height,
1563 0, 1556 0,
1564 pix_colors_focused[Color_fg], 1557 pix_colors_focused[Color_fg],
1565 pix_colors_focused[Color_bg]); 1558 pix_colors_focused[Color_bg]);
1566 1559
1567 attributes.bit_gravity = NorthWestGravity; 1560 attributes.bit_gravity = NorthWestGravity;
… …
1616 if (pty->pty >= 0) 1609 if (pty->pty >= 0)
1617 { 1610 {
1618 if (getfd_hook) 1611 if (getfd_hook)
1619 pty->pty = (*getfd_hook) (pty->pty); 1612 pty->pty = (*getfd_hook) (pty->pty);
1620 1613
1621 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1614 if (pty->pty < 0)
1622 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1615 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1623 } 1616 }
1624 } 1617 }
1625 else 1618 else
1626#endif 1619#endif
1627 if (!pty->get ()) 1620 if (!pty->get ())
1628 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);
1629 1624
1630 struct termios tio = def_tio; 1625 struct termios tio = def_tio;
1631 1626
1632#ifndef NO_BACKSPACE_KEY 1627#ifndef NO_BACKSPACE_KEY
1633 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1628 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1683 1678
1684 _exit (EXIT_FAILURE); 1679 _exit (EXIT_FAILURE);
1685 1680
1686 default: 1681 default:
1687 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
1688 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1689 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1690 }
1689 1691
1690 pty->close_tty (); 1692 pty->close_tty ();
1691 1693
1692 child_ev.start (cmd_pid); 1694 child_ev.start (cmd_pid);
1693 1695
… …
1718#elif defined (SRIOCSREDIR) 1720#elif defined (SRIOCSREDIR)
1719 int fd; 1721 int fd;
1720 1722
1721 fd = open (CONSOLE, O_WRONLY, 0); 1723 fd = open (CONSOLE, O_WRONLY, 0);
1722 if (fd >= 0) 1724 if (fd >= 0)
1723 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1725 {
1726 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1724 close (fd); 1727 close (fd);
1728 }
1725#endif /* SRIOCSREDIR */ 1729#endif /* SRIOCSREDIR */
1726 } 1730 }
1727 1731
1728 /* reset signals and spin off the command interpreter */ 1732 /* reset signals and spin off the command interpreter */
1729 signal (SIGINT, SIG_DFL); 1733 signal (SIGINT, SIG_DFL);

Diff Legend

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