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.64 by sf-exg, Mon Oct 4 14:31:00 2010 UTC vs.
Revision 1.119 by sf-exg, Thu Nov 18 17:28:12 2010 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 <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
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 * 9 *
9 * 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
10 * 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
11 * the Free Software Foundation; either version 2 of the License, or 12 * the Free Software Foundation; either version 2 of the License, or
12 * (at your option) any later version. 13 * (at your option) any later version.
… …
19 * 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
20 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 22 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/ 23 *---------------------------------------------------------------------*/
23 24
25#include <cmath>
24#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
25#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28
29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
32
33#ifndef FilterConvolution
34#define FilterConvolution "convolution"
35#endif
26 36
27#define DO_TIMING_TEST 0 37#define DO_TIMING_TEST 0
28 38
29#if DO_TIMING_TEST 39#if DO_TIMING_TEST
30# include <sys/time.h> 40# include <sys/time.h>
… …
56 * 66 *
57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 67 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
58 * W and H are percentages of the terminal window size. 68 * W and H are percentages of the terminal window size.
59 * X and Y are also percentages; e.g., +50+50 centers 69 * X and Y are also percentages; e.g., +50+50 centers
60 * the image in the window. 70 * the image in the window.
61 * WxH+X Assumes Y == X
62 * WxH Assumes Y == X == 50 (centers the image)
63 * W+X+Y Assumes H == W
64 * W+X Assumes H == W and Y == X
65 * W Assumes H == W and Y == X == 50
66 *
67 * Adjusting position only :
68 * =+X+Y Set position to X% by Y% (absolute).
69 * =+X Set position to X% by X%.
70 * +X+Y Adjust position horizontally X% and vertically Y%
71 * from current position (relative).
72 * +X Adjust position horizontally X% and vertically X%
73 * from current position.
74 *
75 * Adjusting scale only :
76 * Wx0 Multiply horizontal scaling factor by W%
77 * 0xH Multiply vertical scaling factor by H%
78 * 0x0 No scaling (show image at normal size).
79 * 71 *
80 * Pixmap Operations : (should be prepended by a colon) 72 * Pixmap Operations : (should be prepended by a colon)
81 * tile Tile image. Scaling/position modifiers above will affect 73 * tile Tile image. Scaling/position modifiers above will affect
82 * the tile size and origin. 74 * the tile size and origin.
83 * propscale When scaling, scale proportionally. That is, maintain the 75 * propscale When scaling, scale proportionally. That is, maintain the
… …
104#ifdef BG_IMAGE_FROM_FILE 96#ifdef BG_IMAGE_FROM_FILE
105 have_image = false; 97 have_image = false;
106 h_scale = v_scale = 0; 98 h_scale = v_scale = 0;
107 h_align = v_align = 0; 99 h_align = v_align = 0;
108#endif 100#endif
101#ifdef ENABLE_TRANSPARENCY
102 shade = 100;
103#endif
109 flags = 0; 104 flags = 0;
110 pixmap = None; 105 pixmap = None;
111 valid_since = invalid_since = 0; 106 valid_since = invalid_since = 0;
112 target = 0; 107 target = 0;
113} 108}
… …
163 return true; 158 return true;
164 } 159 }
165# endif 160# endif
166 161
167 return false; 162 return false;
168}; 163}
169 164
170bool bgPixmap_t::need_client_side_rendering () 165bool bgPixmap_t::need_client_side_rendering ()
171{ 166{
172# ifdef HAVE_AFTERIMAGE 167# ifdef HAVE_AFTERIMAGE
173 if (original_asim) 168 if (original_asim)
174 return true; 169 return true;
175# endif
176# ifdef ENABLE_TRANSPARENCY
177 if (flags & isTransparent)
178 {
179# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
180 if ((flags & blurNeeded) && !(flags & blurServerSide))
181 return true;
182# endif
183 if ((flags & tintNeeded) && !(flags & tintServerSide))
184 return true;
185 }
186# endif 170# endif
187 return false; 171 return false;
188} 172}
189 173
190# ifdef BG_IMAGE_FROM_FILE 174# ifdef BG_IMAGE_FROM_FILE
… …
226make_align_position (int align, int window_size, int image_size) 210make_align_position (int align, int window_size, int image_size)
227{ 211{
228 int diff = window_size - image_size; 212 int diff = window_size - image_size;
229 int smaller = min (image_size, window_size); 213 int smaller = min (image_size, window_size);
230 214
231 if (align >= 0 && align <= 50) 215 if (align >= 0 && align <= 100)
232 return diff * align / 100; 216 return diff * align / 100;
233 else if (align > 50 && align <= 100)
234 return window_size - image_size - diff * (100 - align) / 100;
235 else if (align > 100 && align <= 200 ) 217 else if (align > 100 && align <= 200)
236 return ((align - 100) * smaller / 100) + window_size - smaller; 218 return ((align - 100) * smaller / 100) + window_size - smaller;
237 else if (align > -100 && align < 0) 219 else if (align >= -100 && align < 0)
238 return ((align + 100) * smaller / 100) - image_size; 220 return ((align + 100) * smaller / 100) - image_size;
239 return 0; 221 return 0;
240} 222}
241 223
242static inline int 224static inline int
243make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 225make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
244{ 226{
245 int src_pos = 0; 227 int src_pos = 0;
246 dst_pos = 0; 228 dst_pos = pos;
247 dst_size = size; 229 dst_size = size;
248 if (pos < 0) 230 if (pos < 0)
249 { 231 {
250 src_pos = -pos; 232 src_pos = -pos;
233 dst_pos = 0;
251 dst_size += pos; 234 dst_size += pos;
252 } 235 }
253 else if (pos > 0)
254 dst_pos = pos;
255 236
256 if (dst_pos + dst_size > target_size) 237 if (dst_pos + dst_size > target_size)
257 dst_size = target_size - dst_pos; 238 dst_size = target_size - dst_pos;
258 return src_pos; 239 return src_pos;
259} 240}
260 241
261bool 242bool
262bgPixmap_t::set_geometry (const char *geom) 243bgPixmap_t::set_geometry (const char *geom, bool update)
263{ 244{
245 bool changed = false;
264 int geom_flags = 0, changed = 0; 246 int geom_flags = 0;
265 int x = 0, y = 0; 247 int x = 0, y = 0;
266 unsigned int w = 0, h = 0; 248 unsigned int w = 0, h = 0;
267 unsigned int n; 249 unsigned int n;
268 unsigned long new_flags = (flags & (~geometryFlags)); 250 unsigned long new_flags = (flags & (~geometryFlags));
269 const char *p; 251 const char *p;
… …
280 262
281 n = (p - geom); 263 n = (p - geom);
282 if (n < MAXLEN_GEOM) 264 if (n < MAXLEN_GEOM)
283 { 265 {
284 char *ops; 266 char *ops;
285 new_flags |= geometrySet;
286 267
287 memcpy (str, geom, n); 268 memcpy (str, geom, n);
288 str[n] = '\0'; 269 str[n] = '\0';
289 if (str[0] == ':') 270 if (str[0] == ':')
290 ops = &str[0]; 271 ops = &str[0];
… …
305 if (ops > str || ops == NULL) 286 if (ops > str || ops == NULL)
306 { 287 {
307 /* we have geometry string - let's handle it prior to applying ops */ 288 /* we have geometry string - let's handle it prior to applying ops */
308 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 289 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
309 290
310 if ((geom_flags & XValue) && !(geom_flags & YValue))
311 {
312 y = x;
313 geom_flags |= YValue;
314 }
315
316 if (flags & geometrySet)
317 {
318 /* new geometry is an adjustment to the old one ! */
319 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
320 {
321 if (w == 0 && h != 0)
322 {
323 w = h_scale;
324 h = (v_scale * h) / 100;
325 }
326 else if (h == 0 && w != 0)
327 {
328 w = (h_scale * w) / 100;
329 h = v_scale;
330 }
331 }
332 if (geom_flags & XValue)
333 {
334 if (str[0] != '=')
335 {
336 y += v_align;
337 x += h_align;
338 }
339 }
340 }
341 else /* setting up geometry from scratch */ 291 if (!update) /* setting up geometry from scratch */
342 { 292 {
343 if (!(geom_flags & XValue)) 293 if (!(geom_flags & XValue))
344 { 294 {
345 /* use default geometry - centered */ 295 /* use default geometry - centered */
346 x = y = defaultAlign; 296 x = y = defaultAlign;
… …
360 } 310 }
361 else 311 else
362 w = h; 312 w = h;
363 } 313 }
364 } /* done parsing geometry string */ 314 } /* done parsing geometry string */
365 else if (!(flags & geometrySet)) 315 else if (!update)
366 { 316 {
367 /* default geometry - scaled and centered */ 317 /* default geometry - scaled and centered */
368 x = y = defaultAlign; 318 x = y = defaultAlign;
369 w = h = defaultScale; 319 w = h = defaultScale;
370 } 320 }
371 321
372 if (!(flags & geometrySet)) 322 if (!update)
373 geom_flags |= WidthValue|HeightValue|XValue|YValue; 323 geom_flags |= WidthValue|HeightValue|XValue|YValue;
374 324
375 if (ops) 325 if (ops)
376 { 326 {
377 while (*ops) 327 while (*ops)
… …
425 375
426 while (*ops != ':' && *ops != '\0') ++ops; 376 while (*ops != ':' && *ops != '\0') ++ops;
427 } /* done parsing ops */ 377 } /* done parsing ops */
428 } 378 }
429 379
430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 380 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 381 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
432 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 382 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
433 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 383 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
434 } 384 }
435 385
436 if (new_flags != flags) 386 if (new_flags != flags)
437 { 387 {
438 flags = new_flags; 388 flags = new_flags;
439 changed++; 389 changed = true;
440 } 390 }
441 391
442 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
443 // flags, h_scale, v_scale, h_align, v_align);
444 return (changed > 0); 392 return changed;
445} 393}
446 394
447void 395void
448bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 396bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
449{ 397{
… …
461 { 409 {
462 w = h_scale * target_width / 100; 410 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100; 411 h = v_scale * target_height / 100;
464 } 412 }
465 413
414 if (!w) w = image_width;
415 if (!h) h = image_height;
416
466 if (flags & rootAlign) 417 if (flags & rootAlign)
467 { 418 {
468 target->get_window_origin (x, y); 419 target->get_window_origin (x, y);
469 x = -x; 420 x = -x;
470 y = -y; 421 y = -y;
471 } 422 }
472 else 423 else
473 { 424 {
474 x = make_align_position (h_align, target_width, w > 0 ? w : image_width); 425 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h > 0 ? h : image_height); 426 y = make_align_position (v_align, target_height, h);
476 } 427 }
477 428
478 flags &= ~sizeSensitive; 429 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0 430 if ((flags & propScale) || h_scale || v_scale
480 || h_align != 0 || v_align != 0 431 || (!(flags & rootAlign) && (h_align || v_align))
481 || image_width > target_width || image_height > target_height) 432 || w > target_width || h > target_height)
482 flags |= sizeSensitive; 433 flags |= sizeSensitive;
483} 434}
484 435
485# ifdef HAVE_AFTERIMAGE 436# ifdef HAVE_AFTERIMAGE
486bool 437bool
… …
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 450 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500 451
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 452 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 { 453 {
503 ShadingInfo as_shade; 454 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade; 455 as_shade.shading = shade;
505 456
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 457 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet) 458 if (flags & tintSet)
508 tint.get (c); 459 tint.get (c);
509 as_shade.tintColor.red = c.r; 460 as_shade.tintColor.red = c.r;
… …
511 as_shade.tintColor.blue = c.b; 462 as_shade.tintColor.blue = c.b;
512 463
513 background_tint = shading2tint32 (&as_shade); 464 background_tint = shading2tint32 (&as_shade);
514 } 465 }
515 466
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 467 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
517 { 468 {
518 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 469 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
519 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 470 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
520 100, ASIMAGE_QUALITY_DEFAULT); 471 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp) 472 if (tmp)
… …
536 int x = 0; 487 int x = 0;
537 int y = 0; 488 int y = 0;
538 int w = 0; 489 int w = 0;
539 int h = 0; 490 int h = 0;
540 491
541 TIMING_TEST_START (asim);
542
543 if (original_asim) 492 if (original_asim)
544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 493 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
545 494
546 if (!original_asim 495 if (!original_asim
496 || (!(flags & rootAlign)
547 || x >= target_width 497 && (x >= target_width
548 || y >= target_height 498 || y >= target_height
549 || (w > 0 && x + w <= 0) 499 || (x + w <= 0)
550 || (h > 0 && y + h <= 0)) 500 || (y + h <= 0))))
551 { 501 {
552 if (background) 502 if (background)
553 { 503 {
554 new_pmap_width = background->width; 504 new_pmap_width = background->width;
555 new_pmap_height = background->height; 505 new_pmap_height = background->height;
… …
569 } 519 }
570 else 520 else
571 { 521 {
572 result = original_asim; 522 result = original_asim;
573 523
574 if ((w > 0 && w != original_asim->width) 524 if ((w != original_asim->width)
575 || (h > 0 && h != original_asim->height)) 525 || (h != original_asim->height))
576 { 526 {
577 result = scale_asimage (target->asv, original_asim, 527 result = scale_asimage (target->asv, original_asim,
578 w > 0 ? w : original_asim->width, 528 w, h,
579 h > 0 ? h : original_asim->height,
580 background ? ASA_ASImage : ASA_XImage, 529 background ? ASA_ASImage : ASA_XImage,
581 100, ASIMAGE_QUALITY_DEFAULT); 530 100, ASIMAGE_QUALITY_DEFAULT);
582 } 531 }
583 532
584 if (background == NULL) 533 if (background == NULL)
… …
616 layers[0].clip_width = target_width; 565 layers[0].clip_width = target_width;
617 layers[0].clip_height = target_height; 566 layers[0].clip_height = target_height;
618 layers[0].tint = background_tint; 567 layers[0].tint = background_tint;
619 layers[1].im = result; 568 layers[1].im = result;
620 569
621 if (w <= 0) 570 if (h_scale == 0 || v_scale == 0)
622 { 571 {
623 /* tile horizontally */ 572 /* tile horizontally */
624 while (x > 0) x -= (int)result->width; 573 while (x > 0) x -= (int)result->width;
625 layers[1].dst_x = x; 574 layers[1].dst_x = x;
626 layers[1].clip_width = result->width+target_width; 575 layers[1].clip_width = result->width+target_width;
… …
630 /* clip horizontally */ 579 /* clip horizontally */
631 layers[1].dst_x = x; 580 layers[1].dst_x = x;
632 layers[1].clip_width = result->width; 581 layers[1].clip_width = result->width;
633 } 582 }
634 583
635 if (h <= 0) 584 if (h_scale == 0 || v_scale == 0)
636 { 585 {
637 while (y > 0) y -= (int)result->height; 586 while (y > 0) y -= (int)result->height;
638 layers[1].dst_y = y; 587 layers[1].dst_y = y;
639 layers[1].clip_height = result->height + target_height; 588 layers[1].clip_height = result->height + target_height;
640 } 589 }
… …
663 } 612 }
664 613
665 free (layers); 614 free (layers);
666 } 615 }
667 } 616 }
668 TIMING_TEST_PRINT_RESULT (asim);
669 617
670 bool ret = false; 618 bool ret = false;
671 619
672 if (result) 620 if (result)
673 { 621 {
674 XGCValues gcv; 622 XGCValues gcv;
675 GC gc; 623 GC gc;
676 624
677 if (pixmap)
678 {
679 if (pmap_width != new_pmap_width
680 || pmap_height != new_pmap_height
681 || pmap_depth != target->depth)
682 {
683 XFreePixmap (target->dpy, pixmap);
684 pixmap = None;
685 }
686 }
687
688 /* create Pixmap */ 625 /* create Pixmap */
689 if (pixmap == None) 626 if (pixmap == None
627 || pmap_width != new_pmap_width
628 || pmap_height != new_pmap_height
629 || pmap_depth != target->depth)
690 { 630 {
631 if (pixmap)
632 XFreePixmap (target->dpy, pixmap);
691 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 633 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
692 pmap_width = new_pmap_width; 634 pmap_width = new_pmap_width;
693 pmap_height = new_pmap_height; 635 pmap_height = new_pmap_height;
694 pmap_depth = target->depth; 636 pmap_depth = target->depth;
695 } 637 }
… …
719 661
720 if (result != background && result != original_asim) 662 if (result != background && result != original_asim)
721 destroy_asimage (&result); 663 destroy_asimage (&result);
722 664
723 XFreeGC (target->dpy, gc); 665 XFreeGC (target->dpy, gc);
724 TIMING_TEST_PRINT_RESULT (asim);
725 666
726 ret = true; 667 ret = true;
727 } 668 }
728 669
729 if (background) 670 if (background)
… …
741 return false; 682 return false;
742 683
743 if (!pixbuf) 684 if (!pixbuf)
744 return false; 685 return false;
745 686
746 // TODO: add alpha blending
747 if (background_flags) 687 if (background_flags
688 && !(flags & HAS_RENDER))
748 return false; 689 return false;
749 690
750 GdkPixbuf *result; 691 GdkPixbuf *result;
751 692
752 int image_width = gdk_pixbuf_get_width (pixbuf); 693 int image_width = gdk_pixbuf_get_width (pixbuf);
… …
762 int w = 0; 703 int w = 0;
763 int h = 0; 704 int h = 0;
764 705
765 get_image_geometry (image_width, image_height, w, h, x, y); 706 get_image_geometry (image_width, image_height, w, h, x, y);
766 707
708 if (!(flags & rootAlign)
767 if (x >= target_width 709 && (x >= target_width
768 || y >= target_height 710 || y >= target_height
769 || (w > 0 && x + w <= 0) 711 || (x + w <= 0)
770 || (h > 0 && y + h <= 0)) 712 || (y + h <= 0)))
771 return false; 713 return false;
772 714
773 result = pixbuf; 715 result = pixbuf;
774 716
775 if ((w > 0 && w != image_width) 717 if ((w != image_width)
776 || (h > 0 && h != image_height)) 718 || (h != image_height))
777 { 719 {
778 result = gdk_pixbuf_scale_simple (pixbuf, 720 result = gdk_pixbuf_scale_simple (pixbuf,
779 w > 0 ? w : image_width, 721 w, h,
780 h > 0 ? h : image_height,
781 GDK_INTERP_BILINEAR); 722 GDK_INTERP_BILINEAR);
782 } 723 }
783 724
784 bool ret = false; 725 bool ret = false;
785 726
786 if (result) 727 if (result)
787 { 728 {
788 XGCValues gcv; 729 XGCValues gcv;
789 GC gc; 730 GC gc;
731 Pixmap root_pmap;
790 732
791 image_width = gdk_pixbuf_get_width (result); 733 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result); 734 image_height = gdk_pixbuf_get_height (result);
793 735
736 if (background_flags)
737 {
738 root_pmap = pixmap;
739 pixmap = None;
740 }
741 else
742 {
794 if (h_scale == 0 || v_scale == 0) 743 if (h_scale == 0 || v_scale == 0)
795 { 744 {
796 new_pmap_width = min (image_width, target_width); 745 new_pmap_width = min (image_width, target_width);
797 new_pmap_height = min (image_height, target_height); 746 new_pmap_height = min (image_height, target_height);
798 }
799
800 if (pixmap)
801 {
802 if (pmap_width != new_pmap_width
803 || pmap_height != new_pmap_height
804 || pmap_depth != target->depth)
805 {
806 XFreePixmap (target->dpy, pixmap);
807 pixmap = None;
808 } 747 }
809 } 748 }
810 749
811 if (pixmap == None) 750 if (pixmap == None
751 || pmap_width != new_pmap_width
752 || pmap_height != new_pmap_height
753 || pmap_depth != target->depth)
812 { 754 {
755 if (pixmap)
756 XFreePixmap (target->dpy, pixmap);
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 757 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width; 758 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height; 759 pmap_height = new_pmap_height;
816 pmap_depth = target->depth; 760 pmap_depth = target->depth;
817 } 761 }
… …
858 dst_width, dst_height, 802 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE, 803 XLIB_RGB_DITHER_NONE,
860 0, 0); 804 0, 0);
861 } 805 }
862 806
807#if XRENDER
808 if (background_flags)
809 {
810 Display *dpy = target->dpy;
811 XRenderPictureAttributes pa;
812
813 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, target->visual);
814 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
815
816 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
817 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa);
818
819 pa.repeat = True;
820 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8);
821 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
822 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
823 XFreePixmap (dpy, mask_pmap);
824
825 if (src && dst && mask)
826 {
827 XRenderColor mask_c;
828
829 mask_c.alpha = 0x8000;
830 mask_c.red = 0;
831 mask_c.green = 0;
832 mask_c.blue = 0;
833 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
834 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
835 }
836
837 XRenderFreePicture (dpy, src);
838 XRenderFreePicture (dpy, dst);
839 XRenderFreePicture (dpy, mask);
840
841 XFreePixmap (dpy, root_pmap);
842 }
843#endif
844
863 if (result != pixbuf) 845 if (result != pixbuf)
864 g_object_unref (result); 846 g_object_unref (result);
865 847
866 XFreeGC (target->dpy, gc); 848 XFreeGC (target->dpy, gc);
867 849
… …
873# endif /* HAVE_PIXBUF */ 855# endif /* HAVE_PIXBUF */
874 856
875bool 857bool
876bgPixmap_t::set_file (const char *file) 858bgPixmap_t::set_file (const char *file)
877{ 859{
878 assert (file); 860 if (!file || !*file)
861 return false;
879 862
880 if (*file)
881 {
882 if (const char *p = strchr (file, ';')) 863 if (const char *p = strchr (file, ';'))
883 { 864 {
884 size_t len = p - file; 865 size_t len = p - file;
885 char *f = rxvt_temp_buf<char> (len + 1); 866 char *f = rxvt_temp_buf<char> (len + 1);
886 memcpy (f, file, len); 867 memcpy (f, file, len);
887 f[len] = '\0'; 868 f[len] = '\0';
888 file = f; 869 file = f;
889 } 870 }
890 871
891# ifdef HAVE_AFTERIMAGE 872# ifdef HAVE_AFTERIMAGE
892 if (!target->asimman) 873 if (!target->asimman)
893 target->asimman = create_generic_imageman (target->rs[Rs_path]); 874 target->asimman = create_generic_imageman (target->rs[Rs_path]);
894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 875 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
876 if (image)
877 {
895 if (original_asim) 878 if (original_asim)
879 safe_asimage_destroy (original_asim);
880 original_asim = image;
896 have_image = true; 881 have_image = true;
897 return have_image; 882 return true;
883 }
898# endif 884# endif
899 885
900# ifdef HAVE_PIXBUF 886# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL); 887 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
888 if (image)
889 {
902 if (pixbuf) 890 if (pixbuf)
891 g_object_unref (pixbuf);
892 pixbuf = image;
903 have_image = true; 893 have_image = true;
904 return have_image; 894 return true;
895 }
905# endif 896# endif
906 }
907 897
908 return false; 898 return false;
909} 899}
910 900
911# endif /* BG_IMAGE_FROM_FILE */ 901# endif /* BG_IMAGE_FROM_FILE */
… …
924} 914}
925 915
926bool 916bool
927bgPixmap_t::set_blur_radius (const char *geom) 917bgPixmap_t::set_blur_radius (const char *geom)
928{ 918{
929 int changed = 0; 919 bool changed = false;
930 unsigned int hr, vr; 920 unsigned int hr, vr;
931 int junk; 921 int junk;
932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 922 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
933 923
934 if (!(geom_flags & WidthValue)) 924 if (!(geom_flags & WidthValue))
935 hr = 1; 925 hr = 1;
936 if (!(geom_flags & HeightValue)) 926 if (!(geom_flags & HeightValue))
937 vr = hr; 927 vr = hr;
938 928
929 min_it (hr, 128);
930 min_it (vr, 128);
931
939 if (h_blurRadius != hr) 932 if (h_blurRadius != hr)
940 { 933 {
941 ++changed; 934 changed = true;
942 h_blurRadius = hr; 935 h_blurRadius = hr;
943 } 936 }
944 937
945 if (v_blurRadius != vr) 938 if (v_blurRadius != vr)
946 { 939 {
947 ++changed; 940 changed = true;
948 v_blurRadius = vr; 941 v_blurRadius = vr;
949 } 942 }
950 943
951 if (v_blurRadius == 0 && h_blurRadius == 0) 944 if (v_blurRadius == 0 && h_blurRadius == 0)
952 flags &= ~blurNeeded; 945 flags &= ~blurNeeded;
953 else 946 else
954 flags |= blurNeeded; 947 flags |= blurNeeded;
955 948
956 return (changed > 0); 949 return changed;
957} 950}
958 951
959static inline unsigned long 952static inline unsigned long
960compute_tint_shade_flags (rxvt_color *tint, int shade) 953compute_tint_shade_flags (rxvt_color *tint, int shade)
961{ 954{
962 unsigned long flags = 0; 955 unsigned long flags = 0;
963 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 956 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
964 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 957 bool has_shade = shade != 100;
965 958
966 if (tint) 959 if (tint)
967 { 960 {
968 tint->get (c); 961 tint->get (c);
969# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 962# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
983 { 976 {
984 flags |= bgPixmap_t::tintNeeded; 977 flags |= bgPixmap_t::tintNeeded;
985 } 978 }
986 } 979 }
987 980
988 if (flags & bgPixmap_t::tintNeeded)
989 {
990 if (flags & bgPixmap_t::tintWholesome)
991 flags |= bgPixmap_t::tintServerSide;
992 else
993 {
994#if XFT
995 flags |= bgPixmap_t::tintServerSide;
996#endif
997 }
998 }
999
1000 return flags; 981 return flags;
1001} 982}
1002 983
1003bool 984bool
1004bgPixmap_t::set_tint (rxvt_color &new_tint) 985bgPixmap_t::set_tint (rxvt_color &new_tint)
1005{ 986{
1006 if (tint != new_tint) 987 if (!(flags & tintSet) || tint != new_tint)
1007 { 988 {
1008 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 989 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1009 tint = new_tint; 990 tint = new_tint;
1010 flags = (flags & ~tintFlags) | new_flags | tintSet; 991 flags = (flags & ~tintFlags) | new_flags | tintSet;
1011 return true; 992 return true;
… …
1029} 1010}
1030 1011
1031bool 1012bool
1032bgPixmap_t::set_shade (const char *shade_str) 1013bgPixmap_t::set_shade (const char *shade_str)
1033{ 1014{
1034 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1015 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1035 1016
1036 if (new_shade < 0 && new_shade > -100) 1017 clamp_it (new_shade, -100, 200);
1018 if (new_shade < 0)
1037 new_shade = 200 - (100 + new_shade); 1019 new_shade = 200 - (100 + new_shade);
1038 else if (new_shade == 100)
1039 new_shade = 0;
1040 1020
1041 if (new_shade != shade) 1021 if (new_shade != shade)
1042 { 1022 {
1043 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1023 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1044 shade = new_shade; 1024 shade = new_shade;
… …
1047 } 1027 }
1048 1028
1049 return false; 1029 return false;
1050} 1030}
1051 1031
1032#if XRENDER
1033static void
1034get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1035{
1036 double sigma = radius / 2.0;
1037 double scale = sqrt (2.0 * M_PI) * sigma;
1038 double sum = 0.0;
1039
1040 for (int i = 0; i < width; i++)
1041 {
1042 double x = i - width / 2;
1043 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1044 sum += kernel[i];
1045 }
1046
1047 params[0] = XDoubleToFixed (width);
1048 params[1] = XDoubleToFixed (1);
1049
1050 for (int i = 0; i < width; i++)
1051 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1052}
1053#endif
1054
1052bool 1055bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap) 1056bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1054{ 1057{
1055 Window root = target->display->root; 1058 bool ret = false;
1059#if XRENDER
1060 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1061 double *kernel = (double *)malloc (size * sizeof (double));
1062 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1063
1056 Display *dpy = target->dpy; 1064 Display *dpy = target->dpy;
1057 int window_width = target->szHint.width; 1065 XRenderPictureAttributes pa;
1058 int window_height = target->szHint.height; 1066 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1067
1068 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1069 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1070
1071 if (kernel && params && src && dst)
1072 {
1073 if (h_blurRadius)
1074 {
1075 size = h_blurRadius * 2 + 1;
1076 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1077
1078 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1079 XRenderComposite (dpy,
1080 PictOpSrc,
1081 src,
1082 None,
1083 dst,
1084 0, 0,
1085 0, 0,
1086 0, 0,
1087 width, height);
1088 }
1089
1090 if (v_blurRadius)
1091 {
1092 size = v_blurRadius * 2 + 1;
1093 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1094 swap (params[0], params[1]);
1095
1096 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1097 XRenderComposite (dpy,
1098 PictOpSrc,
1099 src,
1100 None,
1101 dst,
1102 0, 0,
1103 0, 0,
1104 0, 0,
1105 width, height);
1106 }
1107
1108 ret = true;
1109 }
1110
1111 free (kernel);
1112 free (params);
1113 XRenderFreePicture (dpy, src);
1114 XRenderFreePicture (dpy, dst);
1115#endif
1116 return ret;
1117}
1118
1119bool
1120bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1121{
1122 Display *dpy = target->dpy;
1059 bool ret = false; 1123 bool ret = false;
1060 1124
1061 if (flags & tintWholesome) 1125 if (flags & tintWholesome)
1062 { 1126 {
1063 XGCValues gcv; 1127 XGCValues gcv;
… …
1067 * performance improvements, as we eliminate XImage transfer 1131 * performance improvements, as we eliminate XImage transfer
1068 */ 1132 */
1069 gcv.foreground = Pixel (tint); 1133 gcv.foreground = Pixel (tint);
1070 gcv.function = GXand; 1134 gcv.function = GXand;
1071 gcv.fill_style = FillSolid; 1135 gcv.fill_style = FillSolid;
1072 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv); 1136 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1073 if (gc) 1137 if (gc)
1074 { 1138 {
1075 XFillRectangle (dpy, pixmap, gc, 0, 0, window_width, window_height); 1139 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1076 ret = true; 1140 ret = true;
1077 XFreeGC (dpy, gc); 1141 XFreeGC (dpy, gc);
1078 } 1142 }
1079 } 1143 }
1080 else 1144 else
1081 { 1145 {
1082# if XFT 1146# if XRENDER
1083 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1147 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1084 1148
1085 if (flags & tintSet) 1149 if (flags & tintSet)
1086 tint.get (c); 1150 tint.get (c);
1087 1151
1088 if (shade > 0 && shade < 100) 1152 if (shade <= 100)
1089 { 1153 {
1090 c.r = (c.r * shade) / 100; 1154 c.r = (c.r * shade) / 100;
1091 c.g = (c.g * shade) / 100; 1155 c.g = (c.g * shade) / 100;
1092 c.b = (c.b * shade) / 100; 1156 c.b = (c.b * shade) / 100;
1093 } 1157 }
1094 else if (shade > 100 && shade < 200) 1158 else
1095 {
1096 c.r = (c.r * (200 - shade)) / 100;
1097 c.g = (c.g * (200 - shade)) / 100;
1098 c.b = (c.b * (200 - shade)) / 100;
1099 } 1159 {
1160 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1161 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1162 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1163 }
1100 1164
1101 XRenderPictFormat pf; 1165 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1102 pf.type = PictTypeDirect;
1103 pf.depth = 32;
1104 pf.direct.redMask = 0xff;
1105 pf.direct.greenMask = 0xff;
1106 pf.direct.blueMask = 0xff;
1107 pf.direct.alphaMask = 0xff;
1108
1109 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 1166 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1110 (PictFormatType|
1111 PictFormatDepth|
1112 PictFormatRedMask|
1113 PictFormatGreenMask|
1114 PictFormatBlueMask|
1115 PictFormatAlphaMask),
1116 &pf,
1117 0);
1118 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1119 XRenderPictureAttributes pa; 1167 XRenderPictureAttributes pa;
1120 1168
1121 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa); 1169 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1122 1170
1123 pa.repeat = True; 1171 pa.repeat = True;
1124 1172
1125 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1173 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1126 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1174 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1127 XFreePixmap (dpy, overlay_pmap); 1175 XFreePixmap (dpy, overlay_pmap);
1128 1176
1129 pa.component_alpha = True; 1177 pa.component_alpha = True;
1130 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1178 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1131 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1179 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1132 XFreePixmap (dpy, mask_pmap); 1180 XFreePixmap (dpy, mask_pmap);
1133 1181
1134 if (mask_pic && overlay_pic && back_pic) 1182 if (mask_pic && overlay_pic && back_pic)
1135 { 1183 {
1136 XRenderColor mask_c; 1184 XRenderColor mask_c;
1137 1185
1138 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1186 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1139 mask_c.alpha = 0xffff; 1187 mask_c.alpha = 0xffff;
1140 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1188 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1141 1189
1142 mask_c.alpha = 0; 1190 mask_c.alpha = 0;
1143 mask_c.red = 0xffff - c.r; 1191 mask_c.red = 0xffff - c.r;
1144 mask_c.green = 0xffff - c.g; 1192 mask_c.green = 0xffff - c.g;
1145 mask_c.blue = 0xffff - c.b; 1193 mask_c.blue = 0xffff - c.b;
1146 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1194 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1147 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1195 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1148 ret = true; 1196 ret = true;
1149 } 1197 }
1150 1198
1151 XRenderFreePicture (dpy, mask_pic); 1199 XRenderFreePicture (dpy, mask_pic);
1152 XRenderFreePicture (dpy, overlay_pic); 1200 XRenderFreePicture (dpy, overlay_pic);
1153 XRenderFreePicture (dpy, back_pic); 1201 XRenderFreePicture (dpy, back_pic);
1154# if DO_TIMING_TEST
1155 XSync (dpy, False);
1156# endif
1157# endif 1202# endif
1158 } 1203 }
1159 1204
1160 return ret; 1205 return ret;
1161} 1206}
1162 1207
1163/* make_transparency_pixmap() 1208/* make_transparency_pixmap()
1164 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1209 * Builds a pixmap of the same size as the terminal window that contains
1165 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1210 * the tiled portion of the root pixmap that is supposed to be covered by
1166 * our window. 1211 * our window.
1167 */ 1212 */
1168unsigned long 1213unsigned long
1169bgPixmap_t::make_transparency_pixmap () 1214bgPixmap_t::make_transparency_pixmap ()
1170{ 1215{
… …
1174 return 0; 1219 return 0;
1175 1220
1176 /* root dimensions may change from call to call - but Display structure should 1221 /* root dimensions may change from call to call - but Display structure should
1177 * be always up-to-date, so let's use it : 1222 * be always up-to-date, so let's use it :
1178 */ 1223 */
1179 Window root = target->display->root;
1180 int screen = target->display->screen; 1224 int screen = target->display->screen;
1181 Display *dpy = target->dpy; 1225 Display *dpy = target->dpy;
1226 int root_depth = DefaultDepth (dpy, screen);
1182 int root_width = DisplayWidth (dpy, screen); 1227 int root_width = DisplayWidth (dpy, screen);
1183 int root_height = DisplayHeight (dpy, screen); 1228 int root_height = DisplayHeight (dpy, screen);
1184 unsigned int root_pmap_width, root_pmap_height; 1229 unsigned int root_pmap_width, root_pmap_height;
1185 int window_width = target->szHint.width; 1230 int window_width = target->szHint.width;
1186 int window_height = target->szHint.height; 1231 int window_height = target->szHint.height;
1187 int sx, sy; 1232 int sx, sy;
1188 XGCValues gcv; 1233 XGCValues gcv;
1234 GC gc;
1189 1235
1190 TIMING_TEST_START (tp);
1191 target->get_window_origin (sx, sy); 1236 target->get_window_origin (sx, sy);
1192 1237
1193 /* check if we are outside of the visible part of the virtual screen : */ 1238 /* check if we are outside of the visible part of the virtual screen : */
1194 if (sx + window_width <= 0 || sy + window_height <= 0 1239 if (sx + window_width <= 0 || sy + window_height <= 0
1195 || sx >= root_width || sy >= root_height) 1240 || sx >= root_width || sy >= root_height)
1196 return 0; 1241 return 0;
1197 1242
1243 // validate root pixmap and get its size
1198 if (root_pixmap != None) 1244 if (root_pixmap != None)
1199 { 1245 {
1200 /* we want to validate the pixmap and get it's size at the same time : */ 1246 Window wdummy;
1201 int junk; 1247 int idummy;
1202 unsigned int ujunk; 1248 unsigned int udummy;
1203 /* root pixmap may be bad - allow a error */ 1249
1204 target->allowedxerror = -1; 1250 target->allowedxerror = -1;
1205 1251
1206 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1252 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1207 root_pixmap = None; 1253 root_pixmap = None;
1208 1254
1209 target->allowedxerror = 0; 1255 target->allowedxerror = 0;
1210 } 1256 }
1211 1257
1258 Pixmap recoded_root_pmap = root_pixmap;
1259
1260 if (root_pixmap != None && root_depth != target->depth)
1261 {
1262#if XRENDER
1263 if (flags & HAS_RENDER)
1264 {
1265 XRenderPictureAttributes pa;
1266
1267 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1268 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1269
1270 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1271 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1272 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1273
1274 if (src && dst)
1275 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1276 else
1277 {
1278 XFreePixmap (dpy, recoded_root_pmap);
1279 root_pixmap = None;
1280 }
1281
1282 XRenderFreePicture (dpy, src);
1283 XRenderFreePicture (dpy, dst);
1284 }
1285 else
1286#endif
1287 root_pixmap = None;
1288 }
1289
1290 if (root_pixmap == None)
1291 return 0;
1292
1212 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1293 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
1213 GC gc = NULL;
1214 1294
1215 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1295 if (tiled_root_pmap == None) /* something really bad happened - abort */
1216 return 0; 1296 return 0;
1217 1297
1218 if (root_pixmap == None) 1298 /* straightforward pixmap copy */
1219 { 1299 gcv.tile = recoded_root_pmap;
1220 /* use tricks to obtain the root background image :*/ 1300 gcv.fill_style = FillTiled;
1221 /* we want to create Overrideredirect window overlapping out window
1222 with background type of Parent Relative and then grab it */
1223 XSetWindowAttributes attr;
1224 Window src;
1225 bool success = false;
1226 1301
1227 attr.background_pixmap = ParentRelative; 1302 while (sx < 0) sx += (int)root_width;
1228 attr.backing_store = Always; 1303 while (sy < 0) sy += (int)root_height;
1229 attr.event_mask = ExposureMask;
1230 attr.override_redirect = True;
1231 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
1232 CopyFromParent, CopyFromParent, CopyFromParent,
1233 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
1234 &attr);
1235 1304
1236 if (src != None) 1305 gcv.ts_x_origin = -sx;
1237 { 1306 gcv.ts_y_origin = -sy;
1238 XEvent event; 1307 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1239 int ev_count = 0;
1240 XGrabServer (dpy);
1241 XMapRaised (dpy, src);
1242 XSync (dpy, False);
1243 1308
1244 /* XSync should get window where it's properly exposed, 1309 if (gc)
1245 * but to be on the safe side - let's check for the actual event to arrive : */ 1310 {
1246 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1311 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1247 ++ev_count; 1312 result |= transpPmapTiled;
1313 XFreeGC (dpy, gc);
1248 1314
1249 if (ev_count > 0); 1315 if (!need_client_side_rendering ())
1250 { 1316 {
1251 /* hooray! - we can grab the image! */ 1317 if ((flags & blurNeeded)
1252 gc = XCreateGC (dpy, root, 0, NULL); 1318 && (flags & HAS_RENDER_CONV))
1253 if (gc)
1254 { 1319 {
1255 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 1320 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1256 success = true; 1321 result |= transpPmapBlurred;
1257 }
1258 } 1322 }
1259
1260 XDestroyWindow (dpy, src);
1261 XUngrabServer (dpy);
1262 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
1263 }
1264
1265 if (!success)
1266 {
1267 XFreePixmap (dpy, tiled_root_pmap);
1268 tiled_root_pmap = None;
1269 }
1270 else
1271 result |= transpPmapTiled;
1272 }
1273 else
1274 {
1275 /* straightforward pixmap copy */
1276 gcv.tile = root_pixmap;
1277 gcv.fill_style = FillTiled;
1278
1279 while (sx < 0) sx += (int)root_width;
1280 while (sy < 0) sy += (int)root_height;
1281
1282 gcv.ts_x_origin = -sx;
1283 gcv.ts_y_origin = -sy;
1284 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1285
1286 if (gc)
1287 {
1288 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
1289 result |= transpPmapTiled;
1290 }
1291 }
1292 TIMING_TEST_PRINT_RESULT (tp);
1293
1294 if (tiled_root_pmap != None)
1295 {
1296 if (!need_client_side_rendering ())
1297 {
1298 if ((flags & tintNeeded)) 1323 if ((flags & tintNeeded)
1324 && (flags & (tintWholesome | HAS_RENDER)))
1299 { 1325 {
1300 if (tint_pixmap (tiled_root_pmap)) 1326 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1301 result |= transpPmapTinted; 1327 result |= transpPmapTinted;
1302 } 1328 }
1303 } /* server side rendering completed */ 1329 } /* server side rendering completed */
1304 1330
1305 if (pixmap) 1331 if (pixmap)
1306 XFreePixmap (dpy, pixmap); 1332 XFreePixmap (dpy, pixmap);
1307 1333
1308 pixmap = tiled_root_pmap; 1334 pixmap = tiled_root_pmap;
1309 pmap_width = window_width; 1335 pmap_width = window_width;
1310 pmap_height = window_height; 1336 pmap_height = window_height;
1311 pmap_depth = root_depth; 1337 pmap_depth = target->depth;
1312 } 1338 }
1339 else
1340 XFreePixmap (dpy, tiled_root_pmap);
1313 1341
1314 if (gc) 1342 if (recoded_root_pmap != root_pixmap)
1315 XFreeGC (dpy, gc); 1343 XFreePixmap (dpy, recoded_root_pmap);
1316
1317 TIMING_TEST_PRINT_RESULT (tp);
1318 1344
1319 return result; 1345 return result;
1320} 1346}
1321 1347
1322bool 1348void
1323bgPixmap_t::set_root_pixmap () 1349bgPixmap_t::set_root_pixmap ()
1324{ 1350{
1325 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1351 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1326 if (new_root_pixmap == None) 1352 if (new_root_pixmap == None)
1327 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1353 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1328 1354
1329 if (new_root_pixmap != root_pixmap)
1330 {
1331 root_pixmap = new_root_pixmap; 1355 root_pixmap = new_root_pixmap;
1332 return true;
1333 }
1334
1335 return false;
1336} 1356}
1337# endif /* ENABLE_TRANSPARENCY */ 1357# endif /* ENABLE_TRANSPARENCY */
1338 1358
1339# ifndef HAVE_AFTERIMAGE 1359#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1340static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm); 1360static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1341# endif 1361# endif
1342 1362
1343bool 1363bool
1344bgPixmap_t::render () 1364bgPixmap_t::render ()
1345{ 1365{
1346 unsigned long background_flags = 0; 1366 unsigned long background_flags = 0;
1347 1367
1348 if (target == NULL) 1368 if (target == NULL)
1349 return false; 1369 return false;
1350
1351 TIMING_TEST_START (tp);
1352 1370
1353 invalidate (); 1371 invalidate ();
1354# ifdef ENABLE_TRANSPARENCY 1372# ifdef ENABLE_TRANSPARENCY
1355 if (flags & isTransparent) 1373 if (flags & isTransparent)
1356 { 1374 {
1357 /* we need to re-generate transparency pixmap in that case ! */ 1375 /* we need to re-generate transparency pixmap in that case ! */
1358 background_flags = make_transparency_pixmap (); 1376 background_flags = make_transparency_pixmap ();
1359 if (background_flags == 0) 1377 if (background_flags == 0)
1360 return false; 1378 return false;
1361 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1379 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1362 && pmap_depth == target->depth)
1363 flags = flags & ~isInvalid; 1380 flags = flags & ~isInvalid;
1364 } 1381 }
1365# endif 1382# endif
1366 1383
1367# ifdef BG_IMAGE_FROM_FILE 1384# ifdef BG_IMAGE_FROM_FILE
… …
1371 if (render_image (background_flags)) 1388 if (render_image (background_flags))
1372 flags = flags & ~isInvalid; 1389 flags = flags & ~isInvalid;
1373 } 1390 }
1374# endif 1391# endif
1375 1392
1393# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1376 XImage *result = NULL; 1394 XImage *result = NULL;
1377 1395
1378 if (background_flags && (flags & isInvalid)) 1396 if (background_flags && (flags & isInvalid))
1379 { 1397 {
1380 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1398 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1381 } 1399 }
1382 1400
1383 if (result) 1401 if (result)
1384 { 1402 {
1385# if !defined(HAVE_AFTERIMAGE) && !XFT
1386 /* our own client-side tinting */ 1403 /* our own client-side tinting */
1387 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1388 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1389 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1404 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1390 { 1405 {
1391 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1406 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1392 if (flags & tintSet) 1407 if (flags & tintSet)
1393 tint.get (c); 1408 tint.get (c);
1394 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1409 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1395 } 1410 }
1396# endif
1397 1411
1398 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1412 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1399 1413
1400 if (gc) 1414 if (gc)
1401 { 1415 {
1402 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1403 {
1404 XFreePixmap (target->dpy, pixmap);
1405 pixmap = None;
1406 }
1407
1408 if (pixmap == None)
1409 {
1410 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1411 pmap_width = result->width;
1412 pmap_height = result->height;
1413 pmap_depth = target->depth;
1414 }
1415
1416 if (pmap_depth != result->depth)
1417 {
1418 /* Bad Match error will ensue ! stupid X !!!! */
1419 if (result->depth == 24 && pmap_depth == 32)
1420 result->depth = 32;
1421 else if (result->depth == 32 && pmap_depth == 24)
1422 result->depth = 24;
1423 else
1424 {
1425 /* TODO: implement image recoding */
1426 }
1427 }
1428
1429 if (pmap_depth == result->depth)
1430 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1416 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1431 1417
1432 XFreeGC (target->dpy, gc); 1418 XFreeGC (target->dpy, gc);
1433 flags = flags & ~isInvalid; 1419 flags = flags & ~isInvalid;
1434 } 1420 }
1435 1421
1436 XDestroyImage (result); 1422 XDestroyImage (result);
1437 } 1423 }
1424# endif
1438 1425
1439 if (flags & isInvalid) 1426 if (flags & isInvalid)
1440 { 1427 {
1441 if (pixmap != None) 1428 if (pixmap != None)
1442 { 1429 {
… …
1445 } 1432 }
1446 } 1433 }
1447 1434
1448 apply (); 1435 apply ();
1449 1436
1450 XSync (target->dpy, False);
1451 valid_since = ev::now (); 1437 valid_since = ev::now ();
1452 1438
1453 TIMING_TEST_PRINT_RESULT (tp);
1454
1455 return true; 1439 return true;
1456} 1440}
1457 1441
1458bool 1442void
1459bgPixmap_t::set_target (rxvt_term *new_target) 1443bgPixmap_t::set_target (rxvt_term *new_target)
1460{ 1444{
1461 if (new_target)
1462 if (target != new_target)
1463 {
1464 target = new_target; 1445 target = new_target;
1465# ifdef ENABLE_TRANSPARENCY 1446
1466 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1447 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1448#if XRENDER
1449 int major, minor;
1450 if (XRenderQueryVersion (target->dpy, &major, &minor))
1451 flags |= HAS_RENDER;
1452 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1453 if (filters)
1454 {
1455 for (int i = 0; i < filters->nfilter; i++)
1456 if (!strcmp (filters->filter[i], FilterConvolution))
1457 flags |= HAS_RENDER_CONV;
1458
1459 XFree (filters);
1460 }
1467# endif 1461#endif
1468 return true;
1469 }
1470
1471 return false;
1472} 1462}
1473 1463
1474void 1464void
1475bgPixmap_t::apply () 1465bgPixmap_t::apply ()
1476{ 1466{
1477 if (target) 1467 if (target == NULL)
1478 { 1468 return;
1479 flags &= ~isVtOrigin;
1480 1469
1481 if (pixmap != None) 1470 if (pixmap != None)
1482 { 1471 {
1483 /* set target's background to pixmap */ 1472 /* set target's background to pixmap */
1484# ifdef ENABLE_TRANSPARENCY 1473# ifdef ENABLE_TRANSPARENCY
1485 if (flags & isTransparent) 1474 if (flags & isTransparent)
1486 { 1475 {
1487 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1476 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1488 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1477 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1489 1478
1490 if (target->scrollBar.win) 1479 if (target->scrollBar.win)
1491 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1480 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1492 } 1481 }
1493 else 1482 else
1494# endif 1483# endif
1495 { 1484 {
1496 flags |= isVtOrigin;
1497 /* force old pixmap dereference in case it was transparent before :*/ 1485 /* force old pixmap dereference in case it was transparent before :*/
1498 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1499 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1500 /* do we also need to set scrollbar's background here ? */
1501
1502 if (target->scrollBar.win)
1503 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1504 }
1505 }
1506 else
1507 {
1508 /* set target background to a pixel */
1509 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1486 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1510 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1487 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1511 /* do we also need to set scrollbar's background here ? */ 1488 /* do we also need to set scrollbar's background here ? */
1489
1512 if (target->scrollBar.win) 1490 if (target->scrollBar.win)
1513 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1491 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1514 } 1492 }
1493 }
1494 else
1495 {
1496 /* set target background to a pixel */
1497 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1498 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1499 /* do we also need to set scrollbar's background here ? */
1500 if (target->scrollBar.win)
1501 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1502 }
1515 1503
1516 /* don't want Expose on the parent or vt. It is better to use 1504 /* don't want Expose on the parent or vt. It is better to use
1517 scr_touch or we get a great deal of flicker otherwise: */ 1505 scr_touch or we get a great deal of flicker otherwise: */
1518 XClearWindow (target->dpy, target->parent[0]); 1506 XClearWindow (target->dpy, target->parent[0]);
1519 1507
1520 if (target->scrollBar.state && target->scrollBar.win) 1508 if (target->scrollBar.state && target->scrollBar.win)
1521 { 1509 {
1522 target->scrollBar.state = STATE_IDLE; 1510 target->scrollBar.state = STATE_IDLE;
1523 target->scrollBar.show (0); 1511 target->scrollBar.show (0);
1524 } 1512 }
1525 1513
1526 target->want_refresh = 1; 1514 target->want_refresh = 1;
1527 flags |= hasChanged; 1515 flags |= hasChanged;
1528 }
1529} 1516}
1530 1517
1531#endif /* HAVE_BG_PIXMAP */ 1518#endif /* HAVE_BG_PIXMAP */
1532 1519
1533#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1520#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1534/* taken from aterm-0.4.2 */ 1521/* taken from aterm-0.4.2 */
1535 1522
1536typedef uint32_t RUINT32T;
1537
1538static void 1523static void
1539ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1524ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1540{ 1525{
1541 int sh_r, sh_g, sh_b; 1526 int sh_r, sh_g, sh_b;
1542 RUINT32T mask_r, mask_g, mask_b; 1527 uint32_t mask_r, mask_g, mask_b;
1543 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1528 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1544 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1529 rgba low;
1545 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1530 rgba high;
1546 int i; 1531 int i;
1532 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1547 1533
1548 Visual *visual = term->visual;
1549
1550 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1534 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1551
1552 if (shade == 0)
1553 shade = 100;
1554 1535
1555 /* for convenience */ 1536 /* for convenience */
1556 mask_r = visual->red_mask; 1537 mask_r = visual->red_mask;
1557 mask_g = visual->green_mask; 1538 mask_g = visual->green_mask;
1558 mask_b = visual->blue_mask; 1539 mask_b = visual->blue_mask;
1559 1540
1560 /* boring lookup table pre-initialization */ 1541 /* boring lookup table pre-initialization */
1561 switch (srcImage->bits_per_pixel) { 1542 switch (srcImage->depth)
1543 {
1562 case 15: 1544 case 15:
1563 if ((mask_r != 0x7c00) || 1545 if ((mask_r != 0x7c00) ||
1564 (mask_g != 0x03e0) || 1546 (mask_g != 0x03e0) ||
1565 (mask_b != 0x001f)) 1547 (mask_b != 0x001f))
1566 return; 1548 return;
1567 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1549 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1568 lookup_r = lookup; 1550 lookup_r = lookup;
1569 lookup_g = lookup+32; 1551 lookup_g = lookup+32;
1570 lookup_b = lookup+32+32; 1552 lookup_b = lookup+32+32;
1571 sh_r = 10; 1553 sh_r = 10;
1572 sh_g = 5; 1554 sh_g = 5;
1573 sh_b = 0; 1555 sh_b = 0;
1574 break; 1556 break;
1575 case 16: 1557 case 16:
1576 if ((mask_r != 0xf800) || 1558 if ((mask_r != 0xf800) ||
1577 (mask_g != 0x07e0) || 1559 (mask_g != 0x07e0) ||
1578 (mask_b != 0x001f)) 1560 (mask_b != 0x001f))
1579 return; 1561 return;
1580 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1562 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1581 lookup_r = lookup; 1563 lookup_r = lookup;
1582 lookup_g = lookup+32; 1564 lookup_g = lookup+32;
1583 lookup_b = lookup+32+64; 1565 lookup_b = lookup+32+64;
1584 sh_r = 11; 1566 sh_r = 11;
1585 sh_g = 5; 1567 sh_g = 5;
1586 sh_b = 0; 1568 sh_b = 0;
1587 break; 1569 break;
1588 case 24: 1570 case 24:
1589 if ((mask_r != 0xff0000) || 1571 if ((mask_r != 0xff0000) ||
1590 (mask_g != 0x00ff00) || 1572 (mask_g != 0x00ff00) ||
1591 (mask_b != 0x0000ff)) 1573 (mask_b != 0x0000ff))
1592 return; 1574 return;
1593 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1575 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1594 lookup_r = lookup; 1576 lookup_r = lookup;
1595 lookup_g = lookup+256; 1577 lookup_g = lookup+256;
1596 lookup_b = lookup+256+256; 1578 lookup_b = lookup+256+256;
1597 sh_r = 16; 1579 sh_r = 16;
1598 sh_g = 8; 1580 sh_g = 8;
1599 sh_b = 0; 1581 sh_b = 0;
1600 break; 1582 break;
1601 case 32: 1583 case 32:
1602 if ((mask_r != 0xff0000) || 1584 if ((mask_r != 0xff0000) ||
1603 (mask_g != 0x00ff00) || 1585 (mask_g != 0x00ff00) ||
1604 (mask_b != 0x0000ff)) 1586 (mask_b != 0x0000ff))
1605 return; 1587 return;
1606 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1588 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1607 lookup_r = lookup; 1589 lookup_r = lookup;
1608 lookup_g = lookup+256; 1590 lookup_g = lookup+256;
1609 lookup_b = lookup+256+256; 1591 lookup_b = lookup+256+256;
1610 sh_r = 16; 1592 sh_r = 16;
1611 sh_g = 8; 1593 sh_g = 8;
1612 sh_b = 0; 1594 sh_b = 0;
1613 break; 1595 break;
1614 default: 1596 default:
1615 return; /* we do not support this color depth */ 1597 return; /* we do not support this color depth */
1616 } 1598 }
1617 1599
1618 /* prepare limits for color transformation (each channel is handled separately) */ 1600 /* prepare limits for color transformation (each channel is handled separately) */
1619 if (shade < 0) { 1601 if (shade > 100)
1602 {
1620 shade = -shade; 1603 shade = 200 - shade;
1621 if (shade < 0) shade = 0;
1622 if (shade > 100) shade = 100;
1623 1604
1624 lower_lim_r = 65535-rm; 1605 high.r = (65535 - c.r) * shade / 100;
1625 lower_lim_g = 65535-gm; 1606 high.g = (65535 - c.g) * shade / 100;
1626 lower_lim_b = 65535-bm; 1607 high.b = (65535 - c.b) * shade / 100;
1627 1608
1628 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1609 low.r = 65535 - high.r;
1629 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1610 low.g = 65535 - high.g;
1630 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1611 low.b = 65535 - high.b;
1631
1632 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1633 } else {
1634 if (shade < 0) shade = 0;
1635 if (shade > 100) shade = 100;
1636
1637 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1638
1639 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1640 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1641 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1642 } 1612 }
1643 1613 else
1644 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1645 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1646 { 1614 {
1647 unsigned int tmp; 1615 high.r = c.r * shade / 100;
1616 high.g = c.g * shade / 100;
1617 high.b = c.b * shade / 100;
1648 1618
1649 tmp = lower_lim_r; 1619 low.r = low.g = low.b = 0;
1650 lower_lim_r = lower_lim_b;
1651 lower_lim_b = tmp;
1652
1653 tmp = upper_lim_r;
1654 upper_lim_r = upper_lim_b;
1655 upper_lim_b = tmp;
1656 } 1620 }
1657 1621
1658 /* fill our lookup tables */ 1622 /* fill our lookup tables */
1659 for (i = 0; i <= mask_r>>sh_r; i++) 1623 for (i = 0; i <= mask_r>>sh_r; i++)
1660 { 1624 {
1661 RUINT32T tmp; 1625 uint32_t tmp;
1662 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1626 tmp = i * high.r;
1663 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1627 tmp += (mask_r>>sh_r) * low.r;
1664 lookup_r[i] = (tmp/65535)<<sh_r; 1628 lookup_r[i] = (tmp/65535)<<sh_r;
1665 } 1629 }
1666 for (i = 0; i <= mask_g>>sh_g; i++) 1630 for (i = 0; i <= mask_g>>sh_g; i++)
1667 { 1631 {
1668 RUINT32T tmp; 1632 uint32_t tmp;
1669 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1633 tmp = i * high.g;
1670 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1634 tmp += (mask_g>>sh_g) * low.g;
1671 lookup_g[i] = (tmp/65535)<<sh_g; 1635 lookup_g[i] = (tmp/65535)<<sh_g;
1672 } 1636 }
1673 for (i = 0; i <= mask_b>>sh_b; i++) 1637 for (i = 0; i <= mask_b>>sh_b; i++)
1674 { 1638 {
1675 RUINT32T tmp; 1639 uint32_t tmp;
1676 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1640 tmp = i * high.b;
1677 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1641 tmp += (mask_b>>sh_b) * low.b;
1678 lookup_b[i] = (tmp/65535)<<sh_b; 1642 lookup_b[i] = (tmp/65535)<<sh_b;
1679 } 1643 }
1680 1644
1681 /* apply table to input image (replacing colors by newly calculated ones) */ 1645 /* apply table to input image (replacing colors by newly calculated ones) */
1682 switch (srcImage->bits_per_pixel) 1646 if (srcImage->bits_per_pixel == 32
1647 && (srcImage->depth == 24 || srcImage->depth == 32)
1648 && srcImage->byte_order == host_byte_order)
1683 { 1649 {
1684 case 15:
1685 {
1686 unsigned short *p1, *pf, *p, *pl; 1650 uint32_t *p1, *pf, *p, *pl;
1687 p1 = (unsigned short *) srcImage->data; 1651 p1 = (uint32_t *) srcImage->data;
1688 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1652 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1653
1689 while (p1 < pf) 1654 while (p1 < pf)
1690 { 1655 {
1691 p = p1; 1656 p = p1;
1692 pl = p1 + srcImage->width; 1657 pl = p1 + srcImage->width;
1693 for (; p < pl; p++) 1658 for (; p < pl; p++)
1694 { 1659 {
1695 *p = lookup_r[(*p & 0x7c00)>>10] |
1696 lookup_g[(*p & 0x03e0)>> 5] |
1697 lookup_b[(*p & 0x001f)];
1698 }
1699 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1700 }
1701 break;
1702 }
1703 case 16:
1704 {
1705 unsigned short *p1, *pf, *p, *pl;
1706 p1 = (unsigned short *) srcImage->data;
1707 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1708 while (p1 < pf)
1709 {
1710 p = p1;
1711 pl = p1 + srcImage->width;
1712 for (; p < pl; p++)
1713 {
1714 *p = lookup_r[(*p & 0xf800)>>11] |
1715 lookup_g[(*p & 0x07e0)>> 5] |
1716 lookup_b[(*p & 0x001f)];
1717 }
1718 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1719 }
1720 break;
1721 }
1722 case 24:
1723 {
1724 unsigned char *p1, *pf, *p, *pl;
1725 p1 = (unsigned char *) srcImage->data;
1726 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1727 while (p1 < pf)
1728 {
1729 p = p1;
1730 pl = p1 + srcImage->width * 3;
1731 for (; p < pl; p += 3)
1732 {
1733 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1734 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1735 p[2] = lookup_r[(p[2] & 0x0000ff)];
1736 }
1737 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1738 }
1739 break;
1740 }
1741 case 32:
1742 {
1743 RUINT32T *p1, *pf, *p, *pl;
1744 p1 = (RUINT32T *) srcImage->data;
1745 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1746
1747 while (p1 < pf)
1748 {
1749 p = p1;
1750 pl = p1 + srcImage->width;
1751 for (; p < pl; p++)
1752 {
1753 *p = lookup_r[(*p & 0xff0000)>>16] | 1660 *p = lookup_r[(*p & 0xff0000) >> 16] |
1754 lookup_g[(*p & 0x00ff00)>> 8] | 1661 lookup_g[(*p & 0x00ff00) >> 8] |
1755 lookup_b[(*p & 0x0000ff)] | 1662 lookup_b[(*p & 0x0000ff)] |
1756 (*p & ~0xffffff); 1663 (*p & 0xff000000);
1664 }
1665 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1666 }
1667 }
1668 else
1669 {
1670 for (int y = 0; y < srcImage->height; y++)
1671 for (int x = 0; x < srcImage->width; x++)
1672 {
1673 unsigned long pixel = XGetPixel (srcImage, x, y);
1674 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1675 lookup_g[(pixel & mask_g) >> sh_g] |
1676 lookup_b[(pixel & mask_b) >> sh_b];
1677 XPutPixel (srcImage, x, y, pixel);
1757 } 1678 }
1758 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1759 } 1679 }
1760 break;
1761 }
1762 }
1763 1680
1764 free (lookup); 1681 free (lookup);
1765} 1682}
1766#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1683#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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