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

Diff Legend

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