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.171 by root, Thu Jan 10 21:53:33 2008 UTC vs.
Revision 1.210 by root, Fri Jan 15 15:19:47 2010 UTC

14 14
15package DC; 15package DC;
16 16
17use Carp (); 17use Carp ();
18 18
19our $VERSION;
20
19BEGIN { 21BEGIN {
20 $VERSION = '0.9963'; 22 $VERSION = '2.10';
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);
34 39use Guard qw(guard);
35=item guard { BLOCK }
36
37Returns an object that executes the given block as soon as it is destroyed.
38
39=cut
40
41sub guard(&) {
42 bless \(my $cb = $_[0]), "DC::Guard"
43}
44
45sub DC::Guard::DESTROY {
46 ${$_[0]}->()
47}
48 40
49=item shorten $string[, $maxlength] 41=item shorten $string[, $maxlength]
50 42
51=cut 43=cut
52 44
64 s/</&lt;/g; 56 s/</&lt;/g;
65 57
66 $_ 58 $_
67} 59}
68 60
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(&;&) { 61sub background(&;&) {
77 my ($bg, $cb) = @_; 62 my ($bg, $cb) = @_;
78 63
79 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: $!";
80 66
81 my $pid = fork; 67 my $pid = fork;
82 68
83 if (defined $pid && !$pid) { 69 if (defined $pid && !$pid) {
84 local $SIG{__DIE__}; 70 local $SIG{__DIE__};
140 print $msg, "\n"; 126 print $msg, "\n";
141} 127}
142 128
143package DC; 129package DC;
144 130
131our $RC_THEME;
132our %THEME;
133our @RC_PATH;
134our $RC_BASE;
135
136for (grep !ref, @INC) {
137 $RC_BASE = "$_/Deliantra/Client/private/resources";
138 last if -d $RC_BASE;
139}
140
145sub find_rcfile($) { 141sub find_rcfile($) {
146 my $path; 142 my $path;
147 143
148 for (grep !ref, @INC) { 144 for (@RC_PATH, "") {
149 $path = "$_/Deliantra/Client/private/resources/$_[0]"; 145 $path = "$RC_BASE/$_/$_[0]";
150 return $path if -r $path; 146 return $path if -e $path;
151 } 147 }
152 148
153 die "FATAL: can't find required file $_[0]\n"; 149 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
150}
151
152sub load_json($) {
153 my ($file) = @_;
154
155 open my $fh, $file
156 or return;
157
158 local $/;
159 eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) }
160}
161
162sub set_theme($) {
163 return if $RC_THEME eq $_[0];
164 $RC_THEME = $_[0];
165
166 # kind of hacky, find the main theme file, then load all theme files and merge them
167
168 %THEME = ();
169 @RC_PATH = "theme-$RC_THEME";
170
171 my $theme = load_json find_rcfile "theme.json"
172 or die "FATAL: theme resource file not found";
173
174 @RC_PATH = @{ $theme->{path} } if $theme->{path};
175
176 for (@RC_PATH, "") {
177 my $theme = load_json "$RC_BASE/$_/theme.json"
178 or next;
179
180 %THEME = ( %$theme, %THEME );
181 }
154} 182}
155 183
156sub read_cfg { 184sub read_cfg {
157 my ($file) = @_; 185 my ($file) = @_;
158 186
187 $::CFG = (load_json $file) || (load_json "$file.bak");
188}
189
190sub write_cfg {
191 my $file = "$Deliantra::VARDIR/client.cf";
192
193 $::CFG->{VERSION} = $::VERSION;
194 $::CFG->{layout} = DC::UI::get_layout ();
195
159 open my $fh, $file 196 open my $fh, ">:utf8", "$file~"
160 or return; 197 or return;
198 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
199 close $fh;
161 200
162 local $/; 201 rename $file, "$file.bak";
163 my $CFG = <$fh>; 202 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} 203}
177 204
178sub http_proxy { 205sub http_proxy {
179 my @proxy = win32_proxy_info; 206 my @proxy = win32_proxy_info;
180 207
223 $nb = (! ! $nb) + 0; 250 $nb = (! ! $nb) + 0;
224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 251 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225 } else { 252 } else {
226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 253 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227 } 254 }
228
229} 255}
230 256
231package DC::Layout; 257package DC::Layout;
232 258
233$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub { 259$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines