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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines