--- deliantra/Deliantra-Client/DC/Pod.pm 2006/08/18 01:01:01 1.14 +++ deliantra/Deliantra-Client/DC/Pod.pm 2008/03/25 01:46:36 1.18 @@ -1,11 +1,11 @@ -package CFPlus::Pod; +package DC::Pod; use strict; use utf8; use Storable; -our $VERSION = 1; +our $VERSION = 1.03; our $goto_document = sub { }; our %wiki; @@ -14,7 +14,20 @@ my $MA_SEP = "\x{fcd1}"; my $MA_END = "\x{fcd2}"; -*wiki = Storable::retrieve CFPlus::find_rcfile "docwiki.pst"; +# nodes (order must stay as it is) +sub N_PARENT (){ 0 } +sub N_PAR (){ 1 } +sub N_LEVEL (){ 2 } +sub N_KW (){ 3 } +sub N_DOC (){ 4 } + +# paragraphs (order must stay as it is) +sub P_INDENT (){ 0 } +sub P_LEVEL (){ 1 } +sub P_MARKUP (){ 2 } +sub P_INDEX (){ 3 } + +*wiki = Storable::retrieve DC::find_rcfile "docwiki.pst"; sub goto_document($) { $goto_document->(split /\//, $_[0]); @@ -30,7 +43,7 @@ $node = $node->{parent} or return 0; - return ! ! grep $_ eq $kw, @{ $node->{kw} }; + return scalar grep $_ eq $kw, @{ $node->{kw} }; } sub find(@) { @@ -78,13 +91,13 @@ do { my $p = $doc->[$par]; - if (length $p->{markup}) { + if (length $p->[P_MARKUP]) { push @res, { - markup => $p->{markup}, - indent => $p->{indent}, + markup => $p->[P_MARKUP], + indent => $p->[P_INDENT], }; } - } while $doc->[++$par]{level} > $lvl; + } while $doc->[++$par][P_LEVEL] > $lvl; @res } @@ -116,7 +129,7 @@ link => sub { my ($par, $text, $link) = @_; - "" . (CFPlus::asxml $text) . "" + "" . (DC::asxml $text) . "" }, ); @@ -138,7 +151,7 @@ image => sub { my ($par, $path, $flags) = @_; - push @{ $par->{widget} }, new CFPlus::UI::Image path => $path, + push @{ $par->{widget} }, new DC::UI::Image path => $path, $flags & 1 ? (max_h => $::FONTSIZE) : (); "\x{fffc}" @@ -146,14 +159,14 @@ link => sub { my ($par, $text, $link) = @_; - push @{ $par->{widget} }, new CFPlus::UI::Label - markup => "" . (CFPlus::asxml $text) . "", + push @{ $par->{widget} }, new DC::UI::Label + markup => "" . (DC::asxml $text) . "", fontsize => 0.8, can_hover => 1, can_events => 1, padding_x => 0, padding_y => 0, - tooltip => "Go to " . (CFPlus::asxml $link) . "", + tooltip => "Go to " . (DC::asxml $link) . "", on_button_up => sub { goto_document $link; };