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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines