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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines