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.118 by root, Tue Aug 22 06:37:30 2006 UTC vs.
Revision 1.134 by elmex, Mon Dec 4 15:17:14 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.9';
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;
… …
138our $BIND_EDITOR; 150our $BIND_EDITOR;
139our $BIND_UPD_CB; 151our $BIND_UPD_CB;
140 152
141our $PICKUP_CFG; 153our $PICKUP_CFG;
142 154
155our $IN_BUILD_MODE;
156our $BUILD_BUTTON;
157
143sub status { 158sub status {
144 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]); 159 $STATUSBOX->add (CFPlus::asxml $_[0], pri => -10, group => "status", timeout => 10, fg => [1, 1, 0, 1]);
145} 160}
146 161
147sub debug { 162sub debug {
148 $DEBUG_STATUS->set_text ($_[0]); 163 $DEBUG_STATUS->set_text ($_[0]);
164}
165
166sub message {
167 my ($para) = @_;
168
169 my $time = sprintf "%02d:%02d:%02d", (localtime time)[2,1,0];
170
171 $para->{markup} = "<span foreground='#ffffff'>$time</span> $para->{markup}";
172
173 $LOGVIEW->add_paragraph ($para);
174 $LOGVIEW->scroll_to_bottom;
149} 175}
150 176
151sub destroy_query_dialog { 177sub destroy_query_dialog {
152 (delete $_[0]{query_dialog})->destroy 178 (delete $_[0]{query_dialog})->destroy
153 if $_[0]{query_dialog}; 179 if $_[0]{query_dialog};
… …
352 status "logging in..."; 378 status "logging in...";
353 379
354 $LOGIN_BUTTON->set_text ("Logout"); 380 $LOGIN_BUTTON->set_text ("Logout");
355 $SETUP_DIALOG->hide; 381 $SETUP_DIALOG->hide;
356 382
383 $PROFILE = $CFG->{profile}{default};
384
357 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32; 385 my $mapsize = List::Util::min 32, List::Util::max 11, int $WIDTH * $CFG->{mapsize} * 0.01 / 32;
358 386
359 my ($host, $port) = split /:/, $CFG->{profile}{default}{host}; 387 my ($host, $port) = split /:/, $PROFILE->{host};
360 388
361 $MAP = new CFPlus::Map $mapsize, $mapsize; 389 $MAP = new CFPlus::Map;
362 390
363 $CONN = eval { 391 $CONN = eval {
364 new CFPlus::Protocol 392 new CFPlus::Protocol
365 host => $host, 393 host => $host,
366 port => $port || 13327, 394 port => $port || 13327,
367 user => $CFG->{profile}{default}{user}, 395 user => $PROFILE->{user},
368 pass => $CFG->{profile}{default}{password}, 396 pass => $PROFILE->{password},
369 mapw => $mapsize, 397 mapw => $mapsize,
370 maph => $mapsize, 398 maph => $mapsize,
371 399
372 client => "cfplus $VERSION $] $^O", 400 client => "cfplus $CFPlus::VERSION $] $^O",
373 401
374 map_widget => $MAPWIDGET, 402 map_widget => $MAPWIDGET,
375 logview => $LOGVIEW, 403 logview => $LOGVIEW,
376 statusbox => $STATUSBOX, 404 statusbox => $STATUSBOX,
377 map => $MAP, 405 map => $MAP,
… …
404sub stop_game { 432sub stop_game {
405 $LOGIN_BUTTON->set_text ("Login"); 433 $LOGIN_BUTTON->set_text ("Login");
406 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 434 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
407 $SETUP_DIALOG->show; 435 $SETUP_DIALOG->show;
408 $PL_WINDOW->hide; 436 $PL_WINDOW->hide;
409 $SPELL_PAGE->clear_spells; 437 $SPELL_LIST->clear_spells;
410 438
411 return unless $CONN; 439 return unless $CONN;
412 440
413 status "connection closed"; 441 status "connection closed";
414 442
… …
641 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 }); 669 $table->add (1, 1, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 2; 0 });
642 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 670 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
643 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 }); 671 $table->add (1, 2, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 4; 0 });
644 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 672 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
645 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 }); 673 $table->add (1, 3, new CFPlus::UI::CheckBox on_changed => sub { $ENV{CFPLUS_DEBUG} ^= 8; 0 });
674 $table->add (0, 4, new CFPlus::UI::Button text => "die on click(tm)", on_activate => sub { die "violator" } );
646 675
647 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05); 676 my @default_smooth = (0.05, 0.13, 0.05, 0.13, 0.30, 0.13, 0.05, 0.13, 0.05);
648 677
649 for my $x (0..2) { 678 for my $x (0..2) {
650 for my $y (0 .. 2) { 679 for my $y (0 .. 2) {
… …
832 861
833 my $table = $METASERVER->{table}; 862 my $table = $METASERVER->{table};
834 $table->clear; 863 $table->clear;
835 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 864 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
836 865
837 my $buf; 866 my $ok = 0;
838 867
839 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 868 CFPlus::background {
869 my $ua = CFPlus::lwp_useragent;
840 870
841 unless ($fh) { 871 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
842 $label->set_text ("unable to contact metaserver: $!"); 872 } sub {
843 return; 873 my ($msg) = @_;
844 } 874 if ($msg) {
845
846 Event->io (fd => $fh, poll => 'r', cb => sub {
847 my $res = sysread $fh, $buf, 8192, length $buf;
848
849 if (!defined $res) {
850 $_[0]->w->cancel;
851 $label->set_text ("error while retrieving server list: $!");
852 } elsif ($res == 0) {
853 $_[0]->w->cancel;
854 status "server list retrieved";
855
856 utf8::decode $buf if utf8::valid $buf;
857
858 $table->clear; 875 $table->clear;
859 876
860 my @tip = ( 877 my @tip = (
861 "The current number of users logged in on the server.", 878 "The current number of users logged in on the server.",
862 "The hostname of the server.", 879 "The hostname of the server.",
… …
872 for 0 .. $#col; 889 for 0 .. $#col;
873 890
874 my @align = qw(1 0 1 1 -1); 891 my @align = qw(1 0 1 1 -1);
875 892
876 my $y = 0; 893 my $y = 0;
877 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 894 for my $m (
895 sort {
896 $b->{version} <=> $a->{version}
897 or $b->{users} <=> $a->{users}
898 }
899 @{ $msg->{servers} }
900 ) {
878 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 901 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
902 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
879 903
880 for ($desc) { 904 for ($desc) {
881 s/<br>/\n/gi; 905 s/<br>/\n/gi;
882 s/<li>/\n· /gi; 906 s/<li>/\n· /gi;
883 s/<.*?>//sgi; 907 s/<.*?>//sgi;
884 s/&/&amp;/g; 908 s/&amp;/&/g;
885 s/</&lt;/g; 909 s/&lt;/</g;
886 s/>/&gt;/g; 910 s/&gt;/>/g;
887 } 911 }
888 912
889 $uptime = sprintf "%dd %02d:%02d:%02d", 913 $uptime = sprintf "%dd %02d:%02d:%02d",
890 (int $m->[8] / 86400), 914 (int $uptime / 86400),
891 (int $m->[8] / 3600) % 24, 915 (int $uptime / 3600) % 24,
892 (int $m->[8] / 60) % 60, 916 (int $uptime / 60) % 60,
893 $m->[8] % 60; 917 $uptime % 60;
894 918
895 $m = [$users, $host, $uptime, $version, $desc]; 919 $m = [$users, $host, $uptime, $version, $desc];
896 920
897 $y++; 921 $y++;
898 922
… …
908 ), 932 ),
909 (new CFPlus::UI::Empty expand => 1), 933 (new CFPlus::UI::Empty expand => 1),
910 ]); 934 ]);
911 935
912 $table->add ($_, $y, new CFPlus::UI::Label 936 $table->add ($_, $y, new CFPlus::UI::Label
937 max_w => $::WIDTH * 0.4,
913 ellipsise => 0, 938 ellipsise => 0,
914 align => $align[$_], 939 align => $align[$_],
915 text => $m->[$_], 940 text => $m->[$_],
916 tooltip => $tip[$_], 941 tooltip => $tip[$_],
942 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
917 can_hover => 1, 943 can_hover => 1,
918 can_events => 1, 944 can_events => 1,
919 fontsize => 0.8) 945 fontsize => 0.8)
920 for 0 .. $#$m; 946 for 0 .. $#$m;
921 } 947 }
948 } else {
949 $ok or $label->set_text ("error while contacting metaserver");
922 } 950 }
923 }); 951 };
952
924} 953}
925 954
926sub metaserver_dialog { 955sub metaserver_dialog {
927 my $vbox = new CFPlus::UI::VBox; 956 my $vbox = new CFPlus::UI::VBox;
928 my $table = new CFPlus::UI::Table; 957 my $table = new CFPlus::UI::Table;
… …
932 title => "Server List", 961 title => "Server List",
933 name => 'metaserver_dialog', 962 name => 'metaserver_dialog',
934 x => 'center', 963 x => 'center',
935 y => 'center', 964 y => 'center',
936 z => 3, 965 z => 3,
966 force_w => $::WIDTH * 0.9,
937 force_h => $::HEIGHT * 0.4, 967 force_h => $::HEIGHT * 0.7,
938 child => $vbox, 968 child => $vbox,
939 has_close_button => 1, 969 has_close_button => 1,
940 table => $table, 970 table => $table,
941 on_visibility_change => sub { 971 on_visibility_change => sub {
942 update_metaserver ($_[0]) if $_[1]; 972 update_metaserver ($_[0]) if $_[1];
… …
1045 }, 1075 },
1046 ); 1076 );
1047 1077
1048 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command"); 1078 $table->add (0, 12, new CFPlus::UI::Label valign => 0, align => 1, text => "Chat Command");
1049 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry 1079 $table->add (1, 12, my $saycmd = new CFPlus::UI::Entry
1050 text => $CFG->{say_command}, 1080 text => $CFG->{say_command},
1051 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. " 1081 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. "
1052 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. " 1082 . "Usually you want to enter something like 'say' or 'shout' or 'gsay' here. "
1053 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.", 1083 . "But you could also set it to <b>tell <i>playername</i></b> to only chat with that user.",
1054 on_changed => sub { 1084 on_changed => sub {
1055 my ($self, $value) = @_; 1085 my ($self, $value) = @_;
1056 $CFG->{say_command} = $value; 1086 $CFG->{say_command} = $value;
1087 0
1088 }
1089 );
1090
1091 $table->add (0, 13, new CFPlus::UI::Label valign => 0, align => 1, text => "Tip of the day");
1092 $table->add (1, 13, my $saycmd = new CFPlus::UI::CheckBox
1093 state => $CFG->{show_tips},
1094 tooltip => "Show the <b>Tip of the day</b> window at startup?",
1095 on_changed => sub {
1096 my ($self, $value) = @_;
1097 $CFG->{show_tips} = $value;
1057 0 1098 0
1058 } 1099 }
1059 ); 1100 );
1060 1101
1061 $vbox->add (new CFPlus::UI::FancyFrame 1102 $vbox->add (new CFPlus::UI::FancyFrame
… …
1125 window => $window, 1166 window => $window,
1126 input => $input, 1167 input => $input,
1127 }; 1168 };
1128 1169
1129 $window 1170 $window
1130}
1131
1132sub open_string_query {
1133 my ($title, $cb, $txt, $tooltip) = @_;
1134 my $dialog = new CFPlus::UI::Toplevel
1135 x => "center",
1136 y => "center",
1137 z => 50,
1138 force_w => $WIDTH * 4/5,
1139 title => $title;
1140
1141 $dialog->add (
1142 my $e = new CFPlus::UI::Entry
1143 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1144 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1145 tooltip => $tooltip
1146 );
1147
1148 $e->grab_focus;
1149 $e->set_text ($txt) if $txt;
1150 $dialog->show;
1151}
1152
1153sub open_quit_dialog {
1154 unless ($QUIT_DIALOG) {
1155 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1156 x => "center",
1157 y => "center",
1158 z => 50,
1159 title => "Really Quit?",
1160 on_key_down => sub {
1161 my ($dialog, $ev) = @_;
1162 $ev->{sym} == 27 and $dialog->hide;
1163 }
1164 ;
1165
1166 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1167
1168 $vb->add (new CFPlus::UI::Label
1169 text => "You should find a savebed and apply it first!",
1170 max_w => $WIDTH * 0.25,
1171 ellipsize => 0,
1172 );
1173 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1174 $hb->add (new CFPlus::UI::Button
1175 text => "Ok",
1176 expand => 1,
1177 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1178 );
1179 $hb->add (new CFPlus::UI::Button
1180 text => "Quit anyway",
1181 expand => 1,
1182 on_activate => sub { exit },
1183 );
1184 }
1185
1186 $QUIT_DIALOG->show;
1187 $QUIT_DIALOG->grab_focus;
1188} 1171}
1189 1172
1190sub autopickup_setup { 1173sub autopickup_setup {
1191 my $table = new CFPlus::UI::Table; 1174 my $table = new CFPlus::UI::Table;
1192 1175
… …
1210 ["Boots" => PICKUP_BOOTS], 1193 ["Boots" => PICKUP_BOOTS],
1211 ["Gloves" => PICKUP_GLOVES], 1194 ["Gloves" => PICKUP_GLOVES],
1212 ["Cloaks" => PICKUP_CLOAK], 1195 ["Cloaks" => PICKUP_CLOAK],
1213 ], 1196 ],
1214 1197
1215 ["Readables", 2, 2, 1198 ["Readables", 2, 0,
1216 ["Spellbooks" => PICKUP_SPELLBOOK], 1199 ["Spellbooks" => PICKUP_SPELLBOOK],
1217 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1200 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1218 ["Normal Books/Scrolls" => PICKUP_READABLES], 1201 ["Normal Books/Scrolls" => PICKUP_READABLES],
1219 ], 1202 ],
1220 ["Misc", 2, 7, 1203 ["Misc", 2, 5,
1221 ["Food" => PICKUP_FOOD], 1204 ["Food" => PICKUP_FOOD],
1222 ["Drinks" => PICKUP_DRINK], 1205 ["Drinks" => PICKUP_DRINK],
1223 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1206 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1224 ["Keys" => PICKUP_KEY], 1207 ["Keys" => PICKUP_KEY],
1225 ["Magical Items" => PICKUP_MAGICAL], 1208 ["Magical Items" => PICKUP_MAGICAL],
1226 ["Potions" => PICKUP_POTION], 1209 ["Potions" => PICKUP_POTION],
1227 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1210 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1228 ["Ignore cursed" => PICKUP_NOT_CURSED], 1211 ["Ignore cursed" => PICKUP_NOT_CURSED],
1229 ["Jewelery" => PICKUP_JEWELS], 1212 ["Jewelery" => PICKUP_JEWELS],
1213 ["Flesh" => PICKUP_FLESH],
1230 ], 1214 ],
1231 ["Weight/Value ratio", 2, 17] 1215 ["Weight/Value ratio", 2, 17]
1232 ) 1216 )
1233 { 1217 {
1234 my ($title, $x, $y, @bits) = @$_; 1218 my ($title, $x, $y, @bits) = @$_;
… …
1284 $table 1268 $table
1285} 1269}
1286 1270
1287my %SORT_ORDER = ( 1271my %SORT_ORDER = (
1288 type => undef, 1272 type => undef,
1289 mtime => sub { sort { 1273 mtime => sub {
1274 my $NOW = time;
1275 sort {
1276 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1277 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1278
1290 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1279 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1291 or $b->{mtime} <=> $a->{mtime} 1280 or $btime <=> $atime
1292 or $a->{type} <=> $b->{type} 1281 or $a->{type} <=> $b->{type}
1282 } @_
1293 } @_ }, 1283 },
1294 weight => sub { sort { 1284 weight => sub { sort {
1295 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1285 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1296 or $a->{type} <=> $b->{type} 1286 or $a->{type} <=> $b->{type}
1297 } @_ }, 1287 } @_ },
1298); 1288);
… …
1323 #TODO# update to weigh/maxweight 1313 #TODO# update to weigh/maxweight
1324 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1314 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1325 1315
1326 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1316 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1327 $sw1->add ($INV = new CFPlus::UI::Inventory); 1317 $sw1->add ($INV = new CFPlus::UI::Inventory);
1318 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1328 1319
1329 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1320 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1330 1321
1331 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1322 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1332 1323
… …
1372 $ntb->add ( 1363 $ntb->add (
1373 "Skills (F3)" => $SKILL_PAGE = skill_window, 1364 "Skills (F3)" => $SKILL_PAGE = skill_window,
1374 "Shows all your Skills." 1365 "Shows all your Skills."
1375 ); 1366 );
1376 1367
1377 my $spellsw = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1); 1368 my $spellsw = $SPELL_PAGE = new CFPlus::UI::ScrolledWindow (expand => 1, scroll_y => 1);
1378 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1369 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1379 $ntb->add ( 1370 $ntb->add (
1380 "Spellbook (F4)" => $spellsw, 1371 "Spellbook (F4)" => $spellsw,
1381 "Displays all spells you have and lets you edit keyboard shortcuts for them." 1372 "Displays all spells you have and lets you edit keyboard shortcuts for them."
1382 ); 1373 );
1383 $ntb->add ( 1374 $ntb->add (
… …
1401 1392
1402 my $refresh; 1393 my $refresh;
1403 $refresh = $BIND_UPD_CB = sub { 1394 $refresh = $BIND_UPD_CB = sub {
1404 $binding_list->clear (); 1395 $binding_list->clear ();
1405 1396
1397 return unless $PROFILE;
1398
1406 for my $mod (keys %{$::CFG->{profile}{default}{bindings}}) { 1399 for my $mod (keys %{$PROFILE->{bindings}}) {
1407 for my $sym (keys %{$::CFG->{profile}{default}{bindings}{$mod}}) { 1400 for my $sym (keys %{$PROFILE->{bindings}{$mod}}) {
1408 my $cmds = $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1401 my $cmds = $PROFILE->{bindings}{$mod}{$sym};
1409 next unless ref $cmds eq 'ARRAY' and @$cmds > 0; 1402 next unless ref $cmds eq 'ARRAY' and @$cmds > 0;
1410 1403
1411 my $lbl = join "; ", @$cmds; 1404 my $lbl = join "; ", @$cmds;
1412 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym); 1405 my $nam = CFPlus::BindingEditor::keycombo_to_name ($mod, $sym);
1413 $binding_list->add (my $hb = new CFPlus::UI::HBox); 1406 $binding_list->add (my $hb = new CFPlus::UI::HBox);
1414 $hb->add (new CFPlus::UI::Button 1407 $hb->add (new CFPlus::UI::Button
1415 text => "delete", 1408 text => "delete",
1416 tooltip => "Deletes the binding", 1409 tooltip => "Deletes the binding",
1417 on_activate => sub { 1410 on_activate => sub {
1418 $binding_list->remove ($hb); 1411 $binding_list->remove ($hb);
1419 delete $::CFG->{profile}{default}{bindings}{$mod}{$sym}; 1412 delete $PROFILE->{bindings}{$mod}{$sym};
1420 0 1413 0
1421 }); 1414 });
1422 1415
1423 $hb->add (new CFPlus::UI::Button 1416 $hb->add (new CFPlus::UI::Button
1424 text => "edit", 1417 text => "edit",
1425 tooltip => "Edits the binding", 1418 tooltip => "Edits the binding",
1426 on_activate => sub { 1419 on_activate => sub {
1427 $::BIND_EDITOR->set_binding ( 1420 $::BIND_EDITOR->set_binding (
1428 $mod, $sym, $::CFG->{profile}{default}{bindings}{$mod}{$sym}, 1421 $mod, $sym, $PROFILE->{bindings}{$mod}{$sym},
1429 sub { 1422 sub {
1430 my ($nmod, $nsym, $ncmds) = @_; 1423 my ($nmod, $nsym, $ncmds) = @_;
1431 $::BIND_EDITOR->cfg_unbind ($mod, $sym); 1424 $::BIND_EDITOR->cfg_unbind ($mod, $sym);
1432 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds); 1425 $::BIND_EDITOR->cfg_bind ($nmod, $nsym, $ncmds);
1433 $refresh->(); 1426 $refresh->();
… …
1511 1504
1512sub help_window { 1505sub help_window {
1513 my $win = new CFPlus::UI::Toplevel 1506 my $win = new CFPlus::UI::Toplevel
1514 x => 'center', 1507 x => 'center',
1515 y => 'center', 1508 y => 'center',
1516 z => 2, 1509 z => 4,
1517 name => 'doc_browser', 1510 name => 'doc_browser',
1518 force_w => int $WIDTH * 7/8, 1511 force_w => int $WIDTH * 7/8,
1519 force_h => int $HEIGHT * 7/8, 1512 force_h => int $HEIGHT * 7/8,
1520 title => "Help Browser", 1513 title => "Help Browser",
1521 has_close_button => 1; 1514 has_close_button => 1;
… …
1607 $load_node->((CFPlus::Pod::find @path)[0]); 1600 $load_node->((CFPlus::Pod::find @path)[0]);
1608 $win->show; 1601 $win->show;
1609 }; 1602 };
1610 1603
1611 $win 1604 $win
1605}
1606
1607sub open_string_query {
1608 my ($title, $cb, $txt, $tooltip) = @_;
1609 my $dialog = new CFPlus::UI::Toplevel
1610 x => "center",
1611 y => "center",
1612 z => 50,
1613 force_w => $WIDTH * 4/5,
1614 title => $title;
1615
1616 $dialog->add (
1617 my $e = new CFPlus::UI::Entry
1618 on_activate => sub { $cb->(@_); $dialog->hide; 0 },
1619 on_key_down => sub { $_[1]->{sym} == 27 and $dialog->hide; 0 },
1620 tooltip => $tooltip
1621 );
1622
1623 $e->grab_focus;
1624 $e->set_text ($txt) if $txt;
1625 $dialog->show;
1626}
1627
1628sub open_quit_dialog {
1629 unless ($QUIT_DIALOG) {
1630 $QUIT_DIALOG = new CFPlus::UI::Toplevel
1631 x => "center",
1632 y => "center",
1633 z => 50,
1634 title => "Really Quit?",
1635 on_key_down => sub {
1636 my ($dialog, $ev) = @_;
1637 $ev->{sym} == 27 and $dialog->hide;
1638 }
1639 ;
1640
1641 $QUIT_DIALOG->add (my $vb = new CFPlus::UI::VBox expand => 1);
1642
1643 $vb->add (new CFPlus::UI::Label
1644 text => "You should find a savebed and apply it first!",
1645 max_w => $WIDTH * 0.25,
1646 ellipsize => 0,
1647 );
1648 $vb->add (my $hb = new CFPlus::UI::HBox expand => 1);
1649 $hb->add (new CFPlus::UI::Button
1650 text => "Ok",
1651 expand => 1,
1652 on_activate => sub { $QUIT_DIALOG->hide; 0 },
1653 );
1654 $hb->add (new CFPlus::UI::Button
1655 text => "Quit anyway",
1656 expand => 1,
1657 on_activate => sub { exit },
1658 );
1659 }
1660
1661 $QUIT_DIALOG->show;
1662 $QUIT_DIALOG->grab_focus;
1663}
1664
1665sub show_tip_of_the_day {
1666 # find all tips
1667 my @tod = CFPlus::Pod::find tip_of_the_day => "*";
1668
1669 my $todindex = $CFPlus::DB_STATE->get ("tip_of_the_day");
1670 $todindex = 0 if $todindex >= @tod;
1671 $CFPlus::DB_STATE->put (tip_of_the_day => $todindex + 1);
1672
1673 # create dialog
1674 my $dialog;
1675
1676 my $close = sub {
1677 $dialog->destroy;
1678 };
1679
1680 $dialog = new CFPlus::UI::Toplevel
1681 x => "center",
1682 y => "center",
1683 z => 3,
1684 name => 'tip_of_the_day',
1685 force_w => int $WIDTH * 4/9,
1686 force_h => int $WIDTH * 2/9,
1687 title => "Tip of the day #" . (1 + $todindex),
1688 child => my $vbox = new CFPlus::UI::VBox,
1689 has_close_button => 1,
1690 on_delete => $close,
1691 ;
1692
1693 $vbox->add (my $viewer = new CFPlus::UI::TextScroller
1694 expand => 1, fontsize => 0.8, padding_x => 4, padding_y => 4);
1695 $viewer->add_paragraph (CFPlus::Pod::as_paragraphs CFPlus::Pod::section_of $tod[$todindex]);
1696
1697 $vbox->add (my $table = new CFPlus::UI::Table);
1698
1699 $table->add (0, 0, new CFPlus::UI::Button
1700 text => "Close",
1701 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>.",
1702 on_activate => $close,
1703 );
1704
1705 $table->add (2, 0, new CFPlus::UI::Button
1706 text => "Next",
1707 tooltip => "Show the next <b>Tip of the day</b>.",
1708 on_activate => sub {
1709 $close->();
1710 &show_tip_of_the_day;
1711 },
1712 );
1713
1714 $dialog->show;
1612} 1715}
1613 1716
1614sub sdl_init { 1717sub sdl_init {
1615 CFPlus::SDL_Init 1718 CFPlus::SDL_Init
1616 and die "SDL::Init failed!\n"; 1719 and die "SDL::Init failed!\n";
… …
1762 ); 1865 );
1763 1866
1764 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window, 1867 $BUTTONBAR->add (new CFPlus::UI::Flopper text => "Help!", other => $HELP_WINDOW = help_window,
1765 tooltip => "View Documentation"); 1868 tooltip => "View Documentation");
1766 1869
1870
1767 $BUTTONBAR->add (new CFPlus::UI::Button 1871 $BUTTONBAR->add (new CFPlus::UI::Button
1768 text => "Quit", 1872 text => "Quit",
1769 tooltip => "Terminates the program", 1873 tooltip => "Terminates the program",
1770 on_activate => sub { 1874 on_activate => sub {
1771 if ($CONN) { 1875 if ($CONN) {
… …
1782 } 1886 }
1783 1887
1784 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]); 1888 $STATUSBOX->add ("Set video mode $WIDTH×$HEIGHT", timeout => 10, fg => [1, 1, 1, 0.5]);
1785} 1889}
1786 1890
1891sub setup_build_button {
1892 my ($enabled) = @_;
1893 if ($enabled) {
1894 $BUILD_BUTTON ||= new CFPlus::UI::Button
1895 text => "Build",
1896 tooltip => "Opens the ingame builder",
1897 on_activate => sub {
1898 if ($CONN) {
1899 $CONN->send_ext_req (builder_player_items => sub {
1900 open_ingame_editor ($_[0]) if exists $_[0]->{items};
1901 });
1902 }
1903 0
1904 };
1905 $BUTTONBAR->add ($BUILD_BUTTON);
1906 } else {
1907 $BUILD_BUTTON->hide if $BUILD_BUTTON;
1908 }
1909}
1910
1911sub open_ingame_editor {
1912 my ($msg) = @_;
1913
1914 my $win = new CFPlus::UI::Toplevel
1915 x => 0,
1916 y => 'center',
1917 z => 4,
1918 name => 'builder_window',
1919 force_w => int $WIDTH * 1/4,
1920 force_h => int $HEIGHT * 3/4,
1921 title => "In game builder",
1922 has_close_button => 1;
1923
1924 my $r = new CFPlus::UI::ScrolledWindow (
1925 expand => 1,
1926 scroll_y => 1
1927 );
1928 $r->add (my $vb = new CFPlus::UI::VBox);
1929 $win->add ($r);
1930
1931
1932 $vb->add (my $chk = new CFPlus::UI::Button text => "Disable build mode", on_activate => sub { $::IN_BUILD_MODE = undef });
1933 $vb->add (my $chk = new CFPlus::UI::Button text => "ERASE", on_activate => sub { $::IN_BUILD_MODE = { do_erase => 1 } });
1934
1935 for my $itemarchname (keys %{$msg->{items}}) {
1936 $vb->add (
1937 new CFPlus::UI::Button text => "$itemarchname",
1938 on_activate => sub {
1939 $::IN_BUILD_MODE = $itemarchname;
1940 }
1941 );
1942 }
1943
1944 $win->show;
1945}
1946
1787sub video_shutdown { 1947sub video_shutdown {
1788 CFPlus::OpenGL::shutdown; 1948 CFPlus::OpenGL::shutdown;
1789 1949
1790 undef $SDL_ACTIVE; 1950 undef $SDL_ACTIVE;
1791} 1951}
… …
1822 CFPlus::Mix_AllocateChannels 8; 1982 CFPlus::Mix_AllocateChannels 8;
1823 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1983 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1824 1984
1825 audio_music_finished; 1985 audio_music_finished;
1826 1986
1987 local $_;
1827 while (<$fh>) { 1988 while (<$fh>) {
1828 next if /^\s*#/; 1989 next if /^\s*#/;
1829 next if /^\s*$/; 1990 next if /^\s*$/;
1830 1991
1831 my ($file, $volume, $event) = split /\s+/, $_, 3; 1992 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
1965 log_fontsize => 0.7, 2126 log_fontsize => 0.7,
1966 gauge_fontsize => 1, 2127 gauge_fontsize => 1,
1967 gauge_size => 0.35, 2128 gauge_size => 0.35,
1968 stat_fontsize => 0.7, 2129 stat_fontsize => 0.7,
1969 mapsize => 100, 2130 mapsize => 100,
1970 say_command => 'say', 2131 say_command => 'chat',
1971 audio_enable => 1, 2132 audio_enable => 1,
1972 bgm_enable => 1, 2133 bgm_enable => 1,
1973 bgm_volume => 0.25, 2134 bgm_volume => 0.25,
1974 face_prefetch => 0, 2135 face_prefetch => 0,
1975 output_sync => 1, 2136 output_sync => 1,
1976 output_count => 1, 2137 output_count => 1,
1977 pickup => 0, 2138 pickup => 0,
1978 inv_sort => "mtime", 2139 inv_sort => "mtime",
1979 default => "profile", # default profile 2140 default => "profile", # default profile
2141 show_tips => 1,
1980 ); 2142 );
1981 2143
1982 while (my ($k, $v) = each %DEF_CFG) { 2144 while (my ($k, $v) = each %DEF_CFG) {
1983 $CFG->{$k} = $v unless exists $CFG->{$k}; 2145 $CFG->{$k} = $v unless exists $CFG->{$k};
1984 } 2146 }
… …
2028# } 2190# }
2029# my $t2 = Time::HiRes::time; 2191# my $t2 = Time::HiRes::time;
2030# warn $t2-$t1; 2192# warn $t2-$t1;
2031# } 2193# }
2032 2194
2195 $startup_done->();
2196
2033 video_init; 2197 video_init;
2034 audio_init; 2198 audio_init;
2035} 2199}
2200
2201show_tip_of_the_day if $CFG->{show_tips};
2036 2202
2037Event::loop; 2203Event::loop;
2038#CFPlus::SDL_Quit; 2204#CFPlus::SDL_Quit;
2039#CFPlus::_exit 0; 2205#CFPlus::_exit 0;
2040 2206

Diff Legend

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