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.167 by root, Wed Dec 26 19:11:09 2007 UTC vs.
Revision 1.183 by root, Mon Jul 7 08:02:17 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 CFPlus; 15package DC;
16 16
17use Carp (); 17use Carp ();
18 18
19BEGIN { 19BEGIN {
20 $VERSION = '0.9962'; 20 $VERSION = '0.9973';
21 21
22 use XSLoader; 22 use XSLoader;
23 XSLoader::load "CFPlus", $VERSION; 23 XSLoader::load "Deliantra::Client", $VERSION;
24} 24}
25 25
26use utf8; 26use utf8;
27 27
28use AnyEvent (); 28use AnyEvent ();
37Returns an object that executes the given block as soon as it is destroyed. 37Returns an object that executes the given block as soon as it is destroyed.
38 38
39=cut 39=cut
40 40
41sub guard(&) { 41sub guard(&) {
42 bless \(my $cb = $_[0]), "CFPlus::Guard" 42 bless \(my $cb = $_[0]), "DC::Guard"
43} 43}
44 44
45sub CFPlus::Guard::DESTROY { 45sub DC::Guard::DESTROY {
46 ${$_[0]}->() 46 ${$_[0]}->()
47} 47}
48 48
49=item shorten $string[, $maxlength] 49=item shorten $string[, $maxlength]
50 50
74} 74}
75 75
76sub background(&;&) { 76sub background(&;&) {
77 my ($bg, $cb) = @_; 77 my ($bg, $cb) = @_;
78 78
79 my ($fh_r, $fh_w) = CFPlus::socketpipe; 79 my ($fh_r, $fh_w) = DC::socketpipe;
80 80
81 my $pid = fork; 81 my $pid = fork;
82 82
83 if (defined $pid && !$pid) { 83 if (defined $pid && !$pid) {
84 local $SIG{__DIE__}; 84 local $SIG{__DIE__};
94 94
95 if ($@) { 95 if ($@) {
96 my $msg = $@; 96 my $msg = $@;
97 $msg =~ s/\n+/\n/; 97 $msg =~ s/\n+/\n/;
98 warn "FATAL: $msg"; 98 warn "FATAL: $msg";
99 CFPlus::_exit 1; 99 DC::_exit 1;
100 } 100 }
101 101
102 # win32 is fucked up, of course. exit will clean stuff up, 102 # win32 is fucked up, of course. exit will clean stuff up,
103 # which destroys our database etc. _exit will exit ALL 103 # which destroys our database etc. _exit will exit ALL
104 # forked processes, because of the dreaded fork emulation. 104 # forked processes, because of the dreaded fork emulation.
105 CFPlus::_exit 0; 105 DC::_exit 0;
106 } 106 }
107 107
108 close $fh_w; 108 close $fh_w;
109 109
110 my $buffer; 110 my $buffer;
122 utf8::decode $line; 122 utf8::decode $line;
123 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 123 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
124 $cb->(JSON::XS->new->allow_nonref->decode ($1)); 124 $cb->(JSON::XS->new->allow_nonref->decode ($1));
125 } else { 125 } else {
126 ::message ({ 126 ::message ({
127 markup => "background($pid): " . CFPlus::asxml $line, 127 markup => "background($pid): " . DC::asxml $line,
128 }); 128 });
129 } 129 }
130 } 130 }
131 }); 131 });
132} 132}
138 $msg =~ s/\n//g; 138 $msg =~ s/\n//g;
139 utf8::encode $msg; 139 utf8::encode $msg;
140 print $msg, "\n"; 140 print $msg, "\n";
141} 141}
142 142
143package CFPlus; 143package DC;
144 144
145sub find_rcfile($) { 145sub find_rcfile($) {
146 my $path; 146 my $path;
147 147
148 for (grep !ref, @INC) { 148 for (grep !ref, @INC) {
149 $path = "$_/CFPlus/resources/$_[0]"; 149 $path = "$_/Deliantra/Client/private/resources/$_[0]";
150 return $path if -r $path; 150 return $path if -r $path;
151 } 151 }
152 152
153 die "FATAL: can't find required file $_[0]\n"; 153 die "FATAL: can't find required file $_[0]\n";
154} 154}
164 164
165 $::CFG = decode_json $CFG; 165 $::CFG = decode_json $CFG;
166} 166}
167 167
168sub write_cfg { 168sub write_cfg {
169 my ($file) = @_; 169 my $file = "$Deliantra::VARDIR/client.cf";
170 170
171 $::CFG->{VERSION} = $::VERSION; 171 $::CFG->{VERSION} = $::VERSION;
172 172
173 open my $fh, ">:utf8", $file 173 open my $fh, ">:utf8", $file
174 or return; 174 or return;
175 print $fh encode_json $::CFG; 175 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
176} 176}
177 177
178sub http_proxy { 178sub http_proxy {
179 my @proxy = win32_proxy_info; 179 my @proxy = win32_proxy_info;
180 180
195} 195}
196 196
197sub lwp_useragent { 197sub lwp_useragent {
198 require LWP::UserAgent; 198 require LWP::UserAgent;
199 199
200 CFPlus::set_proxy; 200 DC::set_proxy;
201 201
202 my $ua = LWP::UserAgent->new ( 202 my $ua = LWP::UserAgent->new (
203 agent => "cfplus $VERSION", 203 agent => "deliantra $VERSION",
204 keep_alive => 1, 204 keep_alive => 1,
205 env_proxy => 1, 205 env_proxy => 1,
206 timeout => 30, 206 timeout => 30,
207 ); 207 );
208} 208}
223 $nb = (! ! $nb) + 0; 223 $nb = (! ! $nb) + 0;
224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225 } else { 225 } else {
226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227 } 227 }
228
229} 228}
230 229
231package CFPlus::Layout; 230package DC::Layout;
232 231
233$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Layout"} = sub { 232$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
234 glyph_cache_restore; 233 glyph_cache_restore;
235}; 234};
236 235
237$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 236$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
238 glyph_cache_backup; 237 glyph_cache_backup;
239}; 238};
240 239
2411; 2401;
242 241

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines