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.165 by sf-exg, Mon Aug 15 09:25:56 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
… …
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_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 |= 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; 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
324 w = h_scale * target_width / 100;
325 h = v_scale * target_height / 100;
326
326 if (bg_flags & BG_PROP_SCALE) 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 & BG_ROOT_ALIGN) 338 if (bg_flags & BG_ROOT_ALIGN)
… …
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 &= ~BG_IS_SIZE_SENSITIVE; 349 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
354 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 350 if (!(bg_flags & BG_TILE)
351 || h_scale || v_scale
355 || (!(bg_flags & BG_ROOT_ALIGN) && (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 |= BG_IS_SIZE_SENSITIVE; 354 bg_flags |= BG_IS_SIZE_SENSITIVE;
358} 355}
359 356
… …
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;
… …
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
… …
868 if (image) 866 if (image)
869 { 867 {
870 if (original_asim) 868 if (original_asim)
871 safe_asimage_destroy (original_asim); 869 safe_asimage_destroy (original_asim);
872 original_asim = image; 870 original_asim = image;
873 bg_flags |= BG_CLIENT_RENDER; 871 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
874 have_image = true;
875 return true; 872 return true;
876 } 873 }
877# endif 874# endif
878 875
879# ifdef HAVE_PIXBUF 876# ifdef HAVE_PIXBUF
… …
881 if (image) 878 if (image)
882 { 879 {
883 if (pixbuf) 880 if (pixbuf)
884 g_object_unref (pixbuf); 881 g_object_unref (pixbuf);
885 pixbuf = image; 882 pixbuf = image;
886 have_image = true; 883 bg_flags |= BG_IS_FROM_FILE;
887 return true; 884 return true;
888 } 885 }
889# endif 886# endif
890 887
891 return false; 888 return false;
… …
940 bg_flags |= BG_NEEDS_BLUR; 937 bg_flags |= BG_NEEDS_BLUR;
941 938
942 return changed; 939 return changed;
943} 940}
944 941
945static inline unsigned long 942void
946compute_tint_shade_flags (rxvt_color *tint, int shade) 943rxvt_term::set_tint_shade_flags ()
947{ 944{
948 unsigned long flags = 0;
949 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 945 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
950 bool has_shade = shade != 100; 946 bool has_shade = shade != 100;
951 947
952 if (tint) 948 bg_flags &= ~BG_TINT_FLAGS;
949
950 if (bg_flags & BG_TINT_SET)
953 { 951 {
954 tint->get (c); 952 tint.get (c);
955 if (!has_shade 953 if (!has_shade
956 && (c.r <= 0x00ff || c.r >= 0xff00) 954 && (c.r <= 0x00ff || c.r >= 0xff00)
957 && (c.g <= 0x00ff || c.g >= 0xff00) 955 && (c.g <= 0x00ff || c.g >= 0xff00)
958 && (c.b <= 0x00ff || c.b >= 0xff00)) 956 && (c.b <= 0x00ff || c.b >= 0xff00))
959 flags |= rxvt_term::BG_TINT_BITAND; 957 bg_flags |= BG_TINT_BITAND;
960 } 958 }
961 959
962 if (has_shade || tint) 960 if (has_shade || (bg_flags & BG_TINT_SET))
963 flags |= rxvt_term::BG_NEEDS_TINT; 961 bg_flags |= BG_NEEDS_TINT;
964
965 return flags;
966} 962}
967 963
968bool 964bool
969rxvt_term::bg_set_tint (rxvt_color &new_tint) 965rxvt_term::bg_set_tint (rxvt_color &new_tint)
970{ 966{
971 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 967 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
972 { 968 {
973 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
974 tint = new_tint; 969 tint = new_tint;
975 bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags | BG_TINT_SET; 970 bg_flags |= BG_TINT_SET;
971 set_tint_shade_flags ();
976 return true; 972 return true;
977 } 973 }
978 974
979 return false; 975 return false;
980} 976}
… …
988 if (new_shade < 0) 984 if (new_shade < 0)
989 new_shade = 200 - (100 + new_shade); 985 new_shade = 200 - (100 + new_shade);
990 986
991 if (new_shade != shade) 987 if (new_shade != shade)
992 { 988 {
993 unsigned long new_flags = compute_tint_shade_flags ((bg_flags & BG_TINT_SET) ? &tint : NULL, new_shade);
994 shade = new_shade; 989 shade = new_shade;
995 bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags; 990 set_tint_shade_flags ();
996 return true; 991 return true;
997 } 992 }
998 993
999 return false; 994 return false;
1000} 995}
… …
1035 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1030 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1036 1031
1037 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1032 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1038 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1033 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1039 1034
1040 if (kernel && params && src && dst) 1035 if (kernel && params)
1041 { 1036 {
1042 if (h_blurRadius) 1037 if (h_blurRadius)
1043 { 1038 {
1044 size = h_blurRadius * 2 + 1; 1039 size = h_blurRadius * 2 + 1;
1045 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1040 get_gaussian_kernel (h_blurRadius, size, kernel, params);
… …
1110 } 1105 }
1111 } 1106 }
1112 else 1107 else
1113 { 1108 {
1114# if XRENDER 1109# if XRENDER
1115 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1110 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1116 1111
1117 if (bg_flags & BG_TINT_SET) 1112 if (bg_flags & BG_TINT_SET)
1118 tint.get (c); 1113 tint.get (c);
1119 1114
1120 if (shade <= 100) 1115 if (shade <= 100)
1121 { 1116 {
1122 c.r = (c.r * shade) / 100; 1117 c.r = c.r * shade / 100;
1123 c.g = (c.g * shade) / 100; 1118 c.g = c.g * shade / 100;
1124 c.b = (c.b * shade) / 100; 1119 c.b = c.b * shade / 100;
1125 } 1120 }
1126 else 1121 else
1127 { 1122 {
1128 c.r = (c.r * (200 - shade)) / 100; 1123 c.r = c.r * (200 - shade) / 100;
1129 c.g = (c.g * (200 - shade)) / 100; 1124 c.g = c.g * (200 - shade) / 100;
1130 c.b = (c.b * (200 - shade)) / 100; 1125 c.b = c.b * (200 - shade) / 100;
1131 } 1126 }
1132 1127
1133 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1128 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1134 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1129 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1135 XRenderPictureAttributes pa; 1130 XRenderPictureAttributes pa;
… …
1142 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1137 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1143 XFreePixmap (dpy, overlay_pmap); 1138 XFreePixmap (dpy, overlay_pmap);
1144 1139
1145 pa.component_alpha = True; 1140 pa.component_alpha = True;
1146 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1141 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1147 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1142 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1148 XFreePixmap (dpy, mask_pmap); 1143 XFreePixmap (dpy, mask_pmap);
1149 1144
1150 if (mask_pic && overlay_pic && back_pic)
1151 {
1152 XRenderColor mask_c; 1145 XRenderColor mask_c;
1153 1146
1154 mask_c.red = mask_c.green = mask_c.blue = 0;
1155 mask_c.alpha = 0xffff; 1147 mask_c.alpha = 0xffff;
1148 mask_c.red =
1149 mask_c.green =
1150 mask_c.blue = 0;
1151 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1152
1153 mask_c.alpha = 0;
1154 mask_c.red = 0xffff - c.r;
1155 mask_c.green = 0xffff - c.g;
1156 mask_c.blue = 0xffff - c.b;
1157 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1158 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1159
1160 if (shade > 100)
1161 {
1162 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1163 mask_c.alpha = 0;
1156 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1157 1165
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); 1166 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1172 } 1167 }
1173 1168
1174 ret = true; 1169 ret = true;
1175 }
1176 1170
1177 XRenderFreePicture (dpy, mask_pic); 1171 XRenderFreePicture (dpy, mask_pic);
1178 XRenderFreePicture (dpy, overlay_pic); 1172 XRenderFreePicture (dpy, overlay_pic);
1179 XRenderFreePicture (dpy, back_pic); 1173 XRenderFreePicture (dpy, back_pic);
1180# endif 1174# endif
1181 } 1175 }
1182 1176
1183 return ret; 1177 return ret;
1184} 1178}
1185 1179
1186/* make_transparency_pixmap() 1180/*
1187 * Builds a pixmap of the same size as the terminal window that contains 1181 * 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 1182 * the tiled portion of the root pixmap that is supposed to be covered by
1189 * our window. 1183 * our window.
1190 */ 1184 */
1191unsigned long 1185unsigned long
… …
1235 if (root_pixmap != None && root_depth != depth) 1229 if (root_pixmap != None && root_depth != depth)
1236 { 1230 {
1237#if XRENDER 1231#if XRENDER
1238 if (bg_flags & BG_HAS_RENDER) 1232 if (bg_flags & BG_HAS_RENDER)
1239 { 1233 {
1234 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1235
1240 XRenderPictureAttributes pa; 1236 XRenderPictureAttributes pa;
1241 1237
1242 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1238 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1243 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1239 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1244 1240
1245 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1246 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1241 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1247 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1242 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1248 1243
1249 if (src && dst)
1250 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1244 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 1245
1257 XRenderFreePicture (dpy, src); 1246 XRenderFreePicture (dpy, src);
1258 XRenderFreePicture (dpy, dst); 1247 XRenderFreePicture (dpy, dst);
1259 } 1248 }
1260 else 1249 else
1261#endif 1250#endif
1262 root_pixmap = None; 1251 recoded_root_pmap = None;
1263 } 1252 }
1264 1253
1265 if (root_pixmap == None) 1254 if (recoded_root_pmap == None)
1266 return 0; 1255 return 0;
1267 1256
1268 if (bg_pixmap == None 1257 if (bg_pixmap == None
1269 || bg_pmap_width != window_width 1258 || bg_pmap_width != window_width
1270 || bg_pmap_height != window_height) 1259 || bg_pmap_height != window_height)
… …
1274 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); 1263 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1275 bg_pmap_width = window_width; 1264 bg_pmap_width = window_width;
1276 bg_pmap_height = window_height; 1265 bg_pmap_height = window_height;
1277 } 1266 }
1278 1267
1279 if (bg_pixmap == None)
1280 return 0;
1281
1282 /* straightforward pixmap copy */ 1268 /* straightforward pixmap copy */
1283 while (sx < 0) sx += (int)root_width; 1269 while (sx < 0) sx += root_width;
1284 while (sy < 0) sy += (int)root_height; 1270 while (sy < 0) sy += root_height;
1285 1271
1286 gcv.tile = recoded_root_pmap; 1272 gcv.tile = recoded_root_pmap;
1287 gcv.fill_style = FillTiled; 1273 gcv.fill_style = FillTiled;
1288 gcv.ts_x_origin = -sx; 1274 gcv.ts_x_origin = -sx;
1289 gcv.ts_y_origin = -sy; 1275 gcv.ts_y_origin = -sy;
… …
1350 bg_flags |= BG_IS_VALID; 1336 bg_flags |= BG_IS_VALID;
1351 } 1337 }
1352# endif 1338# endif
1353 1339
1354# ifdef BG_IMAGE_FROM_FILE 1340# ifdef BG_IMAGE_FROM_FILE
1355 if (have_image 1341 if ((bg_flags & BG_IS_FROM_FILE)
1356 || (tr_flags & BG_EFFECTS_FLAGS)) 1342 || (tr_flags & BG_EFFECTS_FLAGS))
1357 { 1343 {
1358 if (render_image (tr_flags)) 1344 if (render_image (tr_flags))
1359 bg_flags |= BG_IS_VALID; 1345 bg_flags |= BG_IS_VALID;
1360 } 1346 }
… …
1446 uint32_t mask_r, mask_g, mask_b; 1432 uint32_t mask_r, mask_g, mask_b;
1447 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1433 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1448 rgba low; 1434 rgba low;
1449 rgba high; 1435 rgba high;
1450 int i; 1436 int i;
1451 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1437 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1452 1438
1453 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1439 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1454 1440
1455 /* for convenience */ 1441 /* for convenience */
1456 mask_r = visual->red_mask; 1442 mask_r = visual->red_mask;

Diff Legend

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