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.180 by sf-exg, Sat Dec 24 09:44:23 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;
217 x = y = 0; 201 x = y = 0;
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_KEEP_ASPECT;
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;
242 w = h = noScale; 227 w = h = noScale;
243 geom_flags = WidthValue|HeightValue; 228 geom_flags = WidthValue|HeightValue;
244 } 229 }
245 else if (!strcasecmp (arr[i], "op=tile")) 230 else if (!strcasecmp (arr[i], "op=tile"))
246 new_flags |= BG_TILE; 231 new_flags |= BG_TILE;
247 else if (!strcasecmp (arr[i], "op=pscale")) 232 else if (!strcasecmp (arr[i], "op=keep-aspect"))
248 new_flags |= BG_PROP_SCALE; 233 new_flags |= BG_KEEP_ASPECT;
249 else if (!strcasecmp (arr[i], "op=root")) 234 else if (!strcasecmp (arr[i], "op=root-align"))
250 new_flags |= BG_ROOT_ALIGN; 235 new_flags |= BG_ROOT_ALIGN;
251 236
252 // deprecated 237 // deprecated
253 else if (!strcasecmp (arr[i], "tile")) 238 else if (!strcasecmp (arr[i], "tile"))
254 { 239 {
256 w = h = noScale; 241 w = h = noScale;
257 geom_flags |= WidthValue|HeightValue; 242 geom_flags |= WidthValue|HeightValue;
258 } 243 }
259 else if (!strcasecmp (arr[i], "propscale")) 244 else if (!strcasecmp (arr[i], "propscale"))
260 { 245 {
261 new_flags |= BG_PROP_SCALE; 246 new_flags |= BG_KEEP_ASPECT;
247 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
262 } 249 }
263 else if (!strcasecmp (arr[i], "hscale")) 250 else if (!strcasecmp (arr[i], "hscale"))
264 { 251 {
265 new_flags |= BG_TILE; 252 new_flags |= BG_TILE;
266 w = windowScale; 253 w = windowScale;
334rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 321rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
335{ 322{
336 int target_width = szHint.width; 323 int target_width = szHint.width;
337 int target_height = szHint.height; 324 int target_height = szHint.height;
338 325
326 w = h_scale * target_width / 100;
327 h = v_scale * target_height / 100;
328
339 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
340 { 330 {
341 float scale = (float)target_width / image_width; 331 float scale = (float)w / image_width;
342 min_it (scale, (float)target_height / image_height); 332 min_it (scale, (float)h / image_height);
343 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
344 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
345 } 335 }
346 else
347 {
348 w = h_scale * target_width / 100;
349 h = v_scale * target_height / 100;
350 }
351 336
352 if (!w) w = image_width; 337 if (!w) w = image_width;
353 if (!h) h = image_height; 338 if (!h) h = image_height;
354 339
355 if (bg_flags & BG_ROOT_ALIGN) 340 if (bg_flags & BG_ROOT_ALIGN)
363 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (v_align, target_height, h);
364 } 349 }
365 350
366 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
367 if (!(bg_flags & BG_TILE) 352 if (!(bg_flags & BG_TILE)
368 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 353 || h_scale || v_scale
369 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
370 || w > target_width || h > target_height) 355 || w > target_width || h > target_height)
371 bg_flags |= BG_IS_SIZE_SENSITIVE; 356 bg_flags |= BG_IS_SIZE_SENSITIVE;
372} 357}
373 358
400 } 385 }
401 386
402 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
403 { 388 {
404 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 389 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
405 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
406 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
407 if (tmp) 392 if (tmp)
408 { 393 {
409 destroy_asimage (&background); 394 destroy_asimage (&background);
410 background = tmp; 395 background = tmp;
429 414
430 if (!original_asim 415 if (!original_asim
431 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
432 && (x >= target_width 417 && (x >= target_width
433 || y >= target_height 418 || y >= target_height
434 || (x + w <= 0) 419 || x + w <= 0
435 || (y + h <= 0)))) 420 || y + h <= 0)))
436 { 421 {
437 if (background) 422 if (background)
438 { 423 {
439 new_pmap_width = background->width; 424 new_pmap_width = background->width;
440 new_pmap_height = background->height; 425 new_pmap_height = background->height;
454 } 439 }
455 else 440 else
456 { 441 {
457 result = original_asim; 442 result = original_asim;
458 443
459 if ((w != original_asim->width) 444 if (w != original_asim->width
460 || (h != original_asim->height)) 445 || h != original_asim->height)
461 { 446 {
462 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
463 w, h, 448 w, h,
464 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
465 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
466 } 451 }
467 452
468 if (background == NULL) 453 if (background == NULL)
469 { 454 {
719 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
720 705
721 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
722 && (x >= target_width 707 && (x >= target_width
723 || y >= target_height 708 || y >= target_height
724 || (x + w <= 0) 709 || x + w <= 0
725 || (y + h <= 0))) 710 || y + h <= 0))
726 return false; 711 return false;
727 712
728 result = pixbuf; 713 result = pixbuf;
729 714
730 if ((w != image_width) 715 if (w != image_width
731 || (h != image_height)) 716 || h != image_height)
732 { 717 {
733 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
734 w, h, 719 w, h,
735 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
736 } 721 }
865rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
866{ 851{
867 if (!file || !*file) 852 if (!file || !*file)
868 return false; 853 return false;
869 854
855 bool ret = false;
870 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
871 { 859 {
872 size_t len = p - file; 860 size_t len = p - file;
873 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
874 memcpy (f, file, len); 862 memcpy (f, file, len);
875 f[len] = '\0'; 863 f[len] = '\0';
884 { 872 {
885 if (original_asim) 873 if (original_asim)
886 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
887 original_asim = image; 875 original_asim = image;
888 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
889 return true; 877 ret = true;
890 } 878 }
891# endif 879# endif
892 880
893# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
894 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
896 { 884 {
897 if (pixbuf) 885 if (pixbuf)
898 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
899 pixbuf = image; 887 pixbuf = image;
900 bg_flags |= BG_IS_FROM_FILE; 888 bg_flags |= BG_IS_FROM_FILE;
901 return true; 889 ret = true;
902 } 890 }
903# endif 891# endif
904 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
905 return false; 901 return ret;
906} 902}
907 903
908# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
909 905
910# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
1281 bg_pmap_width = window_width; 1277 bg_pmap_width = window_width;
1282 bg_pmap_height = window_height; 1278 bg_pmap_height = window_height;
1283 } 1279 }
1284 1280
1285 /* straightforward pixmap copy */ 1281 /* straightforward pixmap copy */
1286 while (sx < 0) sx += root_width; 1282 while (sx < 0) sx += root_pmap_width;
1287 while (sy < 0) sy += root_height; 1283 while (sy < 0) sy += root_pmap_height;
1288 1284
1289 gcv.tile = recoded_root_pmap; 1285 gcv.tile = recoded_root_pmap;
1290 gcv.fill_style = FillTiled; 1286 gcv.fill_style = FillTiled;
1291 gcv.ts_x_origin = -sx; 1287 gcv.ts_x_origin = -sx;
1292 gcv.ts_y_origin = -sy; 1288 gcv.ts_y_origin = -sy;
1347 { 1343 {
1348 /* we need to re-generate transparency pixmap in that case ! */ 1344 /* we need to re-generate transparency pixmap in that case ! */
1349 tr_flags = make_transparency_pixmap (); 1345 tr_flags = make_transparency_pixmap ();
1350 if (tr_flags == 0) 1346 if (tr_flags == 0)
1351 return false; 1347 return false;
1352 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1353 bg_flags |= BG_IS_VALID; 1348 bg_flags |= BG_IS_VALID;
1354 } 1349 }
1355# endif 1350# endif
1356 1351
1357# ifdef BG_IMAGE_FROM_FILE 1352# ifdef BG_IMAGE_FROM_FILE
1358 if ((bg_flags & BG_IS_FROM_FILE) 1353 if ((bg_flags & BG_IS_FROM_FILE)
1364# endif 1359# endif
1365 1360
1366# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1361# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1367 XImage *result = NULL; 1362 XImage *result = NULL;
1368 1363
1369 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1364 if (tr_flags & BG_NEEDS_TINT)
1370 { 1365 {
1371 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1366 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1372 } 1367 }
1373 1368
1374 if (result) 1369 if (result)
1375 { 1370 {
1376 /* our own client-side tinting */ 1371 /* our own client-side tinting */
1377 if (tr_flags & BG_NEEDS_TINT) 1372 //if (tr_flags & BG_NEEDS_TINT)
1373 if (1)
1378 { 1374 {
1379 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1380 if (bg_flags & BG_TINT_SET) 1376 if (bg_flags & BG_TINT_SET)
1381 tint.get (c); 1377 tint.get (c);
1382 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1378 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1387 if (gc) 1383 if (gc)
1388 { 1384 {
1389 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1385 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1390 1386
1391 XFreeGC (dpy, gc); 1387 XFreeGC (dpy, gc);
1392 bg_flags |= BG_IS_VALID;
1393 } 1388 }
1394 1389
1395 XDestroyImage (result); 1390 XDestroyImage (result);
1396 } 1391 }
1397# endif 1392# endif
1438} 1433}
1439 1434
1440#endif /* HAVE_BG_PIXMAP */ 1435#endif /* HAVE_BG_PIXMAP */
1441 1436
1442#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1437#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1443/* taken from aterm-0.4.2 */ 1438/* based on code from aterm-0.4.2 */
1439
1440static inline void
1441fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1442{
1443 for (int i = 0; i <= mask >> sh; i++)
1444 {
1445 uint32_t tmp;
1446 tmp = i * high;
1447 tmp += (mask >> sh) * low;
1448 lookup[i] = (tmp / 0xffff) << sh;
1449 }
1450}
1444 1451
1445static void 1452static void
1446shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1453shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1447{ 1454{
1448 int sh_r, sh_g, sh_b; 1455 int sh_r, sh_g, sh_b;
1449 uint32_t mask_r, mask_g, mask_b; 1456 uint32_t mask_r, mask_g, mask_b;
1450 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1457 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1451 rgba low; 1458 unsigned short low;
1452 rgba high; 1459 rgba high;
1453 int i;
1454 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1460 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1455 1461
1456 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1462 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1457 1463
1458 /* for convenience */ 1464 /* for convenience */
1526 1532
1527 high.r = c.r * shade / 100; 1533 high.r = c.r * shade / 100;
1528 high.g = c.g * shade / 100; 1534 high.g = c.g * shade / 100;
1529 high.b = c.b * shade / 100; 1535 high.b = c.b * shade / 100;
1530 1536
1531 low.r = 65535 * (100 - shade) / 100; 1537 low = 0xffff * (100 - shade) / 100;
1532 low.g = 65535 * (100 - shade) / 100;
1533 low.b = 65535 * (100 - shade) / 100;
1534 } 1538 }
1535 else 1539 else
1536 { 1540 {
1537 high.r = c.r * shade / 100; 1541 high.r = c.r * shade / 100;
1538 high.g = c.g * shade / 100; 1542 high.g = c.g * shade / 100;
1539 high.b = c.b * shade / 100; 1543 high.b = c.b * shade / 100;
1540 1544
1541 low.r = low.g = low.b = 0; 1545 low = 0;
1542 } 1546 }
1543 1547
1544 /* fill our lookup tables */ 1548 /* fill our lookup tables */
1545 for (i = 0; i <= mask_r>>sh_r; i++) 1549 fill_lut (lookup_r, mask_r, sh_r, low, high.r);
1546 { 1550 fill_lut (lookup_g, mask_g, sh_g, low, high.g);
1547 uint32_t tmp; 1551 fill_lut (lookup_b, mask_b, sh_b, low, high.b);
1548 tmp = i * high.r;
1549 tmp += (mask_r>>sh_r) * low.r;
1550 lookup_r[i] = (tmp/65535)<<sh_r;
1551 }
1552 for (i = 0; i <= mask_g>>sh_g; i++)
1553 {
1554 uint32_t tmp;
1555 tmp = i * high.g;
1556 tmp += (mask_g>>sh_g) * low.g;
1557 lookup_g[i] = (tmp/65535)<<sh_g;
1558 }
1559 for (i = 0; i <= mask_b>>sh_b; i++)
1560 {
1561 uint32_t tmp;
1562 tmp = i * high.b;
1563 tmp += (mask_b>>sh_b) * low.b;
1564 lookup_b[i] = (tmp/65535)<<sh_b;
1565 }
1566 1552
1567 /* apply table to input image (replacing colors by newly calculated ones) */ 1553 /* apply table to input image (replacing colors by newly calculated ones) */
1568 if (ximage->bits_per_pixel == 32 1554 if (ximage->bits_per_pixel == 32
1569 && (ximage->depth == 24 || ximage->depth == 32) 1555 && (ximage->depth == 24 || ximage->depth == 32)
1570 && ximage->byte_order == host_byte_order) 1556 && ximage->byte_order == host_byte_order)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines