--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/08 13:36:26	1.18
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/08 20:25:26	1.24
@@ -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,62 @@
 
 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 { $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 ($w, $h) = $self->size_request;#TODO# use widht/height of texture
+   my $tex = $self->{texture}
+      or return;
+
+   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, $h;
+   glTexCoord 1, 1; glVertex $w, $h;
+   glTexCoord 1, 0; glVertex $w,  0;
+   glEnd;
+
+   glDisable GL_BLEND;
+   glDisable GL_TEXTURE_2D;
+}
+
 package Crossfire::Client::Widget::Frame;
 
 our @ISA = Crossfire::Client::Widget::Container::;
@@ -142,7 +202,7 @@
 
    glPushMatrix;
    glTranslate (2, 2, 0);
-   $chld->_draw;
+   $chld->draw;
    glPopMatrix;
 }
 
@@ -215,9 +275,9 @@
       for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
 
          glPushMatrix;
-         glTranslate ($x, $y, 0);
+         glTranslate ($x, $y, 0);#TODO#there must be no translate here, instead the widget must be moved
          my $c = $self->{childs}->[$yi]->[$xi];
-         $c->_draw if $c;
+         $c->draw if $c;
          glPopMatrix;
 
          $x += $self->max_col_width ($xi);
@@ -257,8 +317,8 @@
    my ($x, $y);
    for (@{$self->{childs} || []}) {
       glPushMatrix;
-      glTranslate (0, $y, 0);
-      $_->_draw;
+      glTranslate (0, $y, 0);# see above TODO
+      $_->draw;
       glPopMatrix;
       my ($w, $h) = $_->size_request;
       $y += $h;
@@ -360,31 +420,44 @@
 }
 
 sub _draw {
+   my ($self) = @_;
+
    glEnable GL_TEXTURE_2D;
    glEnable GL_BLEND;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
    my $map = $::CONN->{map};
 
-   for my $x (0 .. $::CONN->{mapw} - 1) {
-      for my $y (0 .. $::CONN->{maph} - 1) {
+   for my $x (0 .. int $::WIDTH / 32) {
+      for my $y (0 .. int $::HEIGHT / 32) {
 
-         my $cell = $map->[$x][$y]
+         my $cell = $map->[$x + $::CONN->{mapx}]
+                          [$y + $::CONN->{mapy}]
             or next;
 
-         my $darkness = $cell->[3] * (1 / 255);
-         glColor $darkness, $darkness, $darkness;
+         my $darkness = $cell->[0] * (1 / 255);
+         if ($darkness < 0) {
+            glColor 0.3, 0.3, 0.3;
+         } else {
+            glColor $darkness, $darkness, $darkness;
+         }
 
-         for my $num (grep $_, $cell->[0], $cell->[1], $cell->[2]) {
+         for my $num (grep $_, @$cell[1,2,3]) {
             my $tex = $::CONN->{face}[$num]{texture} || next;
 
             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;
          }
       }