--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/25 13:08:17	1.177
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/05/08 20:39:34	1.186
@@ -239,6 +239,7 @@
 
       $self->size_allocate ($w, $h);
       $self->update;
+      $self->emit (size_allocate => $w, $h);
    }
 }
 
@@ -249,14 +250,16 @@
 sub children {
 }
 
-# call when resoltuion changes etc.
+# call when resolution changes etc.
 sub reconfigure {
    my ($self) = @_;
 
    $_->reconfigure
       for $self->children;
 
-   $_->check_size;
+   $self->check_size;
+   $self->size_allocate ($self->{w}, $self->{h});
+   $self->update;
 }
 
 sub set_max_size {
@@ -541,6 +544,7 @@
    ];
 
    $child->check_size;
+   $self->update;
 }
 
 sub children {
@@ -569,6 +573,9 @@
       delete $_->{parent};
       $_->hide;
    }
+
+   $self->check_size;
+   $self->update;
 }
 
 sub find_widget {
@@ -664,13 +671,18 @@
    $self->update;
 }
 
+sub _render {
+   $_[0]{children}[0]->draw;
+}
+
 sub render_child {
    my ($self) = @_;
 
    $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
       glClearColor 0, 0, 0, 0;
       glClear GL_COLOR_BUFFER_BIT;
-      $self->child->draw;
+
+      $self->_render;
 #      glColorMask 1, 1, 1, 0;
 #      glEnable GL_BLEND;
 #      glBlendFunc GL_SRC_ALPHA, GL_ZERO;
@@ -707,23 +719,91 @@
 
 our @ISA = CFClient::UI::Window::;
 
-sub new { die }
-
 sub size_request {
    my ($self) = @_;
 
    @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
-   $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
+   $self->child->configure (0, 0, @$self{qw(child_w child_h)});
 
    @$self{qw(child_w child_h)}
 }
 
-sub _draw {
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->update;
+}
+
+sub set_offset {
+   my ($self, $x, $y) = @_;
+
+   $self->{view_x} = int $x;
+   $self->{view_y} = int $y;
+
+   $self->update;
+}
+
+# hmm, this does not work for topleft of $self... but we should not aks for that
+sub _topleft {
+   my ($self, $x, $y) = @_;
+
+   $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
+}
+
+sub find_widget {
+   my ($self, $x, $y) = @_;
+
+   if (   $x >= $self->{x} && $x < $self->{x} + $self->{w}
+       && $y >= $self->{y} && $y < $self->{y} + $self->{h}
+   ) {
+       $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
+   } else {
+      $self->CFClient::UI::Base::find_widget ($x, $y)
+   }
+}
+
+sub _render {
    my ($self) = @_;
 
-   $self->{children}[1]->draw;
+   CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+
+   $self->SUPER::_render;
+}
+
+#############################################################################
+
+package CFClient::UI::ScrolledWindow;
+
+our @ISA = CFClient::UI::HBox::;
+
+sub new {
+   my $class = shift;
+
+   my $self;
+
+   my $slider = new CFClient::UI::Slider
+      vertical        => 1,
+      range           => [0, 0, 1, 0.01], # HACK fix
+      connect_changed => sub {
+         $self->{vp}->set_offset (0, $_[1] * ($self->{vp}{child_h} - $self->{vp}{h}));
+      },
+   ;
+
+   $self = $class->SUPER::new (
+      vp     => (new CFClient::UI::ViewPort),
+      slider => $slider,
+      @_,
+   );
+
+   $self->{vp}->add ($self->{scrolled});
+   $self->add ($self->{vp});
+   $self->add ($self->{slider});
+
+   $self
 }
 
+#TODO# update range on size_allocate depeneing on child
+# update viewport offset on scroll
 
 #############################################################################
 
@@ -1246,12 +1326,6 @@
    $self->SUPER::update;
 }
 
-sub reconfigure {
-   my ($self) = @_;
-
-   delete $self->{texture};
-}
-
 sub set_text {
    my ($self, $text) = @_;
 
@@ -1314,8 +1388,9 @@
 
    $self->{fontsize} = $fontsize;
    delete $self->{texture};
-   $self->check_size;
+
    $self->update;
+   $self->check_size;
 }
 
 sub _draw {
@@ -1959,8 +2034,8 @@
       fg        => [1, 1, 1],
       active_fg => [0, 0, 0],
       range     => [0, 0, 100, 10],
-      req_w     => 20,
-      req_h     => 20,
+      req_w     => $::WIDTH / 80,
+      req_h     => $::WIDTH / 80,
       vertical  => 0,
       can_hover => 1,
       inner_pad => 5,
@@ -2404,11 +2479,13 @@
    (32, 8)
 }
 
-sub draw {
+sub _draw {
    my ($self) = @_;
 
+   return unless $::CONN;#d# manage and cache textures differently
    my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
 
+   # TODO animation
    if ($tex) {
       glEnable GL_BLEND;
       glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
@@ -2423,6 +2500,183 @@
 
 #############################################################################
 
+package CFClient::UI::InventoryItem;
+
+our @ISA = CFClient::UI::HBox::;
+
+sub new {
+   my $class = shift;
+
+   my %args = @_;
+
+   my $item = $args{item};
+
+   my $desc = $item->{nrof} < 2
+      ? $item->{name}
+      : "$item->{nrof} $item->{name_pl}";
+
+
+   my $self = $class->SUPER::new (
+      can_hover => 1,
+      can_events => 1,
+      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) = @_;
+
+         # todo: maybe put examine on 1? but should just be a tooltip :(
+         if ($ev->{button} == 1) {
+            $::CONN->send ("move $::CONN->{player}{tag} $item->{tag} 0");
+         } elsif ($ev->{button} == 2) {
+            $::CONN->send ("apply $item->{tag}");
+         } elsif ($ev->{button} == 3) {
+            CFClient::UI::Menu->new (
+               items => [
+                  ["examine", sub { $::CONN->send ("examine $item->{tag}") }],
+                  [
+                     $item->{flags} & Crossfire::Protocol::F_LOCKED ? "lock" : "unlock",
+                     sub { $::CONN->send ("lock $item->{tag}") },
+                  ],
+                  ["mark", sub { $::CONN->send ("mark $item->{tag}") }],
+                  ["apply", sub { $::CONN->send ("apply $item->{tag}") }],
+                  ["drop", sub { $::CONN->send ("move 0 $item->{tag} 0") }],
+               ],
+            )->popup ($ev);
+         }
+
+         1
+      },
+      %args
+   );
+   $self->add(new CFClient::UI::Face
+      can_events => 0,
+      face       => $item->{face},
+      anim       => $item->{anim},
+      animspeed  => $item->{animspeed});
+   $self->add(new CFClient::UI::Label
+      can_events => 0,
+      text => $desc);
+
+   $self
+}
+
+#############################################################################
+
+package CFClient::UI::Inventory;
+
+our @ISA = CFClient::UI::ScrolledWindow::;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      scrolled => (new CFClient::UI::VBox),
+      @_,
+   );
+
+   $self
+}
+
+sub set_items {
+   my ($self, $items) = @_;
+
+   $self->{scrolled}->clear;
+   return unless $items;
+
+   my @items = sort { $a->{type} <=> $b->{type} } @$items;
+
+   $self->{real_items} = \@items;
+
+   for my $item (@items) {
+      my $desc = $item->{nrof} < 2
+                     ? $item->{name}
+                     : "$item->{nrof} $item->{name_pl}";
+
+      $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
+   }
+
+#   $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
+}
+
+sub size_request {
+   my ($self) = @_;
+   ($self->{req_w}, $self->{req_h});
+}
+
+#############################################################################
+
+package CFClient::UI::Menu;
+
+our @ISA = CFClient::UI::FancyFrame::;
+
+use CFClient::OpenGL;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (
+      items => [],
+      z     => 100,
+      @_,
+   );
+
+   $self->add ($self->{vbox} = new CFClient::UI::VBox);
+
+   for my $item (@{ $self->{items} }) {
+      my ($widget, $cb) = @$item;
+
+      # handle various types of items, only text for now
+      if (!ref $widget) {
+         $widget = new CFClient::UI::Label
+            can_hover  => 1,
+            can_events => 1,
+            text       => $widget;
+      }
+
+      $self->{item}{$widget} = $item;
+
+      $self->{vbox}->add ($widget);
+   }
+
+   $self
+}
+
+# popup given the event (must be a mouse button down event currently)
+sub popup {
+   my ($self, $ev) = @_;
+
+   $self->emit ("popdown");
+
+   # maybe save $GRAB? must be careful about events...
+   $GRAB = $self;
+   $self->{button} = $ev->{button};
+
+   $self->show;
+   $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
+}
+
+sub mouse_motion {
+   my ($self, $ev, $x, $y) = @_;
+
+   # TODO: should use vbox->find_widget or so
+   $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
+   $self->{hover} = $self->{item}{$HOVER};
+}
+
+sub button_up {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($ev->{button} == $self->{button}) {
+      undef $GRAB;
+      $self->hide;
+
+      $self->emit ("popdown");
+      $self->{hover}[1]->() if $self->{hover};
+   }
+}
+
+#############################################################################
+
 package CFClient::UI::Root;
 
 our @ISA = CFClient::UI::Container::;
@@ -2432,11 +2686,36 @@
 sub check_size {
    my ($self) = @_;
 
-   $self->configure (0, 0, $::WIDTH, $::HEIGHT);
+   $self->configure (0, 0, $self->{w}, $self->{h});
 }
 
 sub size_request {
-   ($::WIDTH, $::HEIGHT)
+   my ($self) = @_;
+
+   ($self->{w}, $self->{h})
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   my $old_w = $self->{old_w};
+   my $old_h = $self->{old_h};
+
+   if ($old_w && $old_h) {
+      for my $child ($self->children) {
+         $child->{x}      = int 0.5 + $child->{x}      * $w / $old_w;
+         $child->{w}      = int 0.5 + $child->{req_w}  * $w / $old_w;
+         $child->{req_w}  = int 0.5 + $child->{req_w}  * $w / $old_w if exists $child->{req_w};
+         $child->{user_w} = int 0.5 + $child->{user_w} * $w / $old_w if exists $child->{user_w};
+         $child->{y}      = int 0.5 + $child->{y}      * $h / $old_h;
+         $child->{h}      = int 0.5 + $child->{h}      * $h / $old_h;
+         $child->{req_h}  = int 0.5 + $child->{req_h}  * $h / $old_h if exists $child->{req_h};
+         $child->{user_h} = int 0.5 + $child->{user_h} * $h / $old_h if exists $child->{user_h};
+      }
+   }
+
+   $self->{old_w} = $w;
+   $self->{old_h} = $h;
 }
 
 sub configure {
@@ -2444,12 +2723,12 @@
 
    $self->SUPER::configure ($x, $y, $w, $h);
 
-   for my $child (@{$self->{children}}) {
+   for my $child ($self->children) {
       my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
 
       $X = List::Util::max 0, List::Util::min $w - $W, $X;
       $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
-      $child->configure ($X, $Y, $W,$H);
+      $child->configure ($X, $Y, $W, $H);
    }
 }