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.14 by root, Mon Nov 19 15:33:34 2007 UTC vs.
Revision 1.121 by sf-exg, Fri Nov 19 23:29:30 2010 UTC

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