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.173 by sf-exg, Sun Nov 20 11:09:21 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
… …
166 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
167 151
168 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
169 return diff * align / 100; 153 return diff * align / 100;
170 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
171 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
172 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
173 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
174 return 0; 158 return 0;
175} 159}
176 160
177static inline int 161static inline int
178make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
… …
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 long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
203 187
204 if (geom == NULL) 188 if (geom == NULL)
205 return false; 189 return false;
206 190
207 if (geom[0]) 191 if (geom[0])
208 { 192 {
209 char **arr = rxvt_strsplit (':', geom); 193 char **arr = rxvt_strsplit (':', geom);
210 194
211 for (int i = 0; arr[i]; i++) 195 for (int i = 0; arr[i]; i++)
212 { 196 {
213 if (!strcasecmp (arr[i], "style=tiled")) 197 if (!strcasecmp (arr[i], "style=tiled"))
214 { 198 {
215 new_flags = BG_TILE; 199 new_flags = BG_TILE;
216 w = h = noScale; 200 w = h = noScale;
… …
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
… …
400 } 383 }
401 384
402 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
403 { 386 {
404 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,
405 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 388 ASA_XImage,
406 100, ASIMAGE_QUALITY_DEFAULT); 389 100, ASIMAGE_QUALITY_DEFAULT);
407 if (tmp) 390 if (tmp)
408 { 391 {
409 destroy_asimage (&background); 392 destroy_asimage (&background);
410 background = tmp; 393 background = tmp;
… …
429 412
430 if (!original_asim 413 if (!original_asim
431 || (!(bg_flags & BG_ROOT_ALIGN) 414 || (!(bg_flags & BG_ROOT_ALIGN)
432 && (x >= target_width 415 && (x >= target_width
433 || y >= target_height 416 || y >= target_height
434 || (x + w <= 0) 417 || x + w <= 0
435 || (y + h <= 0)))) 418 || y + h <= 0)))
436 { 419 {
437 if (background) 420 if (background)
438 { 421 {
439 new_pmap_width = background->width; 422 new_pmap_width = background->width;
440 new_pmap_height = background->height; 423 new_pmap_height = background->height;
… …
454 } 437 }
455 else 438 else
456 { 439 {
457 result = original_asim; 440 result = original_asim;
458 441
459 if ((w != original_asim->width) 442 if (w != original_asim->width
460 || (h != original_asim->height)) 443 || h != original_asim->height)
461 { 444 {
462 result = scale_asimage (asv, original_asim, 445 result = scale_asimage (asv, original_asim,
463 w, h, 446 w, h,
464 background ? ASA_ASImage : ASA_XImage, 447 ASA_XImage,
465 100, ASIMAGE_QUALITY_DEFAULT); 448 100, ASIMAGE_QUALITY_DEFAULT);
466 } 449 }
467 450
468 if (background == NULL) 451 if (background == NULL)
469 { 452 {
… …
719 get_image_geometry (image_width, image_height, w, h, x, y); 702 get_image_geometry (image_width, image_height, w, h, x, y);
720 703
721 if (!(bg_flags & BG_ROOT_ALIGN) 704 if (!(bg_flags & BG_ROOT_ALIGN)
722 && (x >= target_width 705 && (x >= target_width
723 || y >= target_height 706 || y >= target_height
724 || (x + w <= 0) 707 || x + w <= 0
725 || (y + h <= 0))) 708 || y + h <= 0))
726 return false; 709 return false;
727 710
728 result = pixbuf; 711 result = pixbuf;
729 712
730 if ((w != image_width) 713 if (w != image_width
731 || (h != image_height)) 714 || h != image_height)
732 { 715 {
733 result = gdk_pixbuf_scale_simple (pixbuf, 716 result = gdk_pixbuf_scale_simple (pixbuf,
734 w, h, 717 w, h,
735 GDK_INTERP_BILINEAR); 718 GDK_INTERP_BILINEAR);
736 } 719 }
… …
865rxvt_term::bg_set_file (const char *file) 848rxvt_term::bg_set_file (const char *file)
866{ 849{
867 if (!file || !*file) 850 if (!file || !*file)
868 return false; 851 return false;
869 852
853 bool ret = false;
870 if (const char *p = strchr (file, ';')) 854 const char *p = strchr (file, ';');
855
856 if (p)
871 { 857 {
872 size_t len = p - file; 858 size_t len = p - file;
873 char *f = rxvt_temp_buf<char> (len + 1); 859 char *f = rxvt_temp_buf<char> (len + 1);
874 memcpy (f, file, len); 860 memcpy (f, file, len);
875 f[len] = '\0'; 861 f[len] = '\0';
… …
884 { 870 {
885 if (original_asim) 871 if (original_asim)
886 safe_asimage_destroy (original_asim); 872 safe_asimage_destroy (original_asim);
887 original_asim = image; 873 original_asim = image;
888 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 874 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
889 return true; 875 ret = true;
890 } 876 }
891# endif 877# endif
892 878
893# ifdef HAVE_PIXBUF 879# ifdef HAVE_PIXBUF
894 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 880 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
896 { 882 {
897 if (pixbuf) 883 if (pixbuf)
898 g_object_unref (pixbuf); 884 g_object_unref (pixbuf);
899 pixbuf = image; 885 pixbuf = image;
900 bg_flags |= BG_IS_FROM_FILE; 886 bg_flags |= BG_IS_FROM_FILE;
901 return true; 887 ret = true;
902 } 888 }
903# endif 889# endif
904 890
891 if (ret)
892 {
893 if (p)
894 bg_set_geometry (p + 1);
895 else
896 bg_set_default_geometry ();
897 }
898
905 return false; 899 return ret;
906} 900}
907 901
908# endif /* BG_IMAGE_FROM_FILE */ 902# endif /* BG_IMAGE_FROM_FILE */
909 903
910# ifdef ENABLE_TRANSPARENCY 904# ifdef ENABLE_TRANSPARENCY
… …
1347 { 1341 {
1348 /* we need to re-generate transparency pixmap in that case ! */ 1342 /* we need to re-generate transparency pixmap in that case ! */
1349 tr_flags = make_transparency_pixmap (); 1343 tr_flags = make_transparency_pixmap ();
1350 if (tr_flags == 0) 1344 if (tr_flags == 0)
1351 return false; 1345 return false;
1352 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1353 bg_flags |= BG_IS_VALID; 1346 bg_flags |= BG_IS_VALID;
1354 } 1347 }
1355# endif 1348# endif
1356 1349
1357# ifdef BG_IMAGE_FROM_FILE 1350# ifdef BG_IMAGE_FROM_FILE
1358 if ((bg_flags & BG_IS_FROM_FILE) 1351 if ((bg_flags & BG_IS_FROM_FILE)
… …
1364# endif 1357# endif
1365 1358
1366# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1359# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1367 XImage *result = NULL; 1360 XImage *result = NULL;
1368 1361
1369 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1362 if (tr_flags & BG_NEEDS_TINT)
1370 { 1363 {
1371 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1364 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1372 } 1365 }
1373 1366
1374 if (result) 1367 if (result)
1375 { 1368 {
1376 /* our own client-side tinting */ 1369 /* our own client-side tinting */
1377 if (tr_flags & BG_NEEDS_TINT) 1370 //if (tr_flags & BG_NEEDS_TINT)
1371 if (1)
1378 { 1372 {
1379 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1380 if (bg_flags & BG_TINT_SET) 1374 if (bg_flags & BG_TINT_SET)
1381 tint.get (c); 1375 tint.get (c);
1382 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1387 if (gc) 1381 if (gc)
1388 { 1382 {
1389 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1383 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1390 1384
1391 XFreeGC (dpy, gc); 1385 XFreeGC (dpy, gc);
1392 bg_flags |= BG_IS_VALID;
1393 } 1386 }
1394 1387
1395 XDestroyImage (result); 1388 XDestroyImage (result);
1396 } 1389 }
1397# endif 1390# endif
… …
1438} 1431}
1439 1432
1440#endif /* HAVE_BG_PIXMAP */ 1433#endif /* HAVE_BG_PIXMAP */
1441 1434
1442#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1435#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1443/* taken from aterm-0.4.2 */ 1436/* based on code from aterm-0.4.2 */
1444 1437
1445static void 1438static void
1446shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1439shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1447{ 1440{
1448 int sh_r, sh_g, sh_b; 1441 int sh_r, sh_g, sh_b;

Diff Legend

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