--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/09 17:34:15	1.35
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/09 17:39:56	1.36
@@ -8,7 +8,6 @@
 use SDL::OpenGL::Constants;
 
 our $FOCUS;  # the widget with current focus
-#our @ACTIVE_WIDGETS;
 
 # class methods for events
 sub feed_sdl_key_down_event    { $FOCUS->key_down ($_[0])    if $FOCUS }
@@ -22,18 +21,6 @@
    bless { @_ }, $class
 }
 
-#sub activate {
-#   push @ACTIVE_WIDGETS, $_[0];
-#   Scalar::Util::weaken $ACTIVE_WIDGETS[-1];
-#}
-
-#sub deactivate {
-#   @ACTIVE_WIDGETS =
-#      sort { $a->{z} <=> $b->{z} }
-#         grep { $_ && $_ != $_[0] }
-#            @ACTIVE_WIDGETS;
-#}
-
 sub move {
    my ($self, $x, $y, $z) = @_;
    $self->{x} = $x;
@@ -46,7 +33,14 @@
 }
 
 sub size_request {
-   die "size_request is abtract";
+   require Carp;
+   Carp::confess "size_request is abtract";
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+   $self->w ($w);
+   $self->h ($h);
 }
 
 sub focus_in {
@@ -74,8 +68,8 @@
    my ($widget, $sdlev) = @_;
 }
 
-sub w { $_[0]->{w} }
-sub h { $_[0]->{h} }
+sub w { $_[0]->{w} = $_[1] if $_[1]; $_[0]->{w} }
+sub h { $_[0]->{h} = $_[1] if $_[1]; $_[0]->{h} }
 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} }
@@ -134,8 +128,7 @@
 
 our @ISA = Crossfire::Client::Widget::;
 
-sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
-
+sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->{expand} = $_[2] }
 sub get { $_[0]->{child} }
 
 sub remove {
@@ -147,6 +140,12 @@
 sub size_request {
    $_[0]->{child}->size_request if $_[0]->{child}
 }
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+   $self->SUPER::size_allocate ($w, $h);
+   $self->{child}->size_allocate ($w, $h)
+      if $self->{child}
+}
 
 sub _draw {
    my ($self) = @_;
@@ -169,6 +168,7 @@
          @{$self->{childs}};
 
    $chld->set_parent ($self);
+   $chld->size_allocate ($chld->size_request);
 }
 
 sub remove {
@@ -198,15 +198,15 @@
 
 sub add {
    my ($self, $chld) = @_;
+   warn "ADD $chld\n";
    $self->SUPER::add ($chld);
    $chld->set_parent ($self);
-   $self->update; #TODO: Move this to the size_request event propably?
 }
 
 sub remove {
    my ($self) = @_;
    # TODO FIXME: removing a child from a window will crash, see render_chld
-   $self->update;
+   # $self->update;
 }
 
 sub update {
@@ -219,6 +219,9 @@
    my $chld = $self->get;
    my ($w, $h) = $self->size_request;
 
+   require Carp;
+   Carp::cluck "RENDERCHI $w $h";
+   warn "RENDERCHI $w $h\n";
    $self->{texture} =
       Crossfire::Client::Texture->new_from_opengl (
          $w, $h, sub { $chld->draw }
@@ -228,15 +231,23 @@
 
 sub size_request {
    my ($self) = @_;
-   my $chld = $self->get
-      or return (0, 0);
-   $chld->size_request
+   ($self->w, $self->h)
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->w ($w);
+   $self->h ($h);
+   $self->get->size_allocate ($w, $h);
+
+   $self->update; #TODO: Move this to the size_request event propably?
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = $self->size_request;#TODO# use width/height of texture
+   my ($w, $h) = ($self->w, $self->h);
 
    my $tex = $self->{texture}
       or return;
@@ -273,6 +284,16 @@
    map { $_ + 4 } $chld->size_request;
 }
 
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->w ($w);
+   $self->h ($h);
+
+   $self->get->size_allocate ($w - 4, $h - 4);
+   $self->get->move (2, 2);
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -306,7 +327,6 @@
          qw/d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png/
    ];
    $self
-
 }
 
 sub size_request {
@@ -318,92 +338,98 @@
    $w += $self->{txts}->[2]->{width};
    $w += $self->{txts}->[3]->{width};
 
-   $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
-
    ($w, $h)
 }
 
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->w ($w);
+   $self->h ($h);
+   $h -= $self->{txts}->[1]->{height};
+   $h -= $self->{txts}->[4]->{height};
+   $w -= $self->{txts}->[2]->{width};
+   $w -= $self->{txts}->[3]->{width};
+
+   $h = $h < 0 ? 0 : $h;
+   $w = $w < 0 ? 0 : $w;
+   warn "CHILD:$w $h\n";
+   $self->get->size_allocate ($w, $h);
+   $self->get->move ($self->{txts}->[3]->{width}, $self->{txts}->[1]->{height});
+}
+
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = $self->size_request;
-   my ($cw, $ch) = $self->get->size_request;
+   my ($w, $h) = ($self->w, $self->h);
+   my ($cw, $ch) = ($self->get->w, $self->get->h);
 
    glEnable GL_BLEND;
    glEnable GL_TEXTURE_2D;
    glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
-
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
    my $top = $self->{txts}->[1];
-      glBindTexture GL_TEXTURE_2D, $top->{name};
-
-      glColor 1, 1, 1, 0.8;
+   glBindTexture GL_TEXTURE_2D, $top->{name};
 
-      glBegin GL_QUADS;
-      glTexCoord 0, 0; glVertex 0            , 0;
-      glTexCoord 0, 1; glVertex 0            , $top->{height};
-      glTexCoord 1, 1; glVertex $w           , $top->{height};
-      glTexCoord 1, 0; glVertex $w           , 0;
-      glEnd;
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex 0            , 0;
+   glTexCoord 0, 1; glVertex 0            , $top->{height};
+   glTexCoord 1, 1; glVertex $w           , $top->{height};
+   glTexCoord 1, 0; glVertex $w           , 0;
+   glEnd;
 
    my $left = $self->{txts}->[3];
-      glBindTexture GL_TEXTURE_2D, $left->{name};
-
-      glColor 1, 1, 1, 0.8;
+   glBindTexture GL_TEXTURE_2D, $left->{name};
 
-      glBegin GL_QUADS;
-      glTexCoord 0, 0; glVertex 0            ,  $top->{height};
-      glTexCoord 0, 1; glVertex 0            ,  $top->{height} + $ch;
-      glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
-      glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
-      glEnd;
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex 0            ,  $top->{height};
+   glTexCoord 0, 1; glVertex 0            ,  $top->{height} + $ch;
+   glTexCoord 1, 1; glVertex $left->{width}, $top->{height} + $ch;
+   glTexCoord 1, 0; glVertex $left->{width}, $top->{height};
+   glEnd;
 
    my $right = $self->{txts}->[2];
-      glBindTexture GL_TEXTURE_2D, $right->{name};
+   glBindTexture GL_TEXTURE_2D, $right->{name};
 
-      glColor 1, 1, 1, 0.8;
-
-      glBegin GL_QUADS;
-      glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
-      glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
-      glTexCoord 1, 1; glVertex $w                  , $top->{height} + $ch;
-      glTexCoord 1, 0; glVertex $w                  , $top->{height};
-      glEnd;
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex $w - $right->{width}, $top->{height};
+   glTexCoord 0, 1; glVertex $w - $right->{width}, $top->{height} + $ch;
+   glTexCoord 1, 1; glVertex $w                  , $top->{height} + $ch;
+   glTexCoord 1, 0; glVertex $w                  , $top->{height};
+   glEnd;
 
    my $bottom = $self->{txts}->[4];
-      glBindTexture GL_TEXTURE_2D, $bottom->{name};
-
-      glColor 1, 1, 1, 0.8;
+   glBindTexture GL_TEXTURE_2D, $bottom->{name};
 
-      glBegin GL_QUADS;
-      glTexCoord 0, 0; glVertex 0            , $h - $bottom->{height};
-      glTexCoord 0, 1; glVertex 0            , $h;
-      glTexCoord 1, 1; glVertex $w           , $h;
-      glTexCoord 1, 0; glVertex $w           , $h - $bottom->{height};
-      glEnd;
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex 0            , $h - $bottom->{height};
+   glTexCoord 0, 1; glVertex 0            , $h;
+   glTexCoord 1, 1; glVertex $w           , $h;
+   glTexCoord 1, 0; glVertex $w           , $h - $bottom->{height};
+   glEnd;
 
    my $bg = $self->{txts}->[0];
-      glBindTexture GL_TEXTURE_2D, $bg->{name};
-      glTexParameter  GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
-      glTexParameter  GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
-
-      glColor 1, 1, 1, 0.8;
-
-      my $rep_x = $cw / $bg->{width};
-      my $rep_y = $ch / $bg->{height};
-
-      glBegin GL_QUADS;
-      glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
-      glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
-      glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
-      glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
-      glEnd;
+   glBindTexture GL_TEXTURE_2D, $bg->{name};
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+   glTexParameter  GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT;
+   glTexParameter  GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT;
 
-   $self->get->draw;
+   my $rep_x = $cw / $bg->{width};
+   my $rep_y = $ch / $bg->{height};
+
+   glBegin GL_QUADS;
+   glTexCoord 0, 0; glVertex $left->{width}, $top->{height};
+   glTexCoord 0, $rep_y; glVertex $left->{width}, $top->{height} + $ch;
+   glTexCoord $rep_x, $rep_y; glVertex $left->{width} + $cw , $top->{height} + $ch;
+   glTexCoord $rep_x, 0; glVertex $left->{width} + $cw , $top->{height};
+   glEnd;
 
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
+
+   $self->get->draw;
+
 }
 
 package Crossfire::Client::Widget::Table;
@@ -498,8 +524,9 @@
 use SDL::OpenGL;
 
 sub add {
-   my ($self, $chld) = @_;
+   my ($self, $chld, $expand) = @_;
    push @{$self->{childs}}, $chld;
+   $chld->{expand} = $expand;
    $chld->set_parent ($self);
    $self->update;
 }
@@ -517,15 +544,54 @@
    return ($ws, $hs);
 }
 
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->w ($w);
+   $self->h ($h);
+
+   my $exp;
+   my @oth;
+   # find expand widget
+   for (@{$self->{childs}}) {
+      if ($_->{expand}) {
+         $exp = $_;
+         last;
+      }
+      push @oth, $_;
+   }
+
+   my ($ow, $oh);
+
+   # get sizes of other widgets
+   for (@oth) {
+      my ($w, $h) = $_->size_request;
+      $oh += $h;
+      if ($ow < $w) { $ow = $w }
+   }
+
+   my $y = 0;
+   for (@{$self->{childs}}) {
+      $_->move (0, $y);
+
+      if ($_ == $exp) {
+         $_->size_allocate ($w, $h - $oh);
+         $y += $h - $oh;
+      } else {
+         my ($cw, $h) = $_->size_request;
+         $_->size_allocate ($w, $h);
+         $y += $h;
+      }
+   }
+}
+
 sub _draw {
    my ($self) = @_;
 
    my ($x, $y);
    for (@{$self->{childs} || []}) {
-      $_->move (0, $y, 0); #TODO: move to size_request
       $_->draw;
-      my ($w, $h) = $_->size_request;
-      $y += $h;
+      $y += $_->h;
    }
 }
 
@@ -581,7 +647,7 @@
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
    glBindTexture GL_TEXTURE_2D, $tex->{name};
 
-   glColor 1, 1, 1, 0.6; # TODO color
+   glColor 1, 0, 0, 1; # TODO color
 
    glBegin GL_QUADS;
    glTexCoord 0, 0; glVertex 0            , 0;
@@ -621,95 +687,6 @@
    $self->set_text ($text);
 }
 
-
-# XXX: TextView isn't neccessary with pango multiline text rendering
-package Crossfire::Client::Widget::TextView;
-
-use strict;
-
-our @ISA = qw/Crossfire::Client::Widget/;
-
-use SDL::OpenGL;
-use SDL::OpenGL::Constants;
-
-sub new {
-   my ($class, $text, $h) = @_;
-   my $self = $class->SUPER::new ();
-
-   $self->{txt_height} = $h;
-   @{$self->{lines}} = split /\r?\n/, $text;
-
-   for (split /\r?\n/, $text) {
-      $self->add_line ($_);
-   }
-   $self
-}
-
-#sub render_lines {
-#   my ($self) = @_;
-#
-#   $self->{txt_lines} = [];
-#
-#   for (@{$self->{lines}}) {
-#      push @{$self->{txt_lines}},
-#         new_from_ttf Crossfire::Client::Texture $self->{ttf}, $_;
-#   }
-#}
-
-sub add_line {
-   my ($self, $line) = @_;
-   push @{$self->{lines}}, $line;
-
-   push @{$self->{txt_lines}},
-     new_from_text Crossfire::Client::Texture $line, $self->{txt_height};
-}
-
-sub size_request {
-   my ($self) = @_;
-
-   my $w = 0;
-   my $h = 0;
-
-   for (@{$self->{txt_lines}}) {
-      if ($w < $_->{width}) { $w = $_->{width} }
-      $h += $_->{height};
-   }
-
-   return ($w, $h);
-}
-
-sub draw_line {
-   my ($self, $tex, $y) = @_;
-
-   glBindTexture GL_TEXTURE_2D, $tex->{name};
-
-   glColor 1, 0, 1;
-
-   glBegin GL_QUADS;
-   glTexCoord 0, 0; glVertex 0            , $y;
-   glTexCoord 0, 1; glVertex 0            , $y + $tex->{height};
-   glTexCoord 1, 1; glVertex $tex->{width}, $y + $tex->{height};
-   glTexCoord 1, 0; glVertex $tex->{width}, $y;
-   glEnd;
-}
-
-sub _draw {
-   my ($self) = @_;
-
-   glEnable GL_BLEND;
-   glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;#DECAL;
-
-   my $l = 0;
-   for (@{$self->{txt_lines}}) {
-      $self->draw_line ($_, $l);
-      $l += $_->{height};
-   }
-
-   glDisable GL_BLEND;
-   glDisable GL_TEXTURE_2D;
-}
-
 package Crossfire::Client::Widget::MapWidget;
 
 use strict;
@@ -729,6 +706,13 @@
 sub key_up {
 }
 
+sub size_request {
+
+}
+
+sub size_allocate {
+}
+
 sub _draw {
    my ($self) = @_;