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.140 by root, Fri Apr 6 07:45:33 2007 UTC vs.
Revision 1.192 by root, Wed Sep 3 10:36:25 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFPlus - undocumented utility garbage for our crossfire client 3DC - undocumented utility garbage for our deliantra client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFPlus; 7 use DC;
8 8
9=head1 DESCRIPTION 9=head1 DESCRIPTION
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
15package CFPlus; 17package DC;
16 18
17use Carp (); 19use Carp ();
18 20
21our $VERSION;
22
19BEGIN { 23BEGIN {
20 $VERSION = '0.97'; 24 $VERSION = '0.9975';
21 25
22 use XSLoader; 26 use XSLoader;
23 XSLoader::load "CFPlus", $VERSION; 27 XSLoader::load "Deliantra::Client", $VERSION;
24} 28}
25 29
26use utf8; 30use utf8;
31use strict qw(vars subs);
27 32
28use AnyEvent (); 33use AnyEvent ();
29use Pod::POM (); 34use Pod::POM ();
30use File::Path (); 35use File::Path ();
31use Storable (); # finally 36use Storable (); # finally
32 37use Fcntl ();
33BEGIN { 38use JSON::XS qw(encode_json decode_json);
34 use Crossfire::Protocol::Base ();
35 *to_json = \&Crossfire::Protocol::Base::to_json;
36 *from_json = \&Crossfire::Protocol::Base::from_json;
37}
38 39
39=item guard { BLOCK } 40=item guard { BLOCK }
40 41
41Returns an object that executes the given block as soon as it is destroyed. 42Returns an object that executes the given block as soon as it is destroyed.
42 43
43=cut 44=cut
44 45
45sub guard(&) { 46sub guard(&) {
46 bless \(my $cb = $_[0]), "CFPlus::Guard" 47 bless \(my $cb = $_[0]), "DC::Guard"
47} 48}
48 49
49sub CFPlus::Guard::DESTROY { 50sub DC::Guard::DESTROY {
50 ${$_[0]}->() 51 ${$_[0]}->()
51} 52}
52 53
53=item shorten $string[, $maxlength] 54=item shorten $string[, $maxlength]
54 55
78} 79}
79 80
80sub background(&;&) { 81sub background(&;&) {
81 my ($bg, $cb) = @_; 82 my ($bg, $cb) = @_;
82 83
83 my ($fh_r, $fh_w) = CFPlus::socketpipe; 84 my ($fh_r, $fh_w) = DC::socketpipe;
84 85
85 my $pid = fork; 86 my $pid = fork;
86 87
87 if (defined $pid && !$pid) { 88 if (defined $pid && !$pid) {
88 local $SIG{__DIE__}; 89 local $SIG{__DIE__};
98 99
99 if ($@) { 100 if ($@) {
100 my $msg = $@; 101 my $msg = $@;
101 $msg =~ s/\n+/\n/; 102 $msg =~ s/\n+/\n/;
102 warn "FATAL: $msg"; 103 warn "FATAL: $msg";
103 CFPlus::_exit 1; 104 DC::_exit 1;
104 } 105 }
105 106
106 # win32 is fucked up, of course. exit will clean stuff up, 107 # win32 is fucked up, of course. exit will clean stuff up,
107 # which destroys our database etc. _exit will exit ALL 108 # which destroys our database etc. _exit will exit ALL
108 # forked processes, because of the dreaded fork emulation. 109 # forked processes, because of the dreaded fork emulation.
109 CFPlus::_exit 0; 110 DC::_exit 0;
110 } 111 }
111 112
112 close $fh_w; 113 close $fh_w;
113 114
114 my $buffer; 115 my $buffer;
126 utf8::decode $line; 127 utf8::decode $line;
127 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 128 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
128 $cb->(JSON::XS->new->allow_nonref->decode ($1)); 129 $cb->(JSON::XS->new->allow_nonref->decode ($1));
129 } else { 130 } else {
130 ::message ({ 131 ::message ({
131 markup => "background($pid): " . CFPlus::asxml $line, 132 markup => "background($pid): " . DC::asxml $line,
132 }); 133 });
133 } 134 }
134 } 135 }
135 }); 136 });
136} 137}
142 $msg =~ s/\n//g; 143 $msg =~ s/\n//g;
143 utf8::encode $msg; 144 utf8::encode $msg;
144 print $msg, "\n"; 145 print $msg, "\n";
145} 146}
146 147
147package CFPlus; 148package DC;
149
150our $RC_THEME;
151our %THEME;
152our @RC_PATH;
153our $RC_BASE;
154
155for (grep !ref, @INC) {
156 $RC_BASE = "$_/Deliantra/Client/private/resources";
157 last if -d $RC_BASE;
158}
148 159
149sub find_rcfile($) { 160sub find_rcfile($) {
150 my $path; 161 my $path;
151 162
152 for (grep !ref, @INC) { 163 for (@RC_PATH, "") {
153 $path = "$_/CFPlus/resources/$_[0]"; 164 $path = "$RC_BASE/$_/$_[0]";
154 return $path if -r $path; 165 return $path if -r $path;
155 } 166 }
156 167
157 die "FATAL: can't find required file $_[0]\n"; 168 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
169}
170
171sub load_json($) {
172 my ($file) = @_;
173
174 open my $fh, $file
175 or return;
176
177 local $/;
178 JSON::XS->new->utf8->relaxed->decode (<$fh>)
179}
180
181sub set_theme($) {
182 return if $RC_THEME eq $_[0];
183 $RC_THEME = $_[0];
184
185 # kind of hacky, find the main theme file, then load all theme files and merge them
186
187 %THEME = ();
188 @RC_PATH = "theme-$RC_THEME";
189
190 my $theme = load_json find_rcfile "theme.json"
191 or die "FATAL: theme resource file not found";
192
193 @RC_PATH = @{ $theme->{path} } if $theme->{path};
194
195 for (@RC_PATH, "") {
196 my $theme = load_json "$RC_BASE/$_/theme.json"
197 or next;
198
199 %THEME = ( %$theme, %THEME );
200 }
158} 201}
159 202
160sub read_cfg { 203sub read_cfg {
161 my ($file) = @_; 204 my ($file) = @_;
162 205
163 open my $fh, $file 206 $::CFG = load_json $file;
164 or return;
165
166 local $/;
167 my $CFG = <$fh>;
168
169 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
170 require YAML;
171 utf8::decode $CFG;
172 $::CFG = YAML::Load ($CFG);
173 } elsif ($CFG =~ /^\{/) {
174 $::CFG = from_json $CFG;
175 } else {
176 $::CFG = eval $CFG; ## todo comaptibility cruft
177 }
178} 207}
179 208
180sub write_cfg { 209sub write_cfg {
181 my ($file) = @_; 210 my $file = "$Deliantra::VARDIR/client.cf";
182 211
183 $::CFG->{VERSION} = $::VERSION; 212 $::CFG->{VERSION} = $::VERSION;
184 213
185 open my $fh, ">:utf8", $file 214 open my $fh, ">:utf8", $file
186 or return; 215 or return;
187 print $fh to_json $::CFG; 216 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
188} 217}
189 218
190sub http_proxy { 219sub http_proxy {
191 my @proxy = win32_proxy_info; 220 my @proxy = win32_proxy_info;
192 221
207} 236}
208 237
209sub lwp_useragent { 238sub lwp_useragent {
210 require LWP::UserAgent; 239 require LWP::UserAgent;
211 240
212 CFPlus::set_proxy; 241 DC::set_proxy;
213 242
214 my $ua = LWP::UserAgent->new ( 243 my $ua = LWP::UserAgent->new (
215 agent => "cfplus $VERSION", 244 agent => "deliantra $VERSION",
216 keep_alive => 1, 245 keep_alive => 1,
217 env_proxy => 1, 246 env_proxy => 1,
218 timeout => 30, 247 timeout => 30,
219 ); 248 );
220} 249}
226 and die $res->status_line; 255 and die $res->status_line;
227 256
228 $res 257 $res
229} 258}
230 259
260sub fh_nonblocking($$) {
261 my ($fh, $nb) = @_;
262
263 if ($^O eq "MSWin32") {
264 $nb = (! ! $nb) + 0;
265 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
266 } else {
267 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
268 }
269}
270
231package CFPlus::Layout; 271package DC::Layout;
232 272
273$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
274 glyph_cache_restore;
275};
276
233$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 277$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
234 reset_glyph_cache; 278 glyph_cache_backup;
235}; 279};
236 280
2371; 2811;
238 282
239=back 283=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines