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.157 by sf-exg, Tue Aug 9 21:48:00 2011 UTC vs.
Revision 1.190 by sf-exg, Thu Dec 29 20:35:37 2011 UTC

… …
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 */
61
62#ifdef HAVE_BG_PIXMAP 37#ifdef HAVE_BG_PIXMAP
38# if XRENDER
39static Picture
40create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
41{
42 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
43
44 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
45 XRenderPictureAttributes pa;
46 pa.repeat = True;
47 pa.component_alpha = component_alpha;
48 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
49
50 XFreePixmap (dpy, pixmap);
51
52 return mask;
53}
54# endif
55
63void 56void
64rxvt_term::bg_destroy () 57rxvt_term::bg_destroy ()
65{ 58{
66#ifdef HAVE_AFTERIMAGE 59#ifdef HAVE_AFTERIMAGE
67 if (original_asim) 60 if (original_asim)
… …
175 int smaller = min (image_size, window_size); 168 int smaller = min (image_size, window_size);
176 169
177 if (align >= 0 && align <= 100) 170 if (align >= 0 && align <= 100)
178 return diff * align / 100; 171 return diff * align / 100;
179 else if (align > 100 && align <= 200) 172 else if (align > 100 && align <= 200)
180 return ((align - 100) * smaller / 100) + window_size - smaller; 173 return (align - 100) * smaller / 100 + window_size - smaller;
181 else if (align >= -100 && align < 0) 174 else if (align >= -100 && align < 0)
182 return ((align + 100) * smaller / 100) - image_size; 175 return (align + 100) * smaller / 100 - image_size;
183 return 0; 176 return 0;
184} 177}
185 178
186static inline int 179static inline int
187make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 180make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
… …
206{ 199{
207 bool changed = false; 200 bool changed = false;
208 int geom_flags = 0; 201 int geom_flags = 0;
209 int x = 0, y = 0; 202 int x = 0, y = 0;
210 unsigned int w = 0, h = 0; 203 unsigned int w = 0, h = 0;
211 unsigned int n; 204 unsigned long new_flags = 0;
212 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
213 const char *ops;
214 205
215 if (geom == NULL) 206 if (geom == NULL)
216 return false; 207 return false;
217 208
218 char str[256]; 209 if (geom[0])
219
220 ops = strchr (geom, ':');
221 if (ops == NULL)
222 n = strlen (geom);
223 else
224 n = ops - geom;
225
226 if (n >= sizeof (str))
227 return false;
228
229 memcpy (str, geom, n);
230 str[n] = '\0';
231 rxvt_strtrim (str);
232
233 if (str[0])
234 { 210 {
235 /* we have geometry string - let's handle it prior to applying ops */ 211 char **arr = rxvt_strsplit (':', geom);
212
213 for (int i = 0; arr[i]; i++)
214 {
215 if (!strcasecmp (arr[i], "style=tiled"))
216 {
217 new_flags = BG_TILE;
218 w = h = noScale;
219 x = y = 0;
220 geom_flags = WidthValue|HeightValue|XValue|YValue;
221 }
222 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
223 {
224 new_flags = BG_KEEP_ASPECT;
225 w = h = windowScale;
226 x = y = centerAlign;
227 geom_flags = WidthValue|HeightValue|XValue|YValue;
228 }
229 else if (!strcasecmp (arr[i], "style=stretched"))
230 {
231 new_flags = 0;
232 w = h = windowScale;
233 geom_flags = WidthValue|HeightValue;
234 }
235 else if (!strcasecmp (arr[i], "style=centered"))
236 {
237 new_flags = 0;
238 w = h = noScale;
239 x = y = centerAlign;
240 geom_flags = WidthValue|HeightValue|XValue|YValue;
241 }
242 else if (!strcasecmp (arr[i], "style=root-tiled"))
243 {
244 new_flags = BG_TILE|BG_ROOT_ALIGN;
245 w = h = noScale;
246 geom_flags = WidthValue|HeightValue;
247 }
248 else if (!strcasecmp (arr[i], "op=tile"))
249 new_flags |= BG_TILE;
250 else if (!strcasecmp (arr[i], "op=keep-aspect"))
251 new_flags |= BG_KEEP_ASPECT;
252 else if (!strcasecmp (arr[i], "op=root-align"))
253 new_flags |= BG_ROOT_ALIGN;
254
255 // deprecated
256 else if (!strcasecmp (arr[i], "tile"))
257 {
258 new_flags |= BG_TILE;
259 w = h = noScale;
260 geom_flags |= WidthValue|HeightValue;
261 }
262 else if (!strcasecmp (arr[i], "propscale"))
263 {
264 new_flags |= BG_KEEP_ASPECT;
265 w = h = windowScale;
266 geom_flags |= WidthValue|HeightValue;
267 }
268 else if (!strcasecmp (arr[i], "hscale"))
269 {
270 new_flags |= BG_TILE;
271 w = windowScale;
272 h = noScale;
273 geom_flags |= WidthValue|HeightValue;
274 }
275 else if (!strcasecmp (arr[i], "vscale"))
276 {
277 new_flags |= BG_TILE;
278 h = windowScale;
279 w = noScale;
280 geom_flags |= WidthValue|HeightValue;
281 }
282 else if (!strcasecmp (arr[i], "scale"))
283 {
284 w = h = windowScale;
285 geom_flags |= WidthValue|HeightValue;
286 }
287 else if (!strcasecmp (arr[i], "auto"))
288 {
289 w = h = windowScale;
290 x = y = centerAlign;
291 geom_flags |= WidthValue|HeightValue|XValue|YValue;
292 }
293 else if (!strcasecmp (arr[i], "root"))
294 {
295 new_flags |= BG_TILE|BG_ROOT_ALIGN;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299
300 else
236 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 301 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
237 } /* done parsing geometry string */ 302 } /* done parsing ops */
303
304 rxvt_free_strsplit (arr);
305 }
306
307 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
238 308
239 if (!update) 309 if (!update)
240 { 310 {
241 if (!(geom_flags & XValue)) 311 if (!(geom_flags & XValue))
242 x = y = defaultAlign; 312 x = y = defaultAlign;
… …
251 w = h; 321 w = h;
252 322
253 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
254 } 324 }
255 325
256 if (ops)
257 {
258 char **arr = rxvt_strsplit (':', ops + 1);
259
260 for (int i = 0; arr[i]; i++)
261 {
262 if (!strcasecmp (arr[i], "tile"))
263 {
264 new_flags |= BG_TILE;
265 w = h = noScale;
266 geom_flags |= WidthValue|HeightValue;
267 }
268 else if (!strcasecmp (arr[i], "propscale"))
269 {
270 new_flags |= BG_PROP_SCALE;
271 }
272 else if (!strcasecmp (arr[i], "hscale"))
273 {
274 if (w == 0) w = windowScale;
275
276 h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279 else if (!strcasecmp (arr[i], "vscale"))
280 {
281 if (h == 0) h = windowScale;
282
283 w = noScale;
284 geom_flags |= WidthValue|HeightValue;
285 }
286 else if (!strcasecmp (arr[i], "scale"))
287 {
288 if (h == 0) h = windowScale;
289 if (w == 0) w = windowScale;
290
291 geom_flags |= WidthValue|HeightValue;
292 }
293 else if (!strcasecmp (arr[i], "root"))
294 {
295 new_flags |= BG_TILE|BG_ROOT_ALIGN;
296 w = h = noScale;
297 geom_flags |= WidthValue|HeightValue;
298 }
299 } /* done parsing ops */
300
301 rxvt_free_strsplit (arr);
302 }
303
304 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 326 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
305 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 327 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
306 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 328 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
307 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 329 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
308 330
… …
319rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 341rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
320{ 342{
321 int target_width = szHint.width; 343 int target_width = szHint.width;
322 int target_height = szHint.height; 344 int target_height = szHint.height;
323 345
346 w = h_scale * target_width / 100;
347 h = v_scale * target_height / 100;
348
324 if (bg_flags & BG_PROP_SCALE) 349 if (bg_flags & BG_KEEP_ASPECT)
325 { 350 {
326 float scale = (float)target_width / image_width; 351 float scale = (float)w / image_width;
327 min_it (scale, (float)target_height / image_height); 352 min_it (scale, (float)h / image_height);
328 w = image_width * scale + 0.5; 353 w = image_width * scale + 0.5;
329 h = image_height * scale + 0.5; 354 h = image_height * scale + 0.5;
330 } 355 }
331 else
332 {
333 w = h_scale * target_width / 100;
334 h = v_scale * target_height / 100;
335 }
336 356
337 if (!w) w = image_width; 357 if (!w) w = image_width;
338 if (!h) h = image_height; 358 if (!h) h = image_height;
339 359
340 if (bg_flags & BG_ROOT_ALIGN) 360 if (bg_flags & BG_ROOT_ALIGN)
… …
348 y = make_align_position (v_align, target_height, h); 368 y = make_align_position (v_align, target_height, h);
349 } 369 }
350 370
351 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
352 if (!(bg_flags & BG_TILE) 372 if (!(bg_flags & BG_TILE)
353 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 373 || h_scale || v_scale
354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
355 || w > target_width || h > target_height) 375 || w > target_width || h > target_height)
356 bg_flags |= BG_IS_SIZE_SENSITIVE; 376 bg_flags |= BG_IS_SIZE_SENSITIVE;
357} 377}
358 378
… …
372 if (tr_flags & BG_NEEDS_TINT) 392 if (tr_flags & BG_NEEDS_TINT)
373 { 393 {
374 ShadingInfo as_shade; 394 ShadingInfo as_shade;
375 as_shade.shading = shade; 395 as_shade.shading = shade;
376 396
377 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 397 rgba c;
378 if (bg_flags & BG_TINT_SET)
379 tint.get (c); 398 tint.get (c);
380 as_shade.tintColor.red = c.r; 399 as_shade.tintColor.red = c.r;
381 as_shade.tintColor.green = c.g; 400 as_shade.tintColor.green = c.g;
382 as_shade.tintColor.blue = c.b; 401 as_shade.tintColor.blue = c.b;
383 402
384 background_tint = shading2tint32 (&as_shade); 403 background_tint = shading2tint32 (&as_shade);
385 } 404 }
386 405
387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 406 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
388 { 407 {
389 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 408 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
390 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 409 ASA_XImage,
391 100, ASIMAGE_QUALITY_DEFAULT); 410 100, ASIMAGE_QUALITY_DEFAULT);
392 if (tmp) 411 if (tmp)
393 { 412 {
394 destroy_asimage (&background); 413 destroy_asimage (&background);
395 background = tmp; 414 background = tmp;
… …
414 433
415 if (!original_asim 434 if (!original_asim
416 || (!(bg_flags & BG_ROOT_ALIGN) 435 || (!(bg_flags & BG_ROOT_ALIGN)
417 && (x >= target_width 436 && (x >= target_width
418 || y >= target_height 437 || y >= target_height
419 || (x + w <= 0) 438 || x + w <= 0
420 || (y + h <= 0)))) 439 || y + h <= 0)))
421 { 440 {
422 if (background) 441 if (background)
423 { 442 {
424 new_pmap_width = background->width; 443 new_pmap_width = background->width;
425 new_pmap_height = background->height; 444 new_pmap_height = background->height;
… …
439 } 458 }
440 else 459 else
441 { 460 {
442 result = original_asim; 461 result = original_asim;
443 462
444 if ((w != original_asim->width) 463 if (w != original_asim->width
445 || (h != original_asim->height)) 464 || h != original_asim->height)
446 { 465 {
447 result = scale_asimage (asv, original_asim, 466 result = scale_asimage (asv, original_asim,
448 w, h, 467 w, h,
449 background ? ASA_ASImage : ASA_XImage, 468 ASA_XImage,
450 100, ASIMAGE_QUALITY_DEFAULT); 469 100, ASIMAGE_QUALITY_DEFAULT);
451 } 470 }
452 471
453 if (background == NULL) 472 if (background == NULL)
454 { 473 {
… …
704 get_image_geometry (image_width, image_height, w, h, x, y); 723 get_image_geometry (image_width, image_height, w, h, x, y);
705 724
706 if (!(bg_flags & BG_ROOT_ALIGN) 725 if (!(bg_flags & BG_ROOT_ALIGN)
707 && (x >= target_width 726 && (x >= target_width
708 || y >= target_height 727 || y >= target_height
709 || (x + w <= 0) 728 || x + w <= 0
710 || (y + h <= 0))) 729 || y + h <= 0))
711 return false; 730 return false;
712 731
713 result = pixbuf; 732 result = pixbuf;
714 733
715 if ((w != image_width) 734 if (w != image_width
716 || (h != image_height)) 735 || h != image_height)
717 { 736 {
718 result = gdk_pixbuf_scale_simple (pixbuf, 737 result = gdk_pixbuf_scale_simple (pixbuf,
719 w, h, 738 w, h,
720 GDK_INTERP_BILINEAR); 739 GDK_INTERP_BILINEAR);
721 } 740 }
… …
801 820
802#if XRENDER 821#if XRENDER
803 if (tr_flags) 822 if (tr_flags)
804 { 823 {
805 XRenderPictureAttributes pa; 824 XRenderPictureAttributes pa;
806
807 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 825 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
826
808 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 827 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, &pa);
809 828
810 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
811 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 829 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, &pa);
812 830
813 pa.repeat = True; 831 Picture mask = create_xrender_mask (dpy, vt, False, False);
814 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
815 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
816 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
817 XFreePixmap (dpy, mask_pmap);
818 832
819 XRenderColor mask_c; 833 XRenderColor mask_c;
820 834
821 mask_c.alpha = 0x8000; 835 mask_c.alpha = 0x8000;
822 mask_c.red = 0; 836 mask_c.red = 0;
… …
850rxvt_term::bg_set_file (const char *file) 864rxvt_term::bg_set_file (const char *file)
851{ 865{
852 if (!file || !*file) 866 if (!file || !*file)
853 return false; 867 return false;
854 868
869 bool ret = false;
855 if (const char *p = strchr (file, ';')) 870 const char *p = strchr (file, ';');
871
872 if (p)
856 { 873 {
857 size_t len = p - file; 874 size_t len = p - file;
858 char *f = rxvt_temp_buf<char> (len + 1); 875 char *f = rxvt_temp_buf<char> (len + 1);
859 memcpy (f, file, len); 876 memcpy (f, file, len);
860 f[len] = '\0'; 877 f[len] = '\0';
… …
869 { 886 {
870 if (original_asim) 887 if (original_asim)
871 safe_asimage_destroy (original_asim); 888 safe_asimage_destroy (original_asim);
872 original_asim = image; 889 original_asim = image;
873 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 890 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
874 return true; 891 ret = true;
875 } 892 }
876# endif 893# endif
877 894
878# ifdef HAVE_PIXBUF 895# ifdef HAVE_PIXBUF
879 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 896 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
881 { 898 {
882 if (pixbuf) 899 if (pixbuf)
883 g_object_unref (pixbuf); 900 g_object_unref (pixbuf);
884 pixbuf = image; 901 pixbuf = image;
885 bg_flags |= BG_IS_FROM_FILE; 902 bg_flags |= BG_IS_FROM_FILE;
886 return true; 903 ret = true;
887 } 904 }
888# endif 905# endif
889 906
907 if (ret)
908 {
909 if (p)
910 bg_set_geometry (p + 1);
911 else
912 bg_set_default_geometry ();
913 }
914
890 return false; 915 return ret;
891} 916}
892 917
893# endif /* BG_IMAGE_FROM_FILE */ 918# endif /* BG_IMAGE_FROM_FILE */
894 919
895# ifdef ENABLE_TRANSPARENCY 920# ifdef ENABLE_TRANSPARENCY
… …
942} 967}
943 968
944void 969void
945rxvt_term::set_tint_shade_flags () 970rxvt_term::set_tint_shade_flags ()
946{ 971{
947 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 972 rgba c;
948 bool has_shade = shade != 100; 973 bool has_shade = shade != 100;
949 974
950 bg_flags &= ~BG_TINT_FLAGS; 975 bg_flags &= ~BG_TINT_FLAGS;
951 976
952 if (bg_flags & BG_TINT_SET)
953 {
954 tint.get (c); 977 tint.get (c);
978
955 if (!has_shade 979 if (!has_shade
956 && (c.r <= 0x00ff || c.r >= 0xff00) 980 && (c.r <= 0x00ff || c.r >= 0xff00)
957 && (c.g <= 0x00ff || c.g >= 0xff00) 981 && (c.g <= 0x00ff || c.g >= 0xff00)
958 && (c.b <= 0x00ff || c.b >= 0xff00)) 982 && (c.b <= 0x00ff || c.b >= 0xff00))
959 bg_flags |= BG_TINT_BITAND; 983 bg_flags |= BG_TINT_BITAND;
960 }
961 984
962 if (has_shade || (bg_flags & BG_TINT_SET)) 985 if (has_shade
986 || c.r < 0xff00
987 || c.g < 0xff00
988 || c.b < 0xff00)
963 bg_flags |= BG_NEEDS_TINT; 989 bg_flags |= BG_NEEDS_TINT;
964} 990}
965 991
966bool 992bool
967rxvt_term::bg_set_tint (rxvt_color &new_tint) 993rxvt_term::bg_set_tint (rxvt_color &new_tint)
968{ 994{
969 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 995 if (tint != new_tint)
970 { 996 {
971 tint = new_tint; 997 tint = new_tint;
972 bg_flags |= BG_TINT_SET;
973 set_tint_shade_flags (); 998 set_tint_shade_flags ();
974 return true; 999 return true;
975 } 1000 }
976 1001
977 return false; 1002 return false;
978} 1003}
979 1004
980bool 1005bool
981rxvt_term::bg_set_shade (const char *shade_str) 1006rxvt_term::bg_set_shade (const char *shade_str)
982{ 1007{
983 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1008 int new_shade = atoi (shade_str);
984 1009
985 clamp_it (new_shade, -100, 200); 1010 clamp_it (new_shade, -100, 200);
986 if (new_shade < 0) 1011 if (new_shade < 0)
987 new_shade = 200 - (100 + new_shade); 1012 new_shade = 200 - (100 + new_shade);
988 1013
… …
1022bool 1047bool
1023rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1048rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1024{ 1049{
1025 bool ret = false; 1050 bool ret = false;
1026#if XRENDER 1051#if XRENDER
1052 if (!(bg_flags & BG_HAS_RENDER_CONV))
1053 return false;
1054
1027 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1055 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1028 double *kernel = (double *)malloc (size * sizeof (double)); 1056 double *kernel = (double *)malloc (size * sizeof (double));
1029 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1057 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1030 1058
1031 XRenderPictureAttributes pa; 1059 XRenderPictureAttributes pa;
… …
1104 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1132 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1105 ret = true; 1133 ret = true;
1106 XFreeGC (dpy, gc); 1134 XFreeGC (dpy, gc);
1107 } 1135 }
1108 } 1136 }
1109 else
1110 {
1111# if XRENDER 1137# if XRENDER
1112 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1138 else if (bg_flags & BG_HAS_RENDER)
1139 {
1140 rgba c;
1113 1141
1114 if (bg_flags & BG_TINT_SET)
1115 tint.get (c); 1142 tint.get (c);
1116 1143
1117 if (shade <= 100) 1144 if (shade <= 100)
1118 { 1145 {
1119 c.r = c.r * shade / 100; 1146 c.r = c.r * shade / 100;
1120 c.g = c.g * shade / 100; 1147 c.g = c.g * shade / 100;
… …
1125 c.r = c.r * (200 - shade) / 100; 1152 c.r = c.r * (200 - shade) / 100;
1126 c.g = c.g * (200 - shade) / 100; 1153 c.g = c.g * (200 - shade) / 100;
1127 c.b = c.b * (200 - shade) / 100; 1154 c.b = c.b * (200 - shade) / 100;
1128 } 1155 }
1129 1156
1130 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1131 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1157 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1132 XRenderPictureAttributes pa; 1158 XRenderPictureAttributes pa;
1133 1159
1134 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1160 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1135 1161
1136 pa.repeat = True; 1162 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1137 1163
1138 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1164 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1139 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1140 XFreePixmap (dpy, overlay_pmap);
1141
1142 pa.component_alpha = True;
1143 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1144 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1145 XFreePixmap (dpy, mask_pmap);
1146 1165
1147 XRenderColor mask_c; 1166 XRenderColor mask_c;
1148 1167
1149 mask_c.alpha = 0xffff; 1168 mask_c.alpha = 0xffff;
1150 mask_c.red = 1169 mask_c.red =
… …
1171 ret = true; 1190 ret = true;
1172 1191
1173 XRenderFreePicture (dpy, mask_pic); 1192 XRenderFreePicture (dpy, mask_pic);
1174 XRenderFreePicture (dpy, overlay_pic); 1193 XRenderFreePicture (dpy, overlay_pic);
1175 XRenderFreePicture (dpy, back_pic); 1194 XRenderFreePicture (dpy, back_pic);
1195 }
1176# endif 1196# endif
1177 }
1178 1197
1179 return ret; 1198 return ret;
1180} 1199}
1181 1200
1182/* 1201/*
… …
1266 bg_pmap_width = window_width; 1285 bg_pmap_width = window_width;
1267 bg_pmap_height = window_height; 1286 bg_pmap_height = window_height;
1268 } 1287 }
1269 1288
1270 /* straightforward pixmap copy */ 1289 /* straightforward pixmap copy */
1271 while (sx < 0) sx += root_width; 1290 while (sx < 0) sx += root_pmap_width;
1272 while (sy < 0) sy += root_height; 1291 while (sy < 0) sy += root_pmap_height;
1273 1292
1274 gcv.tile = recoded_root_pmap; 1293 gcv.tile = recoded_root_pmap;
1275 gcv.fill_style = FillTiled; 1294 gcv.fill_style = FillTiled;
1276 gcv.ts_x_origin = -sx; 1295 gcv.ts_x_origin = -sx;
1277 gcv.ts_y_origin = -sy; 1296 gcv.ts_y_origin = -sy;
… …
1279 1298
1280 if (gc) 1299 if (gc)
1281 { 1300 {
1282 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1301 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1283 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1302 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1284 XFreeGC (dpy, gc);
1285 1303
1286 if (!(bg_flags & BG_CLIENT_RENDER)) 1304 if (!(bg_flags & BG_CLIENT_RENDER))
1287 { 1305 {
1288 if ((bg_flags & BG_NEEDS_BLUR) 1306 if (bg_flags & BG_NEEDS_BLUR)
1289 && (bg_flags & BG_HAS_RENDER_CONV))
1290 { 1307 {
1291 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1308 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1292 result &= ~BG_NEEDS_BLUR; 1309 result &= ~BG_NEEDS_BLUR;
1293 } 1310 }
1294 if ((bg_flags & BG_NEEDS_TINT) 1311 if (bg_flags & BG_NEEDS_TINT)
1295 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1296 { 1312 {
1297 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1313 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1298 result &= ~BG_NEEDS_TINT; 1314 result &= ~BG_NEEDS_TINT;
1299 } 1315 }
1316# ifndef HAVE_AFTERIMAGE
1317 if (result & BG_NEEDS_TINT)
1318 {
1319 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1320 if (ximage)
1321 {
1322 /* our own client-side tinting */
1323 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1324
1325 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1326 XDestroyImage (ximage);
1327 }
1328 }
1329# endif
1300 } /* server side rendering completed */ 1330 } /* server side rendering completed */
1331
1332 XFreeGC (dpy, gc);
1301 } 1333 }
1302 1334
1303 if (recoded_root_pmap != root_pixmap) 1335 if (recoded_root_pmap != root_pixmap)
1304 XFreePixmap (dpy, recoded_root_pmap); 1336 XFreePixmap (dpy, recoded_root_pmap);
1305 1337
… …
1314 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1346 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1315 1347
1316 root_pixmap = new_root_pixmap; 1348 root_pixmap = new_root_pixmap;
1317} 1349}
1318# endif /* ENABLE_TRANSPARENCY */ 1350# endif /* ENABLE_TRANSPARENCY */
1319
1320#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1321static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1322# endif
1323 1351
1324bool 1352bool
1325rxvt_term::bg_render () 1353rxvt_term::bg_render ()
1326{ 1354{
1327 unsigned long tr_flags = 0; 1355 unsigned long tr_flags = 0;
… …
1332 { 1360 {
1333 /* we need to re-generate transparency pixmap in that case ! */ 1361 /* we need to re-generate transparency pixmap in that case ! */
1334 tr_flags = make_transparency_pixmap (); 1362 tr_flags = make_transparency_pixmap ();
1335 if (tr_flags == 0) 1363 if (tr_flags == 0)
1336 return false; 1364 return false;
1337 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1338 bg_flags |= BG_IS_VALID; 1365 bg_flags |= BG_IS_VALID;
1339 } 1366 }
1340# endif 1367# endif
1341 1368
1342# ifdef BG_IMAGE_FROM_FILE 1369# ifdef BG_IMAGE_FROM_FILE
1343 if ((bg_flags & BG_IS_FROM_FILE) 1370 if ((bg_flags & BG_IS_FROM_FILE)
… …
1346 if (render_image (tr_flags)) 1373 if (render_image (tr_flags))
1347 bg_flags |= BG_IS_VALID; 1374 bg_flags |= BG_IS_VALID;
1348 } 1375 }
1349# endif 1376# endif
1350 1377
1351# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1352 XImage *result = NULL;
1353
1354 if (tr_flags && !(bg_flags & BG_IS_VALID))
1355 {
1356 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1357 }
1358
1359 if (result)
1360 {
1361 /* our own client-side tinting */
1362 if (tr_flags & BG_NEEDS_TINT)
1363 {
1364 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1365 if (bg_flags & BG_TINT_SET)
1366 tint.get (c);
1367 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1368 }
1369
1370 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1371
1372 if (gc)
1373 {
1374 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1375
1376 XFreeGC (dpy, gc);
1377 bg_flags |= BG_IS_VALID;
1378 }
1379
1380 XDestroyImage (result);
1381 }
1382# endif
1383
1384 if (!(bg_flags & BG_IS_VALID)) 1378 if (!(bg_flags & BG_IS_VALID))
1385 { 1379 {
1386 if (bg_pixmap != None) 1380 if (bg_pixmap != None)
1387 { 1381 {
1388 XFreePixmap (dpy, bg_pixmap); 1382 XFreePixmap (dpy, bg_pixmap);
… …
1400 1394
1401void 1395void
1402rxvt_term::bg_init () 1396rxvt_term::bg_init ()
1403{ 1397{
1404#ifdef ENABLE_TRANSPARENCY 1398#ifdef ENABLE_TRANSPARENCY
1399 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1400 tint.set (this, c);
1405 shade = 100; 1401 shade = 100;
1406#endif 1402#endif
1407 1403
1408 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1404 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1409#if XRENDER 1405#if XRENDER
… …
1423} 1419}
1424 1420
1425#endif /* HAVE_BG_PIXMAP */ 1421#endif /* HAVE_BG_PIXMAP */
1426 1422
1427#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1423#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1428/* taken from aterm-0.4.2 */ 1424/* based on code from aterm-0.4.2 */
1429 1425
1430static void 1426static inline void
1431shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1427fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1428{
1429 for (int i = 0; i <= mask >> sh; i++)
1430 {
1431 uint32_t tmp;
1432 tmp = i * high;
1433 tmp += (mask >> sh) * low;
1434 lookup[i] = (tmp / 0xffff) << sh;
1435 }
1436}
1437
1438void
1439rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1432{ 1440{
1433 int sh_r, sh_g, sh_b; 1441 int sh_r, sh_g, sh_b;
1434 uint32_t mask_r, mask_g, mask_b; 1442 uint32_t mask_r, mask_g, mask_b;
1435 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1443 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1436 rgba low; 1444 unsigned short low;
1437 rgba high;
1438 int i;
1439 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1445 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1440 1446
1441 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1447 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1442 1448
1443 /* for convenience */ 1449 /* for convenience */
… …
1502 break; 1508 break;
1503 default: 1509 default:
1504 return; /* we do not support this color depth */ 1510 return; /* we do not support this color depth */
1505 } 1511 }
1506 1512
1513 rgba c;
1514
1515 tint.get (c);
1516
1507 /* prepare limits for color transformation (each channel is handled separately) */ 1517 /* prepare limits for color transformation (each channel is handled separately) */
1508 if (shade > 100) 1518 if (shade > 100)
1509 { 1519 {
1510 shade = 200 - shade;
1511
1512 high.r = c.r * shade / 100;
1513 high.g = c.g * shade / 100;
1514 high.b = c.b * shade / 100;
1515
1516 low.r = 65535 * (100 - shade) / 100; 1520 c.r = c.r * (200 - shade) / 100;
1517 low.g = 65535 * (100 - shade) / 100; 1521 c.g = c.g * (200 - shade) / 100;
1518 low.b = 65535 * (100 - shade) / 100; 1522 c.b = c.b * (200 - shade) / 100;
1523
1524 low = 0xffff * (shade - 100) / 100;
1519 } 1525 }
1520 else 1526 else
1521 { 1527 {
1522 high.r = c.r * shade / 100; 1528 c.r = c.r * shade / 100;
1523 high.g = c.g * shade / 100; 1529 c.g = c.g * shade / 100;
1524 high.b = c.b * shade / 100; 1530 c.b = c.b * shade / 100;
1525 1531
1526 low.r = low.g = low.b = 0; 1532 low = 0;
1527 } 1533 }
1528 1534
1529 /* fill our lookup tables */ 1535 /* fill our lookup tables */
1530 for (i = 0; i <= mask_r>>sh_r; i++) 1536 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1531 { 1537 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1532 uint32_t tmp; 1538 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1533 tmp = i * high.r;
1534 tmp += (mask_r>>sh_r) * low.r;
1535 lookup_r[i] = (tmp/65535)<<sh_r;
1536 }
1537 for (i = 0; i <= mask_g>>sh_g; i++)
1538 {
1539 uint32_t tmp;
1540 tmp = i * high.g;
1541 tmp += (mask_g>>sh_g) * low.g;
1542 lookup_g[i] = (tmp/65535)<<sh_g;
1543 }
1544 for (i = 0; i <= mask_b>>sh_b; i++)
1545 {
1546 uint32_t tmp;
1547 tmp = i * high.b;
1548 tmp += (mask_b>>sh_b) * low.b;
1549 lookup_b[i] = (tmp/65535)<<sh_b;
1550 }
1551 1539
1552 /* apply table to input image (replacing colors by newly calculated ones) */ 1540 /* apply table to input image (replacing colors by newly calculated ones) */
1553 if (ximage->bits_per_pixel == 32 1541 if (ximage->bits_per_pixel == 32
1554 && (ximage->depth == 24 || ximage->depth == 32) 1542 && (ximage->depth == 24 || ximage->depth == 32)
1555 && ximage->byte_order == host_byte_order) 1543 && ximage->byte_order == host_byte_order)

Diff Legend

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