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.83 by root, Thu Jun 14 18:06:15 2012 UTC vs.
Revision 1.93 by root, Fri Jun 15 18:07:24 2012 UTC

1#include <string.h>
1#include <math.h> 2#include <math.h>
2#include "../config.h" 3#include "../config.h"
3#include "rxvt.h" 4#include "rxvt.h"
4 5
5#if HAVE_IMG 6#if HAVE_IMG
7
8typedef rxvt_img::nv nv;
9
10namespace
11{
12
13 struct mat3x3
14 {
15 nv v[3][3];
16
17 mat3x3 ()
18 {
19 }
20
21 mat3x3 (nv matrix[3][3])
22 {
23 memcpy (v, matrix, sizeof (v));
24 }
25
26 mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
27 {
28 v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
29 v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
30 v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
31 }
32
33 mat3x3 invert ();
34
35 nv *operator [](int i) { return &v[i][0]; }
36 const nv *operator [](int i) const { return &v[i][0]; }
37
38 // quite inefficient, hopefully gcc pulls the w calc out of any loops
39 nv apply1 (int i, nv x, nv y)
40 {
41 mat3x3 &m = *this;
42
43 nv v = m[i][0] * x + m[i][1] * y + m[i][2];
44 nv w = m[2][0] * x + m[2][1] * y + m[2][2];
45
46 return v * (1. / w);
47 }
48
49 static mat3x3 translate (nv x, nv y);
50 };
51
52 mat3x3
53 mat3x3::invert ()
54 {
55 mat3x3 &m = *this;
56 mat3x3 inv;
57
58 nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
59 nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
60 nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
61
62 nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
63
64 inv[0][0] = invdet * s0;
65 inv[0][1] = invdet * s1;
66 inv[0][2] = invdet * s2;
67
68 inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
69 inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
70 inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
71
72 inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
73 inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
74 inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
75
76 return inv;
77 }
78
79 static mat3x3
80 operator *(const mat3x3 &a, const mat3x3 &b)
81 {
82 mat3x3 r;
83
84 for (int i = 0; i < 3; ++i)
85 for (int j = 0; j < 3; ++j)
86 r[i][j] = a[i][0] * b[0][j]
87 + a[i][1] * b[1][j]
88 + a[i][2] * b[2][j];
89
90 return r;
91 }
92
93 mat3x3
94 mat3x3::translate (nv x, nv y)
95 {
96 return mat3x3 (
97 1, 0, x,
98 0, 1, y,
99 0, 0, 1
100 );
101 }
102
103}
104
105#if 0
106struct pict
107{
108 Display *dpy;
109 Picture pic;
110
111 operator Picture () const
112 {
113 return pic;
114 }
115
116 pict ()
117 : pic (0)
118 {
119 }
120
121 pict (rxvt_img *img, XRenderPictFormat *format = 0)
122 : dpy (img->s->display->dpy)
123 {
124 XRenderPictureAttributes pa;
125 pa.repeat = img->repeat;
126 pic = XRenderCreatePicture (dpy, img->pm, format ? format : img->format, CPRepeat, &pa);
127 }
128
129 ~pict ()
130 {
131 if (pic)
132 XRenderFreePicture (dpy, pic);
133 }
134};
135#endif
6 136
7static XRenderPictFormat * 137static XRenderPictFormat *
8find_alpha_format_for (Display *dpy, XRenderPictFormat *format) 138find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
9{ 139{
10 if (format->direct.alphaMask) 140 if (format->direct.alphaMask)
… …
215 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth); 345 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
216 ref = new pixref (w, h); 346 ref = new pixref (w, h);
217} 347}
218 348
219Picture 349Picture
220rxvt_img::src_picture () 350rxvt_img::picture ()
221{ 351{
222 Display *dpy = s->display->dpy; 352 Display *dpy = s->display->dpy;
223 353
224 XRenderPictureAttributes pa; 354 XRenderPictureAttributes pa;
225 pa.repeat = repeat; 355 pa.repeat = repeat;
… …
249rxvt_img::fill (const rgba &c) 379rxvt_img::fill (const rgba &c)
250{ 380{
251 XRenderColor rc = { c.r, c.g, c.b, c.a }; 381 XRenderColor rc = { c.r, c.g, c.b, c.a };
252 382
253 Display *dpy = s->display->dpy; 383 Display *dpy = s->display->dpy;
254 Picture src = src_picture (); 384 Picture src = picture ();
255 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h); 385 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, 0, 0, w, h);
256 XRenderFreePicture (dpy, src); 386 XRenderFreePicture (dpy, src);
257} 387}
258 388
259void 389void
… …
265 Display *dpy = s->display->dpy; 395 Display *dpy = s->display->dpy;
266 396
267 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat); 397 rxvt_img *img = new rxvt_img (s, find_alpha_format_for (dpy, format), x, y, w, h, repeat);
268 img->alloc (); 398 img->alloc ();
269 399
270 Picture src = src_picture (); 400 Picture src = picture ();
271 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 401 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
272 402
273 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 403 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
274 404
275 XRenderFreePicture (dpy, src); 405 XRenderFreePicture (dpy, src);
… …
280 410
281 delete img; 411 delete img;
282} 412}
283 413
284static void 414static void
285get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 415get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
286{ 416{
287 double sigma = radius / 2.0; 417 nv sigma = radius / 2.0;
288 double scale = sqrt (2.0 * M_PI) * sigma; 418 nv scale = sqrt (2.0 * M_PI) * sigma;
289 double sum = 0.0; 419 nv sum = 0.0;
290 420
291 for (int i = 0; i < width; i++) 421 for (int i = 0; i < width; i++)
292 { 422 {
293 double x = i - width / 2; 423 nv x = i - width / 2;
294 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 424 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
295 sum += kernel[i]; 425 sum += kernel[i];
296 } 426 }
297 427
298 params[0] = XDoubleToFixed (width); 428 params[0] = XDoubleToFixed (width);
… …
308 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 438 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV))
309 return clone (); 439 return clone ();
310 440
311 Display *dpy = s->display->dpy; 441 Display *dpy = s->display->dpy;
312 int size = max (rh, rv) * 2 + 1; 442 int size = max (rh, rv) * 2 + 1;
313 double *kernel = (double *)malloc (size * sizeof (double)); 443 nv *kernel = (nv *)malloc (size * sizeof (nv));
314 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 444 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed));
315 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat); 445 rxvt_img *img = new rxvt_img (s, format, x, y, w, h, repeat);
316 img->alloc (); 446 img->alloc ();
317 447
318 XRenderPictureAttributes pa; 448 XRenderPictureAttributes pa;
… …
449 g = (g * (a >> 8)) >> 8; 579 g = (g * (a >> 8)) >> 8;
450 b = (b * (a >> 8)) >> 8; 580 b = (b * (a >> 8)) >> 8;
451 581
452 Display *dpy = s->display->dpy; 582 Display *dpy = s->display->dpy;
453 583
454 Picture src = src_picture (); 584 Picture src = picture ();
455 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0); 585 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
456 Picture mul = create_xrender_mask (dpy, pm, True, True); 586 Picture mul = create_xrender_mask (dpy, pm, True, True);
457 587
458 //TODO: this operator does not yet implement some useful contrast 588 //TODO: this operator does not yet implement some useful contrast
459 while (r | g | b | a) 589 while (r | g | b | a)
… …
476 ::swap (img->pm , pm ); 606 ::swap (img->pm , pm );
477 607
478 delete img; 608 delete img;
479} 609}
480 610
611void
612rxvt_img::draw (rxvt_img *img, int op, nv mask)
613{
614 unshare ();
615
616 Display *dpy = s->display->dpy;
617 Picture src = img->picture ();
618 Picture dst = picture ();
619 Picture mask_p = 0;
620
621 if (mask != 1.)
622 {
623 mask_p = create_xrender_mask (dpy, img->pm, False, False);
624 XRenderColor mask_c = { 0, 0, 0, float_to_component (mask) };
625 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1);
626 }
627
628 XRenderComposite (dpy, op, src, mask_p, dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
629
630 XRenderFreePicture (dpy, src);
631 XRenderFreePicture (dpy, dst);
632
633 if (mask_p)
634 XRenderFreePicture (dpy, mask_p);
635}
636
481rxvt_img * 637rxvt_img *
482rxvt_img::clone () 638rxvt_img::clone ()
483{ 639{
484 return new rxvt_img (*this); 640 return new rxvt_img (*this);
485} 641}
… …
498 && repeat == RepeatNone; // and we have no good pixels to fill with 654 && repeat == RepeatNone; // and we have no good pixels to fill with
499 655
500 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat); 656 rxvt_img *img = new rxvt_img (s, alpha ? find_alpha_format_for (dpy, format) : format, 0, 0, w, h, repeat);
501 img->alloc (); 657 img->alloc ();
502 658
503 Picture src = src_picture (); 659 Picture src = picture ();
504 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 660 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
505 661
506 if (alpha) 662 if (alpha)
507 { 663 {
508 XRenderColor rc = { 0, 0, 0, 0 }; 664 XRenderColor rc = { 0, 0, 0, 0 };
509 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles 665 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
510 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, -x, -y, ref->w, ref->h); 666 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
511 } 667 }
512 else 668 else
513 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, w, h); 669 XRenderComposite (dpy, PictOpSrc, src, None, dst, -x, -y, 0, 0, 0, 0, w, h);
514 670
515 XRenderFreePicture (dpy, src); 671 XRenderFreePicture (dpy, src);
516 XRenderFreePicture (dpy, dst); 672 XRenderFreePicture (dpy, dst);
517 673
518 return img; 674 return img;
… …
521rxvt_img * 677rxvt_img *
522rxvt_img::sub_rect (int x, int y, int width, int height) 678rxvt_img::sub_rect (int x, int y, int width, int height)
523{ 679{
524 rxvt_img *img = clone (); 680 rxvt_img *img = clone ();
525 681
526 img->x += x; 682 img->x -= x;
527 img->y += y; 683 img->y -= y;
528 684
529 if (w != width || h != height) 685 if (w != width || h != height)
530 { 686 {
531 img->w = width; 687 img->w = width;
532 img->h = height; 688 img->h = height;
… …
537 } 693 }
538 694
539 return img; 695 return img;
540} 696}
541 697
542static void
543mat_invert (double mat[3][3], double (&inv)[3][3])
544{
545 double s0 = mat [2][2] * mat [1][1] - mat [2][1] * mat [1][2];
546 double s1 = mat [2][1] * mat [0][2] - mat [2][2] * mat [0][1];
547 double s2 = mat [1][2] * mat [0][1] - mat [1][1] * mat [0][2];
548
549 double invdet = 1. / (mat [0][0] * s0 + mat [1][0] * s1 + mat [2][0] * s2);
550
551 inv [0][0] = invdet * s0;
552 inv [0][1] = invdet * s1;
553 inv [0][2] = invdet * s2;
554
555 inv [1][0] = invdet * (mat [2][0] * mat [1][2] - mat [2][2] * mat [1][0]);
556 inv [1][1] = invdet * (mat [2][2] * mat [0][0] - mat [2][0] * mat [0][2]);
557 inv [1][2] = invdet * (mat [1][0] * mat [0][2] - mat [1][2] * mat [0][0]);
558
559 inv [2][0] = invdet * (mat [2][1] * mat [1][0] - mat [2][0] * mat [1][1]);
560 inv [2][1] = invdet * (mat [2][0] * mat [0][1] - mat [2][1] * mat [0][0]);
561 inv [2][2] = invdet * (mat [1][1] * mat [0][0] - mat [1][0] * mat [0][1]);
562}
563
564static double
565mat_apply (double mat[3][3], int i, double x, double y)
566{
567 double v = mat [i][0] * x + mat [i][1] * y + mat [i][2];
568 double w = mat [2][0] * x + mat [2][1] * y + mat [2][2];
569
570 return v * (1. / w);
571}
572
573rxvt_img * 698rxvt_img *
574rxvt_img::transform (double matrix[3][3]) 699rxvt_img::transform (nv matrix[3][3])
575{ 700{
576 // find new offset
577 int ox = mat_apply (matrix, 0, x, y);
578 int oy = mat_apply (matrix, 1, x, y);
579
580 // calculate new pixel bounding box coordinates 701 // calculate new pixel bounding box coordinates
581 double d [2], rmin[2], rmax[2]; 702 nv r[2], rmin[2], rmax[2];
703
704 mat3x3 m (matrix);
582 705
583 for (int i = 0; i < 2; ++i) 706 for (int i = 0; i < 2; ++i)
584 { 707 {
585 double v; 708 nv v;
709
586 v = mat_apply (matrix, i, 0, 0); rmin [i] = rmax [i] = v; d [i] = v; 710 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v; r [i] = v;
587 v = mat_apply (matrix, i, w, 0); min_it (rmin [i], v); max_it (rmax [i], v); 711 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
588 v = mat_apply (matrix, i, 0, h); min_it (rmin [i], v); max_it (rmax [i], v); 712 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
589 v = mat_apply (matrix, i, w, h); min_it (rmin [i], v); max_it (rmax [i], v); 713 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
590 } 714 }
591 715
716 float sx = rmin [0] - x;
717 float sy = rmin [1] - y;
718
719 // TODO: adjust matrix for subpixel accuracy
592 int dx = floor (rmin [0]); 720 int nx = floor (rmin [0]);
593 int dy = floor (rmin [1]); 721 int ny = floor (rmin [1]);
594 722
595 int new_width = ceil (rmax [0] - dx); 723 int new_width = ceil (rmax [0] - rmin [0]);
596 int new_height = ceil (rmax [1] - dy); 724 int new_height = ceil (rmax [1] - rmin [1]);
597 725
598 double inv[3][3]; 726 m = mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y);
599 mat_invert (matrix, inv);
600 727
728 mat3x3 inv = m.invert ();
729
601 rxvt_img *img = new rxvt_img (s, format, ox - dx - d [0], oy - dy - d [1], new_width, new_height, repeat); 730 rxvt_img *img = new rxvt_img (s, format, nx, ny, new_width, new_height, repeat);
602 img->alloc (); 731 img->alloc ();
603 732
604 Display *dpy = s->display->dpy; 733 Display *dpy = s->display->dpy;
605 Picture src = src_picture (); 734 Picture src = picture ();
606 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 735 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
607 736
608 XTransform xfrm; 737 XTransform xfrm;
609 738
610 for (int i = 0; i < 3; ++i) 739 for (int i = 0; i < 3; ++i)
611 for (int j = 0; j < 3; ++j) 740 for (int j = 0; j < 3; ++j)
612 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]); 741 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
613 742
614 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 743 XRenderSetPictureFilter (dpy, src, "good", 0, 0);
615 XRenderSetPictureTransform (dpy, src, &xfrm); 744 XRenderSetPictureTransform (dpy, src, &xfrm);
616 XRenderComposite (dpy, PictOpSrc, src, None, dst, dx, dy, 0, 0, 0, 0, new_width, new_height); 745 XRenderComposite (dpy, PictOpSrc, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
746#if 1
747 {
748 XRenderColor rc = { 65535,0,0,65535 };
749 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 0, 0, new_width, new_height);
750 }{
751 XRenderColor rc = { 0,0,0,65535 };
752 XRenderFillRectangle (dpy, PictOpSrc, dst, &rc, 1, 1, new_width - 2, new_height - 2);
753 }
754 XRenderComposite (dpy, PictOpOver, src, None, dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
755#endif
617 756
618 XRenderFreePicture (dpy, src); 757 XRenderFreePicture (dpy, src);
619 XRenderFreePicture (dpy, dst); 758 XRenderFreePicture (dpy, dst);
620 759
621 return img; 760 return img;
… …
625rxvt_img::scale (int new_width, int new_height) 764rxvt_img::scale (int new_width, int new_height)
626{ 765{
627 if (w == new_width && h == new_height) 766 if (w == new_width && h == new_height)
628 return clone (); 767 return clone ();
629 768
630 double matrix[3][3] = { 769 nv matrix[3][3] = {
631 { new_width / (double)w, 0, 0 }, 770 { new_width / (nv)w, 0, 0 },
632 { 0, new_height / (double)h, 0 }, 771 { 0, new_height / (nv)h, 0 },
633 { 0, 0, 1 } 772 { 0, 0, 1 }
634 }; 773 };
635 774
636 int old_repeat_mode = repeat; 775 int old_repeat_mode = repeat;
637 repeat = RepeatPad; // not right, but xrender can't properly scale it seems 776 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
638 777
… …
643 782
644 return img; 783 return img;
645} 784}
646 785
647rxvt_img * 786rxvt_img *
648rxvt_img::rotate (int cx, int cy, double phi) 787rxvt_img::rotate (int cx, int cy, nv phi)
649{ 788{
650 double s = sin (phi); 789 nv s = sin (phi);
651 double c = cos (phi); 790 nv c = cos (phi);
652 791
653 double matrix[3][3] = { 792 nv matrix[3][3] = {
793#if 0
654 { c, -s, cx - c * cx + s * cy }, 794 { c, -s, cx - c * cx + s * cy },
655 { s, c, cy - s * cx - c * cy }, 795 { s, c, cy - s * cx - c * cy },
656 { 0, 0, 1 } 796 { 0, 0, 1 }
797#else
657 //{ c, -s, 0 }, 798 { c, -s, 0 },
658 //{ s, c, 0 }, 799 { s, c, 0 },
659 //{ 0, 0, 1 } 800 { 0, 0, 1 }
801#endif
660 }; 802 };
661 803
662 //move (-cx, -cy); 804 move (-cx, -cy);
663 rxvt_img *img = transform (matrix); 805 rxvt_img *img = transform (matrix);
664 //move ( cx, cy); 806 move ( cx, cy);
665 //img->move (cx, cy); 807 img->move (cx, cy);
666 808
667 return img; 809 return img;
668} 810}
669 811
670rxvt_img * 812rxvt_img *
… …
675 817
676 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat); 818 rxvt_img *img = new rxvt_img (s, new_format, x, y, w, h, repeat);
677 img->alloc (); 819 img->alloc ();
678 820
679 Display *dpy = s->display->dpy; 821 Display *dpy = s->display->dpy;
680 Picture src = src_picture (); 822 Picture src = picture ();
681 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0); 823 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
682 int op = PictOpSrc; 824 int op = PictOpSrc;
683 825
684 if (format->direct.alphaMask && !new_format->direct.alphaMask) 826 if (format->direct.alphaMask && !new_format->direct.alphaMask)
685 { 827 {
… …
697 839
698 return img; 840 return img;
699} 841}
700 842
701rxvt_img * 843rxvt_img *
702rxvt_img::blend (rxvt_img *img, double factor) 844rxvt_img::blend (rxvt_img *img, nv factor)
703{ 845{
704 rxvt_img *img2 = clone (); 846 rxvt_img *img2 = clone ();
705 Display *dpy = s->display->dpy; 847 Display *dpy = s->display->dpy;
706 Picture src = img->src_picture (); 848 Picture src = img->picture ();
707 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0); 849 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
708 Picture mask = create_xrender_mask (dpy, img->pm, False, False); 850 Picture mask = create_xrender_mask (dpy, img->pm, False, False);
709 851
710 XRenderColor mask_c; 852 XRenderColor mask_c;
711 853

Diff Legend

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