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

Diff Legend

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