--- deliantra/Deliantra-Client/DC/UI.pm	2006/05/19 03:49:48	1.215
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/05/21 00:34:59	1.219
@@ -689,7 +689,7 @@
    my ($self) = @_;
 
    $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
-      glClearColor 0.5, 0.5, 0.5, 1;
+      glClearColor 0, 0, 0, 0;
       glClear GL_COLOR_BUFFER_BIT;
 
       $self->_render;
@@ -799,7 +799,7 @@
    ;
 
    $self = $class->SUPER::new (
-      vp     => (new CFClient::UI::ViewPort),
+      vp     => (new CFClient::UI::ViewPort expand => 1),
       slider => $slider,
       @_,
    );
@@ -2052,7 +2052,7 @@
       req_h     => $::WIDTH / 80,
       vertical  => 0,
       can_hover => 1,
-      inner_pad => .05,
+      inner_pad => 0.02,
       @_
    );
 
@@ -2321,7 +2321,7 @@
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    glColor 1, 1, 1, 1;
-   $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
+   $self->{texture}->draw_quad_alpha (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
    glDisable GL_TEXTURE_2D;
 
    $self->{children}[1]->draw;
@@ -2491,10 +2491,26 @@
 sub new {
    my $class = shift;
 
-   $class->SUPER::new (
+   my $self = $class->SUPER::new (
       aspect => 1,
       @_,
-   )
+   );
+
+   if ($self->{anim} && $self->{animspeed}) {
+      Scalar::Util::weaken (my $widget = $self);
+
+      $self->{timer} = Event->timer (
+         at       => $self->{animspeed} * int $::NOW / $self->{animspeed},
+         hard     => 1,
+         interval => $self->{animspeed},
+         cb       => sub {
+            ++$widget->{frame};
+            $widget->update;
+         },
+      );
+   }
+   
+   $self
 }
 
 sub size_request {
@@ -2505,9 +2521,18 @@
    my ($self) = @_;
 
    return unless $::CONN;#d# manage and cache textures differently
-   my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
 
-   # TODO animation
+   my $face;
+
+   if ($self->{frame}) {
+      my $anim = $::CONN->{anim}[$self->{anim}];
+
+      $face = $anim->[ $self->{frame} % @$anim ]
+         if $anim && @$anim;
+   }
+   
+   my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
+
    if ($tex) {
       glEnable GL_TEXTURE_2D;
       glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
@@ -2517,6 +2542,15 @@
    }
 }
 
+sub DESTROY {
+   my ($self) = @_;
+
+   $self->{timer}->cancel
+      if $self->{timer};
+
+   $self->SUPER::DESTROY;
+}
+
 #############################################################################
 
 package CFClient::UI::InventoryItem;
@@ -2529,7 +2563,7 @@
    my $desc =
       $item->{nrof} < 2
          ? $item->{name}
-         : "$item->{nrof} $item->{name_pl}";
+         : "$item->{nrof} × $item->{name_pl}";
 
    $item->{flags} & Crossfire::Protocol::F_OPEN
       and $desc .= " (open)";
@@ -2559,9 +2593,9 @@
    my $desc = _item_to_desc ($item);
 
    my $self = $class->SUPER::new (
-      can_hover => 1,
+      can_hover  => 1,
       can_events => 1,
-      tooltip => ((CFClient::UI::Label::escape $desc)
+      tooltip    => ((CFClient::UI::Label::escape $desc)
                  . "\n<small>leftclick - pick up\nmiddle click - apply\nrightclick - menu</small>"),
       connect_button_down => sub {
          my ($self, $ev, $x, $y) = @_;
@@ -2580,13 +2614,18 @@
          } elsif ($ev->{button} == 3) {
             my @menu_items = (
                ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
-               ["mark",    sub { $::CONN->send ("mark $item->{tag}") }],
+               ["mark",    sub { $::CONN->send ("mark ". pack "N", $item->{tag}) }],
                ["apply",   sub { $::CONN->send ("apply $item->{tag}") }],
-               ["drop",    sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
-               [
-                  $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
-                  sub { $::CONN->send ("lock $item->{tag}") }, 
-               ],
+               (
+                  $item->{flags} & Crossfire::Protocol::F_LOCKED
+                  ? (
+                     ["unlock", sub { $::CONN->send ("lock " . pack "CN", 0, $item->{tag}) }],
+                    )
+                  : (
+                     ["lock",   sub { $::CONN->send ("lock " . pack "CN", 1, $item->{tag}) }],
+                     ["drop",   sub { $::CONN->send ("move $main::OPENCONT $item->{tag} 0") }],
+                  )
+               ),
             );
 
             CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
@@ -3017,7 +3056,7 @@
 
    glMatrixMode GL_PROJECTION;
    glLoadIdentity;
-   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
+   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
    glMatrixMode GL_MODELVIEW;
    glLoadIdentity;