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.137 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.172 by root, Tue Jul 17 16:02:14 2007 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2 2
3my $startup_done = sub { }; 3my $startup_done = sub { };
4our $PANGO = "1.5.0";
4 5
5# do splash-screen thingy on win32 6# do splash-screen thingy on win32
6BEGIN { 7BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") { 8 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) { 9 while (my ($filename, $zip) = each %PAR::LibCache) {
… …
29# do things only needed for single-binary version (par) 30# do things only needed for single-binary version (par)
30BEGIN { 31BEGIN {
31 if (%PAR::LibCache) { 32 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 33 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 34
35 my $tmp = $ENV{PAR_TEMP};
36
34 while (my ($filename, $zip) = each %PAR::LibCache) { 37 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 38 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 39 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 40 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 41 unless -e "$tmp/$1";
39 } 42 }
40 } 43 }
41 44
42 # TODO: pango-rc file, anybody? 45 if ($^O eq "MSWin32") {
46 # relocatable
47 } else {
48 # unix, need to patch pango rc file
49 open my $fh, "<:perlio", "$tmp/usr/lib/pango/$PANGO/module-files.d/libpango1.0-0.modules"
50 or die "$tmp/usr/lib/$PANGO/module-files.d/libpango1.0-0.modules: $!";
51 local $/;
52 my $rc = <$fh>;
53 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 54
44 unshift @INC, $ENV{PAR_TEMP}; 55 mkdir "$tmp/pango-modules";
56 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
57 or die "$tmp/pango-modules/pango.modules: $!";
58 print $fh $rc;
59
60 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
61 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
62 or die "$ENV{PANGO_RC_FILE}: $!";
63 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
64 }
65
66 unshift @INC, $tmp;
45 } 67 }
46} 68}
47 69
48# need to do it again because that pile of garbage called PAR nukes it before main 70# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 71unshift @INC, $ENV{PAR_TEMP}
… …
58use Compress::LZF; 80use Compress::LZF;
59 81
60use CFPlus; 82use CFPlus;
61use CFPlus::OpenGL (); 83use CFPlus::OpenGL ();
62use CFPlus::Protocol; 84use CFPlus::Protocol;
85use CFPlus::DB;
63use CFPlus::UI; 86use CFPlus::UI;
64use CFPlus::UI::Inventory; 87use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList; 88use CFPlus::UI::SpellList;
66use CFPlus::Pod; 89use CFPlus::Pod;
67use CFPlus::MapWidget; 90use CFPlus::MapWidget;
68use CFPlus::Macro; 91use CFPlus::Macro;
69 92
70$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 93$SIG{QUIT} = sub { Carp::cluck "QUIT" };
71$SIG{PIPE} = 'IGNORE'; 94$SIG{PIPE} = 'IGNORE';
72 95
73$Event::Eval = 0; 96$Event::Eval = 1;
74$Event::DIED = sub { 97$Event::DIED = sub {
75 CFPlus::fatal Carp::longmess $_[1] 98 CFPlus::fatal Carp::longmess $_[1]
76}; 99};
77 100
78my $MAX_FPS = 60; 101my $MAX_FPS = 60;
… …
136 159
137our $SDL_ACTIVE; 160our $SDL_ACTIVE;
138our %SDL_CB; 161our %SDL_CB;
139 162
140our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT;
166our $MUSIC_START;
167our $MUSIC_PLAYING;
168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
141our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
142our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
143 172
144our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
145our $STATUSBOX; 174our $STATUSBOX;
… …
176sub destroy_query_dialog { 205sub destroy_query_dialog {
177 (delete $_[0]{query_dialog})->destroy 206 (delete $_[0]{query_dialog})->destroy
178 if $_[0]{query_dialog}; 207 if $_[0]{query_dialog};
179} 208}
180 209
210# FIXME: a very ugly hack to wait for stat update look below! #d#
211our $QUERY_TIMER; #d#
212
181# server query dialog 213# server query dialog
182sub server_query { 214sub server_query {
183 my ($conn, $flags, $prompt) = @_; 215 my ($conn, $flags, $prompt) = @_;
216
217 # FIXME: a very ugly hack to wait for stat update #d#
218 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
219 unless ($QUERY_TIMER) {
220 $QUERY_TIMER =
221 Event->timer (
222 after => 1,
223 cb => sub {
224 server_query ($conn, $flags, $prompt, 1);
225 $QUERY_TIMER = undef
226 }
227 );
228 return;
229 }
230 }
184 231
185 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 232 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
186 x => "center", 233 x => "center",
187 y => "center", 234 y => "center",
188 title => "Server Query", 235 title => "Server Query",
189 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
190 ; 237 ;
191 238
192 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
193 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
194 ellipsise => 0, 241 ellipsise => 0,
195 text => $prompt; 242 text => $prompt;
196 243
197 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
198 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
215 ); 262 );
216 263
217 $dialog->grab_focus; 264 $dialog->grab_focus;
218 265
219 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } elsif ($flags & CS_QUERY_SINGLECHAR) {
220 $dialog->{tooltip} = "#charcreation_focus";
221
222 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 267 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
223 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
224 269
225 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
226 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
227 ellipsise => 0, 272 ellipsise => 0,
228 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
229 274
230 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
231 276
… …
243 $conn->send ("reply d"); 288 $conn->send ("reply d");
244 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
245 0 290 0
246 }, 291 },
247 ); 292 );
293
294 if ($conn->{chargen_race_description}) {
295 unshift @dialog, new CFPlus::UI::Label
296 max_w => $::WIDTH * 0.8,
297 ellipsise => 0,
298 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
299 ;
300 }
301
302 unshift @dialog, new CFPlus::UI::Face
303 face => $conn->{player}{face},
304 bg => [.2, .2, .2, 1],
305 min_w => 64,
306 min_h => 64,
307 ;
308
309 if ($conn->{chargen_race_title}) {
310 unshift @dialog, new CFPlus::UI::Label
311 allign => 1,
312 ellipsise => 0,
313 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
314 ;
315 }
248 316
249 unshift @dialog, new CFPlus::UI::Label 317 unshift @dialog, new CFPlus::UI::Label
250 max_w => $::WIDTH * 0.4, 318 max_w => $::WIDTH * 0.4,
251 ellipsise => 0, 319 ellipsise => 0,
252 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
401 statusbox => $STATUSBOX, 469 statusbox => $STATUSBOX,
402 map => $MAP, 470 map => $MAP,
403 mapmap => $MAPMAP, 471 mapmap => $MAPMAP,
404 query => \&server_query, 472 query => \&server_query,
405 473
474 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1,
476 },
477
406 sound_play => sub { 478 sound_play => sub {
407 my ($x, $y, $soundnum, $type) = @_; 479 my ($x, $y, $soundnum, $type) = @_;
408 480
409 $SDL_MIXER 481 $SDL_MIXER
410 or return; 482 or return;
… …
430 $LOGIN_BUTTON->set_text ("Login"); 502 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 503 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
434 $SPELL_LIST->clear_spells; 506 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508
509 &audio_music_set ([]);
435 510
436 return unless $CONN; 511 return unless $CONN;
437 512
438 status "connection closed"; 513 status "connection closed";
439 514
… …
447sub graphics_setup { 522sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 523 my $vbox = new CFPlus::UI::VBox;
449 524
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 525 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 526
527 my $row = 0;
528
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
530 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
531 can_events => 1,
532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
533
534 my $vidmode_tooltip =
535 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
536 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
537
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 538 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 539 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 540
541 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
455 $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]); 542 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
456 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 543 tooltip => $vidmode_tooltip);
544 $hbox->add (my $mode_label = new CFPlus::UI::Label
545 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
546 can_events => 1, tooltip => $vidmode_tooltip);
457 547
458 $mode_slider->connect (changed => sub { 548 $mode_slider->connect (changed => sub {
459 my ($self, $value) = @_; 549 my ($self, $value) = @_;
460 550
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 551 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 552 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
463 }); 553 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 554 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 555
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 557 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 558 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 559 tooltip => "Bring the client into fullscreen mode.",
… …
477 state => $CFG->{fast}, 565 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 566 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 567 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 568 );
481 569
570 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
571 $table->add (1, $row++, new CFPlus::UI::Slider
572 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
573 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
574 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
575 );
576
577 $table->add (1, $row++, new CFPlus::UI::Button
578 expand => 1, align => 0, text => "Apply",
579 tooltip => "Apply the video settings above.",
580 on_activate => sub {
581 video_shutdown ();
582 video_init ();
583 0
584 }
585 );
586
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 587 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
483 $table->add (1, $row++, new CFPlus::UI::Slider 588 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 589 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 590 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 591 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
592 );
593
594 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
595 $table->add (1, $row++, new CFPlus::UI::CheckBox
596 state => $CFG->{map_smoothing},
597 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
598 . "This increases load on the graphics subsystem and works only with 2.x servers. "
599 . "Changes take effect at next connection only.",
600 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
487 ); 601 );
488 602
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 603 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
490 $table->add (1, $row++, new CFPlus::UI::CheckBox 604 $table->add (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 605 state => $CFG->{fow_enable},
… …
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 624 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0 625 0
512 } 626 }
513 ); 627 );
514 628
515 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
516 $table->add (1, $row++, new CFPlus::UI::Slider
517 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
518 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
519 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
520 );
521
522 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 629 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 630 $table->add (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 631 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
525 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 632 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
526 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 633 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 649 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 650 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
544 on_changed => sub { 651 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 652 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 653 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
547 0
548 }
549 );
550
551 $table->add (1, $row++, new CFPlus::UI::Button
552 expand => 1, align => 0, text => "Apply",
553 tooltip => "Apply the video settings",
554 on_activate => sub {
555 video_shutdown ();
556 video_init ();
557 0 654 0
558 } 655 }
559 ); 656 );
560 657
561 $vbox 658 $vbox
… …
666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 763 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 764 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
668 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 765 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 766 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 767 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
671 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 768 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
672 769
673 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 770 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
674 771
675 for my $x (0..2) { 772 for my $x (0..2) {
676 for my $y (0 .. 2) { 773 for my $y (0 .. 2) {
… …
887 for 0 .. $#col; 984 for 0 .. $#col;
888 985
889 my @align = qw(1 0 1 1 -1); 986 my @align = qw(1 0 1 1 -1);
890 987
891 my $y = 0; 988 my $y = 0;
892 for my $m (
893 sort {
894 $b->{version} <=> $a->{version}
895 or $b->{users} <=> $a->{users}
896 }
897 @{ $msg->{servers} } 989 for my $m (@{ $msg->{servers} }) {
898 ) {
899 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 990 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
900 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 991 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
901 992
902 for ($desc) { 993 for ($desc) {
903 s/<br>/\n/gi; 994 s/<br>/\n/gi;
904 s/<li>/\n· /gi; 995 s/<li>/\n· /gi;
905 s/<.*?>//sgi; 996 s/<.*?>//sgi;
… …
935 max_w => $::WIDTH * 0.4, 1026 max_w => $::WIDTH * 0.4,
936 ellipsise => 0, 1027 ellipsise => 0,
937 align => $align[$_], 1028 align => $align[$_],
938 text => $m->[$_], 1029 text => $m->[$_],
939 tooltip => $tip[$_], 1030 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1031 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
941 can_hover => 1, 1032 can_hover => 1,
942 can_events => 1, 1033 can_events => 1,
943 fontsize => 0.8) 1034 fontsize => 0.8)
944 for 0 .. $#$m; 1035 for 0 .. $#$m;
945 } 1036 }
… …
1046 . "so only set it if you really need to prefetch images. " 1137 . "so only set it if you really need to prefetch images. "
1047 . "This option can be set and unset any time.", 1138 . "This option can be set and unset any time.",
1048 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1139 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1049 ); 1140 );
1050 1141
1051 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1142 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1052 $table->add (1, 9, new CFPlus::UI::Entry 1143 $table->add (1, 9, new CFPlus::UI::Entry
1144 text => $CFG->{output_rate},
1145 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1146 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1147 . "default will be used, which is usually around 100kb/s.",
1148 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1149 );
1150
1151 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1152 $table->add (1, 10, new CFPlus::UI::Entry
1053 text => $CFG->{output_count}, 1153 text => $CFG->{output_count},
1054 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1154 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1055 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1155 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1056 ); 1156 );
1057 1157
1058 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1158 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1059 $table->add (1, 10, new CFPlus::UI::Entry 1159 $table->add (1, 11, new CFPlus::UI::Entry
1060 text => $CFG->{output_sync}, 1160 text => $CFG->{output_sync},
1061 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1161 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1062 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1162 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1063 ); 1163 );
1064 1164
1065 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1165 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1066 expand => 1, 1166 expand => 1,
1067 align => 0, 1167 align => 0,
1068 text => "Login", 1168 text => "Login",
1069 on_activate => sub { 1169 on_activate => sub {
1070 $CONN ? stop_game 1170 $CONN ? stop_game
1071 : start_game; 1171 : start_game;
1072 0 1172 0
1073 }, 1173 },
1074 ); 1174 );
1075 1175
1176 $vbox->add (new CFPlus::UI::FancyFrame
1177 label => "Server Info",
1178 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1179 );
1180
1181 $vbox
1182}
1183
1184sub client_setup {
1185 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1186
1187 my $row = 0;
1188
1076 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1189 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1077 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1190 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1078 text => $CFG->{say_command}, 1191 text => $CFG->{say_command},
1079 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. " 1192 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. "
1080 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1193 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1081 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1194 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1082 on_changed => sub { 1195 on_changed => sub {
1083 my ($self, $value) = @_; 1196 my ($self, $value) = @_;
1084 $CFG->{say_command} = $value; 1197 $CFG->{say_command} = $value;
1085 0 1198 0
1086 } 1199 }
1087 ); 1200 );
1088 1201
1089 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1202 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1090 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1203 $table->add (1, $row++, new CFPlus::UI::CheckBox
1091 state => $CFG->{show_tips}, 1204 state => $CFG->{show_tips},
1092 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1205 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1093 on_changed => sub { 1206 on_changed => sub {
1094 my ($self, $value) = @_; 1207 my ($self, $value) = @_;
1095 $CFG->{show_tips} = $value; 1208 $CFG->{show_tips} = $value;
1096 0 1209 0
1097 } 1210 }
1098 ); 1211 );
1099 1212
1100 $vbox->add (new CFPlus::UI::FancyFrame 1213 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1101 label => "Server Info", 1214 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1102 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1215 text => $CFG->{logview_max_par},
1216 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1217 . "sends more messages than this number, older messages get removed to save memory and "
1218 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1219 on_changed => sub {
1220 my ($self, $value) = @_;
1221 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1222 0
1223 },
1103 ); 1224 );
1104 1225
1105 $vbox 1226 $table
1106} 1227}
1107 1228
1108sub message_window { 1229sub message_window {
1109 my $window = new CFPlus::UI::Toplevel 1230 my $window = new CFPlus::UI::Toplevel
1110 name => "message_window", 1231 name => "message_window",
… …
1167 1288
1168 $window 1289 $window
1169} 1290}
1170 1291
1171sub autopickup_setup { 1292sub autopickup_setup {
1293 my $r = new CFPlus::UI::ScrolledWindow (
1294 expand => 1,
1295 scroll_y => 1
1296 );
1172 my $table = new CFPlus::UI::Table; 1297 $r->add (my $table = new CFPlus::UI::Table
1298 row_expand => [0],
1299 col_expand => [0, 1, 0, 1],
1300 );
1173 1301
1174 for ( 1302 for (
1175 ["General", 0, 0, 1303 ["General", 0, 0,
1176 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1304 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1177 ["Inhibit autopickup" => PICKUP_INHIBIT], 1305 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1261 $::CONN->send_command ("pickup $::CFG->{pickup}") 1389 $::CONN->send_command ("pickup $::CFG->{pickup}")
1262 if defined $::CONN; 1390 if defined $::CONN;
1263 0 1391 0
1264 }); 1392 });
1265 1393
1266 $table 1394 $r
1267} 1395}
1268 1396
1269my %SORT_ORDER = ( 1397my %SORT_ORDER = (
1270 type => undef, 1398 type => undef,
1271 mtime => sub { 1399 mtime => sub {
… …
1350 has_close_button => 1 1478 has_close_button => 1
1351 ; 1479 ;
1352 1480
1353 my $ntb = 1481 my $ntb =
1354 $PL_NOTEBOOK = 1482 $PL_NOTEBOOK =
1355 new CFPlus::UI::Notebook expand => 1, debug => 1; 1483 new CFPlus::UI::Notebook expand => 1;
1356 1484
1357 $ntb->add ( 1485 $ntb->add (
1358 "Statistics (F2)" => $STATS_PAGE = stats_window, 1486 "Statistics (F2)" => $STATS_PAGE = stats_window,
1359 "Shows statistics, where all your Stats and Resistances are shown." 1487 "Shows statistics, where all your Stats and Resistances are shown."
1360 ); 1488 );
… …
1372 $ntb->add ( 1500 $ntb->add (
1373 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1501 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1374 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1502 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1375 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1503 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1376 ); 1504 );
1505 $ntb->add (Pickup => autopickup_setup,
1506 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1377 1507
1378 $ntb->set_current_page ($INVENTORY_PAGE); 1508 $ntb->set_current_page ($INVENTORY_PAGE);
1379 1509
1380 $plwin->add ($ntb); 1510 $plwin->add ($ntb);
1381 $plwin 1511 $plwin
… …
1547 1677
1548sub show_tip_of_the_day { 1678sub show_tip_of_the_day {
1549 # find all tips 1679 # find all tips
1550 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1680 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1551 1681
1552 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1682 CFPlus::DB::get state => "tip_of_the_day", sub {
1683 my ($todindex) = @_;
1553 $todindex = 0 if $todindex >= @tod; 1684 $todindex = 0 if $todindex >= @tod;
1554 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1685 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1555 1686
1556 # create dialog 1687 # create dialog
1557 my $dialog; 1688 my $dialog;
1558 1689
1559 my $close = sub { 1690 my $close = sub {
1560 $dialog->destroy; 1691 $dialog->destroy;
1692 };
1693
1694 $dialog = new CFPlus::UI::Toplevel
1695 x => "center",
1696 y => "center",
1697 z => 3,
1698 name => 'tip_of_the_day',
1699 force_w => int $WIDTH * 4/9,
1700 force_h => int $WIDTH * 2/9,
1701 title => "Tip of the day #" . (1 + $todindex),
1702 child => my $vbox = new CFPlus::UI::VBox,
1703 has_close_button => 1,
1704 on_delete => $close,
1705 ;
1706
1707 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1708 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1709 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1710
1711 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1712
1713 $table->add (0, 0, new CFPlus::UI::Button
1714 text => "Close",
1715 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>.",
1716 on_activate => $close,
1717 );
1718
1719 $table->add (2, 0, new CFPlus::UI::Button
1720 text => "Next",
1721 tooltip => "Show the next <b>Tip of the day</b>.",
1722 on_activate => sub {
1723 $close->();
1724 &show_tip_of_the_day;
1725 },
1726 );
1727
1728 $dialog->show;
1561 }; 1729 };
1562
1563 $dialog = new CFPlus::UI::Toplevel
1564 x => "center",
1565 y => "center",
1566 z => 3,
1567 name => 'tip_of_the_day',
1568 force_w => int $WIDTH * 4/9,
1569 force_h => int $WIDTH * 2/9,
1570 title => "Tip of the day #" . (1 + $todindex),
1571 child => my $vbox = new CFPlus::UI::VBox,
1572 has_close_button => 1,
1573 on_delete => $close,
1574 ;
1575
1576 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1577 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1578 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1579
1580 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1581
1582 $table->add (0, 0, new CFPlus::UI::Button
1583 text => "Close",
1584 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>.",
1585 on_activate => $close,
1586 );
1587
1588 $table->add (2, 0, new CFPlus::UI::Button
1589 text => "Next",
1590 tooltip => "Show the next <b>Tip of the day</b>.",
1591 on_activate => sub {
1592 $close->();
1593 &show_tip_of_the_day;
1594 },
1595 );
1596
1597 $dialog->show;
1598} 1730}
1599 1731
1600sub sdl_init { 1732sub sdl_init {
1601 CFPlus::SDL_Init 1733 CFPlus::SDL_Init
1602 and die "SDL::Init failed!\n"; 1734 and die "SDL::Init failed!\n";
1603} 1735}
1604 1736
1605sub video_init { 1737sub video_init {
1606 sdl_init;
1607
1608 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1738 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1609 1739
1610 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1740 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1611 1741
1612 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1742 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1613 $FULLSCREEN = $CFG->{fullscreen}; 1743 $FULLSCREEN = $CFG->{fullscreen};
1614 $FAST = $CFG->{fast}; 1744 $FAST = $CFG->{fast};
1615 1745
1616 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1746 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1617 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1747 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1618 1748
1619 $SDL_ACTIVE = 1; 1749 $SDL_ACTIVE = 1;
1620 $LAST_REFRESH = time - 0.01; 1750 $LAST_REFRESH = time - 0.01;
1621 1751
… …
1682 font => $FONT_FIXED, 1812 font => $FONT_FIXED,
1683 fontsize => $::CFG->{log_fontsize}, 1813 fontsize => $::CFG->{log_fontsize},
1684 indent => -4, 1814 indent => -4,
1685 can_hover => 1, 1815 can_hover => 1,
1686 can_events => 1, 1816 can_events => 1,
1817 max_par => $CFG->{logview_max_par},
1687 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1818 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1688 ; 1819 ;
1689 1820
1690 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1821 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1691 title => "Setup", 1822 title => "Setup",
1692 name => "setup_dialog", 1823 name => "setup_dialog",
… …
1703 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1834 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1704 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1835 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1705 1836
1706 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1837 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1707 "Configure the server to play on, your username, password and other server-related options."); 1838 "Configure the server to play on, your username, password and other server-related options.");
1708 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1839 $SETUP_NOTEBOOK->add (Client => client_setup,
1709 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1840 "Configure various client-specific settings.");
1710 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1841 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1711 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1842 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1712 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1843 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1713 "Configure the use of audio, sound effects and background music."); 1844 "Configure the use of audio, sound effects and background music.");
1714 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1845 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1770} 1901}
1771 1902
1772sub setup_build_button { 1903sub setup_build_button {
1773 my ($enabled) = @_; 1904 my ($enabled) = @_;
1774 if ($enabled) { 1905 if ($enabled) {
1906 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1775 $BUILD_BUTTON ||= new CFPlus::UI::Button 1907 $BUILD_BUTTON ||= new CFPlus::UI::Button
1776 text => "Build", 1908 text => "Build",
1777 tooltip => "Opens the ingame builder", 1909 tooltip => "Opens the ingame builder",
1778 on_activate => sub { 1910 on_activate => sub {
1779 if ($CONN) { 1911 if ($CONN) {
… …
1891 CFPlus::OpenGL::shutdown; 2023 CFPlus::OpenGL::shutdown;
1892 2024
1893 undef $SDL_ACTIVE; 2025 undef $SDL_ACTIVE;
1894} 2026}
1895 2027
1896my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1897my $bgmusic;#TODO#hack#d#
1898
1899sub audio_channel_finished { 2028sub audio_channel_finished {
1900 my ($channel) = @_; 2029 my ($channel) = @_;
1901 2030
1902 #warn "channel $channel finished\n";#d# 2031 #warn "channel $channel finished\n";#d#
1903} 2032}
1904 2033
2034sub audio_music_set {
2035 my ($songs) = @_;
2036
2037 my @want =
2038 grep $_,
2039 map $CONN->{music_meta}{$_},
2040 @$songs;
2041
2042 if (@want) {
2043 @MUSIC_WANT = @want;
2044 &audio_music_changed ();
2045 }
2046}
2047
2048sub audio_music_start {
2049 my $path = $MUSIC_PLAYING->{path}
2050 or return;
2051
2052 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2053 # music might have changed...
2054 $path eq $MUSIC_PLAYING->{path}
2055 or return &audio_music_start ();
2056
2057 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2058
2059 my $NOW = time;
2060
2061 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2062 my $pos = $MUSIC_PLAYING->{stop_pos};
2063 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2064 $MUSIC_START = time - $pos;
2065 } else {
2066 $MUSIC_PLAYER->play (0);
2067 $MUSIC_START = time;
2068 }
2069
2070 delete $MUSIC_PLAYING->{stop_time};
2071 delete $MUSIC_PLAYING->{stop_pos};
2072 }
2073}
2074
2075sub audio_music_changed {
2076 return unless $CFG->{bgm_enable};
2077
2078 # default MUSIC_WANT == MUSIC_DEFAULT
2079 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2080
2081 # if the currently playing song is acceptable, let it continue
2082 return if $MUSIC_PLAYING
2083 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2084
2085 my $NOW = time;
2086
2087 if ($MUSIC_PLAYING) {
2088 $MUSIC_PLAYING->{stop_time} = $NOW;
2089 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2090 CFPlus::MixMusic::fade_out 1000;
2091 } else {
2092 # sort by stop time, oldest first
2093 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2094
2095 # if the most recently-played piece played very recently,
2096 # resume it, else choose the oldest piece for rotation.
2097 $MUSIC_PLAYING =
2098 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2099 ? $MUSIC_WANT[-1]
2100 : $MUSIC_WANT[0];
2101
2102 audio_music_start;
2103 }
2104}
2105
1905sub audio_music_finished { 2106sub audio_music_finished {
1906 return unless $CFG->{bgm_enable}; 2107 $MUSIC_PLAYING = undef;
2108 undef $MUSIC_PLAYER;
1907 2109
1908 # TODO: hack, do play loop and mood music 2110 audio_music_changed;
1909 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1910 $bgmusic->play (0);
1911
1912 push @bgmusic, shift @bgmusic;
1913} 2111}
1914 2112
1915sub audio_init { 2113sub audio_init {
1916 if ($CFG->{audio_enable}) { 2114 if ($CFG->{audio_enable}) {
1917 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2115 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1977 2175
1978my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2176my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1979 $NOW = time; 2177 $NOW = time;
1980 2178
1981 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2179 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1982 for CFPlus::SDL_PollEvent; 2180 for CFPlus::poll_events;
1983 2181
1984 if (%animate_object) { 2182 if (%animate_object) {
1985 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2183 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1986 $WANT_REFRESH++; 2184 $WANT_REFRESH++;
1987 } 2185 }
… …
2012 if $CONN; 2210 if $CONN;
2013}); 2211});
2014 2212
2015%SDL_CB = ( 2213%SDL_CB = (
2016 CFPlus::SDL_QUIT => sub { 2214 CFPlus::SDL_QUIT => sub {
2017 Event::unloop -1; 2215 exit;
2018 }, 2216 },
2019 CFPlus::SDL_VIDEORESIZE => sub { 2217 CFPlus::SDL_VIDEORESIZE => sub {
2020 }, 2218 },
2021 CFPlus::SDL_VIDEOEXPOSE => sub { 2219 CFPlus::SDL_VIDEOEXPOSE => sub {
2022 CFPlus::UI::full_refresh; 2220 CFPlus::UI::full_refresh;
2023 }, 2221 },
2024 CFPlus::SDL_ACTIVEEVENT => sub { 2222 CFPlus::SDL_ACTIVEEVENT => sub {
2025# not useful, as APPACTIVE include sonly iconified state, not unmapped 2223# not useful, as APPACTIVE include sonly iconified state, not unmapped
2026# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2224# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2225# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2027# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2226# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2028# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2227# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2029# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2228# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2030 }, 2229 },
2031 CFPlus::SDL_KEYDOWN => sub { 2230 CFPlus::SDL_KEYDOWN => sub {
… …
2055 2254
2056$SIG{INT} = $SIG{TERM} = sub { exit }; 2255$SIG{INT} = $SIG{TERM} = sub { exit };
2057 2256
2058{ 2257{
2059 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2258 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2259 CFPlus::DB::Server::run;
2260
2060 CFPlus::UI::set_layout ($::CFG->{layout}); 2261 CFPlus::UI::set_layout ($::CFG->{layout});
2061 2262
2062 my %DEF_CFG = ( 2263 my %DEF_CFG = (
2063 sdl_mode => 0, 2264 sdl_mode => 0,
2064 width => 640, 2265 width => 640,
2065 height => 480, 2266 height => 480,
2066 fullscreen => 0, 2267 fullscreen => 0,
2067 fast => 0, 2268 fast => 0,
2068 map_scale => 1, 2269 map_scale => 1,
2069 fow_enable => 1, 2270 fow_enable => 1,
2070 fow_intensity => 0.45, 2271 fow_intensity => 0.45,
2071 fow_smooth => 0, 2272 fow_smooth => 0,
2273 map_smoothing => 1,
2072 gui_fontsize => 1, 2274 gui_fontsize => 1,
2073 log_fontsize => 0.7, 2275 log_fontsize => 0.7,
2074 gauge_fontsize => 1, 2276 gauge_fontsize => 1,
2075 gauge_size => 0.35, 2277 gauge_size => 0.35,
2076 stat_fontsize => 0.7, 2278 stat_fontsize => 0.7,
2077 mapsize => 100, 2279 mapsize => 100,
2078 say_command => 'chat', 2280 say_command => 'chat',
2079 audio_enable => 1, 2281 audio_enable => 1,
2080 bgm_enable => 1, 2282 bgm_enable => 1,
2081 bgm_volume => 0.25, 2283 bgm_volume => 0.25,
2082 face_prefetch => 0, 2284 face_prefetch => 0,
2083 output_sync => 1, 2285 output_sync => 1,
2084 output_count => 1, 2286 output_count => 1,
2287 output_rate => "",
2085 pickup => 0, 2288 pickup => 0,
2086 inv_sort => "mtime", 2289 inv_sort => "mtime",
2087 default => "profile", # default profile 2290 default => "profile", # default profile
2088 show_tips => 1, 2291 show_tips => 1,
2292 logview_max_par => 1000,
2089 ); 2293 );
2090 2294
2091 while (my ($k, $v) = each %DEF_CFG) { 2295 while (my ($k, $v) = each %DEF_CFG) {
2092 $CFG->{$k} = $v unless exists $CFG->{$k}; 2296 $CFG->{$k} = $v unless exists $CFG->{$k};
2093 } 2297 }
… …
2107 } 2311 }
2108 } 2312 }
2109 2313
2110 sdl_init; 2314 sdl_init;
2111 2315
2112 @SDL_MODES = reverse 2316 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2113 grep $_->[0] >= 640 && $_->[1] >= 480, 2317 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2114 CFPlus::SDL_ListModes;
2115
2116 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2318 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2117 2319
2118 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2320 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2119 2321
2120 { 2322 {
… …
2158 audio_init; 2360 audio_init;
2159} 2361}
2160 2362
2161show_tip_of_the_day if $CFG->{show_tips}; 2363show_tip_of_the_day if $CFG->{show_tips};
2162 2364
2163#CFPlus::Macro::quick_macro ["test"];#d#
2164Event::loop; 2365Event::loop;
2165#CFPlus::SDL_Quit; 2366#CFPlus::SDL_Quit;
2166#CFPlus::_exit 0; 2367#CFPlus::_exit 0;
2167 2368
2369END {
2168END { CFPlus::SDL_Quit } 2370 CFPlus::SDL_Quit;
2371 CFPlus::DB::Server::stop;
2372}
2169 2373
2170=head1 NAME 2374=head1 NAME
2171 2375
2172cfplus - A Crossfire+ and Crossfire game client 2376cfplus - A Crossfire+ and Crossfire game client
2173 2377

Diff Legend

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