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.97 by sf-exg, Fri Oct 22 18:03:10 2010 UTC vs.
Revision 1.188 by sf-exg, Thu Dec 29 12:25:50 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines