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.184 by root, Mon Jul 7 12:56:07 2008 UTC vs.
Revision 1.216 by root, Sat Nov 17 10:40:08 2012 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
17package DC; 15package DC;
18 16
19use Carp (); 17use Carp ();
20 18
19our $VERSION;
20
21BEGIN { 21BEGIN {
22 $VERSION = '0.9973'; 22 $VERSION = '3.0';
23 23
24 use XSLoader; 24 use XSLoader;
25 XSLoader::load "Deliantra::Client", $VERSION; 25 XSLoader::load "Deliantra::Client", $VERSION;
26} 26}
27 27
28use utf8; 28use utf8;
29use strict qw(vars subs);
29 30
31use Socket ();
30use AnyEvent (); 32use AnyEvent ();
33use AnyEvent::Util ();
31use Pod::POM (); 34use Pod::POM ();
32use File::Path (); 35use File::Path ();
33use Storable (); # finally 36use Storable (); # finally
34use Fcntl (); 37use Fcntl ();
35use JSON::XS qw(encode_json decode_json); 38use JSON::XS qw(encode_json decode_json);
39use Guard qw(guard);
36 40
37=item guard { BLOCK } 41# modules to support other DC::* packages
42use List::Util ();
43use IO::AIO ();
44use Coro::AIO ();
45use AnyEvent::AIO ();
38 46
39Returns an object that executes the given block as soon as it is destroyed. 47use Deliantra::Util ();
40 48use Deliantra::Protocol::Constants ();
41=cut
42
43sub guard(&) {
44 bless \(my $cb = $_[0]), "DC::Guard"
45}
46
47sub DC::Guard::DESTROY {
48 ${$_[0]}->()
49}
50 49
51=item shorten $string[, $maxlength] 50=item shorten $string[, $maxlength]
52 51
53=cut 52=cut
54 53
… …
66 s/</&lt;/g; 65 s/</&lt;/g;
67 66
68 $_ 67 $_
69} 68}
70 69
71sub socketpipe() {
72 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
73 or die "cannot establish bidirectional pipe: $!\n";
74
75 ($fh1, $fh2)
76}
77
78sub background(&;&) { 70sub background(&;&) {
79 my ($bg, $cb) = @_; 71 my ($bg, $cb) = @_;
80 72
81 my ($fh_r, $fh_w) = DC::socketpipe; 73 my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
74 or die "unable to create background socketpair: $!";
82 75
83 my $pid = fork; 76 my $pid = fork;
84 77
85 if (defined $pid && !$pid) { 78 if (defined $pid && !$pid) {
86 local $SIG{__DIE__}; 79 local $SIG{__DIE__};
… …
142 print $msg, "\n"; 135 print $msg, "\n";
143} 136}
144 137
145package DC; 138package DC;
146 139
140our $RC_THEME;
141our %THEME;
142our @RC_PATH;
143our $RC_BASE;
144
145for (grep !ref, @INC) {
146 $RC_BASE = "$_/Deliantra/Client/private/resources";
147 last if -d $RC_BASE;
148}
149
147sub find_rcfile($) { 150sub find_rcfile($) {
148 my $path; 151 my $path;
149 152
150 for (grep !ref, @INC) { 153 for (@RC_PATH, "") {
151 $path = "$_/Deliantra/Client/private/resources/$_[0]"; 154 $path = "$RC_BASE/$_/$_[0]";
152 return $path if -r $path; 155 return $path if -e $path;
153 } 156 }
154 157
155 die "FATAL: can't find required file $_[0]\n"; 158 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
156} 159}
157 160
158sub read_cfg { 161sub load_json($) {
159 my ($file) = @_; 162 my ($file) = @_;
160 163
161 open my $fh, $file 164 open my $fh, $file
162 or return; 165 or return;
163 166
164 local $/; 167 local $/;
165 my $CFG = <$fh>; 168 eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) }
166
167 $::CFG = decode_json $CFG;
168} 169}
169 170
171sub set_theme($) {
172 return if $RC_THEME eq $_[0];
173 $RC_THEME = $_[0];
174
175 # kind of hacky, find the main theme file, then load all theme files and merge them
176
177 %THEME = ();
178 @RC_PATH = "theme-$RC_THEME";
179
180 my $theme = load_json find_rcfile "theme.json"
181 or die "FATAL: theme resource file not found";
182
183 @RC_PATH = @{ $theme->{path} } if $theme->{path};
184
185 for (@RC_PATH, "") {
186 my $theme = load_json "$RC_BASE/$_/theme.json"
187 or next;
188
189 %THEME = ( %$theme, %THEME );
190 }
191}
192
193sub read_cfg($) {
194 my ($file) = @_;
195
196 $::CFG = (load_json $file) || (load_json "$file.bak");
197}
198
170sub write_cfg { 199sub write_cfg($) {
171 my $file = "$Deliantra::VARDIR/client.cf"; 200 my $file = "$Deliantra::VARDIR/client.cf";
172 201
173 $::CFG->{VERSION} = $::VERSION; 202 $::CFG->{VERSION} = $::VERSION;
203 $::CFG->{layout} = DC::UI::get_layout ();
174 204
175 open my $fh, ">:utf8", $file 205 open my $fh, ">:utf8", "$file~"
176 or return; 206 or return;
177 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG); 207 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
208 close $fh;
209
210 rename $file, "$file.bak";
211 rename "$file~", $file;
212}
213
214sub load_cfg() {
215 if (-e "$Deliantra::VARDIR/client.cf") {
216 DC::read_cfg "$Deliantra::VARDIR/client.cf";
217 } else {
218 $::CFG = { cfg_schema => 1, db_schema => 1 };
219 }
220}
221
222sub save_cfg() {
223 write_cfg "$Deliantra::VARDIR/client.cf";
224}
225
226sub upgrade_cfg() {
227 my %DEF_CFG = (
228 config_autosave => 1,
229 sdl_mode => undef,
230 fullscreen => 1,
231 fast => 0,
232 force_opengl11 => undef,
233 disable_alpha => 0,
234 smooth_movement => 1,
235 smooth_transitions => 1,
236 texture_compression => 1,
237 map_scale => 1,
238 fow_enable => 1,
239 fow_intensity => 0,
240 fow_texture => 0,
241 map_smoothing => 1,
242 gui_fontsize => 1,
243 log_fontsize => 0.7,
244 gauge_fontsize => 1,
245 gauge_size => 0.35,
246 stat_fontsize => 0.7,
247 mapsize => 100,
248 audio_enable => 1,
249 audio_hw_channels => 0,
250 audio_hw_frequency => 0,
251 audio_hw_chunksize => 0,
252 audio_mix_channels => 8,
253 effects_enable => 1,
254 effects_volume => 1,
255 bgm_enable => 1,
256 bgm_volume => 0.5,
257 output_rate => "",
258 pickup => Deliantra::Protocol::Constants::PICKUP_SPELLBOOK
259 | Deliantra::Protocol::Constants::PICKUP_SKILLSCROLL
260 | Deliantra::Protocol::Constants::PICKUP_VALUABLES,
261 inv_sort => "mtime",
262 default => "profile", # default profile
263 show_tips => 1,
264 logview_max_par => 1000,
265 shift_fire_stop => 0,
266 uitheme => "wood",
267 map_shift_x => -24, # arbitrary
268 map_shift_y => +24, # arbitrary
269 );
270
271 while (my ($k, $v) = each %DEF_CFG) {
272 $::CFG->{$k} = $v unless exists $::CFG->{$k};
273 }
274
275 if ($::CFG->{cfg_schema} < 1) {
276 for my $profile (values %{ $::CFG->{profile} }) {
277 $profile->{password} = unpack "H*", Deliantra::Util::hash_pw $profile->{password};
278 }
279 $::CFG->{cfg_schema} = 1;
280 }
178} 281}
179 282
180sub http_proxy { 283sub http_proxy {
181 my @proxy = win32_proxy_info; 284 my @proxy = win32_proxy_info;
182 285

Diff Legend

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