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

Comparing rxvt-unicode/src/main.C (file contents):
Revision 1.240 by sasha, Fri Aug 10 22:10:36 2007 UTC vs.
Revision 1.261 by root, Mon Nov 19 15:33:34 2007 UTC

38#include <limits> 38#include <limits>
39 39
40#include <csignal> 40#include <csignal>
41#include <cstring> 41#include <cstring>
42 42
43#ifdef TTY_GID_SUPPORT
44# include <grp.h>
45#endif
46
47#ifdef HAVE_TERMIOS_H 43#ifdef HAVE_TERMIOS_H
48# include <termios.h> 44# include <termios.h>
45#endif
46
47#ifdef HAVE_XSETLOCALE
48# define X_LOCALE
49# include <X11/Xlocale.h>
50#else
51# ifdef HAVE_SETLOCALE
52# include <clocale>
53# endif
49#endif 54#endif
50 55
51vector<rxvt_term *> rxvt_term::termlist; 56vector<rxvt_term *> rxvt_term::termlist;
52 57
53// used to tell global functions which terminal instance is "active" 58// used to tell global functions which terminal instance is "active"
88class rxvt_composite_vec rxvt_composite; 93class rxvt_composite_vec rxvt_composite;
89 94
90text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2) 95text_t rxvt_composite_vec::compose (unicode_t c1, unicode_t c2)
91{ 96{
92 compose_char *cc; 97 compose_char *cc;
93 98
94 // break compose chains, as stupid readline really likes to duplicate 99 // break compose chains, as stupid readline really likes to duplicate
95 // composing characters for some reason near the end of a line. 100 // composing characters for some reason near the end of a line.
96 cc = (*this)[c1]; 101 cc = (*this)[c1];
97 while (cc) 102 while (cc)
98 { 103 {
151rxvt_term::rxvt_term () 156rxvt_term::rxvt_term ()
152 : 157 :
153#if ENABLE_TRANSPARENCY || ENABLE_PERL 158#if ENABLE_TRANSPARENCY || ENABLE_PERL
154 rootwin_ev (this, &rxvt_term::rootwin_cb), 159 rootwin_ev (this, &rxvt_term::rootwin_cb),
155#endif 160#endif
156#if ENABLE_TRANSPARENCY 161#if HAVE_BG_PIXMAP
157 check_our_parents_ev(this, &rxvt_term::check_our_parents_cb), 162 update_background_ev(this, &rxvt_term::update_background_cb),
158#endif 163#endif
159#ifdef HAVE_SCROLLBARS 164#ifdef HAVE_SCROLLBARS
160 scrollbar_ev (this, &rxvt_term::x_cb), 165 scrollbar_ev (this, &rxvt_term::x_cb),
161#endif 166#endif
162#ifdef CURSOR_BLINK 167#ifdef CURSOR_BLINK
176#endif 181#endif
177#ifdef POINTER_BLANK 182#ifdef POINTER_BLANK
178 pointer_ev (this, &rxvt_term::pointer_cb), 183 pointer_ev (this, &rxvt_term::pointer_cb),
179#endif 184#endif
180#ifdef USE_XIM 185#ifdef USE_XIM
181 im_ev (this, &rxvt_term::im_cb), 186 im_ev (this, &rxvt_term::im_cb),
182#endif 187#endif
183#ifndef NO_BELL 188#ifndef NO_BELL
184 bell_ev (this, &rxvt_term::bell_cb), 189 bell_ev (this, &rxvt_term::bell_cb),
185#endif 190#endif
186 termwin_ev (this, &rxvt_term::x_cb), 191 termwin_ev (this, &rxvt_term::x_cb),
187 vt_ev (this, &rxvt_term::x_cb), 192 vt_ev (this, &rxvt_term::x_cb),
188 child_ev (this, &rxvt_term::child_cb), 193 child_ev (this, &rxvt_term::child_cb),
189 check_ev (this, &rxvt_term::check_cb), 194 prepare_ev (this, &rxvt_term::prepare_cb),
190 flush_ev (this, &rxvt_term::flush_cb), 195 flush_ev (this, &rxvt_term::flush_cb),
191 destroy_ev (this, &rxvt_term::destroy_cb), 196 destroy_ev (this, &rxvt_term::destroy_cb),
192 pty_ev (this, &rxvt_term::pty_cb), 197 pty_ev (this, &rxvt_term::pty_cb),
193 incr_ev (this, &rxvt_term::incr_cb) 198 incr_ev (this, &rxvt_term::incr_cb)
194{ 199{
195 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base; 200 cmdbuf_ptr = cmdbuf_endp = cmdbuf_base;
196 201
197 termlist.push_back (this); 202 termlist.push_back (this);
198 203
201#endif 206#endif
202} 207}
203 208
204// clean up the most important stuff, do *not* call x or free mem etc. 209// clean up the most important stuff, do *not* call x or free mem etc.
205// for use before an emergency exit 210// for use before an emergency exit
211void
206void rxvt_term::emergency_cleanup () 212rxvt_term::emergency_cleanup ()
207{ 213{
208 if (cmd_pid) 214 if (cmd_pid)
209 kill (-cmd_pid, SIGHUP); 215 kill (-cmd_pid, SIGHUP);
210 216
211 pty_ev.stop (); 217 pty_ev.stop ();
278 delete [] pix_colors_focused; 284 delete [] pix_colors_focused;
279#if OFF_FOCUS_FADING 285#if OFF_FOCUS_FADING
280 delete [] pix_colors_unfocused; 286 delete [] pix_colors_unfocused;
281#endif 287#endif
282 288
289 bgPixmap.destroy ();
283 displays.put (display); 290 displays.put (display);
284 291
285 scr_release (); 292 scr_release ();
286 293
287 /* clear all resources */ 294 /* clear all resources */
304#endif 311#endif
305} 312}
306 313
307// child has exited, usually destroys 314// child has exited, usually destroys
308void 315void
309rxvt_term::child_cb (child_watcher &w, int status) 316rxvt_term::child_cb (ev::child &w, int status)
310{ 317{
311 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END)); 318 HOOK_INVOKE ((this, HOOK_CHILD_EXIT, DT_INT, status, DT_END));
312 319
313 cmd_pid = 0; 320 cmd_pid = 0;
314 321
342 incr_ev.stop (); 349 incr_ev.stop ();
343 termwin_ev.stop (display); 350 termwin_ev.stop (display);
344 vt_ev.stop (display); 351 vt_ev.stop (display);
345 } 352 }
346 353
347 check_ev.stop (); 354 prepare_ev.stop ();
348 pty_ev.stop (); 355 pty_ev.stop ();
349#ifdef CURSOR_BLINK 356#ifdef CURSOR_BLINK
350 cursor_blink_ev.stop (); 357 cursor_blink_ev.stop ();
351#endif 358#endif
352#ifdef TEXT_BLINK 359#ifdef TEXT_BLINK
360#endif 367#endif
361#ifdef POINTER_BLANK 368#ifdef POINTER_BLANK
362 pointer_ev.stop (); 369 pointer_ev.stop ();
363#endif 370#endif
364 371
365 destroy_ev.start (0); 372 destroy_ev.start ();
366} 373}
367 374
368void 375void
369rxvt_term::destroy_cb (time_watcher &w) 376rxvt_term::destroy_cb (ev::idle &w, int revents)
370{ 377{
371 make_current (); 378 make_current ();
372 379
373 delete this; 380 delete this;
374} 381}
428 else 435 else
429 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x", 436 XGetErrorDatabaseText(dpy, mtype, "ResourceID", "ResourceID 0x%x",
430 mesg, BUFSIZ); 437 mesg, BUFSIZ);
431 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid); 438 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->resourceid);
432 } 439 }
433 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d", 440 XGetErrorDatabaseText(dpy, mtype, "ErrorSerial", "Error Serial #%d",
434 mesg, BUFSIZ); 441 mesg, BUFSIZ);
435 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial); 442 rxvt_warn (strncat (mesg, "\n", BUFSIZ), event->serial);
436} 443}
437#endif 444#endif
438 445
506 if (option (Opt_scrollBar)) 513 if (option (Opt_scrollBar))
507 resize_scrollbar (); /* create and map scrollbar */ 514 resize_scrollbar (); /* create and map scrollbar */
508#endif 515#endif
509#ifdef HAVE_BG_PIXMAP 516#ifdef HAVE_BG_PIXMAP
510 { 517 {
511 bool changed = false;
512 bgPixmap.set_target (this); 518 bgPixmap.set_target (this);
513 519
514#ifdef ENABLE_TRANSPARENCY 520#ifdef ENABLE_TRANSPARENCY
515 if (option (Opt_transparent)) 521 if (option (Opt_transparent))
516 { 522 {
517 bgPixmap.set_transparent (); 523 bgPixmap.set_transparent ();
518#ifdef HAVE_AFTERIMAGE 524#ifdef HAVE_AFTERIMAGE
519 if (rs [Rs_blurradius]) 525 if (rs [Rs_blurradius])
520 bgPixmap.set_blur_radius (rs [Rs_blurradius]); 526 bgPixmap.set_blur_radius (rs [Rs_blurradius]);
521#endif 527#endif
522 if (ISSET_PIXCOLOR (Color_tint)) 528 if (ISSET_PIXCOLOR (Color_tint))
523 bgPixmap.set_tint (pix_colors_focused [Color_tint]); 529 bgPixmap.set_tint (pix_colors_focused [Color_tint]);
524 if (rs [Rs_shade]) 530 if (rs [Rs_shade])
525 bgPixmap.set_shade (rs [Rs_shade]); 531 bgPixmap.set_shade (rs [Rs_shade]);
526 changed = true;
527 532
528 bgPixmap.set_root_pixmap (); 533 bgPixmap.set_root_pixmap ();
529 XSelectInput (dpy, display->root, PropertyChangeMask); 534 XSelectInput (dpy, display->root, PropertyChangeMask);
530 rootwin_ev.start (display, display->root); 535 rootwin_ev.start (display, display->root);
531 } 536 }
532#endif 537#endif
533 538
534#ifdef XPM_BACKGROUND 539#ifdef BG_IMAGE_FROM_FILE
535 if (rs[Rs_backgroundPixmap] != NULL) 540 if (rs[Rs_backgroundPixmap] != NULL)
536 { 541 {
537 const char *p = rs[Rs_backgroundPixmap]; 542 const char *p = rs[Rs_backgroundPixmap];
538 543
539 if ((p = strchr (p, ';')) != NULL) 544 if ((p = strchr (p, ';')) != NULL)
542 bgPixmap.set_geometry (p); 547 bgPixmap.set_geometry (p);
543 } 548 }
544 else 549 else
545 bgPixmap.set_defaultGeometry (); 550 bgPixmap.set_defaultGeometry ();
546 551
547 changed = bgPixmap.set_file (rs[Rs_backgroundPixmap]); 552 if (bgPixmap.set_file (rs[Rs_backgroundPixmap]))
553 if (!bgPixmap.window_position_sensitive ())
554 update_background ();
548 } 555 }
549#endif 556#endif
550 if (changed)
551 {
552 bgPixmap.render_background ();
553 scr_touch (true);
554 }
555 } 557 }
556#endif 558#endif
557 559
558#if ENABLE_PERL 560#if ENABLE_PERL
559 rootwin_ev.start (display, display->root); 561 rootwin_ev.start (display, display->root);
564 init_command (cmd_argv); 566 init_command (cmd_argv);
565 567
566 free (cmd_argv); 568 free (cmd_argv);
567 569
568 if (pty->pty >= 0) 570 if (pty->pty >= 0)
569 pty_ev.start (pty->pty, EVENT_READ); 571 pty_ev.start (pty->pty, ev::READ);
570 572
571 check_ev.start (); 573 prepare_ev.start ();
572 574
573 HOOK_INVOKE ((this, HOOK_START, DT_END)); 575 HOOK_INVOKE ((this, HOOK_START, DT_END));
574 576
575#if ENABLE_XEMBED 577#if ENABLE_XEMBED
576 if (rs[Rs_embed]) 578 if (rs[Rs_embed])
588 return true; 590 return true;
589} 591}
590 592
591static struct sig_handlers 593static struct sig_handlers
592{ 594{
593 sig_watcher sw_term, sw_int; 595 ev::sig sw_term, sw_int;
594 596
595 /* 597 /*
596 * Catch a fatal signal and tidy up before quitting 598 * Catch a fatal signal and tidy up before quitting
597 */ 599 */
598 void 600 void
599 sig_term (sig_watcher &w) 601 sig_term (ev::sig &w, int revents)
600 { 602 {
601 rxvt_emergency_cleanup (); 603 rxvt_emergency_cleanup ();
602 signal (w.signum, SIG_DFL); 604 w.stop ();
603 kill (getpid (), w.signum); 605 kill (getpid (), w.signum);
604 } 606 }
605 607
606 sig_handlers () 608 sig_handlers ()
607 : sw_term (this, &sig_handlers::sig_term), 609 : sw_term (this, &sig_handlers::sig_term),
615void 617void
616rxvt_init () 618rxvt_init ()
617{ 619{
618 ptytty::init (); 620 ptytty::init ();
619 621
622 if (!ev::ev_default_loop (0))
623 rxvt_fatal ("cannot initialise libev (bad value for LIBEV_METHODS?)\n");
624
620 rxvt_environ = environ; 625 rxvt_environ = environ;
621 626
622 signal (SIGHUP, SIG_IGN); 627 signal (SIGHUP, SIG_IGN);
623 signal (SIGPIPE, SIG_IGN); 628 signal (SIGPIPE, SIG_IGN);
624 629
625 sig_handlers.sw_term.start (SIGTERM); 630 sig_handlers.sw_term.start (SIGTERM); ev::ev_unref ();
626 sig_handlers.sw_int.start (SIGINT); 631 sig_handlers.sw_int.start (SIGINT); ev::ev_unref ();
627 632
628 /* need to trap SIGURG for SVR4 (Unixware) rlogin */ 633 /* need to trap SIGURG for SVR4 (Unixware) rlogin */
629 /* signal (SIGURG, SIG_DFL); */ 634 /* signal (SIGURG, SIG_DFL); */
630 635
631 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler); 636 old_xerror_handler = XSetErrorHandler ((XErrorHandler) rxvt_xerror_handler);
901 if (parent[0]) 906 if (parent[0])
902 { 907 {
903 resize_all_windows (0, 0, 0); 908 resize_all_windows (0, 0, 0);
904 scr_remap_chars (); 909 scr_remap_chars ();
905 scr_touch (true); 910 scr_touch (true);
906 } 911 }
907 912
908 return true; 913 return true;
909} 914}
910 915
916void
911void rxvt_term::set_string_property (Atom prop, const char *str, int len) 917rxvt_term::set_string_property (Atom prop, const char *str, int len)
912{ 918{
913 XChangeProperty (dpy, parent[0], 919 XChangeProperty (dpy, parent[0],
914 prop, XA_STRING, 8, PropModeReplace, 920 prop, XA_STRING, 8, PropModeReplace,
915 (const unsigned char *)str, len >= 0 ? len : strlen (str)); 921 (const unsigned char *)str, len >= 0 ? len : strlen (str));
916} 922}
917 923
924void
918void rxvt_term::set_utf8_property (Atom prop, const char *str, int len) 925rxvt_term::set_utf8_property (Atom prop, const char *str, int len)
919{ 926{
920 wchar_t *ws = rxvt_mbstowcs (str, len); 927 wchar_t *ws = rxvt_mbstowcs (str, len);
921 char *s = rxvt_wcstoutf8 (ws); 928 char *s = rxvt_wcstoutf8 (ws);
922 929
923 XChangeProperty (dpy, parent[0], 930 XChangeProperty (dpy, parent[0],
947#if ENABLE_EWMH 954#if ENABLE_EWMH
948 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str); 955 set_utf8_property (xa[XA_NET_WM_ICON_NAME], str);
949#endif 956#endif
950} 957}
951 958
959void
960rxvt_term::set_window_color (int idx, const char *color)
961{
952#ifdef XTERM_COLOR_CHANGE 962#ifdef XTERM_COLOR_CHANGE
953void
954rxvt_term::set_window_color (int idx, const char *color)
955{
956 rxvt_color xcol; 963 rxvt_color xcol;
957 int i; 964 int i;
958 965
959 if (color == NULL || *color == '\0') 966 if (color == NULL || *color == '\0')
960 return; 967 return;
961 968
962 color = strdup (color); 969 color = strdup (color);
963 allocated.push_back ((void *)color); 970 allocated.push_back ((void *)color);
997 /*TODO: handle Color_BD, scrollbar background, etc. */ 1004 /*TODO: handle Color_BD, scrollbar background, etc. */
998 1005
999 update_fade_color (idx); 1006 update_fade_color (idx);
1000 recolour_cursor (); 1007 recolour_cursor ();
1001 scr_recolour (); 1008 scr_recolour ();
1009#endif /* XTERM_COLOR_CHANGE */
1002} 1010}
1003
1004#else
1005# define set_window_color (idx,color) ((void)0)
1006#endif /* XTERM_COLOR_CHANGE */
1007 1011
1008void 1012void
1009rxvt_term::recolour_cursor () 1013rxvt_term::recolour_cursor ()
1010{ 1014{
1011 XColor fg, bg; 1015 XColor fg, bg;
1043 1047
1044 for (i = Color_Black; i <= Color_White; i++) 1048 for (i = Color_Black; i <= Color_White; i++)
1045 if (pix_colors[Color_bg] == pix_colors[i]) 1049 if (pix_colors[Color_bg] == pix_colors[i])
1046 { 1050 {
1047 sprintf (bstr, "%d", (i - Color_Black)); 1051 sprintf (bstr, "%d", (i - Color_Black));
1048#ifdef XPM_BACKGROUND 1052#ifdef BG_IMAGE_FROM_FILE
1049 xpmb = "default;"; 1053 xpmb = "default;";
1050#endif 1054#endif
1051 break; 1055 break;
1052 } 1056 }
1053 1057
1149 1153
1150 XMoveResizeWindow (dpy, vt, 1154 XMoveResizeWindow (dpy, vt,
1151 window_vt_x, window_vt_y, 1155 window_vt_x, window_vt_y,
1152 width, height); 1156 width, height);
1153 1157
1158#ifdef HAVE_BG_PIXMAP
1159 if (bgPixmap.window_size_sensitive ())
1160 update_background ();
1161#endif
1162
1154 scr_clear (); 1163 scr_clear ();
1155#ifdef XPM_BACKGROUND
1156 /* TODO: should that really be here ? */
1157 bgPixmap.render_background ();
1158#endif
1159 } 1164 }
1160 1165
1161 if (fix_screen || old_height == 0) 1166 if (fix_screen || old_height == 0)
1162 scr_reset (); 1167 scr_reset ();
1163 1168
1164 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version 1169 // TODO, with nvidia-8178, resizes kill the alpha channel, report if not fixed in newer version
1165 //scr_touch (false); 1170 //scr_touch (false);
1166 1171
1167#ifdef HAVE_BG_PIXMAP 1172#ifdef HAVE_BG_PIXMAP
1173// TODO: this don't seem to have any effect - do we still need it ? If so - in which case exactly ?
1168 if (bgPixmap.pixmap) 1174// if (bgPixmap.pixmap)
1169 scr_touch (false); 1175// scr_touch (false);
1170#endif 1176#endif
1171 1177
1172#ifdef USE_XIM 1178#ifdef USE_XIM
1173 IMSetPosition (); 1179 IMSetPosition ();
1174#endif 1180#endif
1345 if (term->rs[Rs_imLocale]) 1351 if (term->rs[Rs_imLocale])
1346 SET_LOCALE (term->locale); 1352 SET_LOCALE (term->locale);
1347 } 1353 }
1348 else 1354 else
1349 str = (void *)text->string.wide_char; 1355 str = (void *)text->string.wide_char;
1350 1356
1351 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW, 1357 HOOK_INVOKE ((term, HOOK_XIM_PREEDIT_DRAW,
1352 DT_INT, call_data->caret, 1358 DT_INT, call_data->caret,
1353 DT_INT, call_data->chg_first, 1359 DT_INT, call_data->chg_first,
1354 DT_INT, call_data->chg_length, 1360 DT_INT, call_data->chg_length,
1355 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0, 1361 DT_LCS_LEN, (void *)text->feedback, text->feedback ? (int)text->length : 0,
1674 1680
1675 if (input_style & XIMPreeditPosition) 1681 if (input_style & XIMPreeditPosition)
1676 { 1682 {
1677 im_set_size (preedit_rect); 1683 im_set_size (preedit_rect);
1678 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL); 1684 preedit_attr = XVaCreateNestedList (0, XNArea, &preedit_rect, NULL);
1679 1685
1680 XSetICValues (Input_Context, 1686 XSetICValues (Input_Context,
1681 XNPreeditAttributes, preedit_attr, NULL); 1687 XNPreeditAttributes, preedit_attr, NULL);
1682 } 1688 }
1683 else 1689 else
1684 { 1690 {
1701 XFree (status_attr); 1707 XFree (status_attr);
1702 } 1708 }
1703 1709
1704 XFree (preedit_attr); 1710 XFree (preedit_attr);
1705} 1711}
1706#endif /* USE_XIM */ 1712#endif /* USE_XIM */
1713
1714void
1715rxvt_term::get_window_origin (int &x, int &y)
1716{
1717 Window cr;
1718 XTranslateCoordinates (dpy, parent[0], display->root, 0, 0, &x, &y, &cr);
1719/* fprintf( stderr, "origin is %+d%+d\n", x, y);*/
1720}
1721
1722Pixmap
1723rxvt_term::get_pixmap_property (int prop_id)
1724{
1725 if (prop_id > 0 && prop_id < NUM_XA)
1726 if (xa[prop_id])
1727 {
1728 int aformat;
1729 unsigned long nitems, bytes_after;
1730 Atom atype;
1731 unsigned char *prop = NULL;
1732 int result = XGetWindowProperty (dpy, display->root, xa[prop_id],
1733 0L, 1L, False, XA_PIXMAP, &atype, &aformat,
1734 &nitems, &bytes_after, &prop);
1735 if (result == Success && prop && atype == XA_PIXMAP)
1736 {
1737 return *(Pixmap *)prop;
1738 }
1739 }
1740 return None;
1741}
1742
1743#ifdef HAVE_BG_PIXMAP
1744# if TRACE_PIXMAPS
1745# undef update_background
1746int rxvt_term::trace_update_background (const char* file, int line)
1747{
1748 fprintf (stderr, "%s:%d:update_background()\n", file, line);
1749 update_background ();
1750}
1751# endif
1752int
1753rxvt_term::update_background ()
1754{
1755 bgPixmap.invalidate ();
1756
1757 /* no chance of real time refresh if we are blurring! */
1758 if (bgPixmap.invalid_since + 0.5 < ev::now () && !(bgPixmap.flags & bgPixmap_t::blurNeeded))
1759 bgPixmap.render ();
1760 else
1761 {
1762 update_background_ev.stop ();
1763
1764 if (!bgPixmap.need_client_side_rendering())
1765 update_background_ev.start (.05);
1766 else if (bgPixmap.flags & bgPixmap_t::blurNeeded)
1767 update_background_ev.start (.20); /* very slow !!! */
1768 else
1769 update_background_ev.start (.07);
1770 }
1771
1772 return 0;
1773}
1774
1775void
1776rxvt_term::update_background_cb (ev::timer &w, int revents)
1777{
1778 bgPixmap.render ();
1779}
1780
1781#endif /* HAVE_BG_PIXMAP */
1707 1782
1708/*----------------------- end-of-file (C source) -----------------------*/ 1783/*----------------------- end-of-file (C source) -----------------------*/

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines