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.290 by sf-exg, Mon Jan 3 10:32:08 2011 UTC vs.
Revision 1.302 by sf-exg, Fri Dec 2 09:03:43 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>
… …
627 632
628 for (int i = NUM_RESOURCES; i--; ) 633 for (int i = NUM_RESOURCES; i--; )
629 if (rs [i] == resval_undef) 634 if (rs [i] == resval_undef)
630 rs [i] = 0; 635 rs [i] = 0;
631 636
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 637#if ENABLE_PERL
642 if (!rs[Rs_perl_ext_1]) 638 if (!rs[Rs_perl_ext_1])
643 rs[Rs_perl_ext_1] = "default"; 639 rs[Rs_perl_ext_1] = "default";
644 640
645 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1]) 641 if ((rs[Rs_perl_ext_1] && *rs[Rs_perl_ext_1])
… …
648 { 644 {
649 rxvt_perl.init (this); 645 rxvt_perl.init (this);
650 HOOK_INVOKE ((this, HOOK_INIT, DT_END)); 646 HOOK_INVOKE ((this, HOOK_INIT, DT_END));
651 } 647 }
652#endif 648#endif
649
650 // must be called after initialising the perl interpreter as it
651 // may invoke the `on_register_command' hook
652 extract_keysym_resources ();
653 653
654 /* 654 /*
655 * set any defaults not already set 655 * set any defaults not already set
656 */ 656 */
657 if (cmd_argv && cmd_argv[0]) 657 if (cmd_argv && cmd_argv[0])
… …
793 if (chdir (path)) 793 if (chdir (path))
794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n"); 794 rxvt_fatal ("unable to change into specified shell working directory, aborting.\n");
795 } 795 }
796 796
797 if (option (Opt_scrollBar)) 797 if (option (Opt_scrollBar))
798 scrollBar.state = STATE_IDLE; /* set existence for size calculations */ 798 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
799 799
800 pty = ptytty::create (); 800 pty = ptytty::create ();
801
802#ifdef HAVE_AFTERIMAGE
803 set_application_name ((char *)rs[Rs_name]);
804 set_output_threshold (OUTPUT_LEVEL_WARNING);
805#endif
806
807 // must be called before create_windows, because the latter may call set_icon
808#ifdef HAVE_PIXBUF
809 g_type_init ();
810#endif
801 811
802 create_windows (argc, argv); 812 create_windows (argc, argv);
803 813
804 init_xlocale (); 814 init_xlocale ();
805 815
… …
811 821
812 if (option (Opt_scrollBar)) 822 if (option (Opt_scrollBar))
813 scrollBar.resize (); /* create and map scrollbar */ 823 scrollBar.resize (); /* create and map scrollbar */
814#ifdef HAVE_BG_PIXMAP 824#ifdef HAVE_BG_PIXMAP
815 { 825 {
816 bgPixmap.set_target (this); 826 bg_init ();
817 bgPixmap.invalidate ();
818 827
819#ifdef ENABLE_TRANSPARENCY 828#ifdef ENABLE_TRANSPARENCY
820 if (option (Opt_transparent)) 829 if (option (Opt_transparent))
821 { 830 {
822 bgPixmap.set_transparent (); 831 bg_set_transparent ();
823 832
824 if (rs [Rs_blurradius]) 833 if (rs [Rs_blurradius])
825 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 834 bg_set_blur (rs [Rs_blurradius]);
826 835
827 if (ISSET_PIXCOLOR (Color_tint)) 836 if (ISSET_PIXCOLOR (Color_tint))
828 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 837 bg_set_tint (pix_colors_focused [Color_tint]);
829 838
830 if (rs [Rs_shade]) 839 if (rs [Rs_shade])
831 bgPixmap.set_shade (rs [Rs_shade]); 840 bg_set_shade (rs [Rs_shade]);
832 841
833 bgPixmap.set_root_pixmap (); 842 bg_set_root_pixmap ();
834 XSelectInput (dpy, display->root, PropertyChangeMask); 843 XSelectInput (dpy, display->root, PropertyChangeMask);
835 rootwin_ev.start (display, display->root); 844 rootwin_ev.start (display, display->root);
836 } 845 }
837#endif 846#endif
838 847
839#ifdef BG_IMAGE_FROM_FILE 848#ifdef BG_IMAGE_FROM_FILE
840 if (rs[Rs_backgroundPixmap]) 849 if (rs[Rs_backgroundPixmap])
841 { 850 {
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])) 851 if (bg_set_file (rs[Rs_backgroundPixmap]))
853 if (!bgPixmap.window_position_sensitive ()) 852 if (!bg_window_position_sensitive ())
854 update_background (); 853 update_background ();
855 } 854 }
856#endif 855#endif
857 } 856 }
858#endif 857#endif
… …
875#if ENABLE_XEMBED 874#if ENABLE_XEMBED
876 if (rs[Rs_embed]) 875 if (rs[Rs_embed])
877 { 876 {
878 long info[2] = { 0, XEMBED_MAPPED }; 877 long info[2] = { 0, XEMBED_MAPPED };
879 878
880 XChangeProperty (dpy, parent[0], xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO], 879 XChangeProperty (dpy, parent, xa[XA_XEMBED_INFO], xa[XA_XEMBED_INFO],
881 32, PropModeReplace, (unsigned char *)&info, 2); 880 32, PropModeReplace, (unsigned char *)&info, 2);
882 } 881 }
883#endif 882#endif
884 883
884#if HAVE_STARTUP_NOTIFICATION
885 SnDisplay *snDisplay;
886 SnLauncheeContext *snContext;
887
888 snDisplay = sn_display_new (dpy, NULL, NULL);
889 snContext = sn_launchee_context_new_from_environment (snDisplay, DefaultScreen (dpy));
890
891 /* Tell the window manager that this window is part of the startup context */
892 if (snContext)
893 sn_launchee_context_setup_window (snContext, parent);
894#endif
895
885 XMapWindow (dpy, vt); 896 XMapWindow (dpy, vt);
886 XMapWindow (dpy, parent[0]); 897 XMapWindow (dpy, parent);
898
899#if HAVE_STARTUP_NOTIFICATION
900 if (snContext)
901 {
902 /* Mark the startup process as complete */
903 sn_launchee_context_complete (snContext);
904
905 sn_launchee_context_unref (snContext);
906 }
907
908 sn_display_unref (snDisplay);
909#endif
887 910
888 refresh_check (); 911 refresh_check ();
889} 912}
890 913
891/*----------------------------------------------------------------------*/ 914/*----------------------------------------------------------------------*/
… …
917 940
918 env_display = (char *)rxvt_malloc (strlen (val) + 9); 941 env_display = (char *)rxvt_malloc (strlen (val) + 9);
919 942
920 sprintf (env_display, "DISPLAY=%s", val); 943 sprintf (env_display, "DISPLAY=%s", val);
921 944
922 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent[0]); 945 sprintf (env_windowid, "WINDOWID=%lu", (unsigned long)parent);
923 946
924 /* add entries to the environment: 947 /* add entries to the environment:
925 * @ DISPLAY: in case we started with -display 948 * @ DISPLAY: in case we started with -display
926 * @ WINDOWID: X window id number of the window 949 * @ WINDOWID: X window id number of the window
927 * @ COLORTERM: terminal sub-name and also indicates its color 950 * @ COLORTERM: terminal sub-name and also indicates its color
… …
1324 buffer [1] = h; 1347 buffer [1] = h;
1325 1348
1326 for (unsigned int i = 0; i < w * h; ++i) 1349 for (unsigned int i = 0; i < w * h; ++i)
1327 buffer [i + 2] = asbuf [i]; 1350 buffer [i + 2] = asbuf [i];
1328 1351
1329 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1352 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1330 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1353 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1331 free (buffer); 1354 free (buffer);
1332 } 1355 }
1333 else 1356 else
1334 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1357 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1381 } 1404 }
1382 1405
1383 row += rowstride; 1406 row += rowstride;
1384 } 1407 }
1385 1408
1386 XChangeProperty (dpy, parent[0], xa[XA_NET_WM_ICON], XA_CARDINAL, 32, 1409 XChangeProperty (dpy, parent, xa[XA_NET_WM_ICON], XA_CARDINAL, 32,
1387 PropModeReplace, (const unsigned char *) buffer, 2 + w * h); 1410 PropModeReplace, (const unsigned char *) buffer, 2 + w * h);
1388 free (buffer); 1411 free (buffer);
1389 } 1412 }
1390 else 1413 else
1391 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n"); 1414 rxvt_warn ("Memory allocation for icon hint failed, continuing without.\n");
… …
1393 g_object_unref (pixbuf); 1416 g_object_unref (pixbuf);
1394#endif 1417#endif
1395} 1418}
1396 1419
1397/*----------------------------------------------------------------------*/ 1420/*----------------------------------------------------------------------*/
1398/* rxvt_Create_Windows () - Open and map the window */ 1421/* Open and map the window */
1399void 1422void
1400rxvt_term::create_windows (int argc, const char *const *argv) 1423rxvt_term::create_windows (int argc, const char *const *argv)
1401{ 1424{
1402 XClassHint classHint; 1425 XClassHint classHint;
1403 XWMHints wmHint; 1426 XWMHints wmHint;
… …
1449 } 1472 }
1450#endif 1473#endif
1451 1474
1452 window_calc (0, 0); 1475 window_calc (0, 0);
1453 1476
1454 /* sub-window placement & size in rxvt_resize_subwindows () */ 1477 /* sub-window placement & size in rxvt_term::resize_all_windows () */
1455 attributes.background_pixel = pix_colors_focused [Color_border]; 1478 attributes.background_pixel = pix_colors_focused [Color_border];
1456 attributes.border_pixel = pix_colors_focused [Color_border]; 1479 attributes.border_pixel = pix_colors_focused [Color_border];
1457 attributes.colormap = cmap; 1480 attributes.colormap = cmap;
1458 1481
1459 top = XCreateWindow (dpy, parent, 1482 top = XCreateWindow (dpy, parent,
… …
1462 ext_bwidth, 1485 ext_bwidth,
1463 depth, InputOutput, visual, 1486 depth, InputOutput, visual,
1464 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect, 1487 CWColormap | CWBackPixel | CWBorderPixel | CWOverrideRedirect,
1465 &attributes); 1488 &attributes);
1466 1489
1467 this->parent[0] = top; 1490 this->parent = top;
1468 1491
1469 old_width = szHint.width; 1492 old_width = szHint.width;
1470 old_height = szHint.height; 1493 old_height = szHint.height;
1471 1494
1472 set_title (rs [Rs_title]); 1495 set_title (rs [Rs_title]);
… …
1505#if ENABLE_EWMH 1528#if ENABLE_EWMH
1506 xa[XA_NET_WM_PING], 1529 xa[XA_NET_WM_PING],
1507#endif 1530#endif
1508 }; 1531 };
1509 1532
1510 XSetWMProtocols (dpy, top, protocols, ARRAY_LENGTH(protocols)); 1533 XSetWMProtocols (dpy, top, protocols, ecb_array_length (protocols));
1511 1534
1512#if ENABLE_FRILLS 1535#if ENABLE_FRILLS
1513 if (rs[Rs_transient_for]) 1536 if (rs[Rs_transient_for])
1514 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0)); 1537 XSetTransientForHint (dpy, top, (Window)strtol (rs[Rs_transient_for], 0, 0));
1515#endif 1538#endif

Diff Legend

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