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