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.14 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.77 by sf-exg, Tue Oct 12 22:14:04 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) 1997 Carsten Haitzler <raster@zip.com.au>
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com> 6 * Copyright (c) 2005-2008 Marc Lehmann <pcg@goof.com>
10 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net> 7 * Copyright (c) 2007 Sasha Vasko <sasha@aftercode.net>
11 * 8 *
12 * 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
13 * 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
14 * the Free Software Foundation; either version 2 of the License, or 11 * the Free Software Foundation; either version 2 of the License, or
… …
28#include "rxvt.h" /* NECESSARY */ 25#include "rxvt.h" /* NECESSARY */
29 26
30#define DO_TIMING_TEST 0 27#define DO_TIMING_TEST 0
31 28
32#if DO_TIMING_TEST 29#if DO_TIMING_TEST
30# include <sys/time.h>
33#define TIMING_TEST_START(id) \ 31#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv;\ 32 struct timeval timing_test_##id##_stv; \
35 gettimeofday (&timing_test_##id##_stv, NULL); 33 gettimeofday (&timing_test_##id##_stv, NULL);
36 34
37#define TIMING_TEST_PRINT_RESULT(id) \ 35#define TIMING_TEST_PRINT_RESULT(id) \
38 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; \
39 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__, \
40 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)
41 43
42#else 44#else
43#define TIMING_TEST_START(id) do{}while (0) 45#define TIMING_TEST_START(id) do {} while (0)
44#define TIMING_TEST_PRINT_RESULT(id) do{}while (0) 46#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
45#endif 47#endif
46 48
47/* 49/*
48 * Pixmap geometry string interpretation : 50 * Pixmap geometry string interpretation :
49 * Each geometry string contains zero or one scale/position 51 * Each geometry string contains zero or one scale/position
50 * 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
51 * colon-delimited pixmap operations. 53 * colon-delimited pixmap operations.
52 * The following table shows the valid geometry strings and their 54 * The following table shows the valid geometry strings and their
53 * affects on the background image : 55 * effects on the background image :
54 * 56 *
55 * 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%.
56 * W and H are percentages of the terminal window size. 58 * W and H are percentages of the terminal window size.
57 * X and Y are also percentages; e.g., +50+50 centers 59 * X and Y are also percentages; e.g., +50+50 centers
58 * the image in the window. 60 * the image in the window.
59 * WxH+X Assumes Y == X 61 * WxH+X Assumes Y == X
60 * WxH Assumes Y == X == 50 (centers the image) 62 * WxH Assumes Y == X == 50 (centers the image)
61 * W+X+Y Assumes H == W 63 * W+X+Y Assumes H == W
62 * W+X Assumes H == W and Y == X 64 * W+X Assumes H == W and Y == X
63 * W Assumes H == W and Y == X == 50 65 * W Assumes H == W and Y == X == 50
64 * 66 *
65 * Adjusting position only : 67 * Adjusting position only :
66 * =+X+Y Set position to X% by Y% (absolute). 68 * =+X+Y Set position to X% by Y% (absolute).
67 * =+X Set position to X% by X%. 69 * =+X Set position to X% by X%.
68 * +X+Y Adjust position horizontally X% and vertically Y% 70 * +X+Y Adjust position horizontally X% and vertically Y%
69 * from current position (relative). 71 * from current position (relative).
70 * +X Adjust position horizontally X% and vertically X% 72 * +X Adjust position horizontally X% and vertically X%
71 * from current position. 73 * from current position.
72 * 74 *
73 * Adjusting scale only : 75 * Adjusting scale only :
74 * Wx0 Multiply horizontal scaling factor by W% 76 * Wx0 Multiply horizontal scaling factor by W%
75 * 0xH Multiply vertical scaling factor by H% 77 * 0xH Multiply vertical scaling factor by H%
76 * 0x0 No scaling (show image at normal size). 78 * 0x0 No scaling (show image at normal size).
77 * 79 *
78 * Pixmap Operations : (should be prepended by a colon) 80 * Pixmap Operations : (should be prepended by a colon)
79 * tile Tile image. Scaling/position modifiers above will affect 81 * tile Tile image. Scaling/position modifiers above will affect
80 * the tile size and origin. 82 * the tile size and origin.
81 * propscale When scaling, scale proportionally. That is, maintain the 83 * propscale When scaling, scale proportionally. That is, maintain the
82 * proper aspect ratio for the image. Any portion of the 84 * proper aspect ratio for the image. Any portion of the
83 * background not covered by the image is filled with the 85 * background not covered by the image is filled with the
84 * current background color. 86 * current background color.
85 * hscale Scale horizontally, tile vertically ? 87 * hscale Scale horizontally, tile vertically ?
86 * vscale Tile horizontally, scale vertically ? 88 * vscale Tile horizontally, scale vertically ?
… …
89 */ 91 */
90 92
91#ifdef HAVE_BG_PIXMAP 93#ifdef HAVE_BG_PIXMAP
92bgPixmap_t::bgPixmap_t () 94bgPixmap_t::bgPixmap_t ()
93{ 95{
96 // this is basically redundant as bgPixmap_t is only used in
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
109#ifdef ENABLE_TRANSPARENCY
110 shade = 100;
111#endif
101 flags = 0; 112 flags = 0;
102 pixmap = None; 113 pixmap = None;
114 valid_since = invalid_since = 0;
115 target = 0;
103} 116}
104 117
105void 118void
106bgPixmap_t::destroy () 119bgPixmap_t::destroy ()
107{ 120{
108#ifdef HAVE_AFTERIMAGE 121#ifdef HAVE_AFTERIMAGE
109 if (original_asim) 122 if (original_asim)
110 safe_asimage_destroy (original_asim); 123 safe_asimage_destroy (original_asim);
111#endif 124#endif
112 125
126#ifdef HAVE_PIXBUF
127 if (pixbuf)
128 g_object_unref (pixbuf);
129#endif
130
113 if (pixmap && target) 131 if (pixmap && target)
114 XFreePixmap (target->dpy, pixmap); 132 XFreePixmap (target->dpy, pixmap);
115} 133}
116 134
117bool 135bool
… …
121 if (flags & isTransparent) 139 if (flags & isTransparent)
122 return true; 140 return true;
123# endif 141# endif
124 142
125# ifdef BG_IMAGE_FROM_FILE 143# ifdef BG_IMAGE_FROM_FILE
126# ifdef HAVE_AFTERIMAGE 144 if (have_image)
127 if (original_asim != NULL)
128# endif
129 { 145 {
130 if (h_scale != 0 || v_scale != 0 146 if (flags & sizeSensitive)
131 || h_align != 0 || v_align != 0)
132 return true; 147 return true;
133 } 148 }
134# endif 149# endif
135 150
136 return false; 151 return false;
137} 152}
138 153
139bool 154bool
140bgPixmap_t::window_position_sensitive () 155bgPixmap_t::window_position_sensitive ()
141{ 156{
142# ifdef ENABLE_TRANSPARENCY 157# ifdef ENABLE_TRANSPARENCY
143 if (flags & isTransparent) 158 if (flags & isTransparent)
144 return true; 159 return true;
145# endif 160# endif
146 161
147# ifdef BG_IMAGE_FROM_FILE 162# ifdef BG_IMAGE_FROM_FILE
148# ifdef HAVE_AFTERIMAGE 163 if (have_image)
149 if (original_asim != NULL)
150# endif
151 { 164 {
152 if (h_align == rootAlign || v_align == rootAlign) 165 if (flags & rootAlign)
153 return true; 166 return true;
154 } 167 }
155# endif 168# endif
156 169
157 return false; 170 return false;
158}; 171};
159 172
160bool bgPixmap_t::need_client_side_rendering () 173bool bgPixmap_t::need_client_side_rendering ()
161{ 174{
162# ifdef HAVE_AFTERIMAGE 175# ifdef HAVE_AFTERIMAGE
163 if (original_asim != NULL) 176 if (original_asim)
164 return true; 177 return true;
165# endif 178# endif
166# ifdef ENABLE_TRANSPARENCY 179# ifdef ENABLE_TRANSPARENCY
167 if (flags & isTransparent) 180 if (flags & isTransparent)
168 { 181 {
… …
197static inline bool 210static inline bool
198check_set_align_value (int geom_flags, int flag, int &align, int new_value) 211check_set_align_value (int geom_flags, int flag, int &align, int new_value)
199{ 212{
200 if (geom_flags & flag) 213 if (geom_flags & flag)
201 { 214 {
202 if (new_value != bgPixmap_t::rootAlign)
203 {
204 if (new_value < -100) 215 if (new_value < -100)
205 new_value = -100; 216 new_value = -100;
206 else if (new_value > 200) 217 else if (new_value > 200)
207 new_value = 200; 218 new_value = 200;
208 }
209 if (new_value != align) 219 if (new_value != align)
210 { 220 {
211 align = new_value; 221 align = new_value;
212 return true; 222 return true;
213 } 223 }
… …
217 227
218static inline int 228static inline int
219make_align_position (int align, int window_size, int image_size) 229make_align_position (int align, int window_size, int image_size)
220{ 230{
221 int diff = window_size - image_size; 231 int diff = window_size - image_size;
222 int smaller = MIN (image_size,window_size); 232 int smaller = min (image_size, window_size);
223 233
224 if (align >= 0 && align <= 50) 234 if (align >= 0 && align <= 100)
225 return diff * align / 100; 235 return diff * align / 100;
226 else if (align > 50 && align <= 100)
227 return window_size - image_size - diff * (100 - align) / 100;
228 else if (align > 100 && align <= 200 ) 236 else if (align > 100 && align <= 200 )
229 return ((align - 100) * smaller / 100) + window_size - smaller; 237 return ((align - 100) * smaller / 100) + window_size - smaller;
230 else if (align > -100 && align < 0) 238 else if (align >= -100 && align < 0)
231 return ((align + 100) * smaller / 100) - image_size; 239 return ((align + 100) * smaller / 100) - image_size;
232 return 0; 240 return 0;
233} 241}
234 242
235static inline int 243static inline int
236make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size) 244make_clip_rectangle (int pos, int size, int target_size, int &dst_pos, int &dst_size)
237{ 245{
238 int src_pos = 0; 246 int src_pos = 0;
239 dst_pos = 0; 247 dst_pos = pos;
240 dst_size = size; 248 dst_size = size;
241 if (pos < 0 && size > target_size) 249 if (pos < 0)
242 { 250 {
243 src_pos = -pos; 251 src_pos = -pos;
252 dst_pos = 0;
244 dst_size += pos; 253 dst_size += pos;
245 } 254 }
246 else if (pos > 0)
247 dst_pos = pos;
248 255
249 if (dst_pos + dst_size > target_size) 256 if (dst_pos + dst_size > target_size)
250 dst_size = target_size - dst_pos; 257 dst_size = target_size - dst_pos;
251 return src_pos; 258 return src_pos;
252} 259}
… …
257 int geom_flags = 0, changed = 0; 264 int geom_flags = 0, changed = 0;
258 int x = 0, y = 0; 265 int x = 0, y = 0;
259 unsigned int w = 0, h = 0; 266 unsigned int w = 0, h = 0;
260 unsigned int n; 267 unsigned int n;
261 unsigned long new_flags = (flags & (~geometryFlags)); 268 unsigned long new_flags = (flags & (~geometryFlags));
262 char *p; 269 const char *p;
263# define MAXLEN_GEOM 256 /* could be longer then regular geometry string */ 270# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
264 271
265 if (geom == NULL) 272 if (geom == NULL)
266 return false; 273 return false;
267 274
268 char str[MAXLEN_GEOM]; 275 char str[MAXLEN_GEOM];
… …
275 if (n < MAXLEN_GEOM) 282 if (n < MAXLEN_GEOM)
276 { 283 {
277 char *ops; 284 char *ops;
278 new_flags |= geometrySet; 285 new_flags |= geometrySet;
279 286
280 strncpy (str, geom, n); 287 memcpy (str, geom, n);
281 str[n] = '\0'; 288 str[n] = '\0';
282 if (str[0] == ':') 289 if (str[0] == ':')
283 ops = &str[0]; 290 ops = &str[0];
284 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0])) 291 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
285 ops = &str[0]; 292 ops = &str[0];
… …
305 y = x; 312 y = x;
306 geom_flags |= YValue; 313 geom_flags |= YValue;
307 } 314 }
308 315
309 if (flags & geometrySet) 316 if (flags & geometrySet)
317 {
310 {/* new geometry is an adjustment to the old one ! */ 318 /* new geometry is an adjustment to the old one ! */
311 if ((geom_flags & WidthValue) && (geom_flags & HeightValue)) 319 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
312 { 320 {
313 if (w == 0 && h != 0) 321 if (w == 0 && h != 0)
314 { 322 {
315 w = h_scale; 323 w = h_scale;
… …
331 } 339 }
332 } 340 }
333 else /* setting up geometry from scratch */ 341 else /* setting up geometry from scratch */
334 { 342 {
335 if (!(geom_flags & XValue)) 343 if (!(geom_flags & XValue))
344 {
336 {/* use default geometry - centered */ 345 /* use default geometry - centered */
337 x = y = defaultAlign; 346 x = y = defaultAlign;
338 } 347 }
339 else if (!(geom_flags & YValue)) 348 else if (!(geom_flags & YValue))
340 y = x; 349 y = x;
341 350
342 if ((geom_flags & (WidthValue|HeightValue)) == 0) 351 if ((geom_flags & (WidthValue|HeightValue)) == 0)
352 {
343 {/* use default geometry - scaled */ 353 /* use default geometry - scaled */
344 w = h = defaultScale; 354 w = h = defaultScale;
345 } 355 }
346 else if (geom_flags & WidthValue) 356 else if (geom_flags & WidthValue)
347 { 357 {
348 if (!(geom_flags & HeightValue)) 358 if (!(geom_flags & HeightValue))
… …
351 else 361 else
352 w = h; 362 w = h;
353 } 363 }
354 } /* done parsing geometry string */ 364 } /* done parsing geometry string */
355 else if (!(flags & geometrySet)) 365 else if (!(flags & geometrySet))
366 {
356 { /* default geometry - scaled and centered */ 367 /* default geometry - scaled and centered */
357 x = y = defaultAlign; 368 x = y = defaultAlign;
358 w = h = defaultScale; 369 w = h = defaultScale;
359 } 370 }
360 371
361 if (!(flags & geometrySet)) 372 if (!(flags & geometrySet))
… …
364 if (ops) 375 if (ops)
365 { 376 {
366 while (*ops) 377 while (*ops)
367 { 378 {
368 while (*ops == ':' || isspace(*ops)) ++ops; 379 while (*ops == ':' || isspace(*ops)) ++ops;
380
369# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof(op_str)-1) == 0) 381# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
370 if (CHECK_GEOM_OPS("tile")) 382 if (CHECK_GEOM_OPS ("tile"))
371 { 383 {
372 w = h = noScale; 384 w = h = noScale;
373 geom_flags |= WidthValue|HeightValue; 385 geom_flags |= WidthValue|HeightValue;
374 } 386 }
375 else if (CHECK_GEOM_OPS("propscale")) 387 else if (CHECK_GEOM_OPS ("propscale"))
376 { 388 {
377 if (w == 0 && h == 0)
378 {
379 w = windowScale;
380 geom_flags |= WidthValue;
381 }
382 new_flags |= propScale; 389 new_flags |= propScale;
383 } 390 }
384 else if (CHECK_GEOM_OPS("hscale")) 391 else if (CHECK_GEOM_OPS ("hscale"))
385 { 392 {
386 if (w == 0)
387 w = windowScale; 393 if (w == 0) w = windowScale;
394
388 h = noScale; 395 h = noScale;
389 geom_flags |= WidthValue|HeightValue; 396 geom_flags |= WidthValue|HeightValue;
390 } 397 }
391 else if (CHECK_GEOM_OPS("vscale")) 398 else if (CHECK_GEOM_OPS ("vscale"))
392 { 399 {
393 if (h == 0)
394 h = windowScale; 400 if (h == 0) h = windowScale;
401
395 w = noScale; 402 w = noScale;
396 geom_flags |= WidthValue|HeightValue; 403 geom_flags |= WidthValue|HeightValue;
397 } 404 }
398 else if (CHECK_GEOM_OPS("scale")) 405 else if (CHECK_GEOM_OPS ("scale"))
399 { 406 {
400 if (h == 0)
401 h = windowScale; 407 if (h == 0) h = windowScale;
402 if (w == 0)
403 w = windowScale; 408 if (w == 0) w = windowScale;
409
404 geom_flags |= WidthValue|HeightValue; 410 geom_flags |= WidthValue|HeightValue;
405 } 411 }
406 else if (CHECK_GEOM_OPS("auto")) 412 else if (CHECK_GEOM_OPS ("auto"))
407 { 413 {
408 w = h = windowScale; 414 w = h = windowScale;
409 x = y = centerAlign; 415 x = y = centerAlign;
410 geom_flags |= WidthValue|HeightValue|XValue|YValue; 416 geom_flags |= WidthValue|HeightValue|XValue|YValue;
411 } 417 }
412 else if (CHECK_GEOM_OPS("root")) 418 else if (CHECK_GEOM_OPS ("root"))
413 { 419 {
420 new_flags |= rootAlign;
414 w = h = noScale; 421 w = h = noScale;
415 x = y = rootAlign;
416 geom_flags |= WidthValue|HeightValue|XValue|YValue; 422 geom_flags |= WidthValue|HeightValue;
417 } 423 }
418# undef CHECK_GEOM_OPS 424# undef CHECK_GEOM_OPS
425
419 while (*ops != ':' && *ops != '\0') ++ops; 426 while (*ops != ':' && *ops != '\0') ++ops;
420 } /* done parsing ops */ 427 } /* done parsing ops */
421 } 428 }
422 429
423 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) 430 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed;
424 ++changed;
425 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) 431 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed;
426 ++changed;
427 if (check_set_align_value (geom_flags, XValue, h_align, x)) 432 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed;
428 ++changed;
429 if (check_set_align_value (geom_flags, YValue, v_align, y)) 433 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed;
430 ++changed;
431 } 434 }
432 435
433 if (new_flags != flags) 436 if (new_flags != flags)
434 { 437 {
435 flags = new_flags; 438 flags = new_flags;
436 changed++; 439 changed++;
437 } 440 }
441
438//fprintf( stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n", 442 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
439// flags, h_scale, v_scale, h_align, v_align); 443 // flags, h_scale, v_scale, h_align, v_align);
440 return (changed > 0); 444 return (changed > 0);
445}
446
447void
448bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
449{
450 int target_width = target->szHint.width;
451 int target_height = target->szHint.height;
452
453 if (flags & propScale)
454 {
455 float scale = (float)target_width / image_width;
456 min_it (scale, (float)target_height / image_height);
457 w = image_width * scale + 0.5;
458 h = image_height * scale + 0.5;
459 }
460 else
461 {
462 w = h_scale * target_width / 100;
463 h = v_scale * target_height / 100;
464 }
465
466 if (!w) w = image_width;
467 if (!h) h = image_height;
468
469 if (flags & rootAlign)
470 {
471 target->get_window_origin (x, y);
472 x = -x;
473 y = -y;
474 }
475 else
476 {
477 x = make_align_position (h_align, target_width, w);
478 y = make_align_position (v_align, target_height, h);
479 }
480
481 flags &= ~sizeSensitive;
482 if (h_scale != 0 || v_scale != 0
483 || h_align != 0 || v_align != 0
484 || w > target_width || h > target_height)
485 flags |= sizeSensitive;
441} 486}
442 487
443# ifdef HAVE_AFTERIMAGE 488# ifdef HAVE_AFTERIMAGE
444bool 489bool
445bgPixmap_t::render_asim (ASImage *background, ARGB32 background_tint) 490bgPixmap_t::render_image (unsigned long background_flags)
446{ 491{
447 if (target == NULL) 492 if (target == NULL)
448 return false; 493 return false;
449 494
495 target->init_asv ();
496
497 ASImage *background = NULL;
498 ARGB32 background_tint = TINT_LEAVE_SAME;
499
500# ifdef ENABLE_TRANSPARENCY
501 if (background_flags)
502 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
503
504 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
505 {
506 ShadingInfo as_shade;
507 as_shade.shading = shade;
508
509 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
510 if (flags & tintSet)
511 tint.get (c);
512 as_shade.tintColor.red = c.r;
513 as_shade.tintColor.green = c.g;
514 as_shade.tintColor.blue = c.b;
515
516 background_tint = shading2tint32 (&as_shade);
517 }
518
519 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL)
520 {
521 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
522 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
523 100, ASIMAGE_QUALITY_DEFAULT);
524 if (tmp)
525 {
526 destroy_asimage (&background);
527 background = tmp;
528 }
529 }
530# endif
531
532 ASImage *result = 0;
533
450 int target_width = (int)target->szHint.width; 534 int target_width = target->szHint.width;
451 int target_height = (int)target->szHint.height; 535 int target_height = target->szHint.height;
452 int new_pmap_width = target_width, new_pmap_height = target_height; 536 int new_pmap_width = target_width;
453 ASImage *result = NULL; 537 int new_pmap_height = target_height;
454 538
455 int x = 0; 539 int x = 0;
456 int y = 0; 540 int y = 0;
457 int w = h_scale * target_width / 100; 541 int w = 0;
458 int h = v_scale * target_height / 100; 542 int h = 0;
459 543
460 TIMING_TEST_START (asim); 544 TIMING_TEST_START (asim);
461 545
462 if (original_asim) 546 if (original_asim)
463 { 547 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
464 if (h_align == rootAlign || v_align == rootAlign)
465 {
466 target->get_window_origin(x, y);
467 x = -x;
468 y = -y;
469 }
470 if (h_align != rootAlign)
471 x = make_align_position (h_align, target_width, w > 0 ? w : (int)original_asim->width);
472 if (v_align != rootAlign)
473 y = make_align_position (v_align, target_height, h > 0 ? h : (int)original_asim->height);
474 }
475 548
476 if (original_asim == NULL 549 if (!original_asim
550 || (!(flags & rootAlign)
477 || x >= target_width 551 && (x >= target_width
478 || y >= target_height 552 || y >= target_height
479 || (w > 0 && x + w <= 0) 553 || (x + w <= 0)
480 || (h > 0 && y + h <= 0)) 554 || (y + h <= 0))))
481 { 555 {
482 if (background) 556 if (background)
483 { 557 {
484 new_pmap_width = background->width; 558 new_pmap_width = background->width;
485 new_pmap_height = background->height; 559 new_pmap_height = background->height;
486 result = background; 560 result = background;
561
487 if (background_tint != TINT_LEAVE_SAME) 562 if (background_tint != TINT_LEAVE_SAME)
488 { 563 {
489 ASImage* tmp = tile_asimage (target->asv, background, 0, 0, 564 ASImage *tmp = tile_asimage (target->asv, background, 0, 0,
490 target_width, target_height, background_tint, 565 target_width, target_height, background_tint,
491 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 566 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
492 if (tmp) 567 if (tmp)
493 result = tmp; 568 result = tmp;
494 } 569 }
… …
497 new_pmap_width = new_pmap_height = 0; 572 new_pmap_width = new_pmap_height = 0;
498 } 573 }
499 else 574 else
500 { 575 {
501 result = original_asim; 576 result = original_asim;
577
502 if ((w > 0 && w != original_asim->width) 578 if ((w != original_asim->width)
503 || (h > 0 && h != original_asim->height)) 579 || (h != original_asim->height))
504 { 580 {
505 result = scale_asimage (target->asv, original_asim, 581 result = scale_asimage (target->asv, original_asim,
506 w > 0 ? w : original_asim->width, 582 w, h,
507 h > 0 ? h : original_asim->height,
508 background ? ASA_ASImage : ASA_XImage, 583 background ? ASA_ASImage : ASA_XImage,
509 100, ASIMAGE_QUALITY_DEFAULT); 584 100, ASIMAGE_QUALITY_DEFAULT);
510 } 585 }
586
511 if (background == NULL) 587 if (background == NULL)
512 {/* if tiling - pixmap has to be sized exactly as the image, 588 {
513 but there is no need to make it bigger then the window! */
514 if (h_scale == 0)
515 new_pmap_width = min (result->width, target_width);
516 if (v_scale == 0)
517 new_pmap_height = min (result->height, target_height);
518 /* we also need to tile our image in one or both directions */
519 if (h_scale == 0 || v_scale == 0) 589 if (h_scale == 0 || v_scale == 0)
520 { 590 {
591 /* if tiling - pixmap has to be sized exactly as the image,
592 but there is no need to make it bigger than the window! */
593 new_pmap_width = min (result->width, target_width);
594 new_pmap_height = min (result->height, target_height);
595
596 /* we also need to tile our image in both directions */
521 ASImage *tmp = tile_asimage (target->asv, result, 597 ASImage *tmp = tile_asimage (target->asv, result,
522 (h_scale > 0) ? 0 : (int)result->width - x, 598 (int)result->width - x,
523 (v_scale > 0) ? 0 : (int)result->height - y, 599 (int)result->height - y,
524 new_pmap_width, 600 new_pmap_width,
525 new_pmap_height, 601 new_pmap_height,
526 TINT_LEAVE_SAME, ASA_XImage, 602 TINT_LEAVE_SAME, ASA_XImage,
527 100, ASIMAGE_QUALITY_DEFAULT); 603 100, ASIMAGE_QUALITY_DEFAULT);
528 if (tmp) 604 if (tmp)
529 { 605 {
530 if (result != original_asim) 606 if (result != original_asim)
531 destroy_asimage (&result); 607 destroy_asimage (&result);
608
532 result = tmp; 609 result = tmp;
533 } 610 }
534 } 611 }
535 } 612 }
536 else 613 else
614 {
537 {/* if blending background and image - pixmap has to be sized same as target window */ 615 /* if blending background and image - pixmap has to be sized same as target window */
538 ASImageLayer *layers = create_image_layers (2); 616 ASImageLayer *layers = create_image_layers (2);
539 ASImage *merged_im = NULL;
540 617
541 layers[0].im = background; 618 layers[0].im = background;
542 layers[0].clip_width = target_width; 619 layers[0].clip_width = target_width;
543 layers[0].clip_height = target_height; 620 layers[0].clip_height = target_height;
544 layers[0].tint = background_tint; 621 layers[0].tint = background_tint;
545 layers[1].im = result; 622 layers[1].im = result;
546 if (w <= 0) 623
624 if (h_scale == 0 || v_scale == 0)
625 {
547 {/* tile horizontally */ 626 /* tile horizontally */
548 while (x > 0) x -= (int)result->width; 627 while (x > 0) x -= (int)result->width;
549 layers[1].dst_x = x; 628 layers[1].dst_x = x;
550 layers[1].clip_width = result->width+target_width; 629 layers[1].clip_width = result->width+target_width;
551 } 630 }
552 else 631 else
632 {
553 {/* clip horizontally */ 633 /* clip horizontally */
554 layers[1].dst_x = x; 634 layers[1].dst_x = x;
555 layers[1].clip_width = result->width; 635 layers[1].clip_width = result->width;
556 } 636 }
557 if (h <= 0) 637
638 if (h_scale == 0 || v_scale == 0)
558 { 639 {
559 while (y > 0) y -= (int)result->height; 640 while (y > 0) y -= (int)result->height;
560 layers[1].dst_y = y; 641 layers[1].dst_y = y;
561 layers[1].clip_height = result->height + target_height; 642 layers[1].clip_height = result->height + target_height;
562 } 643 }
563 else 644 else
564 { 645 {
565 layers[1].dst_y = y; 646 layers[1].dst_y = y;
566 layers[1].clip_height = result->height; 647 layers[1].clip_height = result->height;
567 } 648 }
649
568 if (target->rs[Rs_blendtype]) 650 if (target->rs[Rs_blendtype])
569 { 651 {
570 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 652 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]);
571 if (layers[1].merge_scanlines == NULL) 653 if (layers[1].merge_scanlines == NULL)
572 layers[1].merge_scanlines = alphablend_scanlines; 654 layers[1].merge_scanlines = alphablend_scanlines;
573 } 655 }
656
574 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 657 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height,
575 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 658 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
659
576 if (tmp) 660 if (tmp)
577 { 661 {
578 if (result != original_asim) 662 if (result != original_asim)
579 destroy_asimage (&result); 663 destroy_asimage (&result);
664
580 result = tmp; 665 result = tmp;
581 } 666 }
667
582 free (layers); 668 free (layers);
583 } 669 }
584 } 670 }
585 TIMING_TEST_PRINT_RESULT (asim); 671 TIMING_TEST_PRINT_RESULT (asim);
586 672
587 if (pixmap) 673 bool ret = false;
588 {
589 if (result == NULL
590 || pmap_width != new_pmap_width
591 || pmap_height != new_pmap_height
592 || pmap_depth != target->depth)
593 {
594 XFreePixmap (target->dpy, pixmap);
595 pixmap = None;
596 }
597 }
598 674
599 if (result) 675 if (result)
600 { 676 {
601 XGCValues gcv; 677 XGCValues gcv;
602 GC gc; 678 GC gc;
679
680 if (pixmap)
681 {
682 if (pmap_width != new_pmap_width
683 || pmap_height != new_pmap_height
684 || pmap_depth != target->depth)
685 {
686 XFreePixmap (target->dpy, pixmap);
687 pixmap = None;
688 }
689 }
603 690
604 /* create Pixmap */ 691 /* create Pixmap */
605 if (pixmap == None) 692 if (pixmap == None)
606 { 693 {
607 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 694 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
608 pmap_width = new_pmap_width; 695 pmap_width = new_pmap_width;
609 pmap_height = new_pmap_height; 696 pmap_height = new_pmap_height;
610 pmap_depth = target->depth; 697 pmap_depth = target->depth;
611 } 698 }
612 /* fill with background color ( if result's not completely overlapping it)*/ 699 /* fill with background color (if result's not completely overlapping it) */
613 gcv.foreground = target->pix_colors[Color_bg]; 700 gcv.foreground = target->pix_colors[Color_bg];
614 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 701 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
615 702
616 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 703 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
617 int dst_width = result->width, dst_height = result->height; 704 int dst_width = result->width, dst_height = result->height;
618 if (background == NULL) 705 if (background == NULL)
619 { 706 {
620 if (h_scale > 0) 707 if (!(h_scale == 0 || v_scale == 0))
708 {
621 src_x = make_clip_rectangle (x, result->width, new_pmap_width, dst_x, dst_width); 709 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width );
622 if (v_scale > 0)
623 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height); 710 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
711 }
624 712
625 if (dst_x > 0 || dst_y > 0 713 if (dst_x > 0 || dst_y > 0
626 || dst_x + dst_width < new_pmap_width 714 || dst_x + dst_width < new_pmap_width
627 || dst_y + dst_height < new_pmap_height) 715 || dst_y + dst_height < new_pmap_height)
628 {
629 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 716 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
630 }
631 } 717 }
632 718
633 /* put result on pixmap */ 719 /* put result on pixmap */
634 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 720 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
635 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 721 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
… …
637 if (result != background && result != original_asim) 723 if (result != background && result != original_asim)
638 destroy_asimage (&result); 724 destroy_asimage (&result);
639 725
640 XFreeGC (target->dpy, gc); 726 XFreeGC (target->dpy, gc);
641 TIMING_TEST_PRINT_RESULT (asim); 727 TIMING_TEST_PRINT_RESULT (asim);
642 }
643 728
729 ret = true;
730 }
731
732 if (background)
733 destroy_asimage (&background);
734
644 return true; 735 return ret;
645} 736}
646# endif /* HAVE_AFTERIMAGE */ 737# endif /* HAVE_AFTERIMAGE */
738
739# ifdef HAVE_PIXBUF
740bool
741bgPixmap_t::render_image (unsigned long background_flags)
742{
743 if (target == NULL)
744 return false;
745
746 if (!pixbuf)
747 return false;
748
749 // TODO: add alpha blending
750 if (background_flags)
751 return false;
752
753 GdkPixbuf *result;
754
755 int image_width = gdk_pixbuf_get_width (pixbuf);
756 int image_height = gdk_pixbuf_get_height (pixbuf);
757
758 int target_width = target->szHint.width;
759 int target_height = target->szHint.height;
760 int new_pmap_width = target_width;
761 int new_pmap_height = target_height;
762
763 int x = 0;
764 int y = 0;
765 int w = 0;
766 int h = 0;
767
768 get_image_geometry (image_width, image_height, w, h, x, y);
769
770 if (!(flags & rootAlign)
771 && (x >= target_width
772 || y >= target_height
773 || (x + w <= 0)
774 || (y + h <= 0)))
775 return false;
776
777 result = pixbuf;
778
779 if ((w != image_width)
780 || (h != image_height))
781 {
782 result = gdk_pixbuf_scale_simple (pixbuf,
783 w, h,
784 GDK_INTERP_BILINEAR);
785 }
786
787 bool ret = false;
788
789 if (result)
790 {
791 XGCValues gcv;
792 GC gc;
793
794 image_width = gdk_pixbuf_get_width (result);
795 image_height = gdk_pixbuf_get_height (result);
796
797 if (h_scale == 0 || v_scale == 0)
798 {
799 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height);
801 }
802
803 if (pixmap)
804 {
805 if (pmap_width != new_pmap_width
806 || pmap_height != new_pmap_height
807 || pmap_depth != target->depth)
808 {
809 XFreePixmap (target->dpy, pixmap);
810 pixmap = None;
811 }
812 }
813
814 if (pixmap == None)
815 {
816 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth);
817 pmap_width = new_pmap_width;
818 pmap_height = new_pmap_height;
819 pmap_depth = target->depth;
820 }
821
822 gcv.foreground = target->pix_colors[Color_bg];
823 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv);
824
825 if (h_scale == 0 || v_scale == 0)
826 {
827 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth);
828 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc,
829 0, 0,
830 0, 0,
831 image_width, image_height,
832 XLIB_RGB_DITHER_NONE,
833 0, 0);
834
835 gcv.tile = tile;
836 gcv.fill_style = FillTiled;
837 gcv.ts_x_origin = x;
838 gcv.ts_y_origin = y;
839 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
840
841 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
842 XFreePixmap (target->dpy, tile);
843 }
844 else
845 {
846 int src_x, src_y, dst_x, dst_y;
847 int dst_width, dst_height;
848
849 src_x = make_clip_rectangle (x, image_width , new_pmap_width , dst_x, dst_width );
850 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
851
852 if (dst_x > 0 || dst_y > 0
853 || dst_x + dst_width < new_pmap_width
854 || dst_y + dst_height < new_pmap_height)
855 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
856
857 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
858 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc,
859 src_x, src_y,
860 dst_x, dst_y,
861 dst_width, dst_height,
862 XLIB_RGB_DITHER_NONE,
863 0, 0);
864 }
865
866 if (result != pixbuf)
867 g_object_unref (result);
868
869 XFreeGC (target->dpy, gc);
870
871 ret = true;
872 }
873
874 return ret;
875}
876# endif /* HAVE_PIXBUF */
647 877
648bool 878bool
649bgPixmap_t::set_file (const char *file) 879bgPixmap_t::set_file (const char *file)
650{ 880{
651 char *f;
652
653 assert (file != NULL); 881 assert (file);
654 882
655 if (*file != '\0') 883 if (*file)
656 { 884 {
885 if (const char *p = strchr (file, ';'))
886 {
887 size_t len = p - file;
888 char *f = rxvt_temp_buf<char> (len + 1);
889 memcpy (f, file, len);
890 f[len] = '\0';
891 file = f;
892 }
893
657# ifdef HAVE_AFTERIMAGE 894# ifdef HAVE_AFTERIMAGE
658 if (target->asimman == NULL) 895 if (!target->asimman)
659 target->asimman = create_generic_imageman (target->rs[Rs_path]); 896 target->asimman = create_generic_imageman (target->rs[Rs_path]);
660 if ((f = strchr (file, ';')) == NULL)
661 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 897 original_asim = get_asimage (target->asimman, file, 0xFFFFFFFF, 100);
662 else 898 if (original_asim)
663 { 899 have_image = true;
664 size_t len = f - file; 900 return have_image;
665 f = (char *)malloc (len + 1);
666 strncpy (f, file, len);
667 f[len] = '\0';
668 original_asim = get_asimage (target->asimman, f, 0xFFFFFFFF, 100);
669 free (f);
670 }
671 return (original_asim != NULL);
672# endif 901# endif
902
903# ifdef HAVE_PIXBUF
904 pixbuf = gdk_pixbuf_new_from_file (file, NULL);
905 if (pixbuf)
906 have_image = true;
907 return have_image;
908# endif
673 } 909 }
910
674 return false; 911 return false;
675} 912}
676 913
677# endif /* BG_IMAGE_FROM_FILE */ 914# endif /* BG_IMAGE_FROM_FILE */
678 915
… …
683 if (!(flags & isTransparent)) 920 if (!(flags & isTransparent))
684 { 921 {
685 flags |= isTransparent; 922 flags |= isTransparent;
686 return true; 923 return true;
687 } 924 }
925
688 return false; 926 return false;
689} 927}
690 928
691bool 929bool
692bgPixmap_t::set_blur_radius (const char *geom) 930bgPixmap_t::set_blur_radius (const char *geom)
… …
694 int changed = 0; 932 int changed = 0;
695 unsigned int hr, vr; 933 unsigned int hr, vr;
696 int junk; 934 int junk;
697 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 935 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
698 936
699 if (!(geom_flags&WidthValue)) 937 if (!(geom_flags & WidthValue))
700 hr = 1; 938 hr = 1;
701 if (!(geom_flags&HeightValue)) 939 if (!(geom_flags & HeightValue))
702 vr = hr; 940 vr = hr;
703 941
704 if (h_blurRadius != hr) 942 if (h_blurRadius != hr)
705 { 943 {
706 ++changed; 944 ++changed;
… …
716 if (v_blurRadius == 0 && h_blurRadius == 0) 954 if (v_blurRadius == 0 && h_blurRadius == 0)
717 flags &= ~blurNeeded; 955 flags &= ~blurNeeded;
718 else 956 else
719 flags |= blurNeeded; 957 flags |= blurNeeded;
720 958
721 return (changed>0); 959 return (changed > 0);
722} 960}
723 961
724static inline unsigned long 962static inline unsigned long
725compute_tint_shade_flags (rxvt_color *tint, int shade) 963compute_tint_shade_flags (rxvt_color *tint, int shade)
726{ 964{
727 unsigned long flags = 0; 965 unsigned long flags = 0;
728 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 966 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
729 bool has_shade = (shade > 0 && shade < 100) || (shade > 100 && shade < 200); 967 bool has_shade = shade != 100;
730 968
731 if (tint) 969 if (tint)
732 { 970 {
733 tint->get (c); 971 tint->get (c);
734# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 972# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700)
… …
743 flags |= bgPixmap_t::tintNeeded; 981 flags |= bgPixmap_t::tintNeeded;
744 else if (tint) 982 else if (tint)
745 { 983 {
746 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 984 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
747 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 985 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
748 { 986 {
749 flags |= bgPixmap_t::tintNeeded; 987 flags |= bgPixmap_t::tintNeeded;
750 } 988 }
751 } 989 }
752 990
753 if (flags & bgPixmap_t::tintNeeded) 991 if (flags & bgPixmap_t::tintNeeded)
754 { 992 {
755 if (flags & bgPixmap_t::tintWholesome) 993 if (flags & bgPixmap_t::tintWholesome)
… …
766} 1004}
767 1005
768bool 1006bool
769bgPixmap_t::set_tint (rxvt_color &new_tint) 1007bgPixmap_t::set_tint (rxvt_color &new_tint)
770{ 1008{
771 if (tint != new_tint) 1009 if (!(flags & tintSet) || tint != new_tint)
772 { 1010 {
773 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 1011 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
774 tint = new_tint; 1012 tint = new_tint;
775 flags = (flags & ~tintFlags) | new_flags | tintSet; 1013 flags = (flags & ~tintFlags) | new_flags | tintSet;
776 return true; 1014 return true;
777 } 1015 }
1016
778 return false; 1017 return false;
779} 1018}
780 1019
781bool 1020bool
782bgPixmap_t::unset_tint () 1021bgPixmap_t::unset_tint ()
783{ 1022{
784 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 1023 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
785 1024
786 if (new_flags != (flags & tintFlags)) 1025 if (new_flags != (flags & tintFlags))
787 { 1026 {
788 flags = (flags&~tintFlags)|new_flags; 1027 flags = (flags & ~tintFlags) | new_flags;
789 return true; 1028 return true;
790 } 1029 }
1030
791 return false; 1031 return false;
792} 1032}
793 1033
794bool 1034bool
795bgPixmap_t::set_shade (const char *shade_str) 1035bgPixmap_t::set_shade (const char *shade_str)
796{ 1036{
797 int new_shade = (shade_str) ? atoi (shade_str) : 0; 1037 int new_shade = (shade_str) ? atoi (shade_str) : 100;
798 1038
799 if (new_shade < 0 && new_shade > -100) 1039 clamp_it (new_shade, -100, 200);
1040 if (new_shade < 0)
800 new_shade = 200 - (100 + new_shade); 1041 new_shade = 200 - (100 + new_shade);
801 else if (new_shade == 100)
802 new_shade = 0;
803 1042
804 if (new_shade != shade) 1043 if (new_shade != shade)
805 { 1044 {
806 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1045 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
807 shade = new_shade; 1046 shade = new_shade;
808 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1047 flags = (flags & (~tintFlags | tintSet)) | new_flags;
809 return true; 1048 return true;
810 } 1049 }
1050
811 return false; 1051 return false;
1052}
1053
1054bool
1055bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1056{
1057 Display *dpy = target->dpy;
1058 bool ret = false;
1059
1060 if (flags & tintWholesome)
1061 {
1062 XGCValues gcv;
1063 GC gc;
1064
1065 /* In this case we can tint image server-side getting significant
1066 * performance improvements, as we eliminate XImage transfer
1067 */
1068 gcv.foreground = Pixel (tint);
1069 gcv.function = GXand;
1070 gcv.fill_style = FillSolid;
1071 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1072 if (gc)
1073 {
1074 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1075 ret = true;
1076 XFreeGC (dpy, gc);
1077 }
1078 }
1079 else
1080 {
1081# if XFT
1082 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1083
1084 if (flags & tintSet)
1085 tint.get (c);
1086
1087 if (shade <= 100)
1088 {
1089 c.r = (c.r * shade) / 100;
1090 c.g = (c.g * shade) / 100;
1091 c.b = (c.b * shade) / 100;
1092 }
1093 else
1094 {
1095 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1096 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1097 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1098 }
1099
1100 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1101 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1102 XRenderPictureAttributes pa;
1103
1104 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1105
1106 pa.repeat = True;
1107
1108 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1109 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1110 XFreePixmap (dpy, overlay_pmap);
1111
1112 pa.component_alpha = True;
1113 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1114 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1115 XFreePixmap (dpy, mask_pmap);
1116
1117 if (mask_pic && overlay_pic && back_pic)
1118 {
1119 XRenderColor mask_c;
1120
1121 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1122 mask_c.alpha = 0xffff;
1123 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1124
1125 mask_c.alpha = 0;
1126 mask_c.red = 0xffff - c.r;
1127 mask_c.green = 0xffff - c.g;
1128 mask_c.blue = 0xffff - c.b;
1129 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1130 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1131 ret = true;
1132 }
1133
1134 XRenderFreePicture (dpy, mask_pic);
1135 XRenderFreePicture (dpy, overlay_pic);
1136 XRenderFreePicture (dpy, back_pic);
1137# if DO_TIMING_TEST
1138 XSync (dpy, False);
1139# endif
1140# endif
1141 }
1142
1143 return ret;
812} 1144}
813 1145
814/* make_transparency_pixmap() 1146/* make_transparency_pixmap()
815 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1147 * Builds a pixmap sized the same as terminal window, with depth same as the root window
816 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1148 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by
… …
822 unsigned long result = 0; 1154 unsigned long result = 0;
823 1155
824 if (target == NULL) 1156 if (target == NULL)
825 return 0; 1157 return 0;
826 1158
827 /* root dimentions may change from call to call - but Display structure should 1159 /* root dimensions may change from call to call - but Display structure should
828 * be always up-to-date, so let's use it : 1160 * be always up-to-date, so let's use it :
829 */ 1161 */
830 Window root = target->display->root; 1162 Window root = target->display->root;
831 int screen = target->display->screen; 1163 int screen = target->display->screen;
832 Display *dpy = target->dpy; 1164 Display *dpy = target->dpy;
… …
845 if (sx + window_width <= 0 || sy + window_height <= 0 1177 if (sx + window_width <= 0 || sy + window_height <= 0
846 || sx >= root_width || sy >= root_height) 1178 || sx >= root_width || sy >= root_height)
847 return 0; 1179 return 0;
848 1180
849 if (root_pixmap != None) 1181 if (root_pixmap != None)
1182 {
850 {/* we want to validate the pixmap and get it's size at the same time : */ 1183 /* we want to validate the pixmap and get it's size at the same time : */
851 int junk; 1184 int junk;
852 unsigned int ujunk; 1185 unsigned int ujunk;
853 /* root pixmap may be bad - allow a error */ 1186 /* root pixmap may be bad - allow a error */
854 target->allowedxerror = -1; 1187 target->allowedxerror = -1;
855 1188
… …
864 1197
865 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1198 if (tiled_root_pmap == None) /* something really bad happened - abort */
866 return 0; 1199 return 0;
867 1200
868 if (root_pixmap == None) 1201 if (root_pixmap == None)
1202 {
869 { /* use tricks to obtain the root background image :*/ 1203 /* use tricks to obtain the root background image :*/
870 /* we want to create Overrideredirect window overlapping out window 1204 /* we want to create Overrideredirect window overlapping out window
871 with background type of Parent Relative and then grab it */ 1205 with background type of Parent Relative and then grab it */
872 XSetWindowAttributes attr; 1206 XSetWindowAttributes attr;
873 Window src; 1207 Window src;
874 bool success = false; 1208 bool success = false;
875 1209
876 attr.background_pixmap = ParentRelative; 1210 attr.background_pixmap = ParentRelative;
877 attr.backing_store = Always; 1211 attr.backing_store = Always;
878 attr.event_mask = ExposureMask; 1212 attr.event_mask = ExposureMask;
879 attr.override_redirect = True; 1213 attr.override_redirect = True;
880 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0, 1214 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
881 CopyFromParent, CopyFromParent, CopyFromParent, 1215 CopyFromParent, CopyFromParent, CopyFromParent,
882 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask, 1216 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
883 &attr); 1217 &attr);
884 1218
885 if (src != None) 1219 if (src != None)
… …
889 XGrabServer (dpy); 1223 XGrabServer (dpy);
890 XMapRaised (dpy, src); 1224 XMapRaised (dpy, src);
891 XSync (dpy, False); 1225 XSync (dpy, False);
892 1226
893 /* XSync should get window where it's properly exposed, 1227 /* XSync should get window where it's properly exposed,
894 * but to be on the safe side - let's check for the actuall event to arrive : */ 1228 * but to be on the safe side - let's check for the actual event to arrive : */
895 while (XCheckWindowEvent (dpy, src, ExposureMask, &event)) 1229 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
896 ++ev_count; 1230 ++ev_count;
897 1231
898 if (ev_count > 0); 1232 if (ev_count > 0);
1233 {
899 { /* hooray! - we can grab the image! */ 1234 /* hooray! - we can grab the image! */
900 gc = XCreateGC (dpy, root, 0, NULL); 1235 gc = XCreateGC (dpy, root, 0, NULL);
901 if (gc) 1236 if (gc)
902 { 1237 {
903 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0); 1238 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
904 success = true; 1239 success = true;
905 } 1240 }
906 } 1241 }
1242
907 XDestroyWindow (dpy, src); 1243 XDestroyWindow (dpy, src);
908 XUngrabServer (dpy); 1244 XUngrabServer (dpy);
909 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count); 1245 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
910 } 1246 }
911 1247
912 if (!success) 1248 if (!success)
913 { 1249 {
914 XFreePixmap (dpy, tiled_root_pmap); 1250 XFreePixmap (dpy, tiled_root_pmap);
915 tiled_root_pmap = None; 1251 tiled_root_pmap = None;
916 } 1252 }
917 else 1253 else
918 result |= transpPmapTiled; 1254 result |= transpPmapTiled;
919 } 1255 }
920 else 1256 else
1257 {
921 {/* strightforward pixmap copy */ 1258 /* straightforward pixmap copy */
922 gcv.tile = root_pixmap; 1259 gcv.tile = root_pixmap;
923 gcv.fill_style = FillTiled; 1260 gcv.fill_style = FillTiled;
924 1261
925 while (sx < 0) sx += (int)root_width; 1262 while (sx < 0) sx += (int)root_width;
926 while (sy < 0) sy += (int)root_height; 1263 while (sy < 0) sy += (int)root_height;
… …
941 { 1278 {
942 if (!need_client_side_rendering ()) 1279 if (!need_client_side_rendering ())
943 { 1280 {
944 if ((flags & tintNeeded)) 1281 if ((flags & tintNeeded))
945 { 1282 {
946 if (flags & tintWholesome) 1283 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height))
947 {
948 /* In this case we can tint image server-side getting significant
949 * performance improvements, as we eliminate XImage transfer
950 */
951 gcv.foreground = Pixel (tint);
952 gcv.function = GXand;
953 gcv.fill_style = FillSolid;
954 if (gc)
955 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
956 else
957 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
958 if (gc)
959 {
960 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
961 result |= transpPmapTinted; 1284 result |= transpPmapTinted;
962 }
963 }
964 else
965 {
966# if XFT
967 Picture back_pic = 0;
968 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
969
970 if (flags & tintSet)
971 tint.get (c);
972
973 if (shade > 0 && shade < 100)
974 {
975 c.r = (c.r * shade) / 100;
976 c.g = (c.g * shade) / 100;
977 c.b = (c.b * shade) / 100;
978 }
979 else if( shade > 100 && shade < 200)
980 {
981 c.r = (c.r * (200 - shade)) / 100;
982 c.g = (c.g * (200 - shade)) / 100;
983 c.b = (c.b * (200 - shade)) / 100;
984 }
985
986 XRenderPictFormat pf;
987 pf.type = PictTypeDirect;
988 pf.depth = 32;
989 pf.direct.redMask = 0xff;
990 pf.direct.greenMask = 0xff;
991 pf.direct.blueMask = 0xff;
992 pf.direct.alphaMask = 0xff;
993
994 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
995 (PictFormatType|
996 PictFormatDepth|
997 PictFormatRedMask|
998 PictFormatGreenMask|
999 PictFormatBlueMask|
1000 PictFormatAlphaMask),
1001 &pf,
1002 0);
1003 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1004 XRenderPictureAttributes pa ;
1005
1006 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1007
1008 pa.repeat = True;
1009
1010 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1011 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1012 XFreePixmap (dpy, overlay_pmap);
1013
1014 pa.component_alpha = True;
1015 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1016 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1017 XFreePixmap (dpy, mask_pmap);
1018
1019 if (mask_pic && overlay_pic && back_pic)
1020 {
1021 XRenderColor mask_c;
1022
1023 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1024 mask_c.alpha = 0xffff;
1025 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1026
1027 mask_c.alpha = 0;
1028 mask_c.red = 0xffff - c.r;
1029 mask_c.green = 0xffff - c.g;
1030 mask_c.blue = 0xffff - c.b;
1031 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1032 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1033 result |= transpPmapTinted;
1034 }
1035 XRenderFreePicture (dpy, mask_pic);
1036 XRenderFreePicture (dpy, overlay_pic);
1037 XRenderFreePicture (dpy, back_pic);
1038# if DO_TIMING_TEST
1039 XSync (dpy, False);
1040# endif
1041# endif
1042 }
1043 } 1285 }
1044 } /* server side rendering completed */ 1286 } /* server side rendering completed */
1045 1287
1046 if (pixmap) 1288 if (pixmap)
1047 XFreePixmap (dpy, pixmap); 1289 XFreePixmap (dpy, pixmap);
1048 1290
… …
1061} 1303}
1062 1304
1063bool 1305bool
1064bgPixmap_t::set_root_pixmap () 1306bgPixmap_t::set_root_pixmap ()
1065{ 1307{
1066 Pixmap new_root_pixmap = None;
1067
1068 new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1308 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1069 if (new_root_pixmap == None) 1309 if (new_root_pixmap == None)
1070 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1310 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1071 1311
1072 if (new_root_pixmap != root_pixmap) 1312 if (new_root_pixmap != root_pixmap)
1073 { 1313 {
1074 root_pixmap = new_root_pixmap; 1314 root_pixmap = new_root_pixmap;
1075 return true; 1315 return true;
1076 } 1316 }
1317
1077 return false; 1318 return false;
1078} 1319}
1079# endif /* ENABLE_TRANSPARENCY */ 1320# endif /* ENABLE_TRANSPARENCY */
1080 1321
1081# ifndef HAVE_AFTERIMAGE 1322# ifndef HAVE_AFTERIMAGE
1082static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1323static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1083# endif 1324# endif
1084
1085 1325
1086bool 1326bool
1087bgPixmap_t::render () 1327bgPixmap_t::render ()
1088{ 1328{
1089 unsigned long background_flags = 0; 1329 unsigned long background_flags = 0;
… …
1091 if (target == NULL) 1331 if (target == NULL)
1092 return false; 1332 return false;
1093 1333
1094 TIMING_TEST_START (tp); 1334 TIMING_TEST_START (tp);
1095 1335
1096 invalidate(); 1336 invalidate ();
1097# ifdef ENABLE_TRANSPARENCY 1337# ifdef ENABLE_TRANSPARENCY
1098 if (flags & isTransparent) 1338 if (flags & isTransparent)
1099 { 1339 {
1100 /* we need to re-generate transparency pixmap in that case ! */ 1340 /* we need to re-generate transparency pixmap in that case ! */
1101 background_flags = make_transparency_pixmap (); 1341 background_flags = make_transparency_pixmap ();
1102 if (background_flags == 0) 1342 if (background_flags == 0)
1103 return false; 1343 return false;
1104 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1344 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1105 && pmap_depth == target->depth) 1345 && pmap_depth == target->depth)
1106 flags = flags & ~isInvalid; 1346 flags = flags & ~isInvalid;
1107 } 1347 }
1108# endif 1348# endif
1109 1349
1350# ifdef BG_IMAGE_FROM_FILE
1351 if (have_image
1352 || (background_flags & transpTransformations) != (flags & transpTransformations))
1353 {
1354 if (render_image (background_flags))
1355 flags = flags & ~isInvalid;
1356 }
1357# endif
1358
1110 XImage *result = NULL; 1359 XImage *result = NULL;
1111# ifdef HAVE_AFTERIMAGE 1360
1112 if (original_asim 1361 if (background_flags && (flags & isInvalid))
1113 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1362 {
1363 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1114 { 1364 }
1115 ASImage *background = NULL;
1116 ARGB32 as_tint = TINT_LEAVE_SAME;
1117 if (background_flags)
1118 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1119 1365
1120# ifdef ENABLE_TRANSPARENCY 1366 if (result)
1367 {
1368# if !defined(HAVE_AFTERIMAGE) && !XFT
1369 /* our own client-side tinting */
1370 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1371 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1121 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1372 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1122 {
1123 ShadingInfo as_shade;
1124 as_shade.shading = (shade == 0) ? 100 : shade;
1125
1126 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1127 if (flags & tintSet)
1128 tint.get (c);
1129 as_shade.tintColor.red = c.r;
1130 as_shade.tintColor.green = c.g;
1131 as_shade.tintColor.blue = c.b;
1132
1133 as_tint = shading2tint32 (&as_shade);
1134 }
1135 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1136 {
1137 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1138 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1139 100, ASIMAGE_QUALITY_DEFAULT);
1140 if (tmp)
1141 {
1142 destroy_asimage (&background);
1143 background = tmp;
1144 }
1145 }
1146# endif
1147
1148 if (render_asim (background, as_tint))
1149 flags = flags & ~isInvalid;
1150 if (background)
1151 destroy_asimage (&background);
1152 }
1153 else if (background_flags && pmap_depth != target->depth)
1154 {
1155 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1156 }
1157
1158# elif !XFT /* our own client-side tinting */
1159
1160 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1161 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1162
1163 if (background_flags && (flags & isInvalid))
1164 {
1165 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1166 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1167 { 1373 {
1168 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1374 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1169 if (flags & tintSet) 1375 if (flags & tintSet)
1170 tint.get (c); 1376 tint.get (c);
1171 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1377 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1172 } 1378 }
1173 } 1379# endif
1174# endif /* HAVE_AFTERIMAGE */
1175 1380
1176 if (result != NULL)
1177 {
1178 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1381 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1382
1179 if (gc) 1383 if (gc)
1180 { 1384 {
1181 if (/*pmap_depth != target->depth &&*/ pixmap != None) 1385 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1182 { 1386 {
1183 XFreePixmap (target->dpy, pixmap); 1387 XFreePixmap (target->dpy, pixmap);
1184 pixmap = None; 1388 pixmap = None;
1185 } 1389 }
1390
1186 if (pixmap == None) 1391 if (pixmap == None)
1187 { 1392 {
1188 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth); 1393 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1189 pmap_width = result->width; 1394 pmap_width = result->width;
1190 pmap_height = result->height; 1395 pmap_height = result->height;
1191 pmap_depth = target->depth; 1396 pmap_depth = target->depth;
1192 } 1397 }
1398
1193 if (pmap_depth != result->depth) 1399 if (pmap_depth != result->depth)
1400 {
1194 { /* Bad Match error will ensue ! stupid X !!!! */ 1401 /* Bad Match error will ensue ! stupid X !!!! */
1195 if( result->depth == 24 && pmap_depth == 32) 1402 if (result->depth == 24 && pmap_depth == 32)
1196 result->depth = 32; 1403 result->depth = 32;
1197 else if( result->depth == 32 && pmap_depth == 24) 1404 else if (result->depth == 32 && pmap_depth == 24)
1198 result->depth = 24; 1405 result->depth = 24;
1199 else 1406 else
1200 { 1407 {
1201 /* TODO: implement image recoding */ 1408 /* TODO: implement image recoding */
1202 } 1409 }
1203 } 1410 }
1411
1204 if (pmap_depth == result->depth) 1412 if (pmap_depth == result->depth)
1205 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1413 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1414
1206 XFreeGC (target->dpy, gc); 1415 XFreeGC (target->dpy, gc);
1207 flags = flags & ~isInvalid; 1416 flags = flags & ~isInvalid;
1208 } 1417 }
1418
1209 XDestroyImage (result); 1419 XDestroyImage (result);
1210 } 1420 }
1211 1421
1212 if (flags & isInvalid) 1422 if (flags & isInvalid)
1213 { 1423 {
1214 if (pixmap != None) 1424 if (pixmap != None)
… …
1217 pixmap = None; 1427 pixmap = None;
1218 } 1428 }
1219 } 1429 }
1220 1430
1221 apply (); 1431 apply ();
1432
1433 XSync (target->dpy, False);
1434 valid_since = ev::now ();
1222 1435
1223 TIMING_TEST_PRINT_RESULT (tp); 1436 TIMING_TEST_PRINT_RESULT (tp);
1224 1437
1225 return true; 1438 return true;
1226} 1439}
… …
1235# ifdef ENABLE_TRANSPARENCY 1448# ifdef ENABLE_TRANSPARENCY
1236 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1449 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1237# endif 1450# endif
1238 return true; 1451 return true;
1239 } 1452 }
1453
1240 return false; 1454 return false;
1241} 1455}
1242 1456
1243void 1457void
1244bgPixmap_t::apply() 1458bgPixmap_t::apply ()
1245{ 1459{
1246 if (target) 1460 if (target)
1247 { 1461 {
1248 flags &= ~isVtOrigin; 1462 flags &= ~isVtOrigin;
1463
1249 if (pixmap != None) 1464 if (pixmap != None)
1465 {
1250 { /* set target's background to pixmap */ 1466 /* set target's background to pixmap */
1251# ifdef ENABLE_TRANSPARENCY 1467# ifdef ENABLE_TRANSPARENCY
1252 if (flags & isTransparent) 1468 if (flags & isTransparent)
1253 { 1469 {
1254 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1470 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1255 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1471 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1256# if HAVE_SCROLLBARS 1472
1257 if (target->scrollBar.win) 1473 if (target->scrollBar.win)
1258 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1474 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1259# endif
1260 } 1475 }
1261 else 1476 else
1262# endif 1477# endif
1263 { 1478 {
1264 flags |= isVtOrigin; 1479 flags |= isVtOrigin;
1265 /* force old pixmap dereference in case it was transparent before :*/ 1480 /* force old pixmap dereference in case it was transparent before :*/
1266 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1481 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1267 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap); 1482 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1268 /* do we also need to set scrollbar's background here ? */ 1483 /* do we also need to set scrollbar's background here ? */
1269# if HAVE_SCROLLBARS 1484
1270 if (target->scrollBar.win) 1485 if (target->scrollBar.win)
1271 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1486 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1272# endif
1273 } 1487 }
1274 } 1488 }
1275 else 1489 else
1490 {
1276 { /* set target background to a pixel */ 1491 /* set target background to a pixel */
1277 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1492 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1278 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1493 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1279 /* do we also need to set scrollbar's background here ? */ 1494 /* do we also need to set scrollbar's background here ? */
1280# if HAVE_SCROLLBARS
1281 if (target->scrollBar.win) 1495 if (target->scrollBar.win)
1282 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1496 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1283# endif
1284 } 1497 }
1498
1285 /* don't want Expose on the parent or vt. It is better to use 1499 /* don't want Expose on the parent or vt. It is better to use
1286 scr_touch or we get a great deal of flicker otherwise: */ 1500 scr_touch or we get a great deal of flicker otherwise: */
1287 XClearWindow (target->dpy, target->parent[0]); 1501 XClearWindow (target->dpy, target->parent[0]);
1288 1502
1289# if HAVE_SCROLLBARS 1503 if (target->scrollBar.state && target->scrollBar.win)
1290 if (target->scrollBar.win)
1291 { 1504 {
1292 target->scrollBar.setIdle (); 1505 target->scrollBar.state = STATE_IDLE;
1293 target->scrollbar_show (0); 1506 target->scrollBar.show (0);
1294 } 1507 }
1295# endif
1296 1508
1297 target->want_refresh = 1; 1509 target->want_refresh = 1;
1298 flags |= hasChanged; 1510 flags |= hasChanged;
1299 } 1511 }
1300} 1512}
… …
1305/* taken from aterm-0.4.2 */ 1517/* taken from aterm-0.4.2 */
1306 1518
1307typedef uint32_t RUINT32T; 1519typedef uint32_t RUINT32T;
1308 1520
1309static void 1521static void
1310ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1522ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm)
1311{ 1523{
1312 int sh_r, sh_g, sh_b; 1524 int sh_r, sh_g, sh_b;
1313 RUINT32T mask_r, mask_g, mask_b; 1525 RUINT32T mask_r, mask_g, mask_b;
1314 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1526 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b;
1315 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1527 unsigned int lower_lim_r, lower_lim_g, lower_lim_b;
… …
1317 int i; 1529 int i;
1318 1530
1319 Visual *visual = term->visual; 1531 Visual *visual = term->visual;
1320 1532
1321 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1533 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ;
1322
1323 if (shade == 0)
1324 shade = 100;
1325 1534
1326 /* for convenience */ 1535 /* for convenience */
1327 mask_r = visual->red_mask; 1536 mask_r = visual->red_mask;
1328 mask_g = visual->green_mask; 1537 mask_g = visual->green_mask;
1329 mask_b = visual->blue_mask; 1538 mask_b = visual->blue_mask;
… …
1385 default: 1594 default:
1386 return; /* we do not support this color depth */ 1595 return; /* we do not support this color depth */
1387 } 1596 }
1388 1597
1389 /* prepare limits for color transformation (each channel is handled separately) */ 1598 /* prepare limits for color transformation (each channel is handled separately) */
1390 if (shade < 0) { 1599 if (shade > 100) {
1391 shade = -shade; 1600 shade = 200 - shade;
1392 if (shade < 0) shade = 0;
1393 if (shade > 100) shade = 100;
1394 1601
1395 lower_lim_r = 65535-rm; 1602 lower_lim_r = 65535-rm;
1396 lower_lim_g = 65535-gm; 1603 lower_lim_g = 65535-gm;
1397 lower_lim_b = 65535-bm; 1604 lower_lim_b = 65535-bm;
1398 1605
… …
1400 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1607 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100);
1401 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1608 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100);
1402 1609
1403 upper_lim_r = upper_lim_g = upper_lim_b = 65535; 1610 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1404 } else { 1611 } else {
1405 if (shade < 0) shade = 0;
1406 if (shade > 100) shade = 100;
1407 1612
1408 lower_lim_r = lower_lim_g = lower_lim_b = 0; 1613 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1409 1614
1410 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100); 1615 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1411 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100); 1616 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);

Diff Legend

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