… | |
… | |
10 | |
10 | |
11 | =over 4 |
11 | =over 4 |
12 | |
12 | |
13 | =cut |
13 | =cut |
14 | |
14 | |
|
|
15 | package Deliantra::Client; # work around CPAN breakage |
|
|
16 | package App::Deliantra; # try to reserve namespace |
15 | package DC; |
17 | package DC; |
16 | |
18 | |
17 | use Carp (); |
19 | use Carp (); |
18 | |
20 | |
|
|
21 | our $VERSION; |
|
|
22 | |
19 | BEGIN { |
23 | BEGIN { |
20 | $VERSION = '0.9972'; |
24 | $VERSION = '0.9976'; |
21 | |
25 | |
22 | use XSLoader; |
26 | use XSLoader; |
23 | XSLoader::load "Deliantra::Client", $VERSION; |
27 | XSLoader::load "Deliantra::Client", $VERSION; |
24 | } |
28 | } |
25 | |
29 | |
26 | use utf8; |
30 | use utf8; |
|
|
31 | use strict qw(vars subs); |
27 | |
32 | |
28 | use AnyEvent (); |
33 | use AnyEvent (); |
29 | use Pod::POM (); |
34 | use Pod::POM (); |
30 | use File::Path (); |
35 | use File::Path (); |
31 | use Storable (); # finally |
36 | use Storable (); # finally |
… | |
… | |
65 | |
70 | |
66 | $_ |
71 | $_ |
67 | } |
72 | } |
68 | |
73 | |
69 | sub socketpipe() { |
74 | sub socketpipe() { |
70 | socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC |
75 | socketpair my $fh1, my $fh2, &Socket::AF_UNIX, &Socket::SOCK_STREAM, &Socket::PF_UNSPEC |
71 | or die "cannot establish bidirectional pipe: $!\n"; |
76 | or die "cannot establish bidirectional pipe: $!\n"; |
72 | |
77 | |
73 | ($fh1, $fh2) |
78 | ($fh1, $fh2) |
74 | } |
79 | } |
75 | |
80 | |
… | |
… | |
140 | print $msg, "\n"; |
145 | print $msg, "\n"; |
141 | } |
146 | } |
142 | |
147 | |
143 | package DC; |
148 | package DC; |
144 | |
149 | |
|
|
150 | our $RC_THEME; |
|
|
151 | our %THEME; |
|
|
152 | our @RC_PATH; |
|
|
153 | our $RC_BASE; |
|
|
154 | |
|
|
155 | for (grep !ref, @INC) { |
|
|
156 | $RC_BASE = "$_/Deliantra/Client/private/resources"; |
|
|
157 | last if -d $RC_BASE; |
|
|
158 | } |
|
|
159 | |
145 | sub find_rcfile($) { |
160 | sub 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 | |
|
|
171 | sub 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 | |
|
|
181 | sub 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 | |
156 | sub read_cfg { |
203 | sub 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 | |
168 | sub write_cfg { |
209 | sub write_cfg { |
169 | my $file = "$Deliantra::VARDIR/client.cf"; |
210 | my $file = "$Deliantra::VARDIR/client.cf"; |
170 | |
211 | |