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.45 by sf-exg, Sun Aug 29 16:10:42 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
94bgPixmap_t::bgPixmap_t ()
95{
96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs
98#ifdef HAVE_AFTERIMAGE
99 original_asim = NULL;
100#endif
101#ifdef BG_IMAGE_FROM_FILE
102 h_scale = v_scale = 0;
103 h_align = v_align = 0;
104#endif
105 flags = 0;
106 pixmap = None;
107 valid_since = invalid_since = 0;
108 target = 0;
109}
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}
122
92bool 123bool
93bgPixmap_t::window_size_sensitive () 124bgPixmap_t::window_size_sensitive ()
94{ 125{
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 126# ifdef ENABLE_TRANSPARENCY
106 if (flags & isTransparent) 127 if (flags & isTransparent)
107 return true; 128 return true;
108# 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
109 return false; 142 return false;
110} 143}
111 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
112bool bgPixmap_t::need_client_side_rendering () 166bool bgPixmap_t::need_client_side_rendering ()
113{ 167{
114# ifdef HAVE_AFTERIMAGE 168# ifdef HAVE_AFTERIMAGE
115 if (original_asim != NULL) 169 if (original_asim)
116 return true; 170 return true;
117# endif 171# endif
118# ifdef ENABLE_TRANSPARENCY 172# ifdef ENABLE_TRANSPARENCY
119 if (flags & isTransparent) 173 if (flags & isTransparent)
120 { 174 {
175# ifdef HAVE_AFTERIMAGE // can't blur without libAI anyways
121 if (((flags & blurNeeded) && !(flags & blurServerSide)) 176 if ((flags & blurNeeded) && !(flags & blurServerSide))
177 return true;
178# endif
122 || ((flags & tintNeeded) && !(flags & tintServerSide))) 179 if ((flags & tintNeeded) && !(flags & tintServerSide))
123 return true; 180 return true;
124 } 181 }
125# endif 182# endif
126 return false; 183 return false;
127} 184}
128 185
129# ifdef XPM_BACKGROUND 186# ifdef BG_IMAGE_FROM_FILE
130static inline bool 187static inline bool
131check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value) 188check_set_scale_value (int geom_flags, int flag, unsigned int &scale, unsigned int new_value)
132{ 189{
133 if (geom_flags & flag) 190 if (geom_flags & flag)
134 { 191 {
146static inline bool 203static inline bool
147check_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)
148{ 205{
149 if (geom_flags & flag) 206 if (geom_flags & flag)
150 { 207 {
208 if (new_value != bgPixmap_t::rootAlign)
209 {
151 if (new_value < -100) 210 if (new_value < -100)
152 new_value = -100; 211 new_value = -100;
153 else if (new_value > 200) 212 else if (new_value > 200)
154 new_value = 200; 213 new_value = 200;
214 }
155 if (new_value != align) 215 if (new_value != align)
156 { 216 {
157 align = new_value; 217 align = new_value;
158 return true; 218 return true;
159 } 219 }
203 int geom_flags = 0, changed = 0; 263 int geom_flags = 0, changed = 0;
204 int x = 0, y = 0; 264 int x = 0, y = 0;
205 unsigned int w = 0, h = 0; 265 unsigned int w = 0, h = 0;
206 unsigned int n; 266 unsigned int n;
207 unsigned long new_flags = (flags & (~geometryFlags)); 267 unsigned long new_flags = (flags & (~geometryFlags));
208 char *p; 268 const char *p;
209# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 269# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
210 270
211 if (geom == NULL) 271 if (geom == NULL)
212 return false; 272 return false;
213 273
214 char str[MAXLEN_GEOM]; 274 char str[MAXLEN_GEOM];
221 if (n < MAXLEN_GEOM) 281 if (n < MAXLEN_GEOM)
222 { 282 {
223 char *ops; 283 char *ops;
224 new_flags |= geometrySet; 284 new_flags |= geometrySet;
225 285
226 strncpy (str, geom, n); 286 memcpy (str, geom, n);
227 str[n] = '\0'; 287 str[n] = '\0';
228 if (str[0] == ':') 288 if (str[0] == ':')
229 ops = &str[0]; 289 ops = &str[0];
230 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 290 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
231 ops = &str[0]; 291 ops = &str[0];
251 y = x; 311 y = x;
252 geom_flags |= YValue; 312 geom_flags |= YValue;
253 } 313 }
254 314
255 if (flags & geometrySet) 315 if (flags & geometrySet)
316 {
256 {/* new geometry is an adjustment to the old one ! */ 317 /* new geometry is an adjustment to the old one ! */
257 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 318 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
258 { 319 {
259 if (w == 0 && h != 0) 320 if (w == 0 && h != 0)
260 { 321 {
261 w = h_scale; 322 w = h_scale;
277 } 338 }
278 } 339 }
279 else /* setting up geometry from scratch */ 340 else /* setting up geometry from scratch */
280 { 341 {
281 if (!(geom_flags & XValue)) 342 if (!(geom_flags & XValue))
343 {
282 {/* use default geometry - centered */ 344 /* use default geometry - centered */
283 x = y = defaultAlign; 345 x = y = defaultAlign;
284 } 346 }
285 else if (!(geom_flags & YValue)) 347 else if (!(geom_flags & YValue))
286 y = x; 348 y = x;
287 349
288 if ((geom_flags & (WidthValue|HeightValue)) == 0) 350 if ((geom_flags & (WidthValue|HeightValue)) == 0)
351 {
289 {/* use default geometry - scaled */ 352 /* use default geometry - scaled */
290 w = h = defaultScale; 353 w = h = defaultScale;
291 } 354 }
292 else if (geom_flags & WidthValue) 355 else if (geom_flags & WidthValue)
293 { 356 {
294 if (!(geom_flags & HeightValue)) 357 if (!(geom_flags & HeightValue))
297 else 360 else
298 w = h; 361 w = h;
299 } 362 }
300 } /* done parsing geometry string */ 363 } /* done parsing geometry string */
301 else if (!(flags & geometrySet)) 364 else if (!(flags & geometrySet))
365 {
302 { /* default geometry - scaled and centered */ 366 /* default geometry - scaled and centered */
303 x = y = defaultAlign; 367 x = y = defaultAlign;
304 w = h = defaultScale; 368 w = h = defaultScale;
305 } 369 }
306 370
307 if (!(flags & geometrySet)) 371 if (!(flags & geometrySet))
308 geom_flags |= WidthValue|HeightValue|XValue|YValue; 372 geom_flags |= WidthValue|HeightValue|XValue|YValue;
309 373
310 if (ops) 374 if (ops)
311 { 375 {
312 while (*ops) 376 while (*ops)
313 { 377 {
314 while (*ops == ':' || isspace(*ops)) ++ops; 378 while (*ops == ':' || isspace(*ops)) ++ops;
379
315# 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)
316 if (CHECK_GEOM_OPS("tile")) 381 if (CHECK_GEOM_OPS ("tile"))
317 { 382 {
318 w = h = 0; 383 w = h = noScale;
319 geom_flags |= WidthValue|HeightValue; 384 geom_flags |= WidthValue|HeightValue;
320 } 385 }
321 else if (CHECK_GEOM_OPS("propscale")) 386 else if (CHECK_GEOM_OPS ("propscale"))
322 { 387 {
323 if (w == 0 && h == 0) 388 if (w == 0 && h == 0)
324 { 389 {
325 w = 100; 390 w = windowScale;
326 geom_flags |= WidthValue; 391 geom_flags |= WidthValue;
327 } 392 }
328 new_flags |= propScale; 393 new_flags |= propScale;
329 } 394 }
330 else if (CHECK_GEOM_OPS("hscale")) 395 else if (CHECK_GEOM_OPS ("hscale"))
331 { 396 {
332 if (w == 0) 397 if (w == 0) w = windowScale;
333 w = 100; 398
334 h = 0; 399 h = noScale;
335 geom_flags |= WidthValue|HeightValue; 400 geom_flags |= WidthValue|HeightValue;
336 } 401 }
337 else if (CHECK_GEOM_OPS("vscale")) 402 else if (CHECK_GEOM_OPS ("vscale"))
338 { 403 {
339 if (h == 0) 404 if (h == 0) h = windowScale;
340 h = 100; 405
341 w = 0; 406 w = noScale;
342 geom_flags |= WidthValue|HeightValue; 407 geom_flags |= WidthValue|HeightValue;
343 } 408 }
344 else if (CHECK_GEOM_OPS("scale")) 409 else if (CHECK_GEOM_OPS ("scale"))
345 { 410 {
346 if (h == 0) 411 if (h == 0) h = windowScale;
347 h = 100;
348 if (w == 0) 412 if (w == 0) w = windowScale;
349 w = 100; 413
350 geom_flags |= WidthValue|HeightValue; 414 geom_flags |= WidthValue|HeightValue;
351 } 415 }
352 else if (CHECK_GEOM_OPS("auto")) 416 else if (CHECK_GEOM_OPS ("auto"))
353 { 417 {
354 w = h = 100; 418 w = h = windowScale;
355 x = y = 50; 419 x = y = centerAlign;
356 geom_flags |= WidthValue|HeightValue|XValue|YValue; 420 geom_flags |= WidthValue|HeightValue|XValue|YValue;
357 } 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 }
358# undef CHECK_GEOM_OPS 428# undef CHECK_GEOM_OPS
429
359 while (*ops != ':' && *ops != '\0') ++ops; 430 while (*ops != ':' && *ops != '\0') ++ops;
360 } /* done parsing ops */ 431 } /* done parsing ops */
361 } 432 }
362 433
363 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 434 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)) 435 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)) 436 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)) 437 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
370 ++changed;
371 } 438 }
372 439
373 if (new_flags != flags) 440 if (new_flags != flags)
374 { 441 {
375 flags = new_flags; 442 flags = new_flags;
376 changed++; 443 changed++;
377 } 444 }
445
378//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
379// flags, h_scale, v_scale, h_align, v_align); 447// flags, h_scale, v_scale, h_align, v_align);
380 return (changed > 0); 448 return (changed > 0);
381} 449}
382 450
383# ifdef HAVE_AFTERIMAGE 451# ifdef HAVE_AFTERIMAGE
384bool 452bool
385bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 453bgPixmap_t::render_asim (unsigned long background_flags)
386{ 454{
387 if (target == NULL) 455 if (target == NULL)
388 return false; 456 return false;
389 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
390 int target_width = (int)target->szHint.width; 497 int target_width = target->szHint.width;
391 int target_height = (int)target->szHint.height; 498 int target_height = target->szHint.height;
392 int new_pmap_width = target_width, new_pmap_height = target_height; 499 int new_pmap_width = target_width;
393 ASImage *result = NULL; 500 int new_pmap_height = target_height;
394 501
395 int x = 0; 502 int x = 0;
396 int y = 0; 503 int y = 0;
397 int w = h_scale * target_width / 100; 504 int w = h_scale * target_width / 100;
398 int h = v_scale * target_height / 100; 505 int h = v_scale * target_height / 100;
399 506
400 TIMING_TEST_START (asim); 507 TIMING_TEST_START (asim);
401 508
402 if (original_asim) 509 if (original_asim)
403 { 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)
404 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)
405 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);
406 } 523 }
407 524
408 if (original_asim == NULL 525 if (!original_asim
409 || x >= target_width 526 || x >= target_width
410 || y >= target_height 527 || y >= target_height
411 || (w > 0 && x + w <= 0) 528 || (w > 0 && x + w <= 0)
412 || (h > 0 && y + h <= 0)) 529 || (h > 0 && y + h <= 0))
413 { 530 {
414 if (background) 531 if (background)
415 { 532 {
416 new_pmap_width = background->width; 533 new_pmap_width = background->width;
417 new_pmap_height = background->height; 534 new_pmap_height = background->height;
418 result = background; 535 result = background;
536
419 if (background_tint != TINT_LEAVE_SAME) 537 if (background_tint != TINT_LEAVE_SAME)
420 { 538 {
421 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 539 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
422 target_width, target_height, background_tint, 540 target_width, target_height, background_tint,
423 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 541 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
424 if (tmp) 542 if (tmp)
425 result = tmp; 543 result = tmp;
426 } 544 }
429 new_pmap_width = new_pmap_height = 0; 547 new_pmap_width = new_pmap_height = 0;
430 } 548 }
431 else 549 else
432 { 550 {
433 result = original_asim; 551 result = original_asim;
552
434 if ((w > 0 && w != original_asim->width) 553 if ((w > 0 && w != original_asim->width)
435 || (h > 0 && h != original_asim->height)) 554 || (h > 0 && h != original_asim->height))
436 { 555 {
437 result = scale_asimage (target->asv, original_asim, 556 result = scale_asimage (target->asv, original_asim,
438 w > 0 ? w : original_asim->width, 557 w > 0 ? w : original_asim->width,
439 h > 0 ? h : original_asim->height, 558 h > 0 ? h : original_asim->height,
440 background ? ASA_ASImage : ASA_XImage, 559 background ? ASA_ASImage : ASA_XImage,
441 100, ASIMAGE_QUALITY_DEFAULT); 560 100, ASIMAGE_QUALITY_DEFAULT);
442 } 561 }
562
443 if (background == NULL) 563 if (background == NULL)
564 {
444 {/* 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! */
445 if (h_scale == 0) 567 if (h_scale == 0)
446 new_pmap_width = result->width; 568 new_pmap_width = min (result->width, target_width);
447 if (v_scale == 0) 569 if (v_scale == 0)
448 new_pmap_height = result->height; 570 new_pmap_height = min (result->height, target_height);
449 /* 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 */
450 if (h_scale == 0 || v_scale == 0) 572 if (h_scale == 0 || v_scale == 0)
451 { 573 {
452 ASImage *tmp = tile_asimage (target->asv, result, 574 ASImage *tmp = tile_asimage (target->asv, result,
453 (h_scale > 0) ? 0 : (int)result->width - x, 575 (h_scale > 0) ? 0 : (int)result->width - x,
454 (v_scale > 0) ? 0 : (int)result->height - y, 576 (v_scale > 0) ? 0 : (int)result->height - y,
577 new_pmap_width,
455 result->width, result->height, 578 new_pmap_height,
456 TINT_LEAVE_SAME, ASA_XImage, 579 TINT_LEAVE_SAME, ASA_XImage,
457 100, ASIMAGE_QUALITY_DEFAULT); 580 100, ASIMAGE_QUALITY_DEFAULT);
458 if (tmp) 581 if (tmp)
459 { 582 {
460 if (result != original_asim) 583 if (result != original_asim)
461 destroy_asimage (&result); 584 destroy_asimage (&result);
585
462 result = tmp; 586 result = tmp;
463 } 587 }
464 } 588 }
465 } 589 }
466 else 590 else
591 {
467 {/* 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 */
468 ASImageLayer *layers = create_image_layers (2); 593 ASImageLayer *layers = create_image_layers (2);
469 ASImage *merged_im = NULL;
470 594
471 layers[0].im = background; 595 layers[0].im = background;
472 layers[0].clip_width = target_width; 596 layers[0].clip_width = target_width;
473 layers[0].clip_height = target_height; 597 layers[0].clip_height = target_height;
474 layers[0].tint = background_tint; 598 layers[0].tint = background_tint;
475 layers[1].im = result; 599 layers[1].im = result;
600
476 if (w <= 0) 601 if (w <= 0)
602 {
477 {/* tile horizontally */ 603 /* tile horizontally */
478 while (x > 0) x -= (int)result->width; 604 while (x > 0) x -= (int)result->width;
479 layers[1].dst_x = x; 605 layers[1].dst_x = x;
480 layers[1].clip_width = result->width+target_width; 606 layers[1].clip_width = result->width+target_width;
481 } 607 }
482 else 608 else
609 {
483 {/* clip horizontally */ 610 /* clip horizontally */
484 layers[1].dst_x = x; 611 layers[1].dst_x = x;
485 layers[1].clip_width = result->width; 612 layers[1].clip_width = result->width;
486 } 613 }
614
487 if (h <= 0) 615 if (h <= 0)
488 { 616 {
489 while (y > 0) y -= (int)result->height; 617 while (y > 0) y -= (int)result->height;
490 layers[1].dst_y = y; 618 layers[1].dst_y = y;
491 layers[1].clip_height = result->height + target_height; 619 layers[1].clip_height = result->height + target_height;
493 else 621 else
494 { 622 {
495 layers[1].dst_y = y; 623 layers[1].dst_y = y;
496 layers[1].clip_height = result->height; 624 layers[1].clip_height = result->height;
497 } 625 }
626
498 if (target->rs[Rs_blendtype]) 627 if (target->rs[Rs_blendtype])
499 { 628 {
500 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 629 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
501 if (layers[1].merge_scanlines == NULL) 630 if (layers[1].merge_scanlines == NULL)
502 layers[1].merge_scanlines = alphablend_scanlines; 631 layers[1].merge_scanlines = alphablend_scanlines;
503 } 632 }
633
504 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,
505 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 635 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
636
506 if (tmp) 637 if (tmp)
507 { 638 {
508 if (result != original_asim) 639 if (result != original_asim)
509 destroy_asimage (&result); 640 destroy_asimage (&result);
641
510 result = tmp; 642 result = tmp;
511 } 643 }
644
512 free (layers); 645 free (layers);
513 } 646 }
514 } 647 }
515 TIMING_TEST_PRINT_RESULT (asim); 648 TIMING_TEST_PRINT_RESULT (asim);
516 649
545 678
546 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;
547 int dst_width = result->width, dst_height = result->height; 680 int dst_width = result->width, dst_height = result->height;
548 if (background == NULL) 681 if (background == NULL)
549 { 682 {
550 if (h_scale > 0)
551 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 );
552 if (v_scale > 0)
553 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);
554 685
555 if (dst_x > 0 || dst_y > 0 686 if (dst_x > 0 || dst_y > 0
556 || dst_x + dst_width < new_pmap_width 687 || dst_x + dst_width < new_pmap_width
557 || dst_y + dst_height < new_pmap_height) 688 || dst_y + dst_height < new_pmap_height)
558 {
559 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);
560 }
561 } 690 }
562 691
563 /* put result on pixmap */ 692 /* put result on pixmap */
564 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 693 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); 694 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
566 695
567 if (result != background && result != original_asim) 696 if (result != background && result != original_asim)
568 destroy_asimage (&result); 697 destroy_asimage (&result);
569 698
570 XFreeGC (target->dpy, gc); 699 XFreeGC (target->dpy, gc);
571 TIMING_TEST_PRINT_RESULT (asim); 700 TIMING_TEST_PRINT_RESULT (asim);
572 } 701 }
573 702
703 if (background)
704 destroy_asimage (&background);
705
574 return true; 706 return true;
575} 707}
576# endif /* HAVE_AFTERIMAGE */ 708# endif /* HAVE_AFTERIMAGE */
577 709
578bool 710bool
579bgPixmap_t::set_file (const char *file) 711bgPixmap_t::set_file (const char *file)
580{ 712{
581 char *f;
582
583 assert (file != NULL); 713 assert (file);
584 714
585 if (*file != '\0') 715 if (*file)
586 { 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
587# ifdef HAVE_AFTERIMAGE 726# ifdef HAVE_AFTERIMAGE
588 if (target->asimman == NULL) 727 if (!target->asimman)
589 target->asimman = create_generic_imageman (target->rs[Rs_path]); 728 target->asimman = create_generic_imageman (target->rs[Rs_path]);
590 if ((f = strchr (file, ';')) == NULL)
591 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 729 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
592 else
593 {
594 size_t len = f - file;
595 f = (char *)malloc (len + 1);
596 strncpy (f, file, len);
597 f[len] = '\0';
598 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
599 free (f);
600 }
601 return (original_asim != NULL); 730 return original_asim;
602# endif 731# endif
603 } 732 }
733
604 return false; 734 return false;
605} 735}
606 736
607# endif /* XPM_BACKGROUND */ 737# endif /* BG_IMAGE_FROM_FILE */
608 738
609# ifdef ENABLE_TRANSPARENCY 739# ifdef ENABLE_TRANSPARENCY
610bool 740bool
611bgPixmap_t::set_transparent () 741bgPixmap_t::set_transparent ()
612{ 742{
613 if (!(flags & isTransparent)) 743 if (!(flags & isTransparent))
614 { 744 {
615 flags |= isTransparent; 745 flags |= isTransparent;
616 return true; 746 return true;
617 } 747 }
748
618 return false; 749 return false;
619} 750}
620 751
621bool 752bool
622bgPixmap_t::set_blur_radius (const char *geom) 753bgPixmap_t::set_blur_radius (const char *geom)
640 if (v_blurRadius != vr) 771 if (v_blurRadius != vr)
641 { 772 {
642 ++changed; 773 ++changed;
643 v_blurRadius = vr; 774 v_blurRadius = vr;
644 } 775 }
645 776
646 if (v_blurRadius == 0 && h_blurRadius == 0) 777 if (v_blurRadius == 0 && h_blurRadius == 0)
647 flags &= ~blurNeeded; 778 flags &= ~blurNeeded;
648 else 779 else
649 flags |= blurNeeded; 780 flags |= blurNeeded;
650 781
654static inline unsigned long 785static inline unsigned long
655compute_tint_shade_flags (rxvt_color *tint, int shade) 786compute_tint_shade_flags (rxvt_color *tint, int shade)
656{ 787{
657 unsigned long flags = 0; 788 unsigned long flags = 0;
658 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);
659 791
660 if (tint) 792 if (tint)
661 { 793 {
662 tint->get (c); 794 tint->get (c);
663# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 795# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
664 if (IS_COMPONENT_WHOLESOME (c.r) 796 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r)
665 && IS_COMPONENT_WHOLESOME (c.g) 797 && IS_COMPONENT_WHOLESOME (c.g)
666 && IS_COMPONENT_WHOLESOME (c.b)) 798 && IS_COMPONENT_WHOLESOME (c.b))
667 flags |= bgPixmap_t::tintWholesome; 799 flags |= bgPixmap_t::tintWholesome;
668# undef IS_COMPONENT_WHOLESOME 800# undef IS_COMPONENT_WHOLESOME
669 } 801 }
670 802
671 if ((shade > 0 && shade < 100) || (shade > 100 && shade < 200)) 803 if (has_shade)
672 flags |= bgPixmap_t::tintNeeded; 804 flags |= bgPixmap_t::tintNeeded;
673 else if (tint) 805 else if (tint)
674 { 806 {
675 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 807 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
676 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 808 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
677 { 809 {
678 flags |= bgPixmap_t::tintNeeded; 810 flags |= bgPixmap_t::tintNeeded;
679 } 811 }
680 } 812 }
681 813
682 if (flags & bgPixmap_t::tintNeeded) 814 if (flags & bgPixmap_t::tintNeeded)
683 { 815 {
684 if (flags & bgPixmap_t::tintWholesome) 816 if (flags & bgPixmap_t::tintWholesome)
685 flags |= bgPixmap_t::tintServerSide; 817 flags |= bgPixmap_t::tintServerSide;
818 else
819 {
686#if XFT 820#if XFT
687 flags |= bgPixmap_t::tintServerSide; 821 flags |= bgPixmap_t::tintServerSide;
688#endif 822#endif
823 }
689 } 824 }
690 825
691 return flags; 826 return flags;
692} 827}
693 828
699 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 834 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
700 tint = new_tint; 835 tint = new_tint;
701 flags = (flags & ~tintFlags) | new_flags | tintSet; 836 flags = (flags & ~tintFlags) | new_flags | tintSet;
702 return true; 837 return true;
703 } 838 }
839
704 return false; 840 return false;
705} 841}
706 842
707bool 843bool
708bgPixmap_t::unset_tint () 844bgPixmap_t::unset_tint ()
712 if (new_flags != (flags & tintFlags)) 848 if (new_flags != (flags & tintFlags))
713 { 849 {
714 flags = (flags&~tintFlags)|new_flags; 850 flags = (flags&~tintFlags)|new_flags;
715 return true; 851 return true;
716 } 852 }
853
717 return false; 854 return false;
718} 855}
719 856
720bool 857bool
721bgPixmap_t::set_shade (const char *shade_str) 858bgPixmap_t::set_shade (const char *shade_str)
722{ 859{
723 int new_shade = (shade_str) ? atoi (shade_str) : 0; 860 int new_shade = (shade_str) ? atoi (shade_str) : 0;
724 861
862 if (new_shade < 0 && new_shade > -100)
863 new_shade = 200 - (100 + new_shade);
725 if (new_shade == 100) 864 else if (new_shade == 100)
726 new_shade = 0; 865 new_shade = 0;
727 866
728 if (new_shade != shade) 867 if (new_shade != shade)
729 { 868 {
730 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);
731 shade = new_shade; 870 shade = new_shade;
732 flags = (flags & ~tintFlags) | new_flags; 871 flags = (flags & (~tintFlags | tintSet)) | new_flags;
733 return true; 872 return true;
734 } 873 }
874
735 return false; 875 return false;
736} 876}
737 877
738/* make_transparency_pixmap() 878/* make_transparency_pixmap()
739 * 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
740 * 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
741 * our window. 881 * our window.
742 */ 882 */
743unsigned long 883unsigned long
744bgPixmap_t::make_transparency_pixmap () 884bgPixmap_t::make_transparency_pixmap ()
745{ 885{
746 unsigned long result = 0; 886 unsigned long result = 0;
747 887
748 if (target == NULL) 888 if (target == NULL)
749 return 0; 889 return 0;
750 890
751 /* 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
752 * be always up-to-date, so let's use it : 892 * be always up-to-date, so let's use it :
753 */ 893 */
754 Window root = target->display->root; 894 Window root = target->display->root;
755 int screen = target->display->screen; 895 int screen = target->display->screen;
756 Display *dpy = target->dpy; 896 Display *dpy = target->dpy;
769 if (sx + window_width <= 0 || sy + window_height <= 0 909 if (sx + window_width <= 0 || sy + window_height <= 0
770 || sx >= root_width || sy >= root_height) 910 || sx >= root_width || sy >= root_height)
771 return 0; 911 return 0;
772 912
773 if (root_pixmap != None) 913 if (root_pixmap != None)
914 {
774 {/* 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 : */
775 int junk; 916 int junk;
776 unsigned int ujunk; 917 unsigned int ujunk;
777 /* root pixmap may be bad - allow a error */ 918 /* root pixmap may be bad - allow a error */
778 target->allowedxerror = -1; 919 target->allowedxerror = -1;
779 920
788 929
789 if (tiled_root_pmap == None) /* something really bad happened - abort */ 930 if (tiled_root_pmap == None) /* something really bad happened - abort */
790 return 0; 931 return 0;
791 932
792 if (root_pixmap == None) 933 if (root_pixmap == None)
934 {
793 { /* use tricks to obtain the root background image :*/ 935 /* use tricks to obtain the root background image :*/
794 /* we want to create Overrideredirect window overlapping out window 936 /* we want to create Overrideredirect window overlapping out window
795 with background type of Parent Relative and then grab it */ 937 with background type of Parent Relative and then grab it */
796 XSetWindowAttributes attr; 938 XSetWindowAttributes attr;
797 Window src; 939 Window src;
798 bool success = false; 940 bool success = false;
813 XGrabServer (dpy); 955 XGrabServer (dpy);
814 XMapRaised (dpy, src); 956 XMapRaised (dpy, src);
815 XSync (dpy, False); 957 XSync (dpy, False);
816 958
817 /* XSync should get window where it's properly exposed, 959 /* 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 : */ 960 * but to be on the safe side - let's check for the actual event to arrive : */
819 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 961 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
820 ++ev_count; 962 ++ev_count;
821 963
822 if (ev_count > 0); 964 if (ev_count > 0);
965 {
823 { /* hooray! - we can grab the image! */ 966 /* hooray! - we can grab the image! */
824 gc = XCreateGC (dpy, root, 0, NULL); 967 gc = XCreateGC (dpy, root, 0, NULL);
825 if (gc) 968 if (gc)
826 { 969 {
827 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);
828 success = true; 971 success = true;
829 } 972 }
830 } 973 }
974
831 XDestroyWindow (dpy, src); 975 XDestroyWindow (dpy, src);
832 XUngrabServer (dpy); 976 XUngrabServer (dpy);
833 //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);
834 } 978 }
835 979
840 } 984 }
841 else 985 else
842 result |= transpPmapTiled; 986 result |= transpPmapTiled;
843 } 987 }
844 else 988 else
989 {
845 {/* strightforward pixmap copy */ 990 /* straightforward pixmap copy */
846 gcv.tile = root_pixmap; 991 gcv.tile = root_pixmap;
847 gcv.fill_style = FillTiled; 992 gcv.fill_style = FillTiled;
848 993
849 while (sx < 0) sx += (int)window_width; 994 while (sx < 0) sx += (int)root_width;
850 while (sy < 0) sy += (int)window_height; 995 while (sy < 0) sy += (int)root_height;
851 996
852 gcv.ts_x_origin = -sx; 997 gcv.ts_x_origin = -sx;
853 gcv.ts_y_origin = -sy; 998 gcv.ts_y_origin = -sy;
854 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 999 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
855 1000
861 } 1006 }
862 TIMING_TEST_PRINT_RESULT (tp); 1007 TIMING_TEST_PRINT_RESULT (tp);
863 1008
864 if (tiled_root_pmap != None) 1009 if (tiled_root_pmap != None)
865 { 1010 {
866 if (!need_client_side_rendering ()) 1011 if (!need_client_side_rendering ())
867 { 1012 {
868 if ((flags & tintNeeded)) 1013 if ((flags & tintNeeded))
869 { 1014 {
870 if (flags & tintWholesome) 1015 if (flags & tintWholesome)
871 { 1016 {
872 /* In this case we can tint image server-side getting significant 1017 /* In this case we can tint image server-side getting significant
873 * performance improvements, as we eliminate XImage transfer 1018 * performance improvements, as we eliminate XImage transfer
898 { 1043 {
899 c.r = (c.r * shade) / 100; 1044 c.r = (c.r * shade) / 100;
900 c.g = (c.g * shade) / 100; 1045 c.g = (c.g * shade) / 100;
901 c.b = (c.b * shade) / 100; 1046 c.b = (c.b * shade) / 100;
902 } 1047 }
903 else if( shade > 100 && shade < 200) 1048 else if (shade > 100 && shade < 200)
904 { 1049 {
905 c.r = (c.r * (200 - shade)) / 100; 1050 c.r = (c.r * (200 - shade)) / 100;
906 c.g = (c.g * (200 - shade)) / 100; 1051 c.g = (c.g * (200 - shade)) / 100;
907 c.b = (c.b * (200 - shade)) / 100; 1052 c.b = (c.b * (200 - shade)) / 100;
908 } 1053 }
914 pf.direct.greenMask = 0xff; 1059 pf.direct.greenMask = 0xff;
915 pf.direct.blueMask = 0xff; 1060 pf.direct.blueMask = 0xff;
916 pf.direct.alphaMask = 0xff; 1061 pf.direct.alphaMask = 0xff;
917 1062
918 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 1063 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
919 (PictFormatType| 1064 (PictFormatType|
920 PictFormatDepth| 1065 PictFormatDepth|
921 PictFormatRedMask| 1066 PictFormatRedMask|
922 PictFormatGreenMask| 1067 PictFormatGreenMask|
923 PictFormatBlueMask| 1068 PictFormatBlueMask|
924 PictFormatAlphaMask), 1069 PictFormatAlphaMask),
925 &pf, 1070 &pf,
926 0); 1071 0);
927 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 1072 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
928 XRenderPictureAttributes pa ; 1073 XRenderPictureAttributes pa ;
929 1074
930 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa); 1075 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
931 1076
933 1078
934 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1079 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
935 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1080 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
936 XFreePixmap (dpy, overlay_pmap); 1081 XFreePixmap (dpy, overlay_pmap);
937 1082
938 pa.component_alpha = True; 1083 pa.component_alpha = True;
939 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1084 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
940 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);
941 XFreePixmap (dpy, mask_pmap); 1086 XFreePixmap (dpy, mask_pmap);
942 1087
943 if (mask_pic && overlay_pic && back_pic) 1088 if (mask_pic && overlay_pic && back_pic)
945 XRenderColor mask_c; 1090 XRenderColor mask_c;
946 1091
947 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1092 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
948 mask_c.alpha = 0xffff; 1093 mask_c.alpha = 0xffff;
949 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1094 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
950 memset (&mask_c, 0x0, sizeof (mask_c)); 1095
951 mask_c.alpha = 0; 1096 mask_c.alpha = 0;
952 1097 mask_c.red = 0xffff - c.r;
953 if (c.r == c.b && c.b == c.g) /* pure shading */ 1098 mask_c.green = 0xffff - c.g;
954 { 1099 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); 1100 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); 1101 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; 1102 result |= transpPmapTinted;
974 } 1103 }
1104
975 XRenderFreePicture (dpy, mask_pic); 1105 XRenderFreePicture (dpy, mask_pic);
976 XRenderFreePicture (dpy, overlay_pic); 1106 XRenderFreePicture (dpy, overlay_pic);
977 XRenderFreePicture (dpy, back_pic); 1107 XRenderFreePicture (dpy, back_pic);
978# if DO_TIMING_TEST 1108# if DO_TIMING_TEST
979 XSync (dpy, False); 1109 XSync (dpy, False);
980# endif 1110# endif
981# endif 1111# endif
982 } 1112 }
983 } 1113 }
984 } /* server side rendering completed */ 1114 } /* server side rendering completed */
985 1115
989 pixmap = tiled_root_pmap; 1119 pixmap = tiled_root_pmap;
990 pmap_width = window_width; 1120 pmap_width = window_width;
991 pmap_height = window_height; 1121 pmap_height = window_height;
992 pmap_depth = root_depth; 1122 pmap_depth = root_depth;
993 } 1123 }
994 1124
995 if (gc) 1125 if (gc)
996 XFreeGC (dpy, gc); 1126 XFreeGC (dpy, gc);
997 1127
998 TIMING_TEST_PRINT_RESULT (tp); 1128 TIMING_TEST_PRINT_RESULT (tp);
999 1129
1000 return result; 1130 return result;
1001} 1131}
1002 1132
1003bool 1133bool
1004bgPixmap_t::set_root_pixmap () 1134bgPixmap_t::set_root_pixmap ()
1005{ 1135{
1006 Pixmap new_root_pixmap = None;
1007
1008 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1136 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1009 if (new_root_pixmap == None) 1137 if (new_root_pixmap == None)
1010 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1138 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1011 1139
1012 if (new_root_pixmap != root_pixmap) 1140 if (new_root_pixmap != root_pixmap)
1013 { 1141 {
1014 root_pixmap = new_root_pixmap; 1142 root_pixmap = new_root_pixmap;
1015 return true; 1143 return true;
1016 } 1144 }
1145
1017 return false; 1146 return false;
1018} 1147}
1019# endif /* ENABLE_TRANSPARENCY */ 1148# endif /* ENABLE_TRANSPARENCY */
1020 1149
1021# ifndef HAVE_AFTERIMAGE 1150# ifndef HAVE_AFTERIMAGE
1022static 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);
1023# endif 1152# endif
1024
1025 1153
1026bool 1154bool
1027bgPixmap_t::render () 1155bgPixmap_t::render ()
1028{ 1156{
1029 unsigned long background_flags = 0; 1157 unsigned long background_flags = 0;
1030 1158
1031 if (target == NULL) 1159 if (target == NULL)
1032 return false; 1160 return false;
1033 1161
1162 TIMING_TEST_START (tp);
1163
1034 invalidate(); 1164 invalidate ();
1035# ifdef ENABLE_TRANSPARENCY 1165# ifdef ENABLE_TRANSPARENCY
1036 if (flags & isTransparent) 1166 if (flags & isTransparent)
1037 { 1167 {
1038 /* we need to re-generate transparency pixmap in that case ! */ 1168 /* we need to re-generate transparency pixmap in that case ! */
1039 background_flags = make_transparency_pixmap (); 1169 background_flags = make_transparency_pixmap ();
1048 XImage *result = NULL; 1178 XImage *result = NULL;
1049# ifdef HAVE_AFTERIMAGE 1179# ifdef HAVE_AFTERIMAGE
1050 if (original_asim 1180 if (original_asim
1051 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1181 || (background_flags & transpTransformations) != (flags & transpTransformations))
1052 { 1182 {
1053 ASImage *background = NULL;
1054 ARGB32 as_tint = TINT_LEAVE_SAME;
1055 if (background_flags)
1056 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1057
1058# ifdef ENABLE_TRANSPARENCY
1059 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1060 {
1061 ShadingInfo as_shade;
1062 as_shade.shading = (shade == 0) ? 100 : shade;
1063
1064 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1065 if (flags & tintSet)
1066 tint.get (c);
1067 as_shade.tintColor.red = c.r;
1068 as_shade.tintColor.green = c.g;
1069 as_shade.tintColor.blue = c.b;
1070
1071 as_tint = shading2tint32 (&as_shade);
1072 }
1073 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1074 {
1075 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,
1077 100, ASIMAGE_QUALITY_DEFAULT);
1078 if (tmp)
1079 {
1080 destroy_asimage (&background);
1081 background = tmp;
1082 }
1083 }
1084# endif
1085
1086 if (render_asim (background, as_tint)) 1183 if (render_asim (background_flags))
1087 flags = flags & ~isInvalid; 1184 flags = flags & ~isInvalid;
1088 if (background)
1089 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 necessary 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 }
1216
1217 /* don't want Expose on the parent */
1218 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False);
1219 /* do want Expose on the vt, so we get refreshed properly */
1220 XClearArea (target->dpy, target->vt, 0, 0, 0, 0, True);
1221
1222# if HAVE_SCROLLBARS
1223 if (target->scrollBar.win)
1224 { 1326 }
1225 target->scrollBar.setIdle (); 1327
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: */
1330 XClearWindow (target->dpy, target->parent[0]);
1331
1332 if (target->scrollBar.state && target->scrollBar.win)
1333 {
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
1240ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1351ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1241{ 1352{
1242 int sh_r, sh_g, sh_b; 1353 int sh_r, sh_g, sh_b;
1243 RUINT32T mask_r, mask_g, mask_b; 1354 RUINT32T mask_r, mask_g, mask_b;
1244 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1355 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1245 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1356 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines