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.289 by root, Mon Jan 3 03:05:47 2011 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.
… …
55 55
56#ifdef HAVE_NL_LANGINFO 56#ifdef HAVE_NL_LANGINFO
57# include <langinfo.h> 57# include <langinfo.h>
58#endif 58#endif
59 59
60#ifdef HAVE_STARTUP_NOTIFICATION
61# define SN_API_NOT_YET_FROZEN
62# include <libsn/sn-launchee.h>
63#endif
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>
63#include <sys/socket.h> 68#include <sys/socket.h>
64 69
65/* these next is probably only on Sun (not Solaris) */ 70/* these next two are probably only on Sun (not Solaris) */
66#ifdef HAVE_SYS_SOCKIO_H 71#ifdef HAVE_SYS_SOCKIO_H
67#include <sys/sockio.h> 72#include <sys/sockio.h>
73#endif
74#ifdef HAVE_SYS_BYTEORDER_H
75#include <sys/byteorder.h>
68#endif 76#endif
69 77
70#include <netinet/in.h> 78#include <netinet/in.h>
71#include <arpa/inet.h> 79#include <arpa/inet.h>
72#include <net/if.h> 80#include <net/if.h>
… …
560/*----------------------------------------------------------------------*/ 568/*----------------------------------------------------------------------*/
561const char ** 569const char **
562rxvt_term::init_resources (int argc, const char *const *argv) 570rxvt_term::init_resources (int argc, const char *const *argv)
563{ 571{
564 int i, r_argc; 572 int i, r_argc;
565 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
566 574
567 /* 575 /*
568 * 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
569 */ 577 */
570 for (r_argc = 0; r_argc < argc; r_argc++) 578 for (r_argc = 0; r_argc < argc; r_argc++)
… …
574 if (r_argc == argc) 582 if (r_argc == argc)
575 cmd_argv = NULL; 583 cmd_argv = NULL;
576 else if (!argv[r_argc + 1]) 584 else if (!argv[r_argc + 1])
577 rxvt_fatal ("option '-e' requires an argument, aborting.\n"); 585 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
578 else 586 else
579 {
580 cmd_argv = (const char **)rxvt_malloc (sizeof (char *) * (argc - r_argc));
581
582 for (i = 0; i < argc - r_argc - 1; i++)
583 cmd_argv[i] = (const char *)argv[i + r_argc + 1]; 587 cmd_argv = (const char **)argv + r_argc + 1;
584
585 cmd_argv[i] = NULL;
586 }
587
588 r_argv = (const char **)rxvt_malloc (sizeof (char *) * (r_argc + 1));
589
590 for (i = 0; i < r_argc; i++)
591 r_argv[i] = (const char *)argv[i];
592
593 r_argv[i] = NULL;
594 588
595 rs[Rs_name] = rxvt_basename (argv[0]); 589 rs[Rs_name] = rxvt_basename (argv[0]);
596 590
597 /* 591 /*
598 * Open display, get options/resources and create the window 592 * Open display, get options/resources and create the window
599 */ 593 */
600 594
601 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 595 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
602 rs[Rs_display_name] = ":0"; 596 rs[Rs_display_name] = ":0";
603 597
604 get_options (r_argc, r_argv); 598 get_options (r_argc, argv);
605 599
606 if (!(display = displays.get (rs[Rs_display_name]))) 600 if (!(display = displays.get (rs[Rs_display_name])))
607 {
608 free (r_argv);
609 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]);
610 }
611 602
612 // using a local pointer decreases code size a lot 603 // using a local pointer decreases code size a lot
613 xa = display->xa; 604 xa = display->xa;
614 605
615 set (display); 606 set (display);
… …
618#if XFT 609#if XFT
619 if (rs[Rs_depth]) 610 if (rs[Rs_depth])
620 select_visual (strtol (rs[Rs_depth], 0, 0)); 611 select_visual (strtol (rs[Rs_depth], 0, 0));
621#endif 612#endif
622 613
623 free (r_argv);
624
625 for (int i = NUM_RESOURCES; i--; ) 614 for (int i = NUM_RESOURCES; i--; )
626 if (rs [i] == resval_undef) 615 if (rs [i] == resval_undef)
627 rs [i] = 0; 616 rs [i] = 0;
628 617
629#ifdef HAVE_AFTERIMAGE
630 set_application_name ((char *)rs[Rs_name]);
631 set_output_threshold (OUTPUT_LEVEL_WARNING);
632#endif
633
634#ifdef HAVE_PIXBUF
635 g_type_init ();
636#endif
637
638#if ENABLE_PERL 618#if ENABLE_PERL
639 if (!rs[Rs_perl_ext_1]) 619 if (!rs[Rs_perl_ext_1])
640 rs[Rs_perl_ext_1] = "default"; 620 rs[Rs_perl_ext_1] = "default";
641 621
642 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 622 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
645 { 625 {
646 rxvt_perl.init (this); 626 rxvt_perl.init (this);
647 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 627 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
648 } 628 }
649#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 ();
650 634
651 /* 635 /*
652 * set any defaults not already set 636 * set any defaults not already set
653 */ 637 */
654 if (cmd_argv && cmd_argv[0]) 638 if (cmd_argv && cmd_argv[0])
… …
763 return cmd_argv; 747 return cmd_argv;
764} 748}
765 749
766/*----------------------------------------------------------------------*/ 750/*----------------------------------------------------------------------*/
767void 751void
768rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 752rxvt_term::init (stringvec *argv, stringvec *envv)
769{ 753{
754 argv->push_back (0);
755 envv->push_back (0);
756
757 this->argv = argv;
770 this->envv = envv; 758 this->envv = envv;
771 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{
772 SET_R (this); 785 SET_R (this);
773 set_locale (""); 786 set_locale ("");
774 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 :(
775 788
776 init_vars (); 789 init_vars ();
… …
790 if (chdir (path)) 803 if (chdir (path))
791 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");
792 } 805 }
793 806
794 if (option (Opt_scrollBar)) 807 if (option (Opt_scrollBar))
795 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 808 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
796 809
797 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
798 821
799 create_windows (argc, argv); 822 create_windows (argc, argv);
800 823
801 init_xlocale (); 824 init_xlocale ();
802 825
… …
808 831
809 if (option (Opt_scrollBar)) 832 if (option (Opt_scrollBar))
810 scrollBar.resize (); /* create and map scrollbar */ 833 scrollBar.resize (); /* create and map scrollbar */
811#ifdef HAVE_BG_PIXMAP 834#ifdef HAVE_BG_PIXMAP
812 { 835 {
813 bgPixmap.set_target (this); 836 bg_init ();
814 bgPixmap.invalidate ();
815 837
816#ifdef ENABLE_TRANSPARENCY 838#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent)) 839 if (option (Opt_transparent))
818 { 840 {
819 bgPixmap.set_transparent (); 841 bg_set_transparent ();
820 842
821 if (rs [Rs_blurradius]) 843 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 844 bg_set_blur (rs [Rs_blurradius]);
823 845
824 if (ISSET_PIXCOLOR (Color_tint)) 846 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 847 bg_set_tint (pix_colors_focused [Color_tint]);
826 848
827 if (rs [Rs_shade]) 849 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]); 850 bg_set_shade (rs [Rs_shade]);
829 851
830 bgPixmap.set_root_pixmap (); 852 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask); 853 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root); 854 rootwin_ev.start (display, display->root);
833 } 855 }
834#endif 856#endif
835 857
836#ifdef BG_IMAGE_FROM_FILE 858#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap]) 859 if (rs[Rs_backgroundPixmap])
838 {
839 const char *p = rs[Rs_backgroundPixmap];
840
841 if ((p = strchr (p, ';')) != 0)
842 {
843 p++;
844 bgPixmap.set_geometry (p);
845 }
846 else
847 bgPixmap.set_defaultGeometry ();
848
849 if (bgPixmap.set_file (rs[Rs_backgroundPixmap])) 860 if (bg_set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ()) 861 if (!bg_window_position_sensitive ())
851 update_background (); 862 update_background ();
852 }
853#endif 863#endif
854 } 864 }
855#endif 865#endif
856 866
857#if ENABLE_PERL 867#if ENABLE_PERL
… …
860 870
861 set_colorfgbg (); 871 set_colorfgbg ();
862 872
863 init_command (cmd_argv); 873 init_command (cmd_argv);
864 874
865 free (cmd_argv);
866
867 if (pty->pty >= 0) 875 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ); 876 pty_ev.start (pty->pty, ev::READ);
869 877
870 HOOK_INVOKE ((this, HOOK_START, DT_END)); 878 HOOK_INVOKE ((this, HOOK_START, DT_END));
871 879
872#if ENABLE_XEMBED 880#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 881 if (rs[Rs_embed])
874 { 882 {
875 long info[2] = { 0, XEMBED_MAPPED }; 883 long info[2] = { 0, XEMBED_MAPPED };
876 884
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 885 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 886 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 887 }
880#endif 888#endif
881 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
882 XMapWindow (dpy, vt); 902 XMapWindow (dpy, vt);
883 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
884 916
885 refresh_check (); 917 refresh_check ();
886} 918}
887 919
888/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
… …
914 946
915 env_display = (char *)rxvt_malloc (strlen (val) + 9); 947 env_display = (char *)rxvt_malloc (strlen (val) + 9);
916 948
917 sprintf (env_display, "DISPLAY=%s", val); 949 sprintf (env_display, "DISPLAY=%s", val);
918 950
919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 951 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
920 952
921 /* add entries to the environment: 953 /* add entries to the environment:
922 * @ DISPLAY: in case we started with -display 954 * @ DISPLAY: in case we started with -display
923 * @ WINDOWID: X window id number of the window 955 * @ WINDOWID: X window id number of the window
924 * @ COLORTERM: terminal sub-name and also indicates its color 956 * @ COLORTERM: terminal sub-name and also indicates its color
… …
957 unsetenv ("TERMCAP"); /* terminfo should be okay */ 989 unsetenv ("TERMCAP"); /* terminfo should be okay */
958#endif /* HAVE_UNSETENV */ 990#endif /* HAVE_UNSETENV */
959} 991}
960 992
961/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
962/*
963 * This is more or less stolen straight from XFree86 xterm.
964 * This should support all European type languages.
965 */
966void 994void
967rxvt_term::set_locale (const char *locale) 995rxvt_term::set_locale (const char *locale)
968{ 996{
969 set_environ (envv); 997 set_environ (envv);
970 998
… …
990 SET_LOCALE (this->locale); 1018 SET_LOCALE (this->locale);
991 mbstate.reset (); 1019 mbstate.reset ();
992#endif 1020#endif
993 1021
994#if HAVE_NL_LANGINFO 1022#if HAVE_NL_LANGINFO
995 char *codeset = strdup (nl_langinfo (CODESET)); 1023 char *codeset = nl_langinfo (CODESET);
996 // /^UTF.?8/i 1024 // /^UTF.?8/i
997 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1025 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
998 && (codeset[1] == 'T' || codeset[1] == 't') 1026 && (codeset[1] == 'T' || codeset[1] == 't')
999 && (codeset[2] == 'F' || codeset[2] == 'f') 1027 && (codeset[2] == 'F' || codeset[2] == 'f')
1000 && (codeset[3] == '8' || codeset[4] == '8'); 1028 && (codeset[3] == '8' || codeset[4] == '8');
1001 free (codeset);
1002#else 1029#else
1003 enc_utf8 = 0; 1030 enc_utf8 = 0;
1004#endif 1031#endif
1005} 1032}
1006 1033
… …
1009{ 1036{
1010 set_environ (envv); 1037 set_environ (envv);
1011 1038
1012#ifdef USE_XIM 1039#ifdef USE_XIM
1013 if (!locale) 1040 if (!locale)
1014 rxvt_warn ("setting locale failed, working without locale support.\n"); 1041 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1015 else 1042 else
1016 { 1043 {
1017 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1044 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1018 1045
1019 if (!XSupportsLocale ()) 1046 if (!XSupportsLocale ())
1020 { 1047 {
1021 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");
1022 return; 1049 return;
1023 } 1050 }
1024 1051
1025 im_ev.start (display); 1052 im_ev.start (display);
1026 1053
… …
1321 buffer [1] = h; 1348 buffer [1] = h;
1322 1349
1323 for (unsigned int i = 0; i < w * h; ++i) 1350 for (unsigned int i = 0; i < w * h; ++i)
1324 buffer [i + 2] = asbuf [i]; 1351 buffer [i + 2] = asbuf [i];
1325 1352
1326 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1353 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1327 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1354 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1328 free (buffer); 1355 free (buffer);
1329 } 1356 }
1330 else 1357 else
1331 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1358 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1378 } 1405 }
1379 1406
1380 row += rowstride; 1407 row += rowstride;
1381 } 1408 }
1382 1409
1383 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1410 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1384 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1411 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1385 free (buffer); 1412 free (buffer);
1386 } 1413 }
1387 else 1414 else
1388 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1415 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1390 g_object_unref (pixbuf); 1417 g_object_unref (pixbuf);
1391#endif 1418#endif
1392} 1419}
1393 1420
1394/*----------------------------------------------------------------------*/ 1421/*----------------------------------------------------------------------*/
1395/* rxvt_Create_Windows () - Open and map the window */ 1422/* Open and map the window */
1396void 1423void
1397rxvt_term::create_windows (int argc, const char *const *argv) 1424rxvt_term::create_windows (int argc, const char *const *argv)
1398{ 1425{
1399 XClassHint classHint; 1426 XClassHint classHint;
1400 XWMHints wmHint; 1427 XWMHints wmHint;
… …
1446 } 1473 }
1447#endif 1474#endif
1448 1475
1449 window_calc (0, 0); 1476 window_calc (0, 0);
1450 1477
1451 /* sub-window placement & size in rxvt_resize_subwindows () */ 1478 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1452 attributes.background_pixel = pix_colors_focused [Color_border]; 1479 attributes.background_pixel = pix_colors_focused [Color_border];
1453 attributes.border_pixel = pix_colors_focused [Color_border]; 1480 attributes.border_pixel = pix_colors_focused [Color_border];
1454 attributes.colormap = cmap; 1481 attributes.colormap = cmap;
1455 1482
1456 top = XCreateWindow (dpy, parent, 1483 top = XCreateWindow (dpy, parent,
… …
1459 ext_bwidth, 1486 ext_bwidth,
1460 depth, InputOutput, visual, 1487 depth, InputOutput, visual,
1461 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1488 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1462 &attributes); 1489 &attributes);
1463 1490
1464 this->parent[0] = top; 1491 this->parent = top;
1465 1492
1466 old_width = szHint.width; 1493 old_width = szHint.width;
1467 old_height = szHint.height; 1494 old_height = szHint.height;
1468 1495
1469 set_title (rs [Rs_title]); 1496 set_title (rs [Rs_title]);
… …
1502#if ENABLE_EWMH 1529#if ENABLE_EWMH
1503 xa[XA_NET_WM_PING], 1530 xa[XA_NET_WM_PING],
1504#endif 1531#endif
1505 }; 1532 };
1506 1533
1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1534 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1508 1535
1509#if ENABLE_FRILLS 1536#if ENABLE_FRILLS
1510 if (rs[Rs_transient_for]) 1537 if (rs[Rs_transient_for])
1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1538 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1512#endif 1539#endif

Diff Legend

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