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.169 by root, Wed Dec 26 21:03:21 2007 UTC vs.
Revision 1.188 by root, Tue Sep 2 16:27:34 2008 UTC

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 DC; 17package DC;
16 18
17use Carp (); 19use Carp ();
18 20
21our $VERSION;
22
19BEGIN { 23BEGIN {
20 $VERSION = '0.9962'; 24 $VERSION = '0.9975';
21 25
22 use XSLoader; 26 use XSLoader;
23 XSLoader::load "Deliantra::Client", $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
140 print $msg, "\n"; 145 print $msg, "\n";
141} 146}
142 147
143package DC; 148package DC;
144 149
150our $RC_THEME = "theme-metal";
151our $RC_BASE;
152
153for (grep !ref, @INC) {
154 $RC_BASE = "$_/Deliantra/Client/private/resources";
155 last if -d $RC_BASE;
156}
157
145sub find_rcfile($) { 158sub find_rcfile($) {
146 my $path; 159 my $path;
147 160
148 for (grep !ref, @INC) { 161 $path = "$RC_BASE/$RC_THEME/$_[0]";
149 $path = "$_/Deliantra/Client/private/resources/$_[0]";
150 return $path if -r $path; 162 return $path if -r $path;
151 }
152 163
164 $path = "$RC_BASE/$_[0]";
165 return $path if -r $path;
166
153 die "FATAL: can't find required file $_[0]\n"; 167 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
154} 168}
155 169
156sub read_cfg { 170sub read_cfg {
157 my ($file) = @_; 171 my ($file) = @_;
158 172
164 178
165 $::CFG = decode_json $CFG; 179 $::CFG = decode_json $CFG;
166} 180}
167 181
168sub write_cfg { 182sub write_cfg {
169 my ($file) = @_; 183 my $file = "$Deliantra::VARDIR/client.cf";
170 184
171 $::CFG->{VERSION} = $::VERSION; 185 $::CFG->{VERSION} = $::VERSION;
172 186
173 open my $fh, ">:utf8", $file 187 open my $fh, ">:utf8", $file
174 or return; 188 or return;
175 print $fh encode_json $::CFG; 189 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
176} 190}
177 191
178sub http_proxy { 192sub http_proxy {
179 my @proxy = win32_proxy_info; 193 my @proxy = win32_proxy_info;
180 194
198 require LWP::UserAgent; 212 require LWP::UserAgent;
199 213
200 DC::set_proxy; 214 DC::set_proxy;
201 215
202 my $ua = LWP::UserAgent->new ( 216 my $ua = LWP::UserAgent->new (
203 agent => "cfplus $VERSION", 217 agent => "deliantra $VERSION",
204 keep_alive => 1, 218 keep_alive => 1,
205 env_proxy => 1, 219 env_proxy => 1,
206 timeout => 30, 220 timeout => 30,
207 ); 221 );
208} 222}
223 $nb = (! ! $nb) + 0; 237 $nb = (! ! $nb) + 0;
224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 238 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225 } else { 239 } else {
226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 240 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227 } 241 }
228
229} 242}
230 243
231package DC::Layout; 244package DC::Layout;
232 245
233$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub { 246$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines