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.197 by root, Fri Dec 5 14:44:45 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.0';
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
32use Fcntl (); 35use Fcntl ();
33 36use 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 37
40=item guard { BLOCK } 38=item guard { BLOCK }
41 39
42Returns 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.
43 41
44=cut 42=cut
45 43
46sub guard(&) { 44sub guard(&) {
47 bless \(my $cb = $_[0]), "CFPlus::Guard" 45 bless \(my $cb = $_[0]), "DC::Guard"
48} 46}
49 47
50sub CFPlus::Guard::DESTROY { 48sub DC::Guard::DESTROY {
51 ${$_[0]}->() 49 ${$_[0]}->()
52} 50}
53 51
54=item shorten $string[, $maxlength] 52=item shorten $string[, $maxlength]
55 53
70 68
71 $_ 69 $_
72} 70}
73 71
74sub socketpipe() { 72sub socketpipe() {
75 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
76 or die "cannot establish bidirectional pipe: $!\n"; 74 or die "cannot establish bidirectional pipe: $!\n";
77 75
78 ($fh1, $fh2) 76 ($fh1, $fh2)
79} 77}
80 78
81sub background(&;&) { 79sub background(&;&) {
82 my ($bg, $cb) = @_; 80 my ($bg, $cb) = @_;
83 81
84 my ($fh_r, $fh_w) = CFPlus::socketpipe; 82 my ($fh_r, $fh_w) = DC::socketpipe;
85 83
86 my $pid = fork; 84 my $pid = fork;
87 85
88 if (defined $pid && !$pid) { 86 if (defined $pid && !$pid) {
89 local $SIG{__DIE__}; 87 local $SIG{__DIE__};
99 97
100 if ($@) { 98 if ($@) {
101 my $msg = $@; 99 my $msg = $@;
102 $msg =~ s/\n+/\n/; 100 $msg =~ s/\n+/\n/;
103 warn "FATAL: $msg"; 101 warn "FATAL: $msg";
104 CFPlus::_exit 1; 102 DC::_exit 1;
105 } 103 }
106 104
107 # win32 is fucked up, of course. exit will clean stuff up, 105 # win32 is fucked up, of course. exit will clean stuff up,
108 # which destroys our database etc. _exit will exit ALL 106 # which destroys our database etc. _exit will exit ALL
109 # forked processes, because of the dreaded fork emulation. 107 # forked processes, because of the dreaded fork emulation.
110 CFPlus::_exit 0; 108 DC::_exit 0;
111 } 109 }
112 110
113 close $fh_w; 111 close $fh_w;
114 112
115 my $buffer; 113 my $buffer;
127 utf8::decode $line; 125 utf8::decode $line;
128 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 126 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
129 $cb->(JSON::XS->new->allow_nonref->decode ($1)); 127 $cb->(JSON::XS->new->allow_nonref->decode ($1));
130 } else { 128 } else {
131 ::message ({ 129 ::message ({
132 markup => "background($pid): " . CFPlus::asxml $line, 130 markup => "background($pid): " . DC::asxml $line,
133 }); 131 });
134 } 132 }
135 } 133 }
136 }); 134 });
137} 135}
143 $msg =~ s/\n//g; 141 $msg =~ s/\n//g;
144 utf8::encode $msg; 142 utf8::encode $msg;
145 print $msg, "\n"; 143 print $msg, "\n";
146} 144}
147 145
148package 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}
149 157
150sub find_rcfile($) { 158sub find_rcfile($) {
151 my $path; 159 my $path;
152 160
153 for (grep !ref, @INC) { 161 for (@RC_PATH, "") {
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";
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 }
159} 199}
160 200
161sub read_cfg { 201sub read_cfg {
162 my ($file) = @_; 202 my ($file) = @_;
163 203
164 open my $fh, $file 204 $::CFG = load_json $file;
165 or return;
166
167 local $/;
168 my $CFG = <$fh>;
169
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;
176 } else {
177 $::CFG = eval $CFG; ## todo comaptibility cruft
178 }
179} 205}
180 206
181sub write_cfg { 207sub write_cfg {
182 my ($file) = @_; 208 my $file = "$Deliantra::VARDIR/client.cf";
183 209
184 $::CFG->{VERSION} = $::VERSION; 210 $::CFG->{VERSION} = $::VERSION;
185 211
186 open my $fh, ">:utf8", $file 212 open my $fh, ">:utf8", $file
187 or return; 213 or return;
188 print $fh to_json $::CFG; 214 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
189} 215}
190 216
191sub http_proxy { 217sub http_proxy {
192 my @proxy = win32_proxy_info; 218 my @proxy = win32_proxy_info;
193 219
208} 234}
209 235
210sub lwp_useragent { 236sub lwp_useragent {
211 require LWP::UserAgent; 237 require LWP::UserAgent;
212 238
213 CFPlus::set_proxy; 239 DC::set_proxy;
214 240
215 my $ua = LWP::UserAgent->new ( 241 my $ua = LWP::UserAgent->new (
216 agent => "cfplus $VERSION", 242 agent => "deliantra $VERSION",
217 keep_alive => 1, 243 keep_alive => 1,
218 env_proxy => 1, 244 env_proxy => 1,
219 timeout => 30, 245 timeout => 30,
220 ); 246 );
221} 247}
230} 256}
231 257
232sub fh_nonblocking($$) { 258sub fh_nonblocking($$) {
233 my ($fh, $nb) = @_; 259 my ($fh, $nb) = @_;
234 260
235 if ($^O =~ /Win32/) { 261 if ($^O eq "MSWin32") {
236 $nb = ! ! $nb; 262 $nb = (! ! $nb) + 0;
237 ioctl $fh, 0x8004667e, $nb; # FIONBIO 263 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
238 } else { 264 } else {
239 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 265 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
240 } 266 }
241
242} 267}
243 268
244package CFPlus::Layout; 269package DC::Layout;
245 270
271$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
272 glyph_cache_restore;
273};
274
246$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 275$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
247 reset_glyph_cache; 276 glyph_cache_backup;
248}; 277};
249 278
2501; 2791;
251 280
252=back 281=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines