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.189 by root, Tue Sep 2 16:50:06 2008 UTC vs.
Revision 1.212 by root, Wed Jan 4 11:23:23 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
21our $VERSION; 19our $VERSION;
22 20
23BEGIN { 21BEGIN {
24 $VERSION = '0.9975'; 22 $VERSION = '2.11';
25 23
26 use XSLoader; 24 use XSLoader;
27 XSLoader::load "Deliantra::Client", $VERSION; 25 XSLoader::load "Deliantra::Client", $VERSION;
28} 26}
29 27
30use utf8; 28use utf8;
31use strict qw(vars subs); 29use strict qw(vars subs);
32 30
31use Socket ();
33use AnyEvent (); 32use AnyEvent ();
33use AnyEvent::Util ();
34use Pod::POM (); 34use Pod::POM ();
35use File::Path (); 35use File::Path ();
36use Storable (); # finally 36use Storable (); # finally
37use Fcntl (); 37use Fcntl ();
38use JSON::XS qw(encode_json decode_json); 38use JSON::XS qw(encode_json decode_json);
39use Guard qw(guard);
39 40
40=item guard { BLOCK } 41# modules to support other DC::* packages
41 42use List::Util ();
42Returns an object that executes the given block as soon as it is destroyed. 43use IO::AIO ();
43 44use Coro::AIO ();
44=cut 45use AnyEvent::AIO ();
45
46sub guard(&) {
47 bless \(my $cb = $_[0]), "DC::Guard"
48}
49
50sub DC::Guard::DESTROY {
51 ${$_[0]}->()
52}
53 46
54=item shorten $string[, $maxlength] 47=item shorten $string[, $maxlength]
55 48
56=cut 49=cut
57 50
… …
69 s/</&lt;/g; 62 s/</&lt;/g;
70 63
71 $_ 64 $_
72} 65}
73 66
74sub socketpipe() {
75 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
76 or die "cannot establish bidirectional pipe: $!\n";
77
78 ($fh1, $fh2)
79}
80
81sub background(&;&) { 67sub background(&;&) {
82 my ($bg, $cb) = @_; 68 my ($bg, $cb) = @_;
83 69
84 my ($fh_r, $fh_w) = DC::socketpipe; 70 my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
71 or die "unable to create background socketpair: $!";
85 72
86 my $pid = fork; 73 my $pid = fork;
87 74
88 if (defined $pid && !$pid) { 75 if (defined $pid && !$pid) {
89 local $SIG{__DIE__}; 76 local $SIG{__DIE__};
… …
145 print $msg, "\n"; 132 print $msg, "\n";
146} 133}
147 134
148package DC; 135package DC;
149 136
150our @RC_THEME = ("theme-plain", "."); 137our $RC_THEME;
138our %THEME;
139our @RC_PATH;
151our $RC_BASE; 140our $RC_BASE;
152 141
153for (grep !ref, @INC) { 142for (grep !ref, @INC) {
154 $RC_BASE = "$_/Deliantra/Client/private/resources"; 143 $RC_BASE = "$_/Deliantra/Client/private/resources";
155 last if -d $RC_BASE; 144 last if -d $RC_BASE;
156} 145}
157 146
158sub find_rcfile($) { 147sub find_rcfile($) {
159 my $path; 148 my $path;
160 149
161 for (@RC_THEME) { 150 for (@RC_PATH, "") {
162 $path = "$RC_BASE/$_/$_[0]"; 151 $path = "$RC_BASE/$_/$_[0]";
163 return $path if -r $path; 152 return $path if -e $path;
164 } 153 }
165 154
166 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n"; 155 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
156}
157
158sub load_json($) {
159 my ($file) = @_;
160
161 open my $fh, $file
162 or return;
163
164 local $/;
165 eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) }
166}
167
168sub set_theme($) {
169 return if $RC_THEME eq $_[0];
170 $RC_THEME = $_[0];
171
172 # kind of hacky, find the main theme file, then load all theme files and merge them
173
174 %THEME = ();
175 @RC_PATH = "theme-$RC_THEME";
176
177 my $theme = load_json find_rcfile "theme.json"
178 or die "FATAL: theme resource file not found";
179
180 @RC_PATH = @{ $theme->{path} } if $theme->{path};
181
182 for (@RC_PATH, "") {
183 my $theme = load_json "$RC_BASE/$_/theme.json"
184 or next;
185
186 %THEME = ( %$theme, %THEME );
187 }
167} 188}
168 189
169sub read_cfg { 190sub read_cfg {
170 my ($file) = @_; 191 my ($file) = @_;
171 192
172 open my $fh, $file 193 $::CFG = (load_json $file) || (load_json "$file.bak");
173 or return;
174
175 local $/;
176 my $CFG = <$fh>;
177
178 $::CFG = decode_json $CFG;
179} 194}
180 195
181sub write_cfg { 196sub write_cfg {
182 my $file = "$Deliantra::VARDIR/client.cf"; 197 my $file = "$Deliantra::VARDIR/client.cf";
183 198
184 $::CFG->{VERSION} = $::VERSION; 199 $::CFG->{VERSION} = $::VERSION;
200 $::CFG->{layout} = DC::UI::get_layout ();
185 201
186 open my $fh, ">:utf8", $file 202 open my $fh, ">:utf8", "$file~"
187 or return; 203 or return;
188 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG); 204 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
205 close $fh;
206
207 rename $file, "$file.bak";
208 rename "$file~", $file;
189} 209}
190 210
191sub http_proxy { 211sub http_proxy {
192 my @proxy = win32_proxy_info; 212 my @proxy = win32_proxy_info;
193 213

Diff Legend

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