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.307 by root, Sat Dec 17 23:17:33 2011 UTC vs.
Revision 1.320 by sf-exg, Thu Jan 19 15:08:55 2012 UTC

… …
38#include "init.h" 38#include "init.h"
39#include "keyboard.h" 39#include "keyboard.h"
40 40
41#include <limits> 41#include <limits>
42 42
43#include <csignal> 43#include <signal.h>
44 44
45#include <fcntl.h> 45#include <fcntl.h>
46 46
47#ifdef HAVE_XSETLOCALE 47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE 48# define X_LOCALE
49# include <X11/Xlocale.h> 49# include <X11/Xlocale.h>
50#else 50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale> 51# include <locale.h>
53# endif
54#endif 52#endif
55 53
56#ifdef HAVE_NL_LANGINFO 54#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 55# include <langinfo.h>
58#endif 56#endif
… …
567 565
568/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
569const char ** 567const char **
570rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
571{ 569{
572 int i, r_argc; 570 int i;
573 const char **cmd_argv; 571 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 572
589 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
590 574
591 /* 575 /*
592 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
593 */ 577 */
594 578
595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
596 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
597 581
598 get_options (r_argc, argv); 582 cmd_argv = get_options (argc, argv);
599 583
600 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
601 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
602 586
603 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
… …
866 850
867#if ENABLE_PERL 851#if ENABLE_PERL
868 rootwin_ev.start (display, display->root); 852 rootwin_ev.start (display, display->root);
869#endif 853#endif
870 854
871 set_colorfgbg (); 855 init_done = 1;
872 856
873 init_command (cmd_argv); 857 init_command (cmd_argv);
874 858
875 if (pty->pty >= 0) 859 if (pty->pty >= 0)
876 pty_ev.start (pty->pty, ev::READ); 860 pty_ev.start (pty->pty, ev::READ);
… …
920/*----------------------------------------------------------------------*/ 904/*----------------------------------------------------------------------*/
921void 905void
922rxvt_term::init_env () 906rxvt_term::init_env ()
923{ 907{
924 char *val; 908 char *val;
909 char *env_display;
910 char *env_windowid;
911 char *env_colorfgbg;
912 char *env_term;
925 913
926#ifdef DISPLAY_IS_IP 914#ifdef DISPLAY_IS_IP
927 /* Fixup display_name for export over pty to any interested terminal 915 /* Fixup display_name for export over pty to any interested terminal
928 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 916 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
929 * (for the first non-loopback interface) that we get from 917 * (for the first non-loopback interface) that we get from
… …
946 934
947 env_display = (char *)rxvt_malloc (strlen (val) + 9); 935 env_display = (char *)rxvt_malloc (strlen (val) + 9);
948 936
949 sprintf (env_display, "DISPLAY=%s", val); 937 sprintf (env_display, "DISPLAY=%s", val);
950 938
939 env_windowid = (char *)rxvt_malloc (21);
951 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
952 941
953 /* add entries to the environment: 942 /* add entries to the environment:
954 * @ DISPLAY: in case we started with -display 943 * @ DISPLAY: in case we started with -display
955 * @ WINDOWID: X window id number of the window 944 * @ WINDOWID: X window id number of the window
… …
959 * @ COLORFGBG: fg;bg color codes 948 * @ COLORFGBG: fg;bg color codes
960 */ 949 */
961 putenv (env_display); 950 putenv (env_display);
962 putenv (env_windowid); 951 putenv (env_windowid);
963 952
964 if (env_colorfgbg) 953 env_colorfgbg = get_colorfgbg ();
965 putenv (env_colorfgbg); 954 putenv (env_colorfgbg);
966 955
967#ifdef RXVT_TERMINFO 956#ifdef RXVT_TERMINFO
968 putenv ("TERMINFO=" RXVT_TERMINFO); 957 putenv ("TERMINFO=" RXVT_TERMINFO);
969#endif 958#endif
970 959
… …
994void 983void
995rxvt_term::set_locale (const char *locale) 984rxvt_term::set_locale (const char *locale)
996{ 985{
997 set_environ (envv); 986 set_environ (envv);
998 987
999#if HAVE_XSETLOCALE || HAVE_SETLOCALE
1000 free (this->locale); 988 free (this->locale);
1001 this->locale = setlocale (LC_CTYPE, locale); 989 this->locale = setlocale (LC_CTYPE, locale);
1002 990
1003 if (!this->locale) 991 if (!this->locale)
1004 { 992 {
… …
1015 1003
1016 1004
1017 this->locale = strdup (this->locale); 1005 this->locale = strdup (this->locale);
1018 SET_LOCALE (this->locale); 1006 SET_LOCALE (this->locale);
1019 mbstate.reset (); 1007 mbstate.reset ();
1020#endif
1021 1008
1022#if HAVE_NL_LANGINFO 1009#if HAVE_NL_LANGINFO
1023 char *codeset = nl_langinfo (CODESET); 1010 char *codeset = nl_langinfo (CODESET);
1024 // /^UTF.?8/i 1011 // /^UTF.?8/i
1025 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1012 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
… …
1202/*----------------------------------------------------------------------*/ 1189/*----------------------------------------------------------------------*/
1203/* color aliases, fg/bg bright-bold */ 1190/* color aliases, fg/bg bright-bold */
1204void 1191void
1205rxvt_term::color_aliases (int idx) 1192rxvt_term::color_aliases (int idx)
1206{ 1193{
1207 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1194 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1208 { 1195 {
1209 int i = atoi (rs[Rs_color + idx]); 1196 int i = atoi (rs[Rs_color + idx]);
1210 1197
1211 if (i >= 8 && i <= 15) 1198 if (i >= 8 && i <= 15)
1212 /* bright colors */ 1199 /* bright colors */
… …
1488 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1475 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1489 &attributes); 1476 &attributes);
1490 1477
1491 this->parent = top; 1478 this->parent = top;
1492 1479
1493 old_width = szHint.width;
1494 old_height = szHint.height;
1495
1496 set_title (rs [Rs_title]); 1480 set_title (rs [Rs_title]);
1497 set_icon_name (rs [Rs_iconName]); 1481 set_icon_name (rs [Rs_iconName]);
1498 1482
1499 classHint.res_name = (char *)rs[Rs_name]; 1483 classHint.res_name = (char *)rs[Rs_name];
1500 classHint.res_class = (char *)RESCLASS; 1484 classHint.res_class = (char *)RESCLASS;
… …
1562 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1546 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1563 1547
1564 /* the vt window */ 1548 /* the vt window */
1565 vt = XCreateSimpleWindow (dpy, top, 1549 vt = XCreateSimpleWindow (dpy, top,
1566 window_vt_x, window_vt_y, 1550 window_vt_x, window_vt_y,
1567 width, height, 1551 vt_width, vt_height,
1568 0, 1552 0,
1569 pix_colors_focused[Color_fg], 1553 pix_colors_focused[Color_fg],
1570 pix_colors_focused[Color_bg]); 1554 pix_colors_focused[Color_bg]);
1571 1555
1572 attributes.bit_gravity = NorthWestGravity; 1556 attributes.bit_gravity = NorthWestGravity;
… …
1621 if (pty->pty >= 0) 1605 if (pty->pty >= 0)
1622 { 1606 {
1623 if (getfd_hook) 1607 if (getfd_hook)
1624 pty->pty = (*getfd_hook) (pty->pty); 1608 pty->pty = (*getfd_hook) (pty->pty);
1625 1609
1626 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1610 if (pty->pty < 0)
1627 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1611 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1628 } 1612 }
1629 } 1613 }
1630 else 1614 else
1631#endif 1615#endif
1632 if (!pty->get ()) 1616 if (!pty->get ())
1633 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1617 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1618
1619 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1634 1620
1635 struct termios tio = def_tio; 1621 struct termios tio = def_tio;
1636 1622
1637#ifndef NO_BACKSPACE_KEY 1623#ifndef NO_BACKSPACE_KEY
1638 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1624 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1688 1674
1689 _exit (EXIT_FAILURE); 1675 _exit (EXIT_FAILURE);
1690 1676
1691 default: 1677 default:
1692 if (!option (Opt_utmpInhibit)) 1678 if (!option (Opt_utmpInhibit))
1679 {
1680#ifdef LOG_ONLY_ON_LOGIN
1681 bool login_shell = option (Opt_loginShell);
1682#else
1683 bool login_shell = true;
1684#endif
1693 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1685 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1686 }
1694 1687
1695 pty->close_tty (); 1688 pty->close_tty ();
1696 1689
1697 child_ev.start (cmd_pid); 1690 child_ev.start (cmd_pid);
1698 1691
… …
1723#elif defined (SRIOCSREDIR) 1716#elif defined (SRIOCSREDIR)
1724 int fd; 1717 int fd;
1725 1718
1726 fd = open (CONSOLE, O_WRONLY, 0); 1719 fd = open (CONSOLE, O_WRONLY, 0);
1727 if (fd >= 0) 1720 if (fd >= 0)
1728 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1721 {
1722 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1729 close (fd); 1723 close (fd);
1724 }
1730#endif /* SRIOCSREDIR */ 1725#endif /* SRIOCSREDIR */
1731 } 1726 }
1732 1727
1733 /* reset signals and spin off the command interpreter */ 1728 /* reset signals and spin off the command interpreter */
1734 signal (SIGINT, SIG_DFL); 1729 signal (SIGINT, SIG_DFL);

Diff Legend

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