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.295 by sf-exg, Tue Apr 26 16:19:45 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>
56#endif
57
58#ifdef HAVE_STARTUP_NOTIFICATION
59# define SN_API_NOT_YET_FROZEN
60# include <libsn/sn-launchee.h>
58#endif 61#endif
59 62
60#ifdef DISPLAY_IS_IP 63#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 64/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 65#include <sys/types.h>
… …
562 565
563/*----------------------------------------------------------------------*/ 566/*----------------------------------------------------------------------*/
564const char ** 567const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 568rxvt_term::init_resources (int argc, const char *const *argv)
566{ 569{
567 int i, r_argc; 570 int i;
568 const char **cmd_argv, **r_argv; 571 const char **cmd_argv;
569
570 /*
571 * Look for -e option. Find => split and make cmd_argv[] of command args
572 */
573 for (r_argc = 0; r_argc < argc; r_argc++)
574 if (!strcmp (argv[r_argc], "-e"))
575 break;
576
577 if (r_argc == argc)
578 cmd_argv = NULL;
579 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1];
587
588 cmd_argv[i] = NULL;
589 }
590
591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
592
593 for (i = 0; i < r_argc; i++)
594 r_argv[i] = (const char *)argv[i];
595
596 r_argv[i] = NULL;
597 572
598 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
599 574
600 /* 575 /*
601 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
602 */ 577 */
603 578
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
606 581
607 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
608 583
609 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
612 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]);
613 }
614 586
615 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
616 xa = display->xa; 588 xa = display->xa;
617 589
618 set (display); 590 set (display);
… …
621#if XFT 593#if XFT
622 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
623 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
624#endif 596#endif
625 597
626 free (r_argv);
627
628 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
630 rs [i] = 0; 600 rs [i] = 0;
631 601
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639#endif
640
641#if ENABLE_PERL 602#if ENABLE_PERL
642 if (!rs[Rs_perl_ext_1]) 603 if (!rs[Rs_perl_ext_1])
643 rs[Rs_perl_ext_1] = "default"; 604 rs[Rs_perl_ext_1] = "default";
644 605
645 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 606 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
648 { 609 {
649 rxvt_perl.init (this); 610 rxvt_perl.init (this);
650 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
651 } 612 }
652#endif 613#endif
614
615 // must be called after initialising the perl interpreter as it
616 // may invoke the `on_register_command' hook
617 extract_keysym_resources ();
653 618
654 /* 619 /*
655 * set any defaults not already set 620 * set any defaults not already set
656 */ 621 */
657 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
… …
766 return cmd_argv; 731 return cmd_argv;
767} 732}
768 733
769/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
770void 735void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 736rxvt_term::init (stringvec *argv, stringvec *envv)
772{ 737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
773 this->envv = envv; 742 this->envv = envv;
774 743
744 init2 (argv->size () - 1, argv->begin ());
745}
746
747void
748rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
749{
750#if ENABLE_PERL
751 // perl might want to access the stringvecs later, so we need to copy them
752 stringvec *args = new stringvec;
753 for (int i = 0; i < argc; i++)
754 args->push_back (strdup (argv [i]));
755
756 stringvec *envs = new stringvec;
757 for (const char *const *var = envv; *var; var++)
758 envs->push_back (strdup (*var));
759
760 init (args, envs);
761#else
762 init2 (argc, argv);
763#endif
764}
765
766void
767rxvt_term::init2 (int argc, const char *const *argv)
768{
775 SET_R (this); 769 SET_R (this);
776 set_locale (""); 770 set_locale ("");
777 set_environ (envv); // a few things in X do not call setlocale :( 771 set_environ (envv); // a few things in X do not call setlocale :(
778 772
779 init_vars (); 773 init_vars ();
… …
793 if (chdir (path)) 787 if (chdir (path))
794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 788 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
795 } 789 }
796 790
797 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 793
800 pty = ptytty::create (); 794 pty = ptytty::create ();
795
796#ifdef HAVE_AFTERIMAGE
797 set_application_name ((char *)rs[Rs_name]);
798 set_output_threshold (OUTPUT_LEVEL_WARNING);
799#endif
800
801 // must be called before create_windows, because the latter may call set_icon
802#ifdef HAVE_PIXBUF
803 g_type_init ();
804#endif
801 805
802 create_windows (argc, argv); 806 create_windows (argc, argv);
803 807
804 init_xlocale (); 808 init_xlocale ();
805 809
… …
835 } 839 }
836#endif 840#endif
837 841
838#ifdef BG_IMAGE_FROM_FILE 842#ifdef BG_IMAGE_FROM_FILE
839 if (rs[Rs_backgroundPixmap]) 843 if (rs[Rs_backgroundPixmap])
840 {
841 const char *p = rs[Rs_backgroundPixmap];
842
843 if ((p = strchr (p, ';')) != 0)
844 {
845 p++;
846 bg_set_geometry (p);
847 }
848 else
849 bg_set_default_geometry ();
850
851 if (bg_set_file (rs[Rs_backgroundPixmap])) 844 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bg_window_position_sensitive ()) 845 if (!bg_window_position_sensitive ())
853 update_background (); 846 update_background ();
854 }
855#endif 847#endif
856 } 848 }
857#endif 849#endif
858 850
859#if ENABLE_PERL 851#if ENABLE_PERL
860 rootwin_ev.start (display, display->root); 852 rootwin_ev.start (display, display->root);
861#endif 853#endif
862 854
863 set_colorfgbg (); 855 init_done = 1;
864 856
865 init_command (cmd_argv); 857 init_command (cmd_argv);
866
867 free (cmd_argv);
868 858
869 if (pty->pty >= 0) 859 if (pty->pty >= 0)
870 pty_ev.start (pty->pty, ev::READ); 860 pty_ev.start (pty->pty, ev::READ);
871 861
872 HOOK_INVOKE ((this, HOOK_START, DT_END)); 862 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
879 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 869 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
880 32, PropModeReplace, (unsigned char *)&info, 2); 870 32, PropModeReplace, (unsigned char *)&info, 2);
881 } 871 }
882#endif 872#endif
883 873
874#if HAVE_STARTUP_NOTIFICATION
875 SnDisplay *snDisplay;
876 SnLauncheeContext *snContext;
877
878 snDisplay = sn_display_new (dpy, NULL, NULL);
879 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
880
881 /* Tell the window manager that this window is part of the startup context */
882 if (snContext)
883 sn_launchee_context_setup_window (snContext, parent);
884#endif
885
884 XMapWindow (dpy, vt); 886 XMapWindow (dpy, vt);
885 XMapWindow (dpy, parent); 887 XMapWindow (dpy, parent);
888
889#if HAVE_STARTUP_NOTIFICATION
890 if (snContext)
891 {
892 /* Mark the startup process as complete */
893 sn_launchee_context_complete (snContext);
894
895 sn_launchee_context_unref (snContext);
896 }
897
898 sn_display_unref (snDisplay);
899#endif
886 900
887 refresh_check (); 901 refresh_check ();
888} 902}
889 903
890/*----------------------------------------------------------------------*/ 904/*----------------------------------------------------------------------*/
891void 905void
892rxvt_term::init_env () 906rxvt_term::init_env ()
893{ 907{
894 char *val; 908 char *val;
909 char *env_display;
910 char *env_windowid;
911 char *env_colorfgbg;
912 char *env_term;
895 913
896#ifdef DISPLAY_IS_IP 914#ifdef DISPLAY_IS_IP
897 /* Fixup display_name for export over pty to any interested terminal 915 /* Fixup display_name for export over pty to any interested terminal
898 * 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
899 * (for the first non-loopback interface) that we get from 917 * (for the first non-loopback interface) that we get from
… …
916 934
917 env_display = (char *)rxvt_malloc (strlen (val) + 9); 935 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 936
919 sprintf (env_display, "DISPLAY=%s", val); 937 sprintf (env_display, "DISPLAY=%s", val);
920 938
939 env_windowid = (char *)rxvt_malloc (21);
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 940 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 941
923 /* add entries to the environment: 942 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 943 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 944 * @ WINDOWID: X window id number of the window
… …
929 * @ COLORFGBG: fg;bg color codes 948 * @ COLORFGBG: fg;bg color codes
930 */ 949 */
931 putenv (env_display); 950 putenv (env_display);
932 putenv (env_windowid); 951 putenv (env_windowid);
933 952
934 if (env_colorfgbg) 953 env_colorfgbg = get_colorfgbg ();
935 putenv (env_colorfgbg); 954 putenv (env_colorfgbg);
936 955
937#ifdef RXVT_TERMINFO 956#ifdef RXVT_TERMINFO
938 putenv ("TERMINFO=" RXVT_TERMINFO); 957 putenv ("TERMINFO=" RXVT_TERMINFO);
939#endif 958#endif
940 959
… …
959 unsetenv ("TERMCAP"); /* terminfo should be okay */ 978 unsetenv ("TERMCAP"); /* terminfo should be okay */
960#endif /* HAVE_UNSETENV */ 979#endif /* HAVE_UNSETENV */
961} 980}
962 981
963/*----------------------------------------------------------------------*/ 982/*----------------------------------------------------------------------*/
964/*
965 * This is more or less stolen straight from XFree86 xterm.
966 * This should support all European type languages.
967 */
968void 983void
969rxvt_term::set_locale (const char *locale) 984rxvt_term::set_locale (const char *locale)
970{ 985{
971 set_environ (envv); 986 set_environ (envv);
972 987
973#if HAVE_XSETLOCALE || HAVE_SETLOCALE
974 free (this->locale); 988 free (this->locale);
975 this->locale = setlocale (LC_CTYPE, locale); 989 this->locale = setlocale (LC_CTYPE, locale);
976 990
977 if (!this->locale) 991 if (!this->locale)
978 { 992 {
… …
989 1003
990 1004
991 this->locale = strdup (this->locale); 1005 this->locale = strdup (this->locale);
992 SET_LOCALE (this->locale); 1006 SET_LOCALE (this->locale);
993 mbstate.reset (); 1007 mbstate.reset ();
994#endif
995 1008
996#if HAVE_NL_LANGINFO 1009#if HAVE_NL_LANGINFO
997 char *codeset = strdup (nl_langinfo (CODESET)); 1010 char *codeset = nl_langinfo (CODESET);
998 // /^UTF.?8/i 1011 // /^UTF.?8/i
999 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1012 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1000 && (codeset[1] == 'T' || codeset[1] == 't') 1013 && (codeset[1] == 'T' || codeset[1] == 't')
1001 && (codeset[2] == 'F' || codeset[2] == 'f') 1014 && (codeset[2] == 'F' || codeset[2] == 'f')
1002 && (codeset[3] == '8' || codeset[4] == '8'); 1015 && (codeset[3] == '8' || codeset[4] == '8');
1003 free (codeset);
1004#else 1016#else
1005 enc_utf8 = 0; 1017 enc_utf8 = 0;
1006#endif 1018#endif
1007} 1019}
1008 1020
… …
1011{ 1023{
1012 set_environ (envv); 1024 set_environ (envv);
1013 1025
1014#ifdef USE_XIM 1026#ifdef USE_XIM
1015 if (!locale) 1027 if (!locale)
1016 rxvt_warn ("setting locale failed, working without locale support.\n"); 1028 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017 else 1029 else
1018 { 1030 {
1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1031 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1020 1032
1021 if (!XSupportsLocale ()) 1033 if (!XSupportsLocale ())
1022 { 1034 {
1023 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1035 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1024 return; 1036 return;
1025 } 1037 }
1026 1038
1027 im_ev.start (display); 1039 im_ev.start (display);
1028 1040
… …
1177/*----------------------------------------------------------------------*/ 1189/*----------------------------------------------------------------------*/
1178/* color aliases, fg/bg bright-bold */ 1190/* color aliases, fg/bg bright-bold */
1179void 1191void
1180rxvt_term::color_aliases (int idx) 1192rxvt_term::color_aliases (int idx)
1181{ 1193{
1182 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1194 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1183 { 1195 {
1184 int i = atoi (rs[Rs_color + idx]); 1196 int i = atoi (rs[Rs_color + idx]);
1185 1197
1186 if (i >= 8 && i <= 15) 1198 if (i >= 8 && i <= 15)
1187 /* bright colors */ 1199 /* bright colors */
… …
1463 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1475 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1464 &attributes); 1476 &attributes);
1465 1477
1466 this->parent = top; 1478 this->parent = top;
1467 1479
1468 old_width = szHint.width;
1469 old_height = szHint.height;
1470
1471 set_title (rs [Rs_title]); 1480 set_title (rs [Rs_title]);
1472 set_icon_name (rs [Rs_iconName]); 1481 set_icon_name (rs [Rs_iconName]);
1473 1482
1474 classHint.res_name = (char *)rs[Rs_name]; 1483 classHint.res_name = (char *)rs[Rs_name];
1475 classHint.res_class = (char *)RESCLASS; 1484 classHint.res_class = (char *)RESCLASS;
… …
1504#if ENABLE_EWMH 1513#if ENABLE_EWMH
1505 xa[XA_NET_WM_PING], 1514 xa[XA_NET_WM_PING],
1506#endif 1515#endif
1507 }; 1516 };
1508 1517
1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1518 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1510 1519
1511#if ENABLE_FRILLS 1520#if ENABLE_FRILLS
1512 if (rs[Rs_transient_for]) 1521 if (rs[Rs_transient_for])
1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1522 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1514#endif 1523#endif
… …
1537 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1546 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1538 1547
1539 /* the vt window */ 1548 /* the vt window */
1540 vt = XCreateSimpleWindow (dpy, top, 1549 vt = XCreateSimpleWindow (dpy, top,
1541 window_vt_x, window_vt_y, 1550 window_vt_x, window_vt_y,
1542 width, height, 1551 vt_width, vt_height,
1543 0, 1552 0,
1544 pix_colors_focused[Color_fg], 1553 pix_colors_focused[Color_fg],
1545 pix_colors_focused[Color_bg]); 1554 pix_colors_focused[Color_bg]);
1546 1555
1547 attributes.bit_gravity = NorthWestGravity; 1556 attributes.bit_gravity = NorthWestGravity;
… …
1596 if (pty->pty >= 0) 1605 if (pty->pty >= 0)
1597 { 1606 {
1598 if (getfd_hook) 1607 if (getfd_hook)
1599 pty->pty = (*getfd_hook) (pty->pty); 1608 pty->pty = (*getfd_hook) (pty->pty);
1600 1609
1601 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1610 if (pty->pty < 0)
1602 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1611 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1603 } 1612 }
1604 } 1613 }
1605 else 1614 else
1606#endif 1615#endif
1607 if (!pty->get ()) 1616 if (!pty->get ())
1608 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);
1609 1620
1610 struct termios tio = def_tio; 1621 struct termios tio = def_tio;
1611 1622
1612#ifndef NO_BACKSPACE_KEY 1623#ifndef NO_BACKSPACE_KEY
1613 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1624 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1663 1674
1664 _exit (EXIT_FAILURE); 1675 _exit (EXIT_FAILURE);
1665 1676
1666 default: 1677 default:
1667 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
1668 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1685 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1686 }
1669 1687
1670 pty->close_tty (); 1688 pty->close_tty ();
1671 1689
1672 child_ev.start (cmd_pid); 1690 child_ev.start (cmd_pid);
1673 1691
… …
1698#elif defined (SRIOCSREDIR) 1716#elif defined (SRIOCSREDIR)
1699 int fd; 1717 int fd;
1700 1718
1701 fd = open (CONSOLE, O_WRONLY, 0); 1719 fd = open (CONSOLE, O_WRONLY, 0);
1702 if (fd >= 0) 1720 if (fd >= 0)
1703 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1721 {
1722 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1704 close (fd); 1723 close (fd);
1724 }
1705#endif /* SRIOCSREDIR */ 1725#endif /* SRIOCSREDIR */
1706 } 1726 }
1707 1727
1708 /* reset signals and spin off the command interpreter */ 1728 /* reset signals and spin off the command interpreter */
1709 signal (SIGINT, SIG_DFL); 1729 signal (SIGINT, SIG_DFL);

Diff Legend

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