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.143 by root, Fri Mar 16 02:33:50 2007 UTC vs.
Revision 1.171 by root, Sun Jul 15 21:42:02 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
… …
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 );
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 }
266 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"),
… …
419 statusbox => $STATUSBOX, 469 statusbox => $STATUSBOX,
420 map => $MAP, 470 map => $MAP,
421 mapmap => $MAPMAP, 471 mapmap => $MAPMAP,
422 query => \&server_query, 472 query => \&server_query,
423 473
474 setup_req => {
475 smoothing => $CFG->{map_smoothing}*1,
476 },
477
424 sound_play => sub { 478 sound_play => sub {
425 my ($x, $y, $soundnum, $type) = @_; 479 my ($x, $y, $soundnum, $type) = @_;
426 480
427 $SDL_MIXER 481 $SDL_MIXER
428 or return; 482 or return;
… …
448 $LOGIN_BUTTON->set_text ("Login"); 502 $LOGIN_BUTTON->set_text ("Login");
449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 503 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
450 $SETUP_DIALOG->show; 504 $SETUP_DIALOG->show;
451 $PL_WINDOW->hide; 505 $PL_WINDOW->hide;
452 $SPELL_LIST->clear_spells; 506 $SPELL_LIST->clear_spells;
507 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
508
509 &audio_music_set ([]);
453 510
454 return unless $CONN; 511 return unless $CONN;
455 512
456 status "connection closed"; 513 status "connection closed";
457 514
… …
465sub graphics_setup { 522sub graphics_setup {
466 my $vbox = new CFPlus::UI::VBox; 523 my $vbox = new CFPlus::UI::VBox;
467 524
468 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 525 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
469 526
527 my $row = 0;
528
529 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
530 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
531 can_events => 1,
532 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
533
470 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 534 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
471 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 535 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
472 536
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]); 537 $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]);
474 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 538 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
475 539
476 $mode_slider->connect (changed => sub { 540 $mode_slider->connect (changed => sub {
… …
478 542
479 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 543 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
480 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 544 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
481 }); 545 });
482 $mode_slider->emit (changed => $mode_slider->{range}[0]); 546 $mode_slider->emit (changed => $mode_slider->{range}[0]);
483
484 my $row = 1;
485 547
486 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 548 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
487 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 549 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
488 state => $CFG->{fullscreen}, 550 state => $CFG->{fullscreen},
489 tooltip => "Bring the client into fullscreen mode.", 551 tooltip => "Bring the client into fullscreen mode.",
… …
495 state => $CFG->{fast}, 557 state => $CFG->{fast},
496 tooltip => "Lower the visual quality considerably to speed up rendering.", 558 tooltip => "Lower the visual quality considerably to speed up rendering.",
497 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 559 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
498 ); 560 );
499 561
562 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
563 $table->add (1, $row++, new CFPlus::UI::Slider
564 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
565 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
566 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
567 );
568
569 $table->add (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings above.",
572 on_activate => sub {
573 video_shutdown ();
574 video_init ();
575 0
576 }
577 );
578
500 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 579 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
501 $table->add (1, $row++, new CFPlus::UI::Slider 580 $table->add (1, $row++, new CFPlus::UI::Slider
502 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 581 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
503 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 582 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
504 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 583 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
584 );
585
586 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
587 $table->add (1, $row++, new CFPlus::UI::CheckBox
588 state => $CFG->{map_smoothing},
589 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
590 . "This increases load on the graphics subsystem and works only with 2.x servers. "
591 . "Changes take effect at next connection only.",
592 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
505 ); 593 );
506 594
507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 595 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
508 $table->add (1, $row++, new CFPlus::UI::CheckBox 596 $table->add (1, $row++, new CFPlus::UI::CheckBox
509 state => $CFG->{fow_enable}, 597 state => $CFG->{fow_enable},
… …
528 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 616 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
529 0 617 0
530 } 618 }
531 ); 619 );
532 620
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"); 621 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
541 $table->add (1, $row++, new CFPlus::UI::Slider 622 $table->add (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 623 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.", 624 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 }, 625 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
560 range => [$CFG->{gauge_size}, 0.2, 0.8], 641 range => [$CFG->{gauge_size}, 0.2, 0.8],
561 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 642 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
562 on_changed => sub { 643 on_changed => sub {
563 $CFG->{gauge_size} = $_[1]; 644 $CFG->{gauge_size} = $_[1];
564 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 645 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
565 0
566 }
567 );
568
569 $table->add (1, $row++, new CFPlus::UI::Button
570 expand => 1, align => 0, text => "Apply",
571 tooltip => "Apply the video settings",
572 on_activate => sub {
573 video_shutdown ();
574 video_init ();
575 0 646 0
576 } 647 }
577 ); 648 );
578 649
579 $vbox 650 $vbox
… …
684 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 755 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
685 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 756 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
686 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 757 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
687 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 758 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
688 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 759 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
689 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } ); 760 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
690 761
691 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 762 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
692 763
693 for my $x (0..2) { 764 for my $x (0..2) {
694 for my $y (0 .. 2) { 765 for my $y (0 .. 2) {
… …
1092 : start_game; 1163 : start_game;
1093 0 1164 0
1094 }, 1165 },
1095 ); 1166 );
1096 1167
1168 $vbox->add (new CFPlus::UI::FancyFrame
1169 label => "Server Info",
1170 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1171 );
1172
1173 $vbox
1174}
1175
1176sub client_setup {
1177 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1178
1179 my $row = 0;
1180
1097 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1181 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1098 $table->add (1, 13, my $saycmd = new CFPlus::UI::Entry 1182 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1099 text => $CFG->{say_command}, 1183 text => $CFG->{say_command},
1100 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. " 1184 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. "
1101 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1185 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1102 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1186 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1103 on_changed => sub { 1187 on_changed => sub {
1104 my ($self, $value) = @_; 1188 my ($self, $value) = @_;
1105 $CFG->{say_command} = $value; 1189 $CFG->{say_command} = $value;
1106 0 1190 0
1107 } 1191 }
1108 ); 1192 );
1109 1193
1110 $table->add (0, 14, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1194 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1111 $table->add (1, 14, my $saycmd = new CFPlus::UI::CheckBox 1195 $table->add (1, $row++, new CFPlus::UI::CheckBox
1112 state => $CFG->{show_tips}, 1196 state => $CFG->{show_tips},
1113 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1197 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1114 on_changed => sub { 1198 on_changed => sub {
1115 my ($self, $value) = @_; 1199 my ($self, $value) = @_;
1116 $CFG->{show_tips} = $value; 1200 $CFG->{show_tips} = $value;
1117 0 1201 0
1118 } 1202 }
1119 ); 1203 );
1120 1204
1121 $vbox->add (new CFPlus::UI::FancyFrame 1205 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1122 label => "Server Info", 1206 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1123 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1207 text => $CFG->{logview_max_par},
1208 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1209 . "sends more messages than this number, older messages get removed to save memory and "
1210 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1211 on_changed => sub {
1212 my ($self, $value) = @_;
1213 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1214 0
1215 },
1124 ); 1216 );
1125 1217
1126 $vbox 1218 $table
1127} 1219}
1128 1220
1129sub message_window { 1221sub message_window {
1130 my $window = new CFPlus::UI::Toplevel 1222 my $window = new CFPlus::UI::Toplevel
1131 name => "message_window", 1223 name => "message_window",
… …
1188 1280
1189 $window 1281 $window
1190} 1282}
1191 1283
1192sub autopickup_setup { 1284sub autopickup_setup {
1285 my $r = new CFPlus::UI::ScrolledWindow (
1286 expand => 1,
1287 scroll_y => 1
1288 );
1193 my $table = new CFPlus::UI::Table; 1289 $r->add (my $table = new CFPlus::UI::Table
1290 row_expand => [0],
1291 col_expand => [0, 1, 0, 1],
1292 );
1194 1293
1195 for ( 1294 for (
1196 ["General", 0, 0, 1295 ["General", 0, 0,
1197 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE], 1296 ["Enable autopickup" => PICKUP_NEWMODE, \$PICKUP_ENABLE],
1198 ["Inhibit autopickup" => PICKUP_INHIBIT], 1297 ["Inhibit autopickup" => PICKUP_INHIBIT],
… …
1282 $::CONN->send_command ("pickup $::CFG->{pickup}") 1381 $::CONN->send_command ("pickup $::CFG->{pickup}")
1283 if defined $::CONN; 1382 if defined $::CONN;
1284 0 1383 0
1285 }); 1384 });
1286 1385
1287 $table 1386 $r
1288} 1387}
1289 1388
1290my %SORT_ORDER = ( 1389my %SORT_ORDER = (
1291 type => undef, 1390 type => undef,
1292 mtime => sub { 1391 mtime => sub {
… …
1371 has_close_button => 1 1470 has_close_button => 1
1372 ; 1471 ;
1373 1472
1374 my $ntb = 1473 my $ntb =
1375 $PL_NOTEBOOK = 1474 $PL_NOTEBOOK =
1376 new CFPlus::UI::Notebook expand => 1, debug => 1; 1475 new CFPlus::UI::Notebook expand => 1;
1377 1476
1378 $ntb->add ( 1477 $ntb->add (
1379 "Statistics (F2)" => $STATS_PAGE = stats_window, 1478 "Statistics (F2)" => $STATS_PAGE = stats_window,
1380 "Shows statistics, where all your Stats and Resistances are shown." 1479 "Shows statistics, where all your Stats and Resistances are shown."
1381 ); 1480 );
… …
1393 $ntb->add ( 1492 $ntb->add (
1394 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1493 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1395 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1494 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1396 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1495 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1397 ); 1496 );
1497 $ntb->add (Pickup => autopickup_setup,
1498 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1398 1499
1399 $ntb->set_current_page ($INVENTORY_PAGE); 1500 $ntb->set_current_page ($INVENTORY_PAGE);
1400 1501
1401 $plwin->add ($ntb); 1502 $plwin->add ($ntb);
1402 $plwin 1503 $plwin
… …
1568 1669
1569sub show_tip_of_the_day { 1670sub show_tip_of_the_day {
1570 # find all tips 1671 # find all tips
1571 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1672 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1572 1673
1573 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1674 CFPlus::DB::get state => "tip_of_the_day", sub {
1675 my ($todindex) = @_;
1574 $todindex = 0 if $todindex >= @tod; 1676 $todindex = 0 if $todindex >= @tod;
1575 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1677 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1576 1678
1577 # create dialog 1679 # create dialog
1578 my $dialog; 1680 my $dialog;
1579 1681
1580 my $close = sub { 1682 my $close = sub {
1581 $dialog->destroy; 1683 $dialog->destroy;
1684 };
1685
1686 $dialog = new CFPlus::UI::Toplevel
1687 x => "center",
1688 y => "center",
1689 z => 3,
1690 name => 'tip_of_the_day',
1691 force_w => int $WIDTH * 4/9,
1692 force_h => int $WIDTH * 2/9,
1693 title => "Tip of the day #" . (1 + $todindex),
1694 child => my $vbox = new CFPlus::UI::VBox,
1695 has_close_button => 1,
1696 on_delete => $close,
1697 ;
1698
1699 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1700 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1701 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1702
1703 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1704
1705 $table->add (0, 0, new CFPlus::UI::Button
1706 text => "Close",
1707 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>.",
1708 on_activate => $close,
1709 );
1710
1711 $table->add (2, 0, new CFPlus::UI::Button
1712 text => "Next",
1713 tooltip => "Show the next <b>Tip of the day</b>.",
1714 on_activate => sub {
1715 $close->();
1716 &show_tip_of_the_day;
1717 },
1718 );
1719
1720 $dialog->show;
1582 }; 1721 };
1583
1584 $dialog = new CFPlus::UI::Toplevel
1585 x => "center",
1586 y => "center",
1587 z => 3,
1588 name => 'tip_of_the_day',
1589 force_w => int $WIDTH * 4/9,
1590 force_h => int $WIDTH * 2/9,
1591 title => "Tip of the day #" . (1 + $todindex),
1592 child => my $vbox = new CFPlus::UI::VBox,
1593 has_close_button => 1,
1594 on_delete => $close,
1595 ;
1596
1597 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1598 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1599 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1600
1601 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1602
1603 $table->add (0, 0, new CFPlus::UI::Button
1604 text => "Close",
1605 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>.",
1606 on_activate => $close,
1607 );
1608
1609 $table->add (2, 0, new CFPlus::UI::Button
1610 text => "Next",
1611 tooltip => "Show the next <b>Tip of the day</b>.",
1612 on_activate => sub {
1613 $close->();
1614 &show_tip_of_the_day;
1615 },
1616 );
1617
1618 $dialog->show;
1619} 1722}
1620 1723
1621sub sdl_init { 1724sub sdl_init {
1622 CFPlus::SDL_Init 1725 CFPlus::SDL_Init
1623 and die "SDL::Init failed!\n"; 1726 and die "SDL::Init failed!\n";
… …
1703 font => $FONT_FIXED, 1806 font => $FONT_FIXED,
1704 fontsize => $::CFG->{log_fontsize}, 1807 fontsize => $::CFG->{log_fontsize},
1705 indent => -4, 1808 indent => -4,
1706 can_hover => 1, 1809 can_hover => 1,
1707 can_events => 1, 1810 can_events => 1,
1811 max_par => $CFG->{logview_max_par},
1708 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1812 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1709 ; 1813 ;
1710 1814
1711 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1815 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1712 title => "Setup", 1816 title => "Setup",
1713 name => "setup_dialog", 1817 name => "setup_dialog",
… …
1724 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1828 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1725 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1829 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1726 1830
1727 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1831 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1728 "Configure the server to play on, your username, password and other server-related options."); 1832 "Configure the server to play on, your username, password and other server-related options.");
1729 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1833 $SETUP_NOTEBOOK->add (Client => client_setup,
1730 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1834 "Configure various client-specific settings.");
1731 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1835 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1732 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1836 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1733 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1837 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1734 "Configure the use of audio, sound effects and background music."); 1838 "Configure the use of audio, sound effects and background music.");
1735 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1839 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1913 CFPlus::OpenGL::shutdown; 2017 CFPlus::OpenGL::shutdown;
1914 2018
1915 undef $SDL_ACTIVE; 2019 undef $SDL_ACTIVE;
1916} 2020}
1917 2021
1918my @bgmusic = qw(game1.ogg game2.ogg game3.ogg game5.ogg game6.ogg ross1.ogg ross2.ogg ross3.ogg ross4.ogg ross5.ogg); #d#
1919my $bgmusic;#TODO#hack#d#
1920
1921sub audio_channel_finished { 2022sub audio_channel_finished {
1922 my ($channel) = @_; 2023 my ($channel) = @_;
1923 2024
1924 #warn "channel $channel finished\n";#d# 2025 #warn "channel $channel finished\n";#d#
1925} 2026}
1926 2027
2028sub audio_music_set {
2029 my ($songs) = @_;
2030
2031 my @want =
2032 grep $_,
2033 map $CONN->{music_meta}{$_},
2034 @$songs;
2035
2036 if (@want) {
2037 @MUSIC_WANT = @want;
2038 &audio_music_changed ();
2039 }
2040}
2041
2042sub audio_music_start {
2043 my $path = $MUSIC_PLAYING->{path}
2044 or return;
2045
2046 CFPlus::DB::prefetch_file $path, 1024_000, sub {
2047 # music might have changed...
2048 $path eq $MUSIC_PLAYING->{path}
2049 or return &audio_music_start ();
2050
2051 $MUSIC_PLAYER = new_from_file CFPlus::MixMusic $path;
2052
2053 my $NOW = time;
2054
2055 if ($MUSIC_PLAYING->{stop_time} > $NOW - $MUSIC_RESUME) {
2056 my $pos = $MUSIC_PLAYING->{stop_pos};
2057 $MUSIC_PLAYER->fade_in_pos (0, 1000, $pos);
2058 $MUSIC_START = time - $pos;
2059 } else {
2060 $MUSIC_PLAYER->play (0);
2061 $MUSIC_START = time;
2062 }
2063
2064 delete $MUSIC_PLAYING->{stop_time};
2065 delete $MUSIC_PLAYING->{stop_pos};
2066 }
2067}
2068
2069sub audio_music_changed {
2070 return unless $CFG->{bgm_enable};
2071
2072 # default MUSIC_WANT == MUSIC_DEFAULT
2073 @MUSIC_WANT = { path => CFPlus::find_rcfile "music/$MUSIC_DEFAULT" } unless @MUSIC_WANT;
2074
2075 # if the currently playing song is acceptable, let it continue
2076 return if $MUSIC_PLAYING
2077 && grep $MUSIC_PLAYING->{path} eq $_->{path}, @MUSIC_WANT;
2078
2079 my $NOW = time;
2080
2081 if ($MUSIC_PLAYING) {
2082 $MUSIC_PLAYING->{stop_time} = $NOW;
2083 $MUSIC_PLAYING->{stop_pos} = $NOW - $MUSIC_START;
2084 CFPlus::MixMusic::fade_out 1000;
2085 } else {
2086 # sort by stop time, oldest first
2087 @MUSIC_WANT = sort { $a->{stop_time} <=> $b->{stop_time} } @MUSIC_WANT;
2088
2089 # if the most recently-played piece played very recently,
2090 # resume it, else choose the oldest piece for rotation.
2091 $MUSIC_PLAYING =
2092 $MUSIC_WANT[-1]{stop_time} > $NOW - $MUSIC_RESUME
2093 ? $MUSIC_WANT[-1]
2094 : $MUSIC_WANT[0];
2095
2096 audio_music_start;
2097 }
2098}
2099
1927sub audio_music_finished { 2100sub audio_music_finished {
1928 return unless $CFG->{bgm_enable}; 2101 $MUSIC_PLAYING = undef;
2102 undef $MUSIC_PLAYER;
1929 2103
1930 # TODO: hack, do play loop and mood music 2104 audio_music_changed;
1931 $bgmusic = new_from_file CFPlus::MixMusic CFPlus::find_rcfile "music/$bgmusic[0]";
1932 $bgmusic->play (0);
1933
1934 push @bgmusic, shift @bgmusic;
1935} 2105}
1936 2106
1937sub audio_init { 2107sub audio_init {
1938 if ($CFG->{audio_enable}) { 2108 if ($CFG->{audio_enable}) {
1939 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") { 2109 if (open my $fh, "<", CFPlus::find_rcfile "sounds/config") {
… …
1999 2169
2000my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub { 2170my $refresh_watcher = Event->timer (after => 0, hard => 0, interval => 1 / $MAX_FPS, cb => sub {
2001 $NOW = time; 2171 $NOW = time;
2002 2172
2003 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_) 2173 ($SDL_CB{$_->{type}} || sub { warn "unhandled event $_->{type}" })->($_)
2004 for CFPlus::SDL_PollEvent; 2174 for CFPlus::poll_events;
2005 2175
2006 if (%animate_object) { 2176 if (%animate_object) {
2007 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object; 2177 $_->animate ($LAST_REFRESH - $NOW) for values %animate_object;
2008 $WANT_REFRESH++; 2178 $WANT_REFRESH++;
2009 } 2179 }
… …
2034 if $CONN; 2204 if $CONN;
2035}); 2205});
2036 2206
2037%SDL_CB = ( 2207%SDL_CB = (
2038 CFPlus::SDL_QUIT => sub { 2208 CFPlus::SDL_QUIT => sub {
2039 Event::unloop -1; 2209 exit;
2040 }, 2210 },
2041 CFPlus::SDL_VIDEORESIZE => sub { 2211 CFPlus::SDL_VIDEORESIZE => sub {
2042 }, 2212 },
2043 CFPlus::SDL_VIDEOEXPOSE => sub { 2213 CFPlus::SDL_VIDEOEXPOSE => sub {
2044 CFPlus::UI::full_refresh; 2214 CFPlus::UI::full_refresh;
2045 }, 2215 },
2046 CFPlus::SDL_ACTIVEEVENT => sub { 2216 CFPlus::SDL_ACTIVEEVENT => sub {
2047# not useful, as APPACTIVE include sonly iconified state, not unmapped 2217# not useful, as APPACTIVE include sonly iconified state, not unmapped
2048# printf "active %x %x\n", $_[0]{gain}, $_[0]{state};#d# 2218# printf "active %x %x %x\n", $_[0]{gain}, $_[0]{state}, CFPlus::SDL_GetAppState;#d#
2219# printf "a %x\n", CFPlus::SDL_GetAppState & CFPlus::SDL_APPACTIVE;#d#
2049# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE; 2220# printf "A\n" if $_[0]{state} & CFPlus::SDL_APPACTIVE;
2050# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS; 2221# printf "K\n" if $_[0]{state} & CFPlus::SDL_APPINPUTFOCUS;
2051# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS; 2222# printf "M\n" if $_[0]{state} & CFPlus::SDL_APPMOUSEFOCUS;
2052 }, 2223 },
2053 CFPlus::SDL_KEYDOWN => sub { 2224 CFPlus::SDL_KEYDOWN => sub {
… …
2077 2248
2078$SIG{INT} = $SIG{TERM} = sub { exit }; 2249$SIG{INT} = $SIG{TERM} = sub { exit };
2079 2250
2080{ 2251{
2081 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2252 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2253 CFPlus::DB::Server::run;
2254
2082 CFPlus::UI::set_layout ($::CFG->{layout}); 2255 CFPlus::UI::set_layout ($::CFG->{layout});
2083 2256
2084 my %DEF_CFG = ( 2257 my %DEF_CFG = (
2085 sdl_mode => 0, 2258 sdl_mode => 0,
2086 width => 640, 2259 width => 640,
2087 height => 480, 2260 height => 480,
2088 fullscreen => 0, 2261 fullscreen => 0,
2089 fast => 0, 2262 fast => 0,
2090 map_scale => 1, 2263 map_scale => 1,
2091 fow_enable => 1, 2264 fow_enable => 1,
2092 fow_intensity => 0.45, 2265 fow_intensity => 0.45,
2093 fow_smooth => 0, 2266 fow_smooth => 0,
2267 map_smoothing => 1,
2094 gui_fontsize => 1, 2268 gui_fontsize => 1,
2095 log_fontsize => 0.7, 2269 log_fontsize => 0.7,
2096 gauge_fontsize => 1, 2270 gauge_fontsize => 1,
2097 gauge_size => 0.35, 2271 gauge_size => 0.35,
2098 stat_fontsize => 0.7, 2272 stat_fontsize => 0.7,
2099 mapsize => 100, 2273 mapsize => 100,
2100 say_command => 'chat', 2274 say_command => 'chat',
2101 audio_enable => 1, 2275 audio_enable => 1,
2102 bgm_enable => 1, 2276 bgm_enable => 1,
2103 bgm_volume => 0.25, 2277 bgm_volume => 0.25,
2104 face_prefetch => 0, 2278 face_prefetch => 0,
2105 output_sync => 1, 2279 output_sync => 1,
2106 output_count => 1, 2280 output_count => 1,
2107 output_rate => "", 2281 output_rate => "",
2108 pickup => 0, 2282 pickup => 0,
2109 inv_sort => "mtime", 2283 inv_sort => "mtime",
2110 default => "profile", # default profile 2284 default => "profile", # default profile
2111 show_tips => 1, 2285 show_tips => 1,
2286 logview_max_par => 1000,
2112 ); 2287 );
2113 2288
2114 while (my ($k, $v) = each %DEF_CFG) { 2289 while (my ($k, $v) = each %DEF_CFG) {
2115 $CFG->{$k} = $v unless exists $CFG->{$k}; 2290 $CFG->{$k} = $v unless exists $CFG->{$k};
2116 } 2291 }
… …
2185 2360
2186Event::loop; 2361Event::loop;
2187#CFPlus::SDL_Quit; 2362#CFPlus::SDL_Quit;
2188#CFPlus::_exit 0; 2363#CFPlus::_exit 0;
2189 2364
2365END {
2190END { CFPlus::SDL_Quit } 2366 CFPlus::SDL_Quit;
2367 CFPlus::DB::Server::stop;
2368}
2191 2369
2192=head1 NAME 2370=head1 NAME
2193 2371
2194cfplus - A Crossfire+ and Crossfire game client 2372cfplus - A Crossfire+ and Crossfire game client
2195 2373

Diff Legend

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