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.306 by sf-exg, Tue Dec 6 11:39:30 2011 UTC vs.
Revision 1.329 by sf-exg, Mon Jun 11 14:56:33 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 cmd_argv = (const char **)argv + r_argc + 1;
588 572
589 rs[Rs_name] = rxvt_basename (argv[0]); 573 rs[Rs_name] = rxvt_basename (argv[0]);
590 574
591 /* 575 /*
592 * Open display, get options/resources and create the window 576 * Open display, get options/resources and create the window
593 */ 577 */
594 578
595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 579 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
596 rs[Rs_display_name] = ":0"; 580 rs[Rs_display_name] = ":0";
597 581
598 get_options (r_argc, argv); 582 cmd_argv = get_options (argc, argv);
599 583
600 if (!(display = displays.get (rs[Rs_display_name]))) 584 if (!(display = displays.get (rs[Rs_display_name])))
601 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]);
602 586
603 // using a local pointer decreases code size a lot 587 // using a local pointer decreases code size a lot
604 xa = display->xa; 588 xa = display->xa;
605 589
606 set (display); 590 set (display);
607 extract_resources (); 591 extract_resources ();
608 592
609#if XFT 593#if ENABLE_FRILLS
610 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
611 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));
612#endif 598#endif
613 599
614 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
615 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
616 rs [i] = 0; 602 rs [i] = 0;
… …
747 return cmd_argv; 733 return cmd_argv;
748} 734}
749 735
750/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
751void 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
752rxvt_term::init (int argc, const char *const *argv) 769rxvt_term::init2 (int argc, const char *const *argv)
753{ 770{
754 SET_R (this); 771 SET_R (this);
755 set_locale (""); 772 set_locale ("");
756 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 :(
757 774
… …
776 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
777 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
778 795
779 pty = ptytty::create (); 796 pty = ptytty::create ();
780 797
781#ifdef HAVE_AFTERIMAGE
782 set_application_name ((char *)rs[Rs_name]);
783 set_output_threshold (OUTPUT_LEVEL_WARNING);
784#endif
785
786 // must be called before create_windows, because the latter may call set_icon
787#ifdef HAVE_PIXBUF
788 g_type_init ();
789#endif
790
791 create_windows (argc, argv); 798 create_windows (argc, argv);
792 799
793 init_xlocale (); 800 init_xlocale ();
794 801
795 scr_poweron (); // initialize screen 802 scr_poweron (); // initialize screen
… …
798 XSynchronize (dpy, True); 805 XSynchronize (dpy, True);
799#endif 806#endif
800 807
801 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
802 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
810
803#ifdef HAVE_BG_PIXMAP 811#ifdef HAVE_BG_PIXMAP
804 {
805 bg_init (); 812 bg_init ();
806
807#ifdef ENABLE_TRANSPARENCY
808 if (option (Opt_transparent))
809 {
810 bg_set_transparent ();
811
812 if (rs [Rs_blurradius])
813 bg_set_blur (rs [Rs_blurradius]);
814
815 if (ISSET_PIXCOLOR (Color_tint))
816 bg_set_tint (pix_colors_focused [Color_tint]);
817
818 if (rs [Rs_shade])
819 bg_set_shade (rs [Rs_shade]);
820
821 bg_set_root_pixmap ();
822 XSelectInput (dpy, display->root, PropertyChangeMask);
823 rootwin_ev.start (display, display->root);
824 }
825#endif
826
827#ifdef BG_IMAGE_FROM_FILE
828 if (rs[Rs_backgroundPixmap])
829 {
830 if (bg_set_file (rs[Rs_backgroundPixmap]))
831 if (!bg_window_position_sensitive ())
832 update_background ();
833 }
834#endif
835 }
836#endif 813#endif
837 814
838#if ENABLE_PERL 815#if ENABLE_PERL
839 rootwin_ev.start (display, display->root); 816 rootwin_ev.start (display, display->root);
840#endif 817#endif
841 818
842 set_colorfgbg (); 819 init_done = 1;
843 820
844 init_command (cmd_argv); 821 init_command (cmd_argv);
845 822
846 if (pty->pty >= 0) 823 if (pty->pty >= 0)
847 pty_ev.start (pty->pty, ev::READ); 824 pty_ev.start (pty->pty, ev::READ);
… …
891/*----------------------------------------------------------------------*/ 868/*----------------------------------------------------------------------*/
892void 869void
893rxvt_term::init_env () 870rxvt_term::init_env ()
894{ 871{
895 char *val; 872 char *val;
873 char *env_display;
874 char *env_windowid;
875 char *env_colorfgbg;
876 char *env_term;
896 877
897#ifdef DISPLAY_IS_IP 878#ifdef DISPLAY_IS_IP
898 /* Fixup display_name for export over pty to any interested terminal 879 /* Fixup display_name for export over pty to any interested terminal
899 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 880 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
900 * (for the first non-loopback interface) that we get from 881 * (for the first non-loopback interface) that we get from
… …
917 898
918 env_display = (char *)rxvt_malloc (strlen (val) + 9); 899 env_display = (char *)rxvt_malloc (strlen (val) + 9);
919 900
920 sprintf (env_display, "DISPLAY=%s", val); 901 sprintf (env_display, "DISPLAY=%s", val);
921 902
903 env_windowid = (char *)rxvt_malloc (21);
922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent); 904 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
923 905
924 /* add entries to the environment: 906 /* add entries to the environment:
925 * @ DISPLAY: in case we started with -display 907 * @ DISPLAY: in case we started with -display
926 * @ WINDOWID: X window id number of the window 908 * @ WINDOWID: X window id number of the window
… …
930 * @ COLORFGBG: fg;bg color codes 912 * @ COLORFGBG: fg;bg color codes
931 */ 913 */
932 putenv (env_display); 914 putenv (env_display);
933 putenv (env_windowid); 915 putenv (env_windowid);
934 916
935 if (env_colorfgbg) 917 env_colorfgbg = get_colorfgbg ();
936 putenv (env_colorfgbg); 918 putenv (env_colorfgbg);
937 919
938#ifdef RXVT_TERMINFO 920#ifdef RXVT_TERMINFO
939 putenv ("TERMINFO=" RXVT_TERMINFO); 921 putenv ("TERMINFO=" RXVT_TERMINFO);
940#endif 922#endif
941 923
… …
960 unsetenv ("TERMCAP"); /* terminfo should be okay */ 942 unsetenv ("TERMCAP"); /* terminfo should be okay */
961#endif /* HAVE_UNSETENV */ 943#endif /* HAVE_UNSETENV */
962} 944}
963 945
964/*----------------------------------------------------------------------*/ 946/*----------------------------------------------------------------------*/
965/*
966 * This is more or less stolen straight from XFree86 xterm.
967 * This should support all European type languages.
968 */
969void 947void
970rxvt_term::set_locale (const char *locale) 948rxvt_term::set_locale (const char *locale)
971{ 949{
972 set_environ (envv); 950 set_environ (envv);
973 951
974#if HAVE_XSETLOCALE || HAVE_SETLOCALE
975 free (this->locale); 952 free (this->locale);
976 this->locale = setlocale (LC_CTYPE, locale); 953 this->locale = setlocale (LC_CTYPE, locale);
977 954
978 if (!this->locale) 955 if (!this->locale)
979 { 956 {
… …
990 967
991 968
992 this->locale = strdup (this->locale); 969 this->locale = strdup (this->locale);
993 SET_LOCALE (this->locale); 970 SET_LOCALE (this->locale);
994 mbstate.reset (); 971 mbstate.reset ();
995#endif
996 972
997#if HAVE_NL_LANGINFO 973#if HAVE_NL_LANGINFO
998 char *codeset = strdup (nl_langinfo (CODESET)); 974 char *codeset = nl_langinfo (CODESET);
999 // /^UTF.?8/i 975 // /^UTF.?8/i
1000 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 976 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1001 && (codeset[1] == 'T' || codeset[1] == 't') 977 && (codeset[1] == 'T' || codeset[1] == 't')
1002 && (codeset[2] == 'F' || codeset[2] == 'f') 978 && (codeset[2] == 'F' || codeset[2] == 'f')
1003 && (codeset[3] == '8' || codeset[4] == '8'); 979 && (codeset[3] == '8' || codeset[4] == '8');
1004 free (codeset);
1005#else 980#else
1006 enc_utf8 = 0; 981 enc_utf8 = 0;
1007#endif 982#endif
1008} 983}
1009 984
1010void 985void
1011rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
1012{ 987{
1013 set_environ (envv); 988 set_environ (envv);
1014 989
1015#ifdef USE_XIM 990#if USE_XIM
1016 if (!locale) 991 if (!locale)
1017 rxvt_warn ("setting locale failed, working without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1018 else 993 else
1019 { 994 {
1020 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1021 996
1022 if (!XSupportsLocale ()) 997 if (!XSupportsLocale ())
1023 { 998 {
1024 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 999 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1025 return; 1000 return;
1026 } 1001 }
1027 1002
1028 im_ev.start (display); 1003 im_ev.start (display);
1029 1004
… …
1178/*----------------------------------------------------------------------*/ 1153/*----------------------------------------------------------------------*/
1179/* color aliases, fg/bg bright-bold */ 1154/* color aliases, fg/bg bright-bold */
1180void 1155void
1181rxvt_term::color_aliases (int idx) 1156rxvt_term::color_aliases (int idx)
1182{ 1157{
1183 if (rs[Rs_color + idx] && isdigit (* (rs[Rs_color + idx]))) 1158 if (rs[Rs_color + idx] && isdigit (*rs[Rs_color + idx]))
1184 { 1159 {
1185 int i = atoi (rs[Rs_color + idx]); 1160 int i = atoi (rs[Rs_color + idx]);
1186 1161
1187 if (i >= 8 && i <= 15) 1162 if (i >= 8 && i <= 15)
1188 /* bright colors */ 1163 /* bright colors */
… …
1283} 1258}
1284 1259
1285void 1260void
1286rxvt_term::set_icon (const char *file) 1261rxvt_term::set_icon (const char *file)
1287{ 1262{
1288#ifdef HAVE_AFTERIMAGE
1289 init_asv ();
1290
1291 ASImage *im = file2ASImage (file, 0xFFFFFFFF, SCREEN_GAMMA, 0, NULL);
1292 if (!im)
1293 {
1294 rxvt_warn ("Loading image icon failed, continuing without.\n");
1295 return;
1296 }
1297
1298 unsigned int w = im->width;
1299 unsigned int h = im->height;
1300
1301 if (!IN_RANGE_INC (w, 1, 16383) || !IN_RANGE_INC (h, 1, 16383))
1302 {
1303 rxvt_warn ("Icon image too big, continuing without.\n");
1304 destroy_asimage (&im);
1305 return;
1306 }
1307
1308 ASImage *result = scale_asimage (asv, im,
1309 w, h, ASA_ARGB32,
1310 100, ASIMAGE_QUALITY_DEFAULT);
1311 destroy_asimage (&im);
1312
1313 if (!result)
1314 {
1315 rxvt_warn ("Icon image transformation to ARGB failed, continuing without.\n");
1316 return;
1317 }
1318
1319 long *buffer = (long *)malloc ((2 + w * h) * sizeof (long));
1320 if (buffer)
1321 {
1322 ARGB32 *asbuf = result->alt.argb32;
1323 buffer [0] = w;
1324 buffer [1] = h;
1325
1326 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i];
1328
1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer);
1332 }
1333 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
1335
1336 destroy_asimage (&result);
1337#endif
1338
1339#ifdef HAVE_PIXBUF 1263#if HAVE_PIXBUF
1340 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1341 if (!pixbuf) 1265 if (!pixbuf)
1342 { 1266 {
1343 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1344 return; 1268 return;
… …
1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1388 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1465 &attributes); 1389 &attributes);
1466 1390
1467 this->parent = top; 1391 this->parent = top;
1468 1392
1469 old_width = szHint.width;
1470 old_height = szHint.height;
1471
1472 set_title (rs [Rs_title]); 1393 set_title (rs [Rs_title]);
1473 set_icon_name (rs [Rs_iconName]); 1394 set_icon_name (rs [Rs_iconName]);
1474 1395
1475 classHint.res_name = (char *)rs[Rs_name]; 1396 classHint.res_name = (char *)rs[Rs_name];
1476 classHint.res_class = (char *)RESCLASS; 1397 classHint.res_class = (char *)RESCLASS;
… …
1538 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm); 1459 TermWin_cursor = XCreateFontCursor (dpy, XC_xterm);
1539 1460
1540 /* the vt window */ 1461 /* the vt window */
1541 vt = XCreateSimpleWindow (dpy, top, 1462 vt = XCreateSimpleWindow (dpy, top,
1542 window_vt_x, window_vt_y, 1463 window_vt_x, window_vt_y,
1543 width, height, 1464 vt_width, vt_height,
1544 0, 1465 0,
1545 pix_colors_focused[Color_fg], 1466 pix_colors_focused[Color_fg],
1546 pix_colors_focused[Color_bg]); 1467 pix_colors_focused[Color_bg]);
1547 1468
1548 attributes.bit_gravity = NorthWestGravity; 1469 attributes.bit_gravity = NorthWestGravity;
… …
1597 if (pty->pty >= 0) 1518 if (pty->pty >= 0)
1598 { 1519 {
1599 if (getfd_hook) 1520 if (getfd_hook)
1600 pty->pty = (*getfd_hook) (pty->pty); 1521 pty->pty = (*getfd_hook) (pty->pty);
1601 1522
1602 if (pty->pty < 0 || fcntl (pty->pty, F_SETFL, O_NONBLOCK)) 1523 if (pty->pty < 0)
1603 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n"); 1524 rxvt_fatal ("unusable pty-fd filehandle, aborting.\n");
1604 } 1525 }
1605 } 1526 }
1606 else 1527 else
1607#endif 1528#endif
1608 if (!pty->get ()) 1529 if (!pty->get ())
1609 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n"); 1530 rxvt_fatal ("can't initialize pseudo-tty, aborting.\n");
1531
1532 fcntl (pty->pty, F_SETFL, O_NONBLOCK);
1610 1533
1611 struct termios tio = def_tio; 1534 struct termios tio = def_tio;
1612 1535
1613#ifndef NO_BACKSPACE_KEY 1536#ifndef NO_BACKSPACE_KEY
1614 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1]) 1537 if (rs[Rs_backspace_key][0] && !rs[Rs_backspace_key][1])
… …
1664 1587
1665 _exit (EXIT_FAILURE); 1588 _exit (EXIT_FAILURE);
1666 1589
1667 default: 1590 default:
1668 if (!option (Opt_utmpInhibit)) 1591 if (!option (Opt_utmpInhibit))
1592 {
1593#ifdef LOG_ONLY_ON_LOGIN
1594 bool login_shell = option (Opt_loginShell);
1595#else
1596 bool login_shell = true;
1597#endif
1669 pty->login (cmd_pid, option (Opt_loginShell), rs[Rs_display_name]); 1598 pty->login (cmd_pid, login_shell, rs[Rs_display_name]);
1599 }
1670 1600
1671 pty->close_tty (); 1601 pty->close_tty ();
1672 1602
1673 child_ev.start (cmd_pid); 1603 child_ev.start (cmd_pid);
1674 1604
… …
1699#elif defined (SRIOCSREDIR) 1629#elif defined (SRIOCSREDIR)
1700 int fd; 1630 int fd;
1701 1631
1702 fd = open (CONSOLE, O_WRONLY, 0); 1632 fd = open (CONSOLE, O_WRONLY, 0);
1703 if (fd >= 0) 1633 if (fd >= 0)
1704 if (ioctl (fd, SRIOCSREDIR, NULL) < 0) 1634 {
1635 ioctl (fd, SRIOCSREDIR, STDIN_FILENO);
1705 close (fd); 1636 close (fd);
1637 }
1706#endif /* SRIOCSREDIR */ 1638#endif /* SRIOCSREDIR */
1707 } 1639 }
1708 1640
1709 /* reset signals and spin off the command interpreter */ 1641 /* reset signals and spin off the command interpreter */
1710 signal (SIGINT, SIG_DFL); 1642 signal (SIGINT, SIG_DFL);

Diff Legend

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