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.123 by root, Mon Oct 9 01:06:36 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.52';
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 $SIG{__DIE__} = sub {
83 my $msg = $_[0];
84 $msg =~ s/\n+/\n/;
85 warn "FATAL: $msg";
86 CFPlus::_exit 99;
87 };
88
89 open STDOUT, ">&", $fh_w;
90 open STDERR, ">&", $fh_w;
91 close $fh_r;
92 close $fh_w;
93
94 $| = 1;
95
96 $cb->();
97
98 # win32 is fucked up, of course. exit will clean stuff up,
99 # which destroys our database etc. _exit will exit ALL
100 # forked processes, because of the dreaded fork emulation.
101 CFPlus::_exit 0;
102 }
103
104 close $fh_w;
105
106 my $buffer;
107
108 Event->io (fd => $fh_r, poll => 'r', cb => sub {
109 unless (sysread $fh_r, $buffer, 4096, length $buffer) {
110 $_[0]->w->cancel;
111 $buffer .= "done\n";
112 }
113
114 while ($buffer =~ s/^(.*)\n//) {
115 my $line = $1;
116 utf8::decode $line;
117 ::message ({
118 markup => "editor($pid): " . CFPlus::asxml $line,
119 });
120 }
121 });
122}
123
74package CFClient::Database; 124package CFPlus::Database;
75 125
76our @ISA = BerkeleyDB::Btree::; 126our @ISA = BerkeleyDB::Btree::;
77 127
78sub get($$) { 128sub get($$) {
79 my $data; 129 my $data;
… …
86my %DB_SYNC; 136my %DB_SYNC;
87 137
88sub put($$$) { 138sub put($$$) {
89 my ($db, $key, $data) = @_; 139 my ($db, $key, $data) = @_;
90 140
141 my $hkey = $db + 0;
142 Scalar::Util::weaken $db;
91 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 143 $DB_SYNC{$hkey} ||= AnyEvent->timer (after => 5, cb => sub {
144 delete $DB_SYNC{$hkey};
145 $db->db_sync if $db;
146 });
92 147
93 $db->db_put ($key => $data) 148 $db->db_put ($key => $data)
94} 149}
95 150
96package CFClient; 151package CFPlus;
97 152
98sub find_rcfile($) { 153sub find_rcfile($) {
99 my $path; 154 my $path;
100 155
101 for (grep !ref, @INC) { 156 for (grep !ref, @INC) {
102 $path = "$_/CFClient/resources/$_[0]"; 157 $path = "$_/CFPlus/resources/$_[0]";
103 return $path if -r $path; 158 return $path if -r $path;
104 } 159 }
105 160
106 die "FATAL: can't find required file $_[0]\n"; 161 die "FATAL: can't find required file $_[0]\n";
107} 162}
108 163
164BEGIN {
165 use Crossfire::Protocol::Base ();
166 *to_json = \&Crossfire::Protocol::Base::to_json;
167 *from_json = \&Crossfire::Protocol::Base::from_json;
168}
169
109sub read_cfg { 170sub read_cfg {
110 my ($file) = @_; 171 my ($file) = @_;
111 172
112 open CFG, $file 173 open my $fh, $file
113 or return; 174 or return;
114 175
115 my $CFG;
116
117 local $/; 176 local $/;
118 $CFG = eval <CFG>; 177 my $CFG = <$fh>;
119 178
120 $::CFG = $CFG; 179 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
121 180 require YAML;
122 close CFG; 181 utf8::decode $CFG;
182 $::CFG = YAML::Load ($CFG);
183 } elsif ($CFG =~ /^\{/) {
184 $::CFG = from_json $CFG;
185 } else {
186 $::CFG = eval $CFG; ## todo comaptibility cruft
187 }
123} 188}
124 189
125sub write_cfg { 190sub write_cfg {
126 my ($file) = @_; 191 my ($file) = @_;
127 192
128 open CFG, ">$file" 193 $::CFG->{VERSION} = $::VERSION;
194
195 open my $fh, ">:utf8", $file
129 or return; 196 or return;
197 print $fh to_json $::CFG;
198}
130 199
131 { 200sub http_proxy {
132 require Data::Dumper; 201 my @proxy = win32_proxy_info;
133 local $Data::Dumper::Purity = 1; 202
134 $::CFG->{VERSION} = $::VERSION; 203 if (@proxy) {
135 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]); 204 "http://" . (@proxy < 2 ? "" : @proxy < 3 ? "$proxy[1]\@" : "$proxy[1]:$proxy[2]\@") . $proxy[0]
205 } elsif (exists $ENV{http_proxy}) {
206 $ENV{http_proxy}
207 } else {
208 ()
136 } 209 }
210}
137 211
138 close CFG; 212sub set_proxy {
213 my $proxy = http_proxy
214 or return;
215
216 $ENV{http_proxy} = $proxy;
139} 217}
140 218
141our $DB_ENV; 219our $DB_ENV;
220our $DB_STATE;
221
222sub db_table($) {
223 my ($table) = @_;
224
225 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
226
227 new CFPlus::Database
228 -Env => $DB_ENV,
229 -Filename => $table,
230# -Filename => "database",
231# -Subname => $table,
232 -Property => DB_CHKSUM,
233 -Flags => DB_CREATE | DB_UPGRADE,
234 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
235}
142 236
143{ 237{
144 use strict; 238 use strict;
145 239
146 mkdir "$Crossfire::VARDIR/cfplus", 0777; 240 mkdir "$Crossfire::VARDIR/cfplus", 0777;
… …
155# -ErrPrefix => "DATABASE", 249# -ErrPrefix => "DATABASE",
156 -Verbose => 1, 250 -Verbose => 1,
157 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover, 251 -Flags => DB_CREATE | DB_RECOVER | DB_INIT_MPOOL | DB_INIT_LOCK | DB_INIT_TXN | $recover,
158 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 252 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
159 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error"; 253 or die "unable to create/open database home $Crossfire::VARDIR/cfplus: $BerkeleyDB::Error";
160}
161 254
162sub db_table($) { 255 $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} 256}
176 257
177package CFClient::Layout; 258package CFPlus::Layout;
178 259
179$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 260$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
180 reset_glyph_cache; 261 reset_glyph_cache;
181}; 262};
182 263
183package CFClient::Item; 264package CFPlus::Item;
184 265
185use strict; 266use strict;
186use Crossfire::Protocol::Constants; 267use Crossfire::Protocol::Constants;
187 268
188my $last_enter_count = 1; 269my $last_enter_count = 1;
… …
222} 303}
223 304
224sub do_n_dialog { 305sub do_n_dialog {
225 my ($cb) = @_; 306 my ($cb) = @_;
226 307
227 my $w = new CFClient::UI::FancyFrame 308 my $w = new CFPlus::UI::Toplevel
228 on_delete => sub { $_[0]->destroy; 1 }, 309 on_delete => sub { $_[0]->destroy; 1 },
229 has_close_button => 1, 310 has_close_button => 1,
230 ; 311 ;
231 312
232 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); 313 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
233 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 314 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
234 $vb->add (my $entry = new CFClient::UI::Entry 315 $vb->add (my $entry = new CFPlus::UI::Entry
235 text => $last_enter_count, 316 text => $last_enter_count,
236 on_activate => sub { 317 on_activate => sub {
237 my ($entry) = @_; 318 my ($entry) = @_;
238 $last_enter_count = $entry->get_text; 319 $last_enter_count = $entry->get_text;
239 $cb->($last_enter_count); 320 $cb->($last_enter_count);
… …
261 342
262 if ($self->{container} == $::CONN->{player}{tag}) { 343 if ($self->{container} == $::CONN->{player}{tag}) {
263 $targ = $::CONN->{open_container}; 344 $targ = $::CONN->{open_container};
264 } 345 }
265 346
266 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 347 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
267 $::CONN->send ("move $targ $self->{tag} 0") 348 $::CONN->send ("move $targ $self->{tag} 0")
268 if $targ || !($self->{flags} & F_LOCKED); 349 if $targ || !($self->{flags} & F_LOCKED);
269 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 350 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
270 $self->{flags} & F_LOCKED 351 $self->{flags} & F_LOCKED
271 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 352 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
272 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 353 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
273 } elsif ($ev->{button} == 1) { 354 } elsif ($ev->{button} == 1) {
274 $::CONN->send ("examine $self->{tag}"); 355 $::CONN->send ("examine $self->{tag}");
… …
285 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 366 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
286 ["ignite/thaw", # first try of an easier use of flint&steel 367 ["ignite/thaw", # first try of an easier use of flint&steel
287 sub { 368 sub {
288 $::CONN->send ("mark ". pack "N", $self->{tag}); 369 $::CONN->send ("mark ". pack "N", $self->{tag});
289 $::CONN->send ("command apply flint and steel"); 370 $::CONN->send ("command apply flint and steel");
371 }
372 ],
373 ["inscribe", # first try of an easier use of flint&steel
374 sub {
375 &::open_string_query ("Text to inscribe", sub {
376 my ($entry, $txt) = @_;
377 $::CONN->send ("mark ". pack "N", $self->{tag});
378 $::CONN->send ("command use_skill inscription $txt");
379 });
380 }
381 ],
382 ["rename", # first try of an easier use of flint&steel
383 sub {
384 &::open_string_query ("Rename item to:", sub {
385 my ($entry, $txt) = @_;
386 $::CONN->send ("mark ". pack "N", $self->{tag});
387 $::CONN->send ("command rename to <$txt>");
388 }, $self->{name},
389 "If you input no name or erase the current custom name, the custom name will be unset");
290 } 390 }
291 ], 391 ],
292 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 392 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
293 ( 393 (
294 $self->{flags} & F_LOCKED 394 $self->{flags} & F_LOCKED
… …
305 ] 405 ]
306 ) 406 )
307 ), 407 ),
308 ); 408 );
309 409
310 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 410 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
311 } 411 }
312 412
313 1 413 1
314 }; 414 };
315 415
… …
323 423
324 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5] 424 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
325 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5] 425 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
326 : undef; 426 : undef;
327 427
328 $self->{face_widget} ||= new CFClient::UI::Face 428 $self->{face_widget} ||= new CFPlus::UI::Face
329 can_events => 1, 429 can_events => 1,
330 can_hover => 1, 430 can_hover => 1,
331 anim => $self->{anim}, 431 anim => $self->{anim},
332 animspeed => $self->{animspeed}, # TODO# must be set at creation time 432 animspeed => $self->{animspeed}, # TODO# must be set at creation time
333 on_button_down => $button_cb, 433 on_button_down => $button_cb,
… …
341 . "Item uses face #$self->{face}. " 441 . "Item uses face #$self->{face}. "
342 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 442 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
343 . "\n\n$tooltip_std" 443 . "\n\n$tooltip_std"
344 ); 444 );
345 445
346 $self->{desc_widget} ||= new CFClient::UI::Label 446 $self->{desc_widget} ||= new CFPlus::UI::Label
347 can_events => 1, 447 can_events => 1,
348 can_hover => 1, 448 can_hover => 1,
349 ellipsise => 2, 449 ellipsise => 2,
350 align => -1, 450 align => -1,
351 on_button_down => $button_cb, 451 on_button_down => $button_cb,
352 ; 452 ;
353 my $desc = CFClient::Item::desc_string $self; 453 my $desc = CFPlus::Item::desc_string $self;
354 $self->{desc_widget}{bg} = $bg; 454 $self->{desc_widget}{bg} = $bg;
355 $self->{desc_widget}->set_text ($desc); 455 $self->{desc_widget}->set_text ($desc);
356 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 456 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
357 457
358 $self->{weight_widget} ||= new CFClient::UI::Label 458 $self->{weight_widget} ||= new CFPlus::UI::Label
359 can_events => 1, 459 can_events => 1,
360 can_hover => 1, 460 can_hover => 1,
361 ellipsise => 0, 461 ellipsise => 0,
362 align => 0, 462 align => 0,
363 on_button_down => $button_cb, 463 on_button_down => $button_cb,
364 ; 464 ;
365 $self->{weight_widget}{bg} = $bg; 465 $self->{weight_widget}{bg} = $bg;
366 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 466 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
367 $self->{weight_widget}->set_tooltip ( 467 $self->{weight_widget}->set_tooltip (
368 "<b>Weight</b>.\n" 468 "<b>Weight</b>.\n"
369 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 469 . ($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. ") 470 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
371 . "\n\n$tooltip_std" 471 . "\n\n$tooltip_std"

Diff Legend

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