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.201 by root, Sun Jan 11 03:19:47 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 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
69 s/</&lt;/g; 69 s/</&lt;/g;
70 70
71 $_ 71 $_
72} 72}
73 73
74sub socketpipe() {
75 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
76 or die "cannot establish bidiretcional pipe: $!\n";
77
78 ($fh1, $fh2)
79}
80
81sub background(&;&) { 74sub background(&;&) {
82 my ($bg, $cb) = @_; 75 my ($bg, $cb) = @_;
83 76
84 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: $!";
85 79
86 my $pid = fork; 80 my $pid = fork;
87 81
88 if (defined $pid && !$pid) { 82 if (defined $pid && !$pid) {
89 local $SIG{__DIE__}; 83 local $SIG{__DIE__};
99 93
100 if ($@) { 94 if ($@) {
101 my $msg = $@; 95 my $msg = $@;
102 $msg =~ s/\n+/\n/; 96 $msg =~ s/\n+/\n/;
103 warn "FATAL: $msg"; 97 warn "FATAL: $msg";
104 CFPlus::_exit 1; 98 DC::_exit 1;
105 } 99 }
106 100
107 # win32 is fucked up, of course. exit will clean stuff up, 101 # win32 is fucked up, of course. exit will clean stuff up,
108 # which destroys our database etc. _exit will exit ALL 102 # which destroys our database etc. _exit will exit ALL
109 # forked processes, because of the dreaded fork emulation. 103 # forked processes, because of the dreaded fork emulation.
110 CFPlus::_exit 0; 104 DC::_exit 0;
111 } 105 }
112 106
113 close $fh_w; 107 close $fh_w;
114 108
115 my $buffer; 109 my $buffer;
124 while ($buffer =~ s/^(.*)\n//) { 118 while ($buffer =~ s/^(.*)\n//) {
125 my $line = $1; 119 my $line = $1;
126 $line =~ s/\s+$//; 120 $line =~ s/\s+$//;
127 utf8::decode $line; 121 utf8::decode $line;
128 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 122 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
129 $cb->(from_json $1); 123 $cb->(JSON::XS->new->allow_nonref->decode ($1));
130 } else { 124 } else {
131 ::message ({ 125 ::message ({
132 markup => "background($pid): " . CFPlus::asxml $line, 126 markup => "background($pid): " . DC::asxml $line,
133 }); 127 });
134 } 128 }
135 } 129 }
136 }); 130 });
137} 131}
138 132
139sub background_msg { 133sub background_msg {
140 my ($msg) = @_; 134 my ($msg) = @_;
141 135
142 $msg = "\x{e877}json_msg " . to_json $msg; 136 $msg = "\x{e877}json_msg " . JSON::XS->new->allow_nonref->encode ($msg);
143 $msg =~ s/\n//g; 137 $msg =~ s/\n//g;
144 utf8::encode $msg; 138 utf8::encode $msg;
145 print $msg, "\n"; 139 print $msg, "\n";
146} 140}
147 141
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; 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}
176 153
177sub find_rcfile($) { 154sub find_rcfile($) {
178 my $path; 155 my $path;
179 156
180 for (grep !ref, @INC) { 157 for (@RC_PATH, "") {
181 $path = "$_/CFPlus/resources/$_[0]"; 158 $path = "$RC_BASE/$_/$_[0]";
182 return $path if -r $path; 159 return $path if -r $path;
183 } 160 }
184 161
185 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 }
186} 195}
187 196
188sub read_cfg { 197sub read_cfg {
189 my ($file) = @_; 198 my ($file) = @_;
190 199
200 $::CFG = (load_json $file) || (load_json "$file.bak");
201}
202
203sub write_cfg {
204 my $file = "$Deliantra::VARDIR/client.cf";
205
206 $::CFG->{VERSION} = $::VERSION;
207 $::CFG->{layout} = DC::UI::get_layout ();
208
191 open my $fh, $file 209 open my $fh, ">:utf8", "$file~"
192 or return; 210 or return;
211 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
212 close $fh;
193 213
194 local $/; 214 rename $file, "$file.bak";
195 my $CFG = <$fh>; 215 rename "$file~", $file;
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
208sub write_cfg {
209 my ($file) = @_;
210
211 $::CFG->{VERSION} = $::VERSION;
212
213 open my $fh, ">:utf8", $file
214 or return;
215 print $fh to_json $::CFG;
216} 216}
217 217
218sub http_proxy { 218sub http_proxy {
219 my @proxy = win32_proxy_info; 219 my @proxy = win32_proxy_info;
220 220
235} 235}
236 236
237sub lwp_useragent { 237sub lwp_useragent {
238 require LWP::UserAgent; 238 require LWP::UserAgent;
239 239
240 CFPlus::set_proxy; 240 DC::set_proxy;
241 241
242 my $ua = LWP::UserAgent->new ( 242 my $ua = LWP::UserAgent->new (
243 agent => "cfplus $VERSION", 243 agent => "deliantra $VERSION",
244 keep_alive => 1, 244 keep_alive => 1,
245 env_proxy => 1, 245 env_proxy => 1,
246 timeout => 30, 246 timeout => 30,
247 ); 247 );
248} 248}
254 and die $res->status_line; 254 and die $res->status_line;
255 255
256 $res 256 $res
257} 257}
258 258
259our $DB_ENV; 259sub fh_nonblocking($$) {
260our $DB_STATE;
261
262sub db_table($) {
263 my ($table) = @_; 260 my ($fh, $nb) = @_;
264 261
265 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 262 if ($^O eq "MSWin32") {
266 263 $nb = (! ! $nb) + 0;
267 new CFPlus::Database 264 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
268 -Env => $DB_ENV, 265 } else {
269 -Filename => $table, 266 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 267 }
300} 268}
301 269
302unless (eval { open_db }) {
303 File::Path::rmtree $DB_HOME;
304 open_db;
305}
306
307package CFPlus::Layout; 270package DC::Layout;
308 271
272$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
273 glyph_cache_restore;
274};
275
309$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 276$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
310 reset_glyph_cache; 277 glyph_cache_backup;
311}; 278};
312 279
3131; 2801;
314 281
315=back 282=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines