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.25 by root, Sat Jan 19 00:21:59 2008 UTC vs.
Revision 1.60 by sf-exg, Sun Oct 3 20:41:32 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
48 * adjustment and may optionally be followed by a colon and one or more 52 * adjustment and may optionally be followed by a colon and one or more
49 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
50 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
51 * affects on the background image : 55 * effects on the background image :
52 * 56 *
53 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 57 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
54 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
55 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
56 * the image in the window. 60 * the image in the window.
57 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
58 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
59 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
60 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
61 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
62 * 66 *
63 * Adjusting position only : 67 * Adjusting position only :
64 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
65 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
66 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
67 * from current position (relative). 71 * from current position (relative).
68 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
69 * from current position. 73 * from current position.
70 * 74 *
71 * Adjusting scale only : 75 * Adjusting scale only :
72 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
73 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
74 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
75 * 79 *
76 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
77 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
78 * the tile size and origin. 82 * the tile size and origin.
79 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
80 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
81 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
82 * current background color. 86 * current background color.
83 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
84 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
… …
92 // this is basically redundant as bgPixmap_t is only used in 96 // this is basically redundant as bgPixmap_t is only used in
93 // zero_initialised-derived structs 97 // zero_initialised-derived structs
94#ifdef HAVE_AFTERIMAGE 98#ifdef HAVE_AFTERIMAGE
95 original_asim = NULL; 99 original_asim = NULL;
96#endif 100#endif
101#ifdef HAVE_PIXBUF
102 pixbuf = NULL;
103#endif
97#ifdef BG_IMAGE_FROM_FILE 104#ifdef BG_IMAGE_FROM_FILE
105 have_image = false;
98 h_scale = v_scale = 0; 106 h_scale = v_scale = 0;
99 h_align = v_align = 0; 107 h_align = v_align = 0;
100#endif 108#endif
101 flags = 0; 109 flags = 0;
102 pixmap = None; 110 pixmap = None;
… …
110#ifdef HAVE_AFTERIMAGE 118#ifdef HAVE_AFTERIMAGE
111 if (original_asim) 119 if (original_asim)
112 safe_asimage_destroy (original_asim); 120 safe_asimage_destroy (original_asim);
113#endif 121#endif
114 122
123#ifdef HAVE_PIXBUF
124 if (pixbuf)
125 g_object_unref (pixbuf);
126#endif
127
115 if (pixmap && target) 128 if (pixmap && target)
116 XFreePixmap (target->dpy, pixmap); 129 XFreePixmap (target->dpy, pixmap);
117} 130}
118 131
119bool 132bool
… …
123 if (flags & isTransparent) 136 if (flags & isTransparent)
124 return true; 137 return true;
125# endif 138# endif
126 139
127# ifdef BG_IMAGE_FROM_FILE 140# ifdef BG_IMAGE_FROM_FILE
128# ifdef HAVE_AFTERIMAGE 141 if (have_image)
129 if (original_asim)
130# endif
131 { 142 {
132 if (h_scale != 0 || v_scale != 0 143 if (h_scale != 0 || v_scale != 0
133 || h_align != 0 || v_align != 0) 144 || h_align != 0 || v_align != 0)
134 return true; 145 return true;
135 } 146 }
136# endif 147# endif
137 148
138 return false; 149 return false;
139} 150}
140 151
141bool 152bool
142bgPixmap_t::window_position_sensitive () 153bgPixmap_t::window_position_sensitive ()
143{ 154{
144# ifdef ENABLE_TRANSPARENCY 155# ifdef ENABLE_TRANSPARENCY
145 if (flags & isTransparent) 156 if (flags & isTransparent)
146 return true; 157 return true;
147# endif 158# endif
148 159
149# ifdef BG_IMAGE_FROM_FILE 160# ifdef BG_IMAGE_FROM_FILE
150# ifdef HAVE_AFTERIMAGE 161 if (have_image)
151 if (original_asim)
152# endif
153 { 162 {
154 if (h_align == rootAlign || v_align == rootAlign) 163 if (h_align == rootAlign || v_align == rootAlign)
155 return true; 164 return true;
156 } 165 }
157# endif 166# endif
… …
219 228
220static inline int 229static inline int
221make_align_position (int align, int window_size, int image_size) 230make_align_position (int align, int window_size, int image_size)
222{ 231{
223 int diff = window_size - image_size; 232 int diff = window_size - image_size;
224 int smaller = MIN (image_size,window_size); 233 int smaller = min (image_size, window_size);
225 234
226 if (align >= 0 && align <= 50) 235 if (align >= 0 && align <= 50)
227 return diff * align / 100; 236 return diff * align / 100;
228 else if (align > 50 && align <= 100) 237 else if (align > 50 && align <= 100)
229 return window_size - image_size - diff * (100 - align) / 100; 238 return window_size - image_size - diff * (100 - align) / 100;
… …
238make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 247make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
239{ 248{
240 int src_pos = 0; 249 int src_pos = 0;
241 dst_pos = 0; 250 dst_pos = 0;
242 dst_size = size; 251 dst_size = size;
243 if (pos < 0 && size > target_size) 252 if (pos < 0)
244 { 253 {
245 src_pos = -pos; 254 src_pos = -pos;
246 dst_size += pos; 255 dst_size += pos;
247 } 256 }
248 else if (pos > 0) 257 else if (pos > 0)
… …
259 int geom_flags = 0, changed = 0; 268 int geom_flags = 0, changed = 0;
260 int x = 0, y = 0; 269 int x = 0, y = 0;
261 unsigned int w = 0, h = 0; 270 unsigned int w = 0, h = 0;
262 unsigned int n; 271 unsigned int n;
263 unsigned long new_flags = (flags & (~geometryFlags)); 272 unsigned long new_flags = (flags & (~geometryFlags));
264 char *p; 273 const char *p;
265# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */ 274# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
266 275
267 if (geom == NULL) 276 if (geom == NULL)
268 return false; 277 return false;
269 278
… …
370 if (ops) 379 if (ops)
371 { 380 {
372 while (*ops) 381 while (*ops)
373 { 382 {
374 while (*ops == ':' || isspace(*ops)) ++ops; 383 while (*ops == ':' || isspace(*ops)) ++ops;
384
375# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 385# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
376 if (CHECK_GEOM_OPS("tile")) 386 if (CHECK_GEOM_OPS ("tile"))
377 { 387 {
378 w = h = noScale; 388 w = h = noScale;
379 geom_flags |= WidthValue|HeightValue; 389 geom_flags |= WidthValue|HeightValue;
380 } 390 }
381 else if (CHECK_GEOM_OPS("propscale")) 391 else if (CHECK_GEOM_OPS ("propscale"))
382 { 392 {
383 if (w == 0 && h == 0) 393 if (w == 0 && h == 0)
384 { 394 {
385 w = windowScale; 395 w = windowScale;
386 geom_flags |= WidthValue; 396 geom_flags |= WidthValue;
387 } 397 }
388 new_flags |= propScale; 398 new_flags |= propScale;
389 } 399 }
390 else if (CHECK_GEOM_OPS("hscale")) 400 else if (CHECK_GEOM_OPS ("hscale"))
391 { 401 {
392 if (w == 0)
393 w = windowScale; 402 if (w == 0) w = windowScale;
403
394 h = noScale; 404 h = noScale;
395 geom_flags |= WidthValue|HeightValue; 405 geom_flags |= WidthValue|HeightValue;
396 } 406 }
397 else if (CHECK_GEOM_OPS("vscale")) 407 else if (CHECK_GEOM_OPS ("vscale"))
398 { 408 {
399 if (h == 0)
400 h = windowScale; 409 if (h == 0) h = windowScale;
410
401 w = noScale; 411 w = noScale;
402 geom_flags |= WidthValue|HeightValue; 412 geom_flags |= WidthValue|HeightValue;
403 } 413 }
404 else if (CHECK_GEOM_OPS("scale")) 414 else if (CHECK_GEOM_OPS ("scale"))
405 { 415 {
406 if (h == 0)
407 h = windowScale; 416 if (h == 0) h = windowScale;
408 if (w == 0)
409 w = windowScale; 417 if (w == 0) w = windowScale;
418
410 geom_flags |= WidthValue|HeightValue; 419 geom_flags |= WidthValue|HeightValue;
411 } 420 }
412 else if (CHECK_GEOM_OPS("auto")) 421 else if (CHECK_GEOM_OPS ("auto"))
413 { 422 {
414 w = h = windowScale; 423 w = h = windowScale;
415 x = y = centerAlign; 424 x = y = centerAlign;
416 geom_flags |= WidthValue|HeightValue|XValue|YValue; 425 geom_flags |= WidthValue|HeightValue|XValue|YValue;
417 } 426 }
418 else if (CHECK_GEOM_OPS("root")) 427 else if (CHECK_GEOM_OPS ("root"))
419 { 428 {
420 w = h = noScale; 429 w = h = noScale;
421 x = y = rootAlign; 430 x = y = rootAlign;
422 geom_flags |= WidthValue|HeightValue|XValue|YValue; 431 geom_flags |= WidthValue|HeightValue|XValue|YValue;
423 } 432 }
424# undef CHECK_GEOM_OPS 433# undef CHECK_GEOM_OPS
434
425 while (*ops != ':' && *ops != '\0') ++ops; 435 while (*ops != ':' && *ops != '\0') ++ops;
426 } /* done parsing ops */ 436 } /* done parsing ops */
427 } 437 }
428 438
429 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 439 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
430 ++changed;
431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 440 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
432 ++changed;
433 if (check_set_align_value (geom_flags, XValue, h_align, x)) 441 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
434 ++changed;
435 if (check_set_align_value (geom_flags, YValue, v_align, y)) 442 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
436 ++changed;
437 } 443 }
438 444
439 if (new_flags != flags) 445 if (new_flags != flags)
440 { 446 {
441 flags = new_flags; 447 flags = new_flags;
442 changed++; 448 changed++;
443 } 449 }
450
444//fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 451 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
445// flags, h_scale, v_scale, h_align, v_align); 452 // flags, h_scale, v_scale, h_align, v_align);
446 return (changed > 0); 453 return (changed > 0);
454}
455
456void
457bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
458{
459 int target_width = target->szHint.width;
460 int target_height = target->szHint.height;
461
462 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100;
464
465 if (h_align == rootAlign || v_align == rootAlign)
466 {
467 target->get_window_origin (x, y);
468 x = -x;
469 y = -y;
470 }
471
472 if (h_align != rootAlign)
473 x = make_align_position (h_align, target_width, w > 0 ? w : image_width);
474
475 if (v_align != rootAlign)
476 y = make_align_position (v_align, target_height, h > 0 ? h : image_height);
447} 477}
448 478
449# ifdef HAVE_AFTERIMAGE 479# ifdef HAVE_AFTERIMAGE
450bool 480bool
451bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 481bgPixmap_t::render_image (unsigned long background_flags)
452{ 482{
453 if (target == NULL) 483 if (target == NULL)
454 return false; 484 return false;
455 485
486 target->init_asv ();
487
488 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME;
490
491# ifdef ENABLE_TRANSPARENCY
492 if (background_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
494
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
496 {
497 ShadingInfo as_shade;
498 as_shade.shading = (shade == 0) ? 100 : shade;
499
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501 if (flags & tintSet)
502 tint.get (c);
503 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b;
506
507 background_tint = shading2tint32 (&as_shade);
508 }
509
510 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
511 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
514 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp)
516 {
517 destroy_asimage (&background);
518 background = tmp;
519 }
520 }
521# endif
522
523 ASImage *result = 0;
524
456 int target_width = (int)target->szHint.width; 525 int target_width = target->szHint.width;
457 int target_height = (int)target->szHint.height; 526 int target_height = target->szHint.height;
458 int new_pmap_width = target_width, new_pmap_height = target_height; 527 int new_pmap_width = target_width;
459 ASImage *result = NULL; 528 int new_pmap_height = target_height;
460 529
461 int x = 0; 530 int x = 0;
462 int y = 0; 531 int y = 0;
463 int w = h_scale * target_width / 100; 532 int w = 0;
464 int h = v_scale * target_height / 100; 533 int h = 0;
465 534
466 TIMING_TEST_START (asim); 535 TIMING_TEST_START (asim);
467 536
468 if (original_asim) 537 if (original_asim)
469 { 538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
470 if (h_align == rootAlign || v_align == rootAlign)
471 {
472 target->get_window_origin(x, y);
473 x = -x;
474 y = -y;
475 }
476
477 if (h_align != rootAlign)
478 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
479
480 if (v_align != rootAlign)
481 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
482 }
483 539
484 if (!original_asim 540 if (!original_asim
485 || x >= target_width 541 || x >= target_width
486 || y >= target_height 542 || y >= target_height
487 || (w > 0 && x + w <= 0) 543 || (w > 0 && x + w <= 0)
… …
493 new_pmap_height = background->height; 549 new_pmap_height = background->height;
494 result = background; 550 result = background;
495 551
496 if (background_tint != TINT_LEAVE_SAME) 552 if (background_tint != TINT_LEAVE_SAME)
497 { 553 {
498 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 554 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
499 target_width, target_height, background_tint, 555 target_width, target_height, background_tint,
500 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 556 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
501 if (tmp) 557 if (tmp)
502 result = tmp; 558 result = tmp;
503 } 559 }
… …
519 100, ASIMAGE_QUALITY_DEFAULT); 575 100, ASIMAGE_QUALITY_DEFAULT);
520 } 576 }
521 577
522 if (background == NULL) 578 if (background == NULL)
523 { 579 {
524 /* if tiling - pixmap has to be sized exactly as the image,
525 but there is no need to make it bigger than the window! */
526 if (h_scale == 0)
527 new_pmap_width = min (result->width, target_width);
528 if (v_scale == 0)
529 new_pmap_height = min (result->height, target_height);
530 /* we also need to tile our image in one or both directions */
531 if (h_scale == 0 || v_scale == 0) 580 if (h_scale == 0 || v_scale == 0)
532 { 581 {
582 /* if tiling - pixmap has to be sized exactly as the image,
583 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height);
586
587 /* we also need to tile our image in both directions */
533 ASImage *tmp = tile_asimage (target->asv, result, 588 ASImage *tmp = tile_asimage (target->asv, result,
534 (h_scale > 0) ? 0 : (int)result->width - x, 589 (int)result->width - x,
535 (v_scale > 0) ? 0 : (int)result->height - y, 590 (int)result->height - y,
536 new_pmap_width, 591 new_pmap_width,
537 new_pmap_height, 592 new_pmap_height,
538 TINT_LEAVE_SAME, ASA_XImage, 593 TINT_LEAVE_SAME, ASA_XImage,
539 100, ASIMAGE_QUALITY_DEFAULT); 594 100, ASIMAGE_QUALITY_DEFAULT);
540 if (tmp) 595 if (tmp)
541 { 596 {
… …
548 } 603 }
549 else 604 else
550 { 605 {
551 /* if blending background and image - pixmap has to be sized same as target window */ 606 /* if blending background and image - pixmap has to be sized same as target window */
552 ASImageLayer *layers = create_image_layers (2); 607 ASImageLayer *layers = create_image_layers (2);
553 ASImage *merged_im = NULL;
554 608
555 layers[0].im = background; 609 layers[0].im = background;
556 layers[0].clip_width = target_width; 610 layers[0].clip_width = target_width;
557 layers[0].clip_height = target_height; 611 layers[0].clip_height = target_height;
558 layers[0].tint = background_tint; 612 layers[0].tint = background_tint;
… …
605 free (layers); 659 free (layers);
606 } 660 }
607 } 661 }
608 TIMING_TEST_PRINT_RESULT (asim); 662 TIMING_TEST_PRINT_RESULT (asim);
609 663
610 if (pixmap) 664 bool ret = false;
611 {
612 if (result == NULL
613 || pmap_width != new_pmap_width
614 || pmap_height != new_pmap_height
615 || pmap_depth != target->depth)
616 {
617 XFreePixmap (target->dpy, pixmap);
618 pixmap = None;
619 }
620 }
621 665
622 if (result) 666 if (result)
623 { 667 {
624 XGCValues gcv; 668 XGCValues gcv;
625 GC gc; 669 GC gc;
670
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
626 681
627 /* create Pixmap */ 682 /* create Pixmap */
628 if (pixmap == None) 683 if (pixmap == None)
629 { 684 {
630 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
631 pmap_width = new_pmap_width; 686 pmap_width = new_pmap_width;
632 pmap_height = new_pmap_height; 687 pmap_height = new_pmap_height;
633 pmap_depth = target->depth; 688 pmap_depth = target->depth;
634 } 689 }
635 /* fill with background color ( if result's not completely overlapping it)*/ 690 /* fill with background color (if result's not completely overlapping it) */
636 gcv.foreground = target->pix_colors[Color_bg]; 691 gcv.foreground = target->pix_colors[Color_bg];
637 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
638 693
639 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
640 int dst_width = result->width, dst_height = result->height; 695 int dst_width = result->width, dst_height = result->height;
641 if (background == NULL) 696 if (background == NULL)
642 { 697 {
643 if (h_scale > 0) 698 if (!(h_scale == 0 || v_scale == 0))
699 {
644 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 700 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
645 if (v_scale > 0)
646 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 701 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
702 }
647 703
648 if (dst_x > 0 || dst_y > 0 704 if (dst_x > 0 || dst_y > 0
649 || dst_x + dst_width < new_pmap_width 705 || dst_x + dst_width < new_pmap_width
650 || dst_y + dst_height < new_pmap_height) 706 || dst_y + dst_height < new_pmap_height)
651 {
652 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
653 }
654 } 708 }
655 709
656 /* put result on pixmap */ 710 /* put result on pixmap */
657 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 711 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
658 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 712 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
… …
660 if (result != background && result != original_asim) 714 if (result != background && result != original_asim)
661 destroy_asimage (&result); 715 destroy_asimage (&result);
662 716
663 XFreeGC (target->dpy, gc); 717 XFreeGC (target->dpy, gc);
664 TIMING_TEST_PRINT_RESULT (asim); 718 TIMING_TEST_PRINT_RESULT (asim);
665 }
666 719
720 ret = true;
721 }
722
723 if (background)
724 destroy_asimage (&background);
725
667 return true; 726 return ret;
668} 727}
669# endif /* HAVE_AFTERIMAGE */ 728# endif /* HAVE_AFTERIMAGE */
729
730# ifdef HAVE_PIXBUF
731bool
732bgPixmap_t::render_image (unsigned long background_flags)
733{
734 if (target == NULL)
735 return false;
736
737 if (!pixbuf)
738 return false;
739
740 // TODO: add alpha blending
741 if (background_flags)
742 return false;
743
744 GdkPixbuf *result;
745
746 int image_width = gdk_pixbuf_get_width (pixbuf);
747 int image_height = gdk_pixbuf_get_height (pixbuf);
748
749 int target_width = target->szHint.width;
750 int target_height = target->szHint.height;
751 int new_pmap_width = target_width;
752 int new_pmap_height = target_height;
753
754 int x = 0;
755 int y = 0;
756 int w = 0;
757 int h = 0;
758
759 get_image_geometry (image_width, image_height, w, h, x, y);
760
761 if (x >= target_width
762 || y >= target_height
763 || (w > 0 && x + w <= 0)
764 || (h > 0 && y + h <= 0))
765 return false;
766
767 result = pixbuf;
768
769 if ((w > 0 && w != image_width)
770 || (h > 0 && h != image_height))
771 {
772 result = gdk_pixbuf_scale_simple (pixbuf,
773 w > 0 ? w : image_width,
774 h > 0 ? h : image_height,
775 GDK_INTERP_BILINEAR);
776 }
777
778 bool ret = false;
779
780 if (result)
781 {
782 XGCValues gcv;
783 GC gc;
784
785 image_width = gdk_pixbuf_get_width (result);
786 image_height = gdk_pixbuf_get_height (result);
787
788 if (h_scale == 0 || v_scale == 0)
789 {
790 new_pmap_width = min (image_width, target_width);
791 new_pmap_height = min (image_height, target_height);
792 }
793
794 if (pixmap)
795 {
796 if (pmap_width != new_pmap_width
797 || pmap_height != new_pmap_height
798 || pmap_depth != target->depth)
799 {
800 XFreePixmap (target->dpy, pixmap);
801 pixmap = None;
802 }
803 }
804
805 if (pixmap == None)
806 {
807 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
808 pmap_width = new_pmap_width;
809 pmap_height = new_pmap_height;
810 pmap_depth = target->depth;
811 }
812
813 gcv.foreground = target->pix_colors[Color_bg];
814 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
815
816 if (h_scale == 0 || v_scale == 0)
817 {
818 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
819 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
820 0, 0,
821 0, 0,
822 image_width, image_height,
823 XLIB_RGB_DITHER_NONE,
824 0, 0);
825
826 gcv.tile = tile;
827 gcv.fill_style = FillTiled;
828 gcv.ts_x_origin = x;
829 gcv.ts_y_origin = y;
830 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
831
832 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
833 XFreePixmap (target->dpy, tile);
834 }
835 else
836 {
837 int src_x, src_y, dst_x, dst_y;
838 int dst_width, dst_height;
839
840 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
841 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
842
843 if (dst_x > 0 || dst_y > 0
844 || dst_x + dst_width < new_pmap_width
845 || dst_y + dst_height < new_pmap_height)
846 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
847
848 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
849 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
850 src_x, src_y,
851 dst_x, dst_y,
852 dst_width, dst_height,
853 XLIB_RGB_DITHER_NONE,
854 0, 0);
855 }
856
857 if (result != pixbuf)
858 g_object_unref (result);
859
860 XFreeGC (target->dpy, gc);
861
862 ret = true;
863 }
864
865 return ret;
866}
867# endif /* HAVE_PIXBUF */
670 868
671bool 869bool
672bgPixmap_t::set_file (const char *file) 870bgPixmap_t::set_file (const char *file)
673{ 871{
674 char *f;
675
676 assert (file); 872 assert (file);
677 873
678 if (*file) 874 if (*file)
679 { 875 {
680# ifdef HAVE_AFTERIMAGE 876 if (const char *p = strchr (file, ';'))
681 if (target->asimman == NULL)
682 target->asimman = create_generic_imageman (target->rs[Rs_path]);
683
684 if ((f = strchr (file, ';')) == NULL)
685 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
686 else
687 { 877 {
688 size_t len = f - file; 878 size_t len = p - file;
689 f = (char *)malloc (len + 1); 879 char *f = rxvt_temp_buf<char> (len + 1);
690 memcpy (f, file, len); 880 memcpy (f, file, len);
691 f[len] = '\0'; 881 f[len] = '\0';
882 file = f;
883 }
884
885# ifdef HAVE_AFTERIMAGE
886 if (!target->asimman)
887 target->asimman = create_generic_imageman (target->rs[Rs_path]);
692 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100); 888 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
693 free (f); 889 if (original_asim)
694 } 890 have_image = true;
891 return have_image;
892# endif
695 893
696 return original_asim; 894# ifdef HAVE_PIXBUF
895 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
896 if (pixbuf)
897 have_image = true;
898 return have_image;
697# endif 899# endif
698 } 900 }
699 901
700 return false; 902 return false;
701} 903}
… …
721 int changed = 0; 923 int changed = 0;
722 unsigned int hr, vr; 924 unsigned int hr, vr;
723 int junk; 925 int junk;
724 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 926 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
725 927
726 if (!(geom_flags&WidthValue)) 928 if (!(geom_flags & WidthValue))
727 hr = 1; 929 hr = 1;
728 if (!(geom_flags&HeightValue)) 930 if (!(geom_flags & HeightValue))
729 vr = hr; 931 vr = hr;
730 932
731 if (h_blurRadius != hr) 933 if (h_blurRadius != hr)
732 { 934 {
733 ++changed; 935 ++changed;
… …
743 if (v_blurRadius == 0 && h_blurRadius == 0) 945 if (v_blurRadius == 0 && h_blurRadius == 0)
744 flags &= ~blurNeeded; 946 flags &= ~blurNeeded;
745 else 947 else
746 flags |= blurNeeded; 948 flags |= blurNeeded;
747 949
748 return (changed>0); 950 return (changed > 0);
749} 951}
750 952
751static inline unsigned long 953static inline unsigned long
752compute_tint_shade_flags (rxvt_color *tint, int shade) 954compute_tint_shade_flags (rxvt_color *tint, int shade)
753{ 955{
… …
770 flags |= bgPixmap_t::tintNeeded; 972 flags |= bgPixmap_t::tintNeeded;
771 else if (tint) 973 else if (tint)
772 { 974 {
773 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 975 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
774 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 976 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
775 { 977 {
776 flags |= bgPixmap_t::tintNeeded; 978 flags |= bgPixmap_t::tintNeeded;
777 } 979 }
778 } 980 }
779 981
780 if (flags & bgPixmap_t::tintNeeded) 982 if (flags & bgPixmap_t::tintNeeded)
781 { 983 {
782 if (flags & bgPixmap_t::tintWholesome) 984 if (flags & bgPixmap_t::tintWholesome)
… …
811{ 1013{
812 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1014 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
813 1015
814 if (new_flags != (flags & tintFlags)) 1016 if (new_flags != (flags & tintFlags))
815 { 1017 {
816 flags = (flags&~tintFlags)|new_flags; 1018 flags = (flags & ~tintFlags) | new_flags;
817 return true; 1019 return true;
818 } 1020 }
819 1021
820 return false; 1022 return false;
821} 1023}
822 1024
… …
852 unsigned long result = 0; 1054 unsigned long result = 0;
853 1055
854 if (target == NULL) 1056 if (target == NULL)
855 return 0; 1057 return 0;
856 1058
857 /* root dimentions may change from call to call - but Display structure should 1059 /* root dimensions may change from call to call - but Display structure should
858 * be always up-to-date, so let's use it : 1060 * be always up-to-date, so let's use it :
859 */ 1061 */
860 Window root = target->display->root; 1062 Window root = target->display->root;
861 int screen = target->display->screen; 1063 int screen = target->display->screen;
862 Display *dpy = target->dpy; 1064 Display *dpy = target->dpy;
… …
907 1109
908 attr.background_pixmap = ParentRelative; 1110 attr.background_pixmap = ParentRelative;
909 attr.backing_store = Always; 1111 attr.backing_store = Always;
910 attr.event_mask = ExposureMask; 1112 attr.event_mask = ExposureMask;
911 attr.override_redirect = True; 1113 attr.override_redirect = True;
912 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1114 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
913 CopyFromParent, CopyFromParent, CopyFromParent, 1115 CopyFromParent, CopyFromParent, CopyFromParent,
914 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1116 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
915 &attr); 1117 &attr);
916 1118
917 if (src != None) 1119 if (src != None)
… …
941 XDestroyWindow (dpy, src); 1143 XDestroyWindow (dpy, src);
942 XUngrabServer (dpy); 1144 XUngrabServer (dpy);
943 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1145 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
944 } 1146 }
945 1147
946 if (!success) 1148 if (!success)
947 { 1149 {
948 XFreePixmap (dpy, tiled_root_pmap); 1150 XFreePixmap (dpy, tiled_root_pmap);
949 tiled_root_pmap = None; 1151 tiled_root_pmap = None;
950 } 1152 }
951 else 1153 else
952 result |= transpPmapTiled; 1154 result |= transpPmapTiled;
953 } 1155 }
954 else 1156 else
955 { 1157 {
956 /* strightforward pixmap copy */ 1158 /* straightforward pixmap copy */
957 gcv.tile = root_pixmap; 1159 gcv.tile = root_pixmap;
958 gcv.fill_style = FillTiled; 1160 gcv.fill_style = FillTiled;
959 1161
960 while (sx < 0) sx += (int)root_width; 1162 while (sx < 0) sx += (int)root_width;
961 while (sy < 0) sy += (int)root_height; 1163 while (sy < 0) sy += (int)root_height;
… …
1074# if DO_TIMING_TEST 1276# if DO_TIMING_TEST
1075 XSync (dpy, False); 1277 XSync (dpy, False);
1076# endif 1278# endif
1077# endif 1279# endif
1078 } 1280 }
1079 } 1281 }
1080 } /* server side rendering completed */ 1282 } /* server side rendering completed */
1081 1283
1082 if (pixmap) 1284 if (pixmap)
1083 XFreePixmap (dpy, pixmap); 1285 XFreePixmap (dpy, pixmap);
1084 1286
… …
1112 return false; 1314 return false;
1113} 1315}
1114# endif /* ENABLE_TRANSPARENCY */ 1316# endif /* ENABLE_TRANSPARENCY */
1115 1317
1116# ifndef HAVE_AFTERIMAGE 1318# ifndef HAVE_AFTERIMAGE
1117static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1319static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1118# endif 1320# endif
1119 1321
1120bool 1322bool
1121bgPixmap_t::render () 1323bgPixmap_t::render ()
1122{ 1324{
… …
1125 if (target == NULL) 1327 if (target == NULL)
1126 return false; 1328 return false;
1127 1329
1128 TIMING_TEST_START (tp); 1330 TIMING_TEST_START (tp);
1129 1331
1130 invalidate(); 1332 invalidate ();
1131# ifdef ENABLE_TRANSPARENCY 1333# ifdef ENABLE_TRANSPARENCY
1132 if (flags & isTransparent) 1334 if (flags & isTransparent)
1133 { 1335 {
1134 /* we need to re-generate transparency pixmap in that case ! */ 1336 /* we need to re-generate transparency pixmap in that case ! */
1135 background_flags = make_transparency_pixmap (); 1337 background_flags = make_transparency_pixmap ();
1136 if (background_flags == 0) 1338 if (background_flags == 0)
1137 return false; 1339 return false;
1138 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1340 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1139 && pmap_depth == target->depth) 1341 && pmap_depth == target->depth)
1140 flags = flags & ~isInvalid; 1342 flags = flags & ~isInvalid;
1141 } 1343 }
1142# endif 1344# endif
1143 1345
1346# ifdef BG_IMAGE_FROM_FILE
1347 if (have_image
1348 || (background_flags & transpTransformations) != (flags & transpTransformations))
1349 {
1350 if (render_image (background_flags))
1351 flags = flags & ~isInvalid;
1352 }
1353# endif
1354
1144 XImage *result = NULL; 1355 XImage *result = NULL;
1145# ifdef HAVE_AFTERIMAGE 1356
1146 if (original_asim 1357 if (background_flags && (flags & isInvalid))
1147 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1358 {
1359 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1148 { 1360 }
1149 ASImage *background = NULL;
1150 ARGB32 as_tint = TINT_LEAVE_SAME;
1151 if (background_flags)
1152 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1153 1361
1154# ifdef ENABLE_TRANSPARENCY 1362 if (result)
1363 {
1364# if !defined(HAVE_AFTERIMAGE) && !XFT
1365 /* our own client-side tinting */
1366 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1367 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1155 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1368 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1156 {
1157 ShadingInfo as_shade;
1158 as_shade.shading = (shade == 0) ? 100 : shade;
1159
1160 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1161 if (flags & tintSet)
1162 tint.get (c);
1163 as_shade.tintColor.red = c.r;
1164 as_shade.tintColor.green = c.g;
1165 as_shade.tintColor.blue = c.b;
1166
1167 as_tint = shading2tint32 (&as_shade);
1168 }
1169 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1170 {
1171 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1172 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1173 100, ASIMAGE_QUALITY_DEFAULT);
1174 if (tmp)
1175 {
1176 destroy_asimage (&background);
1177 background = tmp;
1178 }
1179 }
1180# endif
1181
1182 if (render_asim (background, as_tint))
1183 flags = flags & ~isInvalid;
1184 if (background)
1185 destroy_asimage (&background);
1186 }
1187 else if (background_flags && pmap_depth != target->depth)
1188 {
1189 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1190 }
1191
1192# elif !XFT /* our own client-side tinting */
1193
1194 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1195 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1196
1197 if (background_flags && (flags & isInvalid))
1198 {
1199 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1200 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1201 { 1369 {
1202 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1370 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1203 if (flags & tintSet) 1371 if (flags & tintSet)
1204 tint.get (c); 1372 tint.get (c);
1205 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1373 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1206 } 1374 }
1207 } 1375# endif
1208# endif /* HAVE_AFTERIMAGE */
1209 1376
1210 if (result)
1211 {
1212 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1377 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1213 1378
1214 if (gc) 1379 if (gc)
1215 { 1380 {
1216 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1381 if (/*pmap_depth != target->depth &&*/ pixmap != None)
… …
1245 1410
1246 XFreeGC (target->dpy, gc); 1411 XFreeGC (target->dpy, gc);
1247 flags = flags & ~isInvalid; 1412 flags = flags & ~isInvalid;
1248 } 1413 }
1249 1414
1250 XDestroyImage (result); 1415 XDestroyImage (result);
1251 } 1416 }
1252 1417
1253 if (flags & isInvalid) 1418 if (flags & isInvalid)
1254 { 1419 {
1255 if (pixmap != None) 1420 if (pixmap != None)
… …
1279# ifdef ENABLE_TRANSPARENCY 1444# ifdef ENABLE_TRANSPARENCY
1280 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1445 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1281# endif 1446# endif
1282 return true; 1447 return true;
1283 } 1448 }
1449
1284 return false; 1450 return false;
1285} 1451}
1286 1452
1287void 1453void
1288bgPixmap_t::apply () 1454bgPixmap_t::apply ()
1289{ 1455{
1290 if (target) 1456 if (target)
1291 { 1457 {
1292 flags &= ~isVtOrigin; 1458 flags &= ~isVtOrigin;
1459
1293 if (pixmap != None) 1460 if (pixmap != None)
1294 { 1461 {
1295 /* set target's background to pixmap */ 1462 /* set target's background to pixmap */
1296# ifdef ENABLE_TRANSPARENCY 1463# ifdef ENABLE_TRANSPARENCY
1297 if (flags & isTransparent) 1464 if (flags & isTransparent)
1298 { 1465 {
1299 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1466 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1300 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1467 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1301# if HAVE_SCROLLBARS 1468
1302 if (target->scrollBar.win) 1469 if (target->scrollBar.win)
1303 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1470 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1304# endif
1305 } 1471 }
1306 else 1472 else
1307# endif 1473# endif
1308 { 1474 {
1309 flags |= isVtOrigin; 1475 flags |= isVtOrigin;
1310 /* force old pixmap dereference in case it was transparent before :*/ 1476 /* force old pixmap dereference in case it was transparent before :*/
1311 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1477 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1312 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1478 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1313 /* do we also need to set scrollbar's background here ? */ 1479 /* do we also need to set scrollbar's background here ? */
1314# if HAVE_SCROLLBARS 1480
1315 if (target->scrollBar.win) 1481 if (target->scrollBar.win)
1316 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1482 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1317# endif
1318 } 1483 }
1319 } 1484 }
1320 else 1485 else
1321 { 1486 {
1322 /* set target background to a pixel */ 1487 /* set target background to a pixel */
1323 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1488 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1324 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1489 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1325 /* do we also need to set scrollbar's background here ? */ 1490 /* do we also need to set scrollbar's background here ? */
1326# if HAVE_SCROLLBARS
1327 if (target->scrollBar.win) 1491 if (target->scrollBar.win)
1328 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1492 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1329# endif
1330 } 1493 }
1494
1331 /* don't want Expose on the parent or vt. It is better to use 1495 /* don't want Expose on the parent or vt. It is better to use
1332 scr_touch or we get a great deal of flicker otherwise: */ 1496 scr_touch or we get a great deal of flicker otherwise: */
1333 XClearWindow (target->dpy, target->parent[0]); 1497 XClearWindow (target->dpy, target->parent[0]);
1334 1498
1335# if HAVE_SCROLLBARS 1499 if (target->scrollBar.state && target->scrollBar.win)
1336 if (target->scrollBar.win)
1337 { 1500 {
1338 target->scrollBar.setIdle (); 1501 target->scrollBar.state = STATE_IDLE;
1339 target->scrollbar_show (0); 1502 target->scrollBar.show (0);
1340 } 1503 }
1341# endif
1342 1504
1343 target->want_refresh = 1; 1505 target->want_refresh = 1;
1344 flags |= hasChanged; 1506 flags |= hasChanged;
1345 } 1507 }
1346} 1508}
… …
1351/* taken from aterm-0.4.2 */ 1513/* taken from aterm-0.4.2 */
1352 1514
1353typedef uint32_t RUINT32T; 1515typedef uint32_t RUINT32T;
1354 1516
1355static void 1517static void
1356ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1518ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1357{ 1519{
1358 int sh_r, sh_g, sh_b; 1520 int sh_r, sh_g, sh_b;
1359 RUINT32T mask_r, mask_g, mask_b; 1521 RUINT32T mask_r, mask_g, mask_b;
1360 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1522 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1361 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1523 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;

Diff Legend

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