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

Comparing rxvt-unicode/src/misc.C (file contents):
Revision 1.22 by root, Mon Dec 20 18:07:19 2004 UTC vs.
Revision 1.50 by ayin, Tue Dec 18 01:36:24 2007 UTC

1/*--------------------------------*-C-*---------------------------------* 1/*----------------------------------------------------------------------*
2 * File: misc.C 2 * File: misc.C
3 *----------------------------------------------------------------------* 3 *----------------------------------------------------------------------*
4 * 4 *
5 * All portions of code are copyright by their respective author/s. 5 * All portions of code are copyright by their respective author/s.
6 * Copyright (c) 1996 mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston 6 * Copyright (c) 1996 mj olesen <olesen@me.QueensU.CA> Queen's Univ at Kingston
7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de> 7 * Copyright (c) 1997,1998 Oezguer Kesim <kesim@math.fu-berlin.de>
8 * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com> 8 * Copyright (c) 1998-2000 Geoff Wing <gcw@pobox.com>
9 * Copyright (c) 2003-2004 Marc Lehmann <pcg@goof.com> 9 * Copyright (c) 2003-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 "misc.intpro" /* PROTOS for internal routines */
29 28
30char * 29char *
31rxvt_wcstombs (const wchar_t *str, int len) 30rxvt_wcstombs (const wchar_t *str, int len)
32{ 31{
33 if (len < 0) len = wcslen (str); 32 if (len < 0) len = wcslen (str);
… …
36 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1); 35 char *r = (char *)rxvt_malloc (len * MB_CUR_MAX + 1);
37 36
38 char *dst = r; 37 char *dst = r;
39 while (len--) 38 while (len--)
40 { 39 {
41 int l = wcrtomb (dst, *str++, mbs); 40 ssize_t l = wcrtomb (dst, *str++, mbs);
41
42 if (l < 0) 42 if (l < 0)
43 *dst++ = '?'; 43 *dst++ = '?';
44 else 44 else
45 dst += l; 45 dst += l;
46 } 46 }
47 47
48 *dst++ = 0; 48 *dst++ = 0;
49 49
50 return r; 50 return (char *)rxvt_realloc (r, dst - r);
51} 51}
52 52
53wchar_t * 53wchar_t *
54rxvt_mbstowcs (const char *str, int len) 54rxvt_mbstowcs (const char *str, int len)
55{ 55{
56 if (len < 0) len = strlen (str); 56 if (len < 0) len = strlen (str);
57 57
58 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t)); 58 wchar_t *r = (wchar_t *)rxvt_malloc ((len + 1) * sizeof (wchar_t));
59 59
60 if (mbstowcs (r, str, len + 1) < 0) 60 if ((ssize_t)mbstowcs (r, str, len + 1) < 0)
61 *r = 0; 61 *r = 0;
62 62
63 return r; 63 return r;
64} 64}
65 65
… …
79 *p++ = w; 79 *p++ = w;
80 else if (w < 0x000800) 80 else if (w < 0x000800)
81 *p++ = 0xc0 | ( w >> 6), 81 *p++ = 0xc0 | ( w >> 6),
82 *p++ = 0x80 | ( w & 0x3f); 82 *p++ = 0x80 | ( w & 0x3f);
83 else if (w < 0x010000) 83 else if (w < 0x010000)
84 *p++ = 0xe0 | ( w >> 12 ), 84 *p++ = 0xe0 | ( w >> 12),
85 *p++ = 0x80 | ((w >> 6) & 0x3f), 85 *p++ = 0x80 | ((w >> 6) & 0x3f),
86 *p++ = 0x80 | ( w & 0x3f); 86 *p++ = 0x80 | ( w & 0x3f);
87 else if (w < 0x110000) 87 else if (w < 0x110000)
88 *p++ = 0xf0 | ( w >> 18), 88 *p++ = 0xf0 | ( w >> 18),
89 *p++ = 0x80 | ((w >> 12) & 0x3f), 89 *p++ = 0x80 | ((w >> 12) & 0x3f),
… …
91 *p++ = 0x80 | ( w & 0x3f); 91 *p++ = 0x80 | ( w & 0x3f);
92 else 92 else
93 *p++ = '?'; 93 *p++ = '?';
94 } 94 }
95 95
96 *p = 0; 96 *p++ = 0;
97 97
98 return r; 98 return (char *)rxvt_realloc (r, p - r);
99} 99}
100 100
101wchar_t * 101wchar_t *
102rxvt_utf8towcs (const char *str, int len) 102rxvt_utf8towcs (const char *str, int len)
103{ 103{
… …
116 if (len == 0) 116 if (len == 0)
117 break; 117 break;
118 else if (s[0] < 0x80) 118 else if (s[0] < 0x80)
119 *p++ = *s++; 119 *p++ = *s++;
120 else if (len >= 2 120 else if (len >= 2
121 && s[0] >= 0xc2 && s[0] <= 0xdf 121 && s[0] >= 0xc2 && s[0] <= 0xdf
122 && (s[1] & 0xc0) == 0x80) 122 && (s[1] & 0xc0) == 0x80)
123 { 123 {
124 *p++ = ((s[0] & 0x1f) << 6) 124 *p++ = ((s[0] & 0x1f) << 6)
125 | (s[1] & 0x3f); 125 | (s[1] & 0x3f);
126 s += 2; 126 s += 2;
… …
144 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f) 144 || (s[0] == 0xf4 && s[1] >= 0x80 && s[1] <= 0x8f)
145 ) 145 )
146 && (s[2] & 0xc0) == 0x80 146 && (s[2] & 0xc0) == 0x80
147 && (s[3] & 0xc0) == 0x80) 147 && (s[3] & 0xc0) == 0x80)
148 { 148 {
149 *p++ = ((s[0] & 0x07) << 18) 149 *p++ = ((s[0] & 0x07) << 18)
150 | ((s[1] & 0x3f) << 12) 150 | ((s[1] & 0x3f) << 12)
151 | ((s[2] & 0x3f) << 6) 151 | ((s[2] & 0x3f) << 6)
152 | (s[3] & 0x3f); 152 | (s[3] & 0x3f);
153 s += 4; 153 s += 4;
154 } 154 }
155 else 155 else
156 { 156 {
… …
163 163
164 return r; 164 return r;
165} 165}
166 166
167char * 167char *
168rxvt_strdup (const char *str)
169{
170 return str ? strdup (str) : 0;
171}
172
173/* INTPROTO */
174char *
175rxvt_r_basename (const char *str) 168rxvt_basename (const char *str) NOTHROW
176{ 169{
177 char *base = strrchr (str, '/'); 170 char *base = strrchr (str, '/');
178 171
179 return (char *) (base ? base + 1 : str); 172 return (char *) (base ? base + 1 : str);
180} 173}
181 174
182/* 175/*
183 * Print an error message 176 * Print an error message
184 */ 177 */
185/* INTPROTO */
186void 178void
187rxvt_vlog (const char *fmt, va_list arg_ptr) 179rxvt_vlog (const char *fmt, va_list arg_ptr) NOTHROW
188{ 180{
189 char msg[1024]; 181 char msg[1024];
190 182
191 vsnprintf (msg, sizeof msg, fmt, arg_ptr); 183 vsnprintf (msg, sizeof msg, fmt, arg_ptr);
192 184
… …
194 (*GET_R->log_hook) (msg); 186 (*GET_R->log_hook) (msg);
195 else 187 else
196 write (STDOUT_FILENO, msg, strlen (msg)); 188 write (STDOUT_FILENO, msg, strlen (msg));
197} 189}
198 190
199/* INTPROTO */
200void 191void
201rxvt_log (const char *fmt,...) 192rxvt_log (const char *fmt,...) NOTHROW
202{ 193{
203 va_list arg_ptr; 194 va_list arg_ptr;
204 195
205 va_start (arg_ptr, fmt); 196 va_start (arg_ptr, fmt);
206 rxvt_vlog (fmt, arg_ptr); 197 rxvt_vlog (fmt, arg_ptr);
… …
208} 199}
209 200
210/* 201/*
211 * Print an error message 202 * Print an error message
212 */ 203 */
213/* INTPROTO */
214void 204void
215rxvt_warn (const char *fmt,...) 205rxvt_warn (const char *fmt,...) NOTHROW
216{ 206{
217 va_list arg_ptr; 207 va_list arg_ptr;
218 208
219 rxvt_log ("%s: ", RESNAME); 209 rxvt_log ("%s: ", RESNAME);
220 210
221 va_start (arg_ptr, fmt); 211 va_start (arg_ptr, fmt);
222 rxvt_vlog (fmt, arg_ptr); 212 rxvt_vlog (fmt, arg_ptr);
223 va_end (arg_ptr); 213 va_end (arg_ptr);
224} 214}
225 215
226/* INTPROTO */
227void 216void
228rxvt_fatal (const char *fmt,...) 217rxvt_fatal (const char *fmt,...) THROW ((class rxvt_failure_exception))
229{ 218{
230 va_list arg_ptr; 219 va_list arg_ptr;
231 220
232 rxvt_log ("%s: ", RESNAME); 221 rxvt_log ("%s: ", RESNAME);
233 222
… …
236 va_end (arg_ptr); 225 va_end (arg_ptr);
237 226
238 rxvt_exit_failure (); 227 rxvt_exit_failure ();
239} 228}
240 229
230void
231rxvt_exit_failure () THROW ((class rxvt_failure_exception))
232{
241class rxvt_failure_exception rxvt_failure_exception; 233 static class rxvt_failure_exception rxvt_failure_exception;
242
243/* INTPROTO */
244void
245rxvt_exit_failure ()
246{
247 throw (rxvt_failure_exception); 234 throw (rxvt_failure_exception);
248} 235}
249 236
250/* 237/*
251 * check that the first characters of S1 match S2 238 * remove leading/trailing space in place.
252 *
253 * No Match
254 * return: 0
255 * Match
256 * return: strlen (S2)
257 */ 239 */
258/* INTPROTO */ 240char *
259int
260rxvt_Str_match (const char *s1, const char *s2)
261{
262 int n = strlen (s2);
263
264 return ((strncmp (s1, s2, n) == 0) ? n : 0);
265}
266
267/* INTPROTO */
268const char *
269rxvt_Str_skip_space (const char *str)
270{
271 if (str)
272 while (*str && isspace (*str))
273 str++;
274
275 return str;
276}
277
278/*
279 * remove leading/trailing space and strip-off leading/trailing quotes.
280 * in place.
281 */
282/* INTPROTO */
283char *
284rxvt_Str_trim (char *str) 241rxvt_strtrim (char *str) NOTHROW
285{ 242{
286 char *r, *s; 243 char *r, *s;
287 int n;
288 244
289 if (!str || !*str) /* shortcut */ 245 if (!str || !*str) /* shortcut */
290 return str; 246 return str;
291 247
292 /* skip leading spaces */ 248 /* skip leading spaces */
293 for (s = str; *s && isspace (*s); s++) ; 249 for (s = str; *s && isspace (*s); s++) ;
250
294 /* goto end of string */ 251 /* goto end of string */
295 for (n = 0, r = s; *r++; n++) ; 252 r = s + strlen (s) - 1;
296 r -= 2; 253
297 /* dump return */ 254 /* dump return and other trailing whitespace */
298 if (n > 0 && *r == '\n') 255 while (r > s && isspace (*r))
299 n--, r--; 256 r--;
300 /* backtrack along trailing spaces */
301 for (; n > 0 && isspace (*r); r--, n--) ;
302 /* skip matching leading/trailing quotes */
303 if (*s == '"' && *r == '"' && n > 1)
304 {
305 s++;
306 n -= 2;
307 }
308 257
309 /* copy back over: forwards copy */ 258 memmove (str, s, r + 1 - s);
310 for (r = str; n; n--) 259 str[r + 1 - s] = 0;
311 *r++ = *s++;
312 *r = '\0';
313 260
314 return str; 261 return str;
315}
316
317/*
318 * in-place interpretation of string:
319 *
320 * backslash-escaped: "\a\b\E\e\n\r\t", "\octal"
321 * Ctrl chars: ^@ .. ^_, ^?
322 *
323 * Emacs-style: "M-" prefix
324 *
325 * Also,
326 * "M-x" prefixed strings, append "\r" if needed
327 * "\E]" prefixed strings (XTerm escape sequence) append ST if needed
328 *
329 * returns the converted string length
330 */
331/* INTPROTO */
332int
333rxvt_Str_escaped (char *str)
334{
335 char ch, *s, *d;
336 int i, num, append = 0;
337
338 if (!str || !*str)
339 return 0;
340
341 d = s = str;
342
343 if (*s == 'M' && s[1] == '-')
344 {
345 /* Emacs convenience, replace leading `M-..' with `\E..' */
346 *d++ = C0_ESC;
347 s += 2;
348 if (toupper (*s) == 'X')
349 /* append carriage-return for `M-xcommand' */
350 for (*d++ = 'x', append = '\r', s++; isspace (*s); s++) ;
351 }
352 for (; (ch = *s++);)
353 {
354 if (ch == '\\')
355 {
356 ch = *s++;
357 if (ch >= '0' && ch <= '7')
358 { /* octal */
359 num = ch - '0';
360 for (i = 0; i < 2; i++, s++)
361 {
362 ch = *s;
363 if (ch < '0' || ch > '7')
364 break;
365 num = num * 8 + ch - '0';
366 }
367 ch = (char)num;
368 }
369 else if (ch == 'a')
370 ch = C0_BEL; /* bell */
371 else if (ch == 'b')
372 ch = C0_BS; /* backspace */
373 else if (ch == 'E' || ch == 'e')
374 ch = C0_ESC; /* escape */
375 else if (ch == 'n')
376 ch = '\n'; /* newline */
377 else if (ch == 'r')
378 ch = '\r'; /* carriage-return */
379 else if (ch == 't')
380 ch = C0_HT; /* tab */
381 }
382 else if (ch == '^')
383 {
384 ch = *s++;
385 ch = toupper (ch);
386 ch = (ch == '?' ? 127 : (ch - '@'));
387 }
388 *d++ = ch;
389 }
390
391 /* ESC] is an XTerm escape sequence, must be terminated */
392 if (*str == '\0' && str[1] == C0_ESC && str[2] == ']')
393 append = CHAR_ST;
394
395 /* add trailing character as required */
396 if (append && d[-1] != append)
397 *d++ = append;
398 *d = '\0';
399
400 return (d - str);
401} 262}
402 263
403/* 264/*
404 * Split a comma-separated string into an array, stripping leading and 265 * Split a comma-separated string into an array, stripping leading and
405 * trailing spaces (and paired quotes) from each entry. Empty strings 266 * trailing spaces from each entry. Empty strings are properly returned
406 * are properly returned
407 * Caller should free each entry and array when done
408 */ 267 */
409/* INTPROTO */ 268char **
410char **
411rxvt_splitcommastring (const char *cs) 269rxvt_splitcommastring (const char *cs) NOTHROW
412{ 270{
413 int l, n, p; 271 int l, n, p;
414 const char *s, *t; 272 const char *s, *t;
415 char **ret; 273 char **ret;
416 274
… …
418 s = ""; 276 s = "";
419 277
420 for (n = 1, t = s; *t; t++) 278 for (n = 1, t = s; *t; t++)
421 if (*t == ',') 279 if (*t == ',')
422 n++; 280 n++;
281
423 ret = (char **)malloc ((n + 1) * sizeof (char *)); 282 ret = (char **)malloc ((n + 1) * sizeof (char *));
424 ret[n] = NULL; 283 ret[n] = NULL;
425 284
426 for (l = 0, t = s; l < n; l++) 285 for (l = 0, t = s; l < n; l++)
427 { 286 {
428 for ( ; *t && *t != ','; t++) ; 287 for ( ; *t && *t != ','; t++) ;
429 p = t - s; 288 p = t - s;
430 ret[l] = (char *)malloc (p + 1); 289 ret[l] = (char *)malloc (p + 1);
431 strncpy (ret[l], s, p); 290 strncpy (ret[l], s, p);
432 ret[l][p] = '\0'; 291 ret[l][p] = '\0';
433 rxvt_Str_trim (ret[l]); 292 rxvt_strtrim (ret[l]);
434 s = ++t; 293 s = ++t;
435 } 294 }
295
436 return ret; 296 return ret;
437} 297}
438 298
439void 299void
440rxvt_freecommastring (char **cs) 300rxvt_freecommastring (char **cs) NOTHROW
441{ 301{
442 for (int i = 0; cs[i]; ++i) 302 for (int i = 0; cs[i]; ++i)
443 free (cs[i]); 303 free (cs[i]);
444 304
445 free (cs); 305 free (cs);
446} 306}
447 307
448/*----------------------------------------------------------------------* 308void *
449 * file searching 309rxvt_malloc (size_t size)
450 */
451
452/* #define DEBUG_SEARCH_PATH */
453
454#if defined (XPM_BACKGROUND) || (MENUBAR_MAX)
455/*
456 * search for FILE in the current working directory, and within the
457 * colon-delimited PATHLIST, adding the file extension EXT if required.
458 *
459 * FILE is either semi-colon or zero terminated
460 */
461/* INTPROTO */
462char *
463rxvt_File_search_path (const char *pathlist, const char *file, const char *ext)
464{ 310{
465 int maxpath, len; 311 void *p = malloc (size);
466 const char *p, *path;
467 char name[256];
468 312
469 if (!access (file, R_OK)) /* found (plain name) in current directory */
470 return strdup (file);
471
472 /* semi-colon delimited */
473 if ((p = strchr (file, ';')))
474 len = (p - file);
475 else
476 len = strlen (file);
477
478#ifdef DEBUG_SEARCH_PATH
479 getcwd (name, sizeof (name));
480 fprintf (stderr, "pwd: \"%s\"\n", name);
481 fprintf (stderr, "find: \"%.*s\"\n", len, file);
482#endif
483
484 /* leave room for an extra '/' and trailing '\0' */
485 maxpath = sizeof (name) - (len + (ext ? strlen (ext) : 0) + 2);
486 if (maxpath <= 0)
487 return NULL;
488
489 /* check if we can find it now */
490 strncpy (name, file, len);
491 name[len] = '\0';
492
493 if (!access (name, R_OK))
494 return strdup (name);
495 if (ext)
496 {
497 strcat (name, ext);
498 if (!access (name, R_OK))
499 return strdup (name);
500 }
501 for (path = pathlist; path != NULL && *path != '\0'; path = p)
502 {
503 int n;
504
505 /* colon delimited */
506 if ((p = strchr (path, ':')) == NULL)
507 p = strchr (path, '\0');
508
509 n = (p - path);
510 if (*p != '\0')
511 p++;
512
513 if (n > 0 && n <= maxpath)
514 {
515 strncpy (name, path, n);
516 if (name[n - 1] != '/')
517 name[n++] = '/';
518 name[n] = '\0';
519 strncat (name, file, len);
520
521 if (!access (name, R_OK))
522 return strdup (name);
523 if (ext)
524 {
525 strcat (name, ext);
526 if (!access (name, R_OK))
527 return strdup (name);
528 }
529 }
530 }
531 return NULL;
532}
533
534/* INTPROTO */
535char *
536rxvt_File_find (const char *file, const char *ext, const char *path)
537{
538 char *f;
539
540 if (file == NULL || *file == '\0')
541 return NULL;
542
543 /* search environment variables here too */
544 if ((f = rxvt_File_search_path (path, file, ext)) == NULL)
545#ifdef PATH_ENV
546 if ((f = rxvt_File_search_path (getenv (PATH_ENV), file, ext)) == NULL)
547#endif
548 f = rxvt_File_search_path (getenv ("PATH"), file, ext);
549
550#ifdef DEBUG_SEARCH_PATH
551 if (f) 313 if (!p)
552 fprintf (stderr, "found: \"%s\"\n", f); 314 rxvt_fatal ("memory allocation failure. aborting.\n");
553#endif
554 315
555 return f; 316 return p;
556} 317}
557#endif /* defined (XPM_BACKGROUND) || (MENUBAR_MAX) */
558 318
559/*----------------------------------------------------------------------*
560 * miscellaneous drawing routines
561 */
562
563/*
564 * Draw top/left and bottom/right border shadows around windows
565 */
566#if defined(RXVT_SCROLLBAR) || defined(MENUBAR)
567/* INTPROTO */
568void 319void *
569rxvt_Draw_Shadow (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int h) 320rxvt_calloc (size_t number, size_t size)
570{ 321{
571 int shadow; 322 void *p = calloc (number, size);
572 323
573 shadow = (w == 0 || h == 0) ? 1 : SHADOW; 324 if (!p)
574 w += x - 1; 325 rxvt_fatal ("memory allocation failure. aborting.\n");
575 h += y - 1;
576 for (; shadow-- > 0; x++, y++, w--, h--)
577 {
578 XDrawLine (display, win, topShadow, x, y, w, y);
579 XDrawLine (display, win, topShadow, x, y, x, h);
580 XDrawLine (display, win, botShadow, w, h, w, y + 1);
581 XDrawLine (display, win, botShadow, w, h, x + 1, h);
582 }
583}
584#endif
585 326
586/* button shapes */ 327 return p;
587#ifdef MENUBAR 328}
588/* INTPROTO */ 329
589void 330void *
590rxvt_Draw_Triangle (Display *display, Window win, GC topShadow, GC botShadow, int x, int y, int w, int type) 331rxvt_realloc (void *ptr, size_t size)
591{ 332{
592 switch (type) 333 void *p = realloc (ptr, size);
593 {
594 case 'r': /* right triangle */
595 XDrawLine (display, win, topShadow, x, y, x, y + w);
596 XDrawLine (display, win, topShadow, x, y, x + w, y + w / 2);
597 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w / 2);
598 break;
599 334
600 case 'l': /* left triangle */ 335 if (!p)
601 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y); 336 rxvt_fatal ("memory allocation failure. aborting.\n");
602 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w / 2);
603 XDrawLine (display, win, topShadow, x, y + w / 2, x + w, y);
604 break;
605 337
606 case 'd': /* down triangle */ 338 return p;
607 XDrawLine (display, win, topShadow, x, y, x + w / 2, y + w);
608 XDrawLine (display, win, topShadow, x, y, x + w, y);
609 XDrawLine (display, win, botShadow, x + w, y, x + w / 2, y + w);
610 break;
611
612 case 'u': /* up triangle */
613 XDrawLine (display, win, botShadow, x + w, y + w, x + w / 2, y);
614 XDrawLine (display, win, botShadow, x + w, y + w, x, y + w);
615 XDrawLine (display, win, topShadow, x, y + w, x + w / 2, y);
616 break;
617#if 0
618 case 's': /* square */
619 XDrawLine (display, win, topShadow, x + w, y, x, y);
620 XDrawLine (display, win, topShadow, x, y, x, y + w);
621 XDrawLine (display, win, botShadow, x, y + w, x + w, y + w);
622 XDrawLine (display, win, botShadow, x + w, y + w, x + w, y);
623 break;
624#endif
625
626 }
627} 339}
628#endif
629/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

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