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.161 by root, Sat Dec 8 18:38:10 2007 UTC vs.
Revision 1.216 by root, Sat Nov 17 10:40:08 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.9958'; 22 $VERSION = '3.0';
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);
39use Guard qw(guard);
34 40
35=item guard { BLOCK } 41# modules to support other DC::* packages
42use List::Util ();
43use IO::AIO ();
44use Coro::AIO ();
45use AnyEvent::AIO ();
36 46
37Returns an object that executes the given block as soon as it is destroyed. 47use Deliantra::Util ();
38 48use Deliantra::Protocol::Constants ();
39=cut
40
41sub guard(&) {
42 bless \(my $cb = $_[0]), "CFPlus::Guard"
43}
44
45sub CFPlus::Guard::DESTROY {
46 ${$_[0]}->()
47}
48 49
49=item shorten $string[, $maxlength] 50=item shorten $string[, $maxlength]
50 51
51=cut 52=cut
52 53
64 s/</&lt;/g; 65 s/</&lt;/g;
65 66
66 $_ 67 $_
67} 68}
68 69
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(&;&) { 70sub background(&;&) {
77 my ($bg, $cb) = @_; 71 my ($bg, $cb) = @_;
78 72
79 my ($fh_r, $fh_w) = CFPlus::socketpipe; 73 my ($fh_r, $fh_w) = AnyEvent::Util::portable_socketpair
74 or die "unable to create background socketpair: $!";
80 75
81 my $pid = fork; 76 my $pid = fork;
82 77
83 if (defined $pid && !$pid) { 78 if (defined $pid && !$pid) {
84 local $SIG{__DIE__}; 79 local $SIG{__DIE__};
94 89
95 if ($@) { 90 if ($@) {
96 my $msg = $@; 91 my $msg = $@;
97 $msg =~ s/\n+/\n/; 92 $msg =~ s/\n+/\n/;
98 warn "FATAL: $msg"; 93 warn "FATAL: $msg";
99 CFPlus::_exit 1; 94 DC::_exit 1;
100 } 95 }
101 96
102 # win32 is fucked up, of course. exit will clean stuff up, 97 # win32 is fucked up, of course. exit will clean stuff up,
103 # which destroys our database etc. _exit will exit ALL 98 # which destroys our database etc. _exit will exit ALL
104 # forked processes, because of the dreaded fork emulation. 99 # forked processes, because of the dreaded fork emulation.
105 CFPlus::_exit 0; 100 DC::_exit 0;
106 } 101 }
107 102
108 close $fh_w; 103 close $fh_w;
109 104
110 my $buffer; 105 my $buffer;
122 utf8::decode $line; 117 utf8::decode $line;
123 if ($line =~ /^\x{e877}json_msg (.*)$/s) { 118 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
124 $cb->(JSON::XS->new->allow_nonref->decode ($1)); 119 $cb->(JSON::XS->new->allow_nonref->decode ($1));
125 } else { 120 } else {
126 ::message ({ 121 ::message ({
127 markup => "background($pid): " . CFPlus::asxml $line, 122 markup => "background($pid): " . DC::asxml $line,
128 }); 123 });
129 } 124 }
130 } 125 }
131 }); 126 });
132} 127}
138 $msg =~ s/\n//g; 133 $msg =~ s/\n//g;
139 utf8::encode $msg; 134 utf8::encode $msg;
140 print $msg, "\n"; 135 print $msg, "\n";
141} 136}
142 137
143package CFPlus; 138package DC;
139
140our $RC_THEME;
141our %THEME;
142our @RC_PATH;
143our $RC_BASE;
144
145for (grep !ref, @INC) {
146 $RC_BASE = "$_/Deliantra/Client/private/resources";
147 last if -d $RC_BASE;
148}
144 149
145sub find_rcfile($) { 150sub find_rcfile($) {
146 my $path; 151 my $path;
147 152
148 for (grep !ref, @INC) { 153 for (@RC_PATH, "") {
149 $path = "$_/CFPlus/resources/$_[0]"; 154 $path = "$RC_BASE/$_/$_[0]";
150 return $path if -r $path; 155 return $path if -e $path;
151 } 156 }
152 157
153 die "FATAL: can't find required file $_[0]\n"; 158 die "FATAL: can't find required file \"$_[0]\" in \"$RC_BASE\"\n";
154} 159}
155 160
156sub read_cfg { 161sub load_json($) {
157 my ($file) = @_; 162 my ($file) = @_;
158 163
159 open my $fh, $file 164 open my $fh, $file
160 or return; 165 or return;
161 166
162 local $/; 167 local $/;
163 my $CFG = <$fh>; 168 eval { JSON::XS->new->utf8->relaxed->decode (<$fh>) }
169}
164 170
165 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove 171sub set_theme($) {
166 require YAML; 172 return if $RC_THEME eq $_[0];
167 utf8::decode $CFG; 173 $RC_THEME = $_[0];
168 $::CFG = YAML::Load ($CFG); 174
169 } elsif ($CFG =~ /^\{/) { 175 # kind of hacky, find the main theme file, then load all theme files and merge them
170 $::CFG = decode_json $CFG; 176
177 %THEME = ();
178 @RC_PATH = "theme-$RC_THEME";
179
180 my $theme = load_json find_rcfile "theme.json"
181 or die "FATAL: theme resource file not found";
182
183 @RC_PATH = @{ $theme->{path} } if $theme->{path};
184
185 for (@RC_PATH, "") {
186 my $theme = load_json "$RC_BASE/$_/theme.json"
187 or next;
188
189 %THEME = ( %$theme, %THEME );
190 }
191}
192
193sub read_cfg($) {
194 my ($file) = @_;
195
196 $::CFG = (load_json $file) || (load_json "$file.bak");
197}
198
199sub write_cfg($) {
200 my $file = "$Deliantra::VARDIR/client.cf";
201
202 $::CFG->{VERSION} = $::VERSION;
203 $::CFG->{layout} = DC::UI::get_layout ();
204
205 open my $fh, ">:utf8", "$file~"
206 or return;
207 print $fh JSON::XS->new->utf8->pretty->encode ($::CFG);
208 close $fh;
209
210 rename $file, "$file.bak";
211 rename "$file~", $file;
212}
213
214sub load_cfg() {
215 if (-e "$Deliantra::VARDIR/client.cf") {
216 DC::read_cfg "$Deliantra::VARDIR/client.cf";
171 } else { 217 } else {
172 $::CFG = eval $CFG; ## todo comaptibility cruft 218 $::CFG = { cfg_schema => 1, db_schema => 1 };
173 } 219 }
174} 220}
175 221
176sub write_cfg { 222sub save_cfg() {
177 my ($file) = @_; 223 write_cfg "$Deliantra::VARDIR/client.cf";
224}
178 225
179 $::CFG->{VERSION} = $::VERSION; 226sub upgrade_cfg() {
227 my %DEF_CFG = (
228 config_autosave => 1,
229 sdl_mode => undef,
230 fullscreen => 1,
231 fast => 0,
232 force_opengl11 => undef,
233 disable_alpha => 0,
234 smooth_movement => 1,
235 smooth_transitions => 1,
236 texture_compression => 1,
237 map_scale => 1,
238 fow_enable => 1,
239 fow_intensity => 0,
240 fow_texture => 0,
241 map_smoothing => 1,
242 gui_fontsize => 1,
243 log_fontsize => 0.7,
244 gauge_fontsize => 1,
245 gauge_size => 0.35,
246 stat_fontsize => 0.7,
247 mapsize => 100,
248 audio_enable => 1,
249 audio_hw_channels => 0,
250 audio_hw_frequency => 0,
251 audio_hw_chunksize => 0,
252 audio_mix_channels => 8,
253 effects_enable => 1,
254 effects_volume => 1,
255 bgm_enable => 1,
256 bgm_volume => 0.5,
257 output_rate => "",
258 pickup => Deliantra::Protocol::Constants::PICKUP_SPELLBOOK
259 | Deliantra::Protocol::Constants::PICKUP_SKILLSCROLL
260 | Deliantra::Protocol::Constants::PICKUP_VALUABLES,
261 inv_sort => "mtime",
262 default => "profile", # default profile
263 show_tips => 1,
264 logview_max_par => 1000,
265 shift_fire_stop => 0,
266 uitheme => "wood",
267 map_shift_x => -24, # arbitrary
268 map_shift_y => +24, # arbitrary
269 );
180 270
181 open my $fh, ">:utf8", $file 271 while (my ($k, $v) = each %DEF_CFG) {
182 or return; 272 $::CFG->{$k} = $v unless exists $::CFG->{$k};
183 print $fh encode_json $::CFG; 273 }
274
275 if ($::CFG->{cfg_schema} < 1) {
276 for my $profile (values %{ $::CFG->{profile} }) {
277 $profile->{password} = unpack "H*", Deliantra::Util::hash_pw $profile->{password};
278 }
279 $::CFG->{cfg_schema} = 1;
280 }
184} 281}
185 282
186sub http_proxy { 283sub http_proxy {
187 my @proxy = win32_proxy_info; 284 my @proxy = win32_proxy_info;
188 285
203} 300}
204 301
205sub lwp_useragent { 302sub lwp_useragent {
206 require LWP::UserAgent; 303 require LWP::UserAgent;
207 304
208 CFPlus::set_proxy; 305 DC::set_proxy;
209 306
210 my $ua = LWP::UserAgent->new ( 307 my $ua = LWP::UserAgent->new (
211 agent => "cfplus $VERSION", 308 agent => "deliantra $VERSION",
212 keep_alive => 1, 309 keep_alive => 1,
213 env_proxy => 1, 310 env_proxy => 1,
214 timeout => 30, 311 timeout => 30,
215 ); 312 );
216} 313}
231 $nb = (! ! $nb) + 0; 328 $nb = (! ! $nb) + 0;
232 ioctl $fh, 0x8004667e, \$nb; # FIONBIO 329 ioctl $fh, 0x8004667e, \$nb; # FIONBIO
233 } else { 330 } else {
234 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0; 331 fcntl $fh, &Fcntl::F_SETFL, $nb ? &Fcntl::O_NONBLOCK : 0;
235 } 332 }
236
237} 333}
238 334
239package CFPlus::Layout; 335package DC::Layout;
240 336
337$DC::OpenGL::INIT_HOOK{"DC::Layout"} = sub {
338 glyph_cache_restore;
339};
340
241$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub { 341$DC::OpenGL::SHUTDOWN_HOOK{"DC::Layout"} = sub {
242 reset_glyph_cache; 342 glyph_cache_backup;
243}; 343};
244 344
2451; 3451;
246 346
247=back 347=back

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines