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.161 by sf-exg, Thu Aug 11 08:39:10 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 */
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 int n; 204 unsigned long new_flags = 0;
203 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
204 const char *ops;
205 205
206 if (geom == NULL) 206 if (geom == NULL)
207 return false; 207 return false;
208 208
209 char str[256]; 209 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 { 210 {
226 /* 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
227 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 301 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
228 } /* done parsing geometry string */ 302 } /* done parsing ops */
303
304 rxvt_free_strsplit (arr);
305 }
306
307 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
229 308
230 if (!update) 309 if (!update)
231 { 310 {
232 if (!(geom_flags & XValue)) 311 if (!(geom_flags & XValue))
233 x = y = defaultAlign; 312 x = y = defaultAlign;
… …
242 w = h; 321 w = h;
243 322
244 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
245 } 324 }
246 325
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], "hscale"))
304 {
305 w = windowScale;
306 h = noScale;
307 geom_flags |= WidthValue|HeightValue;
308 }
309 else if (!strcasecmp (arr[i], "vscale"))
310 {
311 h = windowScale;
312 w = noScale;
313 geom_flags |= WidthValue|HeightValue;
314 }
315 else if (!strcasecmp (arr[i], "scale"))
316 {
317 w = h = windowScale;
318 geom_flags |= WidthValue|HeightValue;
319 }
320 else if (!strcasecmp (arr[i], "auto"))
321 {
322 w = h = windowScale;
323 x = y = centerAlign;
324 geom_flags |= WidthValue|HeightValue|XValue|YValue;
325 }
326 else if (!strcasecmp (arr[i], "root"))
327 {
328 new_flags |= BG_TILE|BG_ROOT_ALIGN;
329 w = h = noScale;
330 geom_flags |= WidthValue|HeightValue;
331 }
332 } /* done parsing ops */
333
334 rxvt_free_strsplit (arr);
335 }
336
337 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;
338 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;
339 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;
340 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;
341 330
… …
352rxvt_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)
353{ 342{
354 int target_width = szHint.width; 343 int target_width = szHint.width;
355 int target_height = szHint.height; 344 int target_height = szHint.height;
356 345
346 w = h_scale * target_width / 100;
347 h = v_scale * target_height / 100;
348
357 if (bg_flags & BG_PROP_SCALE) 349 if (bg_flags & BG_KEEP_ASPECT)
358 { 350 {
359 float scale = (float)target_width / image_width; 351 float scale = (float)w / image_width;
360 min_it (scale, (float)target_height / image_height); 352 min_it (scale, (float)h / image_height);
361 w = image_width * scale + 0.5; 353 w = image_width * scale + 0.5;
362 h = image_height * scale + 0.5; 354 h = image_height * scale + 0.5;
363 } 355 }
364 else
365 {
366 w = h_scale * target_width / 100;
367 h = v_scale * target_height / 100;
368 }
369 356
370 if (!w) w = image_width; 357 if (!w) w = image_width;
371 if (!h) h = image_height; 358 if (!h) h = image_height;
372 359
373 if (bg_flags & BG_ROOT_ALIGN) 360 if (bg_flags & BG_ROOT_ALIGN)
… …
381 y = make_align_position (v_align, target_height, h); 368 y = make_align_position (v_align, target_height, h);
382 } 369 }
383 370
384 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
385 if (!(bg_flags & BG_TILE) 372 if (!(bg_flags & BG_TILE)
386 || (bg_flags & BG_PROP_SCALE) || h_scale || v_scale 373 || h_scale || v_scale
387 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
388 || w > target_width || h > target_height) 375 || w > target_width || h > target_height)
389 bg_flags |= BG_IS_SIZE_SENSITIVE; 376 bg_flags |= BG_IS_SIZE_SENSITIVE;
390} 377}
391 378
… …
405 if (tr_flags & BG_NEEDS_TINT) 392 if (tr_flags & BG_NEEDS_TINT)
406 { 393 {
407 ShadingInfo as_shade; 394 ShadingInfo as_shade;
408 as_shade.shading = shade; 395 as_shade.shading = shade;
409 396
410 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 397 rgba c;
411 if (bg_flags & BG_TINT_SET)
412 tint.get (c); 398 tint.get (c);
413 as_shade.tintColor.red = c.r; 399 as_shade.tintColor.red = c.r;
414 as_shade.tintColor.green = c.g; 400 as_shade.tintColor.green = c.g;
415 as_shade.tintColor.blue = c.b; 401 as_shade.tintColor.blue = c.b;
416 402
417 background_tint = shading2tint32 (&as_shade); 403 background_tint = shading2tint32 (&as_shade);
418 } 404 }
419 405
420 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 406 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
421 { 407 {
422 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,
423 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 409 ASA_XImage,
424 100, ASIMAGE_QUALITY_DEFAULT); 410 100, ASIMAGE_QUALITY_DEFAULT);
425 if (tmp) 411 if (tmp)
426 { 412 {
427 destroy_asimage (&background); 413 destroy_asimage (&background);
428 background = tmp; 414 background = tmp;
… …
447 433
448 if (!original_asim 434 if (!original_asim
449 || (!(bg_flags & BG_ROOT_ALIGN) 435 || (!(bg_flags & BG_ROOT_ALIGN)
450 && (x >= target_width 436 && (x >= target_width
451 || y >= target_height 437 || y >= target_height
452 || (x + w <= 0) 438 || x + w <= 0
453 || (y + h <= 0)))) 439 || y + h <= 0)))
454 { 440 {
455 if (background) 441 if (background)
456 { 442 {
457 new_pmap_width = background->width; 443 new_pmap_width = background->width;
458 new_pmap_height = background->height; 444 new_pmap_height = background->height;
… …
472 } 458 }
473 else 459 else
474 { 460 {
475 result = original_asim; 461 result = original_asim;
476 462
477 if ((w != original_asim->width) 463 if (w != original_asim->width
478 || (h != original_asim->height)) 464 || h != original_asim->height)
479 { 465 {
480 result = scale_asimage (asv, original_asim, 466 result = scale_asimage (asv, original_asim,
481 w, h, 467 w, h,
482 background ? ASA_ASImage : ASA_XImage, 468 ASA_XImage,
483 100, ASIMAGE_QUALITY_DEFAULT); 469 100, ASIMAGE_QUALITY_DEFAULT);
484 } 470 }
485 471
486 if (background == NULL) 472 if (background == NULL)
487 { 473 {
… …
737 get_image_geometry (image_width, image_height, w, h, x, y); 723 get_image_geometry (image_width, image_height, w, h, x, y);
738 724
739 if (!(bg_flags & BG_ROOT_ALIGN) 725 if (!(bg_flags & BG_ROOT_ALIGN)
740 && (x >= target_width 726 && (x >= target_width
741 || y >= target_height 727 || y >= target_height
742 || (x + w <= 0) 728 || x + w <= 0
743 || (y + h <= 0))) 729 || y + h <= 0))
744 return false; 730 return false;
745 731
746 result = pixbuf; 732 result = pixbuf;
747 733
748 if ((w != image_width) 734 if (w != image_width
749 || (h != image_height)) 735 || h != image_height)
750 { 736 {
751 result = gdk_pixbuf_scale_simple (pixbuf, 737 result = gdk_pixbuf_scale_simple (pixbuf,
752 w, h, 738 w, h,
753 GDK_INTERP_BILINEAR); 739 GDK_INTERP_BILINEAR);
754 } 740 }
… …
834 820
835#if XRENDER 821#if XRENDER
836 if (tr_flags) 822 if (tr_flags)
837 { 823 {
838 XRenderPictureAttributes pa; 824 XRenderPictureAttributes pa;
839
840 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 825 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
826
841 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 827 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, &pa);
842 828
843 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
844 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 829 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, &pa);
845 830
846 pa.repeat = True; 831 Picture mask = create_xrender_mask (dpy, vt, False, False);
847 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
848 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
849 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
850 XFreePixmap (dpy, mask_pmap);
851 832
852 XRenderColor mask_c; 833 XRenderColor mask_c;
853 834
854 mask_c.alpha = 0x8000; 835 mask_c.alpha = 0x8000;
855 mask_c.red = 0; 836 mask_c.red = 0;
… …
883rxvt_term::bg_set_file (const char *file) 864rxvt_term::bg_set_file (const char *file)
884{ 865{
885 if (!file || !*file) 866 if (!file || !*file)
886 return false; 867 return false;
887 868
869 bool ret = false;
888 if (const char *p = strchr (file, ';')) 870 const char *p = strchr (file, ';');
871
872 if (p)
889 { 873 {
890 size_t len = p - file; 874 size_t len = p - file;
891 char *f = rxvt_temp_buf<char> (len + 1); 875 char *f = rxvt_temp_buf<char> (len + 1);
892 memcpy (f, file, len); 876 memcpy (f, file, len);
893 f[len] = '\0'; 877 f[len] = '\0';
… …
902 { 886 {
903 if (original_asim) 887 if (original_asim)
904 safe_asimage_destroy (original_asim); 888 safe_asimage_destroy (original_asim);
905 original_asim = image; 889 original_asim = image;
906 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 890 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
907 return true; 891 ret = true;
908 } 892 }
909# endif 893# endif
910 894
911# ifdef HAVE_PIXBUF 895# ifdef HAVE_PIXBUF
912 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 896 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
914 { 898 {
915 if (pixbuf) 899 if (pixbuf)
916 g_object_unref (pixbuf); 900 g_object_unref (pixbuf);
917 pixbuf = image; 901 pixbuf = image;
918 bg_flags |= BG_IS_FROM_FILE; 902 bg_flags |= BG_IS_FROM_FILE;
919 return true; 903 ret = true;
920 } 904 }
921# endif 905# endif
922 906
907 if (ret)
908 {
909 if (p)
910 bg_set_geometry (p + 1);
911 else
912 bg_set_default_geometry ();
913 }
914
923 return false; 915 return ret;
924} 916}
925 917
926# endif /* BG_IMAGE_FROM_FILE */ 918# endif /* BG_IMAGE_FROM_FILE */
927 919
928# ifdef ENABLE_TRANSPARENCY 920# ifdef ENABLE_TRANSPARENCY
… …
975} 967}
976 968
977void 969void
978rxvt_term::set_tint_shade_flags () 970rxvt_term::set_tint_shade_flags ()
979{ 971{
980 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 972 rgba c;
981 bool has_shade = shade != 100; 973 bool has_shade = shade != 100;
982 974
983 bg_flags &= ~BG_TINT_FLAGS; 975 bg_flags &= ~BG_TINT_FLAGS;
984 976
985 if (bg_flags & BG_TINT_SET)
986 {
987 tint.get (c); 977 tint.get (c);
978
988 if (!has_shade 979 if (!has_shade
989 && (c.r <= 0x00ff || c.r >= 0xff00) 980 && (c.r <= 0x00ff || c.r >= 0xff00)
990 && (c.g <= 0x00ff || c.g >= 0xff00) 981 && (c.g <= 0x00ff || c.g >= 0xff00)
991 && (c.b <= 0x00ff || c.b >= 0xff00)) 982 && (c.b <= 0x00ff || c.b >= 0xff00))
992 bg_flags |= BG_TINT_BITAND; 983 bg_flags |= BG_TINT_BITAND;
993 }
994 984
995 if (has_shade || (bg_flags & BG_TINT_SET)) 985 if (has_shade
986 || c.r < 0xff00
987 || c.g < 0xff00
988 || c.b < 0xff00)
996 bg_flags |= BG_NEEDS_TINT; 989 bg_flags |= BG_NEEDS_TINT;
997} 990}
998 991
999bool 992bool
1000rxvt_term::bg_set_tint (rxvt_color &new_tint) 993rxvt_term::bg_set_tint (rxvt_color &new_tint)
1001{ 994{
1002 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 995 if (tint != new_tint)
1003 { 996 {
1004 tint = new_tint; 997 tint = new_tint;
1005 bg_flags |= BG_TINT_SET;
1006 set_tint_shade_flags (); 998 set_tint_shade_flags ();
1007 return true; 999 return true;
1008 } 1000 }
1009 1001
1010 return false; 1002 return false;
1011} 1003}
1012 1004
1013bool 1005bool
1014rxvt_term::bg_set_shade (const char *shade_str) 1006rxvt_term::bg_set_shade (const char *shade_str)
1015{ 1007{
1016 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1008 int new_shade = atoi (shade_str);
1017 1009
1018 clamp_it (new_shade, -100, 200); 1010 clamp_it (new_shade, -100, 200);
1019 if (new_shade < 0) 1011 if (new_shade < 0)
1020 new_shade = 200 - (100 + new_shade); 1012 new_shade = 200 - (100 + new_shade);
1021 1013
… …
1055bool 1047bool
1056rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1048rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1057{ 1049{
1058 bool ret = false; 1050 bool ret = false;
1059#if XRENDER 1051#if XRENDER
1052 if (!(bg_flags & BG_HAS_RENDER_CONV))
1053 return false;
1054
1060 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1055 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1061 double *kernel = (double *)malloc (size * sizeof (double)); 1056 double *kernel = (double *)malloc (size * sizeof (double));
1062 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1057 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1063 1058
1064 XRenderPictureAttributes pa; 1059 XRenderPictureAttributes pa;
… …
1137 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1132 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1138 ret = true; 1133 ret = true;
1139 XFreeGC (dpy, gc); 1134 XFreeGC (dpy, gc);
1140 } 1135 }
1141 } 1136 }
1142 else
1143 {
1144# if XRENDER 1137# if XRENDER
1145 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1138 else if (bg_flags & BG_HAS_RENDER)
1139 {
1140 rgba c;
1146 1141
1147 if (bg_flags & BG_TINT_SET)
1148 tint.get (c); 1142 tint.get (c);
1149 1143
1150 if (shade <= 100) 1144 if (shade <= 100)
1151 { 1145 {
1152 c.r = c.r * shade / 100; 1146 c.r = c.r * shade / 100;
1153 c.g = c.g * shade / 100; 1147 c.g = c.g * shade / 100;
… …
1158 c.r = c.r * (200 - shade) / 100; 1152 c.r = c.r * (200 - shade) / 100;
1159 c.g = c.g * (200 - shade) / 100; 1153 c.g = c.g * (200 - shade) / 100;
1160 c.b = c.b * (200 - shade) / 100; 1154 c.b = c.b * (200 - shade) / 100;
1161 } 1155 }
1162 1156
1163 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1164 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1157 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1165 XRenderPictureAttributes pa; 1158 XRenderPictureAttributes pa;
1166 1159
1167 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1160 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1168 1161
1169 pa.repeat = True; 1162 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1170 1163
1171 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1164 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1172 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1173 XFreePixmap (dpy, overlay_pmap);
1174
1175 pa.component_alpha = True;
1176 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1177 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1178 XFreePixmap (dpy, mask_pmap);
1179 1165
1180 XRenderColor mask_c; 1166 XRenderColor mask_c;
1181 1167
1182 mask_c.alpha = 0xffff; 1168 mask_c.alpha = 0xffff;
1183 mask_c.red = 1169 mask_c.red =
… …
1204 ret = true; 1190 ret = true;
1205 1191
1206 XRenderFreePicture (dpy, mask_pic); 1192 XRenderFreePicture (dpy, mask_pic);
1207 XRenderFreePicture (dpy, overlay_pic); 1193 XRenderFreePicture (dpy, overlay_pic);
1208 XRenderFreePicture (dpy, back_pic); 1194 XRenderFreePicture (dpy, back_pic);
1195 }
1209# endif 1196# endif
1210 }
1211 1197
1212 return ret; 1198 return ret;
1213} 1199}
1214 1200
1215/* 1201/*
… …
1299 bg_pmap_width = window_width; 1285 bg_pmap_width = window_width;
1300 bg_pmap_height = window_height; 1286 bg_pmap_height = window_height;
1301 } 1287 }
1302 1288
1303 /* straightforward pixmap copy */ 1289 /* straightforward pixmap copy */
1304 while (sx < 0) sx += root_width; 1290 while (sx < 0) sx += root_pmap_width;
1305 while (sy < 0) sy += root_height; 1291 while (sy < 0) sy += root_pmap_height;
1306 1292
1307 gcv.tile = recoded_root_pmap; 1293 gcv.tile = recoded_root_pmap;
1308 gcv.fill_style = FillTiled; 1294 gcv.fill_style = FillTiled;
1309 gcv.ts_x_origin = -sx; 1295 gcv.ts_x_origin = -sx;
1310 gcv.ts_y_origin = -sy; 1296 gcv.ts_y_origin = -sy;
… …
1312 1298
1313 if (gc) 1299 if (gc)
1314 { 1300 {
1315 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1301 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1316 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1302 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1317 XFreeGC (dpy, gc);
1318 1303
1319 if (!(bg_flags & BG_CLIENT_RENDER)) 1304 if (!(bg_flags & BG_CLIENT_RENDER))
1320 { 1305 {
1321 if ((bg_flags & BG_NEEDS_BLUR) 1306 if (bg_flags & BG_NEEDS_BLUR)
1322 && (bg_flags & BG_HAS_RENDER_CONV))
1323 { 1307 {
1324 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1308 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1325 result &= ~BG_NEEDS_BLUR; 1309 result &= ~BG_NEEDS_BLUR;
1326 } 1310 }
1327 if ((bg_flags & BG_NEEDS_TINT) 1311 if (bg_flags & BG_NEEDS_TINT)
1328 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1329 { 1312 {
1330 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1313 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1331 result &= ~BG_NEEDS_TINT; 1314 result &= ~BG_NEEDS_TINT;
1332 } 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
1333 } /* server side rendering completed */ 1330 } /* server side rendering completed */
1331
1332 XFreeGC (dpy, gc);
1334 } 1333 }
1335 1334
1336 if (recoded_root_pmap != root_pixmap) 1335 if (recoded_root_pmap != root_pixmap)
1337 XFreePixmap (dpy, recoded_root_pmap); 1336 XFreePixmap (dpy, recoded_root_pmap);
1338 1337
… …
1347 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1346 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1348 1347
1349 root_pixmap = new_root_pixmap; 1348 root_pixmap = new_root_pixmap;
1350} 1349}
1351# endif /* ENABLE_TRANSPARENCY */ 1350# endif /* ENABLE_TRANSPARENCY */
1352
1353#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1354static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1355# endif
1356 1351
1357bool 1352bool
1358rxvt_term::bg_render () 1353rxvt_term::bg_render ()
1359{ 1354{
1360 unsigned long tr_flags = 0; 1355 unsigned long tr_flags = 0;
… …
1365 { 1360 {
1366 /* we need to re-generate transparency pixmap in that case ! */ 1361 /* we need to re-generate transparency pixmap in that case ! */
1367 tr_flags = make_transparency_pixmap (); 1362 tr_flags = make_transparency_pixmap ();
1368 if (tr_flags == 0) 1363 if (tr_flags == 0)
1369 return false; 1364 return false;
1370 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1371 bg_flags |= BG_IS_VALID; 1365 bg_flags |= BG_IS_VALID;
1372 } 1366 }
1373# endif 1367# endif
1374 1368
1375# ifdef BG_IMAGE_FROM_FILE 1369# ifdef BG_IMAGE_FROM_FILE
1376 if ((bg_flags & BG_IS_FROM_FILE) 1370 if ((bg_flags & BG_IS_FROM_FILE)
… …
1379 if (render_image (tr_flags)) 1373 if (render_image (tr_flags))
1380 bg_flags |= BG_IS_VALID; 1374 bg_flags |= BG_IS_VALID;
1381 } 1375 }
1382# endif 1376# endif
1383 1377
1384# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1385 XImage *result = NULL;
1386
1387 if (tr_flags && !(bg_flags & BG_IS_VALID))
1388 {
1389 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1390 }
1391
1392 if (result)
1393 {
1394 /* our own client-side tinting */
1395 if (tr_flags & BG_NEEDS_TINT)
1396 {
1397 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1398 if (bg_flags & BG_TINT_SET)
1399 tint.get (c);
1400 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1401 }
1402
1403 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1404
1405 if (gc)
1406 {
1407 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1408
1409 XFreeGC (dpy, gc);
1410 bg_flags |= BG_IS_VALID;
1411 }
1412
1413 XDestroyImage (result);
1414 }
1415# endif
1416
1417 if (!(bg_flags & BG_IS_VALID)) 1378 if (!(bg_flags & BG_IS_VALID))
1418 { 1379 {
1419 if (bg_pixmap != None) 1380 if (bg_pixmap != None)
1420 { 1381 {
1421 XFreePixmap (dpy, bg_pixmap); 1382 XFreePixmap (dpy, bg_pixmap);
… …
1433 1394
1434void 1395void
1435rxvt_term::bg_init () 1396rxvt_term::bg_init ()
1436{ 1397{
1437#ifdef ENABLE_TRANSPARENCY 1398#ifdef ENABLE_TRANSPARENCY
1399 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1400 tint.set (this, c);
1438 shade = 100; 1401 shade = 100;
1439#endif 1402#endif
1440 1403
1441 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1404 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1442#if XRENDER 1405#if XRENDER
… …
1456} 1419}
1457 1420
1458#endif /* HAVE_BG_PIXMAP */ 1421#endif /* HAVE_BG_PIXMAP */
1459 1422
1460#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1423#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1461/* taken from aterm-0.4.2 */ 1424/* based on code from aterm-0.4.2 */
1462 1425
1463static void 1426static inline void
1464shade_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)
1465{ 1440{
1466 int sh_r, sh_g, sh_b; 1441 int sh_r, sh_g, sh_b;
1467 uint32_t mask_r, mask_g, mask_b; 1442 uint32_t mask_r, mask_g, mask_b;
1468 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1443 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1469 rgba low; 1444 unsigned short low;
1470 rgba high;
1471 int i;
1472 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1445 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1473 1446
1474 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1447 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1475 1448
1476 /* for convenience */ 1449 /* for convenience */
… …
1535 break; 1508 break;
1536 default: 1509 default:
1537 return; /* we do not support this color depth */ 1510 return; /* we do not support this color depth */
1538 } 1511 }
1539 1512
1513 rgba c;
1514
1515 tint.get (c);
1516
1540 /* prepare limits for color transformation (each channel is handled separately) */ 1517 /* prepare limits for color transformation (each channel is handled separately) */
1541 if (shade > 100) 1518 if (shade > 100)
1542 { 1519 {
1543 shade = 200 - shade;
1544
1545 high.r = c.r * shade / 100;
1546 high.g = c.g * shade / 100;
1547 high.b = c.b * shade / 100;
1548
1549 low.r = 65535 * (100 - shade) / 100; 1520 c.r = c.r * (200 - shade) / 100;
1550 low.g = 65535 * (100 - shade) / 100; 1521 c.g = c.g * (200 - shade) / 100;
1551 low.b = 65535 * (100 - shade) / 100; 1522 c.b = c.b * (200 - shade) / 100;
1523
1524 low = 0xffff * (shade - 100) / 100;
1552 } 1525 }
1553 else 1526 else
1554 { 1527 {
1555 high.r = c.r * shade / 100; 1528 c.r = c.r * shade / 100;
1556 high.g = c.g * shade / 100; 1529 c.g = c.g * shade / 100;
1557 high.b = c.b * shade / 100; 1530 c.b = c.b * shade / 100;
1558 1531
1559 low.r = low.g = low.b = 0; 1532 low = 0;
1560 } 1533 }
1561 1534
1562 /* fill our lookup tables */ 1535 /* fill our lookup tables */
1563 for (i = 0; i <= mask_r>>sh_r; i++) 1536 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1564 { 1537 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1565 uint32_t tmp; 1538 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1566 tmp = i * high.r;
1567 tmp += (mask_r>>sh_r) * low.r;
1568 lookup_r[i] = (tmp/65535)<<sh_r;
1569 }
1570 for (i = 0; i <= mask_g>>sh_g; i++)
1571 {
1572 uint32_t tmp;
1573 tmp = i * high.g;
1574 tmp += (mask_g>>sh_g) * low.g;
1575 lookup_g[i] = (tmp/65535)<<sh_g;
1576 }
1577 for (i = 0; i <= mask_b>>sh_b; i++)
1578 {
1579 uint32_t tmp;
1580 tmp = i * high.b;
1581 tmp += (mask_b>>sh_b) * low.b;
1582 lookup_b[i] = (tmp/65535)<<sh_b;
1583 }
1584 1539
1585 /* apply table to input image (replacing colors by newly calculated ones) */ 1540 /* apply table to input image (replacing colors by newly calculated ones) */
1586 if (ximage->bits_per_pixel == 32 1541 if (ximage->bits_per_pixel == 32
1587 && (ximage->depth == 24 || ximage->depth == 32) 1542 && (ximage->depth == 24 || ximage->depth == 32)
1588 && ximage->byte_order == host_byte_order) 1543 && ximage->byte_order == host_byte_order)

Diff Legend

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