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.102 by root, Sat Jul 22 13:20:33 2006 UTC vs.
Revision 1.110 by root, Sun Jul 30 17:43:26 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 16
17BEGIN { 17BEGIN {
18 $VERSION = '0.1'; 18 $VERSION = '0.1';
19 19
20 use XSLoader; 20 use XSLoader;
21 XSLoader::load "CFClient", $VERSION; 21 XSLoader::load "CFPlus", $VERSION;
22} 22}
23 23
24use utf8; 24use utf8;
25 25
26use Carp (); 26use Carp ();
… …
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.", 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.", 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.", 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); 48);
49 49
50package CFClient::PodToPango; 50=item guard { BLOCK }
51 51
52use base Pod::POM::View::Text; 52Returns an object that executes the given block as soon as it is destroyed.
53 53
54our $VERSION = 1; # bump if resultant formatting changes 54=cut
55 55
56our $indent = 0; 56sub guard(&) {
57 57 bless \(my $cb = $_[0]), "CFPlus::Guard"
58*view_seq_code =
59*view_seq_bold = sub { "<b>$_[1]</b>" };
60*view_seq_italic = sub { "<i>$_[1]</i>" };
61*view_seq_space =
62*view_seq_link =
63*view_seq_index = sub { CFClient::UI::Label::escape ($_[1]) };
64
65sub view_seq_text {
66 my $text = $_[1];
67 $text =~ s/\s+/ /g;
68 CFClient::UI::Label::escape ($text)
69} 58}
70 59
71sub view_item { 60sub CFPlus::Guard::DESTROY {
72 ("\t" x ($indent / 4)) 61 ${$_[0]}->()
73 . $_[1]->title->present ($_[0])
74 . "\n\n"
75 . $_[1]->content->present ($_[0])
76} 62}
77 63
78sub view_verbatim { 64sub asxml($) {
79 (join "", 65 local $_ = $_[0];
80 map +("\t" x ($indent / 2)) . "<tt>$_</tt>\n",
81 split /\n/, CFClient::UI::Label::escape ($_[1]))
82 . "\n"
83}
84 66
85sub view_textblock { 67 s/&/&amp;/g;
86 ("\t" x ($indent / 2)) . "$_[1]\n\n" 68 s/>/&gt;/g;
87} 69 s/</&lt;/g;
88 70
89sub view_head1 { 71 $_
90 "\n\n<span foreground='#ffff00' size='x-large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
91 . $_[1]->content->present ($_[0])
92};
93
94sub view_head2 {
95 "\n<span foreground='#ccccff' size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
96 . $_[1]->content->present ($_[0])
97};
98
99sub view_head3 {
100 "\n<span size='large'>" . $_[1]->title->present ($_[0]) . "</span>\n\n"
101 . $_[1]->content->present ($_[0])
102};
103
104sub view_over {
105 local $indent = $indent + $_[1]->indent;
106 $_[1]->content->present ($_[0])
107} 72}
108 73
109package CFClient::Database; 74package CFPlus::Database;
110 75
111our @ISA = BerkeleyDB::Btree::; 76our @ISA = BerkeleyDB::Btree::;
112 77
113sub get($$) { 78sub get($$) {
114 my $data; 79 my $data;
… …
126 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync }); 91 $DB_SYNC{$db} = AnyEvent->timer (after => 5, cb => sub { $db->db_sync });
127 92
128 $db->db_put ($key => $data) 93 $db->db_put ($key => $data)
129} 94}
130 95
131package CFClient; 96package CFPlus;
132 97
133sub find_rcfile($) { 98sub find_rcfile($) {
134 my $path; 99 my $path;
135 100
136 for (grep !ref, @INC) { 101 for (grep !ref, @INC) {
137 $path = "$_/CFClient/resources/$_[0]"; 102 $path = "$_/CFPlus/resources/$_[0]";
138 return $path if -r $path; 103 return $path if -r $path;
139 } 104 }
140 105
141 die "FATAL: can't find required file $_[0]\n"; 106 die "FATAL: can't find required file $_[0]\n";
142} 107}
143 108
109BEGIN {
110 use Crossfire::Protocol::Base ();
111 *to_json = \&Crossfire::Protocol::Base::to_json;
112 *from_json = \&Crossfire::Protocol::Base::from_json;
113}
114
144sub read_cfg { 115sub read_cfg {
145 my ($file) = @_; 116 my ($file) = @_;
146 117
147 open CFG, $file 118 open my $fh, $file
148 or return; 119 or return;
149 120
150 my $CFG;
151
152 local $/; 121 local $/;
153 $CFG = eval <CFG>; 122 my $CFG = <$fh>;
154 123
155 $::CFG = $CFG; 124 if ($CFG =~ /^---/) { ## TODO compatibility cruft, remove
156 125 require YAML;
157 close CFG; 126 utf8::decode $CFG;
127 $::CFG = YAML::Load ($CFG);
128 } elsif ($CFG =~ /^\{/) {
129 $::CFG = from_json $CFG;
130 } else {
131 $::CFG = eval $CFG; ## todo comaptibility cruft
132 }
158} 133}
159 134
160sub write_cfg { 135sub write_cfg {
161 my ($file) = @_; 136 my ($file) = @_;
162 137
163 open CFG, ">$file" 138 $::CFG->{VERSION} = $::VERSION;
139
140 open my $fh, ">:utf8", $file
164 or return; 141 or return;
165 142 print $fh to_json $::CFG;
166 {
167 require Data::Dumper;
168 local $Data::Dumper::Purity = 1;
169 $::CFG->{VERSION} = $::VERSION;
170 print CFG Data::Dumper->Dump ([$::CFG], [qw/CFG/]);
171 }
172
173 close CFG;
174} 143}
175 144
176our $DB_ENV; 145our $DB_ENV;
177 146
178{ 147{
… …
197sub db_table($) { 166sub db_table($) {
198 my ($table) = @_; 167 my ($table) = @_;
199 168
200 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 169 $table =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
201 170
202 new CFClient::Database 171 new CFPlus::Database
203 -Env => $DB_ENV, 172 -Env => $DB_ENV,
204 -Filename => $table, 173 -Filename => $table,
205# -Filename => "database", 174# -Filename => "database",
206# -Subname => $table, 175# -Subname => $table,
207 -Property => DB_CHKSUM, 176 -Property => DB_CHKSUM,
208 -Flags => DB_CREATE | DB_UPGRADE, 177 -Flags => DB_CREATE | DB_UPGRADE,
209 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error" 178 or die "unable to create/open database table $_[0]: $BerkeleyDB::Error"
210} 179}
211 180
212my $pod_cache = db_table "pod_cache";
213
214sub load_pod($$$$) {
215 my ($path, $filtertype, $filterversion, $filtercb) = @_;
216
217 stat $path
218 or die "$path: $!";
219
220 my $phash = join ",", $filterversion, $CFClient::PodToPango::VERSION, (stat _)[7,9];
221
222 my ($chash, $pom) = eval { @{ Storable::thaw $pod_cache->get ("$path/$filtertype") } };
223
224 return $pom if $chash eq $phash;
225
226 my $pod = do {
227 local $/;
228 open my $pod, "<:utf8", $_[0]
229 or die "$_[0]: $!";
230 <$pod>
231 };
232
233 #utf8::downgrade $pod;
234
235 $pom = $filtercb-> (Pod::POM->new->parse_text ($pod));
236
237 $pod_cache->put ("$path/$filtertype" => Storable::nfreeze [$phash, $pom]);
238
239 $pom
240}
241
242sub pod_to_pango($) {
243 my ($pom) = @_;
244
245 $pom->present ("CFClient::PodToPango")
246}
247
248sub pod_to_pango_list($) {
249 my ($pom) = @_;
250
251 [
252 map s/^(\s*)// && [40 * length $1, length $_ ? $_ : " "],
253 split /\n/, $pom->present ("CFClient::PodToPango")
254 ]
255}
256
257package CFClient::Layout; 181package CFPlus::Layout;
258 182
259$CFClient::OpenGL::SHUTDOWN_HOOK{"CFClient::Layout"} = sub { 183$CFPlus::OpenGL::SHUTDOWN_HOOK{"CFPlus::Layout"} = sub {
260 reset_glyph_cache; 184 reset_glyph_cache;
261}; 185};
262 186
263package CFClient::Item; 187package CFPlus::Item;
264 188
265use strict; 189use strict;
266use Crossfire::Protocol::Constants; 190use Crossfire::Protocol::Constants;
267 191
268my $last_enter_count = 1; 192my $last_enter_count = 1;
… …
302} 226}
303 227
304sub do_n_dialog { 228sub do_n_dialog {
305 my ($cb) = @_; 229 my ($cb) = @_;
306 230
307 my $w = new CFClient::UI::FancyFrame 231 my $w = new CFPlus::UI::FancyFrame
308 on_delete => sub { $_[0]->destroy; 1 }, 232 on_delete => sub { $_[0]->destroy; 1 },
309 has_close_button => 1, 233 has_close_button => 1,
310 ; 234 ;
311 235
312 $w->add (my $vb = new CFClient::UI::VBox x => "center", y => "center"); 236 $w->add (my $vb = new CFPlus::UI::VBox x => "center", y => "center");
313 $vb->add (new CFClient::UI::Label text => "Enter item count:"); 237 $vb->add (new CFPlus::UI::Label text => "Enter item count:");
314 $vb->add (my $entry = new CFClient::UI::Entry 238 $vb->add (my $entry = new CFPlus::UI::Entry
315 text => $last_enter_count, 239 text => $last_enter_count,
316 on_activate => sub { 240 on_activate => sub {
317 my ($entry) = @_; 241 my ($entry) = @_;
318 $last_enter_count = $entry->get_text; 242 $last_enter_count = $entry->get_text;
319 $cb->($last_enter_count); 243 $cb->($last_enter_count);
… …
341 265
342 if ($self->{container} == $::CONN->{player}{tag}) { 266 if ($self->{container} == $::CONN->{player}{tag}) {
343 $targ = $::CONN->{open_container}; 267 $targ = $::CONN->{open_container};
344 } 268 }
345 269
346 if (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 1) { 270 if (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 1) {
347 $::CONN->send ("move $targ $self->{tag} 0") 271 $::CONN->send ("move $targ $self->{tag} 0")
348 if $targ || !($self->{flags} & F_LOCKED); 272 if $targ || !($self->{flags} & F_LOCKED);
349 } elsif (($ev->{mod} & CFClient::KMOD_SHIFT) && $ev->{button} == 2) { 273 } elsif (($ev->{mod} & CFPlus::KMOD_SHIFT) && $ev->{button} == 2) {
350 $self->{flags} & F_LOCKED 274 $self->{flags} & F_LOCKED
351 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) 275 ? $::CONN->send ("lock " . pack "CN", 0, $self->{tag})
352 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) 276 : $::CONN->send ("lock " . pack "CN", 1, $self->{tag})
353 } elsif ($ev->{button} == 1) { 277 } elsif ($ev->{button} == 1) {
354 $::CONN->send ("examine $self->{tag}"); 278 $::CONN->send ("examine $self->{tag}");
… …
367 sub { 291 sub {
368 $::CONN->send ("mark ". pack "N", $self->{tag}); 292 $::CONN->send ("mark ". pack "N", $self->{tag});
369 $::CONN->send ("command apply flint and steel"); 293 $::CONN->send ("command apply flint and steel");
370 } 294 }
371 ], 295 ],
296 ["inscribe", # first try of an easier use of flint&steel
297 sub {
298 &::open_string_query ("Text to inscribe", sub {
299 my ($entry, $txt) = @_;
300 $::CONN->send ("mark ". pack "N", $self->{tag});
301 $::CONN->send ("command use_skill inscription $txt");
302 });
303 }
304 ],
372 ["apply", sub { $::CONN->send ("apply $self->{tag}") }], 305 ["apply", sub { $::CONN->send ("apply $self->{tag}") }],
373 ( 306 (
374 $self->{flags} & F_LOCKED 307 $self->{flags} & F_LOCKED
375 ? ( 308 ? (
376 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }], 309 ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $self->{tag}) }],
377 ) 310 )
378 : ( 311 : (
379 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }], 312 ["lock", sub { $::CONN->send ("lock " . pack "CN", 1, $self->{tag}) }],
380 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }], 313 ["$move_prefix all", sub { $::CONN->send ("move $targ $self->{tag} 0") }],
381 ["$move_prefix n", 314 ["$move_prefix &lt;n&gt;",
382 sub { 315 sub {
383 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") }) 316 do_n_dialog (sub { $::CONN->send ("move $targ $self->{tag} $_[0]") })
384 } 317 }
385 ] 318 ]
386 ) 319 )
387 ), 320 ),
388 ); 321 );
389 322
390 CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev); 323 CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
391 } 324 }
392 325
393 1 326 1
394 }; 327 };
395 328
… …
399 . "Middle click - apply\n" 332 . "Middle click - apply\n"
400 . "Shift-Middle click - lock/unlock\n" 333 . "Shift-Middle click - lock/unlock\n"
401 . "Right click - further options" 334 . "Right click - further options"
402 . "</small>\n"; 335 . "</small>\n";
403 336
337 my $bg = $self->{flags} & F_CURSED ? [1 , 0 , 0, 0.5]
338 : $self->{flags} & F_MAGIC ? [0.2, 0.2, 1, 0.5]
339 : undef;
340
404 $self->{face_widget} ||= new CFClient::UI::Face 341 $self->{face_widget} ||= new CFPlus::UI::Face
405 can_events => 1, 342 can_events => 1,
406 can_hover => 1, 343 can_hover => 1,
407 anim => $self->{anim}, 344 anim => $self->{anim},
408 animspeed => $self->{animspeed}, # TODO# must be set at creation time 345 animspeed => $self->{animspeed}, # TODO# must be set at creation time
409 on_button_down => $button_cb, 346 on_button_down => $button_cb,
410 ; 347 ;
348 $self->{face_widget}{bg} = $bg;
411 $self->{face_widget}{face} = $self->{face}; 349 $self->{face_widget}{face} = $self->{face};
412 $self->{face_widget}{anim} = $self->{anim}; 350 $self->{face_widget}{anim} = $self->{anim};
413 $self->{face_widget}{animspeed} = $self->{animspeed}; 351 $self->{face_widget}{animspeed} = $self->{animspeed};
414 $self->{face_widget}->set_tooltip ( 352 $self->{face_widget}->set_tooltip (
415 "<b>Face/Animation.</b>\n" 353 "<b>Face/Animation.</b>\n"
416 . "Item uses face #$self->{face}. " 354 . "Item uses face #$self->{face}. "
417 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ") 355 . ($self->{animspeed} ? "Item uses animation #$self->{anim} at " . (1 / $self->{animspeed}) . "fps. " : "Item is not animated. ")
418 . "\n\n$tooltip_std" 356 . "\n\n$tooltip_std"
419 ); 357 );
420 358
421 $self->{desc_widget} ||= new CFClient::UI::Label 359 $self->{desc_widget} ||= new CFPlus::UI::Label
422 can_events => 1, 360 can_events => 1,
423 can_hover => 1, 361 can_hover => 1,
424 ellipsise => 2, 362 ellipsise => 2,
425 align => -1, 363 align => -1,
426 on_button_down => $button_cb, 364 on_button_down => $button_cb,
427 ; 365 ;
428 my $desc = CFClient::Item::desc_string $self; 366 my $desc = CFPlus::Item::desc_string $self;
367 $self->{desc_widget}{bg} = $bg;
429 $self->{desc_widget}->set_text ($desc); 368 $self->{desc_widget}->set_text ($desc);
430 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std"); 369 $self->{desc_widget}->set_tooltip ("<b>$desc</b>.\n$tooltip_std");
431 370
432 $self->{weight_widget} ||= new CFClient::UI::Label 371 $self->{weight_widget} ||= new CFPlus::UI::Label
433 can_events => 1, 372 can_events => 1,
434 can_hover => 1, 373 can_hover => 1,
435 ellipsise => 0, 374 ellipsise => 0,
436 align => 0, 375 align => 0,
437 on_button_down => $button_cb, 376 on_button_down => $button_cb,
438 ; 377 ;
378 $self->{weight_widget}{bg} = $bg;
439 $self->{weight_widget}->set_text (CFClient::Item::weight_string $self); 379 $self->{weight_widget}->set_text (CFPlus::Item::weight_string $self);
440
441 $self->{weight_widget}->set_tooltip ( 380 $self->{weight_widget}->set_tooltip (
442 "<b>Weight</b>.\n" 381 "<b>Weight</b>.\n"
443 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ") 382 . ($self->{weight} >= 0 ? "One item weighs $self->{weight}g. " : "You have no idea how much this weighs. ")
444 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ") 383 . ($self->{nrof} ? "You have $self->{nrof} of it. " : "Item cannot stack with others of it's kind. ")
445 . "\n\n$tooltip_std" 384 . "\n\n$tooltip_std"

Diff Legend

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