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.164 by root, Tue Dec 25 18:58:32 2007 UTC vs.
Revision 1.169 by root, Wed Dec 26 21:03:21 2007 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.9960'; 20 $VERSION = '0.9962';
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}
… …
160 or return; 160 or return;
161 161
162 local $/; 162 local $/;
163 my $CFG = <$fh>; 163 my $CFG = <$fh>;
164 164
165 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
166 require YAML;
167 utf8::decode $CFG;
168 $::CFG = YAML::Load ($CFG);
169 } elsif ($CFG =~ /^\{/) {
170 $::CFG = decode_json $CFG; 165 $::CFG = decode_json $CFG;
171 } else {
172 $::CFG = eval $CFG; ## todo comaptibility cruft
173 }
174} 166}
175 167
176sub write_cfg { 168sub write_cfg {
177 my ($file) = @_; 169 my ($file) = @_;
178 170
… …
203} 195}
204 196
205sub lwp_useragent { 197sub lwp_useragent {
206 require LWP::UserAgent; 198 require LWP::UserAgent;
207 199
208 CFPlus::set_proxy; 200 DC::set_proxy;
209 201
210 my $ua = LWP::UserAgent->new ( 202 my $ua = LWP::UserAgent->new (
211 agent => "cfplus $VERSION", 203 agent => "cfplus $VERSION",
212 keep_alive => 1, 204 keep_alive => 1,
213 env_proxy => 1, 205 env_proxy => 1,
… …
234 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
235 } 227 }
236 228
237} 229}
238 230
239package CFPlus::Layout; 231package DC::Layout;
240 232
241$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Layout"} = sub { 233$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
242 glyph_cache_restore; 234 glyph_cache_restore;
243}; 235};
244 236
245$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 237$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
246 glyph_cache_backup; 238 glyph_cache_backup;
247}; 239};
248 240
2491; 2411;
250 242

Diff Legend

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