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.133 by root, Sun Dec 3 01:03:49 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;
26
27use Carp 'verbose';
5 28
6# do things only needed for single-binary version (par) 29# do things only needed for single-binary version (par)
7BEGIN { 30BEGIN {
8 if (%PAR::LibCache) { 31 if (%PAR::LibCache) {
9 @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
10 33
11 while (my ($filename, $zip) = each %PAR::LibCache) { 34 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 35 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 36 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 37 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 38 unless -e "$ENV{PAR_TEMP}/$1";
16 } 39 }
17 } 40 }
18 41
… …
45$SIG{QUIT} = sub { Carp::cluck "QUIT" }; 68$SIG{QUIT} = sub { Carp::cluck "QUIT" };
46$SIG{PIPE} = 'IGNORE'; 69$SIG{PIPE} = 'IGNORE';
47 70
48$Event::Eval = 0; 71$Event::Eval = 0;
49$Event::DIED = sub { 72$Event::DIED = sub {
50 # TODO: display dialog box or so 73 CFPlus::fatal Carp::longmess $_[1]
51 Carp::cluck $_[1];#d#TODO: remove when stable
52 CFPlus::error $_[1];
53}; 74};
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 75
66my $MAX_FPS = 60; 76my $MAX_FPS = 60;
67my $MIN_FPS = 5; # unused as of yet 77my $MIN_FPS = 5; # unused as of yet
68 78
69our $META_SERVER = "crossfire.real-time.com:13326"; 79our $META_SERVER = "http://metaserver.schmorp.de/current.json";
70 80
71our $LAST_REFRESH; 81our $LAST_REFRESH;
72our $NOW; 82our $NOW;
73 83
74our $CFG; 84our $CFG;
75our $CONN; 85our $CONN;
86our $PROFILE; # current profile
76our $FAST; # fast, low-quality mode, possibly useful for software-rendering 87our $FAST; # fast, low-quality mode, possibly useful for software-rendering
77 88
78our $WANT_REFRESH; 89our $WANT_REFRESH;
79our $CAN_REFRESH; 90our $CAN_REFRESH;
80 91
… …
111 122
112our $INVENTORY_PAGE; 123our $INVENTORY_PAGE;
113our $STATS_PAGE; 124our $STATS_PAGE;
114our $SKILL_PAGE; 125our $SKILL_PAGE;
115our $SPELL_PAGE; 126our $SPELL_PAGE;
127our $SPELL_LIST;
116 128
117our $HELP_WINDOW; 129our $HELP_WINDOW;
118our $MESSAGE_WINDOW; 130our $MESSAGE_WINDOW;
119our $FLOORBOX; 131our $FLOORBOX;
120our $GAUGES; 132our $GAUGES;
… …
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,
… …
402sub stop_game { 429sub stop_game {
403 $LOGIN_BUTTON->set_text ("Login"); 430 $LOGIN_BUTTON->set_text ("Login");
404 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
405 $SETUP_DIALOG->show; 432 $SETUP_DIALOG->show;
406 $PL_WINDOW->hide; 433 $PL_WINDOW->hide;
407 $SPELL_PAGE->clear_spells; 434 $SPELL_LIST->clear_spells;
408 435
409 return unless $CONN; 436 return unless $CONN;
410 437
411 status "connection closed"; 438 status "connection closed";
412 439
… …
639 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 666 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
640 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
641 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 668 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
642 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
643 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 670 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
671 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
644 672
645 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 673 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
646 674
647 for my $x (0..2) { 675 for my $x (0..2) {
648 for my $y (0 .. 2) { 676 for my $y (0 .. 2) {
… …
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
… …
1206 ["Boots" => PICKUP_BOOTS], 1190 ["Boots" => PICKUP_BOOTS],
1207 ["Gloves" => PICKUP_GLOVES], 1191 ["Gloves" => PICKUP_GLOVES],
1208 ["Cloaks" => PICKUP_CLOAK], 1192 ["Cloaks" => PICKUP_CLOAK],
1209 ], 1193 ],
1210 1194
1211 ["Readables", 2, 2, 1195 ["Readables", 2, 0,
1212 ["Spellbooks" => PICKUP_SPELLBOOK], 1196 ["Spellbooks" => PICKUP_SPELLBOOK],
1213 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1197 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1214 ["Normal Books/Scrolls" => PICKUP_READABLES], 1198 ["Normal Books/Scrolls" => PICKUP_READABLES],
1215 ], 1199 ],
1216 ["Misc", 2, 7, 1200 ["Misc", 2, 5,
1217 ["Food" => PICKUP_FOOD], 1201 ["Food" => PICKUP_FOOD],
1218 ["Drinks" => PICKUP_DRINK], 1202 ["Drinks" => PICKUP_DRINK],
1219 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1203 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1220 ["Keys" => PICKUP_KEY], 1204 ["Keys" => PICKUP_KEY],
1221 ["Magical Items" => PICKUP_MAGICAL], 1205 ["Magical Items" => PICKUP_MAGICAL],
1222 ["Potions" => PICKUP_POTION], 1206 ["Potions" => PICKUP_POTION],
1223 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1207 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1224 ["Ignore cursed" => PICKUP_NOT_CURSED], 1208 ["Ignore cursed" => PICKUP_NOT_CURSED],
1225 ["Jewelery" => PICKUP_JEWELS], 1209 ["Jewelery" => PICKUP_JEWELS],
1210 ["Flesh" => PICKUP_FLESH],
1226 ], 1211 ],
1227 ["Weight/Value ratio", 2, 17] 1212 ["Weight/Value ratio", 2, 17]
1228 ) 1213 )
1229 { 1214 {
1230 my ($title, $x, $y, @bits) = @$_; 1215 my ($title, $x, $y, @bits) = @$_;
… …
1280 $table 1265 $table
1281} 1266}
1282 1267
1283my %SORT_ORDER = ( 1268my %SORT_ORDER = (
1284 type => undef, 1269 type => undef,
1285 mtime => sub { sort { 1270 mtime => sub {
1271 my $NOW = time;
1272 sort {
1273 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1274 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1275
1286 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1287 or $b->{mtime} <=> $a->{mtime} 1277 or $btime <=> $atime
1288 or $a->{type} <=> $b->{type} 1278 or $a->{type} <=> $b->{type}
1279 } @_
1289 } @_ }, 1280 },
1290 weight => sub { sort { 1281 weight => sub { sort {
1291 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1282 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1292 or $a->{type} <=> $b->{type} 1283 or $a->{type} <=> $b->{type}
1293 } @_ }, 1284 } @_ },
1294); 1285);
… …
1319 #TODO# update to weigh/maxweight 1310 #TODO# update to weigh/maxweight
1320 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1311 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1321 1312
1322 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1313 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1323 $sw1->add ($INV = new CFPlus::UI::Inventory); 1314 $sw1->add ($INV = new CFPlus::UI::Inventory);
1315 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1324 1316
1325 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1317 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1326 1318
1327 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1319 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1328 1320
… …
1368 $ntb->add ( 1360 $ntb->add (
1369 "Skills (F3)" => $SKILL_PAGE = skill_window, 1361 "Skills (F3)" => $SKILL_PAGE = skill_window,
1370 "Shows all your Skills." 1362 "Shows all your Skills."
1371 ); 1363 );
1372 1364
1373 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1365 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1374 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1366 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1375 $ntb->add ( 1367 $ntb->add (
1376 "Spellbook (F4)" => $spellsw, 1368 "Spellbook (F4)" => $spellsw,
1377 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1369 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1378 ); 1370 );
1379 $ntb->add ( 1371 $ntb->add (
… …
1397 1389
1398 my $refresh; 1390 my $refresh;
1399 $refresh = $BIND_UPD_CB = sub { 1391 $refresh = $BIND_UPD_CB = sub {
1400 $binding_list->clear (); 1392 $binding_list->clear ();
1401 1393
1394 return unless $PROFILE;
1395
1402 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1396 for my $mod (keys %{$PROFILE->{bindings}}) {
1403 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1397 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1404 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1398 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1405 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1399 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1406 1400
1407 my $lbl = join "; ", @$cmds; 1401 my $lbl = join "; ", @$cmds;
1408 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1402 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1409 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1403 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1410 $hb->add (new CFPlus::UI::Button 1404 $hb->add (new CFPlus::UI::Button
1411 text => "delete", 1405 text => "delete",
1412 tooltip => "Deletes the binding", 1406 tooltip => "Deletes the binding",
1413 on_activate => sub { 1407 on_activate => sub {
1414 $binding_list->remove ($hb); 1408 $binding_list->remove ($hb);
1415 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1409 delete $PROFILE->{bindings}{$mod}{$sym};
1416 0 1410 0
1417 }); 1411 });
1418 1412
1419 $hb->add (new CFPlus::UI::Button 1413 $hb->add (new CFPlus::UI::Button
1420 text => "edit", 1414 text => "edit",
1421 tooltip => "Edits the binding", 1415 tooltip => "Edits the binding",
1422 on_activate => sub { 1416 on_activate => sub {
1423 $::BIND_EDITOR->set_binding ( 1417 $::BIND_EDITOR->set_binding (
1424 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1418 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1425 sub { 1419 sub {
1426 my ($nmod, $nsym, $ncmds) = @_; 1420 my ($nmod, $nsym, $ncmds) = @_;
1427 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1421 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1428 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1422 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1429 $refresh->(); 1423 $refresh->();
… …
1507 1501
1508sub help_window { 1502sub help_window {
1509 my $win = new CFPlus::UI::Toplevel 1503 my $win = new CFPlus::UI::Toplevel
1510 x => 'center', 1504 x => 'center',
1511 y => 'center', 1505 y => 'center',
1512 z => 2, 1506 z => 4,
1513 name => 'doc_browser', 1507 name => 'doc_browser',
1514 force_w => int $WIDTH * 7/8, 1508 force_w => int $WIDTH * 7/8,
1515 force_h => int $HEIGHT * 7/8, 1509 force_h => int $HEIGHT * 7/8,
1516 title => "Help Browser", 1510 title => "Help Browser",
1517 has_close_button => 1; 1511 has_close_button => 1;
… …
1528 my @history; 1522 my @history;
1529 my @future; 1523 my @future;
1530 my $curnode; 1524 my $curnode;
1531 1525
1532 my $load_node; $load_node = sub { 1526 my $load_node; $load_node = sub {
1533 my ($node) = @_; 1527 my ($node, $para) = @_;
1534 1528
1535 $buttons->clear; 1529 $buttons->clear;
1530
1531 $buttons->add (new CFPlus::UI::Button
1532 text => "⇤",
1533 tooltip => "back to the starting page",
1534 on_activate => sub {
1535 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1536 unshift @future, @history;
1537 @history = ();
1538 $load_node->(@{shift @future});
1539 },
1540 );
1536 1541
1537 if (@history) { 1542 if (@history) {
1538 $buttons->add (new CFPlus::UI::Button 1543 $buttons->add (new CFPlus::UI::Button
1539 text => "⋘", 1544 text => "⋘",
1540 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1]) . "</i>", 1545 tooltip => "back to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $history[-1][0]) . "</i>",
1541 on_activate => sub { 1546 on_activate => sub {
1542 unshift @future, $curnode if $curnode; 1547 unshift @future, [$curnode, $viewer->current_paragraph] if $curnode;
1543 $load_node->(pop @history); 1548 $load_node->(@{pop @history});
1544 }, 1549 },
1545 ); 1550 );
1546 } 1551 }
1547 1552
1548 if (@future) { 1553 if (@future) {
1549 $buttons->add (new CFPlus::UI::Button 1554 $buttons->add (new CFPlus::UI::Button
1550 text => "⋙", 1555 text => "⋙",
1551 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0]) . "</i>", 1556 tooltip => "forward to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $future[0][0]) . "</i>",
1552 on_activate => sub { 1557 on_activate => sub {
1553 push @history, $curnode; 1558 push @history, [$curnode, $viewer->current_paragraph];
1554 $load_node->(shift @future); 1559 $load_node->(@{shift @future});
1555 }, 1560 },
1556 ); 1561 );
1557 } 1562 }
1558 1563
1559 $buttons->add (new CFPlus::UI::Label text => " "); 1564 $buttons->add (new CFPlus::UI::Label text => " ");
… …
1564 for my $node (@path) { 1569 for my $node (@path) {
1565 $buttons->add (new CFPlus::UI::Button 1570 $buttons->add (new CFPlus::UI::Button
1566 text => $node->{kw}[0], 1571 text => $node->{kw}[0],
1567 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>", 1572 tooltip => "go to <i>" . (CFPlus::asxml CFPlus::Pod::full_path $node) . "</i>",
1568 on_activate => sub { 1573 on_activate => sub {
1569 push @history, $curnode if $curnode; @future = (); 1574 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1570 $load_node->($node); 1575 $load_node->($node);
1571 }, 1576 },
1572 ); 1577 );
1573 $buttons->add (new CFPlus::UI::Label text => "/"); 1578 $buttons->add (new CFPlus::UI::Label text => "/");
1574 } 1579 }
… …
1577 1582
1578 $curnode = $node; 1583 $curnode = $node;
1579 1584
1580 $viewer->clear; 1585 $viewer->clear;
1581 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode); 1586 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $curnode);
1582 $viewer->set_offset (0); 1587 $viewer->scroll_to ($para);
1583 }; 1588 };
1584 1589
1585 $load_node->(CFPlus::Pod::find pod => "mainpage"); 1590 $load_node->(CFPlus::Pod::find pod => "mainpage");
1586 1591
1587 $CFPlus::Pod::goto_document = sub { 1592 $CFPlus::Pod::goto_document = sub {
1588 my (@path) = @_; 1593 my (@path) = @_;
1589 1594
1590 push @history, $curnode if $curnode; @future = (); 1595 push @history, [$curnode, $viewer->current_paragraph] if $curnode; @future = ();
1591 1596
1592 $load_node->(CFPlus::Pod::find @path); 1597 $load_node->((CFPlus::Pod::find @path)[0]);
1593 $win->show; 1598 $win->show;
1594 }; 1599 };
1595 1600
1596 $win 1601 $win
1602}
1603
1604sub open_string_query {
1605 my ($title, $cb, $txt, $tooltip) = @_;
1606 my $dialog = new CFPlus::UI::Toplevel
1607 x => "center",
1608 y => "center",
1609 z => 50,
1610 force_w => $WIDTH * 4/5,
1611 title => $title;
1612
1613 $dialog->add (
1614 my $e = new CFPlus::UI::Entry
1615 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1616 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1617 tooltip => $tooltip
1618 );
1619
1620 $e->grab_focus;
1621 $e->set_text ($txt) if $txt;
1622 $dialog->show;
1623}
1624
1625sub open_quit_dialog {
1626 unless ($QUIT_DIALOG) {
1627 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1628 x => "center",
1629 y => "center",
1630 z => 50,
1631 title => "Really Quit?",
1632 on_key_down => sub {
1633 my ($dialog, $ev) = @_;
1634 $ev->{sym} == 27 and $dialog->hide;
1635 }
1636 ;
1637
1638 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1639
1640 $vb->add (new CFPlus::UI::Label
1641 text => "You should find a savebed and apply it first!",
1642 max_w => $WIDTH * 0.25,
1643 ellipsize => 0,
1644 );
1645 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1646 $hb->add (new CFPlus::UI::Button
1647 text => "Ok",
1648 expand => 1,
1649 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1650 );
1651 $hb->add (new CFPlus::UI::Button
1652 text => "Quit anyway",
1653 expand => 1,
1654 on_activate => sub { exit },
1655 );
1656 }
1657
1658 $QUIT_DIALOG->show;
1659 $QUIT_DIALOG->grab_focus;
1660}
1661
1662sub show_tip_of_the_day {
1663 # find all tips
1664 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1665
1666 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1667 $todindex = 0 if $todindex >= @tod;
1668 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1669
1670 # create dialog
1671 my $dialog;
1672
1673 my $close = sub {
1674 $dialog->destroy;
1675 };
1676
1677 $dialog = new CFPlus::UI::Toplevel
1678 x => "center",
1679 y => "center",
1680 z => 3,
1681 name => 'tip_of_the_day',
1682 force_w => int $WIDTH * 4/9,
1683 force_h => int $WIDTH * 2/9,
1684 title => "Tip of the day #" . (1 + $todindex),
1685 child => my $vbox = new CFPlus::UI::VBox,
1686 has_close_button => 1,
1687 on_delete => $close,
1688 ;
1689
1690 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1691 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1692 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1693
1694 $vbox->add (my $table = new CFPlus::UI::Table);
1695
1696 $table->add (0, 0, new CFPlus::UI::Button
1697 text => "Close",
1698 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>.",
1699 on_activate => $close,
1700 );
1701
1702 $table->add (2, 0, new CFPlus::UI::Button
1703 text => "Next",
1704 tooltip => "Show the next <b>Tip of the day</b>.",
1705 on_activate => sub {
1706 $close->();
1707 &show_tip_of_the_day;
1708 },
1709 );
1710
1711 $dialog->show;
1597} 1712}
1598 1713
1599sub sdl_init { 1714sub sdl_init {
1600 CFPlus::SDL_Init 1715 CFPlus::SDL_Init
1601 and die "SDL::Init failed!\n"; 1716 and die "SDL::Init failed!\n";
… …
1807 CFPlus::Mix_AllocateChannels 8; 1922 CFPlus::Mix_AllocateChannels 8;
1808 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1923 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1809 1924
1810 audio_music_finished; 1925 audio_music_finished;
1811 1926
1927 local $_;
1812 while (<$fh>) { 1928 while (<$fh>) {
1813 next if /^\s*#/; 1929 next if /^\s*#/;
1814 next if /^\s*$/; 1930 next if /^\s*$/;
1815 1931
1816 my ($file, $volume, $event) = split /\s+/, $_, 3; 1932 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1950 log_fontsize => 0.7, 2066 log_fontsize => 0.7,
1951 gauge_fontsize => 1, 2067 gauge_fontsize => 1,
1952 gauge_size => 0.35, 2068 gauge_size => 0.35,
1953 stat_fontsize => 0.7, 2069 stat_fontsize => 0.7,
1954 mapsize => 100, 2070 mapsize => 100,
1955 say_command => 'say', 2071 say_command => 'chat',
1956 audio_enable => 1, 2072 audio_enable => 1,
1957 bgm_enable => 1, 2073 bgm_enable => 1,
1958 bgm_volume => 0.25, 2074 bgm_volume => 0.25,
1959 face_prefetch => 0, 2075 face_prefetch => 0,
1960 output_sync => 1, 2076 output_sync => 1,
1961 output_count => 1, 2077 output_count => 1,
1962 pickup => 0, 2078 pickup => 0,
1963 inv_sort => "mtime", 2079 inv_sort => "mtime",
1964 default => "profile", # default profile 2080 default => "profile", # default profile
2081 show_tips => 1,
1965 ); 2082 );
1966 2083
1967 while (my ($k, $v) = each %DEF_CFG) { 2084 while (my ($k, $v) = each %DEF_CFG) {
1968 $CFG->{$k} = $v unless exists $CFG->{$k}; 2085 $CFG->{$k} = $v unless exists $CFG->{$k};
1969 } 2086 }
… …
2013# } 2130# }
2014# my $t2 = Time::HiRes::time; 2131# my $t2 = Time::HiRes::time;
2015# warn $t2-$t1; 2132# warn $t2-$t1;
2016# } 2133# }
2017 2134
2135 $startup_done->();
2136
2018 video_init; 2137 video_init;
2019 audio_init; 2138 audio_init;
2020} 2139}
2140
2141show_tip_of_the_day if $CFG->{show_tips};
2021 2142
2022Event::loop; 2143Event::loop;
2023#CFPlus::SDL_Quit; 2144#CFPlus::SDL_Quit;
2024#CFPlus::_exit 0; 2145#CFPlus::_exit 0;
2025 2146

Diff Legend

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