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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.184 by root, Wed May 3 19:56:05 2006 UTC vs.
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC

 package CFClient::UI;
+use utf8;
 use strict;
 use Scalar::Util ();
 use List::Util ();
 our ($FOCUS, $HOVER, $GRAB); # various widgets
 our $ROOT;
 our $TOOLTIP;
 our $BUTTON_STATE;
+our %WIDGET; # all widgets, weak-referenced
 sub check_tooltip {
    if (!$GRAB) {
       for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
          if (length $widget->{tooltip}) {
                my $tip = $widget->{tooltip};
                $tip = $tip->($widget) if CODE:: eq ref $tip;
-               $TOOLTIP->set_markup ($widget->{tooltip});
+               $TOOLTIP->set_tooltip_from ($widget);
                $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);
+               $TOOLTIP->check_size;
+               $TOOLTIP->update;
             }
             return;
          }
       }
    for (@$vals) {
       my $i = int $_ + $rem;
       $rem += $_ - $i;
       $_ = $i;
+   }
+}
+# call when resolution changes etc.
+sub rescale_widgets {
+   my ($sx, $sy) = @_;
+   for my $widget (values %WIDGET) {
+      if ($widget->{toplevel}) {
+         $widget->{x}      = int 0.5 + $widget->{x}      * $sx if exists $widget->{x};
+         $widget->{w}      = int 0.5 + $widget->{w}      * $sx if exists $widget->{w};
+         $widget->{req_w}  = int 0.5 + $widget->{req_w}  * $sx if exists $widget->{req_w};
+         $widget->{user_w} = int 0.5 + $widget->{user_w} * $sx if exists $widget->{user_w};
+         $widget->{y}      = int 0.5 + $widget->{y}      * $sy if exists $widget->{y};
+         $widget->{h}      = int 0.5 + $widget->{h}      * $sy if exists $widget->{h};
+         $widget->{req_h}  = int 0.5 + $widget->{req_h}  * $sy if exists $widget->{req_h};
+         $widget->{user_h} = int 0.5 + $widget->{user_h} * $sy if exists $widget->{user_h};
+      }
+      $widget->reconfigure;
    }
 }
 #############################################################################
       if (/^connect_(.*)$/) {
          $self->connect ($1 => delete $self->{$_});
       }
    }
+   Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
    $self
 }
 sub destroy {
    my ($self) = @_;
 sub show {
    my ($self) = @_;
    return if $self->{parent};
+   $self->{toplevel} = 1;
    $CFClient::UI::ROOT->add ($self);
 }
 sub hide {
    my ($self) = @_;
       $self->{y} = $y;
       $self->update;
    }
    if ($self->{w} != $w || $self->{h} != $h) {
-      $self->{w} = $w;
+      $CFClient::UI::ROOT->{size_alloc}{$self} = [$self, $w, $h];
-      $self->{h} = $h;
-      $self->size_allocate ($w, $h);
-      $self->update;
-      $self->emit (size_allocate => $w, $h);
    }
 }
 sub size_allocate {
    # nothing to be done
 }
+sub reconfigure {
+   my ($self) = @_;
+   $self->check_size (1);
+   $self->update;
+}
 sub children {
-}
-# call when resolution 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
 sub coord2local {
    my ($self, $x, $y) = @_;
-   my ($X, $Y) = $self->_topleft;
+   $self->{parent}->coord2local ($x  - $self->{x}, $y - $self->{y})
-   ($x - $X, $y - $Y)
 }
 # translate local coordinates to global coordinate system
 sub coord2global {
    my ($self, $x, $y) = @_;
-   my ($X, $Y) = $self->_topleft;
+   $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
-   ($x + $X, $y + $Y)
 }
 sub focus_in {
    my ($self) = @_;
 sub set_parent {
    my ($self, $parent) = @_;
    Scalar::Util::weaken ($self->{parent} = $parent);
+   # TODO: req_w _does_change after ->reconfigure
+   $self->check_size
+      unless exists $self->{req_w};
 }
 sub check_size {
-   my ($self) = @_;
+   my ($self, $forced) = @_;
-   $self->{parent}
+   $self->{force_alloc} = 1 if $forced;
-      or return 1;
+   $CFClient::UI::ROOT->{check_size}{$self} = $self;
-   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}) {
-      $self->{req_w} = $w;
-      $self->{req_h} = $h;
-      $self->{parent}->check_size
-         or $self->size_allocate (
-               (List::Util::max $self->{w}, $w),
-               (List::Util::max $self->{h}, $h),
-            );
-      1
-   } else {
-      0
-   }
 }
 sub update {
    my ($self) = @_;
 }
 sub DESTROY {
    my ($self) = @_;
+   delete $WIDGET{$self+0};
    #$self->deactivate;
 }
 #############################################################################
    $self
 }
 sub add {
-   my ($self, $child) = @_;
+   my ($self, @widgets) = @_;
-   $child->set_parent ($self);
+   $_->set_parent ($self)
+      for @widgets;
    use sort 'stable';
    $self->{children} = [
       sort { $a->{z} <=> $b->{z} }
-         @{$self->{children}}, $child
+         @{$self->{children}}, @widgets
    ];
-   $child->check_size;
+   $self->check_size (1);
    $self->update;
 }
 sub children {
    @{ $_[0]{children} }
 }
 sub update {
    my ($self) = @_;
-   $ROOT->on_refresh ($self => sub { $self->render_child });
+   $ROOT->on_post_alloc ($self => sub { $self->render_child });
    $self->SUPER::update;
 }
 sub size_allocate {
    my ($self, $w, $h) = @_;
    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);
+   $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
-   glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################
    $self->{view_y} = int $y;
    $self->update;
 }
-# hmm, this does not work for topleft of $self... but we should not aks for that
+# hmm, this does not work for topleft of $self... but we should not ask for that
-sub _topleft {
+sub coord2local {
    my ($self, $x, $y) = @_;
-   $self->SUPER::_topleft ($x - $self->{view_x}, $y - $self->{view_y})
+   $self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
+}
+sub coord2global {
+   my ($self, $x, $y) = @_;
+   $x = List::Util::min $self->{w}, $x - $self->{view_x};
+   $y = List::Util::min $self->{h}, $y - $self->{view_y};
+   $self->SUPER::coord2global ($x, $y)
 }
 sub find_widget {
    my ($self, $x, $y) = @_;
    $self->add ($self->{slider});
    $self
 }
-#TODO# update range on size_allocate depeneing on child
+#TODO# update range on size_allocate depending on child
 # update viewport offset on scroll
 #############################################################################
 package CFClient::UI::Frame;
 use CFClient::OpenGL;
 sub new {
    my $class = shift;
-   my $self = $class->SUPER::new (
+   $class->SUPER::new (
-      bg        => [1, 1, 1, 1],
+      bg => undef,
-      border_bg => [1, 1, 1, 1],
-      border    => 0.8,
-      @_
+      @_,
-   );
+   )
-   $self
 }
 sub _draw {
    my ($self) = @_;
-   my ($w, $h) = ($self->{w}, $self->{h});
+   if ($self->{bg}) {
+      my ($w, $h) = @$self{qw(w h)};
-   glEnable GL_BLEND;
+      glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   glEnable GL_TEXTURE_2D;
+      glColor @{ $self->{bg} };
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-#   glBegin GL_QUADS;
+      glBegin GL_QUADS;
-#   glColor 0, 0, 0, 0;
-#   glVertex 0 , 0;
+      glVertex 0 , 0;
-#   glVertex 0 , $h;
+      glVertex 0 , $h;
-#   glVertex $w, $h;
+      glVertex $w, $h;
-#   glVertex $w, 0;
+      glVertex $w, 0;
-#   glEnd;
+      glEnd;
-   $self->child->draw;
-   glDisable GL_BLEND;
+      glDisable GL_BLEND;
-   glDisable GL_TEXTURE_2D;
+   }
+   $self->SUPER::_draw;
 }
 #############################################################################
 package CFClient::UI::FancyFrame;
    my $self = $class->SUPER::new (
       bg         => [1, 1, 1, 1],
       border_bg  => [1, 1, 1, 1],
       border     => 0.6,
+      toplevel   => 1,
       can_events => 1,
       @_
    );
    $self->{title} &&= new CFClient::UI::Label
    my ($self) = @_;
    my ($w,  $h ) = ($self->{w}, $self->{h});
    my ($cw, $ch) = ($self->child->{w}, $self->child->{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_MODULATE;
    my $border = $self->border;
    glColor @{ $self->{border_bg} };
-   $tex[1]->draw_quad (0, 0, $w, $border);
+   $tex[1]->draw_quad_alpha (0, 0, $w, $border);
-   $tex[3]->draw_quad (0, $border, $border, $ch);
+   $tex[3]->draw_quad_alpha (0, $border, $border, $ch);
-   $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
+   $tex[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
-   $tex[4]->draw_quad (0, $h - $border, $w, $border);
+   $tex[4]->draw_quad_alpha (0, $h - $border, $w, $border);
    if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
       my $bg = $tex[0];
       # TODO: repeat texture not scale
       glColor @{ $self->{bg} };
       $bg->{s} = $rep_x;
       $bg->{t} = $rep_y;
       $bg->{wrap_mode} = 1;
-      $bg->draw_quad ($border, $border, $cw, $ch);
+      $bg->draw_quad_alpha ($border, $border, $cw, $ch);
+   }
-      glDisable GL_TEXTURE_2D;
+   glDisable GL_TEXTURE_2D;
-      glDisable GL_BLEND;
-   }
    $self->{title}->draw if $self->{title};
    $self->child->draw;
 }
 }
 sub size_allocate {
    my ($self, $w, $h) = @_;
+   Carp::confess "negative size" if $w < 0 || $h < 0;#d#
    my $children = $self->{children};
    my @h = map $_->{req_h}, @$children;
    my $req_h = List::Util::sum @h;
    my ($class, %arg) = @_;
    my $self = $class->SUPER::new (
       fg         => [1, 1, 1],
       #font      => default_font
+      #text      => initial text
+      #markup    => initial narkup
+      layout     => (new CFClient::Layout),
       fontsize   => 1,
-      text       => "",
       align      => -1,
       valign     => -1,
       padding    => 2,
-      layout     => new CFClient::Layout,
       can_events => 0,
       %arg
    );
    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};
+   if (exists $self->{markup}) {
-   $self->set_markup (delete $self->{markup}) if exists $self->{markup};
+      $self->set_markup (delete $self->{markup});
+   } else {
+      $self->set_text (delete $self->{text});
+   }
    $self
 }
 sub escape {
    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} = new CFClient::Layout if $self->{layout}->is_rgba;
    $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";
+   my $rgba = $markup =~ /span.*(?:foreground|background)/;
+   $self->{layout} = new CFClient::Layout $rgba if $self->{layout}->is_rgba != $rgba;
    $self->{layout}->set_markup ($markup);
-   delete $self->{texture};
    $self->update;
    $self->check_size;
 }
 sub size_request {
 sub set_fontsize {
    my ($self, $fontsize) = @_;
    $self->{fontsize} = $fontsize;
    delete $self->{texture};
+   $self->update;
    $self->check_size;
-   $self->update;
 }
 sub _draw {
    my ($self) = @_;
    my $tex = $self->{texture} ||= do {
+      $self->{layout}->set_foreground (@{$self->{fg}});
       $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}
+      my $tex = new_from_layout CFClient::Texture $self->{layout};
+      $self->{ox} = int $self->{align} < 0 ? $self->{padding}
+                      : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
+                      :                      ($self->{w} - $tex->{w}) * 0.5;
+      $self->{oy} = int $self->{valign} < 0 ? $self->{padding}
+                      : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
+                      :                       ($self->{h} - $tex->{h}) * 0.5;
+      $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;
+   if ($tex->{format} == GL_ALPHA) {
-   glColor @{$self->{fg}};
+      glColor @{$self->{fg}};
-   $self->{ox} = int (
-      $self->{align} < 0 ? $self->{padding}
-    : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding}
-    :                      ($self->{w} - $tex->{w}) * 0.5
-   );
-   $self->{oy} = int (
-      $self->{valign} < 0 ? $self->{padding}
-    : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding}
-    :                       ($self->{h} - $tex->{h}) * 0.5
-   );
-   $tex->draw_quad ($self->{ox}, $self->{oy});
+      $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
+   } else {
+      $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
+   }
    glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
 }
 #############################################################################
 package CFClient::UI::EntryBase;
    $self->{layout}->set_text ("$text ");
    $self->emit (changed => $self->{text});
 }
+sub set_text {
+   my ($self, $text) = @_;
+   $self->{cursor} = length $text;
+   $self->_set_text ($text);
+   $self->check_size;
+   $self->update;
+}
 sub get_text {
    $_[0]{text}
 }
 sub size_request {
 sub size_allocate {
    my ($self, $w, $h) = @_;
    $self->_set_text (delete $self->{text});#d# don't check for == inside _set_text
-}
-sub set_text {
-   my ($self, $text) = @_;
-   $self->{cursor} = length $text;
-   $self->_set_text ($text);
-   $self->update;
 }
 sub key_down {
    my ($self, $ev) = @_;
    my $sym = $ev->{sym};
    my $uni = $ev->{unicode};
    my $text = $self->get_text;
-   if ($sym == 8) {
+   if ($uni == 8) {
       substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
-   } elsif ($sym == 127) {
+   } elsif ($uni == 127) {
       substr $text, $self->{cursor}, 1, "";
    } elsif ($sym == CFClient::SDLK_LEFT) {
       --$self->{cursor} if $self->{cursor};
    } elsif ($sym == CFClient::SDLK_RIGHT) {
       ++$self->{cursor} if $self->{cursor} < length $self->{text};
    } elsif ($sym == CFClient::SDLK_HOME) {
       $self->{cursor} = 0;
    } elsif ($sym == CFClient::SDLK_END) {
       $self->{cursor} = length $text;
-   } elsif ($sym == 27) {
+   } elsif ($uni == 27) {
       $self->emit ('escape');
    } elsif ($uni) {
       substr $text, $self->{cursor}++, 0, chr $uni;
    }
    if ($GRAB == $self) {
       $self->{fg} = $self->{active_fg};
    }
-   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 0, 0, 0, 1;
-   $tex[0]->draw_quad (0, 0, $self->{w}, $self->{h});
+   $tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
    glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
    $self->SUPER::_draw;
 }
 #############################################################################
    my $s = (List::Util::min @$self{qw(w h)}) - $self->{padding} * 2;
    glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
-   glEnable GL_BLEND;
+   my $tex = $self->{state} ? $tex[1] : $tex[0];
    glEnable GL_TEXTURE_2D;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-   my $tex = $self->{state} ? $tex[1] : $tex[0];
-   $tex->draw_quad (0, 0, $s, $s);
+   $tex->draw_quad_alpha (0, 0, $s, $s);
    glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
 }
 #############################################################################
 package CFClient::UI::Image;
       glTranslate 0, -$self->{w}, 0;
       ($w, $h) = ($h, $w);
    }
-   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);
+   $tex->draw_quad_alpha (0, 0, $w, $h);
-   glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################
    $page ||= 2;
    my $knob_a = $inner_pad_px + ($value - $page * 0.5);
    my $knob_b = $inner_pad_px + ($value + $page * 0.5);
-   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;
    # draw background
-   $tex[1]->draw_quad (0, 0, $w, $h);
+   $tex[1]->draw_quad_alpha (0, 0, $w, $h);
    # draw handle
-   $tex[0]->draw_quad ($knob_a, 0, $knob_b - $knob_a, $h);
+   $tex[0]->draw_quad_alpha ($knob_a, 0, $knob_b - $knob_a, $h);
-   glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################
       fontsize   => 1,
       can_events => 0,
       #font      => default_font
       @_,
-      layout     => (new CFClient::Layout),
+      layout     => (new CFClient::Layout 1),
       par        => [],
       height     => 0,
       children   => [
          (new CFClient::UI::Empty expand => 1),
          (new CFClient::UI::Slider vertical => 1),
    my $layout = $self->{layout};
    $layout->set_height ($self->{fontsize} * $::FONTSIZE);
    $layout->set_width ($self->{children}[0]{w});
-   $layout->set_text ($text);
+   $layout->set_markup ($text);
    ($layout->size)[1]
 }
 sub reflow {
    return unless $self->{h} > 0;
    delete $self->{texture};
-   $ROOT->on_refresh ($self, sub {
+   $ROOT->on_post_alloc ($self, sub {
       if (delete $self->{need_reflow}) {
          my $height = 0;
          $height += $_->[0] = $self->text_height ($_->[2])
             for @{$self->{par}};
       $self->{texture} ||= new_from_opengl CFClient::Texture $self->{children}[0]{w}, $self->{children}[0]{h}, sub {
          glClearColor 0, 0, 0, 0;
          glClear GL_COLOR_BUFFER_BIT;
-         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;
          my $top = int $self->{children}[1]{range}[0];
          for my $par (@{$self->{par}}) {
             my $h = $par->[0];
             if ($y0 < $y + $h && $y < $y1) {
+               $layout->set_foreground (@{ $par->[1] });
-               $layout->set_text ($par->[2]);
+               $layout->set_markup ($par->[2]);
-               glColor @{ $par->[1] };
                my ($W, $H) = $layout->size;
-               CFClient::Texture->new_from_layout ($layout)->draw_quad (0, $y - $y0);
+               CFClient::Texture->new_from_layout ($layout)->draw_quad_alpha_premultiplied (0, $y - $y0);
             }
             $y += $h;
          }
          glDisable GL_TEXTURE_2D;
-         glDisable GL_BLEND;
       };
    });
 }
 sub _draw {
    my ($self) = @_;
-   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 1, 1, 1, 1;
-   $self->{texture}->draw_quad (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
+   $self->{texture}->draw_quad_alpha_premultiplied (0, 0, $self->{children}[0]{w}, $self->{children}[0]{h});
    glDisable GL_TEXTURE_2D;
-   glDisable GL_BLEND;
    $self->{children}[1]->draw;
 }
       @_,
       can_events => 0,
    )
 }
-sub set_markup {
+sub set_tooltip_from {
-   my ($self, $text) = @_;
+   my ($self, $widget) = @_;
-   $self->{label} ||= new CFClient::UI::Label fontsize => 0.8, fg => [0, 0, 0];
+   $self->add (new CFClient::UI::Label
-   $self->{label}->set_markup ($text);
+      markup   => $widget->{tooltip},
-   $self->add ($self->{label});
+      max_w    => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
+      fontsize => 0.8,
+      fg       => [0, 0, 0, 1],
+      font     => ($widget->{tooltip_font} || $::FONT_PROP),
+   );
 }
 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 _draw {
    my ($self) = @_;
-   glPushMatrix;
    glTranslate 0.375, 0.375;
    my ($w, $h) = @$self{qw(w h)};
    glColor 1, 0.8, 0.4;
    glVertex 0 , $h;
    glVertex $w, $h;
    glVertex $w, 0;
    glEnd;
-   glPopMatrix;
+   glTranslate 2 - 0.375, 2 - 0.375;
-   glTranslate 2, 2;
    $self->SUPER::_draw;
 }
 #############################################################################
 }
 sub _draw {
    my ($self) = @_;
+   return unless $::CONN;#d# manage and cache textures differently
    my $tex = $::CONN->{texture}[$::CONN->{faceid}[$self->{face}]];
    # TODO animation
    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});
+      $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
       glDisable GL_TEXTURE_2D;
-      glDisable GL_BLEND;
    }
 }
 #############################################################################
-package CFClient::UI::Menu;
+package CFClient::UI::InventoryItem;
-our @ISA = CFClient::UI::FancyFrame::;
+our @ISA = CFClient::UI::HBox::;
-use CFClient::OpenGL;
 sub new {
    my $class = shift;
-   my $self = $class->SUPER::new (
-      items => [],
-      z     => 100,
-      @_,
-   );
-   $self->add ($self->{vbox} = new CFClient::UI::VBox);
-   for my $item (@{ $self->{items} }) {
-      my ($widget, $cb) = @$item;
-      # handle various types of items, only text for now
-      if (!ref $widget) {
-         $widget = new CFClient::UI::Label
-            can_hover  => 1,
-            can_events => 1,
-            text       => $widget;
-      }
-      $self->{item}{$widget} = $item;
-      $self->{vbox}->add ($widget);
-   }
-   $self
-}
-# popup given the event (must be a mouse button down event currently)
-sub popup {
-   my ($self, $ev) = @_;
-   $self->emit ("popdown");
-   # maybe save $GRAB? must be careful about events...
-   $GRAB = $self;
-   $self->{button} = $ev->{button};
-   $self->show;
-   $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
-}
-sub mouse_motion {
-   my ($self, $ev, $x, $y) = @_;
-   # TODO: should use vbox->find_widget or so
-   $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
-   $self->{hover} = $self->{item}{$HOVER};
-}
-sub button_up {
-   my ($self, $ev, $x, $y) = @_;
-   if ($ev->{button} == $self->{button}) {
-      undef $GRAB;
-      $self->hide;
-      $self->emit ("popdown");
-      $self->{hover}[1]->() if $self->{hover};
-   }
-}
-#############################################################################
-package CFClient::UI::Root;
-our @ISA = CFClient::UI::Container::;
-use CFClient::OpenGL;
-sub check_size {
-   my ($self) = @_;
-   $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);
-   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) = @_;
-   ($x, $y)
-}
-sub update {
-   my ($self) = @_;
-   $self->check_size;
-   ::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 {
-   my ($self, $id, $cb) = @_;
-   $self->{refresh_hook}{$id} = $cb;
-}
-sub draw  {
-   my ($self) = @_;
-   while (my $rcb = delete $self->{refresh_hook}) {
-      $_->() for values %$rcb;
-   }
-   glViewport 0, 0, $::WIDTH, $::HEIGHT;
-   glClearColor +($::CFG->{fow_intensity}) x 3, 1;
-   glClear GL_COLOR_BUFFER_BIT;
-   glMatrixMode GL_PROJECTION;
-   glLoadIdentity;
-   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
-   glMatrixMode GL_MODELVIEW;
-   glLoadIdentity;
-   $self->_draw;
-}
-#############################################################################
-package CFClient::UI::InventoryItem;
-our @ISA = CFClient::UI::HBox::;
-sub new {
-   my $class = shift;
    my %args = @_;
-   my $item = $args{item};
+   my $item = delete $args{item};
    my $desc = $item->{nrof} < 2
       ? $item->{name}
       : "$item->{nrof} $item->{name_pl}";
          1
       },
       %args
    );
-   $self->add(new CFClient::UI::Face
+   $self->add (new CFClient::UI::Face
       can_events => 0,
       face       => $item->{face},
       anim       => $item->{anim},
-      animspeed  => $item->{animspeed});
+      animspeed  => $item->{animspeed},
+   );
-   $self->add(new CFClient::UI::Label
+   $self->add (new CFClient::UI::Label
       can_events => 0,
-      text => $desc);
+      text       => $desc,
+   );
    $self
 }
 #############################################################################
    my ($self, $items) = @_;
    $self->{scrolled}->clear;
    return unless $items;
-   my @items = sort { $a->{type} <=> $b->{type} } @$items;
+   my @items = sort {
+      ($a->{type} <=> $b->{type})
+         or ($a->{name} cmp $b->{name})
+   } @$items;
    $self->{real_items} = \@items;
    for my $item (@items) {
       my $desc = $item->{nrof} < 2
                      ? $item->{name}
                      : "$item->{nrof} $item->{name_pl}";
-      $self->{scrolled}->add (new CFClient::UI::InventoryItem item => $item);
+      $item = $item->{widget} ||= new CFClient::UI::InventoryItem item => $item;
    }
+   $self->{scrolled}->add (@items);
 #   $range->{range} = [$self->{pos}, 0, $self->{max_pos}, $page];
 }
 sub size_request {
    my ($self) = @_;
    ($self->{req_w}, $self->{req_h});
+}
+#############################################################################
+package CFClient::UI::Menu;
+our @ISA = CFClient::UI::FancyFrame::;
+use CFClient::OpenGL;
+sub new {
+   my $class = shift;
+   my $self = $class->SUPER::new (
+      items => [],
+      z     => 100,
+      @_,
+   );
+   $self->add ($self->{vbox} = new CFClient::UI::VBox);
+   for my $item (@{ $self->{items} }) {
+      my ($widget, $cb) = @$item;
+      # handle various types of items, only text for now
+      if (!ref $widget) {
+         $widget = new CFClient::UI::Label
+            can_hover  => 1,
+            can_events => 1,
+            text       => $widget;
+      }
+      $self->{item}{$widget} = $item;
+      $self->{vbox}->add ($widget);
+   }
+   $self
+}
+# popup given the event (must be a mouse button down event currently)
+sub popup {
+   my ($self, $ev) = @_;
+   $self->emit ("popdown");
+   # maybe save $GRAB? must be careful about events...
+   $GRAB = $self;
+   $self->{button} = $ev->{button};
+   $self->show;
+   $self->move ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);
+}
+sub mouse_motion {
+   my ($self, $ev, $x, $y) = @_;
+   # TODO: should use vbox->find_widget or so
+   $HOVER = $ROOT->find_widget ($ev->{x}, $ev->{y});
+   $self->{hover} = $self->{item}{$HOVER};
+}
+sub button_up {
+   my ($self, $ev, $x, $y) = @_;
+   if ($ev->{button} == $self->{button}) {
+      undef $GRAB;
+      $self->hide;
+      $self->emit ("popdown");
+      $self->{hover}[1]->() if $self->{hover};
+   }
+}
+#############################################################################
+package CFClient::UI::Statusbox;
+our @ISA = CFClient::UI::VBox::;
+sub reorder {
+   my ($self) = @_;
+   my $NOW = time;
+   while (my ($k, $v) = each %{ $self->{item} }) {
+      delete $self->{item}{$k} if $v->{timeout} < $NOW;
+   }
+   my @widgets;
+   my @items = sort {
+                  $a->{pri} <=> $b->{pri}
+                     or $b->{id} <=> $a->{id}
+               } values %{ $self->{item} };
+   my $count = 10 + 1;
+   for my $item (@items) {
+      last unless --$count;
+      push @widgets, $item->{label} ||= do {
+         # TODO: doesn't handle markup well (read as: at all)
+         my $short = $item->{count} > 1
+                     ? "<b>$item->{count} ×</b> $item->{text}"
+                     : $item->{text};
+         for ($short) {
+            s/^\s+//;
+            s/\012.*/…/s;
+            my $len = int 40 / $item->{fontsize};
+            substr $_, $len, length, "…" if $len < length;
+         }
+         new CFClient::UI::Label
+            markup        => $short,
+            tooltip       => $item->{tooltip},
+            tooltip_font  => $::FONT_PROP,
+            tooltip_width => 0.67,
+            fontsize      => $item->{fontsize},
+            color         => $item->{color},
+            can_events    => 1,
+            can_hover     => 1
+      };
+   }
+   $self->clear;
+   $self->SUPER::add (reverse @widgets);
+}
+sub add {
+   my ($self, $text, %arg) = @_;
+   $text =~ s/^\s+//;
+   $text =~ s/\s+$//;
+   my $timeout = time + ((delete $arg{timeout}) || 60);
+   my $group = exists $arg{group} ? $arg{group} : ++$self->{id};
+   if (my $item = $self->{item}{$group}) {
+      if ($item->{text} eq $text) {
+         $item->{count}++;
+      } else {
+         $item->{count} = 1;
+         $item->{text} = $item->{tooltip} = $text;
+      }
+      $item->{id} = ++$self->{id};
+      $item->{timeout} = $timeout;
+      delete $item->{label};
+   } else {
+      $self->{item}{$group} = {
+         id       => ++$self->{id},
+         text     => $text,
+         timeout  => $timeout,
+         tooltip  => $text,
+         fontsize => 0.8,
+         color    => [0.8, 0.8, 0.8, 0.8],
+         pri      => 0,
+         count    => 1,
+         %arg,
+      };
+   }
+   $self->reorder;
+}
+#############################################################################
+package CFClient::UI::Root;
+our @ISA = CFClient::UI::Container::;
+use CFClient::OpenGL;
+sub new {
+   my $class = shift;
+   $class->SUPER::new (
+      @_,
+   )
+}
+sub configure {
+   my ($self, $x, $y, $w, $h) = @_;
+   $self->{w} = $w;
+   $self->{h} = $h;
+}
+sub check_size {
+   my ($self) = @_;
+   $self->size_allocate ($self->{w}, $self->{h})
+      if $self->{w};
+}
+sub size_request {
+   my ($self) = @_;
+   ($self->{w}, $self->{h})
+}
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+   my $old_w = $self->{old_w}; $self->{old_w} = $w;
+   my $old_h = $self->{old_h}; $self->{old_h} = $h;
+   CFClient::UI::rescale_widgets $w / $old_w, $h / $old_h
+      if $old_w && $old_h && ($old_w != $w || $old_h != $h);
+   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 coord2local {
+   my ($self, $x, $y) = @_;
+   ($x, $y)
+}
+sub coord2global {
+   my ($self, $x, $y) = @_;
+   ($x, $y)
+}
+sub update {
+   my ($self) = @_;
+   $self->check_size;
+   $::WANT_REFRESH++;
+}
+sub add {
+   my ($self, $child) = @_;
+   # integerise window positions
+   $child->{x} = int $child->{x};
+   $child->{y} = int $child->{y};
+   $self->SUPER::add ($child);
+}
+sub on_refresh {
+   my ($self, $id, $cb) = @_;
+   $self->{refresh_hook}{$id} = $cb;
+}
+sub on_post_alloc {
+   my ($self, $id, $cb) = @_;
+   $self->{post_alloc_hook}{$id} = $cb;
+}
+sub draw {
+   my ($self) = @_;
+   while ($self->{refresh_hook}) {
+      $_->()
+         for values %{delete $self->{refresh_hook}};
+   }
+   if ($self->{check_size}) {
+      my @queue = ([], []);
+      for (;;) {
+         if ($self->{check_size}) {
+            # heuristic: check containers last
+            push @{ $queue[ ! ! $_->isa ("CFClient::UI::Container") ] }, $_
+               for values %{delete $self->{check_size}}
+         }
+         my $widget = (pop @{ $queue[0] }) || (pop @{ $queue[1] }) || last;
+         my ($w, $h) = $widget->{user_w} && $widget->{user_h}
+            ? @$widget{qw(user_w user_h)}
+            : $widget->size_request;
+         if (delete $widget->{force_alloc}
+             or $w != $widget->{req_w} or $h != $widget->{req_h}) {
+            Carp::confess "$widget: size_request is negative" if $w < 0 || $h < 0;#d#
+            $widget->{req_w} = $w;
+            $widget->{req_h} = $h;
+            $self->{size_alloc}{$widget} = [$widget, $widget->{w} || $w, $widget->{h} || $h];
+            $widget->{parent}->check_size
+               if $widget->{parent};
+         }
+       }
+   }
+   while ($self->{size_alloc}) {
+      for (values %{delete $self->{size_alloc}}) {
+         my ($widget, $w, $h) = @$_;
+         $w = 0 if $w < 0;
+         $h = 0 if $h < 0;
+         $widget->{w} = $w;
+         $widget->{h} = $h;
+         $widget->size_allocate ($w, $h);
+         $widget->emit (size_allocate => $w, $h);
+      }
+   }
+   while ($self->{post_alloc_hook}) {
+      $_->()
+         for values %{delete $self->{post_alloc_hook}};
+   }
+   glViewport 0, 0, $::WIDTH, $::HEIGHT;
+   glClearColor +($::CFG->{fow_intensity}) x 3, 1;
+   glClear GL_COLOR_BUFFER_BIT;
+   glMatrixMode GL_PROJECTION;
+   glLoadIdentity;
+   glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000 , 10000;
+   glMatrixMode GL_MODELVIEW;
+   glLoadIdentity;
+   $self->_draw;
 }
 #############################################################################
 package CFClient::UI;

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.184 by root, Wed May 3 19:56:05 2006 UTC vs. Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.184 by root, Wed May 3 19:56:05 2006 UTC vs.
Revision 1.202 by root, Sun May 14 20:51:19 2006 UTC