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.180 by root, Sat Jul 21 13:37:09 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
250 $table->add (0, 0, new CFPlus::UI::Button 277 $table->add_at (0, 0, new CFPlus::UI::Button
251 text => "Next Race", 278 text => "Next Race",
252 on_activate => sub { 279 on_activate => sub {
253 $conn->send ("reply n"); 280 $conn->send ("reply n");
254 destroy_query_dialog $conn; 281 destroy_query_dialog $conn;
255 0 282 0
256 }, 283 },
257 ); 284 );
258 $table->add (2, 0, new CFPlus::UI::Button 285 $table->add_at (2, 0, new CFPlus::UI::Button
259 text => "Accept", 286 text => "Accept",
260 on_activate => sub { 287 on_activate => sub {
261 $conn->send ("reply d"); 288 $conn->send ("reply d");
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 ;
… …
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 329
280 $STATS_PAGE->show;
281 $MESSAGE_WINDOW->hide;
282
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";
287 334
288 unshift @dialog, my $table = new CFPlus::UI::Table; 335 unshift @dialog, my $table = new CFPlus::UI::Table;
289 336
290 # left: re-roll 337 # left: re-roll
291 $table->add (0, 0, new CFPlus::UI::Button 338 $table->add_at (0, 0, new CFPlus::UI::Button
292 text => "Roll Again", 339 text => "Roll Again",
293 on_activate => sub { 340 on_activate => sub {
294 $conn->send ("reply y"); 341 $conn->send ("reply y");
295 destroy_query_dialog $conn; 342 destroy_query_dialog $conn;
296 0 343 0
… …
310 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 357 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
311 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 358 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
312 ], 359 ],
313 ), 1 .. 2; 360 ), 1 .. 2;
314 361
315 $table->add (2, 0, new CFPlus::UI::Button 362 $table->add_at (2, 0, new CFPlus::UI::Button
316 text => "Swap Stats", 363 text => "Swap Stats",
317 on_activate => sub { 364 on_activate => sub {
318 $conn->{stat_change_with} = $sw2->{value}; 365 $conn->{stat_change_with} = $sw2->{value};
319 $conn->send ("reply $sw1->{value}"); 366 $conn->send ("reply $sw1->{value}");
320 destroy_query_dialog $conn; 367 destroy_query_dialog $conn;
321 0 368 0
322 }, 369 },
323 ); 370 );
324 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 371 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
325 372
326 # right: accept 373 # right: accept
327 $table->add (4, 0, new CFPlus::UI::Button 374 $table->add_at (4, 0, new CFPlus::UI::Button
328 text => "Accept", 375 text => "Accept",
329 on_activate => sub { 376 on_activate => sub {
330 $conn->send ("reply n"); 377 $conn->send ("reply n");
331 $STATS_PAGE->hide; 378 $STATS_PAGE->hide;
332 destroy_query_dialog $conn; 379 destroy_query_dialog $conn;
… …
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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
527 $table->add_at (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_at (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_at (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 552
484 my $row = 1;
485
486 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 553 $table->add_at (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_at (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.",
490 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
491 ); 558 );
492 559
493 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly"); 560 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fast & Ugly");
494 $table->add (1, $row++, new CFPlus::UI::CheckBox 561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568 $table->add_at (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_at (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_at (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_at (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_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add_at (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_at (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_at (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 }
512 ); 605 );
513 606
514 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 607 $table->add_at (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_at (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 ); 612 );
520 613
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 );
539
540 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 614 $table->add_at (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_at (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],
543 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 617 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
544 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
545 ); 619 );
546 620
547 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize"); 621 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge fontsize");
548 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add_at (1, $row++, new CFPlus::UI::Slider
549 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
550 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.", 624 tooltip => "Adjusts the fontsize of the gauges at the bottom right. Changes are instant.",
551 on_changed => sub { 625 on_changed => sub {
552 $CFG->{gauge_fontsize} = $_[1]; 626 $CFG->{gauge_fontsize} = $_[1];
553 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
554 0 628 0
555 } 629 }
556 ); 630 );
557 631
558 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size"); 632 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Gauge size");
559 $table->add (1, $row++, new CFPlus::UI::Slider 633 $table->add_at (1, $row++, new CFPlus::UI::Slider
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 639 0
566 } 640 }
567 ); 641 );
568 642
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
576 }
577 );
578
579 $vbox 643 $vbox
580} 644}
581 645
582sub audio_setup { 646sub audio_setup {
583 my $vbox = new CFPlus::UI::VBox; 647 my $vbox = new CFPlus::UI::VBox;
584 648
585 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 649 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
586 650
587 my $row = 0; 651 my $row = 0;
588 652
589 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable"); 653 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Audio Enable");
590 $table->add (1, $row++, new CFPlus::UI::CheckBox 654 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
591 state => $CFG->{audio_enable}, 655 state => $CFG->{audio_enable},
592 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.", 656 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.",
593 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
594 ); 658 );
595# $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume"); 659# $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Effects Volume");
596# $table->add (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub { 660# $table->add_at (1, 8, new CFPlus::UI::Slider range => [$CFG->{effects_volume}, 0, 128, 1], on_changed => sub {
597# $CFG->{effects_volume} = $_[1]; 661# $CFG->{effects_volume} = $_[1];
598# }); 662# });
599 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music"); 663 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Background Music");
600 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 664 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
601 $hbox->add (new CFPlus::UI::CheckBox 665 $hbox->add (new CFPlus::UI::CheckBox
602 expand => 1, state => $CFG->{bgm_enable}, 666 expand => 1, state => $CFG->{bgm_enable},
603 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.", 667 tooltip => "If enabled, playing of background music is enabled. If disabled, no background music will be played.",
604 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
605 ); 669 );
… …
607 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
608 tooltip => "The volume of the background music. Changes are instant.", 672 tooltip => "The volume of the background music. Changes are instant.",
609 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 } 673 on_changed => sub { $CFG->{bgm_volume} = $_[1]; CFPlus::MixMusic::volume $_[1] * 128; 0 }
610 ); 674 );
611 675
612 $table->add (1, $row++, new CFPlus::UI::Button 676 $table->add_at (1, $row++, new CFPlus::UI::Button
613 expand => 1, align => 0, text => "Apply", 677 expand => 1, align => 0, text => "Apply",
614 tooltip => "Apply the audio settings", 678 tooltip => "Apply the audio settings",
615 on_activate => sub { 679 on_activate => sub {
616 audio_shutdown (); 680 audio_shutdown ();
617 audio_init (); 681 audio_init ();
… …
676} 740}
677 741
678sub debug_setup { 742sub debug_setup {
679 my $table = new CFPlus::UI::Table; 743 my $table = new CFPlus::UI::Table;
680 744
681 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 745 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
682 $table->add (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 }); 746 $table->add_at (1, 0, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 1; 0 });
683 $table->add (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info"); 747 $table->add_at (0, 1, new CFPlus::UI::Label text => "Tooltip Widget Info");
684 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 748 $table->add_at (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_at (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_at (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_at (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_at (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_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
690 754
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
703 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 755 $table->add_at (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
756
757 $table->add_at (7,7, my $t = new CFPlus::UI::Table);
758 $t->add_at (0,0, new CFPlus::UI::Label text => "a a a a", rowspan => 1, colspan => 2);
759 $t->add_at (2,0, new CFPlus::UI::Label text => "b\nb", rowspan => 2, colspan => 1);
760 $t->add_at (1,2, new CFPlus::UI::Label text => "c c c c", rowspan => 1, colspan => 2);
761 $t->add_at (0,1, new CFPlus::UI::Label text => "d\nd", rowspan => 2, colspan => 1);
762 $t->add_at (1,1, new CFPlus::UI::Label text => "e");
704 763
705 $table 764 $table
706} 765}
707 766
708sub stats_window { 767sub stats_window {
… …
756 [2, 4, st_spd => "Spd", 10.54], 815 [2, 4, st_spd => "Spd", 10.54],
757 [2, 5, st_wspd => "WSp", 10.54], 816 [2, 5, st_wspd => "WSp", 10.54],
758 ) { 817 ) {
759 my ($col, $row, $id, $label, $template) = @$_; 818 my ($col, $row, $id, $label, $template) = @$_;
760 819
761 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 820 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
762 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 821 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
763 align => +1, template => $template, tooltip => "#stat_$label"); 822 align => +1, template => $template, tooltip => "#stat_$label");
764 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 823 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
765 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 824 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
766 align => -1, text => $label, tooltip => "#stat_$label"); 825 align => -1, text => $label, tooltip => "#stat_$label");
767 } 826 }
768 827
769 $vb->add (new CFPlus::UI::FancyFrame 828 $vb->add (new CFPlus::UI::FancyFrame
… …
810 cold => ["Cold", 869 cold => ["Cold",
811 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 870 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
812 ghit => ["Ghost hit", 871 ghit => ["Ghost hit",
813 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 872 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
814 ); 873 );
874
815 for (qw/slow holyw conf fire depl magic 875 for (qw/slow holyw conf fire depl magic
816 drain acid pois para deat phys 876 drain acid pois para deat phys
817 blind fear tund elec cold ghit/) 877 blind fear tund elec cold ghit/)
818 { 878 {
819 $tbl2->add ($col, $row, 879 $tbl2->add_at ($col, $row,
820 $STATWIDS->{"res_$_"} = 880 $STATWIDS->{"res_$_"} =
821 new CFPlus::UI::Label 881 new CFPlus::UI::Label
822 font => $FONT_FIXED, 882 font => $FONT_FIXED,
823 template => "-100%", 883 template => "-100%",
824 align => +1, 884 align => +1,
825 valign => 0, 885 valign => 0,
826 can_events => 1, 886 can_events => 1,
827 can_hover => 1, 887 can_hover => 1,
828 tooltip => $resist_names{$_}->[1], 888 tooltip => $resist_names{$_}->[1],
829 ); 889 );
830 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 890 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
831 font => $FONT_FIXED, 891 font => $FONT_FIXED,
832 can_hover => 1, 892 can_hover => 1,
833 can_events => 1, 893 can_events => 1,
834 path => "ui/resist/resist_$_.png", 894 path => "ui/resist/resist_$_.png",
835 tooltip => $resist_names{$_}->[1], 895 tooltip => $resist_names{$_}->[1],
836 ); 896 );
837 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 897 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
838 text => $resist_names{$_}->[0], 898 text => $resist_names{$_}->[0],
839 font => $FONT_FIXED, 899 font => $FONT_FIXED,
840 can_hover => 1, 900 can_hover => 1,
841 can_events => 1, 901 can_events => 1,
842 tooltip => $resist_names{$_}->[1], 902 tooltip => $resist_names{$_}->[1],
… …
875 return if $METASERVER_ATIME > time; 935 return if $METASERVER_ATIME > time;
876 $METASERVER_ATIME = time + 60; 936 $METASERVER_ATIME = time + 60;
877 937
878 my $table = $METASERVER->{table}; 938 my $table = $METASERVER->{table};
879 $table->clear; 939 $table->clear;
880 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 940 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
881 941
882 my $ok = 0; 942 my $ok = 0;
883 943
884 CFPlus::background { 944 CFPlus::background {
885 my $ua = CFPlus::lwp_useragent; 945 my $ua = CFPlus::lwp_useragent;
… …
896 "The time this server has been running without being restarted.", 956 "The time this server has been running without being restarted.",
897 "The server software version - a '+' indicates a Crossfire+ server.", 957 "The server software version - a '+' indicates a Crossfire+ server.",
898 "Short information about this server provided by its admins.", 958 "Short information about this server provided by its admins.",
899 ); 959 );
900 my @col = qw(#Users Host Uptime Version Description); 960 my @col = qw(#Users Host Uptime Version Description);
901 $table->add ($_, 0, new CFPlus::UI::Label 961 $table->add_at ($_, 0, new CFPlus::UI::Label
902 can_hover => 1, can_events => 1, 962 can_hover => 1, can_events => 1,
903 align => 0, fg => [1, 1, 0], 963 align => 0, fg => [1, 1, 0],
904 text => $col[$_], tooltip => $tip[$_]) 964 text => $col[$_], tooltip => $tip[$_])
905 for 0 .. $#col; 965 for 0 .. $#col;
906 966
… …
928 988
929 $m = [$users, $host, $uptime, $version, $desc]; 989 $m = [$users, $host, $uptime, $version, $desc];
930 990
931 $y++; 991 $y++;
932 992
933 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 993 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
934 (new CFPlus::UI::Button 994 (new CFPlus::UI::Button
935 text => "Use", 995 text => "Use",
936 tooltip => "Put this server into the <b>Host:Port</b> field", 996 tooltip => "Put this server into the <b>Host:Port</b> field",
937 on_activate => sub { 997 on_activate => sub {
938 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 998 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
941 }, 1001 },
942 ), 1002 ),
943 (new CFPlus::UI::Empty expand => 1), 1003 (new CFPlus::UI::Empty expand => 1),
944 ]); 1004 ]);
945 1005
946 $table->add ($_, $y, new CFPlus::UI::Label 1006 $table->add_at ($_, $y, new CFPlus::UI::Label
947 max_w => $::WIDTH * 0.4, 1007 max_w => $::WIDTH * 0.4,
948 ellipsise => 0, 1008 ellipsise => 0,
949 align => $align[$_], 1009 align => $align[$_],
950 text => $m->[$_], 1010 text => $m->[$_],
951 tooltip => $tip[$_], 1011 tooltip => $tip[$_],
… …
992 1052
993 $vbox->add (new CFPlus::UI::FancyFrame 1053 $vbox->add (new CFPlus::UI::FancyFrame
994 label => "Connection Settings", 1054 label => "Connection Settings",
995 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1055 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
996 ); 1056 );
997 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1057 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
998 1058
999 { 1059 {
1000 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1060 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1001 1061
1002 $vbox->add ( 1062 $vbox->add (
1003 $HOST_ENTRY = new CFPlus::UI::Entry 1063 $HOST_ENTRY = new CFPlus::UI::Entry
1004 expand => 1, 1064 expand => 1,
1005 text => $CFG->{profile}{default}{host}, 1065 text => $CFG->{profile}{default}{host},
… …
1019 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1079 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1020 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1080 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1021 ); 1081 );
1022 } 1082 }
1023 1083
1024 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1084 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1025 $table->add (1, 4, new CFPlus::UI::Entry 1085 $table->add_at (1, 4, new CFPlus::UI::Entry
1026 text => $CFG->{profile}{default}{user}, 1086 text => $CFG->{profile}{default}{user},
1027 tooltip => "The name of your character on the server", 1087 tooltip => "The name of your character on the server",
1028 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1088 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1029 ); 1089 );
1030 1090
1031 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1091 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1032 $table->add (1, 5, new CFPlus::UI::Entry 1092 $table->add_at (1, 5, new CFPlus::UI::Entry
1033 text => $CFG->{profile}{default}{password}, 1093 text => $CFG->{profile}{default}{password},
1034 hidden => 1, 1094 hidden => 1,
1035 tooltip => "The password for your character", 1095 tooltip => "The password for your character",
1036 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1096 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1037 ); 1097 );
1038 1098
1039 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1099 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1040 $table->add (1, 7, new CFPlus::UI::Slider 1100 $table->add_at (1, 7, new CFPlus::UI::Slider
1041 force_w => 100, 1101 force_w => 100,
1042 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1102 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1043 tooltip => "This is the size of the portion of the map update the server sends you. " 1103 tooltip => "This is the size of the portion of the map update the server sends you. "
1044 . "If you set this to a high value you will be able to see further, " 1104 . "If you set this to a high value you will be able to see further, "
1045 . "but you also increase bandwidth requirements and latency. " 1105 . "but you also increase bandwidth requirements and latency. "
1046 . "This option is only used once at log-in.", 1106 . "This option is only used once at log-in.",
1047 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1107 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1048 ); 1108 );
1049 1109
1050 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1110 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1051 $table->add (1, 8, new CFPlus::UI::CheckBox 1111 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1052 state => $CFG->{face_prefetch}, 1112 state => $CFG->{face_prefetch},
1053 tooltip => "<b>Background Image Prefetch</b>\n\n" 1113 tooltip => "<b>Background Image Prefetch</b>\n\n"
1054 . "If enabled, the client automatically pre-fetches images from the server. " 1114 . "If enabled, the client automatically pre-fetches images from the server. "
1055 . "This might increase or create lag, but increases the chances " 1115 . "This might increase or create lag, but increases the chances "
1056 . "of faces being ready for display when you encounter them. " 1116 . "of faces being ready for display when you encounter them. "
… …
1058 . "so only set it if you really need to prefetch images. " 1118 . "so only set it if you really need to prefetch images. "
1059 . "This option can be set and unset any time.", 1119 . "This option can be set and unset any time.",
1060 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1120 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1061 ); 1121 );
1062 1122
1123 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1124 $table->add_at (1, 9, new CFPlus::UI::Entry
1125 text => $CFG->{output_rate},
1126 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1127 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1128 . "default will be used, which is usually around 100kb/s.",
1129 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1130 );
1131
1063 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1132 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1064 $table->add (1, 9, new CFPlus::UI::Entry 1133 $table->add_at (1, 10, new CFPlus::UI::Entry
1065 text => $CFG->{output_count}, 1134 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.", 1135 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 }, 1136 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1068 ); 1137 );
1069 1138
1070 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1139 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1071 $table->add (1, 10, new CFPlus::UI::Entry 1140 $table->add_at (1, 11, new CFPlus::UI::Entry
1072 text => $CFG->{output_sync}, 1141 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.", 1142 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 }, 1143 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1075 ); 1144 );
1076 1145
1077 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1146 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1078 expand => 1, 1147 expand => 1,
1079 align => 0, 1148 align => 0,
1080 text => "Login", 1149 text => "Login",
1081 on_activate => sub { 1150 on_activate => sub {
1082 $CONN ? stop_game 1151 $CONN ? stop_game
1083 : start_game; 1152 : start_game;
1084 0 1153 0
1085 }, 1154 },
1086 ); 1155 );
1087 1156
1157 $vbox->add (new CFPlus::UI::FancyFrame
1158 label => "Server Info",
1159 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1160 );
1161
1162 $vbox
1163}
1164
1165sub client_setup {
1166 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1167
1168 my $row = 0;
1169
1088 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1170 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1089 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1171 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1090 text => $CFG->{say_command}, 1172 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. " 1173 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. " 1174 . "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.", 1175 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1094 on_changed => sub { 1176 on_changed => sub {
1095 my ($self, $value) = @_; 1177 my ($self, $value) = @_;
1096 $CFG->{say_command} = $value; 1178 $CFG->{say_command} = $value;
1097 0 1179 0
1098 } 1180 }
1099 ); 1181 );
1100 1182
1101 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1183 $table->add_at (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 1184 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1103 state => $CFG->{show_tips}, 1185 state => $CFG->{show_tips},
1104 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1186 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1105 on_changed => sub { 1187 on_changed => sub {
1106 my ($self, $value) = @_; 1188 my ($self, $value) = @_;
1107 $CFG->{show_tips} = $value; 1189 $CFG->{show_tips} = $value;
1108 0 1190 0
1109 } 1191 }
1110 ); 1192 );
1111 1193
1112 $vbox->add (new CFPlus::UI::FancyFrame 1194 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1113 label => "Server Info", 1195 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1114 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1196 text => $CFG->{logview_max_par},
1197 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1198 . "sends more messages than this number, older messages get removed to save memory and "
1199 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1200 on_changed => sub {
1201 my ($self, $value) = @_;
1202 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1203 0
1204 },
1115 ); 1205 );
1116 1206
1117 $vbox 1207 $table
1118} 1208}
1119 1209
1120sub message_window { 1210sub message_window {
1121 my $window = new CFPlus::UI::Toplevel 1211 my $window = new CFPlus::UI::Toplevel
1122 name => "message_window", 1212 name => "message_window",
… …
1179 1269
1180 $window 1270 $window
1181} 1271}
1182 1272
1183sub autopickup_setup { 1273sub autopickup_setup {
1274 my $r = new CFPlus::UI::ScrolledWindow (
1275 expand => 1,
1276 scroll_y => 1
1277 );
1184 my $table = new CFPlus::UI::Table; 1278 $r->add (my $table = new CFPlus::UI::Table
1279 row_expand => [0],
1280 col_expand => [0, 1, 0, 1],
1281 );
1185 1282
1186 for ( 1283 for (
1187 ["General", 0, 0, 1284 ["General", 0, 0,
1188 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1285 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1189 ["Inhibit autopickup" => PICKUP_INHIBIT], 1286 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1224 ], 1321 ],
1225 ["Weight/Value ratio", 2, 17] 1322 ["Weight/Value ratio", 2, 17]
1226 ) 1323 )
1227 { 1324 {
1228 my ($title, $x, $y, @bits) = @$_; 1325 my ($title, $x, $y, @bits) = @$_;
1229 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1326 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1230 1327
1231 for (@bits) { 1328 for (@bits) {
1232 ++$y; 1329 ++$y;
1233 1330
1234 my $mask = $_->[1]; 1331 my $mask = $_->[1];
1235 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1332 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1236 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1333 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1237 state => $::CFG->{pickup} & $mask, 1334 state => $::CFG->{pickup} & $mask,
1238 on_changed => sub { 1335 on_changed => sub {
1239 my ($box, $value) = @_; 1336 my ($box, $value) = @_;
1240 1337
1241 if ($value) { 1338 if ($value) {
… …
1252 1349
1253 ${$_->[2]} = $checkbox if $_->[2]; 1350 ${$_->[2]} = $checkbox if $_->[2];
1254 } 1351 }
1255 } 1352 }
1256 1353
1257 $table->add (2, 18, new CFPlus::UI::ValSlider 1354 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1258 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1355 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1259 template => ">= 99", 1356 template => ">= 99",
1260 to_value => sub { ">= " . 5 * $_[0] }, 1357 to_value => sub { ">= " . 5 * $_[0] },
1261 on_changed => sub { 1358 on_changed => sub {
1262 my ($slider, $value) = @_; 1359 my ($slider, $value) = @_;
… …
1265 $::CFG->{pickup} |= int $value 1362 $::CFG->{pickup} |= int $value
1266 if $value; 1363 if $value;
1267 1; 1364 1;
1268 }); 1365 });
1269 1366
1270 $table->add (3, 18, new CFPlus::UI::Button 1367 $table->add_at (3, 18, new CFPlus::UI::Button
1271 text => "set", 1368 text => "set",
1272 on_activate => sub { 1369 on_activate => sub {
1273 $::CONN->send_command ("pickup $::CFG->{pickup}") 1370 $::CONN->send_command ("pickup $::CFG->{pickup}")
1274 if defined $::CONN; 1371 if defined $::CONN;
1275 0 1372 0
1276 }); 1373 });
1277 1374
1278 $table 1375 $r
1279} 1376}
1280 1377
1281my %SORT_ORDER = ( 1378my %SORT_ORDER = (
1282 type => undef, 1379 type => undef,
1283 mtime => sub { 1380 mtime => sub {
… …
1362 has_close_button => 1 1459 has_close_button => 1
1363 ; 1460 ;
1364 1461
1365 my $ntb = 1462 my $ntb =
1366 $PL_NOTEBOOK = 1463 $PL_NOTEBOOK =
1367 new CFPlus::UI::Notebook expand => 1, debug => 1; 1464 new CFPlus::UI::Notebook expand => 1;
1368 1465
1369 $ntb->add ( 1466 $ntb->add (
1370 "Statistics (F2)" => $STATS_PAGE = stats_window, 1467 "Statistics (F2)" => $STATS_PAGE = stats_window,
1371 "Shows statistics, where all your Stats and Resistances are shown." 1468 "Shows statistics, where all your Stats and Resistances are shown."
1372 ); 1469 );
… …
1384 $ntb->add ( 1481 $ntb->add (
1385 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1482 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1386 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1483 "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." 1484 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1388 ); 1485 );
1486 $ntb->add (Pickup => autopickup_setup,
1487 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1389 1488
1390 $ntb->set_current_page ($INVENTORY_PAGE); 1489 $ntb->set_current_page ($INVENTORY_PAGE);
1391 1490
1392 $plwin->add ($ntb); 1491 $plwin->add ($ntb);
1393 $plwin 1492 $plwin
… …
1559 1658
1560sub show_tip_of_the_day { 1659sub show_tip_of_the_day {
1561 # find all tips 1660 # find all tips
1562 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1661 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1563 1662
1564 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1663 CFPlus::DB::get state => "tip_of_the_day", sub {
1664 my ($todindex) = @_;
1565 $todindex = 0 if $todindex >= @tod; 1665 $todindex = 0 if $todindex >= @tod;
1566 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1666 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1567 1667
1568 # create dialog 1668 # create dialog
1569 my $dialog; 1669 my $dialog;
1570 1670
1571 my $close = sub { 1671 my $close = sub {
1572 $dialog->destroy; 1672 $dialog->destroy;
1673 };
1674
1675 $dialog = new CFPlus::UI::Toplevel
1676 x => "center",
1677 y => "center",
1678 z => 3,
1679 name => 'tip_of_the_day',
1680 force_w => int $WIDTH * 4/9,
1681 force_h => int $WIDTH * 2/9,
1682 title => "Tip of the day #" . (1 + $todindex),
1683 child => my $vbox = new CFPlus::UI::VBox,
1684 has_close_button => 1,
1685 on_delete => $close,
1686 ;
1687
1688 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1689 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]);
1691
1692 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1693
1694 $table->add_at (0, 0, new CFPlus::UI::Button
1695 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>.",
1697 on_activate => $close,
1698 );
1699
1700 $table->add_at (2, 0, new CFPlus::UI::Button
1701 text => "Next",
1702 tooltip => "Show the next <b>Tip of the day</b>.",
1703 on_activate => sub {
1704 $close->();
1705 &show_tip_of_the_day;
1706 },
1707 );
1708
1709 $dialog->show;
1573 }; 1710 };
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} 1711}
1611 1712
1612sub sdl_init { 1713sub sdl_init {
1613 CFPlus::SDL_Init 1714 CFPlus::SDL_Init
1614 and die "SDL::Init failed!\n"; 1715 and die "SDL::Init failed!\n";
1615} 1716}
1616 1717
1617sub video_init { 1718sub video_init {
1618 sdl_init;
1619
1620 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1719 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1621 1720
1622 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1721 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1623 1722
1624 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1723 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1625 $FULLSCREEN = $CFG->{fullscreen}; 1724 $FULLSCREEN = $CFG->{fullscreen};
1626 $FAST = $CFG->{fast}; 1725 $FAST = $CFG->{fast};
1627 1726
1628 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1727 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1629 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1728 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1630 1729
1631 $SDL_ACTIVE = 1; 1730 $SDL_ACTIVE = 1;
1632 $LAST_REFRESH = time - 0.01; 1731 $LAST_REFRESH = time - 0.01;
1633 1732
… …
1694 font => $FONT_FIXED, 1793 font => $FONT_FIXED,
1695 fontsize => $::CFG->{log_fontsize}, 1794 fontsize => $::CFG->{log_fontsize},
1696 indent => -4, 1795 indent => -4,
1697 can_hover => 1, 1796 can_hover => 1,
1698 can_events => 1, 1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1699 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1799 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1700 ; 1800 ;
1701 1801
1702 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1802 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1703 title => "Setup", 1803 title => "Setup",
1704 name => "setup_dialog", 1804 name => "setup_dialog",
… …
1715 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1815 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1716 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1816 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1717 1817
1718 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1719 "Configure the server to play on, your username, password and other server-related options."); 1819 "Configure the server to play on, your username, password and other server-related options.");
1720 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1820 $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."); 1821 "Configure various client-specific settings.");
1722 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1723 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1823 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1724 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1824 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1725 "Configure the use of audio, sound effects and background music."); 1825 "Configure the use of audio, sound effects and background music.");
1726 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1872 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1); 1972 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1873 1973
1874 $vb->add (my $table = new CFPlus::UI::Table expand => 1); 1974 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1875 my $row = 0; 1975 my $row = 0;
1876 if ($info->{has_name}) { 1976 if ($info->{has_name}) {
1877 $table->add (0, $row, new CFPlus::UI::Label text => "Name:"); 1977 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1878 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 }); 1978 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1879 } 1979 }
1880 if ($info->{has_text}) { 1980 if ($info->{has_text}) {
1881 $table->add (0, $row, new CFPlus::UI::Label text => "Text:"); 1981 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1882 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 }); 1982 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1883 } 1983 }
1884 if ($info->{has_connection}) { 1984 if ($info->{has_connection}) {
1885 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:"); 1985 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1886 $table->add (1, $row++, 1986 $table->add_at (1, $row++,
1887 new CFPlus::UI::Entry 1987 new CFPlus::UI::Entry
1888 expand => 1, 1988 expand => 1,
1889 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 }, 1989 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1890 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate" 1990 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1891 ); 1991 );
… …
1904 CFPlus::OpenGL::shutdown; 2004 CFPlus::OpenGL::shutdown;
1905 2005
1906 undef $SDL_ACTIVE; 2006 undef $SDL_ACTIVE;
1907} 2007}
1908 2008
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 { 2009sub audio_channel_finished {
1913 my ($channel) = @_; 2010 my ($channel) = @_;
1914 2011
1915 #warn "channel $channel finished\n";#d# 2012 #warn "channel $channel finished\n";#d#
1916} 2013}
1917 2014
2015sub audio_music_set {
2016 my ($songs) = @_;
2017
2018 my @want =
2019 grep $_,
2020 map $CONN->{music_meta}{$_},
2021 @$songs;
2022
2023 if (@want) {
2024 @MUSIC_WANT = @want;
2025 &audio_music_changed ();
2026 }
2027}
2028
2029sub audio_music_start {
2030 my $path = $MUSIC_PLAYING->{path}
2031 or return;
2032
2033 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2034 # music might have changed...
2035 $path eq $MUSIC_PLAYING->{path}
2036 or return &audio_music_start ();
2037
2038 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2039
2040 my $NOW = time;
2041
2042 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2043 my $pos = $MUSIC_PLAYING->{stop_pos};
2044 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2045 $MUSIC_START = time - $pos;
2046 } else {
2047 $MUSIC_PLAYER->play (0);
2048 $MUSIC_START = time;
2049 }
2050
2051 delete $MUSIC_PLAYING->{stop_time};
2052 delete $MUSIC_PLAYING->{stop_pos};
2053 }
2054}
2055
2056sub audio_music_changed {
2057 return unless $CFG->{bgm_enable};
2058
2059 # default MUSIC_WANT == MUSIC_DEFAULT
2060 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2061
2062 # if the currently playing song is acceptable, let it continue
2063 return if $MUSIC_PLAYING
2064 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2065
2066 my $NOW = time;
2067
2068 if ($MUSIC_PLAYING) {
2069 $MUSIC_PLAYING->{stop_time} = $NOW;
2070 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2071 CFPlus::MixMusic::fade_out 1000;
2072 } else {
2073 # sort by stop time, oldest first
2074 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2075
2076 # if the most recently-played piece played very recently,
2077 # resume it, else choose the oldest piece for rotation.
2078 $MUSIC_PLAYING =
2079 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2080 ? $MUSIC_WANT[-1]
2081 : $MUSIC_WANT[0];
2082
2083 audio_music_start;
2084 }
2085}
2086
1918sub audio_music_finished { 2087sub audio_music_finished {
1919 return unless $CFG->{bgm_enable}; 2088 $MUSIC_PLAYING = undef;
2089 undef $MUSIC_PLAYER;
1920 2090
1921 # TODO: hack, do play loop and mood music 2091 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} 2092}
1927 2093
1928sub audio_init { 2094sub audio_init {
1929 if ($CFG->{audio_enable}) { 2095 if ($CFG->{audio_enable}) {
1930 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2096 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1980 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2146 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1981 2147
1982 $CFPlus::UI::ROOT->draw; 2148 $CFPlus::UI::ROOT->draw;
1983 2149
1984 $WANT_REFRESH = 0; 2150 $WANT_REFRESH = 0;
1985 $CAN_REFRESH = 0; 2151 $CAN_REFRESH = 0;
1986 $LAST_REFRESH = $NOW; 2152 $LAST_REFRESH = $NOW;
1987 2153
1988 CFPlus::SDL_GL_SwapBuffers; 2154 CFPlus::SDL_GL_SwapBuffers;
1989} 2155}
1990 2156
1991my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2157my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
1992 $NOW = time; 2158 $NOW = time;
1993 2159
1994 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2160 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
1995 for CFPlus::SDL_PollEvent; 2161 for CFPlus::poll_events;
1996 2162
1997 if (%animate_object) { 2163 if (%animate_object) {
1998 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2164 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
1999 $WANT_REFRESH++; 2165 ++$WANT_REFRESH;
2000 } 2166 }
2001 2167
2002 if ($WANT_REFRESH) { 2168 if ($WANT_REFRESH) {
2003 force_refresh; 2169 force_refresh;
2004 } else { 2170 } else {
… …
2025 if $CONN; 2191 if $CONN;
2026}); 2192});
2027 2193
2028%SDL_CB = ( 2194%SDL_CB = (
2029 CFPlus::SDL_QUIT => sub { 2195 CFPlus::SDL_QUIT => sub {
2030 Event::unloop -1; 2196 exit;
2031 }, 2197 },
2032 CFPlus::SDL_VIDEORESIZE => sub { 2198 CFPlus::SDL_VIDEORESIZE => sub {
2033 }, 2199 },
2034 CFPlus::SDL_VIDEOEXPOSE => sub { 2200 CFPlus::SDL_VIDEOEXPOSE => sub {
2035 CFPlus::UI::full_refresh; 2201 CFPlus::UI::full_refresh;
2036 }, 2202 },
2037 CFPlus::SDL_ACTIVEEVENT => sub { 2203 CFPlus::SDL_ACTIVEEVENT => sub {
2038# not useful, as APPACTIVE include sonly iconified state, not unmapped 2204# not useful, as APPACTIVE include sonly iconified state, not unmapped
2039# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2205# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2206# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2040# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2207# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2041# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2208# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2042# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2209# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2043 }, 2210 },
2044 CFPlus::SDL_KEYDOWN => sub { 2211 CFPlus::SDL_KEYDOWN => sub {
… …
2068 2235
2069$SIG{INT} = $SIG{TERM} = sub { exit }; 2236$SIG{INT} = $SIG{TERM} = sub { exit };
2070 2237
2071{ 2238{
2072 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2239 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2240 CFPlus::DB::Server::run;
2241
2073 CFPlus::UI::set_layout ($::CFG->{layout}); 2242 CFPlus::UI::set_layout ($::CFG->{layout});
2074 2243
2075 my %DEF_CFG = ( 2244 my %DEF_CFG = (
2076 sdl_mode => 0, 2245 sdl_mode => 0,
2077 width => 640, 2246 width => 640,
2078 height => 480, 2247 height => 480,
2079 fullscreen => 0, 2248 fullscreen => 0,
2080 fast => 0, 2249 fast => 0,
2081 map_scale => 1, 2250 map_scale => 1,
2082 fow_enable => 1, 2251 fow_enable => 1,
2083 fow_intensity => 0.45, 2252 fow_intensity => 0,
2084 fow_smooth => 0, 2253 map_smoothing => 1,
2085 gui_fontsize => 1, 2254 gui_fontsize => 1,
2086 log_fontsize => 0.7, 2255 log_fontsize => 0.7,
2087 gauge_fontsize => 1, 2256 gauge_fontsize => 1,
2088 gauge_size => 0.35, 2257 gauge_size => 0.35,
2089 stat_fontsize => 0.7, 2258 stat_fontsize => 0.7,
2090 mapsize => 100, 2259 mapsize => 100,
2091 say_command => 'chat', 2260 say_command => 'chat',
2092 audio_enable => 1, 2261 audio_enable => 1,
2093 bgm_enable => 1, 2262 bgm_enable => 1,
2094 bgm_volume => 0.25, 2263 bgm_volume => 0.25,
2095 face_prefetch => 0, 2264 face_prefetch => 0,
2096 output_sync => 1, 2265 output_sync => 1,
2097 output_count => 1, 2266 output_count => 1,
2267 output_rate => "",
2098 pickup => 0, 2268 pickup => 0,
2099 inv_sort => "mtime", 2269 inv_sort => "mtime",
2100 default => "profile", # default profile 2270 default => "profile", # default profile
2101 show_tips => 1, 2271 show_tips => 1,
2272 logview_max_par => 1000,
2102 ); 2273 );
2103 2274
2104 while (my ($k, $v) = each %DEF_CFG) { 2275 while (my ($k, $v) = each %DEF_CFG) {
2105 $CFG->{$k} = $v unless exists $CFG->{$k}; 2276 $CFG->{$k} = $v unless exists $CFG->{$k};
2106 } 2277 }
… …
2120 } 2291 }
2121 } 2292 }
2122 2293
2123 sdl_init; 2294 sdl_init;
2124 2295
2125 @SDL_MODES = reverse 2296 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2126 grep $_->[0] >= 640 && $_->[1] >= 480, 2297 @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)"; 2298 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2299
2300 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2130 2301
2131 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2302 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2132 2303
2133 { 2304 {
2134 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2305 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(
… …
2175 2346
2176Event::loop; 2347Event::loop;
2177#CFPlus::SDL_Quit; 2348#CFPlus::SDL_Quit;
2178#CFPlus::_exit 0; 2349#CFPlus::_exit 0;
2179 2350
2351END {
2180END { CFPlus::SDL_Quit } 2352 CFPlus::SDL_Quit;
2353 CFPlus::DB::Server::stop;
2354}
2181 2355
2182=head1 NAME 2356=head1 NAME
2183 2357
2184cfplus - A Crossfire+ and Crossfire game client 2358cfplus - A Crossfire+ and Crossfire game client
2185 2359

Diff Legend

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