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.83 by sf-exg, Thu Oct 14 17:39:42 2010 UTC vs.
Revision 1.142 by sf-exg, Thu Jan 27 17:37:18 2011 UTC

… …
24 24
25#include <cmath> 25#include <cmath>
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28 28
29#define DO_TIMING_TEST 0 29#if XRENDER
30# include <X11/extensions/Xrender.h>
31#endif
30 32
31#if DO_TIMING_TEST 33#ifndef FilterConvolution
32# include <sys/time.h> 34#define FilterConvolution "convolution"
33#define TIMING_TEST_START(id) \
34 struct timeval timing_test_##id##_stv; \
35 gettimeofday (&timing_test_##id##_stv, NULL);
36
37#define TIMING_TEST_PRINT_RESULT(id) \
38 do { \
39 struct timeval tv; \
40 gettimeofday (&tv, NULL); \
41 tv.tv_sec -= (timing_test_##id##_stv).tv_sec; \
42 fprintf (stderr, "%s: %s: %d: elapsed %ld usec\n", #id, __FILE__, __LINE__, \
43 tv.tv_sec * 1000000 + tv.tv_usec - (timing_test_##id##_stv).tv_usec); \
44 } while (0)
45
46#else
47#define TIMING_TEST_START(id) do {} while (0)
48#define TIMING_TEST_PRINT_RESULT(id) do {} while (0)
49#endif 35#endif
50 36
51/* 37/*
52 * Pixmap geometry string interpretation : 38 * Pixmap geometry string interpretation :
53 * Each geometry string contains zero or one scale/position 39 * Each geometry string contains zero or one scale/position
… …
58 * 44 *
59 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%. 45 * WxH+X+Y Set scaling to W% by H%, and position to X% by Y%.
60 * W and H are percentages of the terminal window size. 46 * W and H are percentages of the terminal window size.
61 * X and Y are also percentages; e.g., +50+50 centers 47 * X and Y are also percentages; e.g., +50+50 centers
62 * the image in the window. 48 * the image in the window.
63 * WxH+X Assumes Y == X
64 * WxH Assumes Y == X == 50 (centers the image)
65 * W+X+Y Assumes H == W
66 * W+X Assumes H == W and Y == X
67 * W Assumes H == W and Y == X == 50
68 *
69 * Adjusting position only :
70 * =+X+Y Set position to X% by Y% (absolute).
71 * =+X Set position to X% by X%.
72 * +X+Y Adjust position horizontally X% and vertically Y%
73 * from current position (relative).
74 * +X Adjust position horizontally X% and vertically X%
75 * from current position.
76 *
77 * Adjusting scale only :
78 * Wx0 Multiply horizontal scaling factor by W%
79 * 0xH Multiply vertical scaling factor by H%
80 * 0x0 No scaling (show image at normal size).
81 * 49 *
82 * Pixmap Operations : (should be prepended by a colon) 50 * Pixmap Operations : (should be prepended by a colon)
83 * tile Tile image. Scaling/position modifiers above will affect 51 * tile Tile image. Scaling/position modifiers above will affect
84 * the tile size and origin. 52 * the tile size and origin.
85 * propscale When scaling, scale proportionally. That is, maintain the 53 * propscale When scaling, scale proportionally. That is, maintain the
… …
91 * scale Scale both up and down 59 * scale Scale both up and down
92 * auto Same as 100x100+50+50 60 * auto Same as 100x100+50+50
93 */ 61 */
94 62
95#ifdef HAVE_BG_PIXMAP 63#ifdef HAVE_BG_PIXMAP
96bgPixmap_t::bgPixmap_t ()
97{
98 // this is basically redundant as bgPixmap_t is only used in
99 // zero_initialised-derived structs
100#ifdef HAVE_AFTERIMAGE
101 original_asim = NULL;
102#endif
103#ifdef HAVE_PIXBUF
104 pixbuf = NULL;
105#endif
106#ifdef BG_IMAGE_FROM_FILE
107 have_image = false;
108 h_scale = v_scale = 0;
109 h_align = v_align = 0;
110#endif
111#ifdef ENABLE_TRANSPARENCY
112 shade = 100;
113#endif
114 flags = 0;
115 pixmap = None;
116 valid_since = invalid_since = 0;
117 target = 0;
118}
119
120void 64void
121bgPixmap_t::destroy () 65rxvt_term::bg_destroy ()
122{ 66{
123#ifdef HAVE_AFTERIMAGE 67#ifdef HAVE_AFTERIMAGE
124 if (original_asim) 68 if (original_asim)
125 safe_asimage_destroy (original_asim); 69 safe_asimage_destroy (original_asim);
126#endif 70#endif
… …
128#ifdef HAVE_PIXBUF 72#ifdef HAVE_PIXBUF
129 if (pixbuf) 73 if (pixbuf)
130 g_object_unref (pixbuf); 74 g_object_unref (pixbuf);
131#endif 75#endif
132 76
133 if (pixmap && target) 77 if (bg_pixmap)
134 XFreePixmap (target->dpy, pixmap); 78 XFreePixmap (dpy, bg_pixmap);
135} 79}
136 80
137bool 81bool
138bgPixmap_t::window_size_sensitive () 82rxvt_term::bg_set_position (int x, int y)
83{
84
85 if (target_x != x
86 || target_y != y)
87 {
88 target_x = x;
89 target_y = y;
90 return true;
91 }
92 return false;
93}
94
95bool
96rxvt_term::bg_window_size_sensitive ()
139{ 97{
140# ifdef ENABLE_TRANSPARENCY 98# ifdef ENABLE_TRANSPARENCY
141 if (flags & isTransparent) 99 if (bg_flags & isTransparent)
142 return true; 100 return true;
143# endif 101# endif
144 102
145# ifdef BG_IMAGE_FROM_FILE 103# ifdef BG_IMAGE_FROM_FILE
146 if (have_image) 104 if (have_image)
147 { 105 {
148 if (flags & sizeSensitive) 106 if (bg_flags & sizeSensitive)
149 return true; 107 return true;
150 } 108 }
151# endif 109# endif
152 110
153 return false; 111 return false;
154} 112}
155 113
156bool 114bool
157bgPixmap_t::window_position_sensitive () 115rxvt_term::bg_window_position_sensitive ()
158{ 116{
159# ifdef ENABLE_TRANSPARENCY 117# ifdef ENABLE_TRANSPARENCY
160 if (flags & isTransparent) 118 if (bg_flags & isTransparent)
161 return true; 119 return true;
162# endif 120# endif
163 121
164# ifdef BG_IMAGE_FROM_FILE 122# ifdef BG_IMAGE_FROM_FILE
165 if (have_image) 123 if (have_image)
166 { 124 {
167 if (flags & rootAlign) 125 if (bg_flags & rootAlign)
168 return true; 126 return true;
169 } 127 }
170# endif 128# endif
171 129
172 return false;
173};
174
175bool bgPixmap_t::need_client_side_rendering ()
176{
177# ifdef HAVE_AFTERIMAGE
178 if (original_asim)
179 return true;
180# endif
181 return false; 130 return false;
182} 131}
183 132
184# ifdef BG_IMAGE_FROM_FILE 133# ifdef BG_IMAGE_FROM_FILE
185static inline bool 134static inline bool
… …
222 int diff = window_size - image_size; 171 int diff = window_size - image_size;
223 int smaller = min (image_size, window_size); 172 int smaller = min (image_size, window_size);
224 173
225 if (align >= 0 && align <= 100) 174 if (align >= 0 && align <= 100)
226 return diff * align / 100; 175 return diff * align / 100;
227 else if (align > 100 && align <= 200 ) 176 else if (align > 100 && align <= 200)
228 return ((align - 100) * smaller / 100) + window_size - smaller; 177 return ((align - 100) * smaller / 100) + window_size - smaller;
229 else if (align >= -100 && align < 0) 178 else if (align >= -100 && align < 0)
230 return ((align + 100) * smaller / 100) - image_size; 179 return ((align + 100) * smaller / 100) - image_size;
231 return 0; 180 return 0;
232} 181}
… …
248 dst_size = target_size - dst_pos; 197 dst_size = target_size - dst_pos;
249 return src_pos; 198 return src_pos;
250} 199}
251 200
252bool 201bool
253bgPixmap_t::set_geometry (const char *geom) 202rxvt_term::bg_set_geometry (const char *geom, bool update)
254{ 203{
204 bool changed = false;
255 int geom_flags = 0, changed = 0; 205 int geom_flags = 0;
256 int x = 0, y = 0; 206 int x = 0, y = 0;
257 unsigned int w = 0, h = 0; 207 unsigned int w = 0, h = 0;
258 unsigned int n; 208 unsigned int n;
259 unsigned long new_flags = (flags & (~geometryFlags)); 209 unsigned long new_flags = (bg_flags & (~geometryFlags));
260 const char *p; 210 const char *ops;
261# define MAXLEN_GEOM 256 /* could be longer than regular geometry string */
262 211
263 if (geom == NULL) 212 if (geom == NULL)
264 return false; 213 return false;
265 214
266 char str[MAXLEN_GEOM]; 215 char str[256];
267 216
268 while (isspace(*geom)) ++geom;
269 if ((p = strchr (geom, ';')) == NULL)
270 p = strchr (geom, '\0'); 217 ops = strchr (geom, ':');
271 218 if (ops == NULL)
219 n = strlen (geom);
220 else
272 n = (p - geom); 221 n = ops - geom;
273 if (n < MAXLEN_GEOM)
274 {
275 char *ops;
276 new_flags |= geometrySet;
277 222
223 if (n >= sizeof (str))
224 return false;
225
278 memcpy (str, geom, n); 226 memcpy (str, geom, n);
279 str[n] = '\0'; 227 str[n] = '\0';
280 if (str[0] == ':') 228 rxvt_strtrim (str);
281 ops = &str[0];
282 else if (str[0] != 'x' && str[0] != 'X' && isalpha(str[0]))
283 ops = &str[0];
284 else
285 {
286 char *tmp;
287 ops = strchr (str, ':');
288 if (ops != NULL)
289 {
290 for (tmp = ops-1; tmp >= str && isspace(*tmp); --tmp);
291 *(++tmp) = '\0';
292 if (ops == tmp) ++ops;
293 }
294 }
295 229
296 if (ops > str || ops == NULL) 230 if (str[0])
297 { 231 {
298 /* we have geometry string - let's handle it prior to applying ops */ 232 /* we have geometry string - let's handle it prior to applying ops */
299 geom_flags = XParseGeometry (str, &x, &y, &w, &h); 233 geom_flags = XParseGeometry (str, &x, &y, &w, &h);
300
301 if ((geom_flags & XValue) && !(geom_flags & YValue))
302 {
303 y = x;
304 geom_flags |= YValue;
305 }
306
307 if (flags & geometrySet)
308 {
309 /* new geometry is an adjustment to the old one ! */
310 if ((geom_flags & WidthValue) && (geom_flags & HeightValue))
311 {
312 if (w == 0 && h != 0)
313 {
314 w = h_scale;
315 h = (v_scale * h) / 100;
316 }
317 else if (h == 0 && w != 0)
318 {
319 w = (h_scale * w) / 100;
320 h = v_scale;
321 }
322 }
323 if (geom_flags & XValue)
324 {
325 if (str[0] != '=')
326 {
327 y += v_align;
328 x += h_align;
329 }
330 }
331 }
332 else /* setting up geometry from scratch */
333 {
334 if (!(geom_flags & XValue))
335 {
336 /* use default geometry - centered */
337 x = y = defaultAlign;
338 }
339 else if (!(geom_flags & YValue))
340 y = x;
341
342 if ((geom_flags & (WidthValue|HeightValue)) == 0)
343 {
344 /* use default geometry - scaled */
345 w = h = defaultScale;
346 }
347 else if (geom_flags & WidthValue)
348 {
349 if (!(geom_flags & HeightValue))
350 h = w;
351 }
352 else
353 w = h;
354 }
355 } /* done parsing geometry string */ 234 } /* done parsing geometry string */
356 else if (!(flags & geometrySet)) 235
357 { 236 if (!update)
358 /* default geometry - scaled and centered */ 237 {
238 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 239 x = y = defaultAlign;
240 else if (!(geom_flags & YValue))
241 y = x;
242
243 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 244 w = h = defaultScale;
361 } 245 else if (!(geom_flags & HeightValue))
246 h = w;
247 else if (!(geom_flags & WidthValue))
248 w = h;
362 249
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 250 geom_flags |= WidthValue|HeightValue|XValue|YValue;
251 }
365 252
366 if (ops) 253 if (ops)
367 { 254 {
368 while (*ops) 255 char **arr = rxvt_strsplit (':', ops + 1);
256
257 for (int i = 0; arr[i]; i++)
369 { 258 {
370 while (*ops == ':' || isspace(*ops)) ++ops; 259 if (!strcasecmp (arr[i], "tile"))
371
372# define CHECK_GEOM_OPS(op_str) (strncasecmp (ops, (op_str), sizeof (op_str) - 1) == 0)
373 if (CHECK_GEOM_OPS ("tile"))
374 { 260 {
375 w = h = noScale; 261 w = h = noScale;
376 geom_flags |= WidthValue|HeightValue; 262 geom_flags |= WidthValue|HeightValue;
377 } 263 }
378 else if (CHECK_GEOM_OPS ("propscale")) 264 else if (!strcasecmp (arr[i], "propscale"))
379 { 265 {
380 new_flags |= propScale; 266 new_flags |= propScale;
381 } 267 }
382 else if (CHECK_GEOM_OPS ("hscale")) 268 else if (!strcasecmp (arr[i], "hscale"))
383 { 269 {
384 if (w == 0) w = windowScale; 270 if (w == 0) w = windowScale;
385 271
386 h = noScale; 272 h = noScale;
387 geom_flags |= WidthValue|HeightValue; 273 geom_flags |= WidthValue|HeightValue;
388 } 274 }
389 else if (CHECK_GEOM_OPS ("vscale")) 275 else if (!strcasecmp (arr[i], "vscale"))
390 { 276 {
391 if (h == 0) h = windowScale; 277 if (h == 0) h = windowScale;
392 278
393 w = noScale; 279 w = noScale;
394 geom_flags |= WidthValue|HeightValue; 280 geom_flags |= WidthValue|HeightValue;
395 } 281 }
396 else if (CHECK_GEOM_OPS ("scale")) 282 else if (!strcasecmp (arr[i], "scale"))
397 { 283 {
398 if (h == 0) h = windowScale; 284 if (h == 0) h = windowScale;
399 if (w == 0) w = windowScale; 285 if (w == 0) w = windowScale;
400 286
401 geom_flags |= WidthValue|HeightValue; 287 geom_flags |= WidthValue|HeightValue;
402 } 288 }
403 else if (CHECK_GEOM_OPS ("auto")) 289 else if (!strcasecmp (arr[i], "auto"))
404 { 290 {
405 w = h = windowScale; 291 w = h = windowScale;
406 x = y = centerAlign; 292 x = y = centerAlign;
407 geom_flags |= WidthValue|HeightValue|XValue|YValue; 293 geom_flags |= WidthValue|HeightValue|XValue|YValue;
408 } 294 }
409 else if (CHECK_GEOM_OPS ("root")) 295 else if (!strcasecmp (arr[i], "root"))
410 { 296 {
411 new_flags |= rootAlign; 297 new_flags |= rootAlign;
412 w = h = noScale; 298 w = h = noScale;
413 geom_flags |= WidthValue|HeightValue; 299 geom_flags |= WidthValue|HeightValue;
414 } 300 }
415# undef CHECK_GEOM_OPS
416
417 while (*ops != ':' && *ops != '\0') ++ops;
418 } /* done parsing ops */ 301 } /* done parsing ops */
419 }
420 302
303 rxvt_free_strsplit (arr);
304 }
305
421 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) ++changed; 306 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)) changed = true;
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 307 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) changed = true;
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 308 if (check_set_align_value (geom_flags, XValue, h_align, x)) changed = true;
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 309 if (check_set_align_value (geom_flags, YValue, v_align, y)) changed = true;
425 }
426 310
427 if (new_flags != flags) 311 if (new_flags != bg_flags)
428 { 312 {
429 flags = new_flags; 313 bg_flags = new_flags;
430 changed++; 314 changed = true;
431 } 315 }
432 316
433 //fprintf (stderr, "flags = %lX, scale = %ux%u, align=%+d%+d\n",
434 // flags, h_scale, v_scale, h_align, v_align);
435 return (changed > 0); 317 return changed;
436} 318}
437 319
438void 320void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 321rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{ 322{
441 int target_width = target->szHint.width; 323 int target_width = szHint.width;
442 int target_height = target->szHint.height; 324 int target_height = szHint.height;
443 325
444 if (flags & propScale) 326 if (bg_flags & propScale)
445 { 327 {
446 float scale = (float)target_width / image_width; 328 float scale = (float)target_width / image_width;
447 min_it (scale, (float)target_height / image_height); 329 min_it (scale, (float)target_height / image_height);
448 w = image_width * scale + 0.5; 330 w = image_width * scale + 0.5;
449 h = image_height * scale + 0.5; 331 h = image_height * scale + 0.5;
… …
455 } 337 }
456 338
457 if (!w) w = image_width; 339 if (!w) w = image_width;
458 if (!h) h = image_height; 340 if (!h) h = image_height;
459 341
460 if (flags & rootAlign) 342 if (bg_flags & rootAlign)
461 { 343 {
462 target->get_window_origin (x, y);
463 x = -x; 344 x = -target_x;
464 y = -y; 345 y = -target_y;
465 } 346 }
466 else 347 else
467 { 348 {
468 x = make_align_position (h_align, target_width, w); 349 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h); 350 y = make_align_position (v_align, target_height, h);
470 } 351 }
471 352
472 flags &= ~sizeSensitive; 353 bg_flags &= ~sizeSensitive;
473 if (h_scale != 0 || v_scale != 0 354 if ((bg_flags & propScale) || h_scale || v_scale
474 || h_align != 0 || v_align != 0 355 || (!(bg_flags & rootAlign) && (h_align || v_align))
475 || w > target_width || h > target_height) 356 || w > target_width || h > target_height)
476 flags |= sizeSensitive; 357 bg_flags |= sizeSensitive;
477} 358}
478 359
479# ifdef HAVE_AFTERIMAGE 360# ifdef HAVE_AFTERIMAGE
480bool 361bool
481bgPixmap_t::render_image (unsigned long background_flags) 362rxvt_term::render_image (unsigned long tr_flags)
482{ 363{
483 if (target == NULL)
484 return false;
485
486 target->init_asv (); 364 init_asv ();
487 365
488 ASImage *background = NULL; 366 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME; 367 ARGB32 background_tint = TINT_LEAVE_SAME;
490 368
491# ifdef ENABLE_TRANSPARENCY 369# ifdef ENABLE_TRANSPARENCY
492 if (background_flags) 370 if (tr_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 371 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
494 372
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 373 if (tr_flags & tintNeeded)
496 { 374 {
497 ShadingInfo as_shade; 375 ShadingInfo as_shade;
498 as_shade.shading = shade; 376 as_shade.shading = shade;
499 377
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 378 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501 if (flags & tintSet) 379 if (bg_flags & tintSet)
502 tint.get (c); 380 tint.get (c);
503 as_shade.tintColor.red = c.r; 381 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g; 382 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b; 383 as_shade.tintColor.blue = c.b;
506 384
507 background_tint = shading2tint32 (&as_shade); 385 background_tint = shading2tint32 (&as_shade);
508 } 386 }
509 387
510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL) 388 if ((tr_flags & blurNeeded) && background != NULL)
511 { 389 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 390 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 391 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage,
514 100, ASIMAGE_QUALITY_DEFAULT); 392 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp) 393 if (tmp)
516 { 394 {
517 destroy_asimage (&background); 395 destroy_asimage (&background);
… …
520 } 398 }
521# endif 399# endif
522 400
523 ASImage *result = 0; 401 ASImage *result = 0;
524 402
525 int target_width = target->szHint.width; 403 int target_width = szHint.width;
526 int target_height = target->szHint.height; 404 int target_height = szHint.height;
527 int new_pmap_width = target_width; 405 int new_pmap_width = target_width;
528 int new_pmap_height = target_height; 406 int new_pmap_height = target_height;
529 407
530 int x = 0; 408 int x = 0;
531 int y = 0; 409 int y = 0;
532 int w = 0; 410 int w = 0;
533 int h = 0; 411 int h = 0;
534 412
535 TIMING_TEST_START (asim);
536
537 if (original_asim) 413 if (original_asim)
538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 414 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539 415
540 if (!original_asim 416 if (!original_asim
541 || (!(flags & rootAlign) 417 || (!(bg_flags & rootAlign)
542 && (x >= target_width 418 && (x >= target_width
543 || y >= target_height 419 || y >= target_height
544 || (x + w <= 0) 420 || (x + w <= 0)
545 || (y + h <= 0)))) 421 || (y + h <= 0))))
546 { 422 {
… …
550 new_pmap_height = background->height; 426 new_pmap_height = background->height;
551 result = background; 427 result = background;
552 428
553 if (background_tint != TINT_LEAVE_SAME) 429 if (background_tint != TINT_LEAVE_SAME)
554 { 430 {
555 ASImage *tmp = tile_asimage (target->asv, background, 0, 0, 431 ASImage *tmp = tile_asimage (asv, background, 0, 0,
556 target_width, target_height, background_tint, 432 target_width, target_height, background_tint,
557 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 433 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
558 if (tmp) 434 if (tmp)
559 result = tmp; 435 result = tmp;
560 } 436 }
… …
567 result = original_asim; 443 result = original_asim;
568 444
569 if ((w != original_asim->width) 445 if ((w != original_asim->width)
570 || (h != original_asim->height)) 446 || (h != original_asim->height))
571 { 447 {
572 result = scale_asimage (target->asv, original_asim, 448 result = scale_asimage (asv, original_asim,
573 w, h, 449 w, h,
574 background ? ASA_ASImage : ASA_XImage, 450 background ? ASA_ASImage : ASA_XImage,
575 100, ASIMAGE_QUALITY_DEFAULT); 451 100, ASIMAGE_QUALITY_DEFAULT);
576 } 452 }
577 453
… …
583 but there is no need to make it bigger than the window! */ 459 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width); 460 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height); 461 new_pmap_height = min (result->height, target_height);
586 462
587 /* we also need to tile our image in both directions */ 463 /* we also need to tile our image in both directions */
588 ASImage *tmp = tile_asimage (target->asv, result, 464 ASImage *tmp = tile_asimage (asv, result,
589 (int)result->width - x, 465 (int)result->width - x,
590 (int)result->height - y, 466 (int)result->height - y,
591 new_pmap_width, 467 new_pmap_width,
592 new_pmap_height, 468 new_pmap_height,
593 TINT_LEAVE_SAME, ASA_XImage, 469 TINT_LEAVE_SAME, ASA_XImage,
… …
636 { 512 {
637 layers[1].dst_y = y; 513 layers[1].dst_y = y;
638 layers[1].clip_height = result->height; 514 layers[1].clip_height = result->height;
639 } 515 }
640 516
641 if (target->rs[Rs_blendtype]) 517 if (rs[Rs_blendtype])
642 { 518 {
643 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 519 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
644 if (layers[1].merge_scanlines == NULL) 520 if (layers[1].merge_scanlines == NULL)
645 layers[1].merge_scanlines = alphablend_scanlines; 521 layers[1].merge_scanlines = alphablend_scanlines;
646 } 522 }
647 523
648 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 524 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
649 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 525 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
650 526
651 if (tmp) 527 if (tmp)
652 { 528 {
653 if (result != original_asim) 529 if (result != original_asim)
… …
657 } 533 }
658 534
659 free (layers); 535 free (layers);
660 } 536 }
661 } 537 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 538
664 bool ret = false; 539 bool ret = false;
665 540
666 if (result) 541 if (result)
667 { 542 {
668 XGCValues gcv; 543 XGCValues gcv;
669 GC gc; 544 GC gc;
670 545
671 if (pixmap)
672 {
673 if (pmap_width != new_pmap_width
674 || pmap_height != new_pmap_height
675 || pmap_depth != target->depth)
676 {
677 XFreePixmap (target->dpy, pixmap);
678 pixmap = None;
679 }
680 }
681
682 /* create Pixmap */ 546 /* create Pixmap */
683 if (pixmap == None) 547 if (bg_pixmap == None
548 || bg_pmap_width != new_pmap_width
549 || bg_pmap_height != new_pmap_height)
684 { 550 {
551 if (bg_pixmap)
552 XFreePixmap (dpy, bg_pixmap);
685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 553 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
686 pmap_width = new_pmap_width; 554 bg_pmap_width = new_pmap_width;
687 pmap_height = new_pmap_height; 555 bg_pmap_height = new_pmap_height;
688 pmap_depth = target->depth;
689 } 556 }
690 /* fill with background color (if result's not completely overlapping it) */ 557 /* fill with background color (if result's not completely overlapping it) */
691 gcv.foreground = target->pix_colors[Color_bg]; 558 gcv.foreground = pix_colors[Color_bg];
692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 559 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
693 560
694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 561 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
695 int dst_width = result->width, dst_height = result->height; 562 int dst_width = result->width, dst_height = result->height;
696 if (background == NULL) 563 if (background == NULL)
697 { 564 {
… …
702 } 569 }
703 570
704 if (dst_x > 0 || dst_y > 0 571 if (dst_x > 0 || dst_y > 0
705 || dst_x + dst_width < new_pmap_width 572 || dst_x + dst_width < new_pmap_width
706 || dst_y + dst_height < new_pmap_height) 573 || dst_y + dst_height < new_pmap_height)
707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 574 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
708 } 575 }
709 576
710 /* put result on pixmap */ 577 /* put result on pixmap */
711 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 578 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
712 asimage2drawable (target->asv, pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True); 579 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
713 580
714 if (result != background && result != original_asim) 581 if (result != background && result != original_asim)
715 destroy_asimage (&result); 582 destroy_asimage (&result);
716 583
717 XFreeGC (target->dpy, gc); 584 XFreeGC (dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 585
720 ret = true; 586 ret = true;
721 } 587 }
722 588
723 if (background) 589 if (background)
… …
727} 593}
728# endif /* HAVE_AFTERIMAGE */ 594# endif /* HAVE_AFTERIMAGE */
729 595
730# ifdef HAVE_PIXBUF 596# ifdef HAVE_PIXBUF
731bool 597bool
732bgPixmap_t::render_image (unsigned long background_flags) 598rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
599 int src_x, int src_y, int dst_x, int dst_y,
600 unsigned int width, unsigned int height)
733{ 601{
734 if (target == NULL) 602 XImage *ximage;
603 char *data, *line;
604 int bytes_per_pixel;
605 int width_r, width_g, width_b;
606 int sh_r, sh_g, sh_b;
607 int rowstride;
608 int channels;
609 unsigned char *row;
610
611 if (visual->c_class != TrueColor)
735 return false; 612 return false;
736 613
614 if (depth == 24 || depth == 32)
615 bytes_per_pixel = 4;
616 else if (depth == 15 || depth == 16)
617 bytes_per_pixel = 2;
618 else
619 return false;
620
621 width_r = rxvt_popcount (visual->red_mask);
622 width_g = rxvt_popcount (visual->green_mask);
623 width_b = rxvt_popcount (visual->blue_mask);
624
625 if (width_r > 8 || width_g > 8 || width_b > 8)
626 return false;
627
628 sh_r = rxvt_ctz (visual->red_mask);
629 sh_g = rxvt_ctz (visual->green_mask);
630 sh_b = rxvt_ctz (visual->blue_mask);
631
632 if (width > INT_MAX / height / bytes_per_pixel)
633 return false;
634
635 data = (char *)malloc (width * height * bytes_per_pixel);
636 if (!data)
637 return false;
638
639 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
640 width, height, bytes_per_pixel * 8, 0);
641 if (!ximage)
642 {
643 free (data);
644 return false;
645 }
646
647 ximage->byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
648
649 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
650 channels = gdk_pixbuf_get_n_channels (pixbuf);
651 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
652 line = data;
653
654 for (int y = 0; y < height; y++)
655 {
656 for (int x = 0; x < width; x++)
657 {
658 unsigned char *pixel = row + x * channels;
659 uint32_t value;
660
661 value = ((pixel[0] >> (8 - width_r)) << sh_r)
662 | ((pixel[1] >> (8 - width_g)) << sh_g)
663 | ((pixel[2] >> (8 - width_b)) << sh_b);
664
665 if (bytes_per_pixel == 4)
666 ((uint32_t *)line)[x] = value;
667 else
668 ((uint16_t *)line)[x] = value;
669 }
670
671 row += rowstride;
672 line += ximage->bytes_per_line;
673 }
674
675 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
676 XDestroyImage (ximage);
677 return true;
678}
679
680bool
681rxvt_term::render_image (unsigned long tr_flags)
682{
737 if (!pixbuf) 683 if (!pixbuf)
738 return false; 684 return false;
739 685
740#if !XFT 686 if (tr_flags
741 if (background_flags) 687 && !(bg_flags & HAS_RENDER))
742 return false; 688 return false;
743#endif
744 689
745 GdkPixbuf *result; 690 GdkPixbuf *result;
746 691
747 int image_width = gdk_pixbuf_get_width (pixbuf); 692 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 693 int image_height = gdk_pixbuf_get_height (pixbuf);
749 694
750 int target_width = target->szHint.width; 695 int target_width = szHint.width;
751 int target_height = target->szHint.height; 696 int target_height = szHint.height;
752 int new_pmap_width = target_width; 697 int new_pmap_width = target_width;
753 int new_pmap_height = target_height; 698 int new_pmap_height = target_height;
754 699
755 int x = 0; 700 int x = 0;
756 int y = 0; 701 int y = 0;
757 int w = 0; 702 int w = 0;
758 int h = 0; 703 int h = 0;
759 704
760 get_image_geometry (image_width, image_height, w, h, x, y); 705 get_image_geometry (image_width, image_height, w, h, x, y);
761 706
762 if (!(flags & rootAlign) 707 if (!(bg_flags & rootAlign)
763 && (x >= target_width 708 && (x >= target_width
764 || y >= target_height 709 || y >= target_height
765 || (x + w <= 0) 710 || (x + w <= 0)
766 || (y + h <= 0))) 711 || (y + h <= 0)))
767 return false; 712 return false;
… …
785 Pixmap root_pmap; 730 Pixmap root_pmap;
786 731
787 image_width = gdk_pixbuf_get_width (result); 732 image_width = gdk_pixbuf_get_width (result);
788 image_height = gdk_pixbuf_get_height (result); 733 image_height = gdk_pixbuf_get_height (result);
789 734
790 if (background_flags) 735 if (tr_flags)
791 { 736 {
792 root_pmap = pixmap; 737 root_pmap = bg_pixmap;
793 pixmap = None; 738 bg_pixmap = None;
794 } 739 }
795 else 740 else
796 { 741 {
797 if (h_scale == 0 || v_scale == 0) 742 if (h_scale == 0 || v_scale == 0)
798 { 743 {
799 new_pmap_width = min (image_width, target_width); 744 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 745 new_pmap_height = min (image_height, target_height);
801 } 746 }
802 } 747 }
803 748
804 if (pixmap)
805 {
806 if (pmap_width != new_pmap_width
807 || pmap_height != new_pmap_height
808 || pmap_depth != target->depth)
809 {
810 XFreePixmap (target->dpy, pixmap);
811 pixmap = None;
812 }
813 }
814
815 if (pixmap == None) 749 if (bg_pixmap == None
750 || bg_pmap_width != new_pmap_width
751 || bg_pmap_height != new_pmap_height)
816 { 752 {
753 if (bg_pixmap)
754 XFreePixmap (dpy, bg_pixmap);
817 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 755 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
818 pmap_width = new_pmap_width; 756 bg_pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 757 bg_pmap_height = new_pmap_height;
820 pmap_depth = target->depth;
821 } 758 }
822 759
823 gcv.foreground = target->pix_colors[Color_bg]; 760 gcv.foreground = pix_colors[Color_bg];
824 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 761 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
825 762
826 if (h_scale == 0 || v_scale == 0) 763 if (h_scale == 0 || v_scale == 0)
827 { 764 {
828 Pixmap tile = XCreatePixmap (target->dpy, target->vt, image_width, image_height, target->depth); 765 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 766 pixbuf_to_pixmap (result, tile, gc,
830 0, 0, 767 0, 0,
831 0, 0, 768 0, 0,
832 image_width, image_height, 769 image_width, image_height);
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835 770
836 gcv.tile = tile; 771 gcv.tile = tile;
837 gcv.fill_style = FillTiled; 772 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x; 773 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y; 774 gcv.ts_y_origin = y;
840 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 775 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
841 776
842 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 777 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
843 XFreePixmap (target->dpy, tile); 778 XFreePixmap (dpy, tile);
844 } 779 }
845 else 780 else
846 { 781 {
847 int src_x, src_y, dst_x, dst_y; 782 int src_x, src_y, dst_x, dst_y;
848 int dst_width, dst_height; 783 int dst_width, dst_height;
… …
851 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 786 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
852 787
853 if (dst_x > 0 || dst_y > 0 788 if (dst_x > 0 || dst_y > 0
854 || dst_x + dst_width < new_pmap_width 789 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height) 790 || dst_y + dst_height < new_pmap_height)
856 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 791 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
857 792
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 793 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 794 pixbuf_to_pixmap (result, bg_pixmap, gc,
860 src_x, src_y, 795 src_x, src_y,
861 dst_x, dst_y, 796 dst_x, dst_y,
862 dst_width, dst_height, 797 dst_width, dst_height);
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 }
866
867#if XFT
868 if (background_flags)
869 { 798 }
870 Display *dpy = target->dpy; 799
800#if XRENDER
801 if (tr_flags)
802 {
871 XRenderPictureAttributes pa; 803 XRenderPictureAttributes pa;
872 804
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 805 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 806 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 807
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 808 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 809 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
878 810
879 pa.repeat = True; 811 pa.repeat = True;
880 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8); 812 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
881 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 813 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
882 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 814 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
883 XFreePixmap (dpy, mask_pmap); 815 XFreePixmap (dpy, mask_pmap);
884 816
885 if (src && dst && mask) 817 if (src && dst && mask)
… …
903#endif 835#endif
904 836
905 if (result != pixbuf) 837 if (result != pixbuf)
906 g_object_unref (result); 838 g_object_unref (result);
907 839
908 XFreeGC (target->dpy, gc); 840 XFreeGC (dpy, gc);
909 841
910 ret = true; 842 ret = true;
911 } 843 }
912 844
913 return ret; 845 return ret;
914} 846}
915# endif /* HAVE_PIXBUF */ 847# endif /* HAVE_PIXBUF */
916 848
917bool 849bool
918bgPixmap_t::set_file (const char *file) 850rxvt_term::bg_set_file (const char *file)
919{ 851{
920 assert (file); 852 if (!file || !*file)
853 return false;
921 854
922 if (*file)
923 {
924 if (const char *p = strchr (file, ';')) 855 if (const char *p = strchr (file, ';'))
925 { 856 {
926 size_t len = p - file; 857 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 858 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 859 memcpy (f, file, len);
929 f[len] = '\0'; 860 f[len] = '\0';
930 file = f; 861 file = f;
931 } 862 }
932 863
933# ifdef HAVE_AFTERIMAGE 864# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 865 if (!asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 866 asimman = create_generic_imageman (rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 867 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
937 if (image) 868 if (image)
938 { 869 {
939 if (original_asim) 870 if (original_asim)
940 safe_asimage_destroy (original_asim); 871 safe_asimage_destroy (original_asim);
941 original_asim = image; 872 original_asim = image;
873 bg_flags |= CLIENT_RENDER;
942 have_image = true; 874 have_image = true;
943 return true; 875 return true;
944 } 876 }
945# endif 877# endif
946 878
947# ifdef HAVE_PIXBUF 879# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 880 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 881 if (image)
950 { 882 {
951 if (pixbuf) 883 if (pixbuf)
952 g_object_unref (pixbuf); 884 g_object_unref (pixbuf);
953 pixbuf = image; 885 pixbuf = image;
954 have_image = true; 886 have_image = true;
955 return true; 887 return true;
956 } 888 }
957# endif 889# endif
958 }
959 890
960 return false; 891 return false;
961} 892}
962 893
963# endif /* BG_IMAGE_FROM_FILE */ 894# endif /* BG_IMAGE_FROM_FILE */
964 895
965# ifdef ENABLE_TRANSPARENCY 896# ifdef ENABLE_TRANSPARENCY
966bool 897bool
967bgPixmap_t::set_transparent () 898rxvt_term::bg_set_transparent ()
968{ 899{
969 if (!(flags & isTransparent)) 900 if (!(bg_flags & isTransparent))
970 { 901 {
971 flags |= isTransparent; 902 bg_flags |= isTransparent;
972 return true; 903 return true;
973 } 904 }
974 905
975 return false; 906 return false;
976} 907}
977 908
978bool 909bool
979bgPixmap_t::set_blur_radius (const char *geom) 910rxvt_term::bg_set_blur (const char *geom)
980{ 911{
981 int changed = 0; 912 bool changed = false;
982 unsigned int hr, vr; 913 unsigned int hr, vr;
983 int junk; 914 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 915 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 916
986 if (!(geom_flags & WidthValue)) 917 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 922 min_it (hr, 128);
992 min_it (vr, 128); 923 min_it (vr, 128);
993 924
994 if (h_blurRadius != hr) 925 if (h_blurRadius != hr)
995 { 926 {
996 ++changed; 927 changed = true;
997 h_blurRadius = hr; 928 h_blurRadius = hr;
998 } 929 }
999 930
1000 if (v_blurRadius != vr) 931 if (v_blurRadius != vr)
1001 { 932 {
1002 ++changed; 933 changed = true;
1003 v_blurRadius = vr; 934 v_blurRadius = vr;
1004 } 935 }
1005 936
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 937 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 938 bg_flags &= ~blurNeeded;
1008 else 939 else
1009 flags |= blurNeeded; 940 bg_flags |= blurNeeded;
1010 941
1011#if XFT
1012 XFilters *filters = XRenderQueryFilters (target->dpy, target->display->root);
1013 if (filters)
1014 {
1015 for (int i = 0; i < filters->nfilter; i++)
1016 if (!strcmp (filters->filter[i], FilterConvolution))
1017 flags |= bgPixmap_t::blurServerSide;
1018
1019 XFree (filters);
1020 }
1021#endif
1022
1023 return (changed > 0); 942 return changed;
1024} 943}
1025 944
1026static inline unsigned long 945static inline unsigned long
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 946compute_tint_shade_flags (rxvt_color *tint, int shade)
1028{ 947{
… …
1031 bool has_shade = shade != 100; 950 bool has_shade = shade != 100;
1032 951
1033 if (tint) 952 if (tint)
1034 { 953 {
1035 tint->get (c); 954 tint->get (c);
1036# define IS_COMPONENT_WHOLESOME(cmp) ((cmp) <= 0x000700 || (cmp) >= 0x00f700) 955 if (!has_shade
1037 if (!has_shade && IS_COMPONENT_WHOLESOME (c.r) 956 && (c.r <= 0x00ff || c.r >= 0xff00)
1038 && IS_COMPONENT_WHOLESOME (c.g) 957 && (c.g <= 0x00ff || c.g >= 0xff00)
1039 && IS_COMPONENT_WHOLESOME (c.b)) 958 && (c.b <= 0x00ff || c.b >= 0xff00))
1040 flags |= bgPixmap_t::tintWholesome; 959 flags |= rxvt_term::tintWholesome;
1041# undef IS_COMPONENT_WHOLESOME
1042 } 960 }
1043 961
1044 if (has_shade) 962 if (has_shade || tint)
1045 flags |= bgPixmap_t::tintNeeded; 963 flags |= rxvt_term::tintNeeded;
1046 else if (tint)
1047 {
1048 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
1049 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
1050 {
1051 flags |= bgPixmap_t::tintNeeded;
1052 }
1053 }
1054
1055 if (flags & bgPixmap_t::tintNeeded)
1056 {
1057 if (flags & bgPixmap_t::tintWholesome)
1058 flags |= bgPixmap_t::tintServerSide;
1059 else
1060 {
1061#if XFT
1062 flags |= bgPixmap_t::tintServerSide;
1063#endif
1064 }
1065 }
1066 964
1067 return flags; 965 return flags;
1068} 966}
1069 967
1070bool 968bool
1071bgPixmap_t::set_tint (rxvt_color &new_tint) 969rxvt_term::bg_set_tint (rxvt_color &new_tint)
1072{ 970{
1073 if (!(flags & tintSet) || tint != new_tint) 971 if (!(bg_flags & tintSet) || tint != new_tint)
1074 { 972 {
1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 973 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1076 tint = new_tint; 974 tint = new_tint;
1077 flags = (flags & ~tintFlags) | new_flags | tintSet; 975 bg_flags = (bg_flags & ~tintFlags) | new_flags | tintSet;
1078 return true; 976 return true;
1079 } 977 }
1080 978
1081 return false; 979 return false;
1082} 980}
1083 981
1084bool 982bool
1085bgPixmap_t::unset_tint ()
1086{
1087 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
1088
1089 if (new_flags != (flags & tintFlags))
1090 {
1091 flags = (flags & ~tintFlags) | new_flags;
1092 return true;
1093 }
1094
1095 return false;
1096}
1097
1098bool
1099bgPixmap_t::set_shade (const char *shade_str) 983rxvt_term::bg_set_shade (const char *shade_str)
1100{ 984{
1101 int new_shade = (shade_str) ? atoi (shade_str) : 100; 985 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1102 986
1103 clamp_it (new_shade, -100, 200); 987 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0) 988 if (new_shade < 0)
1105 new_shade = 200 - (100 + new_shade); 989 new_shade = 200 - (100 + new_shade);
1106 990
1107 if (new_shade != shade) 991 if (new_shade != shade)
1108 { 992 {
1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 993 unsigned long new_flags = compute_tint_shade_flags ((bg_flags & tintSet) ? &tint : NULL, new_shade);
1110 shade = new_shade; 994 shade = new_shade;
1111 flags = (flags & (~tintFlags | tintSet)) | new_flags; 995 bg_flags = (bg_flags & ~tintFlags) | new_flags;
1112 return true; 996 return true;
1113 } 997 }
1114 998
1115 return false; 999 return false;
1116} 1000}
1117 1001
1002#if XRENDER
1118static void 1003static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1004get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1005{
1121 double sigma = radius / 2.0; 1006 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1007 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1008 double sum = 0.0;
1124 1009
1125 for (int i = 0; i < width; i++) 1010 for (int i = 0; i < width; i++)
1126 { 1011 {
1127 double x = i - width / 2; 1012 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1013 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1014 sum += kernel[i];
1130 } 1015 }
1131 1016
1132 params[0] = XDoubleToFixed (width); 1017 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1018 params[1] = XDoubleToFixed (1);
1134 1019
1135 for (int i = 0; i < width; i++) 1020 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1021 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1022}
1023#endif
1138 1024
1139bool 1025bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1026rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1027{
1142 bool ret = false; 1028 bool ret = false;
1143#if XFT 1029#if XRENDER
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1030 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double)); 1031 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1032 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147 1033
1148 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa; 1034 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1035 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 1036
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1037 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1038 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154 1039
1155 if (kernel && params && src && dst) 1040 if (kernel && params && src && dst)
… …
1173 1058
1174 if (v_blurRadius) 1059 if (v_blurRadius)
1175 { 1060 {
1176 size = v_blurRadius * 2 + 1; 1061 size = v_blurRadius * 2 + 1;
1177 get_gaussian_kernel (v_blurRadius, size, kernel, params); 1062 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1178 swap (params[0], params[1]); 1063 ::swap (params[0], params[1]);
1179 1064
1180 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1065 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1181 XRenderComposite (dpy, 1066 XRenderComposite (dpy,
1182 PictOpSrc, 1067 PictOpSrc,
1183 src, 1068 src,
… …
1199#endif 1084#endif
1200 return ret; 1085 return ret;
1201} 1086}
1202 1087
1203bool 1088bool
1204bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1089rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1205{ 1090{
1206 Display *dpy = target->dpy;
1207 bool ret = false; 1091 bool ret = false;
1208 1092
1209 if (flags & tintWholesome) 1093 if (bg_flags & tintWholesome)
1210 { 1094 {
1211 XGCValues gcv; 1095 XGCValues gcv;
1212 GC gc; 1096 GC gc;
1213 1097
1214 /* In this case we can tint image server-side getting significant 1098 /* In this case we can tint image server-side getting significant
… …
1225 XFreeGC (dpy, gc); 1109 XFreeGC (dpy, gc);
1226 } 1110 }
1227 } 1111 }
1228 else 1112 else
1229 { 1113 {
1230# if XFT 1114# if XRENDER
1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1115 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1232 1116
1233 if (flags & tintSet) 1117 if (bg_flags & tintSet)
1234 tint.get (c); 1118 tint.get (c);
1235 1119
1236 if (shade <= 100) 1120 if (shade <= 100)
1237 { 1121 {
1238 c.r = (c.r * shade) / 100; 1122 c.r = (c.r * shade) / 100;
1239 c.g = (c.g * shade) / 100; 1123 c.g = (c.g * shade) / 100;
1240 c.b = (c.b * shade) / 100; 1124 c.b = (c.b * shade) / 100;
1241 } 1125 }
1242 else 1126 else
1243 { 1127 {
1244 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1128 c.r = (c.r * (200 - shade)) / 100;
1245 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1129 c.g = (c.g * (200 - shade)) / 100;
1246 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1130 c.b = (c.b * (200 - shade)) / 100;
1247 } 1131 }
1248 1132
1249 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1133 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1250 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1134 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1251 XRenderPictureAttributes pa; 1135 XRenderPictureAttributes pa;
… …
1265 1149
1266 if (mask_pic && overlay_pic && back_pic) 1150 if (mask_pic && overlay_pic && back_pic)
1267 { 1151 {
1268 XRenderColor mask_c; 1152 XRenderColor mask_c;
1269 1153
1270 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c)); 1154 mask_c.red = mask_c.green = mask_c.blue = 0;
1271 mask_c.alpha = 0xffff; 1155 mask_c.alpha = 0xffff;
1272 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1156 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1273 1157
1274 mask_c.alpha = 0; 1158 mask_c.alpha = 0;
1275 mask_c.red = 0xffff - c.r; 1159 mask_c.red = 0xffff - c.r;
1276 mask_c.green = 0xffff - c.g; 1160 mask_c.green = 0xffff - c.g;
1277 mask_c.blue = 0xffff - c.b; 1161 mask_c.blue = 0xffff - c.b;
1278 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1); 1162 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1279 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height); 1163 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1164
1165 if (shade > 100)
1166 {
1167 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1168 mask_c.alpha = 0;
1169 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1170
1171 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1172 }
1173
1280 ret = true; 1174 ret = true;
1281 } 1175 }
1282 1176
1283 XRenderFreePicture (dpy, mask_pic); 1177 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic); 1178 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic); 1179 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif 1180# endif
1290 } 1181 }
1291 1182
1292 return ret; 1183 return ret;
1293} 1184}
1294 1185
1295/* make_transparency_pixmap() 1186/* make_transparency_pixmap()
1296 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1187 * Builds a pixmap of the same size as the terminal window that contains
1297 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1188 * the tiled portion of the root pixmap that is supposed to be covered by
1298 * our window. 1189 * our window.
1299 */ 1190 */
1300unsigned long 1191unsigned long
1301bgPixmap_t::make_transparency_pixmap () 1192rxvt_term::make_transparency_pixmap ()
1302{ 1193{
1303 unsigned long result = 0; 1194 unsigned long result = 0;
1304
1305 if (target == NULL)
1306 return 0;
1307 1195
1308 /* root dimensions may change from call to call - but Display structure should 1196 /* root dimensions may change from call to call - but Display structure should
1309 * be always up-to-date, so let's use it : 1197 * be always up-to-date, so let's use it :
1310 */ 1198 */
1311 Window root = target->display->root;
1312 int screen = target->display->screen; 1199 int screen = display->screen;
1313 Display *dpy = target->dpy; 1200 int root_depth = DefaultDepth (dpy, screen);
1314 int root_width = DisplayWidth (dpy, screen); 1201 int root_width = DisplayWidth (dpy, screen);
1315 int root_height = DisplayHeight (dpy, screen); 1202 int root_height = DisplayHeight (dpy, screen);
1316 unsigned int root_pmap_width, root_pmap_height; 1203 unsigned int root_pmap_width, root_pmap_height;
1317 int window_width = target->szHint.width; 1204 int window_width = szHint.width;
1318 int window_height = target->szHint.height; 1205 int window_height = szHint.height;
1319 int sx, sy; 1206 int sx, sy;
1320 XGCValues gcv; 1207 XGCValues gcv;
1321 GC gc; 1208 GC gc;
1322 1209
1323 TIMING_TEST_START (tp); 1210 sx = target_x;
1324 target->get_window_origin (sx, sy); 1211 sy = target_y;
1325 1212
1326 /* check if we are outside of the visible part of the virtual screen : */ 1213 /* check if we are outside of the visible part of the virtual screen : */
1327 if (sx + window_width <= 0 || sy + window_height <= 0 1214 if (sx + window_width <= 0 || sy + window_height <= 0
1328 || sx >= root_width || sy >= root_height) 1215 || sx >= root_width || sy >= root_height)
1329 return 0; 1216 return 0;
1330 1217
1218 // validate root pixmap and get its size
1331 if (root_pixmap != None) 1219 if (root_pixmap != None)
1332 { 1220 {
1333 /* we want to validate the pixmap and get its size at the same time : */ 1221 Window wdummy;
1334 int junk; 1222 int idummy;
1335 unsigned int ujunk; 1223 unsigned int udummy;
1336 /* root pixmap may be bad - allow a error */ 1224
1337 target->allowedxerror = -1; 1225 allowedxerror = -1;
1338 1226
1339 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1227 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1340 root_pixmap = None; 1228 root_pixmap = None;
1341 1229
1342 target->allowedxerror = 0; 1230 allowedxerror = 0;
1231 }
1232
1233 Pixmap recoded_root_pmap = root_pixmap;
1234
1235 if (root_pixmap != None && root_depth != depth)
1236 {
1237#if XRENDER
1238 if (bg_flags & HAS_RENDER)
1239 {
1240 XRenderPictureAttributes pa;
1241
1242 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1243 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1244
1245 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1246 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1247 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1248
1249 if (src && dst)
1250 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1251 else
1252 {
1253 XFreePixmap (dpy, recoded_root_pmap);
1254 root_pixmap = None;
1255 }
1256
1257 XRenderFreePicture (dpy, src);
1258 XRenderFreePicture (dpy, dst);
1259 }
1260 else
1261#endif
1262 root_pixmap = None;
1343 } 1263 }
1344 1264
1345 if (root_pixmap == None) 1265 if (root_pixmap == None)
1346 return 0; 1266 return 0;
1347 1267
1268 if (bg_pixmap == None
1269 || bg_pmap_width != window_width
1270 || bg_pmap_height != window_height)
1271 {
1272 if (bg_pixmap)
1273 XFreePixmap (dpy, bg_pixmap);
1348 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1274 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1275 bg_pmap_width = window_width;
1276 bg_pmap_height = window_height;
1277 }
1349 1278
1350 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1279 if (bg_pixmap == None)
1351 return 0; 1280 return 0;
1352 1281
1353 /* straightforward pixmap copy */ 1282 /* straightforward pixmap copy */
1354 gcv.tile = root_pixmap;
1355 gcv.fill_style = FillTiled;
1356
1357 while (sx < 0) sx += (int)root_width; 1283 while (sx < 0) sx += (int)root_width;
1358 while (sy < 0) sy += (int)root_height; 1284 while (sy < 0) sy += (int)root_height;
1359 1285
1286 gcv.tile = recoded_root_pmap;
1287 gcv.fill_style = FillTiled;
1360 gcv.ts_x_origin = -sx; 1288 gcv.ts_x_origin = -sx;
1361 gcv.ts_y_origin = -sy; 1289 gcv.ts_y_origin = -sy;
1362 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1290 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1363 1291
1364 if (gc) 1292 if (gc)
1365 { 1293 {
1366 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1294 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1367 result |= transpPmapTiled; 1295 result |= isValid | (bg_flags & effectsFlags);
1368 XFreeGC (dpy, gc); 1296 XFreeGC (dpy, gc);
1369 }
1370 TIMING_TEST_PRINT_RESULT (tp);
1371 1297
1372 if (tiled_root_pmap != None) 1298 if (!(bg_flags & CLIENT_RENDER))
1373 {
1374 if (!need_client_side_rendering ())
1375 {
1376 if (flags & (blurNeeded | blurServerSide))
1377 { 1299 {
1378 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1300 if ((bg_flags & blurNeeded)
1379 result |= transpPmapBlurred; 1301 && (bg_flags & HAS_RENDER_CONV))
1380 } 1302 {
1381 if (flags & (tintNeeded | tintServerSide)) 1303 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1304 result &= ~blurNeeded;
1382 { 1305 }
1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1306 if ((bg_flags & tintNeeded)
1307 && (bg_flags & (tintWholesome | HAS_RENDER)))
1308 {
1309 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1384 result |= transpPmapTinted; 1310 result &= ~tintNeeded;
1385 } 1311 }
1386 } /* server side rendering completed */ 1312 } /* server side rendering completed */
1387
1388 if (pixmap)
1389 XFreePixmap (dpy, pixmap);
1390
1391 pixmap = tiled_root_pmap;
1392 pmap_width = window_width;
1393 pmap_height = window_height;
1394 pmap_depth = root_depth;
1395 } 1313 }
1396 1314
1397 TIMING_TEST_PRINT_RESULT (tp); 1315 if (recoded_root_pmap != root_pixmap)
1316 XFreePixmap (dpy, recoded_root_pmap);
1398 1317
1399 return result; 1318 return result;
1400} 1319}
1401 1320
1321void
1322rxvt_term::bg_set_root_pixmap ()
1323{
1324 Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]);
1325 if (new_root_pixmap == None)
1326 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1327
1328 root_pixmap = new_root_pixmap;
1329}
1330# endif /* ENABLE_TRANSPARENCY */
1331
1332#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1333static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1334# endif
1335
1402bool 1336bool
1403bgPixmap_t::set_root_pixmap () 1337rxvt_term::bg_render ()
1404{ 1338{
1405 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1406 if (new_root_pixmap == None)
1407 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1408
1409 if (new_root_pixmap != root_pixmap)
1410 {
1411 root_pixmap = new_root_pixmap;
1412 return true;
1413 }
1414
1415 return false;
1416}
1417# endif /* ENABLE_TRANSPARENCY */
1418
1419# ifndef HAVE_AFTERIMAGE
1420static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1421# endif
1422
1423bool
1424bgPixmap_t::render ()
1425{
1426 unsigned long background_flags = 0; 1339 unsigned long tr_flags = 0;
1427 1340
1428 if (target == NULL)
1429 return false;
1430
1431 TIMING_TEST_START (tp);
1432
1433 invalidate (); 1341 bg_invalidate ();
1434# ifdef ENABLE_TRANSPARENCY 1342# ifdef ENABLE_TRANSPARENCY
1435 if (flags & isTransparent) 1343 if (bg_flags & isTransparent)
1436 { 1344 {
1437 /* we need to re-generate transparency pixmap in that case ! */ 1345 /* we need to re-generate transparency pixmap in that case ! */
1438 background_flags = make_transparency_pixmap (); 1346 tr_flags = make_transparency_pixmap ();
1439 if (background_flags == 0) 1347 if (tr_flags == 0)
1440 return false; 1348 return false;
1441 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1349 else if (!(tr_flags & effectsFlags))
1442 && pmap_depth == target->depth) 1350 bg_flags |= isValid;
1443 flags = flags & ~isInvalid;
1444 } 1351 }
1445# endif 1352# endif
1446 1353
1447# ifdef BG_IMAGE_FROM_FILE 1354# ifdef BG_IMAGE_FROM_FILE
1448 if (have_image 1355 if (have_image
1449 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1356 || (tr_flags & effectsFlags))
1450 { 1357 {
1451 if (render_image (background_flags)) 1358 if (render_image (tr_flags))
1452 flags = flags & ~isInvalid; 1359 bg_flags |= isValid;
1453 } 1360 }
1454# endif 1361# endif
1455 1362
1363# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1456 XImage *result = NULL; 1364 XImage *result = NULL;
1457 1365
1458 if (background_flags && (flags & isInvalid)) 1366 if (tr_flags && !(bg_flags & isValid))
1459 { 1367 {
1460 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap); 1368 result = XGetImage (dpy, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, ZPixmap);
1461 } 1369 }
1462 1370
1463 if (result) 1371 if (result)
1464 { 1372 {
1465# if !defined(HAVE_AFTERIMAGE) && !XFT
1466 /* our own client-side tinting */ 1373 /* our own client-side tinting */
1467 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side. 1374 if (tr_flags & tintNeeded)
1468 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1469 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1470 { 1375 {
1471 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1472 if (flags & tintSet) 1377 if (bg_flags & tintSet)
1473 tint.get (c); 1378 tint.get (c);
1474 ShadeXImage (target, result, shade, c.r, c.g, c.b); 1379 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1475 } 1380 }
1476# endif
1477 1381
1478 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1382 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1479 1383
1480 if (gc) 1384 if (gc)
1481 { 1385 {
1482 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1483 {
1484 XFreePixmap (target->dpy, pixmap);
1485 pixmap = None;
1486 }
1487
1488 if (pixmap == None)
1489 {
1490 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1491 pmap_width = result->width;
1492 pmap_height = result->height;
1493 pmap_depth = target->depth;
1494 }
1495
1496 if (pmap_depth != result->depth)
1497 {
1498 /* Bad Match error will ensue ! stupid X !!!! */
1499 if (result->depth == 24 && pmap_depth == 32)
1500 result->depth = 32;
1501 else if (result->depth == 32 && pmap_depth == 24)
1502 result->depth = 24;
1503 else
1504 {
1505 /* TODO: implement image recoding */
1506 }
1507 }
1508
1509 if (pmap_depth == result->depth)
1510 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1386 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1511 1387
1512 XFreeGC (target->dpy, gc); 1388 XFreeGC (dpy, gc);
1513 flags = flags & ~isInvalid; 1389 bg_flags |= isValid;
1514 } 1390 }
1515 1391
1516 XDestroyImage (result); 1392 XDestroyImage (result);
1517 } 1393 }
1394# endif
1518 1395
1519 if (flags & isInvalid) 1396 if (!(bg_flags & isValid))
1520 { 1397 {
1521 if (pixmap != None) 1398 if (bg_pixmap != None)
1522 { 1399 {
1523 XFreePixmap (target->dpy, pixmap); 1400 XFreePixmap (dpy, bg_pixmap);
1524 pixmap = None; 1401 bg_pixmap = None;
1525 } 1402 }
1526 } 1403 }
1527 1404
1528 apply (); 1405 scr_recolour (false);
1406 bg_flags |= hasChanged;
1529 1407
1530 XSync (target->dpy, False);
1531 valid_since = ev::now (); 1408 bg_valid_since = ev::now ();
1532
1533 TIMING_TEST_PRINT_RESULT (tp);
1534 1409
1535 return true; 1410 return true;
1536} 1411}
1537 1412
1538bool
1539bgPixmap_t::set_target (rxvt_term *new_target)
1540{
1541 if (new_target)
1542 if (target != new_target)
1543 {
1544 target = new_target;
1545# ifdef ENABLE_TRANSPARENCY
1546 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen));
1547# endif
1548 return true;
1549 }
1550
1551 return false;
1552}
1553
1554void 1413void
1555bgPixmap_t::apply () 1414rxvt_term::bg_init ()
1556{ 1415{
1557 if (target)
1558 {
1559 flags &= ~isVtOrigin;
1560
1561 if (pixmap != None)
1562 {
1563 /* set target's background to pixmap */
1564# ifdef ENABLE_TRANSPARENCY 1416#ifdef ENABLE_TRANSPARENCY
1565 if (flags & isTransparent) 1417 shade = 100;
1566 {
1567 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1568 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1569
1570 if (target->scrollBar.win)
1571 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1572 }
1573 else
1574# endif 1418#endif
1575 {
1576 flags |= isVtOrigin;
1577 /* force old pixmap dereference in case it was transparent before :*/
1578 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1579 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1580 /* do we also need to set scrollbar's background here ? */
1581 1419
1582 if (target->scrollBar.win) 1420 bg_flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1583 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1421#if XRENDER
1584 } 1422 int major, minor;
1585 } 1423 if (XRenderQueryVersion (dpy, &major, &minor))
1586 else 1424 bg_flags |= HAS_RENDER;
1587 { 1425 XFilters *filters = XRenderQueryFilters (dpy, vt);
1588 /* set target background to a pixel */ 1426 if (filters)
1589 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1590 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1591 /* do we also need to set scrollbar's background here ? */
1592 if (target->scrollBar.win)
1593 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1594 }
1595
1596 /* don't want Expose on the parent or vt. It is better to use
1597 scr_touch or we get a great deal of flicker otherwise: */
1598 XClearWindow (target->dpy, target->parent[0]);
1599
1600 if (target->scrollBar.state && target->scrollBar.win)
1601 {
1602 target->scrollBar.state = STATE_IDLE;
1603 target->scrollBar.show (0);
1604 }
1605
1606 target->want_refresh = 1;
1607 flags |= hasChanged;
1608 } 1427 {
1428 for (int i = 0; i < filters->nfilter; i++)
1429 if (!strcmp (filters->filter[i], FilterConvolution))
1430 bg_flags |= HAS_RENDER_CONV;
1431
1432 XFree (filters);
1433 }
1434#endif
1609} 1435}
1610 1436
1611#endif /* HAVE_BG_PIXMAP */ 1437#endif /* HAVE_BG_PIXMAP */
1612 1438
1613#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1439#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1614/* taken from aterm-0.4.2 */ 1440/* taken from aterm-0.4.2 */
1615 1441
1616typedef uint32_t RUINT32T;
1617
1618static void 1442static void
1619ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1443shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1620{ 1444{
1621 int sh_r, sh_g, sh_b; 1445 int sh_r, sh_g, sh_b;
1622 RUINT32T mask_r, mask_g, mask_b; 1446 uint32_t mask_r, mask_g, mask_b;
1623 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1447 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1448 rgba low;
1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1449 rgba high;
1626 int i; 1450 int i;
1451 int host_byte_order = byteorder::big_endian () ? MSBFirst : LSBFirst;
1627 1452
1628 Visual *visual = term->visual;
1629
1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1453 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1631 1454
1632 /* for convenience */ 1455 /* for convenience */
1633 mask_r = visual->red_mask; 1456 mask_r = visual->red_mask;
1634 mask_g = visual->green_mask; 1457 mask_g = visual->green_mask;
1635 mask_b = visual->blue_mask; 1458 mask_b = visual->blue_mask;
1636 1459
1637 /* boring lookup table pre-initialization */ 1460 /* boring lookup table pre-initialization */
1638 switch (srcImage->bits_per_pixel) { 1461 switch (ximage->depth)
1462 {
1639 case 15: 1463 case 15:
1640 if ((mask_r != 0x7c00) || 1464 if ((mask_r != 0x7c00) ||
1641 (mask_g != 0x03e0) || 1465 (mask_g != 0x03e0) ||
1642 (mask_b != 0x001f)) 1466 (mask_b != 0x001f))
1643 return; 1467 return;
1644 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1468 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1645 lookup_r = lookup; 1469 lookup_r = lookup;
1646 lookup_g = lookup+32; 1470 lookup_g = lookup+32;
1647 lookup_b = lookup+32+32; 1471 lookup_b = lookup+32+32;
1648 sh_r = 10; 1472 sh_r = 10;
1649 sh_g = 5; 1473 sh_g = 5;
1650 sh_b = 0; 1474 sh_b = 0;
1651 break; 1475 break;
1652 case 16: 1476 case 16:
1653 if ((mask_r != 0xf800) || 1477 if ((mask_r != 0xf800) ||
1654 (mask_g != 0x07e0) || 1478 (mask_g != 0x07e0) ||
1655 (mask_b != 0x001f)) 1479 (mask_b != 0x001f))
1656 return; 1480 return;
1657 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1481 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1658 lookup_r = lookup; 1482 lookup_r = lookup;
1659 lookup_g = lookup+32; 1483 lookup_g = lookup+32;
1660 lookup_b = lookup+32+64; 1484 lookup_b = lookup+32+64;
1661 sh_r = 11; 1485 sh_r = 11;
1662 sh_g = 5; 1486 sh_g = 5;
1663 sh_b = 0; 1487 sh_b = 0;
1664 break; 1488 break;
1665 case 24: 1489 case 24:
1666 if ((mask_r != 0xff0000) || 1490 if ((mask_r != 0xff0000) ||
1667 (mask_g != 0x00ff00) || 1491 (mask_g != 0x00ff00) ||
1668 (mask_b != 0x0000ff)) 1492 (mask_b != 0x0000ff))
1669 return; 1493 return;
1670 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1494 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1671 lookup_r = lookup; 1495 lookup_r = lookup;
1672 lookup_g = lookup+256; 1496 lookup_g = lookup+256;
1673 lookup_b = lookup+256+256; 1497 lookup_b = lookup+256+256;
1674 sh_r = 16; 1498 sh_r = 16;
1675 sh_g = 8; 1499 sh_g = 8;
1676 sh_b = 0; 1500 sh_b = 0;
1677 break; 1501 break;
1678 case 32: 1502 case 32:
1679 if ((mask_r != 0xff0000) || 1503 if ((mask_r != 0xff0000) ||
1680 (mask_g != 0x00ff00) || 1504 (mask_g != 0x00ff00) ||
1681 (mask_b != 0x0000ff)) 1505 (mask_b != 0x0000ff))
1682 return; 1506 return;
1683 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1507 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1684 lookup_r = lookup; 1508 lookup_r = lookup;
1685 lookup_g = lookup+256; 1509 lookup_g = lookup+256;
1686 lookup_b = lookup+256+256; 1510 lookup_b = lookup+256+256;
1687 sh_r = 16; 1511 sh_r = 16;
1688 sh_g = 8; 1512 sh_g = 8;
1689 sh_b = 0; 1513 sh_b = 0;
1690 break; 1514 break;
1691 default: 1515 default:
1692 return; /* we do not support this color depth */ 1516 return; /* we do not support this color depth */
1693 } 1517 }
1694 1518
1695 /* prepare limits for color transformation (each channel is handled separately) */ 1519 /* prepare limits for color transformation (each channel is handled separately) */
1696 if (shade > 100) { 1520 if (shade > 100)
1521 {
1697 shade = 200 - shade; 1522 shade = 200 - shade;
1698 1523
1699 lower_lim_r = 65535-rm; 1524 high.r = c.r * shade / 100;
1700 lower_lim_g = 65535-gm; 1525 high.g = c.g * shade / 100;
1701 lower_lim_b = 65535-bm; 1526 high.b = c.b * shade / 100;
1702 1527
1703 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1528 low.r = 65535 * (100 - shade) / 100;
1704 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1529 low.g = 65535 * (100 - shade) / 100;
1705 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1530 low.b = 65535 * (100 - shade) / 100;
1706
1707 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1708 } else {
1709
1710 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1711
1712 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1713 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1714 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1715 } 1531 }
1716 1532 else
1717 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1718 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1719 { 1533 {
1720 unsigned int tmp; 1534 high.r = c.r * shade / 100;
1535 high.g = c.g * shade / 100;
1536 high.b = c.b * shade / 100;
1721 1537
1722 tmp = lower_lim_r; 1538 low.r = low.g = low.b = 0;
1723 lower_lim_r = lower_lim_b;
1724 lower_lim_b = tmp;
1725
1726 tmp = upper_lim_r;
1727 upper_lim_r = upper_lim_b;
1728 upper_lim_b = tmp;
1729 } 1539 }
1730 1540
1731 /* fill our lookup tables */ 1541 /* fill our lookup tables */
1732 for (i = 0; i <= mask_r>>sh_r; i++) 1542 for (i = 0; i <= mask_r>>sh_r; i++)
1733 { 1543 {
1734 RUINT32T tmp; 1544 uint32_t tmp;
1735 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1545 tmp = i * high.r;
1736 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1546 tmp += (mask_r>>sh_r) * low.r;
1737 lookup_r[i] = (tmp/65535)<<sh_r; 1547 lookup_r[i] = (tmp/65535)<<sh_r;
1738 } 1548 }
1739 for (i = 0; i <= mask_g>>sh_g; i++) 1549 for (i = 0; i <= mask_g>>sh_g; i++)
1740 { 1550 {
1741 RUINT32T tmp; 1551 uint32_t tmp;
1742 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1552 tmp = i * high.g;
1743 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1553 tmp += (mask_g>>sh_g) * low.g;
1744 lookup_g[i] = (tmp/65535)<<sh_g; 1554 lookup_g[i] = (tmp/65535)<<sh_g;
1745 } 1555 }
1746 for (i = 0; i <= mask_b>>sh_b; i++) 1556 for (i = 0; i <= mask_b>>sh_b; i++)
1747 { 1557 {
1748 RUINT32T tmp; 1558 uint32_t tmp;
1749 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1559 tmp = i * high.b;
1750 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1560 tmp += (mask_b>>sh_b) * low.b;
1751 lookup_b[i] = (tmp/65535)<<sh_b; 1561 lookup_b[i] = (tmp/65535)<<sh_b;
1752 } 1562 }
1753 1563
1754 /* apply table to input image (replacing colors by newly calculated ones) */ 1564 /* apply table to input image (replacing colors by newly calculated ones) */
1755 switch (srcImage->bits_per_pixel) 1565 if (ximage->bits_per_pixel == 32
1566 && (ximage->depth == 24 || ximage->depth == 32)
1567 && ximage->byte_order == host_byte_order)
1756 { 1568 {
1757 case 15:
1758 {
1759 unsigned short *p1, *pf, *p, *pl; 1569 uint32_t *p1, *pf, *p, *pl;
1760 p1 = (unsigned short *) srcImage->data; 1570 p1 = (uint32_t *) ximage->data;
1761 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1571 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1572
1762 while (p1 < pf) 1573 while (p1 < pf)
1763 { 1574 {
1764 p = p1; 1575 p = p1;
1765 pl = p1 + srcImage->width; 1576 pl = p1 + ximage->width;
1766 for (; p < pl; p++) 1577 for (; p < pl; p++)
1767 { 1578 {
1768 *p = lookup_r[(*p & 0x7c00)>>10] |
1769 lookup_g[(*p & 0x03e0)>> 5] |
1770 lookup_b[(*p & 0x001f)];
1771 }
1772 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1773 }
1774 break;
1775 }
1776 case 16:
1777 {
1778 unsigned short *p1, *pf, *p, *pl;
1779 p1 = (unsigned short *) srcImage->data;
1780 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1781 while (p1 < pf)
1782 {
1783 p = p1;
1784 pl = p1 + srcImage->width;
1785 for (; p < pl; p++)
1786 {
1787 *p = lookup_r[(*p & 0xf800)>>11] |
1788 lookup_g[(*p & 0x07e0)>> 5] |
1789 lookup_b[(*p & 0x001f)];
1790 }
1791 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1792 }
1793 break;
1794 }
1795 case 24:
1796 {
1797 unsigned char *p1, *pf, *p, *pl;
1798 p1 = (unsigned char *) srcImage->data;
1799 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1800 while (p1 < pf)
1801 {
1802 p = p1;
1803 pl = p1 + srcImage->width * 3;
1804 for (; p < pl; p += 3)
1805 {
1806 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1807 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1808 p[2] = lookup_r[(p[2] & 0x0000ff)];
1809 }
1810 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1811 }
1812 break;
1813 }
1814 case 32:
1815 {
1816 RUINT32T *p1, *pf, *p, *pl;
1817 p1 = (RUINT32T *) srcImage->data;
1818 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1819
1820 while (p1 < pf)
1821 {
1822 p = p1;
1823 pl = p1 + srcImage->width;
1824 for (; p < pl; p++)
1825 {
1826 *p = lookup_r[(*p & 0xff0000)>>16] | 1579 *p = lookup_r[(*p & 0xff0000) >> 16] |
1827 lookup_g[(*p & 0x00ff00)>> 8] | 1580 lookup_g[(*p & 0x00ff00) >> 8] |
1828 lookup_b[(*p & 0x0000ff)] | 1581 lookup_b[(*p & 0x0000ff)] |
1829 (*p & ~0xffffff); 1582 (*p & 0xff000000);
1583 }
1584 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1585 }
1586 }
1587 else
1588 {
1589 for (int y = 0; y < ximage->height; y++)
1590 for (int x = 0; x < ximage->width; x++)
1591 {
1592 unsigned long pixel = XGetPixel (ximage, x, y);
1593 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1594 lookup_g[(pixel & mask_g) >> sh_g] |
1595 lookup_b[(pixel & mask_b) >> sh_b];
1596 XPutPixel (ximage, x, y, pixel);
1830 } 1597 }
1831 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 1598 }
1833 break;
1834 }
1835 }
1836 1599
1837 free (lookup); 1600 free (lookup);
1838} 1601}
1839#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1602#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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