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.174 by sf-exg, Wed Nov 23 16:53:53 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
… …
222 int diff = window_size - image_size; 149 int diff = window_size - image_size;
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 = bg_flags & ~BG_GEOMETRY_FLAGS;
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_PROP_SCALE;
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=pscale"))
233 new_flags |= BG_PROP_SCALE;
234 else if (!strcasecmp (arr[i], "op=root"))
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_PROP_SCALE;
247 }
248 else if (!strcasecmp (arr[i], "hscale"))
249 {
250 new_flags |= BG_TILE;
251 w = windowScale;
252 h = noScale;
253 geom_flags |= WidthValue|HeightValue;
254 }
255 else if (!strcasecmp (arr[i], "vscale"))
256 {
257 new_flags |= BG_TILE;
258 h = windowScale;
259 w = noScale;
260 geom_flags |= WidthValue|HeightValue;
261 }
262 else if (!strcasecmp (arr[i], "scale"))
263 {
264 w = h = windowScale;
265 geom_flags |= WidthValue|HeightValue;
266 }
267 else if (!strcasecmp (arr[i], "auto"))
268 {
269 w = h = windowScale;
270 x = y = centerAlign;
271 geom_flags |= WidthValue|HeightValue|XValue|YValue;
272 }
273 else if (!strcasecmp (arr[i], "root"))
274 {
275 new_flags |= BG_TILE|BG_ROOT_ALIGN;
276 w = h = noScale;
277 geom_flags |= WidthValue|HeightValue;
278 }
279
280 else
281 geom_flags |= XParseGeometry (arr[i], &x, &y, &w, &h);
282 } /* done parsing ops */
283
284 rxvt_free_strsplit (arr);
285 }
286
287 if (!update)
288 {
289 if (!(geom_flags & XValue))
359 x = y = defaultAlign; 290 x = y = defaultAlign;
291 else if (!(geom_flags & YValue))
292 y = x;
293
294 if (!(geom_flags & (WidthValue|HeightValue)))
360 w = h = defaultScale; 295 w = h = defaultScale;
361 } 296 else if (!(geom_flags & HeightValue))
297 h = w;
298 else if (!(geom_flags & WidthValue))
299 w = h;
362 300
363 if (!(flags & geometrySet))
364 geom_flags |= WidthValue|HeightValue|XValue|YValue; 301 geom_flags |= WidthValue|HeightValue|XValue|YValue;
302 }
365 303
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; 304 if (check_set_scale_value (geom_flags, WidthValue, h_scale, w)
422 if (check_set_scale_value (geom_flags, HeightValue, v_scale, h)) ++changed; 305 || check_set_scale_value (geom_flags, HeightValue, v_scale, h)
423 if (check_set_align_value (geom_flags, XValue, h_align, x)) ++changed; 306 || check_set_align_value (geom_flags, XValue, h_align, x)
424 if (check_set_align_value (geom_flags, YValue, v_align, y)) ++changed; 307 || check_set_align_value (geom_flags, YValue, v_align, y))
425 } 308 changed = true;
426 309
427 if (new_flags != flags) 310 if (new_flags != bg_flags)
428 { 311 {
429 flags = new_flags; 312 bg_flags = new_flags;
430 changed++; 313 changed = true;
431 } 314 }
432 315
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); 316 return changed;
436} 317}
437 318
438void 319void
439bgPixmap_t::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y) 320rxvt_term::get_image_geometry (int image_width, int image_height, int &w, int &h, int &x, int &y)
440{ 321{
441 int target_width = target->szHint.width; 322 int target_width = szHint.width;
442 int target_height = target->szHint.height; 323 int target_height = szHint.height;
443 324
444 if (flags & propScale) 325 w = h_scale * target_width / 100;
326 h = v_scale * target_height / 100;
327
328 if (bg_flags & BG_PROP_SCALE)
445 { 329 {
446 float scale = (float)target_width / image_width; 330 float scale = (float)w / image_width;
447 min_it (scale, (float)target_height / image_height); 331 min_it (scale, (float)h / image_height);
448 w = image_width * scale + 0.5; 332 w = image_width * scale + 0.5;
449 h = image_height * scale + 0.5; 333 h = image_height * scale + 0.5;
450 } 334 }
451 else
452 {
453 w = h_scale * target_width / 100;
454 h = v_scale * target_height / 100;
455 }
456 335
457 if (!w) w = image_width; 336 if (!w) w = image_width;
458 if (!h) h = image_height; 337 if (!h) h = image_height;
459 338
460 if (flags & rootAlign) 339 if (bg_flags & BG_ROOT_ALIGN)
461 { 340 {
462 target->get_window_origin (x, y);
463 x = -x; 341 x = -target_x;
464 y = -y; 342 y = -target_y;
465 } 343 }
466 else 344 else
467 { 345 {
468 x = make_align_position (h_align, target_width, w); 346 x = make_align_position (h_align, target_width, w);
469 y = make_align_position (v_align, target_height, h); 347 y = make_align_position (v_align, target_height, h);
470 } 348 }
471 349
472 flags &= ~sizeSensitive; 350 bg_flags &= ~BG_IS_SIZE_SENSITIVE;
473 if (h_scale != 0 || v_scale != 0 351 if (!(bg_flags & BG_TILE)
474 || h_align != 0 || v_align != 0 352 || h_scale || v_scale
353 || (!(bg_flags & BG_ROOT_ALIGN) && (h_align || v_align))
475 || w > target_width || h > target_height) 354 || w > target_width || h > target_height)
476 flags |= sizeSensitive; 355 bg_flags |= BG_IS_SIZE_SENSITIVE;
477} 356}
478 357
479# ifdef HAVE_AFTERIMAGE 358# ifdef HAVE_AFTERIMAGE
480bool 359bool
481bgPixmap_t::render_image (unsigned long background_flags) 360rxvt_term::render_image (unsigned long tr_flags)
482{ 361{
483 if (target == NULL)
484 return false;
485
486 target->init_asv (); 362 init_asv ();
487 363
488 ASImage *background = NULL; 364 ASImage *background = NULL;
489 ARGB32 background_tint = TINT_LEAVE_SAME; 365 ARGB32 background_tint = TINT_LEAVE_SAME;
490 366
491# ifdef ENABLE_TRANSPARENCY 367# ifdef ENABLE_TRANSPARENCY
492 if (background_flags) 368 if (tr_flags)
493 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100); 369 background = pixmap2ximage (asv, bg_pixmap, 0, 0, bg_pmap_width, bg_pmap_height, AllPlanes, 100);
494 370
495 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 371 if (tr_flags & BG_NEEDS_TINT)
496 { 372 {
497 ShadingInfo as_shade; 373 ShadingInfo as_shade;
498 as_shade.shading = shade; 374 as_shade.shading = shade;
499 375
500 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 376 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
501 if (flags & tintSet) 377 if (bg_flags & BG_TINT_SET)
502 tint.get (c); 378 tint.get (c);
503 as_shade.tintColor.red = c.r; 379 as_shade.tintColor.red = c.r;
504 as_shade.tintColor.green = c.g; 380 as_shade.tintColor.green = c.g;
505 as_shade.tintColor.blue = c.b; 381 as_shade.tintColor.blue = c.b;
506 382
507 background_tint = shading2tint32 (&as_shade); 383 background_tint = shading2tint32 (&as_shade);
508 } 384 }
509 385
510 if (!(background_flags & transpPmapBlurred) && (flags & blurNeeded) && background != NULL) 386 if ((tr_flags & BG_NEEDS_BLUR) && background != NULL)
511 { 387 {
512 ASImage *tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF, 388 ASImage *tmp = blur_asimage_gauss (asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
513 (original_asim == NULL || tint == TINT_LEAVE_SAME) ? ASA_XImage : ASA_ASImage, 389 ASA_XImage,
514 100, ASIMAGE_QUALITY_DEFAULT); 390 100, ASIMAGE_QUALITY_DEFAULT);
515 if (tmp) 391 if (tmp)
516 { 392 {
517 destroy_asimage (&background); 393 destroy_asimage (&background);
518 background = tmp; 394 background = tmp;
… …
520 } 396 }
521# endif 397# endif
522 398
523 ASImage *result = 0; 399 ASImage *result = 0;
524 400
525 int target_width = target->szHint.width; 401 int target_width = szHint.width;
526 int target_height = target->szHint.height; 402 int target_height = szHint.height;
527 int new_pmap_width = target_width; 403 int new_pmap_width = target_width;
528 int new_pmap_height = target_height; 404 int new_pmap_height = target_height;
529 405
530 int x = 0; 406 int x = 0;
531 int y = 0; 407 int y = 0;
532 int w = 0; 408 int w = 0;
533 int h = 0; 409 int h = 0;
534 410
535 TIMING_TEST_START (asim);
536
537 if (original_asim) 411 if (original_asim)
538 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y); 412 get_image_geometry (original_asim->width, original_asim->height, w, h, x, y);
539 413
540 if (!original_asim 414 if (!original_asim
541 || (!(flags & rootAlign) 415 || (!(bg_flags & BG_ROOT_ALIGN)
542 && (x >= target_width 416 && (x >= target_width
543 || y >= target_height 417 || y >= target_height
544 || (x + w <= 0) 418 || x + w <= 0
545 || (y + h <= 0)))) 419 || y + h <= 0)))
546 { 420 {
547 if (background) 421 if (background)
548 { 422 {
549 new_pmap_width = background->width; 423 new_pmap_width = background->width;
550 new_pmap_height = background->height; 424 new_pmap_height = background->height;
551 result = background; 425 result = background;
552 426
553 if (background_tint != TINT_LEAVE_SAME) 427 if (background_tint != TINT_LEAVE_SAME)
554 { 428 {
555 ASImage *tmp = tile_asimage (target->asv, background, 0, 0, 429 ASImage *tmp = tile_asimage (asv, background, 0, 0,
556 target_width, target_height, background_tint, 430 target_width, target_height, background_tint,
557 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT); 431 ASA_XImage, 100, ASIMAGE_QUALITY_DEFAULT);
558 if (tmp) 432 if (tmp)
559 result = tmp; 433 result = tmp;
560 } 434 }
… …
564 } 438 }
565 else 439 else
566 { 440 {
567 result = original_asim; 441 result = original_asim;
568 442
569 if ((w != original_asim->width) 443 if (w != original_asim->width
570 || (h != original_asim->height)) 444 || h != original_asim->height)
571 { 445 {
572 result = scale_asimage (target->asv, original_asim, 446 result = scale_asimage (asv, original_asim,
573 w, h, 447 w, h,
574 background ? ASA_ASImage : ASA_XImage, 448 ASA_XImage,
575 100, ASIMAGE_QUALITY_DEFAULT); 449 100, ASIMAGE_QUALITY_DEFAULT);
576 } 450 }
577 451
578 if (background == NULL) 452 if (background == NULL)
579 { 453 {
580 if (h_scale == 0 || v_scale == 0) 454 if (bg_flags & BG_TILE)
581 { 455 {
582 /* if tiling - pixmap has to be sized exactly as the image, 456 /* if tiling - pixmap has to be sized exactly as the image,
583 but there is no need to make it bigger than the window! */ 457 but there is no need to make it bigger than the window! */
584 new_pmap_width = min (result->width, target_width); 458 new_pmap_width = min (result->width, target_width);
585 new_pmap_height = min (result->height, target_height); 459 new_pmap_height = min (result->height, target_height);
586 460
587 /* we also need to tile our image in both directions */ 461 /* we also need to tile our image in both directions */
588 ASImage *tmp = tile_asimage (target->asv, result, 462 ASImage *tmp = tile_asimage (asv, result,
589 (int)result->width - x, 463 (int)result->width - x,
590 (int)result->height - y, 464 (int)result->height - y,
591 new_pmap_width, 465 new_pmap_width,
592 new_pmap_height, 466 new_pmap_height,
593 TINT_LEAVE_SAME, ASA_XImage, 467 TINT_LEAVE_SAME, ASA_XImage,
… …
610 layers[0].clip_width = target_width; 484 layers[0].clip_width = target_width;
611 layers[0].clip_height = target_height; 485 layers[0].clip_height = target_height;
612 layers[0].tint = background_tint; 486 layers[0].tint = background_tint;
613 layers[1].im = result; 487 layers[1].im = result;
614 488
615 if (h_scale == 0 || v_scale == 0) 489 if (bg_flags & BG_TILE)
616 { 490 {
617 /* tile horizontally */ 491 /* tile horizontally */
618 while (x > 0) x -= (int)result->width; 492 while (x > 0) x -= (int)result->width;
619 layers[1].dst_x = x; 493 layers[1].dst_x = x;
620 layers[1].clip_width = result->width+target_width; 494 layers[1].clip_width = result->width+target_width;
… …
624 /* clip horizontally */ 498 /* clip horizontally */
625 layers[1].dst_x = x; 499 layers[1].dst_x = x;
626 layers[1].clip_width = result->width; 500 layers[1].clip_width = result->width;
627 } 501 }
628 502
629 if (h_scale == 0 || v_scale == 0) 503 if (bg_flags & BG_TILE)
630 { 504 {
631 while (y > 0) y -= (int)result->height; 505 while (y > 0) y -= (int)result->height;
632 layers[1].dst_y = y; 506 layers[1].dst_y = y;
633 layers[1].clip_height = result->height + target_height; 507 layers[1].clip_height = result->height + target_height;
634 } 508 }
… …
636 { 510 {
637 layers[1].dst_y = y; 511 layers[1].dst_y = y;
638 layers[1].clip_height = result->height; 512 layers[1].clip_height = result->height;
639 } 513 }
640 514
641 if (target->rs[Rs_blendtype]) 515 if (rs[Rs_blendtype])
642 { 516 {
643 layers[1].merge_scanlines = blend_scanlines_name2func (target->rs[Rs_blendtype]); 517 layers[1].merge_scanlines = blend_scanlines_name2func (rs[Rs_blendtype]);
644 if (layers[1].merge_scanlines == NULL) 518 if (layers[1].merge_scanlines == NULL)
645 layers[1].merge_scanlines = alphablend_scanlines; 519 layers[1].merge_scanlines = alphablend_scanlines;
646 } 520 }
647 521
648 ASImage *tmp = merge_layers (target->asv, layers, 2, target_width, target_height, 522 ASImage *tmp = merge_layers (asv, layers, 2, target_width, target_height,
649 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT); 523 ASA_XImage, 0, ASIMAGE_QUALITY_DEFAULT);
650 524
651 if (tmp) 525 if (tmp)
652 { 526 {
653 if (result != original_asim) 527 if (result != original_asim)
… …
657 } 531 }
658 532
659 free (layers); 533 free (layers);
660 } 534 }
661 } 535 }
662 TIMING_TEST_PRINT_RESULT (asim);
663 536
664 bool ret = false; 537 bool ret = false;
665 538
666 if (result) 539 if (result)
667 { 540 {
668 XGCValues gcv; 541 XGCValues gcv;
669 GC gc; 542 GC gc;
670 543
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 */ 544 /* create Pixmap */
683 if (pixmap == None) 545 if (bg_pixmap == None
546 || bg_pmap_width != new_pmap_width
547 || bg_pmap_height != new_pmap_height)
684 { 548 {
549 if (bg_pixmap)
550 XFreePixmap (dpy, bg_pixmap);
685 pixmap = XCreatePixmap (target->dpy, target->vt, new_pmap_width, new_pmap_height, target->depth); 551 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
686 pmap_width = new_pmap_width; 552 bg_pmap_width = new_pmap_width;
687 pmap_height = new_pmap_height; 553 bg_pmap_height = new_pmap_height;
688 pmap_depth = target->depth;
689 } 554 }
690 /* fill with background color (if result's not completely overlapping it) */ 555 /* fill with background color (if result's not completely overlapping it) */
691 gcv.foreground = target->pix_colors[Color_bg]; 556 gcv.foreground = pix_colors[Color_bg];
692 gc = XCreateGC (target->dpy, target->vt, GCForeground, &gcv); 557 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
693 558
694 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0; 559 int src_x = 0, src_y = 0, dst_x = 0, dst_y = 0;
695 int dst_width = result->width, dst_height = result->height; 560 int dst_width = result->width, dst_height = result->height;
696 if (background == NULL) 561 if (background == NULL)
697 { 562 {
698 if (!(h_scale == 0 || v_scale == 0)) 563 if (!(bg_flags & BG_TILE))
699 { 564 {
700 src_x = make_clip_rectangle (x, result->width , new_pmap_width , dst_x, dst_width ); 565 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); 566 src_y = make_clip_rectangle (y, result->height, new_pmap_height, dst_y, dst_height);
702 } 567 }
703 568
704 if (dst_x > 0 || dst_y > 0 569 if (dst_x > 0 || dst_y > 0
705 || dst_x + dst_width < new_pmap_width 570 || dst_x + dst_width < new_pmap_width
706 || dst_y + dst_height < new_pmap_height) 571 || dst_y + dst_height < new_pmap_height)
707 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 572 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
708 } 573 }
709 574
710 /* put result on pixmap */ 575 /* put result on pixmap */
711 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 576 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); 577 asimage2drawable (asv, bg_pixmap, result, gc, src_x, src_y, dst_x, dst_y, dst_width, dst_height, True);
713 578
714 if (result != background && result != original_asim) 579 if (result != background && result != original_asim)
715 destroy_asimage (&result); 580 destroy_asimage (&result);
716 581
717 XFreeGC (target->dpy, gc); 582 XFreeGC (dpy, gc);
718 TIMING_TEST_PRINT_RESULT (asim);
719 583
720 ret = true; 584 ret = true;
721 } 585 }
722 586
723 if (background) 587 if (background)
… …
727} 591}
728# endif /* HAVE_AFTERIMAGE */ 592# endif /* HAVE_AFTERIMAGE */
729 593
730# ifdef HAVE_PIXBUF 594# ifdef HAVE_PIXBUF
731bool 595bool
732bgPixmap_t::render_image (unsigned long background_flags) 596rxvt_term::pixbuf_to_pixmap (GdkPixbuf *pixbuf, Pixmap pixmap, GC gc,
597 int src_x, int src_y, int dst_x, int dst_y,
598 unsigned int width, unsigned int height)
733{ 599{
734 if (target == NULL) 600 XImage *ximage;
601 char *data, *line;
602 int bytes_per_pixel;
603 int width_r, width_g, width_b;
604 int sh_r, sh_g, sh_b;
605 int rowstride;
606 int channels;
607 unsigned char *row;
608
609 if (visual->c_class != TrueColor)
735 return false; 610 return false;
736 611
612 if (depth == 24 || depth == 32)
613 bytes_per_pixel = 4;
614 else if (depth == 15 || depth == 16)
615 bytes_per_pixel = 2;
616 else
617 return false;
618
619 width_r = ecb_popcount32 (visual->red_mask);
620 width_g = ecb_popcount32 (visual->green_mask);
621 width_b = ecb_popcount32 (visual->blue_mask);
622
623 if (width_r > 8 || width_g > 8 || width_b > 8)
624 return false;
625
626 sh_r = ecb_ctz32 (visual->red_mask);
627 sh_g = ecb_ctz32 (visual->green_mask);
628 sh_b = ecb_ctz32 (visual->blue_mask);
629
630 if (width > INT_MAX / height / bytes_per_pixel)
631 return false;
632
633 data = (char *)malloc (width * height * bytes_per_pixel);
634 if (!data)
635 return false;
636
637 ximage = XCreateImage (dpy, visual, depth, ZPixmap, 0, data,
638 width, height, bytes_per_pixel * 8, 0);
639 if (!ximage)
640 {
641 free (data);
642 return false;
643 }
644
645 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
646
647 rowstride = gdk_pixbuf_get_rowstride (pixbuf);
648 channels = gdk_pixbuf_get_n_channels (pixbuf);
649 row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
650 line = data;
651
652 for (int y = 0; y < height; y++)
653 {
654 for (int x = 0; x < width; x++)
655 {
656 unsigned char *pixel = row + x * channels;
657 uint32_t value;
658
659 value = ((pixel[0] >> (8 - width_r)) << sh_r)
660 | ((pixel[1] >> (8 - width_g)) << sh_g)
661 | ((pixel[2] >> (8 - width_b)) << sh_b);
662
663 if (bytes_per_pixel == 4)
664 ((uint32_t *)line)[x] = value;
665 else
666 ((uint16_t *)line)[x] = value;
667 }
668
669 row += rowstride;
670 line += ximage->bytes_per_line;
671 }
672
673 XPutImage (dpy, pixmap, gc, ximage, 0, 0, dst_x, dst_y, width, height);
674 XDestroyImage (ximage);
675 return true;
676}
677
678bool
679rxvt_term::render_image (unsigned long tr_flags)
680{
737 if (!pixbuf) 681 if (!pixbuf)
738 return false; 682 return false;
739 683
740#if !XFT 684 if (tr_flags
741 if (background_flags) 685 && !(bg_flags & BG_HAS_RENDER))
742 return false; 686 return false;
743#endif
744 687
745 GdkPixbuf *result; 688 GdkPixbuf *result;
746 689
747 int image_width = gdk_pixbuf_get_width (pixbuf); 690 int image_width = gdk_pixbuf_get_width (pixbuf);
748 int image_height = gdk_pixbuf_get_height (pixbuf); 691 int image_height = gdk_pixbuf_get_height (pixbuf);
749 692
750 int target_width = target->szHint.width; 693 int target_width = szHint.width;
751 int target_height = target->szHint.height; 694 int target_height = szHint.height;
752 int new_pmap_width = target_width; 695 int new_pmap_width = target_width;
753 int new_pmap_height = target_height; 696 int new_pmap_height = target_height;
754 697
755 int x = 0; 698 int x = 0;
756 int y = 0; 699 int y = 0;
757 int w = 0; 700 int w = 0;
758 int h = 0; 701 int h = 0;
759 702
760 get_image_geometry (image_width, image_height, w, h, x, y); 703 get_image_geometry (image_width, image_height, w, h, x, y);
761 704
762 if (!(flags & rootAlign) 705 if (!(bg_flags & BG_ROOT_ALIGN)
763 && (x >= target_width 706 && (x >= target_width
764 || y >= target_height 707 || y >= target_height
765 || (x + w <= 0) 708 || x + w <= 0
766 || (y + h <= 0))) 709 || y + h <= 0))
767 return false; 710 return false;
768 711
769 result = pixbuf; 712 result = pixbuf;
770 713
771 if ((w != image_width) 714 if (w != image_width
772 || (h != image_height)) 715 || h != image_height)
773 { 716 {
774 result = gdk_pixbuf_scale_simple (pixbuf, 717 result = gdk_pixbuf_scale_simple (pixbuf,
775 w, h, 718 w, h,
776 GDK_INTERP_BILINEAR); 719 GDK_INTERP_BILINEAR);
777 } 720 }
778 721
722 if (!result)
723 return false;
724
779 bool ret = false; 725 bool ret = false;
780 726
781 if (result)
782 {
783 XGCValues gcv; 727 XGCValues gcv;
784 GC gc; 728 GC gc;
785 Pixmap root_pmap; 729 Pixmap root_pmap;
786 730
787 image_width = gdk_pixbuf_get_width (result); 731 image_width = gdk_pixbuf_get_width (result);
788 image_height = gdk_pixbuf_get_height (result); 732 image_height = gdk_pixbuf_get_height (result);
789 733
790 if (background_flags) 734 if (tr_flags)
791 { 735 {
792 root_pmap = pixmap; 736 root_pmap = bg_pixmap;
793 pixmap = None; 737 bg_pixmap = None;
738 }
739 else
740 {
741 if (bg_flags & BG_TILE)
794 } 742 {
795 else
796 {
797 if (h_scale == 0 || v_scale == 0)
798 {
799 new_pmap_width = min (image_width, target_width); 743 new_pmap_width = min (image_width, target_width);
800 new_pmap_height = min (image_height, target_height); 744 new_pmap_height = min (image_height, target_height);
801 } 745 }
802 } 746 }
803 747
748 if (bg_pixmap == None
749 || bg_pmap_width != new_pmap_width
750 || bg_pmap_height != new_pmap_height)
751 {
804 if (pixmap) 752 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); 753 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); 754 bg_pixmap = XCreatePixmap (dpy, vt, new_pmap_width, new_pmap_height, depth);
818 pmap_width = new_pmap_width; 755 bg_pmap_width = new_pmap_width;
819 pmap_height = new_pmap_height; 756 bg_pmap_height = new_pmap_height;
820 pmap_depth = target->depth; 757 }
758
759 gcv.foreground = pix_colors[Color_bg];
760 gc = XCreateGC (dpy, vt, GCForeground, &gcv);
761
762 if (gc)
763 {
764 if (bg_flags & BG_TILE)
821 } 765 {
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); 766 Pixmap tile = XCreatePixmap (dpy, vt, image_width, image_height, depth);
829 gdk_pixbuf_xlib_render_to_drawable (result, tile, gc, 767 pixbuf_to_pixmap (result, tile, gc,
830 0, 0, 768 0, 0,
831 0, 0, 769 0, 0,
832 image_width, image_height, 770 image_width, image_height);
833 XLIB_RGB_DITHER_NONE,
834 0, 0);
835 771
836 gcv.tile = tile; 772 gcv.tile = tile;
837 gcv.fill_style = FillTiled; 773 gcv.fill_style = FillTiled;
838 gcv.ts_x_origin = x; 774 gcv.ts_x_origin = x;
839 gcv.ts_y_origin = y; 775 gcv.ts_y_origin = y;
840 XChangeGC (target->dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 776 XChangeGC (dpy, gc, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
841 777
842 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 778 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
843 XFreePixmap (target->dpy, tile); 779 XFreePixmap (dpy, tile);
844 } 780 }
845 else 781 else
846 { 782 {
847 int src_x, src_y, dst_x, dst_y; 783 int src_x, src_y, dst_x, dst_y;
848 int dst_width, dst_height; 784 int dst_width, dst_height;
… …
851 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height); 787 src_y = make_clip_rectangle (y, image_height, new_pmap_height, dst_y, dst_height);
852 788
853 if (dst_x > 0 || dst_y > 0 789 if (dst_x > 0 || dst_y > 0
854 || dst_x + dst_width < new_pmap_width 790 || dst_x + dst_width < new_pmap_width
855 || dst_y + dst_height < new_pmap_height) 791 || dst_y + dst_height < new_pmap_height)
856 XFillRectangle (target->dpy, pixmap, gc, 0, 0, new_pmap_width, new_pmap_height); 792 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, new_pmap_width, new_pmap_height);
857 793
858 if (dst_x < new_pmap_width && dst_y < new_pmap_height) 794 if (dst_x < new_pmap_width && dst_y < new_pmap_height)
859 gdk_pixbuf_xlib_render_to_drawable (result, pixmap, gc, 795 pixbuf_to_pixmap (result, bg_pixmap, gc,
860 src_x, src_y, 796 src_x, src_y,
861 dst_x, dst_y, 797 dst_x, dst_y,
862 dst_width, dst_height, 798 dst_width, dst_height);
863 XLIB_RGB_DITHER_NONE,
864 0, 0);
865 }
866
867#if XFT
868 if (background_flags)
869 { 799 }
870 Display *dpy = target->dpy; 800
801#if XRENDER
802 if (tr_flags)
803 {
871 XRenderPictureAttributes pa; 804 XRenderPictureAttributes pa;
872 805
873 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, target->display->screen)); 806 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, visual);
874 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa); 807 Picture src = XRenderCreatePicture (dpy, root_pmap, src_format, 0, &pa);
875 808
876 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual); 809 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
877 Picture dst = XRenderCreatePicture (dpy, pixmap, dst_format, 0, &pa); 810 Picture dst = XRenderCreatePicture (dpy, bg_pixmap, dst_format, 0, &pa);
878 811
879 pa.repeat = True; 812 pa.repeat = True;
880 Pixmap mask_pmap = XCreatePixmap (dpy, target->vt, 1, 1, 8); 813 Pixmap mask_pmap = XCreatePixmap (dpy, vt, 1, 1, 8);
881 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8); 814 XRenderPictFormat *mask_format = XRenderFindStandardFormat (dpy, PictStandardA8);
882 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa); 815 Picture mask = XRenderCreatePicture (dpy, mask_pmap, mask_format, CPRepeat, &pa);
883 XFreePixmap (dpy, mask_pmap); 816 XFreePixmap (dpy, mask_pmap);
884 817
885 if (src && dst && mask)
886 {
887 XRenderColor mask_c; 818 XRenderColor mask_c;
888 819
889 mask_c.alpha = 0x8000; 820 mask_c.alpha = 0x8000;
890 mask_c.red = 0; 821 mask_c.red = 0;
891 mask_c.green = 0; 822 mask_c.green = 0;
892 mask_c.blue = 0; 823 mask_c.blue = 0;
893 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 824 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); 825 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, target_width, target_height);
895 }
896 826
897 XRenderFreePicture (dpy, src); 827 XRenderFreePicture (dpy, src);
898 XRenderFreePicture (dpy, dst); 828 XRenderFreePicture (dpy, dst);
899 XRenderFreePicture (dpy, mask); 829 XRenderFreePicture (dpy, mask);
900
901 XFreePixmap (dpy, root_pmap);
902 } 830 }
903#endif 831#endif
904 832
905 if (result != pixbuf)
906 g_object_unref (result);
907
908 XFreeGC (target->dpy, gc); 833 XFreeGC (dpy, gc);
909 834
910 ret = true; 835 ret = true;
911 } 836 }
912 837
838 if (result != pixbuf)
839 g_object_unref (result);
840
841 if (tr_flags)
842 XFreePixmap (dpy, root_pmap);
843
913 return ret; 844 return ret;
914} 845}
915# endif /* HAVE_PIXBUF */ 846# endif /* HAVE_PIXBUF */
916 847
917bool 848bool
918bgPixmap_t::set_file (const char *file) 849rxvt_term::bg_set_file (const char *file)
919{ 850{
920 assert (file); 851 if (!file || !*file)
852 return false;
921 853
922 if (*file) 854 bool ret = false;
923 {
924 if (const char *p = strchr (file, ';')) 855 const char *p = strchr (file, ';');
925 { 856
857 if (p)
858 {
926 size_t len = p - file; 859 size_t len = p - file;
927 char *f = rxvt_temp_buf<char> (len + 1); 860 char *f = rxvt_temp_buf<char> (len + 1);
928 memcpy (f, file, len); 861 memcpy (f, file, len);
929 f[len] = '\0'; 862 f[len] = '\0';
930 file = f; 863 file = f;
931 } 864 }
932 865
933# ifdef HAVE_AFTERIMAGE 866# ifdef HAVE_AFTERIMAGE
934 if (!target->asimman) 867 if (!asimman)
935 target->asimman = create_generic_imageman (target->rs[Rs_path]); 868 asimman = create_generic_imageman (rs[Rs_path]);
936 ASImage *image = get_asimage (target->asimman, file, 0xFFFFFFFF, 100); 869 ASImage *image = get_asimage (asimman, file, 0xFFFFFFFF, 100);
937 if (image) 870 if (image)
938 { 871 {
939 if (original_asim) 872 if (original_asim)
940 safe_asimage_destroy (original_asim); 873 safe_asimage_destroy (original_asim);
941 original_asim = image; 874 original_asim = image;
942 have_image = true; 875 bg_flags |= BG_IS_FROM_FILE | BG_CLIENT_RENDER;
943 return true; 876 ret = true;
944 } 877 }
945# endif 878# endif
946 879
947# ifdef HAVE_PIXBUF 880# ifdef HAVE_PIXBUF
948 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL); 881 GdkPixbuf *image = gdk_pixbuf_new_from_file (file, NULL);
949 if (image) 882 if (image)
950 { 883 {
951 if (pixbuf) 884 if (pixbuf)
952 g_object_unref (pixbuf); 885 g_object_unref (pixbuf);
953 pixbuf = image; 886 pixbuf = image;
954 have_image = true; 887 bg_flags |= BG_IS_FROM_FILE;
955 return true; 888 ret = true;
956 } 889 }
957# endif 890# endif
891
892 if (ret)
958 } 893 {
894 if (p)
895 bg_set_geometry (p + 1);
896 else
897 bg_set_default_geometry ();
898 }
959 899
960 return false; 900 return ret;
961} 901}
962 902
963# endif /* BG_IMAGE_FROM_FILE */ 903# endif /* BG_IMAGE_FROM_FILE */
964 904
965# ifdef ENABLE_TRANSPARENCY 905# ifdef ENABLE_TRANSPARENCY
966bool 906bool
967bgPixmap_t::set_transparent () 907rxvt_term::bg_set_transparent ()
968{ 908{
969 if (!(flags & isTransparent)) 909 if (!(bg_flags & BG_IS_TRANSPARENT))
970 { 910 {
971 flags |= isTransparent; 911 bg_flags |= BG_IS_TRANSPARENT;
972 return true; 912 return true;
973 } 913 }
974 914
975 return false; 915 return false;
976} 916}
977 917
978bool 918bool
979bgPixmap_t::set_blur_radius (const char *geom) 919rxvt_term::bg_set_blur (const char *geom)
980{ 920{
981 int changed = 0; 921 bool changed = false;
982 unsigned int hr, vr; 922 unsigned int hr, vr;
983 int junk; 923 int junk;
984 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr); 924 int geom_flags = XParseGeometry (geom, &junk, &junk, &hr, &vr);
985 925
986 if (!(geom_flags & WidthValue)) 926 if (!(geom_flags & WidthValue))
… …
991 min_it (hr, 128); 931 min_it (hr, 128);
992 min_it (vr, 128); 932 min_it (vr, 128);
993 933
994 if (h_blurRadius != hr) 934 if (h_blurRadius != hr)
995 { 935 {
996 ++changed; 936 changed = true;
997 h_blurRadius = hr; 937 h_blurRadius = hr;
998 } 938 }
999 939
1000 if (v_blurRadius != vr) 940 if (v_blurRadius != vr)
1001 { 941 {
1002 ++changed; 942 changed = true;
1003 v_blurRadius = vr; 943 v_blurRadius = vr;
1004 } 944 }
1005 945
1006 if (v_blurRadius == 0 && h_blurRadius == 0) 946 if (v_blurRadius == 0 && h_blurRadius == 0)
1007 flags &= ~blurNeeded; 947 bg_flags &= ~BG_NEEDS_BLUR;
1008 else 948 else
1009 flags |= blurNeeded; 949 bg_flags |= BG_NEEDS_BLUR;
1010 950
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); 951 return changed;
1024} 952}
1025 953
1026static inline unsigned long 954void
1027compute_tint_shade_flags (rxvt_color *tint, int shade) 955rxvt_term::set_tint_shade_flags ()
1028{ 956{
1029 unsigned long flags = 0;
1030 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 957 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1031 bool has_shade = shade != 100; 958 bool has_shade = shade != 100;
1032 959
1033 if (tint) 960 bg_flags &= ~BG_TINT_FLAGS;
961
962 if (bg_flags & BG_TINT_SET)
1034 { 963 {
1035 tint->get (c); 964 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) 965 if (!has_shade
1045 flags |= bgPixmap_t::tintNeeded; 966 && (c.r <= 0x00ff || c.r >= 0xff00)
1046 else if (tint) 967 && (c.g <= 0x00ff || c.g >= 0xff00)
968 && (c.b <= 0x00ff || c.b >= 0xff00))
969 bg_flags |= BG_TINT_BITAND;
1047 { 970 }
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 971
1055 if (flags & bgPixmap_t::tintNeeded) 972 if (has_shade || (bg_flags & BG_TINT_SET))
1056 { 973 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} 974}
1069 975
1070bool 976bool
1071bgPixmap_t::set_tint (rxvt_color &new_tint) 977rxvt_term::bg_set_tint (rxvt_color &new_tint)
1072{ 978{
1073 if (!(flags & tintSet) || tint != new_tint) 979 if (!(bg_flags & BG_TINT_SET) || tint != new_tint)
1074 { 980 {
1075 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
1076 tint = new_tint; 981 tint = new_tint;
1077 flags = (flags & ~tintFlags) | new_flags | tintSet; 982 bg_flags |= BG_TINT_SET;
983 set_tint_shade_flags ();
1078 return true; 984 return true;
1079 } 985 }
1080 986
1081 return false; 987 return false;
1082} 988}
1083 989
1084bool 990bool
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) 991rxvt_term::bg_set_shade (const char *shade_str)
1100{ 992{
1101 int new_shade = (shade_str) ? atoi (shade_str) : 100; 993 int new_shade = (shade_str) ? atoi (shade_str) : 100;
1102 994
1103 clamp_it (new_shade, -100, 200); 995 clamp_it (new_shade, -100, 200);
1104 if (new_shade < 0) 996 if (new_shade < 0)
1105 new_shade = 200 - (100 + new_shade); 997 new_shade = 200 - (100 + new_shade);
1106 998
1107 if (new_shade != shade) 999 if (new_shade != shade)
1108 { 1000 {
1109 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
1110 shade = new_shade; 1001 shade = new_shade;
1111 flags = (flags & (~tintFlags | tintSet)) | new_flags; 1002 set_tint_shade_flags ();
1112 return true; 1003 return true;
1113 } 1004 }
1114 1005
1115 return false; 1006 return false;
1116} 1007}
1117 1008
1009#if XRENDER
1118static void 1010static void
1119get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 1011get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1120{ 1012{
1121 double sigma = radius / 2.0; 1013 double sigma = radius / 2.0;
1122 double scale = sqrt (2.0 * M_PI) * sigma; 1014 double scale = sqrt (2.0 * M_PI) * sigma;
1123 double sum = 0.0; 1015 double sum = 0.0;
1124 1016
1125 for (int i = 0; i < width; i++) 1017 for (int i = 0; i < width; i++)
1126 { 1018 {
1127 double x = i - width / 2; 1019 double x = i - width / 2;
1128 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 1020 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1129 sum += kernel[i]; 1021 sum += kernel[i];
1130 } 1022 }
1131 1023
1132 params[0] = XDoubleToFixed (width); 1024 params[0] = XDoubleToFixed (width);
1133 params[1] = XDoubleToFixed (1); 1025 params[1] = XDoubleToFixed (1);
1134 1026
1135 for (int i = 0; i < width; i++) 1027 for (int i = 0; i < width; i++)
1136 params[i+2] = XDoubleToFixed (kernel[i] / sum); 1028 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1137} 1029}
1030#endif
1138 1031
1139bool 1032bool
1140bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1033rxvt_term::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1141{ 1034{
1142 bool ret = false; 1035 bool ret = false;
1143#if XFT 1036#if XRENDER
1144 int size = max (h_blurRadius, v_blurRadius) * 2 + 1; 1037 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1145 double *kernel = (double *)malloc (size * sizeof (double)); 1038 double *kernel = (double *)malloc (size * sizeof (double));
1146 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 1039 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1147 1040
1148 Display *dpy = target->dpy;
1149 XRenderPictureAttributes pa; 1041 XRenderPictureAttributes pa;
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, target->visual); 1042 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 1043
1152 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1044 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1153 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa); 1045 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154 1046
1155 if (kernel && params && src && dst) 1047 if (kernel && params)
1156 { 1048 {
1157 if (h_blurRadius) 1049 if (h_blurRadius)
1158 { 1050 {
1159 size = h_blurRadius * 2 + 1; 1051 size = h_blurRadius * 2 + 1;
1160 get_gaussian_kernel (h_blurRadius, size, kernel, params); 1052 get_gaussian_kernel (h_blurRadius, size, kernel, params);
… …
1173 1065
1174 if (v_blurRadius) 1066 if (v_blurRadius)
1175 { 1067 {
1176 size = v_blurRadius * 2 + 1; 1068 size = v_blurRadius * 2 + 1;
1177 get_gaussian_kernel (v_blurRadius, size, kernel, params); 1069 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1178 swap (params[0], params[1]); 1070 ::swap (params[0], params[1]);
1179 1071
1180 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 1072 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1181 XRenderComposite (dpy, 1073 XRenderComposite (dpy,
1182 PictOpSrc, 1074 PictOpSrc,
1183 src, 1075 src,
… …
1199#endif 1091#endif
1200 return ret; 1092 return ret;
1201} 1093}
1202 1094
1203bool 1095bool
1204bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height) 1096rxvt_term::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1205{ 1097{
1206 Display *dpy = target->dpy;
1207 bool ret = false; 1098 bool ret = false;
1208 1099
1209 if (flags & tintWholesome) 1100 if (bg_flags & BG_TINT_BITAND)
1210 { 1101 {
1211 XGCValues gcv; 1102 XGCValues gcv;
1212 GC gc; 1103 GC gc;
1213 1104
1214 /* In this case we can tint image server-side getting significant 1105 /* In this case we can tint image server-side getting significant
… …
1225 XFreeGC (dpy, gc); 1116 XFreeGC (dpy, gc);
1226 } 1117 }
1227 } 1118 }
1228 else 1119 else
1229 { 1120 {
1230# if XFT 1121# if XRENDER
1231 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1122 rgba c (rgba::MAX_CC, rgba::MAX_CC, rgba::MAX_CC);
1232 1123
1233 if (flags & tintSet) 1124 if (bg_flags & BG_TINT_SET)
1234 tint.get (c); 1125 tint.get (c);
1235 1126
1236 if (shade <= 100) 1127 if (shade <= 100)
1237 { 1128 {
1238 c.r = (c.r * shade) / 100; 1129 c.r = c.r * shade / 100;
1239 c.g = (c.g * shade) / 100; 1130 c.g = c.g * shade / 100;
1240 c.b = (c.b * shade) / 100; 1131 c.b = c.b * shade / 100;
1241 } 1132 }
1242 else 1133 else
1243 { 1134 {
1244 c.r = ((0xffff - c.r) * (200 - shade)) / 100; 1135 c.r = c.r * (200 - shade) / 100;
1245 c.g = ((0xffff - c.g) * (200 - shade)) / 100; 1136 c.g = c.g * (200 - shade) / 100;
1246 c.b = ((0xffff - c.b) * (200 - shade)) / 100; 1137 c.b = c.b * (200 - shade) / 100;
1247 } 1138 }
1248 1139
1249 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32); 1140 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1250 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual); 1141 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1251 XRenderPictureAttributes pa; 1142 XRenderPictureAttributes pa;
… …
1258 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa); 1149 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1259 XFreePixmap (dpy, overlay_pmap); 1150 XFreePixmap (dpy, overlay_pmap);
1260 1151
1261 pa.component_alpha = True; 1152 pa.component_alpha = True;
1262 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32); 1153 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1263 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa); 1154 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat | CPComponentAlpha, &pa);
1264 XFreePixmap (dpy, mask_pmap); 1155 XFreePixmap (dpy, mask_pmap);
1265 1156
1266 if (mask_pic && overlay_pic && back_pic)
1267 {
1268 XRenderColor mask_c; 1157 XRenderColor mask_c;
1269 1158
1270 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1271 mask_c.alpha = 0xffff; 1159 mask_c.alpha = 0xffff;
1160 mask_c.red =
1161 mask_c.green =
1162 mask_c.blue = 0;
1163 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1164
1165 mask_c.alpha = 0;
1166 mask_c.red = 0xffff - c.r;
1167 mask_c.green = 0xffff - c.g;
1168 mask_c.blue = 0xffff - c.b;
1169 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1170 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1171
1172 if (shade > 100)
1173 {
1174 mask_c.red = mask_c.green = mask_c.blue = 0xffff * (shade - 100) / 100;
1175 mask_c.alpha = 0;
1272 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1); 1176 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1273 1177
1274 mask_c.alpha = 0;
1275 mask_c.red = 0xffff - c.r;
1276 mask_c.green = 0xffff - c.g;
1277 mask_c.blue = 0xffff - c.b;
1278 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); 1178 XRenderComposite (dpy, PictOpOver, overlay_pic, None, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1179 }
1180
1280 ret = true; 1181 ret = true;
1281 }
1282 1182
1283 XRenderFreePicture (dpy, mask_pic); 1183 XRenderFreePicture (dpy, mask_pic);
1284 XRenderFreePicture (dpy, overlay_pic); 1184 XRenderFreePicture (dpy, overlay_pic);
1285 XRenderFreePicture (dpy, back_pic); 1185 XRenderFreePicture (dpy, back_pic);
1286# if DO_TIMING_TEST
1287 XSync (dpy, False);
1288# endif
1289# endif 1186# endif
1290 } 1187 }
1291 1188
1292 return ret; 1189 return ret;
1293} 1190}
1294 1191
1295/* make_transparency_pixmap() 1192/*
1296 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1193 * 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 1194 * the tiled portion of the root pixmap that is supposed to be covered by
1298 * our window. 1195 * our window.
1299 */ 1196 */
1300unsigned long 1197unsigned long
1301bgPixmap_t::make_transparency_pixmap () 1198rxvt_term::make_transparency_pixmap ()
1302{ 1199{
1303 unsigned long result = 0; 1200 unsigned long result = 0;
1304
1305 if (target == NULL)
1306 return 0;
1307 1201
1308 /* root dimensions may change from call to call - but Display structure should 1202 /* root dimensions may change from call to call - but Display structure should
1309 * be always up-to-date, so let's use it : 1203 * be always up-to-date, so let's use it :
1310 */ 1204 */
1311 Window root = target->display->root;
1312 int screen = target->display->screen; 1205 int screen = display->screen;
1313 Display *dpy = target->dpy; 1206 int root_depth = DefaultDepth (dpy, screen);
1314 int root_width = DisplayWidth (dpy, screen); 1207 int root_width = DisplayWidth (dpy, screen);
1315 int root_height = DisplayHeight (dpy, screen); 1208 int root_height = DisplayHeight (dpy, screen);
1316 unsigned int root_pmap_width, root_pmap_height; 1209 unsigned int root_pmap_width, root_pmap_height;
1317 int window_width = target->szHint.width; 1210 int window_width = szHint.width;
1318 int window_height = target->szHint.height; 1211 int window_height = szHint.height;
1319 int sx, sy; 1212 int sx, sy;
1320 XGCValues gcv; 1213 XGCValues gcv;
1321 GC gc; 1214 GC gc;
1322 1215
1323 TIMING_TEST_START (tp); 1216 sx = target_x;
1324 target->get_window_origin (sx, sy); 1217 sy = target_y;
1325 1218
1326 /* check if we are outside of the visible part of the virtual screen : */ 1219 /* check if we are outside of the visible part of the virtual screen : */
1327 if (sx + window_width <= 0 || sy + window_height <= 0 1220 if (sx + window_width <= 0 || sy + window_height <= 0
1328 || sx >= root_width || sy >= root_height) 1221 || sx >= root_width || sy >= root_height)
1329 return 0; 1222 return 0;
1330 1223
1224 // validate root pixmap and get its size
1331 if (root_pixmap != None) 1225 if (root_pixmap != None)
1332 { 1226 {
1333 /* we want to validate the pixmap and get its size at the same time : */ 1227 Window wdummy;
1334 int junk; 1228 int idummy;
1335 unsigned int ujunk; 1229 unsigned int udummy;
1336 /* root pixmap may be bad - allow a error */ 1230
1337 target->allowedxerror = -1; 1231 allowedxerror = -1;
1338 1232
1339 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1233 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
1340 root_pixmap = None; 1234 root_pixmap = None;
1341 1235
1342 target->allowedxerror = 0; 1236 allowedxerror = 0;
1237 }
1238
1239 Pixmap recoded_root_pmap = root_pixmap;
1240
1241 if (root_pixmap != None && root_depth != depth)
1343 } 1242 {
1243#if XRENDER
1244 if (bg_flags & BG_HAS_RENDER)
1245 {
1246 recoded_root_pmap = XCreatePixmap (dpy, vt, root_pmap_width, root_pmap_height, depth);
1344 1247
1248 XRenderPictureAttributes pa;
1249
1250 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1251 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1252
1253 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, visual);
1254 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1255
1256 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1257
1258 XRenderFreePicture (dpy, src);
1259 XRenderFreePicture (dpy, dst);
1260 }
1261 else
1262#endif
1263 recoded_root_pmap = None;
1264 }
1265
1345 if (root_pixmap == None) 1266 if (recoded_root_pmap == None)
1346 return 0; 1267 return 0;
1347 1268
1269 if (bg_pixmap == None
1270 || bg_pmap_width != window_width
1271 || bg_pmap_height != window_height)
1272 {
1273 if (bg_pixmap)
1274 XFreePixmap (dpy, bg_pixmap);
1348 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1275 bg_pixmap = XCreatePixmap (dpy, vt, window_width, window_height, depth);
1349 1276 bg_pmap_width = window_width;
1350 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1277 bg_pmap_height = window_height;
1351 return 0; 1278 }
1352 1279
1353 /* straightforward pixmap copy */ 1280 /* straightforward pixmap copy */
1281 while (sx < 0) sx += root_width;
1282 while (sy < 0) sy += root_height;
1283
1354 gcv.tile = root_pixmap; 1284 gcv.tile = recoded_root_pmap;
1355 gcv.fill_style = FillTiled; 1285 gcv.fill_style = FillTiled;
1356
1357 while (sx < 0) sx += (int)root_width;
1358 while (sy < 0) sy += (int)root_height;
1359
1360 gcv.ts_x_origin = -sx; 1286 gcv.ts_x_origin = -sx;
1361 gcv.ts_y_origin = -sy; 1287 gcv.ts_y_origin = -sy;
1362 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1288 gc = XCreateGC (dpy, vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
1363 1289
1364 if (gc) 1290 if (gc)
1365 { 1291 {
1366 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1292 XFillRectangle (dpy, bg_pixmap, gc, 0, 0, window_width, window_height);
1367 result |= transpPmapTiled; 1293 result |= BG_IS_VALID | (bg_flags & BG_EFFECTS_FLAGS);
1368 XFreeGC (dpy, gc); 1294 XFreeGC (dpy, gc);
1369 }
1370 TIMING_TEST_PRINT_RESULT (tp);
1371 1295
1372 if (tiled_root_pmap != None) 1296 if (!(bg_flags & BG_CLIENT_RENDER))
1373 {
1374 if (!need_client_side_rendering ())
1375 {
1376 if (flags & (blurNeeded | blurServerSide))
1377 { 1297 {
1378 if (blur_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1298 if ((bg_flags & BG_NEEDS_BLUR)
1379 result |= transpPmapBlurred; 1299 && (bg_flags & BG_HAS_RENDER_CONV))
1380 } 1300 {
1381 if (flags & (tintNeeded | tintServerSide)) 1301 if (blur_pixmap (bg_pixmap, visual, window_width, window_height))
1302 result &= ~BG_NEEDS_BLUR;
1382 { 1303 }
1383 if (tint_pixmap (tiled_root_pmap, DefaultVisual (dpy, target->display->screen), window_width, window_height)) 1304 if ((bg_flags & BG_NEEDS_TINT)
1384 result |= transpPmapTinted; 1305 && (bg_flags & (BG_TINT_BITAND | BG_HAS_RENDER)))
1306 {
1307 if (tint_pixmap (bg_pixmap, visual, window_width, window_height))
1308 result &= ~BG_NEEDS_TINT;
1385 } 1309 }
1386 } /* server side rendering completed */ 1310 } /* 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 } 1311 }
1396 1312
1397 TIMING_TEST_PRINT_RESULT (tp); 1313 if (recoded_root_pmap != root_pixmap)
1314 XFreePixmap (dpy, recoded_root_pmap);
1398 1315
1399 return result; 1316 return result;
1400} 1317}
1401 1318
1319void
1320rxvt_term::bg_set_root_pixmap ()
1321{
1322 Pixmap new_root_pixmap = get_pixmap_property (xa[XA_XROOTPMAP_ID]);
1323 if (new_root_pixmap == None)
1324 new_root_pixmap = get_pixmap_property (xa[XA_ESETROOT_PMAP_ID]);
1325
1326 root_pixmap = new_root_pixmap;
1327}
1328# endif /* ENABLE_TRANSPARENCY */
1329
1330#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1331static void shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c);
1332# endif
1333
1402bool 1334bool
1403bgPixmap_t::set_root_pixmap () 1335rxvt_term::bg_render ()
1404{ 1336{
1405 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1337 unsigned long tr_flags = 0;
1406 if (new_root_pixmap == None)
1407 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1408 1338
1409 if (new_root_pixmap != root_pixmap) 1339 bg_invalidate ();
1410 { 1340# ifdef ENABLE_TRANSPARENCY
1411 root_pixmap = new_root_pixmap; 1341 if (bg_flags & BG_IS_TRANSPARENT)
1412 return true;
1413 } 1342 {
1414 1343 /* we need to re-generate transparency pixmap in that case ! */
1344 tr_flags = make_transparency_pixmap ();
1345 if (tr_flags == 0)
1415 return false; 1346 return false;
1416} 1347 bg_flags |= BG_IS_VALID;
1417# endif /* ENABLE_TRANSPARENCY */ 1348 }
1418
1419# ifndef HAVE_AFTERIMAGE
1420static void ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm);
1421# endif 1349# endif
1422 1350
1423bool 1351# ifdef BG_IMAGE_FROM_FILE
1424bgPixmap_t::render () 1352 if ((bg_flags & BG_IS_FROM_FILE)
1425{ 1353 || (tr_flags & BG_EFFECTS_FLAGS))
1426 unsigned long background_flags = 0;
1427
1428 if (target == NULL)
1429 return false;
1430
1431 TIMING_TEST_START (tp);
1432
1433 invalidate ();
1434# ifdef ENABLE_TRANSPARENCY
1435 if (flags & isTransparent)
1436 { 1354 {
1437 /* we need to re-generate transparency pixmap in that case ! */ 1355 if (render_image (tr_flags))
1438 background_flags = make_transparency_pixmap (); 1356 bg_flags |= BG_IS_VALID;
1439 if (background_flags == 0)
1440 return false;
1441 else if ((background_flags & transpTransformations) == (flags & transpTransformations)
1442 && pmap_depth == target->depth)
1443 flags = flags & ~isInvalid;
1444 } 1357 }
1445# endif 1358# endif
1446 1359
1447# ifdef BG_IMAGE_FROM_FILE 1360# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1448 if (have_image 1361 XImage *result = NULL;
1449 || (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);
1450 { 1366 }
1451 if (render_image (background_flags)) 1367
1452 flags = flags & ~isInvalid; 1368 if (result)
1369 {
1370 /* our own client-side tinting */
1371 //if (tr_flags & BG_NEEDS_TINT)
1372 if (1)
1373 {
1374 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1375 if (bg_flags & BG_TINT_SET)
1376 tint.get (c);
1377 shade_ximage (DefaultVisual (dpy, display->screen), result, shade, c);
1378 }
1379
1380 GC gc = XCreateGC (dpy, vt, 0UL, NULL);
1381
1382 if (gc)
1383 {
1384 XPutImage (dpy, bg_pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1385
1386 XFreeGC (dpy, gc);
1387 }
1388
1389 XDestroyImage (result);
1453 } 1390 }
1454# endif 1391# endif
1455 1392
1456 XImage *result = NULL; 1393 if (!(bg_flags & BG_IS_VALID))
1457
1458 if (background_flags && (flags & isInvalid))
1459 {
1460 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1461 } 1394 {
1462
1463 if (result)
1464 {
1465# if !defined(HAVE_AFTERIMAGE) && !XFT
1466 /* our own client-side tinting */
1467 /* ATTENTION: We ASSUME that XFT will let us do all the tinting necessary server-side.
1468 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1469 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1470 {
1471 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1472 if (flags & tintSet)
1473 tint.get (c);
1474 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1475 }
1476# endif
1477
1478 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1479
1480 if (gc)
1481 {
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);
1511
1512 XFreeGC (target->dpy, gc);
1513 flags = flags & ~isInvalid;
1514 }
1515
1516 XDestroyImage (result);
1517 }
1518
1519 if (flags & isInvalid)
1520 {
1521 if (pixmap != None) 1395 if (bg_pixmap != None)
1522 { 1396 {
1523 XFreePixmap (target->dpy, pixmap); 1397 XFreePixmap (dpy, bg_pixmap);
1524 pixmap = None; 1398 bg_pixmap = None;
1525 } 1399 }
1526 } 1400 }
1527 1401
1528 apply (); 1402 scr_recolour (false);
1403 bg_flags |= BG_NEEDS_REFRESH;
1529 1404
1530 XSync (target->dpy, False);
1531 valid_since = ev::now (); 1405 bg_valid_since = ev::now ();
1532
1533 TIMING_TEST_PRINT_RESULT (tp);
1534 1406
1535 return true; 1407 return true;
1536} 1408}
1537 1409
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 1410void
1555bgPixmap_t::apply () 1411rxvt_term::bg_init ()
1556{ 1412{
1557 if (target)
1558 {
1559 flags &= ~isVtOrigin;
1560
1561 if (pixmap != None)
1562 {
1563 /* set target's background to pixmap */
1564# ifdef ENABLE_TRANSPARENCY 1413#ifdef ENABLE_TRANSPARENCY
1565 if (flags & isTransparent) 1414 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 1415#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 1416
1582 if (target->scrollBar.win) 1417 bg_flags &= ~(BG_HAS_RENDER | BG_HAS_RENDER_CONV);
1583 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1418#if XRENDER
1584 } 1419 int major, minor;
1585 } 1420 if (XRenderQueryVersion (dpy, &major, &minor))
1586 else 1421 bg_flags |= BG_HAS_RENDER;
1587 { 1422 XFilters *filters = XRenderQueryFilters (dpy, vt);
1588 /* set target background to a pixel */ 1423 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 } 1424 {
1425 for (int i = 0; i < filters->nfilter; i++)
1426 if (!strcmp (filters->filter[i], FilterConvolution))
1427 bg_flags |= BG_HAS_RENDER_CONV;
1428
1429 XFree (filters);
1430 }
1431#endif
1609} 1432}
1610 1433
1611#endif /* HAVE_BG_PIXMAP */ 1434#endif /* HAVE_BG_PIXMAP */
1612 1435
1613#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1436#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1614/* taken from aterm-0.4.2 */ 1437/* based on code from aterm-0.4.2 */
1615
1616typedef uint32_t RUINT32T;
1617 1438
1618static void 1439static void
1619ShadeXImage(rxvt_term *term, XImage *srcImage, int shade, int rm, int gm, int bm) 1440shade_ximage (Visual *visual, XImage *ximage, int shade, const rgba &c)
1620{ 1441{
1621 int sh_r, sh_g, sh_b; 1442 int sh_r, sh_g, sh_b;
1622 RUINT32T mask_r, mask_g, mask_b; 1443 uint32_t mask_r, mask_g, mask_b;
1623 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1444 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1624 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1445 rgba low;
1625 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1446 rgba high;
1626 int i; 1447 int i;
1448 int host_byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
1627 1449
1628 Visual *visual = term->visual;
1629
1630 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1450 if (visual->c_class != TrueColor || ximage->format != ZPixmap) return;
1631 1451
1632 /* for convenience */ 1452 /* for convenience */
1633 mask_r = visual->red_mask; 1453 mask_r = visual->red_mask;
1634 mask_g = visual->green_mask; 1454 mask_g = visual->green_mask;
1635 mask_b = visual->blue_mask; 1455 mask_b = visual->blue_mask;
1636 1456
1637 /* boring lookup table pre-initialization */ 1457 /* boring lookup table pre-initialization */
1638 switch (srcImage->bits_per_pixel) { 1458 switch (ximage->depth)
1459 {
1639 case 15: 1460 case 15:
1640 if ((mask_r != 0x7c00) || 1461 if ((mask_r != 0x7c00) ||
1641 (mask_g != 0x03e0) || 1462 (mask_g != 0x03e0) ||
1642 (mask_b != 0x001f)) 1463 (mask_b != 0x001f))
1643 return; 1464 return;
1644 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1465 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1645 lookup_r = lookup; 1466 lookup_r = lookup;
1646 lookup_g = lookup+32; 1467 lookup_g = lookup+32;
1647 lookup_b = lookup+32+32; 1468 lookup_b = lookup+32+32;
1648 sh_r = 10; 1469 sh_r = 10;
1649 sh_g = 5; 1470 sh_g = 5;
1650 sh_b = 0; 1471 sh_b = 0;
1651 break; 1472 break;
1652 case 16: 1473 case 16:
1653 if ((mask_r != 0xf800) || 1474 if ((mask_r != 0xf800) ||
1654 (mask_g != 0x07e0) || 1475 (mask_g != 0x07e0) ||
1655 (mask_b != 0x001f)) 1476 (mask_b != 0x001f))
1656 return; 1477 return;
1657 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1478 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1658 lookup_r = lookup; 1479 lookup_r = lookup;
1659 lookup_g = lookup+32; 1480 lookup_g = lookup+32;
1660 lookup_b = lookup+32+64; 1481 lookup_b = lookup+32+64;
1661 sh_r = 11; 1482 sh_r = 11;
1662 sh_g = 5; 1483 sh_g = 5;
1663 sh_b = 0; 1484 sh_b = 0;
1664 break; 1485 break;
1665 case 24: 1486 case 24:
1666 if ((mask_r != 0xff0000) || 1487 if ((mask_r != 0xff0000) ||
1667 (mask_g != 0x00ff00) || 1488 (mask_g != 0x00ff00) ||
1668 (mask_b != 0x0000ff)) 1489 (mask_b != 0x0000ff))
1669 return; 1490 return;
1670 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1491 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1671 lookup_r = lookup; 1492 lookup_r = lookup;
1672 lookup_g = lookup+256; 1493 lookup_g = lookup+256;
1673 lookup_b = lookup+256+256; 1494 lookup_b = lookup+256+256;
1674 sh_r = 16; 1495 sh_r = 16;
1675 sh_g = 8; 1496 sh_g = 8;
1676 sh_b = 0; 1497 sh_b = 0;
1677 break; 1498 break;
1678 case 32: 1499 case 32:
1679 if ((mask_r != 0xff0000) || 1500 if ((mask_r != 0xff0000) ||
1680 (mask_g != 0x00ff00) || 1501 (mask_g != 0x00ff00) ||
1681 (mask_b != 0x0000ff)) 1502 (mask_b != 0x0000ff))
1682 return; 1503 return;
1683 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1504 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1684 lookup_r = lookup; 1505 lookup_r = lookup;
1685 lookup_g = lookup+256; 1506 lookup_g = lookup+256;
1686 lookup_b = lookup+256+256; 1507 lookup_b = lookup+256+256;
1687 sh_r = 16; 1508 sh_r = 16;
1688 sh_g = 8; 1509 sh_g = 8;
1689 sh_b = 0; 1510 sh_b = 0;
1690 break; 1511 break;
1691 default: 1512 default:
1692 return; /* we do not support this color depth */ 1513 return; /* we do not support this color depth */
1693 } 1514 }
1694 1515
1695 /* prepare limits for color transformation (each channel is handled separately) */ 1516 /* prepare limits for color transformation (each channel is handled separately) */
1696 if (shade > 100) { 1517 if (shade > 100)
1518 {
1697 shade = 200 - shade; 1519 shade = 200 - shade;
1698 1520
1699 lower_lim_r = 65535-rm; 1521 high.r = c.r * shade / 100;
1700 lower_lim_g = 65535-gm; 1522 high.g = c.g * shade / 100;
1701 lower_lim_b = 65535-bm; 1523 high.b = c.b * shade / 100;
1702 1524
1703 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1525 low.r = 65535 * (100 - shade) / 100;
1704 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1526 low.g = 65535 * (100 - shade) / 100;
1705 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1527 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 } 1528 }
1716 1529 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 { 1530 {
1720 unsigned int tmp; 1531 high.r = c.r * shade / 100;
1532 high.g = c.g * shade / 100;
1533 high.b = c.b * shade / 100;
1721 1534
1722 tmp = lower_lim_r; 1535 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 } 1536 }
1730 1537
1731 /* fill our lookup tables */ 1538 /* fill our lookup tables */
1732 for (i = 0; i <= mask_r>>sh_r; i++) 1539 for (i = 0; i <= mask_r>>sh_r; i++)
1733 { 1540 {
1734 RUINT32T tmp; 1541 uint32_t tmp;
1735 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1542 tmp = i * high.r;
1736 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1543 tmp += (mask_r>>sh_r) * low.r;
1737 lookup_r[i] = (tmp/65535)<<sh_r; 1544 lookup_r[i] = (tmp/65535)<<sh_r;
1738 } 1545 }
1739 for (i = 0; i <= mask_g>>sh_g; i++) 1546 for (i = 0; i <= mask_g>>sh_g; i++)
1740 { 1547 {
1741 RUINT32T tmp; 1548 uint32_t tmp;
1742 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1549 tmp = i * high.g;
1743 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1550 tmp += (mask_g>>sh_g) * low.g;
1744 lookup_g[i] = (tmp/65535)<<sh_g; 1551 lookup_g[i] = (tmp/65535)<<sh_g;
1745 } 1552 }
1746 for (i = 0; i <= mask_b>>sh_b; i++) 1553 for (i = 0; i <= mask_b>>sh_b; i++)
1747 { 1554 {
1748 RUINT32T tmp; 1555 uint32_t tmp;
1749 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1556 tmp = i * high.b;
1750 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1557 tmp += (mask_b>>sh_b) * low.b;
1751 lookup_b[i] = (tmp/65535)<<sh_b; 1558 lookup_b[i] = (tmp/65535)<<sh_b;
1752 } 1559 }
1753 1560
1754 /* apply table to input image (replacing colors by newly calculated ones) */ 1561 /* apply table to input image (replacing colors by newly calculated ones) */
1755 switch (srcImage->bits_per_pixel) 1562 if (ximage->bits_per_pixel == 32
1563 && (ximage->depth == 24 || ximage->depth == 32)
1564 && ximage->byte_order == host_byte_order)
1756 { 1565 {
1757 case 15:
1758 {
1759 unsigned short *p1, *pf, *p, *pl; 1566 uint32_t *p1, *pf, *p, *pl;
1760 p1 = (unsigned short *) srcImage->data; 1567 p1 = (uint32_t *) ximage->data;
1761 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1568 pf = (uint32_t *) (ximage->data + ximage->height * ximage->bytes_per_line);
1569
1762 while (p1 < pf) 1570 while (p1 < pf)
1763 { 1571 {
1764 p = p1; 1572 p = p1;
1765 pl = p1 + srcImage->width; 1573 pl = p1 + ximage->width;
1766 for (; p < pl; p++) 1574 for (; p < pl; p++)
1767 { 1575 {
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] | 1576 *p = lookup_r[(*p & 0xff0000) >> 16] |
1827 lookup_g[(*p & 0x00ff00)>> 8] | 1577 lookup_g[(*p & 0x00ff00) >> 8] |
1828 lookup_b[(*p & 0x0000ff)] | 1578 lookup_b[(*p & 0x0000ff)] |
1829 (*p & ~0xffffff); 1579 (*p & 0xff000000);
1580 }
1581 p1 = (uint32_t *) ((char *) p1 + ximage->bytes_per_line);
1582 }
1583 }
1584 else
1585 {
1586 for (int y = 0; y < ximage->height; y++)
1587 for (int x = 0; x < ximage->width; x++)
1588 {
1589 unsigned long pixel = XGetPixel (ximage, x, y);
1590 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1591 lookup_g[(pixel & mask_g) >> sh_g] |
1592 lookup_b[(pixel & mask_b) >> sh_b];
1593 XPutPixel (ximage, x, y, pixel);
1830 } 1594 }
1831 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1832 } 1595 }
1833 break;
1834 }
1835 }
1836 1596
1837 free (lookup); 1597 free (lookup);
1838} 1598}
1839#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1599#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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