--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/08 18:18:09	1.22
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/09 00:09:50	1.29
@@ -125,7 +125,7 @@
 sub add {
    my ($self, $chld) = @_;
    $self->SUPER::add ($chld);
-   $self->render_chld;
+   $self->render_chld; #TODO: Move this to the size_request event propably?
 }
 
 sub render_chld {
@@ -133,16 +133,9 @@
    my $chld = $self->get;
    my ($w, $h) = $self->size_request;
 
-   $w = $h = 256;
-
    $self->{texture} =
       Crossfire::Client::Texture->new_from_opengl (
-         $w, $h, sub {
-            glPushMatrix;
-            glLoadIdentity;
-            $chld->_draw;
-            glPopMatrix;
-         }
+         $w, $h, sub { $chld->draw }
       );
    $self->{texture}->upload;
 }
@@ -157,7 +150,8 @@
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = $self->size_request;
+   my ($w, $h) = $self->size_request;#TODO# use width/height of texture
+
    my $tex = $self->{texture}
       or return;
 
@@ -169,10 +163,10 @@
    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;
+   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;
@@ -197,6 +191,8 @@
 
    my $chld = $self->get;
 
+   $chld->move (2, 2, 0); #TODO:move to size_request
+
    my ($w, $h) = $chld->size_request;
 
    glColor 1, 0, 0;
@@ -207,10 +203,7 @@
    glTexCoord 1, 0; glVertex $w + 4 , 0;
    glEnd;
 
-   glPushMatrix;
-   glTranslate (2, 2, 0);
-   $chld->_draw;
-   glPopMatrix;
+   $chld->draw;
 }
 
 package Crossfire::Client::Widget::Table;
@@ -281,11 +274,11 @@
 
       for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
 
-         glPushMatrix;
-         glTranslate ($x, $y, 0);
          my $c = $self->{childs}->[$yi]->[$xi];
-         $c->_draw if $c;
-         glPopMatrix;
+         if ($c) {
+            $c->move ($x, $y, 0); #TODO: Move to size_request
+            $c->draw if $c;
+         }
 
          $x += $self->max_col_width ($xi);
       }
@@ -323,10 +316,8 @@
 
    my ($x, $y);
    for (@{$self->{childs} || []}) {
-      glPushMatrix;
-      glTranslate (0, $y, 0);
-      $_->_draw;
-      glPopMatrix;
+      $_->move (0, $y, 0); #TODO: move to size_request
+      $_->draw;
       my ($w, $h) = $_->size_request;
       $y += $h;
    }
@@ -339,9 +330,9 @@
 use SDL::OpenGL;
 
 sub new {
-   my ($class, $x, $y, $z, $ttf, $text) = @_;
+   my ($class, $x, $y, $z, $height, $text) = @_;
 
-   my $self = $class->SUPER::new (x => $x, y => $y, z => $z, ttf => $ttf);
+   my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
 
    $self->set_text ($text);
 
@@ -350,11 +341,15 @@
 
 sub set_text {
    my ($self, $text) = @_;
-   $self->{texture} = new_from_ttf Crossfire::Client::Texture $self->{ttf}, $self->{text} = $text;
+
+   $self->{text} = $text;
+
+   $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
 }
 
 sub get_text {
    my ($self, $text) = @_;
+
    $self->{text}
 }
 
@@ -377,7 +372,7 @@
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
    glBindTexture GL_TEXTURE_2D, $tex->{name};
 
-   glColor 1, 1, 1;
+   glColor 1, 1, 1, 0.8;
 
    glBegin GL_QUADS;
    glTexCoord 0, 0; glVertex 0            , 0;
@@ -413,12 +408,14 @@
 
 use strict;
 
-our @ISA = qw/Crossfire::Client::Widget/;
+use List::Util qw(min max);
 
 use SDL;
 use SDL::OpenGL;
 use SDL::OpenGL::Constants;
 
+our @ISA = Crossfire::Client::Widget::;
+
 sub key_down {
    print "MAPKEYDOWN\n";
 }
@@ -429,24 +426,44 @@
 sub _draw {
    my ($self) = @_;
 
+   my $mx = $::CONN->{mapx};
+   my $my = $::CONN->{mapy};
+
+   my $map = $::CONN->{map};
+
+   my ($xofs, $yofs);
+
+   my $sw = 1 + int $::WIDTH  / 32;
+   my $sh = 1 + int $::HEIGHT / 32;
+
+   if ($::CONN->{mapw} > $sw) {
+      $xofs = $mx + ($::CONN->{mapw} - $sw) * 0.5;
+   } else {
+      $xofs = $self->{xofs} = min $mx, max $mx + $::CONN->{mapw} - $sw + 1, $self->{xofs};
+   }
+
+   if ($::CONN->{maph} > $sh) {
+      $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
+   } else {
+      $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
+   }
+
    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 .. int $::WIDTH / 32) {
-      for my $y (0 .. int $::HEIGHT / 32) {
+   for my $x (0 .. $sw - 1) {
+      for my $y (0 .. $sh - 1) {
 
-         my $cell = $map->[$x + $::CONN->{mapx}]
-                          [$y + $::CONN->{mapy}]
+         my $cell = $map->[$x + $xofs][$y + $yofs]
             or next;
 
          my $darkness = $cell->[0] * (1 / 255);
          if ($darkness < 0) {
-            $darkness = 0.5;
+            glColor 0.3, 0.3, 0.3;
+         } else {
+            glColor $darkness, $darkness, $darkness;
          }
-         glColor $darkness, $darkness, $darkness;
 
          for my $num (grep $_, @$cell[1,2,3]) {
             my $tex = $::CONN->{face}[$num]{texture} || next;