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.115 by root, Mon Aug 14 03:41:29 2006 UTC vs.
Revision 1.130 by root, Sun Nov 19 19:43:53 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
5 26
6# do things only needed for single-binary version (par) 27# do things only needed for single-binary version (par)
… …
8 if (%PAR::LibCache) { 29 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 30 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 31
11 while (my ($filename, $zip) = each %PAR::LibCache) { 32 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 33 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 34 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 36 unless -e "$ENV{PAR_TEMP}/$1";
16 } 37 }
17 } 38 }
18 39
… …
47 68
48$Event::Eval = 0; 69$Event::Eval = 0;
49$Event::DIED = sub { 70$Event::DIED = sub {
50 # TODO: display dialog box or so 71 # TODO: display dialog box or so
51 Carp::cluck $_[1];#d#TODO: remove when stable 72 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1]; 73 return;#d#
74 CFPlus::fatal ($_[1]);
53}; 75};
54
55$SIG{__DIE__} = sub {
56 return if CFPlus::in_destruct;
57 Carp::cluck $_[0];
58 CFPlus::error $_[0];
59 return;#d#
60 #return unless defined $^S && !$^S;
61 $Event::DIED->(undef, $_[0]);
62};
63
64our $VERSION = '0.1';
65 76
66my $MAX_FPS = 60; 77my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 78my $MIN_FPS = 5; # unused as of yet
68 79
69our $META_SERVER = "crossfire.real-time.com:13326"; 80our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 81
71our $LAST_REFRESH; 82our $LAST_REFRESH;
72our $NOW; 83our $NOW;
73 84
74our $CFG; 85our $CFG;
75our $CONN; 86our $CONN;
87our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 88our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 89
78our $WANT_REFRESH; 90our $WANT_REFRESH;
79our $CAN_REFRESH; 91our $CAN_REFRESH;
80 92
… …
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 156 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 157}
146 158
147sub debug { 159sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 160 $DEBUG_STATUS->set_text ($_[0]);
161}
162
163sub message {
164 my ($para) = @_;
165
166 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
167
168 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
169
170 $LOGVIEW->add_paragraph ($para);
171 $LOGVIEW->scroll_to_bottom;
149} 172}
150 173
151sub destroy_query_dialog { 174sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 175 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 176 if $_[0]{query_dialog};
… …
352 status "logging in..."; 375 status "logging in...";
353 376
354 $LOGIN_BUTTON->set_text ("Logout"); 377 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 378 $SETUP_DIALOG->hide;
356 379
380 $PROFILE = $CFG->{profile}{default};
381
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 382 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 383
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 384 my ($host, $port) = split /:/, $PROFILE->{host};
360 385
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 386 $MAP = new CFPlus::Map;
362 387
363 $CONN = eval { 388 $CONN = eval {
364 new CFPlus::Protocol 389 new CFPlus::Protocol
365 host => $host, 390 host => $host,
366 port => $port || 13327, 391 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 392 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 393 pass => $PROFILE->{password},
369 mapw => $mapsize, 394 mapw => $mapsize,
370 maph => $mapsize, 395 maph => $mapsize,
396
397 client => "cfplus $CFPlus::VERSION $] $^O",
371 398
372 map_widget => $MAPWIDGET, 399 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 400 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 401 statusbox => $STATUSBOX,
375 map => $MAP, 402 map => $MAP,
… …
830 857
831 my $table = $METASERVER->{table}; 858 my $table = $METASERVER->{table};
832 $table->clear; 859 $table->clear;
833 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834 861
835 my $buf; 862 my $ok = 0;
836 863
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 864 CFPlus::background {
865 my $ua = CFPlus::lwp_useragent;
838 866
839 unless ($fh) { 867 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 868 } sub {
841 return; 869 my ($msg) = @_;
842 } 870 if ($msg) {
843
844 Event->io (fd => $fh, poll => 'r', cb => sub {
845 my $res = sysread $fh, $buf, 8192, length $buf;
846
847 if (!defined $res) {
848 $_[0]->w->cancel;
849 $label->set_text ("error while retrieving server list: $!");
850 } elsif ($res == 0) {
851 $_[0]->w->cancel;
852 status "server list retrieved";
853
854 utf8::decode $buf if utf8::valid $buf;
855
856 $table->clear; 871 $table->clear;
857 872
858 my @tip = ( 873 my @tip = (
859 "The current number of users logged in on the server.", 874 "The current number of users logged in on the server.",
860 "The hostname of the server.", 875 "The hostname of the server.",
… …
870 for 0 .. $#col; 885 for 0 .. $#col;
871 886
872 my @align = qw(1 0 1 1 -1); 887 my @align = qw(1 0 1 1 -1);
873 888
874 my $y = 0; 889 my $y = 0;
875 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 890 for my $m (
891 sort {
892 $b->{version} <=> $a->{version}
893 or $b->{users} <=> $a->{users}
894 }
895 @{ $msg->{servers} }
896 ) {
876 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 897 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
898 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
877 899
878 for ($desc) { 900 for ($desc) {
879 s/<br>/\n/gi; 901 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 902 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 903 s/<.*?>//sgi;
882 s/&/&amp;/g; 904 s/&amp;/&/g;
883 s/</&lt;/g; 905 s/&lt;/</g;
884 s/>/&gt;/g; 906 s/&gt;/>/g;
885 } 907 }
886 908
887 $uptime = sprintf "%dd %02d:%02d:%02d", 909 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 910 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 911 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 912 (int $uptime / 60) % 60,
891 $m->[8] % 60; 913 $uptime % 60;
892 914
893 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
894 916
895 $y++; 917 $y++;
896 918
… …
906 ), 928 ),
907 (new CFPlus::UI::Empty expand => 1), 929 (new CFPlus::UI::Empty expand => 1),
908 ]); 930 ]);
909 931
910 $table->add ($_, $y, new CFPlus::UI::Label 932 $table->add ($_, $y, new CFPlus::UI::Label
933 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 934 ellipsise => 0,
912 align => $align[$_], 935 align => $align[$_],
913 text => $m->[$_], 936 text => $m->[$_],
914 tooltip => $tip[$_], 937 tooltip => $tip[$_],
938 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 939 can_hover => 1,
916 can_events => 1, 940 can_events => 1,
917 fontsize => 0.8) 941 fontsize => 0.8)
918 for 0 .. $#$m; 942 for 0 .. $#$m;
919 } 943 }
944 } else {
945 $ok or $label->set_text ("error while contacting metaserver");
920 } 946 }
921 }); 947 };
948
922} 949}
923 950
924sub metaserver_dialog { 951sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 952 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 953 my $table = new CFPlus::UI::Table;
… …
930 title => "Server List", 957 title => "Server List",
931 name => 'metaserver_dialog', 958 name => 'metaserver_dialog',
932 x => 'center', 959 x => 'center',
933 y => 'center', 960 y => 'center',
934 z => 3, 961 z => 3,
962 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 963 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 964 child => $vbox,
937 has_close_button => 1, 965 has_close_button => 1,
938 table => $table, 966 table => $table,
939 on_visibility_change => sub { 967 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 968 update_metaserver ($_[0]) if $_[1];
… …
1043 }, 1071 },
1044 ); 1072 );
1045 1073
1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1074 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1047 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1075 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command}, 1076 text => $CFG->{say_command},
1049 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. " 1077 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. "
1050 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1078 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1051 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1079 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052 on_changed => sub { 1080 on_changed => sub {
1053 my ($self, $value) = @_; 1081 my ($self, $value) = @_;
1054 $CFG->{say_command} = $value; 1082 $CFG->{say_command} = $value;
1083 0
1084 }
1085 );
1086
1087 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1088 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1089 state => $CFG->{show_tips},
1090 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1091 on_changed => sub {
1092 my ($self, $value) = @_;
1093 $CFG->{show_tips} = $value;
1055 0 1094 0
1056 } 1095 }
1057 ); 1096 );
1058 1097
1059 $vbox->add (new CFPlus::UI::FancyFrame 1098 $vbox->add (new CFPlus::UI::FancyFrame
… …
1123 window => $window, 1162 window => $window,
1124 input => $input, 1163 input => $input,
1125 }; 1164 };
1126 1165
1127 $window 1166 $window
1128}
1129
1130sub open_string_query {
1131 my $cb = $_[1];
1132 my $dialog = new CFPlus::UI::Toplevel
1133 x => "center",
1134 y => "center",
1135 z => 50,
1136 force_w => $WIDTH * 4/5,
1137 title => $_[0];
1138
1139 $dialog->add (
1140 my $e = new CFPlus::UI::Entry
1141 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1142 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1143 );
1144
1145 $e->grab_focus;
1146 $dialog->show;
1147}
1148
1149sub open_quit_dialog {
1150 unless ($QUIT_DIALOG) {
1151 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1152 x => "center",
1153 y => "center",
1154 z => 50,
1155 title => "Really Quit?",
1156 on_key_down => sub {
1157 my ($dialog, $ev) = @_;
1158 $ev->{sym} == 27 and $dialog->hide;
1159 }
1160 ;
1161
1162 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1163
1164 $vb->add (new CFPlus::UI::Label
1165 text => "You should find a savebed and apply it first!",
1166 max_w => $WIDTH * 0.25,
1167 ellipsize => 0,
1168 );
1169 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1170 $hb->add (new CFPlus::UI::Button
1171 text => "Ok",
1172 expand => 1,
1173 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1174 );
1175 $hb->add (new CFPlus::UI::Button
1176 text => "Quit anyway",
1177 expand => 1,
1178 on_activate => sub { exit },
1179 );
1180 }
1181
1182 $QUIT_DIALOG->show;
1183 $QUIT_DIALOG->grab_focus;
1184} 1167}
1185 1168
1186sub autopickup_setup { 1169sub autopickup_setup {
1187 my $table = new CFPlus::UI::Table; 1170 my $table = new CFPlus::UI::Table;
1188 1171
… …
1280 $table 1263 $table
1281} 1264}
1282 1265
1283my %SORT_ORDER = ( 1266my %SORT_ORDER = (
1284 type => undef, 1267 type => undef,
1285 mtime => sub { sort { 1268 mtime => sub {
1269 my $NOW = time;
1270 sort {
1271 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1272 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1273
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1274 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime} 1275 or $btime <=> $atime
1288 or $a->{type} <=> $b->{type} 1276 or $a->{type} <=> $b->{type}
1277 } @_
1289 } @_ }, 1278 },
1290 weight => sub { sort { 1279 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1280 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type} 1281 or $a->{type} <=> $b->{type}
1293 } @_ }, 1282 } @_ },
1294); 1283);
… …
1319 #TODO# update to weigh/maxweight 1308 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1309 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321 1310
1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1311 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1323 $sw1->add ($INV = new CFPlus::UI::Inventory); 1312 $sw1->add ($INV = new CFPlus::UI::Inventory);
1313 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1324 1314
1325 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1315 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1326 1316
1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328 1318
… …
1397 1387
1398 my $refresh; 1388 my $refresh;
1399 $refresh = $BIND_UPD_CB = sub { 1389 $refresh = $BIND_UPD_CB = sub {
1400 $binding_list->clear (); 1390 $binding_list->clear ();
1401 1391
1392 return unless $PROFILE;
1393
1402 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1394 for my $mod (keys %{$PROFILE->{bindings}}) {
1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1395 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1396 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1397 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1406 1398
1407 my $lbl = join "; ", @$cmds; 1399 my $lbl = join "; ", @$cmds;
1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1400 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1409 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1401 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1410 $hb->add (new CFPlus::UI::Button 1402 $hb->add (new CFPlus::UI::Button
1411 text => "delete", 1403 text => "delete",
1412 tooltip => "Deletes the binding", 1404 tooltip => "Deletes the binding",
1413 on_activate => sub { 1405 on_activate => sub {
1414 $binding_list->remove ($hb); 1406 $binding_list->remove ($hb);
1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1407 delete $PROFILE->{bindings}{$mod}{$sym};
1416 0 1408 0
1417 }); 1409 });
1418 1410
1419 $hb->add (new CFPlus::UI::Button 1411 $hb->add (new CFPlus::UI::Button
1420 text => "edit", 1412 text => "edit",
1421 tooltip => "Edits the binding", 1413 tooltip => "Edits the binding",
1422 on_activate => sub { 1414 on_activate => sub {
1423 $::BIND_EDITOR->set_binding ( 1415 $::BIND_EDITOR->set_binding (
1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1416 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1425 sub { 1417 sub {
1426 my ($nmod, $nsym, $ncmds) = @_; 1418 my ($nmod, $nsym, $ncmds) = @_;
1427 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1419 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1428 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1420 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1429 $refresh->(); 1421 $refresh->();
… …
1507 1499
1508sub help_window { 1500sub help_window {
1509 my $win = new CFPlus::UI::Toplevel 1501 my $win = new CFPlus::UI::Toplevel
1510 x => 'center', 1502 x => 'center',
1511 y => 'center', 1503 y => 'center',
1512 z => 2, 1504 z => 4,
1513 name => 'doc_browser', 1505 name => 'doc_browser',
1514 force_w => int $WIDTH * 7/8, 1506 force_w => int $WIDTH * 7/8,
1515 force_h => int $HEIGHT * 7/8, 1507 force_h => int $HEIGHT * 7/8,
1516 title => "Help Browser", 1508 title => "Help Browser",
1517 has_close_button => 1; 1509 has_close_button => 1;
… …
1532 my $load_node; $load_node = sub { 1524 my $load_node; $load_node = sub {
1533 my ($node, $para) = @_; 1525 my ($node, $para) = @_;
1534 1526
1535 $buttons->clear; 1527 $buttons->clear;
1536 1528
1529 $buttons->add (new CFPlus::UI::Button
1530 text => "⇤",
1531 tooltip => "back to the starting page",
1532 on_activate => sub {
1533 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1534 unshift @future, @history;
1535 @history = ();
1536 $load_node->(@{shift @future});
1537 },
1538 );
1539
1537 if (@history) { 1540 if (@history) {
1538 $buttons->add (new CFPlus::UI::Button 1541 $buttons->add (new CFPlus::UI::Button
1539 text => "⋘", 1542 text => "⋘",
1540 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>", 1543 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1541 on_activate => sub { 1544 on_activate => sub {
1542 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode; 1545 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1543 $load_node->(@{pop @history}); 1546 $load_node->(@{pop @history});
1544 }, 1547 },
1545 ); 1548 );
1546 } 1549 }
1547 1550
1548 if (@future) { 1551 if (@future) {
1549 $buttons->add (new CFPlus::UI::Button 1552 $buttons->add (new CFPlus::UI::Button
1550 text => "⋙", 1553 text => "⋙",
1551 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>", 1554 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1552 on_activate => sub { 1555 on_activate => sub {
1553 push @history, [$curnode, $viewer->current_paragraph]; 1556 push @history, [$curnode, $viewer->current_paragraph];
1554 $load_node->(@{shift @future}); 1557 $load_node->(@{shift @future});
1555 }, 1558 },
1556 ); 1559 );
… …
1587 $CFPlus::Pod::goto_document = sub { 1590 $CFPlus::Pod::goto_document = sub {
1588 my (@path) = @_; 1591 my (@path) = @_;
1589 1592
1590 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = (); 1593 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1591 1594
1592 $load_node->(CFPlus::Pod::find @path); 1595 $load_node->((CFPlus::Pod::find @path)[0]);
1593 $win->show; 1596 $win->show;
1594 }; 1597 };
1595 1598
1596 $win 1599 $win
1600}
1601
1602sub open_string_query {
1603 my ($title, $cb, $txt, $tooltip) = @_;
1604 my $dialog = new CFPlus::UI::Toplevel
1605 x => "center",
1606 y => "center",
1607 z => 50,
1608 force_w => $WIDTH * 4/5,
1609 title => $title;
1610
1611 $dialog->add (
1612 my $e = new CFPlus::UI::Entry
1613 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1614 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1615 tooltip => $tooltip
1616 );
1617
1618 $e->grab_focus;
1619 $e->set_text ($txt) if $txt;
1620 $dialog->show;
1621}
1622
1623sub open_quit_dialog {
1624 unless ($QUIT_DIALOG) {
1625 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1626 x => "center",
1627 y => "center",
1628 z => 50,
1629 title => "Really Quit?",
1630 on_key_down => sub {
1631 my ($dialog, $ev) = @_;
1632 $ev->{sym} == 27 and $dialog->hide;
1633 }
1634 ;
1635
1636 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1637
1638 $vb->add (new CFPlus::UI::Label
1639 text => "You should find a savebed and apply it first!",
1640 max_w => $WIDTH * 0.25,
1641 ellipsize => 0,
1642 );
1643 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1644 $hb->add (new CFPlus::UI::Button
1645 text => "Ok",
1646 expand => 1,
1647 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1648 );
1649 $hb->add (new CFPlus::UI::Button
1650 text => "Quit anyway",
1651 expand => 1,
1652 on_activate => sub { exit },
1653 );
1654 }
1655
1656 $QUIT_DIALOG->show;
1657 $QUIT_DIALOG->grab_focus;
1658}
1659
1660sub show_tip_of_the_day {
1661 # find all tips
1662 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1663
1664 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1665 $todindex = 0 if $todindex >= @tod;
1666 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1667
1668 # create dialog
1669 my $dialog;
1670
1671 my $close = sub {
1672 $dialog->destroy;
1673 };
1674
1675 $dialog = new CFPlus::UI::Toplevel
1676 x => "center",
1677 y => "center",
1678 z => 3,
1679 name => 'tip_of_the_day',
1680 force_w => int $WIDTH * 4/9,
1681 force_h => int $WIDTH * 2/9,
1682 title => "Tip of the day #" . (1 + $todindex),
1683 child => my $vbox = new CFPlus::UI::VBox,
1684 has_close_button => 1,
1685 on_delete => $close,
1686 ;
1687
1688 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1689 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1690 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1691
1692 $vbox->add (my $table = new CFPlus::UI::Table);
1693
1694 $table->add (0, 0, new CFPlus::UI::Button
1695 text => "Close",
1696 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>.",
1697 on_activate => $close,
1698 );
1699
1700 $table->add (2, 0, new CFPlus::UI::Button
1701 text => "Next",
1702 tooltip => "Show the next <b>Tip of the day</b>.",
1703 on_activate => sub {
1704 $close->();
1705 &show_tip_of_the_day;
1706 },
1707 );
1708
1709 $dialog->show;
1597} 1710}
1598 1711
1599sub sdl_init { 1712sub sdl_init {
1600 CFPlus::SDL_Init 1713 CFPlus::SDL_Init
1601 and die "SDL::Init failed!\n"; 1714 and die "SDL::Init failed!\n";
… …
1807 CFPlus::Mix_AllocateChannels 8; 1920 CFPlus::Mix_AllocateChannels 8;
1808 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1921 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1809 1922
1810 audio_music_finished; 1923 audio_music_finished;
1811 1924
1925 local $_;
1812 while (<$fh>) { 1926 while (<$fh>) {
1813 next if /^\s*#/; 1927 next if /^\s*#/;
1814 next if /^\s*$/; 1928 next if /^\s*$/;
1815 1929
1816 my ($file, $volume, $event) = split /\s+/, $_, 3; 1930 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1950 log_fontsize => 0.7, 2064 log_fontsize => 0.7,
1951 gauge_fontsize => 1, 2065 gauge_fontsize => 1,
1952 gauge_size => 0.35, 2066 gauge_size => 0.35,
1953 stat_fontsize => 0.7, 2067 stat_fontsize => 0.7,
1954 mapsize => 100, 2068 mapsize => 100,
1955 say_command => 'say', 2069 say_command => 'chat',
1956 audio_enable => 1, 2070 audio_enable => 1,
1957 bgm_enable => 1, 2071 bgm_enable => 1,
1958 bgm_volume => 0.25, 2072 bgm_volume => 0.25,
1959 face_prefetch => 0, 2073 face_prefetch => 0,
1960 output_sync => 1, 2074 output_sync => 1,
1961 output_count => 1, 2075 output_count => 1,
1962 pickup => 0, 2076 pickup => 0,
1963 inv_sort => "mtime", 2077 inv_sort => "mtime",
1964 default => "profile", # default profile 2078 default => "profile", # default profile
2079 show_tips => 1,
1965 ); 2080 );
1966 2081
1967 while (my ($k, $v) = each %DEF_CFG) { 2082 while (my ($k, $v) = each %DEF_CFG) {
1968 $CFG->{$k} = $v unless exists $CFG->{$k}; 2083 $CFG->{$k} = $v unless exists $CFG->{$k};
1969 } 2084 }
… …
2013# } 2128# }
2014# my $t2 = Time::HiRes::time; 2129# my $t2 = Time::HiRes::time;
2015# warn $t2-$t1; 2130# warn $t2-$t1;
2016# } 2131# }
2017 2132
2133 $startup_done->();
2134
2018 video_init; 2135 video_init;
2019 audio_init; 2136 audio_init;
2020} 2137}
2138
2139show_tip_of_the_day if $CFG->{show_tips};
2021 2140
2022Event::loop; 2141Event::loop;
2023#CFPlus::SDL_Quit; 2142#CFPlus::SDL_Quit;
2024#CFPlus::_exit 0; 2143#CFPlus::_exit 0;
2025 2144

Diff Legend

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