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.159 by sf-exg, Wed Aug 10 07:34:35 2011 UTC vs.
Revision 1.170 by sf-exg, Sun Aug 21 11:00:02 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 * tile Tile image. Scaling/position modifiers above will affect
52 * the tile size and origin.
53 * propscale When scaling, scale proportionally. That is, maintain the
54 * proper aspect ratio for the image. Any portion of the
55 * background not covered by the image is filled with the
56 * current background color.
57 * scale Scale both up and down
58 */
59
60#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
61void 38void
62rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
63{ 40{
64#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
204{ 181{
205 bool changed = false; 182 bool changed = false;
206 int geom_flags = 0; 183 int geom_flags = 0;
207 int x = 0, y = 0; 184 int x = 0, y = 0;
208 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
209 unsigned int n;
210 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
211 const char *ops;
212 187
213 if (geom == NULL) 188 if (geom == NULL)
214 return false; 189 return false;
215 190
216 char str[256]; 191 if (geom[0])
217
218 ops = strchr (geom, ':');
219 if (ops == NULL)
220 n = strlen (geom);
221 else
222 n = ops - geom;
223
224 if (n >= sizeof (str))
225 return false;
226
227 memcpy (str, geom, n);
228 str[n] = '\0';
229 rxvt_strtrim (str);
230
231 if (str[0])
232 { 192 {
233 /* 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
234 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
235 } /* done parsing geometry string */ 282 } /* done parsing ops */
283
284 rxvt_free_strsplit (arr);
285 }
236 286
237 if (!update) 287 if (!update)
238 { 288 {
239 if (!(geom_flags & XValue)) 289 if (!(geom_flags & XValue))
240 x = y = defaultAlign; 290 x = y = defaultAlign;
… …
249 w = h; 299 w = h;
250 300
251 geom_flags |= WidthValue|HeightValue|XValue|YValue; 301 geom_flags |= WidthValue|HeightValue|XValue|YValue;
252 } 302 }
253 303
254 if (ops)
255 {
256 char **arr = rxvt_strsplit (':', ops + 1);
257
258 for (int i = 0; arr[i]; i++)
259 {
260 if (!strcasecmp (arr[i], "tile"))
261 {
262 new_flags |= BG_TILE;
263 w = h = noScale;
264 geom_flags |= WidthValue|HeightValue;
265 }
266 else if (!strcasecmp (arr[i], "propscale"))
267 {
268 new_flags |= BG_PROP_SCALE;
269 }
270 else if (!strcasecmp (arr[i], "scale"))
271 {
272 if (h == 0) h = windowScale;
273 if (w == 0) w = windowScale;
274
275 geom_flags |= WidthValue|HeightValue;
276 }
277 else if (!strcasecmp (arr[i], "center"))
278 {
279 w = h = noScale;
280 x = y = centerAlign;
281 geom_flags |= WidthValue|HeightValue|XValue|YValue;
282 }
283 else if (!strcasecmp (arr[i], "root"))
284 {
285 new_flags |= BG_TILE|BG_ROOT_ALIGN;
286 w = h = noScale;
287 geom_flags |= WidthValue|HeightValue;
288 }
289 } /* done parsing ops */
290
291 rxvt_free_strsplit (arr);
292 }
293
294 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;
295 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;
296 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;
297 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;
298 308
… …
309rxvt_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)
310{ 320{
311 int target_width = szHint.width; 321 int target_width = szHint.width;
312 int target_height = szHint.height; 322 int target_height = szHint.height;
313 323
324 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100;
326
314 if (bg_flags & BG_PROP_SCALE) 327 if (bg_flags & BG_PROP_SCALE)
315 { 328 {
316 float scale = (float)target_width / image_width; 329 float scale = (float)w / image_width;
317 min_it (scale, (float)target_height / image_height); 330 min_it (scale, (float)h / image_height);
318 w = image_width * scale + 0.5; 331 w = image_width * scale + 0.5;
319 h = image_height * scale + 0.5; 332 h = image_height * scale + 0.5;
320 } 333 }
321 else
322 {
323 w = h_scale * target_width / 100;
324 h = v_scale * target_height / 100;
325 }
326 334
327 if (!w) w = image_width; 335 if (!w) w = image_width;
328 if (!h) h = image_height; 336 if (!h) h = image_height;
329 337
330 if (bg_flags & BG_ROOT_ALIGN) 338 if (bg_flags & BG_ROOT_ALIGN)
… …
338 y = make_align_position (v_align, target_height, h); 346 y = make_align_position (v_align, target_height, h);
339 } 347 }
340 348
341 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 349 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
342 if (!(bg_flags & BG_TILE) 350 if (!(bg_flags & BG_TILE)
343 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 351 || h_scale || v_scale
344 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 352 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
345 || w > target_width || h > target_height) 353 || w > target_width || h > target_height)
346 bg_flags |= BG_IS_SIZE_SENSITIVE; 354 bg_flags |= BG_IS_SIZE_SENSITIVE;
347} 355}
348 356
… …
375 } 383 }
376 384
377 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
378 { 386 {
379 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 387 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
380 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 388 ASA_XImage,
381 100, ASIMAGE_QUALITY_DEFAULT); 389 100, ASIMAGE_QUALITY_DEFAULT);
382 if (tmp) 390 if (tmp)
383 { 391 {
384 destroy_asimage (&background); 392 destroy_asimage (&background);
385 background = tmp; 393 background = tmp;
… …
434 if ((w != original_asim->width) 442 if ((w != original_asim->width)
435 || (h != original_asim->height)) 443 || (h != original_asim->height))
436 { 444 {
437 result = scale_asimage (asv, original_asim, 445 result = scale_asimage (asv, original_asim,
438 w, h, 446 w, h,
439 background ? ASA_ASImage : ASA_XImage, 447 ASA_XImage,
440 100, ASIMAGE_QUALITY_DEFAULT); 448 100, ASIMAGE_QUALITY_DEFAULT);
441 } 449 }
442 450
443 if (background == NULL) 451 if (background == NULL)
444 { 452 {
… …
840rxvt_term::bg_set_file (const char *file) 848rxvt_term::bg_set_file (const char *file)
841{ 849{
842 if (!file || !*file) 850 if (!file || !*file)
843 return false; 851 return false;
844 852
853 bool ret = false;
845 if (const char *p = strchr (file, ';')) 854 const char *p = strchr (file, ';');
855
856 if (p)
846 { 857 {
847 size_t len = p - file; 858 size_t len = p - file;
848 char *f = rxvt_temp_buf<char> (len + 1); 859 char *f = rxvt_temp_buf<char> (len + 1);
849 memcpy (f, file, len); 860 memcpy (f, file, len);
850 f[len] = '\0'; 861 f[len] = '\0';
… …
859 { 870 {
860 if (original_asim) 871 if (original_asim)
861 safe_asimage_destroy (original_asim); 872 safe_asimage_destroy (original_asim);
862 original_asim = image; 873 original_asim = image;
863 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 874 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
864 return true; 875 ret = true;
865 } 876 }
866# endif 877# endif
867 878
868# ifdef HAVE_PIXBUF 879# ifdef HAVE_PIXBUF
869 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 880 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
871 { 882 {
872 if (pixbuf) 883 if (pixbuf)
873 g_object_unref (pixbuf); 884 g_object_unref (pixbuf);
874 pixbuf = image; 885 pixbuf = image;
875 bg_flags |= BG_IS_FROM_FILE; 886 bg_flags |= BG_IS_FROM_FILE;
876 return true; 887 ret = true;
877 } 888 }
878# endif 889# endif
879 890
891 if (ret)
892 {
893 if (p)
894 bg_set_geometry (p + 1);
895 else
896 bg_set_default_geometry ();
897 }
898
880 return false; 899 return ret;
881} 900}
882 901
883# endif /* BG_IMAGE_FROM_FILE */ 902# endif /* BG_IMAGE_FROM_FILE */
884 903
885# ifdef ENABLE_TRANSPARENCY 904# ifdef ENABLE_TRANSPARENCY
… …
1413} 1432}
1414 1433
1415#endif /* HAVE_BG_PIXMAP */ 1434#endif /* HAVE_BG_PIXMAP */
1416 1435
1417#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1436#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1418/* taken from aterm-0.4.2 */ 1437/* based on code from aterm-0.4.2 */
1419 1438
1420static void 1439static void
1421shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1440shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1422{ 1441{
1423 int sh_r, sh_g, sh_b; 1442 int sh_r, sh_g, sh_b;

Diff Legend

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