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.36 by root, Sat Apr 15 23:24:59 2006 UTC vs.
Revision 1.87 by root, Mon Jun 5 05:23:19 2006 UTC

… …
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFClient", $VERSION;
22} 22}
23 23
24use utf8;
25
26use Carp ();
24use AnyEvent; 27use AnyEvent ();
25use BerkeleyDB; 28use BerkeleyDB;
26use SDL::OpenGL; 29use Pod::POM;
27
28our %GL_EXT;
29our $GL_VERSION;
30
31our $GL_NPOT;
32
33sub gl_init {
34 $GL_VERSION = gl_version * 1;
35 %GL_EXT = map +($_ => 1), split /\s+/, gl_extensions;
36
37 $GL_NPOT = $GL_EXT{GL_ARB_texture_non_power_of_two} || $GL_VERSION >= 2;
38
39 glEnable GL_TEXTURE_2D;
40 glEnable GL_COLOR_MATERIAL;
41 glShadeModel GL_FLAT;
42 glDisable GL_DEPTH_TEST;
43 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
44
45 glHint GL_PERSPECTIVE_CORRECTION_HINT, GL_FASTEST;
46
47 CFClient::Texture::restore_state ();
48}
49 30
50sub find_rcfile($) { 31sub find_rcfile($) {
51 my $path; 32 my $path;
52 33
53 for (@INC) { 34 for (grep !ref, @INC) {
54 $path = "$_/CFClient/resources/$_[0]"; 35 $path = "$_/CFClient/resources/$_[0]";
55 return $path if -r $path; 36 return $path if -r $path;
56 } 37 }
57 38
58 die "FATAL: can't find required file $_[0]\n"; 39 die "FATAL: can't find required file $_[0]\n";
… …
88 } 69 }
89 70
90 close CFG; 71 close CFG;
91} 72}
92 73
74sub load_pod($) {
75 my $pod = do {
76 local $/;
77 open my $pod, "<:utf8", $_[0]
78 or die "$_[0]: $!";
79 <$pod>
80 };
81
82 Pod::POM->new->parse_text ($pod);
83}
84
85our $DB_ENV;
86
87{
88 use strict;
89
93mkdir "$Crossfire::VARDIR/pclient", 0777; 90 mkdir "$Crossfire::VARDIR/cfplus", 0777;
91 my $recover = $BerkeleyDB::db_version >= 4.4
92 ? eval "DB_REGISTER | DB_RECOVER"
93 : 0;
94 94
95our $DB_ENV = new BerkeleyDB::Env 95 $DB_ENV = new BerkeleyDB::Env
96 -Home => "$Crossfire::VARDIR/pclient", 96 -Home => "$Crossfire::VARDIR/cfplus",
97 -Cachesize => 1_000_000, 97 -Cachesize => 1_000_000,
98 -ErrFile => "/proc/self/fd/2", 98 -ErrFile => "$Crossfire::VARDIR/cfplus/errorlog.txt",
99 -ErrPrefix => "DATABASE", 99# -ErrPrefix => "DATABASE",
100 -Verbose => 1, 100 -Verbose => 1,
101 -Flags => DB_CREATE | DB_JOINENV | DB_RECOVER_FATAL | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN, 101 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
102 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
102 or die "unable to create/open database home $Crossfire::VARDIR/pclient: $BerkeleyDB::Error"; 103 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
104}
103 105
104sub db_table($) { 106sub db_table($) {
107 my ($table) = @_;
108
109 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
110
105 new CFClient::Database 111 new CFClient::Database
106 -Env => $DB_ENV, 112 -Env => $DB_ENV,
113 -Filename => $table,
107 -Filename => "database", 114# -Filename => "database",
108 -Subname => $_[0], 115# -Subname => $table,
116 -Property => DB_CHKSUM,
109 -Flags => DB_CREATE | DB_UPGRADE, 117 -Flags => DB_CREATE | DB_UPGRADE,
110 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"; 118 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
119}
120
121sub pod_to_pango($) {
122 my ($pom) = @_;
123
124 $pom->present ("CFClient::PodToPango")
125}
126
127sub pod_to_pango_list($) {
128 my ($pom) = @_;
129
130 [
131 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
132 split /\n/, $pom->present ("CFClient::PodToPango")
133 ]
134}
135
136package CFClient::PodToPango;
137
138use base Pod::POM::View::Text;
139
140our $indent = 0;
141
142*view_seq_code =
143*view_seq_bold = sub { "<b>$_[1]</b>" };
144*view_seq_italic = sub { "<i>$_[1]</i>" };
145*view_seq_space =
146*view_seq_link =
147*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
148
149sub view_seq_text {
150 my $text = $_[1];
151 $text =~ s/\s+/ /g;
152 CFClient::UI::Label::escape ($text)
153}
154
155sub view_item {
156 ("\t" x ($indent / 4))
157 . $_[1]->title->present ($_[0])
158 . "\n"
159 . $_[1]->content->present ($_[0])
160}
161
162sub view_verbatim {
163 (join "",
164 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
165 split /\n/, CFClient::UI::Label::escape ($_[1]))
166 . "\n"
167}
168
169sub view_textblock {
170 ("\t" x ($indent / 2)) . "$_[1]\n\n"
171}
172
173sub view_head1 {
174 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
175 . $_[1]->content->present ($_[0])
176};
177
178sub view_head2 {
179 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
180 . $_[1]->content->present ($_[0])
181};
182
183sub view_head3 {
184 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
185 . $_[1]->content->present ($_[0])
186};
187
188sub view_over {
189 local $indent = $indent + $_[1]->indent;
190 $_[1]->content->present ($_[0])
111} 191}
112 192
113package CFClient::Database; 193package CFClient::Database;
114 194
115our @ISA = BerkeleyDB::Btree::; 195our @ISA = BerkeleyDB::Btree::;
… …
117sub get($$) { 197sub get($$) {
118 my $data; 198 my $data;
119 199
120 $_[0]->db_get ($_[1], $data) == 0 200 $_[0]->db_get ($_[1], $data) == 0
121 ? $data 201 ? $data
122 : (); 202 : ()
123} 203}
124 204
125my %DB_SYNC; 205my %DB_SYNC;
126 206
127sub put($$$) { 207sub put($$$) {
128 my ($db, $key, $data) = @_; 208 my ($db, $key, $data) = @_;
129 209
130 $db->db_put ($key => $data);
131
132 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 210 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
211
212 $db->db_put ($key => $data)
213}
214
215package CFClient::Item;
216
217use strict;
218use Crossfire::Protocol::Constants;
219
220my $last_enter_count = 1;
221
222sub desc_string {
223 my ($self) = @_;
224
225 my $desc =
226 $self->{nrof} < 2
227 ? $self->{name}
228 : "$self->{nrof} × $self->{name_pl}";
229
230 $self->{flags} & F_OPEN
231 and $desc .= " (open)";
232 $self->{flags} & F_APPLIED
233 and $desc .= " (applied)";
234 $self->{flags} & F_UNPAID
235 and $desc .= " (unpaid)";
236 $self->{flags} & F_MAGIC
237 and $desc .= " (magic)";
238 $self->{flags} & F_CURSED
239 and $desc .= " (cursed)";
240 $self->{flags} & F_DAMNED
241 and $desc .= " (damned)";
242 $self->{flags} & F_LOCKED
243 and $desc .= " *";
244
245 $desc
246}
247
248sub weight_string {
249 my ($self) = @_;
250
251 my $weight = ($self->{nrof} || 1) * $self->{weight};
252
253 $weight < 0 ? "?" : $weight * 0.001
254}
255
256sub do_n_dialog {
257 my ($cb) = @_;
258
259 my $w = new CFClient::UI::FancyFrame;
260 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center");
261 $vb->add (new CFClient::UI::Label text => "Enter item count:");
262 $vb->add (my $entry = new CFClient::UI::Entry
263 text => $last_enter_count,
264 on_activate => sub {
265 my ($entry) = @_;
266 $last_enter_count = $entry->get_text;
267 $cb->($last_enter_count);
268 $w->hide;
269 $w = undef;
270 }
271 );
272 $entry->focus_in;
273 $w->show;
274
275}
276
277sub update_widgets {
278 my ($self) = @_;
279
280 my $button_cb = sub {
281 my (undef, $ev, $x, $y) = @_;
282
283 my $targ = $::CONN->{player}{tag};
284
285 if ($self->{container} == $::CONN->{player}{tag}) {
286 $targ = $::CONN->{open_container};
287 }
288
289 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) {
290 $::CONN->send ("move $targ $self->{tag} 0")
291 if $targ || !($self->{flags} & F_LOCKED);
292 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) {
293 $self->{flags} & F_LOCKED
294 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
295 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
296 } elsif ($ev->{button} == 1) {
297 $::CONN->send ("examine $self->{tag}");
298 } elsif ($ev->{button} == 2) {
299 $::CONN->send ("apply $self->{tag}");
300 } elsif ($ev->{button} == 3) {
301 my @menu_items = (
302 ["examine", sub { $::CONN->send ("examine $self->{tag}") }],
303 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
304 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
305 (
306 $self->{flags} & F_LOCKED
307 ? (
308 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
309 )
310 : (
311 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
312 ["drop", sub { $::CONN->send ("move $::CONN->{open_container} $self->{tag} 0") }],
313 ["move n",
314 sub {
315 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
316 }
317 ]
318 )
319 ),
320 );
321
322 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
323 }
324
325 1
326 };
327
328 my $tooltip_std = "<small>"
329 . "Left click - examine item\n"
330 . "Shift-Left click - " . ($self->{container} ? "move or drop" : "take") . " item\n"
331 . "Middle click - apply\n"
332 . "Shift-Middle click - lock/unlock\n"
333 . "Right click - further options"
334 . "</small>\n";
335
336 $self->{face_widget} ||= new CFClient::UI::Face
337 can_events => 1,
338 can_hover => 1,
339 anim => $self->{anim},
340 animspeed => $self->{animspeed}, # TODO# must be set at creation time
341 on_button_down => $button_cb,
342 ;
343 $self->{face_widget}{face} = $self->{face};
344 $self->{face_widget}{anim} = $self->{anim};
345 $self->{face_widget}{animspeed} = $self->{animspeed};
346 $self->{face_widget}->set_tooltip (
347 "<b>Face/Animation.</b>\n"
348 . "Item uses face #$self->{face}. "
349 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
350 . "\n\n$tooltip_std"
351 );
133 352
134} 353 $self->{desc_widget} ||= new CFClient::UI::Label
354 can_events => 1,
355 can_hover => 1,
356 ellipsise => 2,
357 align => -1,
358 on_button_down => $button_cb,
359 ;
360 my $desc = CFClient::Item::desc_string $self;
361 $self->{desc_widget}->set_text ($desc);
362 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
135 363
136package CFClient::Texture; 364 $self->{weight_widget} ||= new CFClient::UI::Label
365 can_events => 1,
366 can_hover => 1,
367 ellipsise => 0,
368 align => 0,
369 on_button_down => $button_cb,
370 ;
371 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self);
137 372
138use strict; 373 $self->{weight_widget}->set_tooltip (
139 374 "<b>Weight</b>.\n"
140use Scalar::Util; 375 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
141 376 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
142use SDL::OpenGL; 377 . "\n\n$tooltip_std"
143
144my %TEXTURES;
145
146sub new {
147 my ($class, %data) = @_;
148
149 my $self = bless {
150 internalformat => GL_RGBA,
151 format => GL_RGBA,
152 type => GL_UNSIGNED_BYTE,
153 %data,
154 }, $class;
155
156 Scalar::Util::weaken ($TEXTURES{$self+0} = $self);
157
158 $self->upload;
159
160 $self
161}
162
163sub new_from_image {
164 my ($class, $image, %arg) = @_;
165
166 $class->new (image => $image, %arg)
167}
168
169sub new_from_file {
170 my ($class, $path) = @_;
171
172 open my $fh, "<:raw", $path
173 or die "$path: $!";
174
175 local $/;
176 $class->new_from_image (<$fh>)
177}
178
179#sub new_from_surface {
180# my ($class, $surface) = @_;
181#
182# $surface->rgba;
183#
184# $class->new (
185# data => $surface->pixels,
186# w => $surface->width,
187# h => $surface->height,
188# )
189#}
190
191sub new_from_layout {
192 my ($class, $layout) = @_;
193
194 my ($w, $h, $data) = $layout->render;
195
196 $class->new (
197 w => $w,
198 h => $h,
199 data => $data,
200 internalformat => GL_ALPHA4,
201 format => GL_ALPHA,
202 type => GL_UNSIGNED_BYTE,
203 ) 378 );
204} 379}
205 380
206sub new_from_opengl { 381package CFClient::Binder;
207 my ($class, $w, $h, $cb) = @_;
208 382
209 $class->new (w => $w, h => $h, render_cb => $cb) 383my @ALLOWED_MODIFIER_KEYS = (
210} 384 CFClient::SDLK_LSHIFT,
385 CFClient::SDLK_LCTRL ,
386 CFClient::SDLK_LALT ,
387 CFClient::SDLK_LMETA ,
211 388
212sub topot { 389 CFClient::SDLK_RSHIFT,
213 (grep $_ >= $_[0], 1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768)[0] 390 CFClient::SDLK_RCTRL ,
214} 391 CFClient::SDLK_RALT ,
392 CFClient::SDLK_RMETA ,
393);
215 394
216sub upload { 395my %ALLOWED_MODIFIERS = (
396 CFClient::KMOD_LSHIFT => "LSHIFT",
397 CFClient::KMOD_LCTRL => "LCTRL",
398 CFClient::KMOD_LALT => "LALT",
399 CFClient::KMOD_LMETA => "LMETA",
400
401 CFClient::KMOD_RSHIFT => "RSHIFT",
402 CFClient::KMOD_RCTRL => "RCTRL",
403 CFClient::KMOD_RALT => "RALT",
404 CFClient::KMOD_RMETA => "RMETA",
405);
406
407my %DIRECT_BIND_CHARS = map { $_ => 1 } qw/0 1 2 3 4 5 6 7 8 9/;
408my @DIRECT_BIND_KEYS = (
409 CFClient::SDLK_F1,
410 CFClient::SDLK_F2,
411 CFClient::SDLK_F3,
412 CFClient::SDLK_F4,
413 CFClient::SDLK_F5,
414 CFClient::SDLK_F6,
415 CFClient::SDLK_F7,
416 CFClient::SDLK_F8,
417 CFClient::SDLK_F9,
418 CFClient::SDLK_F10,
419 CFClient::SDLK_F11,
420 CFClient::SDLK_F12,
421 CFClient::SDLK_F13,
422 CFClient::SDLK_F14,
423 CFClient::SDLK_F15,
424);
425
426# this binding dialog asks for a key-combo to be pressed
427# and if successful it calls the $cb with $mod and $sym as args.
428sub open_binding_dialog {
217 my ($self) = @_; 429 my ($cb) = @_;
218 430
219 return unless $GL_VERSION; 431 my $w = new CFClient::UI::FancyFrame
432 title => "Bind Action",
433 x => "center",
434 y => "center";
220 435
221 my $data; 436 $w->add (my $vb = new CFClient::UI::VBox);
437 $vb->add (new CFClient::UI::Label
438 text => "Press a modifier (CTRL, ALT and/or SHIFT) and a key."
439 ."You can only bind 0-9 and F1-F15 without modifiers."
440 );
441 $vb->add (my $entry = new CFClient::UI::Entry
442 text => "",
443 on_key_down => sub {
444 my ($entry, $ev) = @_;
222 445
223 if (exists $self->{data}) { 446 my $mod = $ev->{mod};
224 $data = $self->{data}; 447 my $sym = $ev->{sym};
225 448
226 } elsif (exists $self->{render_cb}) { 449 # XXX: This seems a little bit hackisch to me, but i have to ignore them
227 glViewport 0, 0, $self->{w}, $self->{h}; 450 if (grep { $_ == $sym } @ALLOWED_MODIFIER_KEYS) {
228 glMatrixMode GL_PROJECTION; 451 return;
229 glLoadIdentity; 452 }
230 glOrtho 0, $self->{w}, 0, $self->{h}, -10000, 10000;
231 glMatrixMode GL_MODELVIEW;
232 glLoadIdentity;
233 $self->{render_cb}->($self, $self->{w}, $self->{h});
234 453
235 } else { 454 if ($mod == CFClient::KMOD_NONE
236 ($self->{w}, $self->{h}, $data, $self->{internalformat}, $self->{format}, $self->{type}) 455 and not $DIRECT_BIND_CHARS{chr ($ev->{unicode})}
237 = CFClient::load_image_inline $self->{image}; 456 and not grep { $sym == $_ } @DIRECT_BIND_KEYS)
238 } 457 {
458 $::STATUSBOX->add (
459 "Can't bind key ".CFClient::SDL_GetKeyName ($sym)
460 ." directly without modifier! It would damage the completer handling."
461 );
462 return;
463 }
239 464
240 my ($tw, $th) = @$self{qw(w h)}; 465 $entry->focus_out;
241 466
242 unless ($tw && $th) { 467 $cb->($mod, $sym);
243 $tw = $th = 1;
244 $data = "\x00" x 64;
245 }
246 468
247 $self->{minified} = [CFClient::average $tw, $th, $data] 469 $w->destroy
248 if $self->{minify};
249
250 unless ($GL_NPOT) {
251 # TODO: does not work for zero-sized textures
252 $tw = topot $tw;
253 $th = topot $th;
254
255 if ($tw != $self->{w} || $th != $self->{h} && defined $data) {
256 my $bpp = (length $data) / ($self->{w} * $self->{h});
257 $data = pack "(a" . ($tw * $bpp) . ")*",
258 unpack "(a" . ($self->{w} * $bpp) . ")*", $data;
259 $data .= ("\x00" x ($tw * $bpp)) x ($th - $self->{h});
260 } 470 });
261 }
262 471
263 $self->{s} = $self->{w} / $tw; 472 $entry->focus_in;
264 $self->{t} = $self->{h} / $th; 473 $w->show;
265
266 $self->{name} ||= (glGenTextures 1)->[0];
267
268 glBindTexture GL_TEXTURE_2D, $self->{name};
269
270 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
271 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, $::FAST ? GL_NEAREST : GL_LINEAR;
272 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP;
273 glTexParameter GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP;
274
275 if (defined $data) {
276 glTexImage2D GL_TEXTURE_2D, 0,
277 $self->{internalformat},
278 $tw, $th, # need to pad texture first
279 0,
280 $self->{format},
281 $self->{type},
282 $data;
283 glGetError and die;
284 } else {
285 glCopyTexImage2D GL_TEXTURE_2D, 0,
286 $self->{internalformat},
287 0, 0,
288 $tw, $th,
289 0;
290 glGetError and die "glCopyTexImage2D $tw,$th";
291 }
292} 474}
293 475
294sub DESTROY { 476sub keycombo_to_name {
295 my ($self) = @_; 477 my ($mod, $sym) = @_;
296 478
297 delete $TEXTURES{$self+0}; 479 my $mods = join '+',
480 map { $ALLOWED_MODIFIERS{$_} }
481 grep { ($_ + 0) & ($mod + 0) }
482 keys %ALLOWED_MODIFIERS;
483 $mods .= "+" if $mods ne '';
298 484
299 glDeleteTextures delete $self->{name} 485 return $mods . CFClient::SDL_GetKeyName ($sym);
300 if $self->{name};
301} 486}
302 487
303sub restore_state{ 488package CFClient::Pickup;
304 $_->upload 489# some pickup constants
305 for values %TEXTURES; 490sub PU_NOTHING { 0x00000000 }
306}; 491
492sub PU_DEBUG { 0x10000000 }
493sub PU_INHIBIT { 0x20000000 }
494sub PU_STOP { 0x40000000 }
495sub PU_NEWMODE { 0x80000000 }
496
497sub PU_RATIO { 0x0000000F }
498
499sub PU_FOOD { 0x00000010 }
500sub PU_DRINK { 0x00000020 }
501sub PU_VALUABLES { 0x00000040 }
502sub PU_BOW { 0x00000080 }
503
504sub PU_ARROW { 0x00000100 }
505sub PU_HELMET { 0x00000200 }
506sub PU_SHIELD { 0x00000400 }
507sub PU_ARMOUR { 0x00000800 }
508
509sub PU_BOOTS { 0x00001000 }
510sub PU_GLOVES { 0x00002000 }
511sub PU_CLOAK { 0x00004000 }
512sub PU_KEY { 0x00008000 }
513
514sub PU_MISSILEWEAPON { 0x00010000 }
515sub PU_ALLWEAPON { 0x00020000 }
516sub PU_MAGICAL { 0x00040000 }
517sub PU_POTION { 0x00080000 }
518
519sub PU_SPELLBOOK { 0x00100000 }
520sub PU_SKILLSCROLL { 0x00200000 }
521sub PU_READABLES { 0x00400000 }
522sub PU_MAGIC_DEVICE { 0x00800000 }
523
524sub PU_NOT_CURSED { 0x01000000 }
525
526sub PU_JEWELS { 0x02000000 }
527
307 528
3081; 5291;
309 530
310=back 531=back
311 532

Diff Legend

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