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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines