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.51 by sf-exg, Wed Sep 1 09:40:08 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.
… …
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
97#ifdef BG_IMAGE_FROM_FILE 101#ifdef BG_IMAGE_FROM_FILE
102 have_image = false;
98 h_scale = v_scale = 0; 103 h_scale = v_scale = 0;
99 h_align = v_align = 0; 104 h_align = v_align = 0;
100#endif 105#endif
101 flags = 0; 106 flags = 0;
102 pixmap = None; 107 pixmap = None;
108 valid_since = invalid_since = 0;
109 target = 0;
103} 110}
104 111
105void 112void
106bgPixmap_t::destroy () 113bgPixmap_t::destroy ()
107{ 114{
… …
121 if (flags & isTransparent) 128 if (flags & isTransparent)
122 return true; 129 return true;
123# endif 130# endif
124 131
125# ifdef BG_IMAGE_FROM_FILE 132# ifdef BG_IMAGE_FROM_FILE
126# ifdef HAVE_AFTERIMAGE 133 if (have_image)
127 if (original_asim != NULL)
128# endif
129 { 134 {
130 if (h_scale != 0 || v_scale != 0 135 if (h_scale != 0 || v_scale != 0
131 || h_align != 0 || v_align != 0) 136 || h_align != 0 || v_align != 0)
132 return true; 137 return true;
133 } 138 }
134# endif 139# endif
135 140
136 return false; 141 return false;
137} 142}
138 143
139bool 144bool
140bgPixmap_t::window_position_sensitive () 145bgPixmap_t::window_position_sensitive ()
141{ 146{
142# ifdef ENABLE_TRANSPARENCY 147# ifdef ENABLE_TRANSPARENCY
143 if (flags & isTransparent) 148 if (flags & isTransparent)
144 return true; 149 return true;
145# endif 150# endif
146 151
147# ifdef BG_IMAGE_FROM_FILE 152# ifdef BG_IMAGE_FROM_FILE
148# ifdef HAVE_AFTERIMAGE 153 if (have_image)
149 if (original_asim != NULL)
150# endif
151 { 154 {
152 if (h_align == rootAlign || v_align == rootAlign) 155 if (h_align == rootAlign || v_align == rootAlign)
153 return true; 156 return true;
154 } 157 }
155# endif 158# endif
… …
158}; 161};
159 162
160bool bgPixmap_t::need_client_side_rendering () 163bool bgPixmap_t::need_client_side_rendering ()
161{ 164{
162# ifdef HAVE_AFTERIMAGE 165# ifdef HAVE_AFTERIMAGE
163 if (original_asim != NULL) 166 if (original_asim)
164 return true; 167 return true;
165# endif 168# endif
166# ifdef ENABLE_TRANSPARENCY 169# ifdef ENABLE_TRANSPARENCY
167 if (flags & isTransparent) 170 if (flags & isTransparent)
168 { 171 {
… …
257 int geom_flags = 0, changed = 0; 260 int geom_flags = 0, changed = 0;
258 int x = 0, y = 0; 261 int x = 0, y = 0;
259 unsigned int w = 0, h = 0; 262 unsigned int w = 0, h = 0;
260 unsigned int n; 263 unsigned int n;
261 unsigned long new_flags = (flags & (~geometryFlags)); 264 unsigned long new_flags = (flags & (~geometryFlags));
262 char *p; 265 const char *p;
263# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 266# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
264 267
265 if (geom == NULL) 268 if (geom == NULL)
266 return false; 269 return false;
267 270
268 char str[MAXLEN_GEOM]; 271 char str[MAXLEN_GEOM];
… …
275 if (n < MAXLEN_GEOM) 278 if (n < MAXLEN_GEOM)
276 { 279 {
277 char *ops; 280 char *ops;
278 new_flags |= geometrySet; 281 new_flags |= geometrySet;
279 282
280 strncpy (str, geom, n); 283 memcpy (str, geom, n);
281 str[n] = '\0'; 284 str[n] = '\0';
282 if (str[0] == ':') 285 if (str[0] == ':')
283 ops = &str[0]; 286 ops = &str[0];
284 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 287 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
285 ops = &str[0]; 288 ops = &str[0];
… …
305 y = x; 308 y = x;
306 geom_flags |= YValue; 309 geom_flags |= YValue;
307 } 310 }
308 311
309 if (flags & geometrySet) 312 if (flags & geometrySet)
313 {
310 {/* new geometry is an adjustment to the old one ! */ 314 /* new geometry is an adjustment to the old one ! */
311 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 315 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
312 { 316 {
313 if (w == 0 && h != 0) 317 if (w == 0 && h != 0)
314 { 318 {
315 w = h_scale; 319 w = h_scale;
… …
331 } 335 }
332 } 336 }
333 else /* setting up geometry from scratch */ 337 else /* setting up geometry from scratch */
334 { 338 {
335 if (!(geom_flags & XValue)) 339 if (!(geom_flags & XValue))
340 {
336 {/* use default geometry - centered */ 341 /* use default geometry - centered */
337 x = y = defaultAlign; 342 x = y = defaultAlign;
338 } 343 }
339 else if (!(geom_flags & YValue)) 344 else if (!(geom_flags & YValue))
340 y = x; 345 y = x;
341 346
342 if ((geom_flags & (WidthValue|HeightValue)) == 0) 347 if ((geom_flags & (WidthValue|HeightValue)) == 0)
348 {
343 {/* use default geometry - scaled */ 349 /* use default geometry - scaled */
344 w = h = defaultScale; 350 w = h = defaultScale;
345 } 351 }
346 else if (geom_flags & WidthValue) 352 else if (geom_flags & WidthValue)
347 { 353 {
348 if (!(geom_flags & HeightValue)) 354 if (!(geom_flags & HeightValue))
… …
351 else 357 else
352 w = h; 358 w = h;
353 } 359 }
354 } /* done parsing geometry string */ 360 } /* done parsing geometry string */
355 else if (!(flags & geometrySet)) 361 else if (!(flags & geometrySet))
362 {
356 { /* default geometry - scaled and centered */ 363 /* default geometry - scaled and centered */
357 x = y = defaultAlign; 364 x = y = defaultAlign;
358 w = h = defaultScale; 365 w = h = defaultScale;
359 } 366 }
360 367
361 if (!(flags & geometrySet)) 368 if (!(flags & geometrySet))
… …
364 if (ops) 371 if (ops)
365 { 372 {
366 while (*ops) 373 while (*ops)
367 { 374 {
368 while (*ops == ':' || isspace(*ops)) ++ops; 375 while (*ops == ':' || isspace(*ops)) ++ops;
376
369# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 377# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
370 if (CHECK_GEOM_OPS("tile")) 378 if (CHECK_GEOM_OPS ("tile"))
371 { 379 {
372 w = h = noScale; 380 w = h = noScale;
373 geom_flags |= WidthValue|HeightValue; 381 geom_flags |= WidthValue|HeightValue;
374 } 382 }
375 else if (CHECK_GEOM_OPS("propscale")) 383 else if (CHECK_GEOM_OPS ("propscale"))
376 { 384 {
377 if (w == 0 && h == 0) 385 if (w == 0 && h == 0)
378 { 386 {
379 w = windowScale; 387 w = windowScale;
380 geom_flags |= WidthValue; 388 geom_flags |= WidthValue;
381 } 389 }
382 new_flags |= propScale; 390 new_flags |= propScale;
383 } 391 }
384 else if (CHECK_GEOM_OPS("hscale")) 392 else if (CHECK_GEOM_OPS ("hscale"))
385 { 393 {
386 if (w == 0)
387 w = windowScale; 394 if (w == 0) w = windowScale;
395
388 h = noScale; 396 h = noScale;
389 geom_flags |= WidthValue|HeightValue; 397 geom_flags |= WidthValue|HeightValue;
390 } 398 }
391 else if (CHECK_GEOM_OPS("vscale")) 399 else if (CHECK_GEOM_OPS ("vscale"))
392 { 400 {
393 if (h == 0)
394 h = windowScale; 401 if (h == 0) h = windowScale;
402
395 w = noScale; 403 w = noScale;
396 geom_flags |= WidthValue|HeightValue; 404 geom_flags |= WidthValue|HeightValue;
397 } 405 }
398 else if (CHECK_GEOM_OPS("scale")) 406 else if (CHECK_GEOM_OPS ("scale"))
399 { 407 {
400 if (h == 0)
401 h = windowScale; 408 if (h == 0) h = windowScale;
402 if (w == 0)
403 w = windowScale; 409 if (w == 0) w = windowScale;
410
404 geom_flags |= WidthValue|HeightValue; 411 geom_flags |= WidthValue|HeightValue;
405 } 412 }
406 else if (CHECK_GEOM_OPS("auto")) 413 else if (CHECK_GEOM_OPS ("auto"))
407 { 414 {
408 w = h = windowScale; 415 w = h = windowScale;
409 x = y = centerAlign; 416 x = y = centerAlign;
410 geom_flags |= WidthValue|HeightValue|XValue|YValue; 417 geom_flags |= WidthValue|HeightValue|XValue|YValue;
411 } 418 }
412 else if (CHECK_GEOM_OPS("root")) 419 else if (CHECK_GEOM_OPS ("root"))
413 { 420 {
414 w = h = noScale; 421 w = h = noScale;
415 x = y = rootAlign; 422 x = y = rootAlign;
416 geom_flags |= WidthValue|HeightValue|XValue|YValue; 423 geom_flags |= WidthValue|HeightValue|XValue|YValue;
417 } 424 }
418# undef CHECK_GEOM_OPS 425# undef CHECK_GEOM_OPS
426
419 while (*ops != ':' && *ops != '\0') ++ops; 427 while (*ops != ':' && *ops != '\0') ++ops;
420 } /* done parsing ops */ 428 } /* done parsing ops */
421 } 429 }
422 430
423 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 431 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)) 432 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)) 433 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)) 434 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
430 ++changed;
431 } 435 }
432 436
433 if (new_flags != flags) 437 if (new_flags != flags)
434 { 438 {
435 flags = new_flags; 439 flags = new_flags;
436 changed++; 440 changed++;
437 } 441 }
442
438//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 443 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
439// flags, h_scale, v_scale, h_align, v_align); 444 // flags, h_scale, v_scale, h_align, v_align);
440 return (changed > 0); 445 return (changed > 0);
441} 446}
442 447
443# ifdef HAVE_AFTERIMAGE 448# ifdef HAVE_AFTERIMAGE
444bool 449bool
445bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 450bgPixmap_t::render_image (unsigned long background_flags)
446{ 451{
447 if (target == NULL) 452 if (target == NULL)
448 return false; 453 return false;
449 454
455 target->init_asv ();
456
457 ASImage *background = NULL;
458 ARGB32 background_tint = TINT_LEAVE_SAME;
459
460# ifdef ENABLE_TRANSPARENCY
461 if (background_flags)
462 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
463
464 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
465 {
466 ShadingInfo as_shade;
467 as_shade.shading = (shade == 0) ? 100 : shade;
468
469 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
470 if (flags & tintSet)
471 tint.get (c);
472 as_shade.tintColor.red = c.r;
473 as_shade.tintColor.green = c.g;
474 as_shade.tintColor.blue = c.b;
475
476 background_tint = shading2tint32 (&as_shade);
477 }
478
479 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
480 {
481 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
482 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
483 100, ASIMAGE_QUALITY_DEFAULT);
484 if (tmp)
485 {
486 destroy_asimage (&background);
487 background = tmp;
488 }
489 }
490# endif
491
492 ASImage *result = 0;
493
450 int target_width = (int)target->szHint.width; 494 int target_width = target->szHint.width;
451 int target_height = (int)target->szHint.height; 495 int target_height = target->szHint.height;
452 int new_pmap_width = target_width, new_pmap_height = target_height; 496 int new_pmap_width = target_width;
453 ASImage *result = NULL; 497 int new_pmap_height = target_height;
454 498
455 int x = 0; 499 int x = 0;
456 int y = 0; 500 int y = 0;
457 int w = h_scale * target_width / 100; 501 int w = h_scale * target_width / 100;
458 int h = v_scale * target_height / 100; 502 int h = v_scale * target_height / 100;
… …
461 505
462 if (original_asim) 506 if (original_asim)
463 { 507 {
464 if (h_align == rootAlign || v_align == rootAlign) 508 if (h_align == rootAlign || v_align == rootAlign)
465 { 509 {
466 target->get_window_origin(x, y); 510 target->get_window_origin (x, y);
467 x = -x; 511 x = -x;
468 y = -y; 512 y = -y;
469 } 513 }
514
470 if (h_align != rootAlign) 515 if (h_align != rootAlign)
471 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 516 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
517
472 if (v_align != rootAlign) 518 if (v_align != rootAlign)
473 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 519 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
474 } 520 }
475 521
476 if (original_asim == NULL 522 if (!original_asim
477 || x >= target_width 523 || x >= target_width
478 || y >= target_height 524 || y >= target_height
479 || (w > 0 && x + w <= 0) 525 || (w > 0 && x + w <= 0)
480 || (h > 0 && y + h <= 0)) 526 || (h > 0 && y + h <= 0))
481 { 527 {
482 if (background) 528 if (background)
483 { 529 {
484 new_pmap_width = background->width; 530 new_pmap_width = background->width;
485 new_pmap_height = background->height; 531 new_pmap_height = background->height;
486 result = background; 532 result = background;
533
487 if (background_tint != TINT_LEAVE_SAME) 534 if (background_tint != TINT_LEAVE_SAME)
488 { 535 {
489 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 536 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
490 target_width, target_height, background_tint, 537 target_width, target_height, background_tint,
491 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 538 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
492 if (tmp) 539 if (tmp)
493 result = tmp; 540 result = tmp;
494 } 541 }
… …
497 new_pmap_width = new_pmap_height = 0; 544 new_pmap_width = new_pmap_height = 0;
498 } 545 }
499 else 546 else
500 { 547 {
501 result = original_asim; 548 result = original_asim;
549
502 if ((w > 0 && w != original_asim->width) 550 if ((w > 0 && w != original_asim->width)
503 || (h > 0 && h != original_asim->height)) 551 || (h > 0 && h != original_asim->height))
504 { 552 {
505 result = scale_asimage (target->asv, original_asim, 553 result = scale_asimage (target->asv, original_asim,
506 w > 0 ? w : original_asim->width, 554 w > 0 ? w : original_asim->width,
507 h > 0 ? h : original_asim->height, 555 h > 0 ? h : original_asim->height,
508 background ? ASA_ASImage : ASA_XImage, 556 background ? ASA_ASImage : ASA_XImage,
509 100, ASIMAGE_QUALITY_DEFAULT); 557 100, ASIMAGE_QUALITY_DEFAULT);
510 } 558 }
559
511 if (background == NULL) 560 if (background == NULL)
561 {
512 {/* if tiling - pixmap has to be sized exactly as the image, 562 /* if tiling - pixmap has to be sized exactly as the image,
513 but there is no need to make it bigger then the window! */ 563 but there is no need to make it bigger than the window! */
514 if (h_scale == 0) 564 if (h_scale == 0)
515 new_pmap_width = min (result->width, target_width); 565 new_pmap_width = min (result->width, target_width);
516 if (v_scale == 0) 566 if (v_scale == 0)
517 new_pmap_height = min (result->height, target_height); 567 new_pmap_height = min (result->height, target_height);
518 /* we also need to tile our image in one or both directions */ 568 /* we also need to tile our image in one or both directions */
519 if (h_scale == 0 || v_scale == 0) 569 if (h_scale == 0 || v_scale == 0)
520 { 570 {
521 ASImage *tmp = tile_asimage (target->asv, result, 571 ASImage *tmp = tile_asimage (target->asv, result,
522 (h_scale > 0) ? 0 : (int)result->width - x, 572 (h_scale > 0) ? 0 : (int)result->width - x,
523 (v_scale > 0) ? 0 : (int)result->height - y, 573 (v_scale > 0) ? 0 : (int)result->height - y,
524 new_pmap_width, 574 new_pmap_width,
525 new_pmap_height, 575 new_pmap_height,
526 TINT_LEAVE_SAME, ASA_XImage, 576 TINT_LEAVE_SAME, ASA_XImage,
527 100, ASIMAGE_QUALITY_DEFAULT); 577 100, ASIMAGE_QUALITY_DEFAULT);
528 if (tmp) 578 if (tmp)
529 { 579 {
530 if (result != original_asim) 580 if (result != original_asim)
531 destroy_asimage (&result); 581 destroy_asimage (&result);
582
532 result = tmp; 583 result = tmp;
533 } 584 }
534 } 585 }
535 } 586 }
536 else 587 else
588 {
537 {/* if blending background and image - pixmap has to be sized same as target window */ 589 /* if blending background and image - pixmap has to be sized same as target window */
538 ASImageLayer *layers = create_image_layers (2); 590 ASImageLayer *layers = create_image_layers (2);
539 ASImage *merged_im = NULL;
540 591
541 layers[0].im = background; 592 layers[0].im = background;
542 layers[0].clip_width = target_width; 593 layers[0].clip_width = target_width;
543 layers[0].clip_height = target_height; 594 layers[0].clip_height = target_height;
544 layers[0].tint = background_tint; 595 layers[0].tint = background_tint;
545 layers[1].im = result; 596 layers[1].im = result;
597
546 if (w <= 0) 598 if (w <= 0)
599 {
547 {/* tile horizontally */ 600 /* tile horizontally */
548 while (x > 0) x -= (int)result->width; 601 while (x > 0) x -= (int)result->width;
549 layers[1].dst_x = x; 602 layers[1].dst_x = x;
550 layers[1].clip_width = result->width+target_width; 603 layers[1].clip_width = result->width+target_width;
551 } 604 }
552 else 605 else
606 {
553 {/* clip horizontally */ 607 /* clip horizontally */
554 layers[1].dst_x = x; 608 layers[1].dst_x = x;
555 layers[1].clip_width = result->width; 609 layers[1].clip_width = result->width;
556 } 610 }
611
557 if (h <= 0) 612 if (h <= 0)
558 { 613 {
559 while (y > 0) y -= (int)result->height; 614 while (y > 0) y -= (int)result->height;
560 layers[1].dst_y = y; 615 layers[1].dst_y = y;
561 layers[1].clip_height = result->height + target_height; 616 layers[1].clip_height = result->height + target_height;
… …
563 else 618 else
564 { 619 {
565 layers[1].dst_y = y; 620 layers[1].dst_y = y;
566 layers[1].clip_height = result->height; 621 layers[1].clip_height = result->height;
567 } 622 }
623
568 if (target->rs[Rs_blendtype]) 624 if (target->rs[Rs_blendtype])
569 { 625 {
570 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 626 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
571 if (layers[1].merge_scanlines == NULL) 627 if (layers[1].merge_scanlines == NULL)
572 layers[1].merge_scanlines = alphablend_scanlines; 628 layers[1].merge_scanlines = alphablend_scanlines;
573 } 629 }
630
574 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 631 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
575 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 632 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
633
576 if (tmp) 634 if (tmp)
577 { 635 {
578 if (result != original_asim) 636 if (result != original_asim)
579 destroy_asimage (&result); 637 destroy_asimage (&result);
638
580 result = tmp; 639 result = tmp;
581 } 640 }
641
582 free (layers); 642 free (layers);
583 } 643 }
584 } 644 }
585 TIMING_TEST_PRINT_RESULT (asim); 645 TIMING_TEST_PRINT_RESULT (asim);
586 646
587 if (pixmap) 647 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 648
599 if (result) 649 if (result)
600 { 650 {
601 XGCValues gcv; 651 XGCValues gcv;
602 GC gc; 652 GC gc;
653
654 if (pixmap)
655 {
656 if (pmap_width != new_pmap_width
657 || pmap_height != new_pmap_height
658 || pmap_depth != target->depth)
659 {
660 XFreePixmap (target->dpy, pixmap);
661 pixmap = None;
662 }
663 }
603 664
604 /* create Pixmap */ 665 /* create Pixmap */
605 if (pixmap == None) 666 if (pixmap == None)
606 { 667 {
607 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 668 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
608 pmap_width = new_pmap_width; 669 pmap_width = new_pmap_width;
609 pmap_height = new_pmap_height; 670 pmap_height = new_pmap_height;
610 pmap_depth = target->depth; 671 pmap_depth = target->depth;
611 } 672 }
612 /* fill with background color ( if result's not completely overlapping it)*/ 673 /* fill with background color (if result's not completely overlapping it) */
613 gcv.foreground = target->pix_colors[Color_bg]; 674 gcv.foreground = target->pix_colors[Color_bg];
614 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 675 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
615 676
616 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 677 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
617 int dst_width = result->width, dst_height = result->height; 678 int dst_width = result->width, dst_height = result->height;
618 if (background == NULL) 679 if (background == NULL)
619 { 680 {
620 if (h_scale > 0)
621 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 681 if (h_scale > 0) 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); 682 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
624 683
625 if (dst_x > 0 || dst_y > 0 684 if (dst_x > 0 || dst_y > 0
626 || dst_x + dst_width < new_pmap_width 685 || dst_x + dst_width < new_pmap_width
627 || dst_y + dst_height < new_pmap_height) 686 || dst_y + dst_height < new_pmap_height)
628 {
629 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 687 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
630 }
631 } 688 }
632 689
633 /* put result on pixmap */ 690 /* put result on pixmap */
634 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 691 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); 692 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) 694 if (result != background && result != original_asim)
638 destroy_asimage (&result); 695 destroy_asimage (&result);
639 696
640 XFreeGC (target->dpy, gc); 697 XFreeGC (target->dpy, gc);
641 TIMING_TEST_PRINT_RESULT (asim); 698 TIMING_TEST_PRINT_RESULT (asim);
642 }
643 699
700 ret = true;
701 }
702
703 if (background)
704 destroy_asimage (&background);
705
644 return true; 706 return ret;
645} 707}
646# endif /* HAVE_AFTERIMAGE */ 708# endif /* HAVE_AFTERIMAGE */
647 709
648bool 710bool
649bgPixmap_t::set_file (const char *file) 711bgPixmap_t::set_file (const char *file)
650{ 712{
651 char *f;
652
653 assert (file != NULL); 713 assert (file);
654 714
655 if (*file != '\0') 715 if (*file)
656 { 716 {
717 if (const char *p = strchr (file, ';'))
718 {
719 size_t len = p - file;
720 char *f = rxvt_temp_buf<char> (len + 1);
721 memcpy (f, file, len);
722 f[len] = '\0';
723 file = f;
724 }
725
657# ifdef HAVE_AFTERIMAGE 726# ifdef HAVE_AFTERIMAGE
658 if (target->asimman == NULL) 727 if (!target->asimman)
659 target->asimman = create_generic_imageman (target->rs[Rs_path]); 728 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); 729 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
662 else 730 if (original_asim)
663 { 731 have_image = true;
664 size_t len = f - file; 732 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 733# endif
673 } 734 }
735
674 return false; 736 return false;
675} 737}
676 738
677# endif /* BG_IMAGE_FROM_FILE */ 739# endif /* BG_IMAGE_FROM_FILE */
678 740
… …
683 if (!(flags & isTransparent)) 745 if (!(flags & isTransparent))
684 { 746 {
685 flags |= isTransparent; 747 flags |= isTransparent;
686 return true; 748 return true;
687 } 749 }
750
688 return false; 751 return false;
689} 752}
690 753
691bool 754bool
692bgPixmap_t::set_blur_radius (const char *geom) 755bgPixmap_t::set_blur_radius (const char *geom)
… …
743 flags |= bgPixmap_t::tintNeeded; 806 flags |= bgPixmap_t::tintNeeded;
744 else if (tint) 807 else if (tint)
745 { 808 {
746 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 809 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
747 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 810 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
748 { 811 {
749 flags |= bgPixmap_t::tintNeeded; 812 flags |= bgPixmap_t::tintNeeded;
750 } 813 }
751 } 814 }
752 815
753 if (flags & bgPixmap_t::tintNeeded) 816 if (flags & bgPixmap_t::tintNeeded)
754 { 817 {
755 if (flags & bgPixmap_t::tintWholesome) 818 if (flags & bgPixmap_t::tintWholesome)
… …
773 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 836 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
774 tint = new_tint; 837 tint = new_tint;
775 flags = (flags & ~tintFlags) | new_flags | tintSet; 838 flags = (flags & ~tintFlags) | new_flags | tintSet;
776 return true; 839 return true;
777 } 840 }
841
778 return false; 842 return false;
779} 843}
780 844
781bool 845bool
782bgPixmap_t::unset_tint () 846bgPixmap_t::unset_tint ()
783{ 847{
784 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 848 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
785 849
786 if (new_flags != (flags & tintFlags)) 850 if (new_flags != (flags & tintFlags))
787 { 851 {
788 flags = (flags&~tintFlags)|new_flags; 852 flags = (flags&~tintFlags)|new_flags;
789 return true; 853 return true;
790 } 854 }
855
791 return false; 856 return false;
792} 857}
793 858
794bool 859bool
795bgPixmap_t::set_shade (const char *shade_str) 860bgPixmap_t::set_shade (const char *shade_str)
796{ 861{
797 int new_shade = (shade_str) ? atoi (shade_str) : 0; 862 int new_shade = (shade_str) ? atoi (shade_str) : 0;
798 863
799 if (new_shade < 0 && new_shade > -100) 864 if (new_shade < 0 && new_shade > -100)
800 new_shade = 200 - (100 + new_shade); 865 new_shade = 200 - (100 + new_shade);
801 else if (new_shade == 100) 866 else if (new_shade == 100)
802 new_shade = 0; 867 new_shade = 0;
803 868
804 if (new_shade != shade) 869 if (new_shade != shade)
805 { 870 {
806 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 871 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
807 shade = new_shade; 872 shade = new_shade;
808 flags = (flags & (~tintFlags | tintSet)) | new_flags; 873 flags = (flags & (~tintFlags | tintSet)) | new_flags;
809 return true; 874 return true;
810 } 875 }
876
811 return false; 877 return false;
812} 878}
813 879
814/* make_transparency_pixmap() 880/* make_transparency_pixmap()
815 * Builds a pixmap sized the same as terminal window, with depth same as the root window 881 * Builds a pixmap sized the same as terminal window, with depth same as the root window
… …
822 unsigned long result = 0; 888 unsigned long result = 0;
823 889
824 if (target == NULL) 890 if (target == NULL)
825 return 0; 891 return 0;
826 892
827 /* root dimentions may change from call to call - but Display structure should 893 /* root dimensions may change from call to call - but Display structure should
828 * be always up-to-date, so let's use it : 894 * be always up-to-date, so let's use it :
829 */ 895 */
830 Window root = target->display->root; 896 Window root = target->display->root;
831 int screen = target->display->screen; 897 int screen = target->display->screen;
832 Display *dpy = target->dpy; 898 Display *dpy = target->dpy;
… …
845 if (sx + window_width <= 0 || sy + window_height <= 0 911 if (sx + window_width <= 0 || sy + window_height <= 0
846 || sx >= root_width || sy >= root_height) 912 || sx >= root_width || sy >= root_height)
847 return 0; 913 return 0;
848 914
849 if (root_pixmap != None) 915 if (root_pixmap != None)
916 {
850 {/* we want to validate the pixmap and get it's size at the same time : */ 917 /* we want to validate the pixmap and get it's size at the same time : */
851 int junk; 918 int junk;
852 unsigned int ujunk; 919 unsigned int ujunk;
853 /* root pixmap may be bad - allow a error */ 920 /* root pixmap may be bad - allow a error */
854 target->allowedxerror = -1; 921 target->allowedxerror = -1;
855 922
… …
864 931
865 if (tiled_root_pmap == None) /* something really bad happened - abort */ 932 if (tiled_root_pmap == None) /* something really bad happened - abort */
866 return 0; 933 return 0;
867 934
868 if (root_pixmap == None) 935 if (root_pixmap == None)
936 {
869 { /* use tricks to obtain the root background image :*/ 937 /* use tricks to obtain the root background image :*/
870 /* we want to create Overrideredirect window overlapping out window 938 /* we want to create Overrideredirect window overlapping out window
871 with background type of Parent Relative and then grab it */ 939 with background type of Parent Relative and then grab it */
872 XSetWindowAttributes attr; 940 XSetWindowAttributes attr;
873 Window src; 941 Window src;
874 bool success = false; 942 bool success = false;
875 943
876 attr.background_pixmap = ParentRelative; 944 attr.background_pixmap = ParentRelative;
877 attr.backing_store = Always; 945 attr.backing_store = Always;
878 attr.event_mask = ExposureMask; 946 attr.event_mask = ExposureMask;
879 attr.override_redirect = True; 947 attr.override_redirect = True;
880 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 948 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
881 CopyFromParent, CopyFromParent, CopyFromParent, 949 CopyFromParent, CopyFromParent, CopyFromParent,
882 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 950 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
883 &attr); 951 &attr);
884 952
885 if (src != None) 953 if (src != None)
… …
889 XGrabServer (dpy); 957 XGrabServer (dpy);
890 XMapRaised (dpy, src); 958 XMapRaised (dpy, src);
891 XSync (dpy, False); 959 XSync (dpy, False);
892 960
893 /* XSync should get window where it's properly exposed, 961 /* 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 : */ 962 * but to be on the safe side - let's check for the actual event to arrive : */
895 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 963 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
896 ++ev_count; 964 ++ev_count;
897 965
898 if (ev_count > 0); 966 if (ev_count > 0);
967 {
899 { /* hooray! - we can grab the image! */ 968 /* hooray! - we can grab the image! */
900 gc = XCreateGC (dpy, root, 0, NULL); 969 gc = XCreateGC (dpy, root, 0, NULL);
901 if (gc) 970 if (gc)
902 { 971 {
903 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 972 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
904 success = true; 973 success = true;
905 } 974 }
906 } 975 }
976
907 XDestroyWindow (dpy, src); 977 XDestroyWindow (dpy, src);
908 XUngrabServer (dpy); 978 XUngrabServer (dpy);
909 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 979 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
910 } 980 }
911 981
912 if (!success) 982 if (!success)
913 { 983 {
914 XFreePixmap (dpy, tiled_root_pmap); 984 XFreePixmap (dpy, tiled_root_pmap);
915 tiled_root_pmap = None; 985 tiled_root_pmap = None;
916 } 986 }
917 else 987 else
918 result |= transpPmapTiled; 988 result |= transpPmapTiled;
919 } 989 }
920 else 990 else
991 {
921 {/* strightforward pixmap copy */ 992 /* straightforward pixmap copy */
922 gcv.tile = root_pixmap; 993 gcv.tile = root_pixmap;
923 gcv.fill_style = FillTiled; 994 gcv.fill_style = FillTiled;
924 995
925 while (sx < 0) sx += (int)root_width; 996 while (sx < 0) sx += (int)root_width;
926 while (sy < 0) sy += (int)root_height; 997 while (sy < 0) sy += (int)root_height;
… …
974 { 1045 {
975 c.r = (c.r * shade) / 100; 1046 c.r = (c.r * shade) / 100;
976 c.g = (c.g * shade) / 100; 1047 c.g = (c.g * shade) / 100;
977 c.b = (c.b * shade) / 100; 1048 c.b = (c.b * shade) / 100;
978 } 1049 }
979 else if( shade > 100 && shade < 200) 1050 else if (shade > 100 && shade < 200)
980 { 1051 {
981 c.r = (c.r * (200 - shade)) / 100; 1052 c.r = (c.r * (200 - shade)) / 100;
982 c.g = (c.g * (200 - shade)) / 100; 1053 c.g = (c.g * (200 - shade)) / 100;
983 c.b = (c.b * (200 - shade)) / 100; 1054 c.b = (c.b * (200 - shade)) / 100;
984 } 1055 }
… …
1030 mask_c.blue = 0xffff - c.b; 1101 mask_c.blue = 0xffff - c.b;
1031 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1102 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); 1103 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1033 result |= transpPmapTinted; 1104 result |= transpPmapTinted;
1034 } 1105 }
1106
1035 XRenderFreePicture (dpy, mask_pic); 1107 XRenderFreePicture (dpy, mask_pic);
1036 XRenderFreePicture (dpy, overlay_pic); 1108 XRenderFreePicture (dpy, overlay_pic);
1037 XRenderFreePicture (dpy, back_pic); 1109 XRenderFreePicture (dpy, back_pic);
1038# if DO_TIMING_TEST 1110# if DO_TIMING_TEST
1039 XSync (dpy, False); 1111 XSync (dpy, False);
1040# endif 1112# endif
1041# endif 1113# endif
1042 } 1114 }
1043 } 1115 }
1044 } /* server side rendering completed */ 1116 } /* server side rendering completed */
1045 1117
1046 if (pixmap) 1118 if (pixmap)
1047 XFreePixmap (dpy, pixmap); 1119 XFreePixmap (dpy, pixmap);
1048 1120
… …
1061} 1133}
1062 1134
1063bool 1135bool
1064bgPixmap_t::set_root_pixmap () 1136bgPixmap_t::set_root_pixmap ()
1065{ 1137{
1066 Pixmap new_root_pixmap = None;
1067
1068 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1138 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1069 if (new_root_pixmap == None) 1139 if (new_root_pixmap == None)
1070 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1140 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1071 1141
1072 if (new_root_pixmap != root_pixmap) 1142 if (new_root_pixmap != root_pixmap)
1073 { 1143 {
1074 root_pixmap = new_root_pixmap; 1144 root_pixmap = new_root_pixmap;
1075 return true; 1145 return true;
1076 } 1146 }
1147
1077 return false; 1148 return false;
1078} 1149}
1079# endif /* ENABLE_TRANSPARENCY */ 1150# endif /* ENABLE_TRANSPARENCY */
1080 1151
1081# ifndef HAVE_AFTERIMAGE 1152# ifndef HAVE_AFTERIMAGE
1082static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1153static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1083# endif 1154# endif
1084
1085 1155
1086bool 1156bool
1087bgPixmap_t::render () 1157bgPixmap_t::render ()
1088{ 1158{
1089 unsigned long background_flags = 0; 1159 unsigned long background_flags = 0;
… …
1091 if (target == NULL) 1161 if (target == NULL)
1092 return false; 1162 return false;
1093 1163
1094 TIMING_TEST_START (tp); 1164 TIMING_TEST_START (tp);
1095 1165
1096 invalidate(); 1166 invalidate ();
1097# ifdef ENABLE_TRANSPARENCY 1167# ifdef ENABLE_TRANSPARENCY
1098 if (flags & isTransparent) 1168 if (flags & isTransparent)
1099 { 1169 {
1100 /* we need to re-generate transparency pixmap in that case ! */ 1170 /* we need to re-generate transparency pixmap in that case ! */
1101 background_flags = make_transparency_pixmap (); 1171 background_flags = make_transparency_pixmap ();
1102 if (background_flags == 0) 1172 if (background_flags == 0)
1103 return false; 1173 return false;
1104 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1174 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1105 && pmap_depth == target->depth) 1175 && pmap_depth == target->depth)
1106 flags = flags & ~isInvalid; 1176 flags = flags & ~isInvalid;
1107 } 1177 }
1108# endif 1178# endif
1109 1179
1180# ifdef BG_IMAGE_FROM_FILE
1181 if (have_image
1182 || (background_flags & transpTransformations) != (flags & transpTransformations))
1183 {
1184 if (render_image (background_flags))
1185 flags = flags & ~isInvalid;
1186 }
1187# endif
1188
1110 XImage *result = NULL; 1189 XImage *result = NULL;
1111# ifdef HAVE_AFTERIMAGE
1112 if (original_asim
1113 || (background_flags & transpTransformations) != (flags & transpTransformations))
1114 {
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 1190
1120# ifdef ENABLE_TRANSPARENCY 1191 if (background_flags && (flags & isInvalid))
1121 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 { 1192 {
1155 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1193 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1156 }
1157 1194
1195# if !defined(HAVE_AFTERIMAGE) && !XFT
1158# elif !XFT /* our own client-side tinting */ 1196 /* our own client-side tinting */
1159
1160 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side. 1197 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1161 This may need to be changed in need_client_side_rendering() logic is altered !!! */ 1198 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)) 1199 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1167 { 1200 {
1168 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1201 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1169 if (flags & tintSet) 1202 if (flags & tintSet)
1170 tint.get (c); 1203 tint.get (c);
1171 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1204 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1172 } 1205 }
1206# endif
1173 } 1207 }
1174# endif /* HAVE_AFTERIMAGE */
1175 1208
1176 if (result != NULL) 1209 if (result)
1177 { 1210 {
1178 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1211 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1212
1179 if (gc) 1213 if (gc)
1180 { 1214 {
1181 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1215 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1182 { 1216 {
1183 XFreePixmap (target->dpy, pixmap); 1217 XFreePixmap (target->dpy, pixmap);
1184 pixmap = None; 1218 pixmap = None;
1185 } 1219 }
1220
1186 if (pixmap == None) 1221 if (pixmap == None)
1187 { 1222 {
1188 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1223 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1189 pmap_width = result->width; 1224 pmap_width = result->width;
1190 pmap_height = result->height; 1225 pmap_height = result->height;
1191 pmap_depth = target->depth; 1226 pmap_depth = target->depth;
1192 } 1227 }
1228
1193 if (pmap_depth != result->depth) 1229 if (pmap_depth != result->depth)
1230 {
1194 { /* Bad Match error will ensue ! stupid X !!!! */ 1231 /* Bad Match error will ensue ! stupid X !!!! */
1195 if( result->depth == 24 && pmap_depth == 32) 1232 if (result->depth == 24 && pmap_depth == 32)
1196 result->depth = 32; 1233 result->depth = 32;
1197 else if( result->depth == 32 && pmap_depth == 24) 1234 else if (result->depth == 32 && pmap_depth == 24)
1198 result->depth = 24; 1235 result->depth = 24;
1199 else 1236 else
1200 { 1237 {
1201 /* TODO: implement image recoding */ 1238 /* TODO: implement image recoding */
1202 } 1239 }
1203 } 1240 }
1241
1204 if (pmap_depth == result->depth) 1242 if (pmap_depth == result->depth)
1205 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1243 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1244
1206 XFreeGC (target->dpy, gc); 1245 XFreeGC (target->dpy, gc);
1207 flags = flags & ~isInvalid; 1246 flags = flags & ~isInvalid;
1208 } 1247 }
1248
1209 XDestroyImage (result); 1249 XDestroyImage (result);
1210 } 1250 }
1211 1251
1212 if (flags & isInvalid) 1252 if (flags & isInvalid)
1213 { 1253 {
1214 if (pixmap != None) 1254 if (pixmap != None)
… …
1217 pixmap = None; 1257 pixmap = None;
1218 } 1258 }
1219 } 1259 }
1220 1260
1221 apply (); 1261 apply ();
1262
1263 XSync (target->dpy, False);
1264 valid_since = ev::now ();
1222 1265
1223 TIMING_TEST_PRINT_RESULT (tp); 1266 TIMING_TEST_PRINT_RESULT (tp);
1224 1267
1225 return true; 1268 return true;
1226} 1269}
… …
1235# ifdef ENABLE_TRANSPARENCY 1278# ifdef ENABLE_TRANSPARENCY
1236 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1279 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1237# endif 1280# endif
1238 return true; 1281 return true;
1239 } 1282 }
1283
1240 return false; 1284 return false;
1241} 1285}
1242 1286
1243void 1287void
1244bgPixmap_t::apply() 1288bgPixmap_t::apply ()
1245{ 1289{
1246 if (target) 1290 if (target)
1247 { 1291 {
1248 flags &= ~isVtOrigin; 1292 flags &= ~isVtOrigin;
1293
1249 if (pixmap != None) 1294 if (pixmap != None)
1295 {
1250 { /* set target's background to pixmap */ 1296 /* set target's background to pixmap */
1251# ifdef ENABLE_TRANSPARENCY 1297# ifdef ENABLE_TRANSPARENCY
1252 if (flags & isTransparent) 1298 if (flags & isTransparent)
1253 { 1299 {
1254 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1300 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1255 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1301 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1256# if HAVE_SCROLLBARS 1302
1257 if (target->scrollBar.win) 1303 if (target->scrollBar.win)
1258 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1304 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1259# endif
1260 } 1305 }
1261 else 1306 else
1262# endif 1307# endif
1263 { 1308 {
1264 flags |= isVtOrigin; 1309 flags |= isVtOrigin;
1265 /* force old pixmap dereference in case it was transparent before :*/ 1310 /* force old pixmap dereference in case it was transparent before :*/
1266 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1311 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1267 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1312 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1268 /* do we also need to set scrollbar's background here ? */ 1313 /* do we also need to set scrollbar's background here ? */
1269# if HAVE_SCROLLBARS 1314
1270 if (target->scrollBar.win) 1315 if (target->scrollBar.win)
1271 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1316 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1272# endif
1273 } 1317 }
1274 } 1318 }
1275 else 1319 else
1320 {
1276 { /* set target background to a pixel */ 1321 /* set target background to a pixel */
1277 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1322 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1278 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1323 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1279 /* do we also need to set scrollbar's background here ? */ 1324 /* do we also need to set scrollbar's background here ? */
1280# if HAVE_SCROLLBARS
1281 if (target->scrollBar.win) 1325 if (target->scrollBar.win)
1282 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1326 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1283# endif
1284 } 1327 }
1328
1285 /* don't want Expose on the parent or vt. It is better to use 1329 /* 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: */ 1330 scr_touch or we get a great deal of flicker otherwise: */
1287 XClearWindow (target->dpy, target->parent[0]); 1331 XClearWindow (target->dpy, target->parent[0]);
1288 1332
1289# if HAVE_SCROLLBARS 1333 if (target->scrollBar.state && target->scrollBar.win)
1290 if (target->scrollBar.win)
1291 { 1334 {
1292 target->scrollBar.setIdle (); 1335 target->scrollBar.state = STATE_IDLE;
1293 target->scrollbar_show (0); 1336 target->scrollBar.show (0);
1294 } 1337 }
1295# endif
1296 1338
1297 target->want_refresh = 1; 1339 target->want_refresh = 1;
1298 flags |= hasChanged; 1340 flags |= hasChanged;
1299 } 1341 }
1300} 1342}
… …
1305/* taken from aterm-0.4.2 */ 1347/* taken from aterm-0.4.2 */
1306 1348
1307typedef uint32_t RUINT32T; 1349typedef uint32_t RUINT32T;
1308 1350
1309static void 1351static void
1310ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1352ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1311{ 1353{
1312 int sh_r, sh_g, sh_b; 1354 int sh_r, sh_g, sh_b;
1313 RUINT32T mask_r, mask_g, mask_b; 1355 RUINT32T mask_r, mask_g, mask_b;
1314 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1356 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1315 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1357 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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