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.67 by sf-exg, Mon Oct 4 21:56:42 2010 UTC vs.
Revision 1.143 by sf-exg, Fri Jan 28 00:08:57 2011 UTC

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

Diff Legend

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