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.19 by ayin, Tue Dec 18 11:15:24 2007 UTC vs.
Revision 1.34 by root, Sun Apr 26 01:59:53 2009 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) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
8 * 8 *
9 * 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
10 * 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
11 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
… …
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 {
… …
255 int geom_flags = 0, changed = 0; 259 int geom_flags = 0, changed = 0;
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 const 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
… …
447bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 449bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
448{ 450{
449 if (target == NULL) 451 if (target == NULL)
450 return false; 452 return false;
451 453
454 target->init_asv ();
455
456 ASImage *result = 0;
457
452 int target_width = (int)target->szHint.width; 458 int target_width = target->szHint.width;
453 int target_height = (int)target->szHint.height; 459 int target_height = target->szHint.height;
454 int new_pmap_width = target_width, new_pmap_height = target_height; 460 int new_pmap_width = target_width;
455 ASImage *result = NULL; 461 int new_pmap_height = target_height;
456 462
457 int x = 0; 463 int x = 0;
458 int y = 0; 464 int y = 0;
459 int w = h_scale * target_width / 100; 465 int w = h_scale * target_width / 100;
460 int h = v_scale * target_height / 100; 466 int h = v_scale * target_height / 100;
… …
467 { 473 {
468 target->get_window_origin(x, y); 474 target->get_window_origin(x, y);
469 x = -x; 475 x = -x;
470 y = -y; 476 y = -y;
471 } 477 }
478
472 if (h_align != rootAlign) 479 if (h_align != rootAlign)
473 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
474 if (v_align != rootAlign) 482 if (v_align != rootAlign)
475 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);
476 } 484 }
477 485
478 if (original_asim == NULL 486 if (!original_asim
479 || x >= target_width 487 || x >= target_width
480 || y >= target_height 488 || y >= target_height
481 || (w > 0 && x + w <= 0) 489 || (w > 0 && x + w <= 0)
482 || (h > 0 && y + h <= 0)) 490 || (h > 0 && y + h <= 0))
483 { 491 {
484 if (background) 492 if (background)
485 { 493 {
486 new_pmap_width = background->width; 494 new_pmap_width = background->width;
487 new_pmap_height = background->height; 495 new_pmap_height = background->height;
488 result = background; 496 result = background;
497
489 if (background_tint != TINT_LEAVE_SAME) 498 if (background_tint != TINT_LEAVE_SAME)
490 { 499 {
491 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 500 ASImage* tmp = tile_asimage (target->asv, background, 0, 0,
492 target_width, target_height, background_tint, 501 target_width, target_height, background_tint,
493 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 502 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
… …
499 new_pmap_width = new_pmap_height = 0; 508 new_pmap_width = new_pmap_height = 0;
500 } 509 }
501 else 510 else
502 { 511 {
503 result = original_asim; 512 result = original_asim;
513
504 if ((w > 0 && w != original_asim->width) 514 if ((w > 0 && w != original_asim->width)
505 || (h > 0 && h != original_asim->height)) 515 || (h > 0 && h != original_asim->height))
506 { 516 {
507 result = scale_asimage (target->asv, original_asim, 517 result = scale_asimage (target->asv, original_asim,
508 w > 0 ? w : original_asim->width, 518 w > 0 ? w : original_asim->width,
509 h > 0 ? h : original_asim->height, 519 h > 0 ? h : original_asim->height,
510 background ? ASA_ASImage : ASA_XImage, 520 background ? ASA_ASImage : ASA_XImage,
511 100, ASIMAGE_QUALITY_DEFAULT); 521 100, ASIMAGE_QUALITY_DEFAULT);
512 } 522 }
523
513 if (background == NULL) 524 if (background == NULL)
514 { 525 {
515 /* if tiling - pixmap has to be sized exactly as the image, 526 /* if tiling - pixmap has to be sized exactly as the image,
516 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! */
517 if (h_scale == 0) 528 if (h_scale == 0)
518 new_pmap_width = min (result->width, target_width); 529 new_pmap_width = min (result->width, target_width);
519 if (v_scale == 0) 530 if (v_scale == 0)
520 new_pmap_height = min (result->height, target_height); 531 new_pmap_height = min (result->height, target_height);
521 /* 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 */
522 if (h_scale == 0 || v_scale == 0) 533 if (h_scale == 0 || v_scale == 0)
523 { 534 {
524 ASImage *tmp = tile_asimage (target->asv, result, 535 ASImage *tmp = tile_asimage (target->asv, result,
525 (h_scale > 0) ? 0 : (int)result->width - x, 536 (h_scale > 0) ? 0 : (int)result->width - x,
526 (v_scale > 0) ? 0 : (int)result->height - y, 537 (v_scale > 0) ? 0 : (int)result->height - y,
527 new_pmap_width, 538 new_pmap_width,
528 new_pmap_height, 539 new_pmap_height,
529 TINT_LEAVE_SAME, ASA_XImage, 540 TINT_LEAVE_SAME, ASA_XImage,
530 100, ASIMAGE_QUALITY_DEFAULT); 541 100, ASIMAGE_QUALITY_DEFAULT);
531 if (tmp) 542 if (tmp)
532 { 543 {
533 if (result != original_asim) 544 if (result != original_asim)
534 destroy_asimage (&result); 545 destroy_asimage (&result);
546
535 result = tmp; 547 result = tmp;
536 } 548 }
537 } 549 }
538 } 550 }
539 else 551 else
… …
545 layers[0].im = background; 557 layers[0].im = background;
546 layers[0].clip_width = target_width; 558 layers[0].clip_width = target_width;
547 layers[0].clip_height = target_height; 559 layers[0].clip_height = target_height;
548 layers[0].tint = background_tint; 560 layers[0].tint = background_tint;
549 layers[1].im = result; 561 layers[1].im = result;
562
550 if (w <= 0) 563 if (w <= 0)
551 { 564 {
552 /* tile horizontally */ 565 /* tile horizontally */
553 while (x > 0) x -= (int)result->width; 566 while (x > 0) x -= (int)result->width;
554 layers[1].dst_x = x; 567 layers[1].dst_x = x;
… …
558 { 571 {
559 /* clip horizontally */ 572 /* clip horizontally */
560 layers[1].dst_x = x; 573 layers[1].dst_x = x;
561 layers[1].clip_width = result->width; 574 layers[1].clip_width = result->width;
562 } 575 }
576
563 if (h <= 0) 577 if (h <= 0)
564 { 578 {
565 while (y > 0) y -= (int)result->height; 579 while (y > 0) y -= (int)result->height;
566 layers[1].dst_y = y; 580 layers[1].dst_y = y;
567 layers[1].clip_height = result->height + target_height; 581 layers[1].clip_height = result->height + target_height;
… …
569 else 583 else
570 { 584 {
571 layers[1].dst_y = y; 585 layers[1].dst_y = y;
572 layers[1].clip_height = result->height; 586 layers[1].clip_height = result->height;
573 } 587 }
588
574 if (target->rs[Rs_blendtype]) 589 if (target->rs[Rs_blendtype])
575 { 590 {
576 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 591 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
577 if (layers[1].merge_scanlines == NULL) 592 if (layers[1].merge_scanlines == NULL)
578 layers[1].merge_scanlines = alphablend_scanlines; 593 layers[1].merge_scanlines = alphablend_scanlines;
579 } 594 }
595
580 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,
581 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 597 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
598
582 if (tmp) 599 if (tmp)
583 { 600 {
584 if (result != original_asim) 601 if (result != original_asim)
585 destroy_asimage (&result); 602 destroy_asimage (&result);
603
586 result = tmp; 604 result = tmp;
587 } 605 }
606
588 free (layers); 607 free (layers);
589 } 608 }
590 } 609 }
591 TIMING_TEST_PRINT_RESULT (asim); 610 TIMING_TEST_PRINT_RESULT (asim);
592 611
… …
621 640
622 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;
623 int dst_width = result->width, dst_height = result->height; 642 int dst_width = result->width, dst_height = result->height;
624 if (background == NULL) 643 if (background == NULL)
625 { 644 {
626 if (h_scale > 0)
627 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 );
628 if (v_scale > 0)
629 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);
630 647
631 if (dst_x > 0 || dst_y > 0 648 if (dst_x > 0 || dst_y > 0
632 || dst_x + dst_width < new_pmap_width 649 || dst_x + dst_width < new_pmap_width
633 || dst_y + dst_height < new_pmap_height) 650 || dst_y + dst_height < new_pmap_height)
634 {
635 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);
636 }
637 } 652 }
638 653
639 /* put result on pixmap */ 654 /* put result on pixmap */
640 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 655 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); 656 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
… …
652# endif /* HAVE_AFTERIMAGE */ 667# endif /* HAVE_AFTERIMAGE */
653 668
654bool 669bool
655bgPixmap_t::set_file (const char *file) 670bgPixmap_t::set_file (const char *file)
656{ 671{
657 char *f;
658
659 assert (file != NULL); 672 assert (file);
660 673
661 if (*file != '\0') 674 if (*file)
662 { 675 {
663# ifdef HAVE_AFTERIMAGE 676# ifdef HAVE_AFTERIMAGE
664 if (target->asimman == NULL) 677 if (!target->asimman)
665 target->asimman = create_generic_imageman (target->rs[Rs_path]); 678 target->asimman = create_generic_imageman (target->rs[Rs_path]);
666 if ((f = strchr (file, ';')) == NULL) 679
667 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 680 if (const char *p = strchr (file, ';'))
668 else
669 { 681 {
670 size_t len = f - file; 682 size_t len = p - file;
671 f = (char *)malloc (len + 1); 683 char *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 else
690 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
691
677 return (original_asim != NULL); 692 return original_asim;
678# endif 693# endif
679 } 694 }
695
680 return false; 696 return false;
681} 697}
682 698
683# endif /* BG_IMAGE_FROM_FILE */ 699# endif /* BG_IMAGE_FROM_FILE */
684 700
… …
689 if (!(flags & isTransparent)) 705 if (!(flags & isTransparent))
690 { 706 {
691 flags |= isTransparent; 707 flags |= isTransparent;
692 return true; 708 return true;
693 } 709 }
710
694 return false; 711 return false;
695} 712}
696 713
697bool 714bool
698bgPixmap_t::set_blur_radius (const char *geom) 715bgPixmap_t::set_blur_radius (const char *geom)
… …
779 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 796 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
780 tint = new_tint; 797 tint = new_tint;
781 flags = (flags & ~tintFlags) | new_flags | tintSet; 798 flags = (flags & ~tintFlags) | new_flags | tintSet;
782 return true; 799 return true;
783 } 800 }
801
784 return false; 802 return false;
785} 803}
786 804
787bool 805bool
788bgPixmap_t::unset_tint () 806bgPixmap_t::unset_tint ()
… …
792 if (new_flags != (flags & tintFlags)) 810 if (new_flags != (flags & tintFlags))
793 { 811 {
794 flags = (flags&~tintFlags)|new_flags; 812 flags = (flags&~tintFlags)|new_flags;
795 return true; 813 return true;
796 } 814 }
815
797 return false; 816 return false;
798} 817}
799 818
800bool 819bool
801bgPixmap_t::set_shade (const char *shade_str) 820bgPixmap_t::set_shade (const char *shade_str)
802{ 821{
803 int new_shade = (shade_str) ? atoi (shade_str) : 0; 822 int new_shade = (shade_str) ? atoi (shade_str) : 0;
804 823
805 if (new_shade < 0 && new_shade > -100) 824 if (new_shade < 0 && new_shade > -100)
806 new_shade = 200 - (100 + new_shade); 825 new_shade = 200 - (100 + new_shade);
807 else if (new_shade == 100) 826 else if (new_shade == 100)
808 new_shade = 0; 827 new_shade = 0;
809 828
810 if (new_shade != shade) 829 if (new_shade != shade)
811 { 830 {
812 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);
813 shade = new_shade; 832 shade = new_shade;
814 flags = (flags & (~tintFlags | tintSet)) | new_flags; 833 flags = (flags & (~tintFlags | tintSet)) | new_flags;
815 return true; 834 return true;
816 } 835 }
836
817 return false; 837 return false;
818} 838}
819 839
820/* make_transparency_pixmap() 840/* make_transparency_pixmap()
821 * 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
… …
897 XGrabServer (dpy); 917 XGrabServer (dpy);
898 XMapRaised (dpy, src); 918 XMapRaised (dpy, src);
899 XSync (dpy, False); 919 XSync (dpy, False);
900 920
901 /* XSync should get window where it's properly exposed, 921 /* 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 : */ 922 * but to be on the safe side - let's check for the actual event to arrive : */
903 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 923 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
904 ++ev_count; 924 ++ev_count;
905 925
906 if (ev_count > 0); 926 if (ev_count > 0);
907 { 927 {
… …
911 { 931 {
912 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);
913 success = true; 933 success = true;
914 } 934 }
915 } 935 }
936
916 XDestroyWindow (dpy, src); 937 XDestroyWindow (dpy, src);
917 XUngrabServer (dpy); 938 XUngrabServer (dpy);
918 //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);
919 } 940 }
920 941
… …
1040 mask_c.blue = 0xffff - c.b; 1061 mask_c.blue = 0xffff - c.b;
1041 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1062 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); 1063 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1043 result |= transpPmapTinted; 1064 result |= transpPmapTinted;
1044 } 1065 }
1066
1045 XRenderFreePicture (dpy, mask_pic); 1067 XRenderFreePicture (dpy, mask_pic);
1046 XRenderFreePicture (dpy, overlay_pic); 1068 XRenderFreePicture (dpy, overlay_pic);
1047 XRenderFreePicture (dpy, back_pic); 1069 XRenderFreePicture (dpy, back_pic);
1048# if DO_TIMING_TEST 1070# if DO_TIMING_TEST
1049 XSync (dpy, False); 1071 XSync (dpy, False);
… …
1071} 1093}
1072 1094
1073bool 1095bool
1074bgPixmap_t::set_root_pixmap () 1096bgPixmap_t::set_root_pixmap ()
1075{ 1097{
1076 Pixmap new_root_pixmap = None;
1077
1078 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1098 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1079 if (new_root_pixmap == None) 1099 if (new_root_pixmap == None)
1080 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1100 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1081 1101
1082 if (new_root_pixmap != root_pixmap) 1102 if (new_root_pixmap != root_pixmap)
1083 { 1103 {
1084 root_pixmap = new_root_pixmap; 1104 root_pixmap = new_root_pixmap;
1085 return true; 1105 return true;
1086 } 1106 }
1107
1087 return false; 1108 return false;
1088} 1109}
1089# endif /* ENABLE_TRANSPARENCY */ 1110# endif /* ENABLE_TRANSPARENCY */
1090 1111
1091# ifndef HAVE_AFTERIMAGE 1112# ifndef HAVE_AFTERIMAGE
1092static 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);
1093# endif 1114# endif
1094 1115
1095
1096bool 1116bool
1097bgPixmap_t::render () 1117bgPixmap_t::render ()
1098{ 1118{
1099 unsigned long background_flags = 0; 1119 unsigned long background_flags = 0;
1100 1120
1101 if (target == NULL) 1121 if (target == NULL)
1102 return false; 1122 return false;
1103 1123
1104 TIMING_TEST_START (tp); 1124 TIMING_TEST_START (tp);
1105 1125
1106 invalidate(); 1126 invalidate ();
1107# ifdef ENABLE_TRANSPARENCY 1127# ifdef ENABLE_TRANSPARENCY
1108 if (flags & isTransparent) 1128 if (flags & isTransparent)
1109 { 1129 {
1110 /* we need to re-generate transparency pixmap in that case ! */ 1130 /* we need to re-generate transparency pixmap in that case ! */
1111 background_flags = make_transparency_pixmap (); 1131 background_flags = make_transparency_pixmap ();
… …
1120 XImage *result = NULL; 1140 XImage *result = NULL;
1121# ifdef HAVE_AFTERIMAGE 1141# ifdef HAVE_AFTERIMAGE
1122 if (original_asim 1142 if (original_asim
1123 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1143 || (background_flags & transpTransformations) != (flags & transpTransformations))
1124 { 1144 {
1145 target->init_asv ();
1146
1125 ASImage *background = NULL; 1147 ASImage *background = NULL;
1126 ARGB32 as_tint = TINT_LEAVE_SAME; 1148 ARGB32 as_tint = TINT_LEAVE_SAME;
1127 if (background_flags) 1149 if (background_flags)
1128 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);
1129 1151
1130# ifdef ENABLE_TRANSPARENCY 1152# ifdef ENABLE_TRANSPARENCY
1131 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1153 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1132 { 1154 {
1133 ShadingInfo as_shade; 1155 ShadingInfo as_shade;
… …
1140 as_shade.tintColor.green = c.g; 1162 as_shade.tintColor.green = c.g;
1141 as_shade.tintColor.blue = c.b; 1163 as_shade.tintColor.blue = c.b;
1142 1164
1143 as_tint = shading2tint32 (&as_shade); 1165 as_tint = shading2tint32 (&as_shade);
1144 } 1166 }
1167
1145 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 1168 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1146 { 1169 {
1147 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,
1148 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 1171 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1149 100, ASIMAGE_QUALITY_DEFAULT); 1172 100, ASIMAGE_QUALITY_DEFAULT);
… …
1156# endif 1179# endif
1157 1180
1158 if (render_asim (background, as_tint)) 1181 if (render_asim (background, as_tint))
1159 flags = flags & ~isInvalid; 1182 flags = flags & ~isInvalid;
1160 if (background) 1183 if (background)
1161 destroy_asimage (&background); 1184 destroy_asimage (&background);
1162 } 1185 }
1163 else if (background_flags && pmap_depth != target->depth) 1186 else if (background_flags && pmap_depth != target->depth)
1164 {
1165 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);
1166 }
1167 1188
1168# elif !XFT /* our own client-side tinting */ 1189# elif !XFT /* our own client-side tinting */
1169 1190
1170 /* 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.
1171 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 !!! */
1172 1193
1173 if (background_flags && (flags & isInvalid)) 1194 if (background_flags && (flags & isInvalid))
1174 { 1195 {
1175 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
1176 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1198 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1177 { 1199 {
1178 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1200 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1179 if (flags & tintSet) 1201 if (flags & tintSet)
1180 tint.get (c); 1202 tint.get (c);
1181 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1203 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1182 } 1204 }
1183 } 1205 }
1184# endif /* HAVE_AFTERIMAGE */ 1206# endif /* HAVE_AFTERIMAGE */
1185 1207
1186 if (result != NULL) 1208 if (result)
1187 { 1209 {
1188 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1210 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1211
1189 if (gc) 1212 if (gc)
1190 { 1213 {
1191 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1214 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1192 { 1215 {
1193 XFreePixmap (target->dpy, pixmap); 1216 XFreePixmap (target->dpy, pixmap);
1194 pixmap = None; 1217 pixmap = None;
1195 } 1218 }
1219
1196 if (pixmap == None) 1220 if (pixmap == None)
1197 { 1221 {
1198 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);
1199 pmap_width = result->width; 1223 pmap_width = result->width;
1200 pmap_height = result->height; 1224 pmap_height = result->height;
1201 pmap_depth = target->depth; 1225 pmap_depth = target->depth;
1202 } 1226 }
1227
1203 if (pmap_depth != result->depth) 1228 if (pmap_depth != result->depth)
1204 { 1229 {
1205 /* Bad Match error will ensue ! stupid X !!!! */ 1230 /* Bad Match error will ensue ! stupid X !!!! */
1206 if (result->depth == 24 && pmap_depth == 32) 1231 if (result->depth == 24 && pmap_depth == 32)
1207 result->depth = 32; 1232 result->depth = 32;
… …
1210 else 1235 else
1211 { 1236 {
1212 /* TODO: implement image recoding */ 1237 /* TODO: implement image recoding */
1213 } 1238 }
1214 } 1239 }
1240
1215 if (pmap_depth == result->depth) 1241 if (pmap_depth == result->depth)
1216 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
1217 XFreeGC (target->dpy, gc); 1244 XFreeGC (target->dpy, gc);
1218 flags = flags & ~isInvalid; 1245 flags = flags & ~isInvalid;
1219 } 1246 }
1247
1220 XDestroyImage (result); 1248 XDestroyImage (result);
1221 } 1249 }
1222 1250
1223 if (flags & isInvalid) 1251 if (flags & isInvalid)
1224 { 1252 {
… …
1228 pixmap = None; 1256 pixmap = None;
1229 } 1257 }
1230 } 1258 }
1231 1259
1232 apply (); 1260 apply ();
1261
1262 XSync (target->dpy, False);
1263 valid_since = ev::now ();
1233 1264
1234 TIMING_TEST_PRINT_RESULT (tp); 1265 TIMING_TEST_PRINT_RESULT (tp);
1235 1266
1236 return true; 1267 return true;
1237} 1268}
… …
1246# ifdef ENABLE_TRANSPARENCY 1277# ifdef ENABLE_TRANSPARENCY
1247 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1278 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1248# endif 1279# endif
1249 return true; 1280 return true;
1250 } 1281 }
1282
1251 return false; 1283 return false;
1252} 1284}
1253 1285
1254void 1286void
1255bgPixmap_t::apply() 1287bgPixmap_t::apply ()
1256{ 1288{
1257 if (target) 1289 if (target)
1258 { 1290 {
1259 flags &= ~isVtOrigin; 1291 flags &= ~isVtOrigin;
1292
1260 if (pixmap != None) 1293 if (pixmap != None)
1261 { 1294 {
1262 /* set target's background to pixmap */ 1295 /* set target's background to pixmap */
1263# ifdef ENABLE_TRANSPARENCY 1296# ifdef ENABLE_TRANSPARENCY
1264 if (flags & isTransparent) 1297 if (flags & isTransparent)
1265 { 1298 {
1266 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1299 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1267 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1300 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1268# if HAVE_SCROLLBARS 1301
1269 if (target->scrollBar.win) 1302 if (target->scrollBar.win)
1270 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1303 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1271# endif
1272 } 1304 }
1273 else 1305 else
1274# endif 1306# endif
1275 { 1307 {
1276 flags |= isVtOrigin; 1308 flags |= isVtOrigin;
1277 /* force old pixmap dereference in case it was transparent before :*/ 1309 /* force old pixmap dereference in case it was transparent before :*/
1278 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1310 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1279 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1311 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1280 /* do we also need to set scrollbar's background here ? */ 1312 /* do we also need to set scrollbar's background here ? */
1281# if HAVE_SCROLLBARS 1313
1282 if (target->scrollBar.win) 1314 if (target->scrollBar.win)
1283 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1315 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1284# endif
1285 } 1316 }
1286 } 1317 }
1287 else 1318 else
1288 { 1319 {
1289 /* set target background to a pixel */ 1320 /* set target background to a pixel */
1290 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1321 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1291 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1322 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1292 /* do we also need to set scrollbar's background here ? */ 1323 /* do we also need to set scrollbar's background here ? */
1293# if HAVE_SCROLLBARS
1294 if (target->scrollBar.win) 1324 if (target->scrollBar.win)
1295 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1325 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1296# endif
1297 } 1326 }
1327
1298 /* 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
1299 scr_touch or we get a great deal of flicker otherwise: */ 1329 scr_touch or we get a great deal of flicker otherwise: */
1300 XClearWindow (target->dpy, target->parent[0]); 1330 XClearWindow (target->dpy, target->parent[0]);
1301 1331
1302# if HAVE_SCROLLBARS
1303 if (target->scrollBar.win) 1332 if (target->scrollBar.win)
1304 { 1333 {
1305 target->scrollBar.setIdle (); 1334 target->scrollBar.state = STATE_IDLE;
1306 target->scrollbar_show (0); 1335 target->scrollBar.show (0);
1307 } 1336 }
1308# endif
1309 1337
1310 target->want_refresh = 1; 1338 target->want_refresh = 1;
1311 flags |= hasChanged; 1339 flags |= hasChanged;
1312 } 1340 }
1313} 1341}

Diff Legend

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