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.138 by root, Sat Dec 9 21:26:46 2006 UTC vs.
Revision 1.157 by root, Tue Jun 26 05:06:01 2007 UTC

… …
29# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
30BEGIN { 30BEGIN {
31 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
32 @INC = grep ref, @INC; # weed out all paths except pars loader refs 32 @INC = grep ref, @INC; # weed out all paths except pars loader refs
33 33
34 my $tmp = $ENV{PAR_TEMP};
35
34 while (my ($filename, $zip) = each %PAR::LibCache) { 36 while (my ($filename, $zip) = each %PAR::LibCache) {
35 for ($zip->memberNames) { 37 for ($zip->memberNames) {
36 next unless /^root\/(.*)/; 38 next unless /^root\/(.*)/;
37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 39 $zip->extractMember ($_, "$tmp/$1")
38 unless -e "$ENV{PAR_TEMP}/$1"; 40 unless -e "$tmp/$1";
39 } 41 }
40 } 42 }
41 43
42 # TODO: pango-rc file, anybody? 44 if ($^O eq "MSWin32") {
45 # relocatable
46 } else {
47 # unix, need to patch pango rc file
48 open my $fh, "<:perlio", "$tmp/usr/lib/pango/1.5.0/module-files.d/libpango1.0-0.modules"
49 or die "$tmp/usr/lib/1.5.0/module-files.d/libpango1.0-0.modules: $!";
50 local $/;
51 my $rc = <$fh>;
52 $rc =~ s/^\//$tmp\//gm; # replace abs paths by relative ones
43 53
44 unshift @INC, $ENV{PAR_TEMP}; 54 mkdir "$tmp/pango-modules";
55 open my $fh, ">:perlio", "$tmp/pango-modules/pango.modules"
56 or die "$tmp/pango-modules/pango.modules: $!";
57 print $fh $rc;
58
59 $ENV{PANGO_RC_FILE} = "$tmp/pango.rc";
60 open my $fh, ">:perlio", $ENV{PANGO_RC_FILE}
61 or die "$ENV{PANGO_RC_FILE}: $!";
62 print $fh "[Pango]\nModuleFiles = $tmp/pango-modules\n";
63 }
64
65 unshift @INC, $tmp;
45 } 66 }
46} 67}
47 68
48# need to do it again because that pile of garbage called PAR nukes it before main 69# need to do it again because that pile of garbage called PAR nukes it before main
49unshift @INC, $ENV{PAR_TEMP} 70unshift @INC, $ENV{PAR_TEMP}
… …
58use Compress::LZF; 79use Compress::LZF;
59 80
60use CFPlus; 81use CFPlus;
61use CFPlus::OpenGL (); 82use CFPlus::OpenGL ();
62use CFPlus::Protocol; 83use CFPlus::Protocol;
84use CFPlus::DB;
63use CFPlus::UI; 85use CFPlus::UI;
64use CFPlus::UI::Inventory; 86use CFPlus::UI::Inventory;
65use CFPlus::UI::SpellList; 87use CFPlus::UI::SpellList;
66use CFPlus::Pod; 88use CFPlus::Pod;
67use CFPlus::MapWidget; 89use CFPlus::MapWidget;
68use CFPlus::Macro; 90use CFPlus::Macro;
69 91
70$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 92$SIG{QUIT} = sub { Carp::cluck "QUIT" };
71$SIG{PIPE} = 'IGNORE'; 93$SIG{PIPE} = 'IGNORE';
72 94
73$Event::Eval = 0; 95$Event::Eval = 1;
74$Event::DIED = sub { 96$Event::DIED = sub {
75 CFPlus::fatal Carp::longmess $_[1] 97 CFPlus::fatal Carp::longmess $_[1]
76}; 98};
77 99
78my $MAX_FPS = 60; 100my $MAX_FPS = 60;
… …
176sub destroy_query_dialog { 198sub destroy_query_dialog {
177 (delete $_[0]{query_dialog})->destroy 199 (delete $_[0]{query_dialog})->destroy
178 if $_[0]{query_dialog}; 200 if $_[0]{query_dialog};
179} 201}
180 202
203# FIXME: a very ugly hack to wait for stat update look below! #d#
204our $QUERY_TIMER; #d#
205
181# server query dialog 206# server query dialog
182sub server_query { 207sub server_query {
183 my ($conn, $flags, $prompt) = @_; 208 my ($conn, $flags, $prompt) = @_;
209
210 # FIXME: a very ugly hack to wait for stat update #d#
211 if ($prompt =~ /roll new stats/ and not $conn->{stat_change_with}) {
212 unless ($QUERY_TIMER) {
213 $QUERY_TIMER =
214 Event->timer (
215 after => 1,
216 cb => sub {
217 server_query ($conn, $flags, $prompt, 1);
218 $QUERY_TIMER = undef
219 }
220 );
221 return;
222 }
223 }
184 224
185 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel 225 $conn->{query_dialog} = my $dialog = new CFPlus::UI::Toplevel
186 x => "center", 226 x => "center",
187 y => "center", 227 y => "center",
188 title => "Server Query", 228 title => "Server Query",
189 child => my $vbox = new CFPlus::UI::VBox, 229 child => my $vbox = new CFPlus::UI::VBox,
190 ; 230 ;
191 231
192 my @dialog = my $label = new CFPlus::UI::Label 232 my @dialog = my $label = new CFPlus::UI::Label
193 max_w => $::WIDTH * 0.4, 233 max_w => $::WIDTH * 0.8,
194 ellipsise => 0, 234 ellipsise => 0,
195 text => $prompt; 235 text => $prompt;
196 236
197 if ($flags & CS_QUERY_YESNO) { 237 if ($flags & CS_QUERY_YESNO) {
198 push @dialog, my $hbox = new CFPlus::UI::HBox; 238 push @dialog, my $hbox = new CFPlus::UI::HBox;
… …
215 ); 255 );
216 256
217 $dialog->grab_focus; 257 $dialog->grab_focus;
218 258
219 } elsif ($flags & CS_QUERY_SINGLECHAR) { 259 } elsif ($flags & CS_QUERY_SINGLECHAR) {
220 $dialog->{tooltip} = "#charcreation_focus";
221
222 if ($prompt =~ /Now choose a character|Press any key for the next race/i) { 260 if ($prompt =~ /Now choose a character|Press any key for the next race/i) {
223 $MESSAGE_WINDOW->show; 261 $dialog->{tooltip} = "#charcreation_focus";
224 262
225 unshift @dialog, new CFPlus::UI::Label 263 unshift @dialog, new CFPlus::UI::Label
226 max_w => $::WIDTH * 0.4, 264 max_w => $::WIDTH * 0.8,
227 ellipsise => 0, 265 ellipsise => 0,
228 markup => "\nOr use your keyboard and the text entry below:\n"; 266 markup => "\nOr use your keyboard and the text entry below:\n";
229 267
230 unshift @dialog, my $table = new CFPlus::UI::Table; 268 unshift @dialog, my $table = new CFPlus::UI::Table;
231 269
… …
243 $conn->send ("reply d"); 281 $conn->send ("reply d");
244 destroy_query_dialog $conn; 282 destroy_query_dialog $conn;
245 0 283 0
246 }, 284 },
247 ); 285 );
286
287 if ($conn->{chargen_race_description}) {
288 unshift @dialog, new CFPlus::UI::Label
289 max_w => $::WIDTH * 0.8,
290 ellipsise => 0,
291 markup => "<span foreground='#ccccff'>$conn->{chargen_race_description}</span>",
292 ;
293 }
294
295 unshift @dialog, new CFPlus::UI::Face
296 face => $conn->{player}{face},
297 bg => [.2, .2, .2, 1],
298 min_w => 64,
299 min_h => 64,
300 ;
301
302 if ($conn->{chargen_race_title}) {
303 unshift @dialog, new CFPlus::UI::Label
304 allign => 1,
305 ellipsise => 0,
306 markup => "<span foreground='#ccccff' size='large'>Race: $conn->{chargen_race_title}</span>",
307 ;
308 }
248 309
249 unshift @dialog, new CFPlus::UI::Label 310 unshift @dialog, new CFPlus::UI::Label
250 max_w => $::WIDTH * 0.4, 311 max_w => $::WIDTH * 0.4,
251 ellipsise => 0, 312 ellipsise => 0,
252 markup => (CFPlus::Pod::section_label ui => "chargen_race"), 313 markup => (CFPlus::Pod::section_label ui => "chargen_race"),
… …
401 statusbox => $STATUSBOX, 462 statusbox => $STATUSBOX,
402 map => $MAP, 463 map => $MAP,
403 mapmap => $MAPMAP, 464 mapmap => $MAPMAP,
404 query => \&server_query, 465 query => \&server_query,
405 466
467 setup_req => {
468 smoothing => $CFG->{map_smoothing}*1,
469 },
470
406 sound_play => sub { 471 sound_play => sub {
407 my ($x, $y, $soundnum, $type) = @_; 472 my ($x, $y, $soundnum, $type) = @_;
408 473
409 $SDL_MIXER 474 $SDL_MIXER
410 or return; 475 or return;
… …
430 $LOGIN_BUTTON->set_text ("Login"); 495 $LOGIN_BUTTON->set_text ("Login");
431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 496 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
432 $SETUP_DIALOG->show; 497 $SETUP_DIALOG->show;
433 $PL_WINDOW->hide; 498 $PL_WINDOW->hide;
434 $SPELL_LIST->clear_spells; 499 $SPELL_LIST->clear_spells;
500 $CFPlus::UI::ROOT->emit (stop_game => ! ! $CONN);
435 501
436 return unless $CONN; 502 return unless $CONN;
437 503
438 status "connection closed"; 504 status "connection closed";
439 505
… …
447sub graphics_setup { 513sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 514 my $vbox = new CFPlus::UI::VBox;
449 515
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 516 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 517
518 my $row = 0;
519
520 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
521 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
522 can_events => 1,
523 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
524
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 525 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode");
453 $table->add (1, 0, my $hbox = new CFPlus::UI::HBox); 526 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 527
455 $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]); 528 $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]);
456 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999"); 529 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
457 530
458 $mode_slider->connect (changed => sub { 531 $mode_slider->connect (changed => sub {
… …
460 533
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 534 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 535 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
463 }); 536 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 537 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 538
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 539 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen");
469 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox 540 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 541 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 542 tooltip => "Bring the client into fullscreen mode.",
… …
477 state => $CFG->{fast}, 548 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 549 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 550 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 551 );
481 552
553 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
554 $table->add (1, $row++, new CFPlus::UI::Slider
555 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
556 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
557 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
558 );
559
560 $table->add (1, $row++, new CFPlus::UI::Button
561 expand => 1, align => 0, text => "Apply",
562 tooltip => "Apply the video settings above.",
563 on_activate => sub {
564 video_shutdown ();
565 video_init ();
566 0
567 }
568 );
569
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 570 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
483 $table->add (1, $row++, new CFPlus::UI::Slider 571 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 572 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 573 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 574 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
575 );
576
577 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
578 $table->add (1, $row++, new CFPlus::UI::CheckBox
579 state => $CFG->{map_smoothing},
580 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
581 . "This increases load on the graphics subsystem and works only with 2.x servers. "
582 . "Changes take effect at next connection only.",
583 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
487 ); 584 );
488 585
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 586 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War");
490 $table->add (1, $row++, new CFPlus::UI::CheckBox 587 $table->add (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 588 state => $CFG->{fow_enable},
… …
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 607 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0 608 0
512 } 609 }
513 ); 610 );
514 611
515 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
516 $table->add (1, $row++, new CFPlus::UI::Slider
517 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
518 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
519 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
520 );
521
522 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize"); 612 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 613 $table->add (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 614 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1],
525 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.", 615 tooltip => "The font size used by the <b>message/server log</b> window only. Changes are instant.",
526 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 }, 616 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 632 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 633 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
544 on_changed => sub { 634 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 635 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 636 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size});
547 0
548 }
549 );
550
551 $table->add (1, $row++, new CFPlus::UI::Button
552 expand => 1, align => 0, text => "Apply",
553 tooltip => "Apply the video settings",
554 on_activate => sub {
555 video_shutdown ();
556 video_init ();
557 0 637 0
558 } 638 }
559 ); 639 );
560 640
561 $vbox 641 $vbox
… …
887 for 0 .. $#col; 967 for 0 .. $#col;
888 968
889 my @align = qw(1 0 1 1 -1); 969 my @align = qw(1 0 1 1 -1);
890 970
891 my $y = 0; 971 my $y = 0;
892 for my $m (
893 sort {
894 $b->{version} <=> $a->{version}
895 or $b->{users} <=> $a->{users}
896 }
897 @{ $msg->{servers} } 972 for my $m (@{ $msg->{servers} }) {
898 ) {
899 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 973 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
900 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 974 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
901 975
902 for ($desc) { 976 for ($desc) {
903 s/<br>/\n/gi; 977 s/<br>/\n/gi;
904 s/<li>/\n· /gi; 978 s/<li>/\n· /gi;
905 s/<.*?>//sgi; 979 s/<.*?>//sgi;
… …
935 max_w => $::WIDTH * 0.4, 1009 max_w => $::WIDTH * 0.4,
936 ellipsise => 0, 1010 ellipsise => 0,
937 align => $align[$_], 1011 align => $align[$_],
938 text => $m->[$_], 1012 text => $m->[$_],
939 tooltip => $tip[$_], 1013 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1014 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
941 can_hover => 1, 1015 can_hover => 1,
942 can_events => 1, 1016 can_events => 1,
943 fontsize => 0.8) 1017 fontsize => 0.8)
944 for 0 .. $#$m; 1018 for 0 .. $#$m;
945 } 1019 }
… …
1046 . "so only set it if you really need to prefetch images. " 1120 . "so only set it if you really need to prefetch images. "
1047 . "This option can be set and unset any time.", 1121 . "This option can be set and unset any time.",
1048 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1122 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1049 ); 1123 );
1050 1124
1051 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1125 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1052 $table->add (1, 9, new CFPlus::UI::Entry 1126 $table->add (1, 9, new CFPlus::UI::Entry
1127 text => $CFG->{output_rate},
1128 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1129 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1130 . "default will be used, which is usually around 100kb/s.",
1131 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1132 );
1133
1134 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1135 $table->add (1, 10, new CFPlus::UI::Entry
1053 text => $CFG->{output_count}, 1136 text => $CFG->{output_count},
1054 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1137 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1055 on_changed => sub { $CFG->{output_count} = $_[1]; 0 }, 1138 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1056 ); 1139 );
1057 1140
1058 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1141 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1059 $table->add (1, 10, new CFPlus::UI::Entry 1142 $table->add (1, 11, new CFPlus::UI::Entry
1060 text => $CFG->{output_sync}, 1143 text => $CFG->{output_sync},
1061 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.", 1144 tooltip => "Should be set to 1 unless you know what you are doing. This option is only used once at log-in.",
1062 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 }, 1145 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1063 ); 1146 );
1064 1147
1065 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1148 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1066 expand => 1, 1149 expand => 1,
1067 align => 0, 1150 align => 0,
1068 text => "Login", 1151 text => "Login",
1069 on_activate => sub { 1152 on_activate => sub {
1070 $CONN ? stop_game 1153 $CONN ? stop_game
1071 : start_game; 1154 : start_game;
1072 0 1155 0
1073 }, 1156 },
1074 ); 1157 );
1075 1158
1159 $vbox->add (new CFPlus::UI::FancyFrame
1160 label => "Server Info",
1161 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1162 );
1163
1164 $vbox
1165}
1166
1167sub client_setup {
1168 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1169
1170 my $row = 0;
1171
1076 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1172 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1077 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1173 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1078 text => $CFG->{say_command}, 1174 text => $CFG->{say_command},
1079 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. " 1175 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. "
1080 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1176 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1081 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1177 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1082 on_changed => sub { 1178 on_changed => sub {
1083 my ($self, $value) = @_; 1179 my ($self, $value) = @_;
1084 $CFG->{say_command} = $value; 1180 $CFG->{say_command} = $value;
1085 0 1181 0
1086 } 1182 }
1087 ); 1183 );
1088 1184
1089 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1185 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1090 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox 1186 $table->add (1, $row++, new CFPlus::UI::CheckBox
1091 state => $CFG->{show_tips}, 1187 state => $CFG->{show_tips},
1092 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1188 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1093 on_changed => sub { 1189 on_changed => sub {
1094 my ($self, $value) = @_; 1190 my ($self, $value) = @_;
1095 $CFG->{show_tips} = $value; 1191 $CFG->{show_tips} = $value;
1096 0 1192 0
1097 } 1193 }
1098 ); 1194 );
1099 1195
1100 $vbox->add (new CFPlus::UI::FancyFrame 1196 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1101 label => "Server Info", 1197 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1102 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1198 text => $CFG->{logview_max_par},
1199 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1200 . "sends more messages than this number, older messages get removed to save memory and "
1201 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1202 on_changed => sub {
1203 my ($self, $value) = @_;
1204 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1205 0
1206 },
1103 ); 1207 );
1104 1208
1105 $vbox 1209 $table
1106} 1210}
1107 1211
1108sub message_window { 1212sub message_window {
1109 my $window = new CFPlus::UI::Toplevel 1213 my $window = new CFPlus::UI::Toplevel
1110 name => "message_window", 1214 name => "message_window",
… …
1350 has_close_button => 1 1454 has_close_button => 1
1351 ; 1455 ;
1352 1456
1353 my $ntb = 1457 my $ntb =
1354 $PL_NOTEBOOK = 1458 $PL_NOTEBOOK =
1355 new CFPlus::UI::Notebook expand => 1, debug => 1; 1459 new CFPlus::UI::Notebook expand => 1;
1356 1460
1357 $ntb->add ( 1461 $ntb->add (
1358 "Statistics (F2)" => $STATS_PAGE = stats_window, 1462 "Statistics (F2)" => $STATS_PAGE = stats_window,
1359 "Shows statistics, where all your Stats and Resistances are shown." 1463 "Shows statistics, where all your Stats and Resistances are shown."
1360 ); 1464 );
… …
1372 $ntb->add ( 1476 $ntb->add (
1373 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1477 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1374 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1478 "Toggles the inventory window, where you can manage your loot (or treasures :). "
1375 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory." 1479 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1376 ); 1480 );
1481 $ntb->add (Pickup => autopickup_setup,
1482 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1377 1483
1378 $ntb->set_current_page ($INVENTORY_PAGE); 1484 $ntb->set_current_page ($INVENTORY_PAGE);
1379 1485
1380 $plwin->add ($ntb); 1486 $plwin->add ($ntb);
1381 $plwin 1487 $plwin
… …
1547 1653
1548sub show_tip_of_the_day { 1654sub show_tip_of_the_day {
1549 # find all tips 1655 # find all tips
1550 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1656 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1551 1657
1552 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1658 CFPlus::DB::get state => "tip_of_the_day", sub {
1659 my ($todindex) = @_;
1553 $todindex = 0 if $todindex >= @tod; 1660 $todindex = 0 if $todindex >= @tod;
1554 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1661 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1555 1662
1556 # create dialog 1663 # create dialog
1557 my $dialog; 1664 my $dialog;
1558 1665
1559 my $close = sub { 1666 my $close = sub {
1560 $dialog->destroy; 1667 $dialog->destroy;
1668 };
1669
1670 $dialog = new CFPlus::UI::Toplevel
1671 x => "center",
1672 y => "center",
1673 z => 3,
1674 name => 'tip_of_the_day',
1675 force_w => int $WIDTH * 4/9,
1676 force_h => int $WIDTH * 2/9,
1677 title => "Tip of the day #" . (1 + $todindex),
1678 child => my $vbox = new CFPlus::UI::VBox,
1679 has_close_button => 1,
1680 on_delete => $close,
1681 ;
1682
1683 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1684 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1685 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1686
1687 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1688
1689 $table->add (0, 0, new CFPlus::UI::Button
1690 text => "Close",
1691 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>.",
1692 on_activate => $close,
1693 );
1694
1695 $table->add (2, 0, new CFPlus::UI::Button
1696 text => "Next",
1697 tooltip => "Show the next <b>Tip of the day</b>.",
1698 on_activate => sub {
1699 $close->();
1700 &show_tip_of_the_day;
1701 },
1702 );
1703
1704 $dialog->show;
1561 }; 1705 };
1562
1563 $dialog = new CFPlus::UI::Toplevel
1564 x => "center",
1565 y => "center",
1566 z => 3,
1567 name => 'tip_of_the_day',
1568 force_w => int $WIDTH * 4/9,
1569 force_h => int $WIDTH * 2/9,
1570 title => "Tip of the day #" . (1 + $todindex),
1571 child => my $vbox = new CFPlus::UI::VBox,
1572 has_close_button => 1,
1573 on_delete => $close,
1574 ;
1575
1576 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1577 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1578 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1579
1580 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1581
1582 $table->add (0, 0, new CFPlus::UI::Button
1583 text => "Close",
1584 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>.",
1585 on_activate => $close,
1586 );
1587
1588 $table->add (2, 0, new CFPlus::UI::Button
1589 text => "Next",
1590 tooltip => "Show the next <b>Tip of the day</b>.",
1591 on_activate => sub {
1592 $close->();
1593 &show_tip_of_the_day;
1594 },
1595 );
1596
1597 $dialog->show;
1598} 1706}
1599 1707
1600sub sdl_init { 1708sub sdl_init {
1601 CFPlus::SDL_Init 1709 CFPlus::SDL_Init
1602 and die "SDL::Init failed!\n"; 1710 and die "SDL::Init failed!\n";
… …
1682 font => $FONT_FIXED, 1790 font => $FONT_FIXED,
1683 fontsize => $::CFG->{log_fontsize}, 1791 fontsize => $::CFG->{log_fontsize},
1684 indent => -4, 1792 indent => -4,
1685 can_hover => 1, 1793 can_hover => 1,
1686 can_events => 1, 1794 can_events => 1,
1795 max_par => $CFG->{logview_max_par},
1687 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1796 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1688 ; 1797 ;
1689 1798
1690 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1799 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1691 title => "Setup", 1800 title => "Setup",
1692 name => "setup_dialog", 1801 name => "setup_dialog",
… …
1703 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1812 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1704 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1813 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1705 1814
1706 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1815 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1707 "Configure the server to play on, your username, password and other server-related options."); 1816 "Configure the server to play on, your username, password and other server-related options.");
1708 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1817 $SETUP_NOTEBOOK->add (Client => client_setup,
1709 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them."); 1818 "Configure various client-specific settings.");
1710 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1819 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1711 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1820 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1712 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1821 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1713 "Configure the use of audio, sound effects and background music."); 1822 "Configure the use of audio, sound effects and background music.");
1714 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1823 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
1770} 1879}
1771 1880
1772sub setup_build_button { 1881sub setup_build_button {
1773 my ($enabled) = @_; 1882 my ($enabled) = @_;
1774 if ($enabled) { 1883 if ($enabled) {
1884 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1775 $BUILD_BUTTON ||= new CFPlus::UI::Button 1885 $BUILD_BUTTON ||= new CFPlus::UI::Button
1776 text => "Build", 1886 text => "Build",
1777 tooltip => "Opens the ingame builder", 1887 tooltip => "Opens the ingame builder",
1778 on_activate => sub { 1888 on_activate => sub {
1779 if ($CONN) { 1889 if ($CONN) {
… …
2012 if $CONN; 2122 if $CONN;
2013}); 2123});
2014 2124
2015%SDL_CB = ( 2125%SDL_CB = (
2016 CFPlus::SDL_QUIT => sub { 2126 CFPlus::SDL_QUIT => sub {
2017 Event::unloop -1; 2127 exit;
2018 }, 2128 },
2019 CFPlus::SDL_VIDEORESIZE => sub { 2129 CFPlus::SDL_VIDEORESIZE => sub {
2020 }, 2130 },
2021 CFPlus::SDL_VIDEOEXPOSE => sub { 2131 CFPlus::SDL_VIDEOEXPOSE => sub {
2022 CFPlus::UI::full_refresh; 2132 CFPlus::UI::full_refresh;
… …
2055 2165
2056$SIG{INT} = $SIG{TERM} = sub { exit }; 2166$SIG{INT} = $SIG{TERM} = sub { exit };
2057 2167
2058{ 2168{
2059 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2169 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2170 CFPlus::DB::Server::run;
2171
2060 CFPlus::UI::set_layout ($::CFG->{layout}); 2172 CFPlus::UI::set_layout ($::CFG->{layout});
2061 2173
2062 my %DEF_CFG = ( 2174 my %DEF_CFG = (
2063 sdl_mode => 0, 2175 sdl_mode => 0,
2064 width => 640, 2176 width => 640,
2065 height => 480, 2177 height => 480,
2066 fullscreen => 0, 2178 fullscreen => 0,
2067 fast => 0, 2179 fast => 0,
2068 map_scale => 1, 2180 map_scale => 1,
2069 fow_enable => 1, 2181 fow_enable => 1,
2070 fow_intensity => 0.45, 2182 fow_intensity => 0.45,
2071 fow_smooth => 0, 2183 fow_smooth => 0,
2184 map_smoothing => 1,
2072 gui_fontsize => 1, 2185 gui_fontsize => 1,
2073 log_fontsize => 0.7, 2186 log_fontsize => 0.7,
2074 gauge_fontsize => 1, 2187 gauge_fontsize => 1,
2075 gauge_size => 0.35, 2188 gauge_size => 0.35,
2076 stat_fontsize => 0.7, 2189 stat_fontsize => 0.7,
2077 mapsize => 100, 2190 mapsize => 100,
2078 say_command => 'chat', 2191 say_command => 'chat',
2079 audio_enable => 1, 2192 audio_enable => 1,
2080 bgm_enable => 1, 2193 bgm_enable => 1,
2081 bgm_volume => 0.25, 2194 bgm_volume => 0.25,
2082 face_prefetch => 0, 2195 face_prefetch => 0,
2083 output_sync => 1, 2196 output_sync => 1,
2084 output_count => 1, 2197 output_count => 1,
2198 output_rate => "",
2085 pickup => 0, 2199 pickup => 0,
2086 inv_sort => "mtime", 2200 inv_sort => "mtime",
2087 default => "profile", # default profile 2201 default => "profile", # default profile
2088 show_tips => 1, 2202 show_tips => 1,
2203 logview_max_par => 1000,
2089 ); 2204 );
2090 2205
2091 while (my ($k, $v) = each %DEF_CFG) { 2206 while (my ($k, $v) = each %DEF_CFG) {
2092 $CFG->{$k} = $v unless exists $CFG->{$k}; 2207 $CFG->{$k} = $v unless exists $CFG->{$k};
2093 } 2208 }
… …
2162 2277
2163Event::loop; 2278Event::loop;
2164#CFPlus::SDL_Quit; 2279#CFPlus::SDL_Quit;
2165#CFPlus::_exit 0; 2280#CFPlus::_exit 0;
2166 2281
2282END {
2167END { CFPlus::SDL_Quit } 2283 CFPlus::SDL_Quit;
2284 CFPlus::DB::Server::stop;
2285}
2168 2286
2169=head1 NAME 2287=head1 NAME
2170 2288
2171cfplus - A Crossfire+ and Crossfire game client 2289cfplus - A Crossfire+ and Crossfire game client
2172 2290

Diff Legend

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