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.200 by root, Sun Jan 4 10:22:19 2009 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.02';
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
31use Socket ();
28use AnyEvent (); 32use AnyEvent ();
29use BerkeleyDB; 33use AnyEvent::Util ();
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
70 s/</&lt;/g; 69 s/</&lt;/g;
71 70
72 $_ 71 $_
73} 72}
74 73
75sub socketpipe() {
76 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
77 or die "cannot establish bidiretcional pipe: $!\n";
78
79 ($fh1, $fh2)
80}
81
82sub background(&;&) { 74sub background(&;&) {
83 my ($bg, $cb) = @_; 75 my ($bg, $cb) = @_;
84 76
85 my ($fh_r, $fh_w) = CFPlus::socketpipe; 77 my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
78 or die "unable to create background socketpair: $!";
86 79
87 my $pid = fork; 80 my $pid = fork;
88 81
89 if (defined $pid && !$pid) { 82 if (defined $pid && !$pid) {
90 local $SIG{__DIE__}; 83 local $SIG{__DIE__};
100 93
101 if ($@) { 94 if ($@) {
102 my $msg = $@; 95 my $msg = $@;
103 $msg =~ s/\n+/\n/; 96 $msg =~ s/\n+/\n/;
104 warn "FATAL: $msg"; 97 warn "FATAL: $msg";
105 CFPlus::_exit 1; 98 DC::_exit 1;
106 } 99 }
107 100
108 # win32 is fucked up, of course. exit will clean stuff up, 101 # win32 is fucked up, of course. exit will clean stuff up,
109 # which destroys our database etc. _exit will exit ALL 102 # which destroys our database etc. _exit will exit ALL
110 # forked processes, because of the dreaded fork emulation. 103 # forked processes, because of the dreaded fork emulation.
111 CFPlus::_exit 0; 104 DC::_exit 0;
112 } 105 }
113 106
114 close $fh_w; 107 close $fh_w;
115 108
116 my $buffer; 109 my $buffer;
125 while ($buffer =~ s/^(.*)\n//) { 118 while ($buffer =~ s/^(.*)\n//) {
126 my $line = $1; 119 my $line = $1;
127 $line =~ s/\s+$//; 120 $line =~ s/\s+$//;
128 utf8::decode $line; 121 utf8::decode $line;
129 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 122 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
130 $cb->(from_json $1); 123 $cb->(JSON::XS->new->allow_nonref->decode ($1));
131 } else { 124 } else {
132 ::message ({ 125 ::message ({
133 markup => "background($pid): " . CFPlus::asxml $line, 126 markup => "background($pid): " . DC::asxml $line,
134 }); 127 });
135 } 128 }
136 } 129 }
137 }); 130 });
138} 131}
139 132
140sub background_msg { 133sub background_msg {
141 my ($msg) = @_; 134 my ($msg) = @_;
142 135
143 $msg = "\x{e877}json_msg " . to_json $msg; 136 $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
144 $msg =~ s/\n//g; 137 $msg =~ s/\n//g;
145 utf8::encode $msg; 138 utf8::encode $msg;
146 print $msg, "\n"; 139 print $msg, "\n";
147} 140}
148 141
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; 142package DC;
143
144our $RC_THEME;
145our %THEME;
146our @RC_PATH;
147our $RC_BASE;
148
149for (grep !ref, @INC) {
150 $RC_BASE = "$_/Deliantra/Client/private/resources";
151 last if -d $RC_BASE;
152}
177 153
178sub find_rcfile($) { 154sub find_rcfile($) {
179 my $path; 155 my $path;
180 156
181 for (grep !ref, @INC) { 157 for (@RC_PATH, "") {
182 $path = "$_/CFPlus/resources/$_[0]"; 158 $path = "$RC_BASE/$_/$_[0]";
183 return $path if -r $path; 159 return $path if -r $path;
184 } 160 }
185 161
186 die "FATAL: can't find required file $_[0]\n"; 162 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
163}
164
165sub load_json($) {
166 my ($file) = @_;
167
168 open my $fh, $file
169 or return;
170
171 local $/;
172 JSON::XS->new->utf8->relaxed->decode (<$fh>)
173}
174
175sub set_theme($) {
176 return if $RC_THEME eq $_[0];
177 $RC_THEME = $_[0];
178
179 # kind of hacky, find the main theme file, then load all theme files and merge them
180
181 %THEME = ();
182 @RC_PATH = "theme-$RC_THEME";
183
184 my $theme = load_json find_rcfile "theme.json"
185 or die "FATAL: theme resource file not found";
186
187 @RC_PATH = @{ $theme->{path} } if $theme->{path};
188
189 for (@RC_PATH, "") {
190 my $theme = load_json "$RC_BASE/$_/theme.json"
191 or next;
192
193 %THEME = ( %$theme, %THEME );
194 }
187} 195}
188 196
189sub read_cfg { 197sub read_cfg {
190 my ($file) = @_; 198 my ($file) = @_;
191 199
192 open my $fh, $file 200 $::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} 201}
208 202
209sub write_cfg { 203sub write_cfg {
210 my ($file) = @_; 204 my $file = "$Deliantra::VARDIR/client.cf";
211 205
212 $::CFG->{VERSION} = $::VERSION; 206 $::CFG->{VERSION} = $::VERSION;
213 207
214 open my $fh, ">:utf8", $file 208 open my $fh, ">:utf8", $file
215 or return; 209 or return;
216 print $fh to_json $::CFG; 210 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
217} 211}
218 212
219sub http_proxy { 213sub http_proxy {
220 my @proxy = win32_proxy_info; 214 my @proxy = win32_proxy_info;
221 215
236} 230}
237 231
238sub lwp_useragent { 232sub lwp_useragent {
239 require LWP::UserAgent; 233 require LWP::UserAgent;
240 234
241 CFPlus::set_proxy; 235 DC::set_proxy;
242 236
243 my $ua = LWP::UserAgent->new ( 237 my $ua = LWP::UserAgent->new (
244 agent => "cfplus $VERSION", 238 agent => "deliantra $VERSION",
245 keep_alive => 1, 239 keep_alive => 1,
246 env_proxy => 1, 240 env_proxy => 1,
247 timeout => 30, 241 timeout => 30,
248 ); 242 );
249} 243}
255 and die $res->status_line; 249 and die $res->status_line;
256 250
257 $res 251 $res
258} 252}
259 253
260our $DB_ENV; 254sub fh_nonblocking($$) {
261our $DB_STATE;
262
263sub db_table($) {
264 my ($table) = @_; 255 my ($fh, $nb) = @_;
265 256
266 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 257 if ($^O eq "MSWin32") {
267 258 $nb = (! ! $nb) + 0;
268 new CFPlus::Database 259 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
269 -Env => $DB_ENV, 260 } else {
270 -Filename => $table, 261 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 262 }
301} 263}
302 264
303unless (eval { open_db }) {
304 File::Path::rmtree $DB_HOME;
305 open_db;
306}
307
308package CFPlus::Layout; 265package DC::Layout;
309 266
267$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
268 glyph_cache_restore;
269};
270
310$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 271$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
311 reset_glyph_cache; 272 glyph_cache_backup;
312}; 273};
313 274
3141; 2751;
315 276
316=back 277=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines