--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/08 22:08:24	1.25
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/09 01:37:58	1.33
@@ -8,13 +8,13 @@
 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 }
 sub feed_sdl_key_up_event      { $FOCUS->key_up ($_[0])      if $FOCUS }
-sub feed_sdl_button_down_event { $FOCUS->button_down ($_[0]) if $FOCUS }
-sub feed_sdl_button_up_event   { $FOCUS->button_up ($_[0])   if $FOCUS }
+sub feed_sdl_button_down_event { }
+sub feed_sdl_button_up_event   { }
 
 sub new {
    my $class = shift;
@@ -22,17 +22,17 @@
    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 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) = @_;
@@ -94,13 +94,40 @@
 }
 
 sub bbox {
-   my ($widget) = @_;
+   my ($self) = @_;
+   my ($w, $h) = $self->size_request;
+   (
+     $self->{x},
+     $self->{y},
+     $self->{x} = $w,
+     $self->{y} = $h
+   )
+}
+
+sub del_parent { $_[0]->{parent} = undef }
+
+sub set_parent {
+   my ($self, $par) = @_;
+
+   $self->{parent} = $par;
+   Scalar::Util::weaken $self->{parent};
+}
+
+sub get_parent {
+   $_[0]->{parent}
+}
+
+sub update {
+   my ($self) = @_;
+
+   $self->{parent}->update
+      if $self->{parent};
 }
 
 sub DESTROY {
    my ($self) = @_;
 
-   $self->deactivate;
+   #$self->deactivate;
 }
 
 package Crossfire::Client::Widget::Container;
@@ -109,13 +136,54 @@
 
 use SDL::OpenGL;
 
-sub add { $_[0]->{child} = $_[1] }
+sub add { $_[0]->{child} = $_[1]; $_[1]->set_parent ($_[0]); $_[1]->update }
 sub get { $_[0]->{child} }
+sub remove {
+   my ($self, $chld) = @_;
+   delete $self->{child}
+      if $self->{child} == $chld;
+}
 
 sub size_request { $_[0]->{child}->size_request if $_[0]->{child} }
 
 sub _draw { die "Containers can't be drawn!" }
 
+package Crossfire::Client::Widget::Toplevel;
+
+our @ISA = Crossfire::Client::Widget::;
+
+use SDL::OpenGL;
+
+sub add {
+   my ($self, $chld) = @_;
+
+   push @{$self->{childs}}, $chld;
+   @{$self->{childs}} =
+      sort { $a->{z} <=> $b->{z} }
+         @{$self->{childs}};
+
+   $chld->set_parent ($self);
+}
+
+sub remove {
+   my ($self, $chld) = @_;
+   @{$self->{childs}} =
+      sort { $a->{z} <=> $b->{z} }
+         grep { $_ && $_ != $_[0] }
+            @{$self->{childs}}
+}
+
+sub update {
+   my ($self) = @_;
+   ::refresh ();
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   $_->draw for @{$self->{childs}};
+}
+
 package Crossfire::Client::Widget::Window;
 
 our @ISA = Crossfire::Client::Widget::Container::;
@@ -125,6 +193,18 @@
 sub add {
    my ($self, $chld) = @_;
    $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;
+}
+
+sub update {
+   my ($self) = @_;
    $self->render_chld;
 }
 
@@ -150,7 +230,8 @@
 sub _draw {
    my ($self) = @_;
 
-   my ($w, $h) = $self->size_request;#TODO# use widht/height of texture
+   my ($w, $h) = $self->size_request;#TODO# use width/height of texture
+
    my $tex = $self->{texture}
       or return;
 
@@ -159,7 +240,7 @@
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
    glBindTexture GL_TEXTURE_2D, $tex->{name};
 
-   glColor 1, 1, 1;
+   glColor 1, 0, 1;
 
    glBegin GL_QUADS;
    glTexCoord 0, 0; glVertex  0,  0;
@@ -182,6 +263,9 @@
    my ($self) = @_;
    my $chld = $self->get
       or return (0, 0);
+
+   $chld->move (2, 2);
+
    map { $_ + 4 } $chld->size_request;
 }
 
@@ -192,20 +276,25 @@
 
    my ($w, $h) = $chld->size_request;
 
-   glColor 1, 0, 0;
    glBegin GL_QUADS;
+   glColor 0, 0, 0;
    glTexCoord 0, 0; glVertex 0      , 0;
    glTexCoord 0, 1; glVertex 0      , $h + 4;
    glTexCoord 1, 1; glVertex $w + 4 , $h + 4;
    glTexCoord 1, 0; glVertex $w + 4 , 0;
    glEnd;
 
-   glPushMatrix;
-   glTranslate (2, 2, 0);
    $chld->draw;
-   glPopMatrix;
 }
 
+package Crossfire::Client::Widget::FancyFrame;
+
+our @ISA = Crossfire::Client::Widget::Frame::;
+
+use SDL::OpenGL;
+
+#TODO: implement themed frame
+
 package Crossfire::Client::Widget::Table;
 
 our @ISA = Crossfire::Client::Widget::Container::;
@@ -214,7 +303,11 @@
 
 sub add {
    my ($self, $x, $y, $chld) = @_;
+   my $old_chld = $self->{childs}[$y][$x];
+
    $self->{childs}[$y][$x] = $chld;
+   $chld->set_parent ($self);
+   $self->update;
 }
 
 sub max_row_height {
@@ -274,11 +367,11 @@
 
       for (my $xi = 0; $xi <= $#{$self->{childs}->[$yi]}; $xi++) {
 
-         glPushMatrix;
-         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;
-         glPopMatrix;
+         if ($c) {
+            $c->move ($x, $y, 0); #TODO: Move to size_request
+            $c->draw if $c;
+         }
 
          $x += $self->max_col_width ($xi);
       }
@@ -296,6 +389,8 @@
 sub add {
    my ($self, $chld) = @_;
    push @{$self->{childs}}, $chld;
+   $chld->set_parent ($self);
+   $self->update;
 }
 
 sub size_request {
@@ -316,10 +411,8 @@
 
    my ($x, $y);
    for (@{$self->{childs} || []}) {
-      glPushMatrix;
-      glTranslate (0, $y, 0);# see above TODO
+      $_->move (0, $y, 0); #TODO: move to size_request
       $_->draw;
-      glPopMatrix;
       my ($w, $h) = $_->size_request;
       $y += $h;
    }
@@ -332,9 +425,10 @@
 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);
+   # TODO: color, and make height, xyz etc. optional
+   my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
 
    $self->set_text ($text);
 
@@ -343,11 +437,16 @@
 
 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};
+
+   $self->update;
 }
 
 sub get_text {
    my ($self, $text) = @_;
+
    $self->{text}
 }
 
@@ -367,10 +466,11 @@
 
    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;
    glBindTexture GL_TEXTURE_2D, $tex->{name};
 
-   glColor 1, 1, 1;
+   glColor 1, 1, 1, 0.6; # TODO color
 
    glBegin GL_QUADS;
    glTexCoord 0, 0; glVertex 0            , 0;
@@ -383,6 +483,35 @@
    glDisable GL_TEXTURE_2D;
 }
 
+package Crossfire::Client::Widget::TextEntry;
+
+our @ISA = Crossfire::Client::Widget::Label::;
+
+use SDL;
+use SDL::OpenGL;
+
+sub key_down {
+   my ($self, $ev) = @_;
+
+   my $mod = $ev->key_mod;
+   my $sym = $ev->key_sym;
+
+   $ev->set_unicode (1);
+   my $uni = $ev->key_unicode;
+
+   my $text = $self->get_text;
+
+   if ($sym == SDLK_BACKSPACE) {
+      substr $text, -1, 1, '';
+
+   } elsif ($uni) {
+      $text .= chr $uni;
+   }
+   $self->set_text ($text);
+}
+
+
+# XXX: TextView isn't neccessary with pango multiline text rendering
 package Crossfire::Client::Widget::TextView;
 
 use strict;
@@ -392,14 +521,82 @@
 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;
@@ -435,13 +632,13 @@
    my $sh = 1 + int $::HEIGHT / 32;
 
    if ($::CONN->{mapw} > $sw) {
-      $xofs = ($sw - $::CONN->{mapw}) * 0.5;
+      $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 = ($sh - $::CONN->{maph}) * 0.5;
+      $yofs = $my + ($::CONN->{maph} - $sh) * 0.5;
    } else {
       $yofs = $self->{yofs} = min $my, max $my + $::CONN->{maph} - $sh + 1, $self->{yofs};
    }
@@ -450,8 +647,6 @@
    glEnable GL_BLEND;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
-   warn "<$mx,$my> <$xofs,$yofs>\n";#d#
-
    for my $x (0 .. $sw - 1) {
       for my $y (0 .. $sh - 1) {