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