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.150 by sf-exg, Sun May 8 21:00:45 2011 UTC vs.
Revision 1.151 by sf-exg, Sun May 8 21:02:28 2011 UTC

723 result = gdk_pixbuf_scale_simple (pixbuf, 723 result = gdk_pixbuf_scale_simple (pixbuf,
724 w, h, 724 w, h,
725 GDK_INTERP_BILINEAR); 725 GDK_INTERP_BILINEAR);
726 } 726 }
727 727
728 if (!result)
729 return false;
730
728 bool ret = false; 731 bool ret = false;
729 732
730 if (result)
731 {
732 XGCValues gcv; 733 XGCValues gcv;
733 GC gc; 734 GC gc;
734 Pixmap root_pmap; 735 Pixmap root_pmap;
735 736
736 image_width = gdk_pixbuf_get_width (result); 737 image_width = gdk_pixbuf_get_width (result);
842 g_object_unref (result); 843 g_object_unref (result);
843 844
844 XFreeGC (dpy, gc); 845 XFreeGC (dpy, gc);
845 846
846 ret = true; 847 ret = true;
847 }
848 848
849 return ret; 849 return ret;
850} 850}
851# endif /* HAVE_PIXBUF */ 851# endif /* HAVE_PIXBUF */
852 852
1252 if (src && dst) 1252 if (src && dst)
1253 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1253 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1254 else 1254 else
1255 { 1255 {
1256 XFreePixmap (dpy, recoded_root_pmap); 1256 XFreePixmap (dpy, recoded_root_pmap);
1257 root_pixmap = None; 1257 recoded_root_pmap = None;
1258 } 1258 }
1259 1259
1260 XRenderFreePicture (dpy, src); 1260 XRenderFreePicture (dpy, src);
1261 XRenderFreePicture (dpy, dst); 1261 XRenderFreePicture (dpy, dst);
1262 } 1262 }
1263 else 1263 else
1264#endif 1264#endif
1265 root_pixmap = None; 1265 recoded_root_pmap = None;
1266 } 1266 }
1267 1267
1268 if (root_pixmap == None) 1268 if (recoded_root_pmap == None)
1269 return 0; 1269 return 0;
1270 1270
1271 if (bg_pixmap == None 1271 if (bg_pixmap == None
1272 || bg_pmap_width != window_width 1272 || bg_pmap_width != window_width
1273 || bg_pmap_height != window_height) 1273 || bg_pmap_height != window_height)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines