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.305 by sf-exg, Tue Dec 6 11:29:52 2011 UTC vs.
Revision 1.328 by root, Thu Jun 7 16:04:31 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; 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 572
596 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
597 574
598 /* 575 /*
599 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
600 */ 577 */
601 578
602 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
603 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
604 581
605 get_options (r_argc, argv); 582 cmd_argv = get_options (argc, argv);
606 583
607 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
608 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]);
609 586
610 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
611 xa = display->xa; 588 xa = display->xa;
612 589
613 set (display); 590 set (display);
614 extract_resources (); 591 extract_resources ();
615 592
616#if XFT 593#if ENABLE_FRILLS
617 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
618 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
619#endif 598#endif
620 599
621 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
622 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
623 rs [i] = 0; 602 rs [i] = 0;
… …
754 return cmd_argv; 733 return cmd_argv;
755} 734}
756 735
757/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
758void 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
759rxvt_term::init (int argc, const char *const *argv) 769rxvt_term::init2 (int argc, const char *const *argv)
760{ 770{
761 SET_R (this); 771 SET_R (this);
762 set_locale (""); 772 set_locale ("");
763 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 :(
764 774
… …
783 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
784 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
785 795
786 pty = ptytty::create (); 796 pty = ptytty::create ();
787 797
788#ifdef HAVE_AFTERIMAGE
789 set_application_name ((char *)rs[Rs_name]);
790 set_output_threshold (OUTPUT_LEVEL_WARNING);
791#endif
792
793 // must be called before create_windows, because the latter may call set_icon
794#ifdef HAVE_PIXBUF
795 g_type_init ();
796#endif
797
798 create_windows (argc, argv); 798 create_windows (argc, argv);
799 799
800 init_xlocale (); 800 init_xlocale ();
801 801
802 scr_poweron (); // initialize screen 802 scr_poweron (); // initialize screen
… …
809 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
810#ifdef HAVE_BG_PIXMAP 810#ifdef HAVE_BG_PIXMAP
811 { 811 {
812 bg_init (); 812 bg_init ();
813 813
814#ifdef ENABLE_TRANSPARENCY 814#if ENABLE_TRANSPARENCY
815 if (option (Opt_transparent)) 815 if (option (Opt_transparent))
816 { 816 {
817 bg_set_transparent (); 817 bg_set_transparent ();
818 818
819 if (rs [Rs_blurradius]) 819 if (rs [Rs_blurradius])
820 bg_set_blur (rs [Rs_blurradius]); 820 root_effects.set_blur (rs [Rs_blurradius]);
821 821
822 if (ISSET_PIXCOLOR (Color_tint)) 822 if (ISSET_PIXCOLOR (Color_tint))
823 bg_set_tint (pix_colors_focused [Color_tint]); 823 root_effects.set_tint (pix_colors_focused [Color_tint]);
824 824
825 if (rs [Rs_shade]) 825 if (rs [Rs_shade])
826 bg_set_shade (rs [Rs_shade]); 826 root_effects.set_shade (rs [Rs_shade]);
827 827
828 bg_set_root_pixmap (); 828 bg_set_root_pixmap ();
829 XSelectInput (dpy, display->root, PropertyChangeMask); 829 XSelectInput (dpy, display->root, PropertyChangeMask);
830 rootwin_ev.start (display, display->root); 830 rootwin_ev.start (display, display->root);
831 } 831 }
832#endif 832#endif
833
834#ifdef BG_IMAGE_FROM_FILE
835 if (rs[Rs_backgroundPixmap])
836 {
837 if (bg_set_file (rs[Rs_backgroundPixmap]))
838 if (!bg_window_position_sensitive ())
839 update_background ();
840 }
841#endif
842 } 833 }
843#endif 834#endif
844 835
845#if ENABLE_PERL 836#if ENABLE_PERL
846 rootwin_ev.start (display, display->root); 837 rootwin_ev.start (display, display->root);
847#endif 838#endif
848 839
849 set_colorfgbg (); 840 init_done = 1;
850 841
851 init_command (cmd_argv); 842 init_command (cmd_argv);
852
853 free (cmd_argv);
854 843
855 if (pty->pty >= 0) 844 if (pty->pty >= 0)
856 pty_ev.start (pty->pty, ev::READ); 845 pty_ev.start (pty->pty, ev::READ);
857 846
858 HOOK_INVOKE ((this, HOOK_START, DT_END)); 847 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
900/*----------------------------------------------------------------------*/ 889/*----------------------------------------------------------------------*/
901void 890void
902rxvt_term::init_env () 891rxvt_term::init_env ()
903{ 892{
904 char *val; 893 char *val;
894 char *env_display;
895 char *env_windowid;
896 char *env_colorfgbg;
897 char *env_term;
905 898
906#ifdef DISPLAY_IS_IP 899#ifdef DISPLAY_IS_IP
907 /* Fixup display_name for export over pty to any interested terminal 900 /* Fixup display_name for export over pty to any interested terminal
908 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 901 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
909 * (for the first non-loopback interface) that we get from 902 * (for the first non-loopback interface) that we get from
… …
926 919
927 env_display = (char *)rxvt_malloc (strlen (val) + 9); 920 env_display = (char *)rxvt_malloc (strlen (val) + 9);
928 921
929 sprintf (env_display, "DISPLAY=%s", val); 922 sprintf (env_display, "DISPLAY=%s", val);
930 923
924 env_windowid = (char *)rxvt_malloc (21);
931 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 925 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
932 926
933 /* add entries to the environment: 927 /* add entries to the environment:
934 * @ DISPLAY: in case we started with -display 928 * @ DISPLAY: in case we started with -display
935 * @ WINDOWID: X window id number of the window 929 * @ WINDOWID: X window id number of the window
… …
939 * @ COLORFGBG: fg;bg color codes 933 * @ COLORFGBG: fg;bg color codes
940 */ 934 */
941 putenv (env_display); 935 putenv (env_display);
942 putenv (env_windowid); 936 putenv (env_windowid);
943 937
944 if (env_colorfgbg) 938 env_colorfgbg = get_colorfgbg ();
945 putenv (env_colorfgbg); 939 putenv (env_colorfgbg);
946 940
947#ifdef RXVT_TERMINFO 941#ifdef RXVT_TERMINFO
948 putenv ("TERMINFO=" RXVT_TERMINFO); 942 putenv ("TERMINFO=" RXVT_TERMINFO);
949#endif 943#endif
950 944
… …
969 unsetenv ("TERMCAP"); /* terminfo should be okay */ 963 unsetenv ("TERMCAP"); /* terminfo should be okay */
970#endif /* HAVE_UNSETENV */ 964#endif /* HAVE_UNSETENV */
971} 965}
972 966
973/*----------------------------------------------------------------------*/ 967/*----------------------------------------------------------------------*/
974/*
975 * This is more or less stolen straight from XFree86 xterm.
976 * This should support all European type languages.
977 */
978void 968void
979rxvt_term::set_locale (const char *locale) 969rxvt_term::set_locale (const char *locale)
980{ 970{
981 set_environ (envv); 971 set_environ (envv);
982 972
983#if HAVE_XSETLOCALE || HAVE_SETLOCALE
984 free (this->locale); 973 free (this->locale);
985 this->locale = setlocale (LC_CTYPE, locale); 974 this->locale = setlocale (LC_CTYPE, locale);
986 975
987 if (!this->locale) 976 if (!this->locale)
988 { 977 {
… …
999 988
1000 989
1001 this->locale = strdup (this->locale); 990 this->locale = strdup (this->locale);
1002 SET_LOCALE (this->locale); 991 SET_LOCALE (this->locale);
1003 mbstate.reset (); 992 mbstate.reset ();
1004#endif
1005 993
1006#if HAVE_NL_LANGINFO 994#if HAVE_NL_LANGINFO
1007 char *codeset = strdup (nl_langinfo (CODESET)); 995 char *codeset = nl_langinfo (CODESET);
1008 // /^UTF.?8/i 996 // /^UTF.?8/i
1009 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 997 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1010 && (codeset[1] == 'T' || codeset[1] == 't') 998 && (codeset[1] == 'T' || codeset[1] == 't')
1011 && (codeset[2] == 'F' || codeset[2] == 'f') 999 && (codeset[2] == 'F' || codeset[2] == 'f')
1012 && (codeset[3] == '8' || codeset[4] == '8'); 1000 && (codeset[3] == '8' || codeset[4] == '8');
1013 free (codeset);
1014#else 1001#else
1015 enc_utf8 = 0; 1002 enc_utf8 = 0;
1016#endif 1003#endif
1017} 1004}
1018 1005
1019void 1006void
1020rxvt_term::init_xlocale () 1007rxvt_term::init_xlocale ()
1021{ 1008{
1022 set_environ (envv); 1009 set_environ (envv);
1023 1010
1024#ifdef USE_XIM 1011#if USE_XIM
1025 if (!locale) 1012 if (!locale)
1026 rxvt_warn ("setting locale failed, working without locale support.\n"); 1013 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1027 else 1014 else
1028 { 1015 {
1029 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1016 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1030 1017
1031 if (!XSupportsLocale ()) 1018 if (!XSupportsLocale ())
1032 { 1019 {
1033 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1020 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1034 return; 1021 return;
1035 } 1022 }
1036 1023
1037 im_ev.start (display); 1024 im_ev.start (display);
1038 1025
… …
1187/*----------------------------------------------------------------------*/ 1174/*----------------------------------------------------------------------*/
1188/* color aliases, fg/bg bright-bold */ 1175/* color aliases, fg/bg bright-bold */
1189void 1176void
1190rxvt_term::color_aliases (int idx) 1177rxvt_term::color_aliases (int idx)
1191{ 1178{
1192 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1179 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1193 { 1180 {
1194 int i = atoi (rs[Rs_color + idx]); 1181 int i = atoi (rs[Rs_color + idx]);
1195 1182
1196 if (i >= 8 && i <= 15) 1183 if (i >= 8 && i <= 15)
1197 /* bright colors */ 1184 /* bright colors */
… …
1292} 1279}
1293 1280
1294void 1281void
1295rxvt_term::set_icon (const char *file) 1282rxvt_term::set_icon (const char *file)
1296{ 1283{
1297#ifdef HAVE_AFTERIMAGE
1298 init_asv ();
1299
1300 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1301 if (!im)
1302 {
1303 rxvt_warn ("Loading image icon failed, continuing without.\n");
1304 return;
1305 }
1306
1307 unsigned int w = im->width;
1308 unsigned int h = im->height;
1309
1310 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1311 {
1312 rxvt_warn ("Icon image too big, continuing without.\n");
1313 destroy_asimage (&im);
1314 return;
1315 }
1316
1317 ASImage *result = scale_asimage (asv, im,
1318 w, h, ASA_ARGB32,
1319 100, ASIMAGE_QUALITY_DEFAULT);
1320 destroy_asimage (&im);
1321
1322 if (!result)
1323 {
1324 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1325 return;
1326 }
1327
1328 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1329 if (buffer)
1330 {
1331 ARGB32 *asbuf = result->alt.argb32;
1332 buffer [0] = w;
1333 buffer [1] = h;
1334
1335 for (unsigned int i = 0; i < w * h; ++i)
1336 buffer [i + 2] = asbuf [i];
1337
1338 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1339 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1340 free (buffer);
1341 }
1342 else
1343 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1344
1345 destroy_asimage (&result);
1346#endif
1347
1348#ifdef HAVE_PIXBUF 1284#if HAVE_PIXBUF
1349 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1285 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1350 if (!pixbuf) 1286 if (!pixbuf)
1351 { 1287 {
1352 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1288 rxvt_warn ("Loading image icon failed, continuing without.\n");
1353 return; 1289 return;
… …
1473 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1409 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1474 &attributes); 1410 &attributes);
1475 1411
1476 this->parent = top; 1412 this->parent = top;
1477 1413
1478 old_width = szHint.width;
1479 old_height = szHint.height;
1480
1481 set_title (rs [Rs_title]); 1414 set_title (rs [Rs_title]);
1482 set_icon_name (rs [Rs_iconName]); 1415 set_icon_name (rs [Rs_iconName]);
1483 1416
1484 classHint.res_name = (char *)rs[Rs_name]; 1417 classHint.res_name = (char *)rs[Rs_name];
1485 classHint.res_class = (char *)RESCLASS; 1418 classHint.res_class = (char *)RESCLASS;
… …
1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1480 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1548 1481
1549 /* the vt window */ 1482 /* the vt window */
1550 vt = XCreateSimpleWindow (dpy, top, 1483 vt = XCreateSimpleWindow (dpy, top,
1551 window_vt_x, window_vt_y, 1484 window_vt_x, window_vt_y,
1552 width, height, 1485 vt_width, vt_height,
1553 0, 1486 0,
1554 pix_colors_focused[Color_fg], 1487 pix_colors_focused[Color_fg],
1555 pix_colors_focused[Color_bg]); 1488 pix_colors_focused[Color_bg]);
1556 1489
1557 attributes.bit_gravity = NorthWestGravity; 1490 attributes.bit_gravity = NorthWestGravity;
… …
1606 if (pty->pty >= 0) 1539 if (pty->pty >= 0)
1607 { 1540 {
1608 if (getfd_hook) 1541 if (getfd_hook)
1609 pty->pty = (*getfd_hook) (pty->pty); 1542 pty->pty = (*getfd_hook) (pty->pty);
1610 1543
1611 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1544 if (pty->pty < 0)
1612 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1545 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1613 } 1546 }
1614 } 1547 }
1615 else 1548 else
1616#endif 1549#endif
1617 if (!pty->get ()) 1550 if (!pty->get ())
1618 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1551 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1552
1553 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1619 1554
1620 struct termios tio = def_tio; 1555 struct termios tio = def_tio;
1621 1556
1622#ifndef NO_BACKSPACE_KEY 1557#ifndef NO_BACKSPACE_KEY
1623 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1558 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1673 1608
1674 _exit (EXIT_FAILURE); 1609 _exit (EXIT_FAILURE);
1675 1610
1676 default: 1611 default:
1677 if (!option (Opt_utmpInhibit)) 1612 if (!option (Opt_utmpInhibit))
1613 {
1614#ifdef LOG_ONLY_ON_LOGIN
1615 bool login_shell = option (Opt_loginShell);
1616#else
1617 bool login_shell = true;
1618#endif
1678 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1619 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1620 }
1679 1621
1680 pty->close_tty (); 1622 pty->close_tty ();
1681 1623
1682 child_ev.start (cmd_pid); 1624 child_ev.start (cmd_pid);
1683 1625
… …
1708#elif defined (SRIOCSREDIR) 1650#elif defined (SRIOCSREDIR)
1709 int fd; 1651 int fd;
1710 1652
1711 fd = open (CONSOLE, O_WRONLY, 0); 1653 fd = open (CONSOLE, O_WRONLY, 0);
1712 if (fd >= 0) 1654 if (fd >= 0)
1713 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1655 {
1656 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1714 close (fd); 1657 close (fd);
1658 }
1715#endif /* SRIOCSREDIR */ 1659#endif /* SRIOCSREDIR */
1716 } 1660 }
1717 1661
1718 /* reset signals and spin off the command interpreter */ 1662 /* reset signals and spin off the command interpreter */
1719 signal (SIGINT, SIG_DFL); 1663 signal (SIGINT, SIG_DFL);

Diff Legend

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