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

Diff Legend

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