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.163 by sf-exg, Sat Aug 13 09:05:44 2011 UTC vs.
Revision 1.165 by sf-exg, Mon Aug 15 09:25:56 2011 UTC

… …
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/*
38 * Pixmap geometry string interpretation :
39 * Each geometry string contains zero or one scale/position
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 */
52
53#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
54void 38void
55rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
56{ 40{
57#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
218 geom_flags = WidthValue|HeightValue|XValue|YValue; 202 geom_flags = WidthValue|HeightValue|XValue|YValue;
219 } 203 }
220 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
221 { 205 {
222 new_flags = BG_PROP_SCALE; 206 new_flags = BG_PROP_SCALE;
207 w = h = windowScale;
223 x = y = centerAlign; 208 x = y = centerAlign;
224 geom_flags = XValue|YValue; 209 geom_flags = WidthValue|HeightValue|XValue|YValue;
225 } 210 }
226 else if (!strcasecmp (arr[i], "style=stretched")) 211 else if (!strcasecmp (arr[i], "style=stretched"))
227 { 212 {
228 new_flags = 0; 213 new_flags = 0;
229 w = h = windowScale; 214 w = h = windowScale;
… …
334rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 319rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
335{ 320{
336 int target_width = szHint.width; 321 int target_width = szHint.width;
337 int target_height = szHint.height; 322 int target_height = szHint.height;
338 323
324 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100;
326
339 if (bg_flags & BG_PROP_SCALE) 327 if (bg_flags & BG_PROP_SCALE)
340 { 328 {
341 float scale = (float)target_width / image_width; 329 float scale = (float)w / image_width;
342 min_it (scale, (float)target_height / image_height); 330 min_it (scale, (float)h / image_height);
343 w = image_width * scale + 0.5; 331 w = image_width * scale + 0.5;
344 h = image_height * scale + 0.5; 332 h = image_height * scale + 0.5;
345 } 333 }
346 else
347 {
348 w = h_scale * target_width / 100;
349 h = v_scale * target_height / 100;
350 }
351 334
352 if (!w) w = image_width; 335 if (!w) w = image_width;
353 if (!h) h = image_height; 336 if (!h) h = image_height;
354 337
355 if (bg_flags & BG_ROOT_ALIGN) 338 if (bg_flags & BG_ROOT_ALIGN)
… …
363 y = make_align_position (v_align, target_height, h); 346 y = make_align_position (v_align, target_height, h);
364 } 347 }
365 348
366 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 349 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
367 if (!(bg_flags & BG_TILE) 350 if (!(bg_flags & BG_TILE)
368 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 351 || h_scale || v_scale
369 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 352 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
370 || w > target_width || h > target_height) 353 || w > target_width || h > target_height)
371 bg_flags |= BG_IS_SIZE_SENSITIVE; 354 bg_flags |= BG_IS_SIZE_SENSITIVE;
372} 355}
373 356

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines