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.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 YAML ();
32use Storable (); # finally 41use Storable (); # finally
33 42
34our %STAT_TOOLTIP = (
35 Str => "<b>Physical Strength</b>, determines damage dealt with weapons, how much you can carry, and how often you can attack",
36 Dex => "<b>Dexterity</b>, your physical agility. Determines chance of being hit and affects armor class and speed",
37 Con => "<b>Constitution</b>, physical health and toughness. Determines how many healthpoints you can have",
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",
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
51=item guard { BLOCK } 43=item guard { BLOCK }
52 44
53Returns 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.
54 46
55=cut 47=cut
56 48
57sub guard(&) { 49sub guard(&) {
58 bless \(my $cb = $_[0]), "CFClient::Guard" 50 bless \(my $cb = $_[0]), "CFPlus::Guard"
59} 51}
60 52
61sub CFClient::Guard::DESTROY { 53sub CFPlus::Guard::DESTROY {
62 ${$_[0]}->() 54 ${$_[0]}->()
63} 55}
64 56
65sub asxml($) { 57sub asxml($) {
66 local $_ = $_[0]; 58 local $_ = $_[0];
… …
70 s/</&lt;/g; 62 s/</&lt;/g;
71 63
72 $_ 64 $_
73} 65}
74 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
75package CFClient::Database; 127package CFPlus::Database;
76 128
77our @ISA = BerkeleyDB::Btree::; 129our @ISA = BerkeleyDB::Btree::;
78 130
79sub get($$) { 131sub get($$) {
80 my $data; 132 my $data;
… …
87my %DB_SYNC; 139my %DB_SYNC;
88 140
89sub put($$$) { 141sub put($$$) {
90 my ($db, $key, $data) = @_; 142 my ($db, $key, $data) = @_;
91 143
144 my $hkey = $db + 0;
145 Scalar::Util::weaken $db;
92 $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 });
93 150
94 $db->db_put ($key => $data) 151 $db->db_put ($key => $data)
95} 152}
96 153
97package CFClient; 154package CFPlus;
98 155
99sub find_rcfile($) { 156sub find_rcfile($) {
100 my $path; 157 my $path;
101 158
102 for (grep !ref, @INC) { 159 for (grep !ref, @INC) {
103 $path = "$_/CFClient/resources/$_[0]"; 160 $path = "$_/CFPlus/resources/$_[0]";
104 return $path if -r $path; 161 return $path if -r $path;
105 } 162 }
106 163
107 die "FATAL: can't find required file $_[0]\n"; 164 die "FATAL: can't find required file $_[0]\n";
108} 165}
109 166
110sub parse_yaml { 167BEGIN {
111 my $text = shift; 168 use Crossfire::Protocol::Base ();
112 169 *to_json = \&Crossfire::Protocol::Base::to_json;
113 utf8::decode $text; 170 *from_json = \&Crossfire::Protocol::Base::from_json;
114
115 YAML::Load $text
116} 171}
117 172
118sub read_cfg { 173sub read_cfg {
119 my ($file) = @_; 174 my ($file) = @_;
120 175
… …
122 or return; 177 or return;
123 178
124 local $/; 179 local $/;
125 my $CFG = <$fh>; 180 my $CFG = <$fh>;
126 181
182 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
183 require YAML;
184 utf8::decode $CFG;
185 $::CFG = YAML::Load ($CFG);
127 if ($CFG =~ /^---/) { 186 } elsif ($CFG =~ /^\{/) {
128 $::CFG = parse_yaml $CFG; 187 $::CFG = from_json $CFG;
129 } else { 188 } else {
130 $::CFG = eval $CFG; 189 $::CFG = eval $CFG; ## todo comaptibility cruft
131 } 190 }
132} 191}
133 192
134sub write_cfg { 193sub write_cfg {
135 my ($file) = @_; 194 my ($file) = @_;
136 195
137 $::CFG->{VERSION} = $::VERSION; 196 $::CFG->{VERSION} = $::VERSION;
138 197
139 open my $fh, ">:utf8", $file 198 open my $fh, ">:utf8", $file
140 or return; 199 or return;
141 print $fh YAML::Dump $::CFG; 200 print $fh to_json $::CFG;
201}
202
203sub http_proxy {
204 my @proxy = win32_proxy_info;
205
206 if (@proxy) {
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 ()
212 }
213}
214
215sub set_proxy {
216 my $proxy = http_proxy
217 or return;
218
219 $ENV{http_proxy} = $proxy;
142} 220}
143 221
144our $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}
145 239
146{ 240{
147 use strict; 241 use strict;
148 242
149 mkdir "$Crossfire::VARDIR/cfplus", 0777; 243 mkdir "$Crossfire::VARDIR/cfplus", 0777;
… …
158# -ErrPrefix => "DATABASE", 252# -ErrPrefix => "DATABASE",
159 -Verbose => 1, 253 -Verbose => 1,
160 -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,
161 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE, 255 -SetFlags => DB_AUTO_COMMIT | DB_LOG_AUTOREMOVE,
162 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";
163}
164 257
165sub db_table($) { 258 $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} 259}
179 260
180package CFClient::Layout; 261package CFPlus::Layout;
181 262
182$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 263$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
183 reset_glyph_cache; 264 reset_glyph_cache;
184}; 265};
185 266
186package CFClient::Item; 267package CFPlus::Item;
187 268
188use strict; 269use strict;
189use Crossfire::Protocol::Constants; 270use Crossfire::Protocol::Constants;
190 271
191my $last_enter_count = 1; 272my $last_enter_count = 1;
… …
225} 306}
226 307
227sub do_n_dialog { 308sub do_n_dialog {
228 my ($cb) = @_; 309 my ($cb) = @_;
229 310
230 my $w = new CFClient::UI::FancyFrame 311 my $w = new CFPlus::UI::Toplevel
231 on_delete => sub { $_[0]->destroy; 1 }, 312 on_delete => sub { $_[0]->destroy; 1 },
232 has_close_button => 1, 313 has_close_button => 1,
233 ; 314 ;
234 315
235 $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");
236 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 317 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
237 $vb->add (my $entry = new CFClient::UI::Entry 318 $vb->add (my $entry = new CFPlus::UI::Entry
238 text => $last_enter_count, 319 text => $last_enter_count,
239 on_activate => sub { 320 on_activate => sub {
240 my ($entry) = @_; 321 my ($entry) = @_;
241 $last_enter_count = $entry->get_text; 322 $last_enter_count = $entry->get_text;
242 $cb->($last_enter_count); 323 $cb->($last_enter_count);
… …
264 345
265 if ($self->{container} == $::CONN->{player}{tag}) { 346 if ($self->{container} == $::CONN->{player}{tag}) {
266 $targ = $::CONN->{open_container}; 347 $targ = $::CONN->{open_container};
267 } 348 }
268 349
269 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 350 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
270 $::CONN->send ("move $targ $self->{tag} 0") 351 $::CONN->send ("move $targ $self->{tag} 0")
271 if $targ || !($self->{flags} & F_LOCKED); 352 if $targ || !($self->{flags} & F_LOCKED);
272 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 353 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
273 $self->{flags} & F_LOCKED 354 $self->{flags} & F_LOCKED
274 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 355 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
275 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 356 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
276 } elsif ($ev->{button} == 1) { 357 } elsif ($ev->{button} == 1) {
277 $::CONN->send ("examine $self->{tag}"); 358 $::CONN->send ("examine $self->{tag}");
… …
288 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }], 369 ["mark", sub { $::CONN->send ("mark ". pack "N", $self->{tag}) }],
289 ["ignite/thaw", # first try of an easier use of flint&steel 370 ["ignite/thaw", # first try of an easier use of flint&steel
290 sub { 371 sub {
291 $::CONN->send ("mark ". pack "N", $self->{tag}); 372 $::CONN->send ("mark ". pack "N", $self->{tag});
292 $::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");
293 } 393 }
294 ], 394 ],
295 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 395 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
296 ( 396 (
297 $self->{flags} & F_LOCKED 397 $self->{flags} & F_LOCKED
… …
308 ] 408 ]
309 ) 409 )
310 ), 410 ),
311 ); 411 );
312 412
313 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 413 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
314 } 414 }
315 415
316 1 416 1
317 }; 417 };
318 418
… …
326 426
327 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5] 427 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
328 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5] 428 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
329 : undef; 429 : undef;
330 430
331 $self->{face_widget} ||= new CFClient::UI::Face 431 $self->{face_widget} ||= new CFPlus::UI::Face
332 can_events => 1, 432 can_events => 1,
333 can_hover => 1, 433 can_hover => 1,
334 anim => $self->{anim}, 434 anim => $self->{anim},
335 animspeed => $self->{animspeed}, # TODO# must be set at creation time 435 animspeed => $self->{animspeed}, # TODO# must be set at creation time
336 on_button_down => $button_cb, 436 on_button_down => $button_cb,
… …
344 . "Item uses face #$self->{face}. " 444 . "Item uses face #$self->{face}. "
345 . ($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. ")
346 . "\n\n$tooltip_std" 446 . "\n\n$tooltip_std"
347 ); 447 );
348 448
349 $self->{desc_widget} ||= new CFClient::UI::Label 449 $self->{desc_widget} ||= new CFPlus::UI::Label
350 can_events => 1, 450 can_events => 1,
351 can_hover => 1, 451 can_hover => 1,
352 ellipsise => 2, 452 ellipsise => 2,
353 align => -1, 453 align => -1,
354 on_button_down => $button_cb, 454 on_button_down => $button_cb,
355 ; 455 ;
356 my $desc = CFClient::Item::desc_string $self; 456 my $desc = CFPlus::Item::desc_string $self;
357 $self->{desc_widget}{bg} = $bg; 457 $self->{desc_widget}{bg} = $bg;
358 $self->{desc_widget}->set_text ($desc); 458 $self->{desc_widget}->set_text ($desc);
359 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 459 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
360 460
361 $self->{weight_widget} ||= new CFClient::UI::Label 461 $self->{weight_widget} ||= new CFPlus::UI::Label
362 can_events => 1, 462 can_events => 1,
363 can_hover => 1, 463 can_hover => 1,
364 ellipsise => 0, 464 ellipsise => 0,
365 align => 0, 465 align => 0,
366 on_button_down => $button_cb, 466 on_button_down => $button_cb,
367 ; 467 ;
368 $self->{weight_widget}{bg} = $bg; 468 $self->{weight_widget}{bg} = $bg;
369 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 469 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
370 $self->{weight_widget}->set_tooltip ( 470 $self->{weight_widget}->set_tooltip (
371 "<b>Weight</b>.\n" 471 "<b>Weight</b>.\n"
372 . ($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. ")
373 . ($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. ")
374 . "\n\n$tooltip_std" 474 . "\n\n$tooltip_std"

Diff Legend

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