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.17 by ayin, Wed Dec 5 08:46:27 2007 UTC vs.
Revision 1.27 by ayin, Sun Jan 27 22:48:33 2008 UTC

… …
25#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
26 26
27#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
28 28
29#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h>
30#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
31 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv;\
32 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
33 34
34#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
… …
86 */ 87 */
87 88
88#ifdef HAVE_BG_PIXMAP 89#ifdef HAVE_BG_PIXMAP
89bgPixmap_t::bgPixmap_t () 90bgPixmap_t::bgPixmap_t ()
90{ 91{
92 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs
91#ifdef HAVE_AFTERIMAGE 94#ifdef HAVE_AFTERIMAGE
92 original_asim = NULL; 95 original_asim = NULL;
93#endif 96#endif
94#ifdef BG_IMAGE_FROM_FILE 97#ifdef BG_IMAGE_FROM_FILE
95 h_scale = v_scale = 0; 98 h_scale = v_scale = 0;
96 h_align = v_align = 0; 99 h_align = v_align = 0;
97#endif 100#endif
98 flags = 0; 101 flags = 0;
99 pixmap = None; 102 pixmap = None;
103 valid_since = invalid_since = 0;
104 target = 0;
100} 105}
101 106
102void 107void
103bgPixmap_t::destroy () 108bgPixmap_t::destroy ()
104{ 109{
… …
119 return true; 124 return true;
120# endif 125# endif
121 126
122# ifdef BG_IMAGE_FROM_FILE 127# ifdef BG_IMAGE_FROM_FILE
123# ifdef HAVE_AFTERIMAGE 128# ifdef HAVE_AFTERIMAGE
124 if (original_asim != NULL) 129 if (original_asim)
125# endif 130# endif
126 { 131 {
127 if (h_scale != 0 || v_scale != 0 132 if (h_scale != 0 || v_scale != 0
128 || h_align != 0 || v_align != 0) 133 || h_align != 0 || v_align != 0)
129 return true; 134 return true;
… …
141 return true; 146 return true;
142# endif 147# endif
143 148
144# ifdef BG_IMAGE_FROM_FILE 149# ifdef BG_IMAGE_FROM_FILE
145# ifdef HAVE_AFTERIMAGE 150# ifdef HAVE_AFTERIMAGE
146 if (original_asim != NULL) 151 if (original_asim)
147# endif 152# endif
148 { 153 {
149 if (h_align == rootAlign || v_align == rootAlign) 154 if (h_align == rootAlign || v_align == rootAlign)
150 return true; 155 return true;
151 } 156 }
… …
155}; 160};
156 161
157bool bgPixmap_t::need_client_side_rendering () 162bool bgPixmap_t::need_client_side_rendering ()
158{ 163{
159# ifdef HAVE_AFTERIMAGE 164# ifdef HAVE_AFTERIMAGE
160 if (original_asim != NULL) 165 if (original_asim)
161 return true; 166 return true;
162# endif 167# endif
163# ifdef ENABLE_TRANSPARENCY 168# ifdef ENABLE_TRANSPARENCY
164 if (flags & isTransparent) 169 if (flags & isTransparent)
165 { 170 {
… …
255 int x = 0, y = 0; 260 int x = 0, y = 0;
256 unsigned int w = 0, h = 0; 261 unsigned int w = 0, h = 0;
257 unsigned int n; 262 unsigned int n;
258 unsigned long new_flags = (flags & (~geometryFlags)); 263 unsigned long new_flags = (flags & (~geometryFlags));
259 char *p; 264 char *p;
260# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
261 266
262 if (geom == NULL) 267 if (geom == NULL)
263 return false; 268 return false;
264 269
265 char str[MAXLEN_GEOM]; 270 char str[MAXLEN_GEOM];
… …
272 if (n < MAXLEN_GEOM) 277 if (n < MAXLEN_GEOM)
273 { 278 {
274 char *ops; 279 char *ops;
275 new_flags |= geometrySet; 280 new_flags |= geometrySet;
276 281
277 strncpy (str, geom, n); 282 memcpy (str, geom, n);
278 str[n] = '\0'; 283 str[n] = '\0';
279 if (str[0] == ':') 284 if (str[0] == ':')
280 ops = &str[0]; 285 ops = &str[0];
281 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 286 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
282 ops = &str[0]; 287 ops = &str[0];
… …
365 if (ops) 370 if (ops)
366 { 371 {
367 while (*ops) 372 while (*ops)
368 { 373 {
369 while (*ops == ':' || isspace(*ops)) ++ops; 374 while (*ops == ':' || isspace(*ops)) ++ops;
375
370# 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)
371 if (CHECK_GEOM_OPS("tile")) 377 if (CHECK_GEOM_OPS ("tile"))
372 { 378 {
373 w = h = noScale; 379 w = h = noScale;
374 geom_flags |= WidthValue|HeightValue; 380 geom_flags |= WidthValue|HeightValue;
375 } 381 }
376 else if (CHECK_GEOM_OPS("propscale")) 382 else if (CHECK_GEOM_OPS ("propscale"))
377 { 383 {
378 if (w == 0 && h == 0) 384 if (w == 0 && h == 0)
379 { 385 {
380 w = windowScale; 386 w = windowScale;
381 geom_flags |= WidthValue; 387 geom_flags |= WidthValue;
382 } 388 }
383 new_flags |= propScale; 389 new_flags |= propScale;
384 } 390 }
385 else if (CHECK_GEOM_OPS("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
386 { 392 {
387 if (w == 0)
388 w = windowScale; 393 if (w == 0) w = windowScale;
394
389 h = noScale; 395 h = noScale;
390 geom_flags |= WidthValue|HeightValue; 396 geom_flags |= WidthValue|HeightValue;
391 } 397 }
392 else if (CHECK_GEOM_OPS("vscale")) 398 else if (CHECK_GEOM_OPS ("vscale"))
393 { 399 {
394 if (h == 0)
395 h = windowScale; 400 if (h == 0) h = windowScale;
401
396 w = noScale; 402 w = noScale;
397 geom_flags |= WidthValue|HeightValue; 403 geom_flags |= WidthValue|HeightValue;
398 } 404 }
399 else if (CHECK_GEOM_OPS("scale")) 405 else if (CHECK_GEOM_OPS ("scale"))
400 { 406 {
401 if (h == 0)
402 h = windowScale; 407 if (h == 0) h = windowScale;
403 if (w == 0)
404 w = windowScale; 408 if (w == 0) w = windowScale;
409
405 geom_flags |= WidthValue|HeightValue; 410 geom_flags |= WidthValue|HeightValue;
406 } 411 }
407 else if (CHECK_GEOM_OPS("auto")) 412 else if (CHECK_GEOM_OPS ("auto"))
408 { 413 {
409 w = h = windowScale; 414 w = h = windowScale;
410 x = y = centerAlign; 415 x = y = centerAlign;
411 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
412 } 417 }
413 else if (CHECK_GEOM_OPS("root")) 418 else if (CHECK_GEOM_OPS ("root"))
414 { 419 {
415 w = h = noScale; 420 w = h = noScale;
416 x = y = rootAlign; 421 x = y = rootAlign;
417 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue|XValue|YValue;
418 } 423 }
419# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
425
420 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
421 } /* done parsing ops */ 427 } /* done parsing ops */
422 } 428 }
423 429
424 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
425 ++changed;
426 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
427 ++changed;
428 if (check_set_align_value (geom_flags, XValue, h_align, x)) 432 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
429 ++changed;
430 if (check_set_align_value (geom_flags, YValue, v_align, y)) 433 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
431 ++changed;
432 } 434 }
433 435
434 if (new_flags != flags) 436 if (new_flags != flags)
435 { 437 {
436 flags = new_flags; 438 flags = new_flags;
437 changed++; 439 changed++;
438 } 440 }
441
439//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
440// flags, h_scale, v_scale, h_align, v_align); 443// flags, h_scale, v_scale, h_align, v_align);
441 return (changed > 0); 444 return (changed > 0);
442} 445}
443 446
444# ifdef HAVE_AFTERIMAGE 447# ifdef HAVE_AFTERIMAGE
… …
466 { 469 {
467 target->get_window_origin(x, y); 470 target->get_window_origin(x, y);
468 x = -x; 471 x = -x;
469 y = -y; 472 y = -y;
470 } 473 }
474
471 if (h_align != rootAlign) 475 if (h_align != rootAlign)
472 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
473 if (v_align != rootAlign) 478 if (v_align != rootAlign)
474 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);
475 } 480 }
476 481
477 if (original_asim == NULL 482 if (!original_asim
478 || x >= target_width 483 || x >= target_width
479 || y >= target_height 484 || y >= target_height
480 || (w > 0 && x + w <= 0) 485 || (w > 0 && x + w <= 0)
481 || (h > 0 && y + h <= 0)) 486 || (h > 0 && y + h <= 0))
482 { 487 {
483 if (background) 488 if (background)
484 { 489 {
485 new_pmap_width = background->width; 490 new_pmap_width = background->width;
486 new_pmap_height = background->height; 491 new_pmap_height = background->height;
487 result = background; 492 result = background;
493
488 if (background_tint != TINT_LEAVE_SAME) 494 if (background_tint != TINT_LEAVE_SAME)
489 { 495 {
490 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 496 ASImage* tmp = tile_asimage (target->asv, background, 0, 0,
491 target_width, target_height, background_tint, 497 target_width, target_height, background_tint,
492 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 498 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
… …
498 new_pmap_width = new_pmap_height = 0; 504 new_pmap_width = new_pmap_height = 0;
499 } 505 }
500 else 506 else
501 { 507 {
502 result = original_asim; 508 result = original_asim;
509
503 if ((w > 0 && w != original_asim->width) 510 if ((w > 0 && w != original_asim->width)
504 || (h > 0 && h != original_asim->height)) 511 || (h > 0 && h != original_asim->height))
505 { 512 {
506 result = scale_asimage (target->asv, original_asim, 513 result = scale_asimage (target->asv, original_asim,
507 w > 0 ? w : original_asim->width, 514 w > 0 ? w : original_asim->width,
508 h > 0 ? h : original_asim->height, 515 h > 0 ? h : original_asim->height,
509 background ? ASA_ASImage : ASA_XImage, 516 background ? ASA_ASImage : ASA_XImage,
510 100, ASIMAGE_QUALITY_DEFAULT); 517 100, ASIMAGE_QUALITY_DEFAULT);
511 } 518 }
519
512 if (background == NULL) 520 if (background == NULL)
513 { 521 {
514 /* if tiling - pixmap has to be sized exactly as the image, 522 /* if tiling - pixmap has to be sized exactly as the image,
515 but there is no need to make it bigger then the window! */ 523 but there is no need to make it bigger than the window! */
516 if (h_scale == 0) 524 if (h_scale == 0)
517 new_pmap_width = min (result->width, target_width); 525 new_pmap_width = min (result->width, target_width);
518 if (v_scale == 0) 526 if (v_scale == 0)
519 new_pmap_height = min (result->height, target_height); 527 new_pmap_height = min (result->height, target_height);
520 /* 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 */
521 if (h_scale == 0 || v_scale == 0) 529 if (h_scale == 0 || v_scale == 0)
522 { 530 {
523 ASImage *tmp = tile_asimage (target->asv, result, 531 ASImage *tmp = tile_asimage (target->asv, result,
524 (h_scale > 0) ? 0 : (int)result->width - x, 532 (h_scale > 0) ? 0 : (int)result->width - x,
525 (v_scale > 0) ? 0 : (int)result->height - y, 533 (v_scale > 0) ? 0 : (int)result->height - y,
526 new_pmap_width, 534 new_pmap_width,
527 new_pmap_height, 535 new_pmap_height,
528 TINT_LEAVE_SAME, ASA_XImage, 536 TINT_LEAVE_SAME, ASA_XImage,
529 100, ASIMAGE_QUALITY_DEFAULT); 537 100, ASIMAGE_QUALITY_DEFAULT);
530 if (tmp) 538 if (tmp)
531 { 539 {
532 if (result != original_asim) 540 if (result != original_asim)
533 destroy_asimage (&result); 541 destroy_asimage (&result);
542
534 result = tmp; 543 result = tmp;
535 } 544 }
536 } 545 }
537 } 546 }
538 else 547 else
… …
544 layers[0].im = background; 553 layers[0].im = background;
545 layers[0].clip_width = target_width; 554 layers[0].clip_width = target_width;
546 layers[0].clip_height = target_height; 555 layers[0].clip_height = target_height;
547 layers[0].tint = background_tint; 556 layers[0].tint = background_tint;
548 layers[1].im = result; 557 layers[1].im = result;
558
549 if (w <= 0) 559 if (w <= 0)
550 { 560 {
551 /* tile horizontally */ 561 /* tile horizontally */
552 while (x > 0) x -= (int)result->width; 562 while (x > 0) x -= (int)result->width;
553 layers[1].dst_x = x; 563 layers[1].dst_x = x;
… …
557 { 567 {
558 /* clip horizontally */ 568 /* clip horizontally */
559 layers[1].dst_x = x; 569 layers[1].dst_x = x;
560 layers[1].clip_width = result->width; 570 layers[1].clip_width = result->width;
561 } 571 }
572
562 if (h <= 0) 573 if (h <= 0)
563 { 574 {
564 while (y > 0) y -= (int)result->height; 575 while (y > 0) y -= (int)result->height;
565 layers[1].dst_y = y; 576 layers[1].dst_y = y;
566 layers[1].clip_height = result->height + target_height; 577 layers[1].clip_height = result->height + target_height;
… …
568 else 579 else
569 { 580 {
570 layers[1].dst_y = y; 581 layers[1].dst_y = y;
571 layers[1].clip_height = result->height; 582 layers[1].clip_height = result->height;
572 } 583 }
584
573 if (target->rs[Rs_blendtype]) 585 if (target->rs[Rs_blendtype])
574 { 586 {
575 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 587 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
576 if (layers[1].merge_scanlines == NULL) 588 if (layers[1].merge_scanlines == NULL)
577 layers[1].merge_scanlines = alphablend_scanlines; 589 layers[1].merge_scanlines = alphablend_scanlines;
578 } 590 }
591
579 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,
580 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 593 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
594
581 if (tmp) 595 if (tmp)
582 { 596 {
583 if (result != original_asim) 597 if (result != original_asim)
584 destroy_asimage (&result); 598 destroy_asimage (&result);
599
585 result = tmp; 600 result = tmp;
586 } 601 }
602
587 free (layers); 603 free (layers);
588 } 604 }
589 } 605 }
590 TIMING_TEST_PRINT_RESULT (asim); 606 TIMING_TEST_PRINT_RESULT (asim);
591 607
… …
620 636
621 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;
622 int dst_width = result->width, dst_height = result->height; 638 int dst_width = result->width, dst_height = result->height;
623 if (background == NULL) 639 if (background == NULL)
624 { 640 {
625 if (h_scale > 0)
626 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 );
627 if (v_scale > 0)
628 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);
629 643
630 if (dst_x > 0 || dst_y > 0 644 if (dst_x > 0 || dst_y > 0
631 || dst_x + dst_width < new_pmap_width 645 || dst_x + dst_width < new_pmap_width
632 || dst_y + dst_height < new_pmap_height) 646 || dst_y + dst_height < new_pmap_height)
633 {
634 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);
635 }
636 } 648 }
637 649
638 /* put result on pixmap */ 650 /* put result on pixmap */
639 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 651 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
640 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);
… …
653bool 665bool
654bgPixmap_t::set_file (const char *file) 666bgPixmap_t::set_file (const char *file)
655{ 667{
656 char *f; 668 char *f;
657 669
658 assert (file != NULL); 670 assert (file);
659 671
660 if (*file != '\0') 672 if (*file)
661 { 673 {
662# ifdef HAVE_AFTERIMAGE 674# ifdef HAVE_AFTERIMAGE
663 if (target->asimman == NULL) 675 if (target->asimman == NULL)
664 target->asimman = create_generic_imageman (target->rs[Rs_path]); 676 target->asimman = create_generic_imageman (target->rs[Rs_path]);
677
665 if ((f = strchr (file, ';')) == NULL) 678 if ((f = strchr (file, ';')) == NULL)
666 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 679 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
667 else 680 else
668 { 681 {
669 size_t len = f - file; 682 size_t len = f - file;
670 f = (char *)malloc (len + 1); 683 f = (char *)malloc (len + 1);
671 strncpy (f, file, len); 684 memcpy (f, file, len);
672 f[len] = '\0'; 685 f[len] = '\0';
673 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 686 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
674 free (f); 687 free (f);
675 } 688 }
689
676 return (original_asim != NULL); 690 return original_asim;
677# endif 691# endif
678 } 692 }
693
679 return false; 694 return false;
680} 695}
681 696
682# endif /* BG_IMAGE_FROM_FILE */ 697# endif /* BG_IMAGE_FROM_FILE */
683 698
… …
688 if (!(flags & isTransparent)) 703 if (!(flags & isTransparent))
689 { 704 {
690 flags |= isTransparent; 705 flags |= isTransparent;
691 return true; 706 return true;
692 } 707 }
708
693 return false; 709 return false;
694} 710}
695 711
696bool 712bool
697bgPixmap_t::set_blur_radius (const char *geom) 713bgPixmap_t::set_blur_radius (const char *geom)
… …
778 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 794 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
779 tint = new_tint; 795 tint = new_tint;
780 flags = (flags & ~tintFlags) | new_flags | tintSet; 796 flags = (flags & ~tintFlags) | new_flags | tintSet;
781 return true; 797 return true;
782 } 798 }
799
783 return false; 800 return false;
784} 801}
785 802
786bool 803bool
787bgPixmap_t::unset_tint () 804bgPixmap_t::unset_tint ()
… …
791 if (new_flags != (flags & tintFlags)) 808 if (new_flags != (flags & tintFlags))
792 { 809 {
793 flags = (flags&~tintFlags)|new_flags; 810 flags = (flags&~tintFlags)|new_flags;
794 return true; 811 return true;
795 } 812 }
813
796 return false; 814 return false;
797} 815}
798 816
799bool 817bool
800bgPixmap_t::set_shade (const char *shade_str) 818bgPixmap_t::set_shade (const char *shade_str)
801{ 819{
802 int new_shade = (shade_str) ? atoi (shade_str) : 0; 820 int new_shade = (shade_str) ? atoi (shade_str) : 0;
803 821
804 if (new_shade < 0 && new_shade > -100) 822 if (new_shade < 0 && new_shade > -100)
805 new_shade = 200 - (100 + new_shade); 823 new_shade = 200 - (100 + new_shade);
806 else if (new_shade == 100) 824 else if (new_shade == 100)
807 new_shade = 0; 825 new_shade = 0;
808 826
809 if (new_shade != shade) 827 if (new_shade != shade)
810 { 828 {
811 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);
812 shade = new_shade; 830 shade = new_shade;
813 flags = (flags & (~tintFlags | tintSet)) | new_flags; 831 flags = (flags & (~tintFlags | tintSet)) | new_flags;
814 return true; 832 return true;
815 } 833 }
834
816 return false; 835 return false;
817} 836}
818 837
819/* make_transparency_pixmap() 838/* make_transparency_pixmap()
820 * 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
… …
896 XGrabServer (dpy); 915 XGrabServer (dpy);
897 XMapRaised (dpy, src); 916 XMapRaised (dpy, src);
898 XSync (dpy, False); 917 XSync (dpy, False);
899 918
900 /* XSync should get window where it's properly exposed, 919 /* XSync should get window where it's properly exposed,
901 * 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 : */
902 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 921 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
903 ++ev_count; 922 ++ev_count;
904 923
905 if (ev_count > 0); 924 if (ev_count > 0);
906 { 925 {
… …
910 { 929 {
911 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);
912 success = true; 931 success = true;
913 } 932 }
914 } 933 }
934
915 XDestroyWindow (dpy, src); 935 XDestroyWindow (dpy, src);
916 XUngrabServer (dpy); 936 XUngrabServer (dpy);
917 //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);
918 } 938 }
919 939
… …
983 { 1003 {
984 c.r = (c.r * shade) / 100; 1004 c.r = (c.r * shade) / 100;
985 c.g = (c.g * shade) / 100; 1005 c.g = (c.g * shade) / 100;
986 c.b = (c.b * shade) / 100; 1006 c.b = (c.b * shade) / 100;
987 } 1007 }
988 else if( shade > 100 && shade < 200) 1008 else if (shade > 100 && shade < 200)
989 { 1009 {
990 c.r = (c.r * (200 - shade)) / 100; 1010 c.r = (c.r * (200 - shade)) / 100;
991 c.g = (c.g * (200 - shade)) / 100; 1011 c.g = (c.g * (200 - shade)) / 100;
992 c.b = (c.b * (200 - shade)) / 100; 1012 c.b = (c.b * (200 - shade)) / 100;
993 } 1013 }
… …
1039 mask_c.blue = 0xffff - c.b; 1059 mask_c.blue = 0xffff - c.b;
1040 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1060 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1041 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);
1042 result |= transpPmapTinted; 1062 result |= transpPmapTinted;
1043 } 1063 }
1064
1044 XRenderFreePicture (dpy, mask_pic); 1065 XRenderFreePicture (dpy, mask_pic);
1045 XRenderFreePicture (dpy, overlay_pic); 1066 XRenderFreePicture (dpy, overlay_pic);
1046 XRenderFreePicture (dpy, back_pic); 1067 XRenderFreePicture (dpy, back_pic);
1047# if DO_TIMING_TEST 1068# if DO_TIMING_TEST
1048 XSync (dpy, False); 1069 XSync (dpy, False);
… …
1070} 1091}
1071 1092
1072bool 1093bool
1073bgPixmap_t::set_root_pixmap () 1094bgPixmap_t::set_root_pixmap ()
1074{ 1095{
1075 Pixmap new_root_pixmap = None;
1076
1077 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1096 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1078 if (new_root_pixmap == None) 1097 if (new_root_pixmap == None)
1079 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1098 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1080 1099
1081 if (new_root_pixmap != root_pixmap) 1100 if (new_root_pixmap != root_pixmap)
1082 { 1101 {
1083 root_pixmap = new_root_pixmap; 1102 root_pixmap = new_root_pixmap;
1084 return true; 1103 return true;
1085 } 1104 }
1105
1086 return false; 1106 return false;
1087} 1107}
1088# endif /* ENABLE_TRANSPARENCY */ 1108# endif /* ENABLE_TRANSPARENCY */
1089 1109
1090# ifndef HAVE_AFTERIMAGE 1110# ifndef HAVE_AFTERIMAGE
1091static 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);
1092# endif 1112# endif
1093
1094 1113
1095bool 1114bool
1096bgPixmap_t::render () 1115bgPixmap_t::render ()
1097{ 1116{
1098 unsigned long background_flags = 0; 1117 unsigned long background_flags = 0;
… …
1180 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1199 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1181 } 1200 }
1182 } 1201 }
1183# endif /* HAVE_AFTERIMAGE */ 1202# endif /* HAVE_AFTERIMAGE */
1184 1203
1185 if (result != NULL) 1204 if (result)
1186 { 1205 {
1187 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1206 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1207
1188 if (gc) 1208 if (gc)
1189 { 1209 {
1190 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1210 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1191 { 1211 {
1192 XFreePixmap (target->dpy, pixmap); 1212 XFreePixmap (target->dpy, pixmap);
1193 pixmap = None; 1213 pixmap = None;
1194 } 1214 }
1215
1195 if (pixmap == None) 1216 if (pixmap == None)
1196 { 1217 {
1197 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);
1198 pmap_width = result->width; 1219 pmap_width = result->width;
1199 pmap_height = result->height; 1220 pmap_height = result->height;
1200 pmap_depth = target->depth; 1221 pmap_depth = target->depth;
1201 } 1222 }
1223
1202 if (pmap_depth != result->depth) 1224 if (pmap_depth != result->depth)
1203 { 1225 {
1204 /* Bad Match error will ensue ! stupid X !!!! */ 1226 /* Bad Match error will ensue ! stupid X !!!! */
1205 if( result->depth == 24 && pmap_depth == 32) 1227 if (result->depth == 24 && pmap_depth == 32)
1206 result->depth = 32; 1228 result->depth = 32;
1207 else if( result->depth == 32 && pmap_depth == 24) 1229 else if (result->depth == 32 && pmap_depth == 24)
1208 result->depth = 24; 1230 result->depth = 24;
1209 else 1231 else
1210 { 1232 {
1211 /* TODO: implement image recoding */ 1233 /* TODO: implement image recoding */
1212 } 1234 }
1213 } 1235 }
1236
1214 if (pmap_depth == result->depth) 1237 if (pmap_depth == result->depth)
1215 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
1216 XFreeGC (target->dpy, gc); 1240 XFreeGC (target->dpy, gc);
1217 flags = flags & ~isInvalid; 1241 flags = flags & ~isInvalid;
1218 } 1242 }
1243
1219 XDestroyImage (result); 1244 XDestroyImage (result);
1220 } 1245 }
1221 1246
1222 if (flags & isInvalid) 1247 if (flags & isInvalid)
1223 { 1248 {
… …
1227 pixmap = None; 1252 pixmap = None;
1228 } 1253 }
1229 } 1254 }
1230 1255
1231 apply (); 1256 apply ();
1257
1258 XSync (target->dpy, False);
1259 valid_since = ev::now ();
1232 1260
1233 TIMING_TEST_PRINT_RESULT (tp); 1261 TIMING_TEST_PRINT_RESULT (tp);
1234 1262
1235 return true; 1263 return true;
1236} 1264}
… …
1249 } 1277 }
1250 return false; 1278 return false;
1251} 1279}
1252 1280
1253void 1281void
1254bgPixmap_t::apply() 1282bgPixmap_t::apply ()
1255{ 1283{
1256 if (target) 1284 if (target)
1257 { 1285 {
1258 flags &= ~isVtOrigin; 1286 flags &= ~isVtOrigin;
1259 if (pixmap != None) 1287 if (pixmap != None)
… …
1262# ifdef ENABLE_TRANSPARENCY 1290# ifdef ENABLE_TRANSPARENCY
1263 if (flags & isTransparent) 1291 if (flags & isTransparent)
1264 { 1292 {
1265 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1293 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1266 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1294 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1267# if HAVE_SCROLLBARS
1268 if (target->scrollBar.win) 1295 if (target->scrollBar.win)
1269 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1296 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1270# endif
1271 } 1297 }
1272 else 1298 else
1273# endif 1299# endif
1274 { 1300 {
1275 flags |= isVtOrigin; 1301 flags |= isVtOrigin;
1276 /* force old pixmap dereference in case it was transparent before :*/ 1302 /* force old pixmap dereference in case it was transparent before :*/
1277 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1303 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1278 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1304 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1279 /* do we also need to set scrollbar's background here ? */ 1305 /* do we also need to set scrollbar's background here ? */
1280# if HAVE_SCROLLBARS
1281 if (target->scrollBar.win) 1306 if (target->scrollBar.win)
1282 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1307 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1283# endif
1284 } 1308 }
1285 } 1309 }
1286 else 1310 else
1287 { 1311 {
1288 /* set target background to a pixel */ 1312 /* set target background to a pixel */
1289 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1313 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1290 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1314 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1291 /* do we also need to set scrollbar's background here ? */ 1315 /* do we also need to set scrollbar's background here ? */
1292# if HAVE_SCROLLBARS
1293 if (target->scrollBar.win) 1316 if (target->scrollBar.win)
1294 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1317 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1295# endif
1296 } 1318 }
1297 /* don't want Expose on the parent or vt. It is better to use 1319 /* don't want Expose on the parent or vt. It is better to use
1298 scr_touch or we get a great deal of flicker otherwise: */ 1320 scr_touch or we get a great deal of flicker otherwise: */
1299 XClearWindow (target->dpy, target->parent[0]); 1321 XClearWindow (target->dpy, target->parent[0]);
1300 1322
1301# if HAVE_SCROLLBARS
1302 if (target->scrollBar.win) 1323 if (target->scrollBar.win)
1303 { 1324 {
1304 target->scrollBar.setIdle (); 1325 target->scrollBar.setIdle ();
1305 target->scrollbar_show (0); 1326 target->scrollbar_show (0);
1306 } 1327 }
1307# endif
1308 1328
1309 target->want_refresh = 1; 1329 target->want_refresh = 1;
1310 flags |= hasChanged; 1330 flags |= hasChanged;
1311 } 1331 }
1312} 1332}

Diff Legend

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