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.4 by ayin, Fri Sep 14 09:38:33 2007 UTC vs.
Revision 1.125 by sf-exg, Tue Nov 23 18:31:13 2010 UTC

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

Diff Legend

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