--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/14 11:32:22	1.100
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/14 20:27:35	1.107
@@ -63,8 +63,8 @@
    if ($widget != $HOVER) {
       my $hover = $HOVER; $HOVER = $widget;
 
-      $hover->update if $hover;
-      $HOVER->update if $HOVER;
+      $hover->update if $hover && $hover->{can_hover};
+      $HOVER->update if $HOVER && $HOVER->{can_hover};
    }
 
    $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
@@ -441,10 +441,11 @@
 sub render_chld {
    my ($self) = @_;
 
-   $self->{texture} =
-      CFClient::Texture->new_from_opengl (
-         $self->{w}, $self->{h}, sub { $self->child->draw }
-      );
+   $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+      glClearColor 0, 0, 0, 1;
+      glClear GL_COLOR_BUFFER_BIT;
+      $self->child->draw;
+   };
 }
 
 sub size_allocate {
@@ -734,6 +735,9 @@
    $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
    $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
 
+   $_ = int $_ for @$ws; #TODO: avoid rounding problems
+   $_ = int $_ for @$hs; #TODO: avoid rounding problems
+
    my $y;
 
    for my $r (0 .. $#{$self->{children}}) {
@@ -833,7 +837,7 @@
    my $y = 0;
    for (0 .. $#$children) {
       my $child = $children->[$_];
-      my $h = $h[$_];
+      my $h = int $h[$_];
       $child->size_allocate ($y, 0, $h, $w);
 
       $y += $h;
@@ -887,7 +891,7 @@
    my $y = 0;
    for (0 .. $#$children) {
       my $child = $children->[$_];
-      my $h = $h[$_];
+      my $h = int $h[$_];
       $child->size_allocate (0, $y, $w, $h);
 
       $y += $h;
@@ -906,12 +910,12 @@
    my ($class, %arg) = @_;
 
    my $self = $class->SUPER::new (
-      fg      => [1, 1, 1],
-      height  => $::FONTSIZE,
-      text    => "",
-      align   => -1,
-      padding => 2,
-      layout  => new CFClient::Layout,
+      fg       => [1, 1, 1],
+      fontsize => $::FONTSIZE,
+      text     => "",
+      align    => -1,
+      padding  => 2,
+      layout   => new CFClient::Layout,
       %arg
    );
 
@@ -951,7 +955,7 @@
    my ($self) = @_;
 
    $self->{layout}->set_width;
-   $self->{layout}->set_height ($self->{height});
+   $self->{layout}->set_height ($self->{fontsize});
    my ($w, $h) = $self->{layout}->size;
 
    (
@@ -980,14 +984,14 @@
 
    my $tex = $self->{texture} ||= do {
       $self->{layout}->set_width ($self->{w});
-      $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
+      $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
       new_from_layout CFClient::Texture $self->{layout}
    };
 
    glEnable GL_BLEND;
    glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
    glColor @{$self->{fg}};
 
@@ -996,8 +1000,7 @@
     : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
     :                      ($self->{w} - $tex->{w}) * 0.5;
 
-   glTranslate int $x, int +($self->{h} - $tex->{h}) * 0.5, 0;
-   $tex->draw_quad (0, 0);
+   $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
 
    glDisable GL_TEXTURE_2D;
    glDisable GL_BLEND;
@@ -1035,7 +1038,7 @@
 
    $self->{text} = $text;
    $self->{layout}->set_width ($self->{w});
-   $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{height});
+   $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
 
    $text =~ s/./*/g if $self->{hidden};
 
@@ -1096,6 +1099,8 @@
       $self->{cursor} = 0;
    } elsif ($sym == SDLK_END) {
       $self->{cursor} = length $text;
+   } elsif ($sym == SDLK_ESCAPE) {
+      $self->emit ('escape');
    } elsif ($uni) {
       substr $text, $self->{cursor}++, 0, chr $uni;
    }
@@ -1255,6 +1260,10 @@
 
 our @ISA = CFClient::UI::DrawBG::;
 
+my @tex =
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+         qw(c1_checkbox_bg.png c1_checkbox_active.png);
+
 use SDL;
 use SDL::OpenGL;
 
@@ -1301,24 +1310,19 @@
    glTranslate $self->{padding} + 0.375, $self->{padding} + 0.375, 0;
 
    my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
-   
+
    glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
 
-   glBegin GL_LINE_LOOP;
-   glVertex 0 , 0;
-   glVertex 0 , $s;
-   glVertex $s, $s;
-   glVertex $s, 0;
-   glEnd;
+   glEnable GL_BLEND;
+   glEnable GL_TEXTURE_2D;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
 
-   if ($self->{state}) {
-      glBegin GL_LINES;
-      glVertex 0 , 0;
-      glVertex $s, $s;
-      glVertex $s, 0;
-      glVertex 0 , $s;
-      glEnd;
-   }
+   my $tex = $self->{state} ? $tex[1] : $tex[0];
+
+   $tex->draw_quad (0, 0, $s, $s);
+
+   glDisable GL_TEXTURE_2D;
+   glDisable GL_BLEND;
 }
 
 #############################################################################
@@ -1351,6 +1355,7 @@
       req_h     => 13,
       vertical  => 0,
       can_hover => 1,
+      inner_pad => 5,
       @_
    );
 
@@ -1381,7 +1386,11 @@
 
       my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
 
-      $x = $x * ($hi - $lo) / $w + $lo;
+      my $inner_pad_px = $self->_calc_inner_pad_px ($w);
+      my $inner_w = $w - $inner_pad_px * 2;               # * 2 for left & right
+
+      $x -= $inner_pad_px;  # substract the padding
+      $x = $x * ($hi - $lo) / $inner_w + $lo;
       $x = $lo         if $x < $lo;
       $x = $hi - $page if $x > $hi - $page;
       $self->{range}[0] = $x;
@@ -1391,6 +1400,14 @@
    }
 }
 
+# the inner_* stuff is for generating a padding for the slider handle,
+# so that the handle doesn't leave the texture. This calculation isn't 100%
+# correct propably, but it does the job for now
+sub _calc_inner_pad_px {
+   my ($self, $w) = @_;
+   ($w / 100) * $self->{inner_pad} # % to pixels
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -1412,12 +1429,10 @@
 
    my ($value, $lo, $hi, $page) = @{$self->{range}};
 
-   # the inner_* stuff is for generating a padding for the slider handle,
-   # so that the handle doesn't leave the texture. This calculation isn't 100%
-   # correct propably, but it does the job for now
-   my $inner_pad = 5;                          # 5% of width for slider bg texture border
-   my $inner_pad_px = ($w / 100) * $inner_pad; # % to pixels
-   my $inner_w = $w - $inner_pad_px * 2;       # * 2 for left & right
+   $hi = $value + 1 if $lo == $hi;
+
+   my $inner_pad_px = $self->_calc_inner_pad_px ($w);
+   my $inner_w = $w - $inner_pad_px * 2;               # * 2 for left & right
 
    $page  = int $page * $inner_w / ($hi - $lo);
    $value = int +($value - $lo) * $inner_w / ($hi - $lo);
@@ -1457,59 +1472,158 @@
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      par      => [],
+      req_w    => $::WIDTH / 6,
+      req_h    => $::HEIGHT / 6,
+      fontsize => $::FONTSIZE,
       @_,
+
+      layout   => (new CFClient::Layout),
+      par      => [],
+      height   => 0,
       children => [
          (new CFClient::UI::Empty expand => 1),
          (new CFClient::UI::Slider vertical => 1),
       ],
    );
 
+   $self->{children}[1]->connect (changed => sub {
+      $self->update;
+   });
+
    $self
 }
 
+sub set_fontsize {
+   my ($self, $fontsize) = @_;
+
+   $self->{fontsize} = $fontsize;
+   $self->reflow;
+}
+
+sub text_height {
+   my ($self, $text) = @_;
+
+   my $layout = $self->{layout};
+
+   $layout->set_height ($self->{fontsize});
+   $layout->set_width ($self->{w});
+   $layout->set_text ($text);
+   
+   ($layout->size)[1]
+}
+
+sub reflow {
+   my ($self) = @_;
+
+   $self->{need_reflow}++;
+   $self->update;
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   ($self->{req_w}, $self->{req_h})
+}
+
+sub size_allocate {
+   my ($self, $x, $y, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($x, $y, $w, $h);
+
+   $self->{layout}->set_height ($self->{fontsize});
+   $self->{layout}->set_width ($self->{w});
+
+   $self->reflow;
+}
+
 sub add_paragraph {
    my ($self, $color, $text) = @_;
 
-   push @{$self->{par}}, [$color, $text];
-   my $count = scalar @{$self->{par}};
-   $self->{children}[1]{range} = [$count - 1, 0, $count, 1];
+   #TODO: intelligently "reformat" paragraph
+
+   my $height = $self->text_height ($text);
+
+   $self->{height} += $height;
+
+   push @{$self->{par}}, [$height, $color, $text];
+
+   $self->{children}[1]{range} = [$self->{height} - $self->{h}, 0, $self->{height}, $self->{h}];
    $self->{children}[1]->update;
 }
 
-sub _draw {
+sub update {
    my ($self) = @_;
 
-   my $par = $self->{par};
+   $self->SUPER::update;
 
-   my $bottom = (scalar @$par) - 1;
+   return unless $self->{h} > 0;
 
-   my $w = $self->{children}[0]{w};
-   my $y = $self->{h};
+   delete $self->{texture};
 
-   glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+   $TOPLEVEL->on_refresh ($self, sub {
+      if (delete $self->{need_reflow}) {
+         my $height = 0;
+
+         $height += $_->[0] = $self->text_height ($_->[2])
+            for @{$self->{par}};
+
+         $self->{height} = $height;
+
+         $self->{children}[1]{range} = [$height - $self->{h}, 0, $height, $self->{h}];
+         
+         delete $self->{texture};
+      }
+
+      $self->{texture} ||= new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+         glClearColor 0, 0, 0, 1;
+         glClear GL_COLOR_BUFFER_BIT;
+
+         glEnable GL_BLEND;
+         glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+         glEnable GL_TEXTURE_2D;
+         glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+
+         my $top = int $self->{children}[1]{range}[0];
 
-   # TODO: everything!
-   while ($y > 0 && $bottom >= 0) {
-      my $par = $par->[$bottom--];
-
-      my $layout = new CFClient::Layout;
-
-      $layout->set_height ($::FONTSIZE);
-      $layout->set_width ($w);
-      $layout->set_text ($par->[1]);
-      my $tex = new_from_layout CFClient::Texture $layout;
-      $y -= $tex->{h};
+         my $y0 = $top;
+         my $y1 = $top + $self->{h};
 
-      glColor @{ $par->[0] };
-      $tex->draw_quad (0, $y);
+         my $y = 0;
+
+         my $layout = $self->{layout};
+
+         for my $par (@{$self->{par}}) {
+            my $h = $par->[0];
+
+            if ($y0 < $y + $h && $y < $y1) {
+               $layout->set_text ($par->[2]);
+
+               glColor @{ $par->[1] };
+               my ($W, $H) = $layout->size;
+               CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
+            }
+
+            $y += $h;
+         }
+
+         glDisable GL_TEXTURE_2D;
+         glDisable GL_BLEND;
+      };
+   });
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   if ($self->{texture}) {
+      glEnable GL_TEXTURE_2D;
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+      $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
+      glDisable GL_TEXTURE_2D;
    }
 
-   glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
+   $self->{children}[1]->draw;
+
 }
 
 #############################################################################
@@ -1652,6 +1766,10 @@
       $::CONN->user_send ("command stay fire");
    } elsif ($sym == SDLK_a) {
       $::CONN->user_send ("command apply");
+   } elsif ($sym == SDLK_QUOTE) {
+      $self->emit ('activate_console');
+   } elsif ($sym == SDLK_SLASH) {
+      $self->emit ('activate_console' => '/');
    } elsif (exists $DIR{$sym}) {
       if ($mod & KMOD_SHIFT) {
          $self->{shft}++;
@@ -1765,6 +1883,8 @@
 
 our @ISA = CFClient::UI::Container::;
 
+use SDL::OpenGL;
+
 sub size_request {
    ($::WIDTH, $::HEIGHT)
 }
@@ -1799,9 +1919,29 @@
    $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
 }
 
+sub on_refresh {
+   my ($self, $id, $cb) = @_;
+
+   $self->{refresh_hook}{$id} = $cb;
+}
+
 sub draw  {
    my ($self) = @_;
 
+   while (my $rcb = delete $self->{refresh_hook}) {
+      $_->() for values %$rcb;
+   }
+
+   glViewport 0, 0, $::WIDTH, $::HEIGHT;
+   glClearColor +($::CFG->{fow_intensity}) x 3, 1;
+   glClear GL_COLOR_BUFFER_BIT;
+
+   glMatrixMode GL_PROJECTION;
+   glLoadIdentity;
+   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
+   glMatrixMode GL_MODELVIEW;
+   glLoadIdentity;
+
    $self->_draw;
 }