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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines