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.145 by sf-exg, Fri Jan 28 00:21:10 2011 UTC vs.
Revision 1.186 by sf-exg, Wed Dec 28 11:11:25 2011 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it> 8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
… …
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 * hscale Scale horizontally, tile vertically ?
58 * vscale Tile horizontally, scale vertically ?
59 * scale Scale both up and down
60 * auto Same as 100x100+50+50
61 */
62
63#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
64void 38void
65rxvt_term::bg_destroy () 39rxvt_term::bg_destroy ()
66{ 40{
67#ifdef HAVE_AFTERIMAGE 41#ifdef HAVE_AFTERIMAGE
… …
176 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
177 151
178 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
179 return diff * align / 100; 153 return diff * align / 100;
180 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
181 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
182 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
183 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
184 return 0; 158 return 0;
185} 159}
186 160
187static inline int 161static inline int
188make_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)
… …
207{ 181{
208 bool changed = false; 182 bool changed = false;
209 int geom_flags = 0; 183 int geom_flags = 0;
210 int x = 0, y = 0; 184 int x = 0, y = 0;
211 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
212 unsigned int n; 186 unsigned long new_flags = 0;
213 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
214 const char *ops;
215 187
216 if (geom == NULL) 188 if (geom == NULL)
217 return false; 189 return false;
218 190
219 char str[256]; 191 if (geom[0])
220
221 ops = strchr (geom, ':');
222 if (ops == NULL)
223 n = strlen (geom);
224 else
225 n = ops - geom;
226
227 if (n >= sizeof (str))
228 return false;
229
230 memcpy (str, geom, n);
231 str[n] = '\0';
232 rxvt_strtrim (str);
233
234 if (str[0])
235 { 192 {
236 /* 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_KEEP_ASPECT;
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=keep-aspect"))
233 new_flags |= BG_KEEP_ASPECT;
234 else if (!strcasecmp (arr[i], "op=root-align"))
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_KEEP_ASPECT;
247 w = h = windowScale;
248 geom_flags |= WidthValue|HeightValue;
249 }
250 else if (!strcasecmp (arr[i], "hscale"))
251 {
252 new_flags |= BG_TILE;
253 w = windowScale;
254 h = noScale;
255 geom_flags |= WidthValue|HeightValue;
256 }
257 else if (!strcasecmp (arr[i], "vscale"))
258 {
259 new_flags |= BG_TILE;
260 h = windowScale;
261 w = noScale;
262 geom_flags |= WidthValue|HeightValue;
263 }
264 else if (!strcasecmp (arr[i], "scale"))
265 {
266 w = h = windowScale;
267 geom_flags |= WidthValue|HeightValue;
268 }
269 else if (!strcasecmp (arr[i], "auto"))
270 {
271 w = h = windowScale;
272 x = y = centerAlign;
273 geom_flags |= WidthValue|HeightValue|XValue|YValue;
274 }
275 else if (!strcasecmp (arr[i], "root"))
276 {
277 new_flags |= BG_TILE|BG_ROOT_ALIGN;
278 w = h = noScale;
279 geom_flags |= WidthValue|HeightValue;
280 }
281
282 else
237 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
238 } /* done parsing geometry string */ 284 } /* done parsing ops */
285
286 rxvt_free_strsplit (arr);
287 }
288
289 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
239 290
240 if (!update) 291 if (!update)
241 { 292 {
242 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
243 x = y = defaultAlign; 294 x = y = defaultAlign;
… …
252 w = h; 303 w = h;
253 304
254 geom_flags |= WidthValue|HeightValue|XValue|YValue; 305 geom_flags |= WidthValue|HeightValue|XValue|YValue;
255 } 306 }
256 307
257 if (ops)
258 {
259 char **arr = rxvt_strsplit (':', ops + 1);
260
261 for (int i = 0; arr[i]; i++)
262 {
263 if (!strcasecmp (arr[i], "tile"))
264 {
265 w = h = noScale;
266 geom_flags |= WidthValue|HeightValue;
267 }
268 else if (!strcasecmp (arr[i], "propscale"))
269 {
270 new_flags |= BG_PROP_SCALE;
271 }
272 else if (!strcasecmp (arr[i], "hscale"))
273 {
274 if (w == 0) w = windowScale;
275
276 h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279 else if (!strcasecmp (arr[i], "vscale"))
280 {
281 if (h == 0) h = windowScale;
282
283 w = noScale;
284 geom_flags |= WidthValue|HeightValue;
285 }
286 else if (!strcasecmp (arr[i], "scale"))
287 {
288 if (h == 0) h = windowScale;
289 if (w == 0) w = windowScale;
290
291 geom_flags |= WidthValue|HeightValue;
292 }
293 else if (!strcasecmp (arr[i], "auto"))
294 {
295 w = h = windowScale;
296 x = y = centerAlign;
297 geom_flags |= WidthValue|HeightValue|XValue|YValue;
298 }
299 else if (!strcasecmp (arr[i], "root"))
300 {
301 new_flags |= BG_ROOT_ALIGN;
302 w = h = noScale;
303 geom_flags |= WidthValue|HeightValue;
304 }
305 } /* done parsing ops */
306
307 rxvt_free_strsplit (arr);
308 }
309
310 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 308 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
311 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 309 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
312 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 310 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
313 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 311 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
314 312
… …
325rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 323rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
326{ 324{
327 int target_width = szHint.width; 325 int target_width = szHint.width;
328 int target_height = szHint.height; 326 int target_height = szHint.height;
329 327
328 w = h_scale * target_width / 100;
329 h = v_scale * target_height / 100;
330
330 if (bg_flags & BG_PROP_SCALE) 331 if (bg_flags & BG_KEEP_ASPECT)
331 { 332 {
332 float scale = (float)target_width / image_width; 333 float scale = (float)w / image_width;
333 min_it (scale, (float)target_height / image_height); 334 min_it (scale, (float)h / image_height);
334 w = image_width * scale + 0.5; 335 w = image_width * scale + 0.5;
335 h = image_height * scale + 0.5; 336 h = image_height * scale + 0.5;
336 } 337 }
337 else
338 {
339 w = h_scale * target_width / 100;
340 h = v_scale * target_height / 100;
341 }
342 338
343 if (!w) w = image_width; 339 if (!w) w = image_width;
344 if (!h) h = image_height; 340 if (!h) h = image_height;
345 341
346 if (bg_flags & BG_ROOT_ALIGN) 342 if (bg_flags & BG_ROOT_ALIGN)
… …
353 x = make_align_position (h_align, target_width, w); 349 x = make_align_position (h_align, target_width, w);
354 y = make_align_position (v_align, target_height, h); 350 y = make_align_position (v_align, target_height, h);
355 } 351 }
356 352
357 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 353 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
358 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 354 if (!(bg_flags & BG_TILE)
355 || h_scale || v_scale
359 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 356 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
360 || w > target_width || h > target_height) 357 || w > target_width || h > target_height)
361 bg_flags |= BG_IS_SIZE_SENSITIVE; 358 bg_flags |= BG_IS_SIZE_SENSITIVE;
362} 359}
363 360
… …
390 } 387 }
391 388
392 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 389 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
393 { 390 {
394 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 391 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
395 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 392 ASA_XImage,
396 100, ASIMAGE_QUALITY_DEFAULT); 393 100, ASIMAGE_QUALITY_DEFAULT);
397 if (tmp) 394 if (tmp)
398 { 395 {
399 destroy_asimage (&background); 396 destroy_asimage (&background);
400 background = tmp; 397 background = tmp;
… …
419 416
420 if (!original_asim 417 if (!original_asim
421 || (!(bg_flags & BG_ROOT_ALIGN) 418 || (!(bg_flags & BG_ROOT_ALIGN)
422 && (x >= target_width 419 && (x >= target_width
423 || y >= target_height 420 || y >= target_height
424 || (x + w <= 0) 421 || x + w <= 0
425 || (y + h <= 0)))) 422 || y + h <= 0)))
426 { 423 {
427 if (background) 424 if (background)
428 { 425 {
429 new_pmap_width = background->width; 426 new_pmap_width = background->width;
430 new_pmap_height = background->height; 427 new_pmap_height = background->height;
… …
444 } 441 }
445 else 442 else
446 { 443 {
447 result = original_asim; 444 result = original_asim;
448 445
449 if ((w != original_asim->width) 446 if (w != original_asim->width
450 || (h != original_asim->height)) 447 || h != original_asim->height)
451 { 448 {
452 result = scale_asimage (asv, original_asim, 449 result = scale_asimage (asv, original_asim,
453 w, h, 450 w, h,
454 background ? ASA_ASImage : ASA_XImage, 451 ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 452 100, ASIMAGE_QUALITY_DEFAULT);
456 } 453 }
457 454
458 if (background == NULL) 455 if (background == NULL)
459 { 456 {
460 if (h_scale == 0 || v_scale == 0) 457 if (bg_flags & BG_TILE)
461 { 458 {
462 /* if tiling - pixmap has to be sized exactly as the image, 459 /* if tiling - pixmap has to be sized exactly as the image,
463 but there is no need to make it bigger than the window! */ 460 but there is no need to make it bigger than the window! */
464 new_pmap_width = min (result->width, target_width); 461 new_pmap_width = min (result->width, target_width);
465 new_pmap_height = min (result->height, target_height); 462 new_pmap_height = min (result->height, target_height);
… …
490 layers[0].clip_width = target_width; 487 layers[0].clip_width = target_width;
491 layers[0].clip_height = target_height; 488 layers[0].clip_height = target_height;
492 layers[0].tint = background_tint; 489 layers[0].tint = background_tint;
493 layers[1].im = result; 490 layers[1].im = result;
494 491
495 if (h_scale == 0 || v_scale == 0) 492 if (bg_flags & BG_TILE)
496 { 493 {
497 /* tile horizontally */ 494 /* tile horizontally */
498 while (x > 0) x -= (int)result->width; 495 while (x > 0) x -= (int)result->width;
499 layers[1].dst_x = x; 496 layers[1].dst_x = x;
500 layers[1].clip_width = result->width+target_width; 497 layers[1].clip_width = result->width+target_width;
… …
504 /* clip horizontally */ 501 /* clip horizontally */
505 layers[1].dst_x = x; 502 layers[1].dst_x = x;
506 layers[1].clip_width = result->width; 503 layers[1].clip_width = result->width;
507 } 504 }
508 505
509 if (h_scale == 0 || v_scale == 0) 506 if (bg_flags & BG_TILE)
510 { 507 {
511 while (y > 0) y -= (int)result->height; 508 while (y > 0) y -= (int)result->height;
512 layers[1].dst_y = y; 509 layers[1].dst_y = y;
513 layers[1].clip_height = result->height + target_height; 510 layers[1].clip_height = result->height + target_height;
514 } 511 }
… …
564 561
565 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 562 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
566 int dst_width = result->width, dst_height = result->height; 563 int dst_width = result->width, dst_height = result->height;
567 if (background == NULL) 564 if (background == NULL)
568 { 565 {
569 if (!(h_scale == 0 || v_scale == 0)) 566 if (!(bg_flags & BG_TILE))
570 { 567 {
571 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 568 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
572 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 569 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
573 } 570 }
574 571
… …
620 else if (depth == 15 || depth == 16) 617 else if (depth == 15 || depth == 16)
621 bytes_per_pixel = 2; 618 bytes_per_pixel = 2;
622 else 619 else
623 return false; 620 return false;
624 621
625 width_r = rxvt_popcount (visual->red_mask); 622 width_r = ecb_popcount32 (visual->red_mask);
626 width_g = rxvt_popcount (visual->green_mask); 623 width_g = ecb_popcount32 (visual->green_mask);
627 width_b = rxvt_popcount (visual->blue_mask); 624 width_b = ecb_popcount32 (visual->blue_mask);
628 625
629 if (width_r > 8 || width_g > 8 || width_b > 8) 626 if (width_r > 8 || width_g > 8 || width_b > 8)
630 return false; 627 return false;
631 628
632 sh_r = rxvt_ctz (visual->red_mask); 629 sh_r = ecb_ctz32 (visual->red_mask);
633 sh_g = rxvt_ctz (visual->green_mask); 630 sh_g = ecb_ctz32 (visual->green_mask);
634 sh_b = rxvt_ctz (visual->blue_mask); 631 sh_b = ecb_ctz32 (visual->blue_mask);
635 632
636 if (width > INT_MAX / height / bytes_per_pixel) 633 if (width > INT_MAX / height / bytes_per_pixel)
637 return false; 634 return false;
638 635
639 data = (char *)malloc (width * height * bytes_per_pixel); 636 data = (char *)malloc (width * height * bytes_per_pixel);
… …
646 { 643 {
647 free (data); 644 free (data);
648 return false; 645 return false;
649 } 646 }
650 647
651 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 648 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
652 649
653 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 650 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
654 channels = gdk_pixbuf_get_n_channels (pixbuf); 651 channels = gdk_pixbuf_get_n_channels (pixbuf);
655 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 652 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
656 line = data; 653 line = data;
… …
709 get_image_geometry (image_width, image_height, w, h, x, y); 706 get_image_geometry (image_width, image_height, w, h, x, y);
710 707
711 if (!(bg_flags & BG_ROOT_ALIGN) 708 if (!(bg_flags & BG_ROOT_ALIGN)
712 && (x >= target_width 709 && (x >= target_width
713 || y >= target_height 710 || y >= target_height
714 || (x + w <= 0) 711 || x + w <= 0
715 || (y + h <= 0))) 712 || y + h <= 0))
716 return false; 713 return false;
717 714
718 result = pixbuf; 715 result = pixbuf;
719 716
720 if ((w != image_width) 717 if (w != image_width
721 || (h != image_height)) 718 || h != image_height)
722 { 719 {
723 result = gdk_pixbuf_scale_simple (pixbuf, 720 result = gdk_pixbuf_scale_simple (pixbuf,
724 w, h, 721 w, h,
725 GDK_INTERP_BILINEAR); 722 GDK_INTERP_BILINEAR);
726 } 723 }
727 724
725 if (!result)
726 return false;
727
728 bool ret = false; 728 bool ret = false;
729 729
730 if (result)
731 {
732 XGCValues gcv; 730 XGCValues gcv;
733 GC gc; 731 GC gc;
734 Pixmap root_pmap; 732 Pixmap root_pmap;
735 733
736 image_width = gdk_pixbuf_get_width (result); 734 image_width = gdk_pixbuf_get_width (result);
737 image_height = gdk_pixbuf_get_height (result); 735 image_height = gdk_pixbuf_get_height (result);
738 736
739 if (tr_flags) 737 if (tr_flags)
740 { 738 {
741 root_pmap = bg_pixmap; 739 root_pmap = bg_pixmap;
742 bg_pixmap = None; 740 bg_pixmap = None;
741 }
742 else
743 {
744 if (bg_flags & BG_TILE)
743 } 745 {
744 else
745 {
746 if (h_scale == 0 || v_scale == 0)
747 {
748 new_pmap_width = min (image_width, target_width); 746 new_pmap_width = min (image_width, target_width);
749 new_pmap_height = min (image_height, target_height); 747 new_pmap_height = min (image_height, target_height);
750 } 748 }
751 } 749 }
752 750
753 if (bg_pixmap == None 751 if (bg_pixmap == None
754 || bg_pmap_width != new_pmap_width 752 || bg_pmap_width != new_pmap_width
755 || bg_pmap_height != new_pmap_height) 753 || bg_pmap_height != new_pmap_height)
756 { 754 {
757 if (bg_pixmap) 755 if (bg_pixmap)
758 XFreePixmap (dpy, bg_pixmap); 756 XFreePixmap (dpy, bg_pixmap);
759 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 757 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
760 bg_pmap_width = new_pmap_width; 758 bg_pmap_width = new_pmap_width;
761 bg_pmap_height = new_pmap_height; 759 bg_pmap_height = new_pmap_height;
762 } 760 }
763 761
764 gcv.foreground = pix_colors[Color_bg]; 762 gcv.foreground = pix_colors[Color_bg];
765 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 763 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
766 764
767 if (h_scale == 0 || v_scale == 0) 765 if (gc)
766 {
767 if (bg_flags & BG_TILE)
768 { 768 {
769 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 769 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
770 pixbuf_to_pixmap (result, tile, gc, 770 pixbuf_to_pixmap (result, tile, gc,
771 0, 0, 771 0, 0,
772 0, 0, 772 0, 0,
… …
816 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8); 816 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
817 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 817 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
818 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 818 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
819 XFreePixmap (dpy, mask_pmap); 819 XFreePixmap (dpy, mask_pmap);
820 820
821 if (src && dst && mask)
822 {
823 XRenderColor mask_c; 821 XRenderColor mask_c;
824 822
825 mask_c.alpha = 0x8000; 823 mask_c.alpha = 0x8000;
826 mask_c.red = 0; 824 mask_c.red = 0;
827 mask_c.green = 0; 825 mask_c.green = 0;
828 mask_c.blue = 0; 826 mask_c.blue = 0;
829 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 827 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
830 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 828 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
831 }
832 829
833 XRenderFreePicture (dpy, src); 830 XRenderFreePicture (dpy, src);
834 XRenderFreePicture (dpy, dst); 831 XRenderFreePicture (dpy, dst);
835 XRenderFreePicture (dpy, mask); 832 XRenderFreePicture (dpy, mask);
836
837 XFreePixmap (dpy, root_pmap);
838 } 833 }
839#endif 834#endif
840 835
841 if (result != pixbuf)
842 g_object_unref (result);
843
844 XFreeGC (dpy, gc); 836 XFreeGC (dpy, gc);
845 837
846 ret = true; 838 ret = true;
847 } 839 }
840
841 if (result != pixbuf)
842 g_object_unref (result);
843
844 if (tr_flags)
845 XFreePixmap (dpy, root_pmap);
848 846
849 return ret; 847 return ret;
850} 848}
851# endif /* HAVE_PIXBUF */ 849# endif /* HAVE_PIXBUF */
852 850
… …
854rxvt_term::bg_set_file (const char *file) 852rxvt_term::bg_set_file (const char *file)
855{ 853{
856 if (!file || !*file) 854 if (!file || !*file)
857 return false; 855 return false;
858 856
857 bool ret = false;
859 if (const char *p = strchr (file, ';')) 858 const char *p = strchr (file, ';');
859
860 if (p)
860 { 861 {
861 size_t len = p - file; 862 size_t len = p - file;
862 char *f = rxvt_temp_buf<char> (len + 1); 863 char *f = rxvt_temp_buf<char> (len + 1);
863 memcpy (f, file, len); 864 memcpy (f, file, len);
864 f[len] = '\0'; 865 f[len] = '\0';
… …
873 { 874 {
874 if (original_asim) 875 if (original_asim)
875 safe_asimage_destroy (original_asim); 876 safe_asimage_destroy (original_asim);
876 original_asim = image; 877 original_asim = image;
877 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 878 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
878 return true; 879 ret = true;
879 } 880 }
880# endif 881# endif
881 882
882# ifdef HAVE_PIXBUF 883# ifdef HAVE_PIXBUF
883 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 884 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
885 { 886 {
886 if (pixbuf) 887 if (pixbuf)
887 g_object_unref (pixbuf); 888 g_object_unref (pixbuf);
888 pixbuf = image; 889 pixbuf = image;
889 bg_flags |= BG_IS_FROM_FILE; 890 bg_flags |= BG_IS_FROM_FILE;
890 return true; 891 ret = true;
891 } 892 }
892# endif 893# endif
893 894
895 if (ret)
896 {
897 if (p)
898 bg_set_geometry (p + 1);
899 else
900 bg_set_default_geometry ();
901 }
902
894 return false; 903 return ret;
895} 904}
896 905
897# endif /* BG_IMAGE_FROM_FILE */ 906# endif /* BG_IMAGE_FROM_FILE */
898 907
899# ifdef ENABLE_TRANSPARENCY 908# ifdef ENABLE_TRANSPARENCY
… …
943 bg_flags |= BG_NEEDS_BLUR; 952 bg_flags |= BG_NEEDS_BLUR;
944 953
945 return changed; 954 return changed;
946} 955}
947 956
948static inline unsigned long 957void
949compute_tint_shade_flags (rxvt_color *tint, int shade) 958rxvt_term::set_tint_shade_flags ()
950{ 959{
951 unsigned long flags = 0; 960 rgba c;
952 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
953 bool has_shade = shade != 100; 961 bool has_shade = shade != 100;
954 962
955 if (tint) 963 bg_flags &= ~BG_TINT_FLAGS;
964
965 if (bg_flags & BG_TINT_SET)
956 { 966 {
957 tint->get (c); 967 tint.get (c);
958 if (!has_shade 968 if (!has_shade
959 && (c.r <= 0x00ff || c.r >= 0xff00) 969 && (c.r <= 0x00ff || c.r >= 0xff00)
960 && (c.g <= 0x00ff || c.g >= 0xff00) 970 && (c.g <= 0x00ff || c.g >= 0xff00)
961 && (c.b <= 0x00ff || c.b >= 0xff00)) 971 && (c.b <= 0x00ff || c.b >= 0xff00))
962 flags |= rxvt_term::BG_TINT_BITAND; 972 bg_flags |= BG_TINT_BITAND;
963 } 973 }
964 974
965 if (has_shade || tint) 975 if (has_shade || (bg_flags & BG_TINT_SET))
966 flags |= rxvt_term::BG_NEEDS_TINT; 976 bg_flags |= BG_NEEDS_TINT;
967
968 return flags;
969} 977}
970 978
971bool 979bool
972rxvt_term::bg_set_tint (rxvt_color &new_tint) 980rxvt_term::bg_set_tint (rxvt_color &new_tint)
973{ 981{
974 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 982 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
975 { 983 {
976 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
977 tint = new_tint; 984 tint = new_tint;
978 bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags | BG_TINT_SET; 985 bg_flags |= BG_TINT_SET;
986 set_tint_shade_flags ();
979 return true; 987 return true;
980 } 988 }
981 989
982 return false; 990 return false;
983} 991}
984 992
985bool 993bool
986rxvt_term::bg_set_shade (const char *shade_str) 994rxvt_term::bg_set_shade (const char *shade_str)
987{ 995{
988 int new_shade = (shade_str) ? atoi (shade_str) : 100; 996 int new_shade = atoi (shade_str);
989 997
990 clamp_it (new_shade, -100, 200); 998 clamp_it (new_shade, -100, 200);
991 if (new_shade < 0) 999 if (new_shade < 0)
992 new_shade = 200 - (100 + new_shade); 1000 new_shade = 200 - (100 + new_shade);
993 1001
994 if (new_shade != shade) 1002 if (new_shade != shade)
995 { 1003 {
996 unsigned long new_flags = compute_tint_shade_flags ((bg_flags & BG_TINT_SET) ? &tint : NULL, new_shade);
997 shade = new_shade; 1004 shade = new_shade;
998 bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags; 1005 set_tint_shade_flags ();
999 return true; 1006 return true;
1000 } 1007 }
1001 1008
1002 return false; 1009 return false;
1003} 1010}
… …
1028bool 1035bool
1029rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1036rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1030{ 1037{
1031 bool ret = false; 1038 bool ret = false;
1032#if XRENDER 1039#if XRENDER
1040 if (!(bg_flags & BG_HAS_RENDER_CONV))
1041 return false;
1042
1033 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1043 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1034 double *kernel = (double *)malloc (size * sizeof (double)); 1044 double *kernel = (double *)malloc (size * sizeof (double));
1035 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1045 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1036 1046
1037 XRenderPictureAttributes pa; 1047 XRenderPictureAttributes pa;
1038 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1048 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1039 1049
1040 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1050 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1041 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1051 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1042 1052
1043 if (kernel && params && src && dst) 1053 if (kernel && params)
1044 { 1054 {
1045 if (h_blurRadius) 1055 if (h_blurRadius)
1046 { 1056 {
1047 size = h_blurRadius * 2 + 1; 1057 size = h_blurRadius * 2 + 1;
1048 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1058 get_gaussian_kernel (h_blurRadius, size, kernel, params);
… …
1110 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1120 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1111 ret = true; 1121 ret = true;
1112 XFreeGC (dpy, gc); 1122 XFreeGC (dpy, gc);
1113 } 1123 }
1114 } 1124 }
1115 else
1116 {
1117# if XRENDER 1125# if XRENDER
1126 else if (bg_flags & BG_HAS_RENDER)
1127 {
1118 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1128 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1119 1129
1120 if (bg_flags & BG_TINT_SET) 1130 if (bg_flags & BG_TINT_SET)
1121 tint.get (c); 1131 tint.get (c);
1122 1132
1123 if (shade <= 100) 1133 if (shade <= 100)
1124 { 1134 {
1125 c.r = (c.r * shade) / 100; 1135 c.r = c.r * shade / 100;
1126 c.g = (c.g * shade) / 100; 1136 c.g = c.g * shade / 100;
1127 c.b = (c.b * shade) / 100; 1137 c.b = c.b * shade / 100;
1128 } 1138 }
1129 else 1139 else
1130 { 1140 {
1131 c.r = (c.r * (200 - shade)) / 100; 1141 c.r = c.r * (200 - shade) / 100;
1132 c.g = (c.g * (200 - shade)) / 100; 1142 c.g = c.g * (200 - shade) / 100;
1133 c.b = (c.b * (200 - shade)) / 100; 1143 c.b = c.b * (200 - shade) / 100;
1134 } 1144 }
1135 1145
1136 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1146 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1137 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1147 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1138 XRenderPictureAttributes pa; 1148 XRenderPictureAttributes pa;
… …
1145 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1155 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1146 XFreePixmap (dpy, overlay_pmap); 1156 XFreePixmap (dpy, overlay_pmap);
1147 1157
1148 pa.component_alpha = True; 1158 pa.component_alpha = True;
1149 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1159 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1150 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1160 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1151 XFreePixmap (dpy, mask_pmap); 1161 XFreePixmap (dpy, mask_pmap);
1152 1162
1153 if (mask_pic && overlay_pic && back_pic)
1154 {
1155 XRenderColor mask_c; 1163 XRenderColor mask_c;
1156 1164
1157 mask_c.red = mask_c.green = mask_c.blue = 0;
1158 mask_c.alpha = 0xffff; 1165 mask_c.alpha = 0xffff;
1166 mask_c.red =
1167 mask_c.green =
1168 mask_c.blue = 0;
1169 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1170
1171 mask_c.alpha = 0;
1172 mask_c.red = 0xffff - c.r;
1173 mask_c.green = 0xffff - c.g;
1174 mask_c.blue = 0xffff - c.b;
1175 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1176 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1177
1178 if (shade > 100)
1179 {
1180 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1181 mask_c.alpha = 0;
1159 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1182 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1160 1183
1161 mask_c.alpha = 0;
1162 mask_c.red = 0xffff - c.r;
1163 mask_c.green = 0xffff - c.g;
1164 mask_c.blue = 0xffff - c.b;
1165 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1166 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1167
1168 if (shade > 100)
1169 {
1170 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1171 mask_c.alpha = 0;
1172 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1173
1174 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1184 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1175 } 1185 }
1176 1186
1177 ret = true; 1187 ret = true;
1178 }
1179 1188
1180 XRenderFreePicture (dpy, mask_pic); 1189 XRenderFreePicture (dpy, mask_pic);
1181 XRenderFreePicture (dpy, overlay_pic); 1190 XRenderFreePicture (dpy, overlay_pic);
1182 XRenderFreePicture (dpy, back_pic); 1191 XRenderFreePicture (dpy, back_pic);
1192 }
1183# endif 1193# endif
1184 }
1185 1194
1186 return ret; 1195 return ret;
1187} 1196}
1188 1197
1189/* make_transparency_pixmap() 1198/*
1190 * Builds a pixmap of the same size as the terminal window that contains 1199 * Builds a pixmap of the same size as the terminal window that contains
1191 * the tiled portion of the root pixmap that is supposed to be covered by 1200 * the tiled portion of the root pixmap that is supposed to be covered by
1192 * our window. 1201 * our window.
1193 */ 1202 */
1194unsigned long 1203unsigned long
… …
1238 if (root_pixmap != None && root_depth != depth) 1247 if (root_pixmap != None && root_depth != depth)
1239 { 1248 {
1240#if XRENDER 1249#if XRENDER
1241 if (bg_flags & BG_HAS_RENDER) 1250 if (bg_flags & BG_HAS_RENDER)
1242 { 1251 {
1252 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1253
1243 XRenderPictureAttributes pa; 1254 XRenderPictureAttributes pa;
1244 1255
1245 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1256 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1246 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1257 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1247 1258
1248 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1249 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1259 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1250 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1260 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1251 1261
1252 if (src && dst)
1253 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1262 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1254 else
1255 {
1256 XFreePixmap (dpy, recoded_root_pmap);
1257 root_pixmap = None;
1258 }
1259 1263
1260 XRenderFreePicture (dpy, src); 1264 XRenderFreePicture (dpy, src);
1261 XRenderFreePicture (dpy, dst); 1265 XRenderFreePicture (dpy, dst);
1262 } 1266 }
1263 else 1267 else
1264#endif 1268#endif
1265 root_pixmap = None; 1269 recoded_root_pmap = None;
1266 } 1270 }
1267 1271
1268 if (root_pixmap == None) 1272 if (recoded_root_pmap == None)
1269 return 0; 1273 return 0;
1270 1274
1271 if (bg_pixmap == None 1275 if (bg_pixmap == None
1272 || bg_pmap_width != window_width 1276 || bg_pmap_width != window_width
1273 || bg_pmap_height != window_height) 1277 || bg_pmap_height != window_height)
… …
1277 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); 1281 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1278 bg_pmap_width = window_width; 1282 bg_pmap_width = window_width;
1279 bg_pmap_height = window_height; 1283 bg_pmap_height = window_height;
1280 } 1284 }
1281 1285
1282 if (bg_pixmap == None)
1283 return 0;
1284
1285 /* straightforward pixmap copy */ 1286 /* straightforward pixmap copy */
1286 while (sx < 0) sx += (int)root_width; 1287 while (sx < 0) sx += root_pmap_width;
1287 while (sy < 0) sy += (int)root_height; 1288 while (sy < 0) sy += root_pmap_height;
1288 1289
1289 gcv.tile = recoded_root_pmap; 1290 gcv.tile = recoded_root_pmap;
1290 gcv.fill_style = FillTiled; 1291 gcv.fill_style = FillTiled;
1291 gcv.ts_x_origin = -sx; 1292 gcv.ts_x_origin = -sx;
1292 gcv.ts_y_origin = -sy; 1293 gcv.ts_y_origin = -sy;
… …
1298 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1299 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1299 XFreeGC (dpy, gc); 1300 XFreeGC (dpy, gc);
1300 1301
1301 if (!(bg_flags & BG_CLIENT_RENDER)) 1302 if (!(bg_flags & BG_CLIENT_RENDER))
1302 { 1303 {
1303 if ((bg_flags & BG_NEEDS_BLUR) 1304 if (bg_flags & BG_NEEDS_BLUR)
1304 && (bg_flags & BG_HAS_RENDER_CONV))
1305 { 1305 {
1306 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1306 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1307 result &= ~BG_NEEDS_BLUR; 1307 result &= ~BG_NEEDS_BLUR;
1308 } 1308 }
1309 if ((bg_flags & BG_NEEDS_TINT) 1309 if (bg_flags & BG_NEEDS_TINT)
1310 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1311 { 1310 {
1312 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1311 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1313 result &= ~BG_NEEDS_TINT; 1312 result &= ~BG_NEEDS_TINT;
1314 } 1313 }
1315 } /* server side rendering completed */ 1314 } /* server side rendering completed */
… …
1329 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1328 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1330 1329
1331 root_pixmap = new_root_pixmap; 1330 root_pixmap = new_root_pixmap;
1332} 1331}
1333# endif /* ENABLE_TRANSPARENCY */ 1332# endif /* ENABLE_TRANSPARENCY */
1334
1335#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1336static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1337# endif
1338 1333
1339bool 1334bool
1340rxvt_term::bg_render () 1335rxvt_term::bg_render ()
1341{ 1336{
1342 unsigned long tr_flags = 0; 1337 unsigned long tr_flags = 0;
… …
1347 { 1342 {
1348 /* we need to re-generate transparency pixmap in that case ! */ 1343 /* we need to re-generate transparency pixmap in that case ! */
1349 tr_flags = make_transparency_pixmap (); 1344 tr_flags = make_transparency_pixmap ();
1350 if (tr_flags == 0) 1345 if (tr_flags == 0)
1351 return false; 1346 return false;
1352 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1353 bg_flags |= BG_IS_VALID; 1347 bg_flags |= BG_IS_VALID;
1354 } 1348 }
1355# endif 1349# endif
1356 1350
1357# ifdef BG_IMAGE_FROM_FILE 1351# ifdef BG_IMAGE_FROM_FILE
1358 if ((bg_flags & BG_IS_FROM_FILE) 1352 if ((bg_flags & BG_IS_FROM_FILE)
… …
1364# endif 1358# endif
1365 1359
1366# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1367 XImage *result = NULL; 1361 XImage *result = NULL;
1368 1362
1369 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1363 if (tr_flags & BG_NEEDS_TINT)
1370 { 1364 {
1371 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1365 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1372 } 1366 }
1373 1367
1374 if (result) 1368 if (result)
1375 { 1369 {
1376 /* our own client-side tinting */ 1370 /* our own client-side tinting */
1377 if (tr_flags & BG_NEEDS_TINT) 1371 //if (tr_flags & BG_NEEDS_TINT)
1378 { 1372 if (1)
1379 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1380 if (bg_flags & BG_TINT_SET)
1381 tint.get (c);
1382 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1373 tint_ximage (DefaultVisual (dpy, display->screen), result);
1383 }
1384 1374
1385 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1375 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1386 1376
1387 if (gc) 1377 if (gc)
1388 { 1378 {
1389 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1379 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1390 1380
1391 XFreeGC (dpy, gc); 1381 XFreeGC (dpy, gc);
1392 bg_flags |= BG_IS_VALID;
1393 } 1382 }
1394 1383
1395 XDestroyImage (result); 1384 XDestroyImage (result);
1396 } 1385 }
1397# endif 1386# endif
… …
1438} 1427}
1439 1428
1440#endif /* HAVE_BG_PIXMAP */ 1429#endif /* HAVE_BG_PIXMAP */
1441 1430
1442#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1431#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1443/* taken from aterm-0.4.2 */ 1432/* based on code from aterm-0.4.2 */
1444 1433
1445static void 1434static inline void
1446shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1435fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1436{
1437 for (int i = 0; i <= mask >> sh; i++)
1438 {
1439 uint32_t tmp;
1440 tmp = i * high;
1441 tmp += (mask >> sh) * low;
1442 lookup[i] = (tmp / 0xffff) << sh;
1443 }
1444}
1445
1446void
1447rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1447{ 1448{
1448 int sh_r, sh_g, sh_b; 1449 int sh_r, sh_g, sh_b;
1449 uint32_t mask_r, mask_g, mask_b; 1450 uint32_t mask_r, mask_g, mask_b;
1450 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1451 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1451 rgba low; 1452 unsigned short low;
1452 rgba high;
1453 int i;
1454 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1453 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1455 1454
1456 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1455 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1457 1456
1458 /* for convenience */ 1457 /* for convenience */
1459 mask_r = visual->red_mask; 1458 mask_r = visual->red_mask;
… …
1517 break; 1516 break;
1518 default: 1517 default:
1519 return; /* we do not support this color depth */ 1518 return; /* we do not support this color depth */
1520 } 1519 }
1521 1520
1521 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1522
1523 if (bg_flags & BG_TINT_SET)
1524 tint.get (c);
1525
1522 /* prepare limits for color transformation (each channel is handled separately) */ 1526 /* prepare limits for color transformation (each channel is handled separately) */
1523 if (shade > 100) 1527 if (shade > 100)
1524 { 1528 {
1525 shade = 200 - shade;
1526
1527 high.r = c.r * shade / 100;
1528 high.g = c.g * shade / 100;
1529 high.b = c.b * shade / 100;
1530
1531 low.r = 65535 * (100 - shade) / 100; 1529 c.r = c.r * (200 - shade) / 100;
1532 low.g = 65535 * (100 - shade) / 100; 1530 c.g = c.g * (200 - shade) / 100;
1533 low.b = 65535 * (100 - shade) / 100; 1531 c.b = c.b * (200 - shade) / 100;
1532
1533 low = 0xffff * (shade - 100) / 100;
1534 } 1534 }
1535 else 1535 else
1536 { 1536 {
1537 high.r = c.r * shade / 100; 1537 c.r = c.r * shade / 100;
1538 high.g = c.g * shade / 100; 1538 c.g = c.g * shade / 100;
1539 high.b = c.b * shade / 100; 1539 c.b = c.b * shade / 100;
1540 1540
1541 low.r = low.g = low.b = 0; 1541 low = 0;
1542 } 1542 }
1543 1543
1544 /* fill our lookup tables */ 1544 /* fill our lookup tables */
1545 for (i = 0; i <= mask_r>>sh_r; i++) 1545 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1546 { 1546 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1547 uint32_t tmp; 1547 fill_lut (lookup_b, mask_b, sh_b, low, c.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 1548
1567 /* apply table to input image (replacing colors by newly calculated ones) */ 1549 /* apply table to input image (replacing colors by newly calculated ones) */
1568 if (ximage->bits_per_pixel == 32 1550 if (ximage->bits_per_pixel == 32
1569 && (ximage->depth == 24 || ximage->depth == 32) 1551 && (ximage->depth == 24 || ximage->depth == 32)
1570 && ximage->byte_order == host_byte_order) 1552 && ximage->byte_order == host_byte_order)

Diff Legend

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