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

Diff Legend

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