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.321 by sf-exg, Sat Feb 4 21:47:06 2012 UTC vs.
Revision 1.326 by root, Sun Jun 3 10:42:34 2012 UTC

76#include <netinet/in.h> 76#include <netinet/in.h>
77#include <arpa/inet.h> 77#include <arpa/inet.h>
78#include <net/if.h> 78#include <net/if.h>
79#include <net/if_arp.h> 79#include <net/if_arp.h>
80 80
81static char * 81static char * ecb_cold
82rxvt_network_display (const char *display) 82rxvt_network_display (const char *display)
83{ 83{
84 char buffer[1024], *rval = NULL; 84 char buffer[1024], *rval = NULL;
85 struct ifconf ifc; 85 struct ifconf ifc;
86 struct ifreq *ifr; 86 struct ifreq *ifr;
791 if (option (Opt_scrollBar)) 791 if (option (Opt_scrollBar))
792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
793 793
794 pty = ptytty::create (); 794 pty = ptytty::create ();
795 795
796 // must be called before create_windows, because the latter may call set_icon
797#ifdef HAVE_PIXBUF
798 g_type_init ();
799#endif
800
801 create_windows (argc, argv); 796 create_windows (argc, argv);
802 797
803 init_xlocale (); 798 init_xlocale ();
804 799
805 scr_poweron (); // initialize screen 800 scr_poweron (); // initialize screen
818 if (option (Opt_transparent)) 813 if (option (Opt_transparent))
819 { 814 {
820 bg_set_transparent (); 815 bg_set_transparent ();
821 816
822 if (rs [Rs_blurradius]) 817 if (rs [Rs_blurradius])
823 bg_set_blur (rs [Rs_blurradius]); 818 root_effects.set_blur (rs [Rs_blurradius]);
824 819
825 if (ISSET_PIXCOLOR (Color_tint)) 820 if (ISSET_PIXCOLOR (Color_tint))
826 bg_set_tint (pix_colors_focused [Color_tint]); 821 root_effects.set_tint (pix_colors_focused [Color_tint]);
827 822
828 if (rs [Rs_shade]) 823 if (rs [Rs_shade])
829 bg_set_shade (rs [Rs_shade]); 824 root_effects.set_shade (rs [Rs_shade]);
830 825
831 bg_set_root_pixmap (); 826 bg_set_root_pixmap ();
832 XSelectInput (dpy, display->root, PropertyChangeMask); 827 XSelectInput (dpy, display->root, PropertyChangeMask);
833 rootwin_ev.start (display, display->root); 828 rootwin_ev.start (display, display->root);
834 } 829 }
835#endif
836
837#ifdef BG_IMAGE_FROM_FILE
838 if (rs[Rs_backgroundPixmap])
839 if (bg_set_file (rs[Rs_backgroundPixmap]))
840 if (!bg_window_position_sensitive ())
841 update_background ();
842#endif 830#endif
843 } 831 }
844#endif 832#endif
845 833
846#if ENABLE_PERL 834#if ENABLE_PERL

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines