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.21 by root, Fri Jan 4 20:39:42 2008 UTC vs.
Revision 1.23 by ayin, Sat Jan 5 13:52:23 2008 UTC

96 h_scale = v_scale = 0; 96 h_scale = v_scale = 0;
97 h_align = v_align = 0; 97 h_align = v_align = 0;
98#endif 98#endif
99 flags = 0; 99 flags = 0;
100 pixmap = None; 100 pixmap = None;
101 valid_since = invalid_since = 0;
101} 102}
102 103
103void 104void
104bgPixmap_t::destroy () 105bgPixmap_t::destroy ()
105{ 106{
256 int x = 0, y = 0; 257 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 258 unsigned int w = 0, h = 0;
258 unsigned int n; 259 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 260 unsigned long new_flags = (flags & (~geometryFlags));
260 char *p; 261 char *p;
261# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 262# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 263
263 if (geom == NULL) 264 if (geom == NULL)
264 return false; 265 return false;
265 266
266 char str[MAXLEN_GEOM]; 267 char str[MAXLEN_GEOM];
511 100, ASIMAGE_QUALITY_DEFAULT); 512 100, ASIMAGE_QUALITY_DEFAULT);
512 } 513 }
513 if (background == NULL) 514 if (background == NULL)
514 { 515 {
515 /* if tiling - pixmap has to be sized exactly as the image, 516 /* if tiling - pixmap has to be sized exactly as the image,
516 but there is no need to make it bigger then the window! */ 517 but there is no need to make it bigger than the window! */
517 if (h_scale == 0) 518 if (h_scale == 0)
518 new_pmap_width = min (result->width, target_width); 519 new_pmap_width = min (result->width, target_width);
519 if (v_scale == 0) 520 if (v_scale == 0)
520 new_pmap_height = min (result->height, target_height); 521 new_pmap_height = min (result->height, target_height);
521 /* we also need to tile our image in one or both directions */ 522 /* we also need to tile our image in one or both directions */
1237 pixmap = None; 1238 pixmap = None;
1238 } 1239 }
1239 } 1240 }
1240 1241
1241 apply (); 1242 apply ();
1243
1244 XSync (target->dpy, False);
1245 valid_since = ev::now ();
1242 1246
1243 TIMING_TEST_PRINT_RESULT (tp); 1247 TIMING_TEST_PRINT_RESULT (tp);
1244 1248
1245 return true; 1249 return true;
1246} 1250}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines