--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/08 13:36:26	1.18
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/08 17:21:01	1.20
@@ -41,6 +41,10 @@
    $self->{z} = $z if defined $z;
 }
 
+sub needs_redraw {
+   0
+}
+
 sub size_request {
    die "size_request is abtract";
 }
@@ -112,6 +116,65 @@
 
 sub _draw { die "Containers can't be drawn!" }
 
+package Crossfire::Client::Widget::Window;
+
+our @ISA = Crossfire::Client::Widget::Container::;
+
+use SDL::OpenGL;
+
+sub add {
+   my ($self, $chld) = @_;
+   $self->SUPER::add ($chld);
+   $self->render_chld;
+}
+
+sub render_chld {
+   my ($self) = @_;
+   my $chld = $self->get;
+   my ($w, $h) = $self->size_request;
+
+   $self->{texture} =
+      Crossfire::Client::Texture->new_from_opengl (
+         $w, $h, sub {
+            my ($txt, $w, $h) = @_;
+            $chld->_draw;
+         }
+      );
+   $self->{texture}->upload;
+}
+
+sub size_request {
+   my ($self) = @_;
+   my $chld = $self->get
+      or return (0, 0);
+   $chld->size_request
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   my $tex = $self->{texture}
+      or return;
+
+      warn "DRAW TEX: $tex->{width} $tex->{height}\n";
+   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::Frame;
 
 our @ISA = Crossfire::Client::Widget::Container::;
@@ -380,11 +443,17 @@
 
             glBindTexture GL_TEXTURE_2D, $tex->{name};
 
+            my $w = $tex->{width};
+            my $h = $tex->{height};
+
+            my $px = ($x + 1) * 32 - $w;
+            my $py = ($y + 1) * 32 - $h;
+
             glBegin GL_QUADS;
-            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;
+            glTexCoord 0, 0; glVertex $px     , $py;
+            glTexCoord 0, 1; glVertex $px     , $py + $h;
+            glTexCoord 1, 1; glVertex $px + $w, $py + $h;
+            glTexCoord 1, 0; glVertex $px + $w, $py;
             glEnd;
          }
       }