ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.246 by sf-exg, Sat Dec 29 14:23:35 2012 UTC vs.
Revision 1.247 by sf-exg, Sat Dec 29 18:12:53 2012 UTC

45 45
46bool 46bool
47rxvt_term::bg_window_size_sensitive () 47rxvt_term::bg_window_size_sensitive ()
48{ 48{
49# if BG_IMAGE_FROM_ROOT 49# if BG_IMAGE_FROM_ROOT
50 if (bg_flags & BG_IS_TRANSPARENT) 50 if (option (Opt_transparent))
51 return true; 51 return true;
52# endif 52# endif
53 53
54# if BG_IMAGE_FROM_FILE 54# if BG_IMAGE_FROM_FILE
55 if (fimage.img) 55 if (fimage.img)
66 66
67bool 67bool
68rxvt_term::bg_window_position_sensitive () 68rxvt_term::bg_window_position_sensitive ()
69{ 69{
70# if BG_IMAGE_FROM_ROOT 70# if BG_IMAGE_FROM_ROOT
71 if (bg_flags & BG_IS_TRANSPARENT) 71 if (option (Opt_transparent))
72 return true; 72 return true;
73# endif 73# endif
74 74
75# if BG_IMAGE_FROM_FILE 75# if BG_IMAGE_FROM_FILE
76 if (fimage.img) 76 if (fimage.img)
503 if (bg_flags & BG_INHIBIT_RENDER) 503 if (bg_flags & BG_INHIBIT_RENDER)
504 return; 504 return;
505 505
506 bg_invalidate (); 506 bg_invalidate ();
507# if BG_IMAGE_FROM_ROOT 507# if BG_IMAGE_FROM_ROOT
508 if (bg_flags & BG_IS_TRANSPARENT) 508 if (option (Opt_transparent))
509 { 509 {
510 /* we need to re-generate transparency pixmap in that case ! */ 510 /* we need to re-generate transparency pixmap in that case ! */
511 if (render_root_image ()) 511 if (render_root_image ())
512 bg_flags |= BG_IS_VALID; 512 bg_flags |= BG_IS_VALID | BG_IS_TRANSPARENT;
513 } 513 }
514# endif 514# endif
515 515
516# if BG_IMAGE_FROM_FILE 516# if BG_IMAGE_FROM_FILE
517 if (fimage.img) 517 if (fimage.img)
537rxvt_term::bg_init () 537rxvt_term::bg_init ()
538{ 538{
539#if BG_IMAGE_FROM_ROOT 539#if BG_IMAGE_FROM_ROOT
540 if (option (Opt_transparent)) 540 if (option (Opt_transparent))
541 { 541 {
542 bg_set_transparent ();
543
544 if (rs [Rs_blurradius]) 542 if (rs [Rs_blurradius])
545 root_effects.set_blur (rs [Rs_blurradius]); 543 root_effects.set_blur (rs [Rs_blurradius]);
546 544
547 if (ISSET_PIXCOLOR (Color_tint)) 545 if (ISSET_PIXCOLOR (Color_tint))
548 root_effects.set_tint (pix_colors_focused [Color_tint]); 546 root_effects.set_tint (pix_colors_focused [Color_tint]);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines