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.308 by sf-exg, Sun Dec 18 02:14:59 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>
… …
559 567
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;
565 const char **cmd_argv, **r_argv; 573 const char **cmd_argv;
566
567 /*
568 * Look for -e option. Find => split and make cmd_argv[] of command args
569 */
570 for (r_argc = 0; r_argc < argc; r_argc++)
571 if (!strcmp (argv[r_argc], "-e"))
572 break;
573
574 if (r_argc == argc)
575 cmd_argv = NULL;
576 else if (!argv[r_argc + 1])
577 rxvt_fatal ("option '-e' requires an argument, aborting.\n");
578 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];
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 574
595 rs[Rs_name] = rxvt_basename (argv[0]); 575 rs[Rs_name] = rxvt_basename (argv[0]);
596 576
597 /* 577 /*
598 * Open display, get options/resources and create the window 578 * Open display, get options/resources and create the window
599 */ 579 */
600 580
601 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL) 581 if ((rs[Rs_display_name] = getenv ("DISPLAY")) == NULL)
602 rs[Rs_display_name] = ":0"; 582 rs[Rs_display_name] = ":0";
603 583
604 get_options (r_argc, r_argv); 584 cmd_argv = get_options (argc, argv);
605 585
606 if (!(display = displays.get (rs[Rs_display_name]))) 586 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]); 587 rxvt_fatal ("can't open display %s, aborting.\n", rs[Rs_display_name]);
610 }
611 588
612 // using a local pointer decreases code size a lot 589 // using a local pointer decreases code size a lot
613 xa = display->xa; 590 xa = display->xa;
614 591
615 set (display); 592 set (display);
… …
618#if XFT 595#if XFT
619 if (rs[Rs_depth]) 596 if (rs[Rs_depth])
620 select_visual (strtol (rs[Rs_depth], 0, 0)); 597 select_visual (strtol (rs[Rs_depth], 0, 0));
621#endif 598#endif
622 599
623 free (r_argv);
624
625 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
626 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
627 rs [i] = 0; 602 rs [i] = 0;
628 603
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 604#if ENABLE_PERL
639 if (!rs[Rs_perl_ext_1]) 605 if (!rs[Rs_perl_ext_1])
640 rs[Rs_perl_ext_1] = "default"; 606 rs[Rs_perl_ext_1] = "default";
641 607
642 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 608 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
645 { 611 {
646 rxvt_perl.init (this); 612 rxvt_perl.init (this);
647 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 613 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
648 } 614 }
649#endif 615#endif
616
617 // must be called after initialising the perl interpreter as it
618 // may invoke the `on_register_command' hook
619 extract_keysym_resources ();
650 620
651 /* 621 /*
652 * set any defaults not already set 622 * set any defaults not already set
653 */ 623 */
654 if (cmd_argv && cmd_argv[0]) 624 if (cmd_argv && cmd_argv[0])
… …
763 return cmd_argv; 733 return cmd_argv;
764} 734}
765 735
766/*----------------------------------------------------------------------*/ 736/*----------------------------------------------------------------------*/
767void 737void
768rxvt_term::init (int argc, const char *const *argv, stringvec *envv) 738rxvt_term::init (stringvec *argv, stringvec *envv)
769{ 739{
740 argv->push_back (0);
741 envv->push_back (0);
742
743 this->argv = argv;
770 this->envv = envv; 744 this->envv = envv;
771 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
769rxvt_term::init2 (int argc, const char *const *argv)
770{
772 SET_R (this); 771 SET_R (this);
773 set_locale (""); 772 set_locale ("");
774 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 :(
775 774
776 init_vars (); 775 init_vars ();
… …
790 if (chdir (path)) 789 if (chdir (path))
791 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 790 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
792 } 791 }
793 792
794 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
795 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
796 795
797 pty = ptytty::create (); 796 pty = ptytty::create ();
797
798#ifdef HAVE_AFTERIMAGE
799 set_application_name ((char *)rs[Rs_name]);
800 set_output_threshold (OUTPUT_LEVEL_WARNING);
801#endif
802
803 // must be called before create_windows, because the latter may call set_icon
804#ifdef HAVE_PIXBUF
805 g_type_init ();
806#endif
798 807
799 create_windows (argc, argv); 808 create_windows (argc, argv);
800 809
801 init_xlocale (); 810 init_xlocale ();
802 811
… …
808 817
809 if (option (Opt_scrollBar)) 818 if (option (Opt_scrollBar))
810 scrollBar.resize (); /* create and map scrollbar */ 819 scrollBar.resize (); /* create and map scrollbar */
811#ifdef HAVE_BG_PIXMAP 820#ifdef HAVE_BG_PIXMAP
812 { 821 {
813 bgPixmap.set_target (this); 822 bg_init ();
814 bgPixmap.invalidate ();
815 823
816#ifdef ENABLE_TRANSPARENCY 824#ifdef ENABLE_TRANSPARENCY
817 if (option (Opt_transparent)) 825 if (option (Opt_transparent))
818 { 826 {
819 bgPixmap.set_transparent (); 827 bg_set_transparent ();
820 828
821 if (rs [Rs_blurradius]) 829 if (rs [Rs_blurradius])
822 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 830 bg_set_blur (rs [Rs_blurradius]);
823 831
824 if (ISSET_PIXCOLOR (Color_tint)) 832 if (ISSET_PIXCOLOR (Color_tint))
825 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 833 bg_set_tint (pix_colors_focused [Color_tint]);
826 834
827 if (rs [Rs_shade]) 835 if (rs [Rs_shade])
828 bgPixmap.set_shade (rs [Rs_shade]); 836 bg_set_shade (rs [Rs_shade]);
829 837
830 bgPixmap.set_root_pixmap (); 838 bg_set_root_pixmap ();
831 XSelectInput (dpy, display->root, PropertyChangeMask); 839 XSelectInput (dpy, display->root, PropertyChangeMask);
832 rootwin_ev.start (display, display->root); 840 rootwin_ev.start (display, display->root);
833 } 841 }
834#endif 842#endif
835 843
836#ifdef BG_IMAGE_FROM_FILE 844#ifdef BG_IMAGE_FROM_FILE
837 if (rs[Rs_backgroundPixmap]) 845 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])) 846 if (bg_set_file (rs[Rs_backgroundPixmap]))
850 if (!bgPixmap.window_position_sensitive ()) 847 if (!bg_window_position_sensitive ())
851 update_background (); 848 update_background ();
852 }
853#endif 849#endif
854 } 850 }
855#endif 851#endif
856 852
857#if ENABLE_PERL 853#if ENABLE_PERL
… …
860 856
861 set_colorfgbg (); 857 set_colorfgbg ();
862 858
863 init_command (cmd_argv); 859 init_command (cmd_argv);
864 860
865 free (cmd_argv);
866
867 if (pty->pty >= 0) 861 if (pty->pty >= 0)
868 pty_ev.start (pty->pty, ev::READ); 862 pty_ev.start (pty->pty, ev::READ);
869 863
870 HOOK_INVOKE ((this, HOOK_START, DT_END)); 864 HOOK_INVOKE ((this, HOOK_START, DT_END));
871 865
872#if ENABLE_XEMBED 866#if ENABLE_XEMBED
873 if (rs[Rs_embed]) 867 if (rs[Rs_embed])
874 { 868 {
875 long info[2] = { 0, XEMBED_MAPPED }; 869 long info[2] = { 0, XEMBED_MAPPED };
876 870
877 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 871 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
878 32, PropModeReplace, (unsigned char *)&info, 2); 872 32, PropModeReplace, (unsigned char *)&info, 2);
879 } 873 }
880#endif 874#endif
881 875
876#if HAVE_STARTUP_NOTIFICATION
877 SnDisplay *snDisplay;
878 SnLauncheeContext *snContext;
879
880 snDisplay = sn_display_new (dpy, NULL, NULL);
881 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
882
883 /* Tell the window manager that this window is part of the startup context */
884 if (snContext)
885 sn_launchee_context_setup_window (snContext, parent);
886#endif
887
882 XMapWindow (dpy, vt); 888 XMapWindow (dpy, vt);
883 XMapWindow (dpy, parent[0]); 889 XMapWindow (dpy, parent);
890
891#if HAVE_STARTUP_NOTIFICATION
892 if (snContext)
893 {
894 /* Mark the startup process as complete */
895 sn_launchee_context_complete (snContext);
896
897 sn_launchee_context_unref (snContext);
898 }
899
900 sn_display_unref (snDisplay);
901#endif
884 902
885 refresh_check (); 903 refresh_check ();
886} 904}
887 905
888/*----------------------------------------------------------------------*/ 906/*----------------------------------------------------------------------*/
… …
914 932
915 env_display = (char *)rxvt_malloc (strlen (val) + 9); 933 env_display = (char *)rxvt_malloc (strlen (val) + 9);
916 934
917 sprintf (env_display, "DISPLAY=%s", val); 935 sprintf (env_display, "DISPLAY=%s", val);
918 936
919 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 937 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
920 938
921 /* add entries to the environment: 939 /* add entries to the environment:
922 * @ DISPLAY: in case we started with -display 940 * @ DISPLAY: in case we started with -display
923 * @ WINDOWID: X window id number of the window 941 * @ WINDOWID: X window id number of the window
924 * @ COLORTERM: terminal sub-name and also indicates its color 942 * @ COLORTERM: terminal sub-name and also indicates its color
… …
957 unsetenv ("TERMCAP"); /* terminfo should be okay */ 975 unsetenv ("TERMCAP"); /* terminfo should be okay */
958#endif /* HAVE_UNSETENV */ 976#endif /* HAVE_UNSETENV */
959} 977}
960 978
961/*----------------------------------------------------------------------*/ 979/*----------------------------------------------------------------------*/
962/*
963 * This is more or less stolen straight from XFree86 xterm.
964 * This should support all European type languages.
965 */
966void 980void
967rxvt_term::set_locale (const char *locale) 981rxvt_term::set_locale (const char *locale)
968{ 982{
969 set_environ (envv); 983 set_environ (envv);
970 984
… …
990 SET_LOCALE (this->locale); 1004 SET_LOCALE (this->locale);
991 mbstate.reset (); 1005 mbstate.reset ();
992#endif 1006#endif
993 1007
994#if HAVE_NL_LANGINFO 1008#if HAVE_NL_LANGINFO
995 char *codeset = strdup (nl_langinfo (CODESET)); 1009 char *codeset = nl_langinfo (CODESET);
996 // /^UTF.?8/i 1010 // /^UTF.?8/i
997 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1011 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
998 && (codeset[1] == 'T' || codeset[1] == 't') 1012 && (codeset[1] == 'T' || codeset[1] == 't')
999 && (codeset[2] == 'F' || codeset[2] == 'f') 1013 && (codeset[2] == 'F' || codeset[2] == 'f')
1000 && (codeset[3] == '8' || codeset[4] == '8'); 1014 && (codeset[3] == '8' || codeset[4] == '8');
1001 free (codeset);
1002#else 1015#else
1003 enc_utf8 = 0; 1016 enc_utf8 = 0;
1004#endif 1017#endif
1005} 1018}
1006 1019
… …
1009{ 1022{
1010 set_environ (envv); 1023 set_environ (envv);
1011 1024
1012#ifdef USE_XIM 1025#ifdef USE_XIM
1013 if (!locale) 1026 if (!locale)
1014 rxvt_warn ("setting locale failed, working without locale support.\n"); 1027 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1015 else 1028 else
1016 { 1029 {
1017 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1030 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1018 1031
1019 if (!XSupportsLocale ()) 1032 if (!XSupportsLocale ())
1020 { 1033 {
1021 rxvt_warn ("the locale is not supported by Xlib, working without locale support.\n"); 1034 rxvt_warn ("the locale is not supported by Xlib, continuing without locale support.\n");
1022 return; 1035 return;
1023 } 1036 }
1024 1037
1025 im_ev.start (display); 1038 im_ev.start (display);
1026 1039
… …
1321 buffer [1] = h; 1334 buffer [1] = h;
1322 1335
1323 for (unsigned int i = 0; i < w * h; ++i) 1336 for (unsigned int i = 0; i < w * h; ++i)
1324 buffer [i + 2] = asbuf [i]; 1337 buffer [i + 2] = asbuf [i];
1325 1338
1326 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1339 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1327 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1340 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1328 free (buffer); 1341 free (buffer);
1329 } 1342 }
1330 else 1343 else
1331 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1344 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1378 } 1391 }
1379 1392
1380 row += rowstride; 1393 row += rowstride;
1381 } 1394 }
1382 1395
1383 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1396 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1384 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1397 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1385 free (buffer); 1398 free (buffer);
1386 } 1399 }
1387 else 1400 else
1388 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1401 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1390 g_object_unref (pixbuf); 1403 g_object_unref (pixbuf);
1391#endif 1404#endif
1392} 1405}
1393 1406
1394/*----------------------------------------------------------------------*/ 1407/*----------------------------------------------------------------------*/
1395/* rxvt_Create_Windows () - Open and map the window */ 1408/* Open and map the window */
1396void 1409void
1397rxvt_term::create_windows (int argc, const char *const *argv) 1410rxvt_term::create_windows (int argc, const char *const *argv)
1398{ 1411{
1399 XClassHint classHint; 1412 XClassHint classHint;
1400 XWMHints wmHint; 1413 XWMHints wmHint;
… …
1446 } 1459 }
1447#endif 1460#endif
1448 1461
1449 window_calc (0, 0); 1462 window_calc (0, 0);
1450 1463
1451 /* sub-window placement & size in rxvt_resize_subwindows () */ 1464 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1452 attributes.background_pixel = pix_colors_focused [Color_border]; 1465 attributes.background_pixel = pix_colors_focused [Color_border];
1453 attributes.border_pixel = pix_colors_focused [Color_border]; 1466 attributes.border_pixel = pix_colors_focused [Color_border];
1454 attributes.colormap = cmap; 1467 attributes.colormap = cmap;
1455 1468
1456 top = XCreateWindow (dpy, parent, 1469 top = XCreateWindow (dpy, parent,
… …
1459 ext_bwidth, 1472 ext_bwidth,
1460 depth, InputOutput, visual, 1473 depth, InputOutput, visual,
1461 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1474 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1462 &attributes); 1475 &attributes);
1463 1476
1464 this->parent[0] = top; 1477 this->parent = top;
1465 1478
1466 old_width = szHint.width; 1479 old_width = szHint.width;
1467 old_height = szHint.height; 1480 old_height = szHint.height;
1468 1481
1469 set_title (rs [Rs_title]); 1482 set_title (rs [Rs_title]);
… …
1502#if ENABLE_EWMH 1515#if ENABLE_EWMH
1503 xa[XA_NET_WM_PING], 1516 xa[XA_NET_WM_PING],
1504#endif 1517#endif
1505 }; 1518 };
1506 1519
1507 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1520 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1508 1521
1509#if ENABLE_FRILLS 1522#if ENABLE_FRILLS
1510 if (rs[Rs_transient_for]) 1523 if (rs[Rs_transient_for])
1511 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1524 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1512#endif 1525#endif

Diff Legend

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