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.160 by sf-exg, Thu Aug 11 08:37:17 2011 UTC vs.
Revision 1.196 by sf-exg, Tue Jan 10 18:50:14 2012 UTC

32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/* 37#ifndef RepeatPad
38 * Pixmap geometry string interpretation : 38#define RepeatPad True
39 * Each geometry string contains zero or one scale/position 39#endif
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 */
52 40
53#ifdef HAVE_BG_PIXMAP 41#ifdef HAVE_BG_PIXMAP
42# if XRENDER
43static Picture
44create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
45{
46 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
47
48 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
49 XRenderPictureAttributes pa;
50 pa.repeat = True;
51 pa.component_alpha = component_alpha;
52 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
53
54 XFreePixmap (dpy, pixmap);
55
56 return mask;
57}
58# endif
59
54void 60void
55rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
56{ 62{
57#ifdef HAVE_AFTERIMAGE 63#ifdef HAVE_AFTERIMAGE
58 if (original_asim) 64 if (original_asim)
166 int smaller = min (image_size, window_size); 172 int smaller = min (image_size, window_size);
167 173
168 if (align >= 0 && align <= 100) 174 if (align >= 0 && align <= 100)
169 return diff * align / 100; 175 return diff * align / 100;
170 else if (align > 100 && align <= 200) 176 else if (align > 100 && align <= 200)
171 return ((align - 100) * smaller / 100) + window_size - smaller; 177 return (align - 100) * smaller / 100 + window_size - smaller;
172 else if (align >= -100 && align < 0) 178 else if (align >= -100 && align < 0)
173 return ((align + 100) * smaller / 100) - image_size; 179 return (align + 100) * smaller / 100 - image_size;
174 return 0; 180 return 0;
175} 181}
176 182
177static inline int 183static inline int
178make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 184make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
197{ 203{
198 bool changed = false; 204 bool changed = false;
199 int geom_flags = 0; 205 int geom_flags = 0;
200 int x = 0, y = 0; 206 int x = 0, y = 0;
201 unsigned int w = 0, h = 0; 207 unsigned int w = 0, h = 0;
202 unsigned int n; 208 unsigned long new_flags = 0;
203 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
204 const char *ops;
205 209
206 if (geom == NULL) 210 if (geom == NULL)
207 return false; 211 return false;
208 212
209 char str[256]; 213 if (geom[0])
210
211 ops = strchr (geom, ':');
212 if (ops == NULL)
213 n = strlen (geom);
214 else
215 n = ops - geom;
216
217 if (n >= sizeof (str))
218 return false;
219
220 memcpy (str, geom, n);
221 str[n] = '\0';
222 rxvt_strtrim (str);
223
224 if (str[0])
225 { 214 {
226 /* we have geometry string - let's handle it prior to applying ops */ 215 char **arr = rxvt_strsplit (':', geom);
216
217 for (int i = 0; arr[i]; i++)
218 {
219 if (!strcasecmp (arr[i], "style=tiled"))
220 {
221 new_flags = BG_TILE;
222 w = h = noScale;
223 x = y = 0;
224 geom_flags = WidthValue|HeightValue|XValue|YValue;
225 }
226 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
227 {
228 new_flags = BG_KEEP_ASPECT;
229 w = h = windowScale;
230 x = y = centerAlign;
231 geom_flags = WidthValue|HeightValue|XValue|YValue;
232 }
233 else if (!strcasecmp (arr[i], "style=stretched"))
234 {
235 new_flags = 0;
236 w = h = windowScale;
237 geom_flags = WidthValue|HeightValue;
238 }
239 else if (!strcasecmp (arr[i], "style=centered"))
240 {
241 new_flags = 0;
242 w = h = noScale;
243 x = y = centerAlign;
244 geom_flags = WidthValue|HeightValue|XValue|YValue;
245 }
246 else if (!strcasecmp (arr[i], "style=root-tiled"))
247 {
248 new_flags = BG_TILE|BG_ROOT_ALIGN;
249 w = h = noScale;
250 geom_flags = WidthValue|HeightValue;
251 }
252 else if (!strcasecmp (arr[i], "op=tile"))
253 new_flags |= BG_TILE;
254 else if (!strcasecmp (arr[i], "op=keep-aspect"))
255 new_flags |= BG_KEEP_ASPECT;
256 else if (!strcasecmp (arr[i], "op=root-align"))
257 new_flags |= BG_ROOT_ALIGN;
258
259 // deprecated
260 else if (!strcasecmp (arr[i], "tile"))
261 {
262 new_flags |= BG_TILE;
263 w = h = noScale;
264 geom_flags |= WidthValue|HeightValue;
265 }
266 else if (!strcasecmp (arr[i], "propscale"))
267 {
268 new_flags |= BG_KEEP_ASPECT;
269 w = h = windowScale;
270 geom_flags |= WidthValue|HeightValue;
271 }
272 else if (!strcasecmp (arr[i], "hscale"))
273 {
274 new_flags |= BG_TILE;
275 w = windowScale;
276 h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279 else if (!strcasecmp (arr[i], "vscale"))
280 {
281 new_flags |= BG_TILE;
282 h = windowScale;
283 w = noScale;
284 geom_flags |= WidthValue|HeightValue;
285 }
286 else if (!strcasecmp (arr[i], "scale"))
287 {
288 w = h = windowScale;
289 geom_flags |= WidthValue|HeightValue;
290 }
291 else if (!strcasecmp (arr[i], "auto"))
292 {
293 w = h = windowScale;
294 x = y = centerAlign;
295 geom_flags |= WidthValue|HeightValue|XValue|YValue;
296 }
297 else if (!strcasecmp (arr[i], "root"))
298 {
299 new_flags |= BG_TILE|BG_ROOT_ALIGN;
300 w = h = noScale;
301 geom_flags |= WidthValue|HeightValue;
302 }
303
304 else
227 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 305 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
228 } /* done parsing geometry string */ 306 } /* done parsing ops */
307
308 rxvt_free_strsplit (arr);
309 }
310
311 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
229 312
230 if (!update) 313 if (!update)
231 { 314 {
232 if (!(geom_flags & XValue)) 315 if (!(geom_flags & XValue))
233 x = y = defaultAlign; 316 x = y = defaultAlign;
242 w = h; 325 w = h;
243 326
244 geom_flags |= WidthValue|HeightValue|XValue|YValue; 327 geom_flags |= WidthValue|HeightValue|XValue|YValue;
245 } 328 }
246 329
247 if (ops)
248 {
249 char **arr = rxvt_strsplit (':', ops + 1);
250
251 for (int i = 0; arr[i]; i++)
252 {
253 if (!strcasecmp (arr[i], "style=tiled"))
254 {
255 new_flags = BG_TILE;
256 w = h = noScale;
257 x = y = 0;
258 geom_flags = WidthValue|HeightValue|XValue|YValue;
259 }
260 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
261 {
262 new_flags = BG_PROP_SCALE;
263 x = y = centerAlign;
264 geom_flags = XValue|YValue;
265 }
266 else if (!strcasecmp (arr[i], "style=stretched"))
267 {
268 new_flags = 0;
269 w = h = windowScale;
270 geom_flags = WidthValue|HeightValue;
271 }
272 else if (!strcasecmp (arr[i], "style=centered"))
273 {
274 new_flags = 0;
275 w = h = noScale;
276 x = y = centerAlign;
277 geom_flags = WidthValue|HeightValue|XValue|YValue;
278 }
279 else if (!strcasecmp (arr[i], "style=root-tiled"))
280 {
281 new_flags = BG_TILE|BG_ROOT_ALIGN;
282 w = h = noScale;
283 geom_flags = WidthValue|HeightValue;
284 }
285 else if (!strcasecmp (arr[i], "op=tile"))
286 new_flags |= BG_TILE;
287 else if (!strcasecmp (arr[i], "op=pscale"))
288 new_flags |= BG_PROP_SCALE;
289 else if (!strcasecmp (arr[i], "op=root"))
290 new_flags |= BG_ROOT_ALIGN;
291
292 // deprecated
293 else if (!strcasecmp (arr[i], "tile"))
294 {
295 new_flags |= BG_TILE;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299 else if (!strcasecmp (arr[i], "propscale"))
300 {
301 new_flags |= BG_PROP_SCALE;
302 }
303 else if (!strcasecmp (arr[i], "scale"))
304 {
305 if (h == 0) h = windowScale;
306 if (w == 0) w = windowScale;
307
308 geom_flags |= WidthValue|HeightValue;
309 }
310 else if (!strcasecmp (arr[i], "root"))
311 {
312 new_flags |= BG_TILE|BG_ROOT_ALIGN;
313 w = h = noScale;
314 geom_flags |= WidthValue|HeightValue;
315 }
316 } /* done parsing ops */
317
318 rxvt_free_strsplit (arr);
319 }
320
321 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 330 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
322 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 331 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
323 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 332 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
324 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 333 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
325 334
336rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 345rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
337{ 346{
338 int target_width = szHint.width; 347 int target_width = szHint.width;
339 int target_height = szHint.height; 348 int target_height = szHint.height;
340 349
350 w = h_scale * target_width / 100;
351 h = v_scale * target_height / 100;
352
341 if (bg_flags & BG_PROP_SCALE) 353 if (bg_flags & BG_KEEP_ASPECT)
342 { 354 {
343 float scale = (float)target_width / image_width; 355 float scale = (float)w / image_width;
344 min_it (scale, (float)target_height / image_height); 356 min_it (scale, (float)h / image_height);
345 w = image_width * scale + 0.5; 357 w = image_width * scale + 0.5;
346 h = image_height * scale + 0.5; 358 h = image_height * scale + 0.5;
347 } 359 }
348 else
349 {
350 w = h_scale * target_width / 100;
351 h = v_scale * target_height / 100;
352 }
353 360
354 if (!w) w = image_width; 361 if (!w) w = image_width;
355 if (!h) h = image_height; 362 if (!h) h = image_height;
356 363
357 if (bg_flags & BG_ROOT_ALIGN) 364 if (bg_flags & BG_ROOT_ALIGN)
365 y = make_align_position (v_align, target_height, h); 372 y = make_align_position (v_align, target_height, h);
366 } 373 }
367 374
368 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 375 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
369 if (!(bg_flags & BG_TILE) 376 if (!(bg_flags & BG_TILE)
370 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 377 || h_scale || v_scale
371 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 378 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
372 || w > target_width || h > target_height) 379 || w > target_width || h > target_height)
373 bg_flags |= BG_IS_SIZE_SENSITIVE; 380 bg_flags |= BG_IS_SIZE_SENSITIVE;
374} 381}
375 382
402 } 409 }
403 410
404 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 411 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
405 { 412 {
406 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 413 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
407 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 414 ASA_XImage,
408 100, ASIMAGE_QUALITY_DEFAULT); 415 100, ASIMAGE_QUALITY_DEFAULT);
409 if (tmp) 416 if (tmp)
410 { 417 {
411 destroy_asimage (&background); 418 destroy_asimage (&background);
412 background = tmp; 419 background = tmp;
431 438
432 if (!original_asim 439 if (!original_asim
433 || (!(bg_flags & BG_ROOT_ALIGN) 440 || (!(bg_flags & BG_ROOT_ALIGN)
434 && (x >= target_width 441 && (x >= target_width
435 || y >= target_height 442 || y >= target_height
436 || (x + w <= 0) 443 || x + w <= 0
437 || (y + h <= 0)))) 444 || y + h <= 0)))
438 { 445 {
439 if (background) 446 if (background)
440 { 447 {
441 new_pmap_width = background->width; 448 new_pmap_width = background->width;
442 new_pmap_height = background->height; 449 new_pmap_height = background->height;
456 } 463 }
457 else 464 else
458 { 465 {
459 result = original_asim; 466 result = original_asim;
460 467
461 if ((w != original_asim->width) 468 if (w != original_asim->width
462 || (h != original_asim->height)) 469 || h != original_asim->height)
463 { 470 {
464 result = scale_asimage (asv, original_asim, 471 result = scale_asimage (asv, original_asim,
465 w, h, 472 w, h,
466 background ? ASA_ASImage : ASA_XImage, 473 ASA_XImage,
467 100, ASIMAGE_QUALITY_DEFAULT); 474 100, ASIMAGE_QUALITY_DEFAULT);
468 } 475 }
469 476
470 if (background == NULL) 477 if (background == NULL)
471 { 478 {
721 get_image_geometry (image_width, image_height, w, h, x, y); 728 get_image_geometry (image_width, image_height, w, h, x, y);
722 729
723 if (!(bg_flags & BG_ROOT_ALIGN) 730 if (!(bg_flags & BG_ROOT_ALIGN)
724 && (x >= target_width 731 && (x >= target_width
725 || y >= target_height 732 || y >= target_height
726 || (x + w <= 0) 733 || x + w <= 0
727 || (y + h <= 0))) 734 || y + h <= 0))
728 return false; 735 return false;
729 736
730 result = pixbuf; 737 result = pixbuf;
731 738
732 if ((w != image_width) 739 if (w != image_width
733 || (h != image_height)) 740 || h != image_height)
734 { 741 {
735 result = gdk_pixbuf_scale_simple (pixbuf, 742 result = gdk_pixbuf_scale_simple (pixbuf,
736 w, h, 743 w, h,
737 GDK_INTERP_BILINEAR); 744 GDK_INTERP_BILINEAR);
738 } 745 }
817 } 824 }
818 825
819#if XRENDER 826#if XRENDER
820 if (tr_flags) 827 if (tr_flags)
821 { 828 {
822 XRenderPictureAttributes pa;
823
824 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 829 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
830
825 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 831 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
826 832
827 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
828 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 833 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
829 834
830 pa.repeat = True; 835 Picture mask = create_xrender_mask (dpy, vt, False, False);
831 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
832 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
833 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
834 XFreePixmap (dpy, mask_pmap);
835 836
836 XRenderColor mask_c; 837 XRenderColor mask_c;
837 838
838 mask_c.alpha = 0x8000; 839 mask_c.alpha = 0x8000;
839 mask_c.red = 0; 840 mask_c.red =
840 mask_c.green = 0; 841 mask_c.green =
841 mask_c.blue = 0; 842 mask_c.blue = 0;
842 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 843 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
844
843 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 845 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
844 846
845 XRenderFreePicture (dpy, src); 847 XRenderFreePicture (dpy, src);
846 XRenderFreePicture (dpy, dst); 848 XRenderFreePicture (dpy, dst);
847 XRenderFreePicture (dpy, mask); 849 XRenderFreePicture (dpy, mask);
867rxvt_term::bg_set_file (const char *file) 869rxvt_term::bg_set_file (const char *file)
868{ 870{
869 if (!file || !*file) 871 if (!file || !*file)
870 return false; 872 return false;
871 873
874 bool ret = false;
872 if (const char *p = strchr (file, ';')) 875 const char *p = strchr (file, ';');
876
877 if (p)
873 { 878 {
874 size_t len = p - file; 879 size_t len = p - file;
875 char *f = rxvt_temp_buf<char> (len + 1); 880 char *f = rxvt_temp_buf<char> (len + 1);
876 memcpy (f, file, len); 881 memcpy (f, file, len);
877 f[len] = '\0'; 882 f[len] = '\0';
886 { 891 {
887 if (original_asim) 892 if (original_asim)
888 safe_asimage_destroy (original_asim); 893 safe_asimage_destroy (original_asim);
889 original_asim = image; 894 original_asim = image;
890 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 895 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
891 return true; 896 ret = true;
892 } 897 }
893# endif 898# endif
894 899
895# ifdef HAVE_PIXBUF 900# ifdef HAVE_PIXBUF
896 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 901 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
898 { 903 {
899 if (pixbuf) 904 if (pixbuf)
900 g_object_unref (pixbuf); 905 g_object_unref (pixbuf);
901 pixbuf = image; 906 pixbuf = image;
902 bg_flags |= BG_IS_FROM_FILE; 907 bg_flags |= BG_IS_FROM_FILE;
903 return true; 908 ret = true;
904 } 909 }
905# endif 910# endif
906 911
912 if (ret)
913 {
914 if (p)
915 bg_set_geometry (p + 1);
916 else
917 bg_set_default_geometry ();
918 }
919
907 return false; 920 return ret;
908} 921}
909 922
910# endif /* BG_IMAGE_FROM_FILE */ 923# endif /* BG_IMAGE_FROM_FILE */
911 924
912# ifdef ENABLE_TRANSPARENCY 925# ifdef ENABLE_TRANSPARENCY
948 { 961 {
949 changed = true; 962 changed = true;
950 v_blurRadius = vr; 963 v_blurRadius = vr;
951 } 964 }
952 965
953 if (v_blurRadius == 0 && h_blurRadius == 0) 966 if (h_blurRadius == 0 || v_blurRadius == 0)
954 bg_flags &= ~BG_NEEDS_BLUR; 967 bg_flags &= ~BG_NEEDS_BLUR;
955 else 968 else
956 bg_flags |= BG_NEEDS_BLUR; 969 bg_flags |= BG_NEEDS_BLUR;
957 970
958 return changed; 971 return changed;
959} 972}
960 973
961void 974void
962rxvt_term::set_tint_shade_flags () 975rxvt_term::set_tint_shade_flags ()
963{ 976{
964 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 977 rgba c;
965 bool has_shade = shade != 100; 978 bool has_shade = shade != 100;
966 979
967 bg_flags &= ~BG_TINT_FLAGS; 980 bg_flags &= ~BG_TINT_FLAGS;
968 981
969 if (bg_flags & BG_TINT_SET) 982 if (bg_flags & BG_TINT_SET)
995} 1008}
996 1009
997bool 1010bool
998rxvt_term::bg_set_shade (const char *shade_str) 1011rxvt_term::bg_set_shade (const char *shade_str)
999{ 1012{
1000 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1013 int new_shade = atoi (shade_str);
1001 1014
1002 clamp_it (new_shade, -100, 200); 1015 clamp_it (new_shade, -100, 200);
1003 if (new_shade < 0) 1016 if (new_shade < 0)
1004 new_shade = 200 - (100 + new_shade); 1017 new_shade = 200 - (100 + new_shade);
1005 1018
1035 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1048 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1036} 1049}
1037#endif 1050#endif
1038 1051
1039bool 1052bool
1040rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1053rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1041{ 1054{
1042 bool ret = false; 1055 bool ret = false;
1043#if XRENDER 1056#if XRENDER
1057 if (!(bg_flags & BG_HAS_RENDER_CONV))
1058 return false;
1059
1044 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1060 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1045 double *kernel = (double *)malloc (size * sizeof (double)); 1061 double *kernel = (double *)malloc (size * sizeof (double));
1046 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1062 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1047 1063
1048 XRenderPictureAttributes pa; 1064 XRenderPictureAttributes pa;
1049 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1065 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1050 1066
1067 pa.repeat = RepeatPad;
1051 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1068 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
1069 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1052 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1070 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
1071 XFreePixmap (dpy, tmp);
1053 1072
1054 if (kernel && params) 1073 if (kernel && params)
1055 { 1074 {
1056 if (h_blurRadius)
1057 {
1058 size = h_blurRadius * 2 + 1; 1075 size = h_blurRadius * 2 + 1;
1059 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1076 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1060 1077
1061 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1078 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1062 XRenderComposite (dpy, 1079 XRenderComposite (dpy,
1063 PictOpSrc, 1080 PictOpSrc,
1064 src, 1081 src,
1065 None, 1082 None,
1066 dst, 1083 dst,
1067 0, 0, 1084 0, 0,
1068 0, 0, 1085 0, 0,
1069 0, 0, 1086 0, 0,
1070 width, height); 1087 width, height);
1071 }
1072 1088
1073 if (v_blurRadius) 1089 ::swap (src, dst);
1074 { 1090
1075 size = v_blurRadius * 2 + 1; 1091 size = v_blurRadius * 2 + 1;
1076 get_gaussian_kernel (v_blurRadius, size, kernel, params); 1092 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1077 ::swap (params[0], params[1]); 1093 ::swap (params[0], params[1]);
1078 1094
1079 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1095 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1080 XRenderComposite (dpy, 1096 XRenderComposite (dpy,
1081 PictOpSrc, 1097 PictOpSrc,
1082 src, 1098 src,
1083 None, 1099 None,
1084 dst, 1100 dst,
1085 0, 0, 1101 0, 0,
1086 0, 0, 1102 0, 0,
1087 0, 0, 1103 0, 0,
1088 width, height); 1104 width, height);
1089 }
1090 1105
1091 ret = true; 1106 ret = true;
1092 } 1107 }
1093 1108
1094 free (kernel); 1109 free (kernel);
1121 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1136 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1122 ret = true; 1137 ret = true;
1123 XFreeGC (dpy, gc); 1138 XFreeGC (dpy, gc);
1124 } 1139 }
1125 } 1140 }
1126 else
1127 {
1128# if XRENDER 1141# if XRENDER
1142 else if (bg_flags & BG_HAS_RENDER)
1143 {
1129 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1144 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1130 1145
1131 if (bg_flags & BG_TINT_SET) 1146 if (bg_flags & BG_TINT_SET)
1132 tint.get (c); 1147 tint.get (c);
1133 1148
1142 c.r = c.r * (200 - shade) / 100; 1157 c.r = c.r * (200 - shade) / 100;
1143 c.g = c.g * (200 - shade) / 100; 1158 c.g = c.g * (200 - shade) / 100;
1144 c.b = c.b * (200 - shade) / 100; 1159 c.b = c.b * (200 - shade) / 100;
1145 } 1160 }
1146 1161
1147 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1148 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1162 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1149 XRenderPictureAttributes pa;
1150 1163
1151 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1164 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1152 1165
1153 pa.repeat = True; 1166 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1154 1167
1155 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1168 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1156 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1157 XFreePixmap (dpy, overlay_pmap);
1158
1159 pa.component_alpha = True;
1160 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1161 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1162 XFreePixmap (dpy, mask_pmap);
1163 1169
1164 XRenderColor mask_c; 1170 XRenderColor mask_c;
1165 1171
1166 mask_c.alpha = 0xffff; 1172 mask_c.alpha = 0xffff;
1167 mask_c.red = 1173 mask_c.red =
1172 mask_c.alpha = 0; 1178 mask_c.alpha = 0;
1173 mask_c.red = 0xffff - c.r; 1179 mask_c.red = 0xffff - c.r;
1174 mask_c.green = 0xffff - c.g; 1180 mask_c.green = 0xffff - c.g;
1175 mask_c.blue = 0xffff - c.b; 1181 mask_c.blue = 0xffff - c.b;
1176 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1182 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1183
1177 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1184 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1178 1185
1179 if (shade > 100) 1186 if (shade > 100)
1180 { 1187 {
1181 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1182 mask_c.alpha = 0; 1188 mask_c.alpha = 0;
1189 mask_c.red =
1190 mask_c.green =
1191 mask_c.blue = 0xffff * (shade - 100) / 100;
1183 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1192 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1184 1193
1185 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1194 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1186 } 1195 }
1187 1196
1188 ret = true; 1197 ret = true;
1189 1198
1190 XRenderFreePicture (dpy, mask_pic); 1199 XRenderFreePicture (dpy, mask_pic);
1191 XRenderFreePicture (dpy, overlay_pic); 1200 XRenderFreePicture (dpy, overlay_pic);
1192 XRenderFreePicture (dpy, back_pic); 1201 XRenderFreePicture (dpy, back_pic);
1202 }
1193# endif 1203# endif
1194 }
1195 1204
1196 return ret; 1205 return ret;
1197} 1206}
1198 1207
1199/* 1208/*
1250#if XRENDER 1259#if XRENDER
1251 if (bg_flags & BG_HAS_RENDER) 1260 if (bg_flags & BG_HAS_RENDER)
1252 { 1261 {
1253 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1262 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1254 1263
1255 XRenderPictureAttributes pa;
1256
1257 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1264 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1258 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1265 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1259 1266
1260 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1267 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1261 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1268 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1262 1269
1263 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1270 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1264 1271
1265 XRenderFreePicture (dpy, src); 1272 XRenderFreePicture (dpy, src);
1266 XRenderFreePicture (dpy, dst); 1273 XRenderFreePicture (dpy, dst);
1283 bg_pmap_width = window_width; 1290 bg_pmap_width = window_width;
1284 bg_pmap_height = window_height; 1291 bg_pmap_height = window_height;
1285 } 1292 }
1286 1293
1287 /* straightforward pixmap copy */ 1294 /* straightforward pixmap copy */
1288 while (sx < 0) sx += root_width; 1295 while (sx < 0) sx += root_pmap_width;
1289 while (sy < 0) sy += root_height; 1296 while (sy < 0) sy += root_pmap_height;
1290 1297
1291 gcv.tile = recoded_root_pmap; 1298 gcv.tile = recoded_root_pmap;
1292 gcv.fill_style = FillTiled; 1299 gcv.fill_style = FillTiled;
1293 gcv.ts_x_origin = -sx; 1300 gcv.ts_x_origin = -sx;
1294 gcv.ts_y_origin = -sy; 1301 gcv.ts_y_origin = -sy;
1296 1303
1297 if (gc) 1304 if (gc)
1298 { 1305 {
1299 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1306 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1300 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1307 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1301 XFreeGC (dpy, gc);
1302 1308
1303 if (!(bg_flags & BG_CLIENT_RENDER)) 1309 if (!(bg_flags & BG_CLIENT_RENDER))
1304 { 1310 {
1305 if ((bg_flags & BG_NEEDS_BLUR) 1311 if (bg_flags & BG_NEEDS_BLUR)
1306 && (bg_flags & BG_HAS_RENDER_CONV))
1307 { 1312 {
1308 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1313 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1309 result &= ~BG_NEEDS_BLUR; 1314 result &= ~BG_NEEDS_BLUR;
1310 } 1315 }
1311 if ((bg_flags & BG_NEEDS_TINT) 1316 if (bg_flags & BG_NEEDS_TINT)
1312 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1313 { 1317 {
1314 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1318 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1315 result &= ~BG_NEEDS_TINT; 1319 result &= ~BG_NEEDS_TINT;
1316 } 1320 }
1321# ifndef HAVE_AFTERIMAGE
1322 if (result & BG_NEEDS_TINT)
1323 {
1324 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1325 if (ximage)
1326 {
1327 /* our own client-side tinting */
1328 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1329
1330 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1331 XDestroyImage (ximage);
1332 }
1333 }
1334# endif
1317 } /* server side rendering completed */ 1335 } /* server side rendering completed */
1336
1337 XFreeGC (dpy, gc);
1318 } 1338 }
1319 1339
1320 if (recoded_root_pmap != root_pixmap) 1340 if (recoded_root_pmap != root_pixmap)
1321 XFreePixmap (dpy, recoded_root_pmap); 1341 XFreePixmap (dpy, recoded_root_pmap);
1322 1342
1331 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1351 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1332 1352
1333 root_pixmap = new_root_pixmap; 1353 root_pixmap = new_root_pixmap;
1334} 1354}
1335# endif /* ENABLE_TRANSPARENCY */ 1355# endif /* ENABLE_TRANSPARENCY */
1336
1337#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1338static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1339# endif
1340 1356
1341bool 1357bool
1342rxvt_term::bg_render () 1358rxvt_term::bg_render ()
1343{ 1359{
1344 unsigned long tr_flags = 0; 1360 unsigned long tr_flags = 0;
1349 { 1365 {
1350 /* we need to re-generate transparency pixmap in that case ! */ 1366 /* we need to re-generate transparency pixmap in that case ! */
1351 tr_flags = make_transparency_pixmap (); 1367 tr_flags = make_transparency_pixmap ();
1352 if (tr_flags == 0) 1368 if (tr_flags == 0)
1353 return false; 1369 return false;
1354 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1355 bg_flags |= BG_IS_VALID; 1370 bg_flags |= BG_IS_VALID;
1356 } 1371 }
1357# endif 1372# endif
1358 1373
1359# ifdef BG_IMAGE_FROM_FILE 1374# ifdef BG_IMAGE_FROM_FILE
1360 if ((bg_flags & BG_IS_FROM_FILE) 1375 if ((bg_flags & BG_IS_FROM_FILE)
1361 || (tr_flags & BG_EFFECTS_FLAGS)) 1376 || (tr_flags & BG_EFFECTS_FLAGS))
1362 { 1377 {
1363 if (render_image (tr_flags)) 1378 if (render_image (tr_flags))
1364 bg_flags |= BG_IS_VALID; 1379 bg_flags |= BG_IS_VALID;
1365 }
1366# endif
1367
1368# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1369 XImage *result = NULL;
1370
1371 if (tr_flags && !(bg_flags & BG_IS_VALID))
1372 {
1373 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1374 }
1375
1376 if (result)
1377 {
1378 /* our own client-side tinting */
1379 if (tr_flags & BG_NEEDS_TINT)
1380 {
1381 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1382 if (bg_flags & BG_TINT_SET)
1383 tint.get (c);
1384 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1385 }
1386
1387 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1388
1389 if (gc)
1390 {
1391 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1392
1393 XFreeGC (dpy, gc);
1394 bg_flags |= BG_IS_VALID;
1395 }
1396
1397 XDestroyImage (result);
1398 } 1380 }
1399# endif 1381# endif
1400 1382
1401 if (!(bg_flags & BG_IS_VALID)) 1383 if (!(bg_flags & BG_IS_VALID))
1402 { 1384 {
1440} 1422}
1441 1423
1442#endif /* HAVE_BG_PIXMAP */ 1424#endif /* HAVE_BG_PIXMAP */
1443 1425
1444#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1426#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1445/* taken from aterm-0.4.2 */ 1427/* based on code from aterm-0.4.2 */
1446 1428
1447static void 1429static inline void
1448shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1430fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1431{
1432 for (int i = 0; i <= mask >> sh; i++)
1433 {
1434 uint32_t tmp;
1435 tmp = i * high;
1436 tmp += (mask >> sh) * low;
1437 lookup[i] = (tmp / 0xffff) << sh;
1438 }
1439}
1440
1441void
1442rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1449{ 1443{
1450 int sh_r, sh_g, sh_b; 1444 int sh_r, sh_g, sh_b;
1451 uint32_t mask_r, mask_g, mask_b; 1445 uint32_t mask_r, mask_g, mask_b;
1452 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1446 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1453 rgba low; 1447 unsigned short low;
1454 rgba high;
1455 int i;
1456 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1448 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1457 1449
1458 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1450 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1459 1451
1460 /* for convenience */ 1452 /* for convenience */
1519 break; 1511 break;
1520 default: 1512 default:
1521 return; /* we do not support this color depth */ 1513 return; /* we do not support this color depth */
1522 } 1514 }
1523 1515
1516 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1517
1518 if (bg_flags & BG_TINT_SET)
1519 tint.get (c);
1520
1524 /* prepare limits for color transformation (each channel is handled separately) */ 1521 /* prepare limits for color transformation (each channel is handled separately) */
1525 if (shade > 100) 1522 if (shade > 100)
1526 { 1523 {
1527 shade = 200 - shade;
1528
1529 high.r = c.r * shade / 100;
1530 high.g = c.g * shade / 100;
1531 high.b = c.b * shade / 100;
1532
1533 low.r = 65535 * (100 - shade) / 100; 1524 c.r = c.r * (200 - shade) / 100;
1534 low.g = 65535 * (100 - shade) / 100; 1525 c.g = c.g * (200 - shade) / 100;
1535 low.b = 65535 * (100 - shade) / 100; 1526 c.b = c.b * (200 - shade) / 100;
1527
1528 low = 0xffff * (shade - 100) / 100;
1536 } 1529 }
1537 else 1530 else
1538 { 1531 {
1539 high.r = c.r * shade / 100; 1532 c.r = c.r * shade / 100;
1540 high.g = c.g * shade / 100; 1533 c.g = c.g * shade / 100;
1541 high.b = c.b * shade / 100; 1534 c.b = c.b * shade / 100;
1542 1535
1543 low.r = low.g = low.b = 0; 1536 low = 0;
1544 } 1537 }
1545 1538
1546 /* fill our lookup tables */ 1539 /* fill our lookup tables */
1547 for (i = 0; i <= mask_r>>sh_r; i++) 1540 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1548 { 1541 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1549 uint32_t tmp; 1542 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1550 tmp = i * high.r;
1551 tmp += (mask_r>>sh_r) * low.r;
1552 lookup_r[i] = (tmp/65535)<<sh_r;
1553 }
1554 for (i = 0; i <= mask_g>>sh_g; i++)
1555 {
1556 uint32_t tmp;
1557 tmp = i * high.g;
1558 tmp += (mask_g>>sh_g) * low.g;
1559 lookup_g[i] = (tmp/65535)<<sh_g;
1560 }
1561 for (i = 0; i <= mask_b>>sh_b; i++)
1562 {
1563 uint32_t tmp;
1564 tmp = i * high.b;
1565 tmp += (mask_b>>sh_b) * low.b;
1566 lookup_b[i] = (tmp/65535)<<sh_b;
1567 }
1568 1543
1569 /* apply table to input image (replacing colors by newly calculated ones) */ 1544 /* apply table to input image (replacing colors by newly calculated ones) */
1570 if (ximage->bits_per_pixel == 32 1545 if (ximage->bits_per_pixel == 32
1571 && (ximage->depth == 24 || ximage->depth == 32) 1546 && (ximage->depth == 24 || ximage->depth == 32)
1572 && ximage->byte_order == host_byte_order) 1547 && ximage->byte_order == host_byte_order)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines