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

Diff Legend

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