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

Diff Legend

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