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.253 by sf-exg, Sun Dec 30 15:52:37 2012 UTC vs.
Revision 1.254 by sf-exg, Sun Dec 30 20:28:31 2012 UTC

42 42
43bool 43bool
44rxvt_term::bg_window_size_sensitive () 44rxvt_term::bg_window_size_sensitive ()
45{ 45{
46# if BG_IMAGE_FROM_ROOT 46# if BG_IMAGE_FROM_ROOT
47 if (option (Opt_transparent)) 47 if (root_img)
48 return true; 48 return true;
49# endif 49# endif
50 50
51# if BG_IMAGE_FROM_FILE 51# if BG_IMAGE_FROM_FILE
52 if (fimage.img) 52 if (fimage.img)
63 63
64bool 64bool
65rxvt_term::bg_window_position_sensitive () 65rxvt_term::bg_window_position_sensitive ()
66{ 66{
67# if BG_IMAGE_FROM_ROOT 67# if BG_IMAGE_FROM_ROOT
68 if (option (Opt_transparent)) 68 if (root_img)
69 return true; 69 return true;
70# endif 70# endif
71 71
72# if BG_IMAGE_FROM_FILE 72# if BG_IMAGE_FROM_FILE
73 if (fimage.img) 73 if (fimage.img)
456 int sx, sy; 456 int sx, sy;
457 457
458 sx = parent_x; 458 sx = parent_x;
459 sy = parent_y; 459 sy = parent_y;
460 460
461 if (!root_img)
462 return false;
463
464 /* check if we are outside of the visible part of the virtual screen : */ 461 /* check if we are outside of the visible part of the virtual screen : */
465 if (sx + parent_width <= 0 || sy + parent_height <= 0 462 if (sx + parent_width <= 0 || sy + parent_height <= 0
466 || sx >= root_width || sy >= root_height) 463 || sx >= root_width || sy >= root_height)
467 return 0; 464 return 0;
468 465
506 503
507 if (!mapped) 504 if (!mapped)
508 return; 505 return;
509 506
510# if BG_IMAGE_FROM_ROOT 507# if BG_IMAGE_FROM_ROOT
511 if (option (Opt_transparent)) 508 if (root_img)
512 if (render_root_image ()) 509 if (render_root_image ())
513 bg_flags |= BG_IS_TRANSPARENT; 510 bg_flags |= BG_IS_TRANSPARENT;
514# endif 511# endif
515 512
516# if BG_IMAGE_FROM_FILE 513# if BG_IMAGE_FROM_FILE

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines