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.107 by root, Mon Jul 24 08:23:27 2006 UTC vs.
Revision 1.129 by root, Mon Nov 20 16:41:46 2006 UTC

1=head1 NAME 1=head1 NAME
2 2
3CFClient - undocumented utility garbage for our crossfire client 3CFPlus - undocumented utility garbage for our crossfire client
4 4
5=head1 SYNOPSIS 5=head1 SYNOPSIS
6 6
7 use CFClient; 7 use CFPlus;
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 CFClient; 15package CFPlus;
16
17use Carp ();
16 18
17BEGIN { 19BEGIN {
18 $VERSION = '0.1'; 20 $VERSION = '0.96';
19 21
20 use XSLoader; 22 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
22} 24}
23 25
24use utf8; 26use utf8;
25 27
26use Carp ();
27use AnyEvent (); 28use AnyEvent ();
28use BerkeleyDB; 29use BerkeleyDB;
29use Pod::POM (); 30use Pod::POM ();
30use Scalar::Util (); 31use Scalar::Util ();
31use YAML ();
32use Storable (); # finally 32use Storable (); # finally
33 33
34our %STAT_TOOLTIP = ( 34BEGIN {
35 Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack", 35 use Crossfire::Protocol::Base ();
36 Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed", 36 *to_json = \&Crossfire::Protocol::Base::to_json;
37 Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have", 37 *from_json = \&Crossfire::Protocol::Base::from_json;
38 Int => "<b>Intelligence</b>, your ability to learn and use skills and incantations (both prayers and magic) and determines how much spell points you can have", 38}
39 Wis => "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have",
40 Pow => "<b>Power</b>, your magical potential. Influences the strength of spell effects, and also how much your spell and grace points increase when leveling up",
41 Cha => "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops.",
42
43 Wc => "<b>Weapon Class</b>, effectiveness of melee/missile attacks. Lower is more potent. Current weapon, level and Str are some things which effect the value of Wc. The value of Wc may range between 25 and -72.",
44 Ac => "<b>Armour Class</b>, how protected you are from being hit by any attack. Lower values are better. Ac is based on your race and is modified by the Dex and current armour worn. For characters that cannot wear armour, Ac improves as their level increases.",
45 Dam => "<b>Damage</b>, how much damage your melee/missile attack inflicts. Higher values indicate a greater amount of damage will be inflicted with each attack.",
46 Arm => "<b>Armour</b>, how much damage (from physical attacks) will be subtracted from successful hits made upon you. This value ranges between 0 to 99%. Current armour worn primarily determines Arm value. This is the same as the physical resistance.",
47 Spd => "<b>Speed</b>, how fast you can move. The value of speed may range between nearly 0 (\"very slow\") to higher than 5 (\"lightning fast\"). Base speed is determined from the Dex and modified downward proportionally by the amount of weight carried which exceeds the Max Carry limit. The armour worn also sets the upper limit on speed.",
48 WSp => "<b>Weapon Speed</b>, how many attacks you may make per unit of time (0.120s). Higher values indicate faster attack speed. Current weapon and Dex effect the value of weapon speed.",
49);
50 39
51=item guard { BLOCK } 40=item guard { BLOCK }
52 41
53Returns 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.
54 43
55=cut 44=cut
56 45
57sub guard(&) { 46sub guard(&) {
58 bless \(my $cb = $_[0]), "CFClient::Guard" 47 bless \(my $cb = $_[0]), "CFPlus::Guard"
59} 48}
60 49
61sub CFClient::Guard::DESTROY { 50sub CFPlus::Guard::DESTROY {
62 ${$_[0]}->() 51 ${$_[0]}->()
63} 52}
64 53
65sub asxml($) { 54sub asxml($) {
66 local $_ = $_[0]; 55 local $_ = $_[0];
… …
70 s/</&lt;/g; 59 s/</&lt;/g;
71 60
72 $_ 61 $_
73} 62}
74 63
64sub socketpipe() {
65 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
66 or die "cannot establish bidiretcional pipe: $!\n";
67
68 ($fh1, $fh2)
69}
70
71sub background(&;&) {
72 my ($bg, $cb) = @_;
73
74 my ($fh_r, $fh_w) = CFPlus::socketpipe;
75
76 my $pid = fork;
77
78 if (defined $pid && !$pid) {
79 local $SIG{__DIE__};
80
81 open STDOUT, ">&", $fh_w;
82 open STDERR, ">&", $fh_w;
83 close $fh_r;
84 close $fh_w;
85
86 $| = 1;
87
88 eval { $bg->() };
89
90 if ($@) {
91 my $msg = $@;
92 $msg =~ s/\n+/\n/;
93 warn "FATAL: $msg";
94 CFPlus::_exit 1;
95 }
96
97 # win32 is fucked up, of course. exit will clean stuff up,
98 # which destroys our database etc. _exit will exit ALL
99 # forked processes, because of the dreaded fork emulation.
100 CFPlus::_exit 0;
101 }
102
103 close $fh_w;
104
105 my $buffer;
106
107 my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
108 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
109 undef $w;
110 $cb->();
111 return;
112 }
113
114 while ($buffer =~ s/^(.*)\n//) {
115 my $line = $1;
116 $line =~ s/\s+$//;
117 utf8::decode $line;
118 if ($line =~ /^\x{e877}json_msg (.*)$/s) {
119 $cb->(from_json $1);
120 } else {
121 ::message ({
122 markup => "background($pid): " . CFPlus::asxml $line,
123 });
124 }
125 }
126 });
127}
128
129sub background_msg {
130 my ($msg) = @_;
131
132 $msg = "\x{e877}json_msg " . to_json $msg;
133 $msg =~ s/\n//g;
134 utf8::encode $msg;
135 print $msg, "\n";
136}
137
75package CFClient::Database; 138package CFPlus::Database;
76 139
77our @ISA = BerkeleyDB::Btree::; 140our @ISA = BerkeleyDB::Btree::;
78 141
79sub get($$) { 142sub get($$) {
80 my $data; 143 my $data;
… …
87my %DB_SYNC; 150my %DB_SYNC;
88 151
89sub put($$$) { 152sub put($$$) {
90 my ($db, $key, $data) = @_; 153 my ($db, $key, $data) = @_;
91 154
155 my $hkey = $db + 0;
156 Scalar::Util::weaken $db;
92 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 157 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
158 delete $DB_SYNC{$hkey};
159 $db->db_sync if $db;
160 });
93 161
94 $db->db_put ($key => $data) 162 $db->db_put ($key => $data)
95} 163}
96 164
97package CFClient; 165package CFPlus;
98 166
99sub find_rcfile($) { 167sub find_rcfile($) {
100 my $path; 168 my $path;
101 169
102 for (grep !ref, @INC) { 170 for (grep !ref, @INC) {
103 $path = "$_/CFClient/resources/$_[0]"; 171 $path = "$_/CFPlus/resources/$_[0]";
104 return $path if -r $path; 172 return $path if -r $path;
105 } 173 }
106 174
107 die "FATAL: can't find required file $_[0]\n"; 175 die "FATAL: can't find required file $_[0]\n";
108} 176}
109 177
110sub parse_yaml {
111 my $text = shift;
112
113 utf8::decode $text;
114
115 YAML::Load $text
116}
117
118sub read_cfg { 178sub read_cfg {
119 my ($file) = @_; 179 my ($file) = @_;
120 180
121 open my $fh, $file 181 open my $fh, $file
122 or return; 182 or return;
123 183
124 local $/; 184 local $/;
125 my $CFG = <$fh>; 185 my $CFG = <$fh>;
126 186
187 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
188 require YAML;
189 utf8::decode $CFG;
190 $::CFG = YAML::Load ($CFG);
127 if ($CFG =~ /^---/) { 191 } elsif ($CFG =~ /^\{/) {
128 $::CFG = parse_yaml $CFG; 192 $::CFG = from_json $CFG;
129 } else { 193 } else {
130 $::CFG = eval $CFG; 194 $::CFG = eval $CFG; ## todo comaptibility cruft
131 } 195 }
132} 196}
133 197
134sub write_cfg { 198sub write_cfg {
135 my ($file) = @_; 199 my ($file) = @_;
136 200
137 $::CFG->{VERSION} = $::VERSION; 201 $::CFG->{VERSION} = $::VERSION;
138 202
139 open my $fh, ">:utf8", $file 203 open my $fh, ">:utf8", $file
140 or return; 204 or return;
141 print $fh YAML::Dump $::CFG; 205 print $fh to_json $::CFG;
206}
207
208sub http_proxy {
209 my @proxy = win32_proxy_info;
210
211 if (@proxy) {
212 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
213 } elsif (exists $ENV{http_proxy}) {
214 $ENV{http_proxy}
215 } else {
216 ()
217 }
218}
219
220sub set_proxy {
221 my $proxy = http_proxy
222 or return;
223
224 $ENV{http_proxy} = $proxy;
225}
226
227sub lwp_useragent {
228 require LWP::UserAgent;
229
230 CFPlus::set_proxy;
231
232 my $ua = LWP::UserAgent->new (
233 agent => "cfplus $VERSION",
234 keep_alive => 1,
235 env_proxy => 1,
236 timeout => 30,
237 );
238}
239
240sub lwp_check($) {
241 my ($res) = @_;
242
243 $res->is_error
244 and die $res->status_line;
245
246 $res
142} 247}
143 248
144our $DB_ENV; 249our $DB_ENV;
250our $DB_STATE;
251
252sub db_table($) {
253 my ($table) = @_;
254
255 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
256
257 new CFPlus::Database
258 -Env => $DB_ENV,
259 -Filename => $table,
260# -Filename => "database",
261# -Subname => $table,
262 -Property => DB_CHKSUM,
263 -Flags => DB_CREATE | DB_UPGRADE,
264 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
265}
145 266
146{ 267{
147 use strict; 268 use strict;
148 269
149 mkdir "$Crossfire::VARDIR/cfplus", 0777; 270 mkdir "$Crossfire::VARDIR/cfplus", 0777;
… …
158# -ErrPrefix => "DATABASE", 279# -ErrPrefix => "DATABASE",
159 -Verbose => 1, 280 -Verbose => 1,
160 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, 281 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
161 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 282 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
162 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; 283 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
163}
164 284
165sub db_table($) { 285 $DB_STATE = db_table "state";
166 my ($table) = @_;
167
168 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
169
170 new CFClient::Database
171 -Env => $DB_ENV,
172 -Filename => $table,
173# -Filename => "database",
174# -Subname => $table,
175 -Property => DB_CHKSUM,
176 -Flags => DB_CREATE | DB_UPGRADE,
177 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
178} 286}
179 287
180package CFClient::Layout; 288package CFPlus::Layout;
181 289
182$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 290$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
183 reset_glyph_cache; 291 reset_glyph_cache;
184}; 292};
185 293
186package CFClient::Item; 294package CFPlus::Item;
187 295
188use strict; 296use strict;
189use Crossfire::Protocol::Constants; 297use Crossfire::Protocol::Constants;
190 298
191my $last_enter_count = 1; 299my $last_enter_count = 1;
… …
225} 333}
226 334
227sub do_n_dialog { 335sub do_n_dialog {
228 my ($cb) = @_; 336 my ($cb) = @_;
229 337
230 my $w = new CFClient::UI::FancyFrame 338 my $w = new CFPlus::UI::Toplevel
231 on_delete => sub { $_[0]->destroy; 1 }, 339 on_delete => sub { $_[0]->destroy; 1 },
232 has_close_button => 1, 340 has_close_button => 1,
233 ; 341 ;
234 342
235 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); 343 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
236 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 344 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
237 $vb->add (my $entry = new CFClient::UI::Entry 345 $vb->add (my $entry = new CFPlus::UI::Entry
238 text => $last_enter_count, 346 text => $last_enter_count,
239 on_activate => sub { 347 on_activate => sub {
240 my ($entry) = @_; 348 my ($entry) = @_;
241 $last_enter_count = $entry->get_text; 349 $last_enter_count = $entry->get_text;
242 $cb->($last_enter_count); 350 $cb->($last_enter_count);
… …
264 372
265 if ($self->{container} == $::CONN->{player}{tag}) { 373 if ($self->{container} == $::CONN->{player}{tag}) {
266 $targ = $::CONN->{open_container}; 374 $targ = $::CONN->{open_container};
267 } 375 }
268 376
269 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 377 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
270 $::CONN->send ("move $targ $self->{tag} 0") 378 $::CONN->send ("move $targ $self->{tag} 0")
271 if $targ || !($self->{flags} & F_LOCKED); 379 if $targ || !($self->{flags} & F_LOCKED);
272 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 380 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
273 $self->{flags} & F_LOCKED 381 $self->{flags} & F_LOCKED
274 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 382 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
275 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 383 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
276 } elsif ($ev->{button} == 1) { 384 } elsif ($ev->{button} == 1) {
277 $::CONN->send ("examine $self->{tag}"); 385 $::CONN->send ("examine $self->{tag}");
… …
288 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 396 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
289 ["ignite/thaw", # first try of an easier use of flint&steel 397 ["ignite/thaw", # first try of an easier use of flint&steel
290 sub { 398 sub {
291 $::CONN->send ("mark ". pack "N", $self->{tag}); 399 $::CONN->send ("mark ". pack "N", $self->{tag});
292 $::CONN->send ("command apply flint and steel"); 400 $::CONN->send ("command apply flint and steel");
401 }
402 ],
403 ["inscribe", # first try of an easier use of flint&steel
404 sub {
405 &::open_string_query ("Text to inscribe", sub {
406 my ($entry, $txt) = @_;
407 $::CONN->send ("mark ". pack "N", $self->{tag});
408 $::CONN->send ("command use_skill inscription $txt");
409 });
410 }
411 ],
412 ["rename", # first try of an easier use of flint&steel
413 sub {
414 &::open_string_query ("Rename item to:", sub {
415 my ($entry, $txt) = @_;
416 $::CONN->send ("mark ". pack "N", $self->{tag});
417 $::CONN->send ("command rename to <$txt>");
418 }, $self->{name},
419 "If you input no name or erase the current custom name, the custom name will be unset");
293 } 420 }
294 ], 421 ],
295 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 422 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
296 ( 423 (
297 $self->{flags} & F_LOCKED 424 $self->{flags} & F_LOCKED
… …
308 ] 435 ]
309 ) 436 )
310 ), 437 ),
311 ); 438 );
312 439
313 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 440 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
314 } 441 }
315 442
316 1 443 1
317 }; 444 };
318 445
… …
326 453
327 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5] 454 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
328 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5] 455 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
329 : undef; 456 : undef;
330 457
331 $self->{face_widget} ||= new CFClient::UI::Face 458 $self->{face_widget} ||= new CFPlus::UI::Face
332 can_events => 1, 459 can_events => 1,
333 can_hover => 1, 460 can_hover => 1,
334 anim => $self->{anim}, 461 anim => $self->{anim},
335 animspeed => $self->{animspeed}, # TODO# must be set at creation time 462 animspeed => $self->{animspeed}, # TODO# must be set at creation time
336 on_button_down => $button_cb, 463 on_button_down => $button_cb,
… …
344 . "Item uses face #$self->{face}. " 471 . "Item uses face #$self->{face}. "
345 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 472 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
346 . "\n\n$tooltip_std" 473 . "\n\n$tooltip_std"
347 ); 474 );
348 475
349 $self->{desc_widget} ||= new CFClient::UI::Label 476 $self->{desc_widget} ||= new CFPlus::UI::Label
350 can_events => 1, 477 can_events => 1,
351 can_hover => 1, 478 can_hover => 1,
352 ellipsise => 2, 479 ellipsise => 2,
353 align => -1, 480 align => -1,
354 on_button_down => $button_cb, 481 on_button_down => $button_cb,
355 ; 482 ;
356 my $desc = CFClient::Item::desc_string $self; 483 my $desc = CFPlus::Item::desc_string $self;
357 $self->{desc_widget}{bg} = $bg; 484 $self->{desc_widget}{bg} = $bg;
358 $self->{desc_widget}->set_text ($desc); 485 $self->{desc_widget}->set_text ($desc);
359 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 486 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
360 487
361 $self->{weight_widget} ||= new CFClient::UI::Label 488 $self->{weight_widget} ||= new CFPlus::UI::Label
362 can_events => 1, 489 can_events => 1,
363 can_hover => 1, 490 can_hover => 1,
364 ellipsise => 0, 491 ellipsise => 0,
365 align => 0, 492 align => 0,
366 on_button_down => $button_cb, 493 on_button_down => $button_cb,
367 ; 494 ;
368 $self->{weight_widget}{bg} = $bg; 495 $self->{weight_widget}{bg} = $bg;
369 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 496 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
370 $self->{weight_widget}->set_tooltip ( 497 $self->{weight_widget}->set_tooltip (
371 "<b>Weight</b>.\n" 498 "<b>Weight</b>.\n"
372 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 499 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
373 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 500 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
374 . "\n\n$tooltip_std" 501 . "\n\n$tooltip_std"

Diff Legend

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