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.21 by root, Fri Jan 4 20:39:42 2008 UTC vs.
Revision 1.122 by sf-exg, Sat Nov 20 11:30:58 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 }
… …
749 flags |= bgPixmap_t::tintNeeded; 955 flags |= bgPixmap_t::tintNeeded;
750 else if (tint) 956 else if (tint)
751 { 957 {
752 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700) 958 if ((c.r > 0x000700 || c.g > 0x000700 || c.b > 0x000700)
753 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700)) 959 && (c.r < 0x00f700 || c.g < 0x00f700 || c.b < 0x00f700))
754 { 960 {
755 flags |= bgPixmap_t::tintNeeded; 961 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 } 962 }
769 } 963 }
770 964
771 return flags; 965 return flags;
772} 966}
773 967
774bool 968bool
775bgPixmap_t::set_tint (rxvt_color &new_tint) 969bgPixmap_t::set_tint (rxvt_color &new_tint)
776{ 970{
777 if (tint != new_tint) 971 if (!(flags & tintSet) || tint != new_tint)
778 { 972 {
779 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade); 973 unsigned long new_flags = compute_tint_shade_flags (&new_tint, shade);
780 tint = new_tint; 974 tint = new_tint;
781 flags = (flags & ~tintFlags) | new_flags | tintSet; 975 flags = (flags & ~tintFlags) | new_flags | tintSet;
782 return true; 976 return true;
… …
790{ 984{
791 unsigned long new_flags = compute_tint_shade_flags (NULL, shade); 985 unsigned long new_flags = compute_tint_shade_flags (NULL, shade);
792 986
793 if (new_flags != (flags & tintFlags)) 987 if (new_flags != (flags & tintFlags))
794 { 988 {
795 flags = (flags&~tintFlags)|new_flags; 989 flags = (flags & ~tintFlags) | new_flags;
796 return true; 990 return true;
797 } 991 }
798 992
799 return false; 993 return false;
800} 994}
801 995
802bool 996bool
803bgPixmap_t::set_shade (const char *shade_str) 997bgPixmap_t::set_shade (const char *shade_str)
804{ 998{
805 int new_shade = (shade_str) ? atoi (shade_str) : 0; 999 int new_shade = (shade_str) ? atoi (shade_str) : 100;
806 1000
807 if (new_shade < 0 && new_shade > -100) 1001 clamp_it (new_shade, -100, 200);
1002 if (new_shade < 0)
808 new_shade = 200 - (100 + new_shade); 1003 new_shade = 200 - (100 + new_shade);
809 else if (new_shade == 100)
810 new_shade = 0;
811 1004
812 if (new_shade != shade) 1005 if (new_shade != shade)
813 { 1006 {
814 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade); 1007 unsigned long new_flags = compute_tint_shade_flags ((flags & tintSet) ? &tint : NULL, new_shade);
815 shade = new_shade; 1008 shade = new_shade;
… …
818 } 1011 }
819 1012
820 return false; 1013 return false;
821} 1014}
822 1015
1016#if XRENDER
1017static void
1018get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params)
1019{
1020 double sigma = radius / 2.0;
1021 double scale = sqrt (2.0 * M_PI) * sigma;
1022 double sum = 0.0;
1023
1024 for (int i = 0; i < width; i++)
1025 {
1026 double x = i - width / 2;
1027 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
1028 sum += kernel[i];
1029 }
1030
1031 params[0] = XDoubleToFixed (width);
1032 params[1] = XDoubleToFixed (1);
1033
1034 for (int i = 0; i < width; i++)
1035 params[i+2] = XDoubleToFixed (kernel[i] / sum);
1036}
1037#endif
1038
1039bool
1040bgPixmap_t::blur_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1041{
1042 bool ret = false;
1043#if XRENDER
1044 int size = max (h_blurRadius, v_blurRadius) * 2 + 1;
1045 double *kernel = (double *)malloc (size * sizeof (double));
1046 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
1047
1048 Display *dpy = target->dpy;
1049 XRenderPictureAttributes pa;
1050 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1051
1052 Picture src = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1053 Picture dst = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1054
1055 if (kernel && params && src && dst)
1056 {
1057 if (h_blurRadius)
1058 {
1059 size = h_blurRadius * 2 + 1;
1060 get_gaussian_kernel (h_blurRadius, size, kernel, params);
1061
1062 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1063 XRenderComposite (dpy,
1064 PictOpSrc,
1065 src,
1066 None,
1067 dst,
1068 0, 0,
1069 0, 0,
1070 0, 0,
1071 width, height);
1072 }
1073
1074 if (v_blurRadius)
1075 {
1076 size = v_blurRadius * 2 + 1;
1077 get_gaussian_kernel (v_blurRadius, size, kernel, params);
1078 swap (params[0], params[1]);
1079
1080 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2);
1081 XRenderComposite (dpy,
1082 PictOpSrc,
1083 src,
1084 None,
1085 dst,
1086 0, 0,
1087 0, 0,
1088 0, 0,
1089 width, height);
1090 }
1091
1092 ret = true;
1093 }
1094
1095 free (kernel);
1096 free (params);
1097 XRenderFreePicture (dpy, src);
1098 XRenderFreePicture (dpy, dst);
1099#endif
1100 return ret;
1101}
1102
1103bool
1104bgPixmap_t::tint_pixmap (Pixmap pixmap, Visual *visual, int width, int height)
1105{
1106 Display *dpy = target->dpy;
1107 bool ret = false;
1108
1109 if (flags & tintWholesome)
1110 {
1111 XGCValues gcv;
1112 GC gc;
1113
1114 /* In this case we can tint image server-side getting significant
1115 * performance improvements, as we eliminate XImage transfer
1116 */
1117 gcv.foreground = Pixel (tint);
1118 gcv.function = GXand;
1119 gcv.fill_style = FillSolid;
1120 gc = XCreateGC (dpy, pixmap, GCFillStyle | GCForeground | GCFunction, &gcv);
1121 if (gc)
1122 {
1123 XFillRectangle (dpy, pixmap, gc, 0, 0, width, height);
1124 ret = true;
1125 XFreeGC (dpy, gc);
1126 }
1127 }
1128 else
1129 {
1130# if XRENDER
1131 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1132
1133 if (flags & tintSet)
1134 tint.get (c);
1135
1136 if (shade <= 100)
1137 {
1138 c.r = (c.r * shade) / 100;
1139 c.g = (c.g * shade) / 100;
1140 c.b = (c.b * shade) / 100;
1141 }
1142 else
1143 {
1144 c.r = ((0xffff - c.r) * (200 - shade)) / 100;
1145 c.g = ((0xffff - c.g) * (200 - shade)) / 100;
1146 c.b = ((0xffff - c.b) * (200 - shade)) / 100;
1147 }
1148
1149 XRenderPictFormat *solid_format = XRenderFindStandardFormat (dpy, PictStandardARGB32);
1150 XRenderPictFormat *format = XRenderFindVisualFormat (dpy, visual);
1151 XRenderPictureAttributes pa;
1152
1153 Picture back_pic = XRenderCreatePicture (dpy, pixmap, format, 0, &pa);
1154
1155 pa.repeat = True;
1156
1157 Pixmap overlay_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1158 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1159 XFreePixmap (dpy, overlay_pmap);
1160
1161 pa.component_alpha = True;
1162 Pixmap mask_pmap = XCreatePixmap (dpy, pixmap, 1, 1, 32);
1163 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1164 XFreePixmap (dpy, mask_pmap);
1165
1166 if (mask_pic && overlay_pic && back_pic)
1167 {
1168 XRenderColor mask_c;
1169
1170 mask_c.red = mask_c.green = mask_c.blue = shade > 100 ? 0xffff : 0;
1171 mask_c.alpha = 0xffff;
1172 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1173
1174 mask_c.alpha = 0;
1175 mask_c.red = 0xffff - c.r;
1176 mask_c.green = 0xffff - c.g;
1177 mask_c.blue = 0xffff - c.b;
1178 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1179 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, width, height);
1180 ret = true;
1181 }
1182
1183 XRenderFreePicture (dpy, mask_pic);
1184 XRenderFreePicture (dpy, overlay_pic);
1185 XRenderFreePicture (dpy, back_pic);
1186# endif
1187 }
1188
1189 return ret;
1190}
1191
823/* make_transparency_pixmap() 1192/* make_transparency_pixmap()
824 * Builds a pixmap sized the same as terminal window, with depth same as the root window 1193 * Builds a pixmap of the same size as the terminal window that contains
825 * that pixmap contains tiled portion of the root pixmap that is supposed to be covered by 1194 * the tiled portion of the root pixmap that is supposed to be covered by
826 * our window. 1195 * our window.
827 */ 1196 */
828unsigned long 1197unsigned long
829bgPixmap_t::make_transparency_pixmap () 1198bgPixmap_t::make_transparency_pixmap ()
830{ 1199{
831 unsigned long result = 0; 1200 unsigned long result = 0;
832 1201
833 if (target == NULL) 1202 if (target == NULL)
834 return 0; 1203 return 0;
835 1204
836 /* root dimentions may change from call to call - but Display structure should 1205 /* root dimensions may change from call to call - but Display structure should
837 * be always up-to-date, so let's use it : 1206 * be always up-to-date, so let's use it :
838 */ 1207 */
839 Window root = target->display->root;
840 int screen = target->display->screen; 1208 int screen = target->display->screen;
841 Display *dpy = target->dpy; 1209 Display *dpy = target->dpy;
1210 int root_depth = DefaultDepth (dpy, screen);
842 int root_width = DisplayWidth (dpy, screen); 1211 int root_width = DisplayWidth (dpy, screen);
843 int root_height = DisplayHeight (dpy, screen); 1212 int root_height = DisplayHeight (dpy, screen);
844 unsigned int root_pmap_width, root_pmap_height; 1213 unsigned int root_pmap_width, root_pmap_height;
845 int window_width = target->szHint.width; 1214 int window_width = target->szHint.width;
846 int window_height = target->szHint.height; 1215 int window_height = target->szHint.height;
847 int sx, sy; 1216 int sx, sy;
848 XGCValues gcv; 1217 XGCValues gcv;
1218 GC gc;
849 1219
850 TIMING_TEST_START (tp); 1220 sx = target_x;
851 target->get_window_origin (sx, sy); 1221 sy = target_y;
852 1222
853 /* check if we are outside of the visible part of the virtual screen : */ 1223 /* check if we are outside of the visible part of the virtual screen : */
854 if (sx + window_width <= 0 || sy + window_height <= 0 1224 if (sx + window_width <= 0 || sy + window_height <= 0
855 || sx >= root_width || sy >= root_height) 1225 || sx >= root_width || sy >= root_height)
856 return 0; 1226 return 0;
857 1227
1228 // validate root pixmap and get its size
858 if (root_pixmap != None) 1229 if (root_pixmap != None)
859 { 1230 {
860 /* we want to validate the pixmap and get it's size at the same time : */ 1231 Window wdummy;
861 int junk; 1232 int idummy;
862 unsigned int ujunk; 1233 unsigned int udummy;
863 /* root pixmap may be bad - allow a error */ 1234
864 target->allowedxerror = -1; 1235 target->allowedxerror = -1;
865 1236
866 if (!XGetGeometry (dpy, root_pixmap, &root, &junk, &junk, &root_pmap_width, &root_pmap_height, &ujunk, &ujunk)) 1237 if (!XGetGeometry (dpy, root_pixmap, &wdummy, &idummy, &idummy, &root_pmap_width, &root_pmap_height, &udummy, &udummy))
867 root_pixmap = None; 1238 root_pixmap = None;
868 1239
869 target->allowedxerror = 0; 1240 target->allowedxerror = 0;
870 } 1241 }
871 1242
1243 Pixmap recoded_root_pmap = root_pixmap;
1244
1245 if (root_pixmap != None && root_depth != target->depth)
1246 {
1247#if XRENDER
1248 if (flags & HAS_RENDER)
1249 {
1250 XRenderPictureAttributes pa;
1251
1252 XRenderPictFormat *src_format = XRenderFindVisualFormat (dpy, DefaultVisual (dpy, screen));
1253 Picture src = XRenderCreatePicture (dpy, root_pixmap, src_format, 0, &pa);
1254
1255 recoded_root_pmap = XCreatePixmap (dpy, target->vt, root_pmap_width, root_pmap_height, target->depth);
1256 XRenderPictFormat *dst_format = XRenderFindVisualFormat (dpy, target->visual);
1257 Picture dst = XRenderCreatePicture (dpy, recoded_root_pmap, dst_format, 0, &pa);
1258
1259 if (src && dst)
1260 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, root_pmap_width, root_pmap_height);
1261 else
1262 {
1263 XFreePixmap (dpy, recoded_root_pmap);
1264 root_pixmap = None;
1265 }
1266
1267 XRenderFreePicture (dpy, src);
1268 XRenderFreePicture (dpy, dst);
1269 }
1270 else
1271#endif
1272 root_pixmap = None;
1273 }
1274
1275 if (root_pixmap == None)
1276 return 0;
1277
872 Pixmap tiled_root_pmap = XCreatePixmap (dpy, root, window_width, window_height, root_depth); 1278 Pixmap tiled_root_pmap = XCreatePixmap (dpy, target->vt, window_width, window_height, target->depth);
873 GC gc = NULL;
874 1279
875 if (tiled_root_pmap == None) /* something really bad happened - abort */ 1280 if (tiled_root_pmap == None) /* something really bad happened - abort */
876 return 0; 1281 return 0;
877 1282
878 if (root_pixmap == None)
879 {
880 /* use tricks to obtain the root background image :*/
881 /* we want to create Overrideredirect window overlapping out window
882 with background type of Parent Relative and then grab it */
883 XSetWindowAttributes attr;
884 Window src;
885 bool success = false;
886
887 attr.background_pixmap = ParentRelative;
888 attr.backing_store = Always;
889 attr.event_mask = ExposureMask;
890 attr.override_redirect = True;
891 src = XCreateWindow (dpy, root, sx, sy, window_width, window_height, 0,
892 CopyFromParent, CopyFromParent, CopyFromParent,
893 CWBackPixmap|CWBackingStore|CWOverrideRedirect|CWEventMask,
894 &attr);
895
896 if (src != None)
897 {
898 XEvent event;
899 int ev_count = 0;
900 XGrabServer (dpy);
901 XMapRaised (dpy, src);
902 XSync (dpy, False);
903
904 /* XSync should get window where it's properly exposed,
905 * but to be on the safe side - let's check for the actual event to arrive : */
906 while (XCheckWindowEvent (dpy, src, ExposureMask, &event))
907 ++ev_count;
908
909 if (ev_count > 0);
910 {
911 /* hooray! - we can grab the image! */
912 gc = XCreateGC (dpy, root, 0, NULL);
913 if (gc)
914 {
915 XCopyArea (dpy, src, tiled_root_pmap, gc, 0, 0, window_width, window_height, 0, 0);
916 success = true;
917 }
918 }
919
920 XDestroyWindow (dpy, src);
921 XUngrabServer (dpy);
922 //fprintf (stderr, "%s:%d: ev_count = %d\n", __FUNCTION__, __LINE__, ev_count);
923 }
924
925 if (!success)
926 {
927 XFreePixmap (dpy, tiled_root_pmap);
928 tiled_root_pmap = None;
929 }
930 else
931 result |= transpPmapTiled;
932 }
933 else
934 {
935 /* strightforward pixmap copy */ 1283 /* straightforward pixmap copy */
936 gcv.tile = root_pixmap;
937 gcv.fill_style = FillTiled;
938
939 while (sx < 0) sx += (int)root_width; 1284 while (sx < 0) sx += (int)root_width;
940 while (sy < 0) sy += (int)root_height; 1285 while (sy < 0) sy += (int)root_height;
941 1286
1287 gcv.tile = recoded_root_pmap;
1288 gcv.fill_style = FillTiled;
942 gcv.ts_x_origin = -sx; 1289 gcv.ts_x_origin = -sx;
943 gcv.ts_y_origin = -sy; 1290 gcv.ts_y_origin = -sy;
944 gc = XCreateGC (dpy, root, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv); 1291 gc = XCreateGC (dpy, target->vt, GCFillStyle | GCTile | GCTileStipXOrigin | GCTileStipYOrigin, &gcv);
945 1292
946 if (gc) 1293 if (gc)
947 { 1294 {
948 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height); 1295 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
949 result |= transpPmapTiled; 1296 result |= transpPmapTiled;
950 } 1297 XFreeGC (dpy, gc);
951 }
952 TIMING_TEST_PRINT_RESULT (tp);
953 1298
954 if (tiled_root_pmap != None)
955 {
956 if (!need_client_side_rendering ()) 1299 if (!need_client_side_rendering ())
957 { 1300 {
1301 if ((flags & blurNeeded)
1302 && (flags & HAS_RENDER_CONV))
1303 {
1304 if (blur_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
1305 result |= transpPmapBlurred;
1306 }
958 if ((flags & tintNeeded)) 1307 if ((flags & tintNeeded)
959 {
960 if (flags & tintWholesome) 1308 && (flags & (tintWholesome | HAS_RENDER)))
961 { 1309 {
962 /* In this case we can tint image server-side getting significant 1310 if (tint_pixmap (tiled_root_pmap, target->visual, window_width, window_height))
963 * performance improvements, as we eliminate XImage transfer
964 */
965 gcv.foreground = Pixel (tint);
966 gcv.function = GXand;
967 gcv.fill_style = FillSolid;
968 if (gc)
969 XChangeGC (dpy, gc, GCFillStyle | GCForeground | GCFunction, &gcv);
970 else
971 gc = XCreateGC (dpy, root, GCFillStyle | GCForeground | GCFunction, &gcv);
972 if (gc)
973 {
974 XFillRectangle (dpy, tiled_root_pmap, gc, 0, 0, window_width, window_height);
975 result |= transpPmapTinted; 1311 result |= transpPmapTinted;
976 }
977 }
978 else
979 {
980# if XFT
981 Picture back_pic = 0;
982 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
983
984 if (flags & tintSet)
985 tint.get (c);
986
987 if (shade > 0 && shade < 100)
988 {
989 c.r = (c.r * shade) / 100;
990 c.g = (c.g * shade) / 100;
991 c.b = (c.b * shade) / 100;
992 }
993 else if (shade > 100 && shade < 200)
994 {
995 c.r = (c.r * (200 - shade)) / 100;
996 c.g = (c.g * (200 - shade)) / 100;
997 c.b = (c.b * (200 - shade)) / 100;
998 }
999
1000 XRenderPictFormat pf;
1001 pf.type = PictTypeDirect;
1002 pf.depth = 32;
1003 pf.direct.redMask = 0xff;
1004 pf.direct.greenMask = 0xff;
1005 pf.direct.blueMask = 0xff;
1006 pf.direct.alphaMask = 0xff;
1007
1008 XRenderPictFormat *solid_format = XRenderFindFormat (dpy,
1009 (PictFormatType|
1010 PictFormatDepth|
1011 PictFormatRedMask|
1012 PictFormatGreenMask|
1013 PictFormatBlueMask|
1014 PictFormatAlphaMask),
1015 &pf,
1016 0);
1017 XRenderPictFormat *root_format = XRenderFindVisualFormat (dpy, DefaultVisualOfScreen (ScreenOfDisplay (dpy, target->display->screen)));
1018 XRenderPictureAttributes pa ;
1019
1020 back_pic = XRenderCreatePicture (dpy, tiled_root_pmap, root_format, 0, &pa);
1021
1022 pa.repeat = True;
1023
1024 Pixmap overlay_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1025 Picture overlay_pic = XRenderCreatePicture (dpy, overlay_pmap, solid_format, CPRepeat, &pa);
1026 XFreePixmap (dpy, overlay_pmap);
1027
1028 pa.component_alpha = True;
1029 Pixmap mask_pmap = XCreatePixmap (dpy, root, 1, 1, 32);
1030 Picture mask_pic = XRenderCreatePicture (dpy, mask_pmap, solid_format, CPRepeat|CPComponentAlpha, &pa);
1031 XFreePixmap (dpy, mask_pmap);
1032
1033 if (mask_pic && overlay_pic && back_pic)
1034 {
1035 XRenderColor mask_c;
1036
1037 memset (&mask_c, (shade > 100) ? 0xFF : 0x0, sizeof (mask_c));
1038 mask_c.alpha = 0xffff;
1039 XRenderFillRectangle (dpy, PictOpSrc, overlay_pic, &mask_c, 0, 0, 1, 1);
1040
1041 mask_c.alpha = 0;
1042 mask_c.red = 0xffff - c.r;
1043 mask_c.green = 0xffff - c.g;
1044 mask_c.blue = 0xffff - c.b;
1045 XRenderFillRectangle (dpy, PictOpSrc, mask_pic, &mask_c, 0, 0, 1, 1);
1046 XRenderComposite (dpy, PictOpOver, overlay_pic, mask_pic, back_pic, 0, 0, 0, 0, 0, 0, window_width, window_height);
1047 result |= transpPmapTinted;
1048 }
1049
1050 XRenderFreePicture (dpy, mask_pic);
1051 XRenderFreePicture (dpy, overlay_pic);
1052 XRenderFreePicture (dpy, back_pic);
1053# if DO_TIMING_TEST
1054 XSync (dpy, False);
1055# endif
1056# endif
1057 }
1058 } 1312 }
1059 } /* server side rendering completed */ 1313 } /* server side rendering completed */
1060 1314
1061 if (pixmap) 1315 if (pixmap)
1062 XFreePixmap (dpy, pixmap); 1316 XFreePixmap (dpy, pixmap);
1063 1317
1064 pixmap = tiled_root_pmap; 1318 pixmap = tiled_root_pmap;
1065 pmap_width = window_width; 1319 pmap_width = window_width;
1066 pmap_height = window_height; 1320 pmap_height = window_height;
1067 pmap_depth = root_depth; 1321 pmap_depth = target->depth;
1068 } 1322 }
1323 else
1324 XFreePixmap (dpy, tiled_root_pmap);
1069 1325
1070 if (gc) 1326 if (recoded_root_pmap != root_pixmap)
1071 XFreeGC (dpy, gc); 1327 XFreePixmap (dpy, recoded_root_pmap);
1072
1073 TIMING_TEST_PRINT_RESULT (tp);
1074 1328
1075 return result; 1329 return result;
1076} 1330}
1077 1331
1078bool 1332void
1079bgPixmap_t::set_root_pixmap () 1333bgPixmap_t::set_root_pixmap ()
1080{ 1334{
1081 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID); 1335 Pixmap new_root_pixmap = target->get_pixmap_property (XA_XROOTPMAP_ID);
1082 if (new_root_pixmap == None) 1336 if (new_root_pixmap == None)
1083 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID); 1337 new_root_pixmap = target->get_pixmap_property (XA_ESETROOT_PMAP_ID);
1084 1338
1085 if (new_root_pixmap != root_pixmap)
1086 {
1087 root_pixmap = new_root_pixmap; 1339 root_pixmap = new_root_pixmap;
1088 return true;
1089 }
1090
1091 return false;
1092} 1340}
1093# endif /* ENABLE_TRANSPARENCY */ 1341# endif /* ENABLE_TRANSPARENCY */
1094 1342
1095# ifndef HAVE_AFTERIMAGE 1343#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1096static void ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm); 1344static void ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c);
1097# endif 1345# endif
1098 1346
1099bool 1347bool
1100bgPixmap_t::render () 1348bgPixmap_t::render ()
1101{ 1349{
1102 unsigned long background_flags = 0; 1350 unsigned long background_flags = 0;
1103 1351
1104 if (target == NULL) 1352 if (target == NULL)
1105 return false; 1353 return false;
1106 1354
1107 TIMING_TEST_START (tp);
1108
1109 invalidate(); 1355 invalidate ();
1110# ifdef ENABLE_TRANSPARENCY 1356# ifdef ENABLE_TRANSPARENCY
1111 if (flags & isTransparent) 1357 if (flags & isTransparent)
1112 { 1358 {
1113 /* we need to re-generate transparency pixmap in that case ! */ 1359 /* we need to re-generate transparency pixmap in that case ! */
1114 background_flags = make_transparency_pixmap (); 1360 background_flags = make_transparency_pixmap ();
1115 if (background_flags == 0) 1361 if (background_flags == 0)
1116 return false; 1362 return false;
1117 else if ((background_flags & transpTransformations) == (flags & transpTransformations) 1363 else if ((background_flags & transpTransformations) == (flags & transpTransformations))
1118 && pmap_depth == target->depth)
1119 flags = flags & ~isInvalid; 1364 flags &= ~isInvalid;
1120 } 1365 }
1121# endif 1366# endif
1122 1367
1368# ifdef BG_IMAGE_FROM_FILE
1369 if (have_image
1370 || (background_flags & transpTransformations) != (flags & transpTransformations))
1371 {
1372 if (render_image (background_flags))
1373 flags &= ~isInvalid;
1374 }
1375# endif
1376
1377# if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1123 XImage *result = NULL; 1378 XImage *result = NULL;
1124# ifdef HAVE_AFTERIMAGE 1379
1125 if (original_asim 1380 if (background_flags && (flags & isInvalid))
1126 || (background_flags & transpTransformations) != (flags & transpTransformations)) 1381 {
1382 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1127 { 1383 }
1128 ASImage *background = NULL;
1129 ARGB32 as_tint = TINT_LEAVE_SAME;
1130 if (background_flags)
1131 background = pixmap2ximage (target->asv, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, 100);
1132 1384
1133# ifdef ENABLE_TRANSPARENCY 1385 if (result)
1386 {
1387 /* our own client-side tinting */
1134 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded)) 1388 if (!(background_flags & transpPmapTinted) && (flags & tintNeeded))
1135 { 1389 {
1136 ShadingInfo as_shade;
1137 as_shade.shading = (shade == 0) ? 100 : shade;
1138
1139 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC); 1390 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1140 if (flags & tintSet) 1391 if (flags & tintSet)
1141 tint.get (c); 1392 tint.get (c);
1142 as_shade.tintColor.red = c.r; 1393 ShadeXImage (DefaultVisual (target->dpy, target->display->screen), result, shade, c);
1143 as_shade.tintColor.green = c.g;
1144 as_shade.tintColor.blue = c.b;
1145
1146 as_tint = shading2tint32 (&as_shade);
1147 }
1148 if (!(background_flags & transpPmapBlured) && (flags & blurNeeded) && background != NULL)
1149 { 1394 }
1150 ASImage* tmp = blur_asimage_gauss (target->asv, background, h_blurRadius, v_blurRadius, 0xFFFFFFFF,
1151 (original_asim == NULL || tint == TINT_LEAVE_SAME)?ASA_XImage:ASA_ASImage,
1152 100, ASIMAGE_QUALITY_DEFAULT);
1153 if (tmp)
1154 {
1155 destroy_asimage (&background);
1156 background = tmp;
1157 }
1158 }
1159# endif
1160 1395
1161 if (render_asim (background, as_tint))
1162 flags = flags & ~isInvalid;
1163 if (background)
1164 destroy_asimage (&background);
1165 }
1166 else if (background_flags && pmap_depth != target->depth)
1167 {
1168 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1169 }
1170
1171# elif !XFT /* our own client-side tinting */
1172
1173 /* ATTENTION: We ASSUME that XFT will let us do all the tinting neccessary server-side.
1174 This may need to be changed in need_client_side_rendering() logic is altered !!! */
1175
1176 if (background_flags && (flags & isInvalid))
1177 {
1178 result = XGetImage (target->dpy, pixmap, 0, 0, pmap_width, pmap_height, AllPlanes, ZPixmap);
1179 if (result != NULL && !(background_flags & transpPmapTinted) && (flags & tintNeeded))
1180 {
1181 rgba c (rgba::MAX_CC,rgba::MAX_CC,rgba::MAX_CC);
1182 if (flags & tintSet)
1183 tint.get (c);
1184 ShadeXImage (target, result, shade, c.r, c.g, c.b);
1185 }
1186 }
1187# endif /* HAVE_AFTERIMAGE */
1188
1189 if (result)
1190 {
1191 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL); 1396 GC gc = XCreateGC (target->dpy, target->vt, 0UL, NULL);
1192 1397
1193 if (gc) 1398 if (gc)
1194 { 1399 {
1195 if (/*pmap_depth != target->depth &&*/ pixmap != None)
1196 {
1197 XFreePixmap (target->dpy, pixmap);
1198 pixmap = None;
1199 }
1200
1201 if (pixmap == None)
1202 {
1203 pixmap = XCreatePixmap (target->dpy, target->vt, result->width, result->height, target->depth);
1204 pmap_width = result->width;
1205 pmap_height = result->height;
1206 pmap_depth = target->depth;
1207 }
1208
1209 if (pmap_depth != result->depth)
1210 {
1211 /* Bad Match error will ensue ! stupid X !!!! */
1212 if (result->depth == 24 && pmap_depth == 32)
1213 result->depth = 32;
1214 else if (result->depth == 32 && pmap_depth == 24)
1215 result->depth = 24;
1216 else
1217 {
1218 /* TODO: implement image recoding */
1219 }
1220 }
1221
1222 if (pmap_depth == result->depth)
1223 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height); 1400 XPutImage (target->dpy, pixmap, gc, result, 0, 0, 0, 0, result->width, result->height);
1224 1401
1225 XFreeGC (target->dpy, gc); 1402 XFreeGC (target->dpy, gc);
1226 flags = flags & ~isInvalid; 1403 flags &= ~isInvalid;
1227 } 1404 }
1228 1405
1229 XDestroyImage (result); 1406 XDestroyImage (result);
1230 } 1407 }
1408# endif
1231 1409
1232 if (flags & isInvalid) 1410 if (flags & isInvalid)
1233 { 1411 {
1234 if (pixmap != None) 1412 if (pixmap != None)
1235 { 1413 {
… …
1238 } 1416 }
1239 } 1417 }
1240 1418
1241 apply (); 1419 apply ();
1242 1420
1243 TIMING_TEST_PRINT_RESULT (tp); 1421 valid_since = ev::now ();
1244 1422
1245 return true; 1423 return true;
1246} 1424}
1247 1425
1248bool 1426void
1249bgPixmap_t::set_target (rxvt_term *new_target) 1427bgPixmap_t::set_target (rxvt_term *new_target)
1250{ 1428{
1251 if (new_target)
1252 if (target != new_target)
1253 {
1254 target = new_target; 1429 target = new_target;
1255# ifdef ENABLE_TRANSPARENCY 1430
1256 root_depth = DefaultDepthOfScreen (ScreenOfDisplay (target->dpy, target->display->screen)); 1431 flags &= ~(HAS_RENDER | HAS_RENDER_CONV);
1432#if XRENDER
1433 int major, minor;
1434 if (XRenderQueryVersion (target->dpy, &major, &minor))
1435 flags |= HAS_RENDER;
1436 XFilters *filters = XRenderQueryFilters (target->dpy, target->vt);
1437 if (filters)
1438 {
1439 for (int i = 0; i < filters->nfilter; i++)
1440 if (!strcmp (filters->filter[i], FilterConvolution))
1441 flags |= HAS_RENDER_CONV;
1442
1443 XFree (filters);
1444 }
1257# endif 1445#endif
1258 return true;
1259 }
1260 return false;
1261} 1446}
1262 1447
1263void 1448void
1264bgPixmap_t::apply () 1449bgPixmap_t::apply ()
1265{ 1450{
1266 if (target) 1451 if (target == NULL)
1267 { 1452 return;
1268 flags &= ~isVtOrigin; 1453
1269 if (pixmap != None) 1454 if (pixmap != None)
1270 { 1455 {
1271 /* set target's background to pixmap */ 1456 /* set target's background to pixmap */
1272# ifdef ENABLE_TRANSPARENCY 1457# ifdef ENABLE_TRANSPARENCY
1273 if (flags & isTransparent) 1458 if (flags & isTransparent)
1274 { 1459 {
1275 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap); 1460 XSetWindowBackgroundPixmap (target->dpy, target->parent[0], pixmap);
1276 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative); 1461 XSetWindowBackgroundPixmap (target->dpy, target->vt, ParentRelative);
1277# if HAVE_SCROLLBARS 1462
1278 if (target->scrollBar.win) 1463 if (target->scrollBar.win)
1279 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative); 1464 XSetWindowBackgroundPixmap (target->dpy, target->scrollBar.win, ParentRelative);
1280# endif
1281 } 1465 }
1282 else 1466 else
1283# endif 1467# endif
1284 { 1468 {
1285 flags |= isVtOrigin;
1286 /* force old pixmap dereference in case it was transparent before :*/ 1469 /* force old pixmap dereference in case it was transparent before :*/
1287 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1288 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1289 /* do we also need to set scrollbar's background here ? */
1290# if HAVE_SCROLLBARS
1291 if (target->scrollBar.win)
1292 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1293# endif
1294 }
1295 }
1296 else
1297 {
1298 /* set target background to a pixel */
1299 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]); 1470 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1300 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]); 1471 XSetWindowBackgroundPixmap (target->dpy, target->vt, pixmap);
1301 /* do we also need to set scrollbar's background here ? */ 1472 /* do we also need to set scrollbar's background here ? */
1302# if HAVE_SCROLLBARS 1473
1303 if (target->scrollBar.win) 1474 if (target->scrollBar.win)
1304 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]); 1475 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1305# endif
1306 } 1476 }
1307 /* don't want Expose on the parent or vt. It is better to use 1477 }
1308 scr_touch or we get a great deal of flicker otherwise: */ 1478 else
1309 XClearWindow (target->dpy, target->parent[0]); 1479 {
1310 1480 /* set target background to a pixel */
1311# if HAVE_SCROLLBARS 1481 XSetWindowBackground (target->dpy, target->parent[0], target->pix_colors[Color_border]);
1482 XSetWindowBackground (target->dpy, target->vt, target->pix_colors[Color_bg]);
1483 /* do we also need to set scrollbar's background here ? */
1312 if (target->scrollBar.win) 1484 if (target->scrollBar.win)
1313 { 1485 XSetWindowBackground (target->dpy, target->scrollBar.win, target->pix_colors[Color_border]);
1314 target->scrollBar.setIdle (); 1486 }
1487
1488 /* don't want Expose on the parent or vt. It is better to use
1489 scr_touch or we get a great deal of flicker otherwise: */
1490 XClearWindow (target->dpy, target->parent[0]);
1491
1492 if (target->scrollBar.state && target->scrollBar.win)
1493 {
1494 target->scrollBar.state = STATE_IDLE;
1315 target->scrollbar_show (0); 1495 target->scrollBar.show (0);
1316 } 1496 }
1317# endif
1318 1497
1319 target->want_refresh = 1; 1498 target->want_refresh = 1;
1320 flags |= hasChanged; 1499 flags |= hasChanged;
1321 }
1322} 1500}
1323 1501
1324#endif /* HAVE_BG_PIXMAP */ 1502#endif /* HAVE_BG_PIXMAP */
1325 1503
1326#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) && !XFT 1504#if defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE)
1327/* taken from aterm-0.4.2 */ 1505/* taken from aterm-0.4.2 */
1328 1506
1329typedef uint32_t RUINT32T;
1330
1331static void 1507static void
1332ShadeXImage(rxvt_term *term, XImage* srcImage, int shade, int rm, int gm, int bm) 1508ShadeXImage(Visual *visual, XImage *srcImage, int shade, const rgba &c)
1333{ 1509{
1334 int sh_r, sh_g, sh_b; 1510 int sh_r, sh_g, sh_b;
1335 RUINT32T mask_r, mask_g, mask_b; 1511 uint32_t mask_r, mask_g, mask_b;
1336 RUINT32T *lookup, *lookup_r, *lookup_g, *lookup_b; 1512 uint32_t *lookup, *lookup_r, *lookup_g, *lookup_b;
1337 unsigned int lower_lim_r, lower_lim_g, lower_lim_b; 1513 rgba low;
1338 unsigned int upper_lim_r, upper_lim_g, upper_lim_b; 1514 rgba high;
1339 int i; 1515 int i;
1516 int host_byte_order = byteorder.big_endian () ? MSBFirst : LSBFirst;
1340 1517
1341 Visual *visual = term->visual;
1342
1343 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return ; 1518 if (visual->c_class != TrueColor || srcImage->format != ZPixmap) return;
1344
1345 if (shade == 0)
1346 shade = 100;
1347 1519
1348 /* for convenience */ 1520 /* for convenience */
1349 mask_r = visual->red_mask; 1521 mask_r = visual->red_mask;
1350 mask_g = visual->green_mask; 1522 mask_g = visual->green_mask;
1351 mask_b = visual->blue_mask; 1523 mask_b = visual->blue_mask;
1352 1524
1353 /* boring lookup table pre-initialization */ 1525 /* boring lookup table pre-initialization */
1354 switch (srcImage->bits_per_pixel) { 1526 switch (srcImage->depth)
1527 {
1355 case 15: 1528 case 15:
1356 if ((mask_r != 0x7c00) || 1529 if ((mask_r != 0x7c00) ||
1357 (mask_g != 0x03e0) || 1530 (mask_g != 0x03e0) ||
1358 (mask_b != 0x001f)) 1531 (mask_b != 0x001f))
1359 return; 1532 return;
1360 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+32+32)); 1533 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+32+32));
1361 lookup_r = lookup; 1534 lookup_r = lookup;
1362 lookup_g = lookup+32; 1535 lookup_g = lookup+32;
1363 lookup_b = lookup+32+32; 1536 lookup_b = lookup+32+32;
1364 sh_r = 10; 1537 sh_r = 10;
1365 sh_g = 5; 1538 sh_g = 5;
1366 sh_b = 0; 1539 sh_b = 0;
1367 break; 1540 break;
1368 case 16: 1541 case 16:
1369 if ((mask_r != 0xf800) || 1542 if ((mask_r != 0xf800) ||
1370 (mask_g != 0x07e0) || 1543 (mask_g != 0x07e0) ||
1371 (mask_b != 0x001f)) 1544 (mask_b != 0x001f))
1372 return; 1545 return;
1373 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(32+64+32)); 1546 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(32+64+32));
1374 lookup_r = lookup; 1547 lookup_r = lookup;
1375 lookup_g = lookup+32; 1548 lookup_g = lookup+32;
1376 lookup_b = lookup+32+64; 1549 lookup_b = lookup+32+64;
1377 sh_r = 11; 1550 sh_r = 11;
1378 sh_g = 5; 1551 sh_g = 5;
1379 sh_b = 0; 1552 sh_b = 0;
1380 break; 1553 break;
1381 case 24: 1554 case 24:
1382 if ((mask_r != 0xff0000) || 1555 if ((mask_r != 0xff0000) ||
1383 (mask_g != 0x00ff00) || 1556 (mask_g != 0x00ff00) ||
1384 (mask_b != 0x0000ff)) 1557 (mask_b != 0x0000ff))
1385 return; 1558 return;
1386 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1559 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1387 lookup_r = lookup; 1560 lookup_r = lookup;
1388 lookup_g = lookup+256; 1561 lookup_g = lookup+256;
1389 lookup_b = lookup+256+256; 1562 lookup_b = lookup+256+256;
1390 sh_r = 16; 1563 sh_r = 16;
1391 sh_g = 8; 1564 sh_g = 8;
1392 sh_b = 0; 1565 sh_b = 0;
1393 break; 1566 break;
1394 case 32: 1567 case 32:
1395 if ((mask_r != 0xff0000) || 1568 if ((mask_r != 0xff0000) ||
1396 (mask_g != 0x00ff00) || 1569 (mask_g != 0x00ff00) ||
1397 (mask_b != 0x0000ff)) 1570 (mask_b != 0x0000ff))
1398 return; 1571 return;
1399 lookup = (RUINT32T *) malloc (sizeof (RUINT32T)*(256+256+256)); 1572 lookup = (uint32_t *) malloc (sizeof (uint32_t)*(256+256+256));
1400 lookup_r = lookup; 1573 lookup_r = lookup;
1401 lookup_g = lookup+256; 1574 lookup_g = lookup+256;
1402 lookup_b = lookup+256+256; 1575 lookup_b = lookup+256+256;
1403 sh_r = 16; 1576 sh_r = 16;
1404 sh_g = 8; 1577 sh_g = 8;
1405 sh_b = 0; 1578 sh_b = 0;
1406 break; 1579 break;
1407 default: 1580 default:
1408 return; /* we do not support this color depth */ 1581 return; /* we do not support this color depth */
1409 } 1582 }
1410 1583
1411 /* prepare limits for color transformation (each channel is handled separately) */ 1584 /* prepare limits for color transformation (each channel is handled separately) */
1412 if (shade < 0) { 1585 if (shade > 100)
1586 {
1413 shade = -shade; 1587 shade = 200 - shade;
1414 if (shade < 0) shade = 0;
1415 if (shade > 100) shade = 100;
1416 1588
1417 lower_lim_r = 65535-rm; 1589 high.r = (65535 - c.r) * shade / 100;
1418 lower_lim_g = 65535-gm; 1590 high.g = (65535 - c.g) * shade / 100;
1419 lower_lim_b = 65535-bm; 1591 high.b = (65535 - c.b) * shade / 100;
1420 1592
1421 lower_lim_r = 65535-(unsigned int)(((RUINT32T)lower_lim_r)*((RUINT32T)shade)/100); 1593 low.r = 65535 - high.r;
1422 lower_lim_g = 65535-(unsigned int)(((RUINT32T)lower_lim_g)*((RUINT32T)shade)/100); 1594 low.g = 65535 - high.g;
1423 lower_lim_b = 65535-(unsigned int)(((RUINT32T)lower_lim_b)*((RUINT32T)shade)/100); 1595 low.b = 65535 - high.b;
1424
1425 upper_lim_r = upper_lim_g = upper_lim_b = 65535;
1426 } else {
1427 if (shade < 0) shade = 0;
1428 if (shade > 100) shade = 100;
1429
1430 lower_lim_r = lower_lim_g = lower_lim_b = 0;
1431
1432 upper_lim_r = (unsigned int)((((RUINT32T)rm)*((RUINT32T)shade))/100);
1433 upper_lim_g = (unsigned int)((((RUINT32T)gm)*((RUINT32T)shade))/100);
1434 upper_lim_b = (unsigned int)((((RUINT32T)bm)*((RUINT32T)shade))/100);
1435 } 1596 }
1436 1597 else
1437 /* switch red and blue bytes if necessary, we need it for some weird XServers like XFree86 3.3.3.1 */
1438 if ((srcImage->bits_per_pixel == 24) && (mask_r >= 0xFF0000 ))
1439 { 1598 {
1440 unsigned int tmp; 1599 high.r = c.r * shade / 100;
1600 high.g = c.g * shade / 100;
1601 high.b = c.b * shade / 100;
1441 1602
1442 tmp = lower_lim_r; 1603 low.r = low.g = low.b = 0;
1443 lower_lim_r = lower_lim_b;
1444 lower_lim_b = tmp;
1445
1446 tmp = upper_lim_r;
1447 upper_lim_r = upper_lim_b;
1448 upper_lim_b = tmp;
1449 } 1604 }
1450 1605
1451 /* fill our lookup tables */ 1606 /* fill our lookup tables */
1452 for (i = 0; i <= mask_r>>sh_r; i++) 1607 for (i = 0; i <= mask_r>>sh_r; i++)
1453 { 1608 {
1454 RUINT32T tmp; 1609 uint32_t tmp;
1455 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_r-lower_lim_r)); 1610 tmp = i * high.r;
1456 tmp += ((RUINT32T)(mask_r>>sh_r))*((RUINT32T)lower_lim_r); 1611 tmp += (mask_r>>sh_r) * low.r;
1457 lookup_r[i] = (tmp/65535)<<sh_r; 1612 lookup_r[i] = (tmp/65535)<<sh_r;
1458 } 1613 }
1459 for (i = 0; i <= mask_g>>sh_g; i++) 1614 for (i = 0; i <= mask_g>>sh_g; i++)
1460 { 1615 {
1461 RUINT32T tmp; 1616 uint32_t tmp;
1462 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_g-lower_lim_g)); 1617 tmp = i * high.g;
1463 tmp += ((RUINT32T)(mask_g>>sh_g))*((RUINT32T)lower_lim_g); 1618 tmp += (mask_g>>sh_g) * low.g;
1464 lookup_g[i] = (tmp/65535)<<sh_g; 1619 lookup_g[i] = (tmp/65535)<<sh_g;
1465 } 1620 }
1466 for (i = 0; i <= mask_b>>sh_b; i++) 1621 for (i = 0; i <= mask_b>>sh_b; i++)
1467 { 1622 {
1468 RUINT32T tmp; 1623 uint32_t tmp;
1469 tmp = ((RUINT32T)i)*((RUINT32T)(upper_lim_b-lower_lim_b)); 1624 tmp = i * high.b;
1470 tmp += ((RUINT32T)(mask_b>>sh_b))*((RUINT32T)lower_lim_b); 1625 tmp += (mask_b>>sh_b) * low.b;
1471 lookup_b[i] = (tmp/65535)<<sh_b; 1626 lookup_b[i] = (tmp/65535)<<sh_b;
1472 } 1627 }
1473 1628
1474 /* apply table to input image (replacing colors by newly calculated ones) */ 1629 /* apply table to input image (replacing colors by newly calculated ones) */
1475 switch (srcImage->bits_per_pixel) 1630 if (srcImage->bits_per_pixel == 32
1631 && (srcImage->depth == 24 || srcImage->depth == 32)
1632 && srcImage->byte_order == host_byte_order)
1476 { 1633 {
1477 case 15:
1478 {
1479 unsigned short *p1, *pf, *p, *pl; 1634 uint32_t *p1, *pf, *p, *pl;
1480 p1 = (unsigned short *) srcImage->data; 1635 p1 = (uint32_t *) srcImage->data;
1481 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line); 1636 pf = (uint32_t *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1637
1482 while (p1 < pf) 1638 while (p1 < pf)
1483 { 1639 {
1484 p = p1; 1640 p = p1;
1485 pl = p1 + srcImage->width; 1641 pl = p1 + srcImage->width;
1486 for (; p < pl; p++) 1642 for (; p < pl; p++)
1487 { 1643 {
1488 *p = lookup_r[(*p & 0x7c00)>>10] |
1489 lookup_g[(*p & 0x03e0)>> 5] |
1490 lookup_b[(*p & 0x001f)];
1491 }
1492 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1493 }
1494 break;
1495 }
1496 case 16:
1497 {
1498 unsigned short *p1, *pf, *p, *pl;
1499 p1 = (unsigned short *) srcImage->data;
1500 pf = (unsigned short *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1501 while (p1 < pf)
1502 {
1503 p = p1;
1504 pl = p1 + srcImage->width;
1505 for (; p < pl; p++)
1506 {
1507 *p = lookup_r[(*p & 0xf800)>>11] |
1508 lookup_g[(*p & 0x07e0)>> 5] |
1509 lookup_b[(*p & 0x001f)];
1510 }
1511 p1 = (unsigned short *) ((char *) p1 + srcImage->bytes_per_line);
1512 }
1513 break;
1514 }
1515 case 24:
1516 {
1517 unsigned char *p1, *pf, *p, *pl;
1518 p1 = (unsigned char *) srcImage->data;
1519 pf = (unsigned char *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1520 while (p1 < pf)
1521 {
1522 p = p1;
1523 pl = p1 + srcImage->width * 3;
1524 for (; p < pl; p += 3)
1525 {
1526 p[0] = lookup_r[(p[0] & 0xff0000)>>16];
1527 p[1] = lookup_r[(p[1] & 0x00ff00)>> 8];
1528 p[2] = lookup_r[(p[2] & 0x0000ff)];
1529 }
1530 p1 = (unsigned char *) ((char *) p1 + srcImage->bytes_per_line);
1531 }
1532 break;
1533 }
1534 case 32:
1535 {
1536 RUINT32T *p1, *pf, *p, *pl;
1537 p1 = (RUINT32T *) srcImage->data;
1538 pf = (RUINT32T *) (srcImage->data + srcImage->height * srcImage->bytes_per_line);
1539
1540 while (p1 < pf)
1541 {
1542 p = p1;
1543 pl = p1 + srcImage->width;
1544 for (; p < pl; p++)
1545 {
1546 *p = lookup_r[(*p & 0xff0000)>>16] | 1644 *p = lookup_r[(*p & 0xff0000) >> 16] |
1547 lookup_g[(*p & 0x00ff00)>> 8] | 1645 lookup_g[(*p & 0x00ff00) >> 8] |
1548 lookup_b[(*p & 0x0000ff)] | 1646 lookup_b[(*p & 0x0000ff)] |
1549 (*p & ~0xffffff); 1647 (*p & 0xff000000);
1648 }
1649 p1 = (uint32_t *) ((char *) p1 + srcImage->bytes_per_line);
1650 }
1651 }
1652 else
1653 {
1654 for (int y = 0; y < srcImage->height; y++)
1655 for (int x = 0; x < srcImage->width; x++)
1656 {
1657 unsigned long pixel = XGetPixel (srcImage, x, y);
1658 pixel = lookup_r[(pixel & mask_r) >> sh_r] |
1659 lookup_g[(pixel & mask_g) >> sh_g] |
1660 lookup_b[(pixel & mask_b) >> sh_b];
1661 XPutPixel (srcImage, x, y, pixel);
1550 } 1662 }
1551 p1 = (RUINT32T *) ((char *) p1 + srcImage->bytes_per_line);
1552 } 1663 }
1553 break;
1554 }
1555 }
1556 1664
1557 free (lookup); 1665 free (lookup);
1558} 1666}
1559#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */ 1667#endif /* defined(ENABLE_TRANSPARENCY) && !defined(HAVE_AFTERIMAGE) */

Diff Legend

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