ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC.pm (file contents):
Revision 1.136 by root, Sat Dec 9 02:21:24 2006 UTC vs.
Revision 1.188 by root, Tue Sep 2 16:27:34 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFPlus - undocumented utility garbage for our crossfire client 3DC - undocumented utility garbage for our deliantra client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFPlus; 7 use DC;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
10 10
11=over 4 11=over 4
12 12
13=cut 13=cut
14 14
15package Deliantra::Client; # work around CPAN breakage
16package App::Deliantra; # try to reserve namespace
15package CFPlus; 17package DC;
16 18
17use Carp (); 19use Carp ();
18 20
21our $VERSION;
22
19BEGIN { 23BEGIN {
20 $VERSION = '0.97'; 24 $VERSION = '0.9975';
21 25
22 use XSLoader; 26 use XSLoader;
23 XSLoader::load "CFPlus", $VERSION; 27 XSLoader::load "Deliantra::Client", $VERSION;
24} 28}
25 29
26use utf8; 30use utf8;
31use strict qw(vars subs);
27 32
28use AnyEvent (); 33use AnyEvent ();
29use BerkeleyDB;
30use Pod::POM (); 34use Pod::POM ();
31use Scalar::Util ();
32use File::Path (); 35use File::Path ();
33use Storable (); # finally 36use Storable (); # finally
34 37use Fcntl ();
35BEGIN { 38use JSON::XS qw(encode_json decode_json);
36 use Crossfire::Protocol::Base ();
37 *to_json = \&Crossfire::Protocol::Base::to_json;
38 *from_json = \&Crossfire::Protocol::Base::from_json;
39}
40 39
41=item guard { BLOCK } 40=item guard { BLOCK }
42 41
43Returns an object that executes the given block as soon as it is destroyed. 42Returns an object that executes the given block as soon as it is destroyed.
44 43
45=cut 44=cut
46 45
47sub guard(&) { 46sub guard(&) {
48 bless \(my $cb = $_[0]), "CFPlus::Guard" 47 bless \(my $cb = $_[0]), "DC::Guard"
49} 48}
50 49
51sub CFPlus::Guard::DESTROY { 50sub DC::Guard::DESTROY {
52 ${$_[0]}->() 51 ${$_[0]}->()
53} 52}
54 53
55=item shorten $string[, $maxlength] 54=item shorten $string[, $maxlength]
56 55
72 $_ 71 $_
73} 72}
74 73
75sub socketpipe() { 74sub socketpipe() {
76 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 75 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
77 or die "cannot establish bidiretcional pipe: $!\n"; 76 or die "cannot establish bidirectional pipe: $!\n";
78 77
79 ($fh1, $fh2) 78 ($fh1, $fh2)
80} 79}
81 80
82sub background(&;&) { 81sub background(&;&) {
83 my ($bg, $cb) = @_; 82 my ($bg, $cb) = @_;
84 83
85 my ($fh_r, $fh_w) = CFPlus::socketpipe; 84 my ($fh_r, $fh_w) = DC::socketpipe;
86 85
87 my $pid = fork; 86 my $pid = fork;
88 87
89 if (defined $pid && !$pid) { 88 if (defined $pid && !$pid) {
90 local $SIG{__DIE__}; 89 local $SIG{__DIE__};
100 99
101 if ($@) { 100 if ($@) {
102 my $msg = $@; 101 my $msg = $@;
103 $msg =~ s/\n+/\n/; 102 $msg =~ s/\n+/\n/;
104 warn "FATAL: $msg"; 103 warn "FATAL: $msg";
105 CFPlus::_exit 1; 104 DC::_exit 1;
106 } 105 }
107 106
108 # win32 is fucked up, of course. exit will clean stuff up, 107 # win32 is fucked up, of course. exit will clean stuff up,
109 # which destroys our database etc. _exit will exit ALL 108 # which destroys our database etc. _exit will exit ALL
110 # forked processes, because of the dreaded fork emulation. 109 # forked processes, because of the dreaded fork emulation.
111 CFPlus::_exit 0; 110 DC::_exit 0;
112 } 111 }
113 112
114 close $fh_w; 113 close $fh_w;
115 114
116 my $buffer; 115 my $buffer;
125 while ($buffer =~ s/^(.*)\n//) { 124 while ($buffer =~ s/^(.*)\n//) {
126 my $line = $1; 125 my $line = $1;
127 $line =~ s/\s+$//; 126 $line =~ s/\s+$//;
128 utf8::decode $line; 127 utf8::decode $line;
129 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 128 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
130 $cb->(from_json $1); 129 $cb->(JSON::XS->new->allow_nonref->decode ($1));
131 } else { 130 } else {
132 ::message ({ 131 ::message ({
133 markup => "background($pid): " . CFPlus::asxml $line, 132 markup => "background($pid): " . DC::asxml $line,
134 }); 133 });
135 } 134 }
136 } 135 }
137 }); 136 });
138} 137}
139 138
140sub background_msg { 139sub background_msg {
141 my ($msg) = @_; 140 my ($msg) = @_;
142 141
143 $msg = "\x{e877}json_msg " . to_json $msg; 142 $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
144 $msg =~ s/\n//g; 143 $msg =~ s/\n//g;
145 utf8::encode $msg; 144 utf8::encode $msg;
146 print $msg, "\n"; 145 print $msg, "\n";
147} 146}
148 147
149package CFPlus::Database;
150
151our @ISA = BerkeleyDB::Btree::;
152
153sub get($$) {
154 my $data;
155
156 $_[0]->db_get ($_[1], $data) == 0
157 ? $data
158 : ()
159}
160
161my %DB_SYNC;
162
163sub put($$$) {
164 my ($db, $key, $data) = @_;
165
166 my $hkey = $db + 0;
167 Scalar::Util::weaken $db;
168 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
169 delete $DB_SYNC{$hkey};
170 $db->db_sync if $db;
171 });
172
173 $db->db_put ($key => $data)
174}
175
176package CFPlus; 148package DC;
149
150our $RC_THEME = "theme-metal";
151our $RC_BASE;
152
153for (grep !ref, @INC) {
154 $RC_BASE = "$_/Deliantra/Client/private/resources";
155 last if -d $RC_BASE;
156}
177 157
178sub find_rcfile($) { 158sub find_rcfile($) {
179 my $path; 159 my $path;
180 160
181 for (grep !ref, @INC) { 161 $path = "$RC_BASE/$RC_THEME/$_[0]";
182 $path = "$_/CFPlus/resources/$_[0]";
183 return $path if -r $path; 162 return $path if -r $path;
184 }
185 163
164 $path = "$RC_BASE/$_[0]";
165 return $path if -r $path;
166
186 die "FATAL: can't find required file $_[0]\n"; 167 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
187} 168}
188 169
189sub read_cfg { 170sub read_cfg {
190 my ($file) = @_; 171 my ($file) = @_;
191 172
193 or return; 174 or return;
194 175
195 local $/; 176 local $/;
196 my $CFG = <$fh>; 177 my $CFG = <$fh>;
197 178
198 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
199 require YAML;
200 utf8::decode $CFG;
201 $::CFG = YAML::Load ($CFG);
202 } elsif ($CFG =~ /^\{/) {
203 $::CFG = from_json $CFG; 179 $::CFG = decode_json $CFG;
204 } else {
205 $::CFG = eval $CFG; ## todo comaptibility cruft
206 }
207} 180}
208 181
209sub write_cfg { 182sub write_cfg {
210 my ($file) = @_; 183 my $file = "$Deliantra::VARDIR/client.cf";
211 184
212 $::CFG->{VERSION} = $::VERSION; 185 $::CFG->{VERSION} = $::VERSION;
213 186
214 open my $fh, ">:utf8", $file 187 open my $fh, ">:utf8", $file
215 or return; 188 or return;
216 print $fh to_json $::CFG; 189 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
217} 190}
218 191
219sub http_proxy { 192sub http_proxy {
220 my @proxy = win32_proxy_info; 193 my @proxy = win32_proxy_info;
221 194
236} 209}
237 210
238sub lwp_useragent { 211sub lwp_useragent {
239 require LWP::UserAgent; 212 require LWP::UserAgent;
240 213
241 CFPlus::set_proxy; 214 DC::set_proxy;
242 215
243 my $ua = LWP::UserAgent->new ( 216 my $ua = LWP::UserAgent->new (
244 agent => "cfplus $VERSION", 217 agent => "deliantra $VERSION",
245 keep_alive => 1, 218 keep_alive => 1,
246 env_proxy => 1, 219 env_proxy => 1,
247 timeout => 30, 220 timeout => 30,
248 ); 221 );
249} 222}
255 and die $res->status_line; 228 and die $res->status_line;
256 229
257 $res 230 $res
258} 231}
259 232
260our $DB_ENV; 233sub fh_nonblocking($$) {
261our $DB_STATE;
262
263sub db_table($) {
264 my ($table) = @_; 234 my ($fh, $nb) = @_;
265 235
266 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 236 if ($^O eq "MSWin32") {
267 237 $nb = (! ! $nb) + 0;
268 new CFPlus::Database 238 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
269 -Env => $DB_ENV, 239 } else {
270 -Filename => $table, 240 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
271# -Filename => "database",
272# -Subname => $table,
273 -Property => DB_CHKSUM,
274 -Flags => DB_CREATE | DB_UPGRADE,
275 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
276}
277
278our $DB_HOME = "$Crossfire::VARDIR/cfplus";
279
280sub open_db {
281 use strict;
282
283 mkdir $DB_HOME, 0777;
284 my $recover = $BerkeleyDB::db_version >= 4.4
285 ? eval "DB_REGISTER | DB_RECOVER"
286 : 0;
287
288 $DB_ENV = new BerkeleyDB::Env
289 -Home => $DB_HOME,
290 -Cachesize => 1_000_000,
291 -ErrFile => "$DB_HOME/errorlog.txt",
292# -ErrPrefix => "DATABASE",
293 -Verbose => 1,
294 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
295 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
296 or die "unable to create/open database home $DB_HOME: $BerkeleyDB::Error";
297
298 $DB_STATE = db_table "state";
299
300 1 241 }
301} 242}
302 243
303unless (eval { open_db }) {
304 File::Path::rmtree $DB_HOME;
305 open_db;
306}
307
308package CFPlus::Layout; 244package DC::Layout;
309 245
246$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
247 glyph_cache_restore;
248};
249
310$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 250$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
311 reset_glyph_cache; 251 glyph_cache_backup;
312}; 252};
313 253
3141; 2541;
315 255
316=back 256=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines