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.165 by root, Tue Dec 25 19:23:11 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.9961'; 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
32use Fcntl (); 37use Fcntl ();
33use JSON::XS qw(encode_json decode_json); 38use JSON::XS qw(encode_json decode_json);
34 39use Guard qw(guard);
35=item guard { BLOCK }
36
37Returns an object that executes the given block as soon as it is destroyed.
38
39=cut
40
41sub guard(&) {
42 bless \(my $cb = $_[0]), "CFPlus::Guard"
43}
44
45sub CFPlus::Guard::DESTROY {
46 ${$_[0]}->()
47}
48 40
49=item shorten $string[, $maxlength] 41=item shorten $string[, $maxlength]
50 42
51=cut 43=cut
52 44
64 s/</&lt;/g; 56 s/</&lt;/g;
65 57
66 $_ 58 $_
67} 59}
68 60
69sub socketpipe() {
70 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
71 or die "cannot establish bidirectional pipe: $!\n";
72
73 ($fh1, $fh2)
74}
75
76sub background(&;&) { 61sub background(&;&) {
77 my ($bg, $cb) = @_; 62 my ($bg, $cb) = @_;
78 63
79 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: $!";
80 66
81 my $pid = fork; 67 my $pid = fork;
82 68
83 if (defined $pid && !$pid) { 69 if (defined $pid && !$pid) {
84 local $SIG{__DIE__}; 70 local $SIG{__DIE__};
94 80
95 if ($@) { 81 if ($@) {
96 my $msg = $@; 82 my $msg = $@;
97 $msg =~ s/\n+/\n/; 83 $msg =~ s/\n+/\n/;
98 warn "FATAL: $msg"; 84 warn "FATAL: $msg";
99 CFPlus::_exit 1; 85 DC::_exit 1;
100 } 86 }
101 87
102 # win32 is fucked up, of course. exit will clean stuff up, 88 # win32 is fucked up, of course. exit will clean stuff up,
103 # which destroys our database etc. _exit will exit ALL 89 # which destroys our database etc. _exit will exit ALL
104 # forked processes, because of the dreaded fork emulation. 90 # forked processes, because of the dreaded fork emulation.
105 CFPlus::_exit 0; 91 DC::_exit 0;
106 } 92 }
107 93
108 close $fh_w; 94 close $fh_w;
109 95
110 my $buffer; 96 my $buffer;
122 utf8::decode $line; 108 utf8::decode $line;
123 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 109 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
124 $cb->(JSON::XS->new->allow_nonref->decode ($1)); 110 $cb->(JSON::XS->new->allow_nonref->decode ($1));
125 } else { 111 } else {
126 ::message ({ 112 ::message ({
127 markup => "background($pid): " . CFPlus::asxml $line, 113 markup => "background($pid): " . DC::asxml $line,
128 }); 114 });
129 } 115 }
130 } 116 }
131 }); 117 });
132} 118}
138 $msg =~ s/\n//g; 124 $msg =~ s/\n//g;
139 utf8::encode $msg; 125 utf8::encode $msg;
140 print $msg, "\n"; 126 print $msg, "\n";
141} 127}
142 128
143package 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}
144 140
145sub find_rcfile($) { 141sub find_rcfile($) {
146 my $path; 142 my $path;
147 143
148 for (grep !ref, @INC) { 144 for (@RC_PATH, "") {
149 $path = "$_/CFPlus/resources/$_[0]"; 145 $path = "$RC_BASE/$_/$_[0]";
150 return $path if -r $path; 146 return $path if -e $path;
151 } 147 }
152 148
153 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 }
154} 182}
155 183
156sub read_cfg { 184sub read_cfg {
157 my ($file) = @_; 185 my ($file) = @_;
158 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
159 open my $fh, $file 196 open my $fh, ">:utf8", "$file~"
160 or return; 197 or return;
198 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
199 close $fh;
161 200
162 local $/; 201 rename $file, "$file.bak";
163 my $CFG = <$fh>; 202 rename "$file~", $file;
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 = decode_json $CFG;
171 } else {
172 $::CFG = eval $CFG; ## todo comaptibility cruft
173 }
174}
175
176sub write_cfg {
177 my ($file) = @_;
178
179 $::CFG->{VERSION} = $::VERSION;
180
181 open my $fh, ">:utf8", $file
182 or return;
183 print $fh encode_json $::CFG;
184} 203}
185 204
186sub http_proxy { 205sub http_proxy {
187 my @proxy = win32_proxy_info; 206 my @proxy = win32_proxy_info;
188 207
203} 222}
204 223
205sub lwp_useragent { 224sub lwp_useragent {
206 require LWP::UserAgent; 225 require LWP::UserAgent;
207 226
208 CFPlus::set_proxy; 227 DC::set_proxy;
209 228
210 my $ua = LWP::UserAgent->new ( 229 my $ua = LWP::UserAgent->new (
211 agent => "cfplus $VERSION", 230 agent => "deliantra $VERSION",
212 keep_alive => 1, 231 keep_alive => 1,
213 env_proxy => 1, 232 env_proxy => 1,
214 timeout => 30, 233 timeout => 30,
215 ); 234 );
216} 235}
231 $nb = (! ! $nb) + 0; 250 $nb = (! ! $nb) + 0;
232 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 251 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
233 } else { 252 } else {
234 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 253 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
235 } 254 }
236
237} 255}
238 256
239package CFPlus::Layout; 257package DC::Layout;
240 258
241$CFPlus::OpenGL::INIT_HOOK{"CFPlus::Layout"} = sub { 259$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
242 glyph_cache_restore; 260 glyph_cache_restore;
243}; 261};
244 262
245$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 263$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
246 glyph_cache_backup; 264 glyph_cache_backup;
247}; 265};
248 266
2491; 2671;
250 268

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines