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.160 by sf-exg, Thu Aug 11 08:37:17 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
… …
197{ 181{
198 bool changed = false; 182 bool changed = false;
199 int geom_flags = 0; 183 int geom_flags = 0;
200 int x = 0, y = 0; 184 int x = 0, y = 0;
201 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
202 unsigned int n;
203 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
204 const char *ops;
205 187
206 if (geom == NULL) 188 if (geom == NULL)
207 return false; 189 return false;
208 190
209 char str[256]; 191 if (geom[0])
210
211 ops = strchr (geom, ':');
212 if (ops == NULL)
213 n = strlen (geom);
214 else
215 n = ops - geom;
216
217 if (n >= sizeof (str))
218 return false;
219
220 memcpy (str, geom, n);
221 str[n] = '\0';
222 rxvt_strtrim (str);
223
224 if (str[0])
225 { 192 {
226 /* we have geometry string - let's handle it prior to applying ops */ 193 char **arr = rxvt_strsplit (':', geom);
194
195 for (int i = 0; arr[i]; i++)
196 {
197 if (!strcasecmp (arr[i], "style=tiled"))
198 {
199 new_flags = BG_TILE;
200 w = h = noScale;
201 x = y = 0;
202 geom_flags = WidthValue|HeightValue|XValue|YValue;
203 }
204 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
205 {
206 new_flags = BG_PROP_SCALE;
207 w = h = windowScale;
208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 }
211 else if (!strcasecmp (arr[i], "style=stretched"))
212 {
213 new_flags = 0;
214 w = h = windowScale;
215 geom_flags = WidthValue|HeightValue;
216 }
217 else if (!strcasecmp (arr[i], "style=centered"))
218 {
219 new_flags = 0;
220 w = h = noScale;
221 x = y = centerAlign;
222 geom_flags = WidthValue|HeightValue|XValue|YValue;
223 }
224 else if (!strcasecmp (arr[i], "style=root-tiled"))
225 {
226 new_flags = BG_TILE|BG_ROOT_ALIGN;
227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue;
229 }
230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=pscale"))
233 new_flags |= BG_PROP_SCALE;
234 else if (!strcasecmp (arr[i], "op=root"))
235 new_flags |= BG_ROOT_ALIGN;
236
237 // deprecated
238 else if (!strcasecmp (arr[i], "tile"))
239 {
240 new_flags |= BG_TILE;
241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue;
243 }
244 else if (!strcasecmp (arr[i], "propscale"))
245 {
246 new_flags |= BG_PROP_SCALE;
247 }
248 else if (!strcasecmp (arr[i], "hscale"))
249 {
250 new_flags |= BG_TILE;
251 w = windowScale;
252 h = noScale;
253 geom_flags |= WidthValue|HeightValue;
254 }
255 else if (!strcasecmp (arr[i], "vscale"))
256 {
257 new_flags |= BG_TILE;
258 h = windowScale;
259 w = noScale;
260 geom_flags |= WidthValue|HeightValue;
261 }
262 else if (!strcasecmp (arr[i], "scale"))
263 {
264 w = h = windowScale;
265 geom_flags |= WidthValue|HeightValue;
266 }
267 else if (!strcasecmp (arr[i], "auto"))
268 {
269 w = h = windowScale;
270 x = y = centerAlign;
271 geom_flags |= WidthValue|HeightValue|XValue|YValue;
272 }
273 else if (!strcasecmp (arr[i], "root"))
274 {
275 new_flags |= BG_TILE|BG_ROOT_ALIGN;
276 w = h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279
280 else
227 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
228 } /* done parsing geometry string */ 282 } /* done parsing ops */
283
284 rxvt_free_strsplit (arr);
285 }
229 286
230 if (!update) 287 if (!update)
231 { 288 {
232 if (!(geom_flags & XValue)) 289 if (!(geom_flags & XValue))
233 x = y = defaultAlign; 290 x = y = defaultAlign;
… …
242 w = h; 299 w = h;
243 300
244 geom_flags |= WidthValue|HeightValue|XValue|YValue; 301 geom_flags |= WidthValue|HeightValue|XValue|YValue;
245 } 302 }
246 303
247 if (ops)
248 {
249 char **arr = rxvt_strsplit (':', ops + 1);
250
251 for (int i = 0; arr[i]; i++)
252 {
253 if (!strcasecmp (arr[i], "style=tiled"))
254 {
255 new_flags = BG_TILE;
256 w = h = noScale;
257 x = y = 0;
258 geom_flags = WidthValue|HeightValue|XValue|YValue;
259 }
260 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
261 {
262 new_flags = BG_PROP_SCALE;
263 x = y = centerAlign;
264 geom_flags = XValue|YValue;
265 }
266 else if (!strcasecmp (arr[i], "style=stretched"))
267 {
268 new_flags = 0;
269 w = h = windowScale;
270 geom_flags = WidthValue|HeightValue;
271 }
272 else if (!strcasecmp (arr[i], "style=centered"))
273 {
274 new_flags = 0;
275 w = h = noScale;
276 x = y = centerAlign;
277 geom_flags = WidthValue|HeightValue|XValue|YValue;
278 }
279 else if (!strcasecmp (arr[i], "style=root-tiled"))
280 {
281 new_flags = BG_TILE|BG_ROOT_ALIGN;
282 w = h = noScale;
283 geom_flags = WidthValue|HeightValue;
284 }
285 else if (!strcasecmp (arr[i], "op=tile"))
286 new_flags |= BG_TILE;
287 else if (!strcasecmp (arr[i], "op=pscale"))
288 new_flags |= BG_PROP_SCALE;
289 else if (!strcasecmp (arr[i], "op=root"))
290 new_flags |= BG_ROOT_ALIGN;
291
292 // deprecated
293 else if (!strcasecmp (arr[i], "tile"))
294 {
295 new_flags |= BG_TILE;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299 else if (!strcasecmp (arr[i], "propscale"))
300 {
301 new_flags |= BG_PROP_SCALE;
302 }
303 else if (!strcasecmp (arr[i], "scale"))
304 {
305 if (h == 0) h = windowScale;
306 if (w == 0) w = windowScale;
307
308 geom_flags |= WidthValue|HeightValue;
309 }
310 else if (!strcasecmp (arr[i], "root"))
311 {
312 new_flags |= BG_TILE|BG_ROOT_ALIGN;
313 w = h = noScale;
314 geom_flags |= WidthValue|HeightValue;
315 }
316 } /* done parsing ops */
317
318 rxvt_free_strsplit (arr);
319 }
320
321 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 304 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
322 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 305 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
323 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 306 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
324 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 307 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
325 308
… …
336rxvt_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)
337{ 320{
338 int target_width = szHint.width; 321 int target_width = szHint.width;
339 int target_height = szHint.height; 322 int target_height = szHint.height;
340 323
324 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100;
326
341 if (bg_flags & BG_PROP_SCALE) 327 if (bg_flags & BG_PROP_SCALE)
342 { 328 {
343 float scale = (float)target_width / image_width; 329 float scale = (float)w / image_width;
344 min_it (scale, (float)target_height / image_height); 330 min_it (scale, (float)h / image_height);
345 w = image_width * scale + 0.5; 331 w = image_width * scale + 0.5;
346 h = image_height * scale + 0.5; 332 h = image_height * scale + 0.5;
347 } 333 }
348 else
349 {
350 w = h_scale * target_width / 100;
351 h = v_scale * target_height / 100;
352 }
353 334
354 if (!w) w = image_width; 335 if (!w) w = image_width;
355 if (!h) h = image_height; 336 if (!h) h = image_height;
356 337
357 if (bg_flags & BG_ROOT_ALIGN) 338 if (bg_flags & BG_ROOT_ALIGN)
… …
365 y = make_align_position (v_align, target_height, h); 346 y = make_align_position (v_align, target_height, h);
366 } 347 }
367 348
368 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 349 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
369 if (!(bg_flags & BG_TILE) 350 if (!(bg_flags & BG_TILE)
370 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 351 || h_scale || v_scale
371 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 352 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
372 || w > target_width || h > target_height) 353 || w > target_width || h > target_height)
373 bg_flags |= BG_IS_SIZE_SENSITIVE; 354 bg_flags |= BG_IS_SIZE_SENSITIVE;
374} 355}
375 356

Diff Legend

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