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.324 by root, Mon May 28 16:40:03 2012 UTC vs.
Revision 1.330 by sf-exg, Sat Dec 29 14:23:35 2012 UTC

… …
519#endif 519#endif
520 COLOR_SCROLLBAR, 520 COLOR_SCROLLBAR,
521#ifdef RXVT_SCROLLBAR 521#ifdef RXVT_SCROLLBAR
522 COLOR_SCROLLTROUGH, 522 COLOR_SCROLLTROUGH,
523#endif 523#endif
524#if ENABLE_TRANSPARENCY 524#if BG_IMAGE_FROM_ROOT
525 NULL, 525 NULL,
526#endif 526#endif
527#if OFF_FOCUS_FADING 527#if OFF_FOCUS_FADING
528 "rgb:00/00/00", 528 "rgb:00/00/00",
529#endif 529#endif
… …
588 xa = display->xa; 588 xa = display->xa;
589 589
590 set (display); 590 set (display);
591 extract_resources (); 591 extract_resources ();
592 592
593#if XFT 593#if ENABLE_FRILLS
594 if (rs[Rs_depth]) 594 if (rs[Rs_visual])
595 select_visual (strtol (rs[Rs_depth], 0, 0)); 595 select_visual (strtol (rs[Rs_visual], 0, 0));
596 else if (rs[Rs_depth])
597 select_depth (strtol (rs[Rs_depth], 0, 0));
596#endif 598#endif
597 599
598 for (int i = NUM_RESOURCES; i--; ) 600 for (int i = NUM_RESOURCES; i--; )
599 if (rs [i] == resval_undef) 601 if (rs [i] == resval_undef)
600 rs [i] = 0; 602 rs [i] = 0;
… …
791 if (option (Opt_scrollBar)) 793 if (option (Opt_scrollBar))
792 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */ 794 scrollBar.state = SB_STATE_IDLE; /* set existence for size calculations */
793 795
794 pty = ptytty::create (); 796 pty = ptytty::create ();
795 797
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); 798 create_windows (argc, argv);
802 799
803 init_xlocale (); 800 init_xlocale ();
804 801
805 scr_poweron (); // initialize screen 802 scr_poweron (); // initialize screen
… …
808 XSynchronize (dpy, True); 805 XSynchronize (dpy, True);
809#endif 806#endif
810 807
811 if (option (Opt_scrollBar)) 808 if (option (Opt_scrollBar))
812 scrollBar.resize (); /* create and map scrollbar */ 809 scrollBar.resize (); /* create and map scrollbar */
810
813#ifdef HAVE_BG_PIXMAP 811#ifdef HAVE_BG_PIXMAP
814 {
815 bg_init (); 812 bg_init ();
816
817#ifdef ENABLE_TRANSPARENCY
818 if (option (Opt_transparent))
819 {
820 bg_set_transparent ();
821
822 if (rs [Rs_blurradius])
823 bg_set_blur (rs [Rs_blurradius]);
824
825 if (ISSET_PIXCOLOR (Color_tint))
826 bg_set_tint (pix_colors_focused [Color_tint]);
827
828 if (rs [Rs_shade])
829 bg_set_shade (rs [Rs_shade]);
830
831 bg_set_root_pixmap ();
832 XSelectInput (dpy, display->root, PropertyChangeMask);
833 rootwin_ev.start (display, display->root);
834 }
835#endif
836 }
837#endif 813#endif
838 814
839#if ENABLE_PERL 815#if ENABLE_PERL
840 rootwin_ev.start (display, display->root); 816 rootwin_ev.start (display, display->root);
841#endif 817#endif
… …
1009void 985void
1010rxvt_term::init_xlocale () 986rxvt_term::init_xlocale ()
1011{ 987{
1012 set_environ (envv); 988 set_environ (envv);
1013 989
1014#ifdef USE_XIM 990#if USE_XIM
1015 if (!locale) 991 if (!locale)
1016 rxvt_warn ("setting locale failed, continuing without locale support.\n"); 992 rxvt_warn ("setting locale failed, continuing without locale support.\n");
1017 else 993 else
1018 { 994 {
1019 set_string_property (xa[XA_WM_LOCALE_NAME], locale); 995 set_string_property (xa[XA_WM_LOCALE_NAME], locale);
… …
1282} 1258}
1283 1259
1284void 1260void
1285rxvt_term::set_icon (const char *file) 1261rxvt_term::set_icon (const char *file)
1286{ 1262{
1287#ifdef HAVE_PIXBUF 1263#if HAVE_PIXBUF
1288 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL); 1264 GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (file, NULL);
1289 if (!pixbuf) 1265 if (!pixbuf)
1290 { 1266 {
1291 rxvt_warn ("Loading image icon failed, continuing without.\n"); 1267 rxvt_warn ("Loading image icon failed, continuing without.\n");
1292 return; 1268 return;

Diff Legend

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