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