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.173 by root, Sat Jan 19 04:55:42 2008 UTC vs.
Revision 1.189 by root, Tue Sep 2 16:50:06 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.9965'; 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-plain", ".");
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 for (@RC_THEME) {
149 $path = "$_/Deliantra/Client/private/resources/$_[0]"; 162 $path = "$RC_BASE/$_/$_[0]";
150 return $path if -r $path; 163 return $path if -r $path;
151 } 164 }
152 165
153 die "FATAL: can't find required file $_[0]\n"; 166 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
154} 167}
155 168
156sub read_cfg { 169sub read_cfg {
157 my ($file) = @_; 170 my ($file) = @_;
158 171
… …
164 177
165 $::CFG = decode_json $CFG; 178 $::CFG = decode_json $CFG;
166} 179}
167 180
168sub write_cfg { 181sub write_cfg {
169 my ($file) = @_; 182 my $file = "$Deliantra::VARDIR/client.cf";
170 183
171 $::CFG->{VERSION} = $::VERSION; 184 $::CFG->{VERSION} = $::VERSION;
172 185
173 open my $fh, ">:utf8", $file 186 open my $fh, ">:utf8", $file
174 or return; 187 or return;
175 print $fh encode_json $::CFG; 188 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
176} 189}
177 190
178sub http_proxy { 191sub http_proxy {
179 my @proxy = win32_proxy_info; 192 my @proxy = win32_proxy_info;
180 193
… …
223 $nb = (! ! $nb) + 0; 236 $nb = (! ! $nb) + 0;
224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 237 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225 } else { 238 } else {
226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 239 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227 } 240 }
228
229} 241}
230 242
231package DC::Layout; 243package DC::Layout;
232 244
233$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub { 245$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {

Diff Legend

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