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.207 by root, Tue Sep 15 18:49:55 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.05';
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 (); 39use Guard qw(guard);
35 *to_json = \&Crossfire::Protocol::Base::to_json;
36 *from_json = \&Crossfire::Protocol::Base::from_json;
37}
38
39=item guard { BLOCK }
40
41Returns an object that executes the given block as soon as it is destroyed.
42
43=cut
44
45sub guard(&) {
46 bless \(my $cb = $_[0]), "CFPlus::Guard"
47}
48
49sub CFPlus::Guard::DESTROY {
50 ${$_[0]}->()
51}
52 40
53=item shorten $string[, $maxlength] 41=item shorten $string[, $maxlength]
54 42
55=cut 43=cut
56 44
68 s/</&lt;/g; 56 s/</&lt;/g;
69 57
70 $_ 58 $_
71} 59}
72 60
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(&;&) { 61sub background(&;&) {
81 my ($bg, $cb) = @_; 62 my ($bg, $cb) = @_;
82 63
83 my ($fh_r, $fh_w) = CFPlus::socketpipe; 64 my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
65 or die "unable to create background socketpair: $!";
84 66
85 my $pid = fork; 67 my $pid = fork;
86 68
87 if (defined $pid && !$pid) { 69 if (defined $pid && !$pid) {
88 local $SIG{__DIE__}; 70 local $SIG{__DIE__};
98 80
99 if ($@) { 81 if ($@) {
100 my $msg = $@; 82 my $msg = $@;
101 $msg =~ s/\n+/\n/; 83 $msg =~ s/\n+/\n/;
102 warn "FATAL: $msg"; 84 warn "FATAL: $msg";
103 CFPlus::_exit 1; 85 DC::_exit 1;
104 } 86 }
105 87
106 # win32 is fucked up, of course. exit will clean stuff up, 88 # win32 is fucked up, of course. exit will clean stuff up,
107 # which destroys our database etc. _exit will exit ALL 89 # which destroys our database etc. _exit will exit ALL
108 # forked processes, because of the dreaded fork emulation. 90 # forked processes, because of the dreaded fork emulation.
109 CFPlus::_exit 0; 91 DC::_exit 0;
110 } 92 }
111 93
112 close $fh_w; 94 close $fh_w;
113 95
114 my $buffer; 96 my $buffer;
126 utf8::decode $line; 108 utf8::decode $line;
127 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 109 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
128 $cb->(JSON::XS->new->allow_nonref->decode ($1)); 110 $cb->(JSON::XS->new->allow_nonref->decode ($1));
129 } else { 111 } else {
130 ::message ({ 112 ::message ({
131 markup => "background($pid): " . CFPlus::asxml $line, 113 markup => "background($pid): " . DC::asxml $line,
132 }); 114 });
133 } 115 }
134 } 116 }
135 }); 117 });
136} 118}
142 $msg =~ s/\n//g; 124 $msg =~ s/\n//g;
143 utf8::encode $msg; 125 utf8::encode $msg;
144 print $msg, "\n"; 126 print $msg, "\n";
145} 127}
146 128
147package CFPlus; 129package DC;
130
131our $RC_THEME;
132our %THEME;
133our @RC_PATH;
134our $RC_BASE;
135
136for (grep !ref, @INC) {
137 $RC_BASE = "$_/Deliantra/Client/private/resources";
138 last if -d $RC_BASE;
139}
148 140
149sub find_rcfile($) { 141sub find_rcfile($) {
150 my $path; 142 my $path;
151 143
152 for (grep !ref, @INC) { 144 for (@RC_PATH, "") {
153 $path = "$_/CFPlus/resources/$_[0]"; 145 $path = "$RC_BASE/$_/$_[0]";
154 return $path if -r $path; 146 return $path if -e $path;
155 } 147 }
156 148
157 die "FATAL: can't find required file $_[0]\n"; 149 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
150}
151
152sub load_json($) {
153 my ($file) = @_;
154
155 open my $fh, $file
156 or return;
157
158 local $/;
159 eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) }
160}
161
162sub set_theme($) {
163 return if $RC_THEME eq $_[0];
164 $RC_THEME = $_[0];
165
166 # kind of hacky, find the main theme file, then load all theme files and merge them
167
168 %THEME = ();
169 @RC_PATH = "theme-$RC_THEME";
170
171 my $theme = load_json find_rcfile "theme.json"
172 or die "FATAL: theme resource file not found";
173
174 @RC_PATH = @{ $theme->{path} } if $theme->{path};
175
176 for (@RC_PATH, "") {
177 my $theme = load_json "$RC_BASE/$_/theme.json"
178 or next;
179
180 %THEME = ( %$theme, %THEME );
181 }
158} 182}
159 183
160sub read_cfg { 184sub read_cfg {
161 my ($file) = @_; 185 my ($file) = @_;
162 186
187 $::CFG = (load_json $file) || (load_json "$file.bak");
188}
189
190sub write_cfg {
191 my $file = "$Deliantra::VARDIR/client.cf";
192
193 $::CFG->{VERSION} = $::VERSION;
194 $::CFG->{layout} = DC::UI::get_layout ();
195
163 open my $fh, $file 196 open my $fh, ">:utf8", "$file~"
164 or return; 197 or return;
198 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
199 close $fh;
165 200
166 local $/; 201 rename $file, "$file.bak";
167 my $CFG = <$fh>; 202 rename "$file~", $file;
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}
179
180sub write_cfg {
181 my ($file) = @_;
182
183 $::CFG->{VERSION} = $::VERSION;
184
185 open my $fh, ">:utf8", $file
186 or return;
187 print $fh to_json $::CFG;
188} 203}
189 204
190sub http_proxy { 205sub http_proxy {
191 my @proxy = win32_proxy_info; 206 my @proxy = win32_proxy_info;
192 207
207} 222}
208 223
209sub lwp_useragent { 224sub lwp_useragent {
210 require LWP::UserAgent; 225 require LWP::UserAgent;
211 226
212 CFPlus::set_proxy; 227 DC::set_proxy;
213 228
214 my $ua = LWP::UserAgent->new ( 229 my $ua = LWP::UserAgent->new (
215 agent => "cfplus $VERSION", 230 agent => "deliantra $VERSION",
216 keep_alive => 1, 231 keep_alive => 1,
217 env_proxy => 1, 232 env_proxy => 1,
218 timeout => 30, 233 timeout => 30,
219 ); 234 );
220} 235}
226 and die $res->status_line; 241 and die $res->status_line;
227 242
228 $res 243 $res
229} 244}
230 245
246sub fh_nonblocking($$) {
247 my ($fh, $nb) = @_;
248
249 if ($^O eq "MSWin32") {
250 $nb = (! ! $nb) + 0;
251 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
252 } else {
253 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
254 }
255}
256
231package CFPlus::Layout; 257package DC::Layout;
232 258
259$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
260 glyph_cache_restore;
261};
262
233$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 263$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
234 reset_glyph_cache; 264 glyph_cache_backup;
235}; 265};
236 266
2371; 2671;
238 268
239=back 269=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines