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.197 by root, Fri Dec 5 14:44:45 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 CFPlus; 15package DC;
16 16
17use Carp (); 17use Carp ();
18 18
19our $VERSION;
20
19BEGIN { 21BEGIN {
20 $VERSION = '0.97'; 22 $VERSION = '2.0';
21 23
22 use XSLoader; 24 use XSLoader;
23 XSLoader::load "CFPlus", $VERSION; 25 XSLoader::load "Deliantra::Client", $VERSION;
24} 26}
25 27
26use utf8; 28use utf8;
29use strict qw(vars subs);
27 30
28use AnyEvent (); 31use AnyEvent ();
29use BerkeleyDB;
30use Pod::POM (); 32use Pod::POM ();
31use Scalar::Util ();
32use File::Path (); 33use File::Path ();
33use Storable (); # finally 34use Storable (); # finally
34 35use Fcntl ();
35BEGIN { 36use 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 37
41=item guard { BLOCK } 38=item guard { BLOCK }
42 39
43Returns an object that executes the given block as soon as it is destroyed. 40Returns an object that executes the given block as soon as it is destroyed.
44 41
45=cut 42=cut
46 43
47sub guard(&) { 44sub guard(&) {
48 bless \(my $cb = $_[0]), "CFPlus::Guard" 45 bless \(my $cb = $_[0]), "DC::Guard"
49} 46}
50 47
51sub CFPlus::Guard::DESTROY { 48sub DC::Guard::DESTROY {
52 ${$_[0]}->() 49 ${$_[0]}->()
53} 50}
54 51
55=item shorten $string[, $maxlength] 52=item shorten $string[, $maxlength]
56 53
71 68
72 $_ 69 $_
73} 70}
74 71
75sub socketpipe() { 72sub socketpipe() {
76 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 73 socketpair my $fh1, my $fh2, &Socket::AF_UNIX, &Socket::SOCK_STREAM, &Socket::PF_UNSPEC
77 or die "cannot establish bidiretcional pipe: $!\n"; 74 or die "cannot establish bidirectional pipe: $!\n";
78 75
79 ($fh1, $fh2) 76 ($fh1, $fh2)
80} 77}
81 78
82sub background(&;&) { 79sub background(&;&) {
83 my ($bg, $cb) = @_; 80 my ($bg, $cb) = @_;
84 81
85 my ($fh_r, $fh_w) = CFPlus::socketpipe; 82 my ($fh_r, $fh_w) = DC::socketpipe;
86 83
87 my $pid = fork; 84 my $pid = fork;
88 85
89 if (defined $pid && !$pid) { 86 if (defined $pid && !$pid) {
90 local $SIG{__DIE__}; 87 local $SIG{__DIE__};
100 97
101 if ($@) { 98 if ($@) {
102 my $msg = $@; 99 my $msg = $@;
103 $msg =~ s/\n+/\n/; 100 $msg =~ s/\n+/\n/;
104 warn "FATAL: $msg"; 101 warn "FATAL: $msg";
105 CFPlus::_exit 1; 102 DC::_exit 1;
106 } 103 }
107 104
108 # win32 is fucked up, of course. exit will clean stuff up, 105 # win32 is fucked up, of course. exit will clean stuff up,
109 # which destroys our database etc. _exit will exit ALL 106 # which destroys our database etc. _exit will exit ALL
110 # forked processes, because of the dreaded fork emulation. 107 # forked processes, because of the dreaded fork emulation.
111 CFPlus::_exit 0; 108 DC::_exit 0;
112 } 109 }
113 110
114 close $fh_w; 111 close $fh_w;
115 112
116 my $buffer; 113 my $buffer;
125 while ($buffer =~ s/^(.*)\n//) { 122 while ($buffer =~ s/^(.*)\n//) {
126 my $line = $1; 123 my $line = $1;
127 $line =~ s/\s+$//; 124 $line =~ s/\s+$//;
128 utf8::decode $line; 125 utf8::decode $line;
129 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 126 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
130 $cb->(from_json $1); 127 $cb->(JSON::XS->new->allow_nonref->decode ($1));
131 } else { 128 } else {
132 ::message ({ 129 ::message ({
133 markup => "background($pid): " . CFPlus::asxml $line, 130 markup => "background($pid): " . DC::asxml $line,
134 }); 131 });
135 } 132 }
136 } 133 }
137 }); 134 });
138} 135}
139 136
140sub background_msg { 137sub background_msg {
141 my ($msg) = @_; 138 my ($msg) = @_;
142 139
143 $msg = "\x{e877}json_msg " . to_json $msg; 140 $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
144 $msg =~ s/\n//g; 141 $msg =~ s/\n//g;
145 utf8::encode $msg; 142 utf8::encode $msg;
146 print $msg, "\n"; 143 print $msg, "\n";
147} 144}
148 145
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; 146package DC;
147
148our $RC_THEME;
149our %THEME;
150our @RC_PATH;
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 for (@RC_PATH, "") {
182 $path = "$_/CFPlus/resources/$_[0]"; 162 $path = "$RC_BASE/$_/$_[0]";
183 return $path if -r $path; 163 return $path if -r $path;
184 } 164 }
185 165
186 die "FATAL: can't find required file $_[0]\n"; 166 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
167}
168
169sub load_json($) {
170 my ($file) = @_;
171
172 open my $fh, $file
173 or return;
174
175 local $/;
176 JSON::XS->new->utf8->relaxed->decode (<$fh>)
177}
178
179sub set_theme($) {
180 return if $RC_THEME eq $_[0];
181 $RC_THEME = $_[0];
182
183 # kind of hacky, find the main theme file, then load all theme files and merge them
184
185 %THEME = ();
186 @RC_PATH = "theme-$RC_THEME";
187
188 my $theme = load_json find_rcfile "theme.json"
189 or die "FATAL: theme resource file not found";
190
191 @RC_PATH = @{ $theme->{path} } if $theme->{path};
192
193 for (@RC_PATH, "") {
194 my $theme = load_json "$RC_BASE/$_/theme.json"
195 or next;
196
197 %THEME = ( %$theme, %THEME );
198 }
187} 199}
188 200
189sub read_cfg { 201sub read_cfg {
190 my ($file) = @_; 202 my ($file) = @_;
191 203
192 open my $fh, $file 204 $::CFG = load_json $file;
193 or return;
194
195 local $/;
196 my $CFG = <$fh>;
197
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;
204 } else {
205 $::CFG = eval $CFG; ## todo comaptibility cruft
206 }
207} 205}
208 206
209sub write_cfg { 207sub write_cfg {
210 my ($file) = @_; 208 my $file = "$Deliantra::VARDIR/client.cf";
211 209
212 $::CFG->{VERSION} = $::VERSION; 210 $::CFG->{VERSION} = $::VERSION;
213 211
214 open my $fh, ">:utf8", $file 212 open my $fh, ">:utf8", $file
215 or return; 213 or return;
216 print $fh to_json $::CFG; 214 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
217} 215}
218 216
219sub http_proxy { 217sub http_proxy {
220 my @proxy = win32_proxy_info; 218 my @proxy = win32_proxy_info;
221 219
236} 234}
237 235
238sub lwp_useragent { 236sub lwp_useragent {
239 require LWP::UserAgent; 237 require LWP::UserAgent;
240 238
241 CFPlus::set_proxy; 239 DC::set_proxy;
242 240
243 my $ua = LWP::UserAgent->new ( 241 my $ua = LWP::UserAgent->new (
244 agent => "cfplus $VERSION", 242 agent => "deliantra $VERSION",
245 keep_alive => 1, 243 keep_alive => 1,
246 env_proxy => 1, 244 env_proxy => 1,
247 timeout => 30, 245 timeout => 30,
248 ); 246 );
249} 247}
255 and die $res->status_line; 253 and die $res->status_line;
256 254
257 $res 255 $res
258} 256}
259 257
260our $DB_ENV; 258sub fh_nonblocking($$) {
261our $DB_STATE;
262
263sub db_table($) {
264 my ($table) = @_; 259 my ($fh, $nb) = @_;
265 260
266 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 261 if ($^O eq "MSWin32") {
267 262 $nb = (! ! $nb) + 0;
268 new CFPlus::Database 263 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
269 -Env => $DB_ENV, 264 } else {
270 -Filename => $table, 265 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 266 }
301} 267}
302 268
303unless (eval { open_db }) {
304 File::Path::rmtree $DB_HOME;
305 open_db;
306}
307
308package CFPlus::Layout; 269package DC::Layout;
309 270
271$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
272 glyph_cache_restore;
273};
274
310$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 275$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
311 reset_glyph_cache; 276 glyph_cache_backup;
312}; 277};
313 278
3141; 2791;
315 280
316=back 281=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines