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

Diff Legend

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