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.1 by sasha, Wed Sep 12 20:29:24 2007 UTC vs.
Revision 1.34 by root, Sun Apr 26 01:59:53 2009 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xmp.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{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\
39 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 37 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) 38 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0)
41 39
87 * scale Scale both up and down 85 * scale Scale both up and down
88 * auto Same as 100x100+50+50 86 * auto Same as 100x100+50+50
89 */ 87 */
90 88
91#ifdef HAVE_BG_PIXMAP 89#ifdef HAVE_BG_PIXMAP
90bgPixmap_t::bgPixmap_t ()
91{
92 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL;
96#endif
97#ifdef BG_IMAGE_FROM_FILE
98 h_scale = v_scale = 0;
99 h_align = v_align = 0;
100#endif
101 flags = 0;
102 pixmap = None;
103 valid_since = invalid_since = 0;
104 target = 0;
105}
106
107void
108bgPixmap_t::destroy ()
109{
110#ifdef HAVE_AFTERIMAGE
111 if (original_asim)
112 safe_asimage_destroy (original_asim);
113#endif
114
115 if (pixmap && target)
116 XFreePixmap (target->dpy, pixmap);
117}
118
92bool 119bool
93bgPixmap_t::window_size_sensitive () 120bgPixmap_t::window_size_sensitive ()
94{ 121{
95# ifdef XPM_BACKGROUND
96# ifdef HAVE_AFTERIMAGE
97 if (original_asim != NULL)
98# endif
99 {
100 if (h_scale != 0 || v_scale != 0
101 || h_align != 0 || v_align != 0)
102 return true;
103 }
104# endif
105# ifdef ENABLE_TRANSPARENCY 122# ifdef ENABLE_TRANSPARENCY
106 if (flags & isTransparent) 123 if (flags & isTransparent)
107 return true; 124 return true;
108# endif 125# endif
126
127# ifdef BG_IMAGE_FROM_FILE
128# ifdef HAVE_AFTERIMAGE
129 if (original_asim)
130# endif
131 {
132 if (h_scale != 0 || v_scale != 0
133 || h_align != 0 || v_align != 0)
134 return true;
135 }
136# endif
137
109 return false; 138 return false;
110} 139}
111 140
141bool
142bgPixmap_t::window_position_sensitive ()
143{
144# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent)
146 return true;
147# endif
148
149# ifdef BG_IMAGE_FROM_FILE
150# ifdef HAVE_AFTERIMAGE
151 if (original_asim)
152# endif
153 {
154 if (h_align == rootAlign || v_align == rootAlign)
155 return true;
156 }
157# endif
158
159 return false;
160};
161
112bool bgPixmap_t::need_client_side_rendering () 162bool bgPixmap_t::need_client_side_rendering ()
113{ 163{
114# ifdef HAVE_AFTERIMAGE 164# ifdef HAVE_AFTERIMAGE
115 if (original_asim != NULL) 165 if (original_asim)
116 return true; 166 return true;
117# endif 167# endif
118# ifdef ENABLE_TRANSPARENCY 168# ifdef ENABLE_TRANSPARENCY
119 if (flags & isTransparent) 169 if (flags & isTransparent)
120 { 170 {
171# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
121 if (((flags & blurNeeded) && !(flags & blurServerSide)) 172 if ((flags & blurNeeded) && !(flags & blurServerSide))
173 return true;
174# endif
122 || ((flags & tintNeeded) && !(flags & tintServerSide))) 175 if ((flags & tintNeeded) && !(flags & tintServerSide))
123 return true; 176 return true;
124 } 177 }
125# endif 178# endif
126 return false; 179 return false;
127} 180}
128 181
129# ifdef XPM_BACKGROUND 182# ifdef BG_IMAGE_FROM_FILE
130static inline bool 183static inline bool
131check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) 184check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
132{ 185{
133 if (geom_flags & flag) 186 if (geom_flags & flag)
134 { 187 {
146static inline bool 199static inline bool
147check_set_align_value (int geom_flags, int flag, int &align, int new_value) 200check_set_align_value (int geom_flags, int flag, int &align, int new_value)
148{ 201{
149 if (geom_flags & flag) 202 if (geom_flags & flag)
150 { 203 {
204 if (new_value != bgPixmap_t::rootAlign)
205 {
151 if (new_value < -100) 206 if (new_value < -100)
152 new_value = -100; 207 new_value = -100;
153 else if (new_value > 200) 208 else if (new_value > 200)
154 new_value = 200; 209 new_value = 200;
210 }
155 if (new_value != align) 211 if (new_value != align)
156 { 212 {
157 align = new_value; 213 align = new_value;
158 return true; 214 return true;
159 } 215 }
203 int geom_flags = 0, changed = 0; 259 int geom_flags = 0, changed = 0;
204 int x = 0, y = 0; 260 int x = 0, y = 0;
205 unsigned int w = 0, h = 0; 261 unsigned int w = 0, h = 0;
206 unsigned int n; 262 unsigned int n;
207 unsigned long new_flags = (flags & (~geometryFlags)); 263 unsigned long new_flags = (flags & (~geometryFlags));
208 char *p; 264 const char *p;
209# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
210 266
211 if (geom == NULL) 267 if (geom == NULL)
212 return false; 268 return false;
213 269
214 char str[MAXLEN_GEOM]; 270 char str[MAXLEN_GEOM];
221 if (n < MAXLEN_GEOM) 277 if (n < MAXLEN_GEOM)
222 { 278 {
223 char *ops; 279 char *ops;
224 new_flags |= geometrySet; 280 new_flags |= geometrySet;
225 281
226 strncpy (str, geom, n); 282 memcpy (str, geom, n);
227 str[n] = '\0'; 283 str[n] = '\0';
228 if (str[0] == ':') 284 if (str[0] == ':')
229 ops = &str[0]; 285 ops = &str[0];
230 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 286 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
231 ops = &str[0]; 287 ops = &str[0];
251 y = x; 307 y = x;
252 geom_flags |= YValue; 308 geom_flags |= YValue;
253 } 309 }
254 310
255 if (flags & geometrySet) 311 if (flags & geometrySet)
312 {
256 {/* new geometry is an adjustment to the old one ! */ 313 /* new geometry is an adjustment to the old one ! */
257 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 314 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
258 { 315 {
259 if (w == 0 && h != 0) 316 if (w == 0 && h != 0)
260 { 317 {
261 w = h_scale; 318 w = h_scale;
277 } 334 }
278 } 335 }
279 else /* setting up geometry from scratch */ 336 else /* setting up geometry from scratch */
280 { 337 {
281 if (!(geom_flags & XValue)) 338 if (!(geom_flags & XValue))
339 {
282 {/* use default geometry - centered */ 340 /* use default geometry - centered */
283 x = y = defaultAlign; 341 x = y = defaultAlign;
284 } 342 }
285 else if (!(geom_flags & YValue)) 343 else if (!(geom_flags & YValue))
286 y = x; 344 y = x;
287 345
288 if ((geom_flags & (WidthValue|HeightValue)) == 0) 346 if ((geom_flags & (WidthValue|HeightValue)) == 0)
347 {
289 {/* use default geometry - scaled */ 348 /* use default geometry - scaled */
290 w = h = defaultScale; 349 w = h = defaultScale;
291 } 350 }
292 else if (geom_flags & WidthValue) 351 else if (geom_flags & WidthValue)
293 { 352 {
294 if (!(geom_flags & HeightValue)) 353 if (!(geom_flags & HeightValue))
297 else 356 else
298 w = h; 357 w = h;
299 } 358 }
300 } /* done parsing geometry string */ 359 } /* done parsing geometry string */
301 else if (!(flags & geometrySet)) 360 else if (!(flags & geometrySet))
361 {
302 { /* default geometry - scaled and centered */ 362 /* default geometry - scaled and centered */
303 x = y = defaultAlign; 363 x = y = defaultAlign;
304 w = h = defaultScale; 364 w = h = defaultScale;
305 } 365 }
306 366
307 if (!(flags & geometrySet)) 367 if (!(flags & geometrySet))
308 geom_flags |= WidthValue|HeightValue|XValue|YValue; 368 geom_flags |= WidthValue|HeightValue|XValue|YValue;
309 369
310 if (ops) 370 if (ops)
311 { 371 {
312 while (*ops) 372 while (*ops)
313 { 373 {
314 while (*ops == ':' || isspace(*ops)) ++ops; 374 while (*ops == ':' || isspace(*ops)) ++ops;
375
315# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 376# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
316 if (CHECK_GEOM_OPS("tile")) 377 if (CHECK_GEOM_OPS ("tile"))
317 { 378 {
318 w = h = 0; 379 w = h = noScale;
319 geom_flags |= WidthValue|HeightValue; 380 geom_flags |= WidthValue|HeightValue;
320 } 381 }
321 else if (CHECK_GEOM_OPS("propscale")) 382 else if (CHECK_GEOM_OPS ("propscale"))
322 { 383 {
323 if (w == 0 && h == 0) 384 if (w == 0 && h == 0)
324 { 385 {
325 w = 100; 386 w = windowScale;
326 geom_flags |= WidthValue; 387 geom_flags |= WidthValue;
327 } 388 }
328 new_flags |= propScale; 389 new_flags |= propScale;
329 } 390 }
330 else if (CHECK_GEOM_OPS("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
331 { 392 {
332 if (w == 0) 393 if (w == 0) w = windowScale;
333 w = 100; 394
334 h = 0; 395 h = noScale;
335 geom_flags |= WidthValue|HeightValue; 396 geom_flags |= WidthValue|HeightValue;
336 } 397 }
337 else if (CHECK_GEOM_OPS("vscale")) 398 else if (CHECK_GEOM_OPS ("vscale"))
338 { 399 {
339 if (h == 0) 400 if (h == 0) h = windowScale;
340 h = 100; 401
341 w = 0; 402 w = noScale;
342 geom_flags |= WidthValue|HeightValue; 403 geom_flags |= WidthValue|HeightValue;
343 } 404 }
344 else if (CHECK_GEOM_OPS("scale")) 405 else if (CHECK_GEOM_OPS ("scale"))
345 { 406 {
346 if (h == 0) 407 if (h == 0) h = windowScale;
347 h = 100;
348 if (w == 0) 408 if (w == 0) w = windowScale;
349 w = 100; 409
350 geom_flags |= WidthValue|HeightValue; 410 geom_flags |= WidthValue|HeightValue;
351 } 411 }
352 else if (CHECK_GEOM_OPS("auto")) 412 else if (CHECK_GEOM_OPS ("auto"))
353 { 413 {
354 w = h = 100; 414 w = h = windowScale;
355 x = y = 50; 415 x = y = centerAlign;
356 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
357 } 417 }
418 else if (CHECK_GEOM_OPS ("root"))
419 {
420 w = h = noScale;
421 x = y = rootAlign;
422 geom_flags |= WidthValue|HeightValue|XValue|YValue;
423 }
358# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
425
359 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
360 } /* done parsing ops */ 427 } /* done parsing ops */
361 } 428 }
362 429
363 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
364 ++changed;
365 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
366 ++changed;
367 if (check_set_align_value (geom_flags, XValue, h_align, x)) 432 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
368 ++changed;
369 if (check_set_align_value (geom_flags, YValue, v_align, y)) 433 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
370 ++changed;
371 } 434 }
372 435
373 if (new_flags != flags) 436 if (new_flags != flags)
374 { 437 {
375 flags = new_flags; 438 flags = new_flags;
376 changed++; 439 changed++;
377 } 440 }
441
378//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
379// flags, h_scale, v_scale, h_align, v_align); 443// flags, h_scale, v_scale, h_align, v_align);
380 return (changed > 0); 444 return (changed > 0);
381} 445}
382 446
383# ifdef HAVE_AFTERIMAGE 447# ifdef HAVE_AFTERIMAGE
385bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
386{ 450{
387 if (target == NULL) 451 if (target == NULL)
388 return false; 452 return false;
389 453
454 target->init_asv ();
455
456 ASImage *result = 0;
457
390 int target_width = (int)target->szHint.width; 458 int target_width = target->szHint.width;
391 int target_height = (int)target->szHint.height; 459 int target_height = target->szHint.height;
392 int new_pmap_width = target_width, new_pmap_height = target_height; 460 int new_pmap_width = target_width;
393 ASImage *result = NULL; 461 int new_pmap_height = target_height;
394 462
395 int x = 0; 463 int x = 0;
396 int y = 0; 464 int y = 0;
397 int w = h_scale * target_width / 100; 465 int w = h_scale * target_width / 100;
398 int h = v_scale * target_height / 100; 466 int h = v_scale * target_height / 100;
399 467
400 TIMING_TEST_START (asim); 468 TIMING_TEST_START (asim);
401 469
402 if (original_asim) 470 if (original_asim)
403 { 471 {
472 if (h_align == rootAlign || v_align == rootAlign)
473 {
474 target->get_window_origin(x, y);
475 x = -x;
476 y = -y;
477 }
478
479 if (h_align != rootAlign)
404 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 480 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
481
482 if (v_align != rootAlign)
405 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 483 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
406 } 484 }
407 485
408 if (original_asim == NULL 486 if (!original_asim
409 || x >= target_width 487 || x >= target_width
410 || y >= target_height 488 || y >= target_height
411 || (w > 0 && x + w <= 0) 489 || (w > 0 && x + w <= 0)
412 || (h > 0 && y + h <= 0)) 490 || (h > 0 && y + h <= 0))
413 { 491 {
414 if (background) 492 if (background)
415 { 493 {
416 new_pmap_width = background->width; 494 new_pmap_width = background->width;
417 new_pmap_height = background->height; 495 new_pmap_height = background->height;
418 result = background; 496 result = background;
497
419 if (background_tint != TINT_LEAVE_SAME) 498 if (background_tint != TINT_LEAVE_SAME)
420 { 499 {
421 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 500 ASImage* tmp = tile_asimage (target->asv, background, 0, 0,
422 target_width, target_height, background_tint, 501 target_width, target_height, background_tint,
423 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 502 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
429 new_pmap_width = new_pmap_height = 0; 508 new_pmap_width = new_pmap_height = 0;
430 } 509 }
431 else 510 else
432 { 511 {
433 result = original_asim; 512 result = original_asim;
513
434 if ((w > 0 && w != original_asim->width) 514 if ((w > 0 && w != original_asim->width)
435 || (h > 0 && h != original_asim->height)) 515 || (h > 0 && h != original_asim->height))
436 { 516 {
437 result = scale_asimage (target->asv, original_asim, 517 result = scale_asimage (target->asv, original_asim,
438 w > 0 ? w : original_asim->width, 518 w > 0 ? w : original_asim->width,
439 h > 0 ? h : original_asim->height, 519 h > 0 ? h : original_asim->height,
440 background ? ASA_ASImage : ASA_XImage, 520 background ? ASA_ASImage : ASA_XImage,
441 100, ASIMAGE_QUALITY_DEFAULT); 521 100, ASIMAGE_QUALITY_DEFAULT);
442 } 522 }
523
443 if (background == NULL) 524 if (background == NULL)
525 {
444 {/* if tiling - pixmap has to be sized exactly as the image */ 526 /* if tiling - pixmap has to be sized exactly as the image,
527 but there is no need to make it bigger than the window! */
445 if (h_scale == 0) 528 if (h_scale == 0)
446 new_pmap_width = result->width; 529 new_pmap_width = min (result->width, target_width);
447 if (v_scale == 0) 530 if (v_scale == 0)
448 new_pmap_height = result->height; 531 new_pmap_height = min (result->height, target_height);
449 /* we also need to tile our image in one or both directions */ 532 /* we also need to tile our image in one or both directions */
450 if (h_scale == 0 || v_scale == 0) 533 if (h_scale == 0 || v_scale == 0)
451 { 534 {
452 ASImage *tmp = tile_asimage (target->asv, result, 535 ASImage *tmp = tile_asimage (target->asv, result,
453 (h_scale > 0) ? 0 : (int)result->width - x, 536 (h_scale > 0) ? 0 : (int)result->width - x,
454 (v_scale > 0) ? 0 : (int)result->height - y, 537 (v_scale > 0) ? 0 : (int)result->height - y,
538 new_pmap_width,
455 result->width, result->height, 539 new_pmap_height,
456 TINT_LEAVE_SAME, ASA_XImage, 540 TINT_LEAVE_SAME, ASA_XImage,
457 100, ASIMAGE_QUALITY_DEFAULT); 541 100, ASIMAGE_QUALITY_DEFAULT);
458 if (tmp) 542 if (tmp)
459 { 543 {
460 if (result != original_asim) 544 if (result != original_asim)
461 destroy_asimage (&result); 545 destroy_asimage (&result);
546
462 result = tmp; 547 result = tmp;
463 } 548 }
464 } 549 }
465 } 550 }
466 else 551 else
552 {
467 {/* if blending background and image - pixmap has to be sized same as target window */ 553 /* if blending background and image - pixmap has to be sized same as target window */
468 ASImageLayer *layers = create_image_layers (2); 554 ASImageLayer *layers = create_image_layers (2);
469 ASImage *merged_im = NULL; 555 ASImage *merged_im = NULL;
470 556
471 layers[0].im = background; 557 layers[0].im = background;
472 layers[0].clip_width = target_width; 558 layers[0].clip_width = target_width;
473 layers[0].clip_height = target_height; 559 layers[0].clip_height = target_height;
474 layers[0].tint = background_tint; 560 layers[0].tint = background_tint;
475 layers[1].im = result; 561 layers[1].im = result;
562
476 if (w <= 0) 563 if (w <= 0)
564 {
477 {/* tile horizontally */ 565 /* tile horizontally */
478 while (x > 0) x -= (int)result->width; 566 while (x > 0) x -= (int)result->width;
479 layers[1].dst_x = x; 567 layers[1].dst_x = x;
480 layers[1].clip_width = result->width+target_width; 568 layers[1].clip_width = result->width+target_width;
481 } 569 }
482 else 570 else
571 {
483 {/* clip horizontally */ 572 /* clip horizontally */
484 layers[1].dst_x = x; 573 layers[1].dst_x = x;
485 layers[1].clip_width = result->width; 574 layers[1].clip_width = result->width;
486 } 575 }
576
487 if (h <= 0) 577 if (h <= 0)
488 { 578 {
489 while (y > 0) y -= (int)result->height; 579 while (y > 0) y -= (int)result->height;
490 layers[1].dst_y = y; 580 layers[1].dst_y = y;
491 layers[1].clip_height = result->height + target_height; 581 layers[1].clip_height = result->height + target_height;
493 else 583 else
494 { 584 {
495 layers[1].dst_y = y; 585 layers[1].dst_y = y;
496 layers[1].clip_height = result->height; 586 layers[1].clip_height = result->height;
497 } 587 }
588
498 if (target->rs[Rs_blendtype]) 589 if (target->rs[Rs_blendtype])
499 { 590 {
500 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 591 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
501 if (layers[1].merge_scanlines == NULL) 592 if (layers[1].merge_scanlines == NULL)
502 layers[1].merge_scanlines = alphablend_scanlines; 593 layers[1].merge_scanlines = alphablend_scanlines;
503 } 594 }
595
504 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 596 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
505 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 597 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
598
506 if (tmp) 599 if (tmp)
507 { 600 {
508 if (result != original_asim) 601 if (result != original_asim)
509 destroy_asimage (&result); 602 destroy_asimage (&result);
603
510 result = tmp; 604 result = tmp;
511 } 605 }
606
512 free (layers); 607 free (layers);
513 } 608 }
514 } 609 }
515 TIMING_TEST_PRINT_RESULT (asim); 610 TIMING_TEST_PRINT_RESULT (asim);
516 611
545 640
546 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 641 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
547 int dst_width = result->width, dst_height = result->height; 642 int dst_width = result->width, dst_height = result->height;
548 if (background == NULL) 643 if (background == NULL)
549 { 644 {
550 if (h_scale > 0)
551 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 645 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
552 if (v_scale > 0)
553 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 646 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
554 647
555 if (dst_x > 0 || dst_y > 0 648 if (dst_x > 0 || dst_y > 0
556 || dst_x + dst_width < new_pmap_width 649 || dst_x + dst_width < new_pmap_width
557 || dst_y + dst_height < new_pmap_height) 650 || dst_y + dst_height < new_pmap_height)
558 {
559 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 651 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
560 }
561 } 652 }
562 653
563 /* put result on pixmap */ 654 /* put result on pixmap */
564 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 655 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
565 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 656 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
566 657
567 if (result != background && result != original_asim) 658 if (result != background && result != original_asim)
568 destroy_asimage (&result); 659 destroy_asimage (&result);
569 660
570 XFreeGC (target->dpy, gc); 661 XFreeGC (target->dpy, gc);
571 TIMING_TEST_PRINT_RESULT (asim); 662 TIMING_TEST_PRINT_RESULT (asim);
576# endif /* HAVE_AFTERIMAGE */ 667# endif /* HAVE_AFTERIMAGE */
577 668
578bool 669bool
579bgPixmap_t::set_file (const char *file) 670bgPixmap_t::set_file (const char *file)
580{ 671{
581 char *f;
582
583 assert (file != NULL); 672 assert (file);
584 673
585 if (*file != '\0') 674 if (*file)
586 { 675 {
587# ifdef HAVE_AFTERIMAGE 676# ifdef HAVE_AFTERIMAGE
588 if (target->asimman == NULL) 677 if (!target->asimman)
589 target->asimman = create_generic_imageman (target->rs[Rs_path]); 678 target->asimman = create_generic_imageman (target->rs[Rs_path]);
590 if ((f = strchr (file, ';')) == NULL) 679
591 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 680 if (const char *p = strchr (file, ';'))
592 else
593 { 681 {
594 size_t len = f - file; 682 size_t len = p - file;
595 f = (char *)malloc (len + 1); 683 char *f = (char *)malloc (len + 1);
596 strncpy (f, file, len); 684 memcpy (f, file, len);
597 f[len] = '\0'; 685 f[len] = '\0';
598 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
599 free (f); 687 free (f);
600 } 688 }
689 else
690 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
691
601 return (original_asim != NULL); 692 return original_asim;
602# endif 693# endif
603 } 694 }
695
604 return false; 696 return false;
605} 697}
606 698
607# endif /* XPM_BACKGROUND */ 699# endif /* BG_IMAGE_FROM_FILE */
608 700
609# ifdef ENABLE_TRANSPARENCY 701# ifdef ENABLE_TRANSPARENCY
610bool 702bool
611bgPixmap_t::set_transparent () 703bgPixmap_t::set_transparent ()
612{ 704{
613 if (!(flags & isTransparent)) 705 if (!(flags & isTransparent))
614 { 706 {
615 flags |= isTransparent; 707 flags |= isTransparent;
616 return true; 708 return true;
617 } 709 }
710
618 return false; 711 return false;
619} 712}
620 713
621bool 714bool
622bgPixmap_t::set_blur_radius (const char *geom) 715bgPixmap_t::set_blur_radius (const char *geom)
640 if (v_blurRadius != vr) 733 if (v_blurRadius != vr)
641 { 734 {
642 ++changed; 735 ++changed;
643 v_blurRadius = vr; 736 v_blurRadius = vr;
644 } 737 }
645 738
646 if (v_blurRadius == 0 && h_blurRadius == 0) 739 if (v_blurRadius == 0 && h_blurRadius == 0)
647 flags &= ~blurNeeded; 740 flags &= ~blurNeeded;
648 else 741 else
649 flags |= blurNeeded; 742 flags |= blurNeeded;
650 743
654static inline unsigned long 747static inline unsigned long
655compute_tint_shade_flags (rxvt_color *tint, int shade) 748compute_tint_shade_flags (rxvt_color *tint, int shade)
656{ 749{
657 unsigned long flags = 0; 750 unsigned long flags = 0;
658 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 751 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
752 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200);
659 753
660 if (tint) 754 if (tint)
661 { 755 {
662 tint->get (c); 756 tint->get (c);
663# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 757# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
664 if (IS_COMPONENT_WHOLESOME (c.r) 758 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)
665 && IS_COMPONENT_WHOLESOME (c.g) 759 && IS_COMPONENT_WHOLESOME (c.g)
666 && IS_COMPONENT_WHOLESOME (c.b)) 760 && IS_COMPONENT_WHOLESOME (c.b))
667 flags |= bgPixmap_t::tintWholesome; 761 flags |= bgPixmap_t::tintWholesome;
668# undef IS_COMPONENT_WHOLESOME 762# undef IS_COMPONENT_WHOLESOME
669 } 763 }
670 764
671 if ((shade > 0 && shade < 100) || (shade > 100 && shade < 200)) 765 if (has_shade)
672 flags |= bgPixmap_t::tintNeeded; 766 flags |= bgPixmap_t::tintNeeded;
673 else if (tint) 767 else if (tint)
674 { 768 {
675 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 769 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
676 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 770 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
677 { 771 {
678 flags |= bgPixmap_t::tintNeeded; 772 flags |= bgPixmap_t::tintNeeded;
679 } 773 }
680 } 774 }
681 775
682 if (flags & bgPixmap_t::tintNeeded) 776 if (flags & bgPixmap_t::tintNeeded)
683 { 777 {
684 if (flags & bgPixmap_t::tintWholesome) 778 if (flags & bgPixmap_t::tintWholesome)
685 flags |= bgPixmap_t::tintServerSide; 779 flags |= bgPixmap_t::tintServerSide;
780 else
781 {
686#if XFT 782#if XFT
687 flags |= bgPixmap_t::tintServerSide; 783 flags |= bgPixmap_t::tintServerSide;
688#endif 784#endif
785 }
689 } 786 }
690 787
691 return flags; 788 return flags;
692} 789}
693 790
699 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 796 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
700 tint = new_tint; 797 tint = new_tint;
701 flags = (flags & ~tintFlags) | new_flags | tintSet; 798 flags = (flags & ~tintFlags) | new_flags | tintSet;
702 return true; 799 return true;
703 } 800 }
801
704 return false; 802 return false;
705} 803}
706 804
707bool 805bool
708bgPixmap_t::unset_tint () 806bgPixmap_t::unset_tint ()
712 if (new_flags != (flags & tintFlags)) 810 if (new_flags != (flags & tintFlags))
713 { 811 {
714 flags = (flags&~tintFlags)|new_flags; 812 flags = (flags&~tintFlags)|new_flags;
715 return true; 813 return true;
716 } 814 }
815
717 return false; 816 return false;
718} 817}
719 818
720bool 819bool
721bgPixmap_t::set_shade (const char *shade_str) 820bgPixmap_t::set_shade (const char *shade_str)
722{ 821{
723 int new_shade = (shade_str) ? atoi (shade_str) : 0; 822 int new_shade = (shade_str) ? atoi (shade_str) : 0;
724 823
824 if (new_shade < 0 && new_shade > -100)
825 new_shade = 200 - (100 + new_shade);
725 if (new_shade == 100) 826 else if (new_shade == 100)
726 new_shade = 0; 827 new_shade = 0;
727 828
728 if (new_shade != shade) 829 if (new_shade != shade)
729 { 830 {
730 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 831 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
731 shade = new_shade; 832 shade = new_shade;
732 flags = (flags & ~tintFlags) | new_flags; 833 flags = (flags & (~tintFlags | tintSet)) | new_flags;
733 return true; 834 return true;
734 } 835 }
836
735 return false; 837 return false;
736} 838}
737 839
738/* make_transparency_pixmap() 840/* make_transparency_pixmap()
739 * Builds a pixmap sized the same as terminal window, with depth same as the root window 841 * Builds a pixmap sized the same as terminal window, with depth same as the root window
740 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 842 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
741 * our window. 843 * our window.
742 */ 844 */
743unsigned long 845unsigned long
744bgPixmap_t::make_transparency_pixmap () 846bgPixmap_t::make_transparency_pixmap ()
745{ 847{
769 if (sx + window_width <= 0 || sy + window_height <= 0 871 if (sx + window_width <= 0 || sy + window_height <= 0
770 || sx >= root_width || sy >= root_height) 872 || sx >= root_width || sy >= root_height)
771 return 0; 873 return 0;
772 874
773 if (root_pixmap != None) 875 if (root_pixmap != None)
876 {
774 {/* we want to validate the pixmap and get it's size at the same time : */ 877 /* we want to validate the pixmap and get it's size at the same time : */
775 int junk; 878 int junk;
776 unsigned int ujunk; 879 unsigned int ujunk;
777 /* root pixmap may be bad - allow a error */ 880 /* root pixmap may be bad - allow a error */
778 target->allowedxerror = -1; 881 target->allowedxerror = -1;
779 882
788 891
789 if (tiled_root_pmap == None) /* something really bad happened - abort */ 892 if (tiled_root_pmap == None) /* something really bad happened - abort */
790 return 0; 893 return 0;
791 894
792 if (root_pixmap == None) 895 if (root_pixmap == None)
896 {
793 { /* use tricks to obtain the root background image :*/ 897 /* use tricks to obtain the root background image :*/
794 /* we want to create Overrideredirect window overlapping out window 898 /* we want to create Overrideredirect window overlapping out window
795 with background type of Parent Relative and then grab it */ 899 with background type of Parent Relative and then grab it */
796 XSetWindowAttributes attr; 900 XSetWindowAttributes attr;
797 Window src; 901 Window src;
798 bool success = false; 902 bool success = false;
813 XGrabServer (dpy); 917 XGrabServer (dpy);
814 XMapRaised (dpy, src); 918 XMapRaised (dpy, src);
815 XSync (dpy, False); 919 XSync (dpy, False);
816 920
817 /* XSync should get window where it's properly exposed, 921 /* XSync should get window where it's properly exposed,
818 * but to be on the safe side - let's check for the actuall event to arrive : */ 922 * but to be on the safe side - let's check for the actual event to arrive : */
819 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 923 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
820 ++ev_count; 924 ++ev_count;
821 925
822 if (ev_count > 0); 926 if (ev_count > 0);
927 {
823 { /* hooray! - we can grab the image! */ 928 /* hooray! - we can grab the image! */
824 gc = XCreateGC (dpy, root, 0, NULL); 929 gc = XCreateGC (dpy, root, 0, NULL);
825 if (gc) 930 if (gc)
826 { 931 {
827 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 932 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
828 success = true; 933 success = true;
829 } 934 }
830 } 935 }
936
831 XDestroyWindow (dpy, src); 937 XDestroyWindow (dpy, src);
832 XUngrabServer (dpy); 938 XUngrabServer (dpy);
833 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 939 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
834 } 940 }
835 941
840 } 946 }
841 else 947 else
842 result |= transpPmapTiled; 948 result |= transpPmapTiled;
843 } 949 }
844 else 950 else
951 {
845 {/* strightforward pixmap copy */ 952 /* strightforward pixmap copy */
846 gcv.tile = root_pixmap; 953 gcv.tile = root_pixmap;
847 gcv.fill_style = FillTiled; 954 gcv.fill_style = FillTiled;
848 955
849 while (sx < 0) sx += (int)window_width; 956 while (sx < 0) sx += (int)root_width;
850 while (sy < 0) sy += (int)window_height; 957 while (sy < 0) sy += (int)root_height;
851 958
852 gcv.ts_x_origin = -sx; 959 gcv.ts_x_origin = -sx;
853 gcv.ts_y_origin = -sy; 960 gcv.ts_y_origin = -sy;
854 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 961 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
855 962
861 } 968 }
862 TIMING_TEST_PRINT_RESULT (tp); 969 TIMING_TEST_PRINT_RESULT (tp);
863 970
864 if (tiled_root_pmap != None) 971 if (tiled_root_pmap != None)
865 { 972 {
866 if (!need_client_side_rendering ()) 973 if (!need_client_side_rendering ())
867 { 974 {
868 if ((flags & tintNeeded)) 975 if ((flags & tintNeeded))
869 { 976 {
870 if (flags & tintWholesome) 977 if (flags & tintWholesome)
871 { 978 {
872 /* In this case we can tint image server-side getting significant 979 /* In this case we can tint image server-side getting significant
873 * performance improvements, as we eliminate XImage transfer 980 * performance improvements, as we eliminate XImage transfer
898 { 1005 {
899 c.r = (c.r * shade) / 100; 1006 c.r = (c.r * shade) / 100;
900 c.g = (c.g * shade) / 100; 1007 c.g = (c.g * shade) / 100;
901 c.b = (c.b * shade) / 100; 1008 c.b = (c.b * shade) / 100;
902 } 1009 }
903 else if( shade > 100 && shade < 200) 1010 else if (shade > 100 && shade < 200)
904 { 1011 {
905 c.r = (c.r * (200 - shade)) / 100; 1012 c.r = (c.r * (200 - shade)) / 100;
906 c.g = (c.g * (200 - shade)) / 100; 1013 c.g = (c.g * (200 - shade)) / 100;
907 c.b = (c.b * (200 - shade)) / 100; 1014 c.b = (c.b * (200 - shade)) / 100;
908 } 1015 }
914 pf.direct.greenMask = 0xff; 1021 pf.direct.greenMask = 0xff;
915 pf.direct.blueMask = 0xff; 1022 pf.direct.blueMask = 0xff;
916 pf.direct.alphaMask = 0xff; 1023 pf.direct.alphaMask = 0xff;
917 1024
918 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 1025 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
919 (PictFormatType| 1026 (PictFormatType|
920 PictFormatDepth| 1027 PictFormatDepth|
921 PictFormatRedMask| 1028 PictFormatRedMask|
922 PictFormatGreenMask| 1029 PictFormatGreenMask|
923 PictFormatBlueMask| 1030 PictFormatBlueMask|
924 PictFormatAlphaMask), 1031 PictFormatAlphaMask),
925 &pf, 1032 &pf,
926 0); 1033 0);
927 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 1034 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
928 XRenderPictureAttributes pa ; 1035 XRenderPictureAttributes pa ;
929 1036
930 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa); 1037 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
931 1038
933 1040
934 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1041 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
935 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1042 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
936 XFreePixmap (dpy, overlay_pmap); 1043 XFreePixmap (dpy, overlay_pmap);
937 1044
938 pa.component_alpha = True; 1045 pa.component_alpha = True;
939 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1046 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
940 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1047 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
941 XFreePixmap (dpy, mask_pmap); 1048 XFreePixmap (dpy, mask_pmap);
942 1049
943 if (mask_pic && overlay_pic && back_pic) 1050 if (mask_pic && overlay_pic && back_pic)
945 XRenderColor mask_c; 1052 XRenderColor mask_c;
946 1053
947 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1054 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
948 mask_c.alpha = 0xffff; 1055 mask_c.alpha = 0xffff;
949 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1056 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
950 memset (&mask_c, 0x0, sizeof (mask_c)); 1057
951 mask_c.alpha = 0; 1058 mask_c.alpha = 0;
952 1059 mask_c.red = 0xffff - c.r;
953 if (c.r == c.b && c.b == c.g) /* pure shading */ 1060 mask_c.green = 0xffff - c.g;
954 { 1061 mask_c.blue = 0xffff - c.b;
955 mask_c.red = mask_c.green = mask_c.blue = 0xffff - c.r;
956 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1062 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
957 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1063 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
958 }
959 else
960 {
961 mask_c.red = 0xffff - c.r;
962 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
963 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
964 mask_c.red = 0;
965 mask_c.green = 0xffff - c.g;
966 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
967 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
968 mask_c.green = 0;
969 mask_c.blue = 0xffff - c.b;
970 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
971 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
972 }
973 result |= transpPmapTinted; 1064 result |= transpPmapTinted;
974 } 1065 }
1066
975 XRenderFreePicture (dpy, mask_pic); 1067 XRenderFreePicture (dpy, mask_pic);
976 XRenderFreePicture (dpy, overlay_pic); 1068 XRenderFreePicture (dpy, overlay_pic);
977 XRenderFreePicture (dpy, back_pic); 1069 XRenderFreePicture (dpy, back_pic);
978# if DO_TIMING_TEST 1070# if DO_TIMING_TEST
979 XSync (dpy, False); 1071 XSync (dpy, False);
980# endif 1072# endif
981# endif 1073# endif
982 } 1074 }
983 } 1075 }
984 } /* server side rendering completed */ 1076 } /* server side rendering completed */
985 1077
989 pixmap = tiled_root_pmap; 1081 pixmap = tiled_root_pmap;
990 pmap_width = window_width; 1082 pmap_width = window_width;
991 pmap_height = window_height; 1083 pmap_height = window_height;
992 pmap_depth = root_depth; 1084 pmap_depth = root_depth;
993 } 1085 }
994 1086
995 if (gc) 1087 if (gc)
996 XFreeGC (dpy, gc); 1088 XFreeGC (dpy, gc);
997 1089
998 TIMING_TEST_PRINT_RESULT (tp); 1090 TIMING_TEST_PRINT_RESULT (tp);
999 1091
1000 return result; 1092 return result;
1001} 1093}
1002 1094
1003bool 1095bool
1004bgPixmap_t::set_root_pixmap () 1096bgPixmap_t::set_root_pixmap ()
1005{ 1097{
1006 Pixmap new_root_pixmap = None;
1007
1008 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1098 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1009 if (new_root_pixmap == None) 1099 if (new_root_pixmap == None)
1010 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1100 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1011 1101
1012 if (new_root_pixmap != root_pixmap) 1102 if (new_root_pixmap != root_pixmap)
1013 { 1103 {
1014 root_pixmap = new_root_pixmap; 1104 root_pixmap = new_root_pixmap;
1015 return true; 1105 return true;
1016 } 1106 }
1107
1017 return false; 1108 return false;
1018} 1109}
1019# endif /* ENABLE_TRANSPARENCY */ 1110# endif /* ENABLE_TRANSPARENCY */
1020 1111
1021# ifndef HAVE_AFTERIMAGE 1112# ifndef HAVE_AFTERIMAGE
1022static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1113static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
1023# endif 1114# endif
1024 1115
1025
1026bool 1116bool
1027bgPixmap_t::render () 1117bgPixmap_t::render ()
1028{ 1118{
1029 unsigned long background_flags = 0; 1119 unsigned long background_flags = 0;
1030 1120
1031 if (target == NULL) 1121 if (target == NULL)
1032 return false; 1122 return false;
1033 1123
1124 TIMING_TEST_START (tp);
1125
1034 invalidate(); 1126 invalidate ();
1035# ifdef ENABLE_TRANSPARENCY 1127# ifdef ENABLE_TRANSPARENCY
1036 if (flags & isTransparent) 1128 if (flags & isTransparent)
1037 { 1129 {
1038 /* we need to re-generate transparency pixmap in that case ! */ 1130 /* we need to re-generate transparency pixmap in that case ! */
1039 background_flags = make_transparency_pixmap (); 1131 background_flags = make_transparency_pixmap ();
1048 XImage *result = NULL; 1140 XImage *result = NULL;
1049# ifdef HAVE_AFTERIMAGE 1141# ifdef HAVE_AFTERIMAGE
1050 if (original_asim 1142 if (original_asim
1051 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1143 || (background_flags & transpTransformations) != (flags & transpTransformations))
1052 { 1144 {
1145 target->init_asv ();
1146
1053 ASImage *background = NULL; 1147 ASImage *background = NULL;
1054 ARGB32 as_tint = TINT_LEAVE_SAME; 1148 ARGB32 as_tint = TINT_LEAVE_SAME;
1055 if (background_flags) 1149 if (background_flags)
1056 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1150 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1057 1151
1058# ifdef ENABLE_TRANSPARENCY 1152# ifdef ENABLE_TRANSPARENCY
1059 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1153 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1060 { 1154 {
1061 ShadingInfo as_shade; 1155 ShadingInfo as_shade;
1068 as_shade.tintColor.green = c.g; 1162 as_shade.tintColor.green = c.g;
1069 as_shade.tintColor.blue = c.b; 1163 as_shade.tintColor.blue = c.b;
1070 1164
1071 as_tint = shading2tint32 (&as_shade); 1165 as_tint = shading2tint32 (&as_shade);
1072 } 1166 }
1167
1073 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 1168 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1074 { 1169 {
1075 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 1170 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1076 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 1171 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1077 100, ASIMAGE_QUALITY_DEFAULT); 1172 100, ASIMAGE_QUALITY_DEFAULT);
1084# endif 1179# endif
1085 1180
1086 if (render_asim (background, as_tint)) 1181 if (render_asim (background, as_tint))
1087 flags = flags & ~isInvalid; 1182 flags = flags & ~isInvalid;
1088 if (background) 1183 if (background)
1089 destroy_asimage (&background); 1184 destroy_asimage (&background);
1090 } 1185 }
1091 else if (background_flags && pmap_depth != target->depth) 1186 else if (background_flags && pmap_depth != target->depth)
1187 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1188
1189# elif !XFT /* our own client-side tinting */
1190
1191 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1192 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1193
1194 if (background_flags && (flags & isInvalid))
1092 { 1195 {
1093 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1196 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1094 } 1197
1095# else /* our own client-side tinting */
1096 if (background_flags && (flags & isInvalid))
1097 {
1098 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1099 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1100 { 1199 {
1101 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1102 if (flags & tintSet) 1201 if (flags & tintSet)
1103 tint.get (c); 1202 tint.get (c);
1104 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1203 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1105 } 1204 }
1106 } 1205 }
1107# endif /* HAVE_AFTERIMAGE */ 1206# endif /* HAVE_AFTERIMAGE */
1108 1207
1109 if (result != NULL) 1208 if (result)
1110 { 1209 {
1111 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211
1112 if (gc) 1212 if (gc)
1113 { 1213 {
1114 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1214 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1115 { 1215 {
1116 XFreePixmap (target->dpy, pixmap); 1216 XFreePixmap (target->dpy, pixmap);
1117 pixmap = None; 1217 pixmap = None;
1118 } 1218 }
1219
1119 if (pixmap == None) 1220 if (pixmap == None)
1120 { 1221 {
1121 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1222 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1122 pmap_width = result->width; 1223 pmap_width = result->width;
1123 pmap_height = result->height; 1224 pmap_height = result->height;
1124 pmap_depth = target->depth; 1225 pmap_depth = target->depth;
1125 } 1226 }
1227
1126 if (pmap_depth != result->depth) 1228 if (pmap_depth != result->depth)
1229 {
1127 { /* Bad Match error will ensue ! stupid X !!!! */ 1230 /* Bad Match error will ensue ! stupid X !!!! */
1128 if( result->depth == 24 && pmap_depth == 32) 1231 if (result->depth == 24 && pmap_depth == 32)
1129 result->depth = 32; 1232 result->depth = 32;
1130 else if( result->depth == 32 && pmap_depth == 24) 1233 else if (result->depth == 32 && pmap_depth == 24)
1131 result->depth = 24; 1234 result->depth = 24;
1132 else 1235 else
1133 { 1236 {
1134 /* TODO: implement image recoding */ 1237 /* TODO: implement image recoding */
1135 } 1238 }
1136 } 1239 }
1240
1137 if (pmap_depth == result->depth) 1241 if (pmap_depth == result->depth)
1138 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1242 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1243
1139 XFreeGC (target->dpy, gc); 1244 XFreeGC (target->dpy, gc);
1140 flags = flags & ~isInvalid; 1245 flags = flags & ~isInvalid;
1141 } 1246 }
1247
1142 XDestroyImage (result); 1248 XDestroyImage (result);
1143 } 1249 }
1144 1250
1145 if (flags & isInvalid) 1251 if (flags & isInvalid)
1146 { 1252 {
1151 } 1257 }
1152 } 1258 }
1153 1259
1154 apply (); 1260 apply ();
1155 1261
1262 XSync (target->dpy, False);
1263 valid_since = ev::now ();
1264
1265 TIMING_TEST_PRINT_RESULT (tp);
1266
1156 return true; 1267 return true;
1157} 1268}
1158 1269
1159bool 1270bool
1160bgPixmap_t::set_target (rxvt_term *new_target) 1271bgPixmap_t::set_target (rxvt_term *new_target)
1161{ 1272{
1162 if (new_target) 1273 if (new_target)
1163 if (target != new_target) 1274 if (target != new_target)
1164 { 1275 {
1166# ifdef ENABLE_TRANSPARENCY 1277# ifdef ENABLE_TRANSPARENCY
1167 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1278 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1168# endif 1279# endif
1169 return true; 1280 return true;
1170 } 1281 }
1282
1171 return false; 1283 return false;
1172} 1284}
1173 1285
1174void 1286void
1175bgPixmap_t::apply() 1287bgPixmap_t::apply ()
1176{ 1288{
1177 if (target) 1289 if (target)
1178 { 1290 {
1179 flags &= ~isVtOrigin; 1291 flags &= ~isVtOrigin;
1292
1180 if (pixmap != None) 1293 if (pixmap != None)
1294 {
1181 { /* set target's background to pixmap */ 1295 /* set target's background to pixmap */
1182# ifdef ENABLE_TRANSPARENCY 1296# ifdef ENABLE_TRANSPARENCY
1183 if (flags & isTransparent) 1297 if (flags & isTransparent)
1184 { 1298 {
1185 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1299 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1186 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1300 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1187# if HAVE_SCROLLBARS 1301
1188 if (target->scrollBar.win) 1302 if (target->scrollBar.win)
1189 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1303 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1190# endif
1191 } 1304 }
1192 else 1305 else
1193# endif 1306# endif
1194 { 1307 {
1195 flags |= isVtOrigin; 1308 flags |= isVtOrigin;
1196 /* force old pixmap dereference in case it was transparent before :*/ 1309 /* force old pixmap dereference in case it was transparent before :*/
1197 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1310 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1198 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1311 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1199 /* do we also need to set scrollbar's background here ? */ 1312 /* do we also need to set scrollbar's background here ? */
1200# if HAVE_SCROLLBARS 1313
1201 if (target->scrollBar.win) 1314 if (target->scrollBar.win)
1202 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1315 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1203# endif
1204 } 1316 }
1205 } 1317 }
1206 else 1318 else
1319 {
1207 { /* set target background to a pixel */ 1320 /* set target background to a pixel */
1208 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1321 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1209 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1322 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1210 /* do we also need to set scrollbar's background here ? */ 1323 /* do we also need to set scrollbar's background here ? */
1211# if HAVE_SCROLLBARS
1212 if (target->scrollBar.win) 1324 if (target->scrollBar.win)
1213 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1325 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1214# endif
1215 } 1326 }
1216 1327
1217 /* don't want Expose on the parent */ 1328 /* don't want Expose on the parent or vt. It is better to use
1329 scr_touch or we get a great deal of flicker otherwise: */
1218 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); 1330 XClearWindow (target->dpy, target->parent[0]);
1219 /* do want Expose on the vt, so we get refreshed properly */
1220 XClearArea (target->dpy, target->vt, 0, 0, 0, 0, True);
1221 1331
1222# if HAVE_SCROLLBARS
1223 if (target->scrollBar.win) 1332 if (target->scrollBar.win)
1224 { 1333 {
1225 target->scrollBar.setIdle (); 1334 target->scrollBar.state = STATE_IDLE;
1226 target->scrollbar_show (0); 1335 target->scrollBar.show (0);
1227 } 1336 }
1228# endif
1229 }
1230}
1231 1337
1338 target->want_refresh = 1;
1339 flags |= hasChanged;
1340 }
1341}
1342
1232#endif /* HAVE_BG_PIXMAP */ 1343#endif /* HAVE_BG_PIXMAP */
1233 1344
1234#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1345#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1235/* taken from aterm-0.4.2 */ 1346/* taken from aterm-0.4.2 */
1236 1347
1237typedef uint32_t RUINT32T; 1348typedef uint32_t RUINT32T;
1238 1349
1239static void 1350static void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines