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.140 by elmex, Sat Dec 16 16:01:09 2006 UTC vs.
Revision 1.155 by root, Sat May 12 08:13:34 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;
… …
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;
… …
447sub graphics_setup { 512sub graphics_setup {
448 my $vbox = new CFPlus::UI::VBox; 513 my $vbox = new CFPlus::UI::VBox;
449 514
450 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]); 515 $vbox->add (my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1]);
451 516
517 my $row = 0;
518
519 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "OpenGL Info");
520 $table->add (1, $row++, new CFPlus::UI::Label valign => 0, fontsize => 0.8, text => CFPlus::OpenGL::gl_vendor . ", " . CFPlus::OpenGL::gl_version,
521 can_events => 1,
522 tooltip => "<tt><span size='8192'>" . (CFPlus::OpenGL::gl_extensions) . "</span></tt>");
523
452 $table->add (0, 0, new CFPlus::UI::Label valign => 0, align => 1, text => "Video Mode"); 524 $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); 525 $table->add (1, $row++, my $hbox = new CFPlus::UI::HBox);
454 526
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]); 527 $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"); 528 $hbox->add (my $mode_label = new CFPlus::UI::Label align => 0, valign => 0, height => 0.8, template => "9999x9999");
457 529
458 $mode_slider->connect (changed => sub { 530 $mode_slider->connect (changed => sub {
… …
460 532
461 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value; 533 $CFG->{sdl_mode} = $self->{range}[0] = $value = int $value;
462 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]}); 534 $mode_label->set_text (sprintf "%dx%d", @{$SDL_MODES[$value]});
463 }); 535 });
464 $mode_slider->emit (changed => $mode_slider->{range}[0]); 536 $mode_slider->emit (changed => $mode_slider->{range}[0]);
465
466 my $row = 1;
467 537
468 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fullscreen"); 538 $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 539 $table->add (1, $row++, $FULLSCREEN_ENABLE = new CFPlus::UI::CheckBox
470 state => $CFG->{fullscreen}, 540 state => $CFG->{fullscreen},
471 tooltip => "Bring the client into fullscreen mode.", 541 tooltip => "Bring the client into fullscreen mode.",
… …
477 state => $CFG->{fast}, 547 state => $CFG->{fast},
478 tooltip => "Lower the visual quality considerably to speed up rendering.", 548 tooltip => "Lower the visual quality considerably to speed up rendering.",
479 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 } 549 on_changed => sub { my ($self, $value) = @_; $CFG->{fast} = $value; 0 }
480 ); 550 );
481 551
552 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "GUI Fontsize");
553 $table->add (1, $row++, new CFPlus::UI::Slider
554 range => [$CFG->{gui_fontsize}, 0.5, 2, 0, 0.1],
555 tooltip => "The base font size used by most GUI elements that do not have their own setting.",
556 on_changed => sub { $CFG->{gui_fontsize} = $_[1]; 0 },
557 );
558
559 $table->add (1, $row++, new CFPlus::UI::Button
560 expand => 1, align => 0, text => "Apply",
561 tooltip => "Apply the video settings above.",
562 on_activate => sub {
563 video_shutdown ();
564 video_init ();
565 0
566 }
567 );
568
482 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale"); 569 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Map Scale");
483 $table->add (1, $row++, new CFPlus::UI::Slider 570 $table->add (1, $row++, new CFPlus::UI::Slider
484 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1], 571 range => [(log $CFG->{map_scale}) / (log 2), -3, 1, 0, 1],
485 tooltip => "Enlarge or shrink the displayed map. Changes are instant.", 572 tooltip => "Enlarge or shrink the displayed map. Changes are instant.",
486 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 } 573 on_changed => sub { my ($self, $value) = @_; $CFG->{map_scale} = 2 ** $value; 0 }
574 );
575
576 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Smoothing");
577 $table->add (1, $row++, new CFPlus::UI::CheckBox
578 state => $CFG->{map_smoothing},
579 tooltip => "<b>Map Smoothing</b> tries to make tile borders less square. "
580 . "This increases load on the graphics subsystem and works only with 2.x servers. "
581 . "Changes take effect at next connection only.",
582 on_changed => sub { my ($self, $value) = @_; $CFG->{map_smoothing} = $value; 0 }
487 ); 583 );
488 584
489 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Fog of War"); 585 $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 586 $table->add (1, $row++, new CFPlus::UI::CheckBox
491 state => $CFG->{fow_enable}, 587 state => $CFG->{fow_enable},
… …
510 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2; 606 status "Fog of War smoothing requires OpenGL 1.2 or higher" if $CFPlus::OpenGL::GL_VERSION < 1.2;
511 0 607 0
512 } 608 }
513 ); 609 );
514 610
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"); 611 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Message Fontsize");
523 $table->add (1, $row++, new CFPlus::UI::Slider 612 $table->add (1, $row++, new CFPlus::UI::Slider
524 range => [$CFG->{log_fontsize}, 0.5, 2, 0, 0.1], 613 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.", 614 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 }, 615 on_changed => sub { $LOGVIEW->set_fontsize ($CFG->{log_fontsize} = $_[1]); 0 },
… …
542 range => [$CFG->{gauge_size}, 0.2, 0.8], 631 range => [$CFG->{gauge_size}, 0.2, 0.8],
543 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.", 632 tooltip => "Adjust the size of the stats gauges at the bottom right. Changes are instant.",
544 on_changed => sub { 633 on_changed => sub {
545 $CFG->{gauge_size} = $_[1]; 634 $CFG->{gauge_size} = $_[1];
546 $GAUGES->{win}->set_size ($WIDTH, int $HEIGHT * $CFG->{gauge_size}); 635 $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 636 0
558 } 637 }
559 ); 638 );
560 639
561 $vbox 640 $vbox
… …
887 for 0 .. $#col; 966 for 0 .. $#col;
888 967
889 my @align = qw(1 0 1 1 -1); 968 my @align = qw(1 0 1 1 -1);
890 969
891 my $y = 0; 970 my $y = 0;
892 for my $m (
893 sort {
894 $b->{version} <=> $a->{version}
895 or $b->{users} <=> $a->{users}
896 }
897 @{ $msg->{servers} } 971 for my $m (@{ $msg->{servers} }) {
898 ) {
899 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = 972 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime, $highlight) =
900 @$m{qw(ip age hostname users version description ibytes obytes uptime)}; 973 @$m{qw(ip age hostname users version description ibytes obytes uptime highlight)};
901 974
902 for ($desc) { 975 for ($desc) {
903 s/<br>/\n/gi; 976 s/<br>/\n/gi;
904 s/<li>/\n· /gi; 977 s/<li>/\n· /gi;
905 s/<.*?>//sgi; 978 s/<.*?>//sgi;
… …
935 max_w => $::WIDTH * 0.4, 1008 max_w => $::WIDTH * 0.4,
936 ellipsise => 0, 1009 ellipsise => 0,
937 align => $align[$_], 1010 align => $align[$_],
938 text => $m->[$_], 1011 text => $m->[$_],
939 tooltip => $tip[$_], 1012 tooltip => $tip[$_],
940 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]), 1013 fg => ($highlight ? [1, 1, 1] : [.7, .7, .7]),
941 can_hover => 1, 1014 can_hover => 1,
942 can_events => 1, 1015 can_events => 1,
943 fontsize => 0.8) 1016 fontsize => 0.8)
944 for 0 .. $#$m; 1017 for 0 .. $#$m;
945 } 1018 }
… …
1046 . "so only set it if you really need to prefetch images. " 1119 . "so only set it if you really need to prefetch images. "
1047 . "This option can be set and unset any time.", 1120 . "This option can be set and unset any time.",
1048 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 }, 1121 on_changed => sub { $CFG->{face_prefetch} = $_[1]; 0 },
1049 ); 1122 );
1050 1123
1051 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count"); 1124 $table->add (0, 9, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Rate");
1052 $table->add (1, 9, new CFPlus::UI::Entry 1125 $table->add (1, 9, new CFPlus::UI::Entry
1126 text => $CFG->{output_rate},
1127 tooltip => "The approximate bandwidth in bytes per second that the server should not exceed "
1128 . "when sending images, to ensure interactiveness. When 0 or unset, the server "
1129 . "default will be used, which is usually around 100kb/s.",
1130 on_changed => sub { $CFG->{output_rate} = $_[1]; 0 },
1131 );
1132
1133 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Count");
1134 $table->add (1, 10, new CFPlus::UI::Entry
1053 text => $CFG->{output_count}, 1135 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.", 1136 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 }, 1137 on_changed => sub { $CFG->{output_count} = $_[1]; 0 },
1056 ); 1138 );
1057 1139
1058 $table->add (0, 10, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync"); 1140 $table->add (0, 11, new CFPlus::UI::Label valign => 0, align => 1, text => "Output-Sync");
1059 $table->add (1, 10, new CFPlus::UI::Entry 1141 $table->add (1, 11, new CFPlus::UI::Entry
1060 text => $CFG->{output_sync}, 1142 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.", 1143 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 }, 1144 on_changed => sub { $CFG->{output_sync} = $_[1]; 0 },
1063 ); 1145 );
1064 1146
1065 $table->add (1, 11, $LOGIN_BUTTON = new CFPlus::UI::Button 1147 $table->add (1, 12, $LOGIN_BUTTON = new CFPlus::UI::Button
1066 expand => 1, 1148 expand => 1,
1067 align => 0, 1149 align => 0,
1068 text => "Login", 1150 text => "Login",
1069 on_activate => sub { 1151 on_activate => sub {
1070 $CONN ? stop_game 1152 $CONN ? stop_game
1071 : start_game; 1153 : start_game;
1072 0 1154 0
1073 }, 1155 },
1074 ); 1156 );
1075 1157
1158 $vbox->add (new CFPlus::UI::FancyFrame
1159 label => "Server Info",
1160 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0),
1161 );
1162
1163 $vbox
1164}
1165
1166sub client_setup {
1167 my $table = new CFPlus::UI::Table expand => 1, col_expand => [0, 1];
1168
1169 my $row = 0;
1170
1076 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1171 $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 1172 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1078 text => $CFG->{say_command}, 1173 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. " 1174 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. " 1175 . "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.", 1176 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1082 on_changed => sub { 1177 on_changed => sub {
1083 my ($self, $value) = @_; 1178 my ($self, $value) = @_;
1084 $CFG->{say_command} = $value; 1179 $CFG->{say_command} = $value;
1085 0 1180 0
1086 } 1181 }
1087 ); 1182 );
1088 1183
1089 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day"); 1184 $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 1185 $table->add (1, $row++, new CFPlus::UI::CheckBox
1091 state => $CFG->{show_tips}, 1186 state => $CFG->{show_tips},
1092 tooltip => "Show the <b>Tip of the day</b> window at startup?", 1187 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1093 on_changed => sub { 1188 on_changed => sub {
1094 my ($self, $value) = @_; 1189 my ($self, $value) = @_;
1095 $CFG->{show_tips} = $value; 1190 $CFG->{show_tips} = $value;
1096 0 1191 0
1097 } 1192 }
1098 ); 1193 );
1099 1194
1100 $vbox->add (new CFPlus::UI::FancyFrame 1195 $table->add (0, $row, new CFPlus::UI::Label valign => 0, align => 1, text => "Messages Window Size");
1101 label => "Server Info", 1196 $table->add (1, $row++, my $saycmd = new CFPlus::UI::Entry
1102 child => ($SERVER_INFO = new CFPlus::UI::Label ellipsise => 0), 1197 text => $CFG->{logview_max_par},
1198 tooltip => "This is maximum number of messages remembered in the <b>Messages</b> window. If the server "
1199 . "sends more messages than this number, older messages get removed to save memory and "
1200 . "computing time. A value of <b>0</b> disables this feature, but that is not recommended.",
1201 on_changed => sub {
1202 my ($self, $value) = @_;
1203 $LOGVIEW->{max_par} = $CFG->{logview_max_par} = $value*1;
1204 0
1205 },
1103 ); 1206 );
1104 1207
1105 $vbox 1208 $table
1106} 1209}
1107 1210
1108sub message_window { 1211sub message_window {
1109 my $window = new CFPlus::UI::Toplevel 1212 my $window = new CFPlus::UI::Toplevel
1110 name => "message_window", 1213 name => "message_window",
… …
1372 $ntb->add ( 1475 $ntb->add (
1373 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget, 1476 "Inventory (F5)" => $INVENTORY_PAGE = inventory_widget,
1374 "Toggles the inventory window, where you can manage your loot (or treasures :). " 1477 "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." 1478 . "You can also hit the <b>Tab</b>-key to show/hide the Inventory."
1376 ); 1479 );
1480 $ntb->add (Pickup => autopickup_setup,
1481 "Configure autopickup settings, i.e. which items you will pick up automatically when walking (or running) over them.");
1377 1482
1378 $ntb->set_current_page ($INVENTORY_PAGE); 1483 $ntb->set_current_page ($INVENTORY_PAGE);
1379 1484
1380 $plwin->add ($ntb); 1485 $plwin->add ($ntb);
1381 $plwin 1486 $plwin
… …
1547 1652
1548sub show_tip_of_the_day { 1653sub show_tip_of_the_day {
1549 # find all tips 1654 # find all tips
1550 my @tod = CFPlus::Pod::find tip_of_the_day => "*"; 1655 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1551 1656
1552 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day"); 1657 CFPlus::DB::get state => "tip_of_the_day", sub {
1658 my ($todindex) = @_;
1553 $todindex = 0 if $todindex >= @tod; 1659 $todindex = 0 if $todindex >= @tod;
1554 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1); 1660 CFPlus::DB::put state => tip_of_the_day => $todindex + 1, sub { };
1555 1661
1556 # create dialog 1662 # create dialog
1557 my $dialog; 1663 my $dialog;
1558 1664
1559 my $close = sub { 1665 my $close = sub {
1560 $dialog->destroy; 1666 $dialog->destroy;
1667 };
1668
1669 $dialog = new CFPlus::UI::Toplevel
1670 x => "center",
1671 y => "center",
1672 z => 3,
1673 name => 'tip_of_the_day',
1674 force_w => int $WIDTH * 4/9,
1675 force_h => int $WIDTH * 2/9,
1676 title => "Tip of the day #" . (1 + $todindex),
1677 child => my $vbox = new CFPlus::UI::VBox,
1678 has_close_button => 1,
1679 on_delete => $close,
1680 ;
1681
1682 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1683 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1684 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1685
1686 $vbox->add (my $table = new CFPlus::UI::Table col_expand => [0, 1]);
1687
1688 $table->add (0, 0, new CFPlus::UI::Button
1689 text => "Close",
1690 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>.",
1691 on_activate => $close,
1692 );
1693
1694 $table->add (2, 0, new CFPlus::UI::Button
1695 text => "Next",
1696 tooltip => "Show the next <b>Tip of the day</b>.",
1697 on_activate => sub {
1698 $close->();
1699 &show_tip_of_the_day;
1700 },
1701 );
1702
1703 $dialog->show;
1561 }; 1704 };
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} 1705}
1599 1706
1600sub sdl_init { 1707sub sdl_init {
1601 CFPlus::SDL_Init 1708 CFPlus::SDL_Init
1602 and die "SDL::Init failed!\n"; 1709 and die "SDL::Init failed!\n";
… …
1682 font => $FONT_FIXED, 1789 font => $FONT_FIXED,
1683 fontsize => $::CFG->{log_fontsize}, 1790 fontsize => $::CFG->{log_fontsize},
1684 indent => -4, 1791 indent => -4,
1685 can_hover => 1, 1792 can_hover => 1,
1686 can_events => 1, 1793 can_events => 1,
1794 max_par => $CFG->{logview_max_par},
1687 tooltip => "<b>Server Log</b>. This text viewer contains all the messages sent by the server.", 1795 tooltip => "<b>Server Log</b>. This text viewer contains all recent messages sent by the server.",
1688 ; 1796 ;
1689 1797
1690 $SETUP_DIALOG = new CFPlus::UI::Toplevel 1798 $SETUP_DIALOG = new CFPlus::UI::Toplevel
1691 title => "Setup", 1799 title => "Setup",
1692 name => "setup_dialog", 1800 name => "setup_dialog",
… …
1703 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1, 1811 $SETUP_DIALOG->add ($SETUP_NOTEBOOK = new CFPlus::UI::Notebook expand => 1, debug => 1,
1704 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1812 filter => new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1705 1813
1706 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup, 1814 $SETUP_NOTEBOOK->add (Server => $SETUP_SERVER = server_setup,
1707 "Configure the server to play on, your username, password and other server-related options."); 1815 "Configure the server to play on, your username, password and other server-related options.");
1708 $SETUP_NOTEBOOK->add (Pickup => autopickup_setup, 1816 $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."); 1817 "Configure various client-specific settings.");
1710 $SETUP_NOTEBOOK->add (Graphics => graphics_setup, 1818 $SETUP_NOTEBOOK->add (Graphics => graphics_setup,
1711 "Configure the video mode, performance, fonts and other graphical aspects of the game."); 1819 "Configure the video mode, performance, fonts and other graphical aspects of the game.");
1712 $SETUP_NOTEBOOK->add (Audio => audio_setup, 1820 $SETUP_NOTEBOOK->add (Audio => audio_setup,
1713 "Configure the use of audio, sound effects and background music."); 1821 "Configure the use of audio, sound effects and background music.");
1714 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup, 1822 $SETUP_NOTEBOOK->add (Keyboard => $SETUP_KEYBOARD = keyboard_setup,
… …
2013 if $CONN; 2121 if $CONN;
2014}); 2122});
2015 2123
2016%SDL_CB = ( 2124%SDL_CB = (
2017 CFPlus::SDL_QUIT => sub { 2125 CFPlus::SDL_QUIT => sub {
2018 Event::unloop -1; 2126 exit;
2019 }, 2127 },
2020 CFPlus::SDL_VIDEORESIZE => sub { 2128 CFPlus::SDL_VIDEORESIZE => sub {
2021 }, 2129 },
2022 CFPlus::SDL_VIDEOEXPOSE => sub { 2130 CFPlus::SDL_VIDEOEXPOSE => sub {
2023 CFPlus::UI::full_refresh; 2131 CFPlus::UI::full_refresh;
… …
2056 2164
2057$SIG{INT} = $SIG{TERM} = sub { exit }; 2165$SIG{INT} = $SIG{TERM} = sub { exit };
2058 2166
2059{ 2167{
2060 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc"; 2168 CFPlus::read_cfg "$Crossfire::VARDIR/cfplusrc";
2169 CFPlus::DB::Server::run;
2170
2061 CFPlus::UI::set_layout ($::CFG->{layout}); 2171 CFPlus::UI::set_layout ($::CFG->{layout});
2062 2172
2063 my %DEF_CFG = ( 2173 my %DEF_CFG = (
2064 sdl_mode => 0, 2174 sdl_mode => 0,
2065 width => 640, 2175 width => 640,
2066 height => 480, 2176 height => 480,
2067 fullscreen => 0, 2177 fullscreen => 0,
2068 fast => 0, 2178 fast => 0,
2069 map_scale => 1, 2179 map_scale => 1,
2070 fow_enable => 1, 2180 fow_enable => 1,
2071 fow_intensity => 0.45, 2181 fow_intensity => 0.45,
2072 fow_smooth => 0, 2182 fow_smooth => 0,
2183 map_smoothing => 1,
2073 gui_fontsize => 1, 2184 gui_fontsize => 1,
2074 log_fontsize => 0.7, 2185 log_fontsize => 0.7,
2075 gauge_fontsize => 1, 2186 gauge_fontsize => 1,
2076 gauge_size => 0.35, 2187 gauge_size => 0.35,
2077 stat_fontsize => 0.7, 2188 stat_fontsize => 0.7,
2078 mapsize => 100, 2189 mapsize => 100,
2079 say_command => 'chat', 2190 say_command => 'chat',
2080 audio_enable => 1, 2191 audio_enable => 1,
2081 bgm_enable => 1, 2192 bgm_enable => 1,
2082 bgm_volume => 0.25, 2193 bgm_volume => 0.25,
2083 face_prefetch => 0, 2194 face_prefetch => 0,
2084 output_sync => 1, 2195 output_sync => 1,
2085 output_count => 1, 2196 output_count => 1,
2197 output_rate => "",
2086 pickup => 0, 2198 pickup => 0,
2087 inv_sort => "mtime", 2199 inv_sort => "mtime",
2088 default => "profile", # default profile 2200 default => "profile", # default profile
2089 show_tips => 1, 2201 show_tips => 1,
2202 logview_max_par => 1000,
2090 ); 2203 );
2091 2204
2092 while (my ($k, $v) = each %DEF_CFG) { 2205 while (my ($k, $v) = each %DEF_CFG) {
2093 $CFG->{$k} = $v unless exists $CFG->{$k}; 2206 $CFG->{$k} = $v unless exists $CFG->{$k};
2094 } 2207 }
… …
2163 2276
2164Event::loop; 2277Event::loop;
2165#CFPlus::SDL_Quit; 2278#CFPlus::SDL_Quit;
2166#CFPlus::_exit 0; 2279#CFPlus::_exit 0;
2167 2280
2281END {
2168END { CFPlus::SDL_Quit } 2282 CFPlus::SDL_Quit;
2283 CFPlus::DB::Server::stop;
2284}
2169 2285
2170=head1 NAME 2286=head1 NAME
2171 2287
2172cfplus - A Crossfire+ and Crossfire game client 2288cfplus - A Crossfire+ and Crossfire game client
2173 2289

Diff Legend

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