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.25 by root, Sat Jan 19 00:21:59 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 {
327 { 373 {
328 while (*ops == ':' || isspace(*ops)) ++ops; 374 while (*ops == ':' || isspace(*ops)) ++ops;
329# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 375# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0)
330 if (CHECK_GEOM_OPS("tile")) 376 if (CHECK_GEOM_OPS("tile"))
331 { 377 {
332 w = h = 0; 378 w = h = noScale;
333 geom_flags |= WidthValue|HeightValue; 379 geom_flags |= WidthValue|HeightValue;
334 } 380 }
335 else if (CHECK_GEOM_OPS("propscale")) 381 else if (CHECK_GEOM_OPS("propscale"))
336 { 382 {
337 if (w == 0 && h == 0) 383 if (w == 0 && h == 0)
338 { 384 {
339 w = 100; 385 w = windowScale;
340 geom_flags |= WidthValue; 386 geom_flags |= WidthValue;
341 } 387 }
342 new_flags |= propScale; 388 new_flags |= propScale;
343 } 389 }
344 else if (CHECK_GEOM_OPS("hscale")) 390 else if (CHECK_GEOM_OPS("hscale"))
345 { 391 {
346 if (w == 0) 392 if (w == 0)
347 w = 100; 393 w = windowScale;
348 h = 0; 394 h = noScale;
349 geom_flags |= WidthValue|HeightValue; 395 geom_flags |= WidthValue|HeightValue;
350 } 396 }
351 else if (CHECK_GEOM_OPS("vscale")) 397 else if (CHECK_GEOM_OPS("vscale"))
352 { 398 {
353 if (h == 0) 399 if (h == 0)
354 h = 100; 400 h = windowScale;
355 w = 0; 401 w = noScale;
356 geom_flags |= WidthValue|HeightValue; 402 geom_flags |= WidthValue|HeightValue;
357 } 403 }
358 else if (CHECK_GEOM_OPS("scale")) 404 else if (CHECK_GEOM_OPS("scale"))
359 { 405 {
360 if (h == 0) 406 if (h == 0)
361 h = 100; 407 h = windowScale;
362 if (w == 0) 408 if (w == 0)
363 w = 100; 409 w = windowScale;
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 {
414 w = h = windowScale;
415 x = y = centerAlign;
416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
417 }
418 else if (CHECK_GEOM_OPS("root"))
419 {
368 w = h = 100; 420 w = h = noScale;
369 x = y = 50; 421 x = y = rootAlign;
370 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue|XValue|YValue;
371 } 423 }
372# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
373 while (*ops != ':' && *ops != '\0') ++ops; 425 while (*ops != ':' && *ops != '\0') ++ops;
374 } /* done parsing ops */ 426 } /* done parsing ops */
387 if (new_flags != flags) 439 if (new_flags != flags)
388 { 440 {
389 flags = new_flags; 441 flags = new_flags;
390 changed++; 442 changed++;
391 } 443 }
392//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 444//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
393// flags, h_scale, v_scale, h_align, v_align); 445// flags, h_scale, v_scale, h_align, v_align);
394 return (changed > 0); 446 return (changed > 0);
395} 447}
396 448
397# ifdef HAVE_AFTERIMAGE 449# ifdef HAVE_AFTERIMAGE
413 465
414 TIMING_TEST_START (asim); 466 TIMING_TEST_START (asim);
415 467
416 if (original_asim) 468 if (original_asim)
417 { 469 {
470 if (h_align == rootAlign || v_align == rootAlign)
471 {
472 target->get_window_origin(x, y);
473 x = -x;
474 y = -y;
475 }
476
477 if (h_align != rootAlign)
418 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 478 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
479
480 if (v_align != rootAlign)
419 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 481 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
420 } 482 }
421 483
422 if (original_asim == NULL 484 if (!original_asim
423 || x >= target_width 485 || x >= target_width
424 || y >= target_height 486 || y >= target_height
425 || (w > 0 && x + w <= 0) 487 || (w > 0 && x + w <= 0)
426 || (h > 0 && y + h <= 0)) 488 || (h > 0 && y + h <= 0))
427 { 489 {
428 if (background) 490 if (background)
429 { 491 {
430 new_pmap_width = background->width; 492 new_pmap_width = background->width;
431 new_pmap_height = background->height; 493 new_pmap_height = background->height;
432 result = background; 494 result = background;
495
433 if (background_tint != TINT_LEAVE_SAME) 496 if (background_tint != TINT_LEAVE_SAME)
434 { 497 {
435 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 498 ASImage* tmp = tile_asimage (target->asv, background, 0, 0,
436 target_width, target_height, background_tint, 499 target_width, target_height, background_tint,
437 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 500 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
443 new_pmap_width = new_pmap_height = 0; 506 new_pmap_width = new_pmap_height = 0;
444 } 507 }
445 else 508 else
446 { 509 {
447 result = original_asim; 510 result = original_asim;
511
448 if ((w > 0 && w != original_asim->width) 512 if ((w > 0 && w != original_asim->width)
449 || (h > 0 && h != original_asim->height)) 513 || (h > 0 && h != original_asim->height))
450 { 514 {
451 result = scale_asimage (target->asv, original_asim, 515 result = scale_asimage (target->asv, original_asim,
452 w > 0 ? w : original_asim->width, 516 w > 0 ? w : original_asim->width,
453 h > 0 ? h : original_asim->height, 517 h > 0 ? h : original_asim->height,
454 background ? ASA_ASImage : ASA_XImage, 518 background ? ASA_ASImage : ASA_XImage,
455 100, ASIMAGE_QUALITY_DEFAULT); 519 100, ASIMAGE_QUALITY_DEFAULT);
456 } 520 }
521
457 if (background == NULL) 522 if (background == NULL)
523 {
458 {/* if tiling - pixmap has to be sized exactly as the image */ 524 /* if tiling - pixmap has to be sized exactly as the image,
525 but there is no need to make it bigger than the window! */
459 if (h_scale == 0) 526 if (h_scale == 0)
460 new_pmap_width = result->width; 527 new_pmap_width = min (result->width, target_width);
461 if (v_scale == 0) 528 if (v_scale == 0)
462 new_pmap_height = result->height; 529 new_pmap_height = min (result->height, target_height);
463 /* we also need to tile our image in one or both directions */ 530 /* we also need to tile our image in one or both directions */
464 if (h_scale == 0 || v_scale == 0) 531 if (h_scale == 0 || v_scale == 0)
465 { 532 {
466 ASImage *tmp = tile_asimage (target->asv, result, 533 ASImage *tmp = tile_asimage (target->asv, result,
467 (h_scale > 0) ? 0 : (int)result->width - x, 534 (h_scale > 0) ? 0 : (int)result->width - x,
468 (v_scale > 0) ? 0 : (int)result->height - y, 535 (v_scale > 0) ? 0 : (int)result->height - y,
536 new_pmap_width,
469 result->width, result->height, 537 new_pmap_height,
470 TINT_LEAVE_SAME, ASA_XImage, 538 TINT_LEAVE_SAME, ASA_XImage,
471 100, ASIMAGE_QUALITY_DEFAULT); 539 100, ASIMAGE_QUALITY_DEFAULT);
472 if (tmp) 540 if (tmp)
473 { 541 {
474 if (result != original_asim) 542 if (result != original_asim)
475 destroy_asimage (&result); 543 destroy_asimage (&result);
544
476 result = tmp; 545 result = tmp;
477 } 546 }
478 } 547 }
479 } 548 }
480 else 549 else
550 {
481 {/* if blending background and image - pixmap has to be sized same as target window */ 551 /* if blending background and image - pixmap has to be sized same as target window */
482 ASImageLayer *layers = create_image_layers (2); 552 ASImageLayer *layers = create_image_layers (2);
483 ASImage *merged_im = NULL; 553 ASImage *merged_im = NULL;
484 554
485 layers[0].im = background; 555 layers[0].im = background;
486 layers[0].clip_width = target_width; 556 layers[0].clip_width = target_width;
487 layers[0].clip_height = target_height; 557 layers[0].clip_height = target_height;
488 layers[0].tint = background_tint; 558 layers[0].tint = background_tint;
489 layers[1].im = result; 559 layers[1].im = result;
560
490 if (w <= 0) 561 if (w <= 0)
562 {
491 {/* tile horizontally */ 563 /* tile horizontally */
492 while (x > 0) x -= (int)result->width; 564 while (x > 0) x -= (int)result->width;
493 layers[1].dst_x = x; 565 layers[1].dst_x = x;
494 layers[1].clip_width = result->width+target_width; 566 layers[1].clip_width = result->width+target_width;
495 } 567 }
496 else 568 else
569 {
497 {/* clip horizontally */ 570 /* clip horizontally */
498 layers[1].dst_x = x; 571 layers[1].dst_x = x;
499 layers[1].clip_width = result->width; 572 layers[1].clip_width = result->width;
500 } 573 }
574
501 if (h <= 0) 575 if (h <= 0)
502 { 576 {
503 while (y > 0) y -= (int)result->height; 577 while (y > 0) y -= (int)result->height;
504 layers[1].dst_y = y; 578 layers[1].dst_y = y;
505 layers[1].clip_height = result->height + target_height; 579 layers[1].clip_height = result->height + target_height;
507 else 581 else
508 { 582 {
509 layers[1].dst_y = y; 583 layers[1].dst_y = y;
510 layers[1].clip_height = result->height; 584 layers[1].clip_height = result->height;
511 } 585 }
586
512 if (target->rs[Rs_blendtype]) 587 if (target->rs[Rs_blendtype])
513 { 588 {
514 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 589 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
515 if (layers[1].merge_scanlines == NULL) 590 if (layers[1].merge_scanlines == NULL)
516 layers[1].merge_scanlines = alphablend_scanlines; 591 layers[1].merge_scanlines = alphablend_scanlines;
517 } 592 }
593
518 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 594 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
519 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 595 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
596
520 if (tmp) 597 if (tmp)
521 { 598 {
522 if (result != original_asim) 599 if (result != original_asim)
523 destroy_asimage (&result); 600 destroy_asimage (&result);
601
524 result = tmp; 602 result = tmp;
525 } 603 }
604
526 free (layers); 605 free (layers);
527 } 606 }
528 } 607 }
529 TIMING_TEST_PRINT_RESULT (asim); 608 TIMING_TEST_PRINT_RESULT (asim);
530 609
575 } 654 }
576 655
577 /* put result on pixmap */ 656 /* put result on pixmap */
578 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 657 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); 658 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
580 659
581 if (result != background && result != original_asim) 660 if (result != background && result != original_asim)
582 destroy_asimage (&result); 661 destroy_asimage (&result);
583 662
584 XFreeGC (target->dpy, gc); 663 XFreeGC (target->dpy, gc);
585 TIMING_TEST_PRINT_RESULT (asim); 664 TIMING_TEST_PRINT_RESULT (asim);
592bool 671bool
593bgPixmap_t::set_file (const char *file) 672bgPixmap_t::set_file (const char *file)
594{ 673{
595 char *f; 674 char *f;
596 675
597 assert (file != NULL); 676 assert (file);
598 677
599 if (*file != '\0') 678 if (*file)
600 { 679 {
601# ifdef HAVE_AFTERIMAGE 680# ifdef HAVE_AFTERIMAGE
602 if (target->asimman == NULL) 681 if (target->asimman == NULL)
603 target->asimman = create_generic_imageman (target->rs[Rs_path]); 682 target->asimman = create_generic_imageman (target->rs[Rs_path]);
683
604 if ((f = strchr (file, ';')) == NULL) 684 if ((f = strchr (file, ';')) == NULL)
605 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 685 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
606 else 686 else
607 { 687 {
608 size_t len = f - file; 688 size_t len = f - file;
609 f = (char *)malloc (len + 1); 689 f = (char *)malloc (len + 1);
610 strncpy (f, file, len); 690 memcpy (f, file, len);
611 f[len] = '\0'; 691 f[len] = '\0';
612 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 692 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
613 free (f); 693 free (f);
614 } 694 }
695
615 return (original_asim != NULL); 696 return original_asim;
616# endif 697# endif
617 } 698 }
699
618 return false; 700 return false;
619} 701}
620 702
621# endif /* BG_IMAGE_FROM_FILE */ 703# endif /* BG_IMAGE_FROM_FILE */
622 704
623# ifdef ENABLE_TRANSPARENCY 705# ifdef ENABLE_TRANSPARENCY
624bool 706bool
625bgPixmap_t::set_transparent () 707bgPixmap_t::set_transparent ()
626{ 708{
627 if (!(flags & isTransparent)) 709 if (!(flags & isTransparent))
628 { 710 {
629 flags |= isTransparent; 711 flags |= isTransparent;
630 return true; 712 return true;
631 } 713 }
714
632 return false; 715 return false;
633} 716}
634 717
635bool 718bool
636bgPixmap_t::set_blur_radius (const char *geom) 719bgPixmap_t::set_blur_radius (const char *geom)
654 if (v_blurRadius != vr) 737 if (v_blurRadius != vr)
655 { 738 {
656 ++changed; 739 ++changed;
657 v_blurRadius = vr; 740 v_blurRadius = vr;
658 } 741 }
659 742
660 if (v_blurRadius == 0 && h_blurRadius == 0) 743 if (v_blurRadius == 0 && h_blurRadius == 0)
661 flags &= ~blurNeeded; 744 flags &= ~blurNeeded;
662 else 745 else
663 flags |= blurNeeded; 746 flags |= blurNeeded;
664 747
691 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 774 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
692 { 775 {
693 flags |= bgPixmap_t::tintNeeded; 776 flags |= bgPixmap_t::tintNeeded;
694 } 777 }
695 } 778 }
696 779
697 if (flags & bgPixmap_t::tintNeeded) 780 if (flags & bgPixmap_t::tintNeeded)
698 { 781 {
699 if (flags & bgPixmap_t::tintWholesome) 782 if (flags & bgPixmap_t::tintWholesome)
700 flags |= bgPixmap_t::tintServerSide; 783 flags |= bgPixmap_t::tintServerSide;
701 else 784 else
717 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 800 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
718 tint = new_tint; 801 tint = new_tint;
719 flags = (flags & ~tintFlags) | new_flags | tintSet; 802 flags = (flags & ~tintFlags) | new_flags | tintSet;
720 return true; 803 return true;
721 } 804 }
805
722 return false; 806 return false;
723} 807}
724 808
725bool 809bool
726bgPixmap_t::unset_tint () 810bgPixmap_t::unset_tint ()
730 if (new_flags != (flags & tintFlags)) 814 if (new_flags != (flags & tintFlags))
731 { 815 {
732 flags = (flags&~tintFlags)|new_flags; 816 flags = (flags&~tintFlags)|new_flags;
733 return true; 817 return true;
734 } 818 }
819
735 return false; 820 return false;
736} 821}
737 822
738bool 823bool
739bgPixmap_t::set_shade (const char *shade_str) 824bgPixmap_t::set_shade (const char *shade_str)
740{ 825{
741 int new_shade = (shade_str) ? atoi (shade_str) : 0; 826 int new_shade = (shade_str) ? atoi (shade_str) : 0;
742 827
828 if (new_shade < 0 && new_shade > -100)
829 new_shade = 200 - (100 + new_shade);
743 if (new_shade == 100) 830 else if (new_shade == 100)
744 new_shade = 0; 831 new_shade = 0;
745 832
746 if (new_shade != shade) 833 if (new_shade != shade)
747 { 834 {
748 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 835 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
749 shade = new_shade; 836 shade = new_shade;
750 flags = (flags & (~tintFlags | tintSet)) | new_flags; 837 flags = (flags & (~tintFlags | tintSet)) | new_flags;
751 return true; 838 return true;
752 } 839 }
840
753 return false; 841 return false;
754} 842}
755 843
756/* make_transparency_pixmap() 844/* make_transparency_pixmap()
757 * Builds a pixmap sized the same as terminal window, with depth same as the root window 845 * 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 846 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
759 * our window. 847 * our window.
760 */ 848 */
761unsigned long 849unsigned long
762bgPixmap_t::make_transparency_pixmap () 850bgPixmap_t::make_transparency_pixmap ()
763{ 851{
787 if (sx + window_width <= 0 || sy + window_height <= 0 875 if (sx + window_width <= 0 || sy + window_height <= 0
788 || sx >= root_width || sy >= root_height) 876 || sx >= root_width || sy >= root_height)
789 return 0; 877 return 0;
790 878
791 if (root_pixmap != None) 879 if (root_pixmap != None)
880 {
792 {/* we want to validate the pixmap and get it's size at the same time : */ 881 /* we want to validate the pixmap and get it's size at the same time : */
793 int junk; 882 int junk;
794 unsigned int ujunk; 883 unsigned int ujunk;
795 /* root pixmap may be bad - allow a error */ 884 /* root pixmap may be bad - allow a error */
796 target->allowedxerror = -1; 885 target->allowedxerror = -1;
797 886
806 895
807 if (tiled_root_pmap == None) /* something really bad happened - abort */ 896 if (tiled_root_pmap == None) /* something really bad happened - abort */
808 return 0; 897 return 0;
809 898
810 if (root_pixmap == None) 899 if (root_pixmap == None)
900 {
811 { /* use tricks to obtain the root background image :*/ 901 /* use tricks to obtain the root background image :*/
812 /* we want to create Overrideredirect window overlapping out window 902 /* we want to create Overrideredirect window overlapping out window
813 with background type of Parent Relative and then grab it */ 903 with background type of Parent Relative and then grab it */
814 XSetWindowAttributes attr; 904 XSetWindowAttributes attr;
815 Window src; 905 Window src;
816 bool success = false; 906 bool success = false;
831 XGrabServer (dpy); 921 XGrabServer (dpy);
832 XMapRaised (dpy, src); 922 XMapRaised (dpy, src);
833 XSync (dpy, False); 923 XSync (dpy, False);
834 924
835 /* XSync should get window where it's properly exposed, 925 /* 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 : */ 926 * but to be on the safe side - let's check for the actual event to arrive : */
837 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 927 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
838 ++ev_count; 928 ++ev_count;
839 929
840 if (ev_count > 0); 930 if (ev_count > 0);
931 {
841 { /* hooray! - we can grab the image! */ 932 /* hooray! - we can grab the image! */
842 gc = XCreateGC (dpy, root, 0, NULL); 933 gc = XCreateGC (dpy, root, 0, NULL);
843 if (gc) 934 if (gc)
844 { 935 {
845 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 936 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
846 success = true; 937 success = true;
847 } 938 }
848 } 939 }
940
849 XDestroyWindow (dpy, src); 941 XDestroyWindow (dpy, src);
850 XUngrabServer (dpy); 942 XUngrabServer (dpy);
851 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 943 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
852 } 944 }
853 945
858 } 950 }
859 else 951 else
860 result |= transpPmapTiled; 952 result |= transpPmapTiled;
861 } 953 }
862 else 954 else
955 {
863 {/* strightforward pixmap copy */ 956 /* strightforward pixmap copy */
864 gcv.tile = root_pixmap; 957 gcv.tile = root_pixmap;
865 gcv.fill_style = FillTiled; 958 gcv.fill_style = FillTiled;
866 959
867 while (sx < 0) sx += (int)window_width; 960 while (sx < 0) sx += (int)root_width;
868 while (sy < 0) sy += (int)window_height; 961 while (sy < 0) sy += (int)root_height;
869 962
870 gcv.ts_x_origin = -sx; 963 gcv.ts_x_origin = -sx;
871 gcv.ts_y_origin = -sy; 964 gcv.ts_y_origin = -sy;
872 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 965 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
873 966
879 } 972 }
880 TIMING_TEST_PRINT_RESULT (tp); 973 TIMING_TEST_PRINT_RESULT (tp);
881 974
882 if (tiled_root_pmap != None) 975 if (tiled_root_pmap != None)
883 { 976 {
884 if (!need_client_side_rendering ()) 977 if (!need_client_side_rendering ())
885 { 978 {
886 if ((flags & tintNeeded)) 979 if ((flags & tintNeeded))
887 { 980 {
888 if (flags & tintWholesome) 981 if (flags & tintWholesome)
889 { 982 {
890 /* In this case we can tint image server-side getting significant 983 /* In this case we can tint image server-side getting significant
891 * performance improvements, as we eliminate XImage transfer 984 * performance improvements, as we eliminate XImage transfer
916 { 1009 {
917 c.r = (c.r * shade) / 100; 1010 c.r = (c.r * shade) / 100;
918 c.g = (c.g * shade) / 100; 1011 c.g = (c.g * shade) / 100;
919 c.b = (c.b * shade) / 100; 1012 c.b = (c.b * shade) / 100;
920 } 1013 }
921 else if( shade > 100 && shade < 200) 1014 else if (shade > 100 && shade < 200)
922 { 1015 {
923 c.r = (c.r * (200 - shade)) / 100; 1016 c.r = (c.r * (200 - shade)) / 100;
924 c.g = (c.g * (200 - shade)) / 100; 1017 c.g = (c.g * (200 - shade)) / 100;
925 c.b = (c.b * (200 - shade)) / 100; 1018 c.b = (c.b * (200 - shade)) / 100;
926 } 1019 }
932 pf.direct.greenMask = 0xff; 1025 pf.direct.greenMask = 0xff;
933 pf.direct.blueMask = 0xff; 1026 pf.direct.blueMask = 0xff;
934 pf.direct.alphaMask = 0xff; 1027 pf.direct.alphaMask = 0xff;
935 1028
936 XRenderPictFormat *solid_format = XRenderFindFormat (dpy, 1029 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
937 (PictFormatType| 1030 (PictFormatType|
938 PictFormatDepth| 1031 PictFormatDepth|
939 PictFormatRedMask| 1032 PictFormatRedMask|
940 PictFormatGreenMask| 1033 PictFormatGreenMask|
941 PictFormatBlueMask| 1034 PictFormatBlueMask|
942 PictFormatAlphaMask), 1035 PictFormatAlphaMask),
943 &pf, 1036 &pf,
944 0); 1037 0);
945 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen))); 1038 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
946 XRenderPictureAttributes pa ; 1039 XRenderPictureAttributes pa ;
947 1040
948 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa); 1041 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
949 1042
951 1044
952 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1045 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
953 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1046 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
954 XFreePixmap (dpy, overlay_pmap); 1047 XFreePixmap (dpy, overlay_pmap);
955 1048
956 pa.component_alpha = True; 1049 pa.component_alpha = True;
957 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32); 1050 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
958 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1051 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
959 XFreePixmap (dpy, mask_pmap); 1052 XFreePixmap (dpy, mask_pmap);
960 1053
961 if (mask_pic && overlay_pic && back_pic) 1054 if (mask_pic && overlay_pic && back_pic)
972 mask_c.blue = 0xffff - c.b; 1065 mask_c.blue = 0xffff - c.b;
973 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1066 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); 1067 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
975 result |= transpPmapTinted; 1068 result |= transpPmapTinted;
976 } 1069 }
1070
977 XRenderFreePicture (dpy, mask_pic); 1071 XRenderFreePicture (dpy, mask_pic);
978 XRenderFreePicture (dpy, overlay_pic); 1072 XRenderFreePicture (dpy, overlay_pic);
979 XRenderFreePicture (dpy, back_pic); 1073 XRenderFreePicture (dpy, back_pic);
980# if DO_TIMING_TEST 1074# if DO_TIMING_TEST
981 XSync (dpy, False); 1075 XSync (dpy, False);
982# endif 1076# endif
983# endif 1077# endif
984 } 1078 }
985 } 1079 }
986 } /* server side rendering completed */ 1080 } /* server side rendering completed */
987 1081
991 pixmap = tiled_root_pmap; 1085 pixmap = tiled_root_pmap;
992 pmap_width = window_width; 1086 pmap_width = window_width;
993 pmap_height = window_height; 1087 pmap_height = window_height;
994 pmap_depth = root_depth; 1088 pmap_depth = root_depth;
995 } 1089 }
996 1090
997 if (gc) 1091 if (gc)
998 XFreeGC (dpy, gc); 1092 XFreeGC (dpy, gc);
999 1093
1000 TIMING_TEST_PRINT_RESULT (tp); 1094 TIMING_TEST_PRINT_RESULT (tp);
1001 1095
1002 return result; 1096 return result;
1003} 1097}
1004 1098
1005bool 1099bool
1006bgPixmap_t::set_root_pixmap () 1100bgPixmap_t::set_root_pixmap ()
1007{ 1101{
1008 Pixmap new_root_pixmap = None;
1009
1010 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1102 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1011 if (new_root_pixmap == None) 1103 if (new_root_pixmap == None)
1012 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1104 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1013 1105
1014 if (new_root_pixmap != root_pixmap) 1106 if (new_root_pixmap != root_pixmap)
1015 { 1107 {
1016 root_pixmap = new_root_pixmap; 1108 root_pixmap = new_root_pixmap;
1017 return true; 1109 return true;
1018 } 1110 }
1111
1019 return false; 1112 return false;
1020} 1113}
1021# endif /* ENABLE_TRANSPARENCY */ 1114# endif /* ENABLE_TRANSPARENCY */
1022 1115
1023# ifndef HAVE_AFTERIMAGE 1116# ifndef HAVE_AFTERIMAGE
1024static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1117static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm);
1025# endif 1118# endif
1026
1027 1119
1028bool 1120bool
1029bgPixmap_t::render () 1121bgPixmap_t::render ()
1030{ 1122{
1031 unsigned long background_flags = 0; 1123 unsigned long background_flags = 0;
1094 } 1186 }
1095 else if (background_flags && pmap_depth != target->depth) 1187 else if (background_flags && pmap_depth != target->depth)
1096 { 1188 {
1097 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1189 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1098 } 1190 }
1191
1099# else /* our own client-side tinting */ 1192# elif !XFT /* our own client-side tinting */
1193
1194 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1195 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1196
1100 if (background_flags && (flags & isInvalid)) 1197 if (background_flags && (flags & isInvalid))
1101 { 1198 {
1102 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1199 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1103 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1200 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1104 { 1201 {
1108 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1205 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1109 } 1206 }
1110 } 1207 }
1111# endif /* HAVE_AFTERIMAGE */ 1208# endif /* HAVE_AFTERIMAGE */
1112 1209
1113 if (result != NULL) 1210 if (result)
1114 { 1211 {
1115 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1212 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1213
1116 if (gc) 1214 if (gc)
1117 { 1215 {
1118 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1216 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1119 { 1217 {
1120 XFreePixmap (target->dpy, pixmap); 1218 XFreePixmap (target->dpy, pixmap);
1121 pixmap = None; 1219 pixmap = None;
1122 } 1220 }
1221
1123 if (pixmap == None) 1222 if (pixmap == None)
1124 { 1223 {
1125 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);
1126 pmap_width = result->width; 1225 pmap_width = result->width;
1127 pmap_height = result->height; 1226 pmap_height = result->height;
1128 pmap_depth = target->depth; 1227 pmap_depth = target->depth;
1129 } 1228 }
1229
1130 if (pmap_depth != result->depth) 1230 if (pmap_depth != result->depth)
1231 {
1131 { /* Bad Match error will ensue ! stupid X !!!! */ 1232 /* Bad Match error will ensue ! stupid X !!!! */
1132 if( result->depth == 24 && pmap_depth == 32) 1233 if (result->depth == 24 && pmap_depth == 32)
1133 result->depth = 32; 1234 result->depth = 32;
1134 else if( result->depth == 32 && pmap_depth == 24) 1235 else if (result->depth == 32 && pmap_depth == 24)
1135 result->depth = 24; 1236 result->depth = 24;
1136 else 1237 else
1137 { 1238 {
1138 /* TODO: implement image recoding */ 1239 /* TODO: implement image recoding */
1139 } 1240 }
1140 } 1241 }
1242
1141 if (pmap_depth == result->depth) 1243 if (pmap_depth == result->depth)
1142 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
1143 XFreeGC (target->dpy, gc); 1246 XFreeGC (target->dpy, gc);
1144 flags = flags & ~isInvalid; 1247 flags = flags & ~isInvalid;
1145 } 1248 }
1249
1146 XDestroyImage (result); 1250 XDestroyImage (result);
1147 } 1251 }
1148 1252
1149 if (flags & isInvalid) 1253 if (flags & isInvalid)
1150 { 1254 {
1155 } 1259 }
1156 } 1260 }
1157 1261
1158 apply (); 1262 apply ();
1159 1263
1264 XSync (target->dpy, False);
1265 valid_since = ev::now ();
1266
1160 TIMING_TEST_PRINT_RESULT (tp); 1267 TIMING_TEST_PRINT_RESULT (tp);
1161 1268
1162 return true; 1269 return true;
1163} 1270}
1164 1271
1165bool 1272bool
1166bgPixmap_t::set_target (rxvt_term *new_target) 1273bgPixmap_t::set_target (rxvt_term *new_target)
1167{ 1274{
1168 if (new_target) 1275 if (new_target)
1169 if (target != new_target) 1276 if (target != new_target)
1170 { 1277 {
1176 } 1283 }
1177 return false; 1284 return false;
1178} 1285}
1179 1286
1180void 1287void
1181bgPixmap_t::apply() 1288bgPixmap_t::apply ()
1182{ 1289{
1183 if (target) 1290 if (target)
1184 { 1291 {
1185 flags &= ~isVtOrigin; 1292 flags &= ~isVtOrigin;
1186 if (pixmap != None) 1293 if (pixmap != None)
1294 {
1187 { /* set target's background to pixmap */ 1295 /* set target's background to pixmap */
1188# ifdef ENABLE_TRANSPARENCY 1296# ifdef ENABLE_TRANSPARENCY
1189 if (flags & isTransparent) 1297 if (flags & isTransparent)
1190 { 1298 {
1191 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1299 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1192 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1300 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1208 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1316 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1209# endif 1317# endif
1210 } 1318 }
1211 } 1319 }
1212 else 1320 else
1321 {
1213 { /* set target background to a pixel */ 1322 /* set target background to a pixel */
1214 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1323 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1215 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1324 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1216 /* do we also need to set scrollbar's background here ? */ 1325 /* do we also need to set scrollbar's background here ? */
1217# if HAVE_SCROLLBARS 1326# if HAVE_SCROLLBARS
1218 if (target->scrollBar.win) 1327 if (target->scrollBar.win)
1219 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1328 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1220# endif 1329# endif
1221 } 1330 }
1222 1331 /* don't want Expose on the parent or vt. It is better to use
1223 /* don't want Expose on the parent */ 1332 scr_touch or we get a great deal of flicker otherwise: */
1224 XClearArea (target->dpy, target->parent[0], 0, 0, 0, 0, False); 1333 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 1334
1228# if HAVE_SCROLLBARS 1335# if HAVE_SCROLLBARS
1229 if (target->scrollBar.win) 1336 if (target->scrollBar.win)
1230 { 1337 {
1231 target->scrollBar.setIdle (); 1338 target->scrollBar.setIdle ();
1232 target->scrollbar_show (0); 1339 target->scrollbar_show (0);
1233 } 1340 }
1234# endif 1341# endif
1235 }
1236}
1237 1342
1343 target->want_refresh = 1;
1344 flags |= hasChanged;
1345 }
1346}
1347
1238#endif /* HAVE_BG_PIXMAP */ 1348#endif /* HAVE_BG_PIXMAP */
1239 1349
1240#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) 1350#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT
1241/* taken from aterm-0.4.2 */ 1351/* taken from aterm-0.4.2 */
1242 1352
1243typedef uint32_t RUINT32T; 1353typedef uint32_t RUINT32T;
1244 1354
1245static void 1355static void

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines