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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines