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.142 by sf-exg, Thu Jan 27 17:37:18 2011 UTC vs.
Revision 1.168 by sf-exg, Fri Aug 19 17:49:08 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);
… …
94 72
95bool 73bool
96rxvt_term::bg_window_size_sensitive () 74rxvt_term::bg_window_size_sensitive ()
97{ 75{
98# ifdef ENABLE_TRANSPARENCY 76# ifdef ENABLE_TRANSPARENCY
99 if (bg_flags & isTransparent) 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 & sizeSensitive) 84 if (bg_flags & BG_IS_SIZE_SENSITIVE)
107 return true; 85 return true;
108 } 86 }
109# endif 87# endif
110 88
111 return false; 89 return false;
… …
113 91
114bool 92bool
115rxvt_term::bg_window_position_sensitive () 93rxvt_term::bg_window_position_sensitive ()
116{ 94{
117# ifdef ENABLE_TRANSPARENCY 95# ifdef ENABLE_TRANSPARENCY
118 if (bg_flags & isTransparent) 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 & rootAlign) 103 if (bg_flags & BG_ROOT_ALIGN)
126 return true; 104 return true;
127 } 105 }
128# endif 106# endif
129 107
130 return false; 108 return false;
… …
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 & (~geometryFlags)); 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_PROP_SCALE;
207 w = h = windowScale;
208 x = y = centerAlign;
209 geom_flags = WidthValue|HeightValue|XValue|YValue;
210 }
211 else if (!strcasecmp (arr[i], "style=stretched"))
212 {
213 new_flags = 0;
214 w = h = windowScale;
215 geom_flags = WidthValue|HeightValue;
216 }
217 else if (!strcasecmp (arr[i], "style=centered"))
218 {
219 new_flags = 0;
220 w = h = noScale;
221 x = y = centerAlign;
222 geom_flags = WidthValue|HeightValue|XValue|YValue;
223 }
224 else if (!strcasecmp (arr[i], "style=root-tiled"))
225 {
226 new_flags = BG_TILE|BG_ROOT_ALIGN;
227 w = h = noScale;
228 geom_flags = WidthValue|HeightValue;
229 }
230 else if (!strcasecmp (arr[i], "op=tile"))
231 new_flags |= BG_TILE;
232 else if (!strcasecmp (arr[i], "op=pscale"))
233 new_flags |= BG_PROP_SCALE;
234 else if (!strcasecmp (arr[i], "op=root"))
235 new_flags |= BG_ROOT_ALIGN;
236
237 // deprecated
238 else if (!strcasecmp (arr[i], "tile"))
239 {
240 new_flags |= BG_TILE;
241 w = h = noScale;
242 geom_flags |= WidthValue|HeightValue;
243 }
244 else if (!strcasecmp (arr[i], "propscale"))
245 {
246 new_flags |= BG_PROP_SCALE;
247 }
248 else if (!strcasecmp (arr[i], "hscale"))
249 {
250 new_flags |= BG_TILE;
251 w = windowScale;
252 h = noScale;
253 geom_flags |= WidthValue|HeightValue;
254 }
255 else if (!strcasecmp (arr[i], "vscale"))
256 {
257 new_flags |= BG_TILE;
258 h = windowScale;
259 w = noScale;
260 geom_flags |= WidthValue|HeightValue;
261 }
262 else if (!strcasecmp (arr[i], "scale"))
263 {
264 w = h = windowScale;
265 geom_flags |= WidthValue|HeightValue;
266 }
267 else if (!strcasecmp (arr[i], "auto"))
268 {
269 w = h = windowScale;
270 x = y = centerAlign;
271 geom_flags |= WidthValue|HeightValue|XValue|YValue;
272 }
273 else if (!strcasecmp (arr[i], "root"))
274 {
275 new_flags |= BG_TILE|BG_ROOT_ALIGN;
276 w = h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279
280 else
233 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
234 } /* done parsing geometry string */ 282 } /* done parsing ops */
283
284 rxvt_free_strsplit (arr);
285 }
235 286
236 if (!update) 287 if (!update)
237 { 288 {
238 if (!(geom_flags & XValue)) 289 if (!(geom_flags & XValue))
239 x = y = defaultAlign; 290 x = y = defaultAlign;
… …
248 w = h; 299 w = h;
249 300
250 geom_flags |= WidthValue|HeightValue|XValue|YValue; 301 geom_flags |= WidthValue|HeightValue|XValue|YValue;
251 } 302 }
252 303
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 |= propScale;
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 |= rootAlign;
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; 304 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; 305 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; 306 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; 307 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
310 308
… …
321rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 319rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
322{ 320{
323 int target_width = szHint.width; 321 int target_width = szHint.width;
324 int target_height = szHint.height; 322 int target_height = szHint.height;
325 323
326 if (bg_flags & propScale) 324 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100;
326
327 if (bg_flags & BG_PROP_SCALE)
327 { 328 {
328 float scale = (float)target_width / image_width; 329 float scale = (float)w / image_width;
329 min_it (scale, (float)target_height / image_height); 330 min_it (scale, (float)h / image_height);
330 w = image_width * scale + 0.5; 331 w = image_width * scale + 0.5;
331 h = image_height * scale + 0.5; 332 h = image_height * scale + 0.5;
332 } 333 }
333 else
334 {
335 w = h_scale * target_width / 100;
336 h = v_scale * target_height / 100;
337 }
338 334
339 if (!w) w = image_width; 335 if (!w) w = image_width;
340 if (!h) h = image_height; 336 if (!h) h = image_height;
341 337
342 if (bg_flags & rootAlign) 338 if (bg_flags & BG_ROOT_ALIGN)
343 { 339 {
344 x = -target_x; 340 x = -target_x;
345 y = -target_y; 341 y = -target_y;
346 } 342 }
347 else 343 else
348 { 344 {
349 x = make_align_position (h_align, target_width, w); 345 x = make_align_position (h_align, target_width, w);
350 y = make_align_position (v_align, target_height, h); 346 y = make_align_position (v_align, target_height, h);
351 } 347 }
352 348
353 bg_flags &= ~sizeSensitive; 349 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
354 if ((bg_flags & propScale) || h_scale || v_scale 350 if (!(bg_flags & BG_TILE)
351 || h_scale || v_scale
355 || (!(bg_flags & rootAlign) && (h_align || v_align)) 352 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
356 || w > target_width || h > target_height) 353 || w > target_width || h > target_height)
357 bg_flags |= sizeSensitive; 354 bg_flags |= BG_IS_SIZE_SENSITIVE;
358} 355}
359 356
360# ifdef HAVE_AFTERIMAGE 357# ifdef HAVE_AFTERIMAGE
361bool 358bool
362rxvt_term::render_image (unsigned long tr_flags) 359rxvt_term::render_image (unsigned long tr_flags)
… …
368 365
369# ifdef ENABLE_TRANSPARENCY 366# ifdef ENABLE_TRANSPARENCY
370 if (tr_flags) 367 if (tr_flags)
371 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100); 368 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
372 369
373 if (tr_flags & tintNeeded) 370 if (tr_flags & BG_NEEDS_TINT)
374 { 371 {
375 ShadingInfo as_shade; 372 ShadingInfo as_shade;
376 as_shade.shading = shade; 373 as_shade.shading = shade;
377 374
378 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
379 if (bg_flags & tintSet) 376 if (bg_flags & BG_TINT_SET)
380 tint.get (c); 377 tint.get (c);
381 as_shade.tintColor.red = c.r; 378 as_shade.tintColor.red = c.r;
382 as_shade.tintColor.green = c.g; 379 as_shade.tintColor.green = c.g;
383 as_shade.tintColor.blue = c.b; 380 as_shade.tintColor.blue = c.b;
384 381
385 background_tint = shading2tint32 (&as_shade); 382 background_tint = shading2tint32 (&as_shade);
386 } 383 }
387 384
388 if ((tr_flags & blurNeeded) && background != NULL) 385 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
389 { 386 {
390 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 387 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
391 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 388 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
392 100, ASIMAGE_QUALITY_DEFAULT); 389 100, ASIMAGE_QUALITY_DEFAULT);
393 if (tmp) 390 if (tmp)
… …
412 409
413 if (original_asim) 410 if (original_asim)
414 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 411 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
415 412
416 if (!original_asim 413 if (!original_asim
417 || (!(bg_flags & rootAlign) 414 || (!(bg_flags & BG_ROOT_ALIGN)
418 && (x >= target_width 415 && (x >= target_width
419 || y >= target_height 416 || y >= target_height
420 || (x + w <= 0) 417 || (x + w <= 0)
421 || (y + h <= 0)))) 418 || (y + h <= 0))))
422 { 419 {
… …
451 100, ASIMAGE_QUALITY_DEFAULT); 448 100, ASIMAGE_QUALITY_DEFAULT);
452 } 449 }
453 450
454 if (background == NULL) 451 if (background == NULL)
455 { 452 {
456 if (h_scale == 0 || v_scale == 0) 453 if (bg_flags & BG_TILE)
457 { 454 {
458 /* if tiling - pixmap has to be sized exactly as the image, 455 /* if tiling - pixmap has to be sized exactly as the image,
459 but there is no need to make it bigger than the window! */ 456 but there is no need to make it bigger than the window! */
460 new_pmap_width = min (result->width, target_width); 457 new_pmap_width = min (result->width, target_width);
461 new_pmap_height = min (result->height, target_height); 458 new_pmap_height = min (result->height, target_height);
… …
486 layers[0].clip_width = target_width; 483 layers[0].clip_width = target_width;
487 layers[0].clip_height = target_height; 484 layers[0].clip_height = target_height;
488 layers[0].tint = background_tint; 485 layers[0].tint = background_tint;
489 layers[1].im = result; 486 layers[1].im = result;
490 487
491 if (h_scale == 0 || v_scale == 0) 488 if (bg_flags & BG_TILE)
492 { 489 {
493 /* tile horizontally */ 490 /* tile horizontally */
494 while (x > 0) x -= (int)result->width; 491 while (x > 0) x -= (int)result->width;
495 layers[1].dst_x = x; 492 layers[1].dst_x = x;
496 layers[1].clip_width = result->width+target_width; 493 layers[1].clip_width = result->width+target_width;
… …
500 /* clip horizontally */ 497 /* clip horizontally */
501 layers[1].dst_x = x; 498 layers[1].dst_x = x;
502 layers[1].clip_width = result->width; 499 layers[1].clip_width = result->width;
503 } 500 }
504 501
505 if (h_scale == 0 || v_scale == 0) 502 if (bg_flags & BG_TILE)
506 { 503 {
507 while (y > 0) y -= (int)result->height; 504 while (y > 0) y -= (int)result->height;
508 layers[1].dst_y = y; 505 layers[1].dst_y = y;
509 layers[1].clip_height = result->height + target_height; 506 layers[1].clip_height = result->height + target_height;
510 } 507 }
… …
560 557
561 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 558 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
562 int dst_width = result->width, dst_height = result->height; 559 int dst_width = result->width, dst_height = result->height;
563 if (background == NULL) 560 if (background == NULL)
564 { 561 {
565 if (!(h_scale == 0 || v_scale == 0)) 562 if (!(bg_flags & BG_TILE))
566 { 563 {
567 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 564 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); 565 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
569 } 566 }
570 567
… …
616 else if (depth == 15 || depth == 16) 613 else if (depth == 15 || depth == 16)
617 bytes_per_pixel = 2; 614 bytes_per_pixel = 2;
618 else 615 else
619 return false; 616 return false;
620 617
621 width_r = rxvt_popcount (visual->red_mask); 618 width_r = ecb_popcount32 (visual->red_mask);
622 width_g = rxvt_popcount (visual->green_mask); 619 width_g = ecb_popcount32 (visual->green_mask);
623 width_b = rxvt_popcount (visual->blue_mask); 620 width_b = ecb_popcount32 (visual->blue_mask);
624 621
625 if (width_r > 8 || width_g > 8 || width_b > 8) 622 if (width_r > 8 || width_g > 8 || width_b > 8)
626 return false; 623 return false;
627 624
628 sh_r = rxvt_ctz (visual->red_mask); 625 sh_r = ecb_ctz32 (visual->red_mask);
629 sh_g = rxvt_ctz (visual->green_mask); 626 sh_g = ecb_ctz32 (visual->green_mask);
630 sh_b = rxvt_ctz (visual->blue_mask); 627 sh_b = ecb_ctz32 (visual->blue_mask);
631 628
632 if (width > INT_MAX / height / bytes_per_pixel) 629 if (width > INT_MAX / height / bytes_per_pixel)
633 return false; 630 return false;
634 631
635 data = (char *)malloc (width * height * bytes_per_pixel); 632 data = (char *)malloc (width * height * bytes_per_pixel);
… …
642 { 639 {
643 free (data); 640 free (data);
644 return false; 641 return false;
645 } 642 }
646 643
647 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 644 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
648 645
649 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 646 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
650 channels = gdk_pixbuf_get_n_channels (pixbuf); 647 channels = gdk_pixbuf_get_n_channels (pixbuf);
651 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 648 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
652 line = data; 649 line = data;
… …
682{ 679{
683 if (!pixbuf) 680 if (!pixbuf)
684 return false; 681 return false;
685 682
686 if (tr_flags 683 if (tr_flags
687 && !(bg_flags & HAS_RENDER)) 684 && !(bg_flags & BG_HAS_RENDER))
688 return false; 685 return false;
689 686
690 GdkPixbuf *result; 687 GdkPixbuf *result;
691 688
692 int image_width = gdk_pixbuf_get_width (pixbuf); 689 int image_width = gdk_pixbuf_get_width (pixbuf);
… …
702 int w = 0; 699 int w = 0;
703 int h = 0; 700 int h = 0;
704 701
705 get_image_geometry (image_width, image_height, w, h, x, y); 702 get_image_geometry (image_width, image_height, w, h, x, y);
706 703
707 if (!(bg_flags & rootAlign) 704 if (!(bg_flags & BG_ROOT_ALIGN)
708 && (x >= target_width 705 && (x >= target_width
709 || y >= target_height 706 || y >= target_height
710 || (x + w <= 0) 707 || (x + w <= 0)
711 || (y + h <= 0))) 708 || (y + h <= 0)))
712 return false; 709 return false;
… …
719 result = gdk_pixbuf_scale_simple (pixbuf, 716 result = gdk_pixbuf_scale_simple (pixbuf,
720 w, h, 717 w, h,
721 GDK_INTERP_BILINEAR); 718 GDK_INTERP_BILINEAR);
722 } 719 }
723 720
721 if (!result)
722 return false;
723
724 bool ret = false; 724 bool ret = false;
725 725
726 if (result)
727 {
728 XGCValues gcv; 726 XGCValues gcv;
729 GC gc; 727 GC gc;
730 Pixmap root_pmap; 728 Pixmap root_pmap;
731 729
732 image_width = gdk_pixbuf_get_width (result); 730 image_width = gdk_pixbuf_get_width (result);
733 image_height = gdk_pixbuf_get_height (result); 731 image_height = gdk_pixbuf_get_height (result);
734 732
735 if (tr_flags) 733 if (tr_flags)
736 { 734 {
737 root_pmap = bg_pixmap; 735 root_pmap = bg_pixmap;
738 bg_pixmap = None; 736 bg_pixmap = None;
737 }
738 else
739 {
740 if (bg_flags & BG_TILE)
739 } 741 {
740 else
741 {
742 if (h_scale == 0 || v_scale == 0)
743 {
744 new_pmap_width = min (image_width, target_width); 742 new_pmap_width = min (image_width, target_width);
745 new_pmap_height = min (image_height, target_height); 743 new_pmap_height = min (image_height, target_height);
746 } 744 }
747 } 745 }
748 746
749 if (bg_pixmap == None 747 if (bg_pixmap == None
750 || bg_pmap_width != new_pmap_width 748 || bg_pmap_width != new_pmap_width
751 || bg_pmap_height != new_pmap_height) 749 || bg_pmap_height != new_pmap_height)
752 { 750 {
753 if (bg_pixmap) 751 if (bg_pixmap)
754 XFreePixmap (dpy, bg_pixmap); 752 XFreePixmap (dpy, bg_pixmap);
755 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 753 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
756 bg_pmap_width = new_pmap_width; 754 bg_pmap_width = new_pmap_width;
757 bg_pmap_height = new_pmap_height; 755 bg_pmap_height = new_pmap_height;
758 } 756 }
759 757
760 gcv.foreground = pix_colors[Color_bg]; 758 gcv.foreground = pix_colors[Color_bg];
761 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 759 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
762 760
763 if (h_scale == 0 || v_scale == 0) 761 if (gc)
762 {
763 if (bg_flags & BG_TILE)
764 { 764 {
765 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 765 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
766 pixbuf_to_pixmap (result, tile, gc, 766 pixbuf_to_pixmap (result, tile, gc,
767 0, 0, 767 0, 0,
768 0, 0, 768 0, 0,
… …
812 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8); 812 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
813 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 813 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
814 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 814 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
815 XFreePixmap (dpy, mask_pmap); 815 XFreePixmap (dpy, mask_pmap);
816 816
817 if (src && dst && mask)
818 {
819 XRenderColor mask_c; 817 XRenderColor mask_c;
820 818
821 mask_c.alpha = 0x8000; 819 mask_c.alpha = 0x8000;
822 mask_c.red = 0; 820 mask_c.red = 0;
823 mask_c.green = 0; 821 mask_c.green = 0;
824 mask_c.blue = 0; 822 mask_c.blue = 0;
825 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 823 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); 824 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
827 }
828 825
829 XRenderFreePicture (dpy, src); 826 XRenderFreePicture (dpy, src);
830 XRenderFreePicture (dpy, dst); 827 XRenderFreePicture (dpy, dst);
831 XRenderFreePicture (dpy, mask); 828 XRenderFreePicture (dpy, mask);
832
833 XFreePixmap (dpy, root_pmap);
834 } 829 }
835#endif 830#endif
836 831
837 if (result != pixbuf)
838 g_object_unref (result);
839
840 XFreeGC (dpy, gc); 832 XFreeGC (dpy, gc);
841 833
842 ret = true; 834 ret = true;
843 } 835 }
836
837 if (result != pixbuf)
838 g_object_unref (result);
839
840 if (tr_flags)
841 XFreePixmap (dpy, root_pmap);
844 842
845 return ret; 843 return ret;
846} 844}
847# endif /* HAVE_PIXBUF */ 845# endif /* HAVE_PIXBUF */
848 846
… …
850rxvt_term::bg_set_file (const char *file) 848rxvt_term::bg_set_file (const char *file)
851{ 849{
852 if (!file || !*file) 850 if (!file || !*file)
853 return false; 851 return false;
854 852
853 bool ret = false;
855 if (const char *p = strchr (file, ';')) 854 const char *p = strchr (file, ';');
855
856 if (p)
856 { 857 {
857 size_t len = p - file; 858 size_t len = p - file;
858 char *f = rxvt_temp_buf<char> (len + 1); 859 char *f = rxvt_temp_buf<char> (len + 1);
859 memcpy (f, file, len); 860 memcpy (f, file, len);
860 f[len] = '\0'; 861 f[len] = '\0';
… …
868 if (image) 869 if (image)
869 { 870 {
870 if (original_asim) 871 if (original_asim)
871 safe_asimage_destroy (original_asim); 872 safe_asimage_destroy (original_asim);
872 original_asim = image; 873 original_asim = image;
873 bg_flags |= CLIENT_RENDER; 874 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
874 have_image = true;
875 return true; 875 ret = true;
876 } 876 }
877# endif 877# endif
878 878
879# ifdef HAVE_PIXBUF 879# ifdef HAVE_PIXBUF
880 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 880 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
881 if (image) 881 if (image)
882 { 882 {
883 if (pixbuf) 883 if (pixbuf)
884 g_object_unref (pixbuf); 884 g_object_unref (pixbuf);
885 pixbuf = image; 885 pixbuf = image;
886 have_image = true; 886 bg_flags |= BG_IS_FROM_FILE;
887 return true; 887 ret = true;
888 } 888 }
889# endif 889# endif
890 890
891 if (ret)
892 {
893 if (p)
894 bg_set_geometry (p + 1);
895 else
896 bg_set_default_geometry ();
897 }
898
891 return false; 899 return ret;
892} 900}
893 901
894# endif /* BG_IMAGE_FROM_FILE */ 902# endif /* BG_IMAGE_FROM_FILE */
895 903
896# ifdef ENABLE_TRANSPARENCY 904# ifdef ENABLE_TRANSPARENCY
897bool 905bool
898rxvt_term::bg_set_transparent () 906rxvt_term::bg_set_transparent ()
899{ 907{
900 if (!(bg_flags & isTransparent)) 908 if (!(bg_flags & BG_IS_TRANSPARENT))
901 { 909 {
902 bg_flags |= isTransparent; 910 bg_flags |= BG_IS_TRANSPARENT;
903 return true; 911 return true;
904 } 912 }
905 913
906 return false; 914 return false;
907} 915}
… …
933 changed = true; 941 changed = true;
934 v_blurRadius = vr; 942 v_blurRadius = vr;
935 } 943 }
936 944
937 if (v_blurRadius == 0 && h_blurRadius == 0) 945 if (v_blurRadius == 0 && h_blurRadius == 0)
938 bg_flags &= ~blurNeeded; 946 bg_flags &= ~BG_NEEDS_BLUR;
939 else 947 else
940 bg_flags |= blurNeeded; 948 bg_flags |= BG_NEEDS_BLUR;
941 949
942 return changed; 950 return changed;
943} 951}
944 952
945static inline unsigned long 953void
946compute_tint_shade_flags (rxvt_color *tint, int shade) 954rxvt_term::set_tint_shade_flags ()
947{ 955{
948 unsigned long flags = 0;
949 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 956 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
950 bool has_shade = shade != 100; 957 bool has_shade = shade != 100;
951 958
952 if (tint) 959 bg_flags &= ~BG_TINT_FLAGS;
960
961 if (bg_flags & BG_TINT_SET)
953 { 962 {
954 tint->get (c); 963 tint.get (c);
955 if (!has_shade 964 if (!has_shade
956 && (c.r <= 0x00ff || c.r >= 0xff00) 965 && (c.r <= 0x00ff || c.r >= 0xff00)
957 && (c.g <= 0x00ff || c.g >= 0xff00) 966 && (c.g <= 0x00ff || c.g >= 0xff00)
958 && (c.b <= 0x00ff || c.b >= 0xff00)) 967 && (c.b <= 0x00ff || c.b >= 0xff00))
959 flags |= rxvt_term::tintWholesome; 968 bg_flags |= BG_TINT_BITAND;
960 } 969 }
961 970
962 if (has_shade || tint) 971 if (has_shade || (bg_flags & BG_TINT_SET))
963 flags |= rxvt_term::tintNeeded; 972 bg_flags |= BG_NEEDS_TINT;
964
965 return flags;
966} 973}
967 974
968bool 975bool
969rxvt_term::bg_set_tint (rxvt_color &new_tint) 976rxvt_term::bg_set_tint (rxvt_color &new_tint)
970{ 977{
971 if (!(bg_flags & tintSet) || tint != new_tint) 978 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
972 { 979 {
973 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
974 tint = new_tint; 980 tint = new_tint;
975 bg_flags = (bg_flags & ~tintFlags) | new_flags | tintSet; 981 bg_flags |= BG_TINT_SET;
982 set_tint_shade_flags ();
976 return true; 983 return true;
977 } 984 }
978 985
979 return false; 986 return false;
980} 987}
… …
988 if (new_shade < 0) 995 if (new_shade < 0)
989 new_shade = 200 - (100 + new_shade); 996 new_shade = 200 - (100 + new_shade);
990 997
991 if (new_shade != shade) 998 if (new_shade != shade)
992 { 999 {
993 unsigned long new_flags = compute_tint_shade_flags ((bg_flags & tintSet) ? &tint : NULL, new_shade);
994 shade = new_shade; 1000 shade = new_shade;
995 bg_flags = (bg_flags & ~tintFlags) | new_flags; 1001 set_tint_shade_flags ();
996 return true; 1002 return true;
997 } 1003 }
998 1004
999 return false; 1005 return false;
1000} 1006}
… …
1035 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1041 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1036 1042
1037 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1043 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1038 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1044 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1039 1045
1040 if (kernel && params && src && dst) 1046 if (kernel && params)
1041 { 1047 {
1042 if (h_blurRadius) 1048 if (h_blurRadius)
1043 { 1049 {
1044 size = h_blurRadius * 2 + 1; 1050 size = h_blurRadius * 2 + 1;
1045 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1051 get_gaussian_kernel (h_blurRadius, size, kernel, params);
… …
1088bool 1094bool
1089rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1095rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1090{ 1096{
1091 bool ret = false; 1097 bool ret = false;
1092 1098
1093 if (bg_flags & tintWholesome) 1099 if (bg_flags & BG_TINT_BITAND)
1094 { 1100 {
1095 XGCValues gcv; 1101 XGCValues gcv;
1096 GC gc; 1102 GC gc;
1097 1103
1098 /* In this case we can tint image server-side getting significant 1104 /* In this case we can tint image server-side getting significant
… …
1110 } 1116 }
1111 } 1117 }
1112 else 1118 else
1113 { 1119 {
1114# if XRENDER 1120# if XRENDER
1115 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1121 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1116 1122
1117 if (bg_flags & tintSet) 1123 if (bg_flags & BG_TINT_SET)
1118 tint.get (c); 1124 tint.get (c);
1119 1125
1120 if (shade <= 100) 1126 if (shade <= 100)
1121 { 1127 {
1122 c.r = (c.r * shade) / 100; 1128 c.r = c.r * shade / 100;
1123 c.g = (c.g * shade) / 100; 1129 c.g = c.g * shade / 100;
1124 c.b = (c.b * shade) / 100; 1130 c.b = c.b * shade / 100;
1125 } 1131 }
1126 else 1132 else
1127 { 1133 {
1128 c.r = (c.r * (200 - shade)) / 100; 1134 c.r = c.r * (200 - shade) / 100;
1129 c.g = (c.g * (200 - shade)) / 100; 1135 c.g = c.g * (200 - shade) / 100;
1130 c.b = (c.b * (200 - shade)) / 100; 1136 c.b = c.b * (200 - shade) / 100;
1131 } 1137 }
1132 1138
1133 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1139 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1134 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1140 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1135 XRenderPictureAttributes pa; 1141 XRenderPictureAttributes pa;
… …
1142 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1148 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1143 XFreePixmap (dpy, overlay_pmap); 1149 XFreePixmap (dpy, overlay_pmap);
1144 1150
1145 pa.component_alpha = True; 1151 pa.component_alpha = True;
1146 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1152 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1147 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1153 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1148 XFreePixmap (dpy, mask_pmap); 1154 XFreePixmap (dpy, mask_pmap);
1149 1155
1150 if (mask_pic && overlay_pic && back_pic)
1151 {
1152 XRenderColor mask_c; 1156 XRenderColor mask_c;
1153 1157
1154 mask_c.red = mask_c.green = mask_c.blue = 0;
1155 mask_c.alpha = 0xffff; 1158 mask_c.alpha = 0xffff;
1159 mask_c.red =
1160 mask_c.green =
1161 mask_c.blue = 0;
1162 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1163
1164 mask_c.alpha = 0;
1165 mask_c.red = 0xffff - c.r;
1166 mask_c.green = 0xffff - c.g;
1167 mask_c.blue = 0xffff - c.b;
1168 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1169 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1170
1171 if (shade > 100)
1172 {
1173 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1174 mask_c.alpha = 0;
1156 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1175 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1157 1176
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); 1177 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1172 } 1178 }
1173 1179
1174 ret = true; 1180 ret = true;
1175 }
1176 1181
1177 XRenderFreePicture (dpy, mask_pic); 1182 XRenderFreePicture (dpy, mask_pic);
1178 XRenderFreePicture (dpy, overlay_pic); 1183 XRenderFreePicture (dpy, overlay_pic);
1179 XRenderFreePicture (dpy, back_pic); 1184 XRenderFreePicture (dpy, back_pic);
1180# endif 1185# endif
1181 } 1186 }
1182 1187
1183 return ret; 1188 return ret;
1184} 1189}
1185 1190
1186/* make_transparency_pixmap() 1191/*
1187 * Builds a pixmap of the same size as the terminal window that contains 1192 * 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 1193 * the tiled portion of the root pixmap that is supposed to be covered by
1189 * our window. 1194 * our window.
1190 */ 1195 */
1191unsigned long 1196unsigned long
… …
1233 Pixmap recoded_root_pmap = root_pixmap; 1238 Pixmap recoded_root_pmap = root_pixmap;
1234 1239
1235 if (root_pixmap != None && root_depth != depth) 1240 if (root_pixmap != None && root_depth != depth)
1236 { 1241 {
1237#if XRENDER 1242#if XRENDER
1238 if (bg_flags & HAS_RENDER) 1243 if (bg_flags & BG_HAS_RENDER)
1239 { 1244 {
1245 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1246
1240 XRenderPictureAttributes pa; 1247 XRenderPictureAttributes pa;
1241 1248
1242 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1249 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1243 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1250 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1244 1251
1245 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1246 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1252 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1247 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1253 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1248 1254
1249 if (src && dst)
1250 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1255 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 1256
1257 XRenderFreePicture (dpy, src); 1257 XRenderFreePicture (dpy, src);
1258 XRenderFreePicture (dpy, dst); 1258 XRenderFreePicture (dpy, dst);
1259 } 1259 }
1260 else 1260 else
1261#endif 1261#endif
1262 root_pixmap = None; 1262 recoded_root_pmap = None;
1263 } 1263 }
1264 1264
1265 if (root_pixmap == None) 1265 if (recoded_root_pmap == None)
1266 return 0; 1266 return 0;
1267 1267
1268 if (bg_pixmap == None 1268 if (bg_pixmap == None
1269 || bg_pmap_width != window_width 1269 || bg_pmap_width != window_width
1270 || bg_pmap_height != window_height) 1270 || bg_pmap_height != window_height)
… …
1274 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); 1274 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1275 bg_pmap_width = window_width; 1275 bg_pmap_width = window_width;
1276 bg_pmap_height = window_height; 1276 bg_pmap_height = window_height;
1277 } 1277 }
1278 1278
1279 if (bg_pixmap == None)
1280 return 0;
1281
1282 /* straightforward pixmap copy */ 1279 /* straightforward pixmap copy */
1283 while (sx < 0) sx += (int)root_width; 1280 while (sx < 0) sx += root_width;
1284 while (sy < 0) sy += (int)root_height; 1281 while (sy < 0) sy += root_height;
1285 1282
1286 gcv.tile = recoded_root_pmap; 1283 gcv.tile = recoded_root_pmap;
1287 gcv.fill_style = FillTiled; 1284 gcv.fill_style = FillTiled;
1288 gcv.ts_x_origin = -sx; 1285 gcv.ts_x_origin = -sx;
1289 gcv.ts_y_origin = -sy; 1286 gcv.ts_y_origin = -sy;
1290 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1287 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1291 1288
1292 if (gc) 1289 if (gc)
1293 { 1290 {
1294 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1291 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1295 result |= isValid | (bg_flags & effectsFlags); 1292 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1296 XFreeGC (dpy, gc); 1293 XFreeGC (dpy, gc);
1297 1294
1298 if (!(bg_flags & CLIENT_RENDER)) 1295 if (!(bg_flags & BG_CLIENT_RENDER))
1299 { 1296 {
1300 if ((bg_flags & blurNeeded) 1297 if ((bg_flags & BG_NEEDS_BLUR)
1301 && (bg_flags & HAS_RENDER_CONV)) 1298 && (bg_flags & BG_HAS_RENDER_CONV))
1302 { 1299 {
1303 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1300 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1304 result &= ~blurNeeded; 1301 result &= ~BG_NEEDS_BLUR;
1305 } 1302 }
1306 if ((bg_flags & tintNeeded) 1303 if ((bg_flags & BG_NEEDS_TINT)
1307 && (bg_flags & (tintWholesome | HAS_RENDER))) 1304 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1308 { 1305 {
1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1306 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1310 result &= ~tintNeeded; 1307 result &= ~BG_NEEDS_TINT;
1311 } 1308 }
1312 } /* server side rendering completed */ 1309 } /* server side rendering completed */
1313 } 1310 }
1314 1311
1315 if (recoded_root_pmap != root_pixmap) 1312 if (recoded_root_pmap != root_pixmap)
… …
1338{ 1335{
1339 unsigned long tr_flags = 0; 1336 unsigned long tr_flags = 0;
1340 1337
1341 bg_invalidate (); 1338 bg_invalidate ();
1342# ifdef ENABLE_TRANSPARENCY 1339# ifdef ENABLE_TRANSPARENCY
1343 if (bg_flags & isTransparent) 1340 if (bg_flags & BG_IS_TRANSPARENT)
1344 { 1341 {
1345 /* we need to re-generate transparency pixmap in that case ! */ 1342 /* we need to re-generate transparency pixmap in that case ! */
1346 tr_flags = make_transparency_pixmap (); 1343 tr_flags = make_transparency_pixmap ();
1347 if (tr_flags == 0) 1344 if (tr_flags == 0)
1348 return false; 1345 return false;
1349 else if (!(tr_flags & effectsFlags)) 1346 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1350 bg_flags |= isValid; 1347 bg_flags |= BG_IS_VALID;
1351 } 1348 }
1352# endif 1349# endif
1353 1350
1354# ifdef BG_IMAGE_FROM_FILE 1351# ifdef BG_IMAGE_FROM_FILE
1355 if (have_image 1352 if ((bg_flags & BG_IS_FROM_FILE)
1356 || (tr_flags & effectsFlags)) 1353 || (tr_flags & BG_EFFECTS_FLAGS))
1357 { 1354 {
1358 if (render_image (tr_flags)) 1355 if (render_image (tr_flags))
1359 bg_flags |= isValid; 1356 bg_flags |= BG_IS_VALID;
1360 } 1357 }
1361# endif 1358# endif
1362 1359
1363# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1364 XImage *result = NULL; 1361 XImage *result = NULL;
1365 1362
1366 if (tr_flags && !(bg_flags & isValid)) 1363 if (tr_flags && !(bg_flags & BG_IS_VALID))
1367 { 1364 {
1368 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);
1369 } 1366 }
1370 1367
1371 if (result) 1368 if (result)
1372 { 1369 {
1373 /* our own client-side tinting */ 1370 /* our own client-side tinting */
1374 if (tr_flags & tintNeeded) 1371 if (tr_flags & BG_NEEDS_TINT)
1375 { 1372 {
1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1373 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1377 if (bg_flags & tintSet) 1374 if (bg_flags & BG_TINT_SET)
1378 tint.get (c); 1375 tint.get (c);
1379 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c); 1376 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1380 } 1377 }
1381 1378
1382 GC gc = XCreateGC (dpy, vt, 0UL, NULL); 1379 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
… …
1384 if (gc) 1381 if (gc)
1385 { 1382 {
1386 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1383 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1387 1384
1388 XFreeGC (dpy, gc); 1385 XFreeGC (dpy, gc);
1389 bg_flags |= isValid; 1386 bg_flags |= BG_IS_VALID;
1390 } 1387 }
1391 1388
1392 XDestroyImage (result); 1389 XDestroyImage (result);
1393 } 1390 }
1394# endif 1391# endif
1395 1392
1396 if (!(bg_flags & isValid)) 1393 if (!(bg_flags & BG_IS_VALID))
1397 { 1394 {
1398 if (bg_pixmap != None) 1395 if (bg_pixmap != None)
1399 { 1396 {
1400 XFreePixmap (dpy, bg_pixmap); 1397 XFreePixmap (dpy, bg_pixmap);
1401 bg_pixmap = None; 1398 bg_pixmap = None;
1402 } 1399 }
1403 } 1400 }
1404 1401
1405 scr_recolour (false); 1402 scr_recolour (false);
1406 bg_flags |= hasChanged; 1403 bg_flags |= BG_NEEDS_REFRESH;
1407 1404
1408 bg_valid_since = ev::now (); 1405 bg_valid_since = ev::now ();
1409 1406
1410 return true; 1407 return true;
1411} 1408}
… …
1415{ 1412{
1416#ifdef ENABLE_TRANSPARENCY 1413#ifdef ENABLE_TRANSPARENCY
1417 shade = 100; 1414 shade = 100;
1418#endif 1415#endif
1419 1416
1420 bg_flags &= ~(HAS_RENDER | HAS_RENDER_CONV); 1417 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1421#if XRENDER 1418#if XRENDER
1422 int major, minor; 1419 int major, minor;
1423 if (XRenderQueryVersion (dpy, &major, &minor)) 1420 if (XRenderQueryVersion (dpy, &major, &minor))
1424 bg_flags |= HAS_RENDER; 1421 bg_flags |= BG_HAS_RENDER;
1425 XFilters *filters = XRenderQueryFilters (dpy, vt); 1422 XFilters *filters = XRenderQueryFilters (dpy, vt);
1426 if (filters) 1423 if (filters)
1427 { 1424 {
1428 for (int i = 0; i < filters->nfilter; i++) 1425 for (int i = 0; i < filters->nfilter; i++)
1429 if (!strcmp (filters->filter[i], FilterConvolution)) 1426 if (!strcmp (filters->filter[i], FilterConvolution))
1430 bg_flags |= HAS_RENDER_CONV; 1427 bg_flags |= BG_HAS_RENDER_CONV;
1431 1428
1432 XFree (filters); 1429 XFree (filters);
1433 } 1430 }
1434#endif 1431#endif
1435} 1432}
… …
1446 uint32_t mask_r, mask_g, mask_b; 1443 uint32_t mask_r, mask_g, mask_b;
1447 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1444 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1448 rgba low; 1445 rgba low;
1449 rgba high; 1446 rgba high;
1450 int i; 1447 int i;
1451 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1448 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1452 1449
1453 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1450 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1454 1451
1455 /* for convenience */ 1452 /* for convenience */
1456 mask_r = visual->red_mask; 1453 mask_r = visual->red_mask;

Diff Legend

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