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.143 by sf-exg, Fri Jan 28 00:08:57 2011 UTC vs.
Revision 1.182 by sf-exg, Sun Dec 25 17:01:21 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
68 if (original_asim) 42 if (original_asim)
69 safe_asimage_destroy (original_asim); 43 safe_asimage_destroy (original_asim);
44 if (asv)
45 destroy_asvisual (asv, 0);
46 if (asimman)
47 destroy_image_manager (asimman, 0);
70#endif 48#endif
71 49
72#ifdef HAVE_PIXBUF 50#ifdef HAVE_PIXBUF
73 if (pixbuf) 51 if (pixbuf)
74 g_object_unref (pixbuf); 52 g_object_unref (pixbuf);
… …
99 if (bg_flags & BG_IS_TRANSPARENT) 77 if (bg_flags & BG_IS_TRANSPARENT)
100 return true; 78 return true;
101# endif 79# endif
102 80
103# ifdef BG_IMAGE_FROM_FILE 81# ifdef BG_IMAGE_FROM_FILE
104 if (have_image) 82 if (bg_flags & BG_IS_FROM_FILE)
105 { 83 {
106 if (bg_flags & BG_IS_SIZE_SENSITIVE) 84 if (bg_flags & BG_IS_SIZE_SENSITIVE)
107 return true; 85 return true;
108 } 86 }
109# endif 87# endif
… …
118 if (bg_flags & BG_IS_TRANSPARENT) 96 if (bg_flags & BG_IS_TRANSPARENT)
119 return true; 97 return true;
120# endif 98# endif
121 99
122# ifdef BG_IMAGE_FROM_FILE 100# ifdef BG_IMAGE_FROM_FILE
123 if (have_image) 101 if (bg_flags & BG_IS_FROM_FILE)
124 { 102 {
125 if (bg_flags & BG_ROOT_ALIGN) 103 if (bg_flags & BG_ROOT_ALIGN)
126 return true; 104 return true;
127 } 105 }
128# endif 106# endif
… …
172 int smaller = min (image_size, window_size); 150 int smaller = min (image_size, window_size);
173 151
174 if (align >= 0 && align <= 100) 152 if (align >= 0 && align <= 100)
175 return diff * align / 100; 153 return diff * align / 100;
176 else if (align > 100 && align <= 200) 154 else if (align > 100 && align <= 200)
177 return ((align - 100) * smaller / 100) + window_size - smaller; 155 return (align - 100) * smaller / 100 + window_size - smaller;
178 else if (align >= -100 && align < 0) 156 else if (align >= -100 && align < 0)
179 return ((align + 100) * smaller / 100) - image_size; 157 return (align + 100) * smaller / 100 - image_size;
180 return 0; 158 return 0;
181} 159}
182 160
183static inline int 161static inline int
184make_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)
… …
203{ 181{
204 bool changed = false; 182 bool changed = false;
205 int geom_flags = 0; 183 int geom_flags = 0;
206 int x = 0, y = 0; 184 int x = 0, y = 0;
207 unsigned int w = 0, h = 0; 185 unsigned int w = 0, h = 0;
208 unsigned int n;
209 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS;
210 const char *ops;
211 187
212 if (geom == NULL) 188 if (geom == NULL)
213 return false; 189 return false;
214 190
215 char str[256]; 191 if (geom[0])
216
217 ops = strchr (geom, ':');
218 if (ops == NULL)
219 n = strlen (geom);
220 else
221 n = ops - geom;
222
223 if (n >= sizeof (str))
224 return false;
225
226 memcpy (str, geom, n);
227 str[n] = '\0';
228 rxvt_strtrim (str);
229
230 if (str[0])
231 { 192 {
232 /* 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
233 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 283 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
234 } /* done parsing geometry string */ 284 } /* done parsing ops */
285
286 rxvt_free_strsplit (arr);
287 }
235 288
236 if (!update) 289 if (!update)
237 { 290 {
238 if (!(geom_flags & XValue)) 291 if (!(geom_flags & XValue))
239 x = y = defaultAlign; 292 x = y = defaultAlign;
… …
248 w = h; 301 w = h;
249 302
250 geom_flags |= WidthValue|HeightValue|XValue|YValue; 303 geom_flags |= WidthValue|HeightValue|XValue|YValue;
251 } 304 }
252 305
253 if (ops)
254 {
255 char **arr = rxvt_strsplit (':', ops + 1);
256
257 for (int i = 0; arr[i]; i++)
258 {
259 if (!strcasecmp (arr[i], "tile"))
260 {
261 w = h = noScale;
262 geom_flags |= WidthValue|HeightValue;
263 }
264 else if (!strcasecmp (arr[i], "propscale"))
265 {
266 new_flags |= BG_PROP_SCALE;
267 }
268 else if (!strcasecmp (arr[i], "hscale"))
269 {
270 if (w == 0) w = windowScale;
271
272 h = noScale;
273 geom_flags |= WidthValue|HeightValue;
274 }
275 else if (!strcasecmp (arr[i], "vscale"))
276 {
277 if (h == 0) h = windowScale;
278
279 w = noScale;
280 geom_flags |= WidthValue|HeightValue;
281 }
282 else if (!strcasecmp (arr[i], "scale"))
283 {
284 if (h == 0) h = windowScale;
285 if (w == 0) w = windowScale;
286
287 geom_flags |= WidthValue|HeightValue;
288 }
289 else if (!strcasecmp (arr[i], "auto"))
290 {
291 w = h = windowScale;
292 x = y = centerAlign;
293 geom_flags |= WidthValue|HeightValue|XValue|YValue;
294 }
295 else if (!strcasecmp (arr[i], "root"))
296 {
297 new_flags |= BG_ROOT_ALIGN;
298 w = h = noScale;
299 geom_flags |= WidthValue|HeightValue;
300 }
301 } /* done parsing ops */
302
303 rxvt_free_strsplit (arr);
304 }
305
306 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 306 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
307 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 307 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
308 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 308 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
309 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 309 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
310 310
… …
321rxvt_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)
322{ 322{
323 int target_width = szHint.width; 323 int target_width = szHint.width;
324 int target_height = szHint.height; 324 int target_height = szHint.height;
325 325
326 w = h_scale * target_width / 100;
327 h = v_scale * target_height / 100;
328
326 if (bg_flags & BG_PROP_SCALE) 329 if (bg_flags & BG_KEEP_ASPECT)
327 { 330 {
328 float scale = (float)target_width / image_width; 331 float scale = (float)w / image_width;
329 min_it (scale, (float)target_height / image_height); 332 min_it (scale, (float)h / image_height);
330 w = image_width * scale + 0.5; 333 w = image_width * scale + 0.5;
331 h = image_height * scale + 0.5; 334 h = image_height * scale + 0.5;
332 } 335 }
333 else
334 {
335 w = h_scale * target_width / 100;
336 h = v_scale * target_height / 100;
337 }
338 336
339 if (!w) w = image_width; 337 if (!w) w = image_width;
340 if (!h) h = image_height; 338 if (!h) h = image_height;
341 339
342 if (bg_flags & BG_ROOT_ALIGN) 340 if (bg_flags & BG_ROOT_ALIGN)
… …
349 x = make_align_position (h_align, target_width, w); 347 x = make_align_position (h_align, target_width, w);
350 y = make_align_position (v_align, target_height, h); 348 y = make_align_position (v_align, target_height, h);
351 } 349 }
352 350
353 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
354 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 352 if (!(bg_flags & BG_TILE)
353 || h_scale || v_scale
355 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
356 || w > target_width || h > target_height) 355 || w > target_width || h > target_height)
357 bg_flags |= BG_IS_SIZE_SENSITIVE; 356 bg_flags |= BG_IS_SIZE_SENSITIVE;
358} 357}
359 358
… …
386 } 385 }
387 386
388 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
389 { 388 {
390 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,
391 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 390 ASA_XImage,
392 100, ASIMAGE_QUALITY_DEFAULT); 391 100, ASIMAGE_QUALITY_DEFAULT);
393 if (tmp) 392 if (tmp)
394 { 393 {
395 destroy_asimage (&background); 394 destroy_asimage (&background);
396 background = tmp; 395 background = tmp;
… …
415 414
416 if (!original_asim 415 if (!original_asim
417 || (!(bg_flags & BG_ROOT_ALIGN) 416 || (!(bg_flags & BG_ROOT_ALIGN)
418 && (x >= target_width 417 && (x >= target_width
419 || y >= target_height 418 || y >= target_height
420 || (x + w <= 0) 419 || x + w <= 0
421 || (y + h <= 0)))) 420 || y + h <= 0)))
422 { 421 {
423 if (background) 422 if (background)
424 { 423 {
425 new_pmap_width = background->width; 424 new_pmap_width = background->width;
426 new_pmap_height = background->height; 425 new_pmap_height = background->height;
… …
440 } 439 }
441 else 440 else
442 { 441 {
443 result = original_asim; 442 result = original_asim;
444 443
445 if ((w != original_asim->width) 444 if (w != original_asim->width
446 || (h != original_asim->height)) 445 || h != original_asim->height)
447 { 446 {
448 result = scale_asimage (asv, original_asim, 447 result = scale_asimage (asv, original_asim,
449 w, h, 448 w, h,
450 background ? ASA_ASImage : ASA_XImage, 449 ASA_XImage,
451 100, ASIMAGE_QUALITY_DEFAULT); 450 100, ASIMAGE_QUALITY_DEFAULT);
452 } 451 }
453 452
454 if (background == NULL) 453 if (background == NULL)
455 { 454 {
456 if (h_scale == 0 || v_scale == 0) 455 if (bg_flags & BG_TILE)
457 { 456 {
458 /* if tiling - pixmap has to be sized exactly as the image, 457 /* if tiling - pixmap has to be sized exactly as the image,
459 but there is no need to make it bigger than the window! */ 458 but there is no need to make it bigger than the window! */
460 new_pmap_width = min (result->width, target_width); 459 new_pmap_width = min (result->width, target_width);
461 new_pmap_height = min (result->height, target_height); 460 new_pmap_height = min (result->height, target_height);
… …
486 layers[0].clip_width = target_width; 485 layers[0].clip_width = target_width;
487 layers[0].clip_height = target_height; 486 layers[0].clip_height = target_height;
488 layers[0].tint = background_tint; 487 layers[0].tint = background_tint;
489 layers[1].im = result; 488 layers[1].im = result;
490 489
491 if (h_scale == 0 || v_scale == 0) 490 if (bg_flags & BG_TILE)
492 { 491 {
493 /* tile horizontally */ 492 /* tile horizontally */
494 while (x > 0) x -= (int)result->width; 493 while (x > 0) x -= (int)result->width;
495 layers[1].dst_x = x; 494 layers[1].dst_x = x;
496 layers[1].clip_width = result->width+target_width; 495 layers[1].clip_width = result->width+target_width;
… …
500 /* clip horizontally */ 499 /* clip horizontally */
501 layers[1].dst_x = x; 500 layers[1].dst_x = x;
502 layers[1].clip_width = result->width; 501 layers[1].clip_width = result->width;
503 } 502 }
504 503
505 if (h_scale == 0 || v_scale == 0) 504 if (bg_flags & BG_TILE)
506 { 505 {
507 while (y > 0) y -= (int)result->height; 506 while (y > 0) y -= (int)result->height;
508 layers[1].dst_y = y; 507 layers[1].dst_y = y;
509 layers[1].clip_height = result->height + target_height; 508 layers[1].clip_height = result->height + target_height;
510 } 509 }
… …
560 559
561 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 560 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
562 int dst_width = result->width, dst_height = result->height; 561 int dst_width = result->width, dst_height = result->height;
563 if (background == NULL) 562 if (background == NULL)
564 { 563 {
565 if (!(h_scale == 0 || v_scale == 0)) 564 if (!(bg_flags & BG_TILE))
566 { 565 {
567 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 566 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
568 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 567 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
569 } 568 }
570 569
… …
616 else if (depth == 15 || depth == 16) 615 else if (depth == 15 || depth == 16)
617 bytes_per_pixel = 2; 616 bytes_per_pixel = 2;
618 else 617 else
619 return false; 618 return false;
620 619
621 width_r = rxvt_popcount (visual->red_mask); 620 width_r = ecb_popcount32 (visual->red_mask);
622 width_g = rxvt_popcount (visual->green_mask); 621 width_g = ecb_popcount32 (visual->green_mask);
623 width_b = rxvt_popcount (visual->blue_mask); 622 width_b = ecb_popcount32 (visual->blue_mask);
624 623
625 if (width_r > 8 || width_g > 8 || width_b > 8) 624 if (width_r > 8 || width_g > 8 || width_b > 8)
626 return false; 625 return false;
627 626
628 sh_r = rxvt_ctz (visual->red_mask); 627 sh_r = ecb_ctz32 (visual->red_mask);
629 sh_g = rxvt_ctz (visual->green_mask); 628 sh_g = ecb_ctz32 (visual->green_mask);
630 sh_b = rxvt_ctz (visual->blue_mask); 629 sh_b = ecb_ctz32 (visual->blue_mask);
631 630
632 if (width > INT_MAX / height / bytes_per_pixel) 631 if (width > INT_MAX / height / bytes_per_pixel)
633 return false; 632 return false;
634 633
635 data = (char *)malloc (width * height * bytes_per_pixel); 634 data = (char *)malloc (width * height * bytes_per_pixel);
… …
642 { 641 {
643 free (data); 642 free (data);
644 return false; 643 return false;
645 } 644 }
646 645
647 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 646 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
648 647
649 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 648 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
650 channels = gdk_pixbuf_get_n_channels (pixbuf); 649 channels = gdk_pixbuf_get_n_channels (pixbuf);
651 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 650 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
652 line = data; 651 line = data;
… …
705 get_image_geometry (image_width, image_height, w, h, x, y); 704 get_image_geometry (image_width, image_height, w, h, x, y);
706 705
707 if (!(bg_flags & BG_ROOT_ALIGN) 706 if (!(bg_flags & BG_ROOT_ALIGN)
708 && (x >= target_width 707 && (x >= target_width
709 || y >= target_height 708 || y >= target_height
710 || (x + w <= 0) 709 || x + w <= 0
711 || (y + h <= 0))) 710 || y + h <= 0))
712 return false; 711 return false;
713 712
714 result = pixbuf; 713 result = pixbuf;
715 714
716 if ((w != image_width) 715 if (w != image_width
717 || (h != image_height)) 716 || h != image_height)
718 { 717 {
719 result = gdk_pixbuf_scale_simple (pixbuf, 718 result = gdk_pixbuf_scale_simple (pixbuf,
720 w, h, 719 w, h,
721 GDK_INTERP_BILINEAR); 720 GDK_INTERP_BILINEAR);
722 } 721 }
723 722
723 if (!result)
724 return false;
725
724 bool ret = false; 726 bool ret = false;
725 727
726 if (result)
727 {
728 XGCValues gcv; 728 XGCValues gcv;
729 GC gc; 729 GC gc;
730 Pixmap root_pmap; 730 Pixmap root_pmap;
731 731
732 image_width = gdk_pixbuf_get_width (result); 732 image_width = gdk_pixbuf_get_width (result);
733 image_height = gdk_pixbuf_get_height (result); 733 image_height = gdk_pixbuf_get_height (result);
734 734
735 if (tr_flags) 735 if (tr_flags)
736 { 736 {
737 root_pmap = bg_pixmap; 737 root_pmap = bg_pixmap;
738 bg_pixmap = None; 738 bg_pixmap = None;
739 }
740 else
741 {
742 if (bg_flags & BG_TILE)
739 } 743 {
740 else
741 {
742 if (h_scale == 0 || v_scale == 0)
743 {
744 new_pmap_width = min (image_width, target_width); 744 new_pmap_width = min (image_width, target_width);
745 new_pmap_height = min (image_height, target_height); 745 new_pmap_height = min (image_height, target_height);
746 } 746 }
747 } 747 }
748 748
749 if (bg_pixmap == None 749 if (bg_pixmap == None
750 || bg_pmap_width != new_pmap_width 750 || bg_pmap_width != new_pmap_width
751 || bg_pmap_height != new_pmap_height) 751 || bg_pmap_height != new_pmap_height)
752 { 752 {
753 if (bg_pixmap) 753 if (bg_pixmap)
754 XFreePixmap (dpy, bg_pixmap); 754 XFreePixmap (dpy, bg_pixmap);
755 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 755 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
756 bg_pmap_width = new_pmap_width; 756 bg_pmap_width = new_pmap_width;
757 bg_pmap_height = new_pmap_height; 757 bg_pmap_height = new_pmap_height;
758 } 758 }
759 759
760 gcv.foreground = pix_colors[Color_bg]; 760 gcv.foreground = pix_colors[Color_bg];
761 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 761 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
762 762
763 if (h_scale == 0 || v_scale == 0) 763 if (gc)
764 {
765 if (bg_flags & BG_TILE)
764 { 766 {
765 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 767 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
766 pixbuf_to_pixmap (result, tile, gc, 768 pixbuf_to_pixmap (result, tile, gc,
767 0, 0, 769 0, 0,
768 0, 0, 770 0, 0,
… …
812 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8); 814 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
813 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 815 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
814 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 816 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
815 XFreePixmap (dpy, mask_pmap); 817 XFreePixmap (dpy, mask_pmap);
816 818
817 if (src && dst && mask)
818 {
819 XRenderColor mask_c; 819 XRenderColor mask_c;
820 820
821 mask_c.alpha = 0x8000; 821 mask_c.alpha = 0x8000;
822 mask_c.red = 0; 822 mask_c.red = 0;
823 mask_c.green = 0; 823 mask_c.green = 0;
824 mask_c.blue = 0; 824 mask_c.blue = 0;
825 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 825 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
826 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 826 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
827 }
828 827
829 XRenderFreePicture (dpy, src); 828 XRenderFreePicture (dpy, src);
830 XRenderFreePicture (dpy, dst); 829 XRenderFreePicture (dpy, dst);
831 XRenderFreePicture (dpy, mask); 830 XRenderFreePicture (dpy, mask);
832
833 XFreePixmap (dpy, root_pmap);
834 } 831 }
835#endif 832#endif
836 833
837 if (result != pixbuf)
838 g_object_unref (result);
839
840 XFreeGC (dpy, gc); 834 XFreeGC (dpy, gc);
841 835
842 ret = true; 836 ret = true;
843 } 837 }
838
839 if (result != pixbuf)
840 g_object_unref (result);
841
842 if (tr_flags)
843 XFreePixmap (dpy, root_pmap);
844 844
845 return ret; 845 return ret;
846} 846}
847# endif /* HAVE_PIXBUF */ 847# endif /* HAVE_PIXBUF */
848 848
… …
850rxvt_term::bg_set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
851{ 851{
852 if (!file || !*file) 852 if (!file || !*file)
853 return false; 853 return false;
854 854
855 bool ret = false;
855 if (const char *p = strchr (file, ';')) 856 const char *p = strchr (file, ';');
857
858 if (p)
856 { 859 {
857 size_t len = p - file; 860 size_t len = p - file;
858 char *f = rxvt_temp_buf<char> (len + 1); 861 char *f = rxvt_temp_buf<char> (len + 1);
859 memcpy (f, file, len); 862 memcpy (f, file, len);
860 f[len] = '\0'; 863 f[len] = '\0';
… …
868 if (image) 871 if (image)
869 { 872 {
870 if (original_asim) 873 if (original_asim)
871 safe_asimage_destroy (original_asim); 874 safe_asimage_destroy (original_asim);
872 original_asim = image; 875 original_asim = image;
873 bg_flags |= BG_CLIENT_RENDER; 876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
874 have_image = true;
875 return true; 877 ret = true;
876 } 878 }
877# endif 879# endif
878 880
879# ifdef HAVE_PIXBUF 881# ifdef HAVE_PIXBUF
880 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
881 if (image) 883 if (image)
882 { 884 {
883 if (pixbuf) 885 if (pixbuf)
884 g_object_unref (pixbuf); 886 g_object_unref (pixbuf);
885 pixbuf = image; 887 pixbuf = image;
886 have_image = true; 888 bg_flags |= BG_IS_FROM_FILE;
887 return true; 889 ret = true;
888 } 890 }
889# endif 891# endif
890 892
893 if (ret)
894 {
895 if (p)
896 bg_set_geometry (p + 1);
897 else
898 bg_set_default_geometry ();
899 }
900
891 return false; 901 return ret;
892} 902}
893 903
894# endif /* BG_IMAGE_FROM_FILE */ 904# endif /* BG_IMAGE_FROM_FILE */
895 905
896# ifdef ENABLE_TRANSPARENCY 906# ifdef ENABLE_TRANSPARENCY
… …
940 bg_flags |= BG_NEEDS_BLUR; 950 bg_flags |= BG_NEEDS_BLUR;
941 951
942 return changed; 952 return changed;
943} 953}
944 954
945static inline unsigned long 955void
946compute_tint_shade_flags (rxvt_color *tint, int shade) 956rxvt_term::set_tint_shade_flags ()
947{ 957{
948 unsigned long flags = 0; 958 rgba c;
949 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
950 bool has_shade = shade != 100; 959 bool has_shade = shade != 100;
951 960
952 if (tint) 961 bg_flags &= ~BG_TINT_FLAGS;
962
963 if (bg_flags & BG_TINT_SET)
953 { 964 {
954 tint->get (c); 965 tint.get (c);
955 if (!has_shade 966 if (!has_shade
956 && (c.r <= 0x00ff || c.r >= 0xff00) 967 && (c.r <= 0x00ff || c.r >= 0xff00)
957 && (c.g <= 0x00ff || c.g >= 0xff00) 968 && (c.g <= 0x00ff || c.g >= 0xff00)
958 && (c.b <= 0x00ff || c.b >= 0xff00)) 969 && (c.b <= 0x00ff || c.b >= 0xff00))
959 flags |= rxvt_term::BG_TINT_BITAND; 970 bg_flags |= BG_TINT_BITAND;
960 } 971 }
961 972
962 if (has_shade || tint) 973 if (has_shade || (bg_flags & BG_TINT_SET))
963 flags |= rxvt_term::BG_NEEDS_TINT; 974 bg_flags |= BG_NEEDS_TINT;
964
965 return flags;
966} 975}
967 976
968bool 977bool
969rxvt_term::bg_set_tint (rxvt_color &new_tint) 978rxvt_term::bg_set_tint (rxvt_color &new_tint)
970{ 979{
971 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 980 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
972 { 981 {
973 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
974 tint = new_tint; 982 tint = new_tint;
975 bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags | BG_TINT_SET; 983 bg_flags |= BG_TINT_SET;
984 set_tint_shade_flags ();
976 return true; 985 return true;
977 } 986 }
978 987
979 return false; 988 return false;
980} 989}
… …
988 if (new_shade < 0) 997 if (new_shade < 0)
989 new_shade = 200 - (100 + new_shade); 998 new_shade = 200 - (100 + new_shade);
990 999
991 if (new_shade != shade) 1000 if (new_shade != shade)
992 { 1001 {
993 unsigned long new_flags = compute_tint_shade_flags ((bg_flags & BG_TINT_SET) ? &tint : NULL, new_shade);
994 shade = new_shade; 1002 shade = new_shade;
995 bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags; 1003 set_tint_shade_flags ();
996 return true; 1004 return true;
997 } 1005 }
998 1006
999 return false; 1007 return false;
1000} 1008}
… …
1025bool 1033bool
1026rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1027{ 1035{
1028 bool ret = false; 1036 bool ret = false;
1029#if XRENDER 1037#if XRENDER
1038 if (!(bg_flags & BG_HAS_RENDER_CONV))
1039 return false;
1040
1030 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1041 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1031 double *kernel = (double *)malloc (size * sizeof (double)); 1042 double *kernel = (double *)malloc (size * sizeof (double));
1032 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1033 1044
1034 XRenderPictureAttributes pa; 1045 XRenderPictureAttributes pa;
1035 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1046 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1036 1047
1037 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1048 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1038 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1049 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1039 1050
1040 if (kernel && params && src && dst) 1051 if (kernel && params)
1041 { 1052 {
1042 if (h_blurRadius) 1053 if (h_blurRadius)
1043 { 1054 {
1044 size = h_blurRadius * 2 + 1; 1055 size = h_blurRadius * 2 + 1;
1045 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1056 get_gaussian_kernel (h_blurRadius, size, kernel, params);
… …
1107 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1118 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1108 ret = true; 1119 ret = true;
1109 XFreeGC (dpy, gc); 1120 XFreeGC (dpy, gc);
1110 } 1121 }
1111 } 1122 }
1112 else
1113 {
1114# if XRENDER 1123# if XRENDER
1124 else if (bg_flags & BG_HAS_RENDER)
1125 {
1115 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1126 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1116 1127
1117 if (bg_flags & BG_TINT_SET) 1128 if (bg_flags & BG_TINT_SET)
1118 tint.get (c); 1129 tint.get (c);
1119 1130
1120 if (shade <= 100) 1131 if (shade <= 100)
1121 { 1132 {
1122 c.r = (c.r * shade) / 100; 1133 c.r = c.r * shade / 100;
1123 c.g = (c.g * shade) / 100; 1134 c.g = c.g * shade / 100;
1124 c.b = (c.b * shade) / 100; 1135 c.b = c.b * shade / 100;
1125 } 1136 }
1126 else 1137 else
1127 { 1138 {
1128 c.r = (c.r * (200 - shade)) / 100; 1139 c.r = c.r * (200 - shade) / 100;
1129 c.g = (c.g * (200 - shade)) / 100; 1140 c.g = c.g * (200 - shade) / 100;
1130 c.b = (c.b * (200 - shade)) / 100; 1141 c.b = c.b * (200 - shade) / 100;
1131 } 1142 }
1132 1143
1133 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1144 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1134 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1145 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1135 XRenderPictureAttributes pa; 1146 XRenderPictureAttributes pa;
… …
1142 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1153 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1143 XFreePixmap (dpy, overlay_pmap); 1154 XFreePixmap (dpy, overlay_pmap);
1144 1155
1145 pa.component_alpha = True; 1156 pa.component_alpha = True;
1146 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1157 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1147 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1158 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1148 XFreePixmap (dpy, mask_pmap); 1159 XFreePixmap (dpy, mask_pmap);
1149 1160
1150 if (mask_pic && overlay_pic && back_pic)
1151 {
1152 XRenderColor mask_c; 1161 XRenderColor mask_c;
1153 1162
1154 mask_c.red = mask_c.green = mask_c.blue = 0;
1155 mask_c.alpha = 0xffff; 1163 mask_c.alpha = 0xffff;
1164 mask_c.red =
1165 mask_c.green =
1166 mask_c.blue = 0;
1167 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1168
1169 mask_c.alpha = 0;
1170 mask_c.red = 0xffff - c.r;
1171 mask_c.green = 0xffff - c.g;
1172 mask_c.blue = 0xffff - c.b;
1173 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1174 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1175
1176 if (shade > 100)
1177 {
1178 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1179 mask_c.alpha = 0;
1156 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1180 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1157 1181
1158 mask_c.alpha = 0;
1159 mask_c.red = 0xffff - c.r;
1160 mask_c.green = 0xffff - c.g;
1161 mask_c.blue = 0xffff - c.b;
1162 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1163 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1164
1165 if (shade > 100)
1166 {
1167 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1168 mask_c.alpha = 0;
1169 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1170
1171 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1182 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1172 } 1183 }
1173 1184
1174 ret = true; 1185 ret = true;
1175 }
1176 1186
1177 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1178 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1179 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1180# endif 1191# endif
1181 }
1182 1192
1183 return ret; 1193 return ret;
1184} 1194}
1185 1195
1186/* make_transparency_pixmap() 1196/*
1187 * Builds a pixmap of the same size as the terminal window that contains 1197 * Builds a pixmap of the same size as the terminal window that contains
1188 * the tiled portion of the root pixmap that is supposed to be covered by 1198 * the tiled portion of the root pixmap that is supposed to be covered by
1189 * our window. 1199 * our window.
1190 */ 1200 */
1191unsigned long 1201unsigned long
… …
1235 if (root_pixmap != None && root_depth != depth) 1245 if (root_pixmap != None && root_depth != depth)
1236 { 1246 {
1237#if XRENDER 1247#if XRENDER
1238 if (bg_flags & BG_HAS_RENDER) 1248 if (bg_flags & BG_HAS_RENDER)
1239 { 1249 {
1250 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1251
1240 XRenderPictureAttributes pa; 1252 XRenderPictureAttributes pa;
1241 1253
1242 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1254 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1243 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1255 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1244 1256
1245 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1246 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1257 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1247 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1258 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1248 1259
1249 if (src && dst)
1250 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1260 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1251 else
1252 {
1253 XFreePixmap (dpy, recoded_root_pmap);
1254 root_pixmap = None;
1255 }
1256 1261
1257 XRenderFreePicture (dpy, src); 1262 XRenderFreePicture (dpy, src);
1258 XRenderFreePicture (dpy, dst); 1263 XRenderFreePicture (dpy, dst);
1259 } 1264 }
1260 else 1265 else
1261#endif 1266#endif
1262 root_pixmap = None; 1267 recoded_root_pmap = None;
1263 } 1268 }
1264 1269
1265 if (root_pixmap == None) 1270 if (recoded_root_pmap == None)
1266 return 0; 1271 return 0;
1267 1272
1268 if (bg_pixmap == None 1273 if (bg_pixmap == None
1269 || bg_pmap_width != window_width 1274 || bg_pmap_width != window_width
1270 || bg_pmap_height != window_height) 1275 || bg_pmap_height != window_height)
… …
1274 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); 1279 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1275 bg_pmap_width = window_width; 1280 bg_pmap_width = window_width;
1276 bg_pmap_height = window_height; 1281 bg_pmap_height = window_height;
1277 } 1282 }
1278 1283
1279 if (bg_pixmap == None)
1280 return 0;
1281
1282 /* straightforward pixmap copy */ 1284 /* straightforward pixmap copy */
1283 while (sx < 0) sx += (int)root_width; 1285 while (sx < 0) sx += root_pmap_width;
1284 while (sy < 0) sy += (int)root_height; 1286 while (sy < 0) sy += root_pmap_height;
1285 1287
1286 gcv.tile = recoded_root_pmap; 1288 gcv.tile = recoded_root_pmap;
1287 gcv.fill_style = FillTiled; 1289 gcv.fill_style = FillTiled;
1288 gcv.ts_x_origin = -sx; 1290 gcv.ts_x_origin = -sx;
1289 gcv.ts_y_origin = -sy; 1291 gcv.ts_y_origin = -sy;
… …
1295 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1296 XFreeGC (dpy, gc); 1298 XFreeGC (dpy, gc);
1297 1299
1298 if (!(bg_flags & BG_CLIENT_RENDER)) 1300 if (!(bg_flags & BG_CLIENT_RENDER))
1299 { 1301 {
1300 if ((bg_flags & BG_NEEDS_BLUR) 1302 if (bg_flags & BG_NEEDS_BLUR)
1301 && (bg_flags & BG_HAS_RENDER_CONV))
1302 { 1303 {
1303 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1304 result &= ~BG_NEEDS_BLUR; 1305 result &= ~BG_NEEDS_BLUR;
1305 } 1306 }
1306 if ((bg_flags & BG_NEEDS_TINT) 1307 if (bg_flags & BG_NEEDS_TINT)
1307 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1308 { 1308 {
1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1310 result &= ~BG_NEEDS_TINT; 1310 result &= ~BG_NEEDS_TINT;
1311 } 1311 }
1312 } /* server side rendering completed */ 1312 } /* server side rendering completed */
… …
1344 { 1344 {
1345 /* we need to re-generate transparency pixmap in that case ! */ 1345 /* we need to re-generate transparency pixmap in that case ! */
1346 tr_flags = make_transparency_pixmap (); 1346 tr_flags = make_transparency_pixmap ();
1347 if (tr_flags == 0) 1347 if (tr_flags == 0)
1348 return false; 1348 return false;
1349 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1350 bg_flags |= BG_IS_VALID; 1349 bg_flags |= BG_IS_VALID;
1351 } 1350 }
1352# endif 1351# endif
1353 1352
1354# ifdef BG_IMAGE_FROM_FILE 1353# ifdef BG_IMAGE_FROM_FILE
1355 if (have_image 1354 if ((bg_flags & BG_IS_FROM_FILE)
1356 || (tr_flags & BG_EFFECTS_FLAGS)) 1355 || (tr_flags & BG_EFFECTS_FLAGS))
1357 { 1356 {
1358 if (render_image (tr_flags)) 1357 if (render_image (tr_flags))
1359 bg_flags |= BG_IS_VALID; 1358 bg_flags |= BG_IS_VALID;
1360 } 1359 }
1361# endif 1360# endif
1362 1361
1363# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1364 XImage *result = NULL; 1363 XImage *result = NULL;
1365 1364
1366 if (tr_flags && !(bg_flags & BG_IS_VALID)) 1365 if (tr_flags & BG_NEEDS_TINT)
1367 { 1366 {
1368 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap); 1367 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1369 } 1368 }
1370 1369
1371 if (result) 1370 if (result)
1372 { 1371 {
1373 /* our own client-side tinting */ 1372 /* our own client-side tinting */
1374 if (tr_flags & BG_NEEDS_TINT) 1373 //if (tr_flags & BG_NEEDS_TINT)
1374 if (1)
1375 { 1375 {
1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1377 if (bg_flags & BG_TINT_SET) 1377 if (bg_flags & BG_TINT_SET)
1378 tint.get (c); 1378 tint.get (c);
1379 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1379 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
… …
1384 if (gc) 1384 if (gc)
1385 { 1385 {
1386 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1386 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1387 1387
1388 XFreeGC (dpy, gc); 1388 XFreeGC (dpy, gc);
1389 bg_flags |= BG_IS_VALID;
1390 } 1389 }
1391 1390
1392 XDestroyImage (result); 1391 XDestroyImage (result);
1393 } 1392 }
1394# endif 1393# endif
… …
1435} 1434}
1436 1435
1437#endif /* HAVE_BG_PIXMAP */ 1436#endif /* HAVE_BG_PIXMAP */
1438 1437
1439#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1438#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1440/* taken from aterm-0.4.2 */ 1439/* based on code from aterm-0.4.2 */
1440
1441static inline void
1442fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1443{
1444 for (int i = 0; i <= mask >> sh; i++)
1445 {
1446 uint32_t tmp;
1447 tmp = i * high;
1448 tmp += (mask >> sh) * low;
1449 lookup[i] = (tmp / 0xffff) << sh;
1450 }
1451}
1441 1452
1442static void 1453static void
1443shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1454shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1444{ 1455{
1445 int sh_r, sh_g, sh_b; 1456 int sh_r, sh_g, sh_b;
1446 uint32_t mask_r, mask_g, mask_b; 1457 uint32_t mask_r, mask_g, mask_b;
1447 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1458 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1448 rgba low; 1459 unsigned short low;
1449 rgba high; 1460 rgba high;
1450 int i;
1451 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1461 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1452 1462
1453 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1463 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1454 1464
1455 /* for convenience */ 1465 /* for convenience */
1456 mask_r = visual->red_mask; 1466 mask_r = visual->red_mask;
… …
1523 1533
1524 high.r = c.r * shade / 100; 1534 high.r = c.r * shade / 100;
1525 high.g = c.g * shade / 100; 1535 high.g = c.g * shade / 100;
1526 high.b = c.b * shade / 100; 1536 high.b = c.b * shade / 100;
1527 1537
1528 low.r = 65535 * (100 - shade) / 100; 1538 low = 0xffff * (100 - shade) / 100;
1529 low.g = 65535 * (100 - shade) / 100;
1530 low.b = 65535 * (100 - shade) / 100;
1531 } 1539 }
1532 else 1540 else
1533 { 1541 {
1534 high.r = c.r * shade / 100; 1542 high.r = c.r * shade / 100;
1535 high.g = c.g * shade / 100; 1543 high.g = c.g * shade / 100;
1536 high.b = c.b * shade / 100; 1544 high.b = c.b * shade / 100;
1537 1545
1538 low.r = low.g = low.b = 0; 1546 low = 0;
1539 } 1547 }
1540 1548
1541 /* fill our lookup tables */ 1549 /* fill our lookup tables */
1542 for (i = 0; i <= mask_r>>sh_r; i++) 1550 fill_lut (lookup_r, mask_r, sh_r, low, high.r);
1543 { 1551 fill_lut (lookup_g, mask_g, sh_g, low, high.g);
1544 uint32_t tmp; 1552 fill_lut (lookup_b, mask_b, sh_b, low, high.b);
1545 tmp = i * high.r;
1546 tmp += (mask_r>>sh_r) * low.r;
1547 lookup_r[i] = (tmp/65535)<<sh_r;
1548 }
1549 for (i = 0; i <= mask_g>>sh_g; i++)
1550 {
1551 uint32_t tmp;
1552 tmp = i * high.g;
1553 tmp += (mask_g>>sh_g) * low.g;
1554 lookup_g[i] = (tmp/65535)<<sh_g;
1555 }
1556 for (i = 0; i <= mask_b>>sh_b; i++)
1557 {
1558 uint32_t tmp;
1559 tmp = i * high.b;
1560 tmp += (mask_b>>sh_b) * low.b;
1561 lookup_b[i] = (tmp/65535)<<sh_b;
1562 }
1563 1553
1564 /* apply table to input image (replacing colors by newly calculated ones) */ 1554 /* apply table to input image (replacing colors by newly calculated ones) */
1565 if (ximage->bits_per_pixel == 32 1555 if (ximage->bits_per_pixel == 32
1566 && (ximage->depth == 24 || ximage->depth == 32) 1556 && (ximage->depth == 24 || ximage->depth == 32)
1567 && ximage->byte_order == host_byte_order) 1557 && ximage->byte_order == host_byte_order)

Diff Legend

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