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.166 by root, Wed Dec 26 18:20:45 2007 UTC vs.
Revision 1.189 by root, Tue Sep 2 16:50:06 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.9961'; 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
… …
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 = ("theme-plain", ".");
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 for (@RC_THEME) {
149 $path = "$_/CFPlus/resources/$_[0]"; 162 $path = "$RC_BASE/$_/$_[0]";
150 return $path if -r $path; 163 return $path if -r $path;
151 } 164 }
152 165
153 die "FATAL: can't find required file $_[0]\n"; 166 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
154} 167}
155 168
156sub read_cfg { 169sub read_cfg {
157 my ($file) = @_; 170 my ($file) = @_;
158 171
… …
164 177
165 $::CFG = decode_json $CFG; 178 $::CFG = decode_json $CFG;
166} 179}
167 180
168sub write_cfg { 181sub write_cfg {
169 my ($file) = @_; 182 my $file = "$Deliantra::VARDIR/client.cf";
170 183
171 $::CFG->{VERSION} = $::VERSION; 184 $::CFG->{VERSION} = $::VERSION;
172 185
173 open my $fh, ">:utf8", $file 186 open my $fh, ">:utf8", $file
174 or return; 187 or return;
175 print $fh encode_json $::CFG; 188 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
176} 189}
177 190
178sub http_proxy { 191sub http_proxy {
179 my @proxy = win32_proxy_info; 192 my @proxy = win32_proxy_info;
180 193
… …
195} 208}
196 209
197sub lwp_useragent { 210sub lwp_useragent {
198 require LWP::UserAgent; 211 require LWP::UserAgent;
199 212
200 CFPlus::set_proxy; 213 DC::set_proxy;
201 214
202 my $ua = LWP::UserAgent->new ( 215 my $ua = LWP::UserAgent->new (
203 agent => "cfplus $VERSION", 216 agent => "deliantra $VERSION",
204 keep_alive => 1, 217 keep_alive => 1,
205 env_proxy => 1, 218 env_proxy => 1,
206 timeout => 30, 219 timeout => 30,
207 ); 220 );
208} 221}
… …
223 $nb = (! ! $nb) + 0; 236 $nb = (! ! $nb) + 0;
224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 237 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225 } else { 238 } else {
226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 239 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227 } 240 }
228
229} 241}
230 242
231package CFPlus::Layout; 243package DC::Layout;
232 244
233$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Layout"} = sub { 245$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
234 glyph_cache_restore; 246 glyph_cache_restore;
235}; 247};
236 248
237$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 249$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
238 glyph_cache_backup; 250 glyph_cache_backup;
239}; 251};
240 252
2411; 2531;
242 254

Diff Legend

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