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.106 by root, Mon Jul 24 04:24:42 2006 UTC vs.
Revision 1.126 by root, Tue Nov 7 22:41:27 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.95';
19 21
20 use XSLoader; 22 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 23 XSLoader::load "CFPlus", $VERSION;
24}
25
26BEGIN {
27 $SIG{__DIE__} = sub {
28 return if CFPlus::in_destruct;
29 #CFPlus::fatal $_[0];#d#
30 CFPlus::error Carp::longmess $_[0];#d#
31 die;#d#
32 };
22} 33}
23 34
24use utf8; 35use utf8;
25 36
26use Carp ();
27use AnyEvent (); 37use AnyEvent ();
28use BerkeleyDB; 38use BerkeleyDB;
29use Pod::POM (); 39use Pod::POM ();
30use Scalar::Util (); 40use Scalar::Util ();
31use Storable (); # finally 41use Storable (); # finally
32 42
33our %STAT_TOOLTIP = (
34 Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack",
35 Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed",
36 Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have",
37 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 Wis => "<b>Wisdom</b>, the ability to learn and use divine magic (prayers). Determines how many grace points you can have",
39 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",
40 Cha => "<b>Charisma</b>, how well you are received by NPCs. Affects buying and selling prices in shops.",
41
42 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.",
43 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.",
44 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.",
45 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.",
46 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.",
47 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.",
48);
49
50=item guard { BLOCK } 43=item guard { BLOCK }
51 44
52Returns an object that executes the given block as soon as it is destroyed. 45Returns an object that executes the given block as soon as it is destroyed.
53 46
54=cut 47=cut
55 48
56sub guard(&) { 49sub guard(&) {
57 bless \(my $cb = $_[0]), "CFClient::Guard" 50 bless \(my $cb = $_[0]), "CFPlus::Guard"
58} 51}
59 52
60sub CFClient::Guard::DESTROY { 53sub CFPlus::Guard::DESTROY {
61 ${$_[0]}->() 54 ${$_[0]}->()
62} 55}
63 56
64sub asxml($) { 57sub asxml($) {
65 local $_ = $_[0]; 58 local $_ = $_[0];
… …
69 s/</&lt;/g; 62 s/</&lt;/g;
70 63
71 $_ 64 $_
72} 65}
73 66
67sub socketpipe() {
68 socketpair my $fh1, my $fh2, Socket::AF_UNIX, Socket::SOCK_STREAM, Socket::PF_UNSPEC
69 or die "cannot establish bidiretcional pipe: $!\n";
70
71 ($fh1, $fh2)
72}
73
74sub background(&) {
75 my ($cb) = @_;
76
77 my ($fh_r, $fh_w) = CFPlus::socketpipe;
78
79 my $pid = fork;
80
81 if (defined $pid && !$pid) {
82 local $SIG{__DIE__};
83
84 open STDOUT, ">&", $fh_w;
85 open STDERR, ">&", $fh_w;
86 close $fh_r;
87 close $fh_w;
88
89 $| = 1;
90
91 eval { $cb->() };
92
93 if ($@) {
94 my $msg = $@;
95 $msg =~ s/\n+/\n/;
96 warn "FATAL: $msg";
97 CFPlus::_exit 1;
98 }
99
100 # win32 is fucked up, of course. exit will clean stuff up,
101 # which destroys our database etc. _exit will exit ALL
102 # forked processes, because of the dreaded fork emulation.
103 CFPlus::_exit 0;
104 }
105
106 close $fh_w;
107
108 my $buffer;
109
110 my $w; $w = AnyEvent->io (fh => $fh_r, poll => 'r', cb => sub {
111 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
112 undef $w;
113 $buffer .= "done\n";
114 }
115
116 while ($buffer =~ s/^(.*)\n//) {
117 my $line = $1;
118 $line =~ s/\s+$//;
119 utf8::decode $line;
120 ::message ({
121 markup => "editor($pid): " . CFPlus::asxml $line,
122 });
123 }
124 });
125}
126
74package CFClient::Database; 127package CFPlus::Database;
75 128
76our @ISA = BerkeleyDB::Btree::; 129our @ISA = BerkeleyDB::Btree::;
77 130
78sub get($$) { 131sub get($$) {
79 my $data; 132 my $data;
… …
86my %DB_SYNC; 139my %DB_SYNC;
87 140
88sub put($$$) { 141sub put($$$) {
89 my ($db, $key, $data) = @_; 142 my ($db, $key, $data) = @_;
90 143
144 my $hkey = $db + 0;
145 Scalar::Util::weaken $db;
91 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 146 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
147 delete $DB_SYNC{$hkey};
148 $db->db_sync if $db;
149 });
92 150
93 $db->db_put ($key => $data) 151 $db->db_put ($key => $data)
94} 152}
95 153
96package CFClient; 154package CFPlus;
97 155
98sub find_rcfile($) { 156sub find_rcfile($) {
99 my $path; 157 my $path;
100 158
101 for (grep !ref, @INC) { 159 for (grep !ref, @INC) {
102 $path = "$_/CFClient/resources/$_[0]"; 160 $path = "$_/CFPlus/resources/$_[0]";
103 return $path if -r $path; 161 return $path if -r $path;
104 } 162 }
105 163
106 die "FATAL: can't find required file $_[0]\n"; 164 die "FATAL: can't find required file $_[0]\n";
107} 165}
108 166
167BEGIN {
168 use Crossfire::Protocol::Base ();
169 *to_json = \&Crossfire::Protocol::Base::to_json;
170 *from_json = \&Crossfire::Protocol::Base::from_json;
171}
172
109sub read_cfg { 173sub read_cfg {
110 my ($file) = @_; 174 my ($file) = @_;
111 175
112 open CFG, $file 176 open my $fh, $file
113 or return; 177 or return;
114 178
115 my $CFG;
116
117 local $/; 179 local $/;
118 $CFG = eval <CFG>; 180 my $CFG = <$fh>;
119 181
120 $::CFG = $CFG; 182 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
121 183 require YAML;
122 close CFG; 184 utf8::decode $CFG;
185 $::CFG = YAML::Load ($CFG);
186 } elsif ($CFG =~ /^\{/) {
187 $::CFG = from_json $CFG;
188 } else {
189 $::CFG = eval $CFG; ## todo comaptibility cruft
190 }
123} 191}
124 192
125sub write_cfg { 193sub write_cfg {
126 my ($file) = @_; 194 my ($file) = @_;
127 195
128 open CFG, ">$file" 196 $::CFG->{VERSION} = $::VERSION;
197
198 open my $fh, ">:utf8", $file
129 or return; 199 or return;
200 print $fh to_json $::CFG;
201}
130 202
131 { 203sub http_proxy {
132 require Data::Dumper; 204 my @proxy = win32_proxy_info;
133 local $Data::Dumper::Purity = 1; 205
134 $::CFG->{VERSION} = $::VERSION; 206 if (@proxy) {
135 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); 207 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
208 } elsif (exists $ENV{http_proxy}) {
209 $ENV{http_proxy}
210 } else {
211 ()
136 } 212 }
213}
137 214
138 close CFG; 215sub set_proxy {
216 my $proxy = http_proxy
217 or return;
218
219 $ENV{http_proxy} = $proxy;
139} 220}
140 221
141our $DB_ENV; 222our $DB_ENV;
223our $DB_STATE;
224
225sub db_table($) {
226 my ($table) = @_;
227
228 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
229
230 new CFPlus::Database
231 -Env => $DB_ENV,
232 -Filename => $table,
233# -Filename => "database",
234# -Subname => $table,
235 -Property => DB_CHKSUM,
236 -Flags => DB_CREATE | DB_UPGRADE,
237 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
238}
142 239
143{ 240{
144 use strict; 241 use strict;
145 242
146 mkdir "$Crossfire::VARDIR/cfplus", 0777; 243 mkdir "$Crossfire::VARDIR/cfplus", 0777;
… …
155# -ErrPrefix => "DATABASE", 252# -ErrPrefix => "DATABASE",
156 -Verbose => 1, 253 -Verbose => 1,
157 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, 254 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
158 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 255 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
159 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; 256 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
160}
161 257
162sub db_table($) { 258 $DB_STATE = db_table "state";
163 my ($table) = @_;
164
165 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
166
167 new CFClient::Database
168 -Env => $DB_ENV,
169 -Filename => $table,
170# -Filename => "database",
171# -Subname => $table,
172 -Property => DB_CHKSUM,
173 -Flags => DB_CREATE | DB_UPGRADE,
174 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
175} 259}
176 260
177package CFClient::Layout; 261package CFPlus::Layout;
178 262
179$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 263$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
180 reset_glyph_cache; 264 reset_glyph_cache;
181}; 265};
182 266
183package CFClient::Item; 267package CFPlus::Item;
184 268
185use strict; 269use strict;
186use Crossfire::Protocol::Constants; 270use Crossfire::Protocol::Constants;
187 271
188my $last_enter_count = 1; 272my $last_enter_count = 1;
… …
222} 306}
223 307
224sub do_n_dialog { 308sub do_n_dialog {
225 my ($cb) = @_; 309 my ($cb) = @_;
226 310
227 my $w = new CFClient::UI::FancyFrame 311 my $w = new CFPlus::UI::Toplevel
228 on_delete => sub { $_[0]->destroy; 1 }, 312 on_delete => sub { $_[0]->destroy; 1 },
229 has_close_button => 1, 313 has_close_button => 1,
230 ; 314 ;
231 315
232 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); 316 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
233 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 317 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
234 $vb->add (my $entry = new CFClient::UI::Entry 318 $vb->add (my $entry = new CFPlus::UI::Entry
235 text => $last_enter_count, 319 text => $last_enter_count,
236 on_activate => sub { 320 on_activate => sub {
237 my ($entry) = @_; 321 my ($entry) = @_;
238 $last_enter_count = $entry->get_text; 322 $last_enter_count = $entry->get_text;
239 $cb->($last_enter_count); 323 $cb->($last_enter_count);
… …
261 345
262 if ($self->{container} == $::CONN->{player}{tag}) { 346 if ($self->{container} == $::CONN->{player}{tag}) {
263 $targ = $::CONN->{open_container}; 347 $targ = $::CONN->{open_container};
264 } 348 }
265 349
266 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 350 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
267 $::CONN->send ("move $targ $self->{tag} 0") 351 $::CONN->send ("move $targ $self->{tag} 0")
268 if $targ || !($self->{flags} & F_LOCKED); 352 if $targ || !($self->{flags} & F_LOCKED);
269 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 353 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
270 $self->{flags} & F_LOCKED 354 $self->{flags} & F_LOCKED
271 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 355 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
272 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 356 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
273 } elsif ($ev->{button} == 1) { 357 } elsif ($ev->{button} == 1) {
274 $::CONN->send ("examine $self->{tag}"); 358 $::CONN->send ("examine $self->{tag}");
… …
285 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 369 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
286 ["ignite/thaw", # first try of an easier use of flint&steel 370 ["ignite/thaw", # first try of an easier use of flint&steel
287 sub { 371 sub {
288 $::CONN->send ("mark ". pack "N", $self->{tag}); 372 $::CONN->send ("mark ". pack "N", $self->{tag});
289 $::CONN->send ("command apply flint and steel"); 373 $::CONN->send ("command apply flint and steel");
374 }
375 ],
376 ["inscribe", # first try of an easier use of flint&steel
377 sub {
378 &::open_string_query ("Text to inscribe", sub {
379 my ($entry, $txt) = @_;
380 $::CONN->send ("mark ". pack "N", $self->{tag});
381 $::CONN->send ("command use_skill inscription $txt");
382 });
383 }
384 ],
385 ["rename", # first try of an easier use of flint&steel
386 sub {
387 &::open_string_query ("Rename item to:", sub {
388 my ($entry, $txt) = @_;
389 $::CONN->send ("mark ". pack "N", $self->{tag});
390 $::CONN->send ("command rename to <$txt>");
391 }, $self->{name},
392 "If you input no name or erase the current custom name, the custom name will be unset");
290 } 393 }
291 ], 394 ],
292 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 395 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
293 ( 396 (
294 $self->{flags} & F_LOCKED 397 $self->{flags} & F_LOCKED
… …
305 ] 408 ]
306 ) 409 )
307 ), 410 ),
308 ); 411 );
309 412
310 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 413 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
311 } 414 }
312 415
313 1 416 1
314 }; 417 };
315 418
… …
323 426
324 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5] 427 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
325 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5] 428 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
326 : undef; 429 : undef;
327 430
328 $self->{face_widget} ||= new CFClient::UI::Face 431 $self->{face_widget} ||= new CFPlus::UI::Face
329 can_events => 1, 432 can_events => 1,
330 can_hover => 1, 433 can_hover => 1,
331 anim => $self->{anim}, 434 anim => $self->{anim},
332 animspeed => $self->{animspeed}, # TODO# must be set at creation time 435 animspeed => $self->{animspeed}, # TODO# must be set at creation time
333 on_button_down => $button_cb, 436 on_button_down => $button_cb,
… …
341 . "Item uses face #$self->{face}. " 444 . "Item uses face #$self->{face}. "
342 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 445 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
343 . "\n\n$tooltip_std" 446 . "\n\n$tooltip_std"
344 ); 447 );
345 448
346 $self->{desc_widget} ||= new CFClient::UI::Label 449 $self->{desc_widget} ||= new CFPlus::UI::Label
347 can_events => 1, 450 can_events => 1,
348 can_hover => 1, 451 can_hover => 1,
349 ellipsise => 2, 452 ellipsise => 2,
350 align => -1, 453 align => -1,
351 on_button_down => $button_cb, 454 on_button_down => $button_cb,
352 ; 455 ;
353 my $desc = CFClient::Item::desc_string $self; 456 my $desc = CFPlus::Item::desc_string $self;
354 $self->{desc_widget}{bg} = $bg; 457 $self->{desc_widget}{bg} = $bg;
355 $self->{desc_widget}->set_text ($desc); 458 $self->{desc_widget}->set_text ($desc);
356 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 459 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
357 460
358 $self->{weight_widget} ||= new CFClient::UI::Label 461 $self->{weight_widget} ||= new CFPlus::UI::Label
359 can_events => 1, 462 can_events => 1,
360 can_hover => 1, 463 can_hover => 1,
361 ellipsise => 0, 464 ellipsise => 0,
362 align => 0, 465 align => 0,
363 on_button_down => $button_cb, 466 on_button_down => $button_cb,
364 ; 467 ;
365 $self->{weight_widget}{bg} = $bg; 468 $self->{weight_widget}{bg} = $bg;
366 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 469 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
367 $self->{weight_widget}->set_tooltip ( 470 $self->{weight_widget}->set_tooltip (
368 "<b>Weight</b>.\n" 471 "<b>Weight</b>.\n"
369 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 472 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
370 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 473 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
371 . "\n\n$tooltip_std" 474 . "\n\n$tooltip_std"

Diff Legend

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