ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/UI.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.252 by root, Sun May 28 23:21:28 2006 UTC vs.
Revision 1.256 by root, Tue May 30 01:42:16 2006 UTC

… …
17our $BUTTON_STATE; 17our $BUTTON_STATE;
18 18
19our %WIDGET; # all widgets, weak-referenced 19our %WIDGET; # all widgets, weak-referenced
20 20
21sub get_layout { 21sub get_layout {
22 my $layout;
23
22 for (grep { $_->{name} } values %WIDGET) { 24 for (grep { $_->{name} } values %WIDGET) {
23 $LAYOUT->{$_->{name}} = { 25 my $win = $layout->{$_->{name}} = { };
24 x => $_->{x} / $::WIDTH,
25 y => $_->{y} / $::HEIGHT,
26 w => $_->{w} / $::WIDTH,
27 h => $_->{h} / $::HEIGHT
28 }; 26
27 $win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
28 $win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
29 $win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
30 $win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
29 } 31 }
30 32
31 return $LAYOUT; 33 $layout
32} 34}
33 35
34sub set_layout { 36sub set_layout {
35 my ($layout) = @_; 37 my ($layout) = @_;
36 $LAYOUT = $layout; 38 $LAYOUT = $layout;
… …
40 if (!$GRAB) { 42 if (!$GRAB) {
41 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) { 43 for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
42 if (length $widget->{tooltip}) { 44 if (length $widget->{tooltip}) {
43 45
44 if ($TOOLTIP->{owner} != $widget) { 46 if ($TOOLTIP->{owner} != $widget) {
47 $TOOLTIP->hide;
48
45 $TOOLTIP->{owner} = $widget; 49 $TOOLTIP->{owner} = $widget;
46 50
47 my $tip = $widget->{tooltip}; 51 my $tip = $widget->{tooltip};
48 52
49 $tip = $tip->($widget) if CODE:: eq ref $tip; 53 $tip = $tip->($widget) if CODE:: eq ref $tip;
50 54
51 $TOOLTIP->set_tooltip_from ($widget); 55 $TOOLTIP->set_tooltip_from ($widget);
52
53 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
54
55 ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0)
56 if $x + $TOOLTIP->{w} > $::WIDTH;
57
58 $TOOLTIP->move ($x, $y);
59 $TOOLTIP->show; 56 $TOOLTIP->show;
60 } 57 }
61 58
62 return; 59 return;
63 } 60 }
… …
170sub rescale_widgets { 167sub rescale_widgets {
171 my ($sx, $sy) = @_; 168 my ($sx, $sy) = @_;
172 169
173 for my $widget (values %WIDGET) { 170 for my $widget (values %WIDGET) {
174 if ($widget->{is_toplevel}) { 171 if ($widget->{is_toplevel}) {
172 $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
173 $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
174
175 $widget->{x} = int 0.5 + $widget->{x} * $sx if exists $widget->{x}; 175 $widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w}; 176 $widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
177 $widget->{req_w} = int 0.5 + $widget->{req_w} * $sx if exists $widget->{req_w}; 177 $widget->{force_w} = int 0.5 + $widget->{force_w} * $sx if exists $widget->{force_w};
178 $widget->{y} = int 0.5 + $widget->{y} * $sy if exists $widget->{y}; 178 $widget->{y} = int 0.5 + $widget->{y} * $sy if $widget->{y} =~ /^[0-9.]+$/;
179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h}; 179 $widget->{h} = int 0.5 + $widget->{h} * $sy if exists $widget->{h};
180 $widget->{req_h} = int 0.5 + $widget->{req_h} * $sy if exists $widget->{req_h}; 180 $widget->{force_h} = int 0.5 + $widget->{force_h} * $sy if exists $widget->{force_h};
181
182 $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
183 $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
184
181 } 185 }
182 } 186 }
183 187
184 reconfigure_widgets; 188 reconfigure_widgets;
185} 189}
… …
194 198
195sub new { 199sub new {
196 my $class = shift; 200 my $class = shift;
197 201
198 my $self = bless { 202 my $self = bless {
199 x => 0, 203 x => "center",
200 y => 0, 204 y => "center",
201 z => 0, 205 z => 0,
206 w => undef,
207 h => undef,
202 can_events => 1, 208 can_events => 1,
203 @_ 209 @_
204 }, $class; 210 }, $class;
211
212 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
213 $self->{x} = $layout->{x} * $CFClient::UI::ROOT->{w} if exists $layout->{x};
214 $self->{y} = $layout->{y} * $CFClient::UI::ROOT->{h} if exists $layout->{y};
215 $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{w} if exists $layout->{w};
216 $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{h} if exists $layout->{h};
217
218 $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
219 $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
220 }
221
222 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
205 223
206 for (keys %$self) { 224 for (keys %$self) {
207 if (/^on_(.*)$/) { 225 if (/^on_(.*)$/) {
208 $self->connect ($1 => delete $self->{$_}); 226 $self->connect ($1 => delete $self->{$_});
209 } 227 }
210 } 228 }
211 229
212 Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
213
214 if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
215 $self->{req_x} = $layout->{x} * $::WIDTH;
216 $self->{req_y} = $layout->{y} * $::HEIGHT;
217 $self->{def_w} = ($layout->{w} != 0 ? $layout->{w} : 1) * $::WIDTH;
218 $self->{def_h} = ($layout->{h} != 0 ? $layout->{h} : 1) * $::HEIGHT;
219 }
220
221 $self 230 $self
222} 231}
223 232
224sub destroy { 233sub destroy {
225 my ($self) = @_; 234 my ($self) = @_;
… …
232 my ($self) = @_; 241 my ($self) = @_;
233 242
234 return if $self->{parent}; 243 return if $self->{parent};
235 244
236 $CFClient::UI::ROOT->add ($self); 245 $CFClient::UI::ROOT->add ($self);
237}
238
239sub center {
240 my ($self) = @_;
241
242 $CFClient::UI::ROOT->on_post_alloc (
243 "center_$self" => sub {
244 $self->move (($self->{parent}{w} - $self->{w}) * 0.5, ($self->{parent}{h} - $self->{h}) * 0.5);
245 },
246 );
247
248 $self->update;
249} 246}
250 247
251sub set_visible { 248sub set_visible {
252 my ($self) = @_; 249 my ($self) = @_;
253 250
… …
308 305
309 $self->{parent}->remove ($self) 306 $self->{parent}->remove ($self)
310 if $self->{parent}; 307 if $self->{parent};
311} 308}
312 309
313sub move { 310sub move_abs {
314 my ($self, $x, $y, $z) = @_; 311 my ($self, $x, $y, $z) = @_;
315 312
316 $self->{x} = int $x; 313 $self->{x} = List::Util::max 0, int $x;
317 $self->{y} = int $y; 314 $self->{y} = List::Util::max 0, int $y;
318 $self->{z} = $z if defined $z; 315 $self->{z} = $z if defined $z;
319 316
320 $self->update; 317 $self->update;
321} 318}
322 319
323sub set_size { 320sub set_size {
324 my ($self, $w, $h) = @_; 321 my ($self, $w, $h) = @_;
325 322
326 $self->{def_w} = $w; 323 $self->{force_w} = $w;
327 $self->{def_h} = $h; 324 $self->{force_h} = $h;
328 325
329 $self->realloc; 326 $self->realloc;
330} 327}
331 328
332sub size_request { 329sub size_request {
… …
336 333
337sub configure { 334sub configure {
338 my ($self, $x, $y, $w, $h) = @_; 335 my ($self, $x, $y, $w, $h) = @_;
339 336
340 if ($self->{aspect}) { 337 if ($self->{aspect}) {
338 my ($ow, $oh) = ($w, $h);
339
341 my $w2 = List::Util::min $w, int $h * $self->{aspect}; 340 $w = List::Util::min $w, int $h * $self->{aspect};
342 my $h2 = List::Util::min $h, int $w / $self->{aspect}; 341 $h = List::Util::min $h, int $w / $self->{aspect};
343 342
344 # use alignment to adjust x, y 343 # use alignment to adjust x, y
345 344
346 $x += int +($w - $w2) * 0.5; 345 $x += int 0.5 * ($ow - $w);
347 $y += int +($h - $h2) * 0.5; 346 $y += int 0.5 * ($oh - $h);
348
349 ($w, $h) = ($w2, $h2);
350 } 347 }
351 348
352 if ($self->{x} != $x || $self->{y} != $y) { 349 if ($self->{x} ne $x || $self->{y} ne $y) {
353 $self->{x} = $x; 350 $self->{x} = $x;
354 $self->{y} = $y; 351 $self->{y} = $y;
355 $self->update; 352 $self->update;
356 } 353 }
357 354
… …
511sub update { 508sub update {
512 my ($self) = @_; 509 my ($self) = @_;
513 510
514 $self->{parent}->update 511 $self->{parent}->update
515 if $self->{parent}; 512 if $self->{parent};
513}
514
515sub reconfigure {
516 my ($self) = @_;
517
518 $self->realloc;
519 $self->update;
516} 520}
517 521
518sub draw { 522sub draw {
519 my ($self) = @_; 523 my ($self) = @_;
520 524
… …
538 glVertex $x , $y + $self->{h}; 542 glVertex $x , $y + $self->{h};
539 glEnd; 543 glEnd;
540 glDisable GL_BLEND; 544 glDisable GL_BLEND;
541 } 545 }
542 546
543 if ($ENV{PCLIENT_DEBUG}) { 547 if ($ENV{CFPLUS_DEBUG}) {
544 glPushMatrix; 548 glPushMatrix;
545 glColor 1, 1, 0, 1; 549 glColor 1, 1, 0, 1;
546 glTranslate $self->{x} + 0.375, $self->{y} + 0.375; 550 glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
547 glBegin GL_LINE_LOOP; 551 glBegin GL_LINE_LOOP;
548 glVertex 0 , 0; 552 glVertex 0 , 0;
… …
624 my ($class, %arg) = @_; 628 my ($class, %arg) = @_;
625 $class->SUPER::new (can_events => 0, %arg); 629 $class->SUPER::new (can_events => 0, %arg);
626} 630}
627 631
628sub size_request { 632sub size_request {
629 (0, 0) 633 my ($self) = @_;
634
635 ($self->{w} + 0, $self->{h} + 0)
630} 636}
631 637
632sub draw { } 638sub draw { }
633 639
634############################################################################# 640#############################################################################
… …
1005 1011
1006our @ISA = CFClient::UI::Bin::; 1012our @ISA = CFClient::UI::Bin::;
1007 1013
1008use CFClient::OpenGL; 1014use CFClient::OpenGL;
1009 1015
1010my @tex = 1016my $bg =
1017 new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
1018 mipmap => 1, wrap => 1;
1019
1020my @border =
1011 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 } 1021 map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
1012 qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png); 1022 qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1013 1023
1014sub new { 1024sub new {
1015 my $class = shift; 1025 my $class = shift;
1016 1026
1017 my $self = $class->SUPER::new ( 1027 my $self = $class->SUPER::new (
… …
1082 my ($ev, $x, $y) = @_; 1092 my ($ev, $x, $y) = @_;
1083 1093
1084 my $dx = $ev->{x} - $ox; 1094 my $dx = $ev->{x} - $ox;
1085 my $dy = $ev->{y} - $oy; 1095 my $dy = $ev->{y} - $oy;
1086 1096
1087 $self->{user_x} = $wx + $dx * $mx;
1088 $self->{user_y} = $wy + $dy * $my;
1089 $self->{def_w} = $bw + $dx * ($mx ? -1 : 1); 1097 $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
1090 $self->{def_h} = $bh + $dy * ($my ? -1 : 1); 1098 $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
1091 $self->move ($self->{user_x}, $self->{user_y}); 1099
1092 $self->realloc; 1100 $self->realloc;
1101 $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1093 }; 1102 };
1094 1103
1095 } elsif ($lr ^ $td) { 1104 } elsif ($lr ^ $td) {
1096 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 1105 my ($ox, $oy) = ($ev->{x}, $ev->{y});
1097 my ($bx, $by) = ($self->{x}, $self->{y}); 1106 my ($bx, $by) = ($self->{x}, $self->{y});
… …
1099 $self->{motion} = sub { 1108 $self->{motion} = sub {
1100 my ($ev, $x, $y) = @_; 1109 my ($ev, $x, $y) = @_;
1101 1110
1102 ($x, $y) = ($ev->{x}, $ev->{y}); 1111 ($x, $y) = ($ev->{x}, $ev->{y});
1103 1112
1104 $self->{user_x} = $bx + $x - $ox; 1113 $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
1105 $self->{user_y} = $by + $y - $oy;
1106
1107 $self->move ($self->{user_x}, $self->{user_y});
1108 $self->realloc;
1109 }; 1114 };
1110 } 1115 }
1111} 1116}
1112 1117
1113sub button_up { 1118sub button_up {
… …
1132 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 1137 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1133 1138
1134 my $border = $self->border; 1139 my $border = $self->border;
1135 1140
1136 glColor @{ $self->{border_bg} }; 1141 glColor @{ $self->{border_bg} };
1137 $tex[1]->draw_quad_alpha (0, 0, $w, $border); 1142 $border[0]->draw_quad_alpha (0, 0, $w, $border);
1138 $tex[3]->draw_quad_alpha (0, $border, $border, $ch); 1143 $border[1]->draw_quad_alpha (0, $border, $border, $ch);
1139 $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch); 1144 $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1140 $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border); 1145 $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
1141 1146
1142 if (@{$self->{bg}} < 4 || $self->{bg}[3]) { 1147 if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1143 my $bg = $tex[0]; 1148 glColor @{ $self->{bg} };
1144 1149
1145 # TODO: repeat texture not scale 1150 # TODO: repeat texture not scale
1151 # solve this better(?)
1146 my $rep_x = $cw / $bg->{w}; 1152 $bg->{s} = $cw / $bg->{w};
1147 my $rep_y = $ch / $bg->{h}; 1153 $bg->{t} = $ch / $bg->{h};
1148
1149 glColor @{ $self->{bg} };
1150
1151 $bg->{s} = $rep_x;
1152 $bg->{t} = $rep_y;
1153 $bg->{wrap_mode} = 1;
1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch); 1154 $bg->draw_quad_alpha ($border, $border, $cw, $ch);
1155 } 1155 }
1156 1156
1157 glDisable GL_TEXTURE_2D; 1157 glDisable GL_TEXTURE_2D;
1158 1158
… …
2639 my ($self, $w, $h, $changed) = @_; 2639 my ($self, $w, $h, $changed) = @_;
2640 2640
2641 return unless $changed; 2641 return unless $changed;
2642 2642
2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed); 2643 $self->SUPER::size_allocate ($w - 4, $h - 4, $changed);
2644}
2645
2646sub visibility_change {
2647 my ($self, $visible) = @_;
2648
2649 return unless $visible;
2650
2651 $self->{root}->on_post_alloc ("move_$self" => sub {
2652 my $widget = $self->{owner}
2653 or return;
2654
2655 my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2656
2657 ($x, $y) = $widget->coord2global (-$self->{w}, 0)
2658 if $x + $self->{w} > $::WIDTH;
2659
2660 $self->move_abs ($x, $y);
2661 });
2644} 2662}
2645 2663
2646sub _draw { 2664sub _draw {
2647 my ($self) = @_; 2665 my ($self) = @_;
2648 2666
… …
3016 my ($self) = @_; 3034 my ($self) = @_;
3017 3035
3018 ($self->{w}, $self->{h}) 3036 ($self->{w}, $self->{h})
3019} 3037}
3020 3038
3039sub _to_pixel {
3040 my ($coord, $size, $max) = @_;
3041
3042 $coord =
3043 $coord eq "center" ? ($max - $size) * 0.5
3044 : $coord eq "max" ? $max
3045 : $coord;
3046
3047 $coord = 0 if $coord < 0;
3048 $coord = $max - $size if $coord > $max - $size;
3049
3050 int $coord + 0.5
3051}
3052
3021sub size_allocate { 3053sub size_allocate {
3022 my ($self, $w, $h, $changed) = @_; 3054 my ($self, $w, $h, $changed) = @_;
3023 3055
3024 for my $child ($self->children) { 3056 for my $child ($self->children) {
3025 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)}; 3057 my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
3026 3058
3027 $X = $child->{req_x} > 0 ? $child->{req_x} : $w - $W - $child->{req_x} + 1 3059 $X = $child->{force_x} if exists $child->{force_x};
3028 if exists $child->{req_x}; 3060 $Y = $child->{force_y} if exists $child->{force_y};
3029 3061
3030 $Y = $child->{req_y} > 0 ? $child->{req_y} : $h - $H - $child->{req_y} + 1 3062 $X = _to_pixel $X, $W, $self->{w};
3031 if exists $child->{req_y}; 3063 $Y = _to_pixel $Y, $H, $self->{h};
3032
3033 #delete @$child{qw(req_x req_y)};#d# def_x, def_y
3034
3035 $X = List::Util::max 0, List::Util::min $w - $W, int $X + 0.5;
3036 $Y = List::Util::max 0, List::Util::min $h - $H, int $Y + 0.5;
3037 3064
3038 $child->configure ($X, $Y, $W, $H); 3065 $child->configure ($X, $Y, $W, $H);
3039 } 3066 }
3040} 3067}
3041 3068
… …
3058} 3085}
3059 3086
3060sub add { 3087sub add {
3061 my ($self, @children) = @_; 3088 my ($self, @children) = @_;
3062 3089
3063 for my $child (@children) {
3064 $child->{is_toplevel} = 1; 3090 $_->{is_toplevel} = 1
3065 3091 for @children;
3066 # integerise window positions
3067 $child->{x} = int $child->{x};
3068 $child->{y} = int $child->{y};
3069 }
3070 3092
3071 $self->SUPER::add (@children); 3093 $self->SUPER::add (@children);
3072} 3094}
3073 3095
3074sub remove { 3096sub remove {
3075 my ($self, @children) = @_; 3097 my ($self, @children) = @_;
3076 3098
3077 $self->SUPER::remove (@children); 3099 $self->SUPER::remove (@children);
3100
3101 delete $self->{is_toplevel}
3102 for @children;
3078 3103
3079 while (@children) { 3104 while (@children) {
3080 my $w = pop @children; 3105 my $w = pop @children;
3081 push @children, $w->children; 3106 push @children, $w->children;
3082 $w->set_invisible; 3107 $w->set_invisible;
… …
3116 3141
3117 my $widget = pop @queue || last; 3142 my $widget = pop @queue || last;
3118 3143
3119 $widget->{visible} or last; # do not resize invisible widgets 3144 $widget->{visible} or last; # do not resize invisible widgets
3120 3145
3121 my ($w, $h) = $widget->{def_w} && $widget->{def_h} 3146 my ($w, $h) = exists $widget->{force_w} && exists $widget->{force_h}
3122 ? @$widget{qw(def_w def_h)} 3147 ? @$widget{qw(force_w force_h)}
3123 : $widget->size_request; 3148 : $widget->size_request;
3124 3149
3125 Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d# 3150 my $min_size = $widget->{is_toplevel} ? 16 : 0;
3126 3151
3152 $w = $min_size if $w < $min_size;
3153 $h = $min_size if $h < $min_size;
3154
3127 $widget->{req_w} = $w; 3155 $widget->{req_w} = $w;
3128 $widget->{req_h} = $h; 3156 $widget->{req_h} = $h;
3129 3157
3130 $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h]; 3158 $self->{size_alloc}{$widget} = [$widget, undef, undef];
3131 3159
3132 push @queue, $widget->{parent} 3160 push @queue, $widget->{parent}
3133 if $widget->{parent}; 3161 if $widget->{parent};
3134 } 3162 }
3135 } 3163 }
… …
3139 values %$size_alloc; 3167 values %$size_alloc;
3140 3168
3141 while () { 3169 while () {
3142 my ($widget, $w, $h) = @{ pop @queue or last }; 3170 my ($widget, $w, $h) = @{ pop @queue or last };
3143 3171
3172 $w = $widget->{w} || $widget->{req_w} unless defined $w;
3173 $h = $widget->{h} || $widget->{req_h} unless defined $h;
3174
3144 $w = 0 if $w < 0; 3175 $w = 0 if $w < 0;
3145 $h = 0 if $h < 0; 3176 $h = 0 if $h < 0;
3177
3178 $w = int $w + 0.5;
3179 $h = int $h + 0.5;
3146 3180
3147 my $changed = $widget->{w} != $w || $widget->{h} != $h; 3181 my $changed = $widget->{w} != $w || $widget->{h} != $h;
3148 3182
3149 $widget->{w} = $w; 3183 $widget->{w} = $w;
3150 $widget->{h} = $h; 3184 $widget->{h} = $h;

Diff Legend

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