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.171 by sf-exg, Sun Aug 21 14:38:39 2011 UTC vs.
Revision 1.172 by sf-exg, Tue Aug 30 15:00:27 2011 UTC

150 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
151 151
152 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
153 return diff * align / 100; 153 return diff * align / 100;
154 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
155 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
156 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
157 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
158 return 0; 158 return 0;
159} 159}
160 160
161static inline int 161static inline int
162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
181{ 181{
182 bool changed = false; 182 bool changed = false;
183 int geom_flags = 0; 183 int geom_flags = 0;
184 int x = 0, y = 0; 184 int x = 0, y = 0;
185 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
186 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
187 187
188 if (geom == NULL) 188 if (geom == NULL)
189 return false; 189 return false;
190 190
191 if (geom[0]) 191 if (geom[0])
412 412
413 if (!original_asim 413 if (!original_asim
414 || (!(bg_flags & BG_ROOT_ALIGN) 414 || (!(bg_flags & BG_ROOT_ALIGN)
415 && (x >= target_width 415 && (x >= target_width
416 || y >= target_height 416 || y >= target_height
417 || (x + w <= 0) 417 || x + w <= 0
418 || (y + h <= 0)))) 418 || y + h <= 0)))
419 { 419 {
420 if (background) 420 if (background)
421 { 421 {
422 new_pmap_width = background->width; 422 new_pmap_width = background->width;
423 new_pmap_height = background->height; 423 new_pmap_height = background->height;
437 } 437 }
438 else 438 else
439 { 439 {
440 result = original_asim; 440 result = original_asim;
441 441
442 if ((w != original_asim->width) 442 if (w != original_asim->width
443 || (h != original_asim->height)) 443 || h != original_asim->height)
444 { 444 {
445 result = scale_asimage (asv, original_asim, 445 result = scale_asimage (asv, original_asim,
446 w, h, 446 w, h,
447 ASA_XImage, 447 ASA_XImage,
448 100, ASIMAGE_QUALITY_DEFAULT); 448 100, ASIMAGE_QUALITY_DEFAULT);
702 get_image_geometry (image_width, image_height, w, h, x, y); 702 get_image_geometry (image_width, image_height, w, h, x, y);
703 703
704 if (!(bg_flags & BG_ROOT_ALIGN) 704 if (!(bg_flags & BG_ROOT_ALIGN)
705 && (x >= target_width 705 && (x >= target_width
706 || y >= target_height 706 || y >= target_height
707 || (x + w <= 0) 707 || x + w <= 0
708 || (y + h <= 0))) 708 || y + h <= 0))
709 return false; 709 return false;
710 710
711 result = pixbuf; 711 result = pixbuf;
712 712
713 if ((w != image_width) 713 if (w != image_width
714 || (h != image_height)) 714 || h != image_height)
715 { 715 {
716 result = gdk_pixbuf_scale_simple (pixbuf, 716 result = gdk_pixbuf_scale_simple (pixbuf,
717 w, h, 717 w, h,
718 GDK_INTERP_BILINEAR); 718 GDK_INTERP_BILINEAR);
719 } 719 }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines