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.50 by sf-exg, Tue Aug 31 15:14:06 2010 UTC vs.
Revision 1.140 by sf-exg, Sun Jan 23 12:28:47 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines