--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/09 22:26:51	1.49
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/10 11:41:17	1.51
@@ -9,11 +9,66 @@
 
 use Crossfire::Client;
 
+our ($FOCUS, $HOVER, $GRAB); # various widgets
+
+our $TOPLEVEL;
+our $BUTTON_STATE;
+
 # 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 { }
-sub feed_sdl_button_up_event   { }
+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 {
+   my ($ev) = @_;
+   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+
+   if (!$BUTTON_STATE) {
+      my $widget = $TOPLEVEL->find_widget ($x, $y);
+
+      $GRAB = $widget;
+      $GRAB->update if $GRAB;
+   }
+
+   $BUTTON_STATE |= 1 << ($ev->button - 1);
+
+   $GRAB->button_down ($ev) if $GRAB;
+}
+
+sub feed_sdl_button_up_event {
+   my ($ev) = @_;
+   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+
+   my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
+
+   $BUTTON_STATE &= ~(1 << ($ev->button - 1));
+
+   if (!$BUTTON_STATE) {
+      my $grab = $GRAB; undef $GRAB;
+      $grab->update if $grab;
+      $GRAB->update if $GRAB;
+   }
+}
+
+sub feed_sdl_motion_event {
+   my ($ev) = @_;
+   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+
+   my $widget = $GRAB || $TOPLEVEL->find_widget ($x, $y);
+
+   if ($widget != $HOVER) {
+      my $hover = $HOVER; $HOVER = $widget;
+
+      $hover->update if $hover;
+      $HOVER->update if $HOVER;
+   }
+
+   $HOVER->mouse_motion ($ev) if $HOVER;
+}
 
 sub new {
    my $class = shift;
@@ -45,35 +100,33 @@
 }
 
 sub focus_in {
-   my ($widget) = @_;
-   $::FOCUS = $widget;
-}
-
-sub focus_out {
-   my ($widget) = @_;
-}
+   my ($self) = @_;
 
-sub key_down {
-   my ($widget, $sdlev) = @_;
+   my $focus = $FOCUS; $FOCUS = $self;
+   $focus->update if $focus;
+   $FOCUS->update;
 }
 
-sub key_up {
-   my ($widget, $sdlev) = @_;
-}
+sub focus_out {
+   my ($self) = @_;
 
-sub button_down {
-   my ($widget, $sdlev) = @_;
-}
+   return unless $FOCUS == $self;
 
-sub button_up {
-   my ($widget, $sdlev) = @_;
+   my $focus = $FOCUS; undef $FOCUS;
+   $focus->update if $focus; #?
 }
 
-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} }
+sub mouse_motion { }
+sub button_up { }
+sub button_down { }
+sub key_down { }
+sub key_up { }
+
+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} }
 
 sub draw {
    my ($self) = @_;
@@ -81,14 +134,16 @@
    glPushMatrix;
    glTranslate $self->{x}, $self->{y}, 0;
    $self->_draw;
-   if ($self == $::HOVER) {
+   if ($self == $HOVER) {
       glColor 1, 1, 1, 0.4;
+      glEnable GL_BLEND;
       glBegin GL_QUADS;
-      glVertex 0, 0;
-      glVertex $self->{w} - 1, 0;
-      glVertex $self->{w} - 1, $self->{h} - 1;
-      glVertex 0, $self->{h} - 1;
+      glVertex 0         , 0;
+      glVertex $self->{w}, 0;
+      glVertex $self->{w}, $self->{h};
+      glVertex 0         , $self->{h};
       glEnd;
+      glDisable GL_BLEND;
    }
    glPopMatrix;
 }
@@ -227,26 +282,6 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::Toplevel;
-
-our @ISA = Crossfire::Client::Widget::Container::;
-
-sub update {
-   my ($self) = @_;
-
-   ::refresh ();
-}
-
-sub add {
-   my ($self, $widget) = @_;
-
-   $self->SUPER::add ($widget);
-
-   $widget->size_allocate ($widget->size_request);
-}
-
-#############################################################################
-
 package Crossfire::Client::Widget::Window;
 
 our @ISA = Crossfire::Client::Widget::Bin::;
@@ -632,6 +667,8 @@
 sub new {
    my ($class, $x, $y, $z, $height, $text) = @_;
 
+   $height ||= $::FONTSIZE;
+
    # TODO: color, and make height, xyz etc. optional
    my $self = $class->SUPER::new (x => $x, y => $y, z => $z, height => $height);
 
@@ -658,10 +695,17 @@
 sub size_request {
    my ($self) = @_;
 
-   (
-      $self->{texture}{width},
-      $self->{texture}{height},
-   )
+   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};
+
+      ($w, $h)
+   }
+
 }
 
 sub _draw {
@@ -690,7 +734,7 @@
 
 #############################################################################
 
-package Crossfire::Client::Widget::TextEntry;
+package Crossfire::Client::Widget::Entry;
 
 our @ISA = Crossfire::Client::Widget::Label::;
 
@@ -703,20 +747,45 @@
    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;
+      print "$uni <$text>\n";#d#
    }
+
    $self->set_text ($text);
 }
 
+sub button_down {
+   my ($self, $ev) = @_;
+
+   $self->focus_in;
+}
+
+sub _draw {
+   my ($self) = @_;
+
+   if ($FOCUS == $self) {
+      glColor 1, 1, 1;
+   } else {
+      glColor 0.7, 0.7, 0.7;
+   }
+
+   glBegin GL_QUADS;
+   glVertex 0             , 0;
+   glVertex 0             , $self->{h} - 1;
+   glVertex $self->{w} - 1, $self->{h} - 1;
+   glVertex $self->{w} - 1, 0;
+   glEnd;
+
+   $self->SUPER::_draw;
+}
+
 #############################################################################
 
 package Crossfire::Client::Widget::MapWidget;
@@ -906,7 +975,7 @@
    my ($self, $x, $y) = @_;
 
    $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
-   $self->{speed}  = 0.2;
+   $self->{speed}  = 2;
    $self->{time}   = 1;
    
    ::animation_start $self;
@@ -931,10 +1000,56 @@
    my ($self) = @_;
 
    glPushMatrix;
-   glRotate $self->{time} * 10000, 0, 1, 0;
+   glRotate $self->{time} * 1000, 0, 1, 0;
    $self->{children}[0]->draw;
    glPopMatrix;
 }
 
-1;
+#############################################################################
+
+package Crossfire::Client::Widget::Toplevel;
+
+our @ISA = Crossfire::Client::Widget::Container::;
+
+sub size_request {
+   ($::WIDTH, $::HEIGHT)
+}
+
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+
+   $self->SUPER::size_allocate ($w, $h);
+
+   $_->size_allocate ($_->size_request)
+      for @{$self->{children}};
+}
+
+sub update {
+   my ($self) = @_;
+
+   $self->size_allocate ($self->size_request);
+   ::refresh ();
+}
+
+sub add {
+   my ($self, $widget) = @_;
+
+   $self->SUPER::add ($widget);
+
+   $widget->size_allocate ($widget->size_request);
+}
+
+sub draw  {
+   my ($self) = @_;
+
+   $self->_draw;
+}
+
+#############################################################################
+
+package Crossfire::Client::Widget;
+
+$TOPLEVEL = new Crossfire::Client::Widget::Toplevel;
+
+1