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.29 by root, Tue Jan 29 17:52:52 2008 UTC vs.
Revision 1.137 by sf-exg, Sat Jan 15 17:41:43 2011 UTC

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

Diff Legend

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