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.286 by sf-exg, Tue Dec 14 08:01:51 2010 UTC vs.
Revision 1.307 by root, Sat Dec 17 23:17:33 2011 UTC

… …
10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM> 10 * Copyright (c) 1996 Chuck Blake <cblake@BBN.COM>
11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca> 11 * Copyright (c) 1997 mj olesen <olesen@me.queensu.ca>
12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 12 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 13 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
14 * - extensive modifications 14 * - extensive modifications
15 * Copyright (c) 2003-2008 Marc Lehmann <pcg@goof.com> 15 * Copyright (c) 2003-2008 Marc Lehmann <schmorp@schmorp.de>
16 * 16 *
17 * This program is free software; you can redistribute it and/or modify 17 * This program is free software; you can redistribute it and/or modify
18 * it under the terms of the GNU General Public License as published by 18 * it under the terms of the GNU General Public License as published by
19 * the Free Software Foundation; either version 2 of the License, or 19 * the Free Software Foundation; either version 2 of the License, or
20 * (at your option) any later version. 20 * (at your option) any later version.
… …
53# endif 53# endif
54#endif 54#endif
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif
59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
58#endif 63#endif
59 64
60#ifdef DISPLAY_IS_IP 65#ifdef DISPLAY_IS_IP
61/* On Solaris link with -lsocket and -lnsl */ 66/* On Solaris link with -lsocket and -lnsl */
62#include <sys/types.h> 67#include <sys/types.h>
… …
563/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
564const char ** 569const char **
565rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
566{ 571{
567 int i, r_argc; 572 int i, r_argc;
568 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
569 574
570 /* 575 /*
571 * Look for -e option. Find => split and make cmd_argv[] of command args 576 * Look for -e option. Find => split and make cmd_argv[] of command args
572 */ 577 */
573 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
… …
577 if (r_argc == argc) 582 if (r_argc == argc)
578 cmd_argv = NULL; 583 cmd_argv = NULL;
579 else if (!argv[r_argc + 1]) 584 else if (!argv[r_argc + 1])
580 rxvt_fatal ("option '-e' requires an argument, aborting.\n"); 585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
581 else 586 else
582 {
583 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
584
585 for (i = 0; i < argc - r_argc - 1; i++)
586 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 587 cmd_argv = (const char **)argv + r_argc + 1;
587
588 cmd_argv[i] = NULL;
589 }
590
591 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
592
593 for (i = 0; i < r_argc; i++)
594 r_argv[i] = (const char *)argv[i];
595
596 r_argv[i] = NULL;
597 588
598 rs[Rs_name] = rxvt_basename (argv[0]); 589 rs[Rs_name] = rxvt_basename (argv[0]);
599 590
600 /* 591 /*
601 * Open display, get options/resources and create the window 592 * Open display, get options/resources and create the window
602 */ 593 */
603 594
604 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
605 rs[Rs_display_name] = ":0"; 596 rs[Rs_display_name] = ":0";
606 597
607 get_options (r_argc, r_argv); 598 get_options (r_argc, argv);
608 599
609 if (!(display = displays.get (rs[Rs_display_name]))) 600 if (!(display = displays.get (rs[Rs_display_name])))
610 {
611 free (r_argv);
612 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]); 601 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
613 }
614 602
615 // using a local pointer decreases code size a lot 603 // using a local pointer decreases code size a lot
616 xa = display->xa; 604 xa = display->xa;
617 605
618 set (display); 606 set (display);
… …
621#if XFT 609#if XFT
622 if (rs[Rs_depth]) 610 if (rs[Rs_depth])
623 select_visual (strtol (rs[Rs_depth], 0, 0)); 611 select_visual (strtol (rs[Rs_depth], 0, 0));
624#endif 612#endif
625 613
626 free (r_argv);
627
628 for (int i = NUM_RESOURCES; i--; ) 614 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 615 if (rs [i] == resval_undef)
630 rs [i] = 0; 616 rs [i] = 0;
631 617
632#ifdef HAVE_AFTERIMAGE
633 set_application_name ((char *)rs[Rs_name]);
634 set_output_threshold (OUTPUT_LEVEL_WARNING);
635#endif
636
637#ifdef HAVE_PIXBUF
638 g_type_init ();
639#endif
640
641#if ENABLE_PERL 618#if ENABLE_PERL
642 if (!rs[Rs_perl_ext_1]) 619 if (!rs[Rs_perl_ext_1])
643 rs[Rs_perl_ext_1] = "default"; 620 rs[Rs_perl_ext_1] = "default";
644 621
645 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 622 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
648 { 625 {
649 rxvt_perl.init (this); 626 rxvt_perl.init (this);
650 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 627 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
651 } 628 }
652#endif 629#endif
630
631 // must be called after initialising the perl interpreter as it
632 // may invoke the `on_register_command' hook
633 extract_keysym_resources ();
653 634
654 /* 635 /*
655 * set any defaults not already set 636 * set any defaults not already set
656 */ 637 */
657 if (cmd_argv && cmd_argv[0]) 638 if (cmd_argv && cmd_argv[0])
… …
766 return cmd_argv; 747 return cmd_argv;
767} 748}
768 749
769/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
770void 751void
771rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 752rxvt_term::init (stringvec *argv, stringvec *envv)
772{ 753{
754 argv->push_back (0);
755 envv->push_back (0);
756
757 this->argv = argv;
773 this->envv = envv; 758 this->envv = envv;
774 759
760 init2 (argv->size () - 1, argv->begin ());
761}
762
763void
764rxvt_term::init (int argc, const char *const *argv, const char *const *envv)
765{
766#if ENABLE_PERL
767 // perl might want to access the stringvecs later, so we need to copy them
768 stringvec *args = new stringvec;
769 for (int i = 0; i < argc; i++)
770 args->push_back (strdup (argv [i]));
771
772 stringvec *envs = new stringvec;
773 for (const char *const *var = envv; *var; var++)
774 envs->push_back (strdup (*var));
775
776 init (args, envs);
777#else
778 init2 (argc, argv);
779#endif
780}
781
782void
783rxvt_term::init2 (int argc, const char *const *argv)
784{
775 SET_R (this); 785 SET_R (this);
776 set_locale (""); 786 set_locale ("");
777 set_environ (envv); // a few things in X do not call setlocale :( 787 set_environ (envv); // a few things in X do not call setlocale :(
778 788
779 init_vars (); 789 init_vars ();
… …
793 if (chdir (path)) 803 if (chdir (path))
794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 804 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
795 } 805 }
796 806
797 if (option (Opt_scrollBar)) 807 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 808 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 809
800 pty = ptytty::create (); 810 pty = ptytty::create ();
811
812#ifdef HAVE_AFTERIMAGE
813 set_application_name ((char *)rs[Rs_name]);
814 set_output_threshold (OUTPUT_LEVEL_WARNING);
815#endif
816
817 // must be called before create_windows, because the latter may call set_icon
818#ifdef HAVE_PIXBUF
819 g_type_init ();
820#endif
801 821
802 create_windows (argc, argv); 822 create_windows (argc, argv);
803 823
804 init_xlocale (); 824 init_xlocale ();
805 825
… …
811 831
812 if (option (Opt_scrollBar)) 832 if (option (Opt_scrollBar))
813 scrollBar.resize (); /* create and map scrollbar */ 833 scrollBar.resize (); /* create and map scrollbar */
814#ifdef HAVE_BG_PIXMAP 834#ifdef HAVE_BG_PIXMAP
815 { 835 {
816 bgPixmap.set_target (this); 836 bg_init ();
817 bgPixmap.invalidate ();
818 837
819#ifdef ENABLE_TRANSPARENCY 838#ifdef ENABLE_TRANSPARENCY
820 if (option (Opt_transparent)) 839 if (option (Opt_transparent))
821 { 840 {
822 bgPixmap.set_transparent (); 841 bg_set_transparent ();
823 842
824 if (rs [Rs_blurradius]) 843 if (rs [Rs_blurradius])
825 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 844 bg_set_blur (rs [Rs_blurradius]);
826 845
827 if (ISSET_PIXCOLOR (Color_tint)) 846 if (ISSET_PIXCOLOR (Color_tint))
828 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 847 bg_set_tint (pix_colors_focused [Color_tint]);
829 848
830 if (rs [Rs_shade]) 849 if (rs [Rs_shade])
831 bgPixmap.set_shade (rs [Rs_shade]); 850 bg_set_shade (rs [Rs_shade]);
832 851
833 bgPixmap.set_root_pixmap (); 852 bg_set_root_pixmap ();
834 XSelectInput (dpy, display->root, PropertyChangeMask); 853 XSelectInput (dpy, display->root, PropertyChangeMask);
835 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
836 } 855 }
837#endif 856#endif
838 857
839#ifdef BG_IMAGE_FROM_FILE 858#ifdef BG_IMAGE_FROM_FILE
840 if (rs[Rs_backgroundPixmap]) 859 if (rs[Rs_backgroundPixmap])
841 {
842 const char *p = rs[Rs_backgroundPixmap];
843
844 if ((p = strchr (p, ';')) != 0)
845 {
846 p++;
847 bgPixmap.set_geometry (p);
848 }
849 else
850 bgPixmap.set_defaultGeometry ();
851
852 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 860 if (bg_set_file (rs[Rs_backgroundPixmap]))
853 if (!bgPixmap.window_position_sensitive ()) 861 if (!bg_window_position_sensitive ())
854 update_background (); 862 update_background ();
855 }
856#endif 863#endif
857 } 864 }
858#endif 865#endif
859 866
860#if ENABLE_PERL 867#if ENABLE_PERL
… …
863 870
864 set_colorfgbg (); 871 set_colorfgbg ();
865 872
866 init_command (cmd_argv); 873 init_command (cmd_argv);
867 874
868 free (cmd_argv);
869
870 if (pty->pty >= 0) 875 if (pty->pty >= 0)
871 pty_ev.start (pty->pty, ev::READ); 876 pty_ev.start (pty->pty, ev::READ);
872 877
873 HOOK_INVOKE ((this, HOOK_START, DT_END)); 878 HOOK_INVOKE ((this, HOOK_START, DT_END));
874 879
875#if ENABLE_XEMBED 880#if ENABLE_XEMBED
876 if (rs[Rs_embed]) 881 if (rs[Rs_embed])
877 { 882 {
878 long info[2] = { 0, XEMBED_MAPPED }; 883 long info[2] = { 0, XEMBED_MAPPED };
879 884
880 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 885 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
881 32, PropModeReplace, (unsigned char *)&info, 2); 886 32, PropModeReplace, (unsigned char *)&info, 2);
882 } 887 }
883#endif 888#endif
884 889
890#if HAVE_STARTUP_NOTIFICATION
891 SnDisplay *snDisplay;
892 SnLauncheeContext *snContext;
893
894 snDisplay = sn_display_new (dpy, NULL, NULL);
895 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
896
897 /* Tell the window manager that this window is part of the startup context */
898 if (snContext)
899 sn_launchee_context_setup_window (snContext, parent);
900#endif
901
885 XMapWindow (dpy, vt); 902 XMapWindow (dpy, vt);
886 XMapWindow (dpy, parent[0]); 903 XMapWindow (dpy, parent);
904
905#if HAVE_STARTUP_NOTIFICATION
906 if (snContext)
907 {
908 /* Mark the startup process as complete */
909 sn_launchee_context_complete (snContext);
910
911 sn_launchee_context_unref (snContext);
912 }
913
914 sn_display_unref (snDisplay);
915#endif
887 916
888 refresh_check (); 917 refresh_check ();
889} 918}
890 919
891/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
892void 921void
893rxvt_term::init_env () 922rxvt_term::init_env ()
894{ 923{
895 int i;
896 char *val; 924 char *val;
897 925
898#ifdef DISPLAY_IS_IP 926#ifdef DISPLAY_IS_IP
899 /* Fixup display_name for export over pty to any interested terminal 927 /* Fixup display_name for export over pty to any interested terminal
900 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number 928 * clients via "ESC[7n" (e.g. shells). Note we use the pure IP number
… …
914 val = XDisplayString (dpy); 942 val = XDisplayString (dpy);
915 943
916 if (rs[Rs_display_name] == NULL) 944 if (rs[Rs_display_name] == NULL)
917 rs[Rs_display_name] = val; /* use broken `:0' value */ 945 rs[Rs_display_name] = val; /* use broken `:0' value */
918 946
919 i = strlen (val);
920 env_display = (char *)rxvt_malloc (i + 9); 947 env_display = (char *)rxvt_malloc (strlen (val) + 9);
921 948
922 sprintf (env_display, "DISPLAY=%s", val); 949 sprintf (env_display, "DISPLAY=%s", val);
923 950
924 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 951 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
925 952
926 /* add entries to the environment: 953 /* add entries to the environment:
927 * @ DISPLAY: in case we started with -display 954 * @ DISPLAY: in case we started with -display
928 * @ WINDOWID: X window id number of the window 955 * @ WINDOWID: X window id number of the window
929 * @ COLORTERM: terminal sub-name and also indicates its color 956 * @ COLORTERM: terminal sub-name and also indicates its color
… …
962 unsetenv ("TERMCAP"); /* terminfo should be okay */ 989 unsetenv ("TERMCAP"); /* terminfo should be okay */
963#endif /* HAVE_UNSETENV */ 990#endif /* HAVE_UNSETENV */
964} 991}
965 992
966/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
967/*
968 * This is more or less stolen straight from XFree86 xterm.
969 * This should support all European type languages.
970 */
971void 994void
972rxvt_term::set_locale (const char *locale) 995rxvt_term::set_locale (const char *locale)
973{ 996{
974 set_environ (envv); 997 set_environ (envv);
975 998
… …
995 SET_LOCALE (this->locale); 1018 SET_LOCALE (this->locale);
996 mbstate.reset (); 1019 mbstate.reset ();
997#endif 1020#endif
998 1021
999#if HAVE_NL_LANGINFO 1022#if HAVE_NL_LANGINFO
1000 char *codeset = strdup (nl_langinfo (CODESET)); 1023 char *codeset = nl_langinfo (CODESET);
1001 // /^UTF.?8/i 1024 // /^UTF.?8/i
1002 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1025 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1003 && (codeset[1] == 'T' || codeset[1] == 't') 1026 && (codeset[1] == 'T' || codeset[1] == 't')
1004 && (codeset[2] == 'F' || codeset[2] == 'f') 1027 && (codeset[2] == 'F' || codeset[2] == 'f')
1005 && (codeset[3] == '8' || codeset[4] == '8'); 1028 && (codeset[3] == '8' || codeset[4] == '8');
1006 free (codeset);
1007#else 1029#else
1008 enc_utf8 = 0; 1030 enc_utf8 = 0;
1009#endif 1031#endif
1010} 1032}
1011 1033
… …
1014{ 1036{
1015 set_environ (envv); 1037 set_environ (envv);
1016 1038
1017#ifdef USE_XIM 1039#ifdef USE_XIM
1018 if (!locale) 1040 if (!locale)
1019 rxvt_warn ("setting locale failed, working without locale support.\n"); 1041 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1020 else 1042 else
1021 { 1043 {
1022 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1044 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1023 1045
1024 if (!XSupportsLocale ()) 1046 if (!XSupportsLocale ())
1025 { 1047 {
1026 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1048 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1027 return; 1049 return;
1028 } 1050 }
1029 1051
1030 im_ev.start (display); 1052 im_ev.start (display);
1031 1053
… …
1326 buffer [1] = h; 1348 buffer [1] = h;
1327 1349
1328 for (unsigned int i = 0; i < w * h; ++i) 1350 for (unsigned int i = 0; i < w * h; ++i)
1329 buffer [i + 2] = asbuf [i]; 1351 buffer [i + 2] = asbuf [i];
1330 1352
1331 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1353 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1332 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1354 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1333 free (buffer); 1355 free (buffer);
1334 } 1356 }
1335 else 1357 else
1336 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1358 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1383 } 1405 }
1384 1406
1385 row += rowstride; 1407 row += rowstride;
1386 } 1408 }
1387 1409
1388 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1410 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1389 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1411 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1390 free (buffer); 1412 free (buffer);
1391 } 1413 }
1392 else 1414 else
1393 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1415 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1395 g_object_unref (pixbuf); 1417 g_object_unref (pixbuf);
1396#endif 1418#endif
1397} 1419}
1398 1420
1399/*----------------------------------------------------------------------*/ 1421/*----------------------------------------------------------------------*/
1400/* rxvt_Create_Windows () - Open and map the window */ 1422/* Open and map the window */
1401void 1423void
1402rxvt_term::create_windows (int argc, const char *const *argv) 1424rxvt_term::create_windows (int argc, const char *const *argv)
1403{ 1425{
1404 XClassHint classHint; 1426 XClassHint classHint;
1405 XWMHints wmHint; 1427 XWMHints wmHint;
… …
1451 } 1473 }
1452#endif 1474#endif
1453 1475
1454 window_calc (0, 0); 1476 window_calc (0, 0);
1455 1477
1456 /* sub-window placement & size in rxvt_resize_subwindows () */ 1478 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1457 attributes.background_pixel = pix_colors_focused [Color_border]; 1479 attributes.background_pixel = pix_colors_focused [Color_border];
1458 attributes.border_pixel = pix_colors_focused [Color_border]; 1480 attributes.border_pixel = pix_colors_focused [Color_border];
1459 attributes.colormap = cmap; 1481 attributes.colormap = cmap;
1460 1482
1461 top = XCreateWindow (dpy, parent, 1483 top = XCreateWindow (dpy, parent,
… …
1464 ext_bwidth, 1486 ext_bwidth,
1465 depth, InputOutput, visual, 1487 depth, InputOutput, visual,
1466 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1488 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1467 &attributes); 1489 &attributes);
1468 1490
1469 this->parent[0] = top; 1491 this->parent = top;
1470 1492
1471 old_width = szHint.width; 1493 old_width = szHint.width;
1472 old_height = szHint.height; 1494 old_height = szHint.height;
1473 1495
1474 set_title (rs [Rs_title]); 1496 set_title (rs [Rs_title]);
… …
1507#if ENABLE_EWMH 1529#if ENABLE_EWMH
1508 xa[XA_NET_WM_PING], 1530 xa[XA_NET_WM_PING],
1509#endif 1531#endif
1510 }; 1532 };
1511 1533
1512 XSetWMProtocols (dpy, top, protocols, sizeof (protocols) / sizeof (protocols[0])); 1534 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1513 1535
1514#if ENABLE_FRILLS 1536#if ENABLE_FRILLS
1515 if (rs[Rs_transient_for]) 1537 if (rs[Rs_transient_for])
1516 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1538 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1517#endif 1539#endif

Diff Legend

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