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.183 by sf-exg, Sun Dec 25 17:05:53 2011 UTC vs.
Revision 1.211 by sf-exg, Sun May 13 15:28:44 2012 UTC

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 <schmorp@schmorp.de> 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-2012 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
12 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
13 * (at your option) any later version. 13 * (at your option) any later version.
20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
23 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
24 24
25#include <cmath> 25#include <math.h>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#if XRENDER 29#if XRENDER
30# include <X11/extensions/Xrender.h> 30# include <X11/extensions/Xrender.h>
32 32
33#ifndef FilterConvolution 33#ifndef FilterConvolution
34#define FilterConvolution "convolution" 34#define FilterConvolution "convolution"
35#endif 35#endif
36 36
37#ifndef RepeatPad
38#define RepeatPad True
39#endif
40
37#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
38void 60void
39rxvt_term::bg_destroy () 61rxvt_term::bg_destroy ()
40{ 62{
41#ifdef HAVE_AFTERIMAGE
42 if (original_asim)
43 safe_asimage_destroy (original_asim);
44 if (asv)
45 destroy_asvisual (asv, 0);
46 if (asimman)
47 destroy_image_manager (asimman, 0);
48#endif
49
50#ifdef HAVE_PIXBUF 63#ifdef HAVE_PIXBUF
51 if (pixbuf) 64 if (pixbuf)
52 g_object_unref (pixbuf); 65 g_object_unref (pixbuf);
53#endif 66#endif
54 67
107 120
108 return false; 121 return false;
109} 122}
110 123
111# ifdef BG_IMAGE_FROM_FILE 124# ifdef BG_IMAGE_FROM_FILE
112static inline bool
113check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
114{
115 if (geom_flags & flag)
116 {
117 if (new_value > 1000)
118 new_value = 1000;
119 if (new_value != scale)
120 {
121 scale = new_value;
122 return true;
123 }
124 }
125 return false;
126}
127
128static inline bool
129check_set_align_value (int geom_flags, int flag, int &align, int new_value)
130{
131 if (geom_flags & flag)
132 {
133 if (new_value < -100)
134 new_value = -100;
135 else if (new_value > 200)
136 new_value = 200;
137 if (new_value != align)
138 {
139 align = new_value;
140 return true;
141 }
142 }
143 return false;
144}
145
146static inline int 125static inline int
147make_align_position (int align, int window_size, int image_size) 126make_align_position (int align, int window_size, int image_size)
148{ 127{
149 int diff = window_size - image_size;
150 int smaller = min (image_size, window_size);
151
152 if (align >= 0 && align <= 100) 128 if (align >= 0 && align <= 100)
153 return diff * align / 100; 129 return lerp (0, window_size - image_size, align);
154 else if (align > 100 && align <= 200) 130 else if (align > 100)
155 return (align - 100) * smaller / 100 + window_size - smaller; 131 return lerp (window_size - image_size, window_size, align - 100);
156 else if (align >= -100 && align < 0) 132 else
157 return (align + 100) * smaller / 100 - image_size; 133 return lerp (-image_size, 0, align + 100);
158 return 0;
159} 134}
160 135
161static inline int 136static inline int
162make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 137make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
163{ 138{
169 src_pos = -pos; 144 src_pos = -pos;
170 dst_pos = 0; 145 dst_pos = 0;
171 dst_size += pos; 146 dst_size += pos;
172 } 147 }
173 148
174 if (dst_pos + dst_size > target_size)
175 dst_size = target_size - dst_pos; 149 min_it (dst_size, target_size - dst_pos);
176 return src_pos; 150 return src_pos;
177} 151}
178 152
179bool 153bool
180rxvt_term::bg_set_geometry (const char *geom, bool update) 154rxvt_term::bg_set_geometry (const char *geom, bool update)
181{ 155{
182 bool changed = false; 156 bool changed = false;
183 int geom_flags = 0; 157 int geom_flags = 0;
184 int x = 0, y = 0; 158 int x = h_align;
159 int y = v_align;
185 unsigned int w = 0, h = 0; 160 unsigned int w = h_scale;
186 unsigned long new_flags = bg_flags & ~BG_GEOMETRY_FLAGS; 161 unsigned int h = v_scale;
162 unsigned long new_flags = 0;
187 163
188 if (geom == NULL) 164 if (geom == NULL)
189 return false; 165 return false;
190 166
191 if (geom[0]) 167 if (geom[0])
284 } /* done parsing ops */ 260 } /* done parsing ops */
285 261
286 rxvt_free_strsplit (arr); 262 rxvt_free_strsplit (arr);
287 } 263 }
288 264
265 new_flags |= bg_flags & ~BG_GEOMETRY_FLAGS;
266
289 if (!update) 267 if (!update)
290 { 268 {
291 if (!(geom_flags & XValue)) 269 if (!(geom_flags & XValue))
292 x = y = defaultAlign; 270 x = y = defaultAlign;
293 else if (!(geom_flags & YValue)) 271 else if (!(geom_flags & YValue))
297 w = h = defaultScale; 275 w = h = defaultScale;
298 else if (!(geom_flags & HeightValue)) 276 else if (!(geom_flags & HeightValue))
299 h = w; 277 h = w;
300 else if (!(geom_flags & WidthValue)) 278 else if (!(geom_flags & WidthValue))
301 w = h; 279 w = h;
302
303 geom_flags |= WidthValue|HeightValue|XValue|YValue;
304 } 280 }
305 281
306 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true; 282 min_it (w, 1000);
307 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true; 283 min_it (h, 1000);
308 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true; 284 clamp_it (x, -100, 200);
309 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true; 285 clamp_it (y, -100, 200);
310 286
311 if (new_flags != bg_flags) 287 if (bg_flags != new_flags
288 || h_scale != w
289 || v_scale != h
290 || h_align != x
291 || v_align != y)
312 { 292 {
313 bg_flags = new_flags; 293 bg_flags = new_flags;
294 h_scale = w;
295 v_scale = h;
296 h_align = x;
297 v_align = y;
314 changed = true; 298 changed = true;
315 } 299 }
316 300
317 return changed; 301 return changed;
318} 302}
346 { 330 {
347 x = make_align_position (h_align, target_width, w); 331 x = make_align_position (h_align, target_width, w);
348 y = make_align_position (v_align, target_height, h); 332 y = make_align_position (v_align, target_height, h);
349 } 333 }
350 334
351 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
352 if (!(bg_flags & BG_TILE) 335 if (!(bg_flags & BG_TILE)
353 || h_scale || v_scale 336 || h_scale || v_scale
354 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align)) 337 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
355 || w > target_width || h > target_height) 338 || image_width > target_width || image_height > target_height)
356 bg_flags |= BG_IS_SIZE_SENSITIVE; 339 bg_flags |= BG_IS_SIZE_SENSITIVE;
357}
358
359# ifdef HAVE_AFTERIMAGE
360bool
361rxvt_term::render_image (unsigned long tr_flags)
362{
363 init_asv ();
364
365 ASImage *background = NULL;
366 ARGB32 background_tint = TINT_LEAVE_SAME;
367
368# ifdef ENABLE_TRANSPARENCY
369 if (tr_flags)
370 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
371
372 if (tr_flags & BG_NEEDS_TINT)
373 {
374 ShadingInfo as_shade;
375 as_shade.shading = shade;
376
377 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
378 if (bg_flags & BG_TINT_SET)
379 tint.get (c);
380 as_shade.tintColor.red = c.r;
381 as_shade.tintColor.green = c.g;
382 as_shade.tintColor.blue = c.b;
383
384 background_tint = shading2tint32 (&as_shade);
385 }
386
387 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
388 {
389 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
390 ASA_XImage,
391 100, ASIMAGE_QUALITY_DEFAULT);
392 if (tmp)
393 {
394 destroy_asimage (&background);
395 background = tmp;
396 }
397 }
398# endif
399
400 ASImage *result = 0;
401
402 int target_width = szHint.width;
403 int target_height = szHint.height;
404 int new_pmap_width = target_width;
405 int new_pmap_height = target_height;
406
407 int x = 0;
408 int y = 0;
409 int w = 0;
410 int h = 0;
411
412 if (original_asim)
413 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
414
415 if (!original_asim
416 || (!(bg_flags & BG_ROOT_ALIGN)
417 && (x >= target_width
418 || y >= target_height
419 || x + w <= 0
420 || y + h <= 0)))
421 {
422 if (background)
423 {
424 new_pmap_width = background->width;
425 new_pmap_height = background->height;
426 result = background;
427
428 if (background_tint != TINT_LEAVE_SAME)
429 {
430 ASImage *tmp = tile_asimage (asv, background, 0, 0,
431 target_width, target_height, background_tint,
432 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
433 if (tmp)
434 result = tmp;
435 }
436 }
437 else
438 new_pmap_width = new_pmap_height = 0;
439 }
440 else 340 else
441 { 341 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
442 result = original_asim;
443
444 if (w != original_asim->width
445 || h != original_asim->height)
446 {
447 result = scale_asimage (asv, original_asim,
448 w, h,
449 ASA_XImage,
450 100, ASIMAGE_QUALITY_DEFAULT);
451 }
452
453 if (background == NULL)
454 {
455 if (bg_flags & BG_TILE)
456 {
457 /* if tiling - pixmap has to be sized exactly as the image,
458 but there is no need to make it bigger than the window! */
459 new_pmap_width = min (result->width, target_width);
460 new_pmap_height = min (result->height, target_height);
461
462 /* we also need to tile our image in both directions */
463 ASImage *tmp = tile_asimage (asv, result,
464 (int)result->width - x,
465 (int)result->height - y,
466 new_pmap_width,
467 new_pmap_height,
468 TINT_LEAVE_SAME, ASA_XImage,
469 100, ASIMAGE_QUALITY_DEFAULT);
470 if (tmp)
471 {
472 if (result != original_asim)
473 destroy_asimage (&result);
474
475 result = tmp;
476 }
477 }
478 }
479 else
480 {
481 /* if blending background and image - pixmap has to be sized same as target window */
482 ASImageLayer *layers = create_image_layers (2);
483
484 layers[0].im = background;
485 layers[0].clip_width = target_width;
486 layers[0].clip_height = target_height;
487 layers[0].tint = background_tint;
488 layers[1].im = result;
489
490 if (bg_flags & BG_TILE)
491 {
492 /* tile horizontally */
493 while (x > 0) x -= (int)result->width;
494 layers[1].dst_x = x;
495 layers[1].clip_width = result->width+target_width;
496 }
497 else
498 {
499 /* clip horizontally */
500 layers[1].dst_x = x;
501 layers[1].clip_width = result->width;
502 }
503
504 if (bg_flags & BG_TILE)
505 {
506 while (y > 0) y -= (int)result->height;
507 layers[1].dst_y = y;
508 layers[1].clip_height = result->height + target_height;
509 }
510 else
511 {
512 layers[1].dst_y = y;
513 layers[1].clip_height = result->height;
514 }
515
516 if (rs[Rs_blendtype])
517 {
518 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
519 if (layers[1].merge_scanlines == NULL)
520 layers[1].merge_scanlines = alphablend_scanlines;
521 }
522
523 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
524 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
525
526 if (tmp)
527 {
528 if (result != original_asim)
529 destroy_asimage (&result);
530
531 result = tmp;
532 }
533
534 free (layers);
535 }
536 }
537
538 bool ret = false;
539
540 if (result)
541 {
542 XGCValues gcv;
543 GC gc;
544
545 /* create Pixmap */
546 if (bg_pixmap == None
547 || bg_pmap_width != new_pmap_width
548 || bg_pmap_height != new_pmap_height)
549 {
550 if (bg_pixmap)
551 XFreePixmap (dpy, bg_pixmap);
552 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
553 bg_pmap_width = new_pmap_width;
554 bg_pmap_height = new_pmap_height;
555 }
556 /* fill with background color (if result's not completely overlapping it) */
557 gcv.foreground = pix_colors[Color_bg];
558 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
559
560 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
561 int dst_width = result->width, dst_height = result->height;
562 if (background == NULL)
563 {
564 if (!(bg_flags & BG_TILE))
565 {
566 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
567 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
568 }
569
570 if (dst_x > 0 || dst_y > 0
571 || dst_x + dst_width < new_pmap_width
572 || dst_y + dst_height < new_pmap_height)
573 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
574 }
575
576 /* put result on pixmap */
577 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
578 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
579
580 if (result != background && result != original_asim)
581 destroy_asimage (&result);
582
583 XFreeGC (dpy, gc);
584
585 ret = true;
586 }
587
588 if (background)
589 destroy_asimage (&background);
590
591 return ret;
592} 342}
593# endif /* HAVE_AFTERIMAGE */
594 343
595# ifdef HAVE_PIXBUF 344# ifdef HAVE_PIXBUF
596bool 345bool
597rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc, 346rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
598 int src_x, int src_y, int dst_x, int dst_y, 347 int src_x, int src_y, int dst_x, int dst_y,
599 unsigned int width, unsigned int height) 348 unsigned int width, unsigned int height)
600{ 349{
601 XImage *ximage; 350 XImage *ximage;
602 char *data, *line; 351 char *line;
603 int bytes_per_pixel;
604 int width_r, width_g, width_b; 352 int width_r, width_g, width_b, width_a;
605 int sh_r, sh_g, sh_b; 353 int sh_r, sh_g, sh_b, sh_a;
354 uint32_t alpha_mask;
606 int rowstride; 355 int rowstride;
607 int channels; 356 int channels;
608 unsigned char *row; 357 unsigned char *row;
609 358
610 if (visual->c_class != TrueColor) 359 if (visual->c_class != TrueColor)
611 return false; 360 return false;
612 361
613 if (depth == 24 || depth == 32) 362#if XRENDER
614 bytes_per_pixel = 4; 363 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
615 else if (depth == 15 || depth == 16) 364 if (format)
616 bytes_per_pixel = 2; 365 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
617 else 366 else
618 return false; 367#endif
368 alpha_mask = 0;
619 369
620 width_r = ecb_popcount32 (visual->red_mask); 370 width_r = ecb_popcount32 (visual->red_mask);
621 width_g = ecb_popcount32 (visual->green_mask); 371 width_g = ecb_popcount32 (visual->green_mask);
622 width_b = ecb_popcount32 (visual->blue_mask); 372 width_b = ecb_popcount32 (visual->blue_mask);
373 width_a = ecb_popcount32 (alpha_mask);
623 374
624 if (width_r > 8 || width_g > 8 || width_b > 8) 375 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
625 return false; 376 return false;
626 377
627 sh_r = ecb_ctz32 (visual->red_mask); 378 sh_r = ecb_ctz32 (visual->red_mask);
628 sh_g = ecb_ctz32 (visual->green_mask); 379 sh_g = ecb_ctz32 (visual->green_mask);
629 sh_b = ecb_ctz32 (visual->blue_mask); 380 sh_b = ecb_ctz32 (visual->blue_mask);
381 sh_a = ecb_ctz32 (alpha_mask);
630 382
631 if (width > INT_MAX / height / bytes_per_pixel) 383 if (width > 32767 || height > 32767)
632 return false; 384 return false;
633 385
634 data = (char *)malloc (width * height * bytes_per_pixel); 386 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, 0,
635 if (!data) 387 width, height, 32, 0);
388 if (!ximage)
636 return false; 389 return false;
637 390
638 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data, 391 if (height > INT_MAX / ximage->bytes_per_line
639 width, height, bytes_per_pixel * 8, 0); 392 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
640 if (!ximage)
641 { 393 {
642 free (data); 394 XDestroyImage (ximage);
643 return false; 395 return false;
644 } 396 }
645 397
646 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 398 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
647 399
648 rowstride = gdk_pixbuf_get_rowstride (pixbuf); 400 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
649 channels = gdk_pixbuf_get_n_channels (pixbuf); 401 channels = gdk_pixbuf_get_n_channels (pixbuf);
650 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 402 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
651 line = data; 403 line = ximage->data;
404
405 rgba c (0, 0, 0);
406
407 if (channels == 4 && alpha_mask == 0)
408 {
409 pix_colors[Color_bg].get (c);
410 c.r >>= 8;
411 c.g >>= 8;
412 c.b >>= 8;
413 }
652 414
653 for (int y = 0; y < height; y++) 415 for (int y = 0; y < height; y++)
654 { 416 {
655 for (int x = 0; x < width; x++) 417 for (int x = 0; x < width; x++)
656 { 418 {
657 unsigned char *pixel = row + x * channels; 419 unsigned char *pixel = row + x * channels;
658 uint32_t value; 420 uint32_t value;
421 unsigned char r, g, b, a;
659 422
423 if (channels == 4)
424 {
425 a = pixel[3];
426 r = (pixel[0] * a + c.r * (0xff - a)) / 0xff;
427 g = (pixel[1] * a + c.g * (0xff - a)) / 0xff;
428 b = (pixel[2] * a + c.b * (0xff - a)) / 0xff;
429 }
430 else
431 {
432 a = 0xff;
433 r = pixel[0];
434 g = pixel[1];
435 b = pixel[2];
436 }
437
660 value = ((pixel[0] >> (8 - width_r)) << sh_r) 438 value = ((r >> (8 - width_r)) << sh_r)
661 | ((pixel[1] >> (8 - width_g)) << sh_g) 439 | ((g >> (8 - width_g)) << sh_g)
662 | ((pixel[2] >> (8 - width_b)) << sh_b); 440 | ((b >> (8 - width_b)) << sh_b)
441 | ((a >> (8 - width_a)) << sh_a);
663 442
664 if (bytes_per_pixel == 4) 443 if (ximage->bits_per_pixel == 32)
665 ((uint32_t *)line)[x] = value; 444 ((uint32_t *)line)[x] = value;
666 else 445 else
667 ((uint16_t *)line)[x] = value; 446 XPutPixel (ximage, x, y, value);
668 } 447 }
669 448
670 row += rowstride; 449 row += rowstride;
671 line += ximage->bytes_per_line; 450 line += ximage->bytes_per_line;
672 } 451 }
675 XDestroyImage (ximage); 454 XDestroyImage (ximage);
676 return true; 455 return true;
677} 456}
678 457
679bool 458bool
680rxvt_term::render_image (unsigned long tr_flags) 459rxvt_term::render_image (bool transparent)
681{ 460{
682 if (!pixbuf) 461 if (!pixbuf)
683 return false; 462 return false;
684 463
685 if (tr_flags 464 if (transparent
686 && !(bg_flags & BG_HAS_RENDER)) 465 && !(bg_flags & BG_HAS_RENDER))
687 return false; 466 return false;
688 467
689 GdkPixbuf *result; 468 GdkPixbuf *result;
690 469
730 Pixmap root_pmap; 509 Pixmap root_pmap;
731 510
732 image_width = gdk_pixbuf_get_width (result); 511 image_width = gdk_pixbuf_get_width (result);
733 image_height = gdk_pixbuf_get_height (result); 512 image_height = gdk_pixbuf_get_height (result);
734 513
735 if (tr_flags) 514 if (transparent)
736 { 515 {
737 root_pmap = bg_pixmap; 516 root_pmap = bg_pixmap;
738 bg_pixmap = None; 517 bg_pixmap = None;
739 } 518 }
740 else 519 else
798 dst_x, dst_y, 577 dst_x, dst_y,
799 dst_width, dst_height); 578 dst_width, dst_height);
800 } 579 }
801 580
802#if XRENDER 581#if XRENDER
803 if (tr_flags) 582 if (transparent)
804 { 583 {
805 XRenderPictureAttributes pa;
806
807 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual); 584 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
585
808 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 586 Picture src = XRenderCreatePicture (dpy, root_pmap, format, 0, 0);
809 587
810 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
811 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa); 588 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, format, 0, 0);
812 589
813 pa.repeat = True; 590 Picture mask = create_xrender_mask (dpy, vt, False, False);
814 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
815 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
816 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
817 XFreePixmap (dpy, mask_pmap);
818 591
819 XRenderColor mask_c; 592 XRenderColor mask_c;
820 593
821 mask_c.alpha = 0x8000; 594 mask_c.alpha = 0x8000;
822 mask_c.red = 0; 595 mask_c.red =
823 mask_c.green = 0; 596 mask_c.green =
824 mask_c.blue = 0; 597 mask_c.blue = 0;
825 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 598 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
599
826 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height); 600 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
827 601
828 XRenderFreePicture (dpy, src); 602 XRenderFreePicture (dpy, src);
829 XRenderFreePicture (dpy, dst); 603 XRenderFreePicture (dpy, dst);
830 XRenderFreePicture (dpy, mask); 604 XRenderFreePicture (dpy, mask);
837 } 611 }
838 612
839 if (result != pixbuf) 613 if (result != pixbuf)
840 g_object_unref (result); 614 g_object_unref (result);
841 615
842 if (tr_flags) 616 if (transparent)
843 XFreePixmap (dpy, root_pmap); 617 XFreePixmap (dpy, root_pmap);
844 618
845 return ret; 619 return ret;
846} 620}
847# endif /* HAVE_PIXBUF */ 621# endif /* HAVE_PIXBUF */
862 memcpy (f, file, len); 636 memcpy (f, file, len);
863 f[len] = '\0'; 637 f[len] = '\0';
864 file = f; 638 file = f;
865 } 639 }
866 640
867# ifdef HAVE_AFTERIMAGE
868 if (!asimman)
869 asimman = create_generic_imageman (rs[Rs_path]);
870 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
871 if (image)
872 {
873 if (original_asim)
874 safe_asimage_destroy (original_asim);
875 original_asim = image;
876 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
877 ret = true;
878 }
879# endif
880
881# ifdef HAVE_PIXBUF 641# ifdef HAVE_PIXBUF
882 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 642 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
883 if (image) 643 if (image)
884 { 644 {
885 if (pixbuf) 645 if (pixbuf)
903 663
904# endif /* BG_IMAGE_FROM_FILE */ 664# endif /* BG_IMAGE_FROM_FILE */
905 665
906# ifdef ENABLE_TRANSPARENCY 666# ifdef ENABLE_TRANSPARENCY
907bool 667bool
908rxvt_term::bg_set_transparent ()
909{
910 if (!(bg_flags & BG_IS_TRANSPARENT))
911 {
912 bg_flags |= BG_IS_TRANSPARENT;
913 return true;
914 }
915
916 return false;
917}
918
919bool
920rxvt_term::bg_set_blur (const char *geom) 668rxvt_term::bg_set_blur (const char *geom)
921{ 669{
922 bool changed = false; 670 bool changed = false;
923 unsigned int hr, vr; 671 unsigned int hr, vr;
924 int junk; 672 int junk;
942 { 690 {
943 changed = true; 691 changed = true;
944 v_blurRadius = vr; 692 v_blurRadius = vr;
945 } 693 }
946 694
947 if (v_blurRadius == 0 && h_blurRadius == 0) 695 if (h_blurRadius && v_blurRadius)
696 bg_flags |= BG_NEEDS_BLUR;
697 else
948 bg_flags &= ~BG_NEEDS_BLUR; 698 bg_flags &= ~BG_NEEDS_BLUR;
949 else
950 bg_flags |= BG_NEEDS_BLUR;
951 699
952 return changed; 700 return changed;
953} 701}
954 702
955void 703void
956rxvt_term::set_tint_shade_flags () 704rxvt_term::set_tint_shade_flags ()
957{ 705{
706 if (shade != 100 || (bg_flags & BG_TINT_SET))
707 bg_flags |= BG_NEEDS_TINT;
708 else
709 bg_flags &= ~BG_NEEDS_TINT;
710}
711
712bool
713rxvt_term::bg_set_tint (rxvt_color &new_tint)
714{
715 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
716 {
717 tint = new_tint;
718 bg_flags |= BG_TINT_SET;
719
958 rgba c; 720 rgba c;
959 bool has_shade = shade != 100;
960
961 bg_flags &= ~BG_TINT_FLAGS;
962
963 if (bg_flags & BG_TINT_SET)
964 {
965 tint.get (c); 721 tint.get (c);
966 if (!has_shade
967 && (c.r <= 0x00ff || c.r >= 0xff00) 722 if ((c.r <= 0x00ff || c.r >= 0xff00)
968 && (c.g <= 0x00ff || c.g >= 0xff00) 723 && (c.g <= 0x00ff || c.g >= 0xff00)
969 && (c.b <= 0x00ff || c.b >= 0xff00)) 724 && (c.b <= 0x00ff || c.b >= 0xff00))
970 bg_flags |= BG_TINT_BITAND; 725 bg_flags |= BG_TINT_BITAND;
971 } 726 else
972
973 if (has_shade || (bg_flags & BG_TINT_SET))
974 bg_flags |= BG_NEEDS_TINT;
975}
976
977bool
978rxvt_term::bg_set_tint (rxvt_color &new_tint)
979{
980 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
981 {
982 tint = new_tint;
983 bg_flags |= BG_TINT_SET; 727 bg_flags &= ~BG_TINT_BITAND;
728
984 set_tint_shade_flags (); 729 set_tint_shade_flags ();
985 return true; 730 return true;
986 } 731 }
987 732
988 return false; 733 return false;
989} 734}
990 735
991bool 736bool
992rxvt_term::bg_set_shade (const char *shade_str) 737rxvt_term::bg_set_shade (const char *shade_str)
993{ 738{
994 int new_shade = (shade_str) ? atoi (shade_str) : 100; 739 int new_shade = atoi (shade_str);
995 740
996 clamp_it (new_shade, -100, 200); 741 clamp_it (new_shade, -100, 200);
997 if (new_shade < 0) 742 if (new_shade < 0)
998 new_shade = 200 - (100 + new_shade); 743 new_shade = 200 - (100 + new_shade);
999 744
1029 params[i+2] = XDoubleToFixed (kernel[i] / sum); 774 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1030} 775}
1031#endif 776#endif
1032 777
1033bool 778bool
1034rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 779rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height, int depth)
1035{ 780{
1036 bool ret = false; 781 bool ret = false;
1037#if XRENDER 782#if XRENDER
1038 if (!(bg_flags & BG_HAS_RENDER_CONV)) 783 if (!(bg_flags & BG_HAS_RENDER_CONV))
1039 return false; 784 return false;
1043 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 788 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1044 789
1045 XRenderPictureAttributes pa; 790 XRenderPictureAttributes pa;
1046 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 791 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1047 792
793 pa.repeat = RepeatPad;
1048 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 794 Picture src = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
795 Pixmap tmp = XCreatePixmap (dpy, pixmap, width, height, depth);
1049 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 796 Picture dst = XRenderCreatePicture (dpy, tmp, format, CPRepeat, &pa);
797 XFreePixmap (dpy, tmp);
1050 798
1051 if (kernel && params) 799 if (kernel && params)
1052 { 800 {
1053 if (h_blurRadius)
1054 {
1055 size = h_blurRadius * 2 + 1; 801 size = h_blurRadius * 2 + 1;
1056 get_gaussian_kernel (h_blurRadius, size, kernel, params); 802 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1057 803
1058 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 804 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1059 XRenderComposite (dpy, 805 XRenderComposite (dpy,
1060 PictOpSrc, 806 PictOpSrc,
1061 src, 807 src,
1062 None, 808 None,
1063 dst, 809 dst,
1064 0, 0, 810 0, 0,
1065 0, 0, 811 0, 0,
1066 0, 0, 812 0, 0,
1067 width, height); 813 width, height);
1068 }
1069 814
1070 if (v_blurRadius) 815 ::swap (src, dst);
1071 { 816
1072 size = v_blurRadius * 2 + 1; 817 size = v_blurRadius * 2 + 1;
1073 get_gaussian_kernel (v_blurRadius, size, kernel, params); 818 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1074 ::swap (params[0], params[1]); 819 ::swap (params[0], params[1]);
1075 820
1076 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 821 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1077 XRenderComposite (dpy, 822 XRenderComposite (dpy,
1078 PictOpSrc, 823 PictOpSrc,
1079 src, 824 src,
1080 None, 825 None,
1081 dst, 826 dst,
1082 0, 0, 827 0, 0,
1083 0, 0, 828 0, 0,
1084 0, 0, 829 0, 0,
1085 width, height); 830 width, height);
1086 }
1087 831
1088 ret = true; 832 ret = true;
1089 } 833 }
1090 834
1091 free (kernel); 835 free (kernel);
1099bool 843bool
1100rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 844rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1101{ 845{
1102 bool ret = false; 846 bool ret = false;
1103 847
1104 if (bg_flags & BG_TINT_BITAND) 848 if (shade == 100 && (bg_flags & BG_TINT_BITAND))
1105 { 849 {
1106 XGCValues gcv; 850 XGCValues gcv;
1107 GC gc; 851 GC gc;
1108 852
1109 /* In this case we can tint image server-side getting significant 853 /* In this case we can tint image server-side getting significant
1139 c.r = c.r * (200 - shade) / 100; 883 c.r = c.r * (200 - shade) / 100;
1140 c.g = c.g * (200 - shade) / 100; 884 c.g = c.g * (200 - shade) / 100;
1141 c.b = c.b * (200 - shade) / 100; 885 c.b = c.b * (200 - shade) / 100;
1142 } 886 }
1143 887
1144 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1145 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 888 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1146 XRenderPictureAttributes pa;
1147 889
1148 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 890 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, 0);
1149 891
1150 pa.repeat = True; 892 Picture overlay_pic = create_xrender_mask (dpy, pixmap, True, False);
1151 893
1152 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 894 Picture mask_pic = create_xrender_mask (dpy, pixmap, True, True);
1153 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1154 XFreePixmap (dpy, overlay_pmap);
1155
1156 pa.component_alpha = True;
1157 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1158 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1159 XFreePixmap (dpy, mask_pmap);
1160 895
1161 XRenderColor mask_c; 896 XRenderColor mask_c;
1162 897
1163 mask_c.alpha = 0xffff; 898 mask_c.alpha = 0xffff;
1164 mask_c.red = 899 mask_c.red =
1169 mask_c.alpha = 0; 904 mask_c.alpha = 0;
1170 mask_c.red = 0xffff - c.r; 905 mask_c.red = 0xffff - c.r;
1171 mask_c.green = 0xffff - c.g; 906 mask_c.green = 0xffff - c.g;
1172 mask_c.blue = 0xffff - c.b; 907 mask_c.blue = 0xffff - c.b;
1173 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 908 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
909
1174 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 910 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1175 911
1176 if (shade > 100) 912 if (shade > 100)
1177 { 913 {
1178 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1179 mask_c.alpha = 0; 914 mask_c.alpha = 0;
915 mask_c.red =
916 mask_c.green =
917 mask_c.blue = 0xffff * (shade - 100) / 100;
1180 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 918 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1181 919
1182 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height); 920 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1183 } 921 }
1184 922
1196/* 934/*
1197 * Builds a pixmap of the same size as the terminal window that contains 935 * Builds a pixmap of the same size as the terminal window that contains
1198 * the tiled portion of the root pixmap that is supposed to be covered by 936 * the tiled portion of the root pixmap that is supposed to be covered by
1199 * our window. 937 * our window.
1200 */ 938 */
1201unsigned long 939bool
1202rxvt_term::make_transparency_pixmap () 940rxvt_term::make_transparency_pixmap ()
1203{ 941{
1204 unsigned long result = 0; 942 bool ret = false;
1205 943
1206 /* root dimensions may change from call to call - but Display structure should 944 /* root dimensions may change from call to call - but Display structure should
1207 * be always up-to-date, so let's use it : 945 * be always up-to-date, so let's use it :
1208 */ 946 */
1209 int screen = display->screen; 947 int screen = display->screen;
1247#if XRENDER 985#if XRENDER
1248 if (bg_flags & BG_HAS_RENDER) 986 if (bg_flags & BG_HAS_RENDER)
1249 { 987 {
1250 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth); 988 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1251 989
1252 XRenderPictureAttributes pa;
1253
1254 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen)); 990 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1255 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa); 991 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, 0);
1256 992
1257 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual); 993 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1258 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa); 994 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, 0);
1259 995
1260 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height); 996 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1261 997
1262 XRenderFreePicture (dpy, src); 998 XRenderFreePicture (dpy, src);
1263 XRenderFreePicture (dpy, dst); 999 XRenderFreePicture (dpy, dst);
1292 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1028 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1293 1029
1294 if (gc) 1030 if (gc)
1295 { 1031 {
1296 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height); 1032 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1297 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS); 1033 ret = true;
1034 unsigned long tr_flags = bg_flags & BG_EFFECTS_FLAGS;
1035
1036 if (!(bg_flags & BG_CLIENT_RENDER))
1037 {
1038 if (bg_flags & BG_NEEDS_BLUR)
1039 {
1040 if (blur_pixmap (bg_pixmap, visual, window_width, window_height, depth))
1041 tr_flags &= ~BG_NEEDS_BLUR;
1042 }
1043 if (bg_flags & BG_NEEDS_TINT)
1044 {
1045 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1046 tr_flags &= ~BG_NEEDS_TINT;
1047 }
1048 if (tr_flags & BG_NEEDS_TINT)
1049 {
1050 XImage *ximage = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1051 if (ximage)
1052 {
1053 /* our own client-side tinting */
1054 tint_ximage (DefaultVisual (dpy, display->screen), ximage);
1055
1056 XPutImage (dpy, bg_pixmap, gc, ximage, 0, 0, 0, 0, ximage->width, ximage->height);
1057 XDestroyImage (ximage);
1058 }
1059 }
1060 } /* server side rendering completed */
1061
1298 XFreeGC (dpy, gc); 1062 XFreeGC (dpy, gc);
1299
1300 if (!(bg_flags & BG_CLIENT_RENDER))
1301 {
1302 if (bg_flags & BG_NEEDS_BLUR)
1303 {
1304 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1305 result &= ~BG_NEEDS_BLUR;
1306 }
1307 if (bg_flags & BG_NEEDS_TINT)
1308 {
1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1310 result &= ~BG_NEEDS_TINT;
1311 }
1312 } /* server side rendering completed */
1313 } 1063 }
1314 1064
1315 if (recoded_root_pmap != root_pixmap) 1065 if (recoded_root_pmap != root_pixmap)
1316 XFreePixmap (dpy, recoded_root_pmap); 1066 XFreePixmap (dpy, recoded_root_pmap);
1317 1067
1318 return result; 1068 return ret;
1319} 1069}
1320 1070
1321void 1071void
1322rxvt_term::bg_set_root_pixmap () 1072rxvt_term::bg_set_root_pixmap ()
1323{ 1073{
1330# endif /* ENABLE_TRANSPARENCY */ 1080# endif /* ENABLE_TRANSPARENCY */
1331 1081
1332bool 1082bool
1333rxvt_term::bg_render () 1083rxvt_term::bg_render ()
1334{ 1084{
1335 unsigned long tr_flags = 0; 1085 bool transparent = false;
1336 1086
1337 bg_invalidate (); 1087 bg_invalidate ();
1338# ifdef ENABLE_TRANSPARENCY 1088# ifdef ENABLE_TRANSPARENCY
1339 if (bg_flags & BG_IS_TRANSPARENT) 1089 if (bg_flags & BG_IS_TRANSPARENT)
1340 { 1090 {
1341 /* we need to re-generate transparency pixmap in that case ! */ 1091 /* we need to re-generate transparency pixmap in that case ! */
1342 tr_flags = make_transparency_pixmap (); 1092 transparent = make_transparency_pixmap ();
1343 if (tr_flags == 0) 1093 if (transparent)
1344 return false;
1345 bg_flags |= BG_IS_VALID; 1094 bg_flags |= BG_IS_VALID;
1346 } 1095 }
1347# endif 1096# endif
1348 1097
1349# ifdef BG_IMAGE_FROM_FILE 1098# ifdef BG_IMAGE_FROM_FILE
1350 if ((bg_flags & BG_IS_FROM_FILE) 1099 if (bg_flags & BG_IS_FROM_FILE)
1351 || (tr_flags & BG_EFFECTS_FLAGS))
1352 { 1100 {
1353 if (render_image (tr_flags)) 1101 if (render_image (transparent))
1354 bg_flags |= BG_IS_VALID; 1102 bg_flags |= BG_IS_VALID;
1355 }
1356# endif
1357
1358# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1359 XImage *result = NULL;
1360
1361 if (tr_flags & BG_NEEDS_TINT)
1362 {
1363 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1364 }
1365
1366 if (result)
1367 {
1368 /* our own client-side tinting */
1369 //if (tr_flags & BG_NEEDS_TINT)
1370 if (1)
1371 tint_ximage (DefaultVisual (dpy, display->screen), result);
1372
1373 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1374
1375 if (gc)
1376 {
1377 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1378
1379 XFreeGC (dpy, gc);
1380 }
1381
1382 XDestroyImage (result);
1383 } 1103 }
1384# endif 1104# endif
1385 1105
1386 if (!(bg_flags & BG_IS_VALID)) 1106 if (!(bg_flags & BG_IS_VALID))
1387 { 1107 {
1424#endif 1144#endif
1425} 1145}
1426 1146
1427#endif /* HAVE_BG_PIXMAP */ 1147#endif /* HAVE_BG_PIXMAP */
1428 1148
1429#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1149#ifdef ENABLE_TRANSPARENCY
1430/* based on code from aterm-0.4.2 */ 1150/* based on code from aterm-0.4.2 */
1431 1151
1432static inline void 1152static inline void
1433fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high) 1153fill_lut (uint32_t *lookup, uint32_t mask, int sh, unsigned short low, unsigned short high)
1434{ 1154{
1442} 1162}
1443 1163
1444void 1164void
1445rxvt_term::tint_ximage (Visual *visual, XImage *ximage) 1165rxvt_term::tint_ximage (Visual *visual, XImage *ximage)
1446{ 1166{
1167 unsigned int size_r, size_g, size_b;
1447 int sh_r, sh_g, sh_b; 1168 int sh_r, sh_g, sh_b;
1448 uint32_t mask_r, mask_g, mask_b; 1169 uint32_t mask_r, mask_g, mask_b;
1449 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b; 1170 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1450 unsigned short low; 1171 unsigned short low;
1451 rgba high;
1452 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 1172 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1453 1173
1454 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return; 1174 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1455 1175
1456 /* for convenience */ 1176 /* for convenience */
1457 mask_r = visual->red_mask; 1177 mask_r = visual->red_mask;
1458 mask_g = visual->green_mask; 1178 mask_g = visual->green_mask;
1459 mask_b = visual->blue_mask; 1179 mask_b = visual->blue_mask;
1460 1180
1461 /* boring lookup table pre-initialization */ 1181 /* boring lookup table pre-initialization */
1462 switch (ximage->depth) 1182 sh_r = ecb_ctz32 (mask_r);
1463 { 1183 sh_g = ecb_ctz32 (mask_g);
1464 case 15: 1184 sh_b = ecb_ctz32 (mask_b);
1465 if ((mask_r != 0x7c00) || 1185
1466 (mask_g != 0x03e0) || 1186 size_r = mask_r >> sh_r;
1467 (mask_b != 0x001f)) 1187 size_g = mask_g >> sh_g;
1188 size_b = mask_b >> sh_b;
1189
1190 if (size_r++ > 255 || size_g++ > 255 || size_b++ > 255)
1468 return; 1191 return;
1469 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32)); 1192
1193 lookup = (uint32_t *)malloc (sizeof (uint32_t) * (size_r + size_g + size_b));
1470 lookup_r = lookup; 1194 lookup_r = lookup;
1471 lookup_g = lookup+32; 1195 lookup_g = lookup + size_r;
1472 lookup_b = lookup+32+32; 1196 lookup_b = lookup + size_r + size_g;
1473 sh_r = 10;
1474 sh_g = 5;
1475 sh_b = 0;
1476 break;
1477 case 16:
1478 if ((mask_r != 0xf800) ||
1479 (mask_g != 0x07e0) ||
1480 (mask_b != 0x001f))
1481 return;
1482 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1483 lookup_r = lookup;
1484 lookup_g = lookup+32;
1485 lookup_b = lookup+32+64;
1486 sh_r = 11;
1487 sh_g = 5;
1488 sh_b = 0;
1489 break;
1490 case 24:
1491 if ((mask_r != 0xff0000) ||
1492 (mask_g != 0x00ff00) ||
1493 (mask_b != 0x0000ff))
1494 return;
1495 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1496 lookup_r = lookup;
1497 lookup_g = lookup+256;
1498 lookup_b = lookup+256+256;
1499 sh_r = 16;
1500 sh_g = 8;
1501 sh_b = 0;
1502 break;
1503 case 32:
1504 if ((mask_r != 0xff0000) ||
1505 (mask_g != 0x00ff00) ||
1506 (mask_b != 0x0000ff))
1507 return;
1508 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1509 lookup_r = lookup;
1510 lookup_g = lookup+256;
1511 lookup_b = lookup+256+256;
1512 sh_r = 16;
1513 sh_g = 8;
1514 sh_b = 0;
1515 break;
1516 default:
1517 return; /* we do not support this color depth */
1518 }
1519 1197
1520 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC); 1198 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1521 1199
1522 if (bg_flags & BG_TINT_SET) 1200 if (bg_flags & BG_TINT_SET)
1523 tint.get (c); 1201 tint.get (c);
1524 1202
1525 /* prepare limits for color transformation (each channel is handled separately) */ 1203 /* prepare limits for color transformation (each channel is handled separately) */
1526 if (shade > 100) 1204 if (shade > 100)
1527 { 1205 {
1528 high.r = c.r * (200 - shade) / 100; 1206 c.r = c.r * (200 - shade) / 100;
1529 high.g = c.g * (200 - shade) / 100; 1207 c.g = c.g * (200 - shade) / 100;
1530 high.b = c.b * (200 - shade) / 100; 1208 c.b = c.b * (200 - shade) / 100;
1531 1209
1532 low = 0xffff * (shade - 100) / 100; 1210 low = 0xffff * (shade - 100) / 100;
1533 } 1211 }
1534 else 1212 else
1535 { 1213 {
1536 high.r = c.r * shade / 100; 1214 c.r = c.r * shade / 100;
1537 high.g = c.g * shade / 100; 1215 c.g = c.g * shade / 100;
1538 high.b = c.b * shade / 100; 1216 c.b = c.b * shade / 100;
1539 1217
1540 low = 0; 1218 low = 0;
1541 } 1219 }
1542 1220
1543 /* fill our lookup tables */ 1221 /* fill our lookup tables */
1544 fill_lut (lookup_r, mask_r, sh_r, low, high.r); 1222 fill_lut (lookup_r, mask_r, sh_r, low, c.r);
1545 fill_lut (lookup_g, mask_g, sh_g, low, high.g); 1223 fill_lut (lookup_g, mask_g, sh_g, low, c.g);
1546 fill_lut (lookup_b, mask_b, sh_b, low, high.b); 1224 fill_lut (lookup_b, mask_b, sh_b, low, c.b);
1547 1225
1548 /* apply table to input image (replacing colors by newly calculated ones) */ 1226 /* apply table to input image (replacing colors by newly calculated ones) */
1549 if (ximage->bits_per_pixel == 32 1227 if (ximage->bits_per_pixel == 32
1550 && (ximage->depth == 24 || ximage->depth == 32)
1551 && ximage->byte_order == host_byte_order) 1228 && ximage->byte_order == host_byte_order)
1552 { 1229 {
1553 uint32_t *p1, *pf, *p, *pl; 1230 char *line = ximage->data;
1554 p1 = (uint32_t *) ximage->data;
1555 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1556 1231
1557 while (p1 < pf) 1232 for (int y = 0; y < ximage->height; y++)
1558 {
1559 p = p1;
1560 pl = p1 + ximage->width;
1561 for (; p < pl; p++)
1562 { 1233 {
1563 *p = lookup_r[(*p & 0xff0000) >> 16] | 1234 uint32_t *p = (uint32_t *)line;
1564 lookup_g[(*p & 0x00ff00) >> 8] | 1235 for (int x = 0; x < ximage->width; x++)
1565 lookup_b[(*p & 0x0000ff)] |
1566 (*p & 0xff000000);
1567 } 1236 {
1568 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line); 1237 *p = lookup_r[(*p & mask_r) >> sh_r] |
1238 lookup_g[(*p & mask_g) >> sh_g] |
1239 lookup_b[(*p & mask_b) >> sh_b];
1240 p++;
1241 }
1242 line += ximage->bytes_per_line;
1569 } 1243 }
1570 } 1244 }
1571 else 1245 else
1572 { 1246 {
1573 for (int y = 0; y < ximage->height; y++) 1247 for (int y = 0; y < ximage->height; y++)
1581 } 1255 }
1582 } 1256 }
1583 1257
1584 free (lookup); 1258 free (lookup);
1585} 1259}
1586#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1260#endif /* ENABLE_TRANSPARENCY */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines