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.178 by root, Sun Mar 30 06:05:52 2008 UTC vs.
Revision 1.191 by root, Wed Sep 3 06:07:39 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.9970'; 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 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};
154} 186}
155 187
156sub read_cfg { 188sub read_cfg {
157 my ($file) = @_; 189 my ($file) = @_;
158 190
… …
170 202
171 $::CFG->{VERSION} = $::VERSION; 203 $::CFG->{VERSION} = $::VERSION;
172 204
173 open my $fh, ">:utf8", $file 205 open my $fh, ">:utf8", $file
174 or return; 206 or return;
175 print $fh encode_json $::CFG; 207 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
176} 208}
177 209
178sub http_proxy { 210sub http_proxy {
179 my @proxy = win32_proxy_info; 211 my @proxy = win32_proxy_info;
180 212
… …
223 $nb = (! ! $nb) + 0; 255 $nb = (! ! $nb) + 0;
224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 256 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225 } else { 257 } else {
226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 258 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227 } 259 }
228
229} 260}
230 261
231package DC::Layout; 262package DC::Layout;
232 263
233$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub { 264$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {

Diff Legend

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