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.144 by sf-exg, Fri Jan 28 00:20:47 2011 UTC vs.
Revision 1.193 by sf-exg, Sun Jan 1 14:31:29 2012 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it> 8 * Copyright (c) 2010 Emanuele Giaquinta <e.giaquinta@glauco.it>
9 * 9 *
10 * This program is free software; you can redistribute it and/or modify 10 * This program is free software; you can redistribute it and/or modify
11 * it under the terms of the GNU General Public License as published by 11 * it under the terms of the GNU General Public License as published by
… …
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37/*
38 * Pixmap geometry string interpretation :
39 * Each geometry string contains zero or one scale/position
40 * adjustment and may optionally be followed by a colon and one or more
41 * colon-delimited pixmap operations.
42 * The following table shows the valid geometry strings and their
43 * effects on the background image :
44 *
45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
46 * W and H are percentages of the terminal window size.
47 * X and Y are also percentages; e.g., +50+50 centers
48 * the image in the window.
49 *
50 * Pixmap Operations : (should be prepended by a colon)
51 * tile Tile image. Scaling/position modifiers above will affect
52 * the tile size and origin.
53 * propscale When scaling, scale proportionally. That is, maintain the
54 * proper aspect ratio for the image. Any portion of the
55 * background not covered by the image is filled with the
56 * current background color.
57 * hscale Scale horizontally, tile vertically ?
58 * vscale Tile horizontally, scale vertically ?
59 * scale Scale both up and down
60 * auto Same as 100x100+50+50
61 */
62
63#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
64void 56void
65rxvt_term::bg_destroy () 57rxvt_term::bg_destroy ()
66{ 58{
67#ifdef HAVE_AFTERIMAGE 59#ifdef HAVE_AFTERIMAGE
68 if (original_asim) 60 if (original_asim)
69 safe_asimage_destroy (original_asim); 61 safe_asimage_destroy (original_asim);
62 if (asv)
63 destroy_asvisual (asv, 0);
64 if (asimman)
65 destroy_image_manager (asimman, 0);
70#endif 66#endif
71 67
72#ifdef HAVE_PIXBUF 68#ifdef HAVE_PIXBUF
73 if (pixbuf) 69 if (pixbuf)
74 g_object_unref (pixbuf); 70 g_object_unref (pixbuf);
… …
172 int smaller = min (image_size, window_size); 168 int smaller = min (image_size, window_size);
173 169
174 if (align >= 0 && align <= 100) 170 if (align >= 0 && align <= 100)
175 return diff * align / 100; 171 return diff * align / 100;
176 else if (align > 100 && align <= 200) 172 else if (align > 100 && align <= 200)
177 return ((align - 100) * smaller / 100) + window_size - smaller; 173 return (align - 100) * smaller / 100 + window_size - smaller;
178 else if (align >= -100 && align < 0) 174 else if (align >= -100 && align < 0)
179 return ((align + 100) * smaller / 100) - image_size; 175 return (align + 100) * smaller / 100 - image_size;
180 return 0; 176 return 0;
181} 177}
182 178
183static inline int 179static inline int
184make_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)
… …
203{ 199{
204 bool changed = false; 200 bool changed = false;
205 int geom_flags = 0; 201 int geom_flags = 0;
206 int x = 0, y = 0; 202 int x = 0, y = 0;
207 unsigned int w = 0, h = 0; 203 unsigned int w = 0, h = 0;
208 unsigned int n; 204 unsigned long new_flags = 0;
209 unsigned long new_flags = (bg_flags & (~BG_GEOMETRY_FLAGS));
210 const char *ops;
211 205
212 if (geom == NULL) 206 if (geom == NULL)
213 return false; 207 return false;
214 208
215 char str[256]; 209 if (geom[0])
216
217 ops = strchr (geom, ':');
218 if (ops == NULL)
219 n = strlen (geom);
220 else
221 n = ops - geom;
222
223 if (n >= sizeof (str))
224 return false;
225
226 memcpy (str, geom, n);
227 str[n] = '\0';
228 rxvt_strtrim (str);
229
230 if (str[0])
231 { 210 {
232 /* 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
233 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 301 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
234 } /* done parsing geometry string */ 302 } /* done parsing ops */
303
304 rxvt_free_strsplit (arr);
305 }
306
307 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
235 308
236 if (!update) 309 if (!update)
237 { 310 {
238 if (!(geom_flags & XValue)) 311 if (!(geom_flags & XValue))
239 x = y = defaultAlign; 312 x = y = defaultAlign;
… …
248 w = h; 321 w = h;
249 322
250 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
251 } 324 }
252 325
253 if (ops)
254 {
255 char **arr = rxvt_strsplit (':', ops + 1);
256
257 for (int i = 0; arr[i]; i++)
258 {
259 if (!strcasecmp (arr[i], "tile"))
260 {
261 w = h = noScale;
262 geom_flags |= WidthValue|HeightValue;
263 }
264 else if (!strcasecmp (arr[i], "propscale"))
265 {
266 new_flags |= BG_PROP_SCALE;
267 }
268 else if (!strcasecmp (arr[i], "hscale"))
269 {
270 if (w == 0) w = windowScale;
271
272 h = noScale;
273 geom_flags |= WidthValue|HeightValue;
274 }
275 else if (!strcasecmp (arr[i], "vscale"))
276 {
277 if (h == 0) h = windowScale;
278
279 w = noScale;
280 geom_flags |= WidthValue|HeightValue;
281 }
282 else if (!strcasecmp (arr[i], "scale"))
283 {
284 if (h == 0) h = windowScale;
285 if (w == 0) w = windowScale;
286
287 geom_flags |= WidthValue|HeightValue;
288 }
289 else if (!strcasecmp (arr[i], "auto"))
290 {
291 w = h = windowScale;
292 x = y = centerAlign;
293 geom_flags |= WidthValue|HeightValue|XValue|YValue;
294 }
295 else if (!strcasecmp (arr[i], "root"))
296 {
297 new_flags |= BG_ROOT_ALIGN;
298 w = h = noScale;
299 geom_flags |= WidthValue|HeightValue;
300 }
301 } /* done parsing ops */
302
303 rxvt_free_strsplit (arr);
304 }
305
306 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;
307 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;
308 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;
309 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;
310 330
… …
321rxvt_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)
322{ 342{
323 int target_width = szHint.width; 343 int target_width = szHint.width;
324 int target_height = szHint.height; 344 int target_height = szHint.height;
325 345
346 w = h_scale * target_width / 100;
347 h = v_scale * target_height / 100;
348
326 if (bg_flags & BG_PROP_SCALE) 349 if (bg_flags & BG_KEEP_ASPECT)
327 { 350 {
328 float scale = (float)target_width / image_width; 351 float scale = (float)w / image_width;
329 min_it (scale, (float)target_height / image_height); 352 min_it (scale, (float)h / image_height);
330 w = image_width * scale + 0.5; 353 w = image_width * scale + 0.5;
331 h = image_height * scale + 0.5; 354 h = image_height * scale + 0.5;
332 } 355 }
333 else
334 {
335 w = h_scale * target_width / 100;
336 h = v_scale * target_height / 100;
337 }
338 356
339 if (!w) w = image_width; 357 if (!w) w = image_width;
340 if (!h) h = image_height; 358 if (!h) h = image_height;
341 359
342 if (bg_flags & BG_ROOT_ALIGN) 360 if (bg_flags & BG_ROOT_ALIGN)
… …
349 x = make_align_position (h_align, target_width, w); 367 x = make_align_position (h_align, target_width, w);
350 y = make_align_position (v_align, target_height, h); 368 y = make_align_position (v_align, target_height, h);
351 } 369 }
352 370
353 bg_flags &= ~BG_IS_SIZE_SENSITIVE; 371 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
354 if ((bg_flags & BG_PROP_SCALE) || h_scale || v_scale 372 if (!(bg_flags & BG_TILE)
373 || h_scale || v_scale
355 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 374 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
356 || w > target_width || h > target_height) 375 || w > target_width || h > target_height)
357 bg_flags |= BG_IS_SIZE_SENSITIVE; 376 bg_flags |= BG_IS_SIZE_SENSITIVE;
358} 377}
359 378
… …
373 if (tr_flags & BG_NEEDS_TINT) 392 if (tr_flags & BG_NEEDS_TINT)
374 { 393 {
375 ShadingInfo as_shade; 394 ShadingInfo as_shade;
376 as_shade.shading = shade; 395 as_shade.shading = shade;
377 396
378 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 397 rgba c;
379 if (bg_flags & BG_TINT_SET)
380 tint.get (c); 398 tint.get (c);
381 as_shade.tintColor.red = c.r; 399 as_shade.tintColor.red = c.r;
382 as_shade.tintColor.green = c.g; 400 as_shade.tintColor.green = c.g;
383 as_shade.tintColor.blue = c.b; 401 as_shade.tintColor.blue = c.b;
384 402
385 background_tint = shading2tint32 (&as_shade); 403 background_tint = shading2tint32 (&as_shade);
386 } 404 }
387 405
388 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL) 406 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
389 { 407 {
390 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,
391 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 409 ASA_XImage,
392 100, ASIMAGE_QUALITY_DEFAULT); 410 100, ASIMAGE_QUALITY_DEFAULT);
393 if (tmp) 411 if (tmp)
394 { 412 {
395 destroy_asimage (&background); 413 destroy_asimage (&background);
396 background = tmp; 414 background = tmp;
… …
415 433
416 if (!original_asim 434 if (!original_asim
417 || (!(bg_flags & BG_ROOT_ALIGN) 435 || (!(bg_flags & BG_ROOT_ALIGN)
418 && (x >= target_width 436 && (x >= target_width
419 || y >= target_height 437 || y >= target_height
420 || (x + w <= 0) 438 || x + w <= 0
421 || (y + h <= 0)))) 439 || y + h <= 0)))
422 { 440 {
423 if (background) 441 if (background)
424 { 442 {
425 new_pmap_width = background->width; 443 new_pmap_width = background->width;
426 new_pmap_height = background->height; 444 new_pmap_height = background->height;
… …
440 } 458 }
441 else 459 else
442 { 460 {
443 result = original_asim; 461 result = original_asim;
444 462
445 if ((w != original_asim->width) 463 if (w != original_asim->width
446 || (h != original_asim->height)) 464 || h != original_asim->height)
447 { 465 {
448 result = scale_asimage (asv, original_asim, 466 result = scale_asimage (asv, original_asim,
449 w, h, 467 w, h,
450 background ? ASA_ASImage : ASA_XImage, 468 ASA_XImage,
451 100, ASIMAGE_QUALITY_DEFAULT); 469 100, ASIMAGE_QUALITY_DEFAULT);
452 } 470 }
453 471
454 if (background == NULL) 472 if (background == NULL)
455 { 473 {
456 if (h_scale == 0 || v_scale == 0) 474 if (bg_flags & BG_TILE)
457 { 475 {
458 /* if tiling - pixmap has to be sized exactly as the image, 476 /* if tiling - pixmap has to be sized exactly as the image,
459 but there is no need to make it bigger than the window! */ 477 but there is no need to make it bigger than the window! */
460 new_pmap_width = min (result->width, target_width); 478 new_pmap_width = min (result->width, target_width);
461 new_pmap_height = min (result->height, target_height); 479 new_pmap_height = min (result->height, target_height);
… …
486 layers[0].clip_width = target_width; 504 layers[0].clip_width = target_width;
487 layers[0].clip_height = target_height; 505 layers[0].clip_height = target_height;
488 layers[0].tint = background_tint; 506 layers[0].tint = background_tint;
489 layers[1].im = result; 507 layers[1].im = result;
490 508
491 if (h_scale == 0 || v_scale == 0) 509 if (bg_flags & BG_TILE)
492 { 510 {
493 /* tile horizontally */ 511 /* tile horizontally */
494 while (x > 0) x -= (int)result->width; 512 while (x > 0) x -= (int)result->width;
495 layers[1].dst_x = x; 513 layers[1].dst_x = x;
496 layers[1].clip_width = result->width+target_width; 514 layers[1].clip_width = result->width+target_width;
… …
500 /* clip horizontally */ 518 /* clip horizontally */
501 layers[1].dst_x = x; 519 layers[1].dst_x = x;
502 layers[1].clip_width = result->width; 520 layers[1].clip_width = result->width;
503 } 521 }
504 522
505 if (h_scale == 0 || v_scale == 0) 523 if (bg_flags & BG_TILE)
506 { 524 {
507 while (y > 0) y -= (int)result->height; 525 while (y > 0) y -= (int)result->height;
508 layers[1].dst_y = y; 526 layers[1].dst_y = y;
509 layers[1].clip_height = result->height + target_height; 527 layers[1].clip_height = result->height + target_height;
510 } 528 }
… …
560 578
561 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 579 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
562 int dst_width = result->width, dst_height = result->height; 580 int dst_width = result->width, dst_height = result->height;
563 if (background == NULL) 581 if (background == NULL)
564 { 582 {
565 if (!(h_scale == 0 || v_scale == 0)) 583 if (!(bg_flags & BG_TILE))
566 { 584 {
567 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 585 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
568 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 586 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
569 } 587 }
570 588
… …
616 else if (depth == 15 || depth == 16) 634 else if (depth == 15 || depth == 16)
617 bytes_per_pixel = 2; 635 bytes_per_pixel = 2;
618 else 636 else
619 return false; 637 return false;
620 638
621 width_r = rxvt_popcount (visual->red_mask); 639 width_r = ecb_popcount32 (visual->red_mask);
622 width_g = rxvt_popcount (visual->green_mask); 640 width_g = ecb_popcount32 (visual->green_mask);
623 width_b = rxvt_popcount (visual->blue_mask); 641 width_b = ecb_popcount32 (visual->blue_mask);
624 642
625 if (width_r > 8 || width_g > 8 || width_b > 8) 643 if (width_r > 8 || width_g > 8 || width_b > 8)
626 return false; 644 return false;
627 645
628 sh_r = rxvt_ctz (visual->red_mask); 646 sh_r = ecb_ctz32 (visual->red_mask);
629 sh_g = rxvt_ctz (visual->green_mask); 647 sh_g = ecb_ctz32 (visual->green_mask);
630 sh_b = rxvt_ctz (visual->blue_mask); 648 sh_b = ecb_ctz32 (visual->blue_mask);
631 649
632 if (width > INT_MAX / height / bytes_per_pixel) 650 if (width > INT_MAX / height / bytes_per_pixel)
633 return false; 651 return false;
634 652
635 data = (char *)malloc (width * height * bytes_per_pixel); 653 data = (char *)malloc (width * height * bytes_per_pixel);
… …
642 { 660 {
643 free (data); 661 free (data);
644 return false; 662 return false;
645 } 663 }
646 664
647 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 665 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
648 666
649 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 667 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
650 channels = gdk_pixbuf_get_n_channels (pixbuf); 668 channels = gdk_pixbuf_get_n_channels (pixbuf);
651 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 669 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
652 line = data; 670 line = data;
… …
705 get_image_geometry (image_width, image_height, w, h, x, y); 723 get_image_geometry (image_width, image_height, w, h, x, y);
706 724
707 if (!(bg_flags & BG_ROOT_ALIGN) 725 if (!(bg_flags & BG_ROOT_ALIGN)
708 && (x >= target_width 726 && (x >= target_width
709 || y >= target_height 727 || y >= target_height
710 || (x + w <= 0) 728 || x + w <= 0
711 || (y + h <= 0))) 729 || y + h <= 0))
712 return false; 730 return false;
713 731
714 result = pixbuf; 732 result = pixbuf;
715 733
716 if ((w != image_width) 734 if (w != image_width
717 || (h != image_height)) 735 || h != image_height)
718 { 736 {
719 result = gdk_pixbuf_scale_simple (pixbuf, 737 result = gdk_pixbuf_scale_simple (pixbuf,
720 w, h, 738 w, h,
721 GDK_INTERP_BILINEAR); 739 GDK_INTERP_BILINEAR);
722 } 740 }
723 741
742 if (!result)
743 return false;
744
724 bool ret = false; 745 bool ret = false;
725 746
726 if (result)
727 {
728 XGCValues gcv; 747 XGCValues gcv;
729 GC gc; 748 GC gc;
730 Pixmap root_pmap; 749 Pixmap root_pmap;
731 750
732 image_width = gdk_pixbuf_get_width (result); 751 image_width = gdk_pixbuf_get_width (result);
733 image_height = gdk_pixbuf_get_height (result); 752 image_height = gdk_pixbuf_get_height (result);
734 753
735 if (tr_flags) 754 if (tr_flags)
736 { 755 {
737 root_pmap = bg_pixmap; 756 root_pmap = bg_pixmap;
738 bg_pixmap = None; 757 bg_pixmap = None;
758 }
759 else
760 {
761 if (bg_flags & BG_TILE)
739 } 762 {
740 else
741 {
742 if (h_scale == 0 || v_scale == 0)
743 {
744 new_pmap_width = min (image_width, target_width); 763 new_pmap_width = min (image_width, target_width);
745 new_pmap_height = min (image_height, target_height); 764 new_pmap_height = min (image_height, target_height);
746 } 765 }
747 } 766 }
748 767
749 if (bg_pixmap == None 768 if (bg_pixmap == None
750 || bg_pmap_width != new_pmap_width 769 || bg_pmap_width != new_pmap_width
751 || bg_pmap_height != new_pmap_height) 770 || bg_pmap_height != new_pmap_height)
752 { 771 {
753 if (bg_pixmap) 772 if (bg_pixmap)
754 XFreePixmap (dpy, bg_pixmap); 773 XFreePixmap (dpy, bg_pixmap);
755 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth); 774 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
756 bg_pmap_width = new_pmap_width; 775 bg_pmap_width = new_pmap_width;
757 bg_pmap_height = new_pmap_height; 776 bg_pmap_height = new_pmap_height;
758 } 777 }
759 778
760 gcv.foreground = pix_colors[Color_bg]; 779 gcv.foreground = pix_colors[Color_bg];
761 gc = XCreateGC (dpy, vt, GCForeground, &gcv); 780 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
762 781
763 if (h_scale == 0 || v_scale == 0) 782 if (gc)
783 {
784 if (bg_flags & BG_TILE)
764 { 785 {
765 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth); 786 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
766 pixbuf_to_pixmap (result, tile, gc, 787 pixbuf_to_pixmap (result, tile, gc,
767 0, 0, 788 0, 0,
768 0, 0, 789 0, 0,
… …
798 } 819 }
799 820
800#if XRENDER 821#if XRENDER
801 if (tr_flags) 822 if (tr_flags)
802 { 823 {
803 XRenderPictureAttributes pa;
804
805 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 824 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
825
806 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 826 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
807 827
808 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
809 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 828 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
810 829
811 pa.repeat = True; 830 Picture mask = create_xrender_mask (dpy, vt, False, False);
812 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
813 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
814 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
815 XFreePixmap (dpy, mask_pmap);
816 831
817 if (src && dst && mask)
818 {
819 XRenderColor mask_c; 832 XRenderColor mask_c;
820 833
821 mask_c.alpha = 0x8000; 834 mask_c.alpha = 0x8000;
822 mask_c.red = 0; 835 mask_c.red =
823 mask_c.green = 0; 836 mask_c.green =
824 mask_c.blue = 0; 837 mask_c.blue = 0;
825 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 838 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
839
826 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 840 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
827 }
828 841
829 XRenderFreePicture (dpy, src); 842 XRenderFreePicture (dpy, src);
830 XRenderFreePicture (dpy, dst); 843 XRenderFreePicture (dpy, dst);
831 XRenderFreePicture (dpy, mask); 844 XRenderFreePicture (dpy, mask);
832
833 XFreePixmap (dpy, root_pmap);
834 } 845 }
835#endif 846#endif
836 847
837 if (result != pixbuf)
838 g_object_unref (result);
839
840 XFreeGC (dpy, gc); 848 XFreeGC (dpy, gc);
841 849
842 ret = true; 850 ret = true;
843 } 851 }
852
853 if (result != pixbuf)
854 g_object_unref (result);
855
856 if (tr_flags)
857 XFreePixmap (dpy, root_pmap);
844 858
845 return ret; 859 return ret;
846} 860}
847# endif /* HAVE_PIXBUF */ 861# endif /* HAVE_PIXBUF */
848 862
… …
850rxvt_term::bg_set_file (const char *file) 864rxvt_term::bg_set_file (const char *file)
851{ 865{
852 if (!file || !*file) 866 if (!file || !*file)
853 return false; 867 return false;
854 868
869 bool ret = false;
855 if (const char *p = strchr (file, ';')) 870 const char *p = strchr (file, ';');
871
872 if (p)
856 { 873 {
857 size_t len = p - file; 874 size_t len = p - file;
858 char *f = rxvt_temp_buf<char> (len + 1); 875 char *f = rxvt_temp_buf<char> (len + 1);
859 memcpy (f, file, len); 876 memcpy (f, file, len);
860 f[len] = '\0'; 877 f[len] = '\0';
… …
869 { 886 {
870 if (original_asim) 887 if (original_asim)
871 safe_asimage_destroy (original_asim); 888 safe_asimage_destroy (original_asim);
872 original_asim = image; 889 original_asim = image;
873 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER; 890 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
874 return true; 891 ret = true;
875 } 892 }
876# endif 893# endif
877 894
878# ifdef HAVE_PIXBUF 895# ifdef HAVE_PIXBUF
879 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 896 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
… …
881 { 898 {
882 if (pixbuf) 899 if (pixbuf)
883 g_object_unref (pixbuf); 900 g_object_unref (pixbuf);
884 pixbuf = image; 901 pixbuf = image;
885 bg_flags |= BG_IS_FROM_FILE; 902 bg_flags |= BG_IS_FROM_FILE;
886 return true; 903 ret = true;
887 } 904 }
888# endif 905# endif
889 906
907 if (ret)
908 {
909 if (p)
910 bg_set_geometry (p + 1);
911 else
912 bg_set_default_geometry ();
913 }
914
890 return false; 915 return ret;
891} 916}
892 917
893# endif /* BG_IMAGE_FROM_FILE */ 918# endif /* BG_IMAGE_FROM_FILE */
894 919
895# ifdef ENABLE_TRANSPARENCY 920# ifdef ENABLE_TRANSPARENCY
… …
931 { 956 {
932 changed = true; 957 changed = true;
933 v_blurRadius = vr; 958 v_blurRadius = vr;
934 } 959 }
935 960
936 if (v_blurRadius == 0 && h_blurRadius == 0) 961 if (h_blurRadius == 0 || v_blurRadius == 0)
937 bg_flags &= ~BG_NEEDS_BLUR; 962 bg_flags &= ~BG_NEEDS_BLUR;
938 else 963 else
939 bg_flags |= BG_NEEDS_BLUR; 964 bg_flags |= BG_NEEDS_BLUR;
940 965
941 return changed; 966 return changed;
942} 967}
943 968
944static inline unsigned long 969void
945compute_tint_shade_flags (rxvt_color *tint, int shade) 970rxvt_term::set_tint_shade_flags ()
946{ 971{
947 unsigned long flags = 0; 972 rgba c;
948 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
949 bool has_shade = shade != 100; 973 bool has_shade = shade != 100;
950 974
951 if (tint) 975 bg_flags &= ~BG_TINT_FLAGS;
952 { 976
953 tint->get (c); 977 tint.get (c);
978
954 if (!has_shade 979 if (!has_shade
955 && (c.r <= 0x00ff || c.r >= 0xff00) 980 && (c.r <= 0x00ff || c.r >= 0xff00)
956 && (c.g <= 0x00ff || c.g >= 0xff00) 981 && (c.g <= 0x00ff || c.g >= 0xff00)
957 && (c.b <= 0x00ff || c.b >= 0xff00)) 982 && (c.b <= 0x00ff || c.b >= 0xff00))
958 flags |= rxvt_term::BG_TINT_BITAND; 983 bg_flags |= BG_TINT_BITAND;
959 }
960 984
961 if (has_shade || tint) 985 if (has_shade
986 || c.r < 0xff00
987 || c.g < 0xff00
988 || c.b < 0xff00)
962 flags |= rxvt_term::BG_NEEDS_TINT; 989 bg_flags |= BG_NEEDS_TINT;
963
964 return flags;
965} 990}
966 991
967bool 992bool
968rxvt_term::bg_set_tint (rxvt_color &new_tint) 993rxvt_term::bg_set_tint (rxvt_color &new_tint)
969{ 994{
970 if (!(bg_flags & BG_TINT_SET) || tint != new_tint) 995 if (tint != new_tint)
971 { 996 {
972 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
973 tint = new_tint; 997 tint = new_tint;
974 bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags | BG_TINT_SET; 998 set_tint_shade_flags ();
975 return true; 999 return true;
976 } 1000 }
977 1001
978 return false; 1002 return false;
979} 1003}
980 1004
981bool 1005bool
982rxvt_term::bg_set_shade (const char *shade_str) 1006rxvt_term::bg_set_shade (const char *shade_str)
983{ 1007{
984 int new_shade = (shade_str) ? atoi (shade_str) : 100; 1008 int new_shade = atoi (shade_str);
985 1009
986 clamp_it (new_shade, -100, 200); 1010 clamp_it (new_shade, -100, 200);
987 if (new_shade < 0) 1011 if (new_shade < 0)
988 new_shade = 200 - (100 + new_shade); 1012 new_shade = 200 - (100 + new_shade);
989 1013
990 if (new_shade != shade) 1014 if (new_shade != shade)
991 { 1015 {
992 unsigned long new_flags = compute_tint_shade_flags ((bg_flags & BG_TINT_SET) ? &tint : NULL, new_shade);
993 shade = new_shade; 1016 shade = new_shade;
994 bg_flags = (bg_flags & ~BG_TINT_FLAGS) | new_flags; 1017 set_tint_shade_flags ();
995 return true; 1018 return true;
996 } 1019 }
997 1020
998 return false; 1021 return false;
999} 1022}
… …
1024bool 1047bool
1025rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1048rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1026{ 1049{
1027 bool ret = false; 1050 bool ret = false;
1028#if XRENDER 1051#if XRENDER
1052 if (!(bg_flags & BG_HAS_RENDER_CONV))
1053 return false;
1054
1029 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1055 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1030 double *kernel = (double *)malloc (size * sizeof (double)); 1056 double *kernel = (double *)malloc (size * sizeof (double));
1031 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1057 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1032 1058
1033 XRenderPictureAttributes pa;
1034 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1059 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1035 1060
1036 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1061 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1037 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1062 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1038 1063
1039 if (kernel && params && src && dst) 1064 if (kernel && params)
1040 { 1065 {
1041 if (h_blurRadius)
1042 {
1043 size = h_blurRadius * 2 + 1; 1066 size = h_blurRadius * 2 + 1;
1044 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1067 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1045 1068
1046 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1069 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1047 XRenderComposite (dpy, 1070 XRenderComposite (dpy,
1048 PictOpSrc, 1071 PictOpSrc,
1049 src, 1072 src,
1050 None, 1073 None,
1051 dst, 1074 dst,
1052 0, 0, 1075 0, 0,
1053 0, 0, 1076 0, 0,
1054 0, 0, 1077 0, 0,
1055 width, height); 1078 width, height);
1056 }
1057 1079
1058 if (v_blurRadius)
1059 {
1060 size = v_blurRadius * 2 + 1; 1080 size = v_blurRadius * 2 + 1;
1061 get_gaussian_kernel (v_blurRadius, size, kernel, params); 1081 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1062 ::swap (params[0], params[1]); 1082 ::swap (params[0], params[1]);
1063 1083
1064 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1084 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1065 XRenderComposite (dpy, 1085 XRenderComposite (dpy,
1066 PictOpSrc, 1086 PictOpSrc,
1067 src, 1087 src,
1068 None, 1088 None,
1069 dst, 1089 dst,
1070 0, 0, 1090 0, 0,
1071 0, 0, 1091 0, 0,
1072 0, 0, 1092 0, 0,
1073 width, height); 1093 width, height);
1074 }
1075 1094
1076 ret = true; 1095 ret = true;
1077 } 1096 }
1078 1097
1079 free (kernel); 1098 free (kernel);
… …
1106 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height); 1125 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1107 ret = true; 1126 ret = true;
1108 XFreeGC (dpy, gc); 1127 XFreeGC (dpy, gc);
1109 } 1128 }
1110 } 1129 }
1111 else
1112 {
1113# if XRENDER 1130# if XRENDER
1114 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1131 else if (bg_flags & BG_HAS_RENDER)
1132 {
1133 rgba c;
1115 1134
1116 if (bg_flags & BG_TINT_SET)
1117 tint.get (c); 1135 tint.get (c);
1118 1136
1119 if (shade <= 100) 1137 if (shade <= 100)
1120 { 1138 {
1121 c.r = (c.r * shade) / 100; 1139 c.r = c.r * shade / 100;
1122 c.g = (c.g * shade) / 100; 1140 c.g = c.g * shade / 100;
1123 c.b = (c.b * shade) / 100; 1141 c.b = c.b * shade / 100;
1124 } 1142 }
1125 else 1143 else
1126 { 1144 {
1127 c.r = (c.r * (200 - shade)) / 100; 1145 c.r = c.r * (200 - shade) / 100;
1128 c.g = (c.g * (200 - shade)) / 100; 1146 c.g = c.g * (200 - shade) / 100;
1129 c.b = (c.b * (200 - shade)) / 100; 1147 c.b = c.b * (200 - shade) / 100;
1130 } 1148 }
1131 1149
1132 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1133 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1134 XRenderPictureAttributes pa;
1135 1151
1136 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1152 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1137 1153
1138 pa.repeat = True; 1154 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1139 1155
1140 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1156 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1141 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1142 XFreePixmap (dpy, overlay_pmap);
1143 1157
1144 pa.component_alpha = True;
1145 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1146 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1147 XFreePixmap (dpy, mask_pmap);
1148
1149 if (mask_pic && overlay_pic && back_pic)
1150 {
1151 XRenderColor mask_c; 1158 XRenderColor mask_c;
1152 1159
1153 mask_c.red = mask_c.green = mask_c.blue = 0;
1154 mask_c.alpha = 0xffff; 1160 mask_c.alpha = 0xffff;
1161 mask_c.red =
1162 mask_c.green =
1163 mask_c.blue = 0;
1164 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1165
1166 mask_c.alpha = 0;
1167 mask_c.red = 0xffff - c.r;
1168 mask_c.green = 0xffff - c.g;
1169 mask_c.blue = 0xffff - c.b;
1170 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1171
1172 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1173
1174 if (shade > 100)
1175 {
1176 mask_c.alpha = 0;
1177 mask_c.red =
1178 mask_c.green =
1179 mask_c.blue = 0xffff * (shade - 100) / 100;
1155 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1180 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1156 1181
1157 mask_c.alpha = 0;
1158 mask_c.red = 0xffff - c.r;
1159 mask_c.green = 0xffff - c.g;
1160 mask_c.blue = 0xffff - c.b;
1161 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1162 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1163
1164 if (shade > 100)
1165 {
1166 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1167 mask_c.alpha = 0;
1168 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1169
1170 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1182 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1171 } 1183 }
1172 1184
1173 ret = true; 1185 ret = true;
1174 }
1175 1186
1176 XRenderFreePicture (dpy, mask_pic); 1187 XRenderFreePicture (dpy, mask_pic);
1177 XRenderFreePicture (dpy, overlay_pic); 1188 XRenderFreePicture (dpy, overlay_pic);
1178 XRenderFreePicture (dpy, back_pic); 1189 XRenderFreePicture (dpy, back_pic);
1190 }
1179# endif 1191# endif
1180 }
1181 1192
1182 return ret; 1193 return ret;
1183} 1194}
1184 1195
1185/* make_transparency_pixmap() 1196/*
1186 * Builds a pixmap of the same size as the terminal window that contains 1197 * Builds a pixmap of the same size as the terminal window that contains
1187 * the tiled portion of the root pixmap that is supposed to be covered by 1198 * the tiled portion of the root pixmap that is supposed to be covered by
1188 * our window. 1199 * our window.
1189 */ 1200 */
1190unsigned long 1201unsigned long
… …
1234 if (root_pixmap != None && root_depth != depth) 1245 if (root_pixmap != None && root_depth != depth)
1235 { 1246 {
1236#if XRENDER 1247#if XRENDER
1237 if (bg_flags & BG_HAS_RENDER) 1248 if (bg_flags & BG_HAS_RENDER)
1238 { 1249 {
1239 XRenderPictureAttributes pa; 1250 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1240 1251
1241 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 1252 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1242 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 1253 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1243 1254
1244 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1245 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 1255 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1246 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 1256 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1247 1257
1248 if (src && dst)
1249 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 1258 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1250 else
1251 {
1252 XFreePixmap (dpy, recoded_root_pmap);
1253 root_pixmap = None;
1254 }
1255 1259
1256 XRenderFreePicture (dpy, src); 1260 XRenderFreePicture (dpy, src);
1257 XRenderFreePicture (dpy, dst); 1261 XRenderFreePicture (dpy, dst);
1258 } 1262 }
1259 else 1263 else
1260#endif 1264#endif
1261 root_pixmap = None; 1265 recoded_root_pmap = None;
1262 } 1266 }
1263 1267
1264 if (root_pixmap == None) 1268 if (recoded_root_pmap == None)
1265 return 0; 1269 return 0;
1266 1270
1267 if (bg_pixmap == None 1271 if (bg_pixmap == None
1268 || bg_pmap_width != window_width 1272 || bg_pmap_width != window_width
1269 || bg_pmap_height != window_height) 1273 || bg_pmap_height != window_height)
… …
1273 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth); 1277 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1274 bg_pmap_width = window_width; 1278 bg_pmap_width = window_width;
1275 bg_pmap_height = window_height; 1279 bg_pmap_height = window_height;
1276 } 1280 }
1277 1281
1278 if (bg_pixmap == None)
1279 return 0;
1280
1281 /* straightforward pixmap copy */ 1282 /* straightforward pixmap copy */
1282 while (sx < 0) sx += (int)root_width; 1283 while (sx < 0) sx += root_pmap_width;
1283 while (sy < 0) sy += (int)root_height; 1284 while (sy < 0) sy += root_pmap_height;
1284 1285
1285 gcv.tile = recoded_root_pmap; 1286 gcv.tile = recoded_root_pmap;
1286 gcv.fill_style = FillTiled; 1287 gcv.fill_style = FillTiled;
1287 gcv.ts_x_origin = -sx; 1288 gcv.ts_x_origin = -sx;
1288 gcv.ts_y_origin = -sy; 1289 gcv.ts_y_origin = -sy;
… …
1290 1291
1291 if (gc) 1292 if (gc)
1292 { 1293 {
1293 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1294 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1294 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1295 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1295 XFreeGC (dpy, gc);
1296 1296
1297 if (!(bg_flags & BG_CLIENT_RENDER)) 1297 if (!(bg_flags & BG_CLIENT_RENDER))
1298 { 1298 {
1299 if ((bg_flags & BG_NEEDS_BLUR) 1299 if (bg_flags & BG_NEEDS_BLUR)
1300 && (bg_flags & BG_HAS_RENDER_CONV))
1301 { 1300 {
1302 if (blur_pixmap (bg_pixmap, visual, window_width, window_height)) 1301 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1303 result &= ~BG_NEEDS_BLUR; 1302 result &= ~BG_NEEDS_BLUR;
1304 } 1303 }
1305 if ((bg_flags & BG_NEEDS_TINT) 1304 if (bg_flags & BG_NEEDS_TINT)
1306 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1307 { 1305 {
1308 if (tint_pixmap (bg_pixmap, visual, window_width, window_height)) 1306 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1309 result &= ~BG_NEEDS_TINT; 1307 result &= ~BG_NEEDS_TINT;
1310 } 1308 }
1309# ifndef HAVE_AFTERIMAGE
1310 if (result & BG_NEEDS_TINT)
1311 {
1312 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1313 if (ximage)
1314 {
1315 /* our own client-side tinting */
1316 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1317
1318 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1319 XDestroyImage (ximage);
1320 }
1321 }
1322# endif
1311 } /* server side rendering completed */ 1323 } /* server side rendering completed */
1324
1325 XFreeGC (dpy, gc);
1312 } 1326 }
1313 1327
1314 if (recoded_root_pmap != root_pixmap) 1328 if (recoded_root_pmap != root_pixmap)
1315 XFreePixmap (dpy, recoded_root_pmap); 1329 XFreePixmap (dpy, recoded_root_pmap);
1316 1330
… …
1325 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]); 1339 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1326 1340
1327 root_pixmap = new_root_pixmap; 1341 root_pixmap = new_root_pixmap;
1328} 1342}
1329# endif /* ENABLE_TRANSPARENCY */ 1343# endif /* ENABLE_TRANSPARENCY */
1330
1331#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1332static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1333# endif
1334 1344
1335bool 1345bool
1336rxvt_term::bg_render () 1346rxvt_term::bg_render ()
1337{ 1347{
1338 unsigned long tr_flags = 0; 1348 unsigned long tr_flags = 0;
… …
1343 { 1353 {
1344 /* we need to re-generate transparency pixmap in that case ! */ 1354 /* we need to re-generate transparency pixmap in that case ! */
1345 tr_flags = make_transparency_pixmap (); 1355 tr_flags = make_transparency_pixmap ();
1346 if (tr_flags == 0) 1356 if (tr_flags == 0)
1347 return false; 1357 return false;
1348 else if (!(tr_flags & BG_EFFECTS_FLAGS))
1349 bg_flags |= BG_IS_VALID; 1358 bg_flags |= BG_IS_VALID;
1350 } 1359 }
1351# endif 1360# endif
1352 1361
1353# ifdef BG_IMAGE_FROM_FILE 1362# ifdef BG_IMAGE_FROM_FILE
1354 if ((bg_flags & BG_IS_FROM_FILE) 1363 if ((bg_flags & BG_IS_FROM_FILE)
… …
1357 if (render_image (tr_flags)) 1366 if (render_image (tr_flags))
1358 bg_flags |= BG_IS_VALID; 1367 bg_flags |= BG_IS_VALID;
1359 } 1368 }
1360# endif 1369# endif
1361 1370
1362# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1363 XImage *result = NULL;
1364
1365 if (tr_flags && !(bg_flags & BG_IS_VALID))
1366 {
1367 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1368 }
1369
1370 if (result)
1371 {
1372 /* our own client-side tinting */
1373 if (tr_flags & BG_NEEDS_TINT)
1374 {
1375 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1376 if (bg_flags & BG_TINT_SET)
1377 tint.get (c);
1378 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1379 }
1380
1381 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1382
1383 if (gc)
1384 {
1385 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1386
1387 XFreeGC (dpy, gc);
1388 bg_flags |= BG_IS_VALID;
1389 }
1390
1391 XDestroyImage (result);
1392 }
1393# endif
1394
1395 if (!(bg_flags & BG_IS_VALID)) 1371 if (!(bg_flags & BG_IS_VALID))
1396 { 1372 {
1397 if (bg_pixmap != None) 1373 if (bg_pixmap != None)
1398 { 1374 {
1399 XFreePixmap (dpy, bg_pixmap); 1375 XFreePixmap (dpy, bg_pixmap);
… …
1411 1387
1412void 1388void
1413rxvt_term::bg_init () 1389rxvt_term::bg_init ()
1414{ 1390{
1415#ifdef ENABLE_TRANSPARENCY 1391#ifdef ENABLE_TRANSPARENCY
1392 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1393 tint.set (this, c);
1416 shade = 100; 1394 shade = 100;
1417#endif 1395#endif
1418 1396
1419 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV); 1397 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1420#if XRENDER 1398#if XRENDER
… …
1434} 1412}
1435 1413
1436#endif /* HAVE_BG_PIXMAP */ 1414#endif /* HAVE_BG_PIXMAP */
1437 1415
1438#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1416#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1439/* taken from aterm-0.4.2 */ 1417/* based on code from aterm-0.4.2 */
1440 1418
1441static void 1419static inline void
1442shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c) 1420fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1421{
1422 for (int i = 0; i <= mask >> sh; i++)
1423 {
1424 uint32_t tmp;
1425 tmp = i * high;
1426 tmp += (mask >> sh) * low;
1427 lookup[i] = (tmp / 0xffff) << sh;
1428 }
1429}
1430
1431void
1432rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1443{ 1433{
1444 int sh_r, sh_g, sh_b; 1434 int sh_r, sh_g, sh_b;
1445 uint32_t mask_r, mask_g, mask_b; 1435 uint32_t mask_r, mask_g, mask_b;
1446 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1436 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1447 rgba low; 1437 unsigned short low;
1448 rgba high;
1449 int i;
1450 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst; 1438 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1451 1439
1452 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1440 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1453 1441
1454 /* for convenience */ 1442 /* for convenience */
1455 mask_r = visual->red_mask; 1443 mask_r = visual->red_mask;
… …
1513 break; 1501 break;
1514 default: 1502 default:
1515 return; /* we do not support this color depth */ 1503 return; /* we do not support this color depth */
1516 } 1504 }
1517 1505
1506 rgba c;
1507
1508 tint.get (c);
1509
1518 /* prepare limits for color transformation (each channel is handled separately) */ 1510 /* prepare limits for color transformation (each channel is handled separately) */
1519 if (shade > 100) 1511 if (shade > 100)
1520 { 1512 {
1521 shade = 200 - shade;
1522
1523 high.r = c.r * shade / 100;
1524 high.g = c.g * shade / 100;
1525 high.b = c.b * shade / 100;
1526
1527 low.r = 65535 * (100 - shade) / 100; 1513 c.r = c.r * (200 - shade) / 100;
1528 low.g = 65535 * (100 - shade) / 100; 1514 c.g = c.g * (200 - shade) / 100;
1529 low.b = 65535 * (100 - shade) / 100; 1515 c.b = c.b * (200 - shade) / 100;
1516
1517 low = 0xffff * (shade - 100) / 100;
1530 } 1518 }
1531 else 1519 else
1532 { 1520 {
1533 high.r = c.r * shade / 100; 1521 c.r = c.r * shade / 100;
1534 high.g = c.g * shade / 100; 1522 c.g = c.g * shade / 100;
1535 high.b = c.b * shade / 100; 1523 c.b = c.b * shade / 100;
1536 1524
1537 low.r = low.g = low.b = 0; 1525 low = 0;
1538 } 1526 }
1539 1527
1540 /* fill our lookup tables */ 1528 /* fill our lookup tables */
1541 for (i = 0; i <= mask_r>>sh_r; i++) 1529 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1542 { 1530 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1543 uint32_t tmp; 1531 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1544 tmp = i * high.r;
1545 tmp += (mask_r>>sh_r) * low.r;
1546 lookup_r[i] = (tmp/65535)<<sh_r;
1547 }
1548 for (i = 0; i <= mask_g>>sh_g; i++)
1549 {
1550 uint32_t tmp;
1551 tmp = i * high.g;
1552 tmp += (mask_g>>sh_g) * low.g;
1553 lookup_g[i] = (tmp/65535)<<sh_g;
1554 }
1555 for (i = 0; i <= mask_b>>sh_b; i++)
1556 {
1557 uint32_t tmp;
1558 tmp = i * high.b;
1559 tmp += (mask_b>>sh_b) * low.b;
1560 lookup_b[i] = (tmp/65535)<<sh_b;
1561 }
1562 1532
1563 /* apply table to input image (replacing colors by newly calculated ones) */ 1533 /* apply table to input image (replacing colors by newly calculated ones) */
1564 if (ximage->bits_per_pixel == 32 1534 if (ximage->bits_per_pixel == 32
1565 && (ximage->depth == 24 || ximage->depth == 32) 1535 && (ximage->depth == 24 || ximage->depth == 32)
1566 && ximage->byte_order == host_byte_order) 1536 && ximage->byte_order == host_byte_order)

Diff Legend

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