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.148 by root, Mon Apr 9 04:39:11 2007 UTC vs.
Revision 1.176 by root, Thu Jul 19 14:54:51 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}
… …
137 159
138our $SDL_ACTIVE; 160our $SDL_ACTIVE;
139our %SDL_CB; 161our %SDL_CB;
140 162
141our $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
142our @SOUNDS; # event => file mapping 170our @SOUNDS; # event => file mapping
143our %AUDIO_CHUNKS; # audio files 171our %AUDIO_CHUNKS; # audio files
144 172
145our $ALT_ENTER_MESSAGE; 173our $ALT_ENTER_MESSAGE;
146our $STATUSBOX; 174our $STATUSBOX;
… …
207 title => "Server Query", 235 title => "Server Query",
208 child => my $vbox = new CFPlus::UI::VBox, 236 child => my $vbox = new CFPlus::UI::VBox,
209 ; 237 ;
210 238
211 my @dialog = my $label = new CFPlus::UI::Label 239 my @dialog = my $label = new CFPlus::UI::Label
212 max_w => $::WIDTH * 0.4, 240 max_w => $::WIDTH * 0.8,
213 ellipsise => 0, 241 ellipsise => 0,
214 text => $prompt; 242 text => $prompt;
215 243
216 if ($flags & CS_QUERY_YESNO) { 244 if ($flags & CS_QUERY_YESNO) {
217 push @dialog, my $hbox = new CFPlus::UI::HBox; 245 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
234 ); 262 );
235 263
236 $dialog->grab_focus; 264 $dialog->grab_focus;
237 265
238 } elsif ($flags & CS_QUERY_SINGLECHAR) { 266 } elsif ($flags & CS_QUERY_SINGLECHAR) {
239 $dialog->{tooltip} = "#charcreation_focus";
240
241 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) {
242 $MESSAGE_WINDOW->show; 268 $dialog->{tooltip} = "#charcreation_focus";
243 269
244 unshift @dialog, new CFPlus::UI::Label 270 unshift @dialog, new CFPlus::UI::Label
245 max_w => $::WIDTH * 0.4, 271 max_w => $::WIDTH * 0.8,
246 ellipsise => 0, 272 ellipsise => 0,
247 markup => "\nOr use your keyboard and the text entry below:\n"; 273 markup => "\nOr use your keyboard and the text entry below:\n";
248 274
249 unshift @dialog, my $table = new CFPlus::UI::Table; 275 unshift @dialog, my $table = new CFPlus::UI::Table;
250 276
… …
263 destroy_query_dialog $conn; 289 destroy_query_dialog $conn;
264 0 290 0
265 }, 291 },
266 ); 292 );
267 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
268 unshift @dialog, new CFPlus::UI::Label 317 unshift @dialog, new CFPlus::UI::Label
269 max_w => $::WIDTH * 0.4, 318 max_w => $::WIDTH * 0.4,
270 ellipsise => 0, 319 ellipsise => 0,
271 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 320 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
272 ; 321 ;
… …
275 if (my $stat = delete $conn->{stat_change_with}) { 324 if (my $stat = delete $conn->{stat_change_with}) {
276 $conn->send ("reply $stat"); 325 $conn->send ("reply $stat");
277 destroy_query_dialog $conn; 326 destroy_query_dialog $conn;
278 return; 327 return;
279 } 328 }
280
281 $STATS_PAGE->show;
282 $MESSAGE_WINDOW->hide;
283 329
284 unshift @dialog, new CFPlus::UI::Label 330 unshift @dialog, new CFPlus::UI::Label
285 max_w => $::WIDTH * 0.4, 331 max_w => $::WIDTH * 0.4,
286 ellipsise => 0, 332 ellipsise => 0,
287 markup => "\nOr use your keyboard and the text entry below:\n"; 333 markup => "\nOr use your keyboard and the text entry below:\n";
… …
420 statusbox => $STATUSBOX, 466 statusbox => $STATUSBOX,
421 map => $MAP, 467 map => $MAP,
422 mapmap => $MAPMAP, 468 mapmap => $MAPMAP,
423 query => \&server_query, 469 query => \&server_query,
424 470
471 setup_req => {
472 smoothing => $CFG->{map_smoothing}*1,
473 },
474
425 sound_play => sub { 475 sound_play => sub {
426 my ($x, $y, $soundnum, $type) = @_; 476 my ($x, $y, $soundnum, $type) = @_;
427 477
428 $SDL_MIXER 478 $SDL_MIXER
429 or return; 479 or return;
… …
449 $LOGIN_BUTTON->set_text ("Login"); 499 $LOGIN_BUTTON->set_text ("Login");
450 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 500 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
451 $SETUP_DIALOG->show; 501 $SETUP_DIALOG->show;
452 $PL_WINDOW->hide; 502 $PL_WINDOW->hide;
453 $SPELL_LIST->clear_spells; 503 $SPELL_LIST->clear_spells;
504 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
505
506 &audio_music_set ([]);
454 507
455 return unless $CONN; 508 return unless $CONN;
456 509
457 status "connection closed"; 510 status "connection closed";
458 511
… …
473 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info"); 526 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
474 $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 (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
475 can_events => 1, 528 can_events => 1,
476 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>"); 529 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
477 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
478 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 535 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
479 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox); 536 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
480 537
538 $hbox->add (my $mode_slider = new CFPlus::UI::Slider
481 $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],
482 $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);
483 544
484 $mode_slider->connect (changed => sub { 545 $mode_slider->connect (changed => sub {
485 my ($self, $value) = @_; 546 my ($self, $value) = @_;
486 547
487 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 548 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
488 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 549 $mode_label->set_text (sprintf '%dx%d@%d+%d', @{$SDL_MODES[$value]});
489 }); 550 });
490 $mode_slider->emit (changed => $mode_slider->{range}[0]); 551 $mode_slider->emit (changed => $mode_slider->{range}[0]);
491 552
492 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
493 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 554 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
… …
501 state => $CFG->{fast}, 562 state => $CFG->{fast},
502 tooltip => "Lower the visual quality considerably to speed up rendering.", 563 tooltip => "Lower the visual quality considerably to speed up rendering.",
503 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 564 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
504 ); 565 );
505 566
567 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
568 $table->add (1, $row++, new CFPlus::UI::Slider
569 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
570 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
571 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
572 );
573
574 $table->add (1, $row++, new CFPlus::UI::Button
575 expand => 1, align => 0, text => "Apply",
576 tooltip => "Apply the video settings above.",
577 on_activate => sub {
578 video_shutdown ();
579 video_init ();
580 0
581 }
582 );
583
506 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 584 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
507 $table->add (1, $row++, new CFPlus::UI::Slider 585 $table->add (1, $row++, new CFPlus::UI::Slider
508 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 586 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
509 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 587 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
510 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 }
511 ); 589 );
512 590
591 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Smoothing");
592 $table->add (1, $row++, new CFPlus::UI::CheckBox
593 state => $CFG->{map_smoothing},
594 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
595 . "This increases load on the graphics subsystem and works only with 2.x servers. "
596 . "Changes take effect at next connection only.",
597 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
598 );
599
513 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 600 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
514 $table->add (1, $row++, new CFPlus::UI::CheckBox 601 $table->add (1, $row++, new CFPlus::UI::CheckBox
515 state => $CFG->{fow_enable}, 602 state => $CFG->{fow_enable},
516 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.",
517 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 } 604 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_enable} = $value; 0 }
… …
520 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity"); 607 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Intensity");
521 $table->add (1, $row++, new CFPlus::UI::Slider 608 $table->add (1, $row++, new CFPlus::UI::Slider
522 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256], 609 range => [$CFG->{fow_intensity}, 0, 1, 0, 1 / 256],
523 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.",
524 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 } 611 on_changed => sub { my ($self, $value) = @_; $CFG->{fow_intensity} = $value; 0 }
525 );
526
527 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "FoW Smooth");
528 $table->add (1, $row++, new CFPlus::UI::CheckBox
529 state => $CFG->{fow_smooth},
530 tooltip => "Smooth the Fog-of-War a bit to make it more realistic. Changes are instant.",
531 on_changed => sub {
532 my ($self, $value) = @_;
533 $CFG->{fow_smooth} = $value;
534 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
535 0
536 }
537 );
538
539 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
540 $table->add (1, $row++, new CFPlus::UI::Slider
541 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
542 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
543 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
544 ); 612 );
545 613
546 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 614 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
547 $table->add (1, $row++, new CFPlus::UI::Slider 615 $table->add (1, $row++, new CFPlus::UI::Slider
548 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 616 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
… …
566 range => [$CFG->{gauge_size}, 0.2, 0.8], 634 range => [$CFG->{gauge_size}, 0.2, 0.8],
567 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.",
568 on_changed => sub { 636 on_changed => sub {
569 $CFG->{gauge_size} = $_[1]; 637 $CFG->{gauge_size} = $_[1];
570 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 638 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
571 0
572 }
573 );
574
575 $table->add (1, $row++, new CFPlus::UI::Button
576 expand => 1, align => 0, text => "Apply",
577 tooltip => "Apply the video settings",
578 on_activate => sub {
579 video_shutdown ();
580 video_init ();
581 0 639 0
582 } 640 }
583 ); 641 );
584 642
585 $vbox 643 $vbox
… …
690 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 748 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
691 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 749 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
692 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 750 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
693 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 751 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
694 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 752 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
695 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 753 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
696
697 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
698
699 for my $x (0..2) {
700 for my $y (0 .. 2) {
701 $table->add ($x + 3, $y,
702 new CFPlus::UI::Entry
703 text => $default_smooth[$x * 3 + $y],
704 on_changed => sub { $MAP->{smooth_matrix}[$x * 3 + $y] = $_[1] if $MAP; 0 },
705 );
706 }
707 }
708 754
709 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d# 755 $table->add (0, 5, new CFPlus::UI::TextEdit text => "line1\0152\0153");#d#
710 756
711 $table 757 $table
712} 758}
… …
1098 : start_game; 1144 : start_game;
1099 0 1145 0
1100 }, 1146 },
1101 ); 1147 );
1102 1148
1149 $vbox->add (new CFPlus::UI::FancyFrame
1150 label => "Server Info",
1151 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1152 );
1153
1154 $vbox
1155}
1156
1157sub client_setup {
1158 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1159
1160 my $row = 0;
1161
1103 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1162 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1104 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry 1163 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1105 text => $CFG->{say_command}, 1164 text => $CFG->{say_command},
1106 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. " 1165 tooltip => "This is the command that will be used if you write a line in the message window entry or press <b>\"</b> in the map window. "
1107 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1166 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1108 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1167 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1109 on_changed => sub { 1168 on_changed => sub {
1110 my ($self, $value) = @_; 1169 my ($self, $value) = @_;
1111 $CFG->{say_command} = $value; 1170 $CFG->{say_command} = $value;
1112 0 1171 0
1113 } 1172 }
1114 ); 1173 );
1115 1174
1116 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1175 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1117 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox 1176 $table->add (1, $row++, new CFPlus::UI::CheckBox
1118 state => $CFG->{show_tips}, 1177 state => $CFG->{show_tips},
1119 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1178 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1120 on_changed => sub { 1179 on_changed => sub {
1121 my ($self, $value) = @_; 1180 my ($self, $value) = @_;
1122 $CFG->{show_tips} = $value; 1181 $CFG->{show_tips} = $value;
1123 0 1182 0
1124 } 1183 }
1125 ); 1184 );
1126 1185
1127 $vbox->add (new CFPlus::UI::FancyFrame 1186 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1128 label => "Server Info", 1187 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1129 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1188 text => $CFG->{logview_max_par},
1189 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1190 . "sends more messages than this number, older messages get removed to save memory and "
1191 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1192 on_changed => sub {
1193 my ($self, $value) = @_;
1194 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1195 0
1196 },
1130 ); 1197 );
1131 1198
1132 $vbox 1199 $table
1133} 1200}
1134 1201
1135sub message_window { 1202sub message_window {
1136 my $window = new CFPlus::UI::Toplevel 1203 my $window = new CFPlus::UI::Toplevel
1137 name => "message_window", 1204 name => "message_window",
… …
1194 1261
1195 $window 1262 $window
1196} 1263}
1197 1264
1198sub autopickup_setup { 1265sub autopickup_setup {
1266 my $r = new CFPlus::UI::ScrolledWindow (
1267 expand => 1,
1268 scroll_y => 1
1269 );
1199 my $table = new CFPlus::UI::Table; 1270 $r->add (my $table = new CFPlus::UI::Table
1271 row_expand => [0],
1272 col_expand => [0, 1, 0, 1],
1273 );
1200 1274
1201 for ( 1275 for (
1202 ["General", 0, 0, 1276 ["General", 0, 0,
1203 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1277 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1204 ["Inhibit autopickup" => PICKUP_INHIBIT], 1278 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1288 $::CONN->send_command ("pickup $::CFG->{pickup}") 1362 $::CONN->send_command ("pickup $::CFG->{pickup}")
1289 if defined $::CONN; 1363 if defined $::CONN;
1290 0 1364 0
1291 }); 1365 });
1292 1366
1293 $table 1367 $r
1294} 1368}
1295 1369
1296my %SORT_ORDER = ( 1370my %SORT_ORDER = (
1297 type => undef, 1371 type => undef,
1298 mtime => sub { 1372 mtime => sub {
… …
1377 has_close_button => 1 1451 has_close_button => 1
1378 ; 1452 ;
1379 1453
1380 my $ntb = 1454 my $ntb =
1381 $PL_NOTEBOOK = 1455 $PL_NOTEBOOK =
1382 new CFPlus::UI::Notebook expand => 1, debug => 1; 1456 new CFPlus::UI::Notebook expand => 1;
1383 1457
1384 $ntb->add ( 1458 $ntb->add (
1385 "Statistics (F2)" => $STATS_PAGE = stats_window, 1459 "Statistics (F2)" => $STATS_PAGE = stats_window,
1386 "Shows statistics, where all your Stats and Resistances are shown." 1460 "Shows statistics, where all your Stats and Resistances are shown."
1387 ); 1461 );
… …
1399 $ntb->add ( 1473 $ntb->add (
1400 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1474 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1401 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1475 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1402 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1476 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1403 ); 1477 );
1478 $ntb->add (Pickup => autopickup_setup,
1479 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1404 1480
1405 $ntb->set_current_page ($INVENTORY_PAGE); 1481 $ntb->set_current_page ($INVENTORY_PAGE);
1406 1482
1407 $plwin->add ($ntb); 1483 $plwin->add ($ntb);
1408 $plwin 1484 $plwin
… …
1630 CFPlus::SDL_Init 1706 CFPlus::SDL_Init
1631 and die "SDL::Init failed!\n"; 1707 and die "SDL::Init failed!\n";
1632} 1708}
1633 1709
1634sub video_init { 1710sub video_init {
1635 sdl_init;
1636
1637 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES; 1711 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} >= @SDL_MODES;
1638 1712
1639 my ($old_w, $old_h) = ($WIDTH, $HEIGHT); 1713 my ($old_w, $old_h) = ($WIDTH, $HEIGHT);
1640 1714
1641 ($WIDTH, $HEIGHT) = @{ $SDL_MODES[$CFG->{sdl_mode}] }; 1715 ($WIDTH, $HEIGHT, my ($rgb, $alpha)) = @{ $SDL_MODES[$CFG->{sdl_mode}] };
1642 $FULLSCREEN = $CFG->{fullscreen}; 1716 $FULLSCREEN = $CFG->{fullscreen};
1643 $FAST = $CFG->{fast}; 1717 $FAST = $CFG->{fast};
1644 1718
1645 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $FULLSCREEN 1719 CFPlus::SDL_SetVideoMode $WIDTH, $HEIGHT, $rgb, $alpha, $FULLSCREEN
1646 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n"; 1720 or die "SDL_SetVideoMode failed: " . (CFPlus::SDL_GetError) . "\n";
1647 1721
1648 $SDL_ACTIVE = 1; 1722 $SDL_ACTIVE = 1;
1649 $LAST_REFRESH = time - 0.01; 1723 $LAST_REFRESH = time - 0.01;
1650 1724
… …
1711 font => $FONT_FIXED, 1785 font => $FONT_FIXED,
1712 fontsize => $::CFG->{log_fontsize}, 1786 fontsize => $::CFG->{log_fontsize},
1713 indent => -4, 1787 indent => -4,
1714 can_hover => 1, 1788 can_hover => 1,
1715 can_events => 1, 1789 can_events => 1,
1790 max_par => $CFG->{logview_max_par},
1716 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1791 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1717 ; 1792 ;
1718 1793
1719 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1794 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1720 title => "Setup", 1795 title => "Setup",
1721 name => "setup_dialog", 1796 name => "setup_dialog",
… …
1732 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1807 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1733 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1808 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1734 1809
1735 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1810 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1736 "Configure the server to play on, your username, password and other server-related options."); 1811 "Configure the server to play on, your username, password and other server-related options.");
1737 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1812 $SETUP_NOTEBOOK->add (Client => client_setup,
1738 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1813 "Configure various client-specific settings.");
1739 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1814 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1740 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1815 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1741 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1816 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1742 "Configure the use of audio, sound effects and background music."); 1817 "Configure the use of audio, sound effects and background music.");
1743 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1818 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1921 CFPlus::OpenGL::shutdown; 1996 CFPlus::OpenGL::shutdown;
1922 1997
1923 undef $SDL_ACTIVE; 1998 undef $SDL_ACTIVE;
1924} 1999}
1925 2000
1926my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1927my $bgmusic;#TODO#hack#d#
1928
1929sub audio_channel_finished { 2001sub audio_channel_finished {
1930 my ($channel) = @_; 2002 my ($channel) = @_;
1931 2003
1932 #warn "channel $channel finished\n";#d# 2004 #warn "channel $channel finished\n";#d#
1933} 2005}
1934 2006
2007sub audio_music_set {
2008 my ($songs) = @_;
2009
2010 my @want =
2011 grep $_,
2012 map $CONN->{music_meta}{$_},
2013 @$songs;
2014
2015 if (@want) {
2016 @MUSIC_WANT = @want;
2017 &audio_music_changed ();
2018 }
2019}
2020
2021sub audio_music_start {
2022 my $path = $MUSIC_PLAYING->{path}
2023 or return;
2024
2025 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2026 # music might have changed...
2027 $path eq $MUSIC_PLAYING->{path}
2028 or return &audio_music_start ();
2029
2030 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2031
2032 my $NOW = time;
2033
2034 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2035 my $pos = $MUSIC_PLAYING->{stop_pos};
2036 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2037 $MUSIC_START = time - $pos;
2038 } else {
2039 $MUSIC_PLAYER->play (0);
2040 $MUSIC_START = time;
2041 }
2042
2043 delete $MUSIC_PLAYING->{stop_time};
2044 delete $MUSIC_PLAYING->{stop_pos};
2045 }
2046}
2047
2048sub audio_music_changed {
2049 return unless $CFG->{bgm_enable};
2050
2051 # default MUSIC_WANT == MUSIC_DEFAULT
2052 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2053
2054 # if the currently playing song is acceptable, let it continue
2055 return if $MUSIC_PLAYING
2056 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2057
2058 my $NOW = time;
2059
2060 if ($MUSIC_PLAYING) {
2061 $MUSIC_PLAYING->{stop_time} = $NOW;
2062 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2063 CFPlus::MixMusic::fade_out 1000;
2064 } else {
2065 # sort by stop time, oldest first
2066 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2067
2068 # if the most recently-played piece played very recently,
2069 # resume it, else choose the oldest piece for rotation.
2070 $MUSIC_PLAYING =
2071 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2072 ? $MUSIC_WANT[-1]
2073 : $MUSIC_WANT[0];
2074
2075 audio_music_start;
2076 }
2077}
2078
1935sub audio_music_finished { 2079sub audio_music_finished {
1936 return unless $CFG->{bgm_enable}; 2080 $MUSIC_PLAYING = undef;
2081 undef $MUSIC_PLAYER;
1937 2082
1938 # TODO: hack, do play loop and mood music 2083 audio_music_changed;
1939 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1940 $bgmusic->play (0);
1941
1942 push @bgmusic, shift @bgmusic;
1943} 2084}
1944 2085
1945sub audio_init { 2086sub audio_init {
1946 if ($CFG->{audio_enable}) { 2087 if ($CFG->{audio_enable}) {
1947 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2088 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1997 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4; 2138 debug sprintf "%3.2f", $fps if $ENV{CFPLUS_DEBUG} & 4;
1998 2139
1999 $CFPlus::UI::ROOT->draw; 2140 $CFPlus::UI::ROOT->draw;
2000 2141
2001 $WANT_REFRESH = 0; 2142 $WANT_REFRESH = 0;
2002 $CAN_REFRESH = 0; 2143 $CAN_REFRESH = 0;
2003 $LAST_REFRESH = $NOW; 2144 $LAST_REFRESH = $NOW;
2004 2145
2005 CFPlus::SDL_GL_SwapBuffers; 2146 CFPlus::SDL_GL_SwapBuffers;
2006} 2147}
2007 2148
2008my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2149my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2009 $NOW = time; 2150 $NOW = time;
2010 2151
2011 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2152 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2012 for CFPlus::SDL_PollEvent; 2153 for CFPlus::poll_events;
2013 2154
2014 if (%animate_object) { 2155 if (%animate_object) {
2015 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2156 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2016 $WANT_REFRESH++; 2157 ++$WANT_REFRESH;
2017 } 2158 }
2018 2159
2019 if ($WANT_REFRESH) { 2160 if ($WANT_REFRESH) {
2020 force_refresh; 2161 force_refresh;
2021 } else { 2162 } else {
… …
2042 if $CONN; 2183 if $CONN;
2043}); 2184});
2044 2185
2045%SDL_CB = ( 2186%SDL_CB = (
2046 CFPlus::SDL_QUIT => sub { 2187 CFPlus::SDL_QUIT => sub {
2047 Event::unloop -1; 2188 exit;
2048 }, 2189 },
2049 CFPlus::SDL_VIDEORESIZE => sub { 2190 CFPlus::SDL_VIDEORESIZE => sub {
2050 }, 2191 },
2051 CFPlus::SDL_VIDEOEXPOSE => sub { 2192 CFPlus::SDL_VIDEOEXPOSE => sub {
2052 CFPlus::UI::full_refresh; 2193 CFPlus::UI::full_refresh;
2053 }, 2194 },
2054 CFPlus::SDL_ACTIVEEVENT => sub { 2195 CFPlus::SDL_ACTIVEEVENT => sub {
2055# not useful, as APPACTIVE include sonly iconified state, not unmapped 2196# not useful, as APPACTIVE include sonly iconified state, not unmapped
2056# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2197# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2198# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2057# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2199# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2058# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2200# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2059# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2201# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2060 }, 2202 },
2061 CFPlus::SDL_KEYDOWN => sub { 2203 CFPlus::SDL_KEYDOWN => sub {
… …
2090 CFPlus::DB::Server::run; 2232 CFPlus::DB::Server::run;
2091 2233
2092 CFPlus::UI::set_layout ($::CFG->{layout}); 2234 CFPlus::UI::set_layout ($::CFG->{layout});
2093 2235
2094 my %DEF_CFG = ( 2236 my %DEF_CFG = (
2095 sdl_mode => 0, 2237 sdl_mode => 0,
2096 width => 640, 2238 width => 640,
2097 height => 480, 2239 height => 480,
2098 fullscreen => 0, 2240 fullscreen => 0,
2099 fast => 0, 2241 fast => 0,
2100 map_scale => 1, 2242 map_scale => 1,
2101 fow_enable => 1, 2243 fow_enable => 1,
2102 fow_intensity => 0.45, 2244 fow_intensity => 0,
2103 fow_smooth => 0, 2245 map_smoothing => 1,
2104 gui_fontsize => 1, 2246 gui_fontsize => 1,
2105 log_fontsize => 0.7, 2247 log_fontsize => 0.7,
2106 gauge_fontsize => 1, 2248 gauge_fontsize => 1,
2107 gauge_size => 0.35, 2249 gauge_size => 0.35,
2108 stat_fontsize => 0.7, 2250 stat_fontsize => 0.7,
2109 mapsize => 100, 2251 mapsize => 100,
2110 say_command => 'chat', 2252 say_command => 'chat',
2111 audio_enable => 1, 2253 audio_enable => 1,
2112 bgm_enable => 1, 2254 bgm_enable => 1,
2113 bgm_volume => 0.25, 2255 bgm_volume => 0.25,
2114 face_prefetch => 0, 2256 face_prefetch => 0,
2115 output_sync => 1, 2257 output_sync => 1,
2116 output_count => 1, 2258 output_count => 1,
2117 output_rate => "", 2259 output_rate => "",
2118 pickup => 0, 2260 pickup => 0,
2119 inv_sort => "mtime", 2261 inv_sort => "mtime",
2120 default => "profile", # default profile 2262 default => "profile", # default profile
2121 show_tips => 1, 2263 show_tips => 1,
2264 logview_max_par => 1000,
2122 ); 2265 );
2123 2266
2124 while (my ($k, $v) = each %DEF_CFG) { 2267 while (my ($k, $v) = each %DEF_CFG) {
2125 $CFG->{$k} = $v unless exists $CFG->{$k}; 2268 $CFG->{$k} = $v unless exists $CFG->{$k};
2126 } 2269 }
… …
2140 } 2283 }
2141 } 2284 }
2142 2285
2143 sdl_init; 2286 sdl_init;
2144 2287
2145 @SDL_MODES = reverse 2288 @SDL_MODES = CFPlus::SDL_ListModes 8, 8;
2146 grep $_->[0] >= 640 && $_->[1] >= 480, 2289 @SDL_MODES = CFPlus::SDL_ListModes 5, 0 unless @SDL_MODES;
2147 CFPlus::SDL_ListModes;
2148
2149 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)"; 2290 @SDL_MODES or CFPlus::fatal "Unable to find a usable video mode\n(hardware accelerated opengl fullscreen)";
2150 2291
2151 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES; 2292 $CFG->{sdl_mode} = 0 if $CFG->{sdl_mode} > @SDL_MODES;
2152 2293
2153 { 2294 {
… …
2195 2336
2196Event::loop; 2337Event::loop;
2197#CFPlus::SDL_Quit; 2338#CFPlus::SDL_Quit;
2198#CFPlus::_exit 0; 2339#CFPlus::_exit 0;
2199 2340
2341END {
2200END { CFPlus::SDL_Quit } 2342 CFPlus::SDL_Quit;
2343 CFPlus::DB::Server::stop;
2344}
2201 2345
2202=head1 NAME 2346=head1 NAME
2203 2347
2204cfplus - A Crossfire+ and Crossfire game client 2348cfplus - A Crossfire+ and Crossfire game client
2205 2349

Diff Legend

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