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

Diff Legend

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