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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines