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.140 by root, Fri Apr 6 07:45:33 2007 UTC vs.
Revision 1.191 by root, Wed Sep 3 06:07:39 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 Pod::POM (); 34use Pod::POM ();
30use File::Path (); 35use File::Path ();
31use Storable (); # finally 36use Storable (); # finally
32 37use Fcntl ();
33BEGIN { 38use JSON::XS qw(encode_json decode_json);
34 use Crossfire::Protocol::Base ();
35 *to_json = \&Crossfire::Protocol::Base::to_json;
36 *from_json = \&Crossfire::Protocol::Base::from_json;
37}
38 39
39=item guard { BLOCK } 40=item guard { BLOCK }
40 41
41Returns 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.
42 43
43=cut 44=cut
44 45
45sub guard(&) { 46sub guard(&) {
46 bless \(my $cb = $_[0]), "CFPlus::Guard" 47 bless \(my $cb = $_[0]), "DC::Guard"
47} 48}
48 49
49sub CFPlus::Guard::DESTROY { 50sub DC::Guard::DESTROY {
50 ${$_[0]}->() 51 ${$_[0]}->()
51} 52}
52 53
53=item shorten $string[, $maxlength] 54=item shorten $string[, $maxlength]
54 55
78} 79}
79 80
80sub background(&;&) { 81sub background(&;&) {
81 my ($bg, $cb) = @_; 82 my ($bg, $cb) = @_;
82 83
83 my ($fh_r, $fh_w) = CFPlus::socketpipe; 84 my ($fh_r, $fh_w) = DC::socketpipe;
84 85
85 my $pid = fork; 86 my $pid = fork;
86 87
87 if (defined $pid && !$pid) { 88 if (defined $pid && !$pid) {
88 local $SIG{__DIE__}; 89 local $SIG{__DIE__};
98 99
99 if ($@) { 100 if ($@) {
100 my $msg = $@; 101 my $msg = $@;
101 $msg =~ s/\n+/\n/; 102 $msg =~ s/\n+/\n/;
102 warn "FATAL: $msg"; 103 warn "FATAL: $msg";
103 CFPlus::_exit 1; 104 DC::_exit 1;
104 } 105 }
105 106
106 # win32 is fucked up, of course. exit will clean stuff up, 107 # win32 is fucked up, of course. exit will clean stuff up,
107 # which destroys our database etc. _exit will exit ALL 108 # which destroys our database etc. _exit will exit ALL
108 # forked processes, because of the dreaded fork emulation. 109 # forked processes, because of the dreaded fork emulation.
109 CFPlus::_exit 0; 110 DC::_exit 0;
110 } 111 }
111 112
112 close $fh_w; 113 close $fh_w;
113 114
114 my $buffer; 115 my $buffer;
126 utf8::decode $line; 127 utf8::decode $line;
127 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 128 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
128 $cb->(JSON::XS->new->allow_nonref->decode ($1)); 129 $cb->(JSON::XS->new->allow_nonref->decode ($1));
129 } else { 130 } else {
130 ::message ({ 131 ::message ({
131 markup => "background($pid): " . CFPlus::asxml $line, 132 markup => "background($pid): " . DC::asxml $line,
132 }); 133 });
133 } 134 }
134 } 135 }
135 }); 136 });
136} 137}
142 $msg =~ s/\n//g; 143 $msg =~ s/\n//g;
143 utf8::encode $msg; 144 utf8::encode $msg;
144 print $msg, "\n"; 145 print $msg, "\n";
145} 146}
146 147
147package 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}
148 159
149sub find_rcfile($) { 160sub find_rcfile($) {
150 my $path; 161 my $path;
151 162
152 for (grep !ref, @INC) { 163 for (@RC_PATH, "") {
153 $path = "$_/CFPlus/resources/$_[0]"; 164 $path = "$RC_BASE/$_/$_[0]";
154 return $path if -r $path; 165 return $path if -r $path;
155 } 166 }
156 167
157 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 set_theme($) {
172 return if $RC_THEME eq $_[0];
173 $RC_THEME = $_[0];
174
175 @RC_PATH = "theme-$RC_THEME";
176
177 {
178 open my $fh, "<:raw", find_rcfile "theme.json"
179 or die "cannot open theme description file";
180
181 local $/;
182 $THEME = JSON::XS->new->utf8->relaxed->decode (<$fh>);
183 }
184
185 @RC_PATH = @{ $THEME->{path} } if $THEME->{path};
158} 186}
159 187
160sub read_cfg { 188sub read_cfg {
161 my ($file) = @_; 189 my ($file) = @_;
162 190
164 or return; 192 or return;
165 193
166 local $/; 194 local $/;
167 my $CFG = <$fh>; 195 my $CFG = <$fh>;
168 196
169 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
170 require YAML;
171 utf8::decode $CFG;
172 $::CFG = YAML::Load ($CFG);
173 } elsif ($CFG =~ /^\{/) {
174 $::CFG = from_json $CFG; 197 $::CFG = decode_json $CFG;
175 } else {
176 $::CFG = eval $CFG; ## todo comaptibility cruft
177 }
178} 198}
179 199
180sub write_cfg { 200sub write_cfg {
181 my ($file) = @_; 201 my $file = "$Deliantra::VARDIR/client.cf";
182 202
183 $::CFG->{VERSION} = $::VERSION; 203 $::CFG->{VERSION} = $::VERSION;
184 204
185 open my $fh, ">:utf8", $file 205 open my $fh, ">:utf8", $file
186 or return; 206 or return;
187 print $fh to_json $::CFG; 207 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
188} 208}
189 209
190sub http_proxy { 210sub http_proxy {
191 my @proxy = win32_proxy_info; 211 my @proxy = win32_proxy_info;
192 212
207} 227}
208 228
209sub lwp_useragent { 229sub lwp_useragent {
210 require LWP::UserAgent; 230 require LWP::UserAgent;
211 231
212 CFPlus::set_proxy; 232 DC::set_proxy;
213 233
214 my $ua = LWP::UserAgent->new ( 234 my $ua = LWP::UserAgent->new (
215 agent => "cfplus $VERSION", 235 agent => "deliantra $VERSION",
216 keep_alive => 1, 236 keep_alive => 1,
217 env_proxy => 1, 237 env_proxy => 1,
218 timeout => 30, 238 timeout => 30,
219 ); 239 );
220} 240}
226 and die $res->status_line; 246 and die $res->status_line;
227 247
228 $res 248 $res
229} 249}
230 250
251sub fh_nonblocking($$) {
252 my ($fh, $nb) = @_;
253
254 if ($^O eq "MSWin32") {
255 $nb = (! ! $nb) + 0;
256 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
257 } else {
258 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
259 }
260}
261
231package CFPlus::Layout; 262package DC::Layout;
232 263
264$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
265 glyph_cache_restore;
266};
267
233$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 268$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
234 reset_glyph_cache; 269 glyph_cache_backup;
235}; 270};
236 271
2371; 2721;
238 273
239=back 274=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines