ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/background.C
(Generate patch)

Comparing rxvt-unicode/src/background.C (file contents):
Revision 1.82 by sf-exg, Thu Oct 14 16:01:28 2010 UTC vs.
Revision 1.156 by sf-exg, Tue Aug 9 18:41:31 2011 UTC

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

Diff Legend

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