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.14 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.36 by sf-exg, Sat Jan 30 20:52:36 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
11 * 8 *
12 * This program is free software; you can redistribute it and/or modify 9 * This program is free software; you can redistribute it and/or modify
13 * it under the terms of the GNU General Public License as published by 10 * it under the terms of the GNU General Public License as published by
14 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
… …
28#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
29 26
30#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
31 28
32#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv;\
35 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
36 34
37#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
… …
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
105void 107void
106bgPixmap_t::destroy () 108bgPixmap_t::destroy ()
107{ 109{
… …
122 return true; 124 return true;
123# endif 125# endif
124 126
125# ifdef BG_IMAGE_FROM_FILE 127# ifdef BG_IMAGE_FROM_FILE
126# ifdef HAVE_AFTERIMAGE 128# ifdef HAVE_AFTERIMAGE
127 if (original_asim != NULL) 129 if (original_asim)
128# endif 130# endif
129 { 131 {
130 if (h_scale != 0 || v_scale != 0 132 if (h_scale != 0 || v_scale != 0
131 || h_align != 0 || v_align != 0) 133 || h_align != 0 || v_align != 0)
132 return true; 134 return true;
… …
144 return true; 146 return true;
145# endif 147# endif
146 148
147# ifdef BG_IMAGE_FROM_FILE 149# ifdef BG_IMAGE_FROM_FILE
148# ifdef HAVE_AFTERIMAGE 150# ifdef HAVE_AFTERIMAGE
149 if (original_asim != NULL) 151 if (original_asim)
150# endif 152# endif
151 { 153 {
152 if (h_align == rootAlign || v_align == rootAlign) 154 if (h_align == rootAlign || v_align == rootAlign)
153 return true; 155 return true;
154 } 156 }
… …
158}; 160};
159 161
160bool bgPixmap_t::need_client_side_rendering () 162bool bgPixmap_t::need_client_side_rendering ()
161{ 163{
162# ifdef HAVE_AFTERIMAGE 164# ifdef HAVE_AFTERIMAGE
163 if (original_asim != NULL) 165 if (original_asim)
164 return true; 166 return true;
165# endif 167# endif
166# ifdef ENABLE_TRANSPARENCY 168# ifdef ENABLE_TRANSPARENCY
167 if (flags & isTransparent) 169 if (flags & isTransparent)
168 { 170 {
… …
257 int geom_flags = 0, changed = 0; 259 int geom_flags = 0, changed = 0;
258 int x = 0, y = 0; 260 int x = 0, y = 0;
259 unsigned int w = 0, h = 0; 261 unsigned int w = 0, h = 0;
260 unsigned int n; 262 unsigned int n;
261 unsigned long new_flags = (flags & (~geometryFlags)); 263 unsigned long new_flags = (flags & (~geometryFlags));
262 char *p; 264 const char *p;
263# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
264 266
265 if (geom == NULL) 267 if (geom == NULL)
266 return false; 268 return false;
267 269
268 char str[MAXLEN_GEOM]; 270 char str[MAXLEN_GEOM];
… …
275 if (n < MAXLEN_GEOM) 277 if (n < MAXLEN_GEOM)
276 { 278 {
277 char *ops; 279 char *ops;
278 new_flags |= geometrySet; 280 new_flags |= geometrySet;
279 281
280 strncpy (str, geom, n); 282 memcpy (str, geom, n);
281 str[n] = '\0'; 283 str[n] = '\0';
282 if (str[0] == ':') 284 if (str[0] == ':')
283 ops = &str[0]; 285 ops = &str[0];
284 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 286 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
285 ops = &str[0]; 287 ops = &str[0];
… …
305 y = x; 307 y = x;
306 geom_flags |= YValue; 308 geom_flags |= YValue;
307 } 309 }
308 310
309 if (flags & geometrySet) 311 if (flags & geometrySet)
312 {
310 {/* new geometry is an adjustment to the old one ! */ 313 /* new geometry is an adjustment to the old one ! */
311 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 314 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
312 { 315 {
313 if (w == 0 && h != 0) 316 if (w == 0 && h != 0)
314 { 317 {
315 w = h_scale; 318 w = h_scale;
… …
331 } 334 }
332 } 335 }
333 else /* setting up geometry from scratch */ 336 else /* setting up geometry from scratch */
334 { 337 {
335 if (!(geom_flags & XValue)) 338 if (!(geom_flags & XValue))
339 {
336 {/* use default geometry - centered */ 340 /* use default geometry - centered */
337 x = y = defaultAlign; 341 x = y = defaultAlign;
338 } 342 }
339 else if (!(geom_flags & YValue)) 343 else if (!(geom_flags & YValue))
340 y = x; 344 y = x;
341 345
342 if ((geom_flags & (WidthValue|HeightValue)) == 0) 346 if ((geom_flags & (WidthValue|HeightValue)) == 0)
347 {
343 {/* use default geometry - scaled */ 348 /* use default geometry - scaled */
344 w = h = defaultScale; 349 w = h = defaultScale;
345 } 350 }
346 else if (geom_flags & WidthValue) 351 else if (geom_flags & WidthValue)
347 { 352 {
348 if (!(geom_flags & HeightValue)) 353 if (!(geom_flags & HeightValue))
… …
351 else 356 else
352 w = h; 357 w = h;
353 } 358 }
354 } /* done parsing geometry string */ 359 } /* done parsing geometry string */
355 else if (!(flags & geometrySet)) 360 else if (!(flags & geometrySet))
361 {
356 { /* default geometry - scaled and centered */ 362 /* default geometry - scaled and centered */
357 x = y = defaultAlign; 363 x = y = defaultAlign;
358 w = h = defaultScale; 364 w = h = defaultScale;
359 } 365 }
360 366
361 if (!(flags & geometrySet)) 367 if (!(flags & geometrySet))
… …
364 if (ops) 370 if (ops)
365 { 371 {
366 while (*ops) 372 while (*ops)
367 { 373 {
368 while (*ops == ':' || isspace(*ops)) ++ops; 374 while (*ops == ':' || isspace(*ops)) ++ops;
375
369# 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)
370 if (CHECK_GEOM_OPS("tile")) 377 if (CHECK_GEOM_OPS ("tile"))
371 { 378 {
372 w = h = noScale; 379 w = h = noScale;
373 geom_flags |= WidthValue|HeightValue; 380 geom_flags |= WidthValue|HeightValue;
374 } 381 }
375 else if (CHECK_GEOM_OPS("propscale")) 382 else if (CHECK_GEOM_OPS ("propscale"))
376 { 383 {
377 if (w == 0 && h == 0) 384 if (w == 0 && h == 0)
378 { 385 {
379 w = windowScale; 386 w = windowScale;
380 geom_flags |= WidthValue; 387 geom_flags |= WidthValue;
381 } 388 }
382 new_flags |= propScale; 389 new_flags |= propScale;
383 } 390 }
384 else if (CHECK_GEOM_OPS("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
385 { 392 {
386 if (w == 0)
387 w = windowScale; 393 if (w == 0) w = windowScale;
394
388 h = noScale; 395 h = noScale;
389 geom_flags |= WidthValue|HeightValue; 396 geom_flags |= WidthValue|HeightValue;
390 } 397 }
391 else if (CHECK_GEOM_OPS("vscale")) 398 else if (CHECK_GEOM_OPS ("vscale"))
392 { 399 {
393 if (h == 0)
394 h = windowScale; 400 if (h == 0) h = windowScale;
401
395 w = noScale; 402 w = noScale;
396 geom_flags |= WidthValue|HeightValue; 403 geom_flags |= WidthValue|HeightValue;
397 } 404 }
398 else if (CHECK_GEOM_OPS("scale")) 405 else if (CHECK_GEOM_OPS ("scale"))
399 { 406 {
400 if (h == 0)
401 h = windowScale; 407 if (h == 0) h = windowScale;
402 if (w == 0)
403 w = windowScale; 408 if (w == 0) w = windowScale;
409
404 geom_flags |= WidthValue|HeightValue; 410 geom_flags |= WidthValue|HeightValue;
405 } 411 }
406 else if (CHECK_GEOM_OPS("auto")) 412 else if (CHECK_GEOM_OPS ("auto"))
407 { 413 {
408 w = h = windowScale; 414 w = h = windowScale;
409 x = y = centerAlign; 415 x = y = centerAlign;
410 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
411 } 417 }
412 else if (CHECK_GEOM_OPS("root")) 418 else if (CHECK_GEOM_OPS ("root"))
413 { 419 {
414 w = h = noScale; 420 w = h = noScale;
415 x = y = rootAlign; 421 x = y = rootAlign;
416 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue|XValue|YValue;
417 } 423 }
418# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
425
419 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
420 } /* done parsing ops */ 427 } /* done parsing ops */
421 } 428 }
422 429
423 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
424 ++changed;
425 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
426 ++changed;
427 if (check_set_align_value (geom_flags, XValue, h_align, x)) 432 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
428 ++changed;
429 if (check_set_align_value (geom_flags, YValue, v_align, y)) 433 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
430 ++changed;
431 } 434 }
432 435
433 if (new_flags != flags) 436 if (new_flags != flags)
434 { 437 {
435 flags = new_flags; 438 flags = new_flags;
436 changed++; 439 changed++;
437 } 440 }
441
438//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
439// flags, h_scale, v_scale, h_align, v_align); 443// flags, h_scale, v_scale, h_align, v_align);
440 return (changed > 0); 444 return (changed > 0);
441} 445}
442 446
443# ifdef HAVE_AFTERIMAGE 447# ifdef HAVE_AFTERIMAGE
… …
445bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
446{ 450{
447 if (target == NULL) 451 if (target == NULL)
448 return false; 452 return false;
449 453
454 target->init_asv ();
455
456 ASImage *result = 0;
457
450 int target_width = (int)target->szHint.width; 458 int target_width = target->szHint.width;
451 int target_height = (int)target->szHint.height; 459 int target_height = target->szHint.height;
452 int new_pmap_width = target_width, new_pmap_height = target_height; 460 int new_pmap_width = target_width;
453 ASImage *result = NULL; 461 int new_pmap_height = target_height;
454 462
455 int x = 0; 463 int x = 0;
456 int y = 0; 464 int y = 0;
457 int w = h_scale * target_width / 100; 465 int w = h_scale * target_width / 100;
458 int h = v_scale * target_height / 100; 466 int h = v_scale * target_height / 100;
… …
465 { 473 {
466 target->get_window_origin(x, y); 474 target->get_window_origin(x, y);
467 x = -x; 475 x = -x;
468 y = -y; 476 y = -y;
469 } 477 }
478
470 if (h_align != rootAlign) 479 if (h_align != rootAlign)
471 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 480 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
481
472 if (v_align != rootAlign) 482 if (v_align != rootAlign)
473 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 483 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
474 } 484 }
475 485
476 if (original_asim == NULL 486 if (!original_asim
477 || x >= target_width 487 || x >= target_width
478 || y >= target_height 488 || y >= target_height
479 || (w > 0 && x + w <= 0) 489 || (w > 0 && x + w <= 0)
480 || (h > 0 && y + h <= 0)) 490 || (h > 0 && y + h <= 0))
481 { 491 {
482 if (background) 492 if (background)
483 { 493 {
484 new_pmap_width = background->width; 494 new_pmap_width = background->width;
485 new_pmap_height = background->height; 495 new_pmap_height = background->height;
486 result = background; 496 result = background;
497
487 if (background_tint != TINT_LEAVE_SAME) 498 if (background_tint != TINT_LEAVE_SAME)
488 { 499 {
489 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 500 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
490 target_width, target_height, background_tint, 501 target_width, target_height, background_tint,
491 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 502 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
492 if (tmp) 503 if (tmp)
493 result = tmp; 504 result = tmp;
494 } 505 }
… …
497 new_pmap_width = new_pmap_height = 0; 508 new_pmap_width = new_pmap_height = 0;
498 } 509 }
499 else 510 else
500 { 511 {
501 result = original_asim; 512 result = original_asim;
513
502 if ((w > 0 && w != original_asim->width) 514 if ((w > 0 && w != original_asim->width)
503 || (h > 0 && h != original_asim->height)) 515 || (h > 0 && h != original_asim->height))
504 { 516 {
505 result = scale_asimage (target->asv, original_asim, 517 result = scale_asimage (target->asv, original_asim,
506 w > 0 ? w : original_asim->width, 518 w > 0 ? w : original_asim->width,
507 h > 0 ? h : original_asim->height, 519 h > 0 ? h : original_asim->height,
508 background ? ASA_ASImage : ASA_XImage, 520 background ? ASA_ASImage : ASA_XImage,
509 100, ASIMAGE_QUALITY_DEFAULT); 521 100, ASIMAGE_QUALITY_DEFAULT);
510 } 522 }
523
511 if (background == NULL) 524 if (background == NULL)
525 {
512 {/* if tiling - pixmap has to be sized exactly as the image, 526 /* if tiling - pixmap has to be sized exactly as the image,
513 but there is no need to make it bigger then the window! */ 527 but there is no need to make it bigger than the window! */
514 if (h_scale == 0) 528 if (h_scale == 0)
515 new_pmap_width = min (result->width, target_width); 529 new_pmap_width = min (result->width, target_width);
516 if (v_scale == 0) 530 if (v_scale == 0)
517 new_pmap_height = min (result->height, target_height); 531 new_pmap_height = min (result->height, target_height);
518 /* we also need to tile our image in one or both directions */ 532 /* we also need to tile our image in one or both directions */
519 if (h_scale == 0 || v_scale == 0) 533 if (h_scale == 0 || v_scale == 0)
520 { 534 {
521 ASImage *tmp = tile_asimage (target->asv, result, 535 ASImage *tmp = tile_asimage (target->asv, result,
522 (h_scale > 0) ? 0 : (int)result->width - x, 536 (h_scale > 0) ? 0 : (int)result->width - x,
523 (v_scale > 0) ? 0 : (int)result->height - y, 537 (v_scale > 0) ? 0 : (int)result->height - y,
524 new_pmap_width, 538 new_pmap_width,
525 new_pmap_height, 539 new_pmap_height,
526 TINT_LEAVE_SAME, ASA_XImage, 540 TINT_LEAVE_SAME, ASA_XImage,
527 100, ASIMAGE_QUALITY_DEFAULT); 541 100, ASIMAGE_QUALITY_DEFAULT);
528 if (tmp) 542 if (tmp)
529 { 543 {
530 if (result != original_asim) 544 if (result != original_asim)
531 destroy_asimage (&result); 545 destroy_asimage (&result);
546
532 result = tmp; 547 result = tmp;
533 } 548 }
534 } 549 }
535 } 550 }
536 else 551 else
552 {
537 {/* if blending background and image - pixmap has to be sized same as target window */ 553 /* if blending background and image - pixmap has to be sized same as target window */
538 ASImageLayer *layers = create_image_layers (2); 554 ASImageLayer *layers = create_image_layers (2);
539 ASImage *merged_im = NULL; 555 ASImage *merged_im = NULL;
540 556
541 layers[0].im = background; 557 layers[0].im = background;
542 layers[0].clip_width = target_width; 558 layers[0].clip_width = target_width;
543 layers[0].clip_height = target_height; 559 layers[0].clip_height = target_height;
544 layers[0].tint = background_tint; 560 layers[0].tint = background_tint;
545 layers[1].im = result; 561 layers[1].im = result;
562
546 if (w <= 0) 563 if (w <= 0)
564 {
547 {/* tile horizontally */ 565 /* tile horizontally */
548 while (x > 0) x -= (int)result->width; 566 while (x > 0) x -= (int)result->width;
549 layers[1].dst_x = x; 567 layers[1].dst_x = x;
550 layers[1].clip_width = result->width+target_width; 568 layers[1].clip_width = result->width+target_width;
551 } 569 }
552 else 570 else
571 {
553 {/* clip horizontally */ 572 /* clip horizontally */
554 layers[1].dst_x = x; 573 layers[1].dst_x = x;
555 layers[1].clip_width = result->width; 574 layers[1].clip_width = result->width;
556 } 575 }
576
557 if (h <= 0) 577 if (h <= 0)
558 { 578 {
559 while (y > 0) y -= (int)result->height; 579 while (y > 0) y -= (int)result->height;
560 layers[1].dst_y = y; 580 layers[1].dst_y = y;
561 layers[1].clip_height = result->height + target_height; 581 layers[1].clip_height = result->height + target_height;
… …
563 else 583 else
564 { 584 {
565 layers[1].dst_y = y; 585 layers[1].dst_y = y;
566 layers[1].clip_height = result->height; 586 layers[1].clip_height = result->height;
567 } 587 }
588
568 if (target->rs[Rs_blendtype]) 589 if (target->rs[Rs_blendtype])
569 { 590 {
570 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 591 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
571 if (layers[1].merge_scanlines == NULL) 592 if (layers[1].merge_scanlines == NULL)
572 layers[1].merge_scanlines = alphablend_scanlines; 593 layers[1].merge_scanlines = alphablend_scanlines;
573 } 594 }
595
574 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 596 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
575 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 597 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
598
576 if (tmp) 599 if (tmp)
577 { 600 {
578 if (result != original_asim) 601 if (result != original_asim)
579 destroy_asimage (&result); 602 destroy_asimage (&result);
603
580 result = tmp; 604 result = tmp;
581 } 605 }
606
582 free (layers); 607 free (layers);
583 } 608 }
584 } 609 }
585 TIMING_TEST_PRINT_RESULT (asim); 610 TIMING_TEST_PRINT_RESULT (asim);
586 611
… …
615 640
616 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 641 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
617 int dst_width = result->width, dst_height = result->height; 642 int dst_width = result->width, dst_height = result->height;
618 if (background == NULL) 643 if (background == NULL)
619 { 644 {
620 if (h_scale > 0)
621 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 645 if (h_scale > 0) src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
622 if (v_scale > 0)
623 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 646 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
624 647
625 if (dst_x > 0 || dst_y > 0 648 if (dst_x > 0 || dst_y > 0
626 || dst_x + dst_width < new_pmap_width 649 || dst_x + dst_width < new_pmap_width
627 || dst_y + dst_height < new_pmap_height) 650 || dst_y + dst_height < new_pmap_height)
628 {
629 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 651 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
630 }
631 } 652 }
632 653
633 /* put result on pixmap */ 654 /* put result on pixmap */
634 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 655 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
635 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 656 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
… …
646# endif /* HAVE_AFTERIMAGE */ 667# endif /* HAVE_AFTERIMAGE */
647 668
648bool 669bool
649bgPixmap_t::set_file (const char *file) 670bgPixmap_t::set_file (const char *file)
650{ 671{
651 char *f;
652
653 assert (file != NULL); 672 assert (file);
654 673
655 if (*file != '\0') 674 if (*file)
656 { 675 {
657# ifdef HAVE_AFTERIMAGE 676# ifdef HAVE_AFTERIMAGE
658 if (target->asimman == NULL) 677 if (!target->asimman)
659 target->asimman = create_generic_imageman (target->rs[Rs_path]); 678 target->asimman = create_generic_imageman (target->rs[Rs_path]);
660 if ((f = strchr (file, ';')) == NULL) 679
661 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 680 if (const char *p = strchr (file, ';'))
662 else
663 { 681 {
664 size_t len = f - file; 682 size_t len = p - file;
665 f = (char *)malloc (len + 1); 683 char *f = (char *)malloc (len + 1);
666 strncpy (f, file, len); 684 memcpy (f, file, len);
667 f[len] = '\0'; 685 f[len] = '\0';
668 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
669 free (f); 687 free (f);
670 } 688 }
689 else
690 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
691
671 return (original_asim != NULL); 692 return original_asim;
672# endif 693# endif
673 } 694 }
695
674 return false; 696 return false;
675} 697}
676 698
677# endif /* BG_IMAGE_FROM_FILE */ 699# endif /* BG_IMAGE_FROM_FILE */
678 700
… …
683 if (!(flags & isTransparent)) 705 if (!(flags & isTransparent))
684 { 706 {
685 flags |= isTransparent; 707 flags |= isTransparent;
686 return true; 708 return true;
687 } 709 }
710
688 return false; 711 return false;
689} 712}
690 713
691bool 714bool
692bgPixmap_t::set_blur_radius (const char *geom) 715bgPixmap_t::set_blur_radius (const char *geom)
… …
773 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 796 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
774 tint = new_tint; 797 tint = new_tint;
775 flags = (flags & ~tintFlags) | new_flags | tintSet; 798 flags = (flags & ~tintFlags) | new_flags | tintSet;
776 return true; 799 return true;
777 } 800 }
801
778 return false; 802 return false;
779} 803}
780 804
781bool 805bool
782bgPixmap_t::unset_tint () 806bgPixmap_t::unset_tint ()
… …
786 if (new_flags != (flags & tintFlags)) 810 if (new_flags != (flags & tintFlags))
787 { 811 {
788 flags = (flags&~tintFlags)|new_flags; 812 flags = (flags&~tintFlags)|new_flags;
789 return true; 813 return true;
790 } 814 }
815
791 return false; 816 return false;
792} 817}
793 818
794bool 819bool
795bgPixmap_t::set_shade (const char *shade_str) 820bgPixmap_t::set_shade (const char *shade_str)
796{ 821{
797 int new_shade = (shade_str) ? atoi (shade_str) : 0; 822 int new_shade = (shade_str) ? atoi (shade_str) : 0;
798 823
799 if (new_shade < 0 && new_shade > -100) 824 if (new_shade < 0 && new_shade > -100)
800 new_shade = 200 - (100 + new_shade); 825 new_shade = 200 - (100 + new_shade);
801 else if (new_shade == 100) 826 else if (new_shade == 100)
802 new_shade = 0; 827 new_shade = 0;
803 828
804 if (new_shade != shade) 829 if (new_shade != shade)
805 { 830 {
806 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 831 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
807 shade = new_shade; 832 shade = new_shade;
808 flags = (flags & (~tintFlags | tintSet)) | new_flags; 833 flags = (flags & (~tintFlags | tintSet)) | new_flags;
809 return true; 834 return true;
810 } 835 }
836
811 return false; 837 return false;
812} 838}
813 839
814/* make_transparency_pixmap() 840/* make_transparency_pixmap()
815 * Builds a pixmap sized the same as terminal window, with depth same as the root window 841 * Builds a pixmap sized the same as terminal window, with depth same as the root window
… …
845 if (sx + window_width <= 0 || sy + window_height <= 0 871 if (sx + window_width <= 0 || sy + window_height <= 0
846 || sx >= root_width || sy >= root_height) 872 || sx >= root_width || sy >= root_height)
847 return 0; 873 return 0;
848 874
849 if (root_pixmap != None) 875 if (root_pixmap != None)
876 {
850 {/* we want to validate the pixmap and get it's size at the same time : */ 877 /* we want to validate the pixmap and get it's size at the same time : */
851 int junk; 878 int junk;
852 unsigned int ujunk; 879 unsigned int ujunk;
853 /* root pixmap may be bad - allow a error */ 880 /* root pixmap may be bad - allow a error */
854 target->allowedxerror = -1; 881 target->allowedxerror = -1;
855 882
… …
864 891
865 if (tiled_root_pmap == None) /* something really bad happened - abort */ 892 if (tiled_root_pmap == None) /* something really bad happened - abort */
866 return 0; 893 return 0;
867 894
868 if (root_pixmap == None) 895 if (root_pixmap == None)
896 {
869 { /* use tricks to obtain the root background image :*/ 897 /* use tricks to obtain the root background image :*/
870 /* we want to create Overrideredirect window overlapping out window 898 /* we want to create Overrideredirect window overlapping out window
871 with background type of Parent Relative and then grab it */ 899 with background type of Parent Relative and then grab it */
872 XSetWindowAttributes attr; 900 XSetWindowAttributes attr;
873 Window src; 901 Window src;
874 bool success = false; 902 bool success = false;
… …
889 XGrabServer (dpy); 917 XGrabServer (dpy);
890 XMapRaised (dpy, src); 918 XMapRaised (dpy, src);
891 XSync (dpy, False); 919 XSync (dpy, False);
892 920
893 /* XSync should get window where it's properly exposed, 921 /* XSync should get window where it's properly exposed,
894 * but to be on the safe side - let's check for the actuall event to arrive : */ 922 * but to be on the safe side - let's check for the actual event to arrive : */
895 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 923 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
896 ++ev_count; 924 ++ev_count;
897 925
898 if (ev_count > 0); 926 if (ev_count > 0);
927 {
899 { /* hooray! - we can grab the image! */ 928 /* hooray! - we can grab the image! */
900 gc = XCreateGC (dpy, root, 0, NULL); 929 gc = XCreateGC (dpy, root, 0, NULL);
901 if (gc) 930 if (gc)
902 { 931 {
903 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 932 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
904 success = true; 933 success = true;
905 } 934 }
906 } 935 }
936
907 XDestroyWindow (dpy, src); 937 XDestroyWindow (dpy, src);
908 XUngrabServer (dpy); 938 XUngrabServer (dpy);
909 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 939 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
910 } 940 }
911 941
… …
916 } 946 }
917 else 947 else
918 result |= transpPmapTiled; 948 result |= transpPmapTiled;
919 } 949 }
920 else 950 else
951 {
921 {/* strightforward pixmap copy */ 952 /* strightforward pixmap copy */
922 gcv.tile = root_pixmap; 953 gcv.tile = root_pixmap;
923 gcv.fill_style = FillTiled; 954 gcv.fill_style = FillTiled;
924 955
925 while (sx < 0) sx += (int)root_width; 956 while (sx < 0) sx += (int)root_width;
926 while (sy < 0) sy += (int)root_height; 957 while (sy < 0) sy += (int)root_height;
… …
974 { 1005 {
975 c.r = (c.r * shade) / 100; 1006 c.r = (c.r * shade) / 100;
976 c.g = (c.g * shade) / 100; 1007 c.g = (c.g * shade) / 100;
977 c.b = (c.b * shade) / 100; 1008 c.b = (c.b * shade) / 100;
978 } 1009 }
979 else if( shade > 100 && shade < 200) 1010 else if (shade > 100 && shade < 200)
980 { 1011 {
981 c.r = (c.r * (200 - shade)) / 100; 1012 c.r = (c.r * (200 - shade)) / 100;
982 c.g = (c.g * (200 - shade)) / 100; 1013 c.g = (c.g * (200 - shade)) / 100;
983 c.b = (c.b * (200 - shade)) / 100; 1014 c.b = (c.b * (200 - shade)) / 100;
984 } 1015 }
… …
1030 mask_c.blue = 0xffff - c.b; 1061 mask_c.blue = 0xffff - c.b;
1031 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1062 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1032 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height); 1063 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1033 result |= transpPmapTinted; 1064 result |= transpPmapTinted;
1034 } 1065 }
1066
1035 XRenderFreePicture (dpy, mask_pic); 1067 XRenderFreePicture (dpy, mask_pic);
1036 XRenderFreePicture (dpy, overlay_pic); 1068 XRenderFreePicture (dpy, overlay_pic);
1037 XRenderFreePicture (dpy, back_pic); 1069 XRenderFreePicture (dpy, back_pic);
1038# if DO_TIMING_TEST 1070# if DO_TIMING_TEST
1039 XSync (dpy, False); 1071 XSync (dpy, False);
… …
1061} 1093}
1062 1094
1063bool 1095bool
1064bgPixmap_t::set_root_pixmap () 1096bgPixmap_t::set_root_pixmap ()
1065{ 1097{
1066 Pixmap new_root_pixmap = None;
1067
1068 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1098 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1069 if (new_root_pixmap == None) 1099 if (new_root_pixmap == None)
1070 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1100 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1071 1101
1072 if (new_root_pixmap != root_pixmap) 1102 if (new_root_pixmap != root_pixmap)
1073 { 1103 {
1074 root_pixmap = new_root_pixmap; 1104 root_pixmap = new_root_pixmap;
1075 return true; 1105 return true;
1076 } 1106 }
1107
1077 return false; 1108 return false;
1078} 1109}
1079# endif /* ENABLE_TRANSPARENCY */ 1110# endif /* ENABLE_TRANSPARENCY */
1080 1111
1081# ifndef HAVE_AFTERIMAGE 1112# ifndef HAVE_AFTERIMAGE
1082static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1113static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1083# endif 1114# endif
1084
1085 1115
1086bool 1116bool
1087bgPixmap_t::render () 1117bgPixmap_t::render ()
1088{ 1118{
1089 unsigned long background_flags = 0; 1119 unsigned long background_flags = 0;
… …
1091 if (target == NULL) 1121 if (target == NULL)
1092 return false; 1122 return false;
1093 1123
1094 TIMING_TEST_START (tp); 1124 TIMING_TEST_START (tp);
1095 1125
1096 invalidate(); 1126 invalidate ();
1097# ifdef ENABLE_TRANSPARENCY 1127# ifdef ENABLE_TRANSPARENCY
1098 if (flags & isTransparent) 1128 if (flags & isTransparent)
1099 { 1129 {
1100 /* we need to re-generate transparency pixmap in that case ! */ 1130 /* we need to re-generate transparency pixmap in that case ! */
1101 background_flags = make_transparency_pixmap (); 1131 background_flags = make_transparency_pixmap ();
… …
1110 XImage *result = NULL; 1140 XImage *result = NULL;
1111# ifdef HAVE_AFTERIMAGE 1141# ifdef HAVE_AFTERIMAGE
1112 if (original_asim 1142 if (original_asim
1113 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1143 || (background_flags & transpTransformations) != (flags & transpTransformations))
1114 { 1144 {
1145 target->init_asv ();
1146
1115 ASImage *background = NULL; 1147 ASImage *background = NULL;
1116 ARGB32 as_tint = TINT_LEAVE_SAME; 1148 ARGB32 as_tint = TINT_LEAVE_SAME;
1117 if (background_flags) 1149 if (background_flags)
1118 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1150 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1119 1151
1120# ifdef ENABLE_TRANSPARENCY 1152# ifdef ENABLE_TRANSPARENCY
1121 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1153 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1122 { 1154 {
1123 ShadingInfo as_shade; 1155 ShadingInfo as_shade;
… …
1130 as_shade.tintColor.green = c.g; 1162 as_shade.tintColor.green = c.g;
1131 as_shade.tintColor.blue = c.b; 1163 as_shade.tintColor.blue = c.b;
1132 1164
1133 as_tint = shading2tint32 (&as_shade); 1165 as_tint = shading2tint32 (&as_shade);
1134 } 1166 }
1167
1135 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 1168 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1136 { 1169 {
1137 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 1170 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1138 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 1171 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1139 100, ASIMAGE_QUALITY_DEFAULT); 1172 100, ASIMAGE_QUALITY_DEFAULT);
1140 if (tmp) 1173 if (tmp)
1141 { 1174 {
1142 destroy_asimage (&background); 1175 destroy_asimage (&background);
… …
1146# endif 1179# endif
1147 1180
1148 if (render_asim (background, as_tint)) 1181 if (render_asim (background, as_tint))
1149 flags = flags & ~isInvalid; 1182 flags = flags & ~isInvalid;
1150 if (background) 1183 if (background)
1151 destroy_asimage (&background); 1184 destroy_asimage (&background);
1152 } 1185 }
1153 else if (background_flags && pmap_depth != target->depth) 1186 else if (background_flags && pmap_depth != target->depth)
1154 {
1155 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1187 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1156 }
1157 1188
1158# elif !XFT /* our own client-side tinting */ 1189# elif !XFT /* our own client-side tinting */
1159 1190
1160 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side. 1191 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1161 This may need to be changed in need_client_side_rendering() logic is altered !!! */ 1192 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1162 1193
1163 if (background_flags && (flags & isInvalid)) 1194 if (background_flags && (flags & isInvalid))
1164 { 1195 {
1165 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1196 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1197
1166 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1167 { 1199 {
1168 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1169 if (flags & tintSet) 1201 if (flags & tintSet)
1170 tint.get (c); 1202 tint.get (c);
1171 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1203 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1172 } 1204 }
1173 } 1205 }
1174# endif /* HAVE_AFTERIMAGE */ 1206# endif /* HAVE_AFTERIMAGE */
1175 1207
1176 if (result != NULL) 1208 if (result)
1177 { 1209 {
1178 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211
1179 if (gc) 1212 if (gc)
1180 { 1213 {
1181 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1214 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1182 { 1215 {
1183 XFreePixmap (target->dpy, pixmap); 1216 XFreePixmap (target->dpy, pixmap);
1184 pixmap = None; 1217 pixmap = None;
1185 } 1218 }
1219
1186 if (pixmap == None) 1220 if (pixmap == None)
1187 { 1221 {
1188 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1222 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1189 pmap_width = result->width; 1223 pmap_width = result->width;
1190 pmap_height = result->height; 1224 pmap_height = result->height;
1191 pmap_depth = target->depth; 1225 pmap_depth = target->depth;
1192 } 1226 }
1227
1193 if (pmap_depth != result->depth) 1228 if (pmap_depth != result->depth)
1229 {
1194 { /* Bad Match error will ensue ! stupid X !!!! */ 1230 /* Bad Match error will ensue ! stupid X !!!! */
1195 if( result->depth == 24 && pmap_depth == 32) 1231 if (result->depth == 24 && pmap_depth == 32)
1196 result->depth = 32; 1232 result->depth = 32;
1197 else if( result->depth == 32 && pmap_depth == 24) 1233 else if (result->depth == 32 && pmap_depth == 24)
1198 result->depth = 24; 1234 result->depth = 24;
1199 else 1235 else
1200 { 1236 {
1201 /* TODO: implement image recoding */ 1237 /* TODO: implement image recoding */
1202 } 1238 }
1203 } 1239 }
1240
1204 if (pmap_depth == result->depth) 1241 if (pmap_depth == result->depth)
1205 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1242 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1243
1206 XFreeGC (target->dpy, gc); 1244 XFreeGC (target->dpy, gc);
1207 flags = flags & ~isInvalid; 1245 flags = flags & ~isInvalid;
1208 } 1246 }
1247
1209 XDestroyImage (result); 1248 XDestroyImage (result);
1210 } 1249 }
1211 1250
1212 if (flags & isInvalid) 1251 if (flags & isInvalid)
1213 { 1252 {
… …
1217 pixmap = None; 1256 pixmap = None;
1218 } 1257 }
1219 } 1258 }
1220 1259
1221 apply (); 1260 apply ();
1261
1262 XSync (target->dpy, False);
1263 valid_since = ev::now ();
1222 1264
1223 TIMING_TEST_PRINT_RESULT (tp); 1265 TIMING_TEST_PRINT_RESULT (tp);
1224 1266
1225 return true; 1267 return true;
1226} 1268}
… …
1235# ifdef ENABLE_TRANSPARENCY 1277# ifdef ENABLE_TRANSPARENCY
1236 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1278 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1237# endif 1279# endif
1238 return true; 1280 return true;
1239 } 1281 }
1282
1240 return false; 1283 return false;
1241} 1284}
1242 1285
1243void 1286void
1244bgPixmap_t::apply() 1287bgPixmap_t::apply ()
1245{ 1288{
1246 if (target) 1289 if (target)
1247 { 1290 {
1248 flags &= ~isVtOrigin; 1291 flags &= ~isVtOrigin;
1292
1249 if (pixmap != None) 1293 if (pixmap != None)
1294 {
1250 { /* set target's background to pixmap */ 1295 /* set target's background to pixmap */
1251# ifdef ENABLE_TRANSPARENCY 1296# ifdef ENABLE_TRANSPARENCY
1252 if (flags & isTransparent) 1297 if (flags & isTransparent)
1253 { 1298 {
1254 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1299 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1255 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1300 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1256# if HAVE_SCROLLBARS 1301
1257 if (target->scrollBar.win) 1302 if (target->scrollBar.win)
1258 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1303 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1259# endif
1260 } 1304 }
1261 else 1305 else
1262# endif 1306# endif
1263 { 1307 {
1264 flags |= isVtOrigin; 1308 flags |= isVtOrigin;
1265 /* force old pixmap dereference in case it was transparent before :*/ 1309 /* force old pixmap dereference in case it was transparent before :*/
1266 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1310 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1267 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1311 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1268 /* do we also need to set scrollbar's background here ? */ 1312 /* do we also need to set scrollbar's background here ? */
1269# if HAVE_SCROLLBARS 1313
1270 if (target->scrollBar.win) 1314 if (target->scrollBar.win)
1271 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1315 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1272# endif
1273 } 1316 }
1274 } 1317 }
1275 else 1318 else
1319 {
1276 { /* set target background to a pixel */ 1320 /* set target background to a pixel */
1277 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1321 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1278 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1322 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1279 /* do we also need to set scrollbar's background here ? */ 1323 /* do we also need to set scrollbar's background here ? */
1280# if HAVE_SCROLLBARS
1281 if (target->scrollBar.win) 1324 if (target->scrollBar.win)
1282 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1325 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1283# endif
1284 } 1326 }
1327
1285 /* don't want Expose on the parent or vt. It is better to use 1328 /* don't want Expose on the parent or vt. It is better to use
1286 scr_touch or we get a great deal of flicker otherwise: */ 1329 scr_touch or we get a great deal of flicker otherwise: */
1287 XClearWindow (target->dpy, target->parent[0]); 1330 XClearWindow (target->dpy, target->parent[0]);
1288 1331
1289# if HAVE_SCROLLBARS 1332 if (target->scrollBar.state && target->scrollBar.win)
1290 if (target->scrollBar.win)
1291 { 1333 {
1292 target->scrollBar.setIdle (); 1334 target->scrollBar.state = STATE_IDLE;
1293 target->scrollbar_show (0); 1335 target->scrollBar.show (0);
1294 } 1336 }
1295# endif
1296 1337
1297 target->want_refresh = 1; 1338 target->want_refresh = 1;
1298 flags |= hasChanged; 1339 flags |= hasChanged;
1299 } 1340 }
1300} 1341}
… …
1305/* taken from aterm-0.4.2 */ 1346/* taken from aterm-0.4.2 */
1306 1347
1307typedef uint32_t RUINT32T; 1348typedef uint32_t RUINT32T;
1308 1349
1309static void 1350static void
1310ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1351ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1311{ 1352{
1312 int sh_r, sh_g, sh_b; 1353 int sh_r, sh_g, sh_b;
1313 RUINT32T mask_r, mask_g, mask_b; 1354 RUINT32T mask_r, mask_g, mask_b;
1314 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1355 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1315 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1356 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines