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.172 by root, Sun Jan 13 08:47:00 2008 UTC vs.
Revision 1.198 by root, Fri Dec 12 15:06:00 2008 UTC

… …
14 14
15package DC; 15package DC;
16 16
17use Carp (); 17use Carp ();
18 18
19our $VERSION;
20
19BEGIN { 21BEGIN {
20 $VERSION = '0.9964'; 22 $VERSION = '2.01';
21 23
22 use XSLoader; 24 use XSLoader;
23 XSLoader::load "Deliantra::Client", $VERSION; 25 XSLoader::load "Deliantra::Client", $VERSION;
24} 26}
25 27
26use utf8; 28use utf8;
29use strict qw(vars subs);
27 30
28use AnyEvent (); 31use AnyEvent ();
29use Pod::POM (); 32use Pod::POM ();
30use File::Path (); 33use File::Path ();
31use Storable (); # finally 34use Storable (); # finally
… …
65 68
66 $_ 69 $_
67} 70}
68 71
69sub socketpipe() { 72sub socketpipe() {
70 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 73 socketpair my $fh1, my $fh2, &Socket::AF_UNIX, &Socket::SOCK_STREAM, &Socket::PF_UNSPEC
71 or die "cannot establish bidirectional pipe: $!\n"; 74 or die "cannot establish bidirectional pipe: $!\n";
72 75
73 ($fh1, $fh2) 76 ($fh1, $fh2)
74} 77}
75 78
… …
140 print $msg, "\n"; 143 print $msg, "\n";
141} 144}
142 145
143package DC; 146package DC;
144 147
148our $RC_THEME;
149our %THEME;
150our @RC_PATH;
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_PATH, "") {
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";
167}
168
169sub load_json($) {
170 my ($file) = @_;
171
172 open my $fh, $file
173 or return;
174
175 local $/;
176 JSON::XS->new->utf8->relaxed->decode (<$fh>)
177}
178
179sub set_theme($) {
180 return if $RC_THEME eq $_[0];
181 $RC_THEME = $_[0];
182
183 # kind of hacky, find the main theme file, then load all theme files and merge them
184
185 %THEME = ();
186 @RC_PATH = "theme-$RC_THEME";
187
188 my $theme = load_json find_rcfile "theme.json"
189 or die "FATAL: theme resource file not found";
190
191 @RC_PATH = @{ $theme->{path} } if $theme->{path};
192
193 for (@RC_PATH, "") {
194 my $theme = load_json "$RC_BASE/$_/theme.json"
195 or next;
196
197 %THEME = ( %$theme, %THEME );
198 }
154} 199}
155 200
156sub read_cfg { 201sub read_cfg {
157 my ($file) = @_; 202 my ($file) = @_;
158 203
159 open my $fh, $file 204 $::CFG = load_json $file;
160 or return;
161
162 local $/;
163 my $CFG = <$fh>;
164
165 $::CFG = decode_json $CFG;
166} 205}
167 206
168sub write_cfg { 207sub write_cfg {
169 my ($file) = @_; 208 my $file = "$Deliantra::VARDIR/client.cf";
170 209
171 $::CFG->{VERSION} = $::VERSION; 210 $::CFG->{VERSION} = $::VERSION;
172 211
173 open my $fh, ">:utf8", $file 212 open my $fh, ">:utf8", $file
174 or return; 213 or return;
175 print $fh encode_json $::CFG; 214 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
176} 215}
177 216
178sub http_proxy { 217sub http_proxy {
179 my @proxy = win32_proxy_info; 218 my @proxy = win32_proxy_info;
180 219
… …
223 $nb = (! ! $nb) + 0; 262 $nb = (! ! $nb) + 0;
224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 263 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225 } else { 264 } else {
226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 265 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227 } 266 }
228
229} 267}
230 268
231package DC::Layout; 269package DC::Layout;
232 270
233$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub { 271$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {

Diff Legend

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