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.189 by root, Tue Sep 2 16:50:06 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 = ("theme-plain", ".");
151our $RC_BASE;
152
153for (grep !ref, @INC) {
154 $RC_BASE = "$_/Deliantra/Client/private/resources";
155 last if -d $RC_BASE;
156}
148 157
149sub find_rcfile($) { 158sub find_rcfile($) {
150 my $path; 159 my $path;
151 160
152 for (grep !ref, @INC) { 161 for (@RC_THEME) {
153 $path = "$_/CFPlus/resources/$_[0]"; 162 $path = "$RC_BASE/$_/$_[0]";
154 return $path if -r $path; 163 return $path if -r $path;
155 } 164 }
156 165
157 die "FATAL: can't find required file $_[0]\n"; 166 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
158} 167}
159 168
160sub read_cfg { 169sub read_cfg {
161 my ($file) = @_; 170 my ($file) = @_;
162 171
164 or return; 173 or return;
165 174
166 local $/; 175 local $/;
167 my $CFG = <$fh>; 176 my $CFG = <$fh>;
168 177
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; 178 $::CFG = decode_json $CFG;
175 } else {
176 $::CFG = eval $CFG; ## todo comaptibility cruft
177 }
178} 179}
179 180
180sub write_cfg { 181sub write_cfg {
181 my ($file) = @_; 182 my $file = "$Deliantra::VARDIR/client.cf";
182 183
183 $::CFG->{VERSION} = $::VERSION; 184 $::CFG->{VERSION} = $::VERSION;
184 185
185 open my $fh, ">:utf8", $file 186 open my $fh, ">:utf8", $file
186 or return; 187 or return;
187 print $fh to_json $::CFG; 188 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
188} 189}
189 190
190sub http_proxy { 191sub http_proxy {
191 my @proxy = win32_proxy_info; 192 my @proxy = win32_proxy_info;
192 193
207} 208}
208 209
209sub lwp_useragent { 210sub lwp_useragent {
210 require LWP::UserAgent; 211 require LWP::UserAgent;
211 212
212 CFPlus::set_proxy; 213 DC::set_proxy;
213 214
214 my $ua = LWP::UserAgent->new ( 215 my $ua = LWP::UserAgent->new (
215 agent => "cfplus $VERSION", 216 agent => "deliantra $VERSION",
216 keep_alive => 1, 217 keep_alive => 1,
217 env_proxy => 1, 218 env_proxy => 1,
218 timeout => 30, 219 timeout => 30,
219 ); 220 );
220} 221}
226 and die $res->status_line; 227 and die $res->status_line;
227 228
228 $res 229 $res
229} 230}
230 231
232sub fh_nonblocking($$) {
233 my ($fh, $nb) = @_;
234
235 if ($^O eq "MSWin32") {
236 $nb = (! ! $nb) + 0;
237 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
238 } else {
239 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
240 }
241}
242
231package CFPlus::Layout; 243package DC::Layout;
232 244
245$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
246 glyph_cache_restore;
247};
248
233$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 249$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
234 reset_glyph_cache; 250 glyph_cache_backup;
235}; 251};
236 252
2371; 2531;
238 254
239=back 255=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines