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.198 by root, Fri Dec 12 15:06:00 2008 UTC vs.
Revision 1.214 by root, Wed Jan 18 00:51:22 2012 UTC

… …
17use Carp (); 17use Carp ();
18 18
19our $VERSION; 19our $VERSION;
20 20
21BEGIN { 21BEGIN {
22 $VERSION = '2.01'; 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); 29use strict qw(vars subs);
30 30
31use Socket ();
31use AnyEvent (); 32use AnyEvent ();
33use AnyEvent::Util ();
32use Pod::POM (); 34use Pod::POM ();
33use File::Path (); 35use File::Path ();
34use Storable (); # finally 36use Storable (); # finally
35use Fcntl (); 37use Fcntl ();
36use JSON::XS qw(encode_json decode_json); 38use JSON::XS qw(encode_json decode_json);
39use Guard qw(guard);
37 40
38=item guard { BLOCK } 41# modules to support other DC::* packages
42use List::Util ();
43use IO::AIO ();
44use Coro::AIO ();
45use AnyEvent::AIO ();
39 46
40Returns an object that executes the given block as soon as it is destroyed. 47use Deliantra::Protocol::Constants ();
41
42=cut
43
44sub guard(&) {
45 bless \(my $cb = $_[0]), "DC::Guard"
46}
47
48sub DC::Guard::DESTROY {
49 ${$_[0]}->()
50}
51 48
52=item shorten $string[, $maxlength] 49=item shorten $string[, $maxlength]
53 50
54=cut 51=cut
55 52
… …
67 s/</&lt;/g; 64 s/</&lt;/g;
68 65
69 $_ 66 $_
70} 67}
71 68
72sub 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
79sub background(&;&) { 69sub background(&;&) {
80 my ($bg, $cb) = @_; 70 my ($bg, $cb) = @_;
81 71
82 my ($fh_r, $fh_w) = DC::socketpipe; 72 my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
73 or die "unable to create background socketpair: $!";
83 74
84 my $pid = fork; 75 my $pid = fork;
85 76
86 if (defined $pid && !$pid) { 77 if (defined $pid && !$pid) {
87 local $SIG{__DIE__}; 78 local $SIG{__DIE__};
… …
158sub find_rcfile($) { 149sub find_rcfile($) {
159 my $path; 150 my $path;
160 151
161 for (@RC_PATH, "") { 152 for (@RC_PATH, "") {
162 $path = "$RC_BASE/$_/$_[0]"; 153 $path = "$RC_BASE/$_/$_[0]";
163 return $path if -r $path; 154 return $path if -e $path;
164 } 155 }
165 156
166 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n"; 157 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
167} 158}
168 159
… …
171 162
172 open my $fh, $file 163 open my $fh, $file
173 or return; 164 or return;
174 165
175 local $/; 166 local $/;
176 JSON::XS->new->utf8->relaxed->decode (<$fh>) 167 eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) }
177} 168}
178 169
179sub set_theme($) { 170sub set_theme($) {
180 return if $RC_THEME eq $_[0]; 171 return if $RC_THEME eq $_[0];
181 $RC_THEME = $_[0]; 172 $RC_THEME = $_[0];
… …
199} 190}
200 191
201sub read_cfg { 192sub read_cfg {
202 my ($file) = @_; 193 my ($file) = @_;
203 194
204 $::CFG = load_json $file; 195 $::CFG = (load_json $file) || (load_json "$file.bak");
205} 196}
206 197
207sub write_cfg { 198sub write_cfg {
208 my $file = "$Deliantra::VARDIR/client.cf"; 199 my $file = "$Deliantra::VARDIR/client.cf";
209 200
210 $::CFG->{VERSION} = $::VERSION; 201 $::CFG->{VERSION} = $::VERSION;
202 $::CFG->{layout} = DC::UI::get_layout ();
211 203
212 open my $fh, ">:utf8", $file 204 open my $fh, ">:utf8", "$file~"
213 or return; 205 or return;
214 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG); 206 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
207 close $fh;
208
209 rename $file, "$file.bak";
210 rename "$file~", $file;
211}
212
213sub upgrade_cfg() {
214 my %DEF_CFG = (
215 config_autosave => 1,
216 sdl_mode => undef,
217 fullscreen => 1,
218 fast => 0,
219 force_opengl11 => undef,
220 disable_alpha => 0,
221 smooth_movement => 1,
222 smooth_transitions => 1,
223 texture_compression => 1,
224 map_scale => 1,
225 fow_enable => 1,
226 fow_intensity => 0,
227 fow_texture => 0,
228 map_smoothing => 1,
229 gui_fontsize => 1,
230 log_fontsize => 0.7,
231 gauge_fontsize => 1,
232 gauge_size => 0.35,
233 stat_fontsize => 0.7,
234 mapsize => 100,
235 audio_enable => 1,
236 audio_hw_channels => 0,
237 audio_hw_frequency => 0,
238 audio_hw_chunksize => 0,
239 audio_mix_channels => 8,
240 effects_enable => 1,
241 effects_volume => 1,
242 bgm_enable => 1,
243 bgm_volume => 0.5,
244 output_rate => "",
245 pickup => Deliantra::Protocol::Constants::PICKUP_SPELLBOOK
246 | Deliantra::Protocol::Constants::PICKUP_SKILLSCROLL
247 | Deliantra::Protocol::Constants::PICKUP_VALUABLES,
248 inv_sort => "mtime",
249 default => "profile", # default profile
250 show_tips => 1,
251 logview_max_par => 1000,
252 shift_fire_stop => 0,
253 uitheme => "wood",
254 map_shift_x => -24, # arbitrary
255 map_shift_y => +24, # arbitrary
256 #db_schema => 0,
257 );
258
259 while (my ($k, $v) = each %DEF_CFG) {
260 $::CFG->{$k} = $v unless exists $::CFG->{$k};
261 }
215} 262}
216 263
217sub http_proxy { 264sub http_proxy {
218 my @proxy = win32_proxy_info; 265 my @proxy = win32_proxy_info;
219 266

Diff Legend

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