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

Diff Legend

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