--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/20 07:12:57	1.141
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/22 03:50:25	1.147
@@ -142,7 +142,7 @@
 
 sub size_request {
    require Carp;
-   Carp::confess "size_request is abtract";
+   Carp::confess "size_request is abstract";
 }
 
 sub configure {
@@ -154,8 +154,8 @@
 
       # use alignment to adjust x, y
 
-      $x += ($w - $w2) * 0.5;
-      $y += ($h - $h2) * 0.5;
+      $x += int +($w - $w2) * 0.5;
+      $y += int +($h - $h2) * 0.5;
 
       ($w, $h) = ($w2, $h2);
    }
@@ -627,7 +627,7 @@
 use CFClient::OpenGL;
 
 my @tex = 
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
 sub new {
@@ -1113,6 +1113,13 @@
    delete $self->{texture};
 }
 
+sub set_fontsize {
+   my ($self, $fontsize) = @_;
+
+   $self->{fontsize} = $fontsize;
+   $self->check_size;
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -1346,7 +1353,7 @@
 use CFClient::OpenGL;
 
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw(b1_button_active.png);
 
 sub new {
@@ -1403,7 +1410,7 @@
 our @ISA = CFClient::UI::DrawBG::;
 
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw(c1_checkbox_bg.png c1_checkbox_active.png);
 
 use CFClient::OpenGL;
@@ -1462,6 +1469,67 @@
 
 #############################################################################
 
+package CFClient::UI::Image;
+
+our @ISA = CFClient::UI::Base::;
+
+use CFClient::OpenGL;
+use Carp qw/confess/;
+
+our %loaded_images;
+
+sub new {
+   my $class = shift;
+
+   my $self = $class->SUPER::new (@_);
+
+   $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
+
+   $loaded_images{$self->{image}} ||=
+      new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
+
+   my $tex = $self->{tex} = $loaded_images{$self->{image}};
+
+   Scalar::Util::weaken $loaded_images{$self->{image}};
+
+   $self->{aspect} = $tex->{w} / $tex->{h};
+
+   $self
+}
+
+sub size_request {
+   my ($self) = @_;
+
+   ($self->{tex}->{w}, $self->{tex}->{h})
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   my $tex = $self->{tex};
+
+   my ($w, $h) = ($self->{w}, $self->{h});
+
+   if ($self->{rot90}) {
+      glRotate 90, 0, 0, 1;
+      glTranslate 0, -$self->{w}, 0;
+
+      ($w, $h) = ($h, $w);
+   }
+
+   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;
+
+   $tex->draw_quad (0, 0, $w, $h);
+
+   glDisable GL_BLEND;
+   glDisable GL_TEXTURE_2D;
+}
+
+#############################################################################
+
 package CFClient::UI::VGauge;
 
 our @ISA = CFClient::UI::Base::;
@@ -1470,19 +1538,19 @@
 
 my %tex = (
    food => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
    ],
    grace => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
    ],
    hp => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
    ],
    mana => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
    ],
 );
@@ -1504,9 +1572,9 @@
 sub size_request {
    my ($self) = @_;
 
-   my $tex = $tex{$self->{type}}[0];
-   
-   @$tex{qw(w h)}
+   #my $tex = $tex{$self->{type}}[0];
+   #@$tex{qw(w h)}
+   (0, 0)
 }
 
 sub set_max {
@@ -1534,6 +1602,13 @@
 
    my ($w, $h) = ($self->{w}, $self->{h});
 
+   if ($self->{vertical}) {
+      glRotate 90, 0, 0, 1;
+      glTranslate 0, -$self->{w}, 0;
+
+      ($w, $h) = ($h, $w);
+   }
+
    my $ycut = $self->{val} / ($self->{max_val} || 1);
    $ycut = 1 if $self->{val} > $self->{max_val};
 
@@ -1588,6 +1663,13 @@
    $self
 }
 
+sub set_fontsize {
+   my ($self, $fsize) = @_;
+
+   $self->{value}->set_fontsize ($fsize);
+   $self->{max}  ->set_fontsize ($fsize);
+}
+
 sub set_value {
    my ($self, $val, $max) = @_;
 
@@ -2022,6 +2104,10 @@
 sub add {
    my ($self, $child) = @_;
 
+   # integerize window positions
+   $child->{x} = int $child->{x};
+   $child->{y} = int $child->{y};
+
    $self->SUPER::add ($child);
 }