… | |
… | |
17 | use Carp (); |
17 | use Carp (); |
18 | |
18 | |
19 | our $VERSION; |
19 | our $VERSION; |
20 | |
20 | |
21 | BEGIN { |
21 | BEGIN { |
22 | $VERSION = '0.9976'; |
22 | $VERSION = '2.05'; |
23 | |
23 | |
24 | use XSLoader; |
24 | use XSLoader; |
25 | XSLoader::load "Deliantra::Client", $VERSION; |
25 | XSLoader::load "Deliantra::Client", $VERSION; |
26 | } |
26 | } |
27 | |
27 | |
28 | use utf8; |
28 | use utf8; |
29 | use strict qw(vars subs); |
29 | use strict qw(vars subs); |
30 | |
30 | |
|
|
31 | use Socket (); |
31 | use AnyEvent (); |
32 | use AnyEvent (); |
|
|
33 | use AnyEvent::Util (); |
32 | use Pod::POM (); |
34 | use Pod::POM (); |
33 | use File::Path (); |
35 | use File::Path (); |
34 | use Storable (); # finally |
36 | use Storable (); # finally |
35 | use Fcntl (); |
37 | use Fcntl (); |
36 | use JSON::XS qw(encode_json decode_json); |
38 | use JSON::XS qw(encode_json decode_json); |
37 | |
39 | use Guard qw(guard); |
38 | =item guard { BLOCK } |
|
|
39 | |
|
|
40 | Returns an object that executes the given block as soon as it is destroyed. |
|
|
41 | |
|
|
42 | =cut |
|
|
43 | |
|
|
44 | sub guard(&) { |
|
|
45 | bless \(my $cb = $_[0]), "DC::Guard" |
|
|
46 | } |
|
|
47 | |
|
|
48 | sub DC::Guard::DESTROY { |
|
|
49 | ${$_[0]}->() |
|
|
50 | } |
|
|
51 | |
40 | |
52 | =item shorten $string[, $maxlength] |
41 | =item shorten $string[, $maxlength] |
53 | |
42 | |
54 | =cut |
43 | =cut |
55 | |
44 | |
… | |
… | |
67 | s/</</g; |
56 | s/</</g; |
68 | |
57 | |
69 | $_ |
58 | $_ |
70 | } |
59 | } |
71 | |
60 | |
72 | sub socketpipe() { |
|
|
73 | socketpair my $fh1, my $fh2, &Socket::AF_UNIX, &Socket::SOCK_STREAM, &Socket::PF_UNSPEC |
|
|
74 | or die "cannot establish bidirectional pipe: $!\n"; |
|
|
75 | |
|
|
76 | ($fh1, $fh2) |
|
|
77 | } |
|
|
78 | |
|
|
79 | sub background(&;&) { |
61 | sub background(&;&) { |
80 | my ($bg, $cb) = @_; |
62 | my ($bg, $cb) = @_; |
81 | |
63 | |
82 | my ($fh_r, $fh_w) = DC::socketpipe; |
64 | my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair |
|
|
65 | or die "unable to create background socketpair: $!"; |
83 | |
66 | |
84 | my $pid = fork; |
67 | my $pid = fork; |
85 | |
68 | |
86 | if (defined $pid && !$pid) { |
69 | if (defined $pid && !$pid) { |
87 | local $SIG{__DIE__}; |
70 | local $SIG{__DIE__}; |
… | |
… | |
158 | sub find_rcfile($) { |
141 | sub find_rcfile($) { |
159 | my $path; |
142 | my $path; |
160 | |
143 | |
161 | for (@RC_PATH, "") { |
144 | for (@RC_PATH, "") { |
162 | $path = "$RC_BASE/$_/$_[0]"; |
145 | $path = "$RC_BASE/$_/$_[0]"; |
163 | return $path if -r $path; |
146 | return $path if -e $path; |
164 | } |
147 | } |
165 | |
148 | |
166 | die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n"; |
149 | die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n"; |
167 | } |
150 | } |
168 | |
151 | |
… | |
… | |
171 | |
154 | |
172 | open my $fh, $file |
155 | open my $fh, $file |
173 | or return; |
156 | or return; |
174 | |
157 | |
175 | local $/; |
158 | local $/; |
176 | JSON::XS->new->utf8->relaxed->decode (<$fh>) |
159 | eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) } |
177 | } |
160 | } |
178 | |
161 | |
179 | sub set_theme($) { |
162 | sub set_theme($) { |
180 | return if $RC_THEME eq $_[0]; |
163 | return if $RC_THEME eq $_[0]; |
181 | $RC_THEME = $_[0]; |
164 | $RC_THEME = $_[0]; |
… | |
… | |
199 | } |
182 | } |
200 | |
183 | |
201 | sub read_cfg { |
184 | sub read_cfg { |
202 | my ($file) = @_; |
185 | my ($file) = @_; |
203 | |
186 | |
204 | $::CFG = load_json $file; |
187 | $::CFG = (load_json $file) || (load_json "$file.bak"); |
205 | } |
188 | } |
206 | |
189 | |
207 | sub write_cfg { |
190 | sub write_cfg { |
208 | my $file = "$Deliantra::VARDIR/client.cf"; |
191 | my $file = "$Deliantra::VARDIR/client.cf"; |
209 | |
192 | |
210 | $::CFG->{VERSION} = $::VERSION; |
193 | $::CFG->{VERSION} = $::VERSION; |
|
|
194 | $::CFG->{layout} = DC::UI::get_layout (); |
211 | |
195 | |
212 | open my $fh, ">:utf8", $file |
196 | open my $fh, ">:utf8", "$file~" |
213 | or return; |
197 | or return; |
214 | print $fh JSON::XS->new->utf8->pretty->encode ($::CFG); |
198 | print $fh JSON::XS->new->utf8->pretty->encode ($::CFG); |
|
|
199 | close $fh; |
|
|
200 | |
|
|
201 | rename $file, "$file.bak"; |
|
|
202 | rename "$file~", $file; |
215 | } |
203 | } |
216 | |
204 | |
217 | sub http_proxy { |
205 | sub http_proxy { |
218 | my @proxy = win32_proxy_info; |
206 | my @proxy = win32_proxy_info; |
219 | |
207 | |