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.74 by elmex, Mon May 29 19:49:33 2006 UTC vs.
Revision 1.200 by root, Sun Jan 4 10:22:19 2009 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines