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.25 by sf-exg, Tue Jun 5 22:00:15 2012 UTC vs.
Revision 1.110 by root, Tue Sep 17 18:06:37 2019 UTC

1/*----------------------------------------------------------------------*
2 * File: rxvtimg.C
3 *----------------------------------------------------------------------*
4 *
5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 2012 Marc Lehmann <schmorp@schmorp.de>
7 * Copyright (c) 2012 Emanuele Giaquinta <e.giaquinta@glauco.it>
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11 * the Free Software Foundation; either version 3 of the License, or
12 * (at your option) any later version.
13 *
14 * This program is distributed in the hope that it will be useful,
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
17 * GNU General Public License for more details.
18 *
19 * You should have received a copy of the GNU General Public License
20 * along with this program; if not, write to the Free Software
21 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
22 *---------------------------------------------------------------------*/
23
24#include <string.h>
1#include <math.h> 25#include <math.h>
2#include "../config.h" 26#include "../config.h"
3#include "rxvt.h" 27#include "rxvt.h"
4 28
5#if HAVE_IMG 29#if HAVE_IMG
6 30
7#define float_to_component(d) ((d) * 65535.99) 31typedef rxvt_img::nv nv;
8 32
33namespace
34{
35 struct mat3x3
36 {
37 nv v[3][3];
38
39 mat3x3 ()
40 {
41 }
42
43 mat3x3 (const nv *matrix)
44 {
45 memcpy (v, matrix, sizeof (v));
46 }
47
48 mat3x3 (nv v11, nv v12, nv v13, nv v21, nv v22, nv v23, nv v31, nv v32, nv v33)
49 {
50 v[0][0] = v11; v[0][1] = v12; v[0][2] = v13;
51 v[1][0] = v21; v[1][1] = v22; v[1][2] = v23;
52 v[2][0] = v31; v[2][1] = v32; v[2][2] = v33;
53 }
54
55 mat3x3 inverse ();
56
57 nv *operator [](int i) { return &v[i][0]; }
58 const nv *operator [](int i) const { return &v[i][0]; }
59
60 operator const nv * () const { return &v[0][0]; }
61 operator nv * () { return &v[0][0]; }
62
63 // quite inefficient, hopefully gcc pulls the w calc out of any loops
64 nv apply1 (int i, nv x, nv y)
65 {
66 mat3x3 &m = *this;
67
68 nv v = m[i][0] * x + m[i][1] * y + m[i][2];
69 nv w = m[2][0] * x + m[2][1] * y + m[2][2];
70
71 return v * (1. / w);
72 }
73
74 static mat3x3 translate (nv x, nv y);
75 static mat3x3 scale (nv s, nv t);
76 static mat3x3 rotate (nv phi);
77 };
78
79 mat3x3
80 mat3x3::inverse ()
81 {
82 mat3x3 &m = *this;
83 mat3x3 inv;
84
85 nv s0 = m[2][2] * m[1][1] - m[2][1] * m[1][2];
86 nv s1 = m[2][1] * m[0][2] - m[2][2] * m[0][1];
87 nv s2 = m[1][2] * m[0][1] - m[1][1] * m[0][2];
88
89 nv invdet = 1. / (m[0][0] * s0 + m[1][0] * s1 + m[2][0] * s2);
90
91 inv[0][0] = invdet * s0;
92 inv[0][1] = invdet * s1;
93 inv[0][2] = invdet * s2;
94
95 inv[1][0] = invdet * (m[2][0] * m[1][2] - m[2][2] * m[1][0]);
96 inv[1][1] = invdet * (m[2][2] * m[0][0] - m[2][0] * m[0][2]);
97 inv[1][2] = invdet * (m[1][0] * m[0][2] - m[1][2] * m[0][0]);
98
99 inv[2][0] = invdet * (m[2][1] * m[1][0] - m[2][0] * m[1][1]);
100 inv[2][1] = invdet * (m[2][0] * m[0][1] - m[2][1] * m[0][0]);
101 inv[2][2] = invdet * (m[1][1] * m[0][0] - m[1][0] * m[0][1]);
102
103 return inv;
104 }
105
106 static mat3x3
107 operator *(const mat3x3 &a, const mat3x3 &b)
108 {
109 mat3x3 r;
110
111 for (int i = 0; i < 3; ++i)
112 for (int j = 0; j < 3; ++j)
113 r[i][j] = a[i][0] * b[0][j]
114 + a[i][1] * b[1][j]
115 + a[i][2] * b[2][j];
116
117 return r;
118 }
119
120 mat3x3
121 mat3x3::translate (nv x, nv y)
122 {
123 return mat3x3 (
124 1, 0, x,
125 0, 1, y,
126 0, 0, 1
127 );
128 }
129
130 mat3x3
131 mat3x3::scale (nv s, nv t)
132 {
133 return mat3x3 (
134 s, 0, 0,
135 0, t, 0,
136 0, 0, 1
137 );
138 }
139
140 // clockwise
141 mat3x3
142 mat3x3::rotate (nv phi)
143 {
144 nv s = sin (phi);
145 nv c = cos (phi);
146
147 return mat3x3 (
148 c, -s, 0,
149 s, c, 0,
150 0, 0, 1
151 );
152 }
153
154 struct composer
155 {
156 rxvt_img *srcimg, *dstimg;
157 Picture src, dst, msk;
158 Display *dpy;
159
160 ecb_noinline
161 composer (rxvt_img *srcimg, rxvt_img *dstimg = 0)
162 : srcimg (srcimg), dstimg (dstimg), msk (0)
163 {
164 if (!this->dstimg)
165 this->dstimg = srcimg->new_empty ();
166 else if (!this->dstimg->pm) // somewhat unsatisfying
167 this->dstimg->alloc ();
168
169 dpy = srcimg->d->dpy;
170 src = srcimg->picture ();
171 dst = this->dstimg->picture ();
172 }
173
174 ecb_noinline
175 void mask (bool rgb = true, int w = 1, int h = 1)
176 {
177 Pixmap pixmap = XCreatePixmap (dpy, srcimg->pm, w, h, rgb ? 32 : 8);
178
179 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, rgb ? PictStandardARGB32 : PictStandardA8);
180 XRenderPictureAttributes pa;
181 pa.repeat = RepeatNormal;
182 pa.component_alpha = rgb;
183 msk = XRenderCreatePicture (dpy, pixmap, format, CPRepeat | CPComponentAlpha, &pa);
184
185 XFreePixmap (dpy, pixmap);
186
187 ecb_assume (msk);
188 }
189
190 // CreateSolidFill creates a very very very weird picture
191 void mask (const rgba &c)
192 {
193 // the casts are needed in C++11 (see 8.5.1)
194 XRenderColor rc = {
195 (unsigned short)(c.r * c.a / 65535),
196 (unsigned short)(c.g * c.a / 65535),
197 (unsigned short)(c.b * c.a / 65535),
198 c.a
199 };
200 msk = XRenderCreateSolidFill (dpy, &rc);
201 ecb_assume (msk);
202 }
203
204 void fill (const rgba &c)
205 {
206 XRenderColor rc = {
207 (unsigned short)(c.r * c.a / 65535),
208 (unsigned short)(c.g * c.a / 65535),
209 (unsigned short)(c.b * c.a / 65535),
210 c.a
211 };
212
213 XRenderFillRectangle (dpy, PictOpSrc, msk, &rc, 0, 0, 1, 1);
214 }
215
216 operator rxvt_img *()
217 {
218 return dstimg;
219 }
220
221 ecb_noinline
222 ~composer ()
223 {
224 XRenderFreePicture (dpy, src);
225 XRenderFreePicture (dpy, dst);
226 if (msk) XRenderFreePicture (dpy, msk);
227 }
228 };
229}
230
231static XRenderPictFormat *
232find_alpha_format_for (Display *dpy, XRenderPictFormat *format)
233{
234 if (format->direct.alphaMask)
235 return format; // already has alpha
236
237 // try to find a suitable alpha format, one bit alpha is enough for our purposes
238 if (format->type == PictTypeDirect)
239 for (int n = 0; XRenderPictFormat *f = XRenderFindFormat (dpy, 0, 0, n); ++n)
240 if (f->direct.alphaMask
241 && f->type == PictTypeDirect
242 && ecb_popcount32 (f->direct.redMask ) >= ecb_popcount32 (format->direct.redMask )
243 && ecb_popcount32 (f->direct.greenMask) >= ecb_popcount32 (format->direct.greenMask)
244 && ecb_popcount32 (f->direct.blueMask ) >= ecb_popcount32 (format->direct.blueMask ))
245 return f;
246
247 // should be a very good fallback
248 return XRenderFindStandardFormat (dpy, PictStandardARGB32);
249}
250
9rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height) 251rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
10: s(screen), w(width), h(height), format(format), shared(false) 252: d(screen->display), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
253 pm(0), ref(0)
11{ 254{
12 pm = XCreatePixmap (s->display->dpy, s->display->root, w, h, format->depth);
13} 255}
14 256
15rxvt_img::rxvt_img (rxvt_screen *screen, XRenderPictFormat *format, int width, int height, Pixmap pixmap) 257rxvt_img::rxvt_img (rxvt_display *display, XRenderPictFormat *format, int x, int y, int width, int height, int repeat)
16: s(screen), pm(pixmap), w(width), h(height), format(format), shared(false) 258: d(display), x(x), y(y), w(width), h(height), format(format), repeat(repeat),
259 pm(0), ref(0)
17{ 260{
261}
262
263rxvt_img::rxvt_img (const rxvt_img &img)
264: d(img.d), x(img.x), y(img.y), w(img.w), h(img.h), format(img.format), repeat(img.repeat), pm(img.pm), ref(img.ref)
265{
266 ++ref->cnt;
18} 267}
19 268
20rxvt_img * 269rxvt_img *
21rxvt_img::new_from_root (rxvt_screen *s) 270rxvt_img::new_from_root (rxvt_screen *s)
22{ 271{
23 Display *dpy = s->display->dpy; 272 Display *dpy = s->dpy;
24 unsigned int root_pm_w, root_pm_h; 273 unsigned int root_pm_w, root_pm_h;
25 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_XROOTPMAP_ID]); 274 Pixmap root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_XROOTPMAP_ID]);
26 if (root_pixmap == None) 275 if (root_pixmap == None)
27 root_pixmap = s->display->get_pixmap_property (s->display->xa[XA_ESETROOT_PMAP_ID]); 276 root_pixmap = s->display->get_pixmap_property (s->display->xa [XA_ESETROOT_PMAP_ID]);
28 277
29 if (root_pixmap == None) 278 if (root_pixmap == None)
30 return 0; 279 return 0;
31 280
32 Window wdummy; 281 Window wdummy;
… …
37 return 0; 286 return 0;
38 287
39 rxvt_img *img = new rxvt_img ( 288 rxvt_img *img = new rxvt_img (
40 s, 289 s,
41 XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)), 290 XRenderFindVisualFormat (dpy, DefaultVisual (dpy, s->display->screen)),
291 0,
292 0,
42 root_pm_w, 293 root_pm_w,
43 root_pm_h, 294 root_pm_h
44 root_pixmap
45 ); 295 );
46 296
47 img->shared = true; 297 img->pm = root_pixmap;
298 img->ref = new pixref (root_pm_w, root_pm_h);
299 img->ref->ours = false;
300
301 return img;
302}
303
304# if HAVE_PIXBUF
305
306rxvt_img *
307rxvt_img::new_from_pixbuf (rxvt_screen *s, GdkPixbuf *pb)
308{
309 Display *dpy = s->dpy;
310
311 int width = gdk_pixbuf_get_width (pb);
312 int height = gdk_pixbuf_get_height (pb);
313
314 if (width > 32767 || height > 32767) // well, we *could* upload in chunks
315 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big (maximum size 32768x32768).\n");
316
317 // since we require rgb24/argb32 formats from xrender we assume
318 // that both 24 and 32 bpp MUST be supported by any screen that supports xrender
319
320 int byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
321
322 XImage xi;
323
324 xi.width = width;
325 xi.height = height;
326 xi.xoffset = 0;
327 xi.format = ZPixmap;
328 xi.byte_order = ImageByteOrder (dpy);
329 xi.bitmap_unit = 0; //XY only, unused
330 xi.bitmap_bit_order = 0; //XY only, unused
331 xi.bitmap_pad = BitmapPad (dpy);
332 xi.depth = 32;
333 xi.bytes_per_line = 0;
334 xi.bits_per_pixel = 32; //Z only
335 xi.red_mask = 0x00000000; //Z only, unused
336 xi.green_mask = 0x00000000; //Z only, unused
337 xi.blue_mask = 0x00000000; //Z only, unused
338 xi.obdata = 0; // probably unused
339
340 bool byte_order_mismatch = byte_order != xi.byte_order;
341
342 if (!XInitImage (&xi))
343 rxvt_fatal ("unable to initialise ximage, please report.\n");
344
345 if (height > INT_MAX / xi.bytes_per_line)
346 rxvt_fatal ("rxvt_img::new_from_pixbuf: image too big for Xlib.\n");
347
348 xi.data = (char *)rxvt_malloc (height * xi.bytes_per_line);
349
350 int rowstride = gdk_pixbuf_get_rowstride (pb);
351 bool pb_has_alpha = gdk_pixbuf_get_has_alpha (pb);
352 unsigned char *row = gdk_pixbuf_get_pixels (pb);
353
354 char *line = xi.data;
355
356 for (int y = 0; y < height; y++)
357 {
358 unsigned char *src = row;
359 uint32_t *dst = (uint32_t *)line;
360
361 for (int x = 0; x < width; x++)
362 {
363 uint8_t r = *src++;
364 uint8_t g = *src++;
365 uint8_t b = *src++;
366 uint8_t a = *src;
367
368 // this is done so it can be jump-free, but newer gcc's clone inner the loop
369 a = pb_has_alpha ? a : 255;
370 src += pb_has_alpha;
371
372 r = (r * a + 127) / 255;
373 g = (g * a + 127) / 255;
374 b = (b * a + 127) / 255;
375
376 uint32_t v = (a << 24) | (r << 16) | (g << 8) | b;
377
378 if (ecb_big_endian () ? !byte_order_mismatch : byte_order_mismatch)
379 v = ecb_bswap32 (v);
380
381 *dst++ = v;
382 }
383
384 row += rowstride;
385 line += xi.bytes_per_line;
386 }
387
388 rxvt_img *img = new rxvt_img (s, XRenderFindStandardFormat (dpy, PictStandardARGB32), 0, 0, width, height);
389 img->alloc ();
390
391 GC gc = XCreateGC (dpy, img->pm, 0, 0);
392 XPutImage (dpy, img->pm, gc, &xi, 0, 0, 0, 0, width, height);
393 XFreeGC (dpy, gc);
394
395 free (xi.data);
48 396
49 return img; 397 return img;
50} 398}
51 399
52rxvt_img * 400rxvt_img *
… …
54{ 402{
55 GError *err = 0; 403 GError *err = 0;
56 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err); 404 GdkPixbuf *pb = gdk_pixbuf_new_from_file (filename, &err);
57 405
58 if (!pb) 406 if (!pb)
407 try
408 {
59 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message); 409 rxvt_fatal ("rxvt_img::new_from_file: %s\n", err->message);
410 }
411 catch (...)
412 {
413 g_error_free (err);
414 throw;
415 }
60 416
61 rxvt_img *img = new rxvt_img ( 417 rxvt_img *img = new_from_pixbuf (s, pb);
62 s,
63 XRenderFindStandardFormat (s->display->dpy, gdk_pixbuf_get_has_alpha (pb) ? PictStandardARGB32 : PictStandardRGB24),
64 gdk_pixbuf_get_width (pb),
65 gdk_pixbuf_get_height (pb)
66 );
67 418
68 img->render_pixbuf (pb, 0, 0, img->w, img->h, 0, 0); 419 g_object_unref (pb);
69 420
70 return img; 421 return img;
71} 422}
72 423
424# endif
425
426void
427rxvt_img::destroy ()
428{
429 if (--ref->cnt)
430 return;
431
432 if (pm && ref->ours)
433 XFreePixmap (d->dpy, pm);
434
435 delete ref;
436}
437
73rxvt_img::~rxvt_img () 438rxvt_img::~rxvt_img ()
74{ 439{
75 if (!shared) 440 destroy ();
76 XFreePixmap (s->display->dpy, pm); 441}
442
443void
444rxvt_img::alloc ()
445{
446 pm = XCreatePixmap (d->dpy, d->root, w, h, format->depth);
447 ref = new pixref (w, h);
448}
449
450rxvt_img *
451rxvt_img::new_empty ()
452{
453 rxvt_img *img = new rxvt_img (d, format, x, y, w, h, repeat);
454 img->alloc ();
455
456 return img;
457}
458
459Picture
460rxvt_img::picture ()
461{
462 Display *dpy = d->dpy;
463
464 XRenderPictureAttributes pa;
465 pa.repeat = repeat;
466 Picture pic = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
467
468 return pic;
77} 469}
78 470
79void 471void
80rxvt_img::unshare () 472rxvt_img::unshare ()
81{ 473{
82 if (!shared) 474 if (ref->cnt == 1 && ref->ours)
83 return; 475 return;
84 476
477 Pixmap pm2 = XCreatePixmap (d->dpy, d->root, ref->w, ref->h, format->depth);
478 GC gc = XCreateGC (d->dpy, pm, 0, 0);
479 XCopyArea (d->dpy, pm, pm2, gc, 0, 0, ref->w, ref->h, 0, 0);
480 XFreeGC (d->dpy, gc);
481
482 destroy ();
483
484 pm = pm2;
485 ref = new pixref (ref->w, ref->h);
486}
487
488void
489rxvt_img::fill (const rgba &c, int x, int y, int w, int h)
490{
491 XRenderColor rc = { c.r, c.g, c.b, c.a };
492
493 Display *dpy = d->dpy;
494 Picture src = picture ();
495 XRenderFillRectangle (dpy, PictOpSrc, src, &rc, x, y, w, h);
496 XRenderFreePicture (dpy, src);
497}
498
499void
500rxvt_img::fill (const rgba &c)
501{
502 fill (c, 0, 0, w, h);
503}
504
505void
506rxvt_img::add_alpha ()
507{
508 if (format->direct.alphaMask)
509 return;
510
511 composer cc (this, new rxvt_img (d, find_alpha_format_for (d->dpy, format), x, y, w, h, repeat));
512
513 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
514
85 rxvt_img *img = clone (); 515 rxvt_img *img = cc;
86 516
87 ::swap (pm , img->pm); 517 ::swap (img->ref, ref);
88 ::swap (shared, img->shared); 518 ::swap (img->pm , pm );
89 519
90 delete img; 520 delete img;
91} 521}
92 522
93void
94rxvt_img::fill (const rxvt_color &c)
95{
96 XGCValues gcv;
97 gcv.foreground = c;
98 GC gc = XCreateGC (s->display->dpy, pm, GCForeground, &gcv);
99 XFillRectangle (s->display->dpy, pm, gc, 0, 0, w, h);
100 XFreeGC (s->display->dpy, gc);
101}
102
103static void 523static void
104get_gaussian_kernel (int radius, int width, double *kernel, XFixed *params) 524get_gaussian_kernel (int radius, int width, nv *kernel, XFixed *params)
105{ 525{
106 double sigma = radius / 2.0; 526 nv sigma = radius / 2.0;
107 double scale = sqrt (2.0 * M_PI) * sigma; 527 nv scale = sqrt (2.0 * M_PI) * sigma;
108 double sum = 0.0; 528 nv sum = 0.0;
109 529
110 for (int i = 0; i < width; i++) 530 for (int i = 0; i < width; i++)
111 { 531 {
112 double x = i - width / 2; 532 nv x = i - width / 2;
113 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale; 533 kernel[i] = exp (-(x * x) / (2.0 * sigma * sigma)) / scale;
114 sum += kernel[i]; 534 sum += kernel[i];
115 } 535 }
116 536
117 params[0] = XDoubleToFixed (width); 537 params[0] = XDoubleToFixed (width);
… …
122} 542}
123 543
124rxvt_img * 544rxvt_img *
125rxvt_img::blur (int rh, int rv) 545rxvt_img::blur (int rh, int rv)
126{ 546{
127 if (!(s->display->flags & DISPLAY_HAS_RENDER_CONV)) 547 if (!(d->flags & DISPLAY_HAS_RENDER_CONV))
128 return clone (); 548 return clone ();
129 549
130 Display *dpy = s->display->dpy; 550 Display *dpy = d->dpy;
131 int size = max (rh, rv) * 2 + 1; 551 int size = max (rh, rv) * 2 + 1;
132 double *kernel = (double *)malloc (size * sizeof (double)); 552 nv *kernel = (nv *)malloc (size * sizeof (nv));
133 XFixed *params = (XFixed *)malloc ((size + 2) * sizeof (XFixed)); 553 XFixed *params = rxvt_temp_buf<XFixed> (size + 2);
134 rxvt_img *img = new rxvt_img (s, format, w, h); 554 rxvt_img *img = new_empty ();
135 555
136 XRenderPictureAttributes pa; 556 XRenderPictureAttributes pa;
137
138 pa.repeat = RepeatPad; 557 pa.repeat = RepeatPad;
139 Picture src = XRenderCreatePicture (dpy, pm , format, CPRepeat, &pa); 558 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
140 Picture dst = XRenderCreatePicture (dpy, img->pm, format, CPRepeat, &pa); 559 Picture dst = XRenderCreatePicture (dpy, img->pm, format, 0, 0);
141 560
142 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth); 561 Pixmap tmp_pm = XCreatePixmap (dpy, pm, w, h, format->depth);
143 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa); 562 Picture tmp = XRenderCreatePicture (dpy, tmp_pm , format, CPRepeat, &pa);
144 XFreePixmap (dpy, tmp_pm); 563 XFreePixmap (dpy, tmp_pm);
145 564
… …
161 580
162 size = rv * 2 + 1; 581 size = rv * 2 + 1;
163 get_gaussian_kernel (rv, size, kernel, params); 582 get_gaussian_kernel (rv, size, kernel, params);
164 ::swap (params[0], params[1]); 583 ::swap (params[0], params[1]);
165 584
166 XRenderSetPictureFilter (dpy, src, FilterConvolution, params, size+2); 585 XRenderSetPictureFilter (dpy, tmp, FilterConvolution, params, size+2);
167 XRenderComposite (dpy, 586 XRenderComposite (dpy,
168 PictOpSrc, 587 PictOpSrc,
169 tmp, 588 tmp,
170 None, 589 None,
171 dst, 590 dst,
… …
174 0, 0, 593 0, 0,
175 w, h); 594 w, h);
176 } 595 }
177 596
178 free (kernel); 597 free (kernel);
179 free (params); 598
180 XRenderFreePicture (dpy, src); 599 XRenderFreePicture (dpy, src);
181 XRenderFreePicture (dpy, dst); 600 XRenderFreePicture (dpy, dst);
182 XRenderFreePicture (dpy, tmp); 601 XRenderFreePicture (dpy, tmp);
183 602
184 return img; 603 return img;
185} 604}
186 605
187static Picture 606rxvt_img *
188create_xrender_mask (Display *dpy, Drawable drawable, Bool argb) 607rxvt_img::muladd (nv mul, nv add)
189{ 608{
190 Pixmap pixmap = XCreatePixmap (dpy, drawable, 1, 1, argb ? 32 : 8); 609 // STEP 1: double the image width, fill all odd columns with white (==1)
191 610
192 XRenderPictFormat *format = XRenderFindStandardFormat (dpy, argb ? PictStandardARGB32 : PictStandardA8); 611 composer cc (this, new rxvt_img (d, format, 0, 0, w * 2, h, repeat));
193 XRenderPictureAttributes pa;
194 pa.repeat = True;
195 Picture mask = XRenderCreatePicture (dpy, pixmap, format, CPRepeat, &pa);
196 612
197 XFreePixmap (dpy, pixmap); 613 // why the hell does XRenderSetPictureTransform want a writable matrix :(
614 // that keeps us from just static const'ing this matrix.
615 XTransform h_double = {
616 0x08000, 0, 0,
617 0, 0x10000, 0,
618 0, 0, 0x10000
619 };
198 620
199 return mask; 621 XRenderSetPictureFilter (cc.dpy, cc.src, "nearest", 0, 0);
622 XRenderSetPictureTransform (cc.dpy, cc.src, &h_double);
623 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
624
625 cc.mask (false, 2, 1);
626
627 static const XRenderColor c0 = { 0, 0, 0, 0 };
628 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c0, 0, 0, 1, 1);
629 static const XRenderColor c1 = { 65535, 65535, 65535, 65535 };
630 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &c1, 1, 0, 1, 1);
631
632 Picture white = XRenderCreateSolidFill (cc.dpy, &c1);
633
634 XRenderComposite (cc.dpy, PictOpOver, white, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
635
636 XRenderFreePicture (cc.dpy, white);
637
638 // STEP 2: convolve the image with a 3x1 filter
639 // a 2x1 filter would obviously suffice, but given the total lack of specification
640 // for xrender, I expect different xrender implementations to randomly diverge.
641 // we also halve the image, and hope for the best (again, for lack of specs).
642 composer cc2 (cc.dstimg);
643
644 XFixed kernel [] = {
645 XDoubleToFixed (3), XDoubleToFixed (1),
646 XDoubleToFixed (0), XDoubleToFixed (mul), XDoubleToFixed (add)
647 };
648
649 XTransform h_halve = {
650 0x20000, 0, 0,
651 0, 0x10000, 0,
652 0, 0, 0x10000
653 };
654
655 XRenderSetPictureFilter (cc.dpy, cc2.src, "nearest", 0, 0);
656 XRenderSetPictureTransform (cc.dpy, cc2.src, &h_halve);
657 XRenderSetPictureFilter (cc.dpy, cc2.src, FilterConvolution, kernel, ecb_array_length (kernel));
658
659 XRenderComposite (cc.dpy, PictOpSrc, cc2.src, None, cc2.dst, 0, 0, 0, 0, 0, 0, w * 2, h);
660
661 return cc2;
662}
663
664ecb_noinline static void
665extract (int32_t cl0, int32_t cl1, int32_t &c, unsigned short &xc)
666{
667 int32_t x = clamp (c, cl0, cl1);
668 c -= x;
669 xc = x;
670}
671
672ecb_noinline static bool
673extract (int32_t cl0, int32_t cl1, int32_t &r, int32_t &g, int32_t &b, int32_t &a, unsigned short &xr, unsigned short &xg, unsigned short &xb, unsigned short &xa)
674{
675 extract (cl0, cl1, r, xr);
676 extract (cl0, cl1, g, xg);
677 extract (cl0, cl1, b, xb);
678 extract (cl0, cl1, a, xa);
679
680 return xr | xg | xb | xa;
200} 681}
201 682
202void 683void
203rxvt_img::brightness (double r, double g, double b, double a) 684rxvt_img::brightness (int32_t r, int32_t g, int32_t b, int32_t a)
204{ 685{
686 unshare ();
687
205 Display *dpy = s->display->dpy; 688 Display *dpy = d->dpy;
206 Picture src = create_xrender_mask (dpy, pm, True);
207 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 689 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0);
208 690
691 // loop should not be needed for brightness, as only -1..1 makes sense
692 //while (r | g | b | a)
693 {
694 unsigned short xr, xg, xb, xa;
209 XRenderColor mask_c; 695 XRenderColor mask_c;
210 mask_c.red = float_to_component (r); 696
211 mask_c.green = float_to_component (g); 697 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
212 mask_c.blue = float_to_component (b);
213 mask_c.alpha = float_to_component (a);
214 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1); 698 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
215 699
216 XRenderComposite (dpy, PictOpAdd, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 700 if (extract (-65535, 0, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
701 {
702 XRenderColor mask_w = { 65535, 65535, 65535, 65535 };
703 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
704 mask_c.red = -mask_c.red; //TODO: verify that doing clamp, assign, and negation does the right thing
705 mask_c.green = -mask_c.green;
706 mask_c.blue = -mask_c.blue;
707 mask_c.alpha = -mask_c.alpha;
708 XRenderFillRectangle (dpy, PictOpAdd, dst, &mask_c, 0, 0, w, h);
709 XRenderFillRectangle (dpy, PictOpDifference, dst, &mask_w, 0, 0, w, h);
710 }
711 }
217 712
218 XRenderFreePicture (dpy, src);
219 XRenderFreePicture (dpy, dst); 713 XRenderFreePicture (dpy, dst);
220} 714}
221 715
222void 716void
223rxvt_img::contrast (double r, double g, double b, double a) 717rxvt_img::contrast (int32_t r, int32_t g, int32_t b, int32_t a)
224{ 718{
225 if (!(s->display->flags & DISPLAY_HAS_RENDER_MUL)) 719 if (r < 0 || g < 0 || b < 0 || a < 0)
226 return; 720 rxvt_fatal ("rxvt_img::contrast does not support negative values.\n");
227 721
228 Display *dpy = s->display->dpy; 722 // premultiply (yeah, these are not exact, sue me or fix it)
229 Picture src = create_xrender_mask (dpy, pm, True); 723 r = (r * (a >> 8)) >> 8;
230 Picture dst = XRenderCreatePicture (dpy, pm, format, 0, 0); 724 g = (g * (a >> 8)) >> 8;
725 b = (b * (a >> 8)) >> 8;
231 726
727 composer cc (this);
728 rxvt_img *img = cc;
729 img->fill (rgba (0, 0, 0, 0));
730
731 cc.mask (true);
732
733 //TODO: this operator does not yet implement some useful contrast
734 while (r | g | b | a)
735 {
736 unsigned short xr, xg, xb, xa;
232 XRenderColor mask_c; 737 XRenderColor mask_c;
233 mask_c.red = float_to_component (r);
234 mask_c.green = float_to_component (g);
235 mask_c.blue = float_to_component (b);
236 mask_c.alpha = float_to_component (a);
237 XRenderFillRectangle (dpy, PictOpSrc, src, &mask_c, 0, 0, 1, 1);
238 738
239 XRenderComposite (dpy, PictOpMultiply, src, None, dst, 0, 0, 0, 0, 0, 0, w, h); 739 if (extract (0, 65535, r, g, b, a, mask_c.red, mask_c.green, mask_c.blue, mask_c.alpha))
240
241 XRenderFreePicture (dpy, src);
242 XRenderFreePicture (dpy, dst);
243}
244
245bool
246rxvt_img::render_pixbuf (GdkPixbuf *pixbuf, int src_x, int src_y, int width, int height, int dst_x, int dst_y)
247{
248 Display *dpy = s->display->dpy;
249
250 if (s->visual->c_class != TrueColor)
251 return false;
252
253 uint32_t red_mask, green_mask, blue_mask, alpha_mask;
254
255 red_mask = (uint32_t)format->direct.redMask << format->direct.red;
256 green_mask = (uint32_t)format->direct.greenMask << format->direct.green;
257 blue_mask = (uint32_t)format->direct.blueMask << format->direct.blue;
258 alpha_mask = (uint32_t)format->direct.alphaMask << format->direct.alpha;
259
260 int width_r = ecb_popcount32 (red_mask);
261 int width_g = ecb_popcount32 (green_mask);
262 int width_b = ecb_popcount32 (blue_mask);
263 int width_a = ecb_popcount32 (alpha_mask);
264
265 if (width_r > 8 || width_g > 8 || width_b > 8 || width_a > 8)
266 return false;
267
268 int sh_r = ecb_ctz32 (red_mask);
269 int sh_g = ecb_ctz32 (green_mask);
270 int sh_b = ecb_ctz32 (blue_mask);
271 int sh_a = ecb_ctz32 (alpha_mask);
272
273 if (width > 32767 || height > 32767)
274 return false;
275
276 XImage *ximage = XCreateImage (dpy, s->visual, format->depth, ZPixmap, 0, 0,
277 width, height, 32, 0);
278 if (!ximage)
279 return false;
280
281 if (height > INT_MAX / ximage->bytes_per_line
282 || !(ximage->data = (char *)malloc (height * ximage->bytes_per_line)))
283 {
284 XDestroyImage (ximage);
285 return false;
286 }
287
288 GC gc = XCreateGC (dpy, pm, 0, 0);
289
290 ximage->byte_order = ecb_big_endian () ? MSBFirst : LSBFirst;
291
292 int rowstride = gdk_pixbuf_get_rowstride (pixbuf);
293 int channels = gdk_pixbuf_get_n_channels (pixbuf);
294 unsigned char *row = gdk_pixbuf_get_pixels (pixbuf) + src_y * rowstride + src_x * channels;
295 char *line = ximage->data;
296
297 for (int y = 0; y < height; y++)
298 {
299 for (int x = 0; x < width; x++)
300 { 740 {
301 unsigned char *pixel = row + x * channels; 741 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.msk, &mask_c, 0, 0, 1, 1);
302 uint32_t value; 742 XRenderComposite (cc.dpy, PictOpAdd, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
303 unsigned char r, g, b, a;
304
305 if (channels == 4)
306 {
307 a = pixel[3];
308 r = pixel[0] * a / 0xff;
309 g = pixel[1] * a / 0xff;
310 b = pixel[2] * a / 0xff;
311 }
312 else
313 {
314 a = 0xff;
315 r = pixel[0];
316 g = pixel[1];
317 b = pixel[2];
318 }
319
320 value = ((r >> (8 - width_r)) << sh_r)
321 | ((g >> (8 - width_g)) << sh_g)
322 | ((b >> (8 - width_b)) << sh_b)
323 | ((a >> (8 - width_a)) << sh_a);
324
325 if (ximage->bits_per_pixel == 32)
326 ((uint32_t *)line)[x] = value;
327 else
328 XPutPixel (ximage, x, y, value);
329 } 743 }
330
331 row += rowstride;
332 line += ximage->bytes_per_line;
333 } 744 }
334 745
335 XPutImage (dpy, pm, gc, ximage, 0, 0, dst_x, dst_y, width, height); 746 ::swap (img->ref, ref);
336 XDestroyImage (ximage); 747 ::swap (img->pm , pm );
337 XFreeGC (dpy, gc);
338 748
339 return true; 749 delete img;
750}
751
752void
753rxvt_img::draw (rxvt_img *img, int op, nv mask)
754{
755 unshare ();
756
757 composer cc (img, this);
758
759 if (mask != 1.)
760 cc.mask (rgba (0, 0, 0, float_to_component (mask)));
761
762 XRenderComposite (cc.dpy, op, cc.src, cc.msk, cc.dst, x - img->x, y - img->y, 0, 0, 0, 0, w, h);
340} 763}
341 764
342rxvt_img * 765rxvt_img *
343rxvt_img::clone () 766rxvt_img::clone ()
344{ 767{
345 rxvt_img *img = new rxvt_img (s, format, w, h); 768 return new rxvt_img (*this);
769}
346 770
347 GC gc = XCreateGC (s->display->dpy, pm, 0, 0); 771rxvt_img *
348 XCopyArea (s->display->dpy, pm, img->pm, gc, 0, 0, w, h, 0, 0); 772rxvt_img::reify ()
349 XFreeGC (s->display->dpy, gc); 773{
774 if (x == 0 && y == 0 && w == ref->w && h == ref->h)
775 return clone ();
776
777 // add an alpha channel if...
778 bool alpha = !format->direct.alphaMask // pixmap has none yet
779 && (x || y) // we need one because of non-zero offset
780 && repeat == RepeatNone; // and we have no good pixels to fill with
781
782 composer cc (this, new rxvt_img (d, alpha ? find_alpha_format_for (d->dpy, format) : format,
783 0, 0, w, h, repeat));
784
785 if (repeat == RepeatNone)
786 {
787 XRenderColor rc = { 0, 0, 0, 0 };
788 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);//TODO: split into four fillrectangles
789 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, 0, 0, 0, 0, x, y, ref->w, ref->h);
790 }
791 else
792 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, -x, -y, 0, 0, 0, 0, w, h);
793
794 return cc;
795}
796
797rxvt_img *
798rxvt_img::sub_rect (int x, int y, int width, int height)
799{
800 rxvt_img *img = clone ();
801
802 img->x -= x;
803 img->y -= y;
804
805 if (w != width || h != height)
806 {
807 img->w = width;
808 img->h = height;
809
810 rxvt_img *img2 = img->reify ();
811 delete img;
812 img = img2;
813 }
350 814
351 return img; 815 return img;
352} 816}
353 817
354rxvt_img * 818rxvt_img *
355rxvt_img::sub_rect (int x, int y, int width, int height, int repeat) 819rxvt_img::transform (const nv matrix[3][3])
356{ 820{
357 rxvt_img *img = new rxvt_img (s, format, width, height); 821 return transform (mat3x3 (&matrix[0][0]));
358
359 Display *dpy = s->display->dpy;
360 XRenderPictureAttributes pa;
361 pa.repeat = repeat;
362 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa);
363 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
364
365 XRenderComposite (dpy, PictOpSrc, src, None, dst, x, y, 0, 0, 0, 0, width, height);
366
367 XRenderFreePicture (dpy, src);
368 XRenderFreePicture (dpy, dst);
369
370 return img;
371} 822}
372 823
373rxvt_img * 824rxvt_img *
374rxvt_img::transform (int new_width, int new_height, double matrix[9], int repeat) 825rxvt_img::transform (const nv *matrix)
375{ 826{
376 rxvt_img *img = new rxvt_img (s, format, new_width, new_height); 827 mat3x3 m (matrix);
377 828
378 Display *dpy = s->display->dpy; 829 // calculate new pixel bounding box coordinates
379 XRenderPictureAttributes pa; 830 nv rmin[2], rmax[2];
380 pa.repeat = repeat; 831
381 Picture src = XRenderCreatePicture (dpy, pm, format, CPRepeat, &pa); 832 for (int i = 0; i < 2; ++i)
382 Picture dst = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0); 833 {
834 nv v;
835
836 v = m.apply1 (i, 0+x, 0+y); rmin [i] = rmax [i] = v;
837 v = m.apply1 (i, w+x, 0+y); min_it (rmin [i], v); max_it (rmax [i], v);
838 v = m.apply1 (i, 0+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
839 v = m.apply1 (i, w+x, h+y); min_it (rmin [i], v); max_it (rmax [i], v);
840 }
841
842 float sx = rmin [0] - x;
843 float sy = rmin [1] - y;
844
845 // TODO: adjust matrix for subpixel accuracy
846 int nx = floor (rmin [0]);
847 int ny = floor (rmin [1]);
848
849 int new_width = ceil (rmax [0] - rmin [0]);
850 int new_height = ceil (rmax [1] - rmin [1]);
851
852 mat3x3 inv = (mat3x3::translate (-x, -y) * m * mat3x3::translate (x, y)).inverse ();
853
854 composer cc (this, new rxvt_img (d, format, nx, ny, new_width, new_height, repeat));
383 855
384 XTransform xfrm; 856 XTransform xfrm;
385 857
386 for (int i = 0; i < 3; ++i) 858 for (int i = 0; i < 3; ++i)
387 for (int j = 0; j < 3; ++j) 859 for (int j = 0; j < 3; ++j)
388 xfrm.matrix [i][j] = XDoubleToFixed (matrix [i * 3 + j]); 860 xfrm.matrix [i][j] = XDoubleToFixed (inv [i][j]);
389 861
390 XRenderSetPictureFilter (dpy, src, "good", 0, 0); 862 XRenderSetPictureFilter (cc.dpy, cc.src, "good", 0, 0);
391 XRenderSetPictureTransform (dpy, src, &xfrm); 863 XRenderSetPictureTransform (cc.dpy, cc.src, &xfrm);
392 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, new_width, new_height); 864 XRenderComposite (cc.dpy, PictOpSrc, cc.src, None, cc.dst, sx, sy, 0, 0, 0, 0, new_width, new_height);
393 865
394 XRenderFreePicture (dpy, src); 866 return cc;
395 XRenderFreePicture (dpy, dst); 867}
868
869rxvt_img *
870rxvt_img::scale (int new_width, int new_height)
871{
872 if (w == new_width && h == new_height)
873 return clone ();
874
875 int old_repeat_mode = repeat;
876 repeat = RepeatPad; // not right, but xrender can't properly scale it seems
877
878 rxvt_img *img = transform (mat3x3::scale (new_width / (nv)w, new_height / (nv)h));
879
880 repeat = old_repeat_mode;
881 img->repeat = repeat;
396 882
397 return img; 883 return img;
398} 884}
399 885
400rxvt_img * 886rxvt_img *
401rxvt_img::scale (int new_width, int new_height) 887rxvt_img::rotate (int cx, int cy, nv phi)
402{ 888{
403 double matrix[9] = { 889 move (-cx, -cy);
404 w / (double)new_width, 0, 0, 890 rxvt_img *img = transform (mat3x3::rotate (phi));
405 0, h / (double)new_height, 0, 891 move ( cx, cy);
406 0, 0, 1 892 img->move (cx, cy);
407 };
408
409 return transform (new_width, new_height, matrix);
410}
411
412rxvt_img *
413rxvt_img::rotate (int new_width, int new_height, int x, int y, double phi, int repeat)
414{
415 double s = sin (phi);
416 double c = cos (phi);
417
418 double matrix[9] = {
419 c, -s, -c * x + s * y + x,
420 s, c, -s * x - c * y + y,
421 0, 0, 1
422 };
423
424 return transform (new_width, new_height, matrix, repeat);
425}
426
427rxvt_img *
428rxvt_img::convert_to (XRenderPictFormat *new_format)
429{
430 rxvt_img *img = new rxvt_img (s, new_format, w, h);
431
432 Display *dpy = s->display->dpy;
433 Picture src = XRenderCreatePicture (dpy, pm, format, 0, 0);
434 Picture dst = XRenderCreatePicture (dpy, img->pm, new_format, 0, 0);
435
436 XRenderComposite (dpy, PictOpSrc, src, None, dst, 0, 0, 0, 0, 0, 0, w, h);
437
438 XRenderFreePicture (dpy, src);
439 XRenderFreePicture (dpy, dst);
440 893
441 return img; 894 return img;
442} 895}
443 896
444rxvt_img * 897rxvt_img *
445rxvt_img::blend (rxvt_img *img, double factor) 898rxvt_img::convert_format (XRenderPictFormat *new_format, const rgba &bg)
446{ 899{
447 rxvt_img *img2 = clone (); 900 if (new_format == format)
448 Display *dpy = s->display->dpy; 901 return clone ();
449 Picture src = XRenderCreatePicture (dpy, img->pm, img->format, 0, 0);
450 Picture dst = XRenderCreatePicture (dpy, img2->pm, img2->format, 0, 0);
451 Picture mask = create_xrender_mask (dpy, img->pm, False);
452 902
453 XRenderColor mask_c; 903 composer cc (this, new rxvt_img (d, new_format, x, y, w, h, repeat));
454 904
455 mask_c.alpha = float_to_component (factor); 905 int op = PictOpSrc;
456 mask_c.red = 906
457 mask_c.green = 907 if (format->direct.alphaMask && !new_format->direct.alphaMask)
458 mask_c.blue = 0; 908 {
909 // does it have to be that complicated
910 XRenderColor rc = { bg.r, bg.g, bg.b, bg.a };
459 XRenderFillRectangle (dpy, PictOpSrc, mask, &mask_c, 0, 0, 1, 1); 911 XRenderFillRectangle (cc.dpy, PictOpSrc, cc.dst, &rc, 0, 0, w, h);
460 912
913 op = PictOpOver;
914 }
915
916 XRenderComposite (cc.dpy, op, cc.src, None, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
917
918 return cc;
919}
920
921rxvt_img *
922rxvt_img::tint (const rgba &c)
923{
924 composer cc (this);
925 cc.mask (true);
926 cc.fill (c);
927
461 XRenderComposite (dpy, PictOpOver, src, mask, dst, 0, 0, 0, 0, 0, 0, w, h); 928 XRenderComposite (cc.dpy, PictOpSrc, cc.src, cc.msk, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
462 929
463 XRenderFreePicture (dpy, src); 930 return cc;
464 XRenderFreePicture (dpy, dst); 931}
465 XRenderFreePicture (dpy, mask);
466 932
933rxvt_img *
934rxvt_img::shade (nv factor, rgba c)
935{
936 clamp_it (factor, -1., 1.);
937 factor++;
938
939 if (factor > 1)
940 {
941 c.r = c.r * (2 - factor);
942 c.g = c.g * (2 - factor);
943 c.b = c.b * (2 - factor);
944 }
945 else
946 {
947 c.r = c.r * factor;
948 c.g = c.g * factor;
949 c.b = c.b * factor;
950 }
951
952 rxvt_img *img = this->tint (c);
953
954 if (factor > 1)
955 {
956 c.a = 0xffff;
957 c.r =
958 c.g =
959 c.b = 0xffff * (factor - 1);
960
961 img->brightness (c.r, c.g, c.b, c.a);
962 }
963
467 return img2; 964 return img;
965}
966
967rxvt_img *
968rxvt_img::filter (const char *name, int nparams, nv *params)
969{
970 composer cc (this);
971
972 XFixed *xparams = rxvt_temp_buf<XFixed> (nparams);
973
974 for (int i = 0; i < nparams; ++i)
975 xparams [i] = XDoubleToFixed (params [i]);
976
977 XRenderSetPictureFilter (cc.dpy, cc.src, name, xparams, nparams);
978
979 XRenderComposite (cc.dpy, PictOpSrc, cc.src, 0, cc.dst, 0, 0, 0, 0, 0, 0, w, h);
980
981 return cc;
468} 982}
469 983
470#endif 984#endif
471 985

Diff Legend

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