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.140 by root, Fri Apr 6 07:45:33 2007 UTC vs.
Revision 1.198 by root, Fri Dec 12 15:06:00 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 CFPlus; 15package DC;
16 16
17use Carp (); 17use Carp ();
18 18
19our $VERSION;
20
19BEGIN { 21BEGIN {
20 $VERSION = '0.97'; 22 $VERSION = '2.01';
21 23
22 use XSLoader; 24 use XSLoader;
23 XSLoader::load "CFPlus", $VERSION; 25 XSLoader::load "Deliantra::Client", $VERSION;
24} 26}
25 27
26use utf8; 28use utf8;
29use strict qw(vars subs);
27 30
28use AnyEvent (); 31use AnyEvent ();
29use Pod::POM (); 32use Pod::POM ();
30use File::Path (); 33use File::Path ();
31use Storable (); # finally 34use Storable (); # finally
32 35use Fcntl ();
33BEGIN { 36use JSON::XS qw(encode_json decode_json);
34 use Crossfire::Protocol::Base ();
35 *to_json = \&Crossfire::Protocol::Base::to_json;
36 *from_json = \&Crossfire::Protocol::Base::from_json;
37}
38 37
39=item guard { BLOCK } 38=item guard { BLOCK }
40 39
41Returns an object that executes the given block as soon as it is destroyed. 40Returns an object that executes the given block as soon as it is destroyed.
42 41
43=cut 42=cut
44 43
45sub guard(&) { 44sub guard(&) {
46 bless \(my $cb = $_[0]), "CFPlus::Guard" 45 bless \(my $cb = $_[0]), "DC::Guard"
47} 46}
48 47
49sub CFPlus::Guard::DESTROY { 48sub DC::Guard::DESTROY {
50 ${$_[0]}->() 49 ${$_[0]}->()
51} 50}
52 51
53=item shorten $string[, $maxlength] 52=item shorten $string[, $maxlength]
54 53
69 68
70 $_ 69 $_
71} 70}
72 71
73sub socketpipe() { 72sub socketpipe() {
74 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC 73 socketpair my $fh1, my $fh2, &Socket::AF_UNIX, &Socket::SOCK_STREAM, &Socket::PF_UNSPEC
75 or die "cannot establish bidirectional pipe: $!\n"; 74 or die "cannot establish bidirectional pipe: $!\n";
76 75
77 ($fh1, $fh2) 76 ($fh1, $fh2)
78} 77}
79 78
80sub background(&;&) { 79sub background(&;&) {
81 my ($bg, $cb) = @_; 80 my ($bg, $cb) = @_;
82 81
83 my ($fh_r, $fh_w) = CFPlus::socketpipe; 82 my ($fh_r, $fh_w) = DC::socketpipe;
84 83
85 my $pid = fork; 84 my $pid = fork;
86 85
87 if (defined $pid && !$pid) { 86 if (defined $pid && !$pid) {
88 local $SIG{__DIE__}; 87 local $SIG{__DIE__};
98 97
99 if ($@) { 98 if ($@) {
100 my $msg = $@; 99 my $msg = $@;
101 $msg =~ s/\n+/\n/; 100 $msg =~ s/\n+/\n/;
102 warn "FATAL: $msg"; 101 warn "FATAL: $msg";
103 CFPlus::_exit 1; 102 DC::_exit 1;
104 } 103 }
105 104
106 # win32 is fucked up, of course. exit will clean stuff up, 105 # win32 is fucked up, of course. exit will clean stuff up,
107 # which destroys our database etc. _exit will exit ALL 106 # which destroys our database etc. _exit will exit ALL
108 # forked processes, because of the dreaded fork emulation. 107 # forked processes, because of the dreaded fork emulation.
109 CFPlus::_exit 0; 108 DC::_exit 0;
110 } 109 }
111 110
112 close $fh_w; 111 close $fh_w;
113 112
114 my $buffer; 113 my $buffer;
126 utf8::decode $line; 125 utf8::decode $line;
127 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 126 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
128 $cb->(JSON::XS->new->allow_nonref->decode ($1)); 127 $cb->(JSON::XS->new->allow_nonref->decode ($1));
129 } else { 128 } else {
130 ::message ({ 129 ::message ({
131 markup => "background($pid): " . CFPlus::asxml $line, 130 markup => "background($pid): " . DC::asxml $line,
132 }); 131 });
133 } 132 }
134 } 133 }
135 }); 134 });
136} 135}
142 $msg =~ s/\n//g; 141 $msg =~ s/\n//g;
143 utf8::encode $msg; 142 utf8::encode $msg;
144 print $msg, "\n"; 143 print $msg, "\n";
145} 144}
146 145
147package CFPlus; 146package DC;
147
148our $RC_THEME;
149our %THEME;
150our @RC_PATH;
151our $RC_BASE;
152
153for (grep !ref, @INC) {
154 $RC_BASE = "$_/Deliantra/Client/private/resources";
155 last if -d $RC_BASE;
156}
148 157
149sub find_rcfile($) { 158sub find_rcfile($) {
150 my $path; 159 my $path;
151 160
152 for (grep !ref, @INC) { 161 for (@RC_PATH, "") {
153 $path = "$_/CFPlus/resources/$_[0]"; 162 $path = "$RC_BASE/$_/$_[0]";
154 return $path if -r $path; 163 return $path if -r $path;
155 } 164 }
156 165
157 die "FATAL: can't find required file $_[0]\n"; 166 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
167}
168
169sub load_json($) {
170 my ($file) = @_;
171
172 open my $fh, $file
173 or return;
174
175 local $/;
176 JSON::XS->new->utf8->relaxed->decode (<$fh>)
177}
178
179sub set_theme($) {
180 return if $RC_THEME eq $_[0];
181 $RC_THEME = $_[0];
182
183 # kind of hacky, find the main theme file, then load all theme files and merge them
184
185 %THEME = ();
186 @RC_PATH = "theme-$RC_THEME";
187
188 my $theme = load_json find_rcfile "theme.json"
189 or die "FATAL: theme resource file not found";
190
191 @RC_PATH = @{ $theme->{path} } if $theme->{path};
192
193 for (@RC_PATH, "") {
194 my $theme = load_json "$RC_BASE/$_/theme.json"
195 or next;
196
197 %THEME = ( %$theme, %THEME );
198 }
158} 199}
159 200
160sub read_cfg { 201sub read_cfg {
161 my ($file) = @_; 202 my ($file) = @_;
162 203
163 open my $fh, $file 204 $::CFG = load_json $file;
164 or return;
165
166 local $/;
167 my $CFG = <$fh>;
168
169 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
170 require YAML;
171 utf8::decode $CFG;
172 $::CFG = YAML::Load ($CFG);
173 } elsif ($CFG =~ /^\{/) {
174 $::CFG = from_json $CFG;
175 } else {
176 $::CFG = eval $CFG; ## todo comaptibility cruft
177 }
178} 205}
179 206
180sub write_cfg { 207sub write_cfg {
181 my ($file) = @_; 208 my $file = "$Deliantra::VARDIR/client.cf";
182 209
183 $::CFG->{VERSION} = $::VERSION; 210 $::CFG->{VERSION} = $::VERSION;
184 211
185 open my $fh, ">:utf8", $file 212 open my $fh, ">:utf8", $file
186 or return; 213 or return;
187 print $fh to_json $::CFG; 214 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
188} 215}
189 216
190sub http_proxy { 217sub http_proxy {
191 my @proxy = win32_proxy_info; 218 my @proxy = win32_proxy_info;
192 219
207} 234}
208 235
209sub lwp_useragent { 236sub lwp_useragent {
210 require LWP::UserAgent; 237 require LWP::UserAgent;
211 238
212 CFPlus::set_proxy; 239 DC::set_proxy;
213 240
214 my $ua = LWP::UserAgent->new ( 241 my $ua = LWP::UserAgent->new (
215 agent => "cfplus $VERSION", 242 agent => "deliantra $VERSION",
216 keep_alive => 1, 243 keep_alive => 1,
217 env_proxy => 1, 244 env_proxy => 1,
218 timeout => 30, 245 timeout => 30,
219 ); 246 );
220} 247}
226 and die $res->status_line; 253 and die $res->status_line;
227 254
228 $res 255 $res
229} 256}
230 257
258sub fh_nonblocking($$) {
259 my ($fh, $nb) = @_;
260
261 if ($^O eq "MSWin32") {
262 $nb = (! ! $nb) + 0;
263 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
264 } else {
265 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
266 }
267}
268
231package CFPlus::Layout; 269package DC::Layout;
232 270
271$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
272 glyph_cache_restore;
273};
274
233$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 275$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
234 reset_glyph_cache; 276 glyph_cache_backup;
235}; 277};
236 278
2371; 2791;
238 280
239=back 281=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines