--- deliantra/Deliantra-Client/DC/Protocol.pm	2008/01/10 21:53:33	1.189
+++ deliantra/Deliantra-Client/DC/Protocol.pm	2008/09/09 10:27:26	1.202
@@ -14,6 +14,12 @@
 
 use base 'Deliantra::Protocol::Base';
 
+our $TEX_DIALOGUE = new_from_resource DC::Texture
+         "dialogue.png", minify => 1, mipmap => 1;
+
+our $TEX_NOFACE = new_from_resource DC::Texture
+        "noface.png", minify => 1, mipmap => 1;
+
 sub new {
    my ($class, %arg) = @_;
 
@@ -29,8 +35,8 @@
    $self->{map_widget}->clr_commands;
 
    my @cmd_help = map {
-      $_->{kw}[0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
-         or die "unparseable command help: $_->{kw}[0]";
+      $_->[DC::Pod::N_KW][0] =~ /^(\S+) (?:\s+ \( ([^\)]*) \) )?/x
+         or die "unparseable command help: $_->[DC::Pod::N_KW][0]";
 
       my $cmd = $1;
       my @args = split /\|/, $2;
@@ -45,7 +51,7 @@
       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}
@@ -66,20 +72,23 @@
          $_->destroy
             for values %{delete $ws->{w} || {}};
       }
+
+      delete $self->{items};
+      $::INV->clear;
+      $::INVR_HB->clear;
+      $::FLOORBOX->clear;
    });
 
    $self->{map_widget}->add_command (@$_)
       for @cmd_help;
 
    {
-      $self->{dialogue} = my $tex = new_from_file DC::Texture
-         DC::find_rcfile "dialogue.png", minify => 1, mipmap => 1;
+      $self->{dialogue} = my $tex = $TEX_DIALOGUE;
       $self->{map}->set_texture (1, @$tex{qw(name w h s t)}, @{$tex->{minified}});
    }
 
    {
-     $self->{noface} = my $tex = new_from_file DC::Texture
-        DC::find_rcfile "noface.png", minify => 1, mipmap => 1;
+      $self->{noface} = my $tex = $TEX_NOFACE;
       $self->{map}->set_texture (2, @$tex{qw(name w h s t)}, @{$tex->{minified}});
    }
 
@@ -634,7 +643,7 @@
 sub map_scroll {
    my ($self, $dx, $dy) = @_;
 
-   $self->{map}->scroll ($dx, $dy);
+   $self->{map_widget}->scroll ($dx, $dy);
 }
 
 sub feed_map1a {
@@ -681,20 +690,26 @@
 sub flush_map {
    my ($self) = @_;
 
-   my $map_info = delete $self->{map_info}
-      or return;
+   return unless $self->{map_info};
+
+   for my $map_info (values %{ $self->{map_cache} || {} }) {
+      my ($hash, $rdata, $x, $y, $w, $h) = @$map_info;
 
-   my ($hash, $x, $y, $w, $h) = @$map_info;
+      my $data = $self->{map}->get_rect ($x, $y, $w, $h);
 
-   my $data = Compress::LZF::compress $self->{map}->get_rect ($x, $y, $w, $h);
-   $self->{map_cache_new}{$hash} = \$data;
-   DC::DB::put $self->{mapcache} => $hash => $data, sub { };
+      if ($data ne $$rdata) {
+         $map_info->[1] = \$data;
+         my $cdata = Compress::LZF::compress $data;
+         DC::DB::put $self->{mapcache} => $hash => $cdata, sub { };
+      }
+   }
 }
 
 sub map_clear {
    my ($self) = @_;
 
    $self->flush_map;
+   delete $self->{map_info};
    delete $self->{neigh_map};
 
    $self->{map}->clear;
@@ -725,36 +740,34 @@
    };
 }
 
-sub load_map($$$) {
-   my ($self, $hash, $x, $y) = @_;
+sub load_map($$$$$$) {
+   my ($self, $hash, $x, $y, $w, $h) = @_;
 
-   my $gen = $self->{map_change_gen};
+   my $map_info = $self->{map_cache}{$hash} = [$hash, \"", $x, $y, $w, $h];
 
    my $cb = sub {
-      return unless $gen == $self->{map_change_gen};
-
-      my ($data) = @_;
-
-      if (defined $data) {
-         $self->{map_cache_new}{$hash} = \$data;
+      $map_info->[1] = \$_[0];
 
-         my $data = Compress::LZF::decompress $data;
-
-         my $inprogress = @{ $self->{bg_fetch} || [] };
-         unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $data);
-         $self->bg_fetch unless $inprogress;
-      }
+      my $inprogress = @{ $self->{bg_fetch} || [] };
+      unshift @{ $self->{bg_fetch} }, $self->{map}->set_rect ($x, $y, $_[0]);
+      $self->bg_fetch unless $inprogress;
    };
 
-   if (my $rdata = $self->{map_cache_old}{$hash}) {
-      $cb->($$rdata);
+   if (my $map_info = $self->{map_cache_old}{$hash}) {
+      $cb->(${ $map_info->[1] });
    } else {
-      DC::DB::get $self->{mapcache} => $hash, $cb;
+      my $gen = $self->{map_change_gen};
+
+      DC::DB::get $self->{mapcache} => $hash, sub {
+         return unless $gen == $self->{map_change_gen};
+         return unless defined $_[0];
+         $cb->(Compress::LZF::decompress $_[0]);
+      };
    }
 }
 
 # hardcode /world/world_xxx_xxx map names, the savings are enourmous,
-# (server resource,s latency, bandwidth), so this hack is warranted.
+# (server resources, latency, bandwidth), so this hack is warranted.
 # the right fix is to make real tiled maps with an overview file
 sub send_mapinfo {
    my ($self, $data, $cb) = @_;
@@ -789,7 +802,7 @@
 # this method does a "flood fill" into every tile direction
 # it assumes that tiles are arranged in a rectangular grid,
 # i.e. a map is the same as the left of the right map etc.
-# failure to comply are harmless and result in display errors
+# failure to comply is harmless and results in display errors
 # at worst.
 sub flood_fill {
    my ($self, $block, $gx, $gy, $path, $hash, $flags) = @_;
@@ -835,7 +848,7 @@
             $x += $self->{map}->ox;
             $y += $self->{map}->oy;
 
-            $self->load_map ($hash, $x, $y)
+            $self->load_map ($hash, $x, $y, $w, $h)
                unless $self->{neigh_map}{$hash}[5]++;#d#
 
             $neigh->[$tile] = [$flags, $x, $y, $w, $h, $hash];
@@ -853,7 +866,7 @@
    $self->flush_map;
 
    ++$self->{map_change_gen};
-   $self->{map_cache_old} = delete $self->{map_cache_new};
+   $self->{map_cache_old} = delete $self->{map_cache};
 
    my ($ox, $oy) = ($::MAP->ox, $::MAP->oy);
 
@@ -875,7 +888,7 @@
    (my $map = $hash) =~ s/^.*?\/([^\/]+)$/\1/;
    $::STATWIDS->{map}->set_text ("Map: " . $map);
 
-   $self->load_map ($hash, $x, $y);
+   $self->load_map ($hash, $x, $y, $w, $h);
    $self->flood_fill (0, 0, 0, "", $hash, $flags);
 }
 
@@ -1028,6 +1041,8 @@
    s/<fg name='([^']*)'>(.*?)<\/fg>/<span foreground='$1'>$2<\/span>/gs;
    s/<fg name="([^"]*)">(.*?)<\/fg>/<span foreground="$1">$2<\/span>/gs;
 
+   s/\s+$//;
+
    $_
 }
 
@@ -1083,21 +1098,19 @@
       # no longer neecssary with TRT servers
       #$text =~ s/(?<=\S)\n(?=\w)/ /g;
 
-      for (split /\n/, $text) {
-         ::message ({
-            fg     => $fg,
-            markup => $_,
-            type   => $type,
-            extra  => [@extra],
-            color_flags => $color, #d# ugly, kill
-         });
+      ::message ({
+         fg     => $fg,
+         markup => $text,
+         type   => $type,
+         extra  => [@extra],
+         color_flags => $color, #d# ugly, kill
+      });
 
-         $color &= ~NDI_CLEAR; # only clear once for multiline messages
-         # actually, this is an ugly design. _we_ should control the channels,
-         # not some random other widget, as the channels are clearly protocol-specific.
-         # then we could also react to flags such as CLEAR without resorting to
-         # hacks such as color_flags, above.
-      }
+#      $color &= ~NDI_CLEAR; # only clear once for multiline messages
+#      # actually, this is an ugly design. _we_ should control the channels,
+#      # not some random other widget, as the channels are clearly protocol-specific.
+#      # then we could also react to flags such as CLEAR without resorting to
+#      # hacks such as color_flags, above.
 
       $self->{statusbox}->add ($text,
          group        => $text,
@@ -1142,7 +1155,7 @@
 
    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}}) {
@@ -1172,7 +1185,8 @@
       my @add;
 
       my $row;
-      for (sort { $a->{count} <=> $b->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
+      for (sort { $b->{count} <=> $a->{count} } values %{ $::CONN->{container}{$::CONN->{open_container} || 0} }) {
+         next if $_->{tag} & 0x80000000;
          if ($row < 6) {
             local $_->{face_widget}; # hack to force recreation of widget
             local $_->{desc_widget}; # hack to force recreation of widget
@@ -1209,7 +1223,7 @@
    $conn->{open_container} = $tag;
    update_floorbox;
 
-   $::INVR_HB->clear ();
+   $::INVR_HB->clear;
    $::INVR_HB->add (new DC::UI::Label expand => 1, text => $name);
 
    if ($tag != 0) { # Floor isn't closable, is it?
@@ -1275,10 +1289,10 @@
 sub item_update {
    my ($self, $item) = @_;
 
-   #d# print "item_update: $item->{tag} in $item->{container} ($self->{player}{tag}) ($::CONN->{open_container})\n";
+   #print "item_update: $item->{tag} in $item->{container} pt($self->{player}{tag}) oc($::CONN->{open_container}) f($item->{flags})\n";
 
    DC::Item::update_widgets $item;
-
+   
    if ($item->{tag} == $::CONN->{open_container} && not ($item->{flags} & F_OPEN)) {
       set_opencont ($::CONN, 0, "Floor");
 
@@ -1354,6 +1368,9 @@
 
    $self->send_command ("output-rate $::CFG->{output_rate}") if $::CFG->{output_rate} > 0;
    $self->send_command ("pickup $::CFG->{pickup}");
+
+   $self->send_exti_msg (clientlog => sprintf "OpenGL Info: %s [%s]",
+                                              DC::OpenGL::gl_vendor, DC::OpenGL::gl_version);#d#
 }
 
 sub lookat {