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

Comparing rxvt-unicode/src/xpm.C (file contents):
Revision 1.2 by pcg, Mon Nov 24 17:31:28 2003 UTC vs.
Revision 1.37 by root, Tue May 1 21:30:01 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: xpm.c 2 * File: xpm.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * $Id: xpm.C,v 1.2 2003/11/24 17:31:28 pcg Exp $
5 * 4 *
6 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
7 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au> 6 * Copyright (c) 1997 Carsten Haitzler <raster@zip.com.au>
8 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
9 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1998-2001 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2005-2006 Marc Lehmann <pcg@goof.com>
10 * 10 *
11 * This program is free software; you can redistribute it and/or modify 11 * This program is free software; you can redistribute it and/or modify
12 * it under the terms of the GNU General Public License as published by 12 * it under the terms of the GNU General Public License as published by
13 * the Free Software Foundation; either version 2 of the License, or 13 * the Free Software Foundation; either version 2 of the License, or
14 * (at your option) any later version. 14 * (at your option) any later version.
… …
23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. 23 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
24 *---------------------------------------------------------------------*/ 24 *---------------------------------------------------------------------*/
25 25
26#include "../config.h" /* NECESSARY */ 26#include "../config.h" /* NECESSARY */
27#include "rxvt.h" /* NECESSARY */ 27#include "rxvt.h" /* NECESSARY */
28#include "xpm.intpro" /* PROTOS for internal routines */
29 28
30#ifdef XPM_BACKGROUND 29#ifdef XPM_BACKGROUND
30
31static void rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight);
31 32
32/* 33/*
33 * These GEOM strings indicate absolute size/position: 34 * These GEOM strings indicate absolute size/position:
34 * @ `WxH+X+Y' 35 * @ `WxH+X+Y'
35 * @ `WxH+X' -> Y = X 36 * @ `WxH+X' -> Y = X
… …
47 * @ `+X' -> Y = X 48 * @ `+X' -> Y = X
48 * 49 *
49 * And this GEOM string is for querying current scale/position: 50 * And this GEOM string is for querying current scale/position:
50 * @ `?' 51 * @ `?'
51 */ 52 */
52/* EXTPROTO */
53int 53int
54rxvt_scale_pixmap(pR_ const char *geom) 54rxvt_term::scale_pixmap (const char *geom)
55{ 55{
56 int flags, changed = 0; 56 int flags, changed = 0;
57 int x = 0, y = 0; 57 int x = 0, y = 0;
58 unsigned int w = 0, h = 0; 58 unsigned int w = 0, h = 0;
59 unsigned int n; 59 unsigned int n;
60 char *p, *str; 60 char *p;
61 bgPixmap_t *bgpixmap = &(R->h->bgPixmap); 61 bgPixmap_t *bgpixmap = &bgPixmap;
62 62
63#define MAXLEN_GEOM sizeof("[1000x1000+1000+1000]") 63#define MAXLEN_GEOM sizeof("[10000x10000+10000+10000]")
64 64
65 if (geom == NULL) 65 if (geom == NULL)
66 return 0; 66 return 0;
67 str = rxvt_malloc(MAXLEN_GEOM + 1); 67
68 if (!STRCMP(geom, "?")) { 68 char str[MAXLEN_GEOM];
69
70 if (!strcmp (geom, "?"))
71 {
69 sprintf(str, "[%dx%d+%d+%d]", /* can't presume snprintf() ! */ 72 sprintf (str, "[%dx%d+%d+%d]", /* can't presume snprintf () ! */
70 min(bgpixmap->w, 9999), min(bgpixmap->h, 9999), 73 min (bgpixmap->w, 32767), min (bgpixmap->h, 32767),
71 min(bgpixmap->x, 9999), min(bgpixmap->y, 9999)); 74 min (bgpixmap->x, 32767), min (bgpixmap->y, 32767));
72 rxvt_xterm_seq(aR_ XTerm_title, str, CHAR_ST); 75 process_xterm_seq (XTerm_title, str, CHAR_ST);
73 free(str); 76 return 0;
74 return 0;
75 } 77 }
76 78
77 if ((p = STRCHR(geom, ';')) == NULL) 79 if ((p = strchr (geom, ';')) == NULL)
78 p = STRCHR(geom, '\0'); 80 p = strchr (geom, '\0');
81
79 n = (p - geom); 82 n = (p - geom);
80 if (n <= MAXLEN_GEOM) { 83 if (n < MAXLEN_GEOM)
81 STRNCPY(str, geom, n); 84 {
85 strncpy (str, geom, n);
82 str[n] = '\0'; 86 str[n] = '\0';
83 87
84 flags = XParseGeometry(str, &x, &y, &w, &h); 88 flags = XParseGeometry (str, &x, &y, &w, &h);
85 if (!flags) { 89
90 if (!flags)
91 {
86 flags |= WidthValue; 92 flags |= WidthValue;
87 w = 0; 93 w = 0;
88 } /* default is tile */ 94 } /* default is tile */
95
89 if (flags & WidthValue) { 96 if (flags & WidthValue)
97 {
98 if (!(flags & XValue))
99 x = 50;
100
101 if (!(flags & HeightValue))
102 h = w;
103
104 if (w && !h)
105 {
106 w = (bgpixmap->w * w) / 100;
107 h = bgpixmap->h;
108 }
109 else if (h && !w)
110 {
111 w = bgpixmap->w;
112 h = (bgpixmap->h * h) / 100;
113 }
114
115 min_it (w, 32767);
116 min_it (h, 32767);
117
118 if (bgpixmap->w != (short)w)
119 {
120 bgpixmap->w = (short)w;
121 changed++;
122 }
123
124 if (bgpixmap->h != (short)h)
125 {
126 bgpixmap->h = (short)h;
127 changed++;
128 }
129 }
130
90 if (!(flags & XValue)) 131 if (!(flags & YValue))
91 x = 50; 132 {
92 if (!(flags & HeightValue)) 133 if (flags & XNegative)
93 h = w; 134 flags |= YNegative;
94 if (w && !h) { 135
95 w = (bgpixmap->w * w) / 100; 136 y = x;
96 h = bgpixmap->h; 137 }
97 } else if (h && !w) { 138
98 w = bgpixmap->w; 139 if (!(flags & WidthValue) && geom[0] != '=')
99 h = (bgpixmap->h * h) / 100; 140 {
141 x += bgpixmap->x;
142 y += bgpixmap->y;
143 }
144
145 if (xpmAttr.width && xpmAttr.height)
146 {
147 x = MOD(x, xpmAttr.width);
148 y = MOD(y, xpmAttr.height);
149 }
150
151 if (bgpixmap->x != x)
152 {
153 bgpixmap->x = x;
154 changed++;
155 }
156
157 if (bgpixmap->y != y)
158 {
159 bgpixmap->y = y;
160 changed++;
161 }
100 } 162 }
101 if (w > 1000)
102 w = 1000;
103 if (h > 1000)
104 h = 1000;
105 if (bgpixmap->w != (short)w) {
106 bgpixmap->w = (short)w;
107 changed++;
108 }
109 if (bgpixmap->h != (short)h) {
110 bgpixmap->h = (short)h;
111 changed++;
112 }
113 }
114 if (!(flags & YValue)) {
115 if (flags & XNegative)
116 flags |= YNegative;
117 y = x;
118 }
119 163
120 if (!(flags & WidthValue) && geom[0] != '=') {
121 x += bgpixmap->x;
122 y += bgpixmap->y;
123 } else {
124 if (flags & XNegative)
125 x += 100;
126 if (flags & YNegative)
127 y += 100;
128 }
129 MIN_IT(x, 100);
130 MIN_IT(y, 100);
131 MAX_IT(x, 0);
132 MAX_IT(y, 0);
133 if (bgpixmap->x != x) {
134 bgpixmap->x = x;
135 changed++;
136 }
137 if (bgpixmap->y != y) {
138 bgpixmap->y = y;
139 changed++;
140 }
141 }
142 free(str);
143 return changed; 164 return changed;
144} 165}
145 166
146/* EXTPROTO */
147void 167void
148rxvt_resize_pixmap(pR) 168rxvt_term::resize_pixmap ()
149{ 169{
150 XGCValues gcvalue; 170 XGCValues gcvalue;
151 GC gc; 171 GC gc;
152 unsigned int width = TermWin_TotalWidth();
153 unsigned int height = TermWin_TotalHeight();
154 172
155 if (R->TermWin.pixmap != None) 173 if (pixmap != None)
156 XFreePixmap(R->Xdisplay, R->TermWin.pixmap); 174 XFreePixmap (dpy, pixmap);
157 175
158 if (R->h->bgPixmap.pixmap == None) { /* So be it: I'm not using pixmaps */ 176 if (bgPixmap.pixmap == None)
159 R->TermWin.pixmap = None; 177 { /* So be it: I'm not using pixmaps */
160 if (!(R->Options & Opt_transparent) || R->h->am_transparent == 0) 178 pixmap = None;
161 XSetWindowBackground(R->Xdisplay, R->TermWin.vt,
162 R->PixColors[Color_bg]);
163 return;
164 }
165 179
180#ifdef TRANSPARENT
181 if (!option (Opt_transparent) || !am_transparent)
182#endif
183 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
184
185 return;
186 }
187
166 gcvalue.foreground = R->PixColors[Color_bg]; 188 gcvalue.foreground = pix_colors[Color_bg];
167 gc = XCreateGC(R->Xdisplay, R->TermWin.vt, GCForeground, &gcvalue); 189 gc = XCreateGC (dpy, vt, GCForeground, &gcvalue);
168 190
169 if (R->h->bgPixmap.pixmap != None) { /* we have a specified pixmap */ 191 if (bgPixmap.pixmap != None)
192 { /* we have a specified pixmap */
170 unsigned int w = R->h->bgPixmap.w, h = R->h->bgPixmap.h, 193 unsigned int w = bgPixmap.w, h = bgPixmap.h,
171 x = R->h->bgPixmap.x, y = R->h->bgPixmap.y; 194 x = bgPixmap.x, y = bgPixmap.y;
172 unsigned int xpmh = R->h->xpmAttr.height, 195 unsigned int xpmh = xpmAttr.height,
173 xpmw = R->h->xpmAttr.width; 196 xpmw = xpmAttr.width;
174 197
175 /* 198 /*
176 * don't zoom pixmap too much nor expand really small pixmaps 199 * don't zoom pixmap too much nor expand really small pixmaps
177 */ 200 */
178 if (w > 1000 || h > 1000) 201 if (w > 32767 || h > 32767)
179 w = 1; 202 w = 1;
180 else if (width > (10 * xpmw) 203 else if (width > (10 * xpmw)
181 || height > (10 * xpmh)) 204 || height > (10 * xpmh))
182 w = 0; /* tile */ 205 w = 0; /* tile */
183 206
184 if (w == 0) { 207 if (!w)
208 {
185 /* basic X tiling - let the X server do it */ 209 /* basic X tiling - let the X server do it */
186 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 210 pixmap = XCreatePixmap (dpy, vt, xpmw, xpmh, depth);
187 xpmw, xpmh,
188 (unsigned int)XDEPTH);
189 XCopyArea(R->Xdisplay, R->h->bgPixmap.pixmap, R->TermWin.pixmap, gc,
190 0, 0, xpmw, xpmh, 0, 0);
191 } else {
192 float incr, p;
193 Pixmap tmp;
194 211
195 R->TermWin.pixmap = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 212 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, y, xpmw - x, xpmh - y, 0, 0);
196 width, height, 213 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, x, 0, xpmw - x, y, 0, xpmh - y);
197 (unsigned int)XDEPTH); 214 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, y, x, xpmh - y, xpmw - x, 0);
198 /* 215 XCopyArea (dpy, bgPixmap.pixmap, pixmap, gc, 0, 0, x, y, xpmw - x, xpmh - y);
216 }
217 else
218 {
219 float incr, p;
220 Pixmap tmp;
221
222 pixmap = XCreatePixmap (dpy, vt, width, height, depth);
223 /*
199 * horizontal scaling 224 * horizontal scaling
200 */ 225 */
201 rxvt_pixmap_incr(&w, &x, &incr, &p, width, xpmw); 226 rxvt_pixmap_incr (&w, &x, &incr, &p, width, xpmw);
202 227
203 tmp = XCreatePixmap(R->Xdisplay, R->TermWin.vt, 228 tmp = XCreatePixmap (dpy, vt, width, xpmh, depth);
204 width, xpmh, (unsigned int)XDEPTH);
205 XFillRectangle(R->Xdisplay, tmp, gc, 0, 0, width, 229 XFillRectangle (dpy, tmp, gc, 0, 0, width, xpmh);
206 xpmh);
207 230
208 for ( /*nil */ ; x < w; x++, p += incr) { 231 for ( /*nil */ ; x < w; x++, p += incr)
209 if (p >= xpmw) 232 {
210 p = 0; 233 if (p >= xpmw)
234 p = 0;
235
211 /* copy one column from the original pixmap to the tmp pixmap */ 236 /* copy one column from the original pixmap to the tmp pixmap */
212 XCopyArea(R->Xdisplay, R->h->bgPixmap.pixmap, tmp, gc, 237 XCopyArea (dpy, bgPixmap.pixmap, tmp, gc, (int)p, 0, 1, xpmh, (int)x, 0);
213 (int)p, 0, 1, xpmh, (int)x, 0); 238 }
214 }
215 239
216 /* 240 /*
217 * vertical scaling 241 * vertical scaling
218 */ 242 */
219 rxvt_pixmap_incr(&h, &y, &incr, &p, height, xpmh); 243 rxvt_pixmap_incr (&h, &y, &incr, &p, height, xpmh);
220 244
221 if (y > 0) 245 if (y > 0)
222 XFillRectangle(R->Xdisplay, R->TermWin.pixmap, gc, 0, 0, width, 246 XFillRectangle (dpy, pixmap, gc, 0, 0, width, y);
223 y); 247
224 if (h < height) 248 if (h < height)
225 XFillRectangle(R->Xdisplay, R->TermWin.pixmap, gc, 0, (int)h, 249 XFillRectangle (dpy, pixmap, gc, 0, (int)h, width, height - h + 1);
226 width, height - h + 1); 250
227 for ( /*nil */ ; y < h; y++, p += incr) { 251 for ( /*nil */ ; y < h; y++, p += incr)
228 if (p >= xpmh) 252 {
229 p = 0; 253 if (p >= xpmh)
254 p = 0;
255
230 /* copy one row from the tmp pixmap to the main pixmap */ 256 /* copy one row from the tmp pixmap to the main pixmap */
231 XCopyArea(R->Xdisplay, tmp, R->TermWin.pixmap, gc, 257 XCopyArea (dpy, tmp, pixmap, gc, 0, (int)p, width, 1, 0, (int)y);
232 0, (int)p, width, 1, 0, (int)y); 258 }
259
260 XFreePixmap (dpy, tmp);
261 }
233 } 262 }
234 XFreePixmap(R->Xdisplay, tmp); 263
235 } 264 XSetWindowBackgroundPixmap (dpy, vt, pixmap);
236 } 265
237 XSetWindowBackgroundPixmap(R->Xdisplay, R->TermWin.vt, R->TermWin.pixmap);
238 XFreeGC(R->Xdisplay, gc); 266 XFreeGC (dpy, gc);
267#ifdef TRANSPARENT
239 R->h->am_transparent = 0; 268 am_transparent = 0;
240 269#endif
241 XClearWindow(R->Xdisplay, R->TermWin.vt);
242
243 XSync(R->Xdisplay, False);
244} 270}
245 271
246/* 272/*
247 * Calculate tiling sizes and increments 273 * Calculate tiling sizes and increments
248 * At start, p == 0, incr == xpmwidthheight 274 * At start, p == 0, incr == xpmwidthheight
249 */ 275 */
250/* INTPROTO */ 276static void
251void
252rxvt_pixmap_incr(unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight) 277rxvt_pixmap_incr (unsigned int *wh, unsigned int *xy, float *incr, float *p, unsigned int widthheight, unsigned int xpmwidthheight)
253{ 278{
254 unsigned int cwh, cxy; 279 unsigned int cwh, cxy;
255 float cincr, cp; 280 float cincr, cp;
256 281
257 cp = 0; 282 cp = 0;
258 cincr = (float)xpmwidthheight; 283 cincr = (float)xpmwidthheight;
259 cxy = *xy; 284 cxy = *xy;
260 cwh = *wh; 285 cwh = *wh;
286 if (cwh == 1)
261 if (cwh == 1) { /* display one image, no horizontal/vertical scaling */ 287 { /* display one image, no horizontal/vertical scaling */
262 cincr = (float)widthheight; 288 cincr = (float)widthheight;
263 if (xpmwidthheight <= widthheight) { 289 if (xpmwidthheight <= widthheight)
290 {
264 cwh = xpmwidthheight; 291 cwh = xpmwidthheight;
265 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */ 292 cxy = (cxy * (widthheight - cwh)) / 100; /* beware! order */
266 cwh += cxy; 293 cwh += cxy;
267 } else { 294 }
295 else
296 {
297 cxy = 0;
298 cwh = widthheight;
299 }
300 }
301 else if (cwh < 10)
302 { /* fit WH images across/down screen */
303 cincr *= cwh;
268 cxy = 0; 304 cxy = 0;
269 cwh = widthheight; 305 cwh = widthheight;
270 } 306 }
271 } else if (cwh < 10) { /* fit WH images across/down screen */ 307 else
272 cincr *= cwh; 308 {
273 cxy = 0;
274 cwh = widthheight;
275 } else {
276 cincr *= 100.0 / cwh; 309 cincr *= 100.0 / cwh;
277 if (cwh < 100) { /* contract */ 310 if (cwh < 100)
311 { /* contract */
278 float pos; 312 float pos;
279 313
280 cwh = (cwh * widthheight) / 100; 314 cwh = (cwh * widthheight) / 100;
281 pos = (float)cxy / 100 * widthheight - (cwh / 2); 315 pos = (float)cxy / 100 * widthheight - (cwh / 2);
282 316
283 cxy = (widthheight - cwh); 317 cxy = (widthheight - cwh);
284 if (pos <= 0) 318 if (pos <= 0)
285 cxy = 0; 319 cxy = 0;
286 else if (pos < cxy) 320 else if (pos < cxy)
287 cxy = pos; 321 cxy = (int) pos;
288 cwh += cxy; 322 cwh += cxy;
289 } else { /* expand */ 323 }
290 if (cxy > 0) { /* position */ 324 else
291 float pos; 325 { /* expand */
326 if (cxy > 0)
327 { /* position */
328 float pos;
292 329
293 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2); 330 pos = (float)cxy / 100 * xpmwidthheight - (cincr / 2);
294 cp = xpmwidthheight - cincr; 331 cp = xpmwidthheight - cincr;
295 if (pos <= 0) 332 if (pos <= 0)
296 cp = 0; 333 cp = 0;
297 else if (pos < cp) 334 else if (pos < cp)
298 cp = pos; 335 cp = pos;
336 }
337 cxy = 0;
338 cwh = widthheight;
339 }
299 } 340 }
300 cxy = 0;
301 cwh = widthheight;
302 }
303 }
304 cincr /= widthheight; 341 cincr /= widthheight;
305 *wh = cwh; 342 *wh = cwh;
306 *xy = cxy; 343 *xy = cxy;
307 *incr = cincr; 344 *incr = cincr;
308 *p = cp; 345 *p = cp;
309} 346}
310 347
311/* EXTPROTO */
312Pixmap 348Pixmap
313rxvt_set_bgPixmap(pR_ const char *file) 349rxvt_term::set_bgPixmap (const char *file)
314{ 350{
315 char *f; 351 char *f;
316 352
317 assert(file != NULL); 353 assert (file != NULL);
318 354
319 if (R->h->bgPixmap.pixmap != None) { 355 if (bgPixmap.pixmap != None)
320 XFreePixmap(R->Xdisplay, R->h->bgPixmap.pixmap);
321 R->h->bgPixmap.pixmap = None;
322 } 356 {
357 XFreePixmap (dpy, bgPixmap.pixmap);
358 bgPixmap.pixmap = None;
359 }
360
323 XSetWindowBackground(R->Xdisplay, R->TermWin.vt, R->PixColors[Color_bg]); 361 XSetWindowBackground (dpy, vt, pix_colors[Color_bg]);
324 362
325 if (*file != '\0') { 363 if (*file != '\0')
364 {
326/* XWindowAttributes attr; */ 365 /* XWindowAttributes attr; */
327 366
328 /* 367 /*
329 * we already have the required attributes 368 * we already have the required attributes
330 */ 369 */
331/* XGetWindowAttributes(R->Xdisplay, R->TermWin.vt, &attr); */ 370 /* XGetWindowAttributes (dpy, vt, &attr); */
332 371
333 R->h->xpmAttr.closeness = 30000; 372 xpmAttr.closeness = 30000;
334 R->h->xpmAttr.colormap = XCMAP; 373 xpmAttr.colormap = cmap;
335 R->h->xpmAttr.visual = XVISUAL; 374 xpmAttr.visual = visual;
336 R->h->xpmAttr.depth = XDEPTH; 375 xpmAttr.depth = depth;
337 R->h->xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual | 376 xpmAttr.valuemask = (XpmCloseness | XpmColormap | XpmVisual
338 XpmDepth | XpmSize | XpmReturnPixels); 377 | XpmDepth | XpmSize | XpmReturnPixels);
339 378
340 /* search environment variables here too */ 379 /* search environment variables here too */
341 f = (char *)rxvt_File_find(file, ".xpm", R->h->rs[Rs_path]); 380 f = (char *)rxvt_File_find (file, ".xpm", rs[Rs_path]);
342 if (f == NULL 381 if (f == NULL
343 || XpmReadFileToPixmap(R->Xdisplay, Xroot, f, 382 || XpmReadFileToPixmap (dpy, display->root, f,
344 &R->h->bgPixmap.pixmap, NULL, 383 &bgPixmap.pixmap, NULL,
345 &R->h->xpmAttr)) { 384 &xpmAttr))
346 char *p; 385 {
386 char *p;
347 387
348 /* semi-colon delimited */ 388 /* semi-colon delimited */
349 if ((p = STRCHR(file, ';')) == NULL) 389 if ((p = strchr (file, ';')) == NULL)
350 p = STRCHR(file, '\0'); 390 p = strchr (file, '\0');
351 391
352 rxvt_print_error("couldn't load XPM file \"%.*s\"", (p - file), 392 rxvt_warn ("couldn't load XPM file \"%.*s\", ignoring.\n", (p - file), file);
353 file); 393 }
354 } 394
355 free(f); 395 free (f);
356 } 396 }
397
357 rxvt_resize_pixmap(aR); 398 resize_pixmap ();
358 return R->h->bgPixmap.pixmap; 399 return bgPixmap.pixmap;
359} 400}
360 401
361#endif /* XPM_BACKGROUND */ 402#endif /* XPM_BACKGROUND */

Diff Legend

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