ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/rxvtimg.C
(Generate patch)

Comparing rxvt-unicode/src/rxvtimg.C (file contents):
Revision 1.32 by root, Thu Jun 7 07:53:12 2012 UTC vs.
Revision 1.48 by root, Thu Jun 7 19:24:02 2012 UTC

… …
2#include "../config.h" 2#include "../config.h"
3#include "rxvt.h" 3#include "rxvt.h"
4 4
5#if HAVE_IMG 5#if HAVE_IMG
6 6
7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 7rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
8: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), 8: s(screen), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
9 pm(0), refcnt(0) 9 pm(0), ref(0)
10{ 10{
11} 11}
12 12
13rxvt_img::rxvt_img (const rxvt_img &img) 13rxvt_img::rxvt_img (const rxvt_img &img)
14: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), refcnt(img.refcnt) 14: s(img.s), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
15{ 15{
16 if (refcnt)
17 ++*refcnt; 16 ++ref->cnt;
18} 17}
19 18
20#if 0 19#if 0
21rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap) 20rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap)
22: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap) 21: s(screen), x(0), y(0), w(width), h(height), format(format), repeat(RepeatNormal), shared(false), pm(pixmap)
… …
44 return 0; 43 return 0;
45 44
46 rxvt_img *img = new rxvt_img ( 45 rxvt_img *img = new rxvt_img (
47 s, 46 s,
48 XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)), 47 XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
48 0,
49 0,
49 root_pm_w, 50 root_pm_w,
50 root_pm_h 51 root_pm_h
51 ); 52 );
52 53
53 img->pm = root_pixmap; 54 img->pm = root_pixmap;
55 img->ref = new pixref (root_pm_w, root_pm_h);
56 img->ref->ours = false;
57
58 return img;
59}
60
61rxvt_img *
62rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
63{
64 Display *dpy = s->display->dpy;
65
66 int width = gdk_pixbuf_get_width (pb);
67 int height = gdk_pixbuf_get_height (pb);
68
69 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
70 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
71
72 // since we require rgb24/argb32 formats from xrender we assume
73 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
74 int depth = gdk_pixbuf_get_has_alpha (pb) ? 32 : 24;
75
76 XImage xi;
77
78 xi.width = width;
79 xi.height = height;
80 xi.xoffset = 0;
81 xi.format = ZPixmap;
82 xi.byte_order = MSBFirst; // maybe go for host byte order, because servers are usually local?
83 xi.bitmap_unit = 32;
84 xi.bitmap_bit_order = MSBFirst;
85 xi.bitmap_pad = BitmapPad (dpy);
86 xi.depth = depth;
87 xi.bytes_per_line = 0;
88 xi.bits_per_pixel = 32;
89 xi.red_mask = 0x00ff0000;
90 xi.green_mask = 0x0000ff00;
91 xi.blue_mask = 0x000000ff;
92
93 if (!XInitImage (&xi))
94 rxvt_fatal ("unable to initialise ximage, please report.\n");
95
96 if (height > INT_MAX / xi.bytes_per_line)
97 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
98
99 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
100
101 int rowstride = gdk_pixbuf_get_rowstride (pb);
102
103 assert (3 + (depth == 32) == gdk_pixbuf_get_n_channels (pb));
104 unsigned char *row = gdk_pixbuf_get_pixels (pb);
105 char *line = xi.data;
106
107 for (int y = 0; y < height; y++)
108 {
109 unsigned char r, g, b, a;
110 unsigned char *data = row;
111
112 if (depth == 24)
113 for (int x = 0; x < width; x++)
114 {
115 asm volatile("nop");
116 r = *data++;
117 g = *data++;
118 b = *data++;
119 *line++ = 0;
120 *line++ = r;
121 *line++ = g;
122 *line++ = b;
123 asm volatile("nop");
124 }
125 else
126 for (int x = 0; x < width; x++)
127 {
128 uint32_t v = *(uint32_t *)data; data += 4;
129 v = ecb_big_endian () ? ecb_rotr32 (v, 8) : ecb_rotl32 (v, 8);
130 *(uint32_t *)line = x; line += 4;
131 }
132
133 row += rowstride;
134 }
135
136 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, depth == 24 ? PictStandardRGB24 : PictStandardARGB32), 0, 0, width, height);
137 img->alloc ();
138
139 GC gc = XCreateGC (dpy, img->pm, 0, 0);
140 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
141 XFreeGC (dpy, gc);
142
143 free (xi.data);
54 144
55 return img; 145 return img;
56} 146}
57 147
58rxvt_img * 148rxvt_img *
… …
62 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 152 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
63 153
64 if (!pb) 154 if (!pb)
65 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 155 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
66 156
67 rxvt_img *img = new rxvt_img ( 157 rxvt_img *img = new_from_pixbuf (s, pb);
68 s,
69 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
70 gdk_pixbuf_get_width (pb),
71 gdk_pixbuf_get_height (pb)
72 );
73 img->alloc ();
74 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0);
75 158
76 g_object_unref (pb); 159 g_object_unref (pb);
77 160
78 return img; 161 return img;
79} 162}
80 163
81void 164void
82rxvt_img::destroy () 165rxvt_img::destroy ()
83{ 166{
84 if (!refcnt || --*refcnt) 167 if (--ref->cnt)
85 return; 168 return;
86 169
87 if (pm) 170 if (pm && ref->ours)
88 XFreePixmap (s->display->dpy, pm); 171 XFreePixmap (s->display->dpy, pm);
89 172
90 delete refcnt; 173 delete ref;
91} 174}
92 175
93rxvt_img::~rxvt_img () 176rxvt_img::~rxvt_img ()
94{ 177{
95 destroy (); 178 destroy ();
… …
97 180
98void 181void
99rxvt_img::alloc () 182rxvt_img::alloc ()
100{ 183{
101 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 184 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
102 refcnt = new int (1); 185 ref = new pixref (w, h);
186}
187
188Picture
189rxvt_img::src_picture ()
190{
191 Display *dpy = s->display->dpy;
192
193 XRenderPictureAttributes pa;
194 pa.repeat = repeat;
195 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
196
197 return pic;
103} 198}
104 199
105void 200void
106rxvt_img::unshare () 201rxvt_img::unshare ()
107{ 202{
108 if (refcnt && *refcnt == 1) 203 if (ref->cnt == 1 && ref->ours)
109 return; 204 return;
110 205
206 //TODO: maybe should reify instead
111 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 207 Pixmap pm2 = XCreatePixmap (s->display->dpy, s->display->root, ref->w, ref->h, format->depth);
112 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 208 GC gc = XCreateGC (s->display->dpy, pm, 0, 0);
113 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, w, h, 0, 0); 209 XCopyArea (s->display->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
114 XFreeGC (s->display->dpy, gc); 210 XFreeGC (s->display->dpy, gc);
115 211
116 destroy (); 212 destroy ();
117 213
118 pm = pm2; 214 pm = pm2;
119 refcnt = new int (1); 215 ref = new pixref (ref->w, ref->h);
120} 216}
121 217
122void 218void
123rxvt_img::fill (const rxvt_color &c) 219rxvt_img::fill (const rxvt_color &c)
124{ 220{
… …
158 254
159 Display *dpy = s->display->dpy; 255 Display *dpy = s->display->dpy;
160 int size = max (rh, rv) * 2 + 1; 256 int size = max (rh, rv) * 2 + 1;
161 double *kernel = (double *)malloc (size * sizeof (double)); 257 double *kernel = (double *)malloc (size * sizeof (double));
162 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 258 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
163 rxvt_img *img = new rxvt_img (s, format, w, h); 259 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
164 img->alloc (); 260 img->alloc ();
165 261
262 Picture src = src_picture ();
263
166 XRenderPictureAttributes pa; 264 XRenderPictureAttributes pa;
167
168 pa.repeat = RepeatPad; 265 pa.repeat = RepeatPad;
169 Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa);
170 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 266 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa);
171 267
172 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 268 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
173 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 269 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
174 XFreePixmap (dpy, tmp_pm); 270 XFreePixmap (dpy, tmp_pm);
… …
270 366
271 XRenderFreePicture (dpy, src); 367 XRenderFreePicture (dpy, src);
272 XRenderFreePicture (dpy, dst); 368 XRenderFreePicture (dpy, dst);
273} 369}
274 370
275bool 371rxvt_img *
276rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y) 372rxvt_img::clone ()
277{ 373{
278 Display *dpy = s->display->dpy; 374 return new rxvt_img (*this);
375}
279 376
280 if (s->visual->c_class != TrueColor) 377static XRenderPictFormat *
378find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
379{
380 if (format->direct.alphaMask)
381 return format; // already has alpha
382
383 // try to find a suitable alpha format, one bit alpha is enough for our purposes
384 if (format->type == PictTypeDirect)
385 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
386 if (f->direct.alphaMask
387 && f->type == PictTypeDirect
388 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
389 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
390 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
281 return false; 391 return f;
282 392
283 uint32_t red_mask, green_mask, blue_mask, alpha_mask; 393 // should be a very good fallback
394 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
395}
284 396
285 red_mask = (uint32_t)format->direct.redMask << format->direct.red; 397rxvt_img *
286 green_mask = (uint32_t)format->direct.greenMask << format->direct.green; 398rxvt_img::reify ()
287 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue; 399{
288 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha; 400 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
289
290 int width_r = ecb_popcount32 (red_mask);
291 int width_g = ecb_popcount32 (green_mask);
292 int width_b = ecb_popcount32 (blue_mask);
293 int width_a = ecb_popcount32 (alpha_mask);
294
295 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
296 return false; 401 return clone ();
297 402
298 int sh_r = ecb_ctz32 (red_mask); 403 Display *dpy = s->display->dpy;
299 int sh_g = ecb_ctz32 (green_mask);
300 int sh_b = ecb_ctz32 (blue_mask);
301 int sh_a = ecb_ctz32 (alpha_mask);
302 404
303 if (width > 32767 || height > 32767) 405 bool alpha = !format->direct.alphaMask
304 return false; 406 && (x || y)
407 && repeat == RepeatNone;
305 408
306 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0, 409 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
307 width, height, 32, 0); 410 img->alloc ();
308 if (!ximage)
309 return false;
310 411
311 if (height > INT_MAX / ximage->bytes_per_line 412 Picture src = src_picture ();
312 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line))) 413 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
414
415 if (alpha)
313 { 416 {
314 XDestroyImage (ximage); 417 XRenderColor rc = { 0, 0, 0, 0 };
315 return false; 418 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
419 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h);
316 } 420 }
421 else
422 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h);
317 423
318 GC gc = XCreateGC (dpy, pm, 0, 0); 424 XRenderFreePicture (dpy, src);
425 XRenderFreePicture (dpy, dst);
319 426
320 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst; 427 return img;
428}
321 429
322 int rowstride = gdk_pixbuf_get_rowstride (pixbuf); 430rxvt_img *
323 int channels = gdk_pixbuf_get_n_channels (pixbuf); 431rxvt_img::sub_rect (int x, int y, int width, int height)
324 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels; 432{
325 char *line = ximage->data; 433 rxvt_img *img = clone ();
326 434
327 for (int y = 0; y < height; y++) 435 img->x += x;
436 img->y += y;
437
438 if (w != width || h != height)
328 { 439 {
329 for (int x = 0; x < width; x++) 440 img->w = width;
330 { 441 img->h = height;
331 unsigned char *pixel = row + x * channels;
332 uint32_t value;
333 unsigned char r, g, b, a;
334 442
335 if (channels == 4) 443 rxvt_img *img2 = img->reify ();
336 { 444 delete img;
337 a = pixel[3]; 445 img = img2;
338 r = pixel[0] * a / 0xff;
339 g = pixel[1] * a / 0xff;
340 b = pixel[2] * a / 0xff;
341 }
342 else
343 {
344 a = 0xff;
345 r = pixel[0];
346 g = pixel[1];
347 b = pixel[2];
348 }
349
350 value = ((r >> (8 - width_r)) << sh_r)
351 | ((g >> (8 - width_g)) << sh_g)
352 | ((b >> (8 - width_b)) << sh_b)
353 | ((a >> (8 - width_a)) << sh_a);
354
355 if (ximage->bits_per_pixel == 32)
356 ((uint32_t *)line)[x] = value;
357 else
358 XPutPixel (ximage, x, y, value);
359 }
360
361 row += rowstride;
362 line += ximage->bytes_per_line;
363 } 446 }
364 447
365 XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height); 448 return img;
366 XDestroyImage (ximage);
367 XFreeGC (dpy, gc);
368
369 return true;
370} 449}
371 450
372rxvt_img * 451rxvt_img *
373rxvt_img::clone () 452rxvt_img::transform (int new_width, int new_height, double matrix[9])
374{ 453{
375 return new rxvt_img (*this);
376}
377
378rxvt_img *
379rxvt_img::sub_rect (int x, int y, int width, int height)
380{
381 rxvt_img *img = new rxvt_img (s, format, width, height); 454 rxvt_img *img = new rxvt_img (s, format, 0, 0, new_width, new_height, repeat);
382 img->alloc (); 455 img->alloc ();
383 456
384 Display *dpy = s->display->dpy; 457 Display *dpy = s->display->dpy;
385 XRenderPictureAttributes pa; 458 Picture src = src_picture ();
386 pa.repeat = repeat;
387 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
388 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 459 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
389
390 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);
391
392 XRenderFreePicture (dpy, src);
393 XRenderFreePicture (dpy, dst);
394
395 return img;
396}
397
398rxvt_img *
399rxvt_img::transform (int new_width, int new_height, double matrix[9])
400{
401 rxvt_img *img = new rxvt_img (s, format, new_width, new_height);
402 img->alloc ();
403
404 Display *dpy = s->display->dpy;
405 XRenderPictureAttributes pa;
406 pa.repeat = repeat;
407 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
408 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
409 460
410 XTransform xfrm; 461 XTransform xfrm;
411 462
412 for (int i = 0; i < 3; ++i) 463 for (int i = 0; i < 3; ++i)
413 for (int j = 0; j < 3; ++j) 464 for (int j = 0; j < 3; ++j)
414 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 465 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]);
415 466
467#if 0
468 xfrm.matrix [0][2] -= XDoubleToFixed (x);//TODO
469 xfrm.matrix [1][2] -= XDoubleToFixed (y);
470#endif
471
416 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 472 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
417 XRenderSetPictureTransform (dpy, src, &xfrm); 473 XRenderSetPictureTransform (dpy, src, &xfrm);
418 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 474 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height);
419 475
420 XRenderFreePicture (dpy, src); 476 XRenderFreePicture (dpy, src);
… …
424} 480}
425 481
426rxvt_img * 482rxvt_img *
427rxvt_img::scale (int new_width, int new_height) 483rxvt_img::scale (int new_width, int new_height)
428{ 484{
485 if (w == new_width && h == new_height)
486 return clone ();
487
429 double matrix[9] = { 488 double matrix[9] = {
430 w / (double)new_width, 0, 0, 489 w / (double)new_width, 0, 0,
431 0, h / (double)new_height, 0, 490 0, h / (double)new_height, 0,
432 0, 0, 1 491 0, 0, 1
433 }; 492 };
434 493
494 int old_repeat_mode = repeat;
495 repeat = RepeatPad; // not right, but xrender can't proeprly scale it seems
496
435 return transform (new_width, new_height, matrix); 497 rxvt_img *img = transform (new_width, new_height, matrix);
498
499 repeat = old_repeat_mode;
500 img->repeat = repeat;
501
502 return img;
436} 503}
437 504
438rxvt_img * 505rxvt_img *
439rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi) 506rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi)
440{ 507{
… …
449 516
450 return transform (new_width, new_height, matrix); 517 return transform (new_width, new_height, matrix);
451} 518}
452 519
453rxvt_img * 520rxvt_img *
454rxvt_img::convert_to (XRenderPictFormat *new_format, const rxvt_color &bg) 521rxvt_img::convert_format (XRenderPictFormat *new_format, const rxvt_color &bg)
455{ 522{
456 if (new_format == format) 523 if (new_format == format)
457 return clone (); 524 return clone ();
458 525
459 rxvt_img *img = new rxvt_img (s, new_format, w, h); 526 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
460 img->alloc (); 527 img->alloc ();
461 528
462 Display *dpy = s->display->dpy; 529 Display *dpy = s->display->dpy;
463 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0); 530 Picture src = src_picture ();
464 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 531 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
465 int op = PictOpSrc; 532 int op = PictOpSrc;
466 533
467 if (format->direct.alphaMask && !new_format->direct.alphaMask) 534 if (format->direct.alphaMask && !new_format->direct.alphaMask)
468 { 535 {
… …
487rxvt_img * 554rxvt_img *
488rxvt_img::blend (rxvt_img *img, double factor) 555rxvt_img::blend (rxvt_img *img, double factor)
489{ 556{
490 rxvt_img *img2 = clone (); 557 rxvt_img *img2 = clone ();
491 Display *dpy = s->display->dpy; 558 Display *dpy = s->display->dpy;
492 Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 559 Picture src = img->src_picture ();
493 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 560 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
494 Picture mask = create_xrender_mask (dpy, img->pm, False); 561 Picture mask = create_xrender_mask (dpy, img->pm, False);
495 562
496 XRenderColor mask_c; 563 XRenderColor mask_c;
497 564

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines