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.304 by sf-exg, Tue Dec 6 10:27:15 2011 UTC vs.
Revision 1.323 by sf-exg, Fri May 25 08:27:47 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
… …
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
759rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 736rxvt_term::init (stringvec *argv, stringvec *envv)
760{ 737{
738 argv->push_back (0);
739 envv->push_back (0);
740
741 this->argv = argv;
761 this->envv = envv; 742 this->envv = envv;
762 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{
763 SET_R (this); 769 SET_R (this);
764 set_locale (""); 770 set_locale ("");
765 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 :(
766 772
767 init_vars (); 773 init_vars ();
… …
785 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
786 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
787 793
788 pty = ptytty::create (); 794 pty = ptytty::create ();
789 795
790#ifdef HAVE_AFTERIMAGE
791 set_application_name ((char *)rs[Rs_name]);
792 set_output_threshold (OUTPUT_LEVEL_WARNING);
793#endif
794
795 // 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
796#ifdef HAVE_PIXBUF 797#ifdef HAVE_PIXBUF
797 g_type_init (); 798 g_type_init ();
798#endif 799#endif
799 800
… …
830 bg_set_root_pixmap (); 831 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask); 832 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root); 833 rootwin_ev.start (display, display->root);
833 } 834 }
834#endif 835#endif
835
836#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap])
838 {
839 if (bg_set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ())
841 update_background ();
842 }
843#endif
844 } 836 }
845#endif 837#endif
846 838
847#if ENABLE_PERL 839#if ENABLE_PERL
848 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
849#endif 841#endif
850 842
851 set_colorfgbg (); 843 init_done = 1;
852 844
853 init_command (cmd_argv); 845 init_command (cmd_argv);
854
855 free (cmd_argv);
856 846
857 if (pty->pty >= 0) 847 if (pty->pty >= 0)
858 pty_ev.start (pty->pty, ev::READ); 848 pty_ev.start (pty->pty, ev::READ);
859 849
860 HOOK_INVOKE ((this, HOOK_START, DT_END)); 850 HOOK_INVOKE ((this, HOOK_START, DT_END));
… …
902/*----------------------------------------------------------------------*/ 892/*----------------------------------------------------------------------*/
903void 893void
904rxvt_term::init_env () 894rxvt_term::init_env ()
905{ 895{
906 char *val; 896 char *val;
897 char *env_display;
898 char *env_windowid;
899 char *env_colorfgbg;
900 char *env_term;
907 901
908#ifdef DISPLAY_IS_IP 902#ifdef DISPLAY_IS_IP
909 /* Fixup display_name for export over pty to any interested terminal 903 /* Fixup display_name for export over pty to any interested terminal
910 * 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
911 * (for the first non-loopback interface) that we get from 905 * (for the first non-loopback interface) that we get from
… …
928 922
929 env_display = (char *)rxvt_malloc (strlen (val) + 9); 923 env_display = (char *)rxvt_malloc (strlen (val) + 9);
930 924
931 sprintf (env_display, "DISPLAY=%s", val); 925 sprintf (env_display, "DISPLAY=%s", val);
932 926
927 env_windowid = (char *)rxvt_malloc (21);
933 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 928 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
934 929
935 /* add entries to the environment: 930 /* add entries to the environment:
936 * @ DISPLAY: in case we started with -display 931 * @ DISPLAY: in case we started with -display
937 * @ WINDOWID: X window id number of the window 932 * @ WINDOWID: X window id number of the window
… …
941 * @ COLORFGBG: fg;bg color codes 936 * @ COLORFGBG: fg;bg color codes
942 */ 937 */
943 putenv (env_display); 938 putenv (env_display);
944 putenv (env_windowid); 939 putenv (env_windowid);
945 940
946 if (env_colorfgbg) 941 env_colorfgbg = get_colorfgbg ();
947 putenv (env_colorfgbg); 942 putenv (env_colorfgbg);
948 943
949#ifdef RXVT_TERMINFO 944#ifdef RXVT_TERMINFO
950 putenv ("TERMINFO=" RXVT_TERMINFO); 945 putenv ("TERMINFO=" RXVT_TERMINFO);
951#endif 946#endif
952 947
… …
971 unsetenv ("TERMCAP"); /* terminfo should be okay */ 966 unsetenv ("TERMCAP"); /* terminfo should be okay */
972#endif /* HAVE_UNSETENV */ 967#endif /* HAVE_UNSETENV */
973} 968}
974 969
975/*----------------------------------------------------------------------*/ 970/*----------------------------------------------------------------------*/
976/*
977 * This is more or less stolen straight from XFree86 xterm.
978 * This should support all European type languages.
979 */
980void 971void
981rxvt_term::set_locale (const char *locale) 972rxvt_term::set_locale (const char *locale)
982{ 973{
983 set_environ (envv); 974 set_environ (envv);
984 975
985#if HAVE_XSETLOCALE || HAVE_SETLOCALE
986 free (this->locale); 976 free (this->locale);
987 this->locale = setlocale (LC_CTYPE, locale); 977 this->locale = setlocale (LC_CTYPE, locale);
988 978
989 if (!this->locale) 979 if (!this->locale)
990 { 980 {
… …
1001 991
1002 992
1003 this->locale = strdup (this->locale); 993 this->locale = strdup (this->locale);
1004 SET_LOCALE (this->locale); 994 SET_LOCALE (this->locale);
1005 mbstate.reset (); 995 mbstate.reset ();
1006#endif
1007 996
1008#if HAVE_NL_LANGINFO 997#if HAVE_NL_LANGINFO
1009 char *codeset = strdup (nl_langinfo (CODESET)); 998 char *codeset = nl_langinfo (CODESET);
1010 // /^UTF.?8/i 999 // /^UTF.?8/i
1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1012 && (codeset[1] == 'T' || codeset[1] == 't') 1001 && (codeset[1] == 'T' || codeset[1] == 't')
1013 && (codeset[2] == 'F' || codeset[2] == 'f') 1002 && (codeset[2] == 'F' || codeset[2] == 'f')
1014 && (codeset[3] == '8' || codeset[4] == '8'); 1003 && (codeset[3] == '8' || codeset[4] == '8');
1015 free (codeset);
1016#else 1004#else
1017 enc_utf8 = 0; 1005 enc_utf8 = 0;
1018#endif 1006#endif
1019} 1007}
1020 1008
… …
1023{ 1011{
1024 set_environ (envv); 1012 set_environ (envv);
1025 1013
1026#ifdef USE_XIM 1014#ifdef USE_XIM
1027 if (!locale) 1015 if (!locale)
1028 rxvt_warn ("setting locale failed, working without locale support.\n"); 1016 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1029 else 1017 else
1030 { 1018 {
1031 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1032 1020
1033 if (!XSupportsLocale ()) 1021 if (!XSupportsLocale ())
1034 { 1022 {
1035 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");
1036 return; 1024 return;
1037 } 1025 }
1038 1026
1039 im_ev.start (display); 1027 im_ev.start (display);
1040 1028
… …
1189/*----------------------------------------------------------------------*/ 1177/*----------------------------------------------------------------------*/
1190/* color aliases, fg/bg bright-bold */ 1178/* color aliases, fg/bg bright-bold */
1191void 1179void
1192rxvt_term::color_aliases (int idx) 1180rxvt_term::color_aliases (int idx)
1193{ 1181{
1194 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1182 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1195 { 1183 {
1196 int i = atoi (rs[Rs_color + idx]); 1184 int i = atoi (rs[Rs_color + idx]);
1197 1185
1198 if (i >= 8 && i <= 15) 1186 if (i >= 8 && i <= 15)
1199 /* bright colors */ 1187 /* bright colors */
… …
1294} 1282}
1295 1283
1296void 1284void
1297rxvt_term::set_icon (const char *file) 1285rxvt_term::set_icon (const char *file)
1298{ 1286{
1299#ifdef HAVE_AFTERIMAGE
1300 init_asv ();
1301
1302 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1303 if (!im)
1304 {
1305 rxvt_warn ("Loading image icon failed, continuing without.\n");
1306 return;
1307 }
1308
1309 unsigned int w = im->width;
1310 unsigned int h = im->height;
1311
1312 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1313 {
1314 rxvt_warn ("Icon image too big, continuing without.\n");
1315 destroy_asimage (&im);
1316 return;
1317 }
1318
1319 ASImage *result = scale_asimage (asv, im,
1320 w, h, ASA_ARGB32,
1321 100, ASIMAGE_QUALITY_DEFAULT);
1322 destroy_asimage (&im);
1323
1324 if (!result)
1325 {
1326 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1327 return;
1328 }
1329
1330 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1331 if (buffer)
1332 {
1333 ARGB32 *asbuf = result->alt.argb32;
1334 buffer [0] = w;
1335 buffer [1] = h;
1336
1337 for (unsigned int i = 0; i < w * h; ++i)
1338 buffer [i + 2] = asbuf [i];
1339
1340 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1341 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1342 free (buffer);
1343 }
1344 else
1345 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1346
1347 destroy_asimage (&result);
1348#endif
1349
1350#ifdef HAVE_PIXBUF 1287#ifdef HAVE_PIXBUF
1351 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1352 if (!pixbuf) 1289 if (!pixbuf)
1353 { 1290 {
1354 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1291 rxvt_warn ("Loading image icon failed, continuing without.\n");
… …
1475 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1412 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1476 &attributes); 1413 &attributes);
1477 1414
1478 this->parent = top; 1415 this->parent = top;
1479 1416
1480 old_width = szHint.width;
1481 old_height = szHint.height;
1482
1483 set_title (rs [Rs_title]); 1417 set_title (rs [Rs_title]);
1484 set_icon_name (rs [Rs_iconName]); 1418 set_icon_name (rs [Rs_iconName]);
1485 1419
1486 classHint.res_name = (char *)rs[Rs_name]; 1420 classHint.res_name = (char *)rs[Rs_name];
1487 classHint.res_class = (char *)RESCLASS; 1421 classHint.res_class = (char *)RESCLASS;
… …
1549 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1483 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1550 1484
1551 /* the vt window */ 1485 /* the vt window */
1552 vt = XCreateSimpleWindow (dpy, top, 1486 vt = XCreateSimpleWindow (dpy, top,
1553 window_vt_x, window_vt_y, 1487 window_vt_x, window_vt_y,
1554 width, height, 1488 vt_width, vt_height,
1555 0, 1489 0,
1556 pix_colors_focused[Color_fg], 1490 pix_colors_focused[Color_fg],
1557 pix_colors_focused[Color_bg]); 1491 pix_colors_focused[Color_bg]);
1558 1492
1559 attributes.bit_gravity = NorthWestGravity; 1493 attributes.bit_gravity = NorthWestGravity;
… …
1608 if (pty->pty >= 0) 1542 if (pty->pty >= 0)
1609 { 1543 {
1610 if (getfd_hook) 1544 if (getfd_hook)
1611 pty->pty = (*getfd_hook) (pty->pty); 1545 pty->pty = (*getfd_hook) (pty->pty);
1612 1546
1613 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1547 if (pty->pty < 0)
1614 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1548 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1615 } 1549 }
1616 } 1550 }
1617 else 1551 else
1618#endif 1552#endif
1619 if (!pty->get ()) 1553 if (!pty->get ())
1620 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);
1621 1557
1622 struct termios tio = def_tio; 1558 struct termios tio = def_tio;
1623 1559
1624#ifndef NO_BACKSPACE_KEY 1560#ifndef NO_BACKSPACE_KEY
1625 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1561 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1675 1611
1676 _exit (EXIT_FAILURE); 1612 _exit (EXIT_FAILURE);
1677 1613
1678 default: 1614 default:
1679 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
1680 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1622 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1623 }
1681 1624
1682 pty->close_tty (); 1625 pty->close_tty ();
1683 1626
1684 child_ev.start (cmd_pid); 1627 child_ev.start (cmd_pid);
1685 1628
… …
1710#elif defined (SRIOCSREDIR) 1653#elif defined (SRIOCSREDIR)
1711 int fd; 1654 int fd;
1712 1655
1713 fd = open (CONSOLE, O_WRONLY, 0); 1656 fd = open (CONSOLE, O_WRONLY, 0);
1714 if (fd >= 0) 1657 if (fd >= 0)
1715 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1658 {
1659 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1716 close (fd); 1660 close (fd);
1661 }
1717#endif /* SRIOCSREDIR */ 1662#endif /* SRIOCSREDIR */
1718 } 1663 }
1719 1664
1720 /* reset signals and spin off the command interpreter */ 1665 /* reset signals and spin off the command interpreter */
1721 signal (SIGINT, SIG_DFL); 1666 signal (SIGINT, SIG_DFL);

Diff Legend

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