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.12 by ayin, Thu Nov 15 11:36:15 2007 UTC vs.
Revision 1.43 by sf-exg, Sun Aug 29 13:40:42 2010 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines