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.167 by root, Fri Jul 13 05:31:32 2007 UTC vs.
Revision 1.178 by root, Fri Jul 20 16:32:04 2007 UTC

… …
161our %SDL_CB; 161our %SDL_CB;
162 162
163our $SDL_MIXER; 163our $SDL_MIXER;
164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg"; 164our $MUSIC_DEFAULT = "in_a_heartbeat.ogg";
165our @MUSIC_WANT; 165our @MUSIC_WANT;
166our $MUSIC_START;
166our $MUSIC_PLAYING; 167our $MUSIC_PLAYING;
167our $MUSIC_PLAYER; 168our $MUSIC_PLAYER;
169our $MUSIC_RESUME = 30; # resume music when players less than these many seconds before
168our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
169our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
170 172
171our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
172our $STATUSBOX; 174our $STATUSBOX;
… …
270 ellipsise => 0, 272 ellipsise => 0,
271 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
272 274
273 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
274 276
275 $table->add (0, 0, new CFPlus::UI::Button 277 $table->add_at (0, 0, new CFPlus::UI::Button
276 text => "Next Race", 278 text => "Next Race",
277 on_activate => sub { 279 on_activate => sub {
278 $conn->send ("reply n"); 280 $conn->send ("reply n");
279 destroy_query_dialog $conn; 281 destroy_query_dialog $conn;
280 0 282 0
281 }, 283 },
282 ); 284 );
283 $table->add (2, 0, new CFPlus::UI::Button 285 $table->add_at (2, 0, new CFPlus::UI::Button
284 text => "Accept", 286 text => "Accept",
285 on_activate => sub { 287 on_activate => sub {
286 $conn->send ("reply d"); 288 $conn->send ("reply d");
287 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
288 0 290 0
… …
323 $conn->send ("reply $stat"); 325 $conn->send ("reply $stat");
324 destroy_query_dialog $conn; 326 destroy_query_dialog $conn;
325 return; 327 return;
326 } 328 }
327 329
328 $STATS_PAGE->show;
329 $MESSAGE_WINDOW->hide;
330
331 unshift @dialog, new CFPlus::UI::Label 330 unshift @dialog, new CFPlus::UI::Label
332 max_w => $::WIDTH * 0.4, 331 max_w => $::WIDTH * 0.4,
333 ellipsise => 0, 332 ellipsise => 0,
334 markup => "\nOr use your keyboard and the text entry below:\n"; 333 markup => "\nOr use your keyboard and the text entry below:\n";
335 334
336 unshift @dialog, my $table = new CFPlus::UI::Table; 335 unshift @dialog, my $table = new CFPlus::UI::Table;
337 336
338 # left: re-roll 337 # left: re-roll
339 $table->add (0, 0, new CFPlus::UI::Button 338 $table->add_at (0, 0, new CFPlus::UI::Button
340 text => "Roll Again", 339 text => "Roll Again",
341 on_activate => sub { 340 on_activate => sub {
342 $conn->send ("reply y"); 341 $conn->send ("reply y");
343 destroy_query_dialog $conn; 342 destroy_query_dialog $conn;
344 0 343 0
… …
358 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"], 357 [6 => "Pow", "Power ($conn->{stat}{+CS_STAT_POW})"],
359 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"], 358 [7 => "Cha", "Charisma ($conn->{stat}{+CS_STAT_CHA})"],
360 ], 359 ],
361 ), 1 .. 2; 360 ), 1 .. 2;
362 361
363 $table->add (2, 0, new CFPlus::UI::Button 362 $table->add_at (2, 0, new CFPlus::UI::Button
364 text => "Swap Stats", 363 text => "Swap Stats",
365 on_activate => sub { 364 on_activate => sub {
366 $conn->{stat_change_with} = $sw2->{value}; 365 $conn->{stat_change_with} = $sw2->{value};
367 $conn->send ("reply $sw1->{value}"); 366 $conn->send ("reply $sw1->{value}");
368 destroy_query_dialog $conn; 367 destroy_query_dialog $conn;
369 0 368 0
370 }, 369 },
371 ); 370 );
372 $table->add (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]); 371 $table->add_at (2, 1, new CFPlus::UI::HBox children => [$sw1, $sw2]);
373 372
374 # right: accept 373 # right: accept
375 $table->add (4, 0, new CFPlus::UI::Button 374 $table->add_at (4, 0, new CFPlus::UI::Button
376 text => "Accept", 375 text => "Accept",
377 on_activate => sub { 376 on_activate => sub {
378 $conn->send ("reply n"); 377 $conn->send ("reply n");
379 $STATS_PAGE->hide; 378 $STATS_PAGE->hide;
380 destroy_query_dialog $conn; 379 destroy_query_dialog $conn;
… …
522 521
523 $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]);
524 523
525 my $row = 0; 524 my $row = 0;
526 525
527 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 526 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
528 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version, 527 $table->add_at (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
529 can_events => 1, 528 can_events => 1,
530 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
531 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
532 $table->add (0, $row, 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");
533 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 536 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
534 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
535 $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],
536 $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);
537 544
538 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
539 my ($self, $value) = @_; 546 my ($self, $value) = @_;
540 547
541 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
542 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
543 }); 550 });
544 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
545 552
546 $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");
547 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 554 $table->add_at (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
548 state => $CFG->{fullscreen}, 555 state => $CFG->{fullscreen},
549 tooltip => "Bring the client into fullscreen mode.", 556 tooltip => "Bring the client into fullscreen mode.",
550 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 } 557 on_changed => sub { my ($self, $value) = @_; $CFG->{fullscreen} = $value; 0 }
551 ); 558 );
552 559
553 $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");
554 $table->add (1, $row++, new CFPlus::UI::CheckBox 561 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
555 state => $CFG->{fast}, 562 state => $CFG->{fast},
556 tooltip => "Lower the visual quality considerably to speed up rendering.", 563 tooltip => "Lower the visual quality considerably to speed up rendering.",
557 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
558 ); 565 );
559 566
560 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize"); 567 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
561 $table->add (1, $row++, new CFPlus::UI::Slider 568 $table->add_at (1, $row++, new CFPlus::UI::Slider
562 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1], 569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
563 tooltip => "The base font size used by most GUI elements that do not have their own setting.", 570 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
564 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 }, 571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
565 ); 572 );
566 573
567 $table->add (1, $row++, new CFPlus::UI::Button 574 $table->add_at (1, $row++, new CFPlus::UI::Button
568 expand => 1, align => 0, text => "Apply", 575 expand => 1, align => 0, text => "Apply",
569 tooltip => "Apply the video settings above.", 576 tooltip => "Apply the video settings above.",
570 on_activate => sub { 577 on_activate => sub {
571 video_shutdown (); 578 video_shutdown ();
572 video_init (); 579 video_init ();
573 0 580 0
574 } 581 }
575 ); 582 );
576 583
577 $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");
578 $table->add (1, $row++, new CFPlus::UI::Slider 585 $table->add_at (1, $row++, new CFPlus::UI::Slider
579 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
580 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
581 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 }
582 ); 589 );
583 590
584 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing"); 591 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
585 $table->add (1, $row++, new CFPlus::UI::CheckBox 592 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
586 state => $CFG->{map_smoothing}, 593 state => $CFG->{map_smoothing},
587 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. " 594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
588 . "This increases load on the graphics subsystem and works only with 2.x servers. " 595 . "This increases load on the graphics subsystem and works only with 2.x servers. "
589 . "Changes take effect at next connection only.", 596 . "Changes take effect at next connection only.",
590 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 } 597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
591 ); 598 );
592 599
593 $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");
594 $table->add (1, $row++, new CFPlus::UI::CheckBox 601 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
595 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
596 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.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
598 ); 605 );
599 606
600 $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");
601 $table->add (1, $row++, new CFPlus::UI::Slider 608 $table->add_at (1, $row++, new CFPlus::UI::Slider
602 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
603 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.",
604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
605 ); 612 );
606 613
607 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
608 $table->add (1, $row++, new CFPlus::UI::CheckBox
609 state => $CFG->{fow_smooth},
610 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
611 on_changed => sub {
612 my ($self, $value) = @_;
613 $CFG->{fow_smooth} = $value;
614 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
615 0
616 }
617 );
618
619 $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");
620 $table->add (1, $row++, new CFPlus::UI::Slider 615 $table->add_at (1, $row++, new CFPlus::UI::Slider
621 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
622 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.",
623 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 618 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
624 ); 619 );
625 620
626 $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");
627 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add_at (1, $row++, new CFPlus::UI::Slider
628 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1], 623 range => [$CFG->{gauge_fontsize}, 0.5, 2, 0, 0.1],
629 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.",
630 on_changed => sub { 625 on_changed => sub {
631 $CFG->{gauge_fontsize} = $_[1]; 626 $CFG->{gauge_fontsize} = $_[1];
632 &set_gauge_window_fontsize; 627 &set_gauge_window_fontsize;
633 0 628 0
634 } 629 }
635 ); 630 );
636 631
637 $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");
638 $table->add (1, $row++, new CFPlus::UI::Slider 633 $table->add_at (1, $row++, new CFPlus::UI::Slider
639 range => [$CFG->{gauge_size}, 0.2, 0.8], 634 range => [$CFG->{gauge_size}, 0.2, 0.8],
640 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.",
641 on_changed => sub { 636 on_changed => sub {
642 $CFG->{gauge_size} = $_[1]; 637 $CFG->{gauge_size} = $_[1];
643 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
… …
653 648
654 $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]);
655 650
656 my $row = 0; 651 my $row = 0;
657 652
658 $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");
659 $table->add (1, $row++, new CFPlus::UI::CheckBox 654 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
660 state => $CFG->{audio_enable}, 655 state => $CFG->{audio_enable},
661 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.",
662 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 } 657 on_changed => sub { $CFG->{audio_enable} = $_[1]; 0 }
663 ); 658 );
664# $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");
665# $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 {
666# $CFG->{effects_volume} = $_[1]; 661# $CFG->{effects_volume} = $_[1];
667# }); 662# });
668 $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");
669 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 664 $table->add_at (1, $row++, my $hbox = new CFPlus::UI::HBox);
670 $hbox->add (new CFPlus::UI::CheckBox 665 $hbox->add (new CFPlus::UI::CheckBox
671 expand => 1, state => $CFG->{bgm_enable}, 666 expand => 1, state => $CFG->{bgm_enable},
672 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.",
673 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 } 668 on_changed => sub { $CFG->{bgm_enable} = $_[1]; 0 }
674 ); 669 );
… …
676 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128], 671 expand => 1, range => [$CFG->{bgm_volume}, 0, 1, 0, 1/128],
677 tooltip => "The volume of the background music. Changes are instant.", 672 tooltip => "The volume of the background music. Changes are instant.",
678 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 }
679 ); 674 );
680 675
681 $table->add (1, $row++, new CFPlus::UI::Button 676 $table->add_at (1, $row++, new CFPlus::UI::Button
682 expand => 1, align => 0, text => "Apply", 677 expand => 1, align => 0, text => "Apply",
683 tooltip => "Apply the audio settings", 678 tooltip => "Apply the audio settings",
684 on_activate => sub { 679 on_activate => sub {
685 audio_shutdown (); 680 audio_shutdown ();
686 audio_init (); 681 audio_init ();
… …
745} 740}
746 741
747sub debug_setup { 742sub debug_setup {
748 my $table = new CFPlus::UI::Table; 743 my $table = new CFPlus::UI::Table;
749 744
750 $table->add (0, 0, new CFPlus::UI::Label text => "Widget Borders"); 745 $table->add_at (0, 0, new CFPlus::UI::Label text => "Widget Borders");
751 $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 });
752 $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");
753 $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 });
754 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 749 $table->add_at (0, 2, new CFPlus::UI::Label text => "Show FPS");
755 $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 });
756 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 751 $table->add_at (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
757 $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 });
758 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } ); 753 $table->add_at (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
759 754
760 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
761
762 for my $x (0..2) {
763 for my $y (0 .. 2) {
764 $table->add ($x + 3, $y,
765 new CFPlus::UI::Entry
766 text => $default_smooth[$x * 3 + $y],
767 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
768 );
769 }
770 }
771
772 $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#
773 756
774 $table 757 $table
775} 758}
776 759
777sub stats_window { 760sub stats_window {
… …
825 [2, 4, st_spd => "Spd", 10.54], 808 [2, 4, st_spd => "Spd", 10.54],
826 [2, 5, st_wspd => "WSp", 10.54], 809 [2, 5, st_wspd => "WSp", 10.54],
827 ) { 810 ) {
828 my ($col, $row, $id, $label, $template) = @$_; 811 my ($col, $row, $id, $label, $template) = @$_;
829 812
830 $tbl->add ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label 813 $tbl->add_at ($col , $row, $STATWIDS->{$id} = new CFPlus::UI::Label
831 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0, 814 font => $FONT_FIXED, can_hover => 1, can_events => 1, valign => 0,
832 align => +1, template => $template, tooltip => "#stat_$label"); 815 align => +1, template => $template, tooltip => "#stat_$label");
833 $tbl->add ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label 816 $tbl->add_at ($col + 1, $row, $STATWIDS->{"$id\_lbl"} = new CFPlus::UI::Label
834 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0, 817 font => $FONT_FIXED, can_hover => 1, can_events => 1, fg => $color2, valign => 0,
835 align => -1, text => $label, tooltip => "#stat_$label"); 818 align => -1, text => $label, tooltip => "#stat_$label");
836 } 819 }
837 820
838 $vb->add (new CFPlus::UI::FancyFrame 821 $vb->add (new CFPlus::UI::FancyFrame
… …
879 cold => ["Cold", 862 cold => ["Cold",
880 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"], 863 "<b>Cold</b> (this is your resistance against cold spells like icestorm, snowstorm, ...)"],
881 ghit => ["Ghost hit", 864 ghit => ["Ghost hit",
882 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"], 865 "<b>Ghost hit</b> (special attack used by ghosts and ghost-like beings)"],
883 ); 866 );
867
884 for (qw/slow holyw conf fire depl magic 868 for (qw/slow holyw conf fire depl magic
885 drain acid pois para deat phys 869 drain acid pois para deat phys
886 blind fear tund elec cold ghit/) 870 blind fear tund elec cold ghit/)
887 { 871 {
888 $tbl2->add ($col, $row, 872 $tbl2->add_at ($col, $row,
889 $STATWIDS->{"res_$_"} = 873 $STATWIDS->{"res_$_"} =
890 new CFPlus::UI::Label 874 new CFPlus::UI::Label
891 font => $FONT_FIXED, 875 font => $FONT_FIXED,
892 template => "-100%", 876 template => "-100%",
893 align => +1, 877 align => +1,
894 valign => 0, 878 valign => 0,
895 can_events => 1, 879 can_events => 1,
896 can_hover => 1, 880 can_hover => 1,
897 tooltip => $resist_names{$_}->[1], 881 tooltip => $resist_names{$_}->[1],
898 ); 882 );
899 $tbl2->add ($col + 1, $row, new CFPlus::UI::Image 883 $tbl2->add_at ($col + 1, $row, new CFPlus::UI::Image
900 font => $FONT_FIXED, 884 font => $FONT_FIXED,
901 can_hover => 1, 885 can_hover => 1,
902 can_events => 1, 886 can_events => 1,
903 path => "ui/resist/resist_$_.png", 887 path => "ui/resist/resist_$_.png",
904 tooltip => $resist_names{$_}->[1], 888 tooltip => $resist_names{$_}->[1],
905 ); 889 );
906 $tbl2->add ($col + 2, $row, new CFPlus::UI::Label 890 $tbl2->add_at ($col + 2, $row, new CFPlus::UI::Label
907 text => $resist_names{$_}->[0], 891 text => $resist_names{$_}->[0],
908 font => $FONT_FIXED, 892 font => $FONT_FIXED,
909 can_hover => 1, 893 can_hover => 1,
910 can_events => 1, 894 can_events => 1,
911 tooltip => $resist_names{$_}->[1], 895 tooltip => $resist_names{$_}->[1],
… …
944 return if $METASERVER_ATIME > time; 928 return if $METASERVER_ATIME > time;
945 $METASERVER_ATIME = time + 60; 929 $METASERVER_ATIME = time + 60;
946 930
947 my $table = $METASERVER->{table}; 931 my $table = $METASERVER->{table};
948 $table->clear; 932 $table->clear;
949 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 933 $table->add_at (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
950 934
951 my $ok = 0; 935 my $ok = 0;
952 936
953 CFPlus::background { 937 CFPlus::background {
954 my $ua = CFPlus::lwp_useragent; 938 my $ua = CFPlus::lwp_useragent;
… …
965 "The time this server has been running without being restarted.", 949 "The time this server has been running without being restarted.",
966 "The server software version - a '+' indicates a Crossfire+ server.", 950 "The server software version - a '+' indicates a Crossfire+ server.",
967 "Short information about this server provided by its admins.", 951 "Short information about this server provided by its admins.",
968 ); 952 );
969 my @col = qw(#Users Host Uptime Version Description); 953 my @col = qw(#Users Host Uptime Version Description);
970 $table->add ($_, 0, new CFPlus::UI::Label 954 $table->add_at ($_, 0, new CFPlus::UI::Label
971 can_hover => 1, can_events => 1, 955 can_hover => 1, can_events => 1,
972 align => 0, fg => [1, 1, 0], 956 align => 0, fg => [1, 1, 0],
973 text => $col[$_], tooltip => $tip[$_]) 957 text => $col[$_], tooltip => $tip[$_])
974 for 0 .. $#col; 958 for 0 .. $#col;
975 959
… …
997 981
998 $m = [$users, $host, $uptime, $version, $desc]; 982 $m = [$users, $host, $uptime, $version, $desc];
999 983
1000 $y++; 984 $y++;
1001 985
1002 $table->add (scalar @$m, $y, new CFPlus::UI::VBox children => [ 986 $table->add_at (scalar @$m, $y, new CFPlus::UI::VBox children => [
1003 (new CFPlus::UI::Button 987 (new CFPlus::UI::Button
1004 text => "Use", 988 text => "Use",
1005 tooltip => "Put this server into the <b>Host:Port</b> field", 989 tooltip => "Put this server into the <b>Host:Port</b> field",
1006 on_activate => sub { 990 on_activate => sub {
1007 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host); 991 $HOST_ENTRY->set_text ($CFG->{profile}{default}{host} = $host);
… …
1010 }, 994 },
1011 ), 995 ),
1012 (new CFPlus::UI::Empty expand => 1), 996 (new CFPlus::UI::Empty expand => 1),
1013 ]); 997 ]);
1014 998
1015 $table->add ($_, $y, new CFPlus::UI::Label 999 $table->add_at ($_, $y, new CFPlus::UI::Label
1016 max_w => $::WIDTH * 0.4, 1000 max_w => $::WIDTH * 0.4,
1017 ellipsise => 0, 1001 ellipsise => 0,
1018 align => $align[$_], 1002 align => $align[$_],
1019 text => $m->[$_], 1003 text => $m->[$_],
1020 tooltip => $tip[$_], 1004 tooltip => $tip[$_],
… …
1061 1045
1062 $vbox->add (new CFPlus::UI::FancyFrame 1046 $vbox->add (new CFPlus::UI::FancyFrame
1063 label => "Connection Settings", 1047 label => "Connection Settings",
1064 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]), 1048 child => (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]),
1065 ); 1049 );
1066 $table->add (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port"); 1050 $table->add_at (0, 2, new CFPlus::UI::Label valign => 0, align => 1, text => "Host:Port");
1067 1051
1068 { 1052 {
1069 $table->add (1, 2, my $vbox = new CFPlus::UI::VBox); 1053 $table->add_at (1, 2, my $vbox = new CFPlus::UI::VBox);
1070 1054
1071 $vbox->add ( 1055 $vbox->add (
1072 $HOST_ENTRY = new CFPlus::UI::Entry 1056 $HOST_ENTRY = new CFPlus::UI::Entry
1073 expand => 1, 1057 expand => 1,
1074 text => $CFG->{profile}{default}{host}, 1058 text => $CFG->{profile}{default}{host},
… …
1088 on_activate => sub { $METASERVER->toggle_visibility; 0 }, 1072 on_activate => sub { $METASERVER->toggle_visibility; 0 },
1089 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 }, 1073 on_visibility_change => sub { $METASERVER->hide unless $_[1]; 0 },
1090 ); 1074 );
1091 } 1075 }
1092 1076
1093 $table->add (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username"); 1077 $table->add_at (0, 4, new CFPlus::UI::Label valign => 0, align => 1, text => "Username");
1094 $table->add (1, 4, new CFPlus::UI::Entry 1078 $table->add_at (1, 4, new CFPlus::UI::Entry
1095 text => $CFG->{profile}{default}{user}, 1079 text => $CFG->{profile}{default}{user},
1096 tooltip => "The name of your character on the server", 1080 tooltip => "The name of your character on the server",
1097 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value } 1081 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{user} = $value }
1098 ); 1082 );
1099 1083
1100 $table->add (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password"); 1084 $table->add_at (0, 5, new CFPlus::UI::Label valign => 0, align => 1, text => "Password");
1101 $table->add (1, 5, new CFPlus::UI::Entry 1085 $table->add_at (1, 5, new CFPlus::UI::Entry
1102 text => $CFG->{profile}{default}{password}, 1086 text => $CFG->{profile}{default}{password},
1103 hidden => 1, 1087 hidden => 1,
1104 tooltip => "The password for your character", 1088 tooltip => "The password for your character",
1105 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value } 1089 on_changed => sub { my ($self, $value) = @_; $CFG->{profile}{default}{password} = $value }
1106 ); 1090 );
1107 1091
1108 $table->add (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size"); 1092 $table->add_at (0, 7, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Size");
1109 $table->add (1, 7, new CFPlus::UI::Slider 1093 $table->add_at (1, 7, new CFPlus::UI::Slider
1110 force_w => 100, 1094 force_w => 100,
1111 range => [$CFG->{mapsize}, 10, 100, 0, 1], 1095 range => [$CFG->{mapsize}, 10, 100, 0, 1],
1112 tooltip => "This is the size of the portion of the map update the server sends you. " 1096 tooltip => "This is the size of the portion of the map update the server sends you. "
1113 . "If you set this to a high value you will be able to see further, " 1097 . "If you set this to a high value you will be able to see further, "
1114 . "but you also increase bandwidth requirements and latency. " 1098 . "but you also increase bandwidth requirements and latency. "
1115 . "This option is only used once at log-in.", 1099 . "This option is only used once at log-in.",
1116 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 }, 1100 on_changed => sub { my ($self, $value) = @_; $CFG->{mapsize} = $self->{range}[0] = $value = int $value; 0 },
1117 ); 1101 );
1118 1102
1119 $table->add (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch"); 1103 $table->add_at (0, 8, new CFPlus::UI::Label valign => 0, align => 1, text => "Face Prefetch");
1120 $table->add (1, 8, new CFPlus::UI::CheckBox 1104 $table->add_at (1, 8, new CFPlus::UI::CheckBox
1121 state => $CFG->{face_prefetch}, 1105 state => $CFG->{face_prefetch},
1122 tooltip => "<b>Background Image Prefetch</b>\n\n" 1106 tooltip => "<b>Background Image Prefetch</b>\n\n"
1123 . "If enabled, the client automatically pre-fetches images from the server. " 1107 . "If enabled, the client automatically pre-fetches images from the server. "
1124 . "This might increase or create lag, but increases the chances " 1108 . "This might increase or create lag, but increases the chances "
1125 . "of faces being ready for display when you encounter them. " 1109 . "of faces being ready for display when you encounter them. "
… …
1127 . "so only set it if you really need to prefetch images. " 1111 . "so only set it if you really need to prefetch images. "
1128 . "This option can be set and unset any time.", 1112 . "This option can be set and unset any time.",
1129 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1113 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1130 ); 1114 );
1131 1115
1132 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate"); 1116 $table->add_at (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1133 $table->add (1, 9, new CFPlus::UI::Entry 1117 $table->add_at (1, 9, new CFPlus::UI::Entry
1134 text => $CFG->{output_rate}, 1118 text => $CFG->{output_rate},
1135 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed " 1119 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1136 . "when sending images, to ensure interactiveness. When 0 or unset, the server " 1120 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1137 . "default will be used, which is usually around 100kb/s.", 1121 . "default will be used, which is usually around 100kb/s.",
1138 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 }, 1122 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1139 ); 1123 );
1140 1124
1141 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1125 $table->add_at (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1142 $table->add (1, 10, new CFPlus::UI::Entry 1126 $table->add_at (1, 10, new CFPlus::UI::Entry
1143 text => $CFG->{output_count}, 1127 text => $CFG->{output_count},
1144 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1128 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1145 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1129 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1146 ); 1130 );
1147 1131
1148 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1132 $table->add_at (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1149 $table->add (1, 11, new CFPlus::UI::Entry 1133 $table->add_at (1, 11, new CFPlus::UI::Entry
1150 text => $CFG->{output_sync}, 1134 text => $CFG->{output_sync},
1151 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.",
1152 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1136 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1153 ); 1137 );
1154 1138
1155 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button 1139 $table->add_at (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1156 expand => 1, 1140 expand => 1,
1157 align => 0, 1141 align => 0,
1158 text => "Login", 1142 text => "Login",
1159 on_activate => sub { 1143 on_activate => sub {
1160 $CONN ? stop_game 1144 $CONN ? stop_game
… …
1174sub client_setup { 1158sub client_setup {
1175 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]; 1159 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1176 1160
1177 my $row = 0; 1161 my $row = 0;
1178 1162
1179 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1163 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1180 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1164 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1181 text => $CFG->{say_command}, 1165 text => $CFG->{say_command},
1182 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. " 1166 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. "
1183 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1167 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1184 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1168 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1185 on_changed => sub { 1169 on_changed => sub {
… …
1187 $CFG->{say_command} = $value; 1171 $CFG->{say_command} = $value;
1188 0 1172 0
1189 } 1173 }
1190 ); 1174 );
1191 1175
1192 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1176 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1193 $table->add (1, $row++, new CFPlus::UI::CheckBox 1177 $table->add_at (1, $row++, new CFPlus::UI::CheckBox
1194 state => $CFG->{show_tips}, 1178 state => $CFG->{show_tips},
1195 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1179 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1196 on_changed => sub { 1180 on_changed => sub {
1197 my ($self, $value) = @_; 1181 my ($self, $value) = @_;
1198 $CFG->{show_tips} = $value; 1182 $CFG->{show_tips} = $value;
1199 0 1183 0
1200 } 1184 }
1201 ); 1185 );
1202 1186
1203 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size"); 1187 $table->add_at (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1204 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry 1188 $table->add_at (1, $row++, my $saycmd = new CFPlus::UI::Entry
1205 text => $CFG->{logview_max_par}, 1189 text => $CFG->{logview_max_par},
1206 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server " 1190 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1207 . "sends more messages than this number, older messages get removed to save memory and " 1191 . "sends more messages than this number, older messages get removed to save memory and "
1208 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.", 1192 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1209 on_changed => sub { 1193 on_changed => sub {
… …
1278 1262
1279 $window 1263 $window
1280} 1264}
1281 1265
1282sub autopickup_setup { 1266sub autopickup_setup {
1267 my $r = new CFPlus::UI::ScrolledWindow (
1268 expand => 1,
1269 scroll_y => 1
1270 );
1283 my $table = new CFPlus::UI::Table; 1271 $r->add (my $table = new CFPlus::UI::Table
1272 row_expand => [0],
1273 col_expand => [0, 1, 0, 1],
1274 );
1284 1275
1285 for ( 1276 for (
1286 ["General", 0, 0, 1277 ["General", 0, 0,
1287 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1278 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1288 ["Inhibit autopickup" => PICKUP_INHIBIT], 1279 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1323 ], 1314 ],
1324 ["Weight/Value ratio", 2, 17] 1315 ["Weight/Value ratio", 2, 17]
1325 ) 1316 )
1326 { 1317 {
1327 my ($title, $x, $y, @bits) = @$_; 1318 my ($title, $x, $y, @bits) = @$_;
1328 $table->add ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]); 1319 $table->add_at ($x, $y, new CFPlus::UI::Label text => $title, align => 1, fg => [1, 1, 0]);
1329 1320
1330 for (@bits) { 1321 for (@bits) {
1331 ++$y; 1322 ++$y;
1332 1323
1333 my $mask = $_->[1]; 1324 my $mask = $_->[1];
1334 $table->add ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1); 1325 $table->add_at ($x , $y, new CFPlus::UI::Label text => $_->[0], align => 1, expand => 1);
1335 $table->add ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox 1326 $table->add_at ($x+1, $y, my $checkbox = new CFPlus::UI::CheckBox
1336 state => $::CFG->{pickup} & $mask, 1327 state => $::CFG->{pickup} & $mask,
1337 on_changed => sub { 1328 on_changed => sub {
1338 my ($box, $value) = @_; 1329 my ($box, $value) = @_;
1339 1330
1340 if ($value) { 1331 if ($value) {
… …
1351 1342
1352 ${$_->[2]} = $checkbox if $_->[2]; 1343 ${$_->[2]} = $checkbox if $_->[2];
1353 } 1344 }
1354 } 1345 }
1355 1346
1356 $table->add (2, 18, new CFPlus::UI::ValSlider 1347 $table->add_at (2, 18, new CFPlus::UI::ValSlider
1357 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1], 1348 range => [$::CFG->{pickup} & 0xF, 0, 16, 1, 1],
1358 template => ">= 99", 1349 template => ">= 99",
1359 to_value => sub { ">= " . 5 * $_[0] }, 1350 to_value => sub { ">= " . 5 * $_[0] },
1360 on_changed => sub { 1351 on_changed => sub {
1361 my ($slider, $value) = @_; 1352 my ($slider, $value) = @_;
… …
1364 $::CFG->{pickup} |= int $value 1355 $::CFG->{pickup} |= int $value
1365 if $value; 1356 if $value;
1366 1; 1357 1;
1367 }); 1358 });
1368 1359
1369 $table->add (3, 18, new CFPlus::UI::Button 1360 $table->add_at (3, 18, new CFPlus::UI::Button
1370 text => "set", 1361 text => "set",
1371 on_activate => sub { 1362 on_activate => sub {
1372 $::CONN->send_command ("pickup $::CFG->{pickup}") 1363 $::CONN->send_command ("pickup $::CFG->{pickup}")
1373 if defined $::CONN; 1364 if defined $::CONN;
1374 0 1365 0
1375 }); 1366 });
1376 1367
1377 $table 1368 $r
1378} 1369}
1379 1370
1380my %SORT_ORDER = ( 1371my %SORT_ORDER = (
1381 type => undef, 1372 type => undef,
1382 mtime => sub { 1373 mtime => sub {
… …
1691 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4); 1682 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1692 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]); 1683 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1693 1684
1694 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]); 1685 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1695 1686
1696 $table->add (0, 0, new CFPlus::UI::Button 1687 $table->add_at (0, 0, new CFPlus::UI::Button
1697 text => "Close", 1688 text => "Close",
1698 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 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>.",
1699 on_activate => $close, 1690 on_activate => $close,
1700 ); 1691 );
1701 1692
1702 $table->add (2, 0, new CFPlus::UI::Button 1693 $table->add_at (2, 0, new CFPlus::UI::Button
1703 text => "Next", 1694 text => "Next",
1704 tooltip => "Show the next <b>Tip of the day</b>.", 1695 tooltip => "Show the next <b>Tip of the day</b>.",
1705 on_activate => sub { 1696 on_activate => sub {
1706 $close->(); 1697 $close->();
1707 &show_tip_of_the_day; 1698 &show_tip_of_the_day;
… …
1716 CFPlus::SDL_Init 1707 CFPlus::SDL_Init
1717 and die "SDL::Init failed!\n"; 1708 and die "SDL::Init failed!\n";
1718} 1709}
1719 1710
1720sub video_init { 1711sub video_init {
1721 sdl_init;
1722
1723 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1712 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1724 1713
1725 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1714 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1726 1715
1727 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1716 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1728 $FULLSCREEN = $CFG->{fullscreen}; 1717 $FULLSCREEN = $CFG->{fullscreen};
1729 $FAST = $CFG->{fast}; 1718 $FAST = $CFG->{fast};
1730 1719
1731 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1720 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1732 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1721 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1733 1722
1734 $SDL_ACTIVE = 1; 1723 $SDL_ACTIVE = 1;
1735 $LAST_REFRESH = time - 0.01; 1724 $LAST_REFRESH = time - 0.01;
1736 1725
… …
1976 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1); 1965 $dialog->add (my $vb = new CFPlus::UI::VBox expand => 1);
1977 1966
1978 $vb->add (my $table = new CFPlus::UI::Table expand => 1); 1967 $vb->add (my $table = new CFPlus::UI::Table expand => 1);
1979 my $row = 0; 1968 my $row = 0;
1980 if ($info->{has_name}) { 1969 if ($info->{has_name}) {
1981 $table->add (0, $row, new CFPlus::UI::Label text => "Name:"); 1970 $table->add_at (0, $row, new CFPlus::UI::Label text => "Name:");
1982 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 }); 1971 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{name} = $_[1]; 0 });
1983 } 1972 }
1984 if ($info->{has_text}) { 1973 if ($info->{has_text}) {
1985 $table->add (0, $row, new CFPlus::UI::Label text => "Text:"); 1974 $table->add_at (0, $row, new CFPlus::UI::Label text => "Text:");
1986 $table->add (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 }); 1975 $table->add_at (1, $row++, new CFPlus::UI::Entry expand => 1, on_changed => sub { $::IN_BUILD_MODE->{text} = $_[1]; 0 });
1987 } 1976 }
1988 if ($info->{has_connection}) { 1977 if ($info->{has_connection}) {
1989 $table->add (0, $row, new CFPlus::UI::Label text => "Connection ID:"); 1978 $table->add_at (0, $row, new CFPlus::UI::Label text => "Connection ID:");
1990 $table->add (1, $row++, 1979 $table->add_at (1, $row++,
1991 new CFPlus::UI::Entry 1980 new CFPlus::UI::Entry
1992 expand => 1, 1981 expand => 1,
1993 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 }, 1982 on_changed => sub { $::IN_BUILD_MODE->{connection} = $_[1]; 0 },
1994 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate" 1983 tooltip => "Enter the connection ID here. The connection ID connects actors like a lever to a gate or a magic ear to a gate"
1995 ); 1984 );
… …
2017} 2006}
2018 2007
2019sub audio_music_set { 2008sub audio_music_set {
2020 my ($songs) = @_; 2009 my ($songs) = @_;
2021 2010
2022 my $count = @$songs; 2011 my @want =
2023 my @meta; 2012 grep $_,
2013 map $CONN->{music_meta}{$_},
2014 @$songs;
2024 2015
2025 for my $name (@$songs) { 2016 if (@want) {
2026 CFPlus::DB::get "res-metadata" => $name, sub {
2027 my ($data) = @_;
2028
2029 if ($data) {
2030 $data = JSON::XS->new->utf8->decode ($data);
2031 $data->{path} = CFPlus::DB::path_of $name;
2032 push @meta, $data;
2033 }
2034
2035 unless (--$count) {
2036 if (@meta) {
2037 @MUSIC_WANT = @meta; 2017 @MUSIC_WANT = @want;
2038 &audio_music_changed (); 2018 &audio_music_changed ();
2039 } 2019 }
2040 } 2020}
2021
2022sub audio_music_start {
2023 my $path = $MUSIC_PLAYING->{path}
2024 or return;
2025
2026 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2027 # music might have changed...
2028 $path eq $MUSIC_PLAYING->{path}
2029 or return &audio_music_start ();
2030
2031 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2032
2033 my $NOW = time;
2034
2035 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2036 my $pos = $MUSIC_PLAYING->{stop_pos};
2037 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2038 $MUSIC_START = time - $pos;
2039 } else {
2040 $MUSIC_PLAYER->play (0);
2041 $MUSIC_START = time;
2041 }; 2042 }
2043
2044 delete $MUSIC_PLAYING->{stop_time};
2045 delete $MUSIC_PLAYING->{stop_pos};
2042 } 2046 }
2043} 2047}
2044 2048
2045sub audio_music_changed { 2049sub audio_music_changed {
2046 return unless $CFG->{bgm_enable}; 2050 return unless $CFG->{bgm_enable};
… …
2050 2054
2051 # if the currently playing song is acceptable, let it continue 2055 # if the currently playing song is acceptable, let it continue
2052 return if $MUSIC_PLAYING 2056 return if $MUSIC_PLAYING
2053 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT; 2057 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2054 2058
2059 my $NOW = time;
2060
2055 if ($MUSIC_PLAYING) { 2061 if ($MUSIC_PLAYING) {
2062 $MUSIC_PLAYING->{stop_time} = $NOW;
2063 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2056 CFPlus::MixMusic::fade_out 1000; 2064 CFPlus::MixMusic::fade_out 1000;
2057 } else { 2065 } else {
2058 my $music = $MUSIC_WANT [rand @MUSIC_WANT]; 2066 # sort by stop time, oldest first
2067 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2059 2068
2069 # if the most recently-played piece played very recently,
2070 # resume it, else choose the oldest piece for rotation.
2060 $MUSIC_PLAYING = $music; 2071 $MUSIC_PLAYING =
2072 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2073 ? $MUSIC_WANT[-1]
2074 : $MUSIC_WANT[0];
2061 2075
2062 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $music->{path}; 2076 audio_music_start;
2063 $MUSIC_PLAYER->play (0);
2064 } 2077 }
2065} 2078}
2066 2079
2067sub audio_music_finished { 2080sub audio_music_finished {
2068 $MUSIC_PLAYING = undef; 2081 $MUSIC_PLAYING = undef;
… …
2126 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2139 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
2127 2140
2128 $CFPlus::UI::ROOT->draw; 2141 $CFPlus::UI::ROOT->draw;
2129 2142
2130 $WANT_REFRESH = 0; 2143 $WANT_REFRESH = 0;
2131 $CAN_REFRESH = 0; 2144 $CAN_REFRESH = 0;
2132 $LAST_REFRESH = $NOW; 2145 $LAST_REFRESH = $NOW;
2133 2146
2134 CFPlus::SDL_GL_SwapBuffers; 2147 CFPlus::SDL_GL_SwapBuffers;
2135} 2148}
2136 2149
2137my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2150my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2138 $NOW = time; 2151 $NOW = time;
2139 2152
2140 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2153 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2141 for CFPlus::SDL_PollEvent; 2154 for CFPlus::poll_events;
2142 2155
2143 if (%animate_object) { 2156 if (%animate_object) {
2144 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2157 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2145 $WANT_REFRESH++; 2158 ++$WANT_REFRESH;
2146 } 2159 }
2147 2160
2148 if ($WANT_REFRESH) { 2161 if ($WANT_REFRESH) {
2149 force_refresh; 2162 force_refresh;
2150 } else { 2163 } else {
… …
2180 CFPlus::SDL_VIDEOEXPOSE => sub { 2193 CFPlus::SDL_VIDEOEXPOSE => sub {
2181 CFPlus::UI::full_refresh; 2194 CFPlus::UI::full_refresh;
2182 }, 2195 },
2183 CFPlus::SDL_ACTIVEEVENT => sub { 2196 CFPlus::SDL_ACTIVEEVENT => sub {
2184# not useful, as APPACTIVE include sonly iconified state, not unmapped 2197# not useful, as APPACTIVE include sonly iconified state, not unmapped
2185# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2198# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2199# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2186# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2200# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2187# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2201# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2188# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2202# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2189 }, 2203 },
2190 CFPlus::SDL_KEYDOWN => sub { 2204 CFPlus::SDL_KEYDOWN => sub {
… …
2226 height => 480, 2240 height => 480,
2227 fullscreen => 0, 2241 fullscreen => 0,
2228 fast => 0, 2242 fast => 0,
2229 map_scale => 1, 2243 map_scale => 1,
2230 fow_enable => 1, 2244 fow_enable => 1,
2231 fow_intensity => 0.45, 2245 fow_intensity => 0,
2232 fow_smooth => 0,
2233 map_smoothing => 1, 2246 map_smoothing => 1,
2234 gui_fontsize => 1, 2247 gui_fontsize => 1,
2235 log_fontsize => 0.7, 2248 log_fontsize => 0.7,
2236 gauge_fontsize => 1, 2249 gauge_fontsize => 1,
2237 gauge_size => 0.35, 2250 gauge_size => 0.35,
… …
2271 } 2284 }
2272 } 2285 }
2273 2286
2274 sdl_init; 2287 sdl_init;
2275 2288
2276 @SDL_MODES = reverse 2289 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2277 grep $_->[0] >= 640 && $_->[1] >= 480, 2290 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2278 CFPlus::SDL_ListModes;
2279
2280 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2291 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2292
2293 @SDL_MODES = sort { $a->[0] * $a->[1] <=> $b->[0] * $b->[1] } @SDL_MODES;
2281 2294
2282 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2295 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2283 2296
2284 { 2297 {
2285 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw( 2298 my @fonts = map CFPlus::find_rcfile "fonts/$_", qw(

Diff Legend

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