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.168 by root, Wed Dec 26 20:46:39 2007 UTC vs.
Revision 1.197 by root, Fri Dec 5 14:44:45 2008 UTC

1=head1 NAME 1=head1 NAME
2 2
3dc - undocumented utility garbage for our deliantra client 3DC - undocumented utility garbage for our deliantra client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use dc; 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 dc; 15package DC;
16 16
17use Carp (); 17use Carp ();
18 18
19our $VERSION;
20
19BEGIN { 21BEGIN {
20 $VERSION = '0.9962'; 22 $VERSION = '2.0';
21 23
22 use XSLoader; 24 use XSLoader;
23 XSLoader::load "Deliantra::Client", $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
… …
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]), "dc::Guard" 45 bless \(my $cb = $_[0]), "DC::Guard"
43} 46}
44 47
45sub dc::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) = dc::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 dc::_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 dc::_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): " . dc::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 dc; 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 = "$_/Deliantra/Client/private/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 $::CFG = decode_json $CFG;
166} 205}
167 206
168sub write_cfg { 207sub write_cfg {
169 my ($file) = @_; 208 my $file = "$Deliantra::VARDIR/client.cf";
170 209
171 $::CFG->{VERSION} = $::VERSION; 210 $::CFG->{VERSION} = $::VERSION;
172 211
173 open my $fh, ">:utf8", $file 212 open my $fh, ">:utf8", $file
174 or return; 213 or return;
175 print $fh encode_json $::CFG; 214 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
176} 215}
177 216
178sub http_proxy { 217sub http_proxy {
179 my @proxy = win32_proxy_info; 218 my @proxy = win32_proxy_info;
180 219
… …
195} 234}
196 235
197sub lwp_useragent { 236sub lwp_useragent {
198 require LWP::UserAgent; 237 require LWP::UserAgent;
199 238
200 dc::set_proxy; 239 DC::set_proxy;
201 240
202 my $ua = LWP::UserAgent->new ( 241 my $ua = LWP::UserAgent->new (
203 agent => "cfplus $VERSION", 242 agent => "deliantra $VERSION",
204 keep_alive => 1, 243 keep_alive => 1,
205 env_proxy => 1, 244 env_proxy => 1,
206 timeout => 30, 245 timeout => 30,
207 ); 246 );
208} 247}
… …
223 $nb = (! ! $nb) + 0; 262 $nb = (! ! $nb) + 0;
224 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 263 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
225 } else { 264 } else {
226 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 265 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
227 } 266 }
228
229} 267}
230 268
231package dc::Layout; 269package DC::Layout;
232 270
233$dc::OpenGL::INIT_HOOK{"dc::Layout"} = sub { 271$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
234 glyph_cache_restore; 272 glyph_cache_restore;
235}; 273};
236 274
237$dc::OpenGL::SHUTDOWN_HOOK{"dc::Layout"} = sub { 275$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
238 glyph_cache_backup; 276 glyph_cache_backup;
239}; 277};
240 278
2411; 2791;
242 280

Diff Legend

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