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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines