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.163 by sf-exg, Sat Aug 13 09:05:44 2011 UTC vs.
Revision 1.189 by sf-exg, Thu Dec 29 16:45:22 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 */
52
53#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
54void 56void
55rxvt_term::bg_destroy () 57rxvt_term::bg_destroy ()
56{ 58{
57#ifdef HAVE_AFTERIMAGE 59#ifdef HAVE_AFTERIMAGE
58 if (original_asim) 60 if (original_asim)
… …
166 int smaller = min (image_size, window_size); 168 int smaller = min (image_size, window_size);
167 169
168 if (align >= 0 && align <= 100) 170 if (align >= 0 && align <= 100)
169 return diff * align / 100; 171 return diff * align / 100;
170 else if (align > 100 && align <= 200) 172 else if (align > 100 && align <= 200)
171 return ((align - 100) * smaller / 100) + window_size - smaller; 173 return (align - 100) * smaller / 100 + window_size - smaller;
172 else if (align >= -100 && align < 0) 174 else if (align >= -100 && align < 0)
173 return ((align + 100) * smaller / 100) - image_size; 175 return (align + 100) * smaller / 100 - image_size;
174 return 0; 176 return 0;
175} 177}
176 178
177static inline int 179static inline int
178make_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)
… …
197{ 199{
198 bool changed = false; 200 bool changed = false;
199 int geom_flags = 0; 201 int geom_flags = 0;
200 int x = 0, y = 0; 202 int x = 0, y = 0;
201 unsigned int w = 0, h = 0; 203 unsigned int w = 0, h = 0;
202 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS)); 204 unsigned long new_flags = 0;
203 205
204 if (geom == NULL) 206 if (geom == NULL)
205 return false; 207 return false;
206 208
207 if (geom[0]) 209 if (geom[0])
208 { 210 {
209 char **arr = rxvt_strsplit (':', geom); 211 char **arr = rxvt_strsplit (':', geom);
210 212
211 for (int i = 0; arr[i]; i++) 213 for (int i = 0; arr[i]; i++)
212 { 214 {
213 if (!strcasecmp (arr[i], "style=tiled")) 215 if (!strcasecmp (arr[i], "style=tiled"))
214 { 216 {
215 new_flags = BG_TILE; 217 new_flags = BG_TILE;
216 w = h = noScale; 218 w = h = noScale;
217 x = y = 0; 219 x = y = 0;
218 geom_flags = WidthValue|HeightValue|XValue|YValue; 220 geom_flags = WidthValue|HeightValue|XValue|YValue;
219 } 221 }
220 else if (!strcasecmp (arr[i], "style=aspect-stretched")) 222 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
221 { 223 {
222 new_flags = BG_PROP_SCALE; 224 new_flags = BG_KEEP_ASPECT;
225 w = h = windowScale;
223 x = y = centerAlign; 226 x = y = centerAlign;
224 geom_flags = XValue|YValue; 227 geom_flags = WidthValue|HeightValue|XValue|YValue;
225 } 228 }
226 else if (!strcasecmp (arr[i], "style=stretched")) 229 else if (!strcasecmp (arr[i], "style=stretched"))
227 { 230 {
228 new_flags = 0; 231 new_flags = 0;
229 w = h = windowScale; 232 w = h = windowScale;
… …
242 w = h = noScale; 245 w = h = noScale;
243 geom_flags = WidthValue|HeightValue; 246 geom_flags = WidthValue|HeightValue;
244 } 247 }
245 else if (!strcasecmp (arr[i], "op=tile")) 248 else if (!strcasecmp (arr[i], "op=tile"))
246 new_flags |= BG_TILE; 249 new_flags |= BG_TILE;
247 else if (!strcasecmp (arr[i], "op=pscale")) 250 else if (!strcasecmp (arr[i], "op=keep-aspect"))
248 new_flags |= BG_PROP_SCALE; 251 new_flags |= BG_KEEP_ASPECT;
249 else if (!strcasecmp (arr[i], "op=root")) 252 else if (!strcasecmp (arr[i], "op=root-align"))
250 new_flags |= BG_ROOT_ALIGN; 253 new_flags |= BG_ROOT_ALIGN;
251 254
252 // deprecated 255 // deprecated
253 else if (!strcasecmp (arr[i], "tile")) 256 else if (!strcasecmp (arr[i], "tile"))
254 { 257 {
… …
256 w = h = noScale; 259 w = h = noScale;
257 geom_flags |= WidthValue|HeightValue; 260 geom_flags |= WidthValue|HeightValue;
258 } 261 }
259 else if (!strcasecmp (arr[i], "propscale")) 262 else if (!strcasecmp (arr[i], "propscale"))
260 { 263 {
261 new_flags |= BG_PROP_SCALE; 264 new_flags |= BG_KEEP_ASPECT;
265 w = h = windowScale;
266 geom_flags |= WidthValue|HeightValue;
262 } 267 }
263 else if (!strcasecmp (arr[i], "hscale")) 268 else if (!strcasecmp (arr[i], "hscale"))
264 { 269 {
265 new_flags |= BG_TILE; 270 new_flags |= BG_TILE;
266 w = windowScale; 271 w = windowScale;
… …
296 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h); 301 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
297 } /* done parsing ops */ 302 } /* done parsing ops */
298 303
299 rxvt_free_strsplit (arr); 304 rxvt_free_strsplit (arr);
300 } 305 }
306
307 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
301 308
302 if (!update) 309 if (!update)
303 { 310 {
304 if (!(geom_flags & XValue)) 311 if (!(geom_flags & XValue))
305 x = y = defaultAlign; 312 x = y = defaultAlign;
… …
334rxvt_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)
335{ 342{
336 int target_width = szHint.width; 343 int target_width = szHint.width;
337 int target_height = szHint.height; 344 int target_height = szHint.height;
338 345
346 w = h_scale * target_width / 100;
347 h = v_scale * target_height / 100;
348
339 if (bg_flags & BG_PROP_SCALE) 349 if (bg_flags & BG_KEEP_ASPECT)
340 { 350 {
341 float scale = (float)target_width / image_width; 351 float scale = (float)w / image_width;
342 min_it (scale, (float)target_height / image_height); 352 min_it (scale, (float)h / image_height);
343 w = image_width * scale + 0.5; 353 w = image_width * scale + 0.5;
344 h = image_height * scale + 0.5; 354 h = image_height * scale + 0.5;
345 } 355 }
346 else
347 {
348 w = h_scale * target_width / 100;
349 h = v_scale * target_height / 100;
350 }
351 356
352 if (!w) w = image_width; 357 if (!w) w = image_width;
353 if (!h) h = image_height; 358 if (!h) h = image_height;
354 359
355 if (bg_flags & BG_ROOT_ALIGN) 360 if (bg_flags & BG_ROOT_ALIGN)
… …
363 y = make_align_position (v_align, target_height, h); 368 y = make_align_position (v_align, target_height, h);
364 } 369 }
365 370
366 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
367 if (!(bg_flags & BG_TILE) 372 if (!(bg_flags & BG_TILE)
368 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 373 || h_scale || v_scale
369 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
370 || w > target_width || h > target_height) 375 || w > target_width || h > target_height)
371 bg_flags |= BG_IS_SIZE_SENSITIVE; 376 bg_flags |= BG_IS_SIZE_SENSITIVE;
372} 377}
373 378
… …
387 if (tr_flags & BG_NEEDS_TINT) 392 if (tr_flags & BG_NEEDS_TINT)
388 { 393 {
389 ShadingInfo as_shade; 394 ShadingInfo as_shade;
390 as_shade.shading = shade; 395 as_shade.shading = shade;
391 396
392 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 397 rgba c;
393 if (bg_flags & BG_TINT_SET)
394 tint.get (c); 398 tint.get (c);
395 as_shade.tintColor.red = c.r; 399 as_shade.tintColor.red = c.r;
396 as_shade.tintColor.green = c.g; 400 as_shade.tintColor.green = c.g;
397 as_shade.tintColor.blue = c.b; 401 as_shade.tintColor.blue = c.b;
398 402
399 background_tint = shading2tint32 (&as_shade); 403 background_tint = shading2tint32 (&as_shade);
400 } 404 }
401 405
402 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 406 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
403 { 407 {
404 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,
405 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 409 ASA_XImage,
406 100, ASIMAGE_QUALITY_DEFAULT); 410 100, ASIMAGE_QUALITY_DEFAULT);
407 if (tmp) 411 if (tmp)
408 { 412 {
409 destroy_asimage (&background); 413 destroy_asimage (&background);
410 background = tmp; 414 background = tmp;
… …
429 433
430 if (!original_asim 434 if (!original_asim
431 || (!(bg_flags & BG_ROOT_ALIGN) 435 || (!(bg_flags & BG_ROOT_ALIGN)
432 && (x >= target_width 436 && (x >= target_width
433 || y >= target_height 437 || y >= target_height
434 || (x + w <= 0) 438 || x + w <= 0
435 || (y + h <= 0)))) 439 || y + h <= 0)))
436 { 440 {
437 if (background) 441 if (background)
438 { 442 {
439 new_pmap_width = background->width; 443 new_pmap_width = background->width;
440 new_pmap_height = background->height; 444 new_pmap_height = background->height;
… …
454 } 458 }
455 else 459 else
456 { 460 {
457 result = original_asim; 461 result = original_asim;
458 462
459 if ((w != original_asim->width) 463 if (w != original_asim->width
460 || (h != original_asim->height)) 464 || h != original_asim->height)
461 { 465 {
462 result = scale_asimage (asv, original_asim, 466 result = scale_asimage (asv, original_asim,
463 w, h, 467 w, h,
464 background ? ASA_ASImage : ASA_XImage, 468 ASA_XImage,
465 100, ASIMAGE_QUALITY_DEFAULT); 469 100, ASIMAGE_QUALITY_DEFAULT);
466 } 470 }
467 471
468 if (background == NULL) 472 if (background == NULL)
469 { 473 {
… …
719 get_image_geometry (image_width, image_height, w, h, x, y); 723 get_image_geometry (image_width, image_height, w, h, x, y);
720 724
721 if (!(bg_flags & BG_ROOT_ALIGN) 725 if (!(bg_flags & BG_ROOT_ALIGN)
722 && (x >= target_width 726 && (x >= target_width
723 || y >= target_height 727 || y >= target_height
724 || (x + w <= 0) 728 || x + w <= 0
725 || (y + h <= 0))) 729 || y + h <= 0))
726 return false; 730 return false;
727 731
728 result = pixbuf; 732 result = pixbuf;
729 733
730 if ((w != image_width) 734 if (w != image_width
731 || (h != image_height)) 735 || h != image_height)
732 { 736 {
733 result = gdk_pixbuf_scale_simple (pixbuf, 737 result = gdk_pixbuf_scale_simple (pixbuf,
734 w, h, 738 w, h,
735 GDK_INTERP_BILINEAR); 739 GDK_INTERP_BILINEAR);
736 } 740 }
… …
823 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 827 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
824 828
825 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 829 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
826 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 830 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
827 831
828 pa.repeat = True; 832 Picture mask = create_xrender_mask (dpy, vt, False, False);
829 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
830 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
831 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
832 XFreePixmap (dpy, mask_pmap);
833 833
834 XRenderColor mask_c; 834 XRenderColor mask_c;
835 835
836 mask_c.alpha = 0x8000; 836 mask_c.alpha = 0x8000;
837 mask_c.red = 0; 837 mask_c.red = 0;
… …
865rxvt_term::bg_set_file (const char *file) 865rxvt_term::bg_set_file (const char *file)
866{ 866{
867 if (!file || !*file) 867 if (!file || !*file)
868 return false; 868 return false;
869 869
870 bool ret = false;
870 if (const char *p = strchr (file, ';')) 871 const char *p = strchr (file, ';');
872
873 if (p)
871 { 874 {
872 size_t len = p - file; 875 size_t len = p - file;
873 char *f = rxvt_temp_buf<char> (len + 1); 876 char *f = rxvt_temp_buf<char> (len + 1);
874 memcpy (f, file, len); 877 memcpy (f, file, len);
875 f[len] = '\0'; 878 f[len] = '\0';
… …
884 { 887 {
885 if (original_asim) 888 if (original_asim)
886 safe_asimage_destroy (original_asim); 889 safe_asimage_destroy (original_asim);
887 original_asim = image; 890 original_asim = image;
888 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 891 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
889 return true; 892 ret = true;
890 } 893 }
891# endif 894# endif
892 895
893# ifdef HAVE_PIXBUF 896# ifdef HAVE_PIXBUF
894 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 897 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
896 { 899 {
897 if (pixbuf) 900 if (pixbuf)
898 g_object_unref (pixbuf); 901 g_object_unref (pixbuf);
899 pixbuf = image; 902 pixbuf = image;
900 bg_flags |= BG_IS_FROM_FILE; 903 bg_flags |= BG_IS_FROM_FILE;
901 return true; 904 ret = true;
902 } 905 }
903# endif 906# endif
904 907
908 if (ret)
909 {
910 if (p)
911 bg_set_geometry (p + 1);
912 else
913 bg_set_default_geometry ();
914 }
915
905 return false; 916 return ret;
906} 917}
907 918
908# endif /* BG_IMAGE_FROM_FILE */ 919# endif /* BG_IMAGE_FROM_FILE */
909 920
910# ifdef ENABLE_TRANSPARENCY 921# ifdef ENABLE_TRANSPARENCY
… …
957} 968}
958 969
959void 970void
960rxvt_term::set_tint_shade_flags () 971rxvt_term::set_tint_shade_flags ()
961{ 972{
962 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 973 rgba c;
963 bool has_shade = shade != 100; 974 bool has_shade = shade != 100;
964 975
965 bg_flags &= ~BG_TINT_FLAGS; 976 bg_flags &= ~BG_TINT_FLAGS;
966 977
967 if (bg_flags & BG_TINT_SET)
968 {
969 tint.get (c); 978 tint.get (c);
979
970 if (!has_shade 980 if (!has_shade
971 && (c.r <= 0x00ff || c.r >= 0xff00) 981 && (c.r <= 0x00ff || c.r >= 0xff00)
972 && (c.g <= 0x00ff || c.g >= 0xff00) 982 && (c.g <= 0x00ff || c.g >= 0xff00)
973 && (c.b <= 0x00ff || c.b >= 0xff00)) 983 && (c.b <= 0x00ff || c.b >= 0xff00))
974 bg_flags |= BG_TINT_BITAND; 984 bg_flags |= BG_TINT_BITAND;
975 }
976 985
977 if (has_shade || (bg_flags & BG_TINT_SET)) 986 if (has_shade
987 || c.r < 0xff00
988 || c.g < 0xff00
989 || c.b < 0xff00)
978 bg_flags |= BG_NEEDS_TINT; 990 bg_flags |= BG_NEEDS_TINT;
979} 991}
980 992
981bool 993bool
982rxvt_term::bg_set_tint (rxvt_color &new_tint) 994rxvt_term::bg_set_tint (rxvt_color &new_tint)
983{ 995{
984 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 996 if (tint != new_tint)
985 { 997 {
986 tint = new_tint; 998 tint = new_tint;
987 bg_flags |= BG_TINT_SET;
988 set_tint_shade_flags (); 999 set_tint_shade_flags ();
989 return true; 1000 return true;
990 } 1001 }
991 1002
992 return false; 1003 return false;
993} 1004}
994 1005
995bool 1006bool
996rxvt_term::bg_set_shade (const char *shade_str) 1007rxvt_term::bg_set_shade (const char *shade_str)
997{ 1008{
998 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1009 int new_shade = atoi (shade_str);
999 1010
1000 clamp_it (new_shade, -100, 200); 1011 clamp_it (new_shade, -100, 200);
1001 if (new_shade < 0) 1012 if (new_shade < 0)
1002 new_shade = 200 - (100 + new_shade); 1013 new_shade = 200 - (100 + new_shade);
1003 1014
… …
1037bool 1048bool
1038rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1049rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1039{ 1050{
1040 bool ret = false; 1051 bool ret = false;
1041#if XRENDER 1052#if XRENDER
1053 if (!(bg_flags & BG_HAS_RENDER_CONV))
1054 return false;
1055
1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1056 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1043 double *kernel = (double *)malloc (size * sizeof (double)); 1057 double *kernel = (double *)malloc (size * sizeof (double));
1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1058 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1045 1059
1046 XRenderPictureAttributes pa; 1060 XRenderPictureAttributes pa;
… …
1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1133 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1120 ret = true; 1134 ret = true;
1121 XFreeGC (dpy, gc); 1135 XFreeGC (dpy, gc);
1122 } 1136 }
1123 } 1137 }
1124 else
1125 {
1126# if XRENDER 1138# if XRENDER
1127 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1139 else if (bg_flags & BG_HAS_RENDER)
1140 {
1141 rgba c;
1128 1142
1129 if (bg_flags & BG_TINT_SET)
1130 tint.get (c); 1143 tint.get (c);
1131 1144
1132 if (shade <= 100) 1145 if (shade <= 100)
1133 { 1146 {
1134 c.r = c.r * shade / 100; 1147 c.r = c.r * shade / 100;
1135 c.g = c.g * shade / 100; 1148 c.g = c.g * shade / 100;
… …
1140 c.r = c.r * (200 - shade) / 100; 1153 c.r = c.r * (200 - shade) / 100;
1141 c.g = c.g * (200 - shade) / 100; 1154 c.g = c.g * (200 - shade) / 100;
1142 c.b = c.b * (200 - shade) / 100; 1155 c.b = c.b * (200 - shade) / 100;
1143 } 1156 }
1144 1157
1145 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1146 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1158 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1147 XRenderPictureAttributes pa; 1159 XRenderPictureAttributes pa;
1148 1160
1149 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1161 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1150 1162
1151 pa.repeat = True; 1163 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1152 1164
1153 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1165 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1154 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1155 XFreePixmap (dpy, overlay_pmap);
1156
1157 pa.component_alpha = True;
1158 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1159 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1160 XFreePixmap (dpy, mask_pmap);
1161 1166
1162 XRenderColor mask_c; 1167 XRenderColor mask_c;
1163 1168
1164 mask_c.alpha = 0xffff; 1169 mask_c.alpha = 0xffff;
1165 mask_c.red = 1170 mask_c.red =
… …
1186 ret = true; 1191 ret = true;
1187 1192
1188 XRenderFreePicture (dpy, mask_pic); 1193 XRenderFreePicture (dpy, mask_pic);
1189 XRenderFreePicture (dpy, overlay_pic); 1194 XRenderFreePicture (dpy, overlay_pic);
1190 XRenderFreePicture (dpy, back_pic); 1195 XRenderFreePicture (dpy, back_pic);
1196 }
1191# endif 1197# endif
1192 }
1193 1198
1194 return ret; 1199 return ret;
1195} 1200}
1196 1201
1197/* 1202/*
… …
1281 bg_pmap_width = window_width; 1286 bg_pmap_width = window_width;
1282 bg_pmap_height = window_height; 1287 bg_pmap_height = window_height;
1283 } 1288 }
1284 1289
1285 /* straightforward pixmap copy */ 1290 /* straightforward pixmap copy */
1286 while (sx < 0) sx += root_width; 1291 while (sx < 0) sx += root_pmap_width;
1287 while (sy < 0) sy += root_height; 1292 while (sy < 0) sy += root_pmap_height;
1288 1293
1289 gcv.tile = recoded_root_pmap; 1294 gcv.tile = recoded_root_pmap;
1290 gcv.fill_style = FillTiled; 1295 gcv.fill_style = FillTiled;
1291 gcv.ts_x_origin = -sx; 1296 gcv.ts_x_origin = -sx;
1292 gcv.ts_y_origin = -sy; 1297 gcv.ts_y_origin = -sy;
… …
1294 1299
1295 if (gc) 1300 if (gc)
1296 { 1301 {
1297 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1302 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1298 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1303 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1299 XFreeGC (dpy, gc);
1300 1304
1301 if (!(bg_flags & BG_CLIENT_RENDER)) 1305 if (!(bg_flags & BG_CLIENT_RENDER))
1302 { 1306 {
1303 if ((bg_flags & BG_NEEDS_BLUR) 1307 if (bg_flags & BG_NEEDS_BLUR)
1304 && (bg_flags & BG_HAS_RENDER_CONV))
1305 { 1308 {
1306 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1309 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1307 result &= ~BG_NEEDS_BLUR; 1310 result &= ~BG_NEEDS_BLUR;
1308 } 1311 }
1309 if ((bg_flags & BG_NEEDS_TINT) 1312 if (bg_flags & BG_NEEDS_TINT)
1310 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1311 { 1313 {
1312 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1314 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1313 result &= ~BG_NEEDS_TINT; 1315 result &= ~BG_NEEDS_TINT;
1314 } 1316 }
1317# ifndef HAVE_AFTERIMAGE
1318 if (result & BG_NEEDS_TINT)
1319 {
1320 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1321 if (ximage)
1322 {
1323 /* our own client-side tinting */
1324 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1325
1326 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1327 XDestroyImage (ximage);
1328 }
1329 }
1330# endif
1315 } /* server side rendering completed */ 1331 } /* server side rendering completed */
1332
1333 XFreeGC (dpy, gc);
1316 } 1334 }
1317 1335
1318 if (recoded_root_pmap != root_pixmap) 1336 if (recoded_root_pmap != root_pixmap)
1319 XFreePixmap (dpy, recoded_root_pmap); 1337 XFreePixmap (dpy, recoded_root_pmap);
1320 1338
… …
1329 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1347 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1330 1348
1331 root_pixmap = new_root_pixmap; 1349 root_pixmap = new_root_pixmap;
1332} 1350}
1333# endif /* ENABLE_TRANSPARENCY */ 1351# endif /* ENABLE_TRANSPARENCY */
1334
1335#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1336static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1337# endif
1338 1352
1339bool 1353bool
1340rxvt_term::bg_render () 1354rxvt_term::bg_render ()
1341{ 1355{
1342 unsigned long tr_flags = 0; 1356 unsigned long tr_flags = 0;
… …
1347 { 1361 {
1348 /* we need to re-generate transparency pixmap in that case ! */ 1362 /* we need to re-generate transparency pixmap in that case ! */
1349 tr_flags = make_transparency_pixmap (); 1363 tr_flags = make_transparency_pixmap ();
1350 if (tr_flags == 0) 1364 if (tr_flags == 0)
1351 return false; 1365 return false;
1352 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1353 bg_flags |= BG_IS_VALID; 1366 bg_flags |= BG_IS_VALID;
1354 } 1367 }
1355# endif 1368# endif
1356 1369
1357# ifdef BG_IMAGE_FROM_FILE 1370# ifdef BG_IMAGE_FROM_FILE
1358 if ((bg_flags & BG_IS_FROM_FILE) 1371 if ((bg_flags & BG_IS_FROM_FILE)
… …
1361 if (render_image (tr_flags)) 1374 if (render_image (tr_flags))
1362 bg_flags |= BG_IS_VALID; 1375 bg_flags |= BG_IS_VALID;
1363 } 1376 }
1364# endif 1377# endif
1365 1378
1366# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1367 XImage *result = NULL;
1368
1369 if (tr_flags && !(bg_flags & BG_IS_VALID))
1370 {
1371 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1372 }
1373
1374 if (result)
1375 {
1376 /* our own client-side tinting */
1377 if (tr_flags & BG_NEEDS_TINT)
1378 {
1379 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1380 if (bg_flags & BG_TINT_SET)
1381 tint.get (c);
1382 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1383 }
1384
1385 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1386
1387 if (gc)
1388 {
1389 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1390
1391 XFreeGC (dpy, gc);
1392 bg_flags |= BG_IS_VALID;
1393 }
1394
1395 XDestroyImage (result);
1396 }
1397# endif
1398
1399 if (!(bg_flags & BG_IS_VALID)) 1379 if (!(bg_flags & BG_IS_VALID))
1400 { 1380 {
1401 if (bg_pixmap != None) 1381 if (bg_pixmap != None)
1402 { 1382 {
1403 XFreePixmap (dpy, bg_pixmap); 1383 XFreePixmap (dpy, bg_pixmap);
… …
1415 1395
1416void 1396void
1417rxvt_term::bg_init () 1397rxvt_term::bg_init ()
1418{ 1398{
1419#ifdef ENABLE_TRANSPARENCY 1399#ifdef ENABLE_TRANSPARENCY
1400 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1401 tint.set (this, c);
1420 shade = 100; 1402 shade = 100;
1421#endif 1403#endif
1422 1404
1423 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1405 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1424#if XRENDER 1406#if XRENDER
… …
1438} 1420}
1439 1421
1440#endif /* HAVE_BG_PIXMAP */ 1422#endif /* HAVE_BG_PIXMAP */
1441 1423
1442#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1424#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1443/* taken from aterm-0.4.2 */ 1425/* based on code from aterm-0.4.2 */
1444 1426
1445static void 1427static inline void
1446shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1428fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1429{
1430 for (int i = 0; i <= mask >> sh; i++)
1431 {
1432 uint32_t tmp;
1433 tmp = i * high;
1434 tmp += (mask >> sh) * low;
1435 lookup[i] = (tmp / 0xffff) << sh;
1436 }
1437}
1438
1439void
1440rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1447{ 1441{
1448 int sh_r, sh_g, sh_b; 1442 int sh_r, sh_g, sh_b;
1449 uint32_t mask_r, mask_g, mask_b; 1443 uint32_t mask_r, mask_g, mask_b;
1450 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1444 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1451 rgba low; 1445 unsigned short low;
1452 rgba high;
1453 int i;
1454 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1446 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1455 1447
1456 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1448 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1457 1449
1458 /* for convenience */ 1450 /* for convenience */
… …
1517 break; 1509 break;
1518 default: 1510 default:
1519 return; /* we do not support this color depth */ 1511 return; /* we do not support this color depth */
1520 } 1512 }
1521 1513
1514 rgba c;
1515
1516 tint.get (c);
1517
1522 /* prepare limits for color transformation (each channel is handled separately) */ 1518 /* prepare limits for color transformation (each channel is handled separately) */
1523 if (shade > 100) 1519 if (shade > 100)
1524 { 1520 {
1525 shade = 200 - shade;
1526
1527 high.r = c.r * shade / 100;
1528 high.g = c.g * shade / 100;
1529 high.b = c.b * shade / 100;
1530
1531 low.r = 65535 * (100 - shade) / 100; 1521 c.r = c.r * (200 - shade) / 100;
1532 low.g = 65535 * (100 - shade) / 100; 1522 c.g = c.g * (200 - shade) / 100;
1533 low.b = 65535 * (100 - shade) / 100; 1523 c.b = c.b * (200 - shade) / 100;
1524
1525 low = 0xffff * (shade - 100) / 100;
1534 } 1526 }
1535 else 1527 else
1536 { 1528 {
1537 high.r = c.r * shade / 100; 1529 c.r = c.r * shade / 100;
1538 high.g = c.g * shade / 100; 1530 c.g = c.g * shade / 100;
1539 high.b = c.b * shade / 100; 1531 c.b = c.b * shade / 100;
1540 1532
1541 low.r = low.g = low.b = 0; 1533 low = 0;
1542 } 1534 }
1543 1535
1544 /* fill our lookup tables */ 1536 /* fill our lookup tables */
1545 for (i = 0; i <= mask_r>>sh_r; i++) 1537 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1546 { 1538 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1547 uint32_t tmp; 1539 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1548 tmp = i * high.r;
1549 tmp += (mask_r>>sh_r) * low.r;
1550 lookup_r[i] = (tmp/65535)<<sh_r;
1551 }
1552 for (i = 0; i <= mask_g>>sh_g; i++)
1553 {
1554 uint32_t tmp;
1555 tmp = i * high.g;
1556 tmp += (mask_g>>sh_g) * low.g;
1557 lookup_g[i] = (tmp/65535)<<sh_g;
1558 }
1559 for (i = 0; i <= mask_b>>sh_b; i++)
1560 {
1561 uint32_t tmp;
1562 tmp = i * high.b;
1563 tmp += (mask_b>>sh_b) * low.b;
1564 lookup_b[i] = (tmp/65535)<<sh_b;
1565 }
1566 1540
1567 /* apply table to input image (replacing colors by newly calculated ones) */ 1541 /* apply table to input image (replacing colors by newly calculated ones) */
1568 if (ximage->bits_per_pixel == 32 1542 if (ximage->bits_per_pixel == 32
1569 && (ximage->depth == 24 || ximage->depth == 32) 1543 && (ximage->depth == 24 || ximage->depth == 32)
1570 && ximage->byte_order == host_byte_order) 1544 && ximage->byte_order == host_byte_order)

Diff Legend

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