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.25 by root, Sat Jan 19 00:21:59 2008 UTC vs.
Revision 1.72 by sf-exg, Sat Oct 9 14:57:50 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2005-2006 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 * 8 *
9 * This program is free software; you can redistribute it and/or modify 9 * 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 10 * 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 11 * the Free Software Foundation; either version 2 of the License, or
… …
27#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
28 28
29#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h> 30# include <sys/time.h>
31#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
32 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv; \
33 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
34 34
35#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
36 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 36 do { \
37 struct timeval tv; \
38 gettimeofday (&tv, NULL); \
39 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
37 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 40 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
38 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 41 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
42 } while (0)
39 43
40#else 44#else
41#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
42#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
43#endif 47#endif
44 48
45/* 49/*
46 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
47 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
48 * adjustment and may optionally be followed by a colon and one or more 52 * adjustment and may optionally be followed by a colon and one or more
49 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
50 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
51 * affects on the background image : 55 * effects on the background image :
52 * 56 *
53 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
54 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
55 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
56 * the image in the window. 60 * the image in the window.
57 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
58 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
59 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
60 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
61 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
62 * 66 *
63 * Adjusting position only : 67 * Adjusting position only :
64 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
65 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
66 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
67 * from current position (relative). 71 * from current position (relative).
68 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
69 * from current position. 73 * from current position.
70 * 74 *
71 * Adjusting scale only : 75 * Adjusting scale only :
72 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
73 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
74 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
75 * 79 *
76 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
77 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
78 * the tile size and origin. 82 * the tile size and origin.
79 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
80 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
81 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
82 * current background color. 86 * current background color.
83 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
84 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
… …
92 // this is basically redundant as bgPixmap_t is only used in 96 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs 97 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 99 original_asim = NULL;
96#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
97#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
98 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
99 h_align = v_align = 0; 107 h_align = v_align = 0;
100#endif 108#endif
101 flags = 0; 109 flags = 0;
102 pixmap = None; 110 pixmap = None;
… …
110#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
111 if (original_asim) 119 if (original_asim)
112 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
113#endif 121#endif
114 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
115 if (pixmap && target) 128 if (pixmap && target)
116 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
117} 130}
118 131
119bool 132bool
… …
123 if (flags & isTransparent) 136 if (flags & isTransparent)
124 return true; 137 return true;
125# endif 138# endif
126 139
127# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
128# ifdef HAVE_AFTERIMAGE 141 if (have_image)
129 if (original_asim)
130# endif
131 { 142 {
132 if (h_scale != 0 || v_scale != 0 143 if (flags & sizeSensitive)
133 || h_align != 0 || v_align != 0)
134 return true; 144 return true;
135 } 145 }
136# endif 146# endif
137 147
138 return false; 148 return false;
139} 149}
140 150
141bool 151bool
142bgPixmap_t::window_position_sensitive () 152bgPixmap_t::window_position_sensitive ()
143{ 153{
144# ifdef ENABLE_TRANSPARENCY 154# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent) 155 if (flags & isTransparent)
146 return true; 156 return true;
147# endif 157# endif
148 158
149# ifdef BG_IMAGE_FROM_FILE 159# ifdef BG_IMAGE_FROM_FILE
150# ifdef HAVE_AFTERIMAGE 160 if (have_image)
151 if (original_asim)
152# endif
153 { 161 {
154 if (h_align == rootAlign || v_align == rootAlign) 162 if (flags & rootAlign)
155 return true; 163 return true;
156 } 164 }
157# endif 165# endif
158 166
159 return false; 167 return false;
… …
199static inline bool 207static inline bool
200check_set_align_value (int geom_flags, int flag, int &align, int new_value) 208check_set_align_value (int geom_flags, int flag, int &align, int new_value)
201{ 209{
202 if (geom_flags & flag) 210 if (geom_flags & flag)
203 { 211 {
204 if (new_value != bgPixmap_t::rootAlign)
205 {
206 if (new_value < -100) 212 if (new_value < -100)
207 new_value = -100; 213 new_value = -100;
208 else if (new_value > 200) 214 else if (new_value > 200)
209 new_value = 200; 215 new_value = 200;
210 }
211 if (new_value != align) 216 if (new_value != align)
212 { 217 {
213 align = new_value; 218 align = new_value;
214 return true; 219 return true;
215 } 220 }
… …
219 224
220static inline int 225static inline int
221make_align_position (int align, int window_size, int image_size) 226make_align_position (int align, int window_size, int image_size)
222{ 227{
223 int diff = window_size - image_size; 228 int diff = window_size - image_size;
224 int smaller = MIN (image_size,window_size); 229 int smaller = min (image_size, window_size);
225 230
226 if (align >= 0 && align <= 50) 231 if (align >= 0 && align <= 100)
227 return diff * align / 100; 232 return diff * align / 100;
228 else if (align > 50 && align <= 100)
229 return window_size - image_size - diff * (100 - align) / 100;
230 else if (align > 100 && align <= 200 ) 233 else if (align > 100 && align <= 200 )
231 return ((align - 100) * smaller / 100) + window_size - smaller; 234 return ((align - 100) * smaller / 100) + window_size - smaller;
232 else if (align > -100 && align < 0) 235 else if (align >= -100 && align < 0)
233 return ((align + 100) * smaller / 100) - image_size; 236 return ((align + 100) * smaller / 100) - image_size;
234 return 0; 237 return 0;
235} 238}
236 239
237static inline int 240static inline int
238make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 241make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
239{ 242{
240 int src_pos = 0; 243 int src_pos = 0;
241 dst_pos = 0; 244 dst_pos = pos;
242 dst_size = size; 245 dst_size = size;
243 if (pos < 0 && size > target_size) 246 if (pos < 0)
244 { 247 {
245 src_pos = -pos; 248 src_pos = -pos;
249 dst_pos = 0;
246 dst_size += pos; 250 dst_size += pos;
247 } 251 }
248 else if (pos > 0)
249 dst_pos = pos;
250 252
251 if (dst_pos + dst_size > target_size) 253 if (dst_pos + dst_size > target_size)
252 dst_size = target_size - dst_pos; 254 dst_size = target_size - dst_pos;
253 return src_pos; 255 return src_pos;
254} 256}
… …
259 int geom_flags = 0, changed = 0; 261 int geom_flags = 0, changed = 0;
260 int x = 0, y = 0; 262 int x = 0, y = 0;
261 unsigned int w = 0, h = 0; 263 unsigned int w = 0, h = 0;
262 unsigned int n; 264 unsigned int n;
263 unsigned long new_flags = (flags & (~geometryFlags)); 265 unsigned long new_flags = (flags & (~geometryFlags));
264 char *p; 266 const char *p;
265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 267# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
266 268
267 if (geom == NULL) 269 if (geom == NULL)
268 return false; 270 return false;
269 271
… …
370 if (ops) 372 if (ops)
371 { 373 {
372 while (*ops) 374 while (*ops)
373 { 375 {
374 while (*ops == ':' || isspace(*ops)) ++ops; 376 while (*ops == ':' || isspace(*ops)) ++ops;
377
375# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 378# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
376 if (CHECK_GEOM_OPS("tile")) 379 if (CHECK_GEOM_OPS ("tile"))
377 { 380 {
378 w = h = noScale; 381 w = h = noScale;
379 geom_flags |= WidthValue|HeightValue; 382 geom_flags |= WidthValue|HeightValue;
380 } 383 }
381 else if (CHECK_GEOM_OPS("propscale")) 384 else if (CHECK_GEOM_OPS ("propscale"))
382 { 385 {
383 if (w == 0 && h == 0)
384 {
385 w = windowScale;
386 geom_flags |= WidthValue;
387 }
388 new_flags |= propScale; 386 new_flags |= propScale;
389 } 387 }
390 else if (CHECK_GEOM_OPS("hscale")) 388 else if (CHECK_GEOM_OPS ("hscale"))
391 { 389 {
392 if (w == 0)
393 w = windowScale; 390 if (w == 0) w = windowScale;
391
394 h = noScale; 392 h = noScale;
395 geom_flags |= WidthValue|HeightValue; 393 geom_flags |= WidthValue|HeightValue;
396 } 394 }
397 else if (CHECK_GEOM_OPS("vscale")) 395 else if (CHECK_GEOM_OPS ("vscale"))
398 { 396 {
399 if (h == 0)
400 h = windowScale; 397 if (h == 0) h = windowScale;
398
401 w = noScale; 399 w = noScale;
402 geom_flags |= WidthValue|HeightValue; 400 geom_flags |= WidthValue|HeightValue;
403 } 401 }
404 else if (CHECK_GEOM_OPS("scale")) 402 else if (CHECK_GEOM_OPS ("scale"))
405 { 403 {
406 if (h == 0)
407 h = windowScale; 404 if (h == 0) h = windowScale;
408 if (w == 0)
409 w = windowScale; 405 if (w == 0) w = windowScale;
406
410 geom_flags |= WidthValue|HeightValue; 407 geom_flags |= WidthValue|HeightValue;
411 } 408 }
412 else if (CHECK_GEOM_OPS("auto")) 409 else if (CHECK_GEOM_OPS ("auto"))
413 { 410 {
414 w = h = windowScale; 411 w = h = windowScale;
415 x = y = centerAlign; 412 x = y = centerAlign;
416 geom_flags |= WidthValue|HeightValue|XValue|YValue; 413 geom_flags |= WidthValue|HeightValue|XValue|YValue;
417 } 414 }
418 else if (CHECK_GEOM_OPS("root")) 415 else if (CHECK_GEOM_OPS ("root"))
419 { 416 {
417 new_flags |= rootAlign;
420 w = h = noScale; 418 w = h = noScale;
421 x = y = rootAlign;
422 geom_flags |= WidthValue|HeightValue|XValue|YValue; 419 geom_flags |= WidthValue|HeightValue;
423 } 420 }
424# undef CHECK_GEOM_OPS 421# undef CHECK_GEOM_OPS
422
425 while (*ops != ':' && *ops != '\0') ++ops; 423 while (*ops != ':' && *ops != '\0') ++ops;
426 } /* done parsing ops */ 424 } /* done parsing ops */
427 } 425 }
428 426
429 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 427 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
430 ++changed;
431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 428 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
432 ++changed;
433 if (check_set_align_value (geom_flags, XValue, h_align, x)) 429 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
434 ++changed;
435 if (check_set_align_value (geom_flags, YValue, v_align, y)) 430 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
436 ++changed;
437 } 431 }
438 432
439 if (new_flags != flags) 433 if (new_flags != flags)
440 { 434 {
441 flags = new_flags; 435 flags = new_flags;
442 changed++; 436 changed++;
443 } 437 }
438
444//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 439 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
445// flags, h_scale, v_scale, h_align, v_align); 440 // flags, h_scale, v_scale, h_align, v_align);
446 return (changed > 0); 441 return (changed > 0);
442}
443
444void
445bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
446{
447 int target_width = target->szHint.width;
448 int target_height = target->szHint.height;
449
450 if (flags & propScale)
451 {
452 float scale = (float)target_width / image_width;
453 min_it (scale, (float)target_height / image_height);
454 w = image_width * scale + 0.5;
455 h = image_height * scale + 0.5;
456 }
457 else
458 {
459 w = h_scale * target_width / 100;
460 h = v_scale * target_height / 100;
461 }
462
463 if (!w) w = image_width;
464 if (!h) h = image_height;
465
466 if (flags & rootAlign)
467 {
468 target->get_window_origin (x, y);
469 x = -x;
470 y = -y;
471 }
472 else
473 {
474 x = make_align_position (h_align, target_width, w);
475 y = make_align_position (v_align, target_height, h);
476 }
477
478 flags &= ~sizeSensitive;
479 if (h_scale != 0 || v_scale != 0
480 || h_align != 0 || v_align != 0
481 || w > target_width || h > target_height)
482 flags |= sizeSensitive;
447} 483}
448 484
449# ifdef HAVE_AFTERIMAGE 485# ifdef HAVE_AFTERIMAGE
450bool 486bool
451bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 487bgPixmap_t::render_image (unsigned long background_flags)
452{ 488{
453 if (target == NULL) 489 if (target == NULL)
454 return false; 490 return false;
455 491
492 target->init_asv ();
493
494 ASImage *background = NULL;
495 ARGB32 background_tint = TINT_LEAVE_SAME;
496
497# ifdef ENABLE_TRANSPARENCY
498 if (background_flags)
499 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
500
501 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
502 {
503 ShadingInfo as_shade;
504 as_shade.shading = (shade == 0) ? 100 : shade;
505
506 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
507 if (flags & tintSet)
508 tint.get (c);
509 as_shade.tintColor.red = c.r;
510 as_shade.tintColor.green = c.g;
511 as_shade.tintColor.blue = c.b;
512
513 background_tint = shading2tint32 (&as_shade);
514 }
515
516 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
517 {
518 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,
520 100, ASIMAGE_QUALITY_DEFAULT);
521 if (tmp)
522 {
523 destroy_asimage (&background);
524 background = tmp;
525 }
526 }
527# endif
528
529 ASImage *result = 0;
530
456 int target_width = (int)target->szHint.width; 531 int target_width = target->szHint.width;
457 int target_height = (int)target->szHint.height; 532 int target_height = target->szHint.height;
458 int new_pmap_width = target_width, new_pmap_height = target_height; 533 int new_pmap_width = target_width;
459 ASImage *result = NULL; 534 int new_pmap_height = target_height;
460 535
461 int x = 0; 536 int x = 0;
462 int y = 0; 537 int y = 0;
463 int w = h_scale * target_width / 100; 538 int w = 0;
464 int h = v_scale * target_height / 100; 539 int h = 0;
465 540
466 TIMING_TEST_START (asim); 541 TIMING_TEST_START (asim);
467 542
468 if (original_asim) 543 if (original_asim)
469 { 544 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
470 if (h_align == rootAlign || v_align == rootAlign)
471 {
472 target->get_window_origin(x, y);
473 x = -x;
474 y = -y;
475 }
476
477 if (h_align != rootAlign)
478 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
479
480 if (v_align != rootAlign)
481 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
482 }
483 545
484 if (!original_asim 546 if (!original_asim
547 || (!(flags & rootAlign)
485 || x >= target_width 548 && (x >= target_width
486 || y >= target_height 549 || y >= target_height
487 || (w > 0 && x + w <= 0) 550 || (x + w <= 0)
488 || (h > 0 && y + h <= 0)) 551 || (y + h <= 0))))
489 { 552 {
490 if (background) 553 if (background)
491 { 554 {
492 new_pmap_width = background->width; 555 new_pmap_width = background->width;
493 new_pmap_height = background->height; 556 new_pmap_height = background->height;
494 result = background; 557 result = background;
495 558
496 if (background_tint != TINT_LEAVE_SAME) 559 if (background_tint != TINT_LEAVE_SAME)
497 { 560 {
498 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 561 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
499 target_width, target_height, background_tint, 562 target_width, target_height, background_tint,
500 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 563 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
501 if (tmp) 564 if (tmp)
502 result = tmp; 565 result = tmp;
503 } 566 }
… …
507 } 570 }
508 else 571 else
509 { 572 {
510 result = original_asim; 573 result = original_asim;
511 574
512 if ((w > 0 && w != original_asim->width) 575 if ((w != original_asim->width)
513 || (h > 0 && h != original_asim->height)) 576 || (h != original_asim->height))
514 { 577 {
515 result = scale_asimage (target->asv, original_asim, 578 result = scale_asimage (target->asv, original_asim,
516 w > 0 ? w : original_asim->width, 579 w, h,
517 h > 0 ? h : original_asim->height,
518 background ? ASA_ASImage : ASA_XImage, 580 background ? ASA_ASImage : ASA_XImage,
519 100, ASIMAGE_QUALITY_DEFAULT); 581 100, ASIMAGE_QUALITY_DEFAULT);
520 } 582 }
521 583
522 if (background == NULL) 584 if (background == NULL)
523 { 585 {
524 /* if tiling - pixmap has to be sized exactly as the image,
525 but there is no need to make it bigger than the window! */
526 if (h_scale == 0)
527 new_pmap_width = min (result->width, target_width);
528 if (v_scale == 0)
529 new_pmap_height = min (result->height, target_height);
530 /* we also need to tile our image in one or both directions */
531 if (h_scale == 0 || v_scale == 0) 586 if (h_scale == 0 || v_scale == 0)
532 { 587 {
588 /* if tiling - pixmap has to be sized exactly as the image,
589 but there is no need to make it bigger than the window! */
590 new_pmap_width = min (result->width, target_width);
591 new_pmap_height = min (result->height, target_height);
592
593 /* we also need to tile our image in both directions */
533 ASImage *tmp = tile_asimage (target->asv, result, 594 ASImage *tmp = tile_asimage (target->asv, result,
534 (h_scale > 0) ? 0 : (int)result->width - x, 595 (int)result->width - x,
535 (v_scale > 0) ? 0 : (int)result->height - y, 596 (int)result->height - y,
536 new_pmap_width, 597 new_pmap_width,
537 new_pmap_height, 598 new_pmap_height,
538 TINT_LEAVE_SAME, ASA_XImage, 599 TINT_LEAVE_SAME, ASA_XImage,
539 100, ASIMAGE_QUALITY_DEFAULT); 600 100, ASIMAGE_QUALITY_DEFAULT);
540 if (tmp) 601 if (tmp)
541 { 602 {
… …
548 } 609 }
549 else 610 else
550 { 611 {
551 /* if blending background and image - pixmap has to be sized same as target window */ 612 /* if blending background and image - pixmap has to be sized same as target window */
552 ASImageLayer *layers = create_image_layers (2); 613 ASImageLayer *layers = create_image_layers (2);
553 ASImage *merged_im = NULL;
554 614
555 layers[0].im = background; 615 layers[0].im = background;
556 layers[0].clip_width = target_width; 616 layers[0].clip_width = target_width;
557 layers[0].clip_height = target_height; 617 layers[0].clip_height = target_height;
558 layers[0].tint = background_tint; 618 layers[0].tint = background_tint;
559 layers[1].im = result; 619 layers[1].im = result;
560 620
561 if (w <= 0) 621 if (h_scale == 0 || v_scale == 0)
562 { 622 {
563 /* tile horizontally */ 623 /* tile horizontally */
564 while (x > 0) x -= (int)result->width; 624 while (x > 0) x -= (int)result->width;
565 layers[1].dst_x = x; 625 layers[1].dst_x = x;
566 layers[1].clip_width = result->width+target_width; 626 layers[1].clip_width = result->width+target_width;
… …
570 /* clip horizontally */ 630 /* clip horizontally */
571 layers[1].dst_x = x; 631 layers[1].dst_x = x;
572 layers[1].clip_width = result->width; 632 layers[1].clip_width = result->width;
573 } 633 }
574 634
575 if (h <= 0) 635 if (h_scale == 0 || v_scale == 0)
576 { 636 {
577 while (y > 0) y -= (int)result->height; 637 while (y > 0) y -= (int)result->height;
578 layers[1].dst_y = y; 638 layers[1].dst_y = y;
579 layers[1].clip_height = result->height + target_height; 639 layers[1].clip_height = result->height + target_height;
580 } 640 }
… …
605 free (layers); 665 free (layers);
606 } 666 }
607 } 667 }
608 TIMING_TEST_PRINT_RESULT (asim); 668 TIMING_TEST_PRINT_RESULT (asim);
609 669
610 if (pixmap) 670 bool ret = false;
611 {
612 if (result == NULL
613 || pmap_width != new_pmap_width
614 || pmap_height != new_pmap_height
615 || pmap_depth != target->depth)
616 {
617 XFreePixmap (target->dpy, pixmap);
618 pixmap = None;
619 }
620 }
621 671
622 if (result) 672 if (result)
623 { 673 {
624 XGCValues gcv; 674 XGCValues gcv;
625 GC gc; 675 GC gc;
676
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 }
626 687
627 /* create Pixmap */ 688 /* create Pixmap */
628 if (pixmap == None) 689 if (pixmap == None)
629 { 690 {
630 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 691 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
631 pmap_width = new_pmap_width; 692 pmap_width = new_pmap_width;
632 pmap_height = new_pmap_height; 693 pmap_height = new_pmap_height;
633 pmap_depth = target->depth; 694 pmap_depth = target->depth;
634 } 695 }
635 /* fill with background color ( if result's not completely overlapping it)*/ 696 /* fill with background color (if result's not completely overlapping it) */
636 gcv.foreground = target->pix_colors[Color_bg]; 697 gcv.foreground = target->pix_colors[Color_bg];
637 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 698 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
638 699
639 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 700 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
640 int dst_width = result->width, dst_height = result->height; 701 int dst_width = result->width, dst_height = result->height;
641 if (background == NULL) 702 if (background == NULL)
642 { 703 {
643 if (h_scale > 0) 704 if (!(h_scale == 0 || v_scale == 0))
705 {
644 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 706 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
645 if (v_scale > 0)
646 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 707 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
708 }
647 709
648 if (dst_x > 0 || dst_y > 0 710 if (dst_x > 0 || dst_y > 0
649 || dst_x + dst_width < new_pmap_width 711 || dst_x + dst_width < new_pmap_width
650 || dst_y + dst_height < new_pmap_height) 712 || dst_y + dst_height < new_pmap_height)
651 {
652 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 713 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
653 }
654 } 714 }
655 715
656 /* put result on pixmap */ 716 /* put result on pixmap */
657 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 717 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
658 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 718 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
… …
660 if (result != background && result != original_asim) 720 if (result != background && result != original_asim)
661 destroy_asimage (&result); 721 destroy_asimage (&result);
662 722
663 XFreeGC (target->dpy, gc); 723 XFreeGC (target->dpy, gc);
664 TIMING_TEST_PRINT_RESULT (asim); 724 TIMING_TEST_PRINT_RESULT (asim);
665 }
666 725
726 ret = true;
727 }
728
729 if (background)
730 destroy_asimage (&background);
731
667 return true; 732 return ret;
668} 733}
669# endif /* HAVE_AFTERIMAGE */ 734# endif /* HAVE_AFTERIMAGE */
735
736# ifdef HAVE_PIXBUF
737bool
738bgPixmap_t::render_image (unsigned long background_flags)
739{
740 if (target == NULL)
741 return false;
742
743 if (!pixbuf)
744 return false;
745
746 // TODO: add alpha blending
747 if (background_flags)
748 return false;
749
750 GdkPixbuf *result;
751
752 int image_width = gdk_pixbuf_get_width (pixbuf);
753 int image_height = gdk_pixbuf_get_height (pixbuf);
754
755 int target_width = target->szHint.width;
756 int target_height = target->szHint.height;
757 int new_pmap_width = target_width;
758 int new_pmap_height = target_height;
759
760 int x = 0;
761 int y = 0;
762 int w = 0;
763 int h = 0;
764
765 get_image_geometry (image_width, image_height, w, h, x, y);
766
767 if (!(flags & rootAlign)
768 && (x >= target_width
769 || y >= target_height
770 || (x + w <= 0)
771 || (y + h <= 0)))
772 return false;
773
774 result = pixbuf;
775
776 if ((w != image_width)
777 || (h != image_height))
778 {
779 result = gdk_pixbuf_scale_simple (pixbuf,
780 w, h,
781 GDK_INTERP_BILINEAR);
782 }
783
784 bool ret = false;
785
786 if (result)
787 {
788 XGCValues gcv;
789 GC gc;
790
791 image_width = gdk_pixbuf_get_width (result);
792 image_height = gdk_pixbuf_get_height (result);
793
794 if (h_scale == 0 || v_scale == 0)
795 {
796 new_pmap_width = min (image_width, target_width);
797 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 }
809 }
810
811 if (pixmap == None)
812 {
813 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
814 pmap_width = new_pmap_width;
815 pmap_height = new_pmap_height;
816 pmap_depth = target->depth;
817 }
818
819 gcv.foreground = target->pix_colors[Color_bg];
820 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
821
822 if (h_scale == 0 || v_scale == 0)
823 {
824 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
825 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
826 0, 0,
827 0, 0,
828 image_width, image_height,
829 XLIB_RGB_DITHER_NONE,
830 0, 0);
831
832 gcv.tile = tile;
833 gcv.fill_style = FillTiled;
834 gcv.ts_x_origin = x;
835 gcv.ts_y_origin = y;
836 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
837
838 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
839 XFreePixmap (target->dpy, tile);
840 }
841 else
842 {
843 int src_x, src_y, dst_x, dst_y;
844 int dst_width, dst_height;
845
846 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
847 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
848
849 if (dst_x > 0 || dst_y > 0
850 || dst_x + dst_width < new_pmap_width
851 || dst_y + dst_height < new_pmap_height)
852 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
853
854 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
855 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
856 src_x, src_y,
857 dst_x, dst_y,
858 dst_width, dst_height,
859 XLIB_RGB_DITHER_NONE,
860 0, 0);
861 }
862
863 if (result != pixbuf)
864 g_object_unref (result);
865
866 XFreeGC (target->dpy, gc);
867
868 ret = true;
869 }
870
871 return ret;
872}
873# endif /* HAVE_PIXBUF */
670 874
671bool 875bool
672bgPixmap_t::set_file (const char *file) 876bgPixmap_t::set_file (const char *file)
673{ 877{
674 char *f;
675
676 assert (file); 878 assert (file);
677 879
678 if (*file) 880 if (*file)
679 { 881 {
680# ifdef HAVE_AFTERIMAGE 882 if (const char *p = strchr (file, ';'))
681 if (target->asimman == NULL)
682 target->asimman = create_generic_imageman (target->rs[Rs_path]);
683
684 if ((f = strchr (file, ';')) == NULL)
685 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
686 else
687 { 883 {
688 size_t len = f - file; 884 size_t len = p - file;
689 f = (char *)malloc (len + 1); 885 char *f = rxvt_temp_buf<char> (len + 1);
690 memcpy (f, file, len); 886 memcpy (f, file, len);
691 f[len] = '\0'; 887 f[len] = '\0';
888 file = f;
889 }
890
891# ifdef HAVE_AFTERIMAGE
892 if (!target->asimman)
893 target->asimman = create_generic_imageman (target->rs[Rs_path]);
692 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 894 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
693 free (f); 895 if (original_asim)
694 } 896 have_image = true;
897 return have_image;
898# endif
695 899
696 return original_asim; 900# ifdef HAVE_PIXBUF
901 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
902 if (pixbuf)
903 have_image = true;
904 return have_image;
697# endif 905# endif
698 } 906 }
699 907
700 return false; 908 return false;
701} 909}
… …
721 int changed = 0; 929 int changed = 0;
722 unsigned int hr, vr; 930 unsigned int hr, vr;
723 int junk; 931 int junk;
724 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 932 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
725 933
726 if (!(geom_flags&WidthValue)) 934 if (!(geom_flags & WidthValue))
727 hr = 1; 935 hr = 1;
728 if (!(geom_flags&HeightValue)) 936 if (!(geom_flags & HeightValue))
729 vr = hr; 937 vr = hr;
730 938
731 if (h_blurRadius != hr) 939 if (h_blurRadius != hr)
732 { 940 {
733 ++changed; 941 ++changed;
… …
743 if (v_blurRadius == 0 && h_blurRadius == 0) 951 if (v_blurRadius == 0 && h_blurRadius == 0)
744 flags &= ~blurNeeded; 952 flags &= ~blurNeeded;
745 else 953 else
746 flags |= blurNeeded; 954 flags |= blurNeeded;
747 955
748 return (changed>0); 956 return (changed > 0);
749} 957}
750 958
751static inline unsigned long 959static inline unsigned long
752compute_tint_shade_flags (rxvt_color *tint, int shade) 960compute_tint_shade_flags (rxvt_color *tint, int shade)
753{ 961{
… …
770 flags |= bgPixmap_t::tintNeeded; 978 flags |= bgPixmap_t::tintNeeded;
771 else if (tint) 979 else if (tint)
772 { 980 {
773 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 981 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
774 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 982 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
775 { 983 {
776 flags |= bgPixmap_t::tintNeeded; 984 flags |= bgPixmap_t::tintNeeded;
777 } 985 }
778 } 986 }
779 987
780 if (flags & bgPixmap_t::tintNeeded) 988 if (flags & bgPixmap_t::tintNeeded)
781 { 989 {
782 if (flags & bgPixmap_t::tintWholesome) 990 if (flags & bgPixmap_t::tintWholesome)
… …
811{ 1019{
812 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1020 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
813 1021
814 if (new_flags != (flags & tintFlags)) 1022 if (new_flags != (flags & tintFlags))
815 { 1023 {
816 flags = (flags&~tintFlags)|new_flags; 1024 flags = (flags & ~tintFlags) | new_flags;
817 return true; 1025 return true;
818 } 1026 }
819 1027
820 return false; 1028 return false;
821} 1029}
822 1030
… …
837 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1045 flags = (flags & (~tintFlags | tintSet)) | new_flags;
838 return true; 1046 return true;
839 } 1047 }
840 1048
841 return false; 1049 return false;
1050}
1051
1052bool
1053bgPixmap_t::tint_pixmap (Pixmap pixmap, Window root, int width, int height)
1054{
1055 Display *dpy = target->dpy;
1056 bool ret = false;
1057
1058 if (flags & tintWholesome)
1059 {
1060 XGCValues gcv;
1061 GC gc;
1062
1063 /* In this case we can tint image server-side getting significant
1064 * performance improvements, as we eliminate XImage transfer
1065 */
1066 gcv.foreground = Pixel (tint);
1067 gcv.function = GXand;
1068 gcv.fill_style = FillSolid;
1069 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
1070 if (gc)
1071 {
1072 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1073 ret = true;
1074 XFreeGC (dpy, gc);
1075 }
1076 }
1077 else
1078 {
1079# if XFT
1080 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1081
1082 if (flags & tintSet)
1083 tint.get (c);
1084
1085 if (shade > 0 && shade < 100)
1086 {
1087 c.r = (c.r * shade) / 100;
1088 c.g = (c.g * shade) / 100;
1089 c.b = (c.b * shade) / 100;
1090 }
1091 else if (shade > 100 && shade < 200)
1092 {
1093 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1094 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1095 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1096 }
1097
1098 XRenderPictFormat pf;
1099 pf.type = PictTypeDirect;
1100 pf.depth = 32;
1101 pf.direct.redMask = 0xff;
1102 pf.direct.greenMask = 0xff;
1103 pf.direct.blueMask = 0xff;
1104 pf.direct.alphaMask = 0xff;
1105
1106 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1107 (PictFormatType|
1108 PictFormatDepth|
1109 PictFormatRedMask|
1110 PictFormatGreenMask|
1111 PictFormatBlueMask|
1112 PictFormatAlphaMask),
1113 &pf,
1114 0);
1115 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1116 XRenderPictureAttributes pa;
1117
1118 Picture back_pic = XRenderCreatePicture (dpy, pixmap, root_format, 0, &pa);
1119
1120 pa.repeat = True;
1121
1122 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1123 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1124 XFreePixmap (dpy, overlay_pmap);
1125
1126 pa.component_alpha = True;
1127 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1128 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1129 XFreePixmap (dpy, mask_pmap);
1130
1131 if (mask_pic && overlay_pic && back_pic)
1132 {
1133 XRenderColor mask_c;
1134
1135 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1136 mask_c.alpha = 0xffff;
1137 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1138
1139 mask_c.alpha = 0;
1140 mask_c.red = 0xffff - c.r;
1141 mask_c.green = 0xffff - c.g;
1142 mask_c.blue = 0xffff - c.b;
1143 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1144 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1145 ret = true;
1146 }
1147
1148 XRenderFreePicture (dpy, mask_pic);
1149 XRenderFreePicture (dpy, overlay_pic);
1150 XRenderFreePicture (dpy, back_pic);
1151# if DO_TIMING_TEST
1152 XSync (dpy, False);
1153# endif
1154# endif
1155 }
1156
1157 return ret;
842} 1158}
843 1159
844/* make_transparency_pixmap() 1160/* make_transparency_pixmap()
845 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1161 * Builds a pixmap sized the same as terminal window, with depth same as the root window
846 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1162 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
852 unsigned long result = 0; 1168 unsigned long result = 0;
853 1169
854 if (target == NULL) 1170 if (target == NULL)
855 return 0; 1171 return 0;
856 1172
857 /* root dimentions may change from call to call - but Display structure should 1173 /* root dimensions may change from call to call - but Display structure should
858 * be always up-to-date, so let's use it : 1174 * be always up-to-date, so let's use it :
859 */ 1175 */
860 Window root = target->display->root; 1176 Window root = target->display->root;
861 int screen = target->display->screen; 1177 int screen = target->display->screen;
862 Display *dpy = target->dpy; 1178 Display *dpy = target->dpy;
… …
907 1223
908 attr.background_pixmap = ParentRelative; 1224 attr.background_pixmap = ParentRelative;
909 attr.backing_store = Always; 1225 attr.backing_store = Always;
910 attr.event_mask = ExposureMask; 1226 attr.event_mask = ExposureMask;
911 attr.override_redirect = True; 1227 attr.override_redirect = True;
912 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1228 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
913 CopyFromParent, CopyFromParent, CopyFromParent, 1229 CopyFromParent, CopyFromParent, CopyFromParent,
914 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1230 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
915 &attr); 1231 &attr);
916 1232
917 if (src != None) 1233 if (src != None)
… …
941 XDestroyWindow (dpy, src); 1257 XDestroyWindow (dpy, src);
942 XUngrabServer (dpy); 1258 XUngrabServer (dpy);
943 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1259 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
944 } 1260 }
945 1261
946 if (!success) 1262 if (!success)
947 { 1263 {
948 XFreePixmap (dpy, tiled_root_pmap); 1264 XFreePixmap (dpy, tiled_root_pmap);
949 tiled_root_pmap = None; 1265 tiled_root_pmap = None;
950 } 1266 }
951 else 1267 else
952 result |= transpPmapTiled; 1268 result |= transpPmapTiled;
953 } 1269 }
954 else 1270 else
955 { 1271 {
956 /* strightforward pixmap copy */ 1272 /* straightforward pixmap copy */
957 gcv.tile = root_pixmap; 1273 gcv.tile = root_pixmap;
958 gcv.fill_style = FillTiled; 1274 gcv.fill_style = FillTiled;
959 1275
960 while (sx < 0) sx += (int)root_width; 1276 while (sx < 0) sx += (int)root_width;
961 while (sy < 0) sy += (int)root_height; 1277 while (sy < 0) sy += (int)root_height;
… …
976 { 1292 {
977 if (!need_client_side_rendering ()) 1293 if (!need_client_side_rendering ())
978 { 1294 {
979 if ((flags & tintNeeded)) 1295 if ((flags & tintNeeded))
980 { 1296 {
981 if (flags & tintWholesome) 1297 if (tint_pixmap (tiled_root_pmap, root, window_width, window_height))
982 {
983 /* In this case we can tint image server-side getting significant
984 * performance improvements, as we eliminate XImage transfer
985 */
986 gcv.foreground = Pixel (tint);
987 gcv.function = GXand;
988 gcv.fill_style = FillSolid;
989 if (gc)
990 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
991 else
992 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
993 if (gc)
994 {
995 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
996 result |= transpPmapTinted; 1298 result |= transpPmapTinted;
997 }
998 }
999 else
1000 {
1001# if XFT
1002 Picture back_pic = 0;
1003 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1004
1005 if (flags & tintSet)
1006 tint.get (c);
1007
1008 if (shade > 0 && shade < 100)
1009 {
1010 c.r = (c.r * shade) / 100;
1011 c.g = (c.g * shade) / 100;
1012 c.b = (c.b * shade) / 100;
1013 }
1014 else if (shade > 100 && shade < 200)
1015 {
1016 c.r = (c.r * (200 - shade)) / 100;
1017 c.g = (c.g * (200 - shade)) / 100;
1018 c.b = (c.b * (200 - shade)) / 100;
1019 }
1020
1021 XRenderPictFormat pf;
1022 pf.type = PictTypeDirect;
1023 pf.depth = 32;
1024 pf.direct.redMask = 0xff;
1025 pf.direct.greenMask = 0xff;
1026 pf.direct.blueMask = 0xff;
1027 pf.direct.alphaMask = 0xff;
1028
1029 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1030 (PictFormatType|
1031 PictFormatDepth|
1032 PictFormatRedMask|
1033 PictFormatGreenMask|
1034 PictFormatBlueMask|
1035 PictFormatAlphaMask),
1036 &pf,
1037 0);
1038 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1039 XRenderPictureAttributes pa ;
1040
1041 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1042
1043 pa.repeat = True;
1044
1045 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1046 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1047 XFreePixmap (dpy, overlay_pmap);
1048
1049 pa.component_alpha = True;
1050 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1051 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1052 XFreePixmap (dpy, mask_pmap);
1053
1054 if (mask_pic && overlay_pic && back_pic)
1055 {
1056 XRenderColor mask_c;
1057
1058 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1059 mask_c.alpha = 0xffff;
1060 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1061
1062 mask_c.alpha = 0;
1063 mask_c.red = 0xffff - c.r;
1064 mask_c.green = 0xffff - c.g;
1065 mask_c.blue = 0xffff - c.b;
1066 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1067 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1068 result |= transpPmapTinted;
1069 }
1070
1071 XRenderFreePicture (dpy, mask_pic);
1072 XRenderFreePicture (dpy, overlay_pic);
1073 XRenderFreePicture (dpy, back_pic);
1074# if DO_TIMING_TEST
1075 XSync (dpy, False);
1076# endif
1077# endif
1078 }
1079 } 1299 }
1080 } /* server side rendering completed */ 1300 } /* server side rendering completed */
1081 1301
1082 if (pixmap) 1302 if (pixmap)
1083 XFreePixmap (dpy, pixmap); 1303 XFreePixmap (dpy, pixmap);
1084 1304
… …
1112 return false; 1332 return false;
1113} 1333}
1114# endif /* ENABLE_TRANSPARENCY */ 1334# endif /* ENABLE_TRANSPARENCY */
1115 1335
1116# ifndef HAVE_AFTERIMAGE 1336# ifndef HAVE_AFTERIMAGE
1117static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1337static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1118# endif 1338# endif
1119 1339
1120bool 1340bool
1121bgPixmap_t::render () 1341bgPixmap_t::render ()
1122{ 1342{
… …
1125 if (target == NULL) 1345 if (target == NULL)
1126 return false; 1346 return false;
1127 1347
1128 TIMING_TEST_START (tp); 1348 TIMING_TEST_START (tp);
1129 1349
1130 invalidate(); 1350 invalidate ();
1131# ifdef ENABLE_TRANSPARENCY 1351# ifdef ENABLE_TRANSPARENCY
1132 if (flags & isTransparent) 1352 if (flags & isTransparent)
1133 { 1353 {
1134 /* we need to re-generate transparency pixmap in that case ! */ 1354 /* we need to re-generate transparency pixmap in that case ! */
1135 background_flags = make_transparency_pixmap (); 1355 background_flags = make_transparency_pixmap ();
1136 if (background_flags == 0) 1356 if (background_flags == 0)
1137 return false; 1357 return false;
1138 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1358 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1139 && pmap_depth == target->depth) 1359 && pmap_depth == target->depth)
1140 flags = flags & ~isInvalid; 1360 flags = flags & ~isInvalid;
1141 } 1361 }
1142# endif 1362# endif
1143 1363
1364# ifdef BG_IMAGE_FROM_FILE
1365 if (have_image
1366 || (background_flags & transpTransformations) != (flags & transpTransformations))
1367 {
1368 if (render_image (background_flags))
1369 flags = flags & ~isInvalid;
1370 }
1371# endif
1372
1144 XImage *result = NULL; 1373 XImage *result = NULL;
1145# ifdef HAVE_AFTERIMAGE 1374
1146 if (original_asim 1375 if (background_flags && (flags & isInvalid))
1147 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1376 {
1377 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1148 { 1378 }
1149 ASImage *background = NULL;
1150 ARGB32 as_tint = TINT_LEAVE_SAME;
1151 if (background_flags)
1152 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1153 1379
1154# ifdef ENABLE_TRANSPARENCY 1380 if (result)
1381 {
1382# if !defined(HAVE_AFTERIMAGE) && !XFT
1383 /* our own client-side tinting */
1384 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1385 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1155 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1386 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1156 {
1157 ShadingInfo as_shade;
1158 as_shade.shading = (shade == 0) ? 100 : shade;
1159
1160 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1161 if (flags & tintSet)
1162 tint.get (c);
1163 as_shade.tintColor.red = c.r;
1164 as_shade.tintColor.green = c.g;
1165 as_shade.tintColor.blue = c.b;
1166
1167 as_tint = shading2tint32 (&as_shade);
1168 }
1169 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1170 {
1171 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1172 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1173 100, ASIMAGE_QUALITY_DEFAULT);
1174 if (tmp)
1175 {
1176 destroy_asimage (&background);
1177 background = tmp;
1178 }
1179 }
1180# endif
1181
1182 if (render_asim (background, as_tint))
1183 flags = flags & ~isInvalid;
1184 if (background)
1185 destroy_asimage (&background);
1186 }
1187 else if (background_flags && pmap_depth != target->depth)
1188 {
1189 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1190 }
1191
1192# elif !XFT /* our own client-side tinting */
1193
1194 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1195 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1196
1197 if (background_flags && (flags & isInvalid))
1198 {
1199 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1200 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1201 { 1387 {
1202 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1388 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1203 if (flags & tintSet) 1389 if (flags & tintSet)
1204 tint.get (c); 1390 tint.get (c);
1205 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1391 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1206 } 1392 }
1207 } 1393# endif
1208# endif /* HAVE_AFTERIMAGE */
1209 1394
1210 if (result)
1211 {
1212 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1395 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1213 1396
1214 if (gc) 1397 if (gc)
1215 { 1398 {
1216 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1399 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1245 1428
1246 XFreeGC (target->dpy, gc); 1429 XFreeGC (target->dpy, gc);
1247 flags = flags & ~isInvalid; 1430 flags = flags & ~isInvalid;
1248 } 1431 }
1249 1432
1250 XDestroyImage (result); 1433 XDestroyImage (result);
1251 } 1434 }
1252 1435
1253 if (flags & isInvalid) 1436 if (flags & isInvalid)
1254 { 1437 {
1255 if (pixmap != None) 1438 if (pixmap != None)
… …
1279# ifdef ENABLE_TRANSPARENCY 1462# ifdef ENABLE_TRANSPARENCY
1280 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1463 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1281# endif 1464# endif
1282 return true; 1465 return true;
1283 } 1466 }
1467
1284 return false; 1468 return false;
1285} 1469}
1286 1470
1287void 1471void
1288bgPixmap_t::apply () 1472bgPixmap_t::apply ()
1289{ 1473{
1290 if (target) 1474 if (target)
1291 { 1475 {
1292 flags &= ~isVtOrigin; 1476 flags &= ~isVtOrigin;
1477
1293 if (pixmap != None) 1478 if (pixmap != None)
1294 { 1479 {
1295 /* set target's background to pixmap */ 1480 /* set target's background to pixmap */
1296# ifdef ENABLE_TRANSPARENCY 1481# ifdef ENABLE_TRANSPARENCY
1297 if (flags & isTransparent) 1482 if (flags & isTransparent)
1298 { 1483 {
1299 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1484 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1300 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1485 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1301# if HAVE_SCROLLBARS 1486
1302 if (target->scrollBar.win) 1487 if (target->scrollBar.win)
1303 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1488 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1304# endif
1305 } 1489 }
1306 else 1490 else
1307# endif 1491# endif
1308 { 1492 {
1309 flags |= isVtOrigin; 1493 flags |= isVtOrigin;
1310 /* force old pixmap dereference in case it was transparent before :*/ 1494 /* force old pixmap dereference in case it was transparent before :*/
1311 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1495 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1312 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1496 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1313 /* do we also need to set scrollbar's background here ? */ 1497 /* do we also need to set scrollbar's background here ? */
1314# if HAVE_SCROLLBARS 1498
1315 if (target->scrollBar.win) 1499 if (target->scrollBar.win)
1316 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1500 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1317# endif
1318 } 1501 }
1319 } 1502 }
1320 else 1503 else
1321 { 1504 {
1322 /* set target background to a pixel */ 1505 /* set target background to a pixel */
1323 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1506 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1324 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1507 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1325 /* do we also need to set scrollbar's background here ? */ 1508 /* do we also need to set scrollbar's background here ? */
1326# if HAVE_SCROLLBARS
1327 if (target->scrollBar.win) 1509 if (target->scrollBar.win)
1328 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1510 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1329# endif
1330 } 1511 }
1512
1331 /* don't want Expose on the parent or vt. It is better to use 1513 /* don't want Expose on the parent or vt. It is better to use
1332 scr_touch or we get a great deal of flicker otherwise: */ 1514 scr_touch or we get a great deal of flicker otherwise: */
1333 XClearWindow (target->dpy, target->parent[0]); 1515 XClearWindow (target->dpy, target->parent[0]);
1334 1516
1335# if HAVE_SCROLLBARS 1517 if (target->scrollBar.state && target->scrollBar.win)
1336 if (target->scrollBar.win)
1337 { 1518 {
1338 target->scrollBar.setIdle (); 1519 target->scrollBar.state = STATE_IDLE;
1339 target->scrollbar_show (0); 1520 target->scrollBar.show (0);
1340 } 1521 }
1341# endif
1342 1522
1343 target->want_refresh = 1; 1523 target->want_refresh = 1;
1344 flags |= hasChanged; 1524 flags |= hasChanged;
1345 } 1525 }
1346} 1526}
… …
1351/* taken from aterm-0.4.2 */ 1531/* taken from aterm-0.4.2 */
1352 1532
1353typedef uint32_t RUINT32T; 1533typedef uint32_t RUINT32T;
1354 1534
1355static void 1535static void
1356ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1536ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1357{ 1537{
1358 int sh_r, sh_g, sh_b; 1538 int sh_r, sh_g, sh_b;
1359 RUINT32T mask_r, mask_g, mask_b; 1539 RUINT32T mask_r, mask_g, mask_b;
1360 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1540 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1361 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1541 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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