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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.119 by root, Sat Jul 14 12:05:53 2007 UTC vs.
Revision 1.130 by root, Tue Jul 24 00:28:07 2007 UTC

          sort { (length $a) <=> (length $b) }
             @args
    } sort { $a->{par} <=> $b->{par} }
           CFPlus::Pod::find command => "*";
-   $self->connect_ext (event_music => sub {
+   $self->connect_ext (music => sub {
-      my ($ev) = @_;
+      my (%ev) = @_;
       return unless $::CFG->{bgm_enable};
-      my $faces = $ev->{faces};
+      my $faces = $ev{faces};
       my @songs;
       # request music from server if appropriate
-      if (my $faces = $ev->{faces}) {
+      if (my $faces = $ev{faces}) {
          for (@$faces) {
             my ($face, $pri, $chksum) = @$_;
             utf8::downgrade $chksum;
             $chksum = unpack "H*", $chksum;
             $self->{music_map}{$face} = $chksum;
             # check if already cached
             CFPlus::DB::get "res-metadata" => $chksum, sub {
                my ($meta_json) = @_;
+               my $path = CFPlus::DB::path_of_res $chksum;
                if (defined $meta_json) {
                   my $meta = $self->{json_coder}->decode ($meta_json);
-                  $meta->{path} = CFPlus::DB::path_of_res $chksum;
+                  $meta->{path} = $path;
                   $self->{music_meta}{$chksum} = $meta;
+                  &::audio_music_set ($self->{songs});
                } else {
                   ::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
                   $self->ask_face ($face, -100 - $pri, undef, sub {
                      my $len = length $_[1];
                      my ($meta_json, $data) = unpack "(w/a*)*", $_[1];
-                     my $meta = $self->{json_coder}->decode ($meta_json);
-                     $meta->{path} = CFPlus::DB::path_of_res $chksum;
-                     $self->{music_meta}{$chksum} = $meta;
-                     CFPlus::DB::write_file $meta->{path}, $data, sub { };
+                     CFPlus::DB::write_file $path, $data, sub {
-                     CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub { };
+                        CFPlus::DB::put "res-metadata" => $chksum => $meta_json, sub {
+                           my $meta = $self->{json_coder}->decode ($meta_json);
+                           $meta->{path} = $path;
+                           $self->{music_meta}{$chksum} = $meta;
-                     ::message ({ markup => "downloaded song #$face, size $len octets" });
+                           ::message ({ markup => "downloaded song #$face, size $len octets" });
+                           &::audio_music_set ($self->{songs});
+                        };
+                     };
                   });
                }
-               &::audio_music_set ($self->{songs});
             }
          }
       }
-      if (my $play = $ev->{play}) {
+      if (my $play = $ev{play}) {
          &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
       }
    });
-   $self->connect_ext (event_capabilities => sub {
+   $self->connect_ext (capabilities => sub {
-      my ($cap) = @_;
+      my (%cap) = @_;
-      if (my $ts = $cap->{tileset}) {
+      if (my $ts = $cap{tileset}) {
          if (my ($default) = grep $_->[2] & 1, @$ts) {
             $self->{tileset} = $default;
             $self->{tilesize} = $default->[3];
             $self->setup_req (tileset => $default->[0]);
       }
    });
    $self->{json_coder}
       ->convert_blessed
-      ->filter_json_single_key_object (__widget_ref__ => sub {
+      ->filter_json_single_key_object (__w_ => sub {
          $self->{widget}{$_[0]}
       });
+   # widgetset new
    $self->connect_ext (ws_n => sub {
-      my ($arg) = @_;
+      my ($id) = @_;
-      $self->{widgetset}{$arg{id}} = {
+      $self->{widgetset}{$id} = {
          w => {},
       };
    });
+   # widgetset destroy
    $self->connect_ext (ws_d => sub {
-      my ($arg) = @_;
+      my ($id) = @_;
-      my $ws = delete $self->{widgetset}{$arg{id}}
+      my $ws = delete $self->{widgetset}{$id}
          or return;
       $_->destroy
          for values %{$ws->{w}};
    });
+   # widgetset create
    $self->connect_ext (ws_c => sub {
-      my ($arg) = @_;
+      my ($ws, $id, $class, $args) = @_;
-      my $args = $arg->{args} || {};
       for my $ev (grep /^on_/, keys %$args) {
          $args->{$ev} = sub {
             my $id = shift->{s_id};
-            $self->send_exti_msg (w_e => id => $id, name => $ev, args => \@_);
+            $self->send_exti_msg (w_e => $id, $ev, \@_);
             1
          };
       }
       if (my $widget = eval {
             local $SIG{__DIE__};
-            "CFPlus::UI::$arg->{class}"->new (
+            "CFPlus::UI::$class"->new (
                %$args,
-               s_ws => $arg->{ws},
+               s_ws => $ws,
-               s_id => $arg->{id},
+               s_id => $id,
             )
          }
       ) {
-         $self->{widget}{$arg->{id}}
+         $self->{widget}{$id}
-            = $self->{widgetset}{$arg->{ws}}{w}{$arg->{id}}
+            = $self->{widgetset}{$ws}{w}{$id}
             = $widget;
          $widget->connect (on_destroy => sub {
             my ($widget) = @_;
             delete $self->{widget}{$widget->{s_id}};
             delete $self->{widgetset}{$widget->{s_ws}}{$widget->{s_id}};
          });
       } else {
-         warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
+         warn "server failed creating client-side widget " . (CFPlus::to_json $class) . ": $@\n";
-         $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
+         $self->send_exti_msg (w_e => $id, "destroy");
       }
    });
+   # widget call
    $self->connect_ext (w_c => sub {
-      my ($arg) = @_;
+      my ($id, $rid, $method, $args) = @_;
-      my $w = $self->{widget}{$arg->{id}}
+      my $w = $self->{widget}{$id}
          or return;
-      my $m = $arg->{name};
-      my $a = $arg->{args} || [];
+      $args ||= [];
-      if (exists $arg->{rid}) {
+      if ($rid) {
-         $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
+         $self->send_exti_msg (w_r => $rid, [$w->$method (@$args)]);
       } else {
-         $w->$m (@$a);
+         $w->$method (@$args);
       }
    });
+   # widget set
    $self->connect_ext (w_s => sub {
-      my ($arg) = @_;
+      my ($id, $attr) = @_;
-      my $w = $self->{widget}{$arg->{id}}
+      my $w = $self->{widget}{$id}
          or return;
-      $w->{$arg->{name}} = $arg->{value};
+      for (my $i = 0; $i < $#$attr; $i += 2) {
+         my ($member, $value) = @$attr[$i, $i+1];
+         if (defined $value) {
+            $w->{$member} = $value;
+         } else {
+            delete $w->{$member};
+         }
+         $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
+      }
    });
+   # widget get
    $self->connect_ext (w_g => sub {
-      my ($arg) = @_;
+      my ($id, $rid, $attr) = @_;
-      my $w = $self->{widget}{$arg->{id}}
+      my $w = $self->{widget}{$id}
          or return;
-      $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
+      $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
    });
+   # destroy widgets on logout
    $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
       for my $ws (values %{delete $self->{widgetset} || {}}) {
          $_->destroy
             for values %{delete $ws->{w} || {}};
       }
    my @skills = keys %{ $self->{skill_info} };
    if (grep +(exists $stats->{$_}) != (exists $prev->{$_}), @skills) {
       $sktbl->clear;
+      my @add;
+      push @add,
-      $sktbl->add (0, 0, new CFPlus::UI::Label text => "Experience", align => 1);
+         0, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
-      $sktbl->add (1, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
+         1, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
-      $sktbl->add (2, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
+         2, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
-      $sktbl->add (3, 0, new CFPlus::UI::Label text => "Experience", align => 1);
+         3, 0, (new CFPlus::UI::Label text => "Experience", align => 1),
-      $sktbl->add (4, 0, new CFPlus::UI::Label text => "Lvl.", align => 1);
+         4, 0, (new CFPlus::UI::Label text => "Lvl.", align => 1),
-      $sktbl->add (5, 0, new CFPlus::UI::Label text => "Skill", expand => 1);
+         5, 0, (new CFPlus::UI::Label text => "Skill", expand => 1),
+      ;
       my $TOOLTIP_ALL = "\n\n<small>Left click - ready skill\nMiddle click - use spell\nRight click - further options</small>";
       my @TOOLTIP_LVL  = (tooltip => "<b>Level</b>. The level of the skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
       my @TOOLTIP_EXP  = (tooltip => "<b>Experience</b>. The experience points you have in this skill.$TOOLTIP_ALL", can_events => 1, can_hover => 1);
             }
             1
          };
+         push @add,
-         $sktbl->add ($x * 3 + 0, $y, $self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
+            $x * 3 + 0, $y, ($self->{stat_widget_exp}{$idx} = new CFPlus::UI::Label
-            text => "0", align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP);
+                             align => 1, font => $::FONT_FIXED, fg => [1, 1, 0], on_button_down => $spell_cb, @TOOLTIP_EXP),
-         $sktbl->add ($x * 3 + 1, $y, $self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
+            $x * 3 + 1, $y, ($self->{stat_widget_lvl}{$idx} = new CFPlus::UI::Label
-            text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL);
+                             text => "0", align => 1, font => $::FONT_FIXED, fg => [0, 1, 0], padding_x => 4, on_button_down => $spell_cb, @TOOLTIP_LVL),
-         $sktbl->add ($x * 3 + 2, $y, new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
+            $x * 3 + 2, $y, (new CFPlus::UI::Label text => $name, on_button_down => $spell_cb,
-                      can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL);
+                             can_events => 1, can_hover => 1, tooltip => (CFPlus::Pod::section_label skill_description => $name) . $TOOLTIP_ALL),
+         ;
          $x++ and ($x, $y) = (0, $y + 1);
       }
+      $sktbl->add_at (@add);
    }
    for (grep exists $stats->{$_}, @skills) {
       $self->{stat_widget_exp}{$_}->set_text (::formsep ($stats->{$_}[1]));
       $self->{stat_widget_lvl}{$_}->set_text ($stats->{$_}[0] * 1);
       new_from_image CFPlus::Texture
          $data, minify => 1, mipmap => 1;
    $self->{map}->set_texture ($id, @$tex{qw(name w h s t)}, @{$tex->{minified}});
    $self->{map_widget}->update;
+   $_->() for @{(delete $self->{face_cb}{$id}) || []};
+}
+sub connect_face_update {
+   my ($self, $id, $cb) = @_;
+   push @{$self->{face_cb}{$id}}, $cb;
+   CFPlus::guard {
+      @{$self->{face_cb}{$id}}
+         = grep $_ != $cb,
+              @{$self->{face_cb}{$id}};
+   }
 }
 sub sound_play {
    my ($self, $x, $y, $soundnum, $type) = @_;
    $CFPlus::UI::ROOT->on_refresh ($::FLOORBOX => sub {
       return unless $::CONN;
       $::FLOORBOX->clear;
+      my @add;
       my $row;
       for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
          if ($row < 6) {
             local $_->{face_widget}; # hack to force recreation of widget
             local $_->{desc_widget}; # hack to force recreation of widget
             CFPlus::Item::update_widgets $_;
+            push @add,
-            $::FLOORBOX->add (0, $row, $_->{face_widget});
+               0, $row, $_->{face_widget},
-            $::FLOORBOX->add (1, $row, $_->{desc_widget});
+               1, $row, $_->{desc_widget};
             $row++;
          } else {
-            $::FLOORBOX->add (1, $row, new CFPlus::UI::Button
+            push @add, 1, $row, new CFPlus::UI::Button
                text        => "More...",
                on_activate => sub { ::toggle_player_page ($::INVENTORY_PAGE); 0 },
-            );
+            ;
             last;
          }
       }
       if ($::CONN->{open_container}) {
-         $::FLOORBOX->add (1, $row++, new CFPlus::UI::Button
+         push @add, 1, $row++, new CFPlus::UI::Button
             text        => "Close container",
             on_activate => sub { $::CONN->send ("apply $::CONN->{open_container}") }
-         );
+         ;
       }
+      $::FLOORBOX->add_at (@add);
    });
    $::WANT_REFRESH++;
 }
 }
 sub logged_in {
    my ($self) = @_;
-   $self->send_ext_req (cfplus_support => version => 1, sub {
+   $self->send_ext_req (cfplus_support => version => 2, sub {
+      my (%msg) = @_;
-      $self->{cfplus_ext} = $_[0]{version};
+      $self->{cfplus_ext} = $msg{version};
       $self->update_server_info;
       if ($self->{cfplus_ext} >= 2) {
          $self->send_ext_req ("editor_support", sub {
-            $self->{editor_support} = $_[0];
+            $self->{editor_support} = { @_ };
             $self->update_server_info;
             0
          });
       }
 sub lookat {
    my ($self, $x, $y) = @_;
    if ($self->{cfplus_ext}) {
-      $self->send_ext_req (lookat => dx => $x, dy => $y, sub {
+      $self->send_ext_req (lookat => $x, $y, sub {
-         my ($msg) = @_;
+         my (%msg) = @_;
-         if (exists $msg->{npc_dialog}) {
+         if (exists $msg{npc_dialog}) {
             # start npc chat dialog
             $self->{npc_dialog} = new CFPlus::NPCDialog::
-               dx    => $x,
+               token => $msg{npc_dialog},
-               dy    => $y,
-               title => "$msg->{npc_dialog} (NPC)",
+               title => "$msg{npc_dialog}[0] (NPC)",
                conn  => $self,
             ;
          }
       });
    }
       on_activate => sub { $this->destroy; 1 },
    ;
    $self->update_options;
-   $self->{id} = $self->{conn}->send_ext_req (
+   $self->{id} = "npc-channel-" . $self->{conn}->token;
-      npc_dialog_begin => dx => $self->{dx}, dy => $self->{dy},
+   $self->{conn}->connect_ext ($self->{id} => sub {
-      sub { $this && $this->feed (@_) }
+      $this->feed (@_) if $this;
-   );
+   });
+   $self->{conn}->send_ext_msg (npc_dialog_begin => $self->{id}, $self->{token});
    $self->{entry}->grab_focus;
    $self->{textview}->add_paragraph ({
       fg     => [1, 1, 0, 1],
       );
    }
 }
 sub feed {
-   my ($self, $msg) = @_;
+   my ($self, $type, @arg) = @_;
    CFPlus::weaken $self;
-   if ($msg->{msgtype} eq "reply") {
+   if ($type eq "update") {
+      my (%info) = @arg;
-      $self->{kw}{$_} = 1 for @{$msg->{add_topics} || []};
+      $self->{kw}{$_} = 1 for @{$info{add_topics} || []};
-      $self->{kw}{$_} = 0 for @{$msg->{del_topics} || []};
+      $self->{kw}{$_} = 0 for @{$info{del_topics} || []};
-      my $text = "\n" . CFPlus::Protocol::sanitise_xml $msg->{msg};
-      my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
-      my @link;
-      $text =~ s{
-         ($match)
-      }{
-         my $kw = $1;
-         push @link, new CFPlus::UI::Label
-            markup     => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
-            can_hover  => 1,
-            can_events => 1,
-            padding_x  => 0,
-            padding_y  => 0,
-            on_button_up => sub {
-               $self->send ($kw);
-            };
-         "\x{fffc}"
-      }giex;
+      if (exists $info{msg}) {
+         my $text = "\n" . CFPlus::Protocol::sanitise_xml $info{msg};
+         my $match = join "|", map "\\b\Q$_\E\\b", sort { (length $b) <=> (length $a) } keys %{ $self->{kw} };
+         my @link;
+         $text =~ s{
+            ($match)
+         }{
+            my $kw = $1;
+            push @link, new CFPlus::UI::Label
+               markup     => "<span foreground='#c0c0ff' underline='single'>$kw</span>",
+               can_hover  => 1,
+               can_events => 1,
+               padding_x  => 0,
+               padding_y  => 0,
+               on_button_up => sub {
+                  $self->send ($kw);
+               };
+            "\x{fffc}"
+         }giex;
-      $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
+         $self->{textview}->add_paragraph ({ markup => $text, widget => \@link });
-      $self->{textview}->scroll_to_bottom;
+         $self->{textview}->scroll_to_bottom;
+      }
       $self->update_options;
    } else {
       $self->destroy;
    }
    my ($self, $msg) = @_;
    $self->{textview}->add_paragraph ({ markup => "\n" . CFPlus::asxml $msg });
    $self->{textview}->scroll_to_bottom;
-   $self->{conn}->send_ext_msg (npc_dialog_tell => msgid => $self->{id}, msg => $msg);
+   $self->{conn}->send_ext_msg (npc_dialog_tell => $self->{id}, $msg);
 }
 sub destroy {
    my ($self) = @_;
    #Carp::cluck "debug\n";#d# #todo# enable: destroy gets called twice because scalar keys {} is 1
    if ($self->{conn}) {
-      $self->{conn}->send_ext_msg (npc_dialog_end => msgid => $self->{id}) if $self->{id};
+      $self->{conn}->send_ext_msg (npc_dialog_end => $self->{id}) if $self->{id};
       delete $self->{conn}{npc_dialog};
       $self->{conn}->disconnect_ext ($self->{id});
    }
    $self->SUPER::destroy;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.119 by root, Sat Jul 14 12:05:53 2007 UTC vs. Revision 1.130 by root, Tue Jul 24 00:28:07 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.119 by root, Sat Jul 14 12:05:53 2007 UTC vs.
Revision 1.130 by root, Tue Jul 24 00:28:07 2007 UTC