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.306 by sf-exg, Tue Dec 6 11:39:30 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; 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 cmd_argv = (const char **)argv + r_argc + 1;
588 574
589 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
590 576
591 /* 577 /*
592 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
593 */ 579 */
594 580
595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
596 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
597 583
598 get_options (r_argc, argv); 584 cmd_argv = get_options (argc, argv);
599 585
600 if (!(display = displays.get (rs[Rs_display_name]))) 586 if (!(display = displays.get (rs[Rs_display_name])))
601 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]);
602 588
603 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
… …
747 return cmd_argv; 733 return cmd_argv;
748} 734}
749 735
750/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
751void 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
752rxvt_term::init (int argc, const char *const *argv) 769rxvt_term::init2 (int argc, const char *const *argv)
753{ 770{
754 SET_R (this); 771 SET_R (this);
755 set_locale (""); 772 set_locale ("");
756 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 :(
757 774
… …
824 } 841 }
825#endif 842#endif
826 843
827#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
828 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
829 {
830 if (bg_set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
831 if (!bg_window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
832 update_background (); 848 update_background ();
833 }
834#endif 849#endif
835 } 850 }
836#endif 851#endif
837 852
838#if ENABLE_PERL 853#if ENABLE_PERL
839 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
840#endif 855#endif
841 856
842 set_colorfgbg (); 857 init_done = 1;
843 858
844 init_command (cmd_argv); 859 init_command (cmd_argv);
845 860
846 if (pty->pty >= 0) 861 if (pty->pty >= 0)
847 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
… …
891/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
892void 907void
893rxvt_term::init_env () 908rxvt_term::init_env ()
894{ 909{
895 char *val; 910 char *val;
911 char *env_display;
912 char *env_windowid;
913 char *env_colorfgbg;
914 char *env_term;
896 915
897#ifdef DISPLAY_IS_IP 916#ifdef DISPLAY_IS_IP
898 /* Fixup display_name for export over pty to any interested terminal 917 /* Fixup display_name for export over pty to any interested terminal
899 * 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
900 * (for the first non-loopback interface) that we get from 919 * (for the first non-loopback interface) that we get from
… …
917 936
918 env_display = (char *)rxvt_malloc (strlen (val) + 9); 937 env_display = (char *)rxvt_malloc (strlen (val) + 9);
919 938
920 sprintf (env_display, "DISPLAY=%s", val); 939 sprintf (env_display, "DISPLAY=%s", val);
921 940
941 env_windowid = (char *)rxvt_malloc (21);
922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 942 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
923 943
924 /* add entries to the environment: 944 /* add entries to the environment:
925 * @ DISPLAY: in case we started with -display 945 * @ DISPLAY: in case we started with -display
926 * @ WINDOWID: X window id number of the window 946 * @ WINDOWID: X window id number of the window
… …
930 * @ COLORFGBG: fg;bg color codes 950 * @ COLORFGBG: fg;bg color codes
931 */ 951 */
932 putenv (env_display); 952 putenv (env_display);
933 putenv (env_windowid); 953 putenv (env_windowid);
934 954
935 if (env_colorfgbg) 955 env_colorfgbg = get_colorfgbg ();
936 putenv (env_colorfgbg); 956 putenv (env_colorfgbg);
937 957
938#ifdef RXVT_TERMINFO 958#ifdef RXVT_TERMINFO
939 putenv ("TERMINFO=" RXVT_TERMINFO); 959 putenv ("TERMINFO=" RXVT_TERMINFO);
940#endif 960#endif
941 961
… …
960 unsetenv ("TERMCAP"); /* terminfo should be okay */ 980 unsetenv ("TERMCAP"); /* terminfo should be okay */
961#endif /* HAVE_UNSETENV */ 981#endif /* HAVE_UNSETENV */
962} 982}
963 983
964/*----------------------------------------------------------------------*/ 984/*----------------------------------------------------------------------*/
965/*
966 * This is more or less stolen straight from XFree86 xterm.
967 * This should support all European type languages.
968 */
969void 985void
970rxvt_term::set_locale (const char *locale) 986rxvt_term::set_locale (const char *locale)
971{ 987{
972 set_environ (envv); 988 set_environ (envv);
973 989
… …
993 SET_LOCALE (this->locale); 1009 SET_LOCALE (this->locale);
994 mbstate.reset (); 1010 mbstate.reset ();
995#endif 1011#endif
996 1012
997#if HAVE_NL_LANGINFO 1013#if HAVE_NL_LANGINFO
998 char *codeset = strdup (nl_langinfo (CODESET)); 1014 char *codeset = nl_langinfo (CODESET);
999 // /^UTF.?8/i 1015 // /^UTF.?8/i
1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1016 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1001 && (codeset[1] == 'T' || codeset[1] == 't') 1017 && (codeset[1] == 'T' || codeset[1] == 't')
1002 && (codeset[2] == 'F' || codeset[2] == 'f') 1018 && (codeset[2] == 'F' || codeset[2] == 'f')
1003 && (codeset[3] == '8' || codeset[4] == '8'); 1019 && (codeset[3] == '8' || codeset[4] == '8');
1004 free (codeset);
1005#else 1020#else
1006 enc_utf8 = 0; 1021 enc_utf8 = 0;
1007#endif 1022#endif
1008} 1023}
1009 1024
… …
1012{ 1027{
1013 set_environ (envv); 1028 set_environ (envv);
1014 1029
1015#ifdef USE_XIM 1030#ifdef USE_XIM
1016 if (!locale) 1031 if (!locale)
1017 rxvt_warn ("setting locale failed, working without locale support.\n"); 1032 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1018 else 1033 else
1019 { 1034 {
1020 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1035 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1021 1036
1022 if (!XSupportsLocale ()) 1037 if (!XSupportsLocale ())
1023 { 1038 {
1024 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");
1025 return; 1040 return;
1026 } 1041 }
1027 1042
1028 im_ev.start (display); 1043 im_ev.start (display);
1029 1044
… …
1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1479 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1465 &attributes); 1480 &attributes);
1466 1481
1467 this->parent = top; 1482 this->parent = top;
1468 1483
1469 old_width = szHint.width;
1470 old_height = szHint.height;
1471
1472 set_title (rs [Rs_title]); 1484 set_title (rs [Rs_title]);
1473 set_icon_name (rs [Rs_iconName]); 1485 set_icon_name (rs [Rs_iconName]);
1474 1486
1475 classHint.res_name = (char *)rs[Rs_name]; 1487 classHint.res_name = (char *)rs[Rs_name];
1476 classHint.res_class = (char *)RESCLASS; 1488 classHint.res_class = (char *)RESCLASS;
… …
1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1550 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1539 1551
1540 /* the vt window */ 1552 /* the vt window */
1541 vt = XCreateSimpleWindow (dpy, top, 1553 vt = XCreateSimpleWindow (dpy, top,
1542 window_vt_x, window_vt_y, 1554 window_vt_x, window_vt_y,
1543 width, height, 1555 vt_width, vt_height,
1544 0, 1556 0,
1545 pix_colors_focused[Color_fg], 1557 pix_colors_focused[Color_fg],
1546 pix_colors_focused[Color_bg]); 1558 pix_colors_focused[Color_bg]);
1547 1559
1548 attributes.bit_gravity = NorthWestGravity; 1560 attributes.bit_gravity = NorthWestGravity;
… …
1597 if (pty->pty >= 0) 1609 if (pty->pty >= 0)
1598 { 1610 {
1599 if (getfd_hook) 1611 if (getfd_hook)
1600 pty->pty = (*getfd_hook) (pty->pty); 1612 pty->pty = (*getfd_hook) (pty->pty);
1601 1613
1602 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1614 if (pty->pty < 0)
1603 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1615 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1604 } 1616 }
1605 } 1617 }
1606 else 1618 else
1607#endif 1619#endif
1608 if (!pty->get ()) 1620 if (!pty->get ())
1609 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);
1610 1624
1611 struct termios tio = def_tio; 1625 struct termios tio = def_tio;
1612 1626
1613#ifndef NO_BACKSPACE_KEY 1627#ifndef NO_BACKSPACE_KEY
1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1628 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1664 1678
1665 _exit (EXIT_FAILURE); 1679 _exit (EXIT_FAILURE);
1666 1680
1667 default: 1681 default:
1668 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
1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1689 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1690 }
1670 1691
1671 pty->close_tty (); 1692 pty->close_tty ();
1672 1693
1673 child_ev.start (cmd_pid); 1694 child_ev.start (cmd_pid);
1674 1695
… …
1699#elif defined (SRIOCSREDIR) 1720#elif defined (SRIOCSREDIR)
1700 int fd; 1721 int fd;
1701 1722
1702 fd = open (CONSOLE, O_WRONLY, 0); 1723 fd = open (CONSOLE, O_WRONLY, 0);
1703 if (fd >= 0) 1724 if (fd >= 0)
1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1725 {
1726 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1705 close (fd); 1727 close (fd);
1728 }
1706#endif /* SRIOCSREDIR */ 1729#endif /* SRIOCSREDIR */
1707 } 1730 }
1708 1731
1709 /* reset signals and spin off the command interpreter */ 1732 /* reset signals and spin off the command interpreter */
1710 signal (SIGINT, SIG_DFL); 1733 signal (SIGINT, SIG_DFL);

Diff Legend

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