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.7 by sasha, Fri Oct 26 17:10:48 2007 UTC vs.
Revision 1.44 by sf-exg, Sun Aug 29 15:12:41 2010 UTC

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