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

Diff Legend

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