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.154 by root, Sun Oct 14 20:08:38 2007 UTC vs.
Revision 1.191 by root, Wed Sep 3 06:07:39 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.993'; 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 $THEME;
152our @RC_PATH;
153our $RC_BASE;
154
155for (grep !ref, @INC) {
156 $RC_BASE = "$_/Deliantra/Client/private/resources";
157 last if -d $RC_BASE;
158}
144 159
145sub find_rcfile($) { 160sub find_rcfile($) {
146 my $path; 161 my $path;
147 162
148 for (grep !ref, @INC) { 163 for (@RC_PATH, "") {
149 $path = "$_/CFPlus/resources/$_[0]"; 164 $path = "$RC_BASE/$_/$_[0]";
150 return $path if -r $path; 165 return $path if -r $path;
151 } 166 }
152 167
153 die "FATAL: can't find required file $_[0]\n"; 168 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
169}
170
171sub set_theme($) {
172 return if $RC_THEME eq $_[0];
173 $RC_THEME = $_[0];
174
175 @RC_PATH = "theme-$RC_THEME";
176
177 {
178 open my $fh, "<:raw", find_rcfile "theme.json"
179 or die "cannot open theme description file";
180
181 local $/;
182 $THEME = JSON::XS->new->utf8->relaxed->decode (<$fh>);
183 }
184
185 @RC_PATH = @{ $THEME->{path} } if $THEME->{path};
154} 186}
155 187
156sub read_cfg { 188sub read_cfg {
157 my ($file) = @_; 189 my ($file) = @_;
158 190
… …
160 or return; 192 or return;
161 193
162 local $/; 194 local $/;
163 my $CFG = <$fh>; 195 my $CFG = <$fh>;
164 196
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; 197 $::CFG = decode_json $CFG;
171 } else {
172 $::CFG = eval $CFG; ## todo comaptibility cruft
173 }
174} 198}
175 199
176sub write_cfg { 200sub write_cfg {
177 my ($file) = @_; 201 my $file = "$Deliantra::VARDIR/client.cf";
178 202
179 $::CFG->{VERSION} = $::VERSION; 203 $::CFG->{VERSION} = $::VERSION;
180 204
181 open my $fh, ">:utf8", $file 205 open my $fh, ">:utf8", $file
182 or return; 206 or return;
183 print $fh to_json $::CFG; 207 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
184} 208}
185 209
186sub http_proxy { 210sub http_proxy {
187 my @proxy = win32_proxy_info; 211 my @proxy = win32_proxy_info;
188 212
… …
203} 227}
204 228
205sub lwp_useragent { 229sub lwp_useragent {
206 require LWP::UserAgent; 230 require LWP::UserAgent;
207 231
208 CFPlus::set_proxy; 232 DC::set_proxy;
209 233
210 my $ua = LWP::UserAgent->new ( 234 my $ua = LWP::UserAgent->new (
211 agent => "cfplus $VERSION", 235 agent => "deliantra $VERSION",
212 keep_alive => 1, 236 keep_alive => 1,
213 env_proxy => 1, 237 env_proxy => 1,
214 timeout => 30, 238 timeout => 30,
215 ); 239 );
216} 240}
… …
231 $nb = (! ! $nb) + 0; 255 $nb = (! ! $nb) + 0;
232 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 256 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
233 } else { 257 } else {
234 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 258 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
235 } 259 }
236
237} 260}
238 261
239package CFPlus::Layout; 262package DC::Layout;
240 263
264$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
265 glyph_cache_restore;
266};
267
241$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 268$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
242 reset_glyph_cache; 269 glyph_cache_backup;
243}; 270};
244 271
2451; 2721;
246 273
247=back 274=back

Diff Legend

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