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.18 by ayin, Tue Dec 11 17:42:04 2007 UTC vs.
Revision 1.29 by root, Tue Jan 29 17:52:52 2008 UTC

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

Diff Legend

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