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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.127 by root, Mon Jul 23 15:30:45 2007 UTC

    my $self = $class->SUPER::new (%arg,
       setup_req => {
          extmap => 1,
          excmd  => 1,
-         xwidget => 1,
+         ywidget => 1,
          %{$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 {
+      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]);
+      }
+   });
    $self->connect_ext (event_capabilities => sub {
       my ($cap) = @_;
       if (my $ts = $cap->{tileset}) {
          if (my ($default) = grep $_->[2] & 1, @$ts) {
             $self->setup_req (mapsize => "${w}x${h}");
          }
       }
    });
+   $self->{json_coder}
+      ->convert_blessed
+      ->filter_json_single_key_object (__widget_ref__ => sub {
+         $self->{widget}{$_[0]}
+      });
+   # widgetset new
    $self->connect_ext (ws_n => sub {
       my ($arg) = @_;
       $self->{widgetset}{$arg{id}} = {
          w => {},
       };
    });
+   # widgetset destroy
    $self->connect_ext (ws_d => sub {
       my ($arg) = @_;
       my $ws = delete $self->{widgetset}{$arg{id}}
          or return;
       $_->destroy
          for values %{$ws->{w}};
    });
+   # widgetset destroy
    $self->connect_ext (ws_c => sub {
       my ($arg) = @_;
       my $args = $arg->{args} || {};
          warn "server failed creating client-side widget " . (CFPlus::to_json $arg) . ": $@\n";
          $self->send_exti_msg (w_e => id => $arg->{id}, name => "destroy");
       }
    });
+   # widget call
    $self->connect_ext (w_c => sub {
       my ($arg) = @_;
       my $w = $self->{widget}{$arg->{id}}
          or return;
       my $m = $arg->{name};
-      my @a = map {
-         "HASH" eq ref && 1 == (scalar keys %$_) && exists $_->{__widget_ref__}
-            ? $self->{widget}{$_->{__widget_ref__}}
-            : $_
-      } @{ $arg->{args} || [] };
+      my $a = $arg->{args} || [];
       if (exists $arg->{rid}) {
-         $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@a)]);
+         $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->$m (@$a)]);
       } else {
-         $w->$m (@a);
+         $w->$m (@$a);
       }
    });
+   # widget set
    $self->connect_ext (w_s => sub {
       my ($arg) = @_;
       my $w = $self->{widget}{$arg->{id}}
          or return;
-      $w->{$arg->{name}} = $arg->{value};
+      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;
+         } else {
+            delete $w->{$member};
+         }
+         $w->{parent}->realloc if $member =~ /^c_/ && $w->{visible};
+      }
    });
+   # widget get
    $self->connect_ext (w_g => sub {
       my ($arg) = @_;
       my $w = $self->{widget}{$arg->{id}}
          or return;
-      $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [$w->{$arg->{name}}]);
+      $self->send_exti_msg (w_r => rid => $arg->{rid}, res => [map $w->{$_}, @{$arg->{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);
 }
 sub set_texture {
    my ($self, $id, $data) = @_;
+   return unless $self->{map};
    $self->{texture}[$id] = my $tex =
       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++;
 }
    (delete $self->{npc_dialog})->destroy
       if $self->{npc_dialog};
    $self->SUPER::destroy;
+   %$self = ();
 }
 package CFPlus::NPCDialog;
 our @ISA = 'CFPlus::UI::Toplevel';

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents): Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC vs. Revision 1.127 by root, Mon Jul 23 15:30:45 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/Protocol.pm (file contents):
Revision 1.110 by root, Tue Jun 26 05:06:01 2007 UTC vs.
Revision 1.127 by root, Mon Jul 23 15:30:45 2007 UTC