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.20 by root, Mon Dec 24 06:51:37 2007 UTC vs.
Revision 1.40 by sf-exg, Sat Aug 21 09:25:31 2010 UTC

1/*----------------------------------------------------------------------* 1/*----------------------------------------------------------------------*
2 * File: background.C - former xpm.C 2 * File: background.C - former xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 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
… …
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# include <sys/time.h>
31#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
32 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv; \
33 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
34 34
35#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
36 do{ struct timeval tv;gettimeofday (&tv, NULL); tv.tv_sec -= (timing_test_##id##_stv).tv_sec;\ 36 do { \
37 struct timeval tv; \
38 gettimeofday (&tv, NULL); \
39 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
37 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__,\ 40 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
38 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec);}while (0) 41 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
42 } while (0)
39 43
40#else 44#else
41#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
42#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
43#endif 47#endif
44 48
45/* 49/*
46 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
47 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
… …
87 */ 91 */
88 92
89#ifdef HAVE_BG_PIXMAP 93#ifdef HAVE_BG_PIXMAP
90bgPixmap_t::bgPixmap_t () 94bgPixmap_t::bgPixmap_t ()
91{ 95{
96 // this is basically redundant as bgPixmap_t is only used in
97 // zero_initialised-derived structs
92#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
93 original_asim = NULL; 99 original_asim = NULL;
94#endif 100#endif
95#ifdef BG_IMAGE_FROM_FILE 101#ifdef BG_IMAGE_FROM_FILE
96 h_scale = v_scale = 0; 102 h_scale = v_scale = 0;
97 h_align = v_align = 0; 103 h_align = v_align = 0;
98#endif 104#endif
99 flags = 0; 105 flags = 0;
100 pixmap = None; 106 pixmap = None;
107 valid_since = invalid_since = 0;
108 target = 0;
101} 109}
102 110
103void 111void
104bgPixmap_t::destroy () 112bgPixmap_t::destroy ()
105{ 113{
… …
120 return true; 128 return true;
121# endif 129# endif
122 130
123# ifdef BG_IMAGE_FROM_FILE 131# ifdef BG_IMAGE_FROM_FILE
124# ifdef HAVE_AFTERIMAGE 132# ifdef HAVE_AFTERIMAGE
125 if (original_asim != NULL) 133 if (original_asim)
126# endif 134# endif
127 { 135 {
128 if (h_scale != 0 || v_scale != 0 136 if (h_scale != 0 || v_scale != 0
129 || h_align != 0 || v_align != 0) 137 || h_align != 0 || v_align != 0)
130 return true; 138 return true;
… …
132# endif 140# endif
133 141
134 return false; 142 return false;
135} 143}
136 144
137bool 145bool
138bgPixmap_t::window_position_sensitive () 146bgPixmap_t::window_position_sensitive ()
139{ 147{
140# ifdef ENABLE_TRANSPARENCY 148# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 149 if (flags & isTransparent)
142 return true; 150 return true;
143# endif 151# endif
144 152
145# ifdef BG_IMAGE_FROM_FILE 153# ifdef BG_IMAGE_FROM_FILE
146# ifdef HAVE_AFTERIMAGE 154# ifdef HAVE_AFTERIMAGE
147 if (original_asim != NULL) 155 if (original_asim)
148# endif 156# endif
149 { 157 {
150 if (h_align == rootAlign || v_align == rootAlign) 158 if (h_align == rootAlign || v_align == rootAlign)
151 return true; 159 return true;
152 } 160 }
… …
156}; 164};
157 165
158bool bgPixmap_t::need_client_side_rendering () 166bool bgPixmap_t::need_client_side_rendering ()
159{ 167{
160# ifdef HAVE_AFTERIMAGE 168# ifdef HAVE_AFTERIMAGE
161 if (original_asim != NULL) 169 if (original_asim)
162 return true; 170 return true;
163# endif 171# endif
164# ifdef ENABLE_TRANSPARENCY 172# ifdef ENABLE_TRANSPARENCY
165 if (flags & isTransparent) 173 if (flags & isTransparent)
166 { 174 {
… …
255 int geom_flags = 0, changed = 0; 263 int geom_flags = 0, changed = 0;
256 int x = 0, y = 0; 264 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 265 unsigned int w = 0, h = 0;
258 unsigned int n; 266 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 267 unsigned long new_flags = (flags & (~geometryFlags));
260 char *p; 268 const char *p;
261# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 269# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 270
263 if (geom == NULL) 271 if (geom == NULL)
264 return false; 272 return false;
265 273
266 char str[MAXLEN_GEOM]; 274 char str[MAXLEN_GEOM];
… …
273 if (n < MAXLEN_GEOM) 281 if (n < MAXLEN_GEOM)
274 { 282 {
275 char *ops; 283 char *ops;
276 new_flags |= geometrySet; 284 new_flags |= geometrySet;
277 285
278 strncpy (str, geom, n); 286 memcpy (str, geom, n);
279 str[n] = '\0'; 287 str[n] = '\0';
280 if (str[0] == ':') 288 if (str[0] == ':')
281 ops = &str[0]; 289 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 290 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0]; 291 ops = &str[0];
… …
366 if (ops) 374 if (ops)
367 { 375 {
368 while (*ops) 376 while (*ops)
369 { 377 {
370 while (*ops == ':' || isspace(*ops)) ++ops; 378 while (*ops == ':' || isspace(*ops)) ++ops;
379
371# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 380# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
372 if (CHECK_GEOM_OPS("tile")) 381 if (CHECK_GEOM_OPS ("tile"))
373 { 382 {
374 w = h = noScale; 383 w = h = noScale;
375 geom_flags |= WidthValue|HeightValue; 384 geom_flags |= WidthValue|HeightValue;
376 } 385 }
377 else if (CHECK_GEOM_OPS("propscale")) 386 else if (CHECK_GEOM_OPS ("propscale"))
378 { 387 {
379 if (w == 0 && h == 0) 388 if (w == 0 && h == 0)
380 { 389 {
381 w = windowScale; 390 w = windowScale;
382 geom_flags |= WidthValue; 391 geom_flags |= WidthValue;
383 } 392 }
384 new_flags |= propScale; 393 new_flags |= propScale;
385 } 394 }
386 else if (CHECK_GEOM_OPS("hscale")) 395 else if (CHECK_GEOM_OPS ("hscale"))
387 { 396 {
388 if (w == 0)
389 w = windowScale; 397 if (w == 0) w = windowScale;
398
390 h = noScale; 399 h = noScale;
391 geom_flags |= WidthValue|HeightValue; 400 geom_flags |= WidthValue|HeightValue;
392 } 401 }
393 else if (CHECK_GEOM_OPS("vscale")) 402 else if (CHECK_GEOM_OPS ("vscale"))
394 { 403 {
395 if (h == 0)
396 h = windowScale; 404 if (h == 0) h = windowScale;
405
397 w = noScale; 406 w = noScale;
398 geom_flags |= WidthValue|HeightValue; 407 geom_flags |= WidthValue|HeightValue;
399 } 408 }
400 else if (CHECK_GEOM_OPS("scale")) 409 else if (CHECK_GEOM_OPS ("scale"))
401 { 410 {
402 if (h == 0)
403 h = windowScale; 411 if (h == 0) h = windowScale;
404 if (w == 0)
405 w = windowScale; 412 if (w == 0) w = windowScale;
413
406 geom_flags |= WidthValue|HeightValue; 414 geom_flags |= WidthValue|HeightValue;
407 } 415 }
408 else if (CHECK_GEOM_OPS("auto")) 416 else if (CHECK_GEOM_OPS ("auto"))
409 { 417 {
410 w = h = windowScale; 418 w = h = windowScale;
411 x = y = centerAlign; 419 x = y = centerAlign;
412 geom_flags |= WidthValue|HeightValue|XValue|YValue; 420 geom_flags |= WidthValue|HeightValue|XValue|YValue;
413 } 421 }
414 else if (CHECK_GEOM_OPS("root")) 422 else if (CHECK_GEOM_OPS ("root"))
415 { 423 {
416 w = h = noScale; 424 w = h = noScale;
417 x = y = rootAlign; 425 x = y = rootAlign;
418 geom_flags |= WidthValue|HeightValue|XValue|YValue; 426 geom_flags |= WidthValue|HeightValue|XValue|YValue;
419 } 427 }
420# undef CHECK_GEOM_OPS 428# undef CHECK_GEOM_OPS
429
421 while (*ops != ':' && *ops != '\0') ++ops; 430 while (*ops != ':' && *ops != '\0') ++ops;
422 } /* done parsing ops */ 431 } /* done parsing ops */
423 } 432 }
424 433
425 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 434 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)) 435 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)) 436 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)) 437 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
432 ++changed;
433 } 438 }
434 439
435 if (new_flags != flags) 440 if (new_flags != flags)
436 { 441 {
437 flags = new_flags; 442 flags = new_flags;
438 changed++; 443 changed++;
439 } 444 }
445
440//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 446//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
441// flags, h_scale, v_scale, h_align, v_align); 447// flags, h_scale, v_scale, h_align, v_align);
442 return (changed > 0); 448 return (changed > 0);
443} 449}
444 450
… …
447bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 453bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint)
448{ 454{
449 if (target == NULL) 455 if (target == NULL)
450 return false; 456 return false;
451 457
458 target->init_asv ();
459
460 ASImage *result = 0;
461
452 int target_width = (int)target->szHint.width; 462 int target_width = target->szHint.width;
453 int target_height = (int)target->szHint.height; 463 int target_height = target->szHint.height;
454 int new_pmap_width = target_width, new_pmap_height = target_height; 464 int new_pmap_width = target_width;
455 ASImage *result = NULL; 465 int new_pmap_height = target_height;
456 466
457 int x = 0; 467 int x = 0;
458 int y = 0; 468 int y = 0;
459 int w = h_scale * target_width / 100; 469 int w = h_scale * target_width / 100;
460 int h = v_scale * target_height / 100; 470 int h = v_scale * target_height / 100;
… …
467 { 477 {
468 target->get_window_origin(x, y); 478 target->get_window_origin(x, y);
469 x = -x; 479 x = -x;
470 y = -y; 480 y = -y;
471 } 481 }
482
472 if (h_align != rootAlign) 483 if (h_align != rootAlign)
473 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width); 484 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
485
474 if (v_align != rootAlign) 486 if (v_align != rootAlign)
475 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height); 487 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
476 } 488 }
477 489
478 if (original_asim == NULL 490 if (!original_asim
479 || x >= target_width 491 || x >= target_width
480 || y >= target_height 492 || y >= target_height
481 || (w > 0 && x + w <= 0) 493 || (w > 0 && x + w <= 0)
482 || (h > 0 && y + h <= 0)) 494 || (h > 0 && y + h <= 0))
483 { 495 {
484 if (background) 496 if (background)
485 { 497 {
486 new_pmap_width = background->width; 498 new_pmap_width = background->width;
487 new_pmap_height = background->height; 499 new_pmap_height = background->height;
488 result = background; 500 result = background;
501
489 if (background_tint != TINT_LEAVE_SAME) 502 if (background_tint != TINT_LEAVE_SAME)
490 { 503 {
491 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 504 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
492 target_width, target_height, background_tint, 505 target_width, target_height, background_tint,
493 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 506 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
494 if (tmp) 507 if (tmp)
495 result = tmp; 508 result = tmp;
496 } 509 }
… …
499 new_pmap_width = new_pmap_height = 0; 512 new_pmap_width = new_pmap_height = 0;
500 } 513 }
501 else 514 else
502 { 515 {
503 result = original_asim; 516 result = original_asim;
517
504 if ((w > 0 && w != original_asim->width) 518 if ((w > 0 && w != original_asim->width)
505 || (h > 0 && h != original_asim->height)) 519 || (h > 0 && h != original_asim->height))
506 { 520 {
507 result = scale_asimage (target->asv, original_asim, 521 result = scale_asimage (target->asv, original_asim,
508 w > 0 ? w : original_asim->width, 522 w > 0 ? w : original_asim->width,
509 h > 0 ? h : original_asim->height, 523 h > 0 ? h : original_asim->height,
510 background ? ASA_ASImage : ASA_XImage, 524 background ? ASA_ASImage : ASA_XImage,
511 100, ASIMAGE_QUALITY_DEFAULT); 525 100, ASIMAGE_QUALITY_DEFAULT);
512 } 526 }
527
513 if (background == NULL) 528 if (background == NULL)
514 { 529 {
515 /* if tiling - pixmap has to be sized exactly as the image, 530 /* if tiling - pixmap has to be sized exactly as the image,
516 but there is no need to make it bigger then the window! */ 531 but there is no need to make it bigger than the window! */
517 if (h_scale == 0) 532 if (h_scale == 0)
518 new_pmap_width = min (result->width, target_width); 533 new_pmap_width = min (result->width, target_width);
519 if (v_scale == 0) 534 if (v_scale == 0)
520 new_pmap_height = min (result->height, target_height); 535 new_pmap_height = min (result->height, target_height);
521 /* we also need to tile our image in one or both directions */ 536 /* we also need to tile our image in one or both directions */
522 if (h_scale == 0 || v_scale == 0) 537 if (h_scale == 0 || v_scale == 0)
523 { 538 {
524 ASImage *tmp = tile_asimage (target->asv, result, 539 ASImage *tmp = tile_asimage (target->asv, result,
525 (h_scale > 0) ? 0 : (int)result->width - x, 540 (h_scale > 0) ? 0 : (int)result->width - x,
526 (v_scale > 0) ? 0 : (int)result->height - y, 541 (v_scale > 0) ? 0 : (int)result->height - y,
527 new_pmap_width, 542 new_pmap_width,
528 new_pmap_height, 543 new_pmap_height,
529 TINT_LEAVE_SAME, ASA_XImage, 544 TINT_LEAVE_SAME, ASA_XImage,
530 100, ASIMAGE_QUALITY_DEFAULT); 545 100, ASIMAGE_QUALITY_DEFAULT);
531 if (tmp) 546 if (tmp)
532 { 547 {
533 if (result != original_asim) 548 if (result != original_asim)
534 destroy_asimage (&result); 549 destroy_asimage (&result);
550
535 result = tmp; 551 result = tmp;
536 } 552 }
537 } 553 }
538 } 554 }
539 else 555 else
… …
545 layers[0].im = background; 561 layers[0].im = background;
546 layers[0].clip_width = target_width; 562 layers[0].clip_width = target_width;
547 layers[0].clip_height = target_height; 563 layers[0].clip_height = target_height;
548 layers[0].tint = background_tint; 564 layers[0].tint = background_tint;
549 layers[1].im = result; 565 layers[1].im = result;
566
550 if (w <= 0) 567 if (w <= 0)
551 { 568 {
552 /* tile horizontally */ 569 /* tile horizontally */
553 while (x > 0) x -= (int)result->width; 570 while (x > 0) x -= (int)result->width;
554 layers[1].dst_x = x; 571 layers[1].dst_x = x;
… …
558 { 575 {
559 /* clip horizontally */ 576 /* clip horizontally */
560 layers[1].dst_x = x; 577 layers[1].dst_x = x;
561 layers[1].clip_width = result->width; 578 layers[1].clip_width = result->width;
562 } 579 }
580
563 if (h <= 0) 581 if (h <= 0)
564 { 582 {
565 while (y > 0) y -= (int)result->height; 583 while (y > 0) y -= (int)result->height;
566 layers[1].dst_y = y; 584 layers[1].dst_y = y;
567 layers[1].clip_height = result->height + target_height; 585 layers[1].clip_height = result->height + target_height;
… …
569 else 587 else
570 { 588 {
571 layers[1].dst_y = y; 589 layers[1].dst_y = y;
572 layers[1].clip_height = result->height; 590 layers[1].clip_height = result->height;
573 } 591 }
592
574 if (target->rs[Rs_blendtype]) 593 if (target->rs[Rs_blendtype])
575 { 594 {
576 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 595 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
577 if (layers[1].merge_scanlines == NULL) 596 if (layers[1].merge_scanlines == NULL)
578 layers[1].merge_scanlines = alphablend_scanlines; 597 layers[1].merge_scanlines = alphablend_scanlines;
579 } 598 }
599
580 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 600 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
581 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 601 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
602
582 if (tmp) 603 if (tmp)
583 { 604 {
584 if (result != original_asim) 605 if (result != original_asim)
585 destroy_asimage (&result); 606 destroy_asimage (&result);
607
586 result = tmp; 608 result = tmp;
587 } 609 }
610
588 free (layers); 611 free (layers);
589 } 612 }
590 } 613 }
591 TIMING_TEST_PRINT_RESULT (asim); 614 TIMING_TEST_PRINT_RESULT (asim);
592 615
… …
621 644
622 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 645 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
623 int dst_width = result->width, dst_height = result->height; 646 int dst_width = result->width, dst_height = result->height;
624 if (background == NULL) 647 if (background == NULL)
625 { 648 {
626 if (h_scale > 0)
627 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 649 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); 650 if (v_scale > 0) src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
630 651
631 if (dst_x > 0 || dst_y > 0 652 if (dst_x > 0 || dst_y > 0
632 || dst_x + dst_width < new_pmap_width 653 || dst_x + dst_width < new_pmap_width
633 || dst_y + dst_height < new_pmap_height) 654 || dst_y + dst_height < new_pmap_height)
634 {
635 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 655 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
636 }
637 } 656 }
638 657
639 /* put result on pixmap */ 658 /* put result on pixmap */
640 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 659 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); 660 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
… …
652# endif /* HAVE_AFTERIMAGE */ 671# endif /* HAVE_AFTERIMAGE */
653 672
654bool 673bool
655bgPixmap_t::set_file (const char *file) 674bgPixmap_t::set_file (const char *file)
656{ 675{
657 char *f;
658
659 assert (file != NULL); 676 assert (file);
660 677
661 if (*file != '\0') 678 if (*file)
662 { 679 {
663# ifdef HAVE_AFTERIMAGE 680# ifdef HAVE_AFTERIMAGE
664 if (target->asimman == NULL) 681 if (!target->asimman)
665 target->asimman = create_generic_imageman (target->rs[Rs_path]); 682 target->asimman = create_generic_imageman (target->rs[Rs_path]);
666 if ((f = strchr (file, ';')) == NULL) 683
667 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 684 if (const char *p = strchr (file, ';'))
668 else
669 { 685 {
670 size_t len = f - file; 686 size_t len = p - file;
671 f = (char *)malloc (len + 1); 687 char *f = (char *)malloc (len + 1);
672 strncpy (f, file, len); 688 memcpy (f, file, len);
673 f[len] = '\0'; 689 f[len] = '\0';
674 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 690 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
675 free (f); 691 free (f);
676 } 692 }
693 else
694 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
695
677 return (original_asim != NULL); 696 return original_asim;
678# endif 697# endif
679 } 698 }
699
680 return false; 700 return false;
681} 701}
682 702
683# endif /* BG_IMAGE_FROM_FILE */ 703# endif /* BG_IMAGE_FROM_FILE */
684 704
… …
689 if (!(flags & isTransparent)) 709 if (!(flags & isTransparent))
690 { 710 {
691 flags |= isTransparent; 711 flags |= isTransparent;
692 return true; 712 return true;
693 } 713 }
714
694 return false; 715 return false;
695} 716}
696 717
697bool 718bool
698bgPixmap_t::set_blur_radius (const char *geom) 719bgPixmap_t::set_blur_radius (const char *geom)
… …
831 unsigned long result = 0; 852 unsigned long result = 0;
832 853
833 if (target == NULL) 854 if (target == NULL)
834 return 0; 855 return 0;
835 856
836 /* root dimentions may change from call to call - but Display structure should 857 /* root dimensions may change from call to call - but Display structure should
837 * be always up-to-date, so let's use it : 858 * be always up-to-date, so let's use it :
838 */ 859 */
839 Window root = target->display->root; 860 Window root = target->display->root;
840 int screen = target->display->screen; 861 int screen = target->display->screen;
841 Display *dpy = target->dpy; 862 Display *dpy = target->dpy;
… …
900 XGrabServer (dpy); 921 XGrabServer (dpy);
901 XMapRaised (dpy, src); 922 XMapRaised (dpy, src);
902 XSync (dpy, False); 923 XSync (dpy, False);
903 924
904 /* XSync should get window where it's properly exposed, 925 /* XSync should get window where it's properly exposed,
905 * but to be on the safe side - let's check for the actuall event to arrive : */ 926 * but to be on the safe side - let's check for the actual event to arrive : */
906 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 927 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
907 ++ev_count; 928 ++ev_count;
908 929
909 if (ev_count > 0); 930 if (ev_count > 0);
910 { 931 {
… …
930 else 951 else
931 result |= transpPmapTiled; 952 result |= transpPmapTiled;
932 } 953 }
933 else 954 else
934 { 955 {
935 /* strightforward pixmap copy */ 956 /* straightforward pixmap copy */
936 gcv.tile = root_pixmap; 957 gcv.tile = root_pixmap;
937 gcv.fill_style = FillTiled; 958 gcv.fill_style = FillTiled;
938 959
939 while (sx < 0) sx += (int)root_width; 960 while (sx < 0) sx += (int)root_width;
940 while (sy < 0) sy += (int)root_height; 961 while (sy < 0) sy += (int)root_height;
… …
1091 return false; 1112 return false;
1092} 1113}
1093# endif /* ENABLE_TRANSPARENCY */ 1114# endif /* ENABLE_TRANSPARENCY */
1094 1115
1095# ifndef HAVE_AFTERIMAGE 1116# ifndef HAVE_AFTERIMAGE
1096static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1117static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1097# endif 1118# endif
1098 1119
1099bool 1120bool
1100bgPixmap_t::render () 1121bgPixmap_t::render ()
1101{ 1122{
… …
1104 if (target == NULL) 1125 if (target == NULL)
1105 return false; 1126 return false;
1106 1127
1107 TIMING_TEST_START (tp); 1128 TIMING_TEST_START (tp);
1108 1129
1109 invalidate(); 1130 invalidate ();
1110# ifdef ENABLE_TRANSPARENCY 1131# ifdef ENABLE_TRANSPARENCY
1111 if (flags & isTransparent) 1132 if (flags & isTransparent)
1112 { 1133 {
1113 /* we need to re-generate transparency pixmap in that case ! */ 1134 /* we need to re-generate transparency pixmap in that case ! */
1114 background_flags = make_transparency_pixmap (); 1135 background_flags = make_transparency_pixmap ();
… …
1123 XImage *result = NULL; 1144 XImage *result = NULL;
1124# ifdef HAVE_AFTERIMAGE 1145# ifdef HAVE_AFTERIMAGE
1125 if (original_asim 1146 if (original_asim
1126 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1147 || (background_flags & transpTransformations) != (flags & transpTransformations))
1127 { 1148 {
1149 target->init_asv ();
1150
1128 ASImage *background = NULL; 1151 ASImage *background = NULL;
1129 ARGB32 as_tint = TINT_LEAVE_SAME; 1152 ARGB32 as_tint = TINT_LEAVE_SAME;
1130 if (background_flags) 1153 if (background_flags)
1131 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 1154 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1132 1155
1133# ifdef ENABLE_TRANSPARENCY 1156# ifdef ENABLE_TRANSPARENCY
1134 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1157 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1135 { 1158 {
1136 ShadingInfo as_shade; 1159 ShadingInfo as_shade;
… …
1143 as_shade.tintColor.green = c.g; 1166 as_shade.tintColor.green = c.g;
1144 as_shade.tintColor.blue = c.b; 1167 as_shade.tintColor.blue = c.b;
1145 1168
1146 as_tint = shading2tint32 (&as_shade); 1169 as_tint = shading2tint32 (&as_shade);
1147 } 1170 }
1171
1148 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL) 1172 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1149 { 1173 {
1150 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 1174 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1151 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage, 1175 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1152 100, ASIMAGE_QUALITY_DEFAULT); 1176 100, ASIMAGE_QUALITY_DEFAULT);
1153 if (tmp) 1177 if (tmp)
1154 { 1178 {
1155 destroy_asimage (&background); 1179 destroy_asimage (&background);
… …
1159# endif 1183# endif
1160 1184
1161 if (render_asim (background, as_tint)) 1185 if (render_asim (background, as_tint))
1162 flags = flags & ~isInvalid; 1186 flags = flags & ~isInvalid;
1163 if (background) 1187 if (background)
1164 destroy_asimage (&background); 1188 destroy_asimage (&background);
1165 } 1189 }
1166 else if (background_flags && pmap_depth != target->depth) 1190 else if (background_flags && pmap_depth != target->depth)
1191 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1192
1193# elif !XFT /* our own client-side tinting */
1194
1195 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1196 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1197
1198 if (background_flags && (flags & isInvalid))
1167 { 1199 {
1168 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1200 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1169 }
1170 1201
1171# elif !XFT /* our own client-side tinting */
1172
1173 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1174 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1175
1176 if (background_flags && (flags & isInvalid))
1177 {
1178 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1179 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1202 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1180 { 1203 {
1181 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1204 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1182 if (flags & tintSet) 1205 if (flags & tintSet)
1183 tint.get (c); 1206 tint.get (c);
… …
1237 pixmap = None; 1260 pixmap = None;
1238 } 1261 }
1239 } 1262 }
1240 1263
1241 apply (); 1264 apply ();
1265
1266 XSync (target->dpy, False);
1267 valid_since = ev::now ();
1242 1268
1243 TIMING_TEST_PRINT_RESULT (tp); 1269 TIMING_TEST_PRINT_RESULT (tp);
1244 1270
1245 return true; 1271 return true;
1246} 1272}
… …
1255# ifdef ENABLE_TRANSPARENCY 1281# ifdef ENABLE_TRANSPARENCY
1256 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1282 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1257# endif 1283# endif
1258 return true; 1284 return true;
1259 } 1285 }
1286
1260 return false; 1287 return false;
1261} 1288}
1262 1289
1263void 1290void
1264bgPixmap_t::apply () 1291bgPixmap_t::apply ()
1265{ 1292{
1266 if (target) 1293 if (target)
1267 { 1294 {
1268 flags &= ~isVtOrigin; 1295 flags &= ~isVtOrigin;
1296
1269 if (pixmap != None) 1297 if (pixmap != None)
1270 { 1298 {
1271 /* set target's background to pixmap */ 1299 /* set target's background to pixmap */
1272# ifdef ENABLE_TRANSPARENCY 1300# ifdef ENABLE_TRANSPARENCY
1273 if (flags & isTransparent) 1301 if (flags & isTransparent)
1274 { 1302 {
1275 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1303 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1276 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1304 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1277# if HAVE_SCROLLBARS 1305
1278 if (target->scrollBar.win) 1306 if (target->scrollBar.win)
1279 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1307 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1280# endif
1281 } 1308 }
1282 else 1309 else
1283# endif 1310# endif
1284 { 1311 {
1285 flags |= isVtOrigin; 1312 flags |= isVtOrigin;
1286 /* force old pixmap dereference in case it was transparent before :*/ 1313 /* force old pixmap dereference in case it was transparent before :*/
1287 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1314 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1288 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1315 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1289 /* do we also need to set scrollbar's background here ? */ 1316 /* do we also need to set scrollbar's background here ? */
1290# if HAVE_SCROLLBARS 1317
1291 if (target->scrollBar.win) 1318 if (target->scrollBar.win)
1292 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1319 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1293# endif
1294 } 1320 }
1295 } 1321 }
1296 else 1322 else
1297 { 1323 {
1298 /* set target background to a pixel */ 1324 /* set target background to a pixel */
1299 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1325 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1300 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1326 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1301 /* do we also need to set scrollbar's background here ? */ 1327 /* do we also need to set scrollbar's background here ? */
1302# if HAVE_SCROLLBARS
1303 if (target->scrollBar.win) 1328 if (target->scrollBar.win)
1304 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1329 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1305# endif
1306 } 1330 }
1331
1307 /* don't want Expose on the parent or vt. It is better to use 1332 /* don't want Expose on the parent or vt. It is better to use
1308 scr_touch or we get a great deal of flicker otherwise: */ 1333 scr_touch or we get a great deal of flicker otherwise: */
1309 XClearWindow (target->dpy, target->parent[0]); 1334 XClearWindow (target->dpy, target->parent[0]);
1310 1335
1311# if HAVE_SCROLLBARS 1336 if (target->scrollBar.state && target->scrollBar.win)
1312 if (target->scrollBar.win)
1313 { 1337 {
1314 target->scrollBar.setIdle (); 1338 target->scrollBar.state = STATE_IDLE;
1315 target->scrollbar_show (0); 1339 target->scrollBar.show (0);
1316 } 1340 }
1317# endif
1318 1341
1319 target->want_refresh = 1; 1342 target->want_refresh = 1;
1320 flags |= hasChanged; 1343 flags |= hasChanged;
1321 } 1344 }
1322} 1345}
… …
1327/* taken from aterm-0.4.2 */ 1350/* taken from aterm-0.4.2 */
1328 1351
1329typedef uint32_t RUINT32T; 1352typedef uint32_t RUINT32T;
1330 1353
1331static void 1354static void
1332ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1355ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1333{ 1356{
1334 int sh_r, sh_g, sh_b; 1357 int sh_r, sh_g, sh_b;
1335 RUINT32T mask_r, mask_g, mask_b; 1358 RUINT32T mask_r, mask_g, mask_b;
1336 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1359 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1337 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1360 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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