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

Diff Legend

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