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.130 by root, Sun Nov 19 19:43:53 2006 UTC

1#!/opt/bin/perl 1#!/opt/bin/perl
2
3my $startup_done = sub { };
4
5# do splash-screen thingy on win32
6BEGIN {
7 if (%PAR::LibCache && $^O eq "MSWin32") {
8 while (my ($filename, $zip) = each %PAR::LibCache) {
9 $zip->extractMember ("SPLASH.bmp", "$ENV{PAR_TEMP}/SPLASH.bmp");
10 }
11
12 require Win32::GUI::SplashScreen;
13
14 Win32::GUI::SplashScreen::Show (
15 -file => "$ENV{PAR_TEMP}/SPLASH.bmp",
16 );
17
18 $startup_done = sub {
19 Win32::GUI::SplashScreen::Done (1);
20 };
21 }
22}
2 23
3use strict; 24use strict;
4use utf8; 25use utf8;
5 26
6# do things only needed for single-binary version (par) 27# do things only needed for single-binary version (par)
… …
8 if (%PAR::LibCache) { 29 if (%PAR::LibCache) {
9 @INC = grep ref, @INC; # weed out all paths except pars loader refs 30 @INC = grep ref, @INC; # weed out all paths except pars loader refs
10 31
11 while (my ($filename, $zip) = each %PAR::LibCache) { 32 while (my ($filename, $zip) = each %PAR::LibCache) {
12 for ($zip->memberNames) { 33 for ($zip->memberNames) {
13 next unless /^\/root\/(.*)/; 34 next unless /^root\/(.*)/;
14 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1") 35 $zip->extractMember ($_, "$ENV{PAR_TEMP}/$1")
15 unless -e "$ENV{PAR_TEMP}/$1"; 36 unless -e "$ENV{PAR_TEMP}/$1";
16 } 37 }
17 } 38 }
18 39
… …
54}; 75};
55 76
56my $MAX_FPS = 60; 77my $MAX_FPS = 60;
57my $MIN_FPS = 5; # unused as of yet 78my $MIN_FPS = 5; # unused as of yet
58 79
59our $META_SERVER = "crossfire.real-time.com:13326"; 80our $META_SERVER = "http://metaserver.schmorp.de/current.json";
60 81
61our $LAST_REFRESH; 82our $LAST_REFRESH;
62our $NOW; 83our $NOW;
63 84
64our $CFG; 85our $CFG;
… …
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,
… …
825 857
826 my $table = $METASERVER->{table}; 858 my $table = $METASERVER->{table};
827 $table->clear; 859 $table->clear;
828 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list..."); 860 $table->add (0, 0, my $label = new CFPlus::UI::Label max_w => $WIDTH * 0.8, text => "fetching server list...");
829 861
830 my $buf; 862 my $ok = 0;
831 863
832 my $fh = new IO::Socket::INET PeerHost => $META_SERVER, Blocking => 0; 864 CFPlus::background {
865 my $ua = CFPlus::lwp_useragent;
833 866
834 unless ($fh) { 867 CFPlus::background_msg CFPlus::from_json +(CFPlus::lwp_check $ua->get ($META_SERVER))->decoded_content;
835 $label->set_text ("unable to contact metaserver: $!"); 868 } sub {
836 return; 869 my ($msg) = @_;
837 } 870 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; 871 $table->clear;
852 872
853 my @tip = ( 873 my @tip = (
854 "The current number of users logged in on the server.", 874 "The current number of users logged in on the server.",
855 "The hostname of the server.", 875 "The hostname of the server.",
… …
865 for 0 .. $#col; 885 for 0 .. $#col;
866 886
867 my @align = qw(1 0 1 1 -1); 887 my @align = qw(1 0 1 1 -1);
868 888
869 my $y = 0; 889 my $y = 0;
870 for my $m (sort { $b->[3] <=> $a->[3] } map [split /\|/], split /\015?\012/, $buf) { 890 for my $m (
891 sort {
892 $b->{version} <=> $a->{version}
893 or $b->{users} <=> $a->{users}
894 }
895 @{ $msg->{servers} }
896 ) {
871 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) = @$m; 897 my ($ip, $last, $host, $users, $version, $desc, $ibytes, $obytes, $uptime) =
898 @$m{qw(ip age hostname users version description ibytes obytes uptime)};
872 899
873 for ($desc) { 900 for ($desc) {
874 s/<br>/\n/gi; 901 s/<br>/\n/gi;
875 s/<li>/\n· /gi; 902 s/<li>/\n· /gi;
876 s/<.*?>//sgi; 903 s/<.*?>//sgi;
877 s/&/&amp;/g; 904 s/&amp;/&/g;
878 s/</&lt;/g; 905 s/&lt;/</g;
879 s/>/&gt;/g; 906 s/&gt;/>/g;
880 } 907 }
881 908
882 $uptime = sprintf "%dd %02d:%02d:%02d", 909 $uptime = sprintf "%dd %02d:%02d:%02d",
883 (int $m->[8] / 86400), 910 (int $uptime / 86400),
884 (int $m->[8] / 3600) % 24, 911 (int $uptime / 3600) % 24,
885 (int $m->[8] / 60) % 60, 912 (int $uptime / 60) % 60,
886 $m->[8] % 60; 913 $uptime % 60;
887 914
888 $m = [$users, $host, $uptime, $version, $desc]; 915 $m = [$users, $host, $uptime, $version, $desc];
889 916
890 $y++; 917 $y++;
891 918
… …
901 ), 928 ),
902 (new CFPlus::UI::Empty expand => 1), 929 (new CFPlus::UI::Empty expand => 1),
903 ]); 930 ]);
904 931
905 $table->add ($_, $y, new CFPlus::UI::Label 932 $table->add ($_, $y, new CFPlus::UI::Label
933 max_w => $::WIDTH * 0.4,
906 ellipsise => 0, 934 ellipsise => 0,
907 align => $align[$_], 935 align => $align[$_],
908 text => $m->[$_], 936 text => $m->[$_],
909 tooltip => $tip[$_], 937 tooltip => $tip[$_],
938 fg => ($m->[3] =~ /\+$/ ? [1, 1, 1] : [.7, .7, .7]),
910 can_hover => 1, 939 can_hover => 1,
911 can_events => 1, 940 can_events => 1,
912 fontsize => 0.8) 941 fontsize => 0.8)
913 for 0 .. $#$m; 942 for 0 .. $#$m;
914 } 943 }
944 } else {
945 $ok or $label->set_text ("error while contacting metaserver");
915 } 946 }
916 }); 947 };
948
917} 949}
918 950
919sub metaserver_dialog { 951sub metaserver_dialog {
920 my $vbox = new CFPlus::UI::VBox; 952 my $vbox = new CFPlus::UI::VBox;
921 my $table = new CFPlus::UI::Table; 953 my $table = new CFPlus::UI::Table;
… …
925 title => "Server List", 957 title => "Server List",
926 name => 'metaserver_dialog', 958 name => 'metaserver_dialog',
927 x => 'center', 959 x => 'center',
928 y => 'center', 960 y => 'center',
929 z => 3, 961 z => 3,
962 force_w => $::WIDTH * 0.9,
930 force_h => $::HEIGHT * 0.4, 963 force_h => $::HEIGHT * 0.7,
931 child => $vbox, 964 child => $vbox,
932 has_close_button => 1, 965 has_close_button => 1,
933 table => $table, 966 table => $table,
934 on_visibility_change => sub { 967 on_visibility_change => sub {
935 update_metaserver ($_[0]) if $_[1]; 968 update_metaserver ($_[0]) if $_[1];
… …
1230 $table 1263 $table
1231} 1264}
1232 1265
1233my %SORT_ORDER = ( 1266my %SORT_ORDER = (
1234 type => undef, 1267 type => undef,
1235 mtime => sub { sort { 1268 mtime => sub {
1269 my $NOW = time;
1270 sort {
1271 my $atime = $a->{mtime} - $NOW; $atime = $atime < 5 * 60 ? int $atime / 60 : 6;
1272 my $btime = $b->{mtime} - $NOW; $btime = $btime < 5 * 60 ? int $btime / 60 : 6;
1273
1236 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED) 1274 ($a->{flags} & F_LOCKED) <=> ($b->{flags} & F_LOCKED)
1237 or $b->{mtime} <=> $a->{mtime} 1275 or $btime <=> $atime
1238 or $a->{type} <=> $b->{type} 1276 or $a->{type} <=> $b->{type}
1277 } @_
1239 } @_ }, 1278 },
1240 weight => sub { sort { 1279 weight => sub { sort {
1241 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1) 1280 $a->{weight} * ($a->{nrof} || 1) <=> $b->{weight} * ($b->{nrof} || 1)
1242 or $a->{type} <=> $b->{type} 1281 or $a->{type} <=> $b->{type}
1243 } @_ }, 1282 } @_ },
1244); 1283);
… …
1269 #TODO# update to weigh/maxweight 1308 #TODO# update to weigh/maxweight
1270 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1); 1309 $hb1->add ($STATWIDS->{i_weight} = new CFPlus::UI::Label align => -1);
1271 1310
1272 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1); 1311 $vb1->add (my $sw1 = new CFPlus::UI::ScrolledWindow expand => 1, scroll_y => 1);
1273 $sw1->add ($INV = new CFPlus::UI::Inventory); 1312 $sw1->add ($INV = new CFPlus::UI::Inventory);
1313 $INV->set_sort_order ($SORT_ORDER{$::CFG->{inv_sort}});
1274 1314
1275 $hb->add (my $vb2 = new CFPlus::UI::VBox); 1315 $hb->add (my $vb2 = new CFPlus::UI::VBox);
1276 1316
1277 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox); 1317 $vb2->add ($INV_RIGHT_HB = new CFPlus::UI::HBox);
1278 1318
… …
1880 CFPlus::Mix_AllocateChannels 8; 1920 CFPlus::Mix_AllocateChannels 8;
1881 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128; 1921 CFPlus::MixMusic::volume $CFG->{bgm_volume} * 128;
1882 1922
1883 audio_music_finished; 1923 audio_music_finished;
1884 1924
1925 local $_;
1885 while (<$fh>) { 1926 while (<$fh>) {
1886 next if /^\s*#/; 1927 next if /^\s*#/;
1887 next if /^\s*$/; 1928 next if /^\s*$/;
1888 1929
1889 my ($file, $volume, $event) = split /\s+/, $_, 3; 1930 my ($file, $volume, $event) = split /\s+/, $_, 3;
… …
2023 log_fontsize => 0.7, 2064 log_fontsize => 0.7,
2024 gauge_fontsize => 1, 2065 gauge_fontsize => 1,
2025 gauge_size => 0.35, 2066 gauge_size => 0.35,
2026 stat_fontsize => 0.7, 2067 stat_fontsize => 0.7,
2027 mapsize => 100, 2068 mapsize => 100,
2028 say_command => 'say', 2069 say_command => 'chat',
2029 audio_enable => 1, 2070 audio_enable => 1,
2030 bgm_enable => 1, 2071 bgm_enable => 1,
2031 bgm_volume => 0.25, 2072 bgm_volume => 0.25,
2032 face_prefetch => 0, 2073 face_prefetch => 0,
2033 output_sync => 1, 2074 output_sync => 1,
… …
2087# } 2128# }
2088# my $t2 = Time::HiRes::time; 2129# my $t2 = Time::HiRes::time;
2089# warn $t2-$t1; 2130# warn $t2-$t1;
2090# } 2131# }
2091 2132
2133 $startup_done->();
2134
2092 video_init; 2135 video_init;
2093 audio_init; 2136 audio_init;
2094} 2137}
2095 2138
2096show_tip_of_the_day if $CFG->{show_tips}; 2139show_tip_of_the_day if $CFG->{show_tips};

Diff Legend

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