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

Diff Legend

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