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.142 by root, Fri Apr 6 23:25:07 2007 UTC vs.
Revision 1.168 by root, Wed Dec 26 20:46:39 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.97'; 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 ();
29use Pod::POM (); 29use Pod::POM ();
30use File::Path (); 30use File::Path ();
31use Storable (); # finally 31use Storable (); # finally
32use Fcntl (); 32use Fcntl ();
33 33use JSON::XS qw(encode_json decode_json);
34BEGIN {
35 use Crossfire::Protocol::Base ();
36 *to_json = \&Crossfire::Protocol::Base::to_json;
37 *from_json = \&Crossfire::Protocol::Base::from_json;
38}
39 34
40=item guard { BLOCK } 35=item guard { BLOCK }
41 36
42Returns 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.
43 38
44=cut 39=cut
45 40
46sub guard(&) { 41sub guard(&) {
47 bless \(my $cb = $_[0]), "CFPlus::Guard" 42 bless \(my $cb = $_[0]), "dc::Guard"
48} 43}
49 44
50sub CFPlus::Guard::DESTROY { 45sub dc::Guard::DESTROY {
51 ${$_[0]}->() 46 ${$_[0]}->()
52} 47}
53 48
54=item shorten $string[, $maxlength] 49=item shorten $string[, $maxlength]
55 50
79} 74}
80 75
81sub background(&;&) { 76sub background(&;&) {
82 my ($bg, $cb) = @_; 77 my ($bg, $cb) = @_;
83 78
84 my ($fh_r, $fh_w) = CFPlus::socketpipe; 79 my ($fh_r, $fh_w) = dc::socketpipe;
85 80
86 my $pid = fork; 81 my $pid = fork;
87 82
88 if (defined $pid && !$pid) { 83 if (defined $pid && !$pid) {
89 local $SIG{__DIE__}; 84 local $SIG{__DIE__};
99 94
100 if ($@) { 95 if ($@) {
101 my $msg = $@; 96 my $msg = $@;
102 $msg =~ s/\n+/\n/; 97 $msg =~ s/\n+/\n/;
103 warn "FATAL: $msg"; 98 warn "FATAL: $msg";
104 CFPlus::_exit 1; 99 dc::_exit 1;
105 } 100 }
106 101
107 # win32 is fucked up, of course. exit will clean stuff up, 102 # win32 is fucked up, of course. exit will clean stuff up,
108 # which destroys our database etc. _exit will exit ALL 103 # which destroys our database etc. _exit will exit ALL
109 # forked processes, because of the dreaded fork emulation. 104 # forked processes, because of the dreaded fork emulation.
110 CFPlus::_exit 0; 105 dc::_exit 0;
111 } 106 }
112 107
113 close $fh_w; 108 close $fh_w;
114 109
115 my $buffer; 110 my $buffer;
127 utf8::decode $line; 122 utf8::decode $line;
128 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 123 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
129 $cb->(JSON::XS->new->allow_nonref->decode ($1)); 124 $cb->(JSON::XS->new->allow_nonref->decode ($1));
130 } else { 125 } else {
131 ::message ({ 126 ::message ({
132 markup => "background($pid): " . CFPlus::asxml $line, 127 markup => "background($pid): " . dc::asxml $line,
133 }); 128 });
134 } 129 }
135 } 130 }
136 }); 131 });
137} 132}
143 $msg =~ s/\n//g; 138 $msg =~ s/\n//g;
144 utf8::encode $msg; 139 utf8::encode $msg;
145 print $msg, "\n"; 140 print $msg, "\n";
146} 141}
147 142
148package CFPlus; 143package dc;
149 144
150sub find_rcfile($) { 145sub find_rcfile($) {
151 my $path; 146 my $path;
152 147
153 for (grep !ref, @INC) { 148 for (grep !ref, @INC) {
154 $path = "$_/CFPlus/resources/$_[0]"; 149 $path = "$_/Deliantra/Client/private/resources/$_[0]";
155 return $path if -r $path; 150 return $path if -r $path;
156 } 151 }
157 152
158 die "FATAL: can't find required file $_[0]\n"; 153 die "FATAL: can't find required file $_[0]\n";
159} 154}
165 or return; 160 or return;
166 161
167 local $/; 162 local $/;
168 my $CFG = <$fh>; 163 my $CFG = <$fh>;
169 164
170 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
171 require YAML;
172 utf8::decode $CFG;
173 $::CFG = YAML::Load ($CFG);
174 } elsif ($CFG =~ /^\{/) {
175 $::CFG = from_json $CFG; 165 $::CFG = decode_json $CFG;
176 } else {
177 $::CFG = eval $CFG; ## todo comaptibility cruft
178 }
179} 166}
180 167
181sub write_cfg { 168sub write_cfg {
182 my ($file) = @_; 169 my ($file) = @_;
183 170
184 $::CFG->{VERSION} = $::VERSION; 171 $::CFG->{VERSION} = $::VERSION;
185 172
186 open my $fh, ">:utf8", $file 173 open my $fh, ">:utf8", $file
187 or return; 174 or return;
188 print $fh to_json $::CFG; 175 print $fh encode_json $::CFG;
189} 176}
190 177
191sub http_proxy { 178sub http_proxy {
192 my @proxy = win32_proxy_info; 179 my @proxy = win32_proxy_info;
193 180
208} 195}
209 196
210sub lwp_useragent { 197sub lwp_useragent {
211 require LWP::UserAgent; 198 require LWP::UserAgent;
212 199
213 CFPlus::set_proxy; 200 dc::set_proxy;
214 201
215 my $ua = LWP::UserAgent->new ( 202 my $ua = LWP::UserAgent->new (
216 agent => "cfplus $VERSION", 203 agent => "cfplus $VERSION",
217 keep_alive => 1, 204 keep_alive => 1,
218 env_proxy => 1, 205 env_proxy => 1,
232sub fh_nonblocking($$) { 219sub fh_nonblocking($$) {
233 my ($fh, $nb) = @_; 220 my ($fh, $nb) = @_;
234 221
235 if ($^O eq "MSWin32") { 222 if ($^O eq "MSWin32") {
236 $nb = (! ! $nb) + 0; 223 $nb = (! ! $nb) + 0;
237 ioctl $fh, 0x8004667e, $nb; # FIONBIO 224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
238 } else { 225 } else {
239 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
240 } 227 }
241 228
242} 229}
243 230
244package CFPlus::Layout; 231package dc::Layout;
245 232
233$dc::OpenGL::INIT_HOOK{"dc::Layout"} = sub {
234 glyph_cache_restore;
235};
236
246$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 237$dc::OpenGL::SHUTDOWN_HOOK{"dc::Layout"} = sub {
247 reset_glyph_cache; 238 glyph_cache_backup;
248}; 239};
249 240
2501; 2411;
251 242
252=back 243=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines