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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines