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

Comparing deliantra/Deliantra-Client/bin/cfplus (file contents):
Revision 1.164 by root, Thu Jul 12 18:28:34 2007 UTC vs.
Revision 1.197 by root, Tue Jul 31 02:25:52 2007 UTC

… …
71unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
72 if %PAR::LibCache; 72 if %PAR::LibCache;
73 73
74use Time::HiRes 'time'; 74use Time::HiRes 'time';
75use Event; 75use Event;
76use List::Util qw(max min);
76 77
77use Crossfire; 78use Crossfire;
78use Crossfire::Protocol::Constants; 79use Crossfire::Protocol::Constants;
79 80
80use Compress::LZF; 81use Compress::LZF;
… …
82use CFPlus; 83use CFPlus;
83use CFPlus::OpenGL (); 84use CFPlus::OpenGL ();
84use CFPlus::Protocol; 85use CFPlus::Protocol;
85use CFPlus::DB; 86use CFPlus::DB;
86use CFPlus::UI; 87use CFPlus::UI;
88use CFPlus::UI::Canvas;
87use CFPlus::UI::Inventory; 89use CFPlus::UI::Inventory;
88use CFPlus::UI::SpellList; 90use CFPlus::UI::SpellList;
91use CFPlus::UI::MessageWindow;
89use CFPlus::Pod; 92use CFPlus::Pod;
90use CFPlus::MapWidget; 93use CFPlus::MapWidget;
91use CFPlus::Macro; 94use CFPlus::Macro;
92 95
93$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 96$SIG{QUIT} = sub { Carp::cluck "QUIT" };
… …
125 128
126our $MAP; 129our $MAP;
127our $MAPMAP; 130our $MAPMAP;
128our $MAPWIDGET; 131our $MAPWIDGET;
129our $BUTTONBAR; 132our $BUTTONBAR;
130our $LOGVIEW;
131our $CONSOLE;
132our $METASERVER; 133our $METASERVER;
133our $LOGIN_BUTTON; 134our $LOGIN_BUTTON;
134our $QUIT_DIALOG; 135our $QUIT_DIALOG;
135our $HOST_ENTRY; 136our $HOST_ENTRY;
136our $FULLSCREEN_ENABLE; 137our $FULLSCREEN_ENABLE;
… …
160our $SDL_ACTIVE; 161our $SDL_ACTIVE;
161our %SDL_CB; 162our %SDL_CB;
162 163
163our $SDL_MIXER; 164our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 165our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
166our $MUSIC_WANT; # arryref of ambient music
167our @MUSIC_HAVE; # ambient music we want now
165our @MUSIC_WANT; 168our $MUSIC_START;
169our @MUSIC_JINGLE; # which jingles to play
166our $MUSIC_PLAYING; 170our $MUSIC_PLAYING_DATA;
171our $MUSIC_PLAYING_META;
167our $MUSIC_PLAYER; 172our $MUSIC_PLAYER;
173our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
168our @SOUNDS; # event => file mapping 174our @SOUNDS; # event => file mapping
169our %AUDIO_CHUNKS; # audio files 175our %AUDIO_CHUNK; # audio files
170 176
171our $ALT_ENTER_MESSAGE; 177our $ALT_ENTER_MESSAGE;
172our $STATUSBOX; 178our $STATUSBOX;
173our $DEBUG_STATUS; 179our $DEBUG_STATUS;
174 180
… …
176our $INVR; 182our $INVR;
177our $INV_RIGHT_HB; 183our $INV_RIGHT_HB;
178 184
179our $PICKUP_CFG; 185our $PICKUP_CFG;
180 186
181our $IN_BUILD_MODE; 187#############################################################################
182our $BUILD_BUTTON; 188#TODO: maybe move into own audio module...
189
190sub audio_channel_finished {
191 my ($channel) = @_;
192
193# warn "channel $channel finished\n";#d#
194}
195
196our %AUDIO_PLAY;
197our %AUDIO_CHUNK;
198
199sub audio_sound_push($) {
200 my ($face) = @_;
201
202 if (my $chunk = $AUDIO_CHUNK{$face}) {
203 for (grep $_->[0] >= Event::time, @{(delete $AUDIO_PLAY{$face}) || []}) {
204 my (undef, $dx, $dy, $vol) = @$_;
205
206 my $channel = CFPlus::Channel::find;
207 $channel->volume ($vol * 128 / 255);
208 $dx = $dx / 10 * 255;
209 $channel->set_panning (255 - $dx, 255 + $dx);
210
211# my $angle = $dx ? : $dx < 0 ?
212# my $distance = -$vol;
213# $channel->set_position ($angle, $distance);
214
215 $chunk->play ($channel);
216 }
217 } else {
218 # sound_meta not set means data is in flight either way
219 my $meta = $CONN->{sound_meta}{$face}
220 or return;
221
222 # if its a jingle, play it as ambient music
223 if ($meta->{meta}{jingle}) {
224 push @MUSIC_JINGLE, $meta;
225 delete $AUDIO_PLAY{$face};
226 &audio_music_push ($face);
227 } else {
228 # fetch from database
229 CFPlus::DB::get res_data => $meta->{name}, sub {
230 my $rwops = new CFPlus::RW $_[0];
231 my $chunk = new CFPlus::MixChunk $rwops;
232 $chunk->volume (($meta->{meta}{volume} || 1) * 128);
233 $AUDIO_CHUNK{$face} = $chunk;
234
235 audio_sound_push ($face);
236 };
237 }
238 }
239}
240
241sub audio_sound_play {
242 my ($face, $dx, $dy, $vol) = @_;
243
244 $SDL_MIXER
245 or return;
246
247 my $queue = $AUDIO_PLAY{$face} ||= [];
248 push @$queue, [Event::time + 0.2, $dx, $dy, $vol]; # delay sound by max. 0.2s
249 audio_sound_push $face
250 unless @$queue > 1;
251}
252
253sub audio_music_update_volume {
254 return unless $MUSIC_PLAYING_META;
255 my $volume = $MUSIC_PLAYING_META->{meta}{volume} || 1;
256 my $base = $MUSIC_PLAYING_META->{meta}{jingle} ? 1 : $CFG->{bgm_volume};
257 CFPlus::MixMusic::volume $base * $volume * 128;
258}
259
260sub audio_music_start {
261 my $meta = $MUSIC_PLAYING_META;
262
263 CFPlus::DB::get res_data => $meta->{name}, sub {
264 return unless $SDL_MIXER;
265
266 # music might have changed...
267 $meta eq $MUSIC_PLAYING_META
268 or return &audio_music_start ();
269
270 audio_music_update_volume;
271
272 $MUSIC_PLAYING_DATA = \$_[0];
273
274 my $rwops = $meta->{path}
275 ? new_from_file CFPlus::RW $meta->{path}
276 : new CFPlus::RW $$MUSIC_PLAYING_DATA;
277
278 $MUSIC_PLAYER = new CFPlus::MixMusic $rwops
279 or ((warn CFPlus::Mix_GetError), return); # pretty fatal error
280
281 my $NOW = time;
282
283 if ($MUSIC_PLAYING_META->{stop_time} > $NOW - $MUSIC_RESUME) {
284 my $pos = $MUSIC_PLAYING_META->{stop_pos};
285 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
286 $MUSIC_START = time - $pos;
287 } else {
288 $MUSIC_PLAYER->play (0);
289 $MUSIC_START = time;
290 }
291
292 delete $MUSIC_PLAYING_META->{stop_time};
293 delete $MUSIC_PLAYING_META->{stop_pos};
294 }
295}
296
297sub audio_music_push {
298 return unless $SDL_MIXER;
299
300 my $fade_out;
301
302 if (@MUSIC_JINGLE) {
303 @MUSIC_HAVE = $MUSIC_JINGLE[0];
304 $fade_out = 333;
305 } else {
306 return unless $CFG->{bgm_enable};
307
308 my @have =
309 grep $_,
310 map $CONN->{music_meta}{$_},
311 @$MUSIC_WANT;
312
313 @MUSIC_HAVE = @have
314 if @have;
315
316 # default MUSIC_HAVE == MUSIC_DEFAULT
317 @MUSIC_HAVE = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_HAVE;
318 $fade_out = 1000;
319 }
320
321 # if the currently playing song is acceptable, let it continue
322 return if $MUSIC_PLAYING_META
323 && grep $MUSIC_PLAYING_META == $_, @MUSIC_HAVE;
324
325 my $NOW = time;
326
327 if ($MUSIC_PLAYING_META) {
328 $MUSIC_PLAYING_META->{stop_time} = $NOW;
329 $MUSIC_PLAYING_META->{stop_pos} = $NOW - $MUSIC_START;
330 CFPlus::MixMusic::fade_out $fade_out;
331 } else {
332 # sort by stop time, oldest first
333 @MUSIC_HAVE = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_HAVE;
334
335 # if the most recently-played piece played very recently,
336 # resume it, else choose the oldest piece for rotation.
337 $MUSIC_PLAYING_META =
338 $MUSIC_HAVE[-1]{stop_time} > $NOW - $MUSIC_RESUME
339 ? $MUSIC_HAVE[-1]
340 : $MUSIC_HAVE[0];
341
342 audio_music_start;
343 }
344}
345
346sub audio_music_set_ambient {
347 my ($songs) = @_;
348
349 $MUSIC_WANT = $songs;
350 audio_music_push;
351}
352
353sub audio_music_finished {
354 shift @MUSIC_JINGLE
355 if $MUSIC_PLAYING_META == $MUSIC_JINGLE[0];
356
357 undef $MUSIC_PLAYER;
358 undef $MUSIC_PLAYING_META;
359 undef $MUSIC_PLAYING_DATA;
360
361 audio_music_push;
362}
363
364#############################################################################
183 365
184sub status { 366sub status {
185 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 367 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
186} 368}
187 369
… …
189 $DEBUG_STATUS->set_text ($_[0]); 371 $DEBUG_STATUS->set_text ($_[0]);
190} 372}
191 373
192sub message { 374sub message {
193 my ($para) = @_; 375 my ($para) = @_;
194 376 $MESSAGE_WINDOW->message ($para);
195 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
196
197 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
198
199 $LOGVIEW->add_paragraph ($para);
200 $LOGVIEW->scroll_to_bottom;
201} 377}
202 378
203sub destroy_query_dialog { 379sub destroy_query_dialog {
204 (delete $_[0]{query_dialog})->destroy 380 (delete $_[0]{query_dialog})->destroy
205 if $_[0]{query_dialog}; 381 if $_[0]{query_dialog};
… …
270 ellipsise => 0, 446 ellipsise => 0,
271 markup => "\nOr use your keyboard and the text entry below:\n"; 447 markup => "\nOr use your keyboard and the text entry below:\n";
272 448
273 unshift @dialog, my $table = new CFPlus::UI::Table; 449 unshift @dialog, my $table = new CFPlus::UI::Table;
274 450
275 $table->add (0, 0, new CFPlus::UI::Button 451 $table->add_at (0, 0, new CFPlus::UI::Button
276 text => "Next Race", 452 text => "Next Race",
277 on_activate => sub { 453 on_activate => sub {
278 $conn->send ("reply n"); 454 $conn->send ("reply n");
279 destroy_query_dialog $conn; 455 destroy_query_dialog $conn;
280 0 456 0
281 }, 457 },
282 ); 458 );
283 $table->add (2, 0, new CFPlus::UI::Button 459 $table->add_at (2, 0, new CFPlus::UI::Button
284 text => "Accept", 460 text => "Accept",
285 on_activate => sub { 461 on_activate => sub {
286 $conn->send ("reply d"); 462 $conn->send ("reply d");
287 destroy_query_dialog $conn; 463 destroy_query_dialog $conn;
288 0 464 0
… …
323 $conn->send ("reply $stat"); 499 $conn->send ("reply $stat");
324 destroy_query_dialog $conn; 500 destroy_query_dialog $conn;
325 return; 501 return;
326 } 502 }
327 503
328 $STATS_PAGE->show;
329 $MESSAGE_WINDOW->hide;
330
331 unshift @dialog, new CFPlus::UI::Label 504 unshift @dialog, new CFPlus::UI::Label
332 max_w => $::WIDTH * 0.4, 505 max_w => $::WIDTH * 0.4,
333 ellipsise => 0, 506 ellipsise => 0,
334 markup => "\nOr use your keyboard and the text entry below:\n"; 507 markup => "\nOr use your keyboard and the text entry below:\n";
335 508
336 unshift @dialog, my $table = new CFPlus::UI::Table; 509 unshift @dialog, my $table = new CFPlus::UI::Table;
337 510
338 # left: re-roll 511 # left: re-roll
339 $table->add (0, 0, new CFPlus::UI::Button 512 $table->add_at (0, 0, new CFPlus::UI::Button
340 text => "Roll Again", 513 text => "Roll Again",
341 on_activate => sub { 514 on_activate => sub {
342 $conn->send ("reply y"); 515 $conn->send ("reply y");
343 destroy_query_dialog $conn; 516 destroy_query_dialog $conn;
344 0 517 0
… …
358 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 531 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
359 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 532 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
360 ], 533 ],
361 ), 1 .. 2; 534 ), 1 .. 2;
362 535
363 $table->add (2, 0, new CFPlus::UI::Button 536 $table->add_at (2, 0, new CFPlus::UI::Button
364 text => "Swap Stats", 537 text => "Swap Stats",
365 on_activate => sub { 538 on_activate => sub {
366 $conn->{stat_change_with} = $sw2->{value}; 539 $conn->{stat_change_with} = $sw2->{value};
367 $conn->send ("reply $sw1->{value}"); 540 $conn->send ("reply $sw1->{value}");
368 destroy_query_dialog $conn; 541 destroy_query_dialog $conn;
369 0 542 0
370 }, 543 },
371 ); 544 );
372 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 545 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
373 546
374 # right: accept 547 # right: accept
375 $table->add (4, 0, new CFPlus::UI::Button 548 $table->add_at (4, 0, new CFPlus::UI::Button
376 text => "Accept", 549 text => "Accept",
377 on_activate => sub { 550 on_activate => sub {
378 $conn->send ("reply n"); 551 $conn->send ("reply n");
379 $STATS_PAGE->hide; 552 $STATS_PAGE->hide;
380 destroy_query_dialog $conn; 553 destroy_query_dialog $conn;
… …
461 maph => $mapsize, 634 maph => $mapsize,
462 635
463 client => "cfplus $CFPlus::VERSION $] $^O", 636 client => "cfplus $CFPlus::VERSION $] $^O",
464 637
465 map_widget => $MAPWIDGET, 638 map_widget => $MAPWIDGET,
466 logview => $LOGVIEW,
467 statusbox => $STATUSBOX, 639 statusbox => $STATUSBOX,
468 map => $MAP, 640 map => $MAP,
469 mapmap => $MAPMAP, 641 mapmap => $MAPMAP,
470 query => \&server_query, 642 query => \&server_query,
471 643
472 setup_req => { 644 setup_req => {
473 smoothing => $CFG->{map_smoothing}*1, 645 smoothing => $CFG->{map_smoothing}*1,
474 },
475
476 sound_play => sub {
477 my ($x, $y, $soundnum, $type) = @_;
478
479 $SDL_MIXER
480 or return;
481
482 my $chunk = $AUDIO_CHUNKS{$SOUNDS[$soundnum]}
483 or return;
484
485 $chunk->play;
486 }, 646 },
487 }; 647 };
488 648
489 if ($CONN) { 649 if ($CONN) {
490 CFPlus::lowdelay fileno $CONN->{fh}; 650 CFPlus::lowdelay fileno $CONN->{fh};
… …
502 $SETUP_DIALOG->show; 662 $SETUP_DIALOG->show;
503 $PL_WINDOW->hide; 663 $PL_WINDOW->hide;
504 $SPELL_LIST->clear_spells; 664 $SPELL_LIST->clear_spells;
505 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN); 665 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
506 666
667 &audio_music_set_ambient ([]);
668
507 return unless $CONN; 669 return unless $CONN;
508 670
509 status "connection closed"; 671 status "connection closed";
510 672
511 destroy_query_dialog $CONN; 673 destroy_query_dialog $CONN;
… …
520 682
521 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 683 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
522 684
523 my $row = 0; 685 my $row = 0;
524 686
525 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 687 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
526 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 688 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
527 can_events => 1, 689 can_events => 1,
528 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 690 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
529 691
692 my $vidmode_tooltip =
693 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
694 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
695
530 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 696 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
531 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 697 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
532 698
699 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
533 $hbox->add (my $mode_slider = new CFPlus::UI::Slider force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1]); 700 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
534 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 701 tooltip => $vidmode_tooltip);
702 $hbox->add (my $mode_label = new CFPlus::UI::Label
703 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
704 can_events => 1, tooltip => $vidmode_tooltip);
535 705
536 $mode_slider->connect (changed => sub { 706 $mode_slider->connect (changed => sub {
537 my ($self, $value) = @_; 707 my ($self, $value) = @_;
538 708
539 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 709 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
540 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 710 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
541 }); 711 });
542 $mode_slider->emit (changed => $mode_slider->{range}[0]); 712 $mode_slider->emit (changed => $mode_slider->{range}[0]);
543 713
544 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 714 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
545 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 715 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
546 state => $CFG->{fullscreen}, 716 state => $CFG->{fullscreen},
547 tooltip => "Bring the client into fullscreen mode.", 717 tooltip => "Bring the client into fullscreen mode.",
548 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 718 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
549 ); 719 );
550 720
551 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 721 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
552 $table->add (1, $row++, new CFPlus::UI::CheckBox 722 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
553 state => $CFG->{fast}, 723 state => $CFG->{fast},
554 tooltip => "Lower the visual quality considerably to speed up rendering.", 724 tooltip => "Lower the visual quality considerably to speed up rendering.",
555 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 725 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
556 ); 726 );
557 727
558 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 728 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
559 $table->add (1, $row++, new CFPlus::UI::Slider 729 $table->add_at (1, $row++, new CFPlus::UI::Slider
560 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 730 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
561 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 731 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
562 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 732 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
563 ); 733 );
564 734
565 $table->add (1, $row++, new CFPlus::UI::Button 735 $table->add_at (1, $row++, new CFPlus::UI::Button
566 expand => 1, align => 0, text => "Apply", 736 expand => 1, align => 0, text => "Apply",
567 tooltip => "Apply the video settings above.", 737 tooltip => "Apply the video settings above.",
568 on_activate => sub { 738 on_activate => sub {
569 video_shutdown (); 739 video_shutdown ();
570 video_init (); 740 video_init ();
571 0 741 0
572 } 742 }
573 ); 743 );
574 744
575 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 745 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
576 $table->add (1, $row++, new CFPlus::UI::Slider 746 $table->add_at (1, $row++, new CFPlus::UI::Slider
577 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 747 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
578 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 748 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
579 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 749 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
580 ); 750 );
581 751
582 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 752 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
583 $table->add (1, $row++, new CFPlus::UI::CheckBox 753 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
584 state => $CFG->{map_smoothing}, 754 state => $CFG->{map_smoothing},
585 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 755 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
586 . "This increases load on the graphics subsystem and works only with 2.x servers. " 756 . "This increases load on the graphics subsystem and works only with 2.x servers. "
587 . "Changes take effect at next connection only.", 757 . "Changes take effect at next connection only.",
588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 758 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
589 ); 759 );
590 760
591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 761 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox 762 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{fow_enable}, 763 state => $CFG->{fow_enable},
594 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 764 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
595 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 765 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
596 ); 766 );
597 767
598 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 768 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
599 $table->add (1, $row++, new CFPlus::UI::Slider 769 $table->add_at (1, $row++, new CFPlus::UI::Slider
600 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 770 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
601 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 771 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
602 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 772 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
603 ); 773 );
604 774
605 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
606 $table->add (1, $row++, new CFPlus::UI::CheckBox
607 state => $CFG->{fow_smooth},
608 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
609 on_changed => sub {
610 my ($self, $value) = @_;
611 $CFG->{fow_smooth} = $value;
612 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
613 0
614 }
615 );
616
617 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 775 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
618 $table->add (1, $row++, new CFPlus::UI::Slider 776 $table->add_at (1, $row++, new CFPlus::UI::Slider
619 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 777 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
620 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 778 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
621 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 779 on_changed => sub { $MESSAGE_WINDOW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
622 ); 780 );
623 781
624 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 782 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
625 $table->add (1, $row++, new CFPlus::UI::Slider 783 $table->add_at (1, $row++, new CFPlus::UI::Slider
626 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 784 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
627 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 785 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
628 on_changed => sub { 786 on_changed => sub {
629 $CFG->{gauge_fontsize} = $_[1]; 787 $CFG->{gauge_fontsize} = $_[1];
630 &set_gauge_window_fontsize; 788 &set_gauge_window_fontsize;
631 0 789 0
632 } 790 }
633 ); 791 );
634 792
635 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 793 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
636 $table->add (1, $row++, new CFPlus::UI::Slider 794 $table->add_at (1, $row++, new CFPlus::UI::Slider
637 range => [$CFG->{gauge_size}, 0.2, 0.8], 795 range => [$CFG->{gauge_size}, 0.2, 0.8],
638 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 796 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
639 on_changed => sub { 797 on_changed => sub {
640 $CFG->{gauge_size} = $_[1]; 798 $CFG->{gauge_size} = $_[1];
641 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 799 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
651 809
652 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 810 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
653 811
654 my $row = 0; 812 my $row = 0;
655 813
656 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 814 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
657 $table->add (1, $row++, new CFPlus::UI::CheckBox 815 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
658 state => $CFG->{audio_enable}, 816 state => $CFG->{audio_enable},
659 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.", 817 tooltip => "<b>Master Audio Enable.</b> If enabled, sound effects and music will be played. If disabled, no audio will be used and the soundcard will not be opened.",
660 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 818 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
661 ); 819 );
662# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 820# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
663# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 821# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
664# $CFG->{effects_volume} = $_[1]; 822# $CFG->{effects_volume} = $_[1];
665# }); 823# });
666 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 824 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
667 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 825 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
668 $hbox->add (new CFPlus::UI::CheckBox 826 $hbox->add (new CFPlus::UI::CheckBox
669 expand => 1, state => $CFG->{bgm_enable}, 827 expand => 1, state => $CFG->{bgm_enable},
670 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 828 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
671 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 829 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
672 ); 830 );
673 $hbox->add (new CFPlus::UI::Slider 831 $hbox->add (new CFPlus::UI::Slider
674 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 832 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
675 tooltip => "The volume of the background music. Changes are instant.", 833 tooltip => "The volume of the background music. Changes are instant.",
676 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 834 on_changed => sub { $CFG->{bgm_volume} = $_[1]; audio_music_update_volume; 0 }
677 ); 835 );
678 836
679 $table->add (1, $row++, new CFPlus::UI::Button 837 $table->add_at (1, $row++, new CFPlus::UI::Button
680 expand => 1, align => 0, text => "Apply", 838 expand => 1, align => 0, text => "Apply",
681 tooltip => "Apply the audio settings", 839 tooltip => "Apply the audio settings",
682 on_activate => sub { 840 on_activate => sub {
683 audio_shutdown (); 841 audio_shutdown ();
684 audio_init (); 842 audio_init ();
… …
743} 901}
744 902
745sub debug_setup { 903sub debug_setup {
746 my $table = new CFPlus::UI::Table; 904 my $table = new CFPlus::UI::Table;
747 905
748 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 906 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
749 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 907 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
750 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 908 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
751 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 909 $table->add_at (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
752 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 910 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
753 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 911 $table->add_at (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
754 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 912 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
755 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 913 $table->add_at (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
756 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 914 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
757 915
758 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
759
760 for my $x (0..2) {
761 for my $y (0 .. 2) {
762 $table->add ($x + 3, $y,
763 new CFPlus::UI::Entry
764 text => $default_smooth[$x * 3 + $y],
765 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
766 );
767 }
768 }
769
770 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 916 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
917
918 $table->add_at (7,7, my $t = new CFPlus::UI::Table expand => 0);
919 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
920 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
921 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
922 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
923 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
924
925 $table->add_at (7, 6, my $c = new CFPlus::UI::Canvas);
926
927 $c->add_items ({
928 type => "line_loop",
929 color => [0, 1, 0],
930 width => 9,
931 coord_mode => "abs",
932 coord => [[10, 5], [5, 50], [20, 5], [5, 60]],
933 });
934
935 $c->add_items ({
936 type => "lines",
937 color => [1, 1, 0],
938 width => 2,
939 coord_mode => "rel",
940 coord => [[0,0], [1,1], [1,0], [0,1]],
941 });
942
943 $c->add_items ({
944 type => "polygon",
945 color => [0, 0.43, 0],
946 width => 2,
947 coord_mode => "rel",
948 coord => [[0,0.2], [1,.4], [1,.6], [0,.8]],
949 });
771 950
772 $table 951 $table
773} 952}
774 953
775sub stats_window { 954sub stats_window {
… …
823 [2, 4, st_spd => "Spd", 10.54], 1002 [2, 4, st_spd => "Spd", 10.54],
824 [2, 5, st_wspd => "WSp", 10.54], 1003 [2, 5, st_wspd => "WSp", 10.54],
825 ) { 1004 ) {
826 my ($col, $row, $id, $label, $template) = @$_; 1005 my ($col, $row, $id, $label, $template) = @$_;
827 1006
828 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 1007 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
829 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 1008 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
830 align => +1, template => $template, tooltip => "#stat_$label"); 1009 align => +1, template => $template, tooltip => "#stat_$label");
831 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 1010 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
832 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 1011 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
833 align => -1, text => $label, tooltip => "#stat_$label"); 1012 align => -1, text => $label, tooltip => "#stat_$label");
834 } 1013 }
835 1014
836 $vb->add (new CFPlus::UI::FancyFrame 1015 $vb->add (new CFPlus::UI::FancyFrame
… …
877 cold => ["Cold", 1056 cold => ["Cold",
878 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 1057 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
879 ghit => ["Ghost hit", 1058 ghit => ["Ghost hit",
880 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 1059 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
881 ); 1060 );
1061
882 for (qw/slow holyw conf fire depl magic 1062 for (qw/slow holyw conf fire depl magic
883 drain acid pois para deat phys 1063 drain acid pois para deat phys
884 blind fear tund elec cold ghit/) 1064 blind fear tund elec cold ghit/)
885 { 1065 {
886 $tbl2->add ($col, $row, 1066 $tbl2->add_at ($col, $row,
887 $STATWIDS->{"res_$_"} = 1067 $STATWIDS->{"res_$_"} =
888 new CFPlus::UI::Label 1068 new CFPlus::UI::Label
889 font => $FONT_FIXED, 1069 font => $FONT_FIXED,
890 template => "-100%", 1070 template => "-100%",
891 align => +1, 1071 align => +1,
892 valign => 0, 1072 valign => 0,
893 can_events => 1, 1073 can_events => 1,
894 can_hover => 1, 1074 can_hover => 1,
895 tooltip => $resist_names{$_}->[1], 1075 tooltip => $resist_names{$_}->[1],
896 ); 1076 );
897 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 1077 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
898 font => $FONT_FIXED, 1078 font => $FONT_FIXED,
899 can_hover => 1, 1079 can_hover => 1,
900 can_events => 1, 1080 can_events => 1,
901 path => "ui/resist/resist_$_.png", 1081 path => "ui/resist/resist_$_.png",
902 tooltip => $resist_names{$_}->[1], 1082 tooltip => $resist_names{$_}->[1],
903 ); 1083 );
904 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 1084 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
905 text => $resist_names{$_}->[0], 1085 text => $resist_names{$_}->[0],
906 font => $FONT_FIXED, 1086 font => $FONT_FIXED,
907 can_hover => 1, 1087 can_hover => 1,
908 can_events => 1, 1088 can_events => 1,
909 tooltip => $resist_names{$_}->[1], 1089 tooltip => $resist_names{$_}->[1],
… …
942 return if $METASERVER_ATIME > time; 1122 return if $METASERVER_ATIME > time;
943 $METASERVER_ATIME = time + 60; 1123 $METASERVER_ATIME = time + 60;
944 1124
945 my $table = $METASERVER->{table}; 1125 my $table = $METASERVER->{table};
946 $table->clear; 1126 $table->clear;
947 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 1127 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
948 1128
949 my $ok = 0; 1129 my $ok = 0;
950 1130
951 CFPlus::background { 1131 CFPlus::background {
952 my $ua = CFPlus::lwp_useragent; 1132 my $ua = CFPlus::lwp_useragent;
… …
963 "The time this server has been running without being restarted.", 1143 "The time this server has been running without being restarted.",
964 "The server software version - a '+' indicates a Crossfire+ server.", 1144 "The server software version - a '+' indicates a Crossfire+ server.",
965 "Short information about this server provided by its admins.", 1145 "Short information about this server provided by its admins.",
966 ); 1146 );
967 my @col = qw(#Users Host Uptime Version Description); 1147 my @col = qw(#Users Host Uptime Version Description);
968 $table->add ($_, 0, new CFPlus::UI::Label 1148 $table->add_at ($_, 0, new CFPlus::UI::Label
969 can_hover => 1, can_events => 1, 1149 can_hover => 1, can_events => 1,
970 align => 0, fg => [1, 1, 0], 1150 align => 0, fg => [1, 1, 0],
971 text => $col[$_], tooltip => $tip[$_]) 1151 text => $col[$_], tooltip => $tip[$_])
972 for 0 .. $#col; 1152 for 0 .. $#col;
973 1153
… …
995 1175
996 $m = [$users, $host, $uptime, $version, $desc]; 1176 $m = [$users, $host, $uptime, $version, $desc];
997 1177
998 $y++; 1178 $y++;
999 1179
1000 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 1180 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1001 (new CFPlus::UI::Button 1181 (new CFPlus::UI::Button
1002 text => "Use", 1182 text => "Use",
1003 tooltip => "Put this server into the <b>Host:Port</b> field", 1183 tooltip => "Put this server into the <b>Host:Port</b> field",
1004 on_activate => sub { 1184 on_activate => sub {
1005 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 1185 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1008 }, 1188 },
1009 ), 1189 ),
1010 (new CFPlus::UI::Empty expand => 1), 1190 (new CFPlus::UI::Empty expand => 1),
1011 ]); 1191 ]);
1012 1192
1013 $table->add ($_, $y, new CFPlus::UI::Label 1193 $table->add_at ($_, $y, new CFPlus::UI::Label
1014 max_w => $::WIDTH * 0.4, 1194 max_w => $::WIDTH * 0.4,
1015 ellipsise => 0, 1195 ellipsise => 0,
1016 align => $align[$_], 1196 align => $align[$_],
1017 text => $m->[$_], 1197 text => $m->[$_],
1018 tooltip => $tip[$_], 1198 tooltip => $tip[$_],
… …
1059 1239
1060 $vbox->add (new CFPlus::UI::FancyFrame 1240 $vbox->add (new CFPlus::UI::FancyFrame
1061 label => "Connection Settings", 1241 label => "Connection Settings",
1062 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1242 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1063 ); 1243 );
1064 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1244 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1065 1245
1066 { 1246 {
1067 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1247 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1068 1248
1069 $vbox->add ( 1249 $vbox->add (
1070 $HOST_ENTRY = new CFPlus::UI::Entry 1250 $HOST_ENTRY = new CFPlus::UI::Entry
1071 expand => 1, 1251 expand => 1,
1072 text => $CFG->{profile}{default}{host}, 1252 text => $CFG->{profile}{default}{host},
1073 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to", 1253 tooltip => "The hostname or ip address of the Crossfire(+) server to connect to",
1074 on_changed => sub { 1254 on_changed => sub {
1075 my ($self, $value) = @_; 1255 my ($self, $value) = @_;
1076 $CFG->{profile}{default}{host} = $value; 1256 $CFG->{profile}{default}{host} = $value;
1077 0 1257 1
1078 } 1258 }
1079 ); 1259 );
1080 1260
1081 $vbox->add (new CFPlus::UI::Button 1261 $vbox->add (new CFPlus::UI::Button
1082 expand => 1, 1262 expand => 1,
1083 text => "Server List", 1263 text => "Server List",
1084 other => $METASERVER, 1264 other => $METASERVER,
1085 tooltip => "Show a list of available crossfire servers", 1265 tooltip => "Show a list of available crossfire servers",
1086 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1266 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1087 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1267 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 1 },
1088 ); 1268 );
1089 } 1269 }
1090 1270
1091 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1271 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1092 $table->add (1, 4, new CFPlus::UI::Entry 1272 $table->add_at (1, 4, new CFPlus::UI::Entry
1093 text => $CFG->{profile}{default}{user}, 1273 text => $CFG->{profile}{default}{user},
1094 tooltip => "The name of your character on the server", 1274 tooltip => "The name of your character on the server",
1095 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1275 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value; 1 }
1096 ); 1276 );
1097 1277
1098 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1278 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1099 $table->add (1, 5, new CFPlus::UI::Entry 1279 $table->add_at (1, 5, new CFPlus::UI::Entry
1100 text => $CFG->{profile}{default}{password}, 1280 text => $CFG->{profile}{default}{password},
1101 hidden => 1, 1281 hidden => 1,
1102 tooltip => "The password for your character", 1282 tooltip => "The password for your character",
1103 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1283 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value; 1 }
1104 ); 1284 );
1105 1285
1106 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1286 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1107 $table->add (1, 7, new CFPlus::UI::Slider 1287 $table->add_at (1, 7, new CFPlus::UI::Slider
1108 force_w => 100, 1288 force_w => 100,
1109 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1289 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1110 tooltip => "This is the size of the portion of the map update the server sends you. " 1290 tooltip => "This is the size of the portion of the map update the server sends you. "
1111 . "If you set this to a high value you will be able to see further, " 1291 . "If you set this to a high value you will be able to see further, "
1112 . "but you also increase bandwidth requirements and latency. " 1292 . "but you also increase bandwidth requirements and latency. "
1113 . "This option is only used once at log-in.", 1293 . "This option is only used once at log-in.",
1114 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1294 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 1 },
1115 ); 1295 );
1116 1296
1117 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1118 $table->add (1, 8, new CFPlus::UI::CheckBox
1119 state => $CFG->{face_prefetch},
1120 tooltip => "<b>Background Image Prefetch</b>\n\n"
1121 . "If enabled, the client automatically pre-fetches images from the server. "
1122 . "This might increase or create lag, but increases the chances "
1123 . "of faces being ready for display when you encounter them. "
1124 . "It also uses up server bandwidth on every connect, "
1125 . "so only set it if you really need to prefetch images. "
1126 . "This option can be set and unset any time.",
1127 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1128 );
1129
1130 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1297 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1131 $table->add (1, 9, new CFPlus::UI::Entry 1298 $table->add_at (1, 8, new CFPlus::UI::Entry
1132 text => $CFG->{output_rate}, 1299 text => $CFG->{output_rate},
1133 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1300 tooltip => "The maximum bandwidth in bytes per second that the server should not exceed "
1134 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1301 . "when sending data. When 0 or unset, the server "
1135 . "default will be used, which is usually around 100kb/s.", 1302 . "default will be used, which is usually around 100kb/s. Most servers will "
1303 . "dynamically find an optimal rate, so adjust this only when necessary.",
1136 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1304 on_changed => sub { $CFG->{output_rate} = $_[1]; 1 },
1137 ); 1305 );
1138 1306
1139 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1307 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1140 $table->add (1, 10, new CFPlus::UI::Entry 1308 $table->add_at (1, 9, new CFPlus::UI::Entry
1141 text => $CFG->{output_count}, 1309 text => $CFG->{output_count},
1142 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1310 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1143 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1311 on_changed => sub { $CFG->{output_count} = $_[1]; 1 },
1144 ); 1312 );
1145 1313
1146 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1314 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1147 $table->add (1, 11, new CFPlus::UI::Entry 1315 $table->add_at (1, 10, new CFPlus::UI::Entry
1148 text => $CFG->{output_sync}, 1316 text => $CFG->{output_sync},
1149 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1317 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1150 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1318 on_changed => sub { $CFG->{output_sync} = $_[1]; 1 },
1151 ); 1319 );
1152 1320
1153 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1321 $table->add_at (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button
1154 expand => 1, 1322 expand => 1,
1155 align => 0, 1323 align => 0,
1156 text => "Login", 1324 text => "Login",
1157 on_activate => sub { 1325 on_activate => sub {
1158 $CONN ? stop_game 1326 $CONN ? stop_game
1159 : start_game; 1327 : start_game;
1160 0 1328 1
1161 }, 1329 },
1162 ); 1330 );
1163 1331
1164 $vbox->add (new CFPlus::UI::FancyFrame 1332 $vbox->add (new CFPlus::UI::FancyFrame
1165 label => "Server Info", 1333 label => "Server Info",
… …
1172sub client_setup { 1340sub client_setup {
1173 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1341 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1174 1342
1175 my $row = 0; 1343 my $row = 0;
1176 1344
1177 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1178 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1179 text => $CFG->{say_command},
1180 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1181 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1182 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1183 on_changed => sub {
1184 my ($self, $value) = @_;
1185 $CFG->{say_command} = $value;
1186 0
1187 }
1188 );
1189
1190 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1345 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1191 $table->add (1, $row++, new CFPlus::UI::CheckBox 1346 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1192 state => $CFG->{show_tips}, 1347 state => $CFG->{show_tips},
1193 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1348 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1194 on_changed => sub { 1349 on_changed => sub {
1195 my ($self, $value) = @_; 1350 my ($self, $value) = @_;
1196 $CFG->{show_tips} = $value; 1351 $CFG->{show_tips} = $value;
1197 0 1352 0
1198 } 1353 }
1199 ); 1354 );
1200 1355
1201 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1356 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1202 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1357 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1203 text => $CFG->{logview_max_par}, 1358 text => $CFG->{logview_max_par},
1204 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1359 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1205 . "sends more messages than this number, older messages get removed to save memory and " 1360 . "sends more messages than this number, older messages get removed to save memory and "
1206 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1361 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1207 on_changed => sub { 1362 on_changed => sub {
1208 my ($self, $value) = @_; 1363 my ($self, $value) = @_;
1209 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1; 1364 $MESSAGE_WINDOW->set_max_para ($CFG->{logview_max_par} = $value*1);
1210 0 1365 0
1211 }, 1366 },
1212 ); 1367 );
1213 1368
1214 $table 1369 $table
1215} 1370}
1216 1371
1217sub message_window {
1218 my $window = new CFPlus::UI::Toplevel
1219 name => "message_window",
1220 title => "Messages",
1221 border_bg => [1, 1, 1, 1],
1222 x => "max",
1223 y => 0,
1224 force_w => $::WIDTH * 0.4,
1225 force_h => $::HEIGHT * 0.5,
1226 child => (my $vbox = new CFPlus::UI::VBox),
1227 has_close_button => 1;
1228
1229 $vbox->add ($LOGVIEW);
1230
1231 $vbox->add (my $input = new CFPlus::UI::Entry
1232 tooltip => "<b>Chat Box</b>. If you enter a text and press return/enter here, the current <i>communication command</i> "
1233 . "from the client setup will be prepended (e.g. <b>shout</b>, <b>chat</b>...). "
1234 . "If you prepend a slash (/), you will submit a command instead (similar to IRC). "
1235 . "A better way to submit commands (and the occasional chat command) is often the map command completer.",
1236 on_focus_in => sub {
1237 my ($input, $prev_focus) = @_;
1238
1239 delete $input->{refocus_map};
1240
1241 if ($prev_focus == $MAPWIDGET && $input->{auto_activated}) {
1242 $input->{refocus_map} = 1;
1243 }
1244 delete $input->{auto_activated};
1245
1246 0
1247 },
1248 on_activate => sub {
1249 my ($input, $text) = @_;
1250 $input->set_text ('');
1251
1252 if ($text =~ /^\/(.*)/) {
1253 $::CONN->user_send ($1);
1254 } else {
1255 my $say_cmd = $::CFG->{say_command} || 'say';
1256 $::CONN->user_send ("$say_cmd $text");
1257 }
1258 if ($input->{refocus_map}) {
1259 delete $input->{refocus_map};
1260 $MAPWIDGET->focus_in
1261 }
1262
1263 0
1264 },
1265 on_escape => sub {
1266 $MAPWIDGET->grab_focus;
1267
1268 0
1269 },
1270 );
1271
1272 $CONSOLE = {
1273 window => $window,
1274 input => $input,
1275 };
1276
1277 $window
1278}
1279
1280sub autopickup_setup { 1372sub autopickup_setup {
1373 my $r = new CFPlus::UI::ScrolledWindow (
1374 expand => 1,
1375 scroll_y => 1
1376 );
1281 my $table = new CFPlus::UI::Table; 1377 $r->add (my $table = new CFPlus::UI::Table
1378 row_expand => [0],
1379 col_expand => [0, 1, 0, 1],
1380 );
1282 1381
1283 for ( 1382 for (
1284 ["General", 0, 0, 1383 ["General", 0, 0,
1285 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1384 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1286 ["Inhibit autopickup" => PICKUP_INHIBIT], 1385 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1321 ], 1420 ],
1322 ["Weight/Value ratio", 2, 17] 1421 ["Weight/Value ratio", 2, 17]
1323 ) 1422 )
1324 { 1423 {
1325 my ($title, $x, $y, @bits) = @$_; 1424 my ($title, $x, $y, @bits) = @$_;
1326 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1425 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1327 1426
1328 for (@bits) { 1427 for (@bits) {
1329 ++$y; 1428 ++$y;
1330 1429
1331 my $mask = $_->[1]; 1430 my $mask = $_->[1];
1332 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1431 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1333 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1432 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1334 state => $::CFG->{pickup} & $mask, 1433 state => $::CFG->{pickup} & $mask,
1335 on_changed => sub { 1434 on_changed => sub {
1336 my ($box, $value) = @_; 1435 my ($box, $value) = @_;
1337 1436
1338 if ($value) { 1437 if ($value) {
… …
1349 1448
1350 ${$_->[2]} = $checkbox if $_->[2]; 1449 ${$_->[2]} = $checkbox if $_->[2];
1351 } 1450 }
1352 } 1451 }
1353 1452
1354 $table->add (2, 18, new CFPlus::UI::ValSlider 1453 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1355 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1454 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1356 template => ">= 99", 1455 template => ">= 99",
1357 to_value => sub { ">= " . 5 * $_[0] }, 1456 to_value => sub { ">= " . 5 * $_[0] },
1358 on_changed => sub { 1457 on_changed => sub {
1359 my ($slider, $value) = @_; 1458 my ($slider, $value) = @_;
… …
1362 $::CFG->{pickup} |= int $value 1461 $::CFG->{pickup} |= int $value
1363 if $value; 1462 if $value;
1364 1; 1463 1;
1365 }); 1464 });
1366 1465
1367 $table->add (3, 18, new CFPlus::UI::Button 1466 $table->add_at (3, 18, new CFPlus::UI::Button
1368 text => "set", 1467 text => "set",
1369 on_activate => sub { 1468 on_activate => sub {
1370 $::CONN->send_command ("pickup $::CFG->{pickup}") 1469 $::CONN->send_command ("pickup $::CFG->{pickup}")
1371 if defined $::CONN; 1470 if defined $::CONN;
1372 0 1471 0
1373 }); 1472 });
1374 1473
1375 $table 1474 $r
1376} 1475}
1377 1476
1378my %SORT_ORDER = ( 1477my %SORT_ORDER = (
1379 type => undef, 1478 type => undef,
1380 mtime => sub { 1479 mtime => sub {
… …
1461 1560
1462 my $ntb = 1561 my $ntb =
1463 $PL_NOTEBOOK = 1562 $PL_NOTEBOOK =
1464 new CFPlus::UI::Notebook expand => 1; 1563 new CFPlus::UI::Notebook expand => 1;
1465 1564
1466 $ntb->add ( 1565 $ntb->add_tab (
1467 "Statistics (F2)" => $STATS_PAGE = stats_window, 1566 "Statistics (F2)" => $STATS_PAGE = stats_window,
1468 "Shows statistics, where all your Stats and Resistances are shown." 1567 "Shows statistics, where all your Stats and Resistances are shown."
1469 ); 1568 );
1470 $ntb->add ( 1569 $ntb->add_tab (
1471 "Skills (F3)" => $SKILL_PAGE = skill_window, 1570 "Skills (F3)" => $SKILL_PAGE = skill_window,
1472 "Shows all your Skills." 1571 "Shows all your Skills."
1473 ); 1572 );
1474 1573
1475 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1574 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1476 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList); 1575 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1477 $ntb->add ( 1576 $ntb->add_tab (
1478 "Spellbook (F4)" => $spellsw, 1577 "Spellbook (F4)" => $spellsw,
1479 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1578 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1480 ); 1579 );
1481 $ntb->add ( 1580 $ntb->add_tab (
1482 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1581 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1483 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1582 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1484 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1583 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1485 ); 1584 );
1486 $ntb->add (Pickup => autopickup_setup, 1585 $ntb->add_tab (Pickup => autopickup_setup,
1487 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1586 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1488 1587
1489 $ntb->set_current_page ($INVENTORY_PAGE); 1588 $ntb->set_current_page ($INVENTORY_PAGE);
1490 1589
1491 $plwin->add ($ntb); 1590 $plwin->add ($ntb);
… …
1689 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1788 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1690 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1789 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1691 1790
1692 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1791 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1693 1792
1694 $table->add (0, 0, new CFPlus::UI::Button 1793 $table->add_at (0, 0, new CFPlus::UI::Button
1695 text => "Close", 1794 text => "Close",
1696 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.", 1795 tooltip => "Close the tip of the day window. To never see it again, disable the tip of the day in the <b>Server Setup</b>.",
1697 on_activate => $close, 1796 on_activate => $close,
1698 ); 1797 );
1699 1798
1700 $table->add (2, 0, new CFPlus::UI::Button 1799 $table->add_at (2, 0, new CFPlus::UI::Button
1701 text => "Next", 1800 text => "Next",
1702 tooltip => "Show the next <b>Tip of the day</b>.", 1801 tooltip => "Show the next <b>Tip of the day</b>.",
1703 on_activate => sub { 1802 on_activate => sub {
1704 $close->(); 1803 $close->();
1705 &show_tip_of_the_day; 1804 &show_tip_of_the_day;
… …
1714 CFPlus::SDL_Init 1813 CFPlus::SDL_Init
1715 and die "SDL::Init failed!\n"; 1814 and die "SDL::Init failed!\n";
1716} 1815}
1717 1816
1718sub video_init { 1817sub video_init {
1719 sdl_init;
1720
1721 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1818 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1722 1819
1723 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1820 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1724 1821
1725 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1822 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1726 $FULLSCREEN = $CFG->{fullscreen}; 1823 $FULLSCREEN = $CFG->{fullscreen};
1727 $FAST = $CFG->{fast}; 1824 $FAST = $CFG->{fast};
1728 1825
1729 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1826 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1730 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1827 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1731 1828
1732 $SDL_ACTIVE = 1; 1829 $SDL_ACTIVE = 1;
1733 $LAST_REFRESH = time - 0.01; 1830 $LAST_REFRESH = time - 0.01;
1734 1831
… …
1776 1873
1777 $MAPWIDGET = new CFPlus::MapWidget; 1874 $MAPWIDGET = new CFPlus::MapWidget;
1778 $MAPWIDGET->connect (activate_console => sub { 1875 $MAPWIDGET->connect (activate_console => sub {
1779 my ($mapwidget, $preset) = @_; 1876 my ($mapwidget, $preset) = @_;
1780 1877
1781 if ($CONSOLE) { 1878 $MESSAGE_WINDOW->activate_console ($preset)
1782 $CONSOLE->{input}->{auto_activated} = 1; 1879 if $MESSAGE_WINDOW;
1783 $CONSOLE->{input}->grab_focus;
1784
1785 if ($preset && $CONSOLE->{input}->get_text eq '') {
1786 $CONSOLE->{input}->set_text ($preset);
1787 }
1788 }
1789 }); 1880 });
1790 $MAPWIDGET->show; 1881 $MAPWIDGET->show;
1791 $MAPWIDGET->grab_focus; 1882 $MAPWIDGET->grab_focus;
1792
1793 $LOGVIEW = new CFPlus::UI::TextScroller
1794 expand => 1,
1795 font => $FONT_FIXED,
1796 fontsize => $::CFG->{log_fontsize},
1797 indent => -4,
1798 can_hover => 1,
1799 can_events => 1,
1800 max_par => $CFG->{logview_max_par},
1801 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1802 ;
1803 1883
1804 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1884 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1805 title => "Setup", 1885 title => "Setup",
1806 name => "setup_dialog", 1886 name => "setup_dialog",
1807 x => 'center', 1887 x => 'center',
… …
1811 force_h => $::HEIGHT * 0.6, 1891 force_h => $::HEIGHT * 0.6,
1812 has_close_button => 1, 1892 has_close_button => 1,
1813 ; 1893 ;
1814 1894
1815 $METASERVER = metaserver_dialog; 1895 $METASERVER = metaserver_dialog;
1896 $MESSAGE_WINDOW = new CFPlus::UI::MessageWindow;
1816 1897
1817 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1898 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1818 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1899 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1819 1900
1820 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1901 $SETUP_NOTEBOOK->add_tab (Server => $SETUP_SERVER = server_setup,
1821 "Configure the server to play on, your username, password and other server-related options."); 1902 "Configure the server to play on, your username, password and other server-related options.");
1822 $SETUP_NOTEBOOK->add (Client => client_setup, 1903 $SETUP_NOTEBOOK->add_tab (Client => client_setup,
1823 "Configure various client-specific settings."); 1904 "Configure various client-specific settings.");
1824 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1905 $SETUP_NOTEBOOK->add_tab (Graphics => graphics_setup,
1825 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1906 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1826 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1907 $SETUP_NOTEBOOK->add_tab (Audio => audio_setup,
1827 "Configure the use of audio, sound effects and background music."); 1908 "Configure the use of audio, sound effects and background music.");
1828 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1909 $SETUP_NOTEBOOK->add_tab (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
1829 "Lets you define, edit and delete key bindings." 1910 "Lets you define, edit and delete key bindings."
1830 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor " 1911 . "There is a shortcut for making bindings: <b>Control-Insert</b> opens the binding editor "
1831 . "with nothing set and the recording started. After doing the actions you " 1912 . "with nothing set and the recording started. After doing the actions you "
1832 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. " 1913 . "want to record press <b>Insert</b> and you will be asked to press a key-combo. "
1833 . "After pressing the combo the binding will be saved automatically and the " 1914 . "After pressing the combo the binding will be saved automatically and the "
1834 . "binding editor closes"); 1915 . "binding editor closes");
1835 $SETUP_NOTEBOOK->add (Debug => debug_setup, 1916 $SETUP_NOTEBOOK->add_tab (Debug => debug_setup,
1836 "Some debuggin' options. Do not ask."); 1917 "Some debuggin' options. Do not ask.");
1837 1918
1838 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top 1919 $BUTTONBAR = new CFPlus::UI::Buttonbar x => 0, y => 0, z => 200; # put on top
1839 1920
1840 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG, 1921 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Setup", other => $SETUP_DIALOG,
1841 tooltip => "Toggles a dialog where you can configure all aspects of this client."); 1922 tooltip => "Toggles a dialog where you can configure all aspects of this client.");
1842 1923
1843 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW = message_window, 1924 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Message Window", other => $MESSAGE_WINDOW,
1844 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server."); 1925 tooltip => "Toggles the server message log, where the client collects <i>all</i> messages from the server.");
1845 1926
1846 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D 1927 make_gauge_window->show; # XXX: this has to be set before make_stats_window as make_stats_window calls update_stats_window which updated the gauges also X-D
1847 1928
1848 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window, 1929 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Playerbook", other => player_window,
… …
1881 } 1962 }
1882 1963
1883 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1964 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1884} 1965}
1885 1966
1886sub setup_build_button {
1887 my ($enabled) = @_;
1888 if ($enabled) {
1889 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1890 $BUILD_BUTTON ||= new CFPlus::UI::Button
1891 text => "Build",
1892 tooltip => "Opens the ingame builder",
1893 on_activate => sub {
1894 if ($CONN) {
1895 $CONN->send_ext_req (builder_player_items => sub {
1896 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1897 });
1898 }
1899 0
1900 };
1901 $BUTTONBAR->add ($BUILD_BUTTON);
1902 } else {
1903 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1904 }
1905}
1906
1907sub open_ingame_editor {
1908 my ($msg) = @_;
1909
1910 my $win = new CFPlus::UI::Toplevel
1911 x => 0,
1912 y => 'center',
1913 z => 4,
1914 name => 'builder_window',
1915 force_w => int $WIDTH * 1/4,
1916 force_h => int $HEIGHT * 3/4,
1917 title => "In game builder",
1918 has_close_button => 1;
1919
1920 my $r = new CFPlus::UI::ScrolledWindow (
1921 expand => 1,
1922 scroll_y => 1
1923 );
1924 $r->add (my $vb = new CFPlus::UI::VBox);
1925 $win->add ($r);
1926
1927
1928 $vb->add (
1929 new CFPlus::UI::Button
1930 text => "Disable build mode",
1931 on_activate => sub { $::IN_BUILD_MODE = undef }
1932 );
1933 $vb->add (
1934 new CFPlus::UI::Button
1935 text => "ERASE",
1936 on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } }
1937 );
1938
1939 for my $itemarchname (
1940 sort {
1941 $msg->{items}->{$a}->{build_arch_name}
1942 cmp $msg->{items}->{$b}->{build_arch_name}
1943 } keys %{$msg->{items}}
1944 ) {
1945 my $info = $msg->{items}->{$itemarchname};
1946 $vb->add (
1947 new CFPlus::UI::Button text => $info->{build_arch_name},
1948 on_activate => sub {
1949 $::IN_BUILD_MODE = { item => $itemarchname, info => $info };
1950
1951 if (grep { $msg->{items}->{$itemarchname}->{$_} } qw/has_connection has_name has_text/) {
1952 build_mode_query_arch_info ();
1953 }
1954 }
1955 );
1956 }
1957
1958 $win->show;
1959}
1960
1961sub build_mode_query_arch_info {
1962 my ($iteminfo) = $::IN_BUILD_MODE;
1963 my $itemarchname = $iteminfo->{item};
1964 my $info = $iteminfo->{info};
1965
1966 my $dialog = new CFPlus::UI::Toplevel
1967 x => "center",
1968 y => "center",
1969 z => 50,
1970 force_w => int $WIDTH * 1/2,
1971 title => "Enter information for placement of '$itemarchname'",
1972 has_close_button => 1;
1973
1974 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1975
1976 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1977 my $row = 0;
1978 if ($info->{has_name}) {
1979 $table->add (0, $row, new CFPlus::UI::Label text => "Name:");
1980 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1981 }
1982 if ($info->{has_text}) {
1983 $table->add (0, $row, new CFPlus::UI::Label text => "Text:");
1984 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1985 }
1986 if ($info->{has_connection}) {
1987 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1988 $table->add (1, $row++,
1989 new CFPlus::UI::Entry
1990 expand => 1,
1991 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1992 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1993 );
1994 }
1995
1996 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1997 $hb->add (new CFPlus::UI::Button
1998 text => "Close",
1999 expand => 1,
2000 on_activate => sub { $dialog->hide; 0 },
2001 );
2002 $dialog->show;
2003}
2004
2005sub video_shutdown { 1967sub video_shutdown {
2006 CFPlus::OpenGL::shutdown; 1968 CFPlus::OpenGL::shutdown;
2007 1969
2008 undef $SDL_ACTIVE; 1970 undef $SDL_ACTIVE;
2009} 1971}
2010 1972
2011sub audio_channel_finished {
2012 my ($channel) = @_;
2013
2014 #warn "channel $channel finished\n";#d#
2015}
2016
2017sub audio_music_set {
2018 my ($songs) = @_;
2019
2020 my $count = @$songs;
2021 my @meta;
2022
2023 for my $name (@$songs) {
2024 CFPlus::DB::get resmap => $name, sub {
2025 my ($data) = @_;
2026
2027 if ($data) {
2028 $data = JSON::XS->new->utf8->decode ($data);
2029 $data->{path} = CFPlus::DB::path_of $name;
2030 push @meta, $data;
2031 }
2032
2033 unless (--$count) {
2034 if (@meta) {
2035 @MUSIC_WANT = @meta;
2036 &audio_music_changed ();
2037 }
2038 }
2039 };
2040 }
2041}
2042
2043sub audio_music_changed {
2044 return unless $CFG->{bgm_enable};
2045
2046 # default MUSIC_WANT, undef/0 == MUSIC_DEFAULT
2047 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2048
2049 # if the currently playing song is acceptable, let it continue
2050 return if $MUSIC_PLAYING
2051 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2052
2053 if ($MUSIC_PLAYING) {
2054 warn "fade out";
2055 CFPlus::MixMusic::fade_out 1500;
2056 } else {
2057 warn "new music\n";
2058
2059 my $music = $MUSIC_WANT [rand @MUSIC_WANT];
2060
2061 $MUSIC_PLAYING = $music;
2062
2063 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path};
2064 $MUSIC_PLAYER->play (0);
2065 }
2066}
2067
2068sub audio_music_finished {
2069 $MUSIC_PLAYING = undef;
2070 undef $MUSIC_PLAYER;
2071
2072 audio_music_changed;
2073}
2074
2075sub audio_init { 1973sub audio_init {
2076 if ($CFG->{audio_enable}) { 1974 if ($CFG->{audio_enable}) {
2077 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 1975 $ENV{MIX_EFFECTSMAXSPEED} = 1;
2078 $SDL_MIXER = !CFPlus::Mix_OpenAudio; 1976 $SDL_MIXER = !CFPlus::Mix_OpenAudio;
2079 1977
2080 unless ($SDL_MIXER) { 1978 unless ($SDL_MIXER) {
2081 status "Unable to open sound device: there will be no sound"; 1979 status "Unable to open sound device: there will be no sound";
2082 return; 1980 return;
2083 }
2084
2085 CFPlus::Mix_AllocateChannels 8;
2086 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
2087
2088 audio_music_finished;
2089
2090 local $_;
2091 while (<$fh>) {
2092 next if /^\s*#/;
2093 next if /^\s*$/;
2094
2095 my ($file, $volume, $event) = split /\s+/, $_, 3;
2096
2097 push @SOUNDS, "$volume,$file";
2098
2099 $AUDIO_CHUNKS{"$volume,$file"} ||= do {
2100 my $chunk = new_from_file CFPlus::MixChunk CFPlus::find_rcfile "sounds/$file";
2101 $chunk->volume ($volume * 128 / 100);
2102 $chunk
2103 };
2104 }
2105 } else {
2106 status "unable to open sound config: $!";
2107 } 1981 }
1982
1983 CFPlus::Mix_AllocateChannels 16;
1984
1985 audio_music_finished;
1986 } else {
1987 undef $SDL_MIXER;
2108 } 1988 }
2109} 1989}
2110 1990
2111sub audio_shutdown { 1991sub audio_shutdown {
2112 CFPlus::Mix_CloseAudio if $SDL_MIXER; 1992 CFPlus::Mix_CloseAudio if $SDL_MIXER;
2113 undef $SDL_MIXER; 1993 undef $SDL_MIXER;
2114 @SOUNDS = (); 1994 @SOUNDS = ();
2115 %AUDIO_CHUNKS = (); 1995 %AUDIO_CHUNK = ();
2116} 1996}
2117 1997
2118my %animate_object; 1998my %animate_object;
2119my $animate_timer; 1999my $animate_timer;
2120 2000
2121my $fps = 9; 2001my $fps = 9;
2122
2123my %demo;#d#
2124 2002
2125sub force_refresh { 2003sub force_refresh {
2126 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05; 2004 $fps = $fps * 0.95 + 1 / (($NOW - $LAST_REFRESH) || 0.1) * 0.05;
2127 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2005 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2128 2006
2129 $CFPlus::UI::ROOT->draw; 2007 $CFPlus::UI::ROOT->draw;
2130 2008
2131 $WANT_REFRESH = 0; 2009 $WANT_REFRESH = 0;
2132 $CAN_REFRESH = 0; 2010 $CAN_REFRESH = 0;
2133 $LAST_REFRESH = $NOW; 2011 $LAST_REFRESH = $NOW;
2134 2012
2135 CFPlus::SDL_GL_SwapBuffers; 2013 CFPlus::SDL_GL_SwapBuffers;
2136} 2014}
2137 2015
2138my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2016my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2139 $NOW = time; 2017 $NOW = time;
2140 2018
2141 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2019 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2142 for CFPlus::SDL_PollEvent; 2020 for CFPlus::poll_events;
2143 2021
2144 if (%animate_object) { 2022 if (%animate_object) {
2145 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2023 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2146 $WANT_REFRESH++; 2024 ++$WANT_REFRESH;
2147 } 2025 }
2148 2026
2149 if ($WANT_REFRESH) { 2027 if ($WANT_REFRESH) {
2150 force_refresh; 2028 force_refresh;
2151 } else { 2029 } else {
… …
2160 2038
2161sub animation_stop { 2039sub animation_stop {
2162 my ($widget) = @_; 2040 my ($widget) = @_;
2163 delete $animate_object{$widget}; 2041 delete $animate_object{$widget};
2164} 2042}
2165
2166# check once/second for faces that need to be prefetched
2167# this should, of course, only run on demand, but
2168# SDL forces worse things on us....
2169
2170Event->timer (after => 1, interval => 0.25, cb => sub {
2171 $CONN->face_prefetch
2172 if $CONN;
2173});
2174 2043
2175%SDL_CB = ( 2044%SDL_CB = (
2176 CFPlus::SDL_QUIT => sub { 2045 CFPlus::SDL_QUIT => sub {
2177 exit; 2046 exit;
2178 }, 2047 },
… …
2181 CFPlus::SDL_VIDEOEXPOSE => sub { 2050 CFPlus::SDL_VIDEOEXPOSE => sub {
2182 CFPlus::UI::full_refresh; 2051 CFPlus::UI::full_refresh;
2183 }, 2052 },
2184 CFPlus::SDL_ACTIVEEVENT => sub { 2053 CFPlus::SDL_ACTIVEEVENT => sub {
2185# not useful, as APPACTIVE include sonly iconified state, not unmapped 2054# not useful, as APPACTIVE include sonly iconified state, not unmapped
2186# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2055# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2056# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2187# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2057# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2188# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2058# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2189# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2059# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2190 }, 2060 },
2191 CFPlus::SDL_KEYDOWN => sub { 2061 CFPlus::SDL_KEYDOWN => sub {
… …
2221 2091
2222 CFPlus::UI::set_layout ($::CFG->{layout}); 2092 CFPlus::UI::set_layout ($::CFG->{layout});
2223 2093
2224 my %DEF_CFG = ( 2094 my %DEF_CFG = (
2225 sdl_mode => 0, 2095 sdl_mode => 0,
2226 width => 640,
2227 height => 480,
2228 fullscreen => 0, 2096 fullscreen => 0,
2229 fast => 0, 2097 fast => 0,
2230 map_scale => 1, 2098 map_scale => 1,
2231 fow_enable => 1, 2099 fow_enable => 1,
2232 fow_intensity => 0.45, 2100 fow_intensity => 0,
2233 fow_smooth => 0,
2234 map_smoothing => 1, 2101 map_smoothing => 1,
2235 gui_fontsize => 1, 2102 gui_fontsize => 1,
2236 log_fontsize => 0.7, 2103 log_fontsize => 0.7,
2237 gauge_fontsize => 1, 2104 gauge_fontsize => 1,
2238 gauge_size => 0.35, 2105 gauge_size => 0.35,
2239 stat_fontsize => 0.7, 2106 stat_fontsize => 0.7,
2240 mapsize => 100, 2107 mapsize => 100,
2241 say_command => 'chat',
2242 audio_enable => 1, 2108 audio_enable => 1,
2243 bgm_enable => 1, 2109 bgm_enable => 1,
2244 bgm_volume => 0.25, 2110 bgm_volume => 0.25,
2245 face_prefetch => 0,
2246 output_sync => 1, 2111 output_sync => 1,
2247 output_count => 1, 2112 output_count => 1,
2248 output_rate => "", 2113 output_rate => "",
2249 pickup => 0, 2114 pickup => 0,
2250 inv_sort => "mtime", 2115 inv_sort => "mtime",
… …
2272 } 2137 }
2273 } 2138 }
2274 2139
2275 sdl_init; 2140 sdl_init;
2276 2141
2277 @SDL_MODES = reverse 2142 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2278 grep $_->[0] >= 640 && $_->[1] >= 480, 2143 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2279 CFPlus::SDL_ListModes;
2280
2281 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2144 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2145
2146 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2282 2147
2283 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2148 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2284 2149
2285 { 2150 {
2286 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2151 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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