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.306 by sf-exg, Tue Dec 6 11:39:30 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 (int argc, const char *const *argv)
772{ 753{
773 this->envv = envv;
774
775 SET_R (this); 754 SET_R (this);
776 set_locale (""); 755 set_locale ("");
777 set_environ (envv); // a few things in X do not call setlocale :( 756 set_environ (envv); // a few things in X do not call setlocale :(
778 757
779 init_vars (); 758 init_vars ();
… …
793 if (chdir (path)) 772 if (chdir (path))
794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 773 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
795 } 774 }
796 775
797 if (option (Opt_scrollBar)) 776 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 777 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 778
800 pty = ptytty::create (); 779 pty = ptytty::create ();
780
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
801 790
802 create_windows (argc, argv); 791 create_windows (argc, argv);
803 792
804 init_xlocale (); 793 init_xlocale ();
805 794
… …
836#endif 825#endif
837 826
838#ifdef BG_IMAGE_FROM_FILE 827#ifdef BG_IMAGE_FROM_FILE
839 if (rs[Rs_backgroundPixmap]) 828 if (rs[Rs_backgroundPixmap])
840 { 829 {
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])) 830 if (bg_set_file (rs[Rs_backgroundPixmap]))
852 if (!bg_window_position_sensitive ()) 831 if (!bg_window_position_sensitive ())
853 update_background (); 832 update_background ();
854 } 833 }
855#endif 834#endif
… …
862 841
863 set_colorfgbg (); 842 set_colorfgbg ();
864 843
865 init_command (cmd_argv); 844 init_command (cmd_argv);
866 845
867 free (cmd_argv);
868
869 if (pty->pty >= 0) 846 if (pty->pty >= 0)
870 pty_ev.start (pty->pty, ev::READ); 847 pty_ev.start (pty->pty, ev::READ);
871 848
872 HOOK_INVOKE ((this, HOOK_START, DT_END)); 849 HOOK_INVOKE ((this, HOOK_START, DT_END));
873 850
874#if ENABLE_XEMBED 851#if ENABLE_XEMBED
875 if (rs[Rs_embed]) 852 if (rs[Rs_embed])
876 { 853 {
877 long info[2] = { 0, XEMBED_MAPPED }; 854 long info[2] = { 0, XEMBED_MAPPED };
878 855
879 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 856 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
880 32, PropModeReplace, (unsigned char *)&info, 2); 857 32, PropModeReplace, (unsigned char *)&info, 2);
881 } 858 }
882#endif 859#endif
883 860
861#if HAVE_STARTUP_NOTIFICATION
862 SnDisplay *snDisplay;
863 SnLauncheeContext *snContext;
864
865 snDisplay = sn_display_new (dpy, NULL, NULL);
866 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
867
868 /* Tell the window manager that this window is part of the startup context */
869 if (snContext)
870 sn_launchee_context_setup_window (snContext, parent);
871#endif
872
884 XMapWindow (dpy, vt); 873 XMapWindow (dpy, vt);
885 XMapWindow (dpy, parent[0]); 874 XMapWindow (dpy, parent);
875
876#if HAVE_STARTUP_NOTIFICATION
877 if (snContext)
878 {
879 /* Mark the startup process as complete */
880 sn_launchee_context_complete (snContext);
881
882 sn_launchee_context_unref (snContext);
883 }
884
885 sn_display_unref (snDisplay);
886#endif
886 887
887 refresh_check (); 888 refresh_check ();
888} 889}
889 890
890/*----------------------------------------------------------------------*/ 891/*----------------------------------------------------------------------*/
… …
916 917
917 env_display = (char *)rxvt_malloc (strlen (val) + 9); 918 env_display = (char *)rxvt_malloc (strlen (val) + 9);
918 919
919 sprintf (env_display, "DISPLAY=%s", val); 920 sprintf (env_display, "DISPLAY=%s", val);
920 921
921 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
922 923
923 /* add entries to the environment: 924 /* add entries to the environment:
924 * @ DISPLAY: in case we started with -display 925 * @ DISPLAY: in case we started with -display
925 * @ WINDOWID: X window id number of the window 926 * @ WINDOWID: X window id number of the window
926 * @ COLORTERM: terminal sub-name and also indicates its color 927 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1323 buffer [1] = h; 1324 buffer [1] = h;
1324 1325
1325 for (unsigned int i = 0; i < w * h; ++i) 1326 for (unsigned int i = 0; i < w * h; ++i)
1326 buffer [i + 2] = asbuf [i]; 1327 buffer [i + 2] = asbuf [i];
1327 1328
1328 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1329 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1329 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1330 free (buffer); 1331 free (buffer);
1331 } 1332 }
1332 else 1333 else
1333 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1380 } 1381 }
1381 1382
1382 row += rowstride; 1383 row += rowstride;
1383 } 1384 }
1384 1385
1385 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1386 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1386 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1387 free (buffer); 1388 free (buffer);
1388 } 1389 }
1389 else 1390 else
1390 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1392 g_object_unref (pixbuf); 1393 g_object_unref (pixbuf);
1393#endif 1394#endif
1394} 1395}
1395 1396
1396/*----------------------------------------------------------------------*/ 1397/*----------------------------------------------------------------------*/
1397/* rxvt_Create_Windows () - Open and map the window */ 1398/* Open and map the window */
1398void 1399void
1399rxvt_term::create_windows (int argc, const char *const *argv) 1400rxvt_term::create_windows (int argc, const char *const *argv)
1400{ 1401{
1401 XClassHint classHint; 1402 XClassHint classHint;
1402 XWMHints wmHint; 1403 XWMHints wmHint;
… …
1448 } 1449 }
1449#endif 1450#endif
1450 1451
1451 window_calc (0, 0); 1452 window_calc (0, 0);
1452 1453
1453 /* sub-window placement & size in rxvt_resize_subwindows () */ 1454 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1454 attributes.background_pixel = pix_colors_focused [Color_border]; 1455 attributes.background_pixel = pix_colors_focused [Color_border];
1455 attributes.border_pixel = pix_colors_focused [Color_border]; 1456 attributes.border_pixel = pix_colors_focused [Color_border];
1456 attributes.colormap = cmap; 1457 attributes.colormap = cmap;
1457 1458
1458 top = XCreateWindow (dpy, parent, 1459 top = XCreateWindow (dpy, parent,
… …
1461 ext_bwidth, 1462 ext_bwidth,
1462 depth, InputOutput, visual, 1463 depth, InputOutput, visual,
1463 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1464 &attributes); 1465 &attributes);
1465 1466
1466 this->parent[0] = top; 1467 this->parent = top;
1467 1468
1468 old_width = szHint.width; 1469 old_width = szHint.width;
1469 old_height = szHint.height; 1470 old_height = szHint.height;
1470 1471
1471 set_title (rs [Rs_title]); 1472 set_title (rs [Rs_title]);
… …
1504#if ENABLE_EWMH 1505#if ENABLE_EWMH
1505 xa[XA_NET_WM_PING], 1506 xa[XA_NET_WM_PING],
1506#endif 1507#endif
1507 }; 1508 };
1508 1509
1509 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1510 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1510 1511
1511#if ENABLE_FRILLS 1512#if ENABLE_FRILLS
1512 if (rs[Rs_transient_for]) 1513 if (rs[Rs_transient_for])
1513 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1514#endif 1515#endif

Diff Legend

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