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.293 by root, Mon Feb 21 07:41:01 2011 UTC vs.
Revision 1.307 by root, Sat Dec 17 23:17:33 2011 UTC

… …
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
… …
835 } 855 }
836#endif 856#endif
837 857
838#ifdef BG_IMAGE_FROM_FILE 858#ifdef BG_IMAGE_FROM_FILE
839 if (rs[Rs_backgroundPixmap]) 859 if (rs[Rs_backgroundPixmap])
840 {
841 const char *p = rs[Rs_backgroundPixmap];
842
843 if ((p = strchr (p, ';')) != 0)
844 {
845 p++;
846 bg_set_geometry (p);
847 }
848 else
849 bg_set_default_geometry ();
850
851 if (bg_set_file (rs[Rs_backgroundPixmap])) 860 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bg_window_position_sensitive ()) 861 if (!bg_window_position_sensitive ())
853 update_background (); 862 update_background ();
854 }
855#endif 863#endif
856 } 864 }
857#endif 865#endif
858 866
859#if ENABLE_PERL 867#if ENABLE_PERL
… …
862 870
863 set_colorfgbg (); 871 set_colorfgbg ();
864 872
865 init_command (cmd_argv); 873 init_command (cmd_argv);
866 874
867 free (cmd_argv);
868
869 if (pty->pty >= 0) 875 if (pty->pty >= 0)
870 pty_ev.start (pty->pty, ev::READ); 876 pty_ev.start (pty->pty, ev::READ);
871 877
872 HOOK_INVOKE ((this, HOOK_START, DT_END)); 878 HOOK_INVOKE ((this, HOOK_START, DT_END));
873 879
874#if ENABLE_XEMBED 880#if ENABLE_XEMBED
875 if (rs[Rs_embed]) 881 if (rs[Rs_embed])
876 { 882 {
877 long info[2] = { 0, XEMBED_MAPPED }; 883 long info[2] = { 0, XEMBED_MAPPED };
878 884
879 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 885 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
880 32, PropModeReplace, (unsigned char *)&info, 2); 886 32, PropModeReplace, (unsigned char *)&info, 2);
881 } 887 }
882#endif 888#endif
883 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
884 XMapWindow (dpy, vt); 902 XMapWindow (dpy, vt);
885 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
886 916
887 refresh_check (); 917 refresh_check ();
888} 918}
889 919
890/*----------------------------------------------------------------------*/ 920/*----------------------------------------------------------------------*/
… …
916 946
917 env_display = (char *)rxvt_malloc (strlen (val) + 9); 947 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 948
919 sprintf (env_display, "DISPLAY=%s", val); 949 sprintf (env_display, "DISPLAY=%s", val);
920 950
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 951 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 952
923 /* add entries to the environment: 953 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 954 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 955 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 956 * @ COLORTERM: terminal sub-name and also indicates its color
… …
959 unsetenv ("TERMCAP"); /* terminfo should be okay */ 989 unsetenv ("TERMCAP"); /* terminfo should be okay */
960#endif /* HAVE_UNSETENV */ 990#endif /* HAVE_UNSETENV */
961} 991}
962 992
963/*----------------------------------------------------------------------*/ 993/*----------------------------------------------------------------------*/
964/*
965 * This is more or less stolen straight from XFree86 xterm.
966 * This should support all European type languages.
967 */
968void 994void
969rxvt_term::set_locale (const char *locale) 995rxvt_term::set_locale (const char *locale)
970{ 996{
971 set_environ (envv); 997 set_environ (envv);
972 998
… …
992 SET_LOCALE (this->locale); 1018 SET_LOCALE (this->locale);
993 mbstate.reset (); 1019 mbstate.reset ();
994#endif 1020#endif
995 1021
996#if HAVE_NL_LANGINFO 1022#if HAVE_NL_LANGINFO
997 char *codeset = strdup (nl_langinfo (CODESET)); 1023 char *codeset = nl_langinfo (CODESET);
998 // /^UTF.?8/i 1024 // /^UTF.?8/i
999 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u') 1025 enc_utf8 = (codeset[0] == 'U' || codeset[0] == 'u')
1000 && (codeset[1] == 'T' || codeset[1] == 't') 1026 && (codeset[1] == 'T' || codeset[1] == 't')
1001 && (codeset[2] == 'F' || codeset[2] == 'f') 1027 && (codeset[2] == 'F' || codeset[2] == 'f')
1002 && (codeset[3] == '8' || codeset[4] == '8'); 1028 && (codeset[3] == '8' || codeset[4] == '8');
1003 free (codeset);
1004#else 1029#else
1005 enc_utf8 = 0; 1030 enc_utf8 = 0;
1006#endif 1031#endif
1007} 1032}
1008 1033
… …
1011{ 1036{
1012 set_environ (envv); 1037 set_environ (envv);
1013 1038
1014#ifdef USE_XIM 1039#ifdef USE_XIM
1015 if (!locale) 1040 if (!locale)
1016 rxvt_warn ("setting locale failed, working without locale support.\n"); 1041 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017 else 1042 else
1018 { 1043 {
1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 1044 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
1020 1045
1021 if (!XSupportsLocale ()) 1046 if (!XSupportsLocale ())
1022 { 1047 {
1023 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");
1024 return; 1049 return;
1025 } 1050 }
1026 1051
1027 im_ev.start (display); 1052 im_ev.start (display);
1028 1053
… …
1323 buffer [1] = h; 1348 buffer [1] = h;
1324 1349
1325 for (unsigned int i = 0; i < w * h; ++i) 1350 for (unsigned int i = 0; i < w * h; ++i)
1326 buffer [i + 2] = asbuf [i]; 1351 buffer [i + 2] = asbuf [i];
1327 1352
1328 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1353 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1354 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer); 1355 free (buffer);
1331 } 1356 }
1332 else 1357 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1358 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1380 } 1405 }
1381 1406
1382 row += rowstride; 1407 row += rowstride;
1383 } 1408 }
1384 1409
1385 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1410 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1386 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1411 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1387 free (buffer); 1412 free (buffer);
1388 } 1413 }
1389 else 1414 else
1390 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1415 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1392 g_object_unref (pixbuf); 1417 g_object_unref (pixbuf);
1393#endif 1418#endif
1394} 1419}
1395 1420
1396/*----------------------------------------------------------------------*/ 1421/*----------------------------------------------------------------------*/
1397/* rxvt_Create_Windows () - Open and map the window */ 1422/* Open and map the window */
1398void 1423void
1399rxvt_term::create_windows (int argc, const char *const *argv) 1424rxvt_term::create_windows (int argc, const char *const *argv)
1400{ 1425{
1401 XClassHint classHint; 1426 XClassHint classHint;
1402 XWMHints wmHint; 1427 XWMHints wmHint;
… …
1448 } 1473 }
1449#endif 1474#endif
1450 1475
1451 window_calc (0, 0); 1476 window_calc (0, 0);
1452 1477
1453 /* sub-window placement & size in rxvt_resize_subwindows () */ 1478 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1454 attributes.background_pixel = pix_colors_focused [Color_border]; 1479 attributes.background_pixel = pix_colors_focused [Color_border];
1455 attributes.border_pixel = pix_colors_focused [Color_border]; 1480 attributes.border_pixel = pix_colors_focused [Color_border];
1456 attributes.colormap = cmap; 1481 attributes.colormap = cmap;
1457 1482
1458 top = XCreateWindow (dpy, parent, 1483 top = XCreateWindow (dpy, parent,
… …
1461 ext_bwidth, 1486 ext_bwidth,
1462 depth, InputOutput, visual, 1487 depth, InputOutput, visual,
1463 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1488 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1464 &attributes); 1489 &attributes);
1465 1490
1466 this->parent[0] = top; 1491 this->parent = top;
1467 1492
1468 old_width = szHint.width; 1493 old_width = szHint.width;
1469 old_height = szHint.height; 1494 old_height = szHint.height;
1470 1495
1471 set_title (rs [Rs_title]); 1496 set_title (rs [Rs_title]);
… …
1504#if ENABLE_EWMH 1529#if ENABLE_EWMH
1505 xa[XA_NET_WM_PING], 1530 xa[XA_NET_WM_PING],
1506#endif 1531#endif
1507 }; 1532 };
1508 1533
1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1534 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1510 1535
1511#if ENABLE_FRILLS 1536#if ENABLE_FRILLS
1512 if (rs[Rs_transient_for]) 1537 if (rs[Rs_transient_for])
1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1538 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1514#endif 1539#endif

Diff Legend

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