| … | |
… | |
| 19 | use Carp (); |
19 | use Carp (); |
| 20 | |
20 | |
| 21 | our $VERSION; |
21 | our $VERSION; |
| 22 | |
22 | |
| 23 | BEGIN { |
23 | BEGIN { |
| 24 | $VERSION = '0.9975'; |
24 | $VERSION = '0.9976'; |
| 25 | |
25 | |
| 26 | use XSLoader; |
26 | use XSLoader; |
| 27 | XSLoader::load "Deliantra::Client", $VERSION; |
27 | XSLoader::load "Deliantra::Client", $VERSION; |
| 28 | } |
28 | } |
| 29 | |
29 | |
| … | |
… | |
| 70 | |
70 | |
| 71 | $_ |
71 | $_ |
| 72 | } |
72 | } |
| 73 | |
73 | |
| 74 | sub socketpipe() { |
74 | sub socketpipe() { |
| 75 | 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 |
| 76 | or die "cannot establish bidirectional pipe: $!\n"; |
76 | or die "cannot establish bidirectional pipe: $!\n"; |
| 77 | |
77 | |
| 78 | ($fh1, $fh2) |
78 | ($fh1, $fh2) |
| 79 | } |
79 | } |
| 80 | |
80 | |
| … | |
… | |
| 145 | print $msg, "\n"; |
145 | print $msg, "\n"; |
| 146 | } |
146 | } |
| 147 | |
147 | |
| 148 | package DC; |
148 | package DC; |
| 149 | |
149 | |
| 150 | our $RC_THEME = "theme-metal"; |
150 | our $RC_THEME; |
|
|
151 | our %THEME; |
|
|
152 | our @RC_PATH; |
| 151 | our $RC_BASE; |
153 | our $RC_BASE; |
| 152 | |
154 | |
| 153 | for (grep !ref, @INC) { |
155 | for (grep !ref, @INC) { |
| 154 | $RC_BASE = "$_/Deliantra/Client/private/resources"; |
156 | $RC_BASE = "$_/Deliantra/Client/private/resources"; |
| 155 | last if -d $RC_BASE; |
157 | last if -d $RC_BASE; |
| 156 | } |
158 | } |
| 157 | |
159 | |
| 158 | sub find_rcfile($) { |
160 | sub find_rcfile($) { |
| 159 | my $path; |
161 | my $path; |
| 160 | |
162 | |
|
|
163 | for (@RC_PATH, "") { |
| 161 | $path = "$RC_BASE/$RC_THEME/$_[0]"; |
164 | $path = "$RC_BASE/$_/$_[0]"; |
| 162 | return $path if -r $path; |
165 | return $path if -r $path; |
| 163 | |
166 | } |
| 164 | $path = "$RC_BASE/$_[0]"; |
|
|
| 165 | return $path if -r $path; |
|
|
| 166 | |
167 | |
| 167 | die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\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 | } |
| 168 | } |
201 | } |
| 169 | |
202 | |
| 170 | sub read_cfg { |
203 | sub read_cfg { |
| 171 | my ($file) = @_; |
204 | my ($file) = @_; |
| 172 | |
205 | |
| 173 | open my $fh, $file |
206 | $::CFG = load_json $file; |
| 174 | or return; |
|
|
| 175 | |
|
|
| 176 | local $/; |
|
|
| 177 | my $CFG = <$fh>; |
|
|
| 178 | |
|
|
| 179 | $::CFG = decode_json $CFG; |
|
|
| 180 | } |
207 | } |
| 181 | |
208 | |
| 182 | sub write_cfg { |
209 | sub write_cfg { |
| 183 | my $file = "$Deliantra::VARDIR/client.cf"; |
210 | my $file = "$Deliantra::VARDIR/client.cf"; |
| 184 | |
211 | |
