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.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; 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
… …
754 return cmd_argv; 731 return cmd_argv;
755} 732}
756 733
757/*----------------------------------------------------------------------*/ 734/*----------------------------------------------------------------------*/
758void 735void
736rxvt_term::init (stringvec *argv, stringvec *envv)
737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
742 this->envv = envv;
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
759rxvt_term::init (int argc, const char *const *argv) 767rxvt_term::init2 (int argc, const char *const *argv)
760{ 768{
761 SET_R (this); 769 SET_R (this);
762 set_locale (""); 770 set_locale ("");
763 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 :(
764 772
… …
783 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
784 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
785 793
786 pty = ptytty::create (); 794 pty = ptytty::create ();
787 795
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 796 // must be called before create_windows, because the latter may call set_icon
794#ifdef HAVE_PIXBUF 797#ifdef HAVE_PIXBUF
795 g_type_init (); 798 g_type_init ();
796#endif 799#endif
797 800
… …
815 if (option (Opt_transparent)) 818 if (option (Opt_transparent))
816 { 819 {
817 bg_set_transparent (); 820 bg_set_transparent ();
818 821
819 if (rs [Rs_blurradius]) 822 if (rs [Rs_blurradius])
820 bg_set_blur (rs [Rs_blurradius]); 823 root_effects.set_blur (rs [Rs_blurradius]);
821 824
822 if (ISSET_PIXCOLOR (Color_tint)) 825 if (ISSET_PIXCOLOR (Color_tint))
823 bg_set_tint (pix_colors_focused [Color_tint]); 826 root_effects.set_tint (pix_colors_focused [Color_tint]);
824 827
825 if (rs [Rs_shade]) 828 if (rs [Rs_shade])
826 bg_set_shade (rs [Rs_shade]); 829 root_effects.set_shade (rs [Rs_shade]);
827 830
828 bg_set_root_pixmap (); 831 bg_set_root_pixmap ();
829 XSelectInput (dpy, display->root, PropertyChangeMask); 832 XSelectInput (dpy, display->root, PropertyChangeMask);
830 rootwin_ev.start (display, display->root); 833 rootwin_ev.start (display, display->root);
831 } 834 }
832#endif 835#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 } 836 }
843#endif 837#endif
844 838
845#if ENABLE_PERL 839#if ENABLE_PERL
846 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
847#endif 841#endif
848 842
849 set_colorfgbg (); 843 init_done = 1;
850 844
851 init_command (cmd_argv); 845 init_command (cmd_argv);
852
853 free (cmd_argv);
854 846
855 if (pty->pty >= 0) 847 if (pty->pty >= 0)
856 pty_ev.start (pty->pty, ev::READ); 848 pty_ev.start (pty->pty, ev::READ);
857 849
858 HOOK_INVOKE ((this, HOOK_START, DT_END)); 850 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
900/*----------------------------------------------------------------------*/ 892/*----------------------------------------------------------------------*/
901void 893void
902rxvt_term::init_env () 894rxvt_term::init_env ()
903{ 895{
904 char *val; 896 char *val;
897 char *env_display;
898 char *env_windowid;
899 char *env_colorfgbg;
900 char *env_term;
905 901
906#ifdef DISPLAY_IS_IP 902#ifdef DISPLAY_IS_IP
907 /* Fixup display_name for export over pty to any interested terminal 903 /* 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 904 * 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 905 * (for the first non-loopback interface) that we get from
… …
926 922
927 env_display = (char *)rxvt_malloc (strlen (val) + 9); 923 env_display = (char *)rxvt_malloc (strlen (val) + 9);
928 924
929 sprintf (env_display, "DISPLAY=%s", val); 925 sprintf (env_display, "DISPLAY=%s", val);
930 926
927 env_windowid = (char *)rxvt_malloc (21);
931 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 928 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
932 929
933 /* add entries to the environment: 930 /* add entries to the environment:
934 * @ DISPLAY: in case we started with -display 931 * @ DISPLAY: in case we started with -display
935 * @ WINDOWID: X window id number of the window 932 * @ WINDOWID: X window id number of the window
… …
939 * @ COLORFGBG: fg;bg color codes 936 * @ COLORFGBG: fg;bg color codes
940 */ 937 */
941 putenv (env_display); 938 putenv (env_display);
942 putenv (env_windowid); 939 putenv (env_windowid);
943 940
944 if (env_colorfgbg) 941 env_colorfgbg = get_colorfgbg ();
945 putenv (env_colorfgbg); 942 putenv (env_colorfgbg);
946 943
947#ifdef RXVT_TERMINFO 944#ifdef RXVT_TERMINFO
948 putenv ("TERMINFO=" RXVT_TERMINFO); 945 putenv ("TERMINFO=" RXVT_TERMINFO);
949#endif 946#endif
950 947
… …
969 unsetenv ("TERMCAP"); /* terminfo should be okay */ 966 unsetenv ("TERMCAP"); /* terminfo should be okay */
970#endif /* HAVE_UNSETENV */ 967#endif /* HAVE_UNSETENV */
971} 968}
972 969
973/*----------------------------------------------------------------------*/ 970/*----------------------------------------------------------------------*/
974/*
975 * This is more or less stolen straight from XFree86 xterm.
976 * This should support all European type languages.
977 */
978void 971void
979rxvt_term::set_locale (const char *locale) 972rxvt_term::set_locale (const char *locale)
980{ 973{
981 set_environ (envv); 974 set_environ (envv);
982 975
983#if HAVE_XSETLOCALE || HAVE_SETLOCALE
984 free (this->locale); 976 free (this->locale);
985 this->locale = setlocale (LC_CTYPE, locale); 977 this->locale = setlocale (LC_CTYPE, locale);
986 978
987 if (!this->locale) 979 if (!this->locale)
988 { 980 {
… …
999 991
1000 992
1001 this->locale = strdup (this->locale); 993 this->locale = strdup (this->locale);
1002 SET_LOCALE (this->locale); 994 SET_LOCALE (this->locale);
1003 mbstate.reset (); 995 mbstate.reset ();
1004#endif
1005 996
1006#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
1007 char *codeset = strdup (nl_langinfo (CODESET)); 998 char *codeset = nl_langinfo (CODESET);
1008 // /^UTF.?8/i 999 // /^UTF.?8/i
1009 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1010 && (codeset[1] == 'T' || codeset[1] == 't') 1001 && (codeset[1] == 'T' || codeset[1] == 't')
1011 && (codeset[2] == 'F' || codeset[2] == 'f') 1002 && (codeset[2] == 'F' || codeset[2] == 'f')
1012 && (codeset[3] == '8' || codeset[4] == '8'); 1003 && (codeset[3] == '8' || codeset[4] == '8');
1013 free (codeset);
1014#else 1004#else
1015 enc_utf8 = 0; 1005 enc_utf8 = 0;
1016#endif 1006#endif
1017} 1007}
1018 1008
… …
1021{ 1011{
1022 set_environ (envv); 1012 set_environ (envv);
1023 1013
1024#ifdef USE_XIM 1014#ifdef USE_XIM
1025 if (!locale) 1015 if (!locale)
1026 rxvt_warn ("setting locale failed, working without locale support.\n"); 1016 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1027 else 1017 else
1028 { 1018 {
1029 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1030 1020
1031 if (!XSupportsLocale ()) 1021 if (!XSupportsLocale ())
1032 { 1022 {
1033 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");
1034 return; 1024 return;
1035 } 1025 }
1036 1026
1037 im_ev.start (display); 1027 im_ev.start (display);
1038 1028
… …
1187/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
1188/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
1189void 1179void
1190rxvt_term::color_aliases (int idx) 1180rxvt_term::color_aliases (int idx)
1191{ 1181{
1192 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1193 { 1183 {
1194 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
1195 1185
1196 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
1197 /* bright colors */ 1187 /* bright colors */
… …
1292} 1282}
1293 1283
1294void 1284void
1295rxvt_term::set_icon (const char *file) 1285rxvt_term::set_icon (const char *file)
1296{ 1286{
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 1287#ifdef HAVE_PIXBUF
1349 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1350 if (!pixbuf) 1289 if (!pixbuf)
1351 { 1290 {
1352 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1473 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1412 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1474 &attributes); 1413 &attributes);
1475 1414
1476 this->parent = top; 1415 this->parent = top;
1477 1416
1478 old_width = szHint.width;
1479 old_height = szHint.height;
1480
1481 set_title (rs [Rs_title]); 1417 set_title (rs [Rs_title]);
1482 set_icon_name (rs [Rs_iconName]); 1418 set_icon_name (rs [Rs_iconName]);
1483 1419
1484 classHint.res_name = (char *)rs[Rs_name]; 1420 classHint.res_name = (char *)rs[Rs_name];
1485 classHint.res_class = (char *)RESCLASS; 1421 classHint.res_class = (char *)RESCLASS;
… …
1547 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1548 1484
1549 /* the vt window */ 1485 /* the vt window */
1550 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
1551 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
1552 width, height, 1488 vt_width, vt_height,
1553 0, 1489 0,
1554 pix_colors_focused[Color_fg], 1490 pix_colors_focused[Color_fg],
1555 pix_colors_focused[Color_bg]); 1491 pix_colors_focused[Color_bg]);
1556 1492
1557 attributes.bit_gravity = NorthWestGravity; 1493 attributes.bit_gravity = NorthWestGravity;
… …
1606 if (pty->pty >= 0) 1542 if (pty->pty >= 0)
1607 { 1543 {
1608 if (getfd_hook) 1544 if (getfd_hook)
1609 pty->pty = (*getfd_hook) (pty->pty); 1545 pty->pty = (*getfd_hook) (pty->pty);
1610 1546
1611 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1547 if (pty->pty < 0)
1612 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1548 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1613 } 1549 }
1614 } 1550 }
1615 else 1551 else
1616#endif 1552#endif
1617 if (!pty->get ()) 1553 if (!pty->get ())
1618 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);
1619 1557
1620 struct termios tio = def_tio; 1558 struct termios tio = def_tio;
1621 1559
1622#ifndef NO_BACKSPACE_KEY 1560#ifndef NO_BACKSPACE_KEY
1623 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1561 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1673 1611
1674 _exit (EXIT_FAILURE); 1612 _exit (EXIT_FAILURE);
1675 1613
1676 default: 1614 default:
1677 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
1678 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1622 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1623 }
1679 1624
1680 pty->close_tty (); 1625 pty->close_tty ();
1681 1626
1682 child_ev.start (cmd_pid); 1627 child_ev.start (cmd_pid);
1683 1628
… …
1708#elif defined (SRIOCSREDIR) 1653#elif defined (SRIOCSREDIR)
1709 int fd; 1654 int fd;
1710 1655
1711 fd = open (CONSOLE, O_WRONLY, 0); 1656 fd = open (CONSOLE, O_WRONLY, 0);
1712 if (fd >= 0) 1657 if (fd >= 0)
1713 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1658 {
1659 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1714 close (fd); 1660 close (fd);
1661 }
1715#endif /* SRIOCSREDIR */ 1662#endif /* SRIOCSREDIR */
1716 } 1663 }
1717 1664
1718 /* reset signals and spin off the command interpreter */ 1665 /* reset signals and spin off the command interpreter */
1719 signal (SIGINT, SIG_DFL); 1666 signal (SIGINT, SIG_DFL);

Diff Legend

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