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.141 by elmex, Sat Dec 16 17:33:26 2006 UTC vs.
Revision 1.161 by root, Thu Jul 5 06:57:03 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;
… …
206 title => "Server Query", 229 title => "Server Query",
207 child => my $vbox = new CFPlus::UI::VBox, 230 child => my $vbox = new CFPlus::UI::VBox,
208 ; 231 ;
209 232
210 my @dialog = my $label = new CFPlus::UI::Label 233 my @dialog = my $label = new CFPlus::UI::Label
211 max_w => $::WIDTH * 0.4, 234 max_w => $::WIDTH * 0.8,
212 ellipsise => 0, 235 ellipsise => 0,
213 text => $prompt; 236 text => $prompt;
214 237
215 if ($flags & CS_QUERY_YESNO) { 238 if ($flags & CS_QUERY_YESNO) {
216 push @dialog, my $hbox = new CFPlus::UI::HBox; 239 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
233 ); 256 );
234 257
235 $dialog->grab_focus; 258 $dialog->grab_focus;
236 259
237 } elsif ($flags & CS_QUERY_SINGLECHAR) { 260 } 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) { 261 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
241 $MESSAGE_WINDOW->show; 262 $dialog->{tooltip} = "#charcreation_focus";
242 263
243 unshift @dialog, new CFPlus::UI::Label 264 unshift @dialog, new CFPlus::UI::Label
244 max_w => $::WIDTH * 0.4, 265 max_w => $::WIDTH * 0.8,
245 ellipsise => 0, 266 ellipsise => 0,
246 markup => "\nOr use your keyboard and the text entry below:\n"; 267 markup => "\nOr use your keyboard and the text entry below:\n";
247 268
248 unshift @dialog, my $table = new CFPlus::UI::Table; 269 unshift @dialog, my $table = new CFPlus::UI::Table;
249 270
… …
261 $conn->send ("reply d"); 282 $conn->send ("reply d");
262 destroy_query_dialog $conn; 283 destroy_query_dialog $conn;
263 0 284 0
264 }, 285 },
265 ); 286 );
287
288 if ($conn->{chargen_race_description}) {
289 unshift @dialog, new CFPlus::UI::Label
290 max_w => $::WIDTH * 0.8,
291 ellipsise => 0,
292 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
293 ;
294 }
295
296 unshift @dialog, new CFPlus::UI::Face
297 face => $conn->{player}{face},
298 bg => [.2, .2, .2, 1],
299 min_w => 64,
300 min_h => 64,
301 ;
302
303 if ($conn->{chargen_race_title}) {
304 unshift @dialog, new CFPlus::UI::Label
305 allign => 1,
306 ellipsise => 0,
307 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
308 ;
309 }
266 310
267 unshift @dialog, new CFPlus::UI::Label 311 unshift @dialog, new CFPlus::UI::Label
268 max_w => $::WIDTH * 0.4, 312 max_w => $::WIDTH * 0.4,
269 ellipsise => 0, 313 ellipsise => 0,
270 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 314 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
401 445
402 my ($host, $port) = split /:/, $PROFILE->{host}; 446 my ($host, $port) = split /:/, $PROFILE->{host};
403 447
404 $MAP = new CFPlus::Map; 448 $MAP = new CFPlus::Map;
405 449
450 warn "connecting...\n";#d#
406 $CONN = eval { 451 $CONN = eval {
407 new CFPlus::Protocol 452 new CFPlus::Protocol
408 host => $host, 453 host => $host,
409 port => $port || 13327, 454 port => $port || 13327,
410 user => $PROFILE->{user}, 455 user => $PROFILE->{user},
… …
419 statusbox => $STATUSBOX, 464 statusbox => $STATUSBOX,
420 map => $MAP, 465 map => $MAP,
421 mapmap => $MAPMAP, 466 mapmap => $MAPMAP,
422 query => \&server_query, 467 query => \&server_query,
423 468
469 setup_req => {
470 smoothing => $CFG->{map_smoothing}*1,
471 },
472
424 sound_play => sub { 473 sound_play => sub {
425 my ($x, $y, $soundnum, $type) = @_; 474 my ($x, $y, $soundnum, $type) = @_;
426 475
427 $SDL_MIXER 476 $SDL_MIXER
428 or return; 477 or return;
… …
431 or return; 480 or return;
432 481
433 $chunk->play; 482 $chunk->play;
434 }, 483 },
435 }; 484 };
485 warn "connected<$CONN,$@>\n";#d#
436 486
437 if ($CONN) { 487 if ($CONN) {
438 CFPlus::lowdelay fileno $CONN->{fh}; 488 CFPlus::lowdelay fileno $CONN->{fh};
439 489
440 status "login successful"; 490 status "login successful";
… …
448 $LOGIN_BUTTON->set_text ("Login"); 498 $LOGIN_BUTTON->set_text ("Login");
449 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 499 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
450 $SETUP_DIALOG->show; 500 $SETUP_DIALOG->show;
451 $PL_WINDOW->hide; 501 $PL_WINDOW->hide;
452 $SPELL_LIST->clear_spells; 502 $SPELL_LIST->clear_spells;
503 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
453 504
454 return unless $CONN; 505 return unless $CONN;
455 506
456 status "connection closed"; 507 status "connection closed";
457 508
… …
465sub graphics_setup { 516sub graphics_setup {
466 my $vbox = new CFPlus::UI::VBox; 517 my $vbox = new CFPlus::UI::VBox;
467 518
468 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 519 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
469 520
521 my $row = 0;
522
523 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
524 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
525 can_events => 1,
526 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
527
470 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 528 $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); 529 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
472 530
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]); 531 $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"); 532 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
475 533
476 $mode_slider->connect (changed => sub { 534 $mode_slider->connect (changed => sub {
… …
478 536
479 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 537 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
480 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 538 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
481 }); 539 });
482 $mode_slider->emit (changed => $mode_slider->{range}[0]); 540 $mode_slider->emit (changed => $mode_slider->{range}[0]);
483
484 my $row = 1;
485 541
486 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 542 $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 543 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
488 state => $CFG->{fullscreen}, 544 state => $CFG->{fullscreen},
489 tooltip => "Bring the client into fullscreen mode.", 545 tooltip => "Bring the client into fullscreen mode.",
… …
495 state => $CFG->{fast}, 551 state => $CFG->{fast},
496 tooltip => "Lower the visual quality considerably to speed up rendering.", 552 tooltip => "Lower the visual quality considerably to speed up rendering.",
497 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 553 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
498 ); 554 );
499 555
556 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
557 $table->add (1, $row++, new CFPlus::UI::Slider
558 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
559 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
560 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
561 );
562
563 $table->add (1, $row++, new CFPlus::UI::Button
564 expand => 1, align => 0, text => "Apply",
565 tooltip => "Apply the video settings above.",
566 on_activate => sub {
567 video_shutdown ();
568 video_init ();
569 0
570 }
571 );
572
500 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 573 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
501 $table->add (1, $row++, new CFPlus::UI::Slider 574 $table->add (1, $row++, new CFPlus::UI::Slider
502 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 575 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
503 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 576 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
504 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 577 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
578 );
579
580 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
581 $table->add (1, $row++, new CFPlus::UI::CheckBox
582 state => $CFG->{map_smoothing},
583 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
584 . "This increases load on the graphics subsystem and works only with 2.x servers. "
585 . "Changes take effect at next connection only.",
586 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
505 ); 587 );
506 588
507 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 589 $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 590 $table->add (1, $row++, new CFPlus::UI::CheckBox
509 state => $CFG->{fow_enable}, 591 state => $CFG->{fow_enable},
… …
528 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 610 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
529 0 611 0
530 } 612 }
531 ); 613 );
532 614
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"); 615 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
541 $table->add (1, $row++, new CFPlus::UI::Slider 616 $table->add (1, $row++, new CFPlus::UI::Slider
542 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 617 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.", 618 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 }, 619 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
560 range => [$CFG->{gauge_size}, 0.2, 0.8], 635 range => [$CFG->{gauge_size}, 0.2, 0.8],
561 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 636 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
562 on_changed => sub { 637 on_changed => sub {
563 $CFG->{gauge_size} = $_[1]; 638 $CFG->{gauge_size} = $_[1];
564 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 639 $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 640 0
576 } 641 }
577 ); 642 );
578 643
579 $vbox 644 $vbox
… …
684 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 749 $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"); 750 $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 }); 751 $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"); 752 $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 }); 753 $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" } ); 754 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { &CFPlus::debug() } );
690 755
691 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 756 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
692 757
693 for my $x (0..2) { 758 for my $x (0..2) {
694 for my $y (0 .. 2) { 759 for my $y (0 .. 2) {
… …
905 for 0 .. $#col; 970 for 0 .. $#col;
906 971
907 my @align = qw(1 0 1 1 -1); 972 my @align = qw(1 0 1 1 -1);
908 973
909 my $y = 0; 974 my $y = 0;
910 for my $m (
911 sort {
912 $b->{version} <=> $a->{version}
913 or $b->{users} <=> $a->{users}
914 }
915 @{ $msg->{servers} } 975 for my $m (@{ $msg->{servers} }) {
916 ) {
917 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 976 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
918 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 977 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
919 978
920 for ($desc) { 979 for ($desc) {
921 s/<br>/\n/gi; 980 s/<br>/\n/gi;
922 s/<li>/\n· /gi; 981 s/<li>/\n· /gi;
923 s/<.*?>//sgi; 982 s/<.*?>//sgi;
… …
953 max_w => $::WIDTH * 0.4, 1012 max_w => $::WIDTH * 0.4,
954 ellipsise => 0, 1013 ellipsise => 0,
955 align => $align[$_], 1014 align => $align[$_],
956 text => $m->[$_], 1015 text => $m->[$_],
957 tooltip => $tip[$_], 1016 tooltip => $tip[$_],
958 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1017 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
959 can_hover => 1, 1018 can_hover => 1,
960 can_events => 1, 1019 can_events => 1,
961 fontsize => 0.8) 1020 fontsize => 0.8)
962 for 0 .. $#$m; 1021 for 0 .. $#$m;
963 } 1022 }
… …
1064 . "so only set it if you really need to prefetch images. " 1123 . "so only set it if you really need to prefetch images. "
1065 . "This option can be set and unset any time.", 1124 . "This option can be set and unset any time.",
1066 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1125 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1067 ); 1126 );
1068 1127
1069 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1128 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1070 $table->add (1, 9, new CFPlus::UI::Entry 1129 $table->add (1, 9, new CFPlus::UI::Entry
1130 text => $CFG->{output_rate},
1131 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1132 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1133 . "default will be used, which is usually around 100kb/s.",
1134 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1135 );
1136
1137 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1138 $table->add (1, 10, new CFPlus::UI::Entry
1071 text => $CFG->{output_count}, 1139 text => $CFG->{output_count},
1072 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1140 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1073 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1141 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1074 ); 1142 );
1075 1143
1076 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1144 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1077 $table->add (1, 10, new CFPlus::UI::Entry 1145 $table->add (1, 11, new CFPlus::UI::Entry
1078 text => $CFG->{output_sync}, 1146 text => $CFG->{output_sync},
1079 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1147 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1080 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1148 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1081 ); 1149 );
1082 1150
1083 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1151 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1084 expand => 1, 1152 expand => 1,
1085 align => 0, 1153 align => 0,
1086 text => "Login", 1154 text => "Login",
1087 on_activate => sub { 1155 on_activate => sub {
1088 $CONN ? stop_game 1156 $CONN ? stop_game
1089 : start_game; 1157 : start_game;
1090 0 1158 0
1091 }, 1159 },
1092 ); 1160 );
1093 1161
1162 $vbox->add (new CFPlus::UI::FancyFrame
1163 label => "Server Info",
1164 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1165 );
1166
1167 $vbox
1168}
1169
1170sub client_setup {
1171 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1172
1173 my $row = 0;
1174
1094 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1175 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1095 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1176 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1096 text => $CFG->{say_command}, 1177 text => $CFG->{say_command},
1097 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. " 1178 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. "
1098 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1179 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1099 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1180 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1100 on_changed => sub { 1181 on_changed => sub {
1101 my ($self, $value) = @_; 1182 my ($self, $value) = @_;
1102 $CFG->{say_command} = $value; 1183 $CFG->{say_command} = $value;
1103 0 1184 0
1104 } 1185 }
1105 ); 1186 );
1106 1187
1107 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1188 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1108 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1189 $table->add (1, $row++, new CFPlus::UI::CheckBox
1109 state => $CFG->{show_tips}, 1190 state => $CFG->{show_tips},
1110 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1191 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1111 on_changed => sub { 1192 on_changed => sub {
1112 my ($self, $value) = @_; 1193 my ($self, $value) = @_;
1113 $CFG->{show_tips} = $value; 1194 $CFG->{show_tips} = $value;
1114 0 1195 0
1115 } 1196 }
1116 ); 1197 );
1117 1198
1118 $vbox->add (new CFPlus::UI::FancyFrame 1199 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1119 label => "Server Info", 1200 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1120 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1201 text => $CFG->{logview_max_par},
1202 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1203 . "sends more messages than this number, older messages get removed to save memory and "
1204 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1205 on_changed => sub {
1206 my ($self, $value) = @_;
1207 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1208 0
1209 },
1121 ); 1210 );
1122 1211
1123 $vbox 1212 $table
1124} 1213}
1125 1214
1126sub message_window { 1215sub message_window {
1127 my $window = new CFPlus::UI::Toplevel 1216 my $window = new CFPlus::UI::Toplevel
1128 name => "message_window", 1217 name => "message_window",
… …
1368 has_close_button => 1 1457 has_close_button => 1
1369 ; 1458 ;
1370 1459
1371 my $ntb = 1460 my $ntb =
1372 $PL_NOTEBOOK = 1461 $PL_NOTEBOOK =
1373 new CFPlus::UI::Notebook expand => 1, debug => 1; 1462 new CFPlus::UI::Notebook expand => 1;
1374 1463
1375 $ntb->add ( 1464 $ntb->add (
1376 "Statistics (F2)" => $STATS_PAGE = stats_window, 1465 "Statistics (F2)" => $STATS_PAGE = stats_window,
1377 "Shows statistics, where all your Stats and Resistances are shown." 1466 "Shows statistics, where all your Stats and Resistances are shown."
1378 ); 1467 );
… …
1390 $ntb->add ( 1479 $ntb->add (
1391 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1480 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1392 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1481 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1393 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1482 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1394 ); 1483 );
1484 $ntb->add (Pickup => autopickup_setup,
1485 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1395 1486
1396 $ntb->set_current_page ($INVENTORY_PAGE); 1487 $ntb->set_current_page ($INVENTORY_PAGE);
1397 1488
1398 $plwin->add ($ntb); 1489 $plwin->add ($ntb);
1399 $plwin 1490 $plwin
… …
1565 1656
1566sub show_tip_of_the_day { 1657sub show_tip_of_the_day {
1567 # find all tips 1658 # find all tips
1568 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1659 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1569 1660
1570 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1661 CFPlus::DB::get state => "tip_of_the_day", sub {
1662 my ($todindex) = @_;
1571 $todindex = 0 if $todindex >= @tod; 1663 $todindex = 0 if $todindex >= @tod;
1572 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1664 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1573 1665
1574 # create dialog 1666 # create dialog
1575 my $dialog; 1667 my $dialog;
1576 1668
1577 my $close = sub { 1669 my $close = sub {
1578 $dialog->destroy; 1670 $dialog->destroy;
1671 };
1672
1673 $dialog = new CFPlus::UI::Toplevel
1674 x => "center",
1675 y => "center",
1676 z => 3,
1677 name => 'tip_of_the_day',
1678 force_w => int $WIDTH * 4/9,
1679 force_h => int $WIDTH * 2/9,
1680 title => "Tip of the day #" . (1 + $todindex),
1681 child => my $vbox = new CFPlus::UI::VBox,
1682 has_close_button => 1,
1683 on_delete => $close,
1684 ;
1685
1686 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1687 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1688 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1689
1690 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1691
1692 $table->add (0, 0, new CFPlus::UI::Button
1693 text => "Close",
1694 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>.",
1695 on_activate => $close,
1696 );
1697
1698 $table->add (2, 0, new CFPlus::UI::Button
1699 text => "Next",
1700 tooltip => "Show the next <b>Tip of the day</b>.",
1701 on_activate => sub {
1702 $close->();
1703 &show_tip_of_the_day;
1704 },
1705 );
1706
1707 $dialog->show;
1579 }; 1708 };
1580
1581 $dialog = new CFPlus::UI::Toplevel
1582 x => "center",
1583 y => "center",
1584 z => 3,
1585 name => 'tip_of_the_day',
1586 force_w => int $WIDTH * 4/9,
1587 force_h => int $WIDTH * 2/9,
1588 title => "Tip of the day #" . (1 + $todindex),
1589 child => my $vbox = new CFPlus::UI::VBox,
1590 has_close_button => 1,
1591 on_delete => $close,
1592 ;
1593
1594 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1595 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1596 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1597
1598 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1599
1600 $table->add (0, 0, new CFPlus::UI::Button
1601 text => "Close",
1602 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>.",
1603 on_activate => $close,
1604 );
1605
1606 $table->add (2, 0, new CFPlus::UI::Button
1607 text => "Next",
1608 tooltip => "Show the next <b>Tip of the day</b>.",
1609 on_activate => sub {
1610 $close->();
1611 &show_tip_of_the_day;
1612 },
1613 );
1614
1615 $dialog->show;
1616} 1709}
1617 1710
1618sub sdl_init { 1711sub sdl_init {
1619 CFPlus::SDL_Init 1712 CFPlus::SDL_Init
1620 and die "SDL::Init failed!\n"; 1713 and die "SDL::Init failed!\n";
… …
1700 font => $FONT_FIXED, 1793 font => $FONT_FIXED,
1701 fontsize => $::CFG->{log_fontsize}, 1794 fontsize => $::CFG->{log_fontsize},
1702 indent => -4, 1795 indent => -4,
1703 can_hover => 1, 1796 can_hover => 1,
1704 can_events => 1, 1797 can_events => 1,
1798 max_par => $CFG->{logview_max_par},
1705 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1799 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1706 ; 1800 ;
1707 1801
1708 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1802 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1709 title => "Setup", 1803 title => "Setup",
1710 name => "setup_dialog", 1804 name => "setup_dialog",
… …
1721 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1815 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1722 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1816 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1723 1817
1724 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1818 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1725 "Configure the server to play on, your username, password and other server-related options."); 1819 "Configure the server to play on, your username, password and other server-related options.");
1726 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1820 $SETUP_NOTEBOOK->add (Client => client_setup,
1727 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1821 "Configure various client-specific settings.");
1728 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1822 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1729 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1823 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1730 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1824 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1731 "Configure the use of audio, sound effects and background music."); 1825 "Configure the use of audio, sound effects and background music.");
1732 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1826 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
2031 if $CONN; 2125 if $CONN;
2032}); 2126});
2033 2127
2034%SDL_CB = ( 2128%SDL_CB = (
2035 CFPlus::SDL_QUIT => sub { 2129 CFPlus::SDL_QUIT => sub {
2036 Event::unloop -1; 2130 exit;
2037 }, 2131 },
2038 CFPlus::SDL_VIDEORESIZE => sub { 2132 CFPlus::SDL_VIDEORESIZE => sub {
2039 }, 2133 },
2040 CFPlus::SDL_VIDEOEXPOSE => sub { 2134 CFPlus::SDL_VIDEOEXPOSE => sub {
2041 CFPlus::UI::full_refresh; 2135 CFPlus::UI::full_refresh;
… …
2074 2168
2075$SIG{INT} = $SIG{TERM} = sub { exit }; 2169$SIG{INT} = $SIG{TERM} = sub { exit };
2076 2170
2077{ 2171{
2078 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2172 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2173 CFPlus::DB::Server::run;
2174
2079 CFPlus::UI::set_layout ($::CFG->{layout}); 2175 CFPlus::UI::set_layout ($::CFG->{layout});
2080 2176
2081 my %DEF_CFG = ( 2177 my %DEF_CFG = (
2082 sdl_mode => 0, 2178 sdl_mode => 0,
2083 width => 640, 2179 width => 640,
2084 height => 480, 2180 height => 480,
2085 fullscreen => 0, 2181 fullscreen => 0,
2086 fast => 0, 2182 fast => 0,
2087 map_scale => 1, 2183 map_scale => 1,
2088 fow_enable => 1, 2184 fow_enable => 1,
2089 fow_intensity => 0.45, 2185 fow_intensity => 0.45,
2090 fow_smooth => 0, 2186 fow_smooth => 0,
2187 map_smoothing => 1,
2091 gui_fontsize => 1, 2188 gui_fontsize => 1,
2092 log_fontsize => 0.7, 2189 log_fontsize => 0.7,
2093 gauge_fontsize => 1, 2190 gauge_fontsize => 1,
2094 gauge_size => 0.35, 2191 gauge_size => 0.35,
2095 stat_fontsize => 0.7, 2192 stat_fontsize => 0.7,
2096 mapsize => 100, 2193 mapsize => 100,
2097 say_command => 'chat', 2194 say_command => 'chat',
2098 audio_enable => 1, 2195 audio_enable => 1,
2099 bgm_enable => 1, 2196 bgm_enable => 1,
2100 bgm_volume => 0.25, 2197 bgm_volume => 0.25,
2101 face_prefetch => 0, 2198 face_prefetch => 0,
2102 output_sync => 1, 2199 output_sync => 1,
2103 output_count => 1, 2200 output_count => 1,
2201 output_rate => "",
2104 pickup => 0, 2202 pickup => 0,
2105 inv_sort => "mtime", 2203 inv_sort => "mtime",
2106 default => "profile", # default profile 2204 default => "profile", # default profile
2107 show_tips => 1, 2205 show_tips => 1,
2206 logview_max_par => 1000,
2108 ); 2207 );
2109 2208
2110 while (my ($k, $v) = each %DEF_CFG) { 2209 while (my ($k, $v) = each %DEF_CFG) {
2111 $CFG->{$k} = $v unless exists $CFG->{$k}; 2210 $CFG->{$k} = $v unless exists $CFG->{$k};
2112 } 2211 }
… …
2181 2280
2182Event::loop; 2281Event::loop;
2183#CFPlus::SDL_Quit; 2282#CFPlus::SDL_Quit;
2184#CFPlus::_exit 0; 2283#CFPlus::_exit 0;
2185 2284
2285END {
2186END { CFPlus::SDL_Quit } 2286 CFPlus::SDL_Quit;
2287 CFPlus::DB::Server::stop;
2288}
2187 2289
2188=head1 NAME 2290=head1 NAME
2189 2291
2190cfplus - A Crossfire+ and Crossfire game client 2292cfplus - A Crossfire+ and Crossfire game client
2191 2293

Diff Legend

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