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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.127 by root, Mon Jul 23 15:30:45 2007 UTC vs.
Revision 1.136 by elmex, Fri Jul 27 18:04:42 2007 UTC

    my $self = $class->SUPER::new (%arg,
       setup_req => {
          extmap => 1,
          excmd  => 1,
-         ywidget => 1,
+         ywidget => 1,#d#
          %{$arg{setup_req} || {}},
       },
    );
    $self->{map_widget}->clr_commands;
          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) = @_;
-      return unless $::CFG->{bgm_enable};
-      my $faces = $ev->{faces};
-      my @songs;
-      # request music from server if appropriate
-      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} = $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];
-                     CFPlus::DB::write_file $path, $data, 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" });
-                           &::audio_music_set ($self->{songs});
-                        };
-                     };
-                  });
-               }
-            }
-         }
-      }
-      if (my $play = $ev->{play}) {
-         &::audio_music_set ($self->{songs} = [map $self->{music_map}{$_}, @$play]);
+      &::audio_music_set ($self->{songs} = $ev->{play})
-      }
+         if $ev->{play};
    });
-   $self->connect_ext (event_capabilities => sub {
+   $self->connect_ext (capabilities => sub {
-      my ($cap) = @_;
+      my (%cap) = @_;
+      $self->send_exti_msg (fx_want => {
+         3 => !!$::CFG->{bgm_enable},   # FT_MUSIC
+         5 => !!$::CFG->{audio_enable}, # FT_SOUND
+      });
-      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 destroy
+   # 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;
-      my $attr = $arg->{attr};
       for (my $i = 0; $i < $#$attr; $i += 2) {
          my ($member, $value) = @$attr[$i, $i+1];
          if (defined $value) {
             $w->{$member} = $value;
       }
    });
    # 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 => [map $w->{$_}, @{$arg->{attr}}]);
+      $self->send_exti_msg (w_r => $rid, [map $w->{$_}, @$attr]);
+   });
+   # message window
+   $self->connect_ext (channel_info => sub {
+      my ($info) = @_;
+      $self->{channels}->{$info->{id}} = $info;
+      $::MESSAGE_WINDOW->add_channel ($info);
    });
    # destroy widgets on logout
    $self->{on_stop_game_guard} = $self->{map_widget}{root}->connect (stop_game => sub {
       for my $ws (values %{delete $self->{widgetset} || {}}) {
 }
 sub face_find {
    my ($self, $facenum, $face, $cb) = @_;
-   my $hash = "$face->{chksum},$face->{name}";
+   if ($face->{type} == 0) { # FT_FACE
-   my $id = CFPlus::DB::get_tile_id_sync $hash;
+      my $id = CFPlus::DB::get_tile_id_sync $face->{name};
-   $face->{id}               = $id;
+      $face->{id}               = $id;
-   $self->{faceid}[$facenum] = $id;
+      $self->{faceid}[$facenum] = $id;
-   $self->{map}->set_tileid ($facenum => $id);
+      $self->{map}->set_tileid ($facenum => $id);
-   CFPlus::DB::get tilecache => $id, $cb;
+      CFPlus::DB::get tilecache => $id, $cb;
+   } elsif ($face->{type} & 1) { # with metadata
+      #::message ({ markup => "starting to download song #$face/$pri, check your output-rate setting if your connection gets laggy." });
+      CFPlus::DB::get "res-metadata" => $face->{name}, $cb;
+   }
 }
 sub face_update {
    my ($self, $facenum, $face, $changed) = @_;
+   if ($face->{type} == 0) { # FT_FACE
-   CFPlus::DB::put tilecache => $face->{id} => $face->{image}, sub { }
+      CFPlus::DB::put tilecache => $face->{id} => $face->{data}, sub { }
-      if $changed;
+         if $changed;
-   $self->set_texture ($face->{id} => delete $face->{image});
+      $self->set_texture ($face->{id} => delete $face->{data});
+   } elsif ($face->{type} & 1) { # split metadata
+      my $cb = sub { };
+      if ($face->{type} == 3) { # FT_MUSIC
+         $cb = sub {
+            $self->{music_meta}{$facenum} = $face;
+            ::message ({ markup => "downloaded song #$facenum" })
+               if $changed;
+            &::audio_music_set ($self->{songs});
+         };
+      }
+      if ($changed) { # new data
+         my ($meta_json, $data) = unpack "(w/a*)*", delete $face->{data};
+         my $path = CFPlus::DB::path_of_res $face->{name};
+         CFPlus::DB::write_file $path, $data, sub {
+            CFPlus::DB::put "res-metadata" => $face->{name} => $meta_json, sub {
+               $face->{meta} = $self->{json_coder}->decode ($meta_json);
+               $face->{path} = $path;
+               $cb->();
+            };
+         };
+      } else {
+         $face->{meta} = $self->{json_coder}->decode (delete $face->{data});
+         $cb->();
+      }
+   }
 }
 sub smooth_update {
    my ($self, $facenum, $face) = @_;
       ## try to create single paragraphs of multiple lines sent by the server
       # no longer neecssary with TRT servers
       #$text =~ s/(?<=\S)\n(?=\w)/ /g;
-      ::message ({ fg => $fg, markup => $_ })
+      ::message ({ fg => $fg, markup => $_, type => $type, extra => [@extra] })
          for split /\n/, $text;
       $self->{statusbox}->add ($text,
          group        => $text,
          fg           => $fg,
     . "cfplus support $yesno[$self->{cfplus_ext} > 0]"
       . ($self->{cfplus_ext} > 0 ? ", version $self->{cfplus_ext}" : "") ."\n"
     . "map size $self->{mapw}×$self->{maph}\n"
    );
-   ::setup_build_button ($self->{editor_support}->{builder_ui});
 }
 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
          });
       }
    $self->send_command ("output-count $::CFG->{output_count}");
    $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
    $self->send_command ("pickup $::CFG->{pickup}");
 }
-sub buildat {
-   my ($self, $builditem, $x, $y) = @_;
-   if ($self->{cfplus_ext}) {
-      $self->send_ext_msg (builder_build => dx => $x, dy => $y, (ref ($builditem) eq 'HASH') ? %$builditem : (item => $builditem));
-   }
-}
 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.127 by root, Mon Jul 23 15:30:45 2007 UTC vs. Revision 1.136 by elmex, Fri Jul 27 18:04:42 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.127 by root, Mon Jul 23 15:30:45 2007 UTC vs.
Revision 1.136 by elmex, Fri Jul 27 18:04:42 2007 UTC