--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/10 11:56:28	1.53
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/11 13:14:36	1.60
@@ -1,4 +1,4 @@
-package Crossfire::Client::Widget;
+package CFClient::Widget;
 
 use strict;
 
@@ -7,7 +7,7 @@
 use SDL::OpenGL;
 use SDL::OpenGL::Constants;
 
-use Crossfire::Client;
+use CFClient;
 
 our ($FOCUS, $HOVER, $GRAB); # various widgets
 
@@ -36,7 +36,7 @@
 
    $BUTTON_STATE |= 1 << ($ev->button - 1);
 
-   $GRAB->button_down ($ev) if $GRAB;
+   $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
 }
 
 sub feed_sdl_button_up_event {
@@ -47,6 +47,8 @@
 
    $BUTTON_STATE &= ~(1 << ($ev->button - 1));
 
+   $GRAB->button_down ($ev, $GRAB->translate ($x, $y)) if $GRAB;
+
    if (!$BUTTON_STATE) {
       my $grab = $GRAB; undef $GRAB;
       $grab->update if $grab;
@@ -67,7 +69,7 @@
       $HOVER->update if $HOVER;
    }
 
-   $HOVER->mouse_motion ($ev) if $HOVER;
+   $HOVER->mouse_motion ($ev, $HOVER->translate ($x, $y)) if $HOVER;
 }
 
 sub new {
@@ -99,6 +101,13 @@
    $self->{h} = $h;
 }
 
+# translate global koordinates to local coordinate system
+sub translate {
+   my ($self, $x, $y) = @_;
+
+   $self->{parent}->translate ($x - $self->{x}, $y - $self->{y});
+}
+
 sub focus_in {
    my ($self) = @_;
 
@@ -203,9 +212,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Container;
+package CFClient::Widget::Container;
 
-our @ISA = Crossfire::Client::Widget::;
+our @ISA = CFClient::Widget::;
 
 sub new {
    my ($class, @widgets) = @_;
@@ -262,9 +271,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Bin;
+package CFClient::Widget::Bin;
 
-our @ISA = Crossfire::Client::Widget::Container::;
+our @ISA = CFClient::Widget::Container::;
 
 sub child { $_[0]->{children}[0] }
 
@@ -282,9 +291,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Window;
+package CFClient::Widget::Window;
 
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = CFClient::Widget::Bin::;
 
 use SDL::OpenGL;
 
@@ -307,7 +316,7 @@
    my ($self) = @_;
 
    $self->{texture} =
-      Crossfire::Client::Texture->new_from_opengl (
+      CFClient::Texture->new_from_opengl (
          $self->{w}, $self->{h}, sub { $self->child->draw }
       );
 }
@@ -334,14 +343,8 @@
    glEnable GL_BLEND;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-   glBindTexture GL_TEXTURE_2D, $tex->{name};
 
-   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;
+   $tex->draw_quad (0, 0, $w, $h);
 
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
@@ -349,9 +352,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Frame;
+package CFClient::Widget::Frame;
 
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = CFClient::Widget::Bin::;
 
 use SDL::OpenGL;
 
@@ -384,10 +387,10 @@
 
    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;
+   glVertex 0      , 0;
+   glVertex 0      , $h + 4;
+   glVertex $w + 4 , $h + 4;
+   glVertex $w + 4 , 0;
    glEnd;
 
    $chld->draw;
@@ -395,14 +398,14 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::FancyFrame;
+package CFClient::Widget::FancyFrame;
 
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = CFClient::Widget::Bin::;
 
 use SDL::OpenGL;
 
 my @tex = 
-      map { new_from_file Crossfire::Client::Texture Crossfire::Client::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
          qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
 sub size_request {
@@ -447,44 +450,16 @@
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
    my $top = $tex[1];
-   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;
+   $top->draw_quad (0, 0, $w, $top->{height});
 
    my $left = $tex[3];
-   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;
+   $left->draw_quad (0, $top->{height}, $left->{width}, $ch);
 
    my $right = $tex[2];
-   glBindTexture GL_TEXTURE_2D, $right->{name};
-
-   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;
+   $right->draw_quad ($w - $right->{width}, $top->{height}, $right->{width}, $ch);
 
    my $bottom = $tex[4];
-   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;
+   $bottom->draw_quad (0, $h - $bottom->{height}, $w, $bottom->{height});
 
    my $bg = $tex[0];
    glBindTexture GL_TEXTURE_2D, $bg->{name};
@@ -495,12 +470,7 @@
    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;
+   $bg->draw_quad ($left->{width}, $top->{height}, $cw, $ch);
 
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
@@ -511,9 +481,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Table;
+package CFClient::Widget::Table;
 
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = CFClient::Widget::Bin::;
 
 use SDL::OpenGL;
 
@@ -598,9 +568,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::VBox;
+package CFClient::Widget::VBox;
 
-our @ISA = Crossfire::Client::Widget::Container::;
+our @ISA = CFClient::Widget::Container::;
 
 use SDL::OpenGL;
 
@@ -658,9 +628,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Label;
+package CFClient::Widget::Label;
 
-our @ISA = Crossfire::Client::Widget::;
+our @ISA = CFClient::Widget::;
 
 use SDL::OpenGL;
 
@@ -670,7 +640,13 @@
    $height ||= $::FONTSIZE;
 
    # TODO: color, and make height, xyz etc. optional
-   my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
+   my $self = $class->SUPER::new (
+      x => $x,
+      y => $y,
+      z => $z,
+      height => $height,
+      layout => new CFClient::Layout,
+   );
 
    $self->set_text ($text);
 
@@ -681,9 +657,9 @@
    my ($self, $text) = @_;
 
    $self->{text} = $text;
-   $self->{texture} = new_from_text Crossfire::Client::Texture $text, $self->{height};
+   $self->{layout}->set_markup ($text);
 
-   $self->update;
+   delete $self->{texture};
 }
 
 sub get_text {
@@ -695,38 +671,43 @@
 sub size_request {
    my ($self) = @_;
 
-   if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
-      (
-         $self->{texture}{width},
-         $self->{texture}{height},
-      )
-   } else {
-      my ($w, $h, $data) = Crossfire::Client::font_render "Yy", $self->{height};
+   $self->{layout}->set_width;
+   $self->{layout}->size
+#   if ($self->{texture}{width} > 1 && $self->{texture}{height} > 1) { #TODO: hack
+#      (
+#         $self->{texture}{width},
+#         $self->{texture}{height},
+#      )
+#   } else {
+#      my ($w, $h, $data) = CFClient::font_render "Yy", $self->{height};
+#   
+#      ($w, $h)
+#   }
+}
 
-      ($w, $h)
-   }
+sub size_allocate {
+   my ($self, $w, $h) = @_;
 
+   $self->SUPER::size_allocate ($w, $h);
+   delete $self->{texture};
 }
 
 sub _draw {
    my ($self) = @_;
 
-   my $tex = $self->{texture};
+   my $tex = $self->{texture} ||= do {
+      $self->{layout}->set_width ($self->{w});
+      new_from_layout CFClient::Texture $self->{layout};
+   };
 
    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, 0, 0, 1; # TODO color
 
-   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;
+   $tex->draw_quad (0, 0);
 
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
@@ -734,9 +715,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Entry;
+package CFClient::Widget::Entry;
 
-our @ISA = Crossfire::Client::Widget::Label::;
+our @ISA = CFClient::Widget::Label::;
 
 use SDL;
 use SDL::OpenGL;
@@ -755,7 +736,6 @@
       substr $text, -1, 1, '';
    } elsif ($uni) {
       $text .= chr $uni;
-      print "$uni <$text>\n";#d#
    }
 
    $self->set_text ($text);
@@ -767,6 +747,11 @@
    $self->focus_in;
 }
 
+sub mouse_motion {
+   my ($self, $ev, $x, $y) = @_;
+   printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
+}
+
 sub _draw {
    my ($self) = @_;
 
@@ -788,7 +773,7 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::MapWidget;
+package CFClient::Widget::MapWidget;
 
 use strict;
 
@@ -798,7 +783,7 @@
 use SDL::OpenGL;
 use SDL::OpenGL::Constants;
 
-our @ISA = Crossfire::Client::Widget::;
+our @ISA = CFClient::Widget::;
 
 sub key_down {
    print "MAPKEYDOWN\n";
@@ -844,37 +829,29 @@
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
 
    my $sw4 = ($sw + 3) & ~3;
-   my $lighting = "\x00" x ($sw4 * $sh);
+   my $darkness = "\x00" x ($sw4 * $sh);
 
    for my $x (0 .. $sw - 1) {
+      my $row = $map->[$x + $xofs];
       for my $y (0 .. $sh - 1) {
 
-         my $cell = $map->[$x + $xofs][$y + $yofs]
+         my $cell = $row->[$y + $yofs]
             or next;
 
-         my $darkness = $cell->[0] * (1 / 255);
-         if ($darkness < 0) {
-            $darkness = $cell->[1] ? 0.2 : 0;
+         my $dark = $cell->[0];
+         if ($dark < 0) {
+            substr $darkness, $y * $sw4 + $x, 1, chr 224;
+         } else {
+            substr $darkness, $y * $sw4 + $x, 1, chr 255 - $dark;
          }
-         substr $lighting, $y * $sw4 + $x, 1, chr 255 - $darkness * 255;
 
          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 $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;
+            $tex->draw_quad (($x + 1) * 32 - $w, ($y + 1) * 32 - $h, $w, $h);
          }
       }
    }
@@ -889,24 +866,18 @@
 #      $lighting =~ s/(.)../$1/gs;
 #   }
 
-   $lighting = new Crossfire::Client::Texture
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+
+   $darkness = new CFClient::Texture
       width          => $sw4,
       height         => $sh,
-      data           => $lighting,
+      data           => $darkness,
       internalformat => GL_ALPHA,
       format         => GL_ALPHA;
 
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glColor 0.5, 0.5, 0.5, 1;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
-   glBindTexture GL_TEXTURE_2D, $lighting->{name};
-   glTexParameter GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR;
-   glBegin GL_QUADS;
-   glTexCoord 0, 0; glVertex 0        , 0;
-   glTexCoord 0, 1; glVertex 0        , $sh * 32;
-   glTexCoord 1, 1; glVertex $sw4 * 32, $sh * 32;
-   glTexCoord 1, 0; glVertex $sw4 * 32, 0;
-   glEnd;
+   glColor 0.45, 0.45, 0.45, 1;
+   $darkness->draw_quad (0, 0, $sw4 * 32, $sh * 32);
 
    glDisable GL_TEXTURE_2D;
    glDisable GL_BLEND;
@@ -965,17 +936,17 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Animator;
+package CFClient::Widget::Animator;
 
 use SDL::OpenGL;
 
-our @ISA = Crossfire::Client::Widget::Bin::;
+our @ISA = CFClient::Widget::Bin::;
 
 sub moveto {
    my ($self, $x, $y) = @_;
 
    $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
-   $self->{speed}  = 2;
+   $self->{speed}  = 0.001;
    $self->{time}   = 1;
    
    ::animation_start $self;
@@ -1007,9 +978,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Toplevel;
+package CFClient::Widget::Toplevel;
 
-our @ISA = Crossfire::Client::Widget::Container::;
+our @ISA = CFClient::Widget::Container::;
 
 sub size_request {
    ($::WIDTH, $::HEIGHT)
@@ -1024,6 +995,12 @@
       for @{$self->{children}};
 }
 
+sub translate {
+   my ($self, $x, $y) = @_;
+
+   ($x, $y)
+}
+
 sub update {
    my ($self) = @_;
 
@@ -1047,9 +1024,9 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget;
+package CFClient::Widget;
 
-$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;
+$TOPLEVEL = new CFClient::Widget::Toplevel;
 
 1