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.89 by sf-exg, Mon Oct 18 15:35:19 2010 UTC vs.
Revision 1.186 by sf-exg, Wed Dec 28 11:11:25 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines