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.153 by sf-exg, Sun May 8 21:07:43 2011 UTC vs.
Revision 1.197 by sf-exg, Wed Jan 11 13:22:01 2012 UTC

32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/* 37#ifndef RepeatPad
38 * Pixmap geometry string interpretation : 38#define RepeatPad True
39 * Each geometry string contains zero or one scale/position 39#endif
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 * tile Tile image. Scaling/position modifiers above will affect
52 * the tile size and origin.
53 * propscale When scaling, scale proportionally. That is, maintain the
54 * proper aspect ratio for the image. Any portion of the
55 * background not covered by the image is filled with the
56 * current background color.
57 * hscale Scale horizontally, tile vertically ?
58 * vscale Tile horizontally, scale vertically ?
59 * scale Scale both up and down
60 * auto Same as 100x100+50+50
61 */
62 40
63#ifdef HAVE_BG_PIXMAP 41#ifdef HAVE_BG_PIXMAP
42# if XRENDER
43static Picture
44create_xrender_mask (Display *dpy, Drawable drawable, Bool argb, Bool component_alpha)
45{
46 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8);
47
48 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8);
49 XRenderPictureAttributes pa;
50 pa.repeat = True;
51 pa.component_alpha = component_alpha;
52 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
53
54 XFreePixmap (dpy, pixmap);
55
56 return mask;
57}
58# endif
59
64void 60void
65rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
66{ 62{
67#ifdef HAVE_AFTERIMAGE 63#ifdef HAVE_AFTERIMAGE
68 if (original_asim) 64 if (original_asim)
176 int smaller = min (image_size, window_size); 172 int smaller = min (image_size, window_size);
177 173
178 if (align >= 0 && align <= 100) 174 if (align >= 0 && align <= 100)
179 return diff * align / 100; 175 return diff * align / 100;
180 else if (align > 100 && align <= 200) 176 else if (align > 100 && align <= 200)
181 return ((align - 100) * smaller / 100) + window_size - smaller; 177 return (align - 100) * smaller / 100 + window_size - smaller;
182 else if (align >= -100 && align < 0) 178 else if (align >= -100 && align < 0)
183 return ((align + 100) * smaller / 100) - image_size; 179 return (align + 100) * smaller / 100 - image_size;
184 return 0; 180 return 0;
185} 181}
186 182
187static inline int 183static inline int
188make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 184make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
195 src_pos = -pos; 191 src_pos = -pos;
196 dst_pos = 0; 192 dst_pos = 0;
197 dst_size += pos; 193 dst_size += pos;
198 } 194 }
199 195
200 if (dst_pos + dst_size > target_size)
201 dst_size = target_size - dst_pos; 196 min_it (dst_size, target_size - dst_pos);
202 return src_pos; 197 return src_pos;
203} 198}
204 199
205bool 200bool
206rxvt_term::bg_set_geometry (const char *geom, bool update) 201rxvt_term::bg_set_geometry (const char *geom, bool update)
207{ 202{
208 bool changed = false; 203 bool changed = false;
209 int geom_flags = 0; 204 int geom_flags = 0;
210 int x = 0, y = 0; 205 int x = 0, y = 0;
211 unsigned int w = 0, h = 0; 206 unsigned int w = 0, h = 0;
212 unsigned int n; 207 unsigned long new_flags = 0;
213 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
214 const char *ops;
215 208
216 if (geom == NULL) 209 if (geom == NULL)
217 return false; 210 return false;
218 211
219 char str[256]; 212 if (geom[0])
220
221 ops = strchr (geom, ':');
222 if (ops == NULL)
223 n = strlen (geom);
224 else
225 n = ops - geom;
226
227 if (n >= sizeof (str))
228 return false;
229
230 memcpy (str, geom, n);
231 str[n] = '\0';
232 rxvt_strtrim (str);
233
234 if (str[0])
235 { 213 {
236 /* we have geometry string - let's handle it prior to applying ops */ 214 char **arr = rxvt_strsplit (':', geom);
215
216 for (int i = 0; arr[i]; i++)
217 {
218 if (!strcasecmp (arr[i], "style=tiled"))
219 {
220 new_flags = BG_TILE;
221 w = h = noScale;
222 x = y = 0;
223 geom_flags = WidthValue|HeightValue|XValue|YValue;
224 }
225 else if (!strcasecmp (arr[i], "style=aspect-stretched"))
226 {
227 new_flags = BG_KEEP_ASPECT;
228 w = h = windowScale;
229 x = y = centerAlign;
230 geom_flags = WidthValue|HeightValue|XValue|YValue;
231 }
232 else if (!strcasecmp (arr[i], "style=stretched"))
233 {
234 new_flags = 0;
235 w = h = windowScale;
236 geom_flags = WidthValue|HeightValue;
237 }
238 else if (!strcasecmp (arr[i], "style=centered"))
239 {
240 new_flags = 0;
241 w = h = noScale;
242 x = y = centerAlign;
243 geom_flags = WidthValue|HeightValue|XValue|YValue;
244 }
245 else if (!strcasecmp (arr[i], "style=root-tiled"))
246 {
247 new_flags = BG_TILE|BG_ROOT_ALIGN;
248 w = h = noScale;
249 geom_flags = WidthValue|HeightValue;
250 }
251 else if (!strcasecmp (arr[i], "op=tile"))
252 new_flags |= BG_TILE;
253 else if (!strcasecmp (arr[i], "op=keep-aspect"))
254 new_flags |= BG_KEEP_ASPECT;
255 else if (!strcasecmp (arr[i], "op=root-align"))
256 new_flags |= BG_ROOT_ALIGN;
257
258 // deprecated
259 else if (!strcasecmp (arr[i], "tile"))
260 {
261 new_flags |= BG_TILE;
262 w = h = noScale;
263 geom_flags |= WidthValue|HeightValue;
264 }
265 else if (!strcasecmp (arr[i], "propscale"))
266 {
267 new_flags |= BG_KEEP_ASPECT;
268 w = h = windowScale;
269 geom_flags |= WidthValue|HeightValue;
270 }
271 else if (!strcasecmp (arr[i], "hscale"))
272 {
273 new_flags |= BG_TILE;
274 w = windowScale;
275 h = noScale;
276 geom_flags |= WidthValue|HeightValue;
277 }
278 else if (!strcasecmp (arr[i], "vscale"))
279 {
280 new_flags |= BG_TILE;
281 h = windowScale;
282 w = noScale;
283 geom_flags |= WidthValue|HeightValue;
284 }
285 else if (!strcasecmp (arr[i], "scale"))
286 {
287 w = h = windowScale;
288 geom_flags |= WidthValue|HeightValue;
289 }
290 else if (!strcasecmp (arr[i], "auto"))
291 {
292 w = h = windowScale;
293 x = y = centerAlign;
294 geom_flags |= WidthValue|HeightValue|XValue|YValue;
295 }
296 else if (!strcasecmp (arr[i], "root"))
297 {
298 new_flags |= BG_TILE|BG_ROOT_ALIGN;
299 w = h = noScale;
300 geom_flags |= WidthValue|HeightValue;
301 }
302
303 else
237 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 304 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
238 } /* done parsing geometry string */ 305 } /* done parsing ops */
306
307 rxvt_free_strsplit (arr);
308 }
309
310 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
239 311
240 if (!update) 312 if (!update)
241 { 313 {
242 if (!(geom_flags & XValue)) 314 if (!(geom_flags & XValue))
243 x = y = defaultAlign; 315 x = y = defaultAlign;
252 w = h; 324 w = h;
253 325
254 geom_flags |= WidthValue|HeightValue|XValue|YValue; 326 geom_flags |= WidthValue|HeightValue|XValue|YValue;
255 } 327 }
256 328
257 if (ops)
258 {
259 char **arr = rxvt_strsplit (':', ops + 1);
260
261 for (int i = 0; arr[i]; i++)
262 {
263 if (!strcasecmp (arr[i], "tile"))
264 {
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], "auto"))
294 {
295 w = h = windowScale;
296 x = y = centerAlign;
297 geom_flags |= WidthValue|HeightValue|XValue|YValue;
298 }
299 else if (!strcasecmp (arr[i], "root"))
300 {
301 new_flags |= BG_ROOT_ALIGN;
302 w = h = noScale;
303 geom_flags |= WidthValue|HeightValue;
304 }
305 } /* done parsing ops */
306
307 rxvt_free_strsplit (arr);
308 }
309
310 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 329 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
311 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 330 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
312 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 331 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
313 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 332 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
314 333
325rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 344rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
326{ 345{
327 int target_width = szHint.width; 346 int target_width = szHint.width;
328 int target_height = szHint.height; 347 int target_height = szHint.height;
329 348
349 w = h_scale * target_width / 100;
350 h = v_scale * target_height / 100;
351
330 if (bg_flags & BG_PROP_SCALE) 352 if (bg_flags & BG_KEEP_ASPECT)
331 { 353 {
332 float scale = (float)target_width / image_width; 354 float scale = (float)w / image_width;
333 min_it (scale, (float)target_height / image_height); 355 min_it (scale, (float)h / image_height);
334 w = image_width * scale + 0.5; 356 w = image_width * scale + 0.5;
335 h = image_height * scale + 0.5; 357 h = image_height * scale + 0.5;
336 } 358 }
337 else
338 {
339 w = h_scale * target_width / 100;
340 h = v_scale * target_height / 100;
341 }
342 359
343 if (!w) w = image_width; 360 if (!w) w = image_width;
344 if (!h) h = image_height; 361 if (!h) h = image_height;
345 362
346 if (bg_flags & BG_ROOT_ALIGN) 363 if (bg_flags & BG_ROOT_ALIGN)
353 x = make_align_position (h_align, target_width, w); 370 x = make_align_position (h_align, target_width, w);
354 y = make_align_position (v_align, target_height, h); 371 y = make_align_position (v_align, target_height, h);
355 } 372 }
356 373
357 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 374 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
358 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 375 if (!(bg_flags & BG_TILE)
376 || h_scale || v_scale
359 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 377 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
360 || w > target_width || h > target_height) 378 || w > target_width || h > target_height)
361 bg_flags |= BG_IS_SIZE_SENSITIVE; 379 bg_flags |= BG_IS_SIZE_SENSITIVE;
362} 380}
363 381
390 } 408 }
391 409
392 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 410 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
393 { 411 {
394 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 412 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
395 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 413 ASA_XImage,
396 100, ASIMAGE_QUALITY_DEFAULT); 414 100, ASIMAGE_QUALITY_DEFAULT);
397 if (tmp) 415 if (tmp)
398 { 416 {
399 destroy_asimage (&background); 417 destroy_asimage (&background);
400 background = tmp; 418 background = tmp;
419 437
420 if (!original_asim 438 if (!original_asim
421 || (!(bg_flags & BG_ROOT_ALIGN) 439 || (!(bg_flags & BG_ROOT_ALIGN)
422 && (x >= target_width 440 && (x >= target_width
423 || y >= target_height 441 || y >= target_height
424 || (x + w <= 0) 442 || x + w <= 0
425 || (y + h <= 0)))) 443 || y + h <= 0)))
426 { 444 {
427 if (background) 445 if (background)
428 { 446 {
429 new_pmap_width = background->width; 447 new_pmap_width = background->width;
430 new_pmap_height = background->height; 448 new_pmap_height = background->height;
444 } 462 }
445 else 463 else
446 { 464 {
447 result = original_asim; 465 result = original_asim;
448 466
449 if ((w != original_asim->width) 467 if (w != original_asim->width
450 || (h != original_asim->height)) 468 || h != original_asim->height)
451 { 469 {
452 result = scale_asimage (asv, original_asim, 470 result = scale_asimage (asv, original_asim,
453 w, h, 471 w, h,
454 background ? ASA_ASImage : ASA_XImage, 472 ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 473 100, ASIMAGE_QUALITY_DEFAULT);
456 } 474 }
457 475
458 if (background == NULL) 476 if (background == NULL)
459 { 477 {
460 if (h_scale == 0 || v_scale == 0) 478 if (bg_flags & BG_TILE)
461 { 479 {
462 /* if tiling - pixmap has to be sized exactly as the image, 480 /* if tiling - pixmap has to be sized exactly as the image,
463 but there is no need to make it bigger than the window! */ 481 but there is no need to make it bigger than the window! */
464 new_pmap_width = min (result->width, target_width); 482 new_pmap_width = min (result->width, target_width);
465 new_pmap_height = min (result->height, target_height); 483 new_pmap_height = min (result->height, target_height);
490 layers[0].clip_width = target_width; 508 layers[0].clip_width = target_width;
491 layers[0].clip_height = target_height; 509 layers[0].clip_height = target_height;
492 layers[0].tint = background_tint; 510 layers[0].tint = background_tint;
493 layers[1].im = result; 511 layers[1].im = result;
494 512
495 if (h_scale == 0 || v_scale == 0) 513 if (bg_flags & BG_TILE)
496 { 514 {
497 /* tile horizontally */ 515 /* tile horizontally */
498 while (x > 0) x -= (int)result->width; 516 while (x > 0) x -= (int)result->width;
499 layers[1].dst_x = x; 517 layers[1].dst_x = x;
500 layers[1].clip_width = result->width+target_width; 518 layers[1].clip_width = result->width+target_width;
504 /* clip horizontally */ 522 /* clip horizontally */
505 layers[1].dst_x = x; 523 layers[1].dst_x = x;
506 layers[1].clip_width = result->width; 524 layers[1].clip_width = result->width;
507 } 525 }
508 526
509 if (h_scale == 0 || v_scale == 0) 527 if (bg_flags & BG_TILE)
510 { 528 {
511 while (y > 0) y -= (int)result->height; 529 while (y > 0) y -= (int)result->height;
512 layers[1].dst_y = y; 530 layers[1].dst_y = y;
513 layers[1].clip_height = result->height + target_height; 531 layers[1].clip_height = result->height + target_height;
514 } 532 }
564 582
565 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 583 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
566 int dst_width = result->width, dst_height = result->height; 584 int dst_width = result->width, dst_height = result->height;
567 if (background == NULL) 585 if (background == NULL)
568 { 586 {
569 if (!(h_scale == 0 || v_scale == 0)) 587 if (!(bg_flags & BG_TILE))
570 { 588 {
571 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 589 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
572 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 590 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
573 } 591 }
574 592
620 else if (depth == 15 || depth == 16) 638 else if (depth == 15 || depth == 16)
621 bytes_per_pixel = 2; 639 bytes_per_pixel = 2;
622 else 640 else
623 return false; 641 return false;
624 642
625 width_r = rxvt_popcount (visual->red_mask); 643 width_r = ecb_popcount32 (visual->red_mask);
626 width_g = rxvt_popcount (visual->green_mask); 644 width_g = ecb_popcount32 (visual->green_mask);
627 width_b = rxvt_popcount (visual->blue_mask); 645 width_b = ecb_popcount32 (visual->blue_mask);
628 646
629 if (width_r > 8 || width_g > 8 || width_b > 8) 647 if (width_r > 8 || width_g > 8 || width_b > 8)
630 return false; 648 return false;
631 649
632 sh_r = rxvt_ctz (visual->red_mask); 650 sh_r = ecb_ctz32 (visual->red_mask);
633 sh_g = rxvt_ctz (visual->green_mask); 651 sh_g = ecb_ctz32 (visual->green_mask);
634 sh_b = rxvt_ctz (visual->blue_mask); 652 sh_b = ecb_ctz32 (visual->blue_mask);
635 653
636 if (width > INT_MAX / height / bytes_per_pixel) 654 if (width > INT_MAX / height / bytes_per_pixel)
637 return false; 655 return false;
638 656
639 data = (char *)malloc (width * height * bytes_per_pixel); 657 data = (char *)malloc (width * height * bytes_per_pixel);
646 { 664 {
647 free (data); 665 free (data);
648 return false; 666 return false;
649 } 667 }
650 668
651 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 669 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
652 670
653 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 671 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
654 channels = gdk_pixbuf_get_n_channels (pixbuf); 672 channels = gdk_pixbuf_get_n_channels (pixbuf);
655 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 673 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
656 line = data; 674 line = data;
709 get_image_geometry (image_width, image_height, w, h, x, y); 727 get_image_geometry (image_width, image_height, w, h, x, y);
710 728
711 if (!(bg_flags & BG_ROOT_ALIGN) 729 if (!(bg_flags & BG_ROOT_ALIGN)
712 && (x >= target_width 730 && (x >= target_width
713 || y >= target_height 731 || y >= target_height
714 || (x + w <= 0) 732 || x + w <= 0
715 || (y + h <= 0))) 733 || y + h <= 0))
716 return false; 734 return false;
717 735
718 result = pixbuf; 736 result = pixbuf;
719 737
720 if ((w != image_width) 738 if (w != image_width
721 || (h != image_height)) 739 || h != image_height)
722 { 740 {
723 result = gdk_pixbuf_scale_simple (pixbuf, 741 result = gdk_pixbuf_scale_simple (pixbuf,
724 w, h, 742 w, h,
725 GDK_INTERP_BILINEAR); 743 GDK_INTERP_BILINEAR);
726 } 744 }
742 root_pmap = bg_pixmap; 760 root_pmap = bg_pixmap;
743 bg_pixmap = None; 761 bg_pixmap = None;
744 } 762 }
745 else 763 else
746 { 764 {
747 if (h_scale == 0 || v_scale == 0) 765 if (bg_flags & BG_TILE)
748 { 766 {
749 new_pmap_width = min (image_width, target_width); 767 new_pmap_width = min (image_width, target_width);
750 new_pmap_height = min (image_height, target_height); 768 new_pmap_height = min (image_height, target_height);
751 } 769 }
752 } 770 }
760 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 778 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
761 bg_pmap_width = new_pmap_width; 779 bg_pmap_width = new_pmap_width;
762 bg_pmap_height = new_pmap_height; 780 bg_pmap_height = new_pmap_height;
763 } 781 }
764 782
765 if (bg_pixmap != None)
766 {
767 gcv.foreground = pix_colors[Color_bg]; 783 gcv.foreground = pix_colors[Color_bg];
768 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 784 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
769 785
770 if (gc) 786 if (gc)
771 { 787 {
772 if (h_scale == 0 || v_scale == 0) 788 if (bg_flags & BG_TILE)
773 { 789 {
774 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 790 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
775
776 if (tile != None)
777 {
778 pixbuf_to_pixmap (result, tile, gc, 791 pixbuf_to_pixmap (result, tile, gc,
779 0, 0, 792 0, 0,
780 0, 0, 793 0, 0,
781 image_width, image_height); 794 image_width, image_height);
782 795
783 gcv.tile = tile; 796 gcv.tile = tile;
784 gcv.fill_style = FillTiled; 797 gcv.fill_style = FillTiled;
785 gcv.ts_x_origin = x; 798 gcv.ts_x_origin = x;
786 gcv.ts_y_origin = y; 799 gcv.ts_y_origin = y;
787 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 800 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
788 801
789 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 802 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
790 XFreePixmap (dpy, tile); 803 XFreePixmap (dpy, tile);
791 }
792 } 804 }
793 else 805 else
794 { 806 {
795 int src_x, src_y, dst_x, dst_y; 807 int src_x, src_y, dst_x, dst_y;
796 int dst_width, dst_height; 808 int dst_width, dst_height;
797 809
798 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width ); 810 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
799 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 811 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
800 812
801 if (dst_x > 0 || dst_y > 0 813 if (dst_x > 0 || dst_y > 0
802 || dst_x + dst_width < new_pmap_width 814 || dst_x + dst_width < new_pmap_width
803 || dst_y + dst_height < new_pmap_height) 815 || dst_y + dst_height < new_pmap_height)
804 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 816 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
805 817
806 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 818 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
807 pixbuf_to_pixmap (result, bg_pixmap, gc, 819 pixbuf_to_pixmap (result, bg_pixmap, gc,
808 src_x, src_y, 820 src_x, src_y,
809 dst_x, dst_y, 821 dst_x, dst_y,
810 dst_width, dst_height); 822 dst_width, dst_height);
811 } 823 }
812 824
813#if XRENDER 825#if XRENDER
814 if (tr_flags) 826 if (tr_flags)
815 { 827 {
816 XRenderPictureAttributes pa;
817
818 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 828 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
829
819 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 830 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
820 831
821 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
822 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 832 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
823 833
824 pa.repeat = True; 834 Picture mask = create_xrender_mask (dpy, vt, False, False);
825 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
826 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
827 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
828 XFreePixmap (dpy, mask_pmap);
829 835
830 if (src && dst && mask)
831 {
832 XRenderColor mask_c; 836 XRenderColor mask_c;
833 837
834 mask_c.alpha = 0x8000; 838 mask_c.alpha = 0x8000;
835 mask_c.red = 0; 839 mask_c.red =
836 mask_c.green = 0; 840 mask_c.green =
837 mask_c.blue = 0; 841 mask_c.blue = 0;
838 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 842 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
843
839 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 844 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
840 }
841 845
842 XRenderFreePicture (dpy, src); 846 XRenderFreePicture (dpy, src);
843 XRenderFreePicture (dpy, dst); 847 XRenderFreePicture (dpy, dst);
844 XRenderFreePicture (dpy, mask); 848 XRenderFreePicture (dpy, mask);
845 } 849 }
846#endif 850#endif
847 851
848 XFreeGC (dpy, gc); 852 XFreeGC (dpy, gc);
849 853
850 ret = true; 854 ret = true;
851 }
852 } 855 }
853 856
854 if (result != pixbuf) 857 if (result != pixbuf)
855 g_object_unref (result); 858 g_object_unref (result);
856 859
865rxvt_term::bg_set_file (const char *file) 868rxvt_term::bg_set_file (const char *file)
866{ 869{
867 if (!file || !*file) 870 if (!file || !*file)
868 return false; 871 return false;
869 872
873 bool ret = false;
870 if (const char *p = strchr (file, ';')) 874 const char *p = strchr (file, ';');
875
876 if (p)
871 { 877 {
872 size_t len = p - file; 878 size_t len = p - file;
873 char *f = rxvt_temp_buf<char> (len + 1); 879 char *f = rxvt_temp_buf<char> (len + 1);
874 memcpy (f, file, len); 880 memcpy (f, file, len);
875 f[len] = '\0'; 881 f[len] = '\0';
884 { 890 {
885 if (original_asim) 891 if (original_asim)
886 safe_asimage_destroy (original_asim); 892 safe_asimage_destroy (original_asim);
887 original_asim = image; 893 original_asim = image;
888 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 894 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
889 return true; 895 ret = true;
890 } 896 }
891# endif 897# endif
892 898
893# ifdef HAVE_PIXBUF 899# ifdef HAVE_PIXBUF
894 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 900 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
896 { 902 {
897 if (pixbuf) 903 if (pixbuf)
898 g_object_unref (pixbuf); 904 g_object_unref (pixbuf);
899 pixbuf = image; 905 pixbuf = image;
900 bg_flags |= BG_IS_FROM_FILE; 906 bg_flags |= BG_IS_FROM_FILE;
901 return true; 907 ret = true;
902 } 908 }
903# endif 909# endif
904 910
911 if (ret)
912 {
913 if (p)
914 bg_set_geometry (p + 1);
915 else
916 bg_set_default_geometry ();
917 }
918
905 return false; 919 return ret;
906} 920}
907 921
908# endif /* BG_IMAGE_FROM_FILE */ 922# endif /* BG_IMAGE_FROM_FILE */
909 923
910# ifdef ENABLE_TRANSPARENCY 924# ifdef ENABLE_TRANSPARENCY
946 { 960 {
947 changed = true; 961 changed = true;
948 v_blurRadius = vr; 962 v_blurRadius = vr;
949 } 963 }
950 964
951 if (v_blurRadius == 0 && h_blurRadius == 0) 965 if (h_blurRadius == 0 || v_blurRadius == 0)
952 bg_flags &= ~BG_NEEDS_BLUR; 966 bg_flags &= ~BG_NEEDS_BLUR;
953 else 967 else
954 bg_flags |= BG_NEEDS_BLUR; 968 bg_flags |= BG_NEEDS_BLUR;
955 969
956 return changed; 970 return changed;
957} 971}
958 972
959void 973void
960rxvt_term::set_tint_shade_flags () 974rxvt_term::set_tint_shade_flags ()
961{ 975{
962 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 976 rgba c;
963 bool has_shade = shade != 100; 977 bool has_shade = shade != 100;
964 978
965 bg_flags &= ~BG_TINT_FLAGS; 979 bg_flags &= ~BG_TINT_FLAGS;
966 980
967 if (bg_flags & BG_TINT_SET) 981 if (bg_flags & BG_TINT_SET)
993} 1007}
994 1008
995bool 1009bool
996rxvt_term::bg_set_shade (const char *shade_str) 1010rxvt_term::bg_set_shade (const char *shade_str)
997{ 1011{
998 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1012 int new_shade = atoi (shade_str);
999 1013
1000 clamp_it (new_shade, -100, 200); 1014 clamp_it (new_shade, -100, 200);
1001 if (new_shade < 0) 1015 if (new_shade < 0)
1002 new_shade = 200 - (100 + new_shade); 1016 new_shade = 200 - (100 + new_shade);
1003 1017
1033 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1047 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1034} 1048}
1035#endif 1049#endif
1036 1050
1037bool 1051bool
1038rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1052rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1039{ 1053{
1040 bool ret = false; 1054 bool ret = false;
1041#if XRENDER 1055#if XRENDER
1056 if (!(bg_flags & BG_HAS_RENDER_CONV))
1057 return false;
1058
1042 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1059 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1043 double *kernel = (double *)malloc (size * sizeof (double)); 1060 double *kernel = (double *)malloc (size * sizeof (double));
1044 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1061 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1045 1062
1046 XRenderPictureAttributes pa; 1063 XRenderPictureAttributes pa;
1047 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1064 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1048 1065
1066 pa.repeat = RepeatPad;
1049 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1067 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
1068 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1050 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1069 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
1070 XFreePixmap (dpy, tmp);
1051 1071
1052 if (kernel && params && src && dst) 1072 if (kernel && params)
1053 { 1073 {
1054 if (h_blurRadius)
1055 {
1056 size = h_blurRadius * 2 + 1; 1074 size = h_blurRadius * 2 + 1;
1057 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1075 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1058 1076
1059 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1077 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1060 XRenderComposite (dpy, 1078 XRenderComposite (dpy,
1061 PictOpSrc, 1079 PictOpSrc,
1062 src, 1080 src,
1063 None, 1081 None,
1064 dst, 1082 dst,
1065 0, 0, 1083 0, 0,
1066 0, 0, 1084 0, 0,
1067 0, 0, 1085 0, 0,
1068 width, height); 1086 width, height);
1069 }
1070 1087
1071 if (v_blurRadius) 1088 ::swap (src, dst);
1072 { 1089
1073 size = v_blurRadius * 2 + 1; 1090 size = v_blurRadius * 2 + 1;
1074 get_gaussian_kernel (v_blurRadius, size, kernel, params); 1091 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1075 ::swap (params[0], params[1]); 1092 ::swap (params[0], params[1]);
1076 1093
1077 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1094 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1078 XRenderComposite (dpy, 1095 XRenderComposite (dpy,
1079 PictOpSrc, 1096 PictOpSrc,
1080 src, 1097 src,
1081 None, 1098 None,
1082 dst, 1099 dst,
1083 0, 0, 1100 0, 0,
1084 0, 0, 1101 0, 0,
1085 0, 0, 1102 0, 0,
1086 width, height); 1103 width, height);
1087 }
1088 1104
1089 ret = true; 1105 ret = true;
1090 } 1106 }
1091 1107
1092 free (kernel); 1108 free (kernel);
1119 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1135 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1120 ret = true; 1136 ret = true;
1121 XFreeGC (dpy, gc); 1137 XFreeGC (dpy, gc);
1122 } 1138 }
1123 } 1139 }
1124 else
1125 {
1126# if XRENDER 1140# if XRENDER
1141 else if (bg_flags & BG_HAS_RENDER)
1142 {
1127 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1143 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1128 1144
1129 if (bg_flags & BG_TINT_SET) 1145 if (bg_flags & BG_TINT_SET)
1130 tint.get (c); 1146 tint.get (c);
1131 1147
1140 c.r = c.r * (200 - shade) / 100; 1156 c.r = c.r * (200 - shade) / 100;
1141 c.g = c.g * (200 - shade) / 100; 1157 c.g = c.g * (200 - shade) / 100;
1142 c.b = c.b * (200 - shade) / 100; 1158 c.b = c.b * (200 - shade) / 100;
1143 } 1159 }
1144 1160
1145 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1146 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1161 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1147 XRenderPictureAttributes pa;
1148 1162
1149 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1163 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1150 1164
1151 pa.repeat = True; 1165 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1152 1166
1153 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1167 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 1168
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
1162 if (mask_pic && overlay_pic && back_pic)
1163 {
1164 XRenderColor mask_c; 1169 XRenderColor mask_c;
1165 1170
1166 mask_c.alpha = 0xffff; 1171 mask_c.alpha = 0xffff;
1172 mask_c.red =
1173 mask_c.green =
1174 mask_c.blue = 0;
1175 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1176
1177 mask_c.alpha = 0;
1178 mask_c.red = 0xffff - c.r;
1179 mask_c.green = 0xffff - c.g;
1180 mask_c.blue = 0xffff - c.b;
1181 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1182
1183 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1184
1185 if (shade > 100)
1186 {
1187 mask_c.alpha = 0;
1167 mask_c.red = 1188 mask_c.red =
1168 mask_c.green = 1189 mask_c.green =
1169 mask_c.blue = 0; 1190 mask_c.blue = 0xffff * (shade - 100) / 100;
1170 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1191 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1171 1192
1172 mask_c.alpha = 0;
1173 mask_c.red = 0xffff - c.r;
1174 mask_c.green = 0xffff - c.g;
1175 mask_c.blue = 0xffff - c.b;
1176 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1177 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1178
1179 if (shade > 100)
1180 {
1181 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1182 mask_c.alpha = 0;
1183 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1184
1185 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1193 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1186 } 1194 }
1187 1195
1188 ret = true; 1196 ret = true;
1189 }
1190 1197
1191 XRenderFreePicture (dpy, mask_pic); 1198 XRenderFreePicture (dpy, mask_pic);
1192 XRenderFreePicture (dpy, overlay_pic); 1199 XRenderFreePicture (dpy, overlay_pic);
1193 XRenderFreePicture (dpy, back_pic); 1200 XRenderFreePicture (dpy, back_pic);
1201 }
1194# endif 1202# endif
1195 }
1196 1203
1197 return ret; 1204 return ret;
1198} 1205}
1199 1206
1200/* 1207/*
1251#if XRENDER 1258#if XRENDER
1252 if (bg_flags & BG_HAS_RENDER) 1259 if (bg_flags & BG_HAS_RENDER)
1253 { 1260 {
1254 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 1261 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1255 1262
1256 if (recoded_root_pmap != None)
1257 {
1258 XRenderPictureAttributes pa;
1259
1260 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1263 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1261 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1264 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1262 1265
1263 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1266 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1264 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1267 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1265 1268
1266 if (src && dst)
1267 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1269 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1268 else
1269 {
1270 XFreePixmap (dpy, recoded_root_pmap);
1271 recoded_root_pmap = None;
1272 }
1273 1270
1274 XRenderFreePicture (dpy, src); 1271 XRenderFreePicture (dpy, src);
1275 XRenderFreePicture (dpy, dst); 1272 XRenderFreePicture (dpy, dst);
1276 }
1277 } 1273 }
1278 else 1274 else
1279#endif 1275#endif
1280 recoded_root_pmap = None; 1276 recoded_root_pmap = None;
1281 } 1277 }
1292 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); 1288 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1293 bg_pmap_width = window_width; 1289 bg_pmap_width = window_width;
1294 bg_pmap_height = window_height; 1290 bg_pmap_height = window_height;
1295 } 1291 }
1296 1292
1297 if (bg_pixmap != None)
1298 {
1299 /* straightforward pixmap copy */ 1293 /* straightforward pixmap copy */
1300 while (sx < 0) sx += root_width; 1294 while (sx < 0) sx += root_pmap_width;
1301 while (sy < 0) sy += root_height; 1295 while (sy < 0) sy += root_pmap_height;
1302 1296
1303 gcv.tile = recoded_root_pmap; 1297 gcv.tile = recoded_root_pmap;
1304 gcv.fill_style = FillTiled; 1298 gcv.fill_style = FillTiled;
1305 gcv.ts_x_origin = -sx; 1299 gcv.ts_x_origin = -sx;
1306 gcv.ts_y_origin = -sy; 1300 gcv.ts_y_origin = -sy;
1307 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1301 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1308 1302
1309 if (gc) 1303 if (gc)
1310 { 1304 {
1311 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1305 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1312 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1306 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1313 XFreeGC (dpy, gc);
1314 1307
1315 if (!(bg_flags & BG_CLIENT_RENDER)) 1308 if (!(bg_flags & BG_CLIENT_RENDER))
1316 { 1309 {
1317 if ((bg_flags & BG_NEEDS_BLUR) 1310 if (bg_flags & BG_NEEDS_BLUR)
1318 && (bg_flags & BG_HAS_RENDER_CONV)) 1311 {
1312 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1313 result &= ~BG_NEEDS_BLUR;
1314 }
1315 if (bg_flags & BG_NEEDS_TINT)
1316 {
1317 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1318 result &= ~BG_NEEDS_TINT;
1319 }
1320# ifndef HAVE_AFTERIMAGE
1321 if (result & BG_NEEDS_TINT)
1322 {
1323 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1324 if (ximage)
1319 { 1325 {
1320 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1326 /* our own client-side tinting */
1321 result &= ~BG_NEEDS_BLUR; 1327 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1328
1329 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1330 XDestroyImage (ximage);
1322 } 1331 }
1323 if ((bg_flags & BG_NEEDS_TINT)
1324 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1325 {
1326 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1327 result &= ~BG_NEEDS_TINT;
1328 } 1332 }
1333# endif
1329 } /* server side rendering completed */ 1334 } /* server side rendering completed */
1330 } 1335
1336 XFreeGC (dpy, gc);
1331 } 1337 }
1332 1338
1333 if (recoded_root_pmap != root_pixmap) 1339 if (recoded_root_pmap != root_pixmap)
1334 XFreePixmap (dpy, recoded_root_pmap); 1340 XFreePixmap (dpy, recoded_root_pmap);
1335 1341
1344 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1350 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1345 1351
1346 root_pixmap = new_root_pixmap; 1352 root_pixmap = new_root_pixmap;
1347} 1353}
1348# endif /* ENABLE_TRANSPARENCY */ 1354# endif /* ENABLE_TRANSPARENCY */
1349
1350#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1351static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1352# endif
1353 1355
1354bool 1356bool
1355rxvt_term::bg_render () 1357rxvt_term::bg_render ()
1356{ 1358{
1357 unsigned long tr_flags = 0; 1359 unsigned long tr_flags = 0;
1362 { 1364 {
1363 /* we need to re-generate transparency pixmap in that case ! */ 1365 /* we need to re-generate transparency pixmap in that case ! */
1364 tr_flags = make_transparency_pixmap (); 1366 tr_flags = make_transparency_pixmap ();
1365 if (tr_flags == 0) 1367 if (tr_flags == 0)
1366 return false; 1368 return false;
1367 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1368 bg_flags |= BG_IS_VALID; 1369 bg_flags |= BG_IS_VALID;
1369 } 1370 }
1370# endif 1371# endif
1371 1372
1372# ifdef BG_IMAGE_FROM_FILE 1373# ifdef BG_IMAGE_FROM_FILE
1373 if ((bg_flags & BG_IS_FROM_FILE) 1374 if ((bg_flags & BG_IS_FROM_FILE)
1374 || (tr_flags & BG_EFFECTS_FLAGS)) 1375 || (tr_flags & BG_EFFECTS_FLAGS))
1375 { 1376 {
1376 if (render_image (tr_flags)) 1377 if (render_image (tr_flags))
1377 bg_flags |= BG_IS_VALID; 1378 bg_flags |= BG_IS_VALID;
1378 }
1379# endif
1380
1381# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1382 XImage *result = NULL;
1383
1384 if (tr_flags && !(bg_flags & BG_IS_VALID))
1385 {
1386 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1387 }
1388
1389 if (result)
1390 {
1391 /* our own client-side tinting */
1392 if (tr_flags & BG_NEEDS_TINT)
1393 {
1394 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1395 if (bg_flags & BG_TINT_SET)
1396 tint.get (c);
1397 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1398 }
1399
1400 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1401
1402 if (gc)
1403 {
1404 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1405
1406 XFreeGC (dpy, gc);
1407 bg_flags |= BG_IS_VALID;
1408 }
1409
1410 XDestroyImage (result);
1411 } 1379 }
1412# endif 1380# endif
1413 1381
1414 if (!(bg_flags & BG_IS_VALID)) 1382 if (!(bg_flags & BG_IS_VALID))
1415 { 1383 {
1453} 1421}
1454 1422
1455#endif /* HAVE_BG_PIXMAP */ 1423#endif /* HAVE_BG_PIXMAP */
1456 1424
1457#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1425#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1458/* taken from aterm-0.4.2 */ 1426/* based on code from aterm-0.4.2 */
1459 1427
1460static void 1428static inline void
1461shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1429fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1430{
1431 for (int i = 0; i <= mask >> sh; i++)
1432 {
1433 uint32_t tmp;
1434 tmp = i * high;
1435 tmp += (mask >> sh) * low;
1436 lookup[i] = (tmp / 0xffff) << sh;
1437 }
1438}
1439
1440void
1441rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1462{ 1442{
1463 int sh_r, sh_g, sh_b; 1443 int sh_r, sh_g, sh_b;
1464 uint32_t mask_r, mask_g, mask_b; 1444 uint32_t mask_r, mask_g, mask_b;
1465 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1445 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1466 rgba low; 1446 unsigned short low;
1467 rgba high;
1468 int i;
1469 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1447 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1470 1448
1471 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1449 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1472 1450
1473 /* for convenience */ 1451 /* for convenience */
1474 mask_r = visual->red_mask; 1452 mask_r = visual->red_mask;
1532 break; 1510 break;
1533 default: 1511 default:
1534 return; /* we do not support this color depth */ 1512 return; /* we do not support this color depth */
1535 } 1513 }
1536 1514
1515 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1516
1517 if (bg_flags & BG_TINT_SET)
1518 tint.get (c);
1519
1537 /* prepare limits for color transformation (each channel is handled separately) */ 1520 /* prepare limits for color transformation (each channel is handled separately) */
1538 if (shade > 100) 1521 if (shade > 100)
1539 { 1522 {
1540 shade = 200 - shade;
1541
1542 high.r = c.r * shade / 100;
1543 high.g = c.g * shade / 100;
1544 high.b = c.b * shade / 100;
1545
1546 low.r = 65535 * (100 - shade) / 100; 1523 c.r = c.r * (200 - shade) / 100;
1547 low.g = 65535 * (100 - shade) / 100; 1524 c.g = c.g * (200 - shade) / 100;
1548 low.b = 65535 * (100 - shade) / 100; 1525 c.b = c.b * (200 - shade) / 100;
1526
1527 low = 0xffff * (shade - 100) / 100;
1549 } 1528 }
1550 else 1529 else
1551 { 1530 {
1552 high.r = c.r * shade / 100; 1531 c.r = c.r * shade / 100;
1553 high.g = c.g * shade / 100; 1532 c.g = c.g * shade / 100;
1554 high.b = c.b * shade / 100; 1533 c.b = c.b * shade / 100;
1555 1534
1556 low.r = low.g = low.b = 0; 1535 low = 0;
1557 } 1536 }
1558 1537
1559 /* fill our lookup tables */ 1538 /* fill our lookup tables */
1560 for (i = 0; i <= mask_r>>sh_r; i++) 1539 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1561 { 1540 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1562 uint32_t tmp; 1541 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1563 tmp = i * high.r;
1564 tmp += (mask_r>>sh_r) * low.r;
1565 lookup_r[i] = (tmp/65535)<<sh_r;
1566 }
1567 for (i = 0; i <= mask_g>>sh_g; i++)
1568 {
1569 uint32_t tmp;
1570 tmp = i * high.g;
1571 tmp += (mask_g>>sh_g) * low.g;
1572 lookup_g[i] = (tmp/65535)<<sh_g;
1573 }
1574 for (i = 0; i <= mask_b>>sh_b; i++)
1575 {
1576 uint32_t tmp;
1577 tmp = i * high.b;
1578 tmp += (mask_b>>sh_b) * low.b;
1579 lookup_b[i] = (tmp/65535)<<sh_b;
1580 }
1581 1542
1582 /* apply table to input image (replacing colors by newly calculated ones) */ 1543 /* apply table to input image (replacing colors by newly calculated ones) */
1583 if (ximage->bits_per_pixel == 32 1544 if (ximage->bits_per_pixel == 32
1584 && (ximage->depth == 24 || ximage->depth == 32) 1545 && (ximage->depth == 24 || ximage->depth == 32)
1585 && ximage->byte_order == host_byte_order) 1546 && ximage->byte_order == host_byte_order)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines