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