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.114 by root, Mon Aug 14 01:21:02 2006 UTC vs.
Revision 1.131 by root, Sun Nov 19 20:31:29 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
… …
111 123
112our $INVENTORY_PAGE; 124our $INVENTORY_PAGE;
113our $STATS_PAGE; 125our $STATS_PAGE;
114our $SKILL_PAGE; 126our $SKILL_PAGE;
115our $SPELL_PAGE; 127our $SPELL_PAGE;
128our $SPELL_LIST;
116 129
117our $HELP_WINDOW; 130our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 131our $MESSAGE_WINDOW;
119our $FLOORBOX; 132our $FLOORBOX;
120our $GAUGES; 133our $GAUGES;
… …
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 157 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 158}
146 159
147sub debug { 160sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 161 $DEBUG_STATUS->set_text ($_[0]);
162}
163
164sub message {
165 my ($para) = @_;
166
167 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
168
169 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
170
171 $LOGVIEW->add_paragraph ($para);
172 $LOGVIEW->scroll_to_bottom;
149} 173}
150 174
151sub destroy_query_dialog { 175sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 176 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 177 if $_[0]{query_dialog};
… …
352 status "logging in..."; 376 status "logging in...";
353 377
354 $LOGIN_BUTTON->set_text ("Logout"); 378 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 379 $SETUP_DIALOG->hide;
356 380
381 $PROFILE = $CFG->{profile}{default};
382
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 383 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 384
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 385 my ($host, $port) = split /:/, $PROFILE->{host};
360 386
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 387 $MAP = new CFPlus::Map;
362 388
363 $CONN = eval { 389 $CONN = eval {
364 new CFPlus::Protocol 390 new CFPlus::Protocol
365 host => $host, 391 host => $host,
366 port => $port || 13327, 392 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 393 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 394 pass => $PROFILE->{password},
369 mapw => $mapsize, 395 mapw => $mapsize,
370 maph => $mapsize, 396 maph => $mapsize,
397
398 client => "cfplus $CFPlus::VERSION $] $^O",
371 399
372 map_widget => $MAPWIDGET, 400 map_widget => $MAPWIDGET,
373 logview => $LOGVIEW, 401 logview => $LOGVIEW,
374 statusbox => $STATUSBOX, 402 statusbox => $STATUSBOX,
375 map => $MAP, 403 map => $MAP,
… …
830 858
831 my $table = $METASERVER->{table}; 859 my $table = $METASERVER->{table};
832 $table->clear; 860 $table->clear;
833 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 861 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
834 862
835 my $buf; 863 my $ok = 0;
836 864
837 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 865 CFPlus::background {
866 my $ua = CFPlus::lwp_useragent;
838 867
839 unless ($fh) { 868 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
840 $label->set_text ("unable to contact metaserver: $!"); 869 } sub {
841 return; 870 my ($msg) = @_;
842 } 871 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; 872 $table->clear;
857 873
858 my @tip = ( 874 my @tip = (
859 "The current number of users logged in on the server.", 875 "The current number of users logged in on the server.",
860 "The hostname of the server.", 876 "The hostname of the server.",
… …
870 for 0 .. $#col; 886 for 0 .. $#col;
871 887
872 my @align = qw(1 0 1 1 -1); 888 my @align = qw(1 0 1 1 -1);
873 889
874 my $y = 0; 890 my $y = 0;
875 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 891 for my $m (
892 sort {
893 $b->{version} <=> $a->{version}
894 or $b->{users} <=> $a->{users}
895 }
896 @{ $msg->{servers} }
897 ) {
876 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 898 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
899 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
877 900
878 for ($desc) { 901 for ($desc) {
879 s/<br>/\n/gi; 902 s/<br>/\n/gi;
880 s/<li>/\n· /gi; 903 s/<li>/\n· /gi;
881 s/<.*?>//sgi; 904 s/<.*?>//sgi;
882 s/&/&amp;/g; 905 s/&amp;/&/g;
883 s/</&lt;/g; 906 s/&lt;/</g;
884 s/>/&gt;/g; 907 s/&gt;/>/g;
885 } 908 }
886 909
887 $uptime = sprintf "%dd %02d:%02d:%02d", 910 $uptime = sprintf "%dd %02d:%02d:%02d",
888 (int $m->[8] / 86400), 911 (int $uptime / 86400),
889 (int $m->[8] / 3600) % 24, 912 (int $uptime / 3600) % 24,
890 (int $m->[8] / 60) % 60, 913 (int $uptime / 60) % 60,
891 $m->[8] % 60; 914 $uptime % 60;
892 915
893 $m = [$users, $host, $uptime, $version, $desc]; 916 $m = [$users, $host, $uptime, $version, $desc];
894 917
895 $y++; 918 $y++;
896 919
… …
906 ), 929 ),
907 (new CFPlus::UI::Empty expand => 1), 930 (new CFPlus::UI::Empty expand => 1),
908 ]); 931 ]);
909 932
910 $table->add ($_, $y, new CFPlus::UI::Label 933 $table->add ($_, $y, new CFPlus::UI::Label
934 max_w => $::WIDTH * 0.4,
911 ellipsise => 0, 935 ellipsise => 0,
912 align => $align[$_], 936 align => $align[$_],
913 text => $m->[$_], 937 text => $m->[$_],
914 tooltip => $tip[$_], 938 tooltip => $tip[$_],
939 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
915 can_hover => 1, 940 can_hover => 1,
916 can_events => 1, 941 can_events => 1,
917 fontsize => 0.8) 942 fontsize => 0.8)
918 for 0 .. $#$m; 943 for 0 .. $#$m;
919 } 944 }
945 } else {
946 $ok or $label->set_text ("error while contacting metaserver");
920 } 947 }
921 }); 948 };
949
922} 950}
923 951
924sub metaserver_dialog { 952sub metaserver_dialog {
925 my $vbox = new CFPlus::UI::VBox; 953 my $vbox = new CFPlus::UI::VBox;
926 my $table = new CFPlus::UI::Table; 954 my $table = new CFPlus::UI::Table;
… …
930 title => "Server List", 958 title => "Server List",
931 name => 'metaserver_dialog', 959 name => 'metaserver_dialog',
932 x => 'center', 960 x => 'center',
933 y => 'center', 961 y => 'center',
934 z => 3, 962 z => 3,
963 force_w => $::WIDTH * 0.9,
935 force_h => $::HEIGHT * 0.4, 964 force_h => $::HEIGHT * 0.7,
936 child => $vbox, 965 child => $vbox,
937 has_close_button => 1, 966 has_close_button => 1,
938 table => $table, 967 table => $table,
939 on_visibility_change => sub { 968 on_visibility_change => sub {
940 update_metaserver ($_[0]) if $_[1]; 969 update_metaserver ($_[0]) if $_[1];
… …
1043 }, 1072 },
1044 ); 1073 );
1045 1074
1046 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1075 $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 1076 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1048 text => $CFG->{say_command}, 1077 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. " 1078 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. " 1079 . "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.", 1080 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1052 on_changed => sub { 1081 on_changed => sub {
1053 my ($self, $value) = @_; 1082 my ($self, $value) = @_;
1054 $CFG->{say_command} = $value; 1083 $CFG->{say_command} = $value;
1084 0
1085 }
1086 );
1087
1088 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1089 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1090 state => $CFG->{show_tips},
1091 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1092 on_changed => sub {
1093 my ($self, $value) = @_;
1094 $CFG->{show_tips} = $value;
1055 0 1095 0
1056 } 1096 }
1057 ); 1097 );
1058 1098
1059 $vbox->add (new CFPlus::UI::FancyFrame 1099 $vbox->add (new CFPlus::UI::FancyFrame
… …
1123 window => $window, 1163 window => $window,
1124 input => $input, 1164 input => $input,
1125 }; 1165 };
1126 1166
1127 $window 1167 $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} 1168}
1185 1169
1186sub autopickup_setup { 1170sub autopickup_setup {
1187 my $table = new CFPlus::UI::Table; 1171 my $table = new CFPlus::UI::Table;
1188 1172
… …
1280 $table 1264 $table
1281} 1265}
1282 1266
1283my %SORT_ORDER = ( 1267my %SORT_ORDER = (
1284 type => undef, 1268 type => undef,
1285 mtime => sub { sort { 1269 mtime => sub {
1270 my $NOW = time;
1271 sort {
1272 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1273 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1274
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1275 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime} 1276 or $btime <=> $atime
1288 or $a->{type} <=> $b->{type} 1277 or $a->{type} <=> $b->{type}
1278 } @_
1289 } @_ }, 1279 },
1290 weight => sub { sort { 1280 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1281 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type} 1282 or $a->{type} <=> $b->{type}
1293 } @_ }, 1283 } @_ },
1294); 1284);
… …
1319 #TODO# update to weigh/maxweight 1309 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1310 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321 1311
1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1312 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1323 $sw1->add ($INV = new CFPlus::UI::Inventory); 1313 $sw1->add ($INV = new CFPlus::UI::Inventory);
1314 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1324 1315
1325 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1316 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1326 1317
1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1318 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328 1319
… …
1368 $ntb->add ( 1359 $ntb->add (
1369 "Skills (F3)" => $SKILL_PAGE = skill_window, 1360 "Skills (F3)" => $SKILL_PAGE = skill_window,
1370 "Shows all your Skills." 1361 "Shows all your Skills."
1371 ); 1362 );
1372 1363
1373 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1364 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1365 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1375 $ntb->add ( 1366 $ntb->add (
1376 "Spellbook (F4)" => $spellsw, 1367 "Spellbook (F4)" => $spellsw,
1377 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1368 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1378 ); 1369 );
1379 $ntb->add ( 1370 $ntb->add (
… …
1397 1388
1398 my $refresh; 1389 my $refresh;
1399 $refresh = $BIND_UPD_CB = sub { 1390 $refresh = $BIND_UPD_CB = sub {
1400 $binding_list->clear (); 1391 $binding_list->clear ();
1401 1392
1393 return unless $PROFILE;
1394
1402 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1395 for my $mod (keys %{$PROFILE->{bindings}}) {
1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1396 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1397 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1398 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1406 1399
1407 my $lbl = join "; ", @$cmds; 1400 my $lbl = join "; ", @$cmds;
1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1401 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1409 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1402 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1410 $hb->add (new CFPlus::UI::Button 1403 $hb->add (new CFPlus::UI::Button
1411 text => "delete", 1404 text => "delete",
1412 tooltip => "Deletes the binding", 1405 tooltip => "Deletes the binding",
1413 on_activate => sub { 1406 on_activate => sub {
1414 $binding_list->remove ($hb); 1407 $binding_list->remove ($hb);
1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1408 delete $PROFILE->{bindings}{$mod}{$sym};
1416 0 1409 0
1417 }); 1410 });
1418 1411
1419 $hb->add (new CFPlus::UI::Button 1412 $hb->add (new CFPlus::UI::Button
1420 text => "edit", 1413 text => "edit",
1421 tooltip => "Edits the binding", 1414 tooltip => "Edits the binding",
1422 on_activate => sub { 1415 on_activate => sub {
1423 $::BIND_EDITOR->set_binding ( 1416 $::BIND_EDITOR->set_binding (
1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1417 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1425 sub { 1418 sub {
1426 my ($nmod, $nsym, $ncmds) = @_; 1419 my ($nmod, $nsym, $ncmds) = @_;
1427 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1420 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1428 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1421 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1429 $refresh->(); 1422 $refresh->();
… …
1507 1500
1508sub help_window { 1501sub help_window {
1509 my $win = new CFPlus::UI::Toplevel 1502 my $win = new CFPlus::UI::Toplevel
1510 x => 'center', 1503 x => 'center',
1511 y => 'center', 1504 y => 'center',
1512 z => 2, 1505 z => 4,
1513 name => 'doc_browser', 1506 name => 'doc_browser',
1514 force_w => int $WIDTH * 7/8, 1507 force_w => int $WIDTH * 7/8,
1515 force_h => int $HEIGHT * 7/8, 1508 force_h => int $HEIGHT * 7/8,
1516 title => "Help Browser", 1509 title => "Help Browser",
1517 has_close_button => 1; 1510 has_close_button => 1;
… …
1528 my @history; 1521 my @history;
1529 my @future; 1522 my @future;
1530 my $curnode; 1523 my $curnode;
1531 1524
1532 my $load_node; $load_node = sub { 1525 my $load_node; $load_node = sub {
1533 my ($node) = @_; 1526 my ($node, $para) = @_;
1534 1527
1535 $buttons->clear; 1528 $buttons->clear;
1529
1530 $buttons->add (new CFPlus::UI::Button
1531 text => "⇤",
1532 tooltip => "back to the starting page",
1533 on_activate => sub {
1534 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1535 unshift @future, @history;
1536 @history = ();
1537 $load_node->(@{shift @future});
1538 },
1539 );
1536 1540
1537 if (@history) { 1541 if (@history) {
1538 $buttons->add (new CFPlus::UI::Button 1542 $buttons->add (new CFPlus::UI::Button
1539 text => "⋘", 1543 text => "⋘",
1540 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>", 1544 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1541 on_activate => sub { 1545 on_activate => sub {
1542 unshift @future, $curnode if $curnode; 1546 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1543 $load_node->(pop @history); 1547 $load_node->(@{pop @history});
1544 }, 1548 },
1545 ); 1549 );
1546 } 1550 }
1547 1551
1548 if (@future) { 1552 if (@future) {
1549 $buttons->add (new CFPlus::UI::Button 1553 $buttons->add (new CFPlus::UI::Button
1550 text => "⋙", 1554 text => "⋙",
1551 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>", 1555 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1552 on_activate => sub { 1556 on_activate => sub {
1553 push @history, $curnode; 1557 push @history, [$curnode, $viewer->current_paragraph];
1554 $load_node->(shift @future); 1558 $load_node->(@{shift @future});
1555 }, 1559 },
1556 ); 1560 );
1557 } 1561 }
1558 1562
1559 $buttons->add (new CFPlus::UI::Label text => " "); 1563 $buttons->add (new CFPlus::UI::Label text => " ");
… …
1564 for my $node (@path) { 1568 for my $node (@path) {
1565 $buttons->add (new CFPlus::UI::Button 1569 $buttons->add (new CFPlus::UI::Button
1566 text => $node->{kw}[0], 1570 text => $node->{kw}[0],
1567 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>", 1571 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1568 on_activate => sub { 1572 on_activate => sub {
1569 push @history, $curnode if $curnode; @future = (); 1573 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1570 $load_node->($node); 1574 $load_node->($node);
1571 }, 1575 },
1572 ); 1576 );
1573 $buttons->add (new CFPlus::UI::Label text => "/"); 1577 $buttons->add (new CFPlus::UI::Label text => "/");
1574 } 1578 }
… …
1577 1581
1578 $curnode = $node; 1582 $curnode = $node;
1579 1583
1580 $viewer->clear; 1584 $viewer->clear;
1581 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1585 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1582 $viewer->set_offset (0); 1586 $viewer->scroll_to ($para);
1583 }; 1587 };
1584 1588
1585 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1589 $load_node->(CFPlus::Pod::find pod => "mainpage");
1586 1590
1587 $CFPlus::Pod::goto_document = sub { 1591 $CFPlus::Pod::goto_document = sub {
1588 my (@path) = @_; 1592 my (@path) = @_;
1589 1593
1590 push @history, $curnode if $curnode; @future = (); 1594 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1591 1595
1592 $load_node->(CFPlus::Pod::find @path); 1596 $load_node->((CFPlus::Pod::find @path)[0]);
1593 $win->show; 1597 $win->show;
1594 }; 1598 };
1595 1599
1596 $win 1600 $win
1601}
1602
1603sub open_string_query {
1604 my ($title, $cb, $txt, $tooltip) = @_;
1605 my $dialog = new CFPlus::UI::Toplevel
1606 x => "center",
1607 y => "center",
1608 z => 50,
1609 force_w => $WIDTH * 4/5,
1610 title => $title;
1611
1612 $dialog->add (
1613 my $e = new CFPlus::UI::Entry
1614 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1615 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1616 tooltip => $tooltip
1617 );
1618
1619 $e->grab_focus;
1620 $e->set_text ($txt) if $txt;
1621 $dialog->show;
1622}
1623
1624sub open_quit_dialog {
1625 unless ($QUIT_DIALOG) {
1626 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1627 x => "center",
1628 y => "center",
1629 z => 50,
1630 title => "Really Quit?",
1631 on_key_down => sub {
1632 my ($dialog, $ev) = @_;
1633 $ev->{sym} == 27 and $dialog->hide;
1634 }
1635 ;
1636
1637 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1638
1639 $vb->add (new CFPlus::UI::Label
1640 text => "You should find a savebed and apply it first!",
1641 max_w => $WIDTH * 0.25,
1642 ellipsize => 0,
1643 );
1644 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1645 $hb->add (new CFPlus::UI::Button
1646 text => "Ok",
1647 expand => 1,
1648 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1649 );
1650 $hb->add (new CFPlus::UI::Button
1651 text => "Quit anyway",
1652 expand => 1,
1653 on_activate => sub { exit },
1654 );
1655 }
1656
1657 $QUIT_DIALOG->show;
1658 $QUIT_DIALOG->grab_focus;
1659}
1660
1661sub show_tip_of_the_day {
1662 # find all tips
1663 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1664
1665 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1666 $todindex = 0 if $todindex >= @tod;
1667 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1668
1669 # create dialog
1670 my $dialog;
1671
1672 my $close = sub {
1673 $dialog->destroy;
1674 };
1675
1676 $dialog = new CFPlus::UI::Toplevel
1677 x => "center",
1678 y => "center",
1679 z => 3,
1680 name => 'tip_of_the_day',
1681 force_w => int $WIDTH * 4/9,
1682 force_h => int $WIDTH * 2/9,
1683 title => "Tip of the day #" . (1 + $todindex),
1684 child => my $vbox = new CFPlus::UI::VBox,
1685 has_close_button => 1,
1686 on_delete => $close,
1687 ;
1688
1689 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1690 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1691 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1692
1693 $vbox->add (my $table = new CFPlus::UI::Table);
1694
1695 $table->add (0, 0, new CFPlus::UI::Button
1696 text => "Close",
1697 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>.",
1698 on_activate => $close,
1699 );
1700
1701 $table->add (2, 0, new CFPlus::UI::Button
1702 text => "Next",
1703 tooltip => "Show the next <b>Tip of the day</b>.",
1704 on_activate => sub {
1705 $close->();
1706 &show_tip_of_the_day;
1707 },
1708 );
1709
1710 $dialog->show;
1597} 1711}
1598 1712
1599sub sdl_init { 1713sub sdl_init {
1600 CFPlus::SDL_Init 1714 CFPlus::SDL_Init
1601 and die "SDL::Init failed!\n"; 1715 and die "SDL::Init failed!\n";
… …
1807 CFPlus::Mix_AllocateChannels 8; 1921 CFPlus::Mix_AllocateChannels 8;
1808 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1922 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1809 1923
1810 audio_music_finished; 1924 audio_music_finished;
1811 1925
1926 local $_;
1812 while (<$fh>) { 1927 while (<$fh>) {
1813 next if /^\s*#/; 1928 next if /^\s*#/;
1814 next if /^\s*$/; 1929 next if /^\s*$/;
1815 1930
1816 my ($file, $volume, $event) = split /\s+/, $_, 3; 1931 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1950 log_fontsize => 0.7, 2065 log_fontsize => 0.7,
1951 gauge_fontsize => 1, 2066 gauge_fontsize => 1,
1952 gauge_size => 0.35, 2067 gauge_size => 0.35,
1953 stat_fontsize => 0.7, 2068 stat_fontsize => 0.7,
1954 mapsize => 100, 2069 mapsize => 100,
1955 say_command => 'say', 2070 say_command => 'chat',
1956 audio_enable => 1, 2071 audio_enable => 1,
1957 bgm_enable => 1, 2072 bgm_enable => 1,
1958 bgm_volume => 0.25, 2073 bgm_volume => 0.25,
1959 face_prefetch => 0, 2074 face_prefetch => 0,
1960 output_sync => 1, 2075 output_sync => 1,
1961 output_count => 1, 2076 output_count => 1,
1962 pickup => 0, 2077 pickup => 0,
1963 inv_sort => "mtime", 2078 inv_sort => "mtime",
1964 default => "profile", # default profile 2079 default => "profile", # default profile
2080 show_tips => 1,
1965 ); 2081 );
1966 2082
1967 while (my ($k, $v) = each %DEF_CFG) { 2083 while (my ($k, $v) = each %DEF_CFG) {
1968 $CFG->{$k} = $v unless exists $CFG->{$k}; 2084 $CFG->{$k} = $v unless exists $CFG->{$k};
1969 } 2085 }
… …
2013# } 2129# }
2014# my $t2 = Time::HiRes::time; 2130# my $t2 = Time::HiRes::time;
2015# warn $t2-$t1; 2131# warn $t2-$t1;
2016# } 2132# }
2017 2133
2134 $startup_done->();
2135
2018 video_init; 2136 video_init;
2019 audio_init; 2137 audio_init;
2020} 2138}
2139
2140show_tip_of_the_day if $CFG->{show_tips};
2021 2141
2022Event::loop; 2142Event::loop;
2023#CFPlus::SDL_Quit; 2143#CFPlus::SDL_Quit;
2024#CFPlus::_exit 0; 2144#CFPlus::_exit 0;
2025 2145

Diff Legend

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