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.302 by sf-exg, Fri Dec 2 09:03:43 2011 UTC vs.
Revision 1.314 by sf-exg, Mon Jan 9 15:30:17 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);
… …
625 594
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
631 free (r_argv);
632 599
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
… …
766 return cmd_argv; 733 return cmd_argv;
767} 734}
768 735
769/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
770void 737void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
772{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
773 this->envv = envv; 744 this->envv = envv;
774 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{
775 SET_R (this); 771 SET_R (this);
776 set_locale (""); 772 set_locale ("");
777 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 :(
778 774
779 init_vars (); 775 init_vars ();
… …
845 } 841 }
846#endif 842#endif
847 843
848#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
849 if (rs[Rs_backgroundPixmap]) 845 if (rs[Rs_backgroundPixmap])
850 {
851 if (bg_set_file (rs[Rs_backgroundPixmap])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bg_window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
853 update_background (); 848 update_background ();
854 }
855#endif 849#endif
856 } 850 }
857#endif 851#endif
858 852
859#if ENABLE_PERL 853#if ENABLE_PERL
… …
861#endif 855#endif
862 856
863 set_colorfgbg (); 857 set_colorfgbg ();
864 858
865 init_command (cmd_argv); 859 init_command (cmd_argv);
866
867 free (cmd_argv);
868 860
869 if (pty->pty >= 0) 861 if (pty->pty >= 0)
870 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
871 863
872 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
914/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
915void 907void
916rxvt_term::init_env () 908rxvt_term::init_env ()
917{ 909{
918 char *val; 910 char *val;
911 char *env_display;
912 char *env_term;
919 913
920#ifdef DISPLAY_IS_IP 914#ifdef DISPLAY_IS_IP
921 /* Fixup display_name for export over pty to any interested terminal 915 /* Fixup display_name for export over pty to any interested terminal
922 * 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
923 * (for the first non-loopback interface) that we get from 917 * (for the first non-loopback interface) that we get from
… …
983 unsetenv ("TERMCAP"); /* terminfo should be okay */ 977 unsetenv ("TERMCAP"); /* terminfo should be okay */
984#endif /* HAVE_UNSETENV */ 978#endif /* HAVE_UNSETENV */
985} 979}
986 980
987/*----------------------------------------------------------------------*/ 981/*----------------------------------------------------------------------*/
988/*
989 * This is more or less stolen straight from XFree86 xterm.
990 * This should support all European type languages.
991 */
992void 982void
993rxvt_term::set_locale (const char *locale) 983rxvt_term::set_locale (const char *locale)
994{ 984{
995 set_environ (envv); 985 set_environ (envv);
996 986
… …
1016 SET_LOCALE (this->locale); 1006 SET_LOCALE (this->locale);
1017 mbstate.reset (); 1007 mbstate.reset ();
1018#endif 1008#endif
1019 1009
1020#if HAVE_NL_LANGINFO 1010#if HAVE_NL_LANGINFO
1021 char *codeset = strdup (nl_langinfo (CODESET)); 1011 char *codeset = nl_langinfo (CODESET);
1022 // /^UTF.?8/i 1012 // /^UTF.?8/i
1023 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1013 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1024 && (codeset[1] == 'T' || codeset[1] == 't') 1014 && (codeset[1] == 'T' || codeset[1] == 't')
1025 && (codeset[2] == 'F' || codeset[2] == 'f') 1015 && (codeset[2] == 'F' || codeset[2] == 'f')
1026 && (codeset[3] == '8' || codeset[4] == '8'); 1016 && (codeset[3] == '8' || codeset[4] == '8');
1027 free (codeset);
1028#else 1017#else
1029 enc_utf8 = 0; 1018 enc_utf8 = 0;
1030#endif 1019#endif
1031} 1020}
1032 1021
… …
1035{ 1024{
1036 set_environ (envv); 1025 set_environ (envv);
1037 1026
1038#ifdef USE_XIM 1027#ifdef USE_XIM
1039 if (!locale) 1028 if (!locale)
1040 rxvt_warn ("setting locale failed, working without locale support.\n"); 1029 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1041 else 1030 else
1042 { 1031 {
1043 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1032 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1044 1033
1045 if (!XSupportsLocale ()) 1034 if (!XSupportsLocale ())
1046 { 1035 {
1047 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1036 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1048 return; 1037 return;
1049 } 1038 }
1050 1039
1051 im_ev.start (display); 1040 im_ev.start (display);
1052 1041
… …
1487 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1476 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1488 &attributes); 1477 &attributes);
1489 1478
1490 this->parent = top; 1479 this->parent = top;
1491 1480
1492 old_width = szHint.width;
1493 old_height = szHint.height;
1494
1495 set_title (rs [Rs_title]); 1481 set_title (rs [Rs_title]);
1496 set_icon_name (rs [Rs_iconName]); 1482 set_icon_name (rs [Rs_iconName]);
1497 1483
1498 classHint.res_name = (char *)rs[Rs_name]; 1484 classHint.res_name = (char *)rs[Rs_name];
1499 classHint.res_class = (char *)RESCLASS; 1485 classHint.res_class = (char *)RESCLASS;
… …
1620 if (pty->pty >= 0) 1606 if (pty->pty >= 0)
1621 { 1607 {
1622 if (getfd_hook) 1608 if (getfd_hook)
1623 pty->pty = (*getfd_hook) (pty->pty); 1609 pty->pty = (*getfd_hook) (pty->pty);
1624 1610
1625 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1611 if (pty->pty < 0)
1626 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1612 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1627 } 1613 }
1628 } 1614 }
1629 else 1615 else
1630#endif 1616#endif
1631 if (!pty->get ()) 1617 if (!pty->get ())
1632 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1619
1620 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1633 1621
1634 struct termios tio = def_tio; 1622 struct termios tio = def_tio;
1635 1623
1636#ifndef NO_BACKSPACE_KEY 1624#ifndef NO_BACKSPACE_KEY
1637 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1687 1675
1688 _exit (EXIT_FAILURE); 1676 _exit (EXIT_FAILURE);
1689 1677
1690 default: 1678 default:
1691 if (!option (Opt_utmpInhibit)) 1679 if (!option (Opt_utmpInhibit))
1680 {
1681#ifdef LOG_ONLY_ON_LOGIN
1682 bool login_shell = option (Opt_loginShell);
1683#else
1684 bool login_shell = true;
1685#endif
1692 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1686 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1687 }
1693 1688
1694 pty->close_tty (); 1689 pty->close_tty ();
1695 1690
1696 child_ev.start (cmd_pid); 1691 child_ev.start (cmd_pid);
1697 1692
… …
1722#elif defined (SRIOCSREDIR) 1717#elif defined (SRIOCSREDIR)
1723 int fd; 1718 int fd;
1724 1719
1725 fd = open (CONSOLE, O_WRONLY, 0); 1720 fd = open (CONSOLE, O_WRONLY, 0);
1726 if (fd >= 0) 1721 if (fd >= 0)
1727 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1722 {
1723 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1728 close (fd); 1724 close (fd);
1725 }
1729#endif /* SRIOCSREDIR */ 1726#endif /* SRIOCSREDIR */
1730 } 1727 }
1731 1728
1732 /* reset signals and spin off the command interpreter */ 1729 /* reset signals and spin off the command interpreter */
1733 signal (SIGINT, SIG_DFL); 1730 signal (SIGINT, SIG_DFL);

Diff Legend

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