--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/15 19:35:20	1.115
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/17 19:36:27	1.122
@@ -76,7 +76,7 @@
 
    my $rem = 0;
 
-   for ($vals) {
+   for (@$vals) {
       my $i = int $_ + $rem;
       $rem += $_ - $i;
       $_ = $i;
@@ -114,8 +114,8 @@
 
 sub move {
    my ($self, $x, $y, $z) = @_;
-   $self->{x} = $x;
-   $self->{y} = $y;
+   $self->{x} = int $x;
+   $self->{y} = int $y;
    $self->{z} = $z if defined $z;
 }
 
@@ -178,6 +178,9 @@
    return unless $self->{can_focus};
 
    my $focus = $FOCUS; $FOCUS = $self;
+
+   $self->emit (focus_in => $focus);
+
    $focus->update if $focus;
    $FOCUS->update;
 }
@@ -188,6 +191,9 @@
    return unless $FOCUS == $self;
 
    my $focus = $FOCUS; undef $FOCUS;
+
+   $self->emit (focus_out => $focus);
+
    $focus->update if $focus; #?
 }
 
@@ -221,7 +227,7 @@
    if ($self == $HOVER && $self->{can_hover}) {
       my ($x, $y) = @$self{qw(x y)};
 
-      glColor 0, 0, 1, 0.2;
+      glColor 1, 0.8, 0.5, 0.2;
       glEnable GL_BLEND;
       glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
       glBegin GL_QUADS;
@@ -567,7 +573,7 @@
    $class->SUPER::new (
       bg        => [1, 1, 1, 1],
       border_bg => [1, 1, 1, 1],
-      border    => $::FONTSIZE * 0.8,
+      border    => int $::FONTSIZE * 0.8,
       @_
    )
 }
@@ -952,12 +958,16 @@
       fontsize => $::FONTSIZE,
       text     => "",
       align    => -1,
+      valign   => -1,
       padding  => 2,
       layout   => new CFClient::Layout,
       %arg
    );
 
-   $self->set_text ($self->{text});
+   $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
+
+   $self->set_text   (delete $self->{text})   if exists $self->{text};
+   $self->set_markup (delete $self->{markup}) if exists $self->{markup};
 
    $self
 }
@@ -975,18 +985,19 @@
 sub set_text {
    my ($self, $text) = @_;
 
-   $self->{text} = $text;
-   $self->{layout}->set_markup ($text);
+   $self->{layout}->set_text ($text);
 
    delete $self->{texture};
-#   $self->{w} = $self->{h} = -1;
    $self->update;
 }
 
-sub get_text {
-   my ($self, $text) = @_;
+sub set_markup {
+   my ($self, $markup) = @_;
 
-   $self->{text}
+   $self->{layout}->set_markup ($markup);
+
+   delete $self->{texture};
+   $self->update;
 }
 
 sub size_request {
@@ -994,6 +1005,7 @@
 
    $self->{layout}->set_width;
    $self->{layout}->set_height ($self->{fontsize});
+
    my ($w, $h) = $self->{layout}->size;
 
    (
@@ -1022,7 +1034,7 @@
 
    my $tex = $self->{texture} ||= do {
       $self->{layout}->set_width ($self->{w});
-      $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
+      $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
       new_from_layout CFClient::Texture $self->{layout}
    };
 
@@ -1033,12 +1045,19 @@
 
    glColor @{$self->{fg}};
 
-   my $x =
+   $self->{ox} = int (
       $self->{align} < 0 ? $self->{padding}
     : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
-    :                      ($self->{w} - $tex->{w}) * 0.5;
+    :                      ($self->{w} - $tex->{w}) * 0.5
+   );
 
-   $tex->draw_quad (int $x, int +($self->{h} - $tex->{h}) * 0.5);
+   $self->{oy} = int (
+      $self->{valign} < 0 ? $self->{padding}
+    : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
+    :                       ($self->{h} - $tex->{h}) * 0.5
+   );
+
+   $tex->draw_quad ($self->{ox}, $self->{oy});
 
    glDisable GL_TEXTURE_2D;
    glDisable GL_BLEND;
@@ -1046,7 +1065,7 @@
 
 #############################################################################
 
-package CFClient::UI::Entry;
+package CFClient::UI::EntryBase;
 
 our @ISA = CFClient::UI::Label::;
 
@@ -1063,6 +1082,7 @@
       active_fg => [0, 0, 0],
       can_hover => 1,
       can_focus => 1,
+      valign    => 0,
       @_
    )
 }
@@ -1070,25 +1090,21 @@
 sub _set_text {
    my ($self, $text) = @_;
 
-   my $old_text = $self->{text};
+   delete $self->{cur_h};
 
-   $self->{last_activity} = $::NOW;
+   return if $self->{text} eq $text;
 
+   $self->{last_activity} = $::NOW;
    $self->{text} = $text;
-   $self->{layout}->set_width ($self->{w});
-   $self->{layout}->set_height (List::Util::min $self->{h} - $self->{padding} * 2, $self->{fontsize});
 
    $text =~ s/./*/g if $self->{hidden};
+   $self->{layout}->set_text ("$text ");
 
-   $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);
+   $self->emit (changed => $self->{text});
+}
 
-   $self->emit (changed => $self->{text}) # XXX: is this the right place to do this?
-      if $old_text ne $self->{text};
+sub get_text {
+   $_[0]{text}
 }
 
 sub size_request {
@@ -1202,17 +1218,25 @@
 
    #TODO: force update every cursor change :(
    if ($FOCUS == $self && (($::NOW - $self->{last_activity}) & 1023) < 600) {
+
+      unless (exists $self->{cur_h}) {
+         my $text = substr $self->{text}, 0, $self->{cursor};
+         utf8::encode $text;
+
+         @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
+      }
+
       glColor @{$self->{fg}};
       glBegin GL_LINES;
-      glVertex $self->{cur_x}, $self->{cur_y};
-      glVertex $self->{cur_x}, $self->{cur_y} + $self->{cur_h};
+      glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
+      glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
       glEnd;
    }
 }
 
-package CFClient::UI::LineEntry;
+package CFClient::UI::Entry;
 
-our @ISA = CFClient::UI::Entry::;
+our @ISA = CFClient::UI::EntryBase::;
 
 use SDL;
 use SDL::OpenGL;
@@ -1271,20 +1295,18 @@
    my ($self) = @_;
 
    local $self->{fg} = $self->{fg};
-   my $tex = $tex[0];
-
-   glEnable GL_BLEND;
-   glEnable GL_TEXTURE_2D;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
 
    if ($GRAB == $self) {
       $self->{fg} = $self->{active_fg};
    }
 
-   glBindTexture GL_TEXTURE_2D, $tex->{name};
+   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;
+   glColor 0, 0, 0, 1;
 
-   $tex->draw_quad (0, 0, $self->{w}, $self->{h});
+   $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
 
    glDisable GL_TEXTURE_2D;
    glDisable GL_BLEND;
@@ -1776,7 +1798,7 @@
                glEnable GL_CONVOLUTION_2D;
             }
 
-            my $tex = new CFClient::Texture
+            $self->{fow_texture} = new CFClient::Texture
                w              => $w,
                h              => $h,
                data           => $data,
@@ -1791,7 +1813,7 @@
             glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
             glColor +($::CFG->{fow_intensity}) x 3, 1;
-            $tex->draw_quad (0, 0, $w * 32, $h * 32);
+            $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
 
             glDisable GL_TEXTURE_2D;
             glDisable GL_BLEND;
@@ -1807,12 +1829,14 @@
            glEnable GL_TEXTURE_2D;
            glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
-           CFClient::Texture->new (
-                                 w    => $w,
-                                 h    => $h,
-                                 data => $::MAP->mapmap ($w, $h),
-                                 type => GL_UNSIGNED_INT_8_8_8_8_REV
-                              )->draw_quad (100, 100);
+           $self->{mapmap_texture} =
+              new CFClient::Texture
+                 w    => $w,
+                 h    => $h,
+                 data => $::MAP->mapmap ($w, $h),
+                 type => GL_UNSIGNED_INT_8_8_8_8_REV;
+
+           $self->{mapmap_texture}->draw_quad (100, 100);
 
            glDisable GL_TEXTURE_2D;
            glDisable GL_BLEND;
@@ -1864,9 +1888,9 @@
    my $sym = $ev->key_sym;
 
    if ($sym == SDLK_KP5) {
-      $::CONN->user_send ("command stay fire");
+      $::CONN->user_send ("stay fire");
    } elsif ($sym == SDLK_a) {
-      $::CONN->user_send ("command apply");
+      $::CONN->user_send ("apply");
    } elsif ($sym == SDLK_QUOTE) {
       $self->emit ('activate_console');
    } elsif ($sym == SDLK_SLASH) {
@@ -1874,12 +1898,12 @@
    } elsif (exists $DIR{$sym}) {
       if ($mod & KMOD_SHIFT) {
          $self->{shft}++;
-         $::CONN->user_send ("command fire $DIR{$sym}[0]");
+         $::CONN->user_send ("fire $DIR{$sym}[0]");
       } elsif ($mod & KMOD_CTRL) {
          $self->{ctrl}++;
-         $::CONN->user_send ("command run $DIR{$sym}[0]");
+         $::CONN->user_send ("run $DIR{$sym}[0]");
       } else {
-         $::CONN->user_send ("command $DIR{$sym}[1]");
+         $::CONN->user_send ("$DIR{$sym}[1]");
       }
    }
 }
@@ -1891,10 +1915,10 @@
    my $sym = $ev->key_sym;
 
    if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
-      $::CONN->user_send ("command fire_stop");
+      $::CONN->user_send ("fire_stop");
    }
    if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
-      $::CONN->user_send ("command run_stop");
+      $::CONN->user_send ("run_stop");
    }
 }
 
@@ -2018,7 +2042,7 @@
 
    $self->SUPER::add ($widget);
 
-   $widget->size_allocate ($widget->{x}, $widget->{y}, $widget->size_request);
+   $widget->size_allocate (int $widget->{x}, int $widget->{y}, $widget->size_request);
 }
 
 sub on_refresh {