[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.137 by root, Wed Apr 19 21:38:05 2006 UTC vs.
Revision 1.174 by root, Tue Apr 25 11:18:49 2006 UTC

 use CFClient;
 our ($FOCUS, $HOVER, $GRAB); # various widgets
 our $ROOT;
+our $TOOLTIP;
 our $BUTTON_STATE;
+sub check_tooltip {
+   if (!$GRAB) {
+      for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
+         if (length $widget->{tooltip}) {
+            if ($TOOLTIP->{owner} != $widget) {
+               $TOOLTIP->{owner} = $widget;
+               my $tip = $widget->{tooltip};
+               $tip = $tip->($widget) if CODE:: eq ref $tip;
+               $TOOLTIP->set_markup ($widget->{tooltip});
+               $TOOLTIP->show;
+               my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
+               if ($x + $TOOLTIP->{w} > $::WIDTH) {
+                  ($x, $y) = $widget->coord2global (-$TOOLTIP->{w}, 0);
+               }
+               $TOOLTIP->move ($x, $y);
+            }
+            return;
+         }
+      }
+   }
+   $TOOLTIP->hide;
+   delete $TOOLTIP->{owner};
+}
 # class methods for events
 sub feed_sdl_key_down_event {
-   $FOCUS->key_down ($_[0]) if $FOCUS;
+   $FOCUS->emit (key_down => $_[0]) || $FOCUS->key_down ($_[0])
+      if $FOCUS;
 }
 sub feed_sdl_key_up_event {
-   $FOCUS->key_up ($_[0]) if $FOCUS;
+   $FOCUS->emit (key_up => $_[0]) || $FOCUS->key_up ($_[0])
+      if $FOCUS;
 }
 sub feed_sdl_button_down_event {
    my ($ev) = @_;
    my ($x, $y) = ($ev->{x}, $ev->{y});
    if (!$BUTTON_STATE) {
       my $widget = $ROOT->find_widget ($x, $y);
       $GRAB = $widget;
       $GRAB->update if $GRAB;
+      check_tooltip;
    }
    $BUTTON_STATE |= 1 << ($ev->{button} - 1);
-   $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
+   if ($GRAB) {
+      ($x, $y) = $GRAB->coord2local ($x, $y);
+      $GRAB->emit (button_down => $ev, $x, $y) || $GRAB->button_down ($ev, $x, $y);
+   }
 }
 sub feed_sdl_button_up_event {
    my ($ev) = @_;
    my ($x, $y) = ($ev->{x}, $ev->{y});
    my $widget = $GRAB || $ROOT->find_widget ($x, $y);
    $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
-   $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
+   if ($GRAB) {
+      ($x, $y) = $GRAB->coord2local ($x, $y);
+      $GRAB->emit (button_up => $ev, $x, $y) || $GRAB->button_up ($ev, $x, $y);
+   }
    if (!$BUTTON_STATE) {
       my $grab = $GRAB; undef $GRAB;
       $grab->update if $grab;
       $GRAB->update if $GRAB;
+      check_tooltip;
    }
 }
 sub feed_sdl_motion_event {
    my ($ev) = @_;
    if ($widget != $HOVER) {
       my $hover = $HOVER; $HOVER = $widget;
       $hover->update if $hover && $hover->{can_hover};
       $HOVER->update if $HOVER && $HOVER->{can_hover};
-   }
-   $HOVER->mouse_motion ($ev, $HOVER->coord2local ($x, $y)) if $HOVER;
+      check_tooltip;
+   }
+   if ($HOVER) {
+      ($x, $y) = $HOVER->coord2local ($x, $y);
+      $HOVER->emit (mouse_motion => $ev, $x, $y) || $HOVER->mouse_motion ($ev, $x, $y);
+   }
 }
 # convert position array to integers
 sub harmonize {
    my ($vals) = @_;
 package CFClient::UI::Base;
 use strict;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 sub new {
    my $class = shift;
    my $self = bless {
-      x => 0,
+      x          => 0,
-      y => 0,
+      y          => 0,
-      z => 0,
+      z          => 0,
+      can_events => 1,
       @_
    }, $class;
    for (keys %$self) {
       if (/^connect_(.*)$/) {
    }
    $self
 }
+sub destroy {
+   my ($self) = @_;
+   $self->hide;
+   %$self = ();
+}
 sub show {
    my ($self) = @_;
    return if $self->{parent};
 }
 sub hide {
    my ($self) = @_;
-   return unless $self->{parent};
+   undef $GRAB  if $GRAB  == $self;
+   undef $HOVER if $HOVER == $self;
-   $self->{parent}->remove ($self);
+   $self->{parent}->remove ($self)
+      if $self->{parent};
 }
 sub move {
    my ($self, $x, $y, $z) = @_;
    $self->{z} = $z if defined $z;
    $self->update;
 }
-sub needs_redraw {
+sub set_size {
-   0
+   my ($self, $w, $h) = @_;
+   $self->{user_w} = $w;
+   $self->{user_h} = $h;
+   $self->check_size;
 }
 sub size_request {
    require Carp;
-   Carp::confess "size_request is abtract";
+   Carp::confess "size_request is abstract";
 }
 sub configure {
    my ($self, $x, $y, $w, $h) = @_;
+   if ($self->{aspect}) {
+      my $w2 = List::Util::min $w, int $h * $self->{aspect};
+      my $h2 = List::Util::min $h, int $w / $self->{aspect};
+      # use alignment to adjust x, y
+      $x += int +($w - $w2) * 0.5;
+      $y += int +($h - $h2) * 0.5;
+      ($w, $h) = ($w2, $h2);
+   }
+   if ($self->{x} != $x || $self->{y} != $y) {
-   $self->{x} = $x;
+      $self->{x} = $x;
-   $self->{y} = $y;
+      $self->{y} = $y;
+      $self->update;
+   }
-   return unless $self->{w} != $w || $self->{h} != $h;
+   if ($self->{w} != $w || $self->{h} != $h) {
-   $self->{w} = $w;
+      $self->{w} = $w;
-   $self->{h} = $h;
+      $self->{h} = $h;
-   $self->size_allocate ($w, $h);
+      $self->size_allocate ($w, $h);
-   $self->update;
+      $self->update;
+   }
 }
 sub size_allocate {
    # nothing to be done
+}
+sub children {
+}
+# call when resoltuion changes etc.
+sub reconfigure {
+   my ($self) = @_;
+   $_->reconfigure
+      for $self->children;
+   $_->check_size;
+}
+sub set_max_size {
+   my ($self, $w, $h) = @_;
+   delete $self->{max_w}; $self->{max_w} = $w if $w;
+   delete $self->{max_h}; $self->{max_h} = $h if $h;
 }
 # return top left coordinates
 sub _topleft {
    my ($self, $x, $y) = @_;
+   $self->{parent}
+      or Carp::confess "no parent widget in _topleft\n";#d#
    $self->{parent}->_topleft ($x + $self->{x}, $y + $self->{y});
 }
 # translate global coordinates to local coordinate system
       glVertex $x + $self->{w}, $y + $self->{h};
       glVertex $x             , $y + $self->{h};
       glEnd;
       glDisable GL_BLEND;
    }
+   if ($ENV{PCLIENT_DEBUG}) {
+      glPushMatrix;
+      glColor 1, 1, 0, 1;
+      glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
+      glBegin GL_LINE_LOOP;
+      glVertex 0         , 0;
+      glVertex $self->{w}, 0;
+      glVertex $self->{w}, $self->{h};
+      glVertex 0         , $self->{h};
+      glEnd;
+      glPopMatrix;
+      CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
+   }
 }
 sub _draw {
    my ($self) = @_;
    warn "no draw defined for $self\n";
 }
 sub find_widget {
    my ($self, $x, $y) = @_;
+   return () unless $self->{can_events};
    return $self
       if $x >= $self->{x} && $x < $self->{x} + $self->{w}
           && $y >= $self->{y} && $y < $self->{y} + $self->{h};
 }
 sub check_size {
    my ($self) = @_;
-   my ($w, $h) = $self->size_request;
+   $self->{parent}
+      or return 1;
+   my ($w, $h) = $self->{user_w} && $self->{user_h}
+      ? @$self{qw(user_w user_h)}
+      : $self->size_request;
-   if ($w != $self->{req_w}  || $h != $self->{req_h}) {
+   if ($w != $self->{req_w} || $h != $self->{req_h}) {
       $self->{req_w} = $w;
       $self->{req_h} = $h;
       $self->{parent}->check_size
-         if $self->{parent};
+         or $self->size_allocate (
+               (List::Util::max $self->{w}, $w),
+               (List::Util::max $self->{h}, $h),
+            );
+      1
+   } else {
+      0
    }
 }
 sub update {
    my ($self) = @_;
 }
 sub emit {
    my ($self, $signal, @args) = @_;
-   for my $cb (@{$self->{signal_cb}{$signal} || []}) {
+   List::Util::sum map $_->($self, @args), @{$self->{signal_cb}{$signal} || []}
-      $cb->($self, @args);
-   }
 }
 sub DESTROY {
    my ($self) = @_;
 package CFClient::UI::DrawBG;
 our @ISA = CFClient::UI::Base::;
 use strict;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 sub new {
    my $class = shift;
    # range [value, low, high, page]
 package CFClient::UI::Empty;
 our @ISA = CFClient::UI::Base::;
+sub new {
+   my ($class, %arg) = @_;
+   $class->SUPER::new (can_events => 0, %arg);
+}
 sub size_request {
    (0, 0)
 }
 sub draw { }
 sub new {
    my ($class, %arg) = @_;
    my $children = delete $arg{children} || [];
-   my $self = $class->SUPER::new (children => [], %arg);
+   my $self = $class->SUPER::new (
+      children   => [],
+      can_events => 0,
+      %arg,
+   );
    $self->add ($_) for @$children;
    $self
 }
    ];
    $child->check_size;
 }
+sub children {
+   @{ $_[0]{children} }
+}
 sub remove {
    my ($self, $child) = @_;
    delete $child->{parent};
+   $child->hide;
    $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
    $self->check_size;
+   $self->update;
+}
+sub clear {
+   my ($self) = @_;
+   my $children = delete $self->{children};
+   $self->{children} = [];
+   for (@$children) {
+      delete $_->{parent};
+      $_->hide;
+   }
 }
 sub find_widget {
    my ($self, $x, $y) = @_;
 package CFClient::UI::Window;
 our @ISA = CFClient::UI::Bin::;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 sub new {
    my ($class, %arg) = @_;
    my $self = $class->SUPER::new (%arg);
 }
 sub update {
    my ($self) = @_;
-   # we want to do this delayed...
+   $ROOT->on_refresh ($self => sub { $self->render_child });
-   $self->render_chld;
    $self->SUPER::update;
 }
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+   $self->SUPER::size_allocate ($w, $h);
+   $self->update;
+}
-sub render_chld {
+sub render_child {
    my ($self) = @_;
    $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
-      glClearColor 0, 0, 0, 1;
+      glClearColor 0, 0, 0, 0;
       glClear GL_COLOR_BUFFER_BIT;
       $self->child->draw;
    };
 }
-sub size_allocate {
-   my ($self, $w, $h) = @_;
-   $self->child->configure (0, 0, $w, $h);
-   $self->render_chld;
-}
 sub _draw {
    my ($self) = @_;
    my ($w, $h) = ($self->w, $self->h);
    my $tex = $self->{texture}
       or return;
+   glEnable GL_BLEND;
+   glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
+   glEnable GL_TEXTURE_2D;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+   glColor 0, 0, 0, 1;
+   $tex->draw_quad (0, 0, $w, $h);
+   glDisable GL_BLEND;
+   glDisable GL_TEXTURE_2D;
+}
+#############################################################################
+package CFClient::UI::ViewPort;
+our @ISA = CFClient::UI::Window::;
+sub new { die }
+sub size_request {
+   my ($self) = @_;
+   @$self{qw(child_w child_h)} = @{$self->child}{qw(req_w req_h)};
+   $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
+   @$self{qw(child_w child_h)}
+}
+sub _draw {
+   my ($self) = @_;
+   $self->{children}[1]->draw;
+}
+#############################################################################
+package CFClient::UI::Frame;
+our @ISA = CFClient::UI::Bin::;
+use CFClient::OpenGL;
+sub new {
+   my $class = shift;
+   my $self = $class->SUPER::new (
+      bg        => [1, 1, 1, 1],
+      border_bg => [1, 1, 1, 1],
+      border    => 0.8,
+      @_
+   );
+   $self
+}
+sub _draw {
+   my ($self) = @_;
+   my ($w, $h) = ($self->{w}, $self->{h});
    glEnable GL_BLEND;
    glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-   $tex->draw_quad (0, 0, $w, $h);
+#   glBegin GL_QUADS;
+#   glColor 0, 0, 0, 0;
+#   glVertex 0 , 0;
+#   glVertex 0 , $h;
+#   glVertex $w, $h;
+#   glVertex $w, 0;
+#   glEnd;
+   $self->child->draw;
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################
-package CFClient::UI::ViewPort;
-our @ISA = CFClient::UI::Window::;
-sub new { die }
-sub size_request {
-   my ($self) = @_;
-   @$self{qw(child_w child_h)} = $self->child->size_request;
-   $self->child->size_allocate (0, 0, @$self{qw(child_w child_h)});
-   @$self{qw(child_w child_h)}
-}
-sub _draw {
-   my ($self) = @_;
-   $self->{children}[1]->draw;
-}
-#############################################################################
-package CFClient::UI::Frame;
+package CFClient::UI::FancyFrame;
 our @ISA = CFClient::UI::Bin::;
-use SDL::OpenGL;
+use CFClient::OpenGL;
-sub size_request {
-   my ($self) = @_;
-   my $chld = $self->child
-      or return (0, 0);
-   $chld->move (2, 2);
-   map { $_ + 4 } $chld->size_request;
-}
-sub size_allocate {
-   my ($self, $x, $y, $w, $h) = @_;
-   $self->child->configure (2, 2, $w - 4, $h - 4);
-}
-sub _draw {
-   my ($self) = @_;
-   my $chld = $self->child;
-   my ($w, $h) = $chld->size_request;
-   glBegin GL_QUADS;
-   glColor 0, 0, 0;
-   glVertex 0      , 0;
-   glVertex 0      , $h + 4;
-   glVertex $w + 4 , $h + 4;
-   glVertex $w + 4 , 0;
-   glEnd;
-   $chld->draw;
-}
-#############################################################################
-package CFClient::UI::FancyFrame;
-our @ISA = CFClient::UI::Bin::;
-use SDL::OpenGL;
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw(d1_bg.png d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 sub new {
    my $class = shift;
    # TODO: user_x, user_y, overwrite moveto?
-   $class->SUPER::new (
+   my $self = $class->SUPER::new (
-      bg        => [1, 1, 1, 1],
+      bg         => [1, 1, 1, 1],
-      border_bg => [1, 1, 1, 1],
+      border_bg  => [1, 1, 1, 1],
-      border    => 0.8,
+      border     => 0.8,
+      can_events => 1,
       @_
-   )
+   );
+   $self->{title} &&= new CFClient::UI::Label
+      align    => 0,
+      valign   => 1,
+      text     => $self->{title},
+      fontsize => 1;
+   $self
 }
 sub border {
    int $_[0]{border} * $::FONTSIZE
 }
 sub size_request {
    my ($self) = @_;
-   return ($self->{user_w}, $self->{user_h}) if $self->{user_w} && $self->{user_h};
    my ($w, $h) = $self->SUPER::size_request;
    (
       $w + $self->border * 2,
    my ($self, $w, $h) = @_;
    $h -= List::Util::max 0, $self->border * 2;
    $w -= List::Util::max 0, $self->border * 2;
+   $self->{title}->configure ($self->border, $self->border - $::FONTSIZE * 2, $w, $::FONTSIZE * 2)
+      if $self->{title};
    $self->child->configure ($self->border, $self->border, $w, $h);
 }
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
    my $border = $self->border;
    if ($x < $self->{w} && $x >= $self->{w} - $border
        && $y < $self->{h} && $y >= $self->{h} - $border) {
-      my ($ox, $oy) = ($ev->button_x, $ev->button_y);
+      my ($ox, $oy) = ($ev->{x}, $ev->{y});
       my ($bw, $bh) = ($self->{w}, $self->{h});
       $self->{motion} = sub {
          my ($ev, $x, $y) = @_;
-         ($x, $y) = ($ev->motion_x, $ev->motion_y);
+         ($x, $y) = ($ev->{x}, $ev->{y});
          $self->{user_w} = $bw + $x - $ox;
          $self->{user_h} = $bh + $y - $oy;
          $self->check_size;
       };
    } elsif ($x >= 0 && $x < $self->{w}
             && $y >= 0 && $y < $border) {
-      my ($ox, $oy) = ($ev->button_x, $ev->button_y);
+      my ($ox, $oy) = ($ev->{x}, $ev->{y});
       my ($bx, $by) = ($self->{x}, $self->{y});
       $self->{motion} = sub {
          my ($ev, $x, $y) = @_;
-         ($x, $y) = ($ev->motion_x, $ev->motion_y);
+         ($x, $y) = ($ev->{x}, $ev->{y});
          $self->move ($bx + $x - $ox, $by + $y - $oy);
          $self->update;
       };
    }
    $bg->draw_quad ($border, $border, $cw, $ch);
    glDisable GL_TEXTURE_2D;
    glDisable GL_BLEND;
+   $self->{title}->draw if $self->{title};
    $self->child->draw;
 }
 #############################################################################
 our @ISA = CFClient::UI::Base::;
 use List::Util qw(max sum);
-use SDL::OpenGL;
+use CFClient::OpenGL;
 sub new {
    my $class = shift;
    $class->SUPER::new (
    $self->{children}[$y][$x] = $child;
    $child->check_size;
 }
+sub children {
+   grep $_, map @$_, grep $_, @{ $_[0]{children} }
+}
 # TODO: move to container class maybe? send childs a signal on removal?
 sub clear {
    my ($self) = @_;
+   my @children = $self->children;
    delete $self->{children};
+   for (@children) {
+      delete $_->{parent};
+      $_->hide;
+   }
    $self->update;
 }
 sub get_wh {
    my ($self) = @_;
          or next;
       for my $x (0 .. $#$row) {
          my $widget = $row->[$x]
             or next;
-         my ($w, $h) = $widget->size_request;
+         my ($w, $h) = @$widget{qw(req_w req_h)};
          $w[$x] = max $w[$x], $w;
          $h[$y] = max $h[$y], $h;
       }
    }
    ($h, $w) = ($w, $h);
    my $children = $self->{children};
-   my @h = map +($_->size_request)[0], @$children;
+   my @h = map $_->{req_w}, @$children;
    my $req_h = List::Util::sum @h;
    if ($req_h > $h) {
       # ah well, not enough space
 sub size_allocate {
    my ($self, $w, $h) = @_;
    my $children = $self->{children};
-   my @h = map +($_->size_request)[1], @$children;
+   my @h = map $_->{req_h}, @$children;
    my $req_h = List::Util::sum @h;
    if ($req_h > $h) {
       # ah well, not enough space
 package CFClient::UI::Label;
 our @ISA = CFClient::UI::Base::;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 sub new {
    my ($class, %arg) = @_;
    my $self = $class->SUPER::new (
-      fg       => [1, 1, 1],
+      fg         => [1, 1, 1],
+      #font      => default_font
-      fontsize => 1,
+      fontsize   => 1,
-      text     => "",
+      text       => "",
-      align    => -1,
+      align      => -1,
-      valign   => -1,
+      valign     => -1,
-      padding  => 2,
+      padding    => 2,
-      layout   => new CFClient::Layout,
+      layout     => new CFClient::Layout,
+      can_events => 0,
       %arg
    );
-   $self->{xxx}++ if $self->{text} eq "Client Setup" && $self->{align};#d#
+   if (exists $self->{template}) {
+      my $layout = new CFClient::Layout;
+      $layout->set_text (delete $self->{template});
+      $self->{template} = $layout;
+   }
    $self->set_text   (delete $self->{text})   if exists $self->{text};
    $self->set_markup (delete $self->{markup}) if exists $self->{markup};
    $self
 }
-sub escape_text {
+sub escape {
    local $_ = $_[1];
    s/&/&amp;/g;
    s/>/&gt;/g;
    s/</&lt;/g;
    $_[1]
 }
+sub update {
+   my ($self) = @_;
+   delete $self->{texture};
+   $self->SUPER::update;
+}
+sub reconfigure {
+   my ($self) = @_;
+   delete $self->{texture};
+}
 sub set_text {
    my ($self, $text) = @_;
+   return if $self->{text} eq "T$text";
+   $self->{text} = "T$text";
    $self->{layout}->set_text ($text);
    delete $self->{texture};
    $self->update;
+   $self->check_size;
 }
 sub set_markup {
    my ($self, $markup) = @_;
+   return if $self->{text} eq "M$markup";
+   $self->{text} = "M$markup";
    $self->{layout}->set_markup ($markup);
    delete $self->{texture};
    $self->update;
+   $self->check_size;
 }
 sub size_request {
    my ($self) = @_;
-   $self->{layout}->set_width;
+   $self->{layout}->set_font ($self->{font}) if $self->{font};
+   $self->{layout}->set_width ($self->{max_w} || -1);
    $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
    my ($w, $h) = $self->{layout}->size;
+   if (exists $self->{template}) {
+      $self->{template}->set_font ($self->{font}) if $self->{font};
+      $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
+      my ($w2, $h2) = $self->{template}->size;
+      $w = List::Util::max $w, $w2;
+      $h = List::Util::max $h, $h2;
+   }
    (
       $w + $self->{padding} * 2,
       $h + $self->{padding} * 2,
    )
    my ($self, $w, $h) = @_;
    delete $self->{texture};
 }
+sub set_fontsize {
+   my ($self, $fontsize) = @_;
+   $self->{fontsize} = $fontsize;
+   delete $self->{texture};
+   $self->check_size;
+   $self->update;
+}
 sub _draw {
    my ($self) = @_;
    my $tex = $self->{texture} ||= do {
+      $self->{layout}->set_font ($self->{font}) if $self->{font};
       $self->{layout}->set_width ($self->{w});
       $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
       new_from_layout CFClient::Texture $self->{layout}
    };
 package CFClient::UI::EntryBase;
 our @ISA = CFClient::UI::Label::;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 sub new {
    my $class = shift;
    $class->SUPER::new (
-      fg        => [1, 1, 1],
+      fg         => [1, 1, 1],
-      bg        => [0, 0, 0, 0.2],
+      bg         => [0, 0, 0, 0.2],
-      active_bg => [1, 1, 1, 0.5],
+      active_bg  => [1, 1, 1, 0.5],
-      active_fg => [0, 0, 0],
+      active_fg  => [0, 0, 0],
-      can_hover => 1,
+      can_hover  => 1,
-      can_focus => 1,
+      can_focus  => 1,
-      valign    => 0,
+      valign     => 0,
+      can_events => 1,
       @_
    )
 }
 sub _set_text {
 }
 sub size_allocate {
    my ($self, $w, $h) = @_;
-   $self->_set_text ($self->{text});
+   $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
 }
 sub set_text {
    my ($self, $text) = @_;
 package CFClient::UI::Entry;
 our @ISA = CFClient::UI::EntryBase::;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 sub key_down {
    my ($self, $ev) = @_;
    my $sym = $ev->{sym};
    if ($sym == 13) {
+      unshift @{$self->{history}},
+         my $txt = $self->get_text;
+      $self->{history_pointer} = -1;
+      $self->{history_saveback} = '';
-      $self->emit (activate => $self->get_text);
+      $self->emit (activate => $txt);
       $self->update;
+   } elsif ($sym == CFClient::SDLK_UP) {
+      if ($self->{history_pointer} < 0) {
+         $self->{history_saveback} = $self->get_text;
+      }
+      if (@{$self->{history} || []} > 0) {
+         $self->{history_pointer}++;
+         if ($self->{history_pointer} >= @{$self->{history} || []}) {
+            $self->{history_pointer} = @{$self->{history} || []} - 1;
+         }
+         $self->set_text ($self->{history}->[$self->{history_pointer}]);
+      }
+   } elsif ($sym == CFClient::SDLK_DOWN) {
+      $self->{history_pointer}--;
+      $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
+      if ($self->{history_pointer} >= 0) {
+         $self->set_text ($self->{history}->[$self->{history_pointer}]);
+      } else {
+         $self->set_text ($self->{history_saveback});
+      }
    } else {
       $self->SUPER::key_down ($ev);
    }
 package CFClient::UI::Button;
 our @ISA = CFClient::UI::Label::;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw(b1_button_active.png);
 sub new {
    my $class = shift;
    $class->SUPER::new (
-      padding   => 4,
+      padding    => 4,
-      fg        => [1, 1, 1],
+      fg         => [1, 1, 1],
-      bg        => [1, 1, 1, 0.2],
+      bg         => [1, 1, 1, 0.2],
-      active_fg => [0, 0, 1],
+      active_fg  => [0, 0, 1],
-      can_hover => 1,
+      can_hover  => 1,
-      align     => 0,
+      align      => 0,
-      valign    => 0,
+      valign     => 0,
+      can_events => 1,
       @_
    )
 }
 sub button_up {
 package CFClient::UI::CheckBox;
 our @ISA = CFClient::UI::DrawBG::;
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw(c1_checkbox_bg.png c1_checkbox_active.png);
-use SDL::OpenGL;
+use CFClient::OpenGL;
 sub new {
    my $class = shift;
    $class->SUPER::new (
    glDisable GL_BLEND;
 }
 #############################################################################
-package CFClient::UI::VGauge;
+package CFClient::UI::Image;
 our @ISA = CFClient::UI::Base::;
-use SDL::OpenGL;
+use CFClient::OpenGL;
+use Carp qw/confess/;
-my %tex = (
+our %loaded_images;
-   food => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
-         qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
-   ],
-   grace => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
-         qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png/
-   ],
-   hp => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
-         qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
-   ],
-   mana => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
-         qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png/
-   ],
-);
-# eg. VGauge->new (gauge => 'food'), default gauge: food
 sub new {
    my $class = shift;
-   my $self = $class->SUPER::new (gauge => 'food', @_);
+   my $self = $class->SUPER::new (can_events => 0, @_);
+   $self->{image} or confess "Image has 'image' not set. This is a fatal error!";
+   $loaded_images{$self->{image}} ||=
+      new_from_file CFClient::Texture CFClient::find_rcfile $self->{image}, mipmap => 1;
+   my $tex = $self->{tex} = $loaded_images{$self->{image}};
+   Scalar::Util::weaken $loaded_images{$self->{image}};
+   $self->{aspect} = $tex->{w} / $tex->{h};
    $self
 }
 sub size_request {
    my ($self) = @_;
-   my $tex = $tex{$self->{gauge}}[0];
+   ($self->{tex}->{w}, $self->{tex}->{h})
-   @$tex{qw(w h)}
-}
-sub set_max {
-   my ($self, $max) = @_;
-   $self->{max_val} = $max;
-}
-sub set_value {
-   my ($self, $val, $max) = @_;
-   $self->set_max ($max)
-      if defined $max;
-   $max = $self->{max_val};
-   $self->{val} = $val;
-   $self->update;
 }
 sub _draw {
    my ($self) = @_;
-   my $tex = $tex{$self->{gauge}};
+   my $tex = $self->{tex};
    my ($w, $h) = ($self->{w}, $self->{h});
-   my $ycut = $self->{val} / ($self->{max_val} || 1);
+   if ($self->{rot90}) {
-   $ycut = 1 if $self->{val} > $self->{max_val};
+      glRotate 90, 0, 0, 1;
+      glTranslate 0, -$self->{w}, 0;
-   my $t1 = $tex->[0];
+      ($w, $h) = ($h, $w);
-   my $t2 = $tex->[1];
+   }
    glEnable GL_BLEND;
    glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+   $tex->draw_quad (0, 0, $w, $h);
+   glDisable GL_BLEND;
+   glDisable GL_TEXTURE_2D;
+}
+#############################################################################
+package CFClient::UI::VGauge;
+our @ISA = CFClient::UI::Base::;
+use List::Util qw(min max);
+use CFClient::OpenGL;
+my %tex = (
+   food => [
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+         qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
+   ],
+   grace => [
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+         qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
+   ],
+   hp => [
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+         qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
+   ],
+   mana => [
+      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+         qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
+   ],
+);
+# eg. VGauge->new (gauge => 'food'), default gauge: food
+sub new {
+   my $class = shift;
+   my $self = $class->SUPER::new (
+      type  => 'food',
+      @_
+   );
+   $self->{aspect} = $tex{$self->{type}}[0]{w} / $tex{$self->{type}}[0]{h};
+   $self
+}
+sub size_request {
+   my ($self) = @_;
+   #my $tex = $tex{$self->{type}}[0];
+   #@$tex{qw(w h)}
+   (0, 0)
+}
+sub set_max {
+   my ($self, $max) = @_;
+   return if $self->{max_val} == $max;
+   $self->{max_val} = $max;
+   $self->update;
+}
+sub set_value {
+   my ($self, $val, $max) = @_;
+   $self->set_max ($max)
+      if defined $max;
+   return if $self->{val} == $val;
+   $self->{val} = $val;
+   $self->update;
+}
+sub _draw {
+   my ($self) = @_;
+   my $tex = $tex{$self->{type}};
+   my ($t1, $t2, $t3) = @$tex;
+   my ($w, $h) = ($self->{w}, $self->{h});
+   if ($self->{vertical}) {
+      glRotate 90, 0, 0, 1;
+      glTranslate 0, -$self->{w}, 0;
+      ($w, $h) = ($h, $w);
+   }
+   my $ycut = $self->{val} / ($self->{max_val} || 1);
+   my $ycut1 = max 0, min 1, $ycut;
+   my $ycut2 = max 0, min 1, $ycut - 1;
-   my $h1 = $self->{h} - $ycut * $self->{h};
+   my $h1 = $self->{h} * (1 - $ycut1);
-   my $h2 = $ycut * $self->{h};
+   my $h2 = $self->{h} * (1 - $ycut2);
-   my $yp = 0;
+   glEnable GL_BLEND;
+   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glEnable GL_TEXTURE_2D;
+   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    glBindTexture GL_TEXTURE_2D, $t1->{name};
    glBegin GL_QUADS;
-   glTexCoord 0       , 0;                      glVertex 0     , $yp;
+   glTexCoord 0       , 0;                       glVertex 0 , 0;
-   glTexCoord 0       , $t1->{t} * (1 - $ycut); glVertex 0     , $yp + $h1;
+   glTexCoord 0       , $t1->{t} * (1 - $ycut1); glVertex 0 , $h1;
-   glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
+   glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut1); glVertex $w, $h1;
-   glTexCoord $t1->{s}, 0;                      glVertex 0 + $w, $yp;
+   glTexCoord $t1->{s}, 0;                       glVertex $w, 0;
    glEnd;
-   $yp += $h1;
+   my $ycut1 = List::Util::min 1, $ycut;
    glBindTexture GL_TEXTURE_2D, $t2->{name};
    glBegin GL_QUADS;
-   glTexCoord 0       , $t2->{t} * (1 - $ycut); glVertex 0     , $yp;
+   glTexCoord 0       , $t2->{t} * (1 - $ycut1); glVertex 0 , $h1;
-   glTexCoord 0       , $t2->{t};               glVertex 0     , $yp + $h2;
+   glTexCoord 0       , $t2->{t} * (1 - $ycut2); glVertex 0 , $h2;
-   glTexCoord $t2->{s}, $t2->{t};               glVertex 0 + $w, $yp + $h2;
-   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
+   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut2); glVertex $w, $h2;
+   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut1); glVertex $w, $h1;
    glEnd;
+   if ($t3) {
+      glBindTexture GL_TEXTURE_2D, $t3->{name};
+      glBegin GL_QUADS;
+      glTexCoord 0       , $t3->{t} * (1 - $ycut2); glVertex 0 , $h2;
+      glTexCoord 0       , $t3->{t};                glVertex 0 , $self->{h};
+      glTexCoord $t3->{s}, $t3->{t};                glVertex $w, $self->{h};
+      glTexCoord $t3->{s}, $t3->{t} * (1 - $ycut2); glVertex $w, $h2;
+      glEnd;
+   }
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################
+package CFClient::UI::Gauge;
+our @ISA = CFClient::UI::VBox::;
+sub new {
+   my ($class, %arg) = @_;
+   my $self = $class->SUPER::new (
+      tooltip    => $arg{type},
+      can_hover  => 1,
+      can_events => 1,
+      %arg,
+   );
+   $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
+   $self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
+   $self->add ($self->{max}   = new CFClient::UI::Label valign => -1, align => 0, template => "999");
+   $self
+}
+sub set_fontsize {
+   my ($self, $fsize) = @_;
+   $self->{value}->set_fontsize ($fsize);
+   $self->{max}  ->set_fontsize ($fsize);
+}
+sub set_max {
+   my ($self, $max) = @_;
+   $self->{gauge}->set_max ($max);
+   $self->{max}->set_text ($max);
+}
+sub set_value {
+   my ($self, $val, $max) = @_;
+   $self->set_max ($max)
+      if defined $max;
+   $self->{gauge}->set_value ($val, $max);
+   $self->{value}->set_text ($val);
+}
+#############################################################################
 package CFClient::UI::Slider;
 use strict;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 our @ISA = CFClient::UI::DrawBG::;
 my @tex =
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
 package CFClient::UI::TextView;
 our @ISA = CFClient::UI::HBox::;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
-      fontsize => 1,
+      fontsize   => 1,
+      can_events => 0,
+      #font      => default_font
       @_,
-      layout   => (new CFClient::Layout),
+      layout     => (new CFClient::Layout),
-      par      => [],
+      par        => [],
-      height   => 0,
+      height     => 0,
-      children => [
+      children   => [
          (new CFClient::UI::Empty expand => 1),
          (new CFClient::UI::Slider vertical => 1),
       ],
    );
 sub size_allocate {
    my ($self, $w, $h) = @_;
    $self->SUPER::size_allocate ($w, $h);
+   $self->{layout}->set_font ($self->{font}) if $self->{font};
    $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
    $self->{layout}->set_width ($self->{children}[0]{w});
    $self->reflow;
 }
          my $y = 0;
          my $layout = $self->{layout};
+         $layout->set_font ($self->{font}) if $self->{font};
          for my $par (@{$self->{par}}) {
             my $h = $par->[0];
             if ($y0 < $y + $h && $y < $y1) {
                $layout->set_text ($par->[2]);
    my ($self) = @_;
    if ($self->{texture}) {
       glEnable GL_TEXTURE_2D;
       glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+      glColor 1, 1, 1, 1;
       $self->{texture}->draw_quad (0, 0, $self->{w}, $self->{h});
       glDisable GL_TEXTURE_2D;
    }
    $self->{children}[1]->draw;
 #############################################################################
 package CFClient::UI::Animator;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 our @ISA = CFClient::UI::Bin::;
 sub moveto {
    my ($self, $x, $y) = @_;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
-      state => 0,
+      state            => 0,
       connect_activate => \&toggle_flopper,
       @_
    );
    if ($self->{state}) {
    $self->emit (changed => $self->{state});
 }
 #############################################################################
+package CFClient::UI::Tooltip;
+our @ISA = CFClient::UI::Bin::;
+use CFClient::OpenGL;
+sub new {
+   my $class = shift;
+   $class->SUPER::new (
+      @_,
+      can_events => 0,
+   )
+}
+sub set_markup {
+   my ($self, $text) = @_;
+   $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
+   $self->{label}->set_markup ($text);
+   $self->add ($self->{label});
+}
+sub size_request {
+   my ($self) = @_;
+   $self->child->set_max_size ($::WIDTH * 0.3);
+   my ($w, $h) = @{$self->child}{qw(req_w req_h)};
+   ($w + 4, $h + 4)
+}
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+   $self->SUPER::size_allocate ($w - 4, $h - 4);
+}
+sub _draw {
+   my ($self) = @_;
+   glPushMatrix;
+   glTranslate 0.375, 0.375;
+   my ($w, $h) = @$self{qw(w h)};
+   glColor 1, 0.8, 0.4;
+   glBegin GL_QUADS;
+   glVertex 0 , 0;
+   glVertex 0 , $h;
+   glVertex $w, $h;
+   glVertex $w, 0;
+   glEnd;
+   glColor 0, 0, 0;
+   glBegin GL_LINE_LOOP;
+   glVertex 0 , 0;
+   glVertex 0 , $h;
+   glVertex $w, $h;
+   glVertex $w, 0;
+   glEnd;
+   glPopMatrix;
+   glTranslate 2, 2;
+   $self->SUPER::_draw;
+}
+#############################################################################
+package CFClient::UI::Face;
+our @ISA = CFClient::UI::Base::;
+use CFClient::OpenGL;
+sub new {
+   my $class = shift;
+   $class->SUPER::new (
+      aspect => 1,
+      @_,
+   )
+}
+sub size_request {
+   (32, 8)
+}
+sub draw {
+   my ($self) = @_;
+   my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
+   if ($tex) {
+      glEnable GL_BLEND;
+      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glEnable GL_TEXTURE_2D;
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
+      glColor 1, 1, 1, 1;
+      $tex->draw_quad (0, 0, $self->{w}, $self->{h});
+      glDisable GL_TEXTURE_2D;
+      glDisable GL_BLEND;
+   }
+}
+#############################################################################
 package CFClient::UI::Root;
 our @ISA = CFClient::UI::Container::;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 sub check_size {
    my ($self) = @_;
-   $self->configure (0, 0, $::WITH, $::HEIGHT);
+   $self->configure (0, 0, $::WIDTH, $::HEIGHT);
 }
 sub size_request {
    ($::WIDTH, $::HEIGHT)
 }
 sub configure {
    my ($self, $x, $y, $w, $h) = @_;
    $self->SUPER::configure ($x, $y, $w, $h);
-   $_->configure ($_->{x}, $_->{y}, $_->size_request)
-      for @{$self->{children}};
+   for my $child (@{$self->{children}}) {
+      my ($X, $Y, $W, $H) = @$child{qw(x y req_w req_h)};
+      $X = List::Util::max 0, List::Util::min $w - $W, $X;
+      $Y = List::Util::max 0, List::Util::min $h - $H, $Y;
+      $child->configure ($X, $Y, $W,$H);
+   }
 }
 sub _topleft {
    my ($self, $x, $y) = @_;
    ::refresh ();
 }
 sub add {
    my ($self, $child) = @_;
+   # integerize window positions
+   $child->{x} = int $child->{x};
+   $child->{y} = int $child->{y};
    $self->SUPER::add ($child);
 }
 sub on_refresh {
 #############################################################################
 package CFClient::UI;
 $ROOT = new CFClient::UI::Root;
+$TOOLTIP = new CFClient::UI::Tooltip;
 1

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.137 by root, Wed Apr 19 21:38:05 2006 UTC vs. Revision 1.174 by root, Tue Apr 25 11:18:49 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.137 by root, Wed Apr 19 21:38:05 2006 UTC vs.
Revision 1.174 by root, Tue Apr 25 11:18:49 2006 UTC