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.173 by root, Sat Jan 19 04:55:42 2008 UTC vs.
Revision 1.212 by root, Wed Jan 4 11:23:23 2012 UTC

… …
14 14
15package DC; 15package DC;
16 16
17use Carp (); 17use Carp ();
18 18
19our $VERSION;
20
19BEGIN { 21BEGIN {
20 $VERSION = '0.9965'; 22 $VERSION = '2.11';
21 23
22 use XSLoader; 24 use XSLoader;
23 XSLoader::load "Deliantra::Client", $VERSION; 25 XSLoader::load "Deliantra::Client", $VERSION;
24} 26}
25 27
26use utf8; 28use utf8;
29use strict qw(vars subs);
27 30
31use Socket ();
28use AnyEvent (); 32use AnyEvent ();
33use AnyEvent::Util ();
29use Pod::POM (); 34use Pod::POM ();
30use File::Path (); 35use File::Path ();
31use Storable (); # finally 36use Storable (); # finally
32use Fcntl (); 37use Fcntl ();
33use JSON::XS qw(encode_json decode_json); 38use JSON::XS qw(encode_json decode_json);
39use Guard qw(guard);
34 40
35=item guard { BLOCK } 41# modules to support other DC::* packages
36 42use List::Util ();
37Returns an object that executes the given block as soon as it is destroyed. 43use IO::AIO ();
38 44use Coro::AIO ();
39=cut 45use AnyEvent::AIO ();
40
41sub guard(&) {
42 bless \(my $cb = $_[0]), "DC::Guard"
43}
44
45sub DC::Guard::DESTROY {
46 ${$_[0]}->()
47}
48 46
49=item shorten $string[, $maxlength] 47=item shorten $string[, $maxlength]
50 48
51=cut 49=cut
52 50
… …
64 s/</&lt;/g; 62 s/</&lt;/g;
65 63
66 $_ 64 $_
67} 65}
68 66
69sub socketpipe() {
70 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
71 or die "cannot establish bidirectional pipe: $!\n";
72
73 ($fh1, $fh2)
74}
75
76sub background(&;&) { 67sub background(&;&) {
77 my ($bg, $cb) = @_; 68 my ($bg, $cb) = @_;
78 69
79 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: $!";
80 72
81 my $pid = fork; 73 my $pid = fork;
82 74
83 if (defined $pid && !$pid) { 75 if (defined $pid && !$pid) {
84 local $SIG{__DIE__}; 76 local $SIG{__DIE__};
… …
140 print $msg, "\n"; 132 print $msg, "\n";
141} 133}
142 134
143package DC; 135package DC;
144 136
137our $RC_THEME;
138our %THEME;
139our @RC_PATH;
140our $RC_BASE;
141
142for (grep !ref, @INC) {
143 $RC_BASE = "$_/Deliantra/Client/private/resources";
144 last if -d $RC_BASE;
145}
146
145sub find_rcfile($) { 147sub find_rcfile($) {
146 my $path; 148 my $path;
147 149
148 for (grep !ref, @INC) { 150 for (@RC_PATH, "") {
149 $path = "$_/Deliantra/Client/private/resources/$_[0]"; 151 $path = "$RC_BASE/$_/$_[0]";
150 return $path if -r $path; 152 return $path if -e $path;
151 } 153 }
152 154
153 die "FATAL: can't find required file $_[0]\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 }
154} 188}
155 189
156sub read_cfg { 190sub read_cfg {
157 my ($file) = @_; 191 my ($file) = @_;
158 192
193 $::CFG = (load_json $file) || (load_json "$file.bak");
194}
195
196sub write_cfg {
197 my $file = "$Deliantra::VARDIR/client.cf";
198
199 $::CFG->{VERSION} = $::VERSION;
200 $::CFG->{layout} = DC::UI::get_layout ();
201
159 open my $fh, $file 202 open my $fh, ">:utf8", "$file~"
160 or return; 203 or return;
204 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
205 close $fh;
161 206
162 local $/; 207 rename $file, "$file.bak";
163 my $CFG = <$fh>; 208 rename "$file~", $file;
164
165 $::CFG = decode_json $CFG;
166}
167
168sub write_cfg {
169 my ($file) = @_;
170
171 $::CFG->{VERSION} = $::VERSION;
172
173 open my $fh, ">:utf8", $file
174 or return;
175 print $fh encode_json $::CFG;
176} 209}
177 210
178sub http_proxy { 211sub http_proxy {
179 my @proxy = win32_proxy_info; 212 my @proxy = win32_proxy_info;
180 213
… …
223 $nb = (! ! $nb) + 0; 256 $nb = (! ! $nb) + 0;
224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 257 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225 } else { 258 } else {
226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 259 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227 } 260 }
228
229} 261}
230 262
231package DC::Layout; 263package DC::Layout;
232 264
233$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub { 265$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {

Diff Legend

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