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

Diff Legend

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