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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.31 by root, Fri May 19 23:18:42 2006 UTC vs.
Revision 1.49 by root, Sat Jun 3 22:50:48 2006 UTC

… …
17 can_focus => 1, 17 can_focus => 1,
18 list => glGenList, 18 list => glGenList,
19 @_ 19 @_
20 ); 20 );
21 21
22 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command},
24 can_focus => 1,
25 tooltip => "<b>The Command Completer</b>\n\n"
26 . "This is your central interface to send text commands to the server. "
27 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "for commands you might want to use.\n"
31 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
33 ;
34
22 $self 35 $self
23} 36}
24 37
25sub DESTROY { 38sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_;
40
41 (my $data = $command) =~ s/\\//g;
42
43 $tooltip =~ s/^\s+//;
44 $tooltip = "<big>$data</big>\n\n$tooltip";
45 $tooltip =~ s/\s+$//;
46
47 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
48}
49
50sub clr_commands {
26 my $self = shift; 51 my ($self) = @_;
27 52
28 glDeleteList $self->{list}; 53 %{$self->{completer}{command}} = ();
29
30 $self->SUPER::DESTROY;
31} 54}
32 55
33sub button_down { 56sub button_down {
34 my ($self, $ev, $x, $y) = @_; 57 my ($self, $ev, $x, $y) = @_;
35 58
36 $self->focus_in; 59 $self->focus_in;
37 60
38 if ($ev->{button} == 2) { 61 if ($ev->{button} == 1) {
62 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63
64 my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99);
65 my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99);
66 $fx += $::MAP->x;
67 $fy += $::MAP->y;
68
69 $::CONN->send (sprintf "lookat %d %d", $fx, $fy);
70
71 warn "FOOX: $fx (".$::MAP->ox.")\n";
72 warn "FOOY: $fy (".$::MAP->oy.")\n";
73 } elsif ($ev->{button} == 2) {
39 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 74 my ($ox, $oy) = ($ev->{x}, $ev->{y});
40 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 75 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
41 76
42 $self->{motion} = sub { 77 $self->{motion} = sub {
43 my ($ev, $x, $y) = @_; 78 my ($ev, $x, $y) = @_;
… …
48 $::CFG->{map_shift_y} = $bh + $y - $oy; 83 $::CFG->{map_shift_y} = $bh + $y - $oy;
49 84
50 $self->update; 85 $self->update;
51 }; 86 };
52 } 87 }
88
89 1
53} 90}
54 91
55sub button_up { 92sub button_up {
56 my ($self, $ev, $x, $y) = @_; 93 my ($self, $ev, $x, $y) = @_;
57 94
58 delete $self->{motion}; 95 delete $self->{motion};
96
97 1
59} 98}
60 99
61sub mouse_motion { 100sub mouse_motion {
62 my ($self, $ev, $x, $y) = @_; 101 my ($self, $ev, $x, $y) = @_;
63 102
103 if ($self->{motion}) {
64 $self->{motion}->($ev, $x, $y) if $self->{motion}; 104 $self->{motion}->($ev, $x, $y);
105 } else {
106 return 0;
107 }
108
109 1
65} 110}
66 111
67sub size_request { 112sub size_request {
68 ( 113 (
69 1 + 32 * int $::WIDTH / 32, 114 1 + 32 * int $::WIDTH / 32,
… …
76 121
77 $self->{need_update} = 1; 122 $self->{need_update} = 1;
78 $self->SUPER::update; 123 $self->SUPER::update;
79} 124}
80 125
126my %DIR = (
127 CFClient::SDLK_KP8, [1, "north"],
128 CFClient::SDLK_KP9, [2, "northeast"],
129 CFClient::SDLK_KP6, [3, "east"],
130 CFClient::SDLK_KP3, [4, "southeast"],
131 CFClient::SDLK_KP2, [5, "south"],
132 CFClient::SDLK_KP1, [6, "southwest"],
133 CFClient::SDLK_KP4, [7, "west"],
134 CFClient::SDLK_KP7, [8, "northwest"],
135
136 CFClient::SDLK_UP, [1, "north"],
137 CFClient::SDLK_RIGHT, [3, "east"],
138 CFClient::SDLK_DOWN, [5, "south"],
139 CFClient::SDLK_LEFT, [7, "west"],
140);
141
142sub key_down {
143 my ($self, $ev) = @_;
144
145 return 0 unless $::CONN;
146
147 my $mod = $ev->{mod};
148 my $sym = $ev->{sym};
149 my $uni = $ev->{unicode};
150
151 if ($sym == CFClient::SDLK_KP5) {
152 $::CONN->user_send ("stay fire");
153 } elsif ($uni == ord ",") {
154 $::CONN->user_send ("take");
155 } elsif ($uni == ord " ") {
156 $::CONN->user_send ("apply");
157 } elsif ($uni == ord ".") {
158 $::CONN->user_send ($self->{completer}{last_command})
159 if exists $self->{completer}{last_command};
160 } elsif ($uni == ord "\t") {
161 $::INV_WINDOW->toggle_visibility;
162 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
163 $::CONN->user_send ("rotateshoottype +");
164 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
165 $::CONN->user_send ("rotateshoottype -");
166 } elsif ($uni == ord '"') {
167 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
168 $self->{completer}->show;
169 } elsif ($uni == ord "'") {
170 $self->{completer}->set_prefix ("");
171 $self->{completer}->show;
172 } elsif (exists $DIR{$sym}) {
173 if ($mod & CFClient::KMOD_SHIFT) {
174 $self->{shft}++;
175 $::CONN->user_send ("fire $DIR{$sym}[0]");
176 } elsif ($mod & CFClient::KMOD_CTRL) {
177 $self->{ctrl}++;
178 $::CONN->user_send ("run $DIR{$sym}[0]");
179 } else {
180 $::CONN->user_send ("$DIR{$sym}[1]");
181 }
182 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
183 $::BIND_EDITOR->set_binding (undef, undef, [],
184 sub {
185 my ($mod, $sym, $cmds) = @_;
186 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
187 });
188 $::BIND_EDITOR->start;
189 $::BIND_EDITOR->show;
190 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
191 $::BIND_EDITOR->stop;
192 $::BIND_EDITOR->ask_for_bind_and_commit;
193 $::BIND_EDITOR->hide;
194 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
195 $::CONN->user_send ($_) for @$bind_cmd;
196 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
197 $self->{completer}->key_down ($ev);
198 $self->{completer}->show;
199 } else {
200 return 0;
201 }
202
203 1
204}
205
206sub key_up {
207 my ($self, $ev) = @_;
208
209 my $res = 0;
210 my $mod = $ev->{mod};
211 my $sym = $ev->{sym};
212
213 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
214 $::CONN->user_send ("fire_stop");
215 $res = 1;
216 }
217
218 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
219 $::CONN->user_send ("run_stop");
220 $res = 1;
221 }
222
223 $res
224}
225
81sub draw { 226sub draw {
82 my ($self) = @_; 227 my ($self) = @_;
83 228
229 my $focused = $CFClient::UI::FOCUS == $self
230 || $CFClient::UI::FOCUS == $self->{completer}{entry};
231
84 return 232 return
85 unless $CFClient::UI::FOCUS == $self || !$::FAST; 233 unless $focused || !$::FAST;
86 234
87 if (delete $self->{need_update}) { 235 if (delete $self->{need_update}) {
88 glNewList $self->{list}; 236 glNewList $self->{list};
89 237
90 if ($::MAP) { 238 if ($::MAP) {
… …
100 glTranslate $sx0 - 32, $sy0 - 32, 0; 248 glTranslate $sx0 - 32, $sy0 - 32, 0;
101 249
102 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 250 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
103 251
104 if ($::CFG->{fow_enable}) { 252 if ($::CFG->{fow_enable}) {
105 if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war 253 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
106 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 254 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
107 glConvolutionFilter2D ( 255 glConvolutionFilter2D (
108 GL_CONVOLUTION_2D, 256 GL_CONVOLUTION_2D,
109 GL_ALPHA, 257 GL_ALPHA,
110 3, 3, 258 3, 3,
… …
115 0.05, 0.13, 0.05, 263 0.05, 0.13, 0.05,
116 ); 264 );
117 glEnable GL_CONVOLUTION_2D; 265 glEnable GL_CONVOLUTION_2D;
118 } 266 }
119 267
268 $self->{fow_texture_name} ||= glGenTexture;
120 # try to re-use the texture name: TODO improve texture class instead 269 # try to re-use the texture name: TODO improve texture class instead
121 my $prev_name = ((delete $self->{fow_texture}) || {})->{name};
122 270
123 $self->{fow_texture} = new CFClient::Texture 271 $self->{fow_texture} = new CFClient::Texture
124 w => $w, 272 w => $w,
125 h => $h, 273 h => $h,
126 data => $data, 274 data => $data,
127 name => $prev_name, # a bit hackish 275 name => $self->{fow_texture_name},
128 internalformat => GL_ALPHA, 276 internalformat => GL_ALPHA,
129 format => GL_ALPHA; 277 format => GL_ALPHA;
130 278
131 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; 279 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
132 280
… …
148 glPushMatrix; 296 glPushMatrix;
149 glCallList $self->{list}; 297 glCallList $self->{list};
150 glPopMatrix; 298 glPopMatrix;
151 299
152 # TNT2 emulates logops in software (or worse :) 300 # TNT2 emulates logops in software (or worse :)
153 if ($CFClient::UI::FOCUS != $self) { 301 if ($focused) {
302 (delete $self->{out_of_focus})->destroy
303 if $self->{out_of_focus};
304 } else {
154 glColor 0.4, 0.2, 0.2, 0.9; 305 glColor 0.4, 0.2, 0.2, 0.6;
155 glEnable GL_BLEND; 306 glEnable GL_BLEND;
156 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 307 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
157 glBegin GL_QUADS; 308 glBegin GL_QUADS;
158 glVertex 0, 0; 309 glVertex 0, 0;
159 glVertex 0, $::HEIGHT; 310 glVertex 0, $::HEIGHT;
160 glVertex $::WIDTH, $::HEIGHT; 311 glVertex $::WIDTH, $::HEIGHT;
161 glVertex $::WIDTH, 0; 312 glVertex $::WIDTH, 0;
162 glEnd; 313 glEnd;
163 glDisable GL_BLEND; 314 glDisable GL_BLEND;
164 }
165}
166 315
167my %DIR = ( 316# $self->{out_of_focus} ||= do {
168 CFClient::SDLK_KP8, [1, "north"], 317# my $label = new CFClient::UI::Label
169 CFClient::SDLK_KP9, [2, "northeast"], 318# x => 0,
170 CFClient::SDLK_KP6, [3, "east"], 319# y => 0,
171 CFClient::SDLK_KP3, [4, "southeast"], 320# z => 1,
172 CFClient::SDLK_KP2, [5, "south"], 321# ellipsise => 0,
173 CFClient::SDLK_KP1, [6, "southwest"], 322# text => "map out of focus (click map to play)";
174 CFClient::SDLK_KP4, [7, "west"], 323#
175 CFClient::SDLK_KP7, [8, "northwest"], 324# $label->show;
176 325# $label->update;
177 CFClient::SDLK_UP, [1, "north"], 326#
178 CFClient::SDLK_RIGHT, [3, "east"], 327# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
179 CFClient::SDLK_DOWN, [5, "south"], 328# $label->move_abs (
180 CFClient::SDLK_LEFT, [7, "west"], 329# ($::WIDTH - $label->{w}) * 0.5,
181); 330# ($::HEIGHT - $label->{h}) * 0.5,
182 331# );
183sub key_down { 332# });
184 my ($self, $ev) = @_; 333#
185 334# $label
186 return unless $::CONN;
187
188 my $mod = $ev->{mod};
189 my $sym = $ev->{sym};
190 my $uni = $ev->{unicode};
191
192 if ($sym == CFClient::SDLK_KP5) {
193 $::CONN->user_send ("stay fire");
194 } elsif ($uni == ord ",") {
195 $::CONN->user_send ("take");
196 } elsif ($uni == ord "\t" or $uni == ord " ") {
197 $::CONN->user_send ("apply");
198 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
199 $::CONN->user_send ("rotateshoottype +");
200 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
201 $::CONN->user_send ("rotateshoottype -");
202 } elsif ($uni == ord "'") {
203 $self->emit ('activate_console');
204 } elsif ($uni == ord "/") {
205 $self->emit (activate_console => '/');
206 } elsif (exists $DIR{$sym}) {
207 if ($mod & CFClient::KMOD_SHIFT) {
208 $self->{shft}++;
209 $::CONN->user_send ("fire $DIR{$sym}[0]");
210 } elsif ($mod & CFClient::KMOD_CTRL) {
211 $self->{ctrl}++;
212 $::CONN->user_send ("run $DIR{$sym}[0]");
213 } else {
214 $::CONN->user_send ("$DIR{$sym}[1]");
215 } 335# };
216 } elsif ($ev->{unicode}) {
217 $self->{command_widget} ||=
218 new CFClient::MapWidget::Command::
219 command => $self->{command},
220 can_focus => 1,
221 connect_execute => sub {
222 # todo: support callback instead of user_send
223 $::CONN->user_send ($_[1]);
224 },
225 connect_close => sub {
226 (delete $self->{command_widget})->hide;
227 $self->focus_in;
228 },
229 ;
230 $self->{command_widget}->key_down ($ev)
231 unless $ev->{unicode} == 20;
232 return unless $self->{command_widget};
233 $self->{command_widget}->show;
234 $self->{command_widget}->focus_in;
235 } 336 }
236} 337}
237 338
238sub key_up { 339sub DESTROY {
239 my ($self, $ev) = @_;
240
241 my $mod = $ev->{mod};
242 my $sym = $ev->{sym};
243
244 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
245 $::CONN->user_send ("fire_stop");
246 }
247 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
248 $::CONN->user_send ("run_stop");
249 }
250}
251
252sub add_command {
253 my ($self, $command, $tooltip, $widget, $cb) = @_;
254
255 (my $data = $command) =~ s/\\//g;
256
257 $tooltip =~ s/^\s+//;
258
259 $tooltip = "<big>$data</big>\n\n$tooltip";
260
261 $tooltip =~ s/\s+$//;
262
263 $self->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
264}
265
266sub clr_commands {
267 my ($self) = @_; 340 my $self = shift;
268 341
269 %{$self->{command}} = (); 342 glDeleteList $self->{list};
343
344 $self->SUPER::DESTROY;
270} 345}
271 346
272package CFClient::MapWidget::MapMap; 347package CFClient::MapWidget::MapMap;
273 348
274our @ISA = CFClient::UI::Base::; 349our @ISA = CFClient::UI::Base::;
… …
375 fontsize => $_, 450 fontsize => $_,
376 ), (0.8) x 16 451 ), (0.8) x 16
377 ]; 452 ];
378 453
379 $self->{entry} = new CFClient::UI::Entry 454 $self->{entry} = new CFClient::UI::Entry
380 connect_changed => sub { 455 on_changed => sub {
381 $self->update_labels; 456 $self->update_labels;
457 },
458 on_key_down => sub {
459 my ($entry, $ev) = @_;
460
461 my $self = $entry->{parent}{parent};
462
463 if ($ev->{sym} == 13) {
464 if (exists $self->{select}) {
465 $self->{last_command} = $self->{select};
466 $::CONN->user_send ($self->{select});
467 $self->hide;
468 }
469 } elsif ($ev->{sym} == 27) {
470 $self->hide;
471 return;
472 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
473 ++$self->{select_offset}
474 if $self->{select_offset} < $#{ $self->{last_match} || [] };
475 $self->update_labels;
476 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
477 --$self->{select_offset}
478 if $self->{select_offset};
479 $self->update_labels;
480 } else {
481 return 0;
482 }
483
484 1
382 }; 485 }
486 ;
383 487
384 $self->{vbox}->add ( 488 $self->{vbox}->add (
385 $self->{entry}, 489 $self->{entry},
386 @{$self->{label}}, 490 @{$self->{label}},
387 ); 491 );
388 492
389 $self 493 $self
390} 494}
391 495
496sub set_prefix {
497 my ($self, $prefix) = @_;
498
499 $self->{entry}->set_text ($prefix);
500 $self->show;
501}
502
392sub size_allocate { 503sub size_allocate {
393 my ($self, $w, $h) = @_; 504 my ($self, $w, $h) = @_;
394 505
395 $self->SUPER::size_allocate ($w, $h); 506 $self->SUPER::size_allocate ($w, $h);
396 $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 507 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
508}
509
510sub show {
511 my ($self) = @_;
512
513 $self->SUPER::show;
514 $self->{entry}->focus_in;
515}
516
517sub hide {
518 my ($self) = @_;
519
520 $self->SUPER::hide;
521 $self->{entry}->set_text ("");
397} 522}
398 523
399sub key_down { 524sub key_down {
400 my ($self, $ev) = @_; 525 my ($self, $ev) = @_;
401 526
402 if ($ev->{sym} == 13) { 527 $self->{entry}->key_down ($ev)
403 if (exists $self->{select}) { 528}
404 $self->emit (execute => $self->{select}); 529
405 $self->emit ("close"); 530sub update_labels {
531 my ($self) = @_;
532
533 my $text = $self->{entry}->get_text;
534
535 length $text
536 or return $self->hide;
537
538 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
539
540 if ($text ne $self->{last_search}) {
541 my @match;
542
543 if ($text =~ /^(.*?)\s+$/) {
544 @match = [$cmd, "(appended whitespace suppresses completion)"];
545 } else {
546 my $regexp = do {
547 my ($beg, @chr) = split //, lc $cmd;
548
549 # the following regex is used to match our "completion entry"
550 # to an actual command - the parentheses match kind of "overhead"
551 # - the more characters the parentheses match, the less attractive
552 # is the match.
553 my $regexp = "^\Q$beg\E"
554 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
555 qr<$regexp>
556 };
557
558 my @penalty;
559
560 for (keys %{$self->{command}}) {
561 if (@penalty = $_ =~ $regexp) {
562 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
563 }
564 }
565
566 @match = map $self->{command}{$_->[0]},
567 sort {
568 $a->[1] <=> $b->[1]
569 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
570 or (length $b->[0]) <=> (length $a->[0])
571 } @match;
406 } 572 }
407 } elsif ($ev->{sym} == 27) {
408 $self->{entry}->set_text ("");
409 $self->emit ("close");
410 return;
411 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
412 ++$self->{select_offset}
413 if $self->{select_offset} < $#{ $self->{last_match} || [] };
414 $self->update_labels;
415 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
416 --$self->{select_offset}
417 if $self->{select_offset};
418 $self->update_labels;
419 } else {
420 #$self->{entry}{force_alloc} = 1;
421 $self->{entry}->key_down ($ev);
422 }
423}
424 573
425sub update_labels {
426 my ($self) = @_;
427
428 my $text = $self->{entry}->get_text;
429
430 length $text
431 or return $self->emit ("close");
432
433 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
434
435 if ($cmd ne $self->{last_search}) {
436 my $regexp = do {
437 my ($beg, @chr) = split //, lc $cmd;
438
439 # the following regex is used to match our "completion entry"
440 # to an actual command - the parentheses match kind of "overhead"
441 # - the more characters the parentheses match, the less attractive
442 # is the match.
443 my $regexp = "^\Q$beg\E"
444 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
445 qr<$regexp>
446 };
447
448 my @match;
449 my @penalty;
450
451 for (keys %{$self->{command}}) {
452 if (@penalty = $_ =~ $regexp) {
453 push @match, [$_, length join "", map "::$_", grep defined, @penalty];
454 }
455 }
456
457 @match = map $self->{command}{$_->[0]},
458 sort {
459 $a->[1] <=> $b->[1]
460 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
461 } @match;
462
463 $self->{last_search} = $cmd; 574 $self->{last_search} = $text;
464 $self->{last_match} = \@match; 575 $self->{last_match} = \@match;
465 576
466 $self->{select_offset} = 0; 577 $self->{select_offset} = 0;
467 } 578 }
468 579

Diff Legend

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