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

Comparing deliantra/Deliantra-Client/bin/pclient (file contents):
Revision 1.29 by elmex, Fri Apr 7 23:05:21 2006 UTC vs.
Revision 1.80 by root, Wed Apr 12 02:00:07 2006 UTC

… …
12use SDL::Surface; 12use SDL::Surface;
13use SDL::OpenGL; 13use SDL::OpenGL;
14use SDL::OpenGL::Constants; 14use SDL::OpenGL::Constants;
15 15
16use Crossfire; 16use Crossfire;
17use Crossfire::Client;
18use Crossfire::Protocol; 17use Crossfire::Protocol;
19 18
20use Crossfire::Client::Util; 19use CFClient;
21use Crossfire::Client::Widget; 20use CFClient::UI;
21
22our $VERSION = '0.1';
23
24my $MAX_FPS = 60;
25my $TICKS_PER_FRAME = int 1000 / $MAX_FPS - 1; # min ticks per frame
22 26
23our $FACECACHE; 27our $FACECACHE;
24
25our $VERSION = '0.1';
26 28
27our $CFG; 29our $CFG;
28our $CONN; 30our $CONN;
31our $FAST; # fast, low-quality mode
29 32
33our @SDL_MODES;
34our $WIDTH;
35our $HEIGHT;
36our $FULLSCREEN;
37
38our $NOW;
39
40our $MAPWIDGET;
30our $UIFONT; 41our $FONTSIZE;
31 42
32our $SDL_TIMER; 43our $SDL_TIMER;
33our $SDL_APP; 44our $SDL_APP;
34our $SDL_EV = new SDL::Event; 45our $SDL_EV;
35our %SDL_CB; 46our %SDL_CB;
36 47
37our @GL_INIT; # hooks called on every gl init 48our $ALT_ENTER_MESSAGE;
49our $STATUS_LINE;
50our $DEBUG_STATUS;
51
52my $last_refresh;
53my %ANIMATE;
54my $refresh_handler;
55
56our ($tw, $te); # Test widget #d#
38 57
39sub init_screen { 58sub init_screen {
40 $SDL_APP = new SDL::App 59 $SDL_APP = new SDL::App
41 -flags => SDL_ANYFORMAT | SDL_HWSURFACE, 60 -flags => SDL_ANYFORMAT | SDL_HWSURFACE,
42 -title => "Crossfire+ Client", 61 -title => "Crossfire+ Client",
43 -width => $CFG->{width}, 62 -width => $WIDTH,
44 -height => $CFG->{height}, 63 -height => $HEIGHT,
45 -opengl => 1, 64 -opengl => 1,
46 -red_size => 8, 65 -red_size => 5,
47 -green_size => 8, 66 -green_size => 5,
48 -blue_size => 8, 67 -blue_size => 5,
68 -alpha_size => 0,
49 -double_buffer => 1, 69 -double_buffer => 1,
50 -fullscreen => $CFG->{fullscreen}, 70 -fullscreen => $FULLSCREEN,
51 -resizeable => 0; 71 -resizeable => 0;
52 72
53 $UIFONT = SDL::TTFOpenFont Crossfire::Client::find_rcfile "uifont.ttf", $CFG->{height} / 40 73 $SDL_EV = new SDL::Event;
54 or die "TTFOpenFont: $!"; 74 $SDL_EV->set_unicode (1);
55 75
56 glClearColor 0, 0, 0, 0;
57
58 glEnable GL_TEXTURE_2D;
59 glShadeModel GL_FLAT;
60 glDisable GL_DEPTH_TEST;
61 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
62
63 glMatrixMode GL_PROJECTION;
64 glLoadIdentity;
65 glOrtho 0, $CFG->{width}, $CFG->{height}, 0, -100 , 100;
66
67 glMatrixMode GL_MODELVIEW;
68
69 $_->() for @GL_INIT;
70}
71
72my $label;#d#
73
74sub start_game {
75 $SDL_TIMER = add Glib::Timeout 1000/20, sub { 76 $SDL_TIMER = add Glib::Timeout 1000 / $MAX_FPS, sub {
76 while ($SDL_EV->poll) {
77 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->(); 77 ($SDL_CB{$SDL_EV->type} || sub { warn "unhandled event ", $SDL_EV->type })->()
78 } 78 while $SDL_EV->poll;
79 79
80 1 80 1
81 }; 81 };
82 82
83 $last_refresh = SDL::GetTicks;
84
85 CFClient::gl_init;
86
87 $FONTSIZE = int $HEIGHT / 40;
88
89 #############################################################################
90
91 $DEBUG_STATUS = new CFClient::UI::Label padding => 0;
92 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
93
94 $STATUS_LINE = new CFClient::UI::Label
95 padding => 0,
96 y => $HEIGHT * 49 / 50 - $FONTSIZE;
97 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
98
99 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
100 padding => 0,
101 y => $HEIGHT * 49 / 50,
102 height => $HEIGHT / 50,
103 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
104 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
105
106 $MAPWIDGET = new CFClient::UI::MapWidget;
107 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET);
108 $MAPWIDGET->focus_in;
109}
110
111sub destroy_screen {
112 remove Glib::Source $SDL_TIMER;
113 undef $SDL_APP;
114 undef $SDL_EV;
115 SDL::Quit;
116}
117
118sub config_dialog {
119 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100,
120 child => (my $vbox = new CFClient::UI::VBox);
121 $vbox->add (new CFClient::UI::Label align => 0, text => "Setup");
122 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
123
124 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
125 $table->add (1, 0, my $hbox = new CFClient::UI::HBox);
126
127 $hbox->add (my $mode_slider = new CFClient::UI::Slider expand => 1, req_w => 100, range => [$CFG->{sdl_mode}, 0, scalar @SDL_MODES, 1]);
128 $hbox->add (my $mode_label = new CFClient::UI::Label height => $FONTSIZE * 0.8);
129
130 $mode_slider->connect (changed => sub {
131 my ($self, $value) = @_;
132
133 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
134 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
135 });
136 $mode_slider->emit (changed => $mode_slider->{range}[0]);
137
138 $table->add (0, 1, new CFClient::UI::Label align => 1, text => "Host");
139 $table->add (1, 1, my $host = new CFClient::UI::Entry text => $CFG->{host});
140
141 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Port");
142 $table->add (1, 2, my $port = new CFClient::UI::Entry text => $CFG->{port});
143
144 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Username");
145 $table->add (1, 3, my $user = new CFClient::UI::Entry text => $CFG->{user});
146
147 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Password");
148 $table->add (1, 4, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1);
149
150 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Map Size");
151 $table->add (1, 5, new CFClient::UI::Slider
152 req_w => 100,
153 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
154 connect_changed => sub {
155 my ($self, $value) = @_;
156
157 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
158 },
159 );
160
161 $vbox->add (my $hbox = new CFClient::UI::HBox);
162 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
163 warn "save\n";
164 });
165 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
166 warn "login\n";
167 });
168 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
169 warn "apply\n";
170 });
171
172 $CFClient::UI::TOPLEVEL->add ($dialog);
173}
174
175sub start_game {
176 $WIDTH = $CFG->{width};
177 $HEIGHT = $CFG->{height};
178 $FULLSCREEN = 0;
179
83 init_screen; 180 init_screen;
84 181
85 my $v = new Crossfire::Client::Widget::Table; 182 config_dialog;
86 $v->add (0, 0, $label = new Crossfire::Client::Widget::Label 500, 10, 1, $UIFONT, "T");
87 $v->add (0, 1, $label = new Crossfire::Client::Widget::Label 500, 10, 1, $UIFONT, "TT");
88 $v->add (0, 2, $label = new Crossfire::Client::Widget::Label 500, 10, 1, $UIFONT, "TTT");
89 $v->add (1, 1, $label = new Crossfire::Client::Widget::Label 500, 10, 1, $UIFONT, "Testü[]");
90 $v->size_request;
91 my $f = new Crossfire::Client::Widget::Frame;
92 $f->add ($v);
93 $f->activate;
94 183
95# $v->add ($label = new Crossfire::Client::Widget::Label 500, 10, 1, $UIFONT, "Testü[]"); 184 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
96# $v->add ($label = new Crossfire::Client::Widget::Label 500, 10, 1, $UIFONT, "Testü[]!!");
97# $v->activate;
98# $f->add ($v);#$label = new Crossfire::Client::Widget::Label 500, 10, 1, $UIFONT, "Testü[]");
99# $label->activate;
100 185
101 $CONN = new conn 186 $CONN = new conn
102 host => $CFG->{host}, 187 host => $CFG->{host},
103 port => $CFG->{port}, 188 port => $CFG->{port},
104 user => $CFG->{user}, 189 user => $CFG->{user},
105 pass => $CFG->{password}; 190 pass => $CFG->{password},
191 mapw => $mapsize,
192 maph => $mapsize,
193 ;
194
195 CFClient::lowdelay fileno $CONN->{fh};
106} 196}
107 197
108sub stop_game { 198sub stop_game {
109 remove Glib::Source $SDL_TIMER; 199 remove Glib::Source $refresh_handler if $refresh_handler;
200 undef $refresh_handler;
110 201
111 undef $SDL_APP; 202 undef $CONN;
112 SDL::Quit; 203 destroy_screen;
113} 204}
205
206sub force_refresh {
207 glViewport 0, 0, $WIDTH, $HEIGHT;
208
209 glMatrixMode GL_PROJECTION;
210 glLoadIdentity;
211 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
212 glMatrixMode GL_MODELVIEW;
213 glLoadIdentity;
214
215 glClear GL_COLOR_BUFFER_BIT;
216
217 $CFClient::UI::TOPLEVEL->draw;
218
219 SDL::GLSwapBuffers;
220}
221
222sub debug {
223 $DEBUG_STATUS->set_text ($_[0]);
224 my ($w, $h) = $DEBUG_STATUS->size_request;
225 $DEBUG_STATUS->size_allocate ($WIDTH - $w, 0, $w, $h);
226}
227
228my $FPS;
114 229
115sub refresh { 230sub refresh {
116 glClear GL_COLOR_BUFFER_BIT; 231 $refresh_handler ||= add Glib::Idle sub {
232 if ($SDL_APP) {
233 $NOW = SDL::GetTicks;
117 234
118 $_->draw for @Crossfire::Client::Widget::ACTIVE_WIDGETS; 235 if ($NOW - $last_refresh < $TICKS_PER_FRAME) {
236 SDL::Delay $TICKS_PER_FRAME - ($NOW - $last_refresh);
237 $NOW = SDL::GetTicks;
238 }
239
240 my $interval = ($NOW - $last_refresh) * 0.001;
241 $last_refresh = $NOW;
119 242
120 SDL::GLSwapBuffers; 243 if ($interval) {
244 $FPS ||= 1 / $interval;
245 $FPS = $FPS * 0.9 + (1 / $interval) * 0.1;
246 debug sprintf "%5.02f", $FPS;
247 }
248
249 force_refresh;
250 $_->animate ($interval) for grep $_, values %ANIMATE;
251
252 if (%ANIMATE) {
253 1
254 } else {
255 undef $refresh_handler;
256 0
257 }
258 } else {
259 undef $refresh_handler;
260 0
261 }
262 };
263}
264
265sub animation_start {
266 my ($widget) = @_;
267 $ANIMATE{$widget} = $widget;
268 Scalar::Util::weaken $ANIMATE{$widget};
269
270 refresh;
271}
272
273sub animation_stop {
274 my ($widget) = @_;
275 delete $ANIMATE{$widget};
121} 276}
122 277
123%SDL_CB = ( 278%SDL_CB = (
124 SDL_QUIT() => sub { 279 SDL_QUIT() => sub {
125 main_quit Gtk2; 280 main_quit Gtk2;
… …
130 refresh; 285 refresh;
131 }, 286 },
132 SDL_KEYDOWN() => sub { 287 SDL_KEYDOWN() => sub {
133 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 288 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
134 # alt-enter 289 # alt-enter
135 $CFG->{fullscreen} = !$CFG->{fullscreen}; 290 $FULLSCREEN = !$FULLSCREEN;
136 init_screen; 291 init_screen;
137 } else { 292 } else {
138 Crossfire::Client::Widget::feed_sdl_key_down_event ($SDL_EV); 293 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
139 } 294 }
140 }, 295 },
141 SDL_KEYUP() => sub { 296 SDL_KEYUP() => sub {
142 Crossfire::Client::Widget::feed_sdl_key_up_event ($SDL_EV); 297 CFClient::UI::feed_sdl_key_up_event ($SDL_EV);
143 }, 298 },
144 SDL_MOUSEMOTION() => sub { 299 SDL_MOUSEMOTION() => sub {
145 warn "sdl motion\n";#d# 300 CFClient::UI::feed_sdl_motion_event ($SDL_EV);
146 }, 301 },
147 SDL_MOUSEBUTTONDOWN() => sub { 302 SDL_MOUSEBUTTONDOWN() => sub {
148 Crossfire::Client::Widget::feed_sdl_button_down_event ($SDL_EV); 303 CFClient::UI::feed_sdl_button_down_event ($SDL_EV);
149 }, 304 },
150 SDL_MOUSEBUTTONUP() => sub { 305 SDL_MOUSEBUTTONUP() => sub {
151 Crossfire::Client::Widget::feed_sdl_button_up_event ($SDL_EV); 306 CFClient::UI::feed_sdl_button_up_event ($SDL_EV);
152 }, 307 },
153 SDL_ACTIVEEVENT() => sub { 308 SDL_ACTIVEEVENT() => sub {
154 warn "active\n";#d# 309# printf "active %x %x\n", $SDL_EV->active_gain, $SDL_EV->active_state;#d#
155 }, 310 },
156); 311);
157 312
158@conn::ISA = Crossfire::Protocol::; 313@conn::ISA = Crossfire::Protocol::;
159 314
160sub conn::map_update { 315sub conn::map_update {
161 my ($self, $dirty) = @_; 316 my ($self, $dirty) = @_;
162 317
163 refresh; 318 $MAPWIDGET->update;
164} 319}
165 320
166sub conn::map_scroll { 321sub conn::map_scroll {
167 my ($self, $dx, $dy) = @_; 322 my ($self, $dx, $dy) = @_;
168 323
169 refresh; 324# refresh;
170} 325}
171 326
172sub conn::map_clear { 327sub conn::map_clear {
173 my ($self) = @_; 328 my ($self) = @_;
174 329
175 refresh; 330# refresh;
176} 331}
177 332
178sub conn::face_find { 333sub conn::face_find {
179 my ($self, $face) = @_; 334 my ($self, $face) = @_;
180 335
… …
184sub conn::face_update { 339sub conn::face_update {
185 my ($self, $face) = @_; 340 my ($self, $face) = @_;
186 341
187 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 342 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
188 343
189 $face->{texture} = new_from_image Crossfire::Client::Texture delete $face->{image}; 344 $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
345}
346
347sub conn::query {
348 my ($self, $flags, $prompt) = @_;
349
350 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
190} 351}
191 352
192sub gtk_add_cfg_field { 353sub gtk_add_cfg_field {
193 my ($tbl, $cfg, $klbl, $key, $value) = @_; 354 my ($tbl, $cfg, $klbl, $key, $value) = @_;
194 my $i = $cfg->{_i}++; 355 my $i = $cfg->{_i}++;
… …
200 } 361 }
201 $ent->set_text ($value); 362 $ent->set_text ($value);
202 $ent->signal_connect (changed => sub { 363 $ent->signal_connect (changed => sub {
203 my ($ent) = @_; 364 my ($ent) = @_;
204 $cfg->{$key} = $ent->get_text; 365 $cfg->{$key} = $ent->get_text;
366 # TODO: Mapsize should be a slider in the game gui
367 if ($key eq 'mapsize' and $cfg->{$key} > 100) {
368 $cfg->{$key} = 100;
369 } elsif ($key eq 'mapsize' and $cfg->{$key} < 50) {
370 $cfg->{$key} = 50;
371 }
205 }); 372 });
206} 373}
207 374
208sub run_config_dialog { 375sub run_config_dialog {
209 my (%events) = @_; 376 my (%events) = @_;
… …
211 my $w = Gtk2::Window->new; 378 my $w = Gtk2::Window->new;
212 379
213 my @cfg = ( 380 my @cfg = (
214 [qw/Host host/], 381 [qw/Host host/],
215 [qw/Port port/], 382 [qw/Port port/],
383 [qw/Mapsize% mapsize/],
216 [qw/Username user/], 384 [qw/Username user/],
217 [qw/Password password/], 385 [qw/Password password/],
218 ); 386 );
219 387
220 my $cfg = {}; 388 my $cfg = {};
221
222 my $a = SDL::ListModes (0, SDL_FULLSCREEN|SDL_HWSURFACE);
223 my @modes = map { [SDL::RectW ($_), SDL::RectH ($_)] } @$a;
224 389
225 $w->add (my $vb = Gtk2::VBox->new); 390 $w->add (my $vb = Gtk2::VBox->new);
226 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0); 391 $vb->pack_start (my $t = Gtk2::Table->new (2, scalar @cfg), 0, 0, 0);
227 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height}; 392 my $selmode = $::CFG->{width} . 'x' . $::CFG->{height};
228 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1); 393 $t->attach_defaults (Gtk2::Label->new ("Modes"), 0, 1, 0, 1);
229 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1); 394 $t->attach_defaults (my $cb = Gtk2::ComboBox->new_text, 1, 2, 0, 1);
230 my $i = 0; 395 my $i = 0;
231 my $act = 0; 396 my $act = 0;
232 for (map { "$_->[0]x$_->[1]" } reverse @modes) { 397 for (map { "$_->[0]x$_->[1]" } @SDL_MODES) {
233 if ($_ eq $selmode) { $act = $i } 398 if ($_ eq $selmode) { $act = $i }
234 $cb->append_text ($_); 399 $cb->append_text ($_);
235 $i++; 400 $i++;
236 } 401 }
237 $cb->set_active ($act); 402 $cb->set_active ($act);
… …
254 $cb->signal_connect (clicked => sub { 419 $cb->signal_connect (clicked => sub {
255 for (keys %$cfg) { 420 for (keys %$cfg) {
256 $::CFG->{$_} = $cfg->{$_} 421 $::CFG->{$_} = $cfg->{$_}
257 if $_ ne '_i'; 422 if $_ ne '_i';
258 } 423 }
259 Crossfire::Client::write_cfg "$Crossfire::VARDIR/pclientrc"; 424 CFClient::write_cfg "$CFrossfire::VARDIR/pclientrc";
260 }); 425 });
261 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5); 426 $hb->pack_start (my $cb = Gtk2::Button->new ("login"), 1, 1, 5);
262 $cb->signal_connect (clicked => sub { 427 $cb->signal_connect (clicked => sub {
263 for (keys %$cfg) { 428 for (keys %$cfg) {
264 $::CFG->{$_} = $cfg->{$_} 429 $::CFG->{$_} = $cfg->{$_}
… …
267 my $cb = $events{login} || sub {}; 432 my $cb = $events{login} || sub {};
268 $cb->($::CFG->{user}, $::CFG->{password}); 433 $cb->($::CFG->{user}, $::CFG->{password});
269 }); 434 });
270 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5); 435 $hb->pack_start (my $cb = Gtk2::Button->new ("logout"), 1, 1, 5);
271 $cb->signal_connect (clicked => sub { 436 $cb->signal_connect (clicked => sub {
272 my $cb = $events{login} || sub {}; 437 my $cb = $events{logout} || sub {};
273 $cb->(); 438 $cb->();
274 }); 439 });
275 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5); 440 $hb->pack_start (my $cb = Gtk2::Button->new ("quit"), 1, 1, 5);
276 $cb->signal_connect (clicked => sub { $w->destroy }); 441 $cb->signal_connect (clicked => sub { $w->destroy });
277 442
… …
282 447
283 448
284############################################################################# 449#############################################################################
285 450
286SDL::Init SDL_INIT_EVERYTHING; 451SDL::Init SDL_INIT_EVERYTHING;
287SDL::TTFInit;
288 452
289my $mapwidget = Crossfire::Client::Widget::MapWidget->new; 453@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)],
454 @{ SDL::ListModes 0, SDL_FULLSCREEN|SDL_HWSURFACE };
290 455
291$mapwidget->activate;
292$mapwidget->focus_in;
293
294Crossfire::Client::read_cfg "$Crossfire::VARDIR/pclientrc"; 456CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
295 457
296$CFG ||= { 458$CFG ||= {
297 width => 640, 459 width => 640,
298 height => 480, 460 height => 480,
461 mapsize => 100,
299 fullscreen => 0, 462 fullscreen => 0,
300 host => "crossfire.schmorp.de", 463 host => "crossfire.schmorp.de",
301 port => 13327, 464 port => 13327,
302}; 465};
303 466
467{
468 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);
469
470 CFClient::add_font $_ for @fonts;
471 CFClient::set_font $fonts[0];
472}
473
304$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {}; 474$FACECACHE = eval { Crossfire::load_ref "$Crossfire::VARDIR/pclient.faces" } || {};
305 475
306run_config_dialog 476run_config_dialog
307 login => sub { start_game }, 477 login => sub { start_game },
308 logout => sub { stop_game }; 478 logout => sub { stop_game };

Diff Legend

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