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

Diff Legend

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