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.88 by root, Wed Apr 12 21:01:47 2006 UTC vs.
Revision 1.105 by root, Fri Apr 14 20:27:36 2006 UTC

19use CFClient::UI; 19use CFClient::UI;
20 20
21our $VERSION = '0.1'; 21our $VERSION = '0.1';
22 22
23my $MAX_FPS = 60; 23my $MAX_FPS = 60;
24my $MIN_FPS = 5; # unused 24my $MIN_FPS = 5; # unused as of yet
25 25
26our $FACECACHE; 26our $FACECACHE;
27 27
28our $LAST_REFRESH; 28our $LAST_REFRESH;
29our $NOW; 29our $NOW;
34 34
35our @SDL_MODES; 35our @SDL_MODES;
36our $WIDTH; 36our $WIDTH;
37our $HEIGHT; 37our $HEIGHT;
38our $FULLSCREEN; 38our $FULLSCREEN;
39our $FONTSIZE;
39 40
41our $MAP;
40our $MAPWIDGET; 42our $MAPWIDGET;
41our $FONTSIZE;
42 43
43our $SDL_ACTIVE; 44our $SDL_ACTIVE;
44our $SDL_EV; 45our $SDL_EV;
45our %SDL_CB; 46our %SDL_CB;
46 47
47our $ALT_ENTER_MESSAGE; 48our $ALT_ENTER_MESSAGE;
48our $STATUS_LINE; 49our $STATUS_LINE;
49our $DEBUG_STATUS; 50our $DEBUG_STATUS;
51our $BUTTONBAR;
52our $LOGVIEW;
53our $CONSOLE;
50 54
51sub status { 55sub status {
52 $STATUS_LINE->set_text ($_[0]); 56 $STATUS_LINE->set_text ($_[0]);
53 my ($w, $h) = $STATUS_LINE->size_request; 57 my ($w, $h) = $STATUS_LINE->size_request;
54 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h); 58 $STATUS_LINE->size_allocate (0, $HEIGHT - $ALT_ENTER_MESSAGE->{h} - $h, $w, $h);
63sub start_game { 67sub start_game {
64 status "logging in..."; 68 status "logging in...";
65 69
66 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 70 my $mapsize = List::Util::min 64, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
67 71
72 $MAP = new CFClient::Map $mapsize, $mapsize;
73
68 $CONN = new conn 74 $CONN = new conn
69 host => $CFG->{host}, 75 host => $CFG->{host},
70 port => $CFG->{port}, 76 port => $CFG->{port},
71 user => $CFG->{user}, 77 user => $CFG->{user},
72 pass => $CFG->{password}, 78 pass => $CFG->{password},
82sub stop_game { 88sub stop_game {
83 undef $CONN; 89 undef $CONN;
84} 90}
85 91
86sub config_dialog { 92sub config_dialog {
87 my $dialog = new CFClient::UI::FancyFrame x => 300, y => 100, 93 my $dialog = new CFClient::UI::FancyFrame
88 child => (my $vbox = new CFClient::UI::VBox); 94 child => (my $vbox = new CFClient::UI::VBox);
89 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup"); 95 $vbox->add (new CFClient::UI::Label align => 0, text => "Client Setup");
90 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 96 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
91 97
92 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode"); 98 $table->add (0, 0, new CFClient::UI::Label align => 1, text => "Video Mode");
107 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub { 113 $table->add (1, 1, new CFClient::UI::CheckBox state => $CFG->{fullscreen}, connect_changed => sub {
108 my ($self, $value) = @_; 114 my ($self, $value) = @_;
109 $CFG->{fullscreen} = $value; 115 $CFG->{fullscreen} = $value;
110 }); 116 });
111 117
118 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Fast & Ugly");
119 $table->add (1, 2, new CFClient::UI::CheckBox state => $CFG->{fast}, connect_changed => sub {
120 my ($self, $value) = @_;
121 $CFG->{fast} = $value;
122 });
123
124 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Fog of War");
125 $table->add (1, 3, new CFClient::UI::CheckBox state => $CFG->{fow_enable}, connect_changed => sub {
126 my ($self, $value) = @_;
127 $CFG->{fow_enable} = $value;
128 });
129
130 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "FoW Intensity");
131 $table->add (1, 4, new CFClient::UI::Slider range => [$CFG->{fow_intensity}, 0, 1 + 0.001, 0.001], connect_changed => sub {
132 my ($self, $value) = @_;
133 $CFG->{fow_intensity} = $value;
134 });
135
136 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "FoW Smooth");
137 $table->add (1, 5, new CFClient::UI::CheckBox state => $CFG->{fow_smooth}, connect_changed => sub {
138 my ($self, $value) = @_;
139 $CFG->{fow_smooth} = $value;
140 });
141
142 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Log Fontsize");
143 $table->add (1, 5, new CFClient::UI::Slider range => [$CFG->{log_fontsize}, 8, 30, 1], connect_changed => sub {
144 my ($self, $value) = @_;
145 $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = int $value);
146 });
147
112 $table->add (1, 2, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub { 148 $table->add (1, 6, new CFClient::UI::Button expand => 1, align => 0, text => "Apply", connect_activate => sub {
113 destroy_screen (); 149 destroy_screen ();
114 init_screen (); 150 init_screen ();
115 }); 151 });
116 152
117 $vbox->add (new CFClient::UI::Label align => 0, text => "Server"); 153 $vbox->add (new CFClient::UI::Label align => 0, text => "Server Setup");
118 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]); 154 $vbox->add (my $table = new CFClient::UI::Table expand => 1, col_expand => [0, 1]);
119 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host"); 155 $table->add (0, 2, new CFClient::UI::Label align => 1, text => "Host");
120 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}); 156 $table->add (1, 2, my $host = new CFClient::UI::Entry text => $CFG->{host}, connect_changed => sub {
121 157 my ($self, $value) = @_;
158 $CFG->{host} = $value;
159 });
160
122 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port"); 161 $table->add (0, 3, new CFClient::UI::Label align => 1, text => "Port");
123 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}); 162 $table->add (1, 3, my $port = new CFClient::UI::Entry text => $CFG->{port}, connect_changed => sub {
163 my ($self, $value) = @_;
164 $CFG->{port} = $value;
165 });
124 166
125 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username"); 167 $table->add (0, 4, new CFClient::UI::Label align => 1, text => "Username");
126 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}); 168 $table->add (1, 4, my $user = new CFClient::UI::Entry text => $CFG->{user}, connect_changed => sub {
169 my ($self, $value) = @_;
170 $CFG->{user} = $value;
171 });
127 172
128 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password"); 173 $table->add (0, 5, new CFClient::UI::Label align => 1, text => "Password");
129 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1); 174 $table->add (1, 5, my $pass = new CFClient::UI::Entry text => $CFG->{password}, hidden => 1, connect_changed => sub {
175 my ($self, $value) = @_;
176 $CFG->{password} = $value;
177 });
130 178
179 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Def. say cmd");
180 $table->add (1, 6, my $saycmd = new CFClient::UI::Entry text => $CFG->{say_command}, connect_changed => sub {
181 my ($self, $value) = @_;
182 $CFG->{say_command} = $value;
183 });
184
131 $table->add (0, 6, new CFClient::UI::Label align => 1, text => "Map Size"); 185 $table->add (0, 7, new CFClient::UI::Label align => 1, text => "Map Size");
132 $table->add (1, 6, new CFClient::UI::Slider 186 $table->add (1, 7, new CFClient::UI::Slider
133 req_w => 100, 187 req_w => 100,
134 range => [$CFG->{mapsize}, 10, 100 + 1, 1], 188 range => [$CFG->{mapsize}, 10, 100 + 1, 1],
135 connect_changed => sub { 189 connect_changed => sub {
136 my ($self, $value) = @_; 190 my ($self, $value) = @_;
137 191
138 $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 192 $CFG->{mapsize} = $self->{range}[0] = $value = int $value;
139 }, 193 },
140 ); 194 );
141 195
142 $table->add (1, 7, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub { 196 $table->add (1, 8, new CFClient::UI::Button expand => 1, align => 0, text => "Login", connect_activate => sub {
143 start_game; 197 start_game;
144 }); 198 });
145 199
146 $vbox->add (my $hbox = new CFClient::UI::HBox); 200 $vbox->add (my $hbox = new CFClient::UI::HBox);
147 201
148 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub { 202 $hbox->add (new CFClient::UI::Button expand => 1, align => 0, text => "Save", connect_activate => sub {
149 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc"; 203 CFClient::write_cfg "$Crossfire::VARDIR/pclientrc";
150 status "Configuration Saved"; 204 status "Configuration Saved";
151 }); 205 });
152 $CFClient::UI::TOPLEVEL->add ($dialog); 206
207 $dialog
208}
209
210sub console_window {
211 my $window = new CFClient::UI::FancyFrame
212 border_bg => [1, 1, 1, 0.5],
213 bg => [0.3, 0.3, 0.3, 0.8],
214 user_w => $::WIDTH/4,
215 user_h => $::HEIGHT,
216 child => (my $vbox = new CFClient::UI::VBox);
217
218 $vbox->add ($LOGVIEW = new CFClient::UI::TextView
219 expand => 1,
220 fontsize => $::CFG->{log_fontsize},
221 );
222
223 $vbox->add (my $input = new CFClient::UI::LineEntry);
224 $input->connect (activate => sub {
225 my ($input, $text) = @_;
226 $input->set_text ('');
227
228 if ($text =~ /^\/(.*)/) {
229 $::CONN->user_send ("command $1");
230 } else {
231 my $say_cmd = $::CFG->{say_command} || 'say';
232 $::CONN->user_send ("command $say_cmd $text");
233 }
234 1
235 });
236 $input->connect (escape => sub {
237 $MAPWIDGET->focus_in
238 });
239 $input->focus_in;
240
241 $CONSOLE = {
242 window => $window,
243 input => $input
244 };
245
246 $window
247}
248
249sub sdl_init {
250 SDL::Init SDL_INIT_AUDIO | SDL_INIT_VIDEO
251 and die "SDL::Init failed!\n";
153} 252}
154 253
155sub init_screen { 254sub init_screen {
255 sdl_init;
256
156 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 257 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
157 $FULLSCREEN = $CFG->{fullscreen}; 258 $FULLSCREEN = $CFG->{fullscreen};
259 $FAST = $CFG->{fast};
158 260
159 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5; 261 SDL::GLSetAttribute SDL_GL_RED_SIZE, 5;
160 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5; 262 SDL::GLSetAttribute SDL_GL_GREEN_SIZE, 5;
161 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5; 263 SDL::GLSetAttribute SDL_GL_BLUE_SIZE, 5;
162 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0; 264 SDL::GLSetAttribute SDL_GL_ALPHA_SIZE, 0;
188 290
189 $FONTSIZE = int $HEIGHT / 40; 291 $FONTSIZE = int $HEIGHT / 40;
190 292
191 ############################################################################# 293 #############################################################################
192 294
193 $DEBUG_STATUS = new CFClient::UI::Label padding => 0; 295 $DEBUG_STATUS = new CFClient::UI::Label padding => 0, z => 100;
194 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS); 296 $CFClient::UI::TOPLEVEL->add ($DEBUG_STATUS);
195 297
196 $STATUS_LINE = new CFClient::UI::Label 298 $STATUS_LINE = new CFClient::UI::Label
197 padding => 0, 299 padding => 0,
198 y => $HEIGHT * 49 / 50 - $FONTSIZE; 300 y => $HEIGHT * 44 / 45 - $FONTSIZE;
199 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE); 301 $CFClient::UI::TOPLEVEL->add ($STATUS_LINE);
200 302
201 $ALT_ENTER_MESSAGE = new CFClient::UI::Label 303 $ALT_ENTER_MESSAGE = new CFClient::UI::Label
202 padding => 0, 304 padding => 0,
203 y => $HEIGHT * 49 / 50, 305 y => $HEIGHT * 44 / 45,
204 height => $HEIGHT / 50, 306 height => $HEIGHT / 45,
205 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode"; 307 text => "Use <b>Alt-Enter</b> to toggle fullscreen mode";
206 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE); 308 $CFClient::UI::TOPLEVEL->add ($ALT_ENTER_MESSAGE);
207 309
208 $MAPWIDGET = new CFClient::UI::MapWidget;
209 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET); 310 $CFClient::UI::TOPLEVEL->add ($MAPWIDGET = new CFClient::UI::MapWidget);
210 $MAPWIDGET->focus_in; 311 $MAPWIDGET->focus_in;
312 $MAPWIDGET->connect (activate_console => sub {
313 my ($mapwidget, $preset) = @_;
211 314
212 config_dialog; 315 if ($CONSOLE) {
316 $CONSOLE->{input}->focus_in;
317
318 if ($preset && $CONSOLE->{input}->get_text eq '') {
319 $CONSOLE->{input}->set_text ($preset);
320 }
321 }
322 });
323
324 $CFClient::UI::TOPLEVEL->add ($BUTTONBAR = new CFClient::UI::HBox);
325
326 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Setup", other => config_dialog, state => 1);
327 $BUTTONBAR->add (my $setup = new CFClient::UI::Flopper x => 0, y => 0, text => "Console", other => console_window);
213} 328}
214 329
215sub destroy_screen { 330sub destroy_screen {
216 $CFClient::UI::TOPLEVEL->{children} = []; 331 $CFClient::UI::TOPLEVEL->{children} = [];
217 undef $SDL_ACTIVE; 332 undef $SDL_ACTIVE;
231 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05; 346 $fps = $fps * 0.95 + 1 / ($NOW - $LAST_REFRESH) * 0.05;
232 debug sprintf "%3.2f", $fps; 347 debug sprintf "%3.2f", $fps;
233 348
234 $want_refresh = 0; 349 $want_refresh = 0;
235 $can_refresh = 0; 350 $can_refresh = 0;
236
237 glViewport 0, 0, $WIDTH, $HEIGHT;
238
239 glMatrixMode GL_PROJECTION;
240 glLoadIdentity;
241 glOrtho 0, $WIDTH, $HEIGHT, 0, -10000 , 10000;
242 glMatrixMode GL_MODELVIEW;
243 glLoadIdentity;
244
245 glClear GL_COLOR_BUFFER_BIT;
246 351
247 $CFClient::UI::TOPLEVEL->draw; 352 $CFClient::UI::TOPLEVEL->draw;
248 353
249 SDL::GLSwapBuffers; 354 SDL::GLSwapBuffers;
250 355
283 delete $animate_object{$widget}; 388 delete $animate_object{$widget};
284} 389}
285 390
286@conn::ISA = Crossfire::Protocol::; 391@conn::ISA = Crossfire::Protocol::;
287 392
288sub conn::send { 393sub conn::user_send {
289 my ($self, $command) = @_; 394 my ($self, $command) = @_;
290 395
291 $self->Crossfire::Protocol::send ($command); 396 $self->send ($command);
292 status $command; 397 status $command;
293} 398}
294 399
295sub conn::map_update { 400sub conn::feed_map1a {
296 my ($self, $dirty) = @_; 401 my ($self, $data) = @_;
297 402
403# $self->Crossfire::Protocol::feed_map1a ($data);
404
405 $MAP->scroll (delete $self->{delayed_scroll_x}, delete $self->{delayed_scroll_y});
406 $MAP->map1a_update ($data);
298 $MAPWIDGET->update; 407 $MAPWIDGET->update;
299} 408}
300 409
301sub conn::map_scroll { 410#sub conn::map_update {
302 my ($self, $dx, $dy) = @_; 411# my ($self, $dirty) = @_;
303 412#
304# refresh; 413# $MAPWIDGET->update;
305} 414#}
306 415
307sub conn::map_clear { 416sub conn::map_clear {
308 my ($self) = @_; 417 my ($self) = @_;
309 418
419 $MAP->clear;
420
310# refresh; 421# refresh;
311} 422}
312 423
313sub conn::face_find { 424sub conn::face_find {
314 my ($self, $face) = @_; 425 my ($self, $face) = @_;
315 426
316 $FACECACHE->{"$face->{chksum},$face->{name}"} 427 $FACECACHE->{"$face->{chksum},$face->{name}"}
317} 428}
318 429
319sub conn::face_update { 430sub conn::face_update {
320 my ($self, $face) = @_; 431 my ($self, $facenum, $face) = @_;
321 432
322 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image}; 433 $FACECACHE->{"$face->{chksum},$face->{name}"} = $face->{image};
323 434
324 $face->{texture} = new_from_image CFClient::Texture delete $face->{image}; 435 my $tex = $face->{texture} = new_from_image CFClient::Texture delete $face->{image};
436
437 $MAP->set_texture ($facenum, @$tex{qw(name w h s t)});
438 $MAPWIDGET->update;
325} 439}
326 440
327sub conn::query { 441sub conn::query {
328 my ($self, $flags, $prompt) = @_; 442 my ($self, $flags, $prompt) = @_;
329 443
444 #TODO
330 warn "<<<<QUERY:$flags:$prompt>>>\n";#d# 445 warn "<<<<QUERY:$flags:$prompt>>>\n";#d#
446}
447
448sub conn::drawinfo {
449 my ($self, $color, $text) = @_;
450
451 my @color = (
452 [1.00, 1.00, 1.00], #[0.00, 0.00, 0.00],
453 [1.00, 1.00, 1.00],
454 [0.00, 0.00, 0.55],
455 [1.00, 0.00, 0.00],
456 [1.00, 0.54, 0.00],
457 [0.11, 0.56, 1.00],
458 [0.93, 0.46, 0.00],
459 [0.18, 0.54, 0.34],
460 [0.56, 0.73, 0.56],
461 [0.80, 0.80, 0.80],
462 [0.55, 0.41, 0.13],
463 [0.99, 0.77, 0.26],
464 [0.74, 0.65, 0.41],
465 );
466
467 $LOGVIEW->add_paragraph ($color[$color], $text);
331} 468}
332 469
333%SDL_CB = ( 470%SDL_CB = (
334 SDL_QUIT() => sub { 471 SDL_QUIT() => sub {
335 Event::unloop -1; 472 Event::unloop -1;
340 refresh; 477 refresh;
341 }, 478 },
342 SDL_KEYDOWN() => sub { 479 SDL_KEYDOWN() => sub {
343 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) { 480 if ($SDL_EV->key_mod & KMOD_ALT && $SDL_EV->key_sym == SDLK_RETURN) {
344 # alt-enter 481 # alt-enter
345 $FULLSCREEN = !$FULLSCREEN;
346 destroy_screen; 482 destroy_screen;
483 $CFG->{fullscreen} = !$CFG->{fullscreen};
347 init_screen; 484 init_screen;
348 } else { 485 } else {
349 CFClient::UI::feed_sdl_key_down_event ($SDL_EV); 486 CFClient::UI::feed_sdl_key_down_event ($SDL_EV);
350 } 487 }
351 }, 488 },
368 505
369############################################################################# 506#############################################################################
370 507
371CFClient::read_cfg "$Crossfire::VARDIR/pclientrc"; 508CFClient::read_cfg "$Crossfire::VARDIR/pclientrc";
372 509
373$CFG ||= { 510my %DEF_CFG = (
511 sdl_mode => 0,
374 width => 640, 512 width => 640,
375 height => 480, 513 height => 480,
376 fullscreen => 0, 514 fullscreen => 0,
377 sdl_mode => 0, 515 fast => 0,
516 fow_enable => 1,
517 fow_intensity => 0.45,
518 fow_smooth => 0,
519 log_fontsize => 14,
378 mapsize => 100, 520 mapsize => 100,
379 host => "crossfire.schmorp.de", 521 host => "crossfire.schmorp.de",
380 port => 13327, 522 port => 13327,
381}; 523 say_command => 'say',
524);
382 525
383SDL::Init SDL_INIT_TIMER | SDL_INIT_AUDIO | SDL_INIT_VIDEO 526while (my ($k, $v) = each %DEF_CFG) {
384 and die "SDL::Init failed!\n"; 527 $CFG->{$k} = $v unless exists $CFG->{$k};
528}
385 529
386@SDL_MODES = reverse map [SDL::RectW ($_), SDL::RectH ($_)], 530sdl_init;
531
532@SDL_MODES = reverse
533 grep $_->[0] >= 640 && $_->[1] >= 480,
534 map [SDL::RectW ($_), SDL::RectH ($_)],
387 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL }; 535 @{ SDL::ListModes 0, SDL_FULLSCREEN | SDL_HWSURFACE | SDL_OPENGL };
536
537@SDL_MODES or CFClient::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
538
539$CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
388 540
389init_screen; 541init_screen;
390 542
391{ 543{
392 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf); 544 my @fonts = map CFClient::find_rcfile $_, qw(uifont.ttf uifontb.ttf uifonti.ttf uifontbi.ttf);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines