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.82 by sf-exg, Thu Oct 14 16:01:28 2010 UTC vs.
Revision 1.146 by sf-exg, Sat Jan 29 17:50:31 2011 UTC

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

Diff Legend

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