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.121 by root, Sun Oct 1 18:17:38 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 return;#d#
53 CFPlus::fatal ($_[1]);
54}; 74};
55 75
56my $MAX_FPS = 60; 76my $MAX_FPS = 60;
57my $MIN_FPS = 5; # unused as of yet 77my $MIN_FPS = 5; # unused as of yet
58 78
59our $META_SERVER = "crossfire.real-time.com:13326"; 79our $META_SERVER = "http://metaserver.schmorp.de/current.json";
60 80
61our $LAST_REFRESH; 81our $LAST_REFRESH;
62our $NOW; 82our $NOW;
63 83
64our $CFG; 84our $CFG;
… …
102 122
103our $INVENTORY_PAGE; 123our $INVENTORY_PAGE;
104our $STATS_PAGE; 124our $STATS_PAGE;
105our $SKILL_PAGE; 125our $SKILL_PAGE;
106our $SPELL_PAGE; 126our $SPELL_PAGE;
127our $SPELL_LIST;
107 128
108our $HELP_WINDOW; 129our $HELP_WINDOW;
109our $MESSAGE_WINDOW; 130our $MESSAGE_WINDOW;
110our $FLOORBOX; 131our $FLOORBOX;
111our $GAUGES; 132our $GAUGES;
… …
135 $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]);
136} 157}
137 158
138sub debug { 159sub debug {
139 $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;
140} 172}
141 173
142sub destroy_query_dialog { 174sub destroy_query_dialog {
143 (delete $_[0]{query_dialog})->destroy 175 (delete $_[0]{query_dialog})->destroy
144 if $_[0]{query_dialog}; 176 if $_[0]{query_dialog};
… …
349 381
350 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;
351 383
352 my ($host, $port) = split /:/, $PROFILE->{host}; 384 my ($host, $port) = split /:/, $PROFILE->{host};
353 385
354 $MAP = new CFPlus::Map $mapsize, $mapsize; 386 $MAP = new CFPlus::Map;
355 387
356 $CONN = eval { 388 $CONN = eval {
357 new CFPlus::Protocol 389 new CFPlus::Protocol
358 host => $host, 390 host => $host,
359 port => $port || 13327, 391 port => $port || 13327,
… …
397sub stop_game { 429sub stop_game {
398 $LOGIN_BUTTON->set_text ("Login"); 430 $LOGIN_BUTTON->set_text ("Login");
399 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER); 431 $SETUP_NOTEBOOK->set_current_page ($SETUP_SERVER);
400 $SETUP_DIALOG->show; 432 $SETUP_DIALOG->show;
401 $PL_WINDOW->hide; 433 $PL_WINDOW->hide;
402 $SPELL_PAGE->clear_spells; 434 $SPELL_LIST->clear_spells;
403 435
404 return unless $CONN; 436 return unless $CONN;
405 437
406 status "connection closed"; 438 status "connection closed";
407 439
… …
634 $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 });
635 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS"); 667 $table->add (0, 2, new CFPlus::UI::Label text => "Show FPS");
636 $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 });
637 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips"); 669 $table->add (0, 3, new CFPlus::UI::Label text => "Suppress Tooltips");
638 $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" } );
639 672
640 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);
641 674
642 for my $x (0..2) { 675 for my $x (0..2) {
643 for my $y (0 .. 2) { 676 for my $y (0 .. 2) {
… …
825 858
826 my $table = $METASERVER->{table}; 859 my $table = $METASERVER->{table};
827 $table->clear; 860 $table->clear;
828 $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...");
829 862
830 my $buf; 863 my $ok = 0;
831 864
832 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 865 CFPlus::background {
866 my $ua = CFPlus::lwp_useragent;
833 867
834 unless ($fh) { 868 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
835 $label->set_text ("unable to contact metaserver: $!"); 869 } sub {
836 return; 870 my ($msg) = @_;
837 } 871 if ($msg) {
838
839 Event->io (fd => $fh, poll => 'r', cb => sub {
840 my $res = sysread $fh, $buf, 8192, length $buf;
841
842 if (!defined $res) {
843 $_[0]->w->cancel;
844 $label->set_text ("error while retrieving server list: $!");
845 } elsif ($res == 0) {
846 $_[0]->w->cancel;
847 status "server list retrieved";
848
849 utf8::decode $buf if utf8::valid $buf;
850
851 $table->clear; 872 $table->clear;
852 873
853 my @tip = ( 874 my @tip = (
854 "The current number of users logged in on the server.", 875 "The current number of users logged in on the server.",
855 "The hostname of the server.", 876 "The hostname of the server.",
… …
865 for 0 .. $#col; 886 for 0 .. $#col;
866 887
867 my @align = qw(1 0 1 1 -1); 888 my @align = qw(1 0 1 1 -1);
868 889
869 my $y = 0; 890 my $y = 0;
870 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 ) {
871 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)};
872 900
873 for ($desc) { 901 for ($desc) {
874 s/<br>/\n/gi; 902 s/<br>/\n/gi;
875 s/<li>/\n· /gi; 903 s/<li>/\n· /gi;
876 s/<.*?>//sgi; 904 s/<.*?>//sgi;
877 s/&/&amp;/g; 905 s/&amp;/&/g;
878 s/</&lt;/g; 906 s/&lt;/</g;
879 s/>/&gt;/g; 907 s/&gt;/>/g;
880 } 908 }
881 909
882 $uptime = sprintf "%dd %02d:%02d:%02d", 910 $uptime = sprintf "%dd %02d:%02d:%02d",
883 (int $m->[8] / 86400), 911 (int $uptime / 86400),
884 (int $m->[8] / 3600) % 24, 912 (int $uptime / 3600) % 24,
885 (int $m->[8] / 60) % 60, 913 (int $uptime / 60) % 60,
886 $m->[8] % 60; 914 $uptime % 60;
887 915
888 $m = [$users, $host, $uptime, $version, $desc]; 916 $m = [$users, $host, $uptime, $version, $desc];
889 917
890 $y++; 918 $y++;
891 919
… …
901 ), 929 ),
902 (new CFPlus::UI::Empty expand => 1), 930 (new CFPlus::UI::Empty expand => 1),
903 ]); 931 ]);
904 932
905 $table->add ($_, $y, new CFPlus::UI::Label 933 $table->add ($_, $y, new CFPlus::UI::Label
934 max_w => $::WIDTH * 0.4,
906 ellipsise => 0, 935 ellipsise => 0,
907 align => $align[$_], 936 align => $align[$_],
908 text => $m->[$_], 937 text => $m->[$_],
909 tooltip => $tip[$_], 938 tooltip => $tip[$_],
939 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
910 can_hover => 1, 940 can_hover => 1,
911 can_events => 1, 941 can_events => 1,
912 fontsize => 0.8) 942 fontsize => 0.8)
913 for 0 .. $#$m; 943 for 0 .. $#$m;
914 } 944 }
945 } else {
946 $ok or $label->set_text ("error while contacting metaserver");
915 } 947 }
916 }); 948 };
949
917} 950}
918 951
919sub metaserver_dialog { 952sub metaserver_dialog {
920 my $vbox = new CFPlus::UI::VBox; 953 my $vbox = new CFPlus::UI::VBox;
921 my $table = new CFPlus::UI::Table; 954 my $table = new CFPlus::UI::Table;
… …
925 title => "Server List", 958 title => "Server List",
926 name => 'metaserver_dialog', 959 name => 'metaserver_dialog',
927 x => 'center', 960 x => 'center',
928 y => 'center', 961 y => 'center',
929 z => 3, 962 z => 3,
963 force_w => $::WIDTH * 0.9,
930 force_h => $::HEIGHT * 0.4, 964 force_h => $::HEIGHT * 0.7,
931 child => $vbox, 965 child => $vbox,
932 has_close_button => 1, 966 has_close_button => 1,
933 table => $table, 967 table => $table,
934 on_visibility_change => sub { 968 on_visibility_change => sub {
935 update_metaserver ($_[0]) if $_[1]; 969 update_metaserver ($_[0]) if $_[1];
… …
1156 ["Boots" => PICKUP_BOOTS], 1190 ["Boots" => PICKUP_BOOTS],
1157 ["Gloves" => PICKUP_GLOVES], 1191 ["Gloves" => PICKUP_GLOVES],
1158 ["Cloaks" => PICKUP_CLOAK], 1192 ["Cloaks" => PICKUP_CLOAK],
1159 ], 1193 ],
1160 1194
1161 ["Readables", 2, 2, 1195 ["Readables", 2, 0,
1162 ["Spellbooks" => PICKUP_SPELLBOOK], 1196 ["Spellbooks" => PICKUP_SPELLBOOK],
1163 ["Skillscrolls" => PICKUP_SKILLSCROLL], 1197 ["Skillscrolls" => PICKUP_SKILLSCROLL],
1164 ["Normal Books/Scrolls" => PICKUP_READABLES], 1198 ["Normal Books/Scrolls" => PICKUP_READABLES],
1165 ], 1199 ],
1166 ["Misc", 2, 7, 1200 ["Misc", 2, 5,
1167 ["Food" => PICKUP_FOOD], 1201 ["Food" => PICKUP_FOOD],
1168 ["Drinks" => PICKUP_DRINK], 1202 ["Drinks" => PICKUP_DRINK],
1169 ["Valuables (Money, Gems)" => PICKUP_VALUABLES], 1203 ["Valuables (Money, Gems)" => PICKUP_VALUABLES],
1170 ["Keys" => PICKUP_KEY], 1204 ["Keys" => PICKUP_KEY],
1171 ["Magical Items" => PICKUP_MAGICAL], 1205 ["Magical Items" => PICKUP_MAGICAL],
1172 ["Potions" => PICKUP_POTION], 1206 ["Potions" => PICKUP_POTION],
1173 ["Magic Devices" => PICKUP_MAGIC_DEVICE], 1207 ["Magic Devices" => PICKUP_MAGIC_DEVICE],
1174 ["Ignore cursed" => PICKUP_NOT_CURSED], 1208 ["Ignore cursed" => PICKUP_NOT_CURSED],
1175 ["Jewelery" => PICKUP_JEWELS], 1209 ["Jewelery" => PICKUP_JEWELS],
1210 ["Flesh" => PICKUP_FLESH],
1176 ], 1211 ],
1177 ["Weight/Value ratio", 2, 17] 1212 ["Weight/Value ratio", 2, 17]
1178 ) 1213 )
1179 { 1214 {
1180 my ($title, $x, $y, @bits) = @$_; 1215 my ($title, $x, $y, @bits) = @$_;
… …
1230 $table 1265 $table
1231} 1266}
1232 1267
1233my %SORT_ORDER = ( 1268my %SORT_ORDER = (
1234 type => undef, 1269 type => undef,
1235 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
1236 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1276 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1237 or $b->{mtime} <=> $a->{mtime} 1277 or $btime <=> $atime
1238 or $a->{type} <=> $b->{type} 1278 or $a->{type} <=> $b->{type}
1279 } @_
1239 } @_ }, 1280 },
1240 weight => sub { sort { 1281 weight => sub { sort {
1241 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1282 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1242 or $a->{type} <=> $b->{type} 1283 or $a->{type} <=> $b->{type}
1243 } @_ }, 1284 } @_ },
1244); 1285);
… …
1269 #TODO# update to weigh/maxweight 1310 #TODO# update to weigh/maxweight
1270 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1311 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1271 1312
1272 $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);
1273 $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}});
1274 1316
1275 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1317 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1276 1318
1277 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1319 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1278 1320
… …
1318 $ntb->add ( 1360 $ntb->add (
1319 "Skills (F3)" => $SKILL_PAGE = skill_window, 1361 "Skills (F3)" => $SKILL_PAGE = skill_window,
1320 "Shows all your Skills." 1362 "Shows all your Skills."
1321 ); 1363 );
1322 1364
1323 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);
1324 $spellsw->add ($SPELL_PAGE = new CFPlus::UI::SpellList); 1366 $spellsw->add ($SPELL_LIST = new CFPlus::UI::SpellList);
1325 $ntb->add ( 1367 $ntb->add (
1326 "Spellbook (F4)" => $spellsw, 1368 "Spellbook (F4)" => $spellsw,
1327 "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."
1328 ); 1370 );
1329 $ntb->add ( 1371 $ntb->add (
… …
1880 CFPlus::Mix_AllocateChannels 8; 1922 CFPlus::Mix_AllocateChannels 8;
1881 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1923 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1882 1924
1883 audio_music_finished; 1925 audio_music_finished;
1884 1926
1927 local $_;
1885 while (<$fh>) { 1928 while (<$fh>) {
1886 next if /^\s*#/; 1929 next if /^\s*#/;
1887 next if /^\s*$/; 1930 next if /^\s*$/;
1888 1931
1889 my ($file, $volume, $event) = split /\s+/, $_, 3; 1932 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
2023 log_fontsize => 0.7, 2066 log_fontsize => 0.7,
2024 gauge_fontsize => 1, 2067 gauge_fontsize => 1,
2025 gauge_size => 0.35, 2068 gauge_size => 0.35,
2026 stat_fontsize => 0.7, 2069 stat_fontsize => 0.7,
2027 mapsize => 100, 2070 mapsize => 100,
2028 say_command => 'say', 2071 say_command => 'chat',
2029 audio_enable => 1, 2072 audio_enable => 1,
2030 bgm_enable => 1, 2073 bgm_enable => 1,
2031 bgm_volume => 0.25, 2074 bgm_volume => 0.25,
2032 face_prefetch => 0, 2075 face_prefetch => 0,
2033 output_sync => 1, 2076 output_sync => 1,
… …
2087# } 2130# }
2088# my $t2 = Time::HiRes::time; 2131# my $t2 = Time::HiRes::time;
2089# warn $t2-$t1; 2132# warn $t2-$t1;
2090# } 2133# }
2091 2134
2135 $startup_done->();
2136
2092 video_init; 2137 video_init;
2093 audio_init; 2138 audio_init;
2094} 2139}
2095 2140
2096show_tip_of_the_day if $CFG->{show_tips}; 2141show_tip_of_the_day if $CFG->{show_tips};

Diff Legend

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