--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/11 14:36:59	1.67
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/11 17:32:14	1.69
@@ -116,6 +116,8 @@
 sub focus_in {
    my ($self) = @_;
 
+   return if $FOCUS == $self;
+
    my $focus = $FOCUS; $FOCUS = $self;
    $focus->update if $focus;
    $FOCUS->update;
@@ -132,10 +134,15 @@
 
 sub mouse_motion { }
 sub button_up { }
-sub button_down { }
 sub key_down { }
 sub key_up { }
 
+sub button_down {
+   my ($self, $ev, $x, $y) = @_;
+
+   $self->focus_in;
+}
+
 sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
 sub h { $_[0]{h} = $_[1] if @_ > 1; $_[0]{h} }
 sub x { $_[0]{x} = $_[1] if @_ > 1; $_[0]{x} }
@@ -145,6 +152,8 @@
 sub draw {
    my ($self) = @_;
 
+   return unless $self->{h} && $self->{w};
+
    glPushMatrix;
    glTranslate $self->{x}, $self->{y}, 0;
    $self->_draw;
@@ -217,6 +226,41 @@
 
 #############################################################################
 
+package CFClient::Widget::DrawBG;
+
+our @ISA = CFClient::Widget::;
+
+use strict;
+use SDL::OpenGL;
+
+sub new {
+   my $class = shift;
+
+   # range [value, low, high, page]
+
+   $class->SUPER::new (
+      bg        => [0, 0, 0, 0.4],
+      active_bg => [1, 1, 1],
+      @_
+   )
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   my ($w, $h) = @$self{qw(w h)};
+
+   glColor @{ $FOCUS == $self ? $self->{active_bg} : $self->{bg} };
+   glBegin GL_QUADS;
+   glVertex 0 , 0;
+   glVertex 0 , $h;
+   glVertex $w, $h;
+   glVertex $w, 0;
+   glEnd;
+}
+
+#############################################################################
+
 package CFClient::Widget::Empty;
 
 our @ISA = CFClient::Widget::;
@@ -323,15 +367,16 @@
 sub child { $_[0]->{children}[0] }
 
 sub size_request {
-   $_[0]{children}[0]->size_request if $_[0]{children}[0];
+   $_[0]{children}[0]->size_request
 }
 
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
+   return unless $self->{w} != $w || $self->{h} != $h;
+
    $self->SUPER::size_allocate ($w, $h);
-   $self->{children}[0]->size_allocate ($w, $h)
-      if $self->{children}[0]
+   $self->{children}[0]->size_allocate ($w, $h);
 }
 
 #############################################################################
@@ -368,6 +413,8 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
+   return unless $self->{w} != $w || $self->{h} != $h;
+
    $self->{w} = $w;
    $self->{h} = $h;
 
@@ -415,6 +462,8 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
    
+   return unless $self->{w} != $w || $self->{h} != $h;
+
    $self->{w} = $w;
    $self->{h} = $h;
 
@@ -468,6 +517,8 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
+   return unless $self->{w} != $w || $self->{h} != $h;
+
    $self->SUPER::size_allocate ($w, $h);
 
    $h -= $tex[1]->{height};
@@ -634,41 +685,45 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->w ($w);
-   $self->h ($h);
+   return unless $self->{w} != $w || $self->{h} != $h;
 
-   my $exp;
-   my @oth;
-   # find expand widget
-   for (@{$self->{children}}) {
-      if ($_->{expand}) {
-         $exp = $_;
-         last;
-      }
-      push @oth, $_;
-   }
+   $self->{w} = $w;
+   $self->{h} = $h;
+
+   return unless $self->{h};
+
+   my $children = $self->{children};
 
-   my ($ow, $oh);
+   my @h = map +($_->size_request)[1], @$children;
 
-   # get sizes of other widgets
-   for (@oth) {
-      my ($w, $h) = $_->size_request;
-      $oh += $h;
-      if ($ow < $w) { $ow = $w }
+   my $req_h = List::Util::sum @h;
+
+   if ($req_h > $h) {
+      # ah well, not enough space
+      $_ = $h[$_] * $h / $req_h for @h;
+   } else {
+      my @exp = grep $_->{expand}, @$children;
+      @exp = @$children unless @exp;
+      
+      my %exp = map +($_ => 1), @exp;
+
+      for (0 .. $#$children) {
+         my $child = $children->[$_];
+
+         my $alloc_h = $h[$_];
+         $alloc_h += ($h - $req_h) / @exp if $exp{$child};
+         $h[$_] = $alloc_h;
+      }
    }
 
    my $y = 0;
-   for (@{$self->{children}}) {
-      $_->move (0, $y);
+   for (0 .. $#$children) {
+      my $child = $children->[$_];
+      my $h = $h[$_];
+      $child->move (0, $y);
+      $child->size_allocate ($w, $h);
 
-      if ($_ == $exp) {
-         $_->size_allocate ($w, $h - $oh);
-         $y += $h - $oh;
-      } else {
-         my ($cw, $h) = $_->size_request;
-         $_->size_allocate ($w, $h);
-         $y += $h;
-      }
+      $y += $h;
    }
 }
 
@@ -683,9 +738,8 @@
 sub new {
    my ($class, %arg) = @_;
 
-   # TODO: color, and make height, xyz etc. optional
    my $self = $class->SUPER::new (
-      color  => [1, 1, 1],
+      fg     => [1, 1, 1],
       height => $::FONTSIZE,
       text   => "",
       layout => new CFClient::Layout,
@@ -697,6 +751,16 @@
    $self
 }
 
+sub escape_text {
+   local $_ = $_[1];
+
+   s/&/&amp;/g;
+   s/>/&gt;/g;
+   s/</&lt;/g;
+
+   $_[1]
+}
+
 sub set_text {
    my ($self, $text) = @_;
 
@@ -704,6 +768,7 @@
    $self->{layout}->set_markup ($text);
 
    delete $self->{texture};
+   $self->update;
 }
 
 sub get_text {
@@ -733,10 +798,19 @@
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
+   return unless $self->{w} != $w || $self->{h} != $h;
+
    $self->SUPER::size_allocate ($w, $h);
    delete $self->{texture};
 }
 
+sub update {
+   my ($self) = @_;
+
+   delete $self->{texture};
+   $self->SUPER::update;
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -750,7 +824,7 @@
    glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
-   glColor @{$self->{color}};
+   glColor @{$self->{fg}};
 
    $tex->draw_quad (0, 0);
 
@@ -767,6 +841,59 @@
 use SDL;
 use SDL::OpenGL;
 
+sub new {
+   my $class = shift;
+
+   $class->SUPER::new (
+      fg        => [1, 1, 1],
+      bg        => [0, 0, 0, 0.4],
+      active_bg => [1, 1, 1],
+      active_fg => [0, 0, 0],
+      @_
+   )
+}
+
+sub _set_text {
+   my ($self, $text) = @_;
+
+   $self->{last_activity} = $::NOW;
+
+   $self->{text} = $text;
+   $self->{layout}->set_width ($self->{w});
+   $self->{layout}->set_markup ($self->escape_text ($text));
+
+   $text = substr $text, 0, $self->{cursor};
+   utf8::encode $text;
+
+   @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   my ($w, $h) = $self->SUPER::size_request;
+
+   ($w + 1, $h) # add 1 for cursor
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   return unless $self->{w} != $w || $self->{h} != $h;
+
+   $self->SUPER::size_allocate ($w, $h);
+
+   $self->_set_text ($self->{text});
+}
+
+sub set_text {
+   my ($self, $text) = @_;
+
+   $self->{cursor} = length $text;
+   $self->_set_text ($text);
+   $self->update;
+}
+
 sub key_down {
    my ($self, $ev) = @_;
 
@@ -778,42 +905,195 @@
    my $text = $self->get_text;
 
    if ($sym == SDLK_BACKSPACE) {
-      substr $text, -1, 1, '';
+      substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
+   } elsif ($sym == SDLK_DELETE) {
+      substr $text, $self->{cursor}, 1, "";
+   } elsif ($sym == SDLK_LEFT) {
+      --$self->{cursor} if $self->{cursor};
+   } elsif ($sym == SDLK_RIGHT) {
+      ++$self->{cursor} if $self->{cursor} < length $self->{text};
    } elsif ($uni) {
-      $text .= chr $uni;
+      substr $text, $self->{cursor}++, 0, chr $uni;
    }
 
-   $self->set_text ($text);
+   $self->_set_text ($text);
+   $self->update;
+}
+
+sub focus_in {
+   my ($self) = @_;
+
+   $self->{last_activity} = $::NOW;
+
+   $self->SUPER::focus_in;
 }
 
 sub button_down {
-   my ($self, $ev) = @_;
+   my ($self, $ev, $x, $y) = @_;
 
-   $self->focus_in;
+   $self->SUPER::button_down ($ev, $x, $y);
+
+   my $idx = $self->{layout}->xy_to_index ($x, $y);
+
+   # byte-index to char-index
+   my $text = $self->{layout};
+   utf8::encode $text;
+   $self->{cursor} = length substr $text, 0, $idx;
+
+   $self->_set_text ($self->{text});
+   $self->update;
 }
 
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
-   printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
+#   printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
 }
 
 sub _draw {
    my ($self) = @_;
 
+   local $self->{fg} = $self->{fg};
+
    if ($FOCUS == $self) {
-      glColor 1, 1, 1;
+      glColor @{$self->{active_bg}};
+      $self->{fg} = $self->{active_fg};
    } else {
-      glColor 0.7, 0.7, 0.7;
+      glColor @{$self->{bg}};
    }
 
    glBegin GL_QUADS;
-   glVertex 0             , 0;
-   glVertex 0             , $self->{h} - 1;
-   glVertex $self->{w} - 1, $self->{h} - 1;
-   glVertex $self->{w} - 1, 0;
+   glVertex 0         , 0;
+   glVertex 0         , $self->{h};
+   glVertex $self->{w}, $self->{h};
+   glVertex $self->{w}, 0;
    glEnd;
 
    $self->SUPER::_draw;
+
+   #TODO: force update every cursor change :(
+   if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
+      glColor @{$self->{fg}};
+      glBegin GL_LINES;
+      glVertex $self->{cur_x}, $self->{cur_y};
+      glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
+      glEnd;
+   }
+}
+
+#############################################################################
+
+package CFClient::Widget::Slider;
+
+use strict;
+
+use SDL::OpenGL;
+use SDL::OpenGL::Constants;
+
+our @ISA = CFClient::Widget::DrawBG::;
+
+sub size_request {
+   my ($self) = @_;
+
+   my $w = 20;
+   my $h = 10;
+
+   $self->{vertical} ? ($h, $w) : ($w, $h)
+}
+
+sub new {
+   my $class = shift;
+
+   # range [value, low, high, page]
+
+   $class->SUPER::new (
+      fg        => [1, 1, 1],
+      active_fg => [0, 0, 0],
+      range     => [0, 0, 100, 10],
+      vertical  => 0,
+      @_
+   )
+}
+
+sub button_down {
+   my ($self, $ev, $x, $y) = @_;
+
+   $self->SUPER::button_down ($ev, $x, $y);
+   $self->mouse_motion ($ev, $x, $y);
+}
+
+sub mouse_motion {
+   my ($self, $ev, $x, $y) = @_;
+
+   if ($GRAB == $self) {
+      my ($value, $lo, $hi, $page) = @{$self->{range}};
+
+      $x = $x * ($hi - $lo) / $self->{w} + $lo;
+      $x = $lo         if $x < $lo;
+      $x = $hi - $page if $x > $hi - $page;
+      $self->{range}[0] = $x;
+
+      $self->{changed}($x) if $self->{changed};
+      $self->update;
+   }
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   $self->SUPER::_draw ();
+
+   glPushMatrix;
+
+   my ($w, $h) = @$self{qw(w h)};
+
+   if ($self->{vertical}) {
+      # draw a vertical slider like a rotated horizontal slider
+ 
+      glTranslate 0, $self->{w};
+      glRotate 90, 0, 0, 1;
+
+      ($w, $h) = ($h, $w);
+   }
+
+   my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
+   my $bg = $FOCUS == $self ? $self->{active_bg} : $self->{bg};
+
+   my ($value, $lo, $hi, $page) = @{$self->{range}};
+
+   $page = int $page * $w / ($hi - $lo);
+   $value = int +($value - $lo) * $w / ($hi - $lo);
+
+   $w -= $page;
+   $page &= ~1;
+   glTranslate $page * 0.5, 0, 0;
+
+   glColor @$fg;
+   glBegin GL_LINES;
+   glVertex 0, 0; glVertex 0, $h;
+   glVertex $w - 1, 0; glVertex $w - 1, $h;
+   glVertex 0, $h * 0.5; glVertex $w, $h * 0.5;
+   glEnd;
+
+   my $knob_a = $value - $page * 0.5;
+   my $knob_b = $value + $page * 0.5;
+
+   glBegin GL_QUADS;
+   glColor @$fg;
+   glVertex $knob_a, 0;
+   glVertex $knob_a, $h;
+   glVertex $knob_b, $h;
+   glVertex $knob_b, 0;
+
+   if ($knob_a < $knob_b - 2) {
+      glColor @$bg;
+      glVertex $knob_a + 1, 1;
+      glVertex $knob_a + 1, $h - 1;
+      glVertex $knob_b - 1, $h - 1;
+      glVertex $knob_b - 1, 1;
+   }
+   glEnd;
+
+   glPopMatrix;
 }
 
 #############################################################################