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.192 by root, Wed Sep 3 10:36:25 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;
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}
159
145sub find_rcfile($) { 160sub find_rcfile($) {
146 my $path; 161 my $path;
147 162
148 for (grep !ref, @INC) { 163 for (@RC_PATH, "") {
149 $path = "$_/Deliantra/Client/private/resources/$_[0]"; 164 $path = "$RC_BASE/$_/$_[0]";
150 return $path if -r $path; 165 return $path if -r $path;
151 } 166 }
152 167
153 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 load_json($) {
172 my ($file) = @_;
173
174 open my $fh, $file
175 or return;
176
177 local $/;
178 JSON::XS->new->utf8->relaxed->decode (<$fh>)
179}
180
181sub set_theme($) {
182 return if $RC_THEME eq $_[0];
183 $RC_THEME = $_[0];
184
185 # kind of hacky, find the main theme file, then load all theme files and merge them
186
187 %THEME = ();
188 @RC_PATH = "theme-$RC_THEME";
189
190 my $theme = load_json find_rcfile "theme.json"
191 or die "FATAL: theme resource file not found";
192
193 @RC_PATH = @{ $theme->{path} } if $theme->{path};
194
195 for (@RC_PATH, "") {
196 my $theme = load_json "$RC_BASE/$_/theme.json"
197 or next;
198
199 %THEME = ( %$theme, %THEME );
200 }
154} 201}
155 202
156sub read_cfg { 203sub read_cfg {
157 my ($file) = @_; 204 my ($file) = @_;
158 205
159 open my $fh, $file 206 $::CFG = load_json $file;
160 or return;
161
162 local $/;
163 my $CFG = <$fh>;
164
165 $::CFG = decode_json $CFG;
166} 207}
167 208
168sub write_cfg { 209sub write_cfg {
169 my ($file) = @_; 210 my $file = "$Deliantra::VARDIR/client.cf";
170 211
171 $::CFG->{VERSION} = $::VERSION; 212 $::CFG->{VERSION} = $::VERSION;
172 213
173 open my $fh, ">:utf8", $file 214 open my $fh, ">:utf8", $file
174 or return; 215 or return;
175 print $fh encode_json $::CFG; 216 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
176} 217}
177 218
178sub http_proxy { 219sub http_proxy {
179 my @proxy = win32_proxy_info; 220 my @proxy = win32_proxy_info;
180 221
… …
198 require LWP::UserAgent; 239 require LWP::UserAgent;
199 240
200 DC::set_proxy; 241 DC::set_proxy;
201 242
202 my $ua = LWP::UserAgent->new ( 243 my $ua = LWP::UserAgent->new (
203 agent => "cfplus $VERSION", 244 agent => "deliantra $VERSION",
204 keep_alive => 1, 245 keep_alive => 1,
205 env_proxy => 1, 246 env_proxy => 1,
206 timeout => 30, 247 timeout => 30,
207 ); 248 );
208} 249}
… …
223 $nb = (! ! $nb) + 0; 264 $nb = (! ! $nb) + 0;
224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 265 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225 } else { 266 } else {
226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 267 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227 } 268 }
228
229} 269}
230 270
231package DC::Layout; 271package DC::Layout;
232 272
233$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub { 273$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines