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