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.146 by root, Sun Aug 26 03:12:34 2007 UTC vs.
Revision 1.196 by root, Sun Nov 9 13:33:42 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.981'; 22 $VERSION = '0.9978';
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 ();
33use JSON::XS qw(to_json from_json); 36use JSON::XS qw(encode_json decode_json);
34 37
35=item guard { BLOCK } 38=item guard { BLOCK }
36 39
37Returns 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.
38 41
39=cut 42=cut
40 43
41sub guard(&) { 44sub guard(&) {
42 bless \(my $cb = $_[0]), "CFPlus::Guard" 45 bless \(my $cb = $_[0]), "DC::Guard"
43} 46}
44 47
45sub CFPlus::Guard::DESTROY { 48sub DC::Guard::DESTROY {
46 ${$_[0]}->() 49 ${$_[0]}->()
47} 50}
48 51
49=item shorten $string[, $maxlength] 52=item shorten $string[, $maxlength]
50 53
… …
65 68
66 $_ 69 $_
67} 70}
68 71
69sub socketpipe() { 72sub socketpipe() {
70 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
71 or die "cannot establish bidirectional pipe: $!\n"; 74 or die "cannot establish bidirectional pipe: $!\n";
72 75
73 ($fh1, $fh2) 76 ($fh1, $fh2)
74} 77}
75 78
76sub background(&;&) { 79sub background(&;&) {
77 my ($bg, $cb) = @_; 80 my ($bg, $cb) = @_;
78 81
79 my ($fh_r, $fh_w) = CFPlus::socketpipe; 82 my ($fh_r, $fh_w) = DC::socketpipe;
80 83
81 my $pid = fork; 84 my $pid = fork;
82 85
83 if (defined $pid && !$pid) { 86 if (defined $pid && !$pid) {
84 local $SIG{__DIE__}; 87 local $SIG{__DIE__};
… …
94 97
95 if ($@) { 98 if ($@) {
96 my $msg = $@; 99 my $msg = $@;
97 $msg =~ s/\n+/\n/; 100 $msg =~ s/\n+/\n/;
98 warn "FATAL: $msg"; 101 warn "FATAL: $msg";
99 CFPlus::_exit 1; 102 DC::_exit 1;
100 } 103 }
101 104
102 # win32 is fucked up, of course. exit will clean stuff up, 105 # win32 is fucked up, of course. exit will clean stuff up,
103 # which destroys our database etc. _exit will exit ALL 106 # which destroys our database etc. _exit will exit ALL
104 # forked processes, because of the dreaded fork emulation. 107 # forked processes, because of the dreaded fork emulation.
105 CFPlus::_exit 0; 108 DC::_exit 0;
106 } 109 }
107 110
108 close $fh_w; 111 close $fh_w;
109 112
110 my $buffer; 113 my $buffer;
… …
122 utf8::decode $line; 125 utf8::decode $line;
123 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 126 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
124 $cb->(JSON::XS->new->allow_nonref->decode ($1)); 127 $cb->(JSON::XS->new->allow_nonref->decode ($1));
125 } else { 128 } else {
126 ::message ({ 129 ::message ({
127 markup => "background($pid): " . CFPlus::asxml $line, 130 markup => "background($pid): " . DC::asxml $line,
128 }); 131 });
129 } 132 }
130 } 133 }
131 }); 134 });
132} 135}
… …
138 $msg =~ s/\n//g; 141 $msg =~ s/\n//g;
139 utf8::encode $msg; 142 utf8::encode $msg;
140 print $msg, "\n"; 143 print $msg, "\n";
141} 144}
142 145
143package 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}
144 157
145sub find_rcfile($) { 158sub find_rcfile($) {
146 my $path; 159 my $path;
147 160
148 for (grep !ref, @INC) { 161 for (@RC_PATH, "") {
149 $path = "$_/CFPlus/resources/$_[0]"; 162 $path = "$RC_BASE/$_/$_[0]";
150 return $path if -r $path; 163 return $path if -r $path;
151 } 164 }
152 165
153 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 }
154} 199}
155 200
156sub read_cfg { 201sub read_cfg {
157 my ($file) = @_; 202 my ($file) = @_;
158 203
159 open my $fh, $file 204 $::CFG = load_json $file;
160 or return;
161
162 local $/;
163 my $CFG = <$fh>;
164
165 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
166 require YAML;
167 utf8::decode $CFG;
168 $::CFG = YAML::Load ($CFG);
169 } elsif ($CFG =~ /^\{/) {
170 $::CFG = from_json $CFG;
171 } else {
172 $::CFG = eval $CFG; ## todo comaptibility cruft
173 }
174} 205}
175 206
176sub write_cfg { 207sub write_cfg {
177 my ($file) = @_; 208 my $file = "$Deliantra::VARDIR/client.cf";
178 209
179 $::CFG->{VERSION} = $::VERSION; 210 $::CFG->{VERSION} = $::VERSION;
180 211
181 open my $fh, ">:utf8", $file 212 open my $fh, ">:utf8", $file
182 or return; 213 or return;
183 print $fh to_json $::CFG; 214 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
184} 215}
185 216
186sub http_proxy { 217sub http_proxy {
187 my @proxy = win32_proxy_info; 218 my @proxy = win32_proxy_info;
188 219
… …
203} 234}
204 235
205sub lwp_useragent { 236sub lwp_useragent {
206 require LWP::UserAgent; 237 require LWP::UserAgent;
207 238
208 CFPlus::set_proxy; 239 DC::set_proxy;
209 240
210 my $ua = LWP::UserAgent->new ( 241 my $ua = LWP::UserAgent->new (
211 agent => "cfplus $VERSION", 242 agent => "deliantra $VERSION",
212 keep_alive => 1, 243 keep_alive => 1,
213 env_proxy => 1, 244 env_proxy => 1,
214 timeout => 30, 245 timeout => 30,
215 ); 246 );
216} 247}
… …
231 $nb = (! ! $nb) + 0; 262 $nb = (! ! $nb) + 0;
232 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 263 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
233 } else { 264 } else {
234 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 265 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
235 } 266 }
236
237} 267}
238 268
239package CFPlus::Layout; 269package DC::Layout;
240 270
271$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
272 glyph_cache_restore;
273};
274
241$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 275$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
242 reset_glyph_cache; 276 glyph_cache_backup;
243}; 277};
244 278
2451; 2791;
246 280
247=back 281=back

Diff Legend

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