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.301 by mikachu, Sun Nov 13 16:03:31 2011 UTC vs.
Revision 1.325 by sf-exg, Thu May 31 05:53:46 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
… …
78#include <netinet/in.h> 76#include <netinet/in.h>
79#include <arpa/inet.h> 77#include <arpa/inet.h>
80#include <net/if.h> 78#include <net/if.h>
81#include <net/if_arp.h> 79#include <net/if_arp.h>
82 80
83static char * 81static char * ecb_cold
84rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
85{ 83{
86 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
87 struct ifconf ifc; 85 struct ifconf ifc;
88 struct ifreq *ifr; 86 struct ifreq *ifr;
… …
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, **r_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 {
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 572
603 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
604 574
605 /* 575 /*
606 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
607 */ 577 */
608 578
609 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
610 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
611 581
612 get_options (r_argc, r_argv); 582 cmd_argv = get_options (argc, argv);
613 583
614 if (!(display = displays.get (rs[Rs_display_name]))) 584 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]); 585 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
618 }
619 586
620 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
621 xa = display->xa; 588 xa = display->xa;
622 589
623 set (display); 590 set (display);
… …
626#if XFT 593#if XFT
627 if (rs[Rs_depth]) 594 if (rs[Rs_depth])
628 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_depth], 0, 0));
629#endif 596#endif
630 597
631 free (r_argv);
632
633 for (int i = NUM_RESOURCES; i--; ) 598 for (int i = NUM_RESOURCES; i--; )
634 if (rs [i] == resval_undef) 599 if (rs [i] == resval_undef)
635 rs [i] = 0; 600 rs [i] = 0;
636 601
637#if ENABLE_PERL 602#if ENABLE_PERL
… …
644 { 609 {
645 rxvt_perl.init (this); 610 rxvt_perl.init (this);
646 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 611 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
647 } 612 }
648#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 ();
649 618
650 /* 619 /*
651 * set any defaults not already set 620 * set any defaults not already set
652 */ 621 */
653 if (cmd_argv && cmd_argv[0]) 622 if (cmd_argv && cmd_argv[0])
… …
762 return cmd_argv; 731 return cmd_argv;
763} 732}
764 733
765/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
766void 735void
767rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 736rxvt_term::init (stringvec *argv, stringvec *envv)
768{ 737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
769 this->envv = envv; 742 this->envv = envv;
770 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{
771 SET_R (this); 769 SET_R (this);
772 set_locale (""); 770 set_locale ("");
773 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 :(
774 772
775 init_vars (); 773 init_vars ();
… …
793 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
795 793
796 pty = ptytty::create (); 794 pty = ptytty::create ();
797 795
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon 796 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF 797#ifdef HAVE_PIXBUF
805 g_type_init (); 798 g_type_init ();
806#endif 799#endif
807 800
… …
825 if (option (Opt_transparent)) 818 if (option (Opt_transparent))
826 { 819 {
827 bg_set_transparent (); 820 bg_set_transparent ();
828 821
829 if (rs [Rs_blurradius]) 822 if (rs [Rs_blurradius])
830 bg_set_blur (rs [Rs_blurradius]); 823 root_effects.set_blur (rs [Rs_blurradius]);
831 824
832 if (ISSET_PIXCOLOR (Color_tint)) 825 if (ISSET_PIXCOLOR (Color_tint))
833 bg_set_tint (pix_colors_focused [Color_tint]); 826 root_effects.set_tint (pix_colors_focused [Color_tint]);
834 827
835 if (rs [Rs_shade]) 828 if (rs [Rs_shade])
836 bg_set_shade (rs [Rs_shade]); 829 root_effects.set_shade (rs [Rs_shade]);
837 830
838 bg_set_root_pixmap (); 831 bg_set_root_pixmap ();
839 XSelectInput (dpy, display->root, PropertyChangeMask); 832 XSelectInput (dpy, display->root, PropertyChangeMask);
840 rootwin_ev.start (display, display->root); 833 rootwin_ev.start (display, display->root);
841 } 834 }
842#endif 835#endif
843
844#ifdef BG_IMAGE_FROM_FILE
845 if (rs[Rs_backgroundPixmap])
846 {
847 if (bg_set_file (rs[Rs_backgroundPixmap]))
848 if (!bg_window_position_sensitive ())
849 update_background ();
850 }
851#endif
852 } 836 }
853#endif 837#endif
854 838
855#if ENABLE_PERL 839#if ENABLE_PERL
856 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
857#endif 841#endif
858 842
859 set_colorfgbg (); 843 init_done = 1;
860 844
861 init_command (cmd_argv); 845 init_command (cmd_argv);
862
863 free (cmd_argv);
864 846
865 if (pty->pty >= 0) 847 if (pty->pty >= 0)
866 pty_ev.start (pty->pty, ev::READ); 848 pty_ev.start (pty->pty, ev::READ);
867 849
868 HOOK_INVOKE ((this, HOOK_START, DT_END)); 850 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
910/*----------------------------------------------------------------------*/ 892/*----------------------------------------------------------------------*/
911void 893void
912rxvt_term::init_env () 894rxvt_term::init_env ()
913{ 895{
914 char *val; 896 char *val;
897 char *env_display;
898 char *env_windowid;
899 char *env_colorfgbg;
900 char *env_term;
915 901
916#ifdef DISPLAY_IS_IP 902#ifdef DISPLAY_IS_IP
917 /* Fixup display_name for export over pty to any interested terminal 903 /* Fixup display_name for export over pty to any interested terminal
918 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 904 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
919 * (for the first non-loopback interface) that we get from 905 * (for the first non-loopback interface) that we get from
… …
936 922
937 env_display = (char *)rxvt_malloc (strlen (val) + 9); 923 env_display = (char *)rxvt_malloc (strlen (val) + 9);
938 924
939 sprintf (env_display, "DISPLAY=%s", val); 925 sprintf (env_display, "DISPLAY=%s", val);
940 926
927 env_windowid = (char *)rxvt_malloc (21);
941 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 928 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
942 929
943 /* add entries to the environment: 930 /* add entries to the environment:
944 * @ DISPLAY: in case we started with -display 931 * @ DISPLAY: in case we started with -display
945 * @ WINDOWID: X window id number of the window 932 * @ WINDOWID: X window id number of the window
… …
949 * @ COLORFGBG: fg;bg color codes 936 * @ COLORFGBG: fg;bg color codes
950 */ 937 */
951 putenv (env_display); 938 putenv (env_display);
952 putenv (env_windowid); 939 putenv (env_windowid);
953 940
954 if (env_colorfgbg) 941 env_colorfgbg = get_colorfgbg ();
955 putenv (env_colorfgbg); 942 putenv (env_colorfgbg);
956 943
957#ifdef RXVT_TERMINFO 944#ifdef RXVT_TERMINFO
958 putenv ("TERMINFO=" RXVT_TERMINFO); 945 putenv ("TERMINFO=" RXVT_TERMINFO);
959#endif 946#endif
960 947
… …
979 unsetenv ("TERMCAP"); /* terminfo should be okay */ 966 unsetenv ("TERMCAP"); /* terminfo should be okay */
980#endif /* HAVE_UNSETENV */ 967#endif /* HAVE_UNSETENV */
981} 968}
982 969
983/*----------------------------------------------------------------------*/ 970/*----------------------------------------------------------------------*/
984/*
985 * This is more or less stolen straight from XFree86 xterm.
986 * This should support all European type languages.
987 */
988void 971void
989rxvt_term::set_locale (const char *locale) 972rxvt_term::set_locale (const char *locale)
990{ 973{
991 set_environ (envv); 974 set_environ (envv);
992 975
993#if HAVE_XSETLOCALE || HAVE_SETLOCALE
994 free (this->locale); 976 free (this->locale);
995 this->locale = setlocale (LC_CTYPE, locale); 977 this->locale = setlocale (LC_CTYPE, locale);
996 978
997 if (!this->locale) 979 if (!this->locale)
998 { 980 {
… …
1009 991
1010 992
1011 this->locale = strdup (this->locale); 993 this->locale = strdup (this->locale);
1012 SET_LOCALE (this->locale); 994 SET_LOCALE (this->locale);
1013 mbstate.reset (); 995 mbstate.reset ();
1014#endif
1015 996
1016#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
1017 char *codeset = strdup (nl_langinfo (CODESET)); 998 char *codeset = nl_langinfo (CODESET);
1018 // /^UTF.?8/i 999 // /^UTF.?8/i
1019 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1020 && (codeset[1] == 'T' || codeset[1] == 't') 1001 && (codeset[1] == 'T' || codeset[1] == 't')
1021 && (codeset[2] == 'F' || codeset[2] == 'f') 1002 && (codeset[2] == 'F' || codeset[2] == 'f')
1022 && (codeset[3] == '8' || codeset[4] == '8'); 1003 && (codeset[3] == '8' || codeset[4] == '8');
1023 free (codeset);
1024#else 1004#else
1025 enc_utf8 = 0; 1005 enc_utf8 = 0;
1026#endif 1006#endif
1027} 1007}
1028 1008
… …
1031{ 1011{
1032 set_environ (envv); 1012 set_environ (envv);
1033 1013
1034#ifdef USE_XIM 1014#ifdef USE_XIM
1035 if (!locale) 1015 if (!locale)
1036 rxvt_warn ("setting locale failed, working without locale support.\n"); 1016 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1037 else 1017 else
1038 { 1018 {
1039 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1040 1020
1041 if (!XSupportsLocale ()) 1021 if (!XSupportsLocale ())
1042 { 1022 {
1043 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1023 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1044 return; 1024 return;
1045 } 1025 }
1046 1026
1047 im_ev.start (display); 1027 im_ev.start (display);
1048 1028
… …
1197/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
1198/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
1199void 1179void
1200rxvt_term::color_aliases (int idx) 1180rxvt_term::color_aliases (int idx)
1201{ 1181{
1202 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1203 { 1183 {
1204 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
1205 1185
1206 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
1207 /* bright colors */ 1187 /* bright colors */
… …
1302} 1282}
1303 1283
1304void 1284void
1305rxvt_term::set_icon (const char *file) 1285rxvt_term::set_icon (const char *file)
1306{ 1286{
1307#ifdef HAVE_AFTERIMAGE
1308 init_asv ();
1309
1310 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1311 if (!im)
1312 {
1313 rxvt_warn ("Loading image icon failed, continuing without.\n");
1314 return;
1315 }
1316
1317 unsigned int w = im->width;
1318 unsigned int h = im->height;
1319
1320 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1321 {
1322 rxvt_warn ("Icon image too big, continuing without.\n");
1323 destroy_asimage (&im);
1324 return;
1325 }
1326
1327 ASImage *result = scale_asimage (asv, im,
1328 w, h, ASA_ARGB32,
1329 100, ASIMAGE_QUALITY_DEFAULT);
1330 destroy_asimage (&im);
1331
1332 if (!result)
1333 {
1334 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1335 return;
1336 }
1337
1338 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1339 if (buffer)
1340 {
1341 ARGB32 *asbuf = result->alt.argb32;
1342 buffer [0] = w;
1343 buffer [1] = h;
1344
1345 for (unsigned int i = 0; i < w * h; ++i)
1346 buffer [i + 2] = asbuf [i];
1347
1348 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1349 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1350 free (buffer);
1351 }
1352 else
1353 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1354
1355 destroy_asimage (&result);
1356#endif
1357
1358#ifdef HAVE_PIXBUF 1287#ifdef HAVE_PIXBUF
1359 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1360 if (!pixbuf) 1289 if (!pixbuf)
1361 { 1290 {
1362 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1483 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1412 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1484 &attributes); 1413 &attributes);
1485 1414
1486 this->parent = top; 1415 this->parent = top;
1487 1416
1488 old_width = szHint.width;
1489 old_height = szHint.height;
1490
1491 set_title (rs [Rs_title]); 1417 set_title (rs [Rs_title]);
1492 set_icon_name (rs [Rs_iconName]); 1418 set_icon_name (rs [Rs_iconName]);
1493 1419
1494 classHint.res_name = (char *)rs[Rs_name]; 1420 classHint.res_name = (char *)rs[Rs_name];
1495 classHint.res_class = (char *)RESCLASS; 1421 classHint.res_class = (char *)RESCLASS;
… …
1557 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1558 1484
1559 /* the vt window */ 1485 /* the vt window */
1560 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
1561 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
1562 width, height, 1488 vt_width, vt_height,
1563 0, 1489 0,
1564 pix_colors_focused[Color_fg], 1490 pix_colors_focused[Color_fg],
1565 pix_colors_focused[Color_bg]); 1491 pix_colors_focused[Color_bg]);
1566 1492
1567 attributes.bit_gravity = NorthWestGravity; 1493 attributes.bit_gravity = NorthWestGravity;
… …
1616 if (pty->pty >= 0) 1542 if (pty->pty >= 0)
1617 { 1543 {
1618 if (getfd_hook) 1544 if (getfd_hook)
1619 pty->pty = (*getfd_hook) (pty->pty); 1545 pty->pty = (*getfd_hook) (pty->pty);
1620 1546
1621 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1547 if (pty->pty < 0)
1622 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1548 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1623 } 1549 }
1624 } 1550 }
1625 else 1551 else
1626#endif 1552#endif
1627 if (!pty->get ()) 1553 if (!pty->get ())
1628 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1554 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1555
1556 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1629 1557
1630 struct termios tio = def_tio; 1558 struct termios tio = def_tio;
1631 1559
1632#ifndef NO_BACKSPACE_KEY 1560#ifndef NO_BACKSPACE_KEY
1633 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1561 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1683 1611
1684 _exit (EXIT_FAILURE); 1612 _exit (EXIT_FAILURE);
1685 1613
1686 default: 1614 default:
1687 if (!option (Opt_utmpInhibit)) 1615 if (!option (Opt_utmpInhibit))
1616 {
1617#ifdef LOG_ONLY_ON_LOGIN
1618 bool login_shell = option (Opt_loginShell);
1619#else
1620 bool login_shell = true;
1621#endif
1688 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1622 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1623 }
1689 1624
1690 pty->close_tty (); 1625 pty->close_tty ();
1691 1626
1692 child_ev.start (cmd_pid); 1627 child_ev.start (cmd_pid);
1693 1628
… …
1718#elif defined (SRIOCSREDIR) 1653#elif defined (SRIOCSREDIR)
1719 int fd; 1654 int fd;
1720 1655
1721 fd = open (CONSOLE, O_WRONLY, 0); 1656 fd = open (CONSOLE, O_WRONLY, 0);
1722 if (fd >= 0) 1657 if (fd >= 0)
1723 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1658 {
1659 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1724 close (fd); 1660 close (fd);
1661 }
1725#endif /* SRIOCSREDIR */ 1662#endif /* SRIOCSREDIR */
1726 } 1663 }
1727 1664
1728 /* reset signals and spin off the command interpreter */ 1665 /* reset signals and spin off the command interpreter */
1729 signal (SIGINT, SIG_DFL); 1666 signal (SIGINT, SIG_DFL);

Diff Legend

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