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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines