[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/Protocol.pm

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.184 by root, Thu Dec 27 18:35:56 2007 UTC vs.
Revision 1.191 by root, Tue Mar 25 19:28:54 2008 UTC

    );
    $self->{map_widget}->clr_commands;
    my @cmd_help = map {
-      $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
+      $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
-         or die "unparseable command help: $_->{kw}[0]";
+         or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
       my $cmd = $1;
       my @args = split /\|/, $2;
       @args = (".*") unless @args;
          for @args;
       map ["$cmd$_", $text],
          sort { (length $a) <=> (length $b) }
             @args
-   } sort { $a->{par} <=> $b->{par} }
+   } sort { $a->[DC::Pod::N_PAR] <=> $b->[DC::Pod::N_PAR] }
           DC::Pod::find command => "*";
    $self->{json_coder}
       ->convert_blessed
       ->filter_json_single_key_object ("\fw" => sub {
    );
 }
 # widgetset create template
 sub ext_ws_ct {
-   my ($self, $ws, $template, $cfg) = @_;
+   my ($self, $ws, $type, $template, $done_cb, $cfg) = @_;
-   $template = eval <<EOF;
+   $done_cb ||= sub { };
-[
-   Toplevel => {
-      s_id  => "toplevel",
-      title => "Character Creation",
-      x     => "center",
-      y     => "center",
-      z     => 5,
-      s_cl => [VBox => {s_cl => [
-         Label => {
-            text     => "Character Creation",
-            fontsize => 1,
-            align    => 0,
-         },
-         Label => {
-            markup   => "View or Edit your character attributes below, then press <b>Finish</b> to create your character",
-            fontsize => 0.8,
-            align    => 0,
-         },
-         Notebook => {
-            s_cl => [
-               Label => {
-                  text => "hulla-hoop"
-               },
-               Entry => {
-                  s_id => "entry",
-               },
-            ],
-         },
-         Button => {
-            s_id  => "finish",
-            title => "Finish",
-         },
-      ]}],
-   },
-]
-EOF
-   die if $@;
    my $parse_list; $parse_list = sub {
       my ($list) = @_;
       my @w;
       }
       @w
    };
+   # either array reference, or face #
+   if ($type eq "inline") {
+      $done_cb->();
-   $parse_list->($template);
+      $parse_list->($template);
+   } elsif ($type eq "face") {
+      my $handler; $handler = $self->register_face_handler ($template, sub {
+         my ($face) = @_;
+         undef $handler;
+         $done_cb->();
+         $parse_list->($self->{json_coder}->decode ($face->{data}));
+      });
+   } else {
+      $done_cb->(0);
+   }
 }
 # widgetset associate
 sub ext_ws_a {
    my ($self, %ass) = @_;
       spell_list     => $::SPELL_LIST,
       floorbox       => $::FLOORBOX,
       help_window    => $::HELP_WINDOW,
       message_window => $::MESSAGE_WINDOW,
+      message_dist   => $::MESSAGE_DIST,
       statusbox      => $::SDTATUSBOX,
       inv            => $::INV,
       invr           => $::INVR,
       invr_hb        => $::INVR_HB,
 # message window
 sub ext_channel_info {
    my ($self, $info) = @_;
    $self->{channels}->{$info->{id}} = $info;
-   $::MESSAGE_WINDOW->add_channel ($info);
+   $::MESSAGE_DIST->add_channel ($info);
 }
 #############################################################################
 sub logprint {
       $sktbl->clear;
       my $sw = $self->{skillwid}{""} ||= [
          0, 0, (new DC::UI::Label text => "Experience", align => 1),
          1, 0, (new DC::UI::Label text => "Lvl.", align => 1),
-         2, 0, (new DC::UI::Label text => "Progress", align => 0),
+         2, 0, (new DC::UI::Label text => "Progress"),
-         3, 0, (new DC::UI::Label text => "Skill", expand => 1),
+         3, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
          4, 0, (new DC::UI::Label text => "Experience", align => 1),
          5, 0, (new DC::UI::Label text => "Lvl.", align => 1),
-         6, 0, (new DC::UI::Label text => "Progress", align => 0),
+         6, 0, (new DC::UI::Label text => "Progress"),
-         7, 0, (new DC::UI::Label text => "Skill", expand => 1),
+         7, 0, (new DC::UI::Label text => "Skill", expand => 1, align => 0),
       ];
       my @add = @$sw;
       my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
             # progress
             (new DC::UI::ExperienceProgress),
             # label
-            (new DC::UI::Label text => $name, on_button_down => $spell_cb,
+            (new DC::UI::Label text => $name, on_button_down => $spell_cb, align => 0,
              can_events => 1, can_hover => 1, tooltip => (DC::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
          ];
          push @add,
             $x * 4 + 0, $y, $sw->[0],
    my %skill_help;
    for my $node (DC::Pod::find skill_description => "*") {
       my (undef, @par) = DC::Pod::section_of $node;
-      $skill_help{$node->{kw}[0]} = DC::Pod::as_label @par;
+      $skill_help{$node->[DC::Pod::N_KW][0]} = DC::Pod::as_label @par;
    };
    for my $skill (values %{$self->{skill_info}}) {
       $self->{map_widget}->add_command ("ready_skill $skill",
                                         (DC::asxml "Ready the skill '$skill'\n\n")
    my ($conn, $tag, $name) = @_;
    $conn->{open_container} = $tag;
    update_floorbox;
    $::INVR_HB->clear ();
-   $::INVR_HB->add (new DC::UI::Label align => 0, expand => 1, text => $name);
+   $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
    if ($tag != 0) { # Floor isn't closable, is it?
       $::INVR_HB->add (new DC::UI::Button
          text     => "Close container",
          tooltip  => "Close the currently open container (if one is open)",
    my $weight = .001 * $self->{player}{weight};
    my $limit  = .001 * $self->{stat}{+CS_STAT_WEIGHT_LIM};
    $::STATWIDS->{weight}->set_text (sprintf "Weight: %.1fkg", $weight);
-   $::STATWIDS->{m_weight}->set_text (sprintf "%.1fkg", $limit);
+   $::STATWIDS->{m_weight}->set_text (sprintf "Max Weight: %.1fkg", $limit);
    $::STATWIDS->{i_weight}->set_text (sprintf "%.1f/%.1fkg", $weight, $limit);
 }
 sub update_server_info {
    my ($self) = @_;
     . "extended command support $yesno[$self->{setup}{extcmd} > 0]\n"
     . "examine command support $yesno[$self->{setup}{excmd} > 0]\n"
     . "editing support $yesno[!!$self->{editor_support}]\n"
     . "map attributes $yesno[$self->{setup}{extmap} > 0]\n"
     . "big image protocol support $yesno[$self->{setup}{fxix} > 0]\n"
-    . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
+    . "client support $yesno[$self->{cfplus_ext} > 0]"
       . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
     . "map size $self->{mapw}×$self->{maph}\n"
    );
 }
    DC::weaken $self;
    $self->{options}->clear;
    $self->{options}->add ($self->{bye_button});
-   for my $kw (sort keys %{ $self->{kw} }) {
+   for my $kw (sort keys %{ $self->[DC::Pod::N_KW] }) {
       $self->{options}->add (new DC::UI::Button
          text => $kw,
          on_activate => sub {
             $self->send ($kw);
             0
    DC::weaken $self;
    if ($type eq "update") {
       my (%info) = @arg;
-      $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
+      $self->[DC::Pod::N_KW]{$_} = 1 for @{$info{add_topics} || []};
-      $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
+      $self->[DC::Pod::N_KW]{$_} = 0 for @{$info{del_topics} || []};
       if (exists $info{msg}) {
          my $text = "\n" . DC::Protocol::sanitise_xml $info{msg};
-         my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
+         my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->[DC::Pod::N_KW] };
          my @link;
          $text =~ s{
             ($match)
          }{
             my $kw = $1;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.184 by root, Thu Dec 27 18:35:56 2007 UTC vs. Revision 1.191 by root, Tue Mar 25 19:28:54 2008 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.184 by root, Thu Dec 27 18:35:56 2007 UTC vs.
Revision 1.191 by root, Tue Mar 25 19:28:54 2008 UTC