--- deliantra/Deliantra-Client/DC/UI.pm	2007/07/15 22:13:43	1.372
+++ deliantra/Deliantra-Client/DC/UI.pm	2007/07/21 13:54:03	1.394
@@ -115,8 +115,12 @@
    if ($GRAB) {
       if ($ev->{button} == 4 || $ev->{button} == 5) {
          # mousewheel
-         $ev->{dx} = 0;
-         $ev->{dy} = $ev->{button} * 2 - 9;
+         my $delta = $ev->{button} * 2 - 9;
+         my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
+
+         $ev->{dx} = $shift ? $delta : 0;
+         $ev->{dy} = $shift ? 0 : $delta;
+
          $GRAB->emit (mouse_wheel => $ev);
       } else {
          $GRAB->emit (button_down => $ev)
@@ -549,17 +553,8 @@
    $self->{parent} && $self->{parent}->emit ($signal, @args)
 }
 
-sub find_widget {
-   my ($self, $x, $y) = @_;
-
-   return () unless $self->{can_events};
-
-   return $self
-      if $x >= $self->{x} && $x < $self->{x} + $self->{w}
-          && $y >= $self->{y} && $y < $self->{y} + $self->{h};
-
-   ()
-}
+#sub find_widget {
+# in .xs
 
 sub set_parent {
    my ($self, $parent) = @_;
@@ -748,7 +743,7 @@
    );
 
    $self->add (@$children)
-      if $children;
+      if $children && @$children;
 
    $self
 }
@@ -767,6 +762,7 @@
    $_->set_parent ($self)
       for @widgets;
 
+   # TODO: only do this in widgets that need it, e.g. root, fixed
    use sort 'stable';
 
    $self->{children} = [
@@ -795,7 +791,7 @@
 sub clear {
    my ($self) = @_;
 
-   my $children = delete $self->{children};
+   my $children = $self->{children};
    $self->{children} = [];
 
    for (@$children) {
@@ -946,6 +942,8 @@
 
 package CFPlus::UI::ViewPort;
 
+use List::Util qw(min max);
+
 our @ISA = CFPlus::UI::Window::;
 
 sub new {
@@ -963,8 +961,8 @@
 
    my ($w, $h) = @{$self->child}{qw(req_w req_h)};
 
-   $w = 10 if $self->{scroll_x};
-   $h = 10 if $self->{scroll_y};
+   $w = 1 if $self->{scroll_x};
+   $h = 1 if $self->{scroll_y};
 
    ($w, $h)
 }
@@ -986,10 +984,16 @@
 sub set_offset {
    my ($self, $x, $y) = @_;
 
-   $self->{view_x} = int $x;
-   $self->{view_y} = int $y;
+   my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
+   my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
 
-   $self->update;
+   if ($x != $self->{view_x} or $y != $self->{view_y}) {
+      $self->{view_x} = $x;
+      $self->{view_y} = $y;
+
+      $self->emit (changed => $x, $y);
+      $self->update;
+   }
 }
 
 # hmm, this does not work for topleft of $self... but we should not ask for that
@@ -1014,7 +1018,7 @@
    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})
+      $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
    } else {
       $self->CFPlus::UI::Base::find_widget ($x, $y)
    }
@@ -1045,6 +1049,8 @@
    my $self;
 
    my $hslider = new CFPlus::UI::Slider
+      col        => 0,
+      row        => 1,
       vertical   => 0,
       range      => [0, 0, 1, 0.01], # HACK fix
       on_changed => sub {
@@ -1054,6 +1060,8 @@
    ;
 
    my $vslider = new CFPlus::UI::Slider
+      col        => 1,
+      row        => 0,
       vertical   => 1,
       range      => [0, 0, 1, 0.01], # HACK fix
       on_changed => sub {
@@ -1074,21 +1082,29 @@
    );
 
    $self->{vp} = new CFPlus::UI::ViewPort
-      expand   => 1,
-      scroll_x => $self->{scroll_x},
-      scroll_y => $self->{scroll_y},
+      col        => 0,
+      row        => 0,
+      expand     => 1,
+      scroll_x   => $self->{scroll_x},
+      scroll_y   => $self->{scroll_y},
+      on_changed => sub {
+         my ($vp, $x, $y) = @_;
+
+         $vp->{parent}{hslider}->set_value ($x);
+         $vp->{parent}{vslider}->set_value ($y);
+
+         0
+      },
    ;
 
-   $self->SUPER::add (0, 0, $self->{vp});
-   $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
-   $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
+   $self->SUPER::add ($self->{vp});
 
    $self->add ($child) if $child;
 
    $self
 }
 
-#TODO# update range on size_allocate depending on child
+#TODO# update range on size_allocate depending on child?
 
 sub add {
    my ($self, $widget) = @_;
@@ -1096,16 +1112,6 @@
    $self->{vp}->add ($self->{child} = $widget);
 }
 
-sub invoke_mouse_wheel {
-   my ($self, $ev) = @_;
-
-   return 0 unless $ev->{dy}; # only vertical movements
-
-   $self->{vslider}->emit (mouse_wheel => $ev);
-
-   1
-}
-
 sub update_slider {
    my ($self) = @_;
 
@@ -1113,18 +1119,85 @@
 
    my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
    $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
-   #$self->{hslider}->set_visibility ($w1 != $w2);
+
+   my $visible = $w1 > $w2;
+   if ($visible != $self->{hslider_visible}) {
+      $self->{hslider_visible} = $visible;
+      $visible ? $self->SUPER::add ($self->{hslider})
+               : $self->SUPER::remove ($self->{hslider});
+   }
 
    my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
    $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
-   #$self->{vslider}->set_visibility ($h1 != $h2);
+
+   my $visible = $h1 > $h2;
+   if ($visible != $self->{vslider_visible}) {
+      $self->{vslider_visible} = $visible;
+      $visible ? $self->SUPER::add ($self->{vslider})
+               : $self->SUPER::remove ($self->{vslider});
+   }
 }
 
 sub update {
    my ($self) = @_;
 
-   $self->SUPER::update;
    $self->update_slider;
+   $self->SUPER::update;
+}
+
+sub invoke_mouse_wheel {
+   my ($self, $ev) = @_;
+
+   $self->{vslider}->emit (mouse_wheel => $ev)
+      if $ev->{dy};
+
+   $self->{hslider}->emit (mouse_wheel => $ev)
+      if $ev->{dx};
+
+   1
+}
+
+sub invoke_button_down {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($ev->{button} == 2) {
+      $self->grab_focus;
+
+      my $ox = $self->{vp}{view_x} + $ev->{x};
+      my $oy = $self->{vp}{view_y} + $ev->{y};
+      
+      $self->{motion} = sub {
+         my ($ev, $x, $y) = @_;
+
+         $self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
+         $self->update;
+      };
+
+      return 1;
+   }
+
+   0
+}
+
+sub invoke_button_up {
+   my ($self, $ev, $x, $y) = @_;
+
+   if (delete $self->{motion}) {
+      return 1;
+   }
+
+   0
+}
+
+sub invoke_mouse_motion {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($self->{motion}) {
+      $self->{motion}->($ev, $x, $y);
+      return 1;
+   }
+
+   0
 }
 
 sub invoke_size_allocate {
@@ -1290,6 +1363,10 @@
       map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
          qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
+my @icon =
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+         qw(x1_move.png x1_resize.png);
+
 sub new {
    my ($class, %arg) = @_;
 
@@ -1467,10 +1544,24 @@
    my $border = $self->border;
 
    glColor @{ $self->{border_bg} };
-   $border[0]->draw_quad_alpha (0, 0, $w, $border);
-   $border[1]->draw_quad_alpha (0, $border, $border, $ch);
-   $border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
-   $border[3]->draw_quad_alpha (0, $h - $border, $w, $border);
+   $border[0]->draw_quad_alpha (           0,            0, $w, $border);
+   $border[1]->draw_quad_alpha (           0,      $border, $border, $ch);
+   $border[2]->draw_quad_alpha ($w - $border,      $border, $border, $ch);
+   $border[3]->draw_quad_alpha (           0, $h - $border, $w, $border);
+
+   # move
+   my $w2 = ($w - $border) * .5;
+   my $h2 = ($h - $border) * .5;
+   $icon[0]->draw_quad_alpha (           0,          $h2, $border, $border);
+   $icon[0]->draw_quad_alpha ($w - $border,          $h2, $border, $border);
+   $icon[0]->draw_quad_alpha ($w2         , $h - $border, $border, $border);
+
+   # resize
+   $icon[1]->draw_quad_alpha (           0,            0, $border, $border);
+   $icon[1]->draw_quad_alpha ($w - $border,            0, $border, $border)
+      unless $self->{has_close_button};
+   $icon[1]->draw_quad_alpha (           0, $h - $border, $border, $border);
+   $icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
 
    if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
       glColor @{ $self->{bg} };
@@ -1501,7 +1592,7 @@
 
 package CFPlus::UI::Table;
 
-our @ISA = CFPlus::UI::Base::;
+our @ISA = CFPlus::UI::Container::;
 
 use List::Util qw(max sum);
 
@@ -1517,43 +1608,32 @@
    )
 }
 
-sub children {
-   grep $_, map @$_, grep $_, @{ $_[0]{children} }
-}
-
 sub add {
-   my ($self) = shift;
+   my ($self, @widgets) = @_;
 
-   while (@_) {
-      my ($x, $y, $child) = splice @_, 0, 3, ();
-      $child->set_parent ($self);
-      $self->{children}[$y][$x] = $child;
+   for my $child (@widgets) {
+      $child->{rowspan} ||= 1;
+      $child->{colspan} ||= 1;
    }
 
-   $self->{force_realloc} = 1;
-   $self->{force_size_alloc} = 1;
-   $self->realloc;
+   $self->SUPER::add (@widgets);
 }
 
-sub remove {
-   my ($self, $child) = @_;
+sub add_at {
+   my $self = shift;
 
-   # TODO: not yet implemented
-}
+   my @widgets;
 
-# TODO: move to container class maybe? send children a signal on removal?
-sub clear {
-   my ($self) = @_;
+   while (@_) {
+      my ($col, $row, $child) = splice @_, 0, 3, ();
 
-   my @children = $self->children;
-   delete $self->{children};
-   
-   for (@children) {
-      delete $_->{parent};
-      $_->hide;
+      $child->{row} = $row;
+      $child->{col} = $col;
+
+      push @widgets, $child;
    }
 
-   $self->realloc;
+   $self->add (@widgets);
 }
 
 sub get_wh {
@@ -1561,17 +1641,27 @@
 
    my (@w, @h);
 
-   for my $y (0 .. $#{$self->{children}}) {
-      my $row = $self->{children}[$y]
-         or next;
-
-      for my $x (0 .. $#$row) {
-         my $widget = $row->[$x]
-            or next;
-         my ($w, $h) = @$widget{qw(req_w req_h)};
+   my @children = $self->children;
+
+   # first pass, columns
+   for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
+      my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
 
-         $w[$x] = max $w[$x], $w;
-         $h[$y] = max $h[$y], $h;
+      my $sw = sum @w[$c .. $c + $cs - 1];
+
+      if ($w > $sw) {
+         $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
+      }
+   }
+
+   # second pass, rows
+   for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
+      my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
+
+      my $sh = sum @h[$r .. $r + $rs - 1];
+
+      if ($h > $sh) {
+         $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
       }
    }
 
@@ -1597,7 +1687,7 @@
    my $req_w = (sum @$ws) || 1;
    my $req_h = (sum @$hs) || 1;
 
-   # TODO: nicer code
+   # now linearly scale the rows/columns to the allocated size
    my @col_expand = @{$self->{col_expand}};
    @col_expand = (1) x @$ws unless @col_expand;
    my $col_expand = (sum @col_expand) || 1;
@@ -1614,53 +1704,101 @@
 
    CFPlus::UI::harmonize $hs;
 
-   my $y;
+   my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
+   my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
 
-   for my $r (0 .. $#{$self->{children}}) {
-      my $row = $self->{children}[$r]
-         or next;
+   for my $widget ($self->children) {
+      my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
 
-      my $x = 0;
-      my $row_h = $hs->[$r];
-      
-      for my $c (0 .. $#$row) {
-         my $col_w = $ws->[$c];
+      $widget->configure (
+         $x[$c], $y[$r],
+         $x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
+      );
+   }
 
-         if (my $widget = $row->[$c]) {
-            $widget->configure ($x, $y, $col_w, $row_h);
-         }
+   1
+}
 
-         $x += $col_w;
-      }
+#############################################################################
 
-      $y += $row_h;
-   }
+package CFPlus::UI::Fixed;
 
-   1
+use List::Util qw(min max);
+
+our @ISA = CFPlus::UI::Container::;
+
+sub add {
+   my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
+
+   $child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
+   $self->SUPER::add ($child);
 }
 
-sub find_widget {
-   my ($self, $x, $y) = @_;
+sub _scale($$$) {
+   my ($mode, $val, $max) = @_;
 
-   $x -= $self->{x};
-   $y -= $self->{y};
+   $mode eq "abs"   ? $val
+   : $mode eq "rel" ? $val * $max
+   :                  0
+}
 
-   my $res;
+sub size_request {
+   my ($self) = @_;
 
-   for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
-      $res = $_->find_widget ($x, $y)
-         and return $res;
+   my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
+
+   # determine overall size by querying abs widgets
+   for my $child ($self->visible_children) {
+      my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+      if ($pos eq "abs") {
+         $w = _scale $size, $w, $child->{req_w};
+         $h = _scale $size, $h, $child->{req_h};
+
+         $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
+         $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
+      }
    }
 
-   $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
+   my $W = $x2 - $x1;
+   my $H = $y2 - $y1;
+
+   # now layout remaining widgets
+   for my $child ($self->visible_children) {
+      my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+      if ($pos ne "abs") {
+         $x = _scale $pos,  $x, $W;
+         $y = _scale $pos,  $x, $H;
+         $w = _scale $size, $w, $child->{req_w};
+         $h = _scale $size, $h, $child->{req_h};
+
+         $x1 = min $x1, $x; $x2 = max $x2, $x + $w;
+         $y1 = min $y1, $y; $y2 = max $y2, $y + $h;
+      }
+   }
+
+   my $W = $x2 - $x1;
+   my $H = $y2 - $y1;
+
+   ($W, $H)
 }
 
-sub _draw {
-   my ($self) = @_;
+sub invoke_size_allocate {
+   my ($self, $W, $H) = @_;
+
+   for my $child ($self->visible_children) {
+      my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
+
+      $x = _scale $pos,  $x, $W;
+      $y = _scale $pos,  $x, $H;
+      $w = _scale $size, $w, $child->{req_w};
+      $h = _scale $size, $h, $child->{req_h};
 
-   for (grep $_, @{$self->{children}}) {
-      $_->draw for grep $_, @$_;
+      $child->configure ($x, $y, $w, $h);
    }
+
+   1
 }
 
 #############################################################################
@@ -2228,7 +2366,7 @@
 
 my @tex =
       map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
-         qw(b1_button_active.png);
+         qw(b1_button_inactive.png b1_button_active.png);
 
 sub new {
    my $class = shift;
@@ -2236,8 +2374,8 @@
    $class->SUPER::new (
       padding_x  => 4,
       padding_y  => 4,
-      fg         => [1, 1, 1],
-      active_fg  => [0, 0, 1],
+      fg         => [1.0, 1.0, 1.0],
+      active_fg  => [0.8, 0.8, 0.8],
       can_hover  => 1,
       align      => 0,
       valign     => 0,
@@ -2265,7 +2403,8 @@
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    glColor 0, 0, 0, 1;
 
-   $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
+   my $tex = $tex[$GRAB == $self];
+   $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
 
    glDisable GL_TEXTURE_2D;
 
@@ -3330,6 +3469,8 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
+      size_w     => 32,
+      size_h     => 8,
       aspect     => 1,
       can_events => 0,
       @_,
@@ -3338,23 +3479,74 @@
    if ($self->{anim} && $self->{animspeed}) {
       CFPlus::weaken (my $widget = $self);
 
+      $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
+      $widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
       $self->{timer} = Event->timer (
-         at       => $self->{animspeed} * int $::NOW / $self->{animspeed},
-         hard     => 1,
-         interval => $self->{animspeed},
+         parked   => 1,
          cb       => sub {
-            delete $self->{wait_face};
+            return unless $::CONN && $widget;
+
             ++$widget->{frame};
+            $widget->update_face;
             $widget->update;
+
+            $widget->update_timer;
          },
       );
+
+      $self->update_face;
+      $self->update_timer;
    }
    
    $self
 }
 
+sub update_timer {
+   my ($self) = @_;
+
+   return unless $self->{timer};
+
+   if ($self->{visible}) {
+      $self->{timer}->at (
+         $self->{anim_start}
+         + $self->{animspeed}
+           * int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
+      );
+      $self->{timer}->start;
+   } else {
+      $self->{timer}->stop;
+   }
+}
+
+sub update_face {
+   my ($self) = @_;
+
+   return unless $::CONN;
+
+   if (my $anim = $::CONN->{anim}[$self->{anim}]) {
+      if ($anim && @$anim) {
+         delete $self->{wait_face};
+         $self->{face} = $anim->[ $self->{frame} % @$anim ];
+      }
+   }
+}
+
 sub size_request {
-   (32, 8)
+   my ($self) = @_;
+
+   if ($::CONN) {
+      if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
+         if (my $tex = $::CONN->{texture}[$faceid]) {
+            return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
+         } else {
+            $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
+               $self->realloc;
+            });
+         }
+      }
+   }
+
+   ($self->{size_w} || 8, $self->{size_h} || 8)
 }
 
 sub update {
@@ -3365,23 +3557,22 @@
    $self->SUPER::update;
 }
 
-sub _draw {
+sub invoke_visibility_change {
    my ($self) = @_;
 
-   return unless $::CONN;
+   $self->update_timer;
 
-   $self->SUPER::_draw;
+   0
+}
 
-   my $face;
+sub _draw {
+   my ($self) = @_;
 
-   if ($self->{frame}) {
-      my $anim = $::CONN->{anim}[$self->{anim}];
+   return unless $::CONN;
 
-      $face = $anim->[ $self->{frame} % @$anim ]
-         if $anim && @$anim;
-   }
+   $self->SUPER::_draw;
 
-   my $faceid = $::CONN->{faceid}[$face || $self->{face}]
+   my $faceid = $::CONN->{faceid}[$self->{face}]
       or return;
    
    my $tex = $::CONN->{texture}[$faceid];
@@ -3392,17 +3583,13 @@
       glColor 0, 0, 0, 1;
       $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
       glDisable GL_TEXTURE_2D;
-   } else {
-      $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
-         $self->update;
-      });
    }
 }
 
 sub destroy {
    my ($self) = @_;
 
-   $self->{timer}->cancel
+   (delete $self->{timer})->cancel
       if $self->{timer};
 
    $self->SUPER::destroy;
@@ -4056,7 +4243,6 @@
          for values %{delete $self->{post_alloc_hook}};
    }
 
-
    glViewport 0, 0, $::WIDTH, $::HEIGHT;
    glClearColor +($::CFG->{fow_intensity}) x 3, 1;
    glClear GL_COLOR_BUFFER_BIT;