--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/07 20:09:52	1.9
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/07 20:57:29	1.13
@@ -1,9 +1,11 @@
 package Crossfire::Client::Widget;
 
 use strict;
+use SDL::OpenGL;
+use SDL::OpenGL::Constants;
 
 our $FOCUS;  # the widget with current focus
-our %ACTIVE_WIDGETS;
+our @ACTIVE_WIDGETS;
 
 # class methods for events
 sub feed_sdl_key_down_event    { $FOCUS->key_down ($_[0])    if $FOCUS }
@@ -13,17 +15,19 @@
 
 sub new {
    my $class = shift;
-   my $self = { @_ };
-   bless $self, $class;
-   return $self;
+
+   bless { @_ }, $class
 }
 
 sub activate {
-   $ACTIVE_WIDGETS{$_[0]} = $_[0];
+   push @ACTIVE_WIDGETS, $_[0];
 }
 
 sub deactivate {
-   delete $ACTIVE_WIDGETS{$_[0]};
+   @ACTIVE_WIDGETS =
+      sort { $a->{z} <=> $b->{z} }
+         grep { $_ != $_[0] }
+            @ACTIVE_WIDGETS;
 }
 
 sub focus_in {
@@ -51,7 +55,20 @@
    my ($widget, $sdlev) = @_;
 }
 
+sub x { $_[0]->{x} = $_[1] if $_[1]; $_[0]->{x} }
+sub y { $_[0]->{y} = $_[1] if $_[1]; $_[0]->{y} }
+sub z { $_[0]->{z} = $_[1] if $_[1]; $_[0]->{z} }
+
 sub draw {
+   my ($self) = @_;
+
+   glPushMatrix;
+   glTranslate $self->{x}, $self->{y}, 0;
+   $self->_draw;
+   glPopMatrix;
+}
+
+sub _draw {
    my ($widget) = @_;
 }
 
@@ -59,9 +76,51 @@
    my ($widget) = @_;
 }
 
+package Crossfire::Client::Widget::Label;
+
+our @ISA = Crossfire::Client::Widget::;
+
+use SDL::OpenGL;
+
+sub new {
+   my ($class, $x, $y, $z, $ttf, $text) = @_;
+
+   my $self = $class->SUPER::new (x => $x, y => $y, z => $z);
+
+   $self->{texture} = new_from_ttf Crossfire::Client::Texture $ttf, $text;
+
+   $self
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   my $tex = $self->{texture};
+
+   $self->{x}--;
+
+   glEnable GL_BLEND;
+   glEnable GL_TEXTURE_2D;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+   glBindTexture GL_TEXTURE_2D, $tex->{name};
+
+   glColor 1, 1, 1;
+
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex 0            , 0;
+   glTexCoord 0, 1; glVertex 0            , $tex->{height};
+   glTexCoord 1, 1; glVertex $tex->{width}, $tex->{height};
+   glTexCoord 1, 0; glVertex $tex->{width}, 0;
+   glEnd;
+
+   glDisable GL_BLEND;
+   glDisable GL_TEXTURE_2D;
+}
+
 package Crossfire::Client::Widget::TextView;
 
 use strict;
+
 our @ISA = qw/Crossfire::Client::Widget/;
 
 use SDL::OpenGL;
@@ -72,7 +131,7 @@
    push @{$self->{lines}}, $line;
 }
 
-sub draw {
+sub _draw {
    my ($self) = @_;
 
 }
@@ -93,9 +152,10 @@
 sub key_up {
 }
 
-sub draw {
+sub _draw {
    glEnable GL_TEXTURE_2D;
    glEnable GL_BLEND;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
    my $map = $::CONN->{map};
 
@@ -114,10 +174,10 @@
             glBindTexture GL_TEXTURE_2D, $tex->{name};
 
             glBegin GL_QUADS;
-            glTexCoord 0, 0; glVertex $x, $y;
-            glTexCoord 0, 1; glVertex $x,     $y + 1;
-            glTexCoord 1, 1; glVertex $x + 1, $y + 1;
-            glTexCoord 1, 0; glVertex $x + 1, $y;
+            glTexCoord 0, 0; glVertex $x * 32     , $y * 32;
+            glTexCoord 0, 1; glVertex $x * 32     , $y * 32 + 32;
+            glTexCoord 1, 1; glVertex $x * 32 + 32, $y * 32 + 32;
+            glTexCoord 1, 0; glVertex $x * 32 + 32, $y * 32;
             glEnd;
          }
       }