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.305 by sf-exg, Tue Dec 6 11:29:52 2011 UTC vs.
Revision 1.315 by sf-exg, Mon Jan 9 15:34:56 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
738rxvt_term::init (stringvec *argv, stringvec *envv)
739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
744 this->envv = envv;
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
759rxvt_term::init (int argc, const char *const *argv) 769rxvt_term::init2 (int argc, const char *const *argv)
760{ 770{
761 SET_R (this); 771 SET_R (this);
762 set_locale (""); 772 set_locale ("");
763 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 :(
764 774
… …
831 } 841 }
832#endif 842#endif
833 843
834#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
835 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
836 {
837 if (bg_set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
838 if (!bg_window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
839 update_background (); 848 update_background ();
840 }
841#endif 849#endif
842 } 850 }
843#endif 851#endif
844 852
845#if ENABLE_PERL 853#if ENABLE_PERL
846 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
847#endif 855#endif
848 856
849 set_colorfgbg (); 857 set_colorfgbg ();
858 init_done = 1;
850 859
851 init_command (cmd_argv); 860 init_command (cmd_argv);
852
853 free (cmd_argv);
854 861
855 if (pty->pty >= 0) 862 if (pty->pty >= 0)
856 pty_ev.start (pty->pty, ev::READ); 863 pty_ev.start (pty->pty, ev::READ);
857 864
858 HOOK_INVOKE ((this, HOOK_START, DT_END)); 865 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
900/*----------------------------------------------------------------------*/ 907/*----------------------------------------------------------------------*/
901void 908void
902rxvt_term::init_env () 909rxvt_term::init_env ()
903{ 910{
904 char *val; 911 char *val;
912 char *env_display;
913 char *env_term;
905 914
906#ifdef DISPLAY_IS_IP 915#ifdef DISPLAY_IS_IP
907 /* Fixup display_name for export over pty to any interested terminal 916 /* Fixup display_name for export over pty to any interested terminal
908 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 917 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
909 * (for the first non-loopback interface) that we get from 918 * (for the first non-loopback interface) that we get from
… …
969 unsetenv ("TERMCAP"); /* terminfo should be okay */ 978 unsetenv ("TERMCAP"); /* terminfo should be okay */
970#endif /* HAVE_UNSETENV */ 979#endif /* HAVE_UNSETENV */
971} 980}
972 981
973/*----------------------------------------------------------------------*/ 982/*----------------------------------------------------------------------*/
974/*
975 * This is more or less stolen straight from XFree86 xterm.
976 * This should support all European type languages.
977 */
978void 983void
979rxvt_term::set_locale (const char *locale) 984rxvt_term::set_locale (const char *locale)
980{ 985{
981 set_environ (envv); 986 set_environ (envv);
982 987
… …
1002 SET_LOCALE (this->locale); 1007 SET_LOCALE (this->locale);
1003 mbstate.reset (); 1008 mbstate.reset ();
1004#endif 1009#endif
1005 1010
1006#if HAVE_NL_LANGINFO 1011#if HAVE_NL_LANGINFO
1007 char *codeset = strdup (nl_langinfo (CODESET)); 1012 char *codeset = nl_langinfo (CODESET);
1008 // /^UTF.?8/i 1013 // /^UTF.?8/i
1009 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1014 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1010 && (codeset[1] == 'T' || codeset[1] == 't') 1015 && (codeset[1] == 'T' || codeset[1] == 't')
1011 && (codeset[2] == 'F' || codeset[2] == 'f') 1016 && (codeset[2] == 'F' || codeset[2] == 'f')
1012 && (codeset[3] == '8' || codeset[4] == '8'); 1017 && (codeset[3] == '8' || codeset[4] == '8');
1013 free (codeset);
1014#else 1018#else
1015 enc_utf8 = 0; 1019 enc_utf8 = 0;
1016#endif 1020#endif
1017} 1021}
1018 1022
… …
1021{ 1025{
1022 set_environ (envv); 1026 set_environ (envv);
1023 1027
1024#ifdef USE_XIM 1028#ifdef USE_XIM
1025 if (!locale) 1029 if (!locale)
1026 rxvt_warn ("setting locale failed, working without locale support.\n"); 1030 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1027 else 1031 else
1028 { 1032 {
1029 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1033 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1030 1034
1031 if (!XSupportsLocale ()) 1035 if (!XSupportsLocale ())
1032 { 1036 {
1033 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1037 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1034 return; 1038 return;
1035 } 1039 }
1036 1040
1037 im_ev.start (display); 1041 im_ev.start (display);
1038 1042
… …
1473 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1477 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1474 &attributes); 1478 &attributes);
1475 1479
1476 this->parent = top; 1480 this->parent = top;
1477 1481
1478 old_width = szHint.width;
1479 old_height = szHint.height;
1480
1481 set_title (rs [Rs_title]); 1482 set_title (rs [Rs_title]);
1482 set_icon_name (rs [Rs_iconName]); 1483 set_icon_name (rs [Rs_iconName]);
1483 1484
1484 classHint.res_name = (char *)rs[Rs_name]; 1485 classHint.res_name = (char *)rs[Rs_name];
1485 classHint.res_class = (char *)RESCLASS; 1486 classHint.res_class = (char *)RESCLASS;
… …
1606 if (pty->pty >= 0) 1607 if (pty->pty >= 0)
1607 { 1608 {
1608 if (getfd_hook) 1609 if (getfd_hook)
1609 pty->pty = (*getfd_hook) (pty->pty); 1610 pty->pty = (*getfd_hook) (pty->pty);
1610 1611
1611 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1612 if (pty->pty < 0)
1612 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1613 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1613 } 1614 }
1614 } 1615 }
1615 else 1616 else
1616#endif 1617#endif
1617 if (!pty->get ()) 1618 if (!pty->get ())
1618 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);
1619 1622
1620 struct termios tio = def_tio; 1623 struct termios tio = def_tio;
1621 1624
1622#ifndef NO_BACKSPACE_KEY 1625#ifndef NO_BACKSPACE_KEY
1623 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1626 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1673 1676
1674 _exit (EXIT_FAILURE); 1677 _exit (EXIT_FAILURE);
1675 1678
1676 default: 1679 default:
1677 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
1678 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1687 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1688 }
1679 1689
1680 pty->close_tty (); 1690 pty->close_tty ();
1681 1691
1682 child_ev.start (cmd_pid); 1692 child_ev.start (cmd_pid);
1683 1693
… …
1708#elif defined (SRIOCSREDIR) 1718#elif defined (SRIOCSREDIR)
1709 int fd; 1719 int fd;
1710 1720
1711 fd = open (CONSOLE, O_WRONLY, 0); 1721 fd = open (CONSOLE, O_WRONLY, 0);
1712 if (fd >= 0) 1722 if (fd >= 0)
1713 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1723 {
1724 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1714 close (fd); 1725 close (fd);
1726 }
1715#endif /* SRIOCSREDIR */ 1727#endif /* SRIOCSREDIR */
1716 } 1728 }
1717 1729
1718 /* reset signals and spin off the command interpreter */ 1730 /* reset signals and spin off the command interpreter */
1719 signal (SIGINT, SIG_DFL); 1731 signal (SIGINT, SIG_DFL);

Diff Legend

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