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

Diff Legend

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