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

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.89 by root, Mon Jun 5 21:10:03 2006 UTC vs.
Revision 1.145 by root, Mon Jul 2 02:58:51 2007 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFClient - undocumented utility garbage for our crossfire client 3CFPlus - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFClient; 7 use CFPlus;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package CFClient; 15package CFPlus;
16
17use Carp ();
16 18
17BEGIN { 19BEGIN {
18 $VERSION = '0.1'; 20 $VERSION = '0.98';
19 21
20 use XSLoader; 22 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
22} 24}
23 25
24use utf8; 26use utf8;
25 27
26use Carp ();
27use AnyEvent (); 28use AnyEvent ();
28use BerkeleyDB;
29use Pod::POM (); 29use Pod::POM ();
30use File::Path ();
30use Storable (); # finally 31use Storable (); # finally
32use Fcntl ();
33use JSON::XS qw(to_json from_json);
31 34
32package CFClient::PodToPango; 35=item guard { BLOCK }
33 36
34use base Pod::POM::View::Text; 37Returns an object that executes the given block as soon as it is destroyed.
35 38
36our $VERSION = 1; # bump if resultant formatting changes 39=cut
37 40
38our $indent = 0; 41sub guard(&) {
39 42 bless \(my $cb = $_[0]), "CFPlus::Guard"
40*view_seq_code =
41*view_seq_bold = sub { "<b>$_[1]</b>" };
42*view_seq_italic = sub { "<i>$_[1]</i>" };
43*view_seq_space =
44*view_seq_link =
45*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
46
47sub view_seq_text {
48 my $text = $_[1];
49 $text =~ s/\s+/ /g;
50 CFClient::UI::Label::escape ($text)
51} 43}
52 44
53sub view_item { 45sub CFPlus::Guard::DESTROY {
54 ("\t" x ($indent / 4)) 46 ${$_[0]}->()
55 . $_[1]->title->present ($_[0])
56 . "\n"
57 . $_[1]->content->present ($_[0])
58} 47}
59 48
60sub view_verbatim { 49=item shorten $string[, $maxlength]
61 (join "",
62 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
63 split /\n/, CFClient::UI::Label::escape ($_[1]))
64 . "\n"
65}
66 50
67sub view_textblock { 51=cut
68 ("\t" x ($indent / 2)) . "$_[1]\n\n"
69}
70 52
71sub view_head1 { 53sub shorten($;$) {
72 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n" 54 my ($str, $len) = @_;
73 . $_[1]->content->present ($_[0]) 55 substr $str, $len, (length $str), "..." if $len + 3 <= length $str;
74}; 56 $str
75
76sub view_head2 {
77 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
78 . $_[1]->content->present ($_[0])
79};
80
81sub view_head3 {
82 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
83 . $_[1]->content->present ($_[0])
84};
85
86sub view_over {
87 local $indent = $indent + $_[1]->indent;
88 $_[1]->content->present ($_[0])
89} 57}
90 58
91package CFClient::Database; 59sub asxml($) {
60 local $_ = $_[0];
92 61
93our @ISA = BerkeleyDB::Btree::; 62 s/&/&amp;/g;
63 s/>/&gt;/g;
64 s/</&lt;/g;
94 65
95sub get($$) { 66 $_
96 my $data;
97
98 $_[0]->db_get ($_[1], $data) == 0
99 ? $data
100 : ()
101} 67}
102 68
103my %DB_SYNC; 69sub socketpipe() {
70 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
71 or die "cannot establish bidirectional pipe: $!\n";
104 72
105sub put($$$) { 73 ($fh1, $fh2)
106 my ($db, $key, $data) = @_;
107
108 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
109
110 $db->db_put ($key => $data)
111} 74}
112 75
76sub background(&;&) {
77 my ($bg, $cb) = @_;
78
79 my ($fh_r, $fh_w) = CFPlus::socketpipe;
80
81 my $pid = fork;
82
83 if (defined $pid && !$pid) {
84 local $SIG{__DIE__};
85
86 open STDOUT, ">&", $fh_w;
87 open STDERR, ">&", $fh_w;
88 close $fh_r;
89 close $fh_w;
90
91 $| = 1;
92
93 eval { $bg->() };
94
95 if ($@) {
96 my $msg = $@;
97 $msg =~ s/\n+/\n/;
98 warn "FATAL: $msg";
99 CFPlus::_exit 1;
100 }
101
102 # win32 is fucked up, of course. exit will clean stuff up,
103 # which destroys our database etc. _exit will exit ALL
104 # forked processes, because of the dreaded fork emulation.
105 CFPlus::_exit 0;
106 }
107
108 close $fh_w;
109
110 my $buffer;
111
112 my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
113 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
114 undef $w;
115 $cb->();
116 return;
117 }
118
119 while ($buffer =~ s/^(.*)\n//) {
120 my $line = $1;
121 $line =~ s/\s+$//;
122 utf8::decode $line;
123 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
124 $cb->(JSON::XS->new->allow_nonref->decode ($1));
125 } else {
126 ::message ({
127 markup => "background($pid): " . CFPlus::asxml $line,
128 });
129 }
130 }
131 });
132}
133
134sub background_msg {
135 my ($msg) = @_;
136
137 $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
138 $msg =~ s/\n//g;
139 utf8::encode $msg;
140 print $msg, "\n";
141}
142
113package CFClient; 143package CFPlus;
114 144
115sub find_rcfile($) { 145sub find_rcfile($) {
116 my $path; 146 my $path;
117 147
118 for (grep !ref, @INC) { 148 for (grep !ref, @INC) {
119 $path = "$_/CFClient/resources/$_[0]"; 149 $path = "$_/CFPlus/resources/$_[0]";
120 return $path if -r $path; 150 return $path if -r $path;
121 } 151 }
122 152
123 die "FATAL: can't find required file $_[0]\n"; 153 die "FATAL: can't find required file $_[0]\n";
124} 154}
125 155
126sub read_cfg { 156sub read_cfg {
127 my ($file) = @_; 157 my ($file) = @_;
128 158
129 open CFG, $file 159 open my $fh, $file
130 or return; 160 or return;
131 161
132 my $CFG;
133
134 local $/; 162 local $/;
135 $CFG = eval <CFG>; 163 my $CFG = <$fh>;
136 164
137 $::CFG = $CFG; 165 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
138 166 require YAML;
139 close CFG; 167 utf8::decode $CFG;
168 $::CFG = YAML::Load ($CFG);
169 } elsif ($CFG =~ /^\{/) {
170 $::CFG = from_json $CFG;
171 } else {
172 $::CFG = eval $CFG; ## todo comaptibility cruft
173 }
140} 174}
141 175
142sub write_cfg { 176sub write_cfg {
143 my ($file) = @_; 177 my ($file) = @_;
144 178
145 open CFG, ">$file" 179 $::CFG->{VERSION} = $::VERSION;
180
181 open my $fh, ">:utf8", $file
146 or return; 182 or return;
147 183 print $fh to_json $::CFG;
148 {
149 require Data::Dumper;
150 local $Data::Dumper::Purity = 1;
151 $::CFG->{VERSION} = $::VERSION;
152 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
153 }
154
155 close CFG;
156} 184}
157 185
158our $DB_ENV; 186sub http_proxy {
187 my @proxy = win32_proxy_info;
159 188
160{ 189 if (@proxy) {
161 use strict; 190 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
162 191 } elsif (exists $ENV{http_proxy}) {
163 mkdir "$Crossfire::VARDIR/cfplus", 0777; 192 $ENV{http_proxy}
164 my $recover = $BerkeleyDB::db_version >= 4.4 193 } else {
165 ? eval "DB_REGISTER | DB_RECOVER" 194 ()
166 : 0;
167
168 $DB_ENV = new BerkeleyDB::Env
169 -Home => "$Crossfire::VARDIR/cfplus",
170 -Cachesize => 1_000_000,
171 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
172# -ErrPrefix => "DATABASE",
173 -Verbose => 1,
174 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
175 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
176 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
177}
178
179sub db_table($) {
180 my ($table) = @_;
181
182 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
183
184 new CFClient::Database
185 -Env => $DB_ENV,
186 -Filename => $table,
187# -Filename => "database",
188# -Subname => $table,
189 -Property => DB_CHKSUM,
190 -Flags => DB_CREATE | DB_UPGRADE,
191 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
192}
193
194my $pod_cache = db_table "pod_cache";
195
196sub load_pod($$$$) {
197 my ($path, $filtertype, $filterversion, $filtercb) = @_;
198
199 stat $path
200 or die "$path: $!";
201
202 my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
203
204 my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
205
206 return $pom if $chash eq $phash;
207
208 my $pod = do {
209 local $/;
210 open my $pod, "<:utf8", $_[0]
211 or die "$_[0]: $!";
212 <$pod>
213 }; 195 }
214
215 #utf8::downgrade $pod;
216
217 $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
218
219 $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
220
221 $pom
222} 196}
223 197
224sub pod_to_pango($) { 198sub set_proxy {
225 my ($pom) = @_; 199 my $proxy = http_proxy
200 or return;
226 201
227 $pom->present ("CFClient::PodToPango") 202 $ENV{http_proxy} = $proxy;
228} 203}
229 204
230sub pod_to_pango_list($) { 205sub lwp_useragent {
231 my ($pom) = @_; 206 require LWP::UserAgent;
232
233 [ 207
234 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "], 208 CFPlus::set_proxy;
235 split /\n/, $pom->present ("CFClient::PodToPango")
236 ]
237}
238 209
239package CFClient::Item; 210 my $ua = LWP::UserAgent->new (
240 211 agent => "cfplus $VERSION",
241use strict; 212 keep_alive => 1,
242use Crossfire::Protocol::Constants; 213 env_proxy => 1,
243 214 timeout => 30,
244my $last_enter_count = 1;
245
246sub desc_string {
247 my ($self) = @_;
248
249 my $desc =
250 $self->{nrof} < 2
251 ? $self->{name}
252 : "$self->{nrof} × $self->{name_pl}";
253
254 $self->{flags} & F_OPEN
255 and $desc .= " (open)";
256 $self->{flags} & F_APPLIED
257 and $desc .= " (applied)";
258 $self->{flags} & F_UNPAID
259 and $desc .= " (unpaid)";
260 $self->{flags} & F_MAGIC
261 and $desc .= " (magic)";
262 $self->{flags} & F_CURSED
263 and $desc .= " (cursed)";
264 $self->{flags} & F_DAMNED
265 and $desc .= " (damned)";
266 $self->{flags} & F_LOCKED
267 and $desc .= " *";
268
269 $desc
270}
271
272sub weight_string {
273 my ($self) = @_;
274
275 my $weight = ($self->{nrof} || 1) * $self->{weight};
276
277 $weight < 0 ? "?" : $weight * 0.001
278}
279
280sub do_n_dialog {
281 my ($cb) = @_;
282
283 my $w = new CFClient::UI::FancyFrame;
284 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
285 $vb->add (new CFClient::UI::Label text => "Enter item count:");
286 $vb->add (my $entry = new CFClient::UI::Entry
287 text => $last_enter_count,
288 on_activate => sub {
289 my ($entry) = @_;
290 $last_enter_count = $entry->get_text;
291 $cb->($last_enter_count);
292 $w->hide;
293 $w = undef;
294 }
295 ); 215 );
296 $entry->focus_in;
297 $w->show;
298
299} 216}
300 217
301sub update_widgets { 218sub lwp_check($) {
302 my ($self) = @_; 219 my ($res) = @_;
303 220
304 my $button_cb = sub { 221 $res->is_error
305 my (undef, $ev, $x, $y) = @_; 222 and die $res->status_line;
306 223
307 my $targ = $::CONN->{player}{tag}; 224 $res
225}
308 226
309 if ($self->{container} == $::CONN->{player}{tag}) { 227sub fh_nonblocking($$) {
310 $targ = $::CONN->{open_container}; 228 my ($fh, $nb) = @_;
311 }
312 229
313 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 230 if ($^O eq "MSWin32") {
314 $::CONN->send ("move $targ $self->{tag} 0") 231 $nb = (! ! $nb) + 0;
315 if $targ || !($self->{flags} & F_LOCKED); 232 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
316 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 233 } else {
317 $self->{flags} & F_LOCKED 234 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
318 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
319 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
320 } elsif ($ev->{button} == 1) {
321 $::CONN->send ("examine $self->{tag}");
322 } elsif ($ev->{button} == 2) {
323 $::CONN->send ("apply $self->{tag}");
324 } elsif ($ev->{button} == 3) {
325 my @menu_items = (
326 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
327 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
328 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
329 (
330 $self->{flags} & F_LOCKED
331 ? (
332 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
333 )
334 : (
335 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
336 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
337 ["move n",
338 sub {
339 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
340 }
341 ]
342 )
343 ),
344 );
345
346 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
347 }
348
349 1
350 }; 235 }
351 236
352 my $tooltip_std = "<small>"
353 . "Left click - examine item\n"
354 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
355 . "Middle click - apply\n"
356 . "Shift-Middle click - lock/unlock\n"
357 . "Right click - further options"
358 . "</small>\n";
359
360 $self->{face_widget} ||= new CFClient::UI::Face
361 can_events => 1,
362 can_hover => 1,
363 anim => $self->{anim},
364 animspeed => $self->{animspeed}, # TODO# must be set at creation time
365 on_button_down => $button_cb,
366 ;
367 $self->{face_widget}{face} = $self->{face};
368 $self->{face_widget}{anim} = $self->{anim};
369 $self->{face_widget}{animspeed} = $self->{animspeed};
370 $self->{face_widget}->set_tooltip (
371 "<b>Face/Animation.</b>\n"
372 . "Item uses face #$self->{face}. "
373 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
374 . "\n\n$tooltip_std"
375 );
376
377 $self->{desc_widget} ||= new CFClient::UI::Label
378 can_events => 1,
379 can_hover => 1,
380 ellipsise => 2,
381 align => -1,
382 on_button_down => $button_cb,
383 ;
384 my $desc = CFClient::Item::desc_string $self;
385 $self->{desc_widget}->set_text ($desc);
386 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
387
388 $self->{weight_widget} ||= new CFClient::UI::Label
389 can_events => 1,
390 can_hover => 1,
391 ellipsise => 0,
392 align => 0,
393 on_button_down => $button_cb,
394 ;
395 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
396
397 $self->{weight_widget}->set_tooltip (
398 "<b>Weight</b>.\n"
399 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
400 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
401 . "\n\n$tooltip_std"
402 );
403} 237}
404 238
405package CFClient::Binder; 239package CFPlus::Layout;
406 240
407my @ALLOWED_MODIFIER_KEYS = ( 241$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
408 CFClient::SDLK_LSHIFT, 242 reset_glyph_cache;
409 CFClient::SDLK_LCTRL , 243};
410 CFClient::SDLK_LALT ,
411 CFClient::SDLK_LMETA ,
412
413 CFClient::SDLK_RSHIFT,
414 CFClient::SDLK_RCTRL ,
415 CFClient::SDLK_RALT ,
416 CFClient::SDLK_RMETA ,
417);
418
419my %ALLOWED_MODIFIERS = (
420 CFClient::KMOD_LSHIFT => "LSHIFT",
421 CFClient::KMOD_LCTRL => "LCTRL",
422 CFClient::KMOD_LALT => "LALT",
423 CFClient::KMOD_LMETA => "LMETA",
424
425 CFClient::KMOD_RSHIFT => "RSHIFT",
426 CFClient::KMOD_RCTRL => "RCTRL",
427 CFClient::KMOD_RALT => "RALT",
428 CFClient::KMOD_RMETA => "RMETA",
429);
430
431my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
432my @DIRECT_BIND_KEYS = (
433 CFClient::SDLK_F1,
434 CFClient::SDLK_F2,
435 CFClient::SDLK_F3,
436 CFClient::SDLK_F4,
437 CFClient::SDLK_F5,
438 CFClient::SDLK_F6,
439 CFClient::SDLK_F7,
440 CFClient::SDLK_F8,
441 CFClient::SDLK_F9,
442 CFClient::SDLK_F10,
443 CFClient::SDLK_F11,
444 CFClient::SDLK_F12,
445 CFClient::SDLK_F13,
446 CFClient::SDLK_F14,
447 CFClient::SDLK_F15,
448);
449
450# this binding dialog asks for a key-combo to be pressed
451# and if successful it calls the $cb with $mod and $sym as args.
452sub open_binding_dialog {
453 my ($cb) = @_;
454
455 my $w = new CFClient::UI::FancyFrame
456 title => "Bind Action",
457 x => "center",
458 y => "center";
459
460 $w->add (my $vb = new CFClient::UI::VBox);
461 $vb->add (new CFClient::UI::Label
462 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
463 ."You can only bind 0-9 and F1-F15 without modifiers."
464 );
465 $vb->add (my $entry = new CFClient::UI::Entry
466 text => "",
467 on_key_down => sub {
468 my ($entry, $ev) = @_;
469
470 my $mod = $ev->{mod};
471 my $sym = $ev->{sym};
472
473 # XXX: This seems a little bit hackisch to me, but i have to ignore them
474 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
475 return;
476 }
477
478 if ($mod == CFClient::KMOD_NONE
479 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
480 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
481 {
482 $::STATUSBOX->add (
483 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
484 ." directly without modifier! It would damage the completer handling."
485 );
486 return;
487 }
488
489 $entry->focus_out;
490
491 $cb->($mod, $sym);
492
493 $w->destroy
494 });
495
496 $entry->focus_in;
497 $w->show;
498}
499
500sub keycombo_to_name {
501 my ($mod, $sym) = @_;
502
503 my $mods = join '+',
504 map { $ALLOWED_MODIFIERS{$_} }
505 grep { ($_ + 0) & ($mod + 0) }
506 keys %ALLOWED_MODIFIERS;
507 $mods .= "+" if $mods ne '';
508
509 return $mods . CFClient::SDL_GetKeyName ($sym);
510}
511
512package CFClient::Pickup;
513# some pickup constants
514sub PU_NOTHING { 0x00000000 }
515
516sub PU_DEBUG { 0x10000000 }
517sub PU_INHIBIT { 0x20000000 }
518sub PU_STOP { 0x40000000 }
519sub PU_NEWMODE { 0x80000000 }
520
521sub PU_RATIO { 0x0000000F }
522
523sub PU_FOOD { 0x00000010 }
524sub PU_DRINK { 0x00000020 }
525sub PU_VALUABLES { 0x00000040 }
526sub PU_BOW { 0x00000080 }
527
528sub PU_ARROW { 0x00000100 }
529sub PU_HELMET { 0x00000200 }
530sub PU_SHIELD { 0x00000400 }
531sub PU_ARMOUR { 0x00000800 }
532
533sub PU_BOOTS { 0x00001000 }
534sub PU_GLOVES { 0x00002000 }
535sub PU_CLOAK { 0x00004000 }
536sub PU_KEY { 0x00008000 }
537
538sub PU_MISSILEWEAPON { 0x00010000 }
539sub PU_ALLWEAPON { 0x00020000 }
540sub PU_MAGICAL { 0x00040000 }
541sub PU_POTION { 0x00080000 }
542
543sub PU_SPELLBOOK { 0x00100000 }
544sub PU_SKILLSCROLL { 0x00200000 }
545sub PU_READABLES { 0x00400000 }
546sub PU_MAGIC_DEVICE { 0x00800000 }
547
548sub PU_NOT_CURSED { 0x01000000 }
549
550sub PU_JEWELS { 0x02000000 }
551
552 244
5531; 2451;
554 246
555=back 247=back
556 248

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines