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.93 by sf-exg, Tue Oct 19 14:44:30 2010 UTC vs.
Revision 1.162 by sf-exg, Thu Aug 11 12:27:26 2011 UTC

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

Diff Legend

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