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.142 by root, Mon Mar 12 22:23:09 2007 UTC vs.
Revision 1.177 by root, Thu Jul 19 15:43: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;
… …
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;
… …
206 title => "Server Query", 235 title => "Server Query",
207 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
208 ; 237 ;
209 238
210 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
211 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
212 ellipsise => 0, 241 ellipsise => 0,
213 text => $prompt; 242 text => $prompt;
214 243
215 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
216 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
233 ); 262 );
234 263
235 $dialog->grab_focus; 264 $dialog->grab_focus;
236 265
237 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } elsif ($flags & CS_QUERY_SINGLECHAR) {
238 $dialog->{tooltip} = "#charcreation_focus";
239
240 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) {
241 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
242 269
243 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
244 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
245 ellipsise => 0, 272 ellipsise => 0,
246 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
247 274
248 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
249 276
… …
262 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
263 0 290 0
264 }, 291 },
265 ); 292 );
266 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 }
316
267 unshift @dialog, new CFPlus::UI::Label 317 unshift @dialog, new CFPlus::UI::Label
268 max_w => $::WIDTH * 0.4, 318 max_w => $::WIDTH * 0.4,
269 ellipsise => 0, 319 ellipsise => 0,
270 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
271 ; 321 ;
… …
274 if (my $stat = delete $conn->{stat_change_with}) { 324 if (my $stat = delete $conn->{stat_change_with}) {
275 $conn->send ("reply $stat"); 325 $conn->send ("reply $stat");
276 destroy_query_dialog $conn; 326 destroy_query_dialog $conn;
277 return; 327 return;
278 } 328 }
279
280 $STATS_PAGE->show;
281 $MESSAGE_WINDOW->hide;
282 329
283 unshift @dialog, new CFPlus::UI::Label 330 unshift @dialog, new CFPlus::UI::Label
284 max_w => $::WIDTH * 0.4, 331 max_w => $::WIDTH * 0.4,
285 ellipsise => 0, 332 ellipsise => 0,
286 markup => "\nOr use your keyboard and the text entry below:\n"; 333 markup => "\nOr use your keyboard and the text entry below:\n";
… …
419 statusbox => $STATUSBOX, 466 statusbox => $STATUSBOX,
420 map => $MAP, 467 map => $MAP,
421 mapmap => $MAPMAP, 468 mapmap => $MAPMAP,
422 query => \&server_query, 469 query => \&server_query,
423 470
471 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1,
473 },
474
424 sound_play => sub { 475 sound_play => sub {
425 my ($x, $y, $soundnum, $type) = @_; 476 my ($x, $y, $soundnum, $type) = @_;
426 477
427 $SDL_MIXER 478 $SDL_MIXER
428 or return; 479 or return;
… …
448 $LOGIN_BUTTON->set_text ("Login"); 499 $LOGIN_BUTTON->set_text ("Login");
449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 500 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
450 $SETUP_DIALOG->show; 501 $SETUP_DIALOG->show;
451 $PL_WINDOW->hide; 502 $PL_WINDOW->hide;
452 $SPELL_LIST->clear_spells; 503 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505
506 &audio_music_set ([]);
453 507
454 return unless $CONN; 508 return unless $CONN;
455 509
456 status "connection closed"; 510 status "connection closed";
457 511
… …
465sub graphics_setup { 519sub graphics_setup {
466 my $vbox = new CFPlus::UI::VBox; 520 my $vbox = new CFPlus::UI::VBox;
467 521
468 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 522 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
469 523
524 my $row = 0;
525
526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
527 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
528 can_events => 1,
529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
530
531 my $vidmode_tooltip =
532 "<b>Video Mode.</b> The video mode to use for fullscreen (and the window size for windowed operation). "
533 . "The format is <i>width</i> x <i>height</i> \@ <i>depth-per-channel</i> + <i>alpha-channel</i>.";
534
470 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 535 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
471 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
472 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
473 $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]); 539 force_w => $WIDTH * 0.1, expand => 1, range => [$CFG->{sdl_mode}, 0, $#SDL_MODES, 0, 1],
474 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 540 tooltip => $vidmode_tooltip);
541 $hbox->add (my $mode_label = new CFPlus::UI::Label
542 align => 0, valign => 0, height => 0.8, template => "9999x9999@9+9",
543 can_events => 1, tooltip => $vidmode_tooltip);
475 544
476 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
477 my ($self, $value) = @_; 546 my ($self, $value) = @_;
478 547
479 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
480 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
481 }); 550 });
482 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
483
484 my $row = 1;
485 552
486 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
487 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 554 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
488 state => $CFG->{fullscreen}, 555 state => $CFG->{fullscreen},
489 tooltip => "Bring the client into fullscreen mode.", 556 tooltip => "Bring the client into fullscreen mode.",
… …
495 state => $CFG->{fast}, 562 state => $CFG->{fast},
496 tooltip => "Lower the visual quality considerably to speed up rendering.", 563 tooltip => "Lower the visual quality considerably to speed up rendering.",
497 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
498 ); 565 );
499 566
567 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568 $table->add (1, $row++, new CFPlus::UI::Slider
569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
570 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572 );
573
574 $table->add (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings above.",
577 on_activate => sub {
578 video_shutdown ();
579 video_init ();
580 0
581 }
582 );
583
500 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 584 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
501 $table->add (1, $row++, new CFPlus::UI::Slider 585 $table->add (1, $row++, new CFPlus::UI::Slider
502 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
503 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
504 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 588 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
505 ); 589 );
506 590
591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing},
594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
595 . "This increases load on the graphics subsystem and works only with 2.x servers. "
596 . "Changes take effect at next connection only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 );
599
507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 600 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
508 $table->add (1, $row++, new CFPlus::UI::CheckBox 601 $table->add (1, $row++, new CFPlus::UI::CheckBox
509 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
510 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.", 603 tooltip => "<b>Fog-of-War</b> marks areas that cannot be seen by the player. Changes are instant.",
511 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
… …
514 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 607 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
515 $table->add (1, $row++, new CFPlus::UI::Slider 608 $table->add (1, $row++, new CFPlus::UI::Slider
516 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
517 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.", 610 tooltip => "<b>Fog of War Lightness.</b> The higher the intensity, the lighter the Fog-of-War color. Changes are instant.",
518 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
519 );
520
521 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
522 $table->add (1, $row++, new CFPlus::UI::CheckBox
523 state => $CFG->{fow_smooth},
524 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
525 on_changed => sub {
526 my ($self, $value) = @_;
527 $CFG->{fow_smooth} = $value;
528 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
529 0
530 }
531 );
532
533 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
534 $table->add (1, $row++, new CFPlus::UI::Slider
535 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
536 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
537 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
538 ); 612 );
539 613
540 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 614 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
541 $table->add (1, $row++, new CFPlus::UI::Slider 615 $table->add (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
… …
560 range => [$CFG->{gauge_size}, 0.2, 0.8], 634 range => [$CFG->{gauge_size}, 0.2, 0.8],
561 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 635 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
562 on_changed => sub { 636 on_changed => sub {
563 $CFG->{gauge_size} = $_[1]; 637 $CFG->{gauge_size} = $_[1];
564 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
565 0
566 }
567 );
568
569 $table->add (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings",
572 on_activate => sub {
573 video_shutdown ();
574 video_init ();
575 0 639 0
576 } 640 }
577 ); 641 );
578 642
579 $vbox 643 $vbox
… …
684 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 748 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
685 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 749 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
686 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 750 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
687 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 751 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
688 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 752 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
689 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 753 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
690
691 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
692
693 for my $x (0..2) {
694 for my $y (0 .. 2) {
695 $table->add ($x + 3, $y,
696 new CFPlus::UI::Entry
697 text => $default_smooth[$x * 3 + $y],
698 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
699 );
700 }
701 }
702 754
703 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 755 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
704 756
705 $table 757 $table
706} 758}
… …
1058 . "so only set it if you really need to prefetch images. " 1110 . "so only set it if you really need to prefetch images. "
1059 . "This option can be set and unset any time.", 1111 . "This option can be set and unset any time.",
1060 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1112 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1061 ); 1113 );
1062 1114
1063 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1115 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1064 $table->add (1, 9, new CFPlus::UI::Entry 1116 $table->add (1, 9, new CFPlus::UI::Entry
1117 text => $CFG->{output_rate},
1118 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1119 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1120 . "default will be used, which is usually around 100kb/s.",
1121 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1122 );
1123
1124 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1125 $table->add (1, 10, new CFPlus::UI::Entry
1065 text => $CFG->{output_count}, 1126 text => $CFG->{output_count},
1066 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1127 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1067 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1128 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1068 ); 1129 );
1069 1130
1070 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1131 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1071 $table->add (1, 10, new CFPlus::UI::Entry 1132 $table->add (1, 11, new CFPlus::UI::Entry
1072 text => $CFG->{output_sync}, 1133 text => $CFG->{output_sync},
1073 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1134 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1074 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1135 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1075 ); 1136 );
1076 1137
1077 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1138 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1078 expand => 1, 1139 expand => 1,
1079 align => 0, 1140 align => 0,
1080 text => "Login", 1141 text => "Login",
1081 on_activate => sub { 1142 on_activate => sub {
1082 $CONN ? stop_game 1143 $CONN ? stop_game
1083 : start_game; 1144 : start_game;
1084 0 1145 0
1085 }, 1146 },
1086 ); 1147 );
1087 1148
1149 $vbox->add (new CFPlus::UI::FancyFrame
1150 label => "Server Info",
1151 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1152 );
1153
1154 $vbox
1155}
1156
1157sub client_setup {
1158 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1159
1160 my $row = 0;
1161
1088 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1162 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1089 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1163 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1090 text => $CFG->{say_command}, 1164 text => $CFG->{say_command},
1091 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. " 1165 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. "
1092 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1166 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1093 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1167 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1094 on_changed => sub { 1168 on_changed => sub {
1095 my ($self, $value) = @_; 1169 my ($self, $value) = @_;
1096 $CFG->{say_command} = $value; 1170 $CFG->{say_command} = $value;
1097 0 1171 0
1098 } 1172 }
1099 ); 1173 );
1100 1174
1101 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1175 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1102 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1176 $table->add (1, $row++, new CFPlus::UI::CheckBox
1103 state => $CFG->{show_tips}, 1177 state => $CFG->{show_tips},
1104 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1178 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1105 on_changed => sub { 1179 on_changed => sub {
1106 my ($self, $value) = @_; 1180 my ($self, $value) = @_;
1107 $CFG->{show_tips} = $value; 1181 $CFG->{show_tips} = $value;
1108 0 1182 0
1109 } 1183 }
1110 ); 1184 );
1111 1185
1112 $vbox->add (new CFPlus::UI::FancyFrame 1186 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1113 label => "Server Info", 1187 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1114 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1188 text => $CFG->{logview_max_par},
1189 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1190 . "sends more messages than this number, older messages get removed to save memory and "
1191 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1192 on_changed => sub {
1193 my ($self, $value) = @_;
1194 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1195 0
1196 },
1115 ); 1197 );
1116 1198
1117 $vbox 1199 $table
1118} 1200}
1119 1201
1120sub message_window { 1202sub message_window {
1121 my $window = new CFPlus::UI::Toplevel 1203 my $window = new CFPlus::UI::Toplevel
1122 name => "message_window", 1204 name => "message_window",
… …
1179 1261
1180 $window 1262 $window
1181} 1263}
1182 1264
1183sub autopickup_setup { 1265sub autopickup_setup {
1266 my $r = new CFPlus::UI::ScrolledWindow (
1267 expand => 1,
1268 scroll_y => 1
1269 );
1184 my $table = new CFPlus::UI::Table; 1270 $r->add (my $table = new CFPlus::UI::Table
1271 row_expand => [0],
1272 col_expand => [0, 1, 0, 1],
1273 );
1185 1274
1186 for ( 1275 for (
1187 ["General", 0, 0, 1276 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1277 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1278 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1273 $::CONN->send_command ("pickup $::CFG->{pickup}") 1362 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN; 1363 if defined $::CONN;
1275 0 1364 0
1276 }); 1365 });
1277 1366
1278 $table 1367 $r
1279} 1368}
1280 1369
1281my %SORT_ORDER = ( 1370my %SORT_ORDER = (
1282 type => undef, 1371 type => undef,
1283 mtime => sub { 1372 mtime => sub {
… …
1362 has_close_button => 1 1451 has_close_button => 1
1363 ; 1452 ;
1364 1453
1365 my $ntb = 1454 my $ntb =
1366 $PL_NOTEBOOK = 1455 $PL_NOTEBOOK =
1367 new CFPlus::UI::Notebook expand => 1, debug => 1; 1456 new CFPlus::UI::Notebook expand => 1;
1368 1457
1369 $ntb->add ( 1458 $ntb->add (
1370 "Statistics (F2)" => $STATS_PAGE = stats_window, 1459 "Statistics (F2)" => $STATS_PAGE = stats_window,
1371 "Shows statistics, where all your Stats and Resistances are shown." 1460 "Shows statistics, where all your Stats and Resistances are shown."
1372 ); 1461 );
… …
1384 $ntb->add ( 1473 $ntb->add (
1385 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1474 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1386 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1475 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1387 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1476 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1388 ); 1477 );
1478 $ntb->add (Pickup => autopickup_setup,
1479 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1389 1480
1390 $ntb->set_current_page ($INVENTORY_PAGE); 1481 $ntb->set_current_page ($INVENTORY_PAGE);
1391 1482
1392 $plwin->add ($ntb); 1483 $plwin->add ($ntb);
1393 $plwin 1484 $plwin
… …
1559 1650
1560sub show_tip_of_the_day { 1651sub show_tip_of_the_day {
1561 # find all tips 1652 # find all tips
1562 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1653 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1563 1654
1564 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1655 CFPlus::DB::get state => "tip_of_the_day", sub {
1656 my ($todindex) = @_;
1565 $todindex = 0 if $todindex >= @tod; 1657 $todindex = 0 if $todindex >= @tod;
1566 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1658 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1567 1659
1568 # create dialog 1660 # create dialog
1569 my $dialog; 1661 my $dialog;
1570 1662
1571 my $close = sub { 1663 my $close = sub {
1572 $dialog->destroy; 1664 $dialog->destroy;
1665 };
1666
1667 $dialog = new CFPlus::UI::Toplevel
1668 x => "center",
1669 y => "center",
1670 z => 3,
1671 name => 'tip_of_the_day',
1672 force_w => int $WIDTH * 4/9,
1673 force_h => int $WIDTH * 2/9,
1674 title => "Tip of the day #" . (1 + $todindex),
1675 child => my $vbox = new CFPlus::UI::VBox,
1676 has_close_button => 1,
1677 on_delete => $close,
1678 ;
1679
1680 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1681 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1682 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1683
1684 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1685
1686 $table->add (0, 0, new CFPlus::UI::Button
1687 text => "Close",
1688 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>.",
1689 on_activate => $close,
1690 );
1691
1692 $table->add (2, 0, new CFPlus::UI::Button
1693 text => "Next",
1694 tooltip => "Show the next <b>Tip of the day</b>.",
1695 on_activate => sub {
1696 $close->();
1697 &show_tip_of_the_day;
1698 },
1699 );
1700
1701 $dialog->show;
1573 }; 1702 };
1574
1575 $dialog = new CFPlus::UI::Toplevel
1576 x => "center",
1577 y => "center",
1578 z => 3,
1579 name => 'tip_of_the_day',
1580 force_w => int $WIDTH * 4/9,
1581 force_h => int $WIDTH * 2/9,
1582 title => "Tip of the day #" . (1 + $todindex),
1583 child => my $vbox = new CFPlus::UI::VBox,
1584 has_close_button => 1,
1585 on_delete => $close,
1586 ;
1587
1588 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1589 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1590 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1591
1592 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1593
1594 $table->add (0, 0, new CFPlus::UI::Button
1595 text => "Close",
1596 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>.",
1597 on_activate => $close,
1598 );
1599
1600 $table->add (2, 0, new CFPlus::UI::Button
1601 text => "Next",
1602 tooltip => "Show the next <b>Tip of the day</b>.",
1603 on_activate => sub {
1604 $close->();
1605 &show_tip_of_the_day;
1606 },
1607 );
1608
1609 $dialog->show;
1610} 1703}
1611 1704
1612sub sdl_init { 1705sub sdl_init {
1613 CFPlus::SDL_Init 1706 CFPlus::SDL_Init
1614 and die "SDL::Init failed!\n"; 1707 and die "SDL::Init failed!\n";
1615} 1708}
1616 1709
1617sub video_init { 1710sub video_init {
1618 sdl_init;
1619
1620 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1711 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1621 1712
1622 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1713 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1623 1714
1624 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1715 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1625 $FULLSCREEN = $CFG->{fullscreen}; 1716 $FULLSCREEN = $CFG->{fullscreen};
1626 $FAST = $CFG->{fast}; 1717 $FAST = $CFG->{fast};
1627 1718
1628 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1719 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1629 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1720 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1630 1721
1631 $SDL_ACTIVE = 1; 1722 $SDL_ACTIVE = 1;
1632 $LAST_REFRESH = time - 0.01; 1723 $LAST_REFRESH = time - 0.01;
1633 1724
… …
1694 font => $FONT_FIXED, 1785 font => $FONT_FIXED,
1695 fontsize => $::CFG->{log_fontsize}, 1786 fontsize => $::CFG->{log_fontsize},
1696 indent => -4, 1787 indent => -4,
1697 can_hover => 1, 1788 can_hover => 1,
1698 can_events => 1, 1789 can_events => 1,
1790 max_par => $CFG->{logview_max_par},
1699 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1791 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1700 ; 1792 ;
1701 1793
1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1794 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1703 title => "Setup", 1795 title => "Setup",
1704 name => "setup_dialog", 1796 name => "setup_dialog",
… …
1715 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1807 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1716 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1808 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1717 1809
1718 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1810 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1719 "Configure the server to play on, your username, password and other server-related options."); 1811 "Configure the server to play on, your username, password and other server-related options.");
1720 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1812 $SETUP_NOTEBOOK->add (Client => client_setup,
1721 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1813 "Configure various client-specific settings.");
1722 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1814 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1723 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1815 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1724 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1816 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1725 "Configure the use of audio, sound effects and background music."); 1817 "Configure the use of audio, sound effects and background music.");
1726 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1818 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1904 CFPlus::OpenGL::shutdown; 1996 CFPlus::OpenGL::shutdown;
1905 1997
1906 undef $SDL_ACTIVE; 1998 undef $SDL_ACTIVE;
1907} 1999}
1908 2000
1909my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1910my $bgmusic;#TODO#hack#d#
1911
1912sub audio_channel_finished { 2001sub audio_channel_finished {
1913 my ($channel) = @_; 2002 my ($channel) = @_;
1914 2003
1915 #warn "channel $channel finished\n";#d# 2004 #warn "channel $channel finished\n";#d#
1916} 2005}
1917 2006
2007sub audio_music_set {
2008 my ($songs) = @_;
2009
2010 my @want =
2011 grep $_,
2012 map $CONN->{music_meta}{$_},
2013 @$songs;
2014
2015 if (@want) {
2016 @MUSIC_WANT = @want;
2017 &audio_music_changed ();
2018 }
2019}
2020
2021sub audio_music_start {
2022 my $path = $MUSIC_PLAYING->{path}
2023 or return;
2024
2025 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2026 # music might have changed...
2027 $path eq $MUSIC_PLAYING->{path}
2028 or return &audio_music_start ();
2029
2030 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2031
2032 my $NOW = time;
2033
2034 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2035 my $pos = $MUSIC_PLAYING->{stop_pos};
2036 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2037 $MUSIC_START = time - $pos;
2038 } else {
2039 $MUSIC_PLAYER->play (0);
2040 $MUSIC_START = time;
2041 }
2042
2043 delete $MUSIC_PLAYING->{stop_time};
2044 delete $MUSIC_PLAYING->{stop_pos};
2045 }
2046}
2047
2048sub audio_music_changed {
2049 return unless $CFG->{bgm_enable};
2050
2051 # default MUSIC_WANT == MUSIC_DEFAULT
2052 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2053
2054 # if the currently playing song is acceptable, let it continue
2055 return if $MUSIC_PLAYING
2056 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2057
2058 my $NOW = time;
2059
2060 if ($MUSIC_PLAYING) {
2061 $MUSIC_PLAYING->{stop_time} = $NOW;
2062 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2063 CFPlus::MixMusic::fade_out 1000;
2064 } else {
2065 # sort by stop time, oldest first
2066 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2067
2068 # if the most recently-played piece played very recently,
2069 # resume it, else choose the oldest piece for rotation.
2070 $MUSIC_PLAYING =
2071 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2072 ? $MUSIC_WANT[-1]
2073 : $MUSIC_WANT[0];
2074
2075 audio_music_start;
2076 }
2077}
2078
1918sub audio_music_finished { 2079sub audio_music_finished {
1919 return unless $CFG->{bgm_enable}; 2080 $MUSIC_PLAYING = undef;
2081 undef $MUSIC_PLAYER;
1920 2082
1921 # TODO: hack, do play loop and mood music 2083 audio_music_changed;
1922 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1923 $bgmusic->play (0);
1924
1925 push @bgmusic, shift @bgmusic;
1926} 2084}
1927 2085
1928sub audio_init { 2086sub audio_init {
1929 if ($CFG->{audio_enable}) { 2087 if ($CFG->{audio_enable}) {
1930 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2088 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1980 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2138 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1981 2139
1982 $CFPlus::UI::ROOT->draw; 2140 $CFPlus::UI::ROOT->draw;
1983 2141
1984 $WANT_REFRESH = 0; 2142 $WANT_REFRESH = 0;
1985 $CAN_REFRESH = 0; 2143 $CAN_REFRESH = 0;
1986 $LAST_REFRESH = $NOW; 2144 $LAST_REFRESH = $NOW;
1987 2145
1988 CFPlus::SDL_GL_SwapBuffers; 2146 CFPlus::SDL_GL_SwapBuffers;
1989} 2147}
1990 2148
1991my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2149my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1992 $NOW = time; 2150 $NOW = time;
1993 2151
1994 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2152 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1995 for CFPlus::SDL_PollEvent; 2153 for CFPlus::poll_events;
1996 2154
1997 if (%animate_object) { 2155 if (%animate_object) {
1998 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2156 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1999 $WANT_REFRESH++; 2157 ++$WANT_REFRESH;
2000 } 2158 }
2001 2159
2002 if ($WANT_REFRESH) { 2160 if ($WANT_REFRESH) {
2003 force_refresh; 2161 force_refresh;
2004 } else { 2162 } else {
… …
2025 if $CONN; 2183 if $CONN;
2026}); 2184});
2027 2185
2028%SDL_CB = ( 2186%SDL_CB = (
2029 CFPlus::SDL_QUIT => sub { 2187 CFPlus::SDL_QUIT => sub {
2030 Event::unloop -1; 2188 exit;
2031 }, 2189 },
2032 CFPlus::SDL_VIDEORESIZE => sub { 2190 CFPlus::SDL_VIDEORESIZE => sub {
2033 }, 2191 },
2034 CFPlus::SDL_VIDEOEXPOSE => sub { 2192 CFPlus::SDL_VIDEOEXPOSE => sub {
2035 CFPlus::UI::full_refresh; 2193 CFPlus::UI::full_refresh;
2036 }, 2194 },
2037 CFPlus::SDL_ACTIVEEVENT => sub { 2195 CFPlus::SDL_ACTIVEEVENT => sub {
2038# not useful, as APPACTIVE include sonly iconified state, not unmapped 2196# not useful, as APPACTIVE include sonly iconified state, not unmapped
2039# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2197# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2198# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2040# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2199# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2041# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2200# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2042# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2201# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2043 }, 2202 },
2044 CFPlus::SDL_KEYDOWN => sub { 2203 CFPlus::SDL_KEYDOWN => sub {
… …
2068 2227
2069$SIG{INT} = $SIG{TERM} = sub { exit }; 2228$SIG{INT} = $SIG{TERM} = sub { exit };
2070 2229
2071{ 2230{
2072 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2231 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2232 CFPlus::DB::Server::run;
2233
2073 CFPlus::UI::set_layout ($::CFG->{layout}); 2234 CFPlus::UI::set_layout ($::CFG->{layout});
2074 2235
2075 my %DEF_CFG = ( 2236 my %DEF_CFG = (
2076 sdl_mode => 0, 2237 sdl_mode => 0,
2077 width => 640, 2238 width => 640,
2078 height => 480, 2239 height => 480,
2079 fullscreen => 0, 2240 fullscreen => 0,
2080 fast => 0, 2241 fast => 0,
2081 map_scale => 1, 2242 map_scale => 1,
2082 fow_enable => 1, 2243 fow_enable => 1,
2083 fow_intensity => 0.45, 2244 fow_intensity => 0,
2084 fow_smooth => 0, 2245 map_smoothing => 1,
2085 gui_fontsize => 1, 2246 gui_fontsize => 1,
2086 log_fontsize => 0.7, 2247 log_fontsize => 0.7,
2087 gauge_fontsize => 1, 2248 gauge_fontsize => 1,
2088 gauge_size => 0.35, 2249 gauge_size => 0.35,
2089 stat_fontsize => 0.7, 2250 stat_fontsize => 0.7,
2090 mapsize => 100, 2251 mapsize => 100,
2091 say_command => 'chat', 2252 say_command => 'chat',
2092 audio_enable => 1, 2253 audio_enable => 1,
2093 bgm_enable => 1, 2254 bgm_enable => 1,
2094 bgm_volume => 0.25, 2255 bgm_volume => 0.25,
2095 face_prefetch => 0, 2256 face_prefetch => 0,
2096 output_sync => 1, 2257 output_sync => 1,
2097 output_count => 1, 2258 output_count => 1,
2259 output_rate => "",
2098 pickup => 0, 2260 pickup => 0,
2099 inv_sort => "mtime", 2261 inv_sort => "mtime",
2100 default => "profile", # default profile 2262 default => "profile", # default profile
2101 show_tips => 1, 2263 show_tips => 1,
2264 logview_max_par => 1000,
2102 ); 2265 );
2103 2266
2104 while (my ($k, $v) = each %DEF_CFG) { 2267 while (my ($k, $v) = each %DEF_CFG) {
2105 $CFG->{$k} = $v unless exists $CFG->{$k}; 2268 $CFG->{$k} = $v unless exists $CFG->{$k};
2106 } 2269 }
… …
2120 } 2283 }
2121 } 2284 }
2122 2285
2123 sdl_init; 2286 sdl_init;
2124 2287
2125 @SDL_MODES = reverse 2288 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2126 grep $_->[0] >= 640 && $_->[1] >= 480, 2289 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2127 CFPlus::SDL_ListModes;
2128
2129 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2290 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2291
2292 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2130 2293
2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2294 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2132 2295
2133 { 2296 {
2134 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2297 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2175 2338
2176Event::loop; 2339Event::loop;
2177#CFPlus::SDL_Quit; 2340#CFPlus::SDL_Quit;
2178#CFPlus::_exit 0; 2341#CFPlus::_exit 0;
2179 2342
2343END {
2180END { CFPlus::SDL_Quit } 2344 CFPlus::SDL_Quit;
2345 CFPlus::DB::Server::stop;
2346}
2181 2347
2182=head1 NAME 2348=head1 NAME
2183 2349
2184cfplus - A Crossfire+ and Crossfire game client 2350cfplus - A Crossfire+ and Crossfire game client
2185 2351

Diff Legend

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