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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines