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.81 by sf-exg, Wed Oct 13 23:08:11 2010 UTC vs.
Revision 1.164 by sf-exg, Sun Aug 14 22:01:25 2011 UTC

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

Diff Legend

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