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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.259 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC

 use utf8;
 use strict;
 use Scalar::Util ();
 use List::Util ();
+use Event;
 use CFClient;
 use CFClient::Texture;
 our ($FOCUS, $HOVER, $GRAB); # various widgets
 our $ROOT;
 our $TOOLTIP;
 our $BUTTON_STATE;
 our %WIDGET; # all widgets, weak-referenced
+our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
+   if (!$GRAB) {
+      for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
+         if (length $widget->{tooltip}) {
+            if ($TOOLTIP->{owner} != $widget) {
+               $TOOLTIP->hide;
+               $TOOLTIP->{owner} = $widget;
+               return if $ENV{CFPLUS_DEBUG} & 8;
+               my $tip = $widget->{tooltip};
+               $tip = $tip->($widget) if CODE:: eq ref $tip;
+               $TOOLTIP->set_tooltip_from ($widget);
+               $TOOLTIP->show;
+            }
+            return;
+         }
+      }
+   }
+   $TOOLTIP->hide;
+   delete $TOOLTIP->{owner};
+});
 sub get_layout {
    my $layout;
    for (grep { $_->{name} } values %WIDGET) {
    my ($layout) = @_;
    $LAYOUT = $layout;
 }
-sub check_tooltip {
-   if (!$GRAB) {
-      for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
-         if (length $widget->{tooltip}) {
-            if ($TOOLTIP->{owner} != $widget) {
-               $TOOLTIP->hide;
-               $TOOLTIP->{owner} = $widget;
-               my $tip = $widget->{tooltip};
-               $tip = $tip->($widget) if CODE:: eq ref $tip;
-               $TOOLTIP->set_tooltip_from ($widget);
-               $TOOLTIP->show;
-            }
-            return;
-         }
-      }
-   }
-   $TOOLTIP->hide;
-   delete $TOOLTIP->{owner};
-}
 # class methods for events
 sub feed_sdl_key_down_event {
    $FOCUS->emit (key_down => $_[0])
       if $FOCUS;
 }
       my $widget = $ROOT->find_widget ($x, $y);
       $GRAB = $widget;
       $GRAB->update if $GRAB;
-      check_tooltip;
+      $TOOLTIP_WATCHER->cb->();
    }
    $BUTTON_STATE |= 1 << ($ev->{button} - 1);
    $GRAB->emit (button_down => $ev, $GRAB->coord2local ($x, $y))
    if (!$BUTTON_STATE) {
       my $grab = $GRAB; undef $GRAB;
       $grab->update if $grab;
       $GRAB->update if $GRAB;
-      check_tooltip;
+      $TOOLTIP_WATCHER->cb->();
    }
 }
 sub feed_sdl_motion_event {
    my ($ev) = @_;
       my $hover = $HOVER; $HOVER = $widget;
       $hover->update if $hover && $hover->{can_hover};
       $HOVER->update if $HOVER && $HOVER->{can_hover};
-      check_tooltip;
+      $TOOLTIP_WATCHER->start;
    }
    $HOVER->emit (mouse_motion => $ev, $HOVER->coord2local ($x, $y))
       if $HOVER;
 }
 sub rescale_widgets {
    my ($sx, $sy) = @_;
    for my $widget (values %WIDGET) {
       if ($widget->{is_toplevel}) {
-         $widget->{x} += $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
-         $widget->{y} += $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+         $widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
          $widget->{x}       = int 0.5 + $widget->{x}        * $sx if $widget->{x} =~ /^[0-9.]+$/;
          $widget->{w}       = int 0.5 + $widget->{w}        * $sx if exists $widget->{w};
          $widget->{force_w} = int 0.5 + $widget->{force_w}  * $sx if exists $widget->{force_w};
          $widget->{y}       = int 0.5 + $widget->{y}        * $sy if $widget->{y} =~ /^[0-9.]+$/;
          $widget->{h}       = int 0.5 + $widget->{h}        * $sy if exists $widget->{h};
          $widget->{force_h} = int 0.5 + $widget->{force_h}  * $sy if exists $widget->{force_h};
-         $widget->{x} -= $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
+         $widget->{x} -= int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
-         $widget->{y} -= $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
+         $widget->{y} -= int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
       }
    }
    reconfigure_widgets;
    delete $self->{visible};
    undef $GRAB  if $GRAB  == $self;
    undef $HOVER if $HOVER == $self;
-   CFClient::UI::check_tooltip
+   $CFClient::UI::TOOLTIP_WATCHER->cb->()
       if $TOOLTIP->{owner} == $self;
    $self->focus_out;
    $self->emit (visibility_change => 0);
 sub size_allocate {
    # nothing to be done
 }
 sub children {
+   # nop
+}
+sub visible_children {
+   $_[0]->children
 }
 sub set_max_size {
    my ($self, $w, $h) = @_;
-   delete $self->{max_w}; $self->{max_w} = $w if $w;
+   $self->{max_w} = int $w if defined $w;
-   delete $self->{max_h}; $self->{max_h} = $h if $h;
+   $self->{max_h} = int $h if defined $h;
+   $self->realloc;
 }
 sub set_tooltip {
    my ($self, $tooltip) = @_;
    $self->{tooltip} = $tooltip;
    if ($CFClient::UI::TOOLTIP->{owner} == $self) {
       delete $CFClient::UI::TOOLTIP->{owner};
-      CFClient::UI::check_tooltip;
+      $CFClient::UI::TOOLTIP_WATCHER->cb->();
    }
 }
 # translate global coordinates to local coordinate system
 sub coord2local {
    $::MAPWIDGET->focus_in #d# focus mapwidget if no other widget has focus
       unless $FOCUS;
 }
-sub mouse_motion { }
+sub mouse_motion { 0 }
-sub button_up    { }
+sub button_up    { 0 }
-sub key_down     { }
+sub key_down     { 0 }
-sub key_up       { }
+sub key_up       { 0 }
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
    $self->focus_in;
-}
-sub w { $_[0]{w} = $_[1] if @_ > 1; $_[0]{w} }
+   0
-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 find_widget {
    my ($self, $x, $y) = @_;
    return () unless $self->{can_events};
    $self->realloc;
    $self->update;
 }
+# using global variables seems a bit hacky, but passing through all drawing
+# functions seems pointless.
+our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
 sub draw {
    my ($self) = @_;
    return unless $self->{h} && $self->{w};
+   # update screen rectangle
+   local $draw_x = $draw_x + $self->{x};
+   local $draw_y = $draw_y + $self->{y};
+   local $draw_w = $draw_x + $self->{w};
+   local $draw_h = $draw_y + $self->{h};
+   # skip widgets that are entirely outside the drawing area
+   return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
+          || ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
    glPushMatrix;
    glTranslate $self->{x}, $self->{y}, 0;
-   $self->_draw;
-   glPopMatrix;
    if ($self == $HOVER && $self->{can_hover}) {
-      my ($x, $y) = @$self{qw(x y)};
-      glColor 1, 0.8, 0.5, 0.2;
+      glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
       glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
       glBegin GL_QUADS;
-      glVertex $x             , $y;
+      glVertex 0         , 0;
-      glVertex $x + $self->{w}, $y;
+      glVertex $self->{w}, 0;
-      glVertex $x + $self->{w}, $y + $self->{h};
+      glVertex $self->{w}, $self->{h};
-      glVertex $x             , $y + $self->{h};
+      glVertex 0         , $self->{h};
       glEnd;
       glDisable GL_BLEND;
    }
    if ($ENV{CFPLUS_DEBUG} & 1) {
       glPushMatrix;
       glColor 1, 1, 0, 1;
-      glTranslate $self->{x} + 0.375, $self->{y} + 0.375;
+      glTranslate 0.375, 0.375;
       glBegin GL_LINE_LOOP;
       glVertex 0             , 0;
       glVertex $self->{w} - 1, 0;
       glVertex $self->{w} - 1, $self->{h} - 1;
       glVertex 0             , $self->{h} - 1;
       glEnd;
       glPopMatrix;
       #CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
    }
+   $self->_draw;
+   glPopMatrix;
 }
 sub _draw {
    my ($self) = @_;
    if ($color && (@$color < 4 || $color->[3])) {
       my ($w, $h) = @$self{qw(w h)};
       glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
-      glColor @$color;
+      glColor_premultiply @$color;
       glBegin GL_QUADS;
       glVertex 0 , 0;
       glVertex 0 , $h;
       glVertex $w, $h;
 our @ISA = CFClient::UI::Base::;
 sub new {
    my ($class, %arg) = @_;
-   my $children = delete $arg{children} || [];
+   my $children = delete $arg{children};
    my $self = $class->SUPER::new (
       children   => [],
       can_events => 0,
       %arg,
    );
-   $self->add ($_) for @$children;
+   $self->add (@$children)
+      if $children;
    $self
 }
 sub add {
    $x -= $self->{x};
    $y -= $self->{y};
    my $res;
-   for (reverse @{ $self->{children} }) {
+   for (reverse $self->visible_children) {
       $res = $_->find_widget ($x, $y)
          and return $res;
    }
    $self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
    $self->{children}[0]->configure (0, 0, $w, $h);
 }
 #############################################################################
+# back-buffered drawing area
 package CFClient::UI::Window;
 our @ISA = CFClient::UI::Bin::;
 use CFClient::OpenGL;
    $self->SUPER::size_allocate ($w, $h);
    $self->update;
 }
 sub _render {
+   my ($self) = @_;
-   $_[0]{children}[0]->draw;
+   $self->{children}[0]->draw;
 }
 sub render_child {
    my ($self) = @_;
    $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
       glClearColor 0, 0, 0, 0;
       glClear GL_COLOR_BUFFER_BIT;
+      {
+         package CFClient::UI::Base;
+         ($draw_x, $draw_y, $draw_w, $draw_h) =
+            (0, 0, $self->{w}, $self->{h});
+      }
       $self->_render;
    };
 }
 sub _draw {
    my ($self) = @_;
-   my ($w, $h) = ($self->w, $self->h);
+   my ($w, $h) = @$self{qw(w h)};
    my $tex = $self->{texture}
       or return;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-   glColor 1, 1, 1, 1;
+   glColor 0, 0, 0, 1;
    $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
    glDisable GL_TEXTURE_2D;
 }
 }
 sub _render {
    my ($self) = @_;
+   local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
+   local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
    CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
    $self->SUPER::_render;
 }
 package CFClient::UI::ScrolledWindow;
 our @ISA = CFClient::UI::HBox::;
 sub new {
-   my $class = shift;
+   my ($class, %arg) = @_;
+   my $child = delete $arg{child};
    my $self;
    my $slider = new CFClient::UI::Slider
       vertical   => 1,
    ;
    $self = $class->SUPER::new (
       vp     => (new CFClient::UI::ViewPort expand => 1),
       slider => $slider,
-      @_,
+      %arg,
    );
-   $self->{vp}->add ($self->{scrolled});
-   $self->add ($self->{vp});
-   $self->add ($self->{slider});
+   $self->SUPER::add ($self->{vp}, $self->{slider});
+   $self->add ($child) if $child;
    $self
+}
+sub add {
+   my ($self, $widget) = @_;
+   $self->{vp}->add ($self->{child} = $widget);
 }
 sub update {
    my ($self) = @_;
    if ($self->{bg}) {
       my ($w, $h) = @$self{qw(w h)};
       glEnable GL_BLEND;
-      glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+      glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
-      glColor @{ $self->{bg} };
+      glColor_premultiply @{ $self->{bg} };
       glBegin GL_QUADS;
       glVertex 0 , 0;
       glVertex 0 , $h;
       glVertex $w, $h;
 my @border =
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
          qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 sub new {
-   my $class = shift;
+   my ($class, %arg) = @_;
+   my $title = delete $arg{title};
    my $self = $class->SUPER::new (
       bg          => [1, 1, 1, 1],
       border_bg   => [1, 1, 1, 1],
       border      => 0.6,
       can_events  => 1,
       min_w       => 16,
       min_h       => 16,
-      @_
+      %arg,
    );
-   $self->{title} &&= new CFClient::UI::Label
+   $self->{title} = new CFClient::UI::Label
       align    => 0,
       valign   => 1,
-      text     => $self->{title},
+      text     => $title,
-      fontsize => $self->{border};
+      fontsize => $self->{border}
+         if defined $title;
    $self
+}
+sub add {
+   my ($self, @widgets) = @_;
+   $self->SUPER::add (@widgets);
+   $self->CFClient::UI::Container::add ($self->{title}) if $self->{title};
 }
 sub border {
    int $_[0]{border} * $::FONTSIZE
 }
 sub size_request {
    my ($self) = @_;
+   $self->{title}->size_request
+      if $self->{title};
    my ($w, $h) = $self->SUPER::size_request;
    (
       $w + $self->border * 2,
 }
 sub size_allocate {
    my ($self, $w, $h) = @_;
+   if ($self->{title}) {
+      $self->{title}{w} = $w;
+      $self->{title}{h} = $h;
+      $self->{title}->size_allocate ($w, $h);
+   }
+   my $border = $self->border;
-   $h -= List::Util::max 0, $self->border * 2;
+   $h -= List::Util::max 0, $border * 2;
-   $w -= List::Util::max 0, $self->border * 2;
+   $w -= List::Util::max 0, $border * 2;
-   $self->{title}->configure ($self->border, int $self->border - $::FONTSIZE * 2, $w, int $::FONTSIZE * 2)
-      if $self->{title};
-   $self->child->configure ($self->border, $self->border, $w, $h);
+   $self->child->configure ($border, $border, $w, $h);
 }
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
          my $dy = $ev->{y} - $oy;
          $self->{force_w} = $bw + $dx * ($mx ? -1 : 1);
          $self->{force_h} = $bh + $dy * ($my ? -1 : 1);
+         $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
          $self->realloc;
-         $self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
       };
    } elsif ($lr ^ $td) {
       my ($ox, $oy) = ($ev->{x}, $ev->{y});
       my ($bx, $by) = ($self->{x}, $self->{y});
          my ($ev, $x, $y) = @_;
          ($x, $y) = ($ev->{x}, $ev->{y});
          $self->move_abs ($bx + $x - $ox, $by + $y - $oy);
+         # HACK: the next line is required to enforce placement
+         $self->{parent}->size_allocate ($self->{parent}{w}, $self->{parent}{h});
       };
+   } else {
+      return 0;
+   }
-   }
+   1
 }
 sub button_up {
    my ($self, $ev, $x, $y) = @_;
-   delete $self->{motion};
+   !!delete $self->{motion}
 }
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
    $self->{motion}->($ev, $x, $y) if $self->{motion};
+   !!$self->{motion}
 }
 sub _draw {
    my ($self) = @_;
+   my $child = $self->{children}[0];
    my ($w,  $h ) = ($self->{w}, $self->{h});
-   my ($cw, $ch) = ($self->child->{w}, $self->child->{h});
+   my ($cw, $ch) = ($child->{w}, $child->{h});
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
    my $border = $self->border;
       $bg->draw_quad_alpha ($border, $border, $cw, $ch);
    }
    glDisable GL_TEXTURE_2D;
-   $self->{title}->draw if $self->{title};
-   $self->child->draw;
+   $child->draw;
+   if ($self->{title}) {
+      glTranslate 0, $border - $self->{h};
+      $self->{title}->_draw;
+   }
 }
 #############################################################################
 package CFClient::UI::Table;
    delete $self->{texture};
    $self->SUPER::update;
 }
+sub realloc {
+   my ($self) = @_;
+   delete $self->{ox};
+   $self->SUPER::realloc;
+}
 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->{size_req};
    $self->realloc;
    $self->update;
 }
 sub set_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->{size_req};
    $self->realloc;
    $self->update;
 }
 sub size_request {
    my ($self) = @_;
+   $self->{size_req} ||= do {
-   $self->{layout}->set_font ($self->{font}) if $self->{font};
+      $self->{layout}->set_font ($self->{font}) if $self->{font};
-   $self->{layout}->set_width ($self->{max_w} || -1);
+      $self->{layout}->set_width ($self->{max_w} || -1);
-   $self->{layout}->set_ellipsise ($self->{ellipsise});
+      $self->{layout}->set_ellipsise ($self->{ellipsise});
-   $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
+      $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
-   $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
+      $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
-   my ($w, $h) = $self->{layout}->size;
+      my ($w, $h) = $self->{layout}->size;
-   if (exists $self->{template}) {
+      if (exists $self->{template}) {
-      $self->{template}->set_font ($self->{font}) if $self->{font};
+         $self->{template}->set_font ($self->{font}) if $self->{font};
-      $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
+         $self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
-      my ($w2, $h2) = $self->{template}->size;
+         my ($w2, $h2) = $self->{template}->size;
-      $w = List::Util::max $w, $w2;
+         $w = List::Util::max $w, $w2;
-      $h = List::Util::max $h, $h2;
+         $h = List::Util::max $h, $h2;
+      }
+      [$w, $h]
-   }
+   };
-   ($w, $h)
+   @{ $self->{size_req} }
 }
 sub size_allocate {
    my ($self, $w, $h) = @_;
+   delete $self->{ox};
-   delete $self->{texture};
+   delete $self->{texture}
+      unless $w >= $self->{req_w} && $self->{old_w} >= $self->{req_w};
 }
 sub set_fontsize {
    my ($self, $fontsize) = @_;
    $self->{fontsize} = $fontsize;
    delete $self->{texture};
    $self->realloc;
+}
+sub reconfigure {
+   my ($self) = @_;
+   delete $self->{size_req};
+   $self->SUPER::reconfigure;
 }
 sub _draw {
    my ($self) = @_;
       $self->{layout}->set_width ($self->{w});
       $self->{layout}->set_ellipsise ($self->{ellipsise});
       $self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
       $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
-      my $tex = new_from_layout CFClient::Texture $self->{layout};
+      new_from_layout CFClient::Texture $self->{layout}
+   };
+   unless (exists $self->{ox}) {
       $self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}
                        : $self->{align} > 0 ? $self->{w} - $tex->{w} - $self->{padding_x}
                        :                      ($self->{w} - $tex->{w}) * 0.5);
       $self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
                        : $self->{valign} > 0 ? $self->{h} - $tex->{h} - $self->{padding_y}
                        :                       ($self->{h} - $tex->{h}) * 0.5);
-      $tex
    };
    glEnable GL_TEXTURE_2D;
-   glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    if ($tex->{format} == GL_ALPHA) {
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
       glColor @{$self->{fg}};
       $tex->draw_quad_alpha ($self->{ox}, $self->{oy});
    } else {
+      glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
       $tex->draw_quad_alpha_premultiplied ($self->{ox}, $self->{oy});
    }
    glDisable GL_TEXTURE_2D;
 }
    delete $self->{cur_h};
    return if $self->{text} eq $text;
-   delete $self->{texture};
    $self->{last_activity} = $::NOW;
    $self->{text} = $text;
    $text =~ s/./*/g if $self->{hidden};
    $self->{layout}->set_text ("$text ");
+   delete $self->{size_req};
    $self->_emit (changed => $self->{text});
+   $self->realloc;
+   $self->update;
 }
 sub set_text {
    my ($self, $text) = @_;
    $self->{cursor} = length $text;
    $self->_set_text ($text);
-   $self->realloc;
 }
 sub get_text {
    $_[0]{text}
 }
       $self->{cursor} = length $text;
    } elsif ($uni == 27) {
       $self->_emit ('escape');
    } elsif ($uni) {
       substr $text, $self->{cursor}++, 0, chr $uni;
+   } else {
+      return 0;
    }
    $self->_set_text ($text);
    $self->realloc;
+   1
 }
 sub focus_in {
    my ($self) = @_;
    utf8::encode $text;
    $self->{cursor} = length substr $text, 0, $idx;
    $self->_set_text ($self->{text});
    $self->update;
+   1
 }
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
 #   printf "M %d,%d %d,%d\n", $ev->motion_x, $ev->motion_y, $x, $y;#d#
+   0
 }
 sub _draw {
    my ($self) = @_;
    local $self->{fg} = $self->{fg};
    if ($FOCUS == $self) {
-      glColor @{$self->{active_bg}};
+      glColor_premultiply @{$self->{active_bg}};
       $self->{fg} = $self->{active_fg};
    } else {
-      glColor @{$self->{bg}};
+      glColor_premultiply @{$self->{bg}};
    }
    glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
    glBegin GL_QUADS;
    glVertex 0         , 0;
    glVertex 0         , $self->{h};
    glVertex $self->{w}, $self->{h};
    glVertex $self->{w}, 0;
       } else {
          $self->set_text ($self->{history_saveback});
       }
    } else {
-      $self->SUPER::key_down ($ev);
+      return $self->SUPER::key_down ($ev)
+   }
-   }
+   1
 }
 #############################################################################
 package CFClient::UI::Button;
    my ($self, $ev, $x, $y) = @_;
    $self->emit ("activate")
       if $x >= 0 && $x < $self->{w}
          && $y >= 0 && $y < $self->{h};
+   1
 }
 sub _draw {
    my ($self) = @_;
-   local $self->{fg} = $self->{fg};
+   local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
-   if ($GRAB == $self) {
-      $self->{fg} = $self->{active_fg};
-   }
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
    glColor 0, 0, 0, 1;
    if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
        && $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
       $self->{state} = !$self->{state};
       $self->_emit (changed => $self->{state});
+   } else {
+      return 0
+   }
-   }
+   1
 }
 sub _draw {
    my ($self) = @_;
    my $h1 = $self->{h} * (1 - $ycut1);
    my $h2 = $self->{h} * (1 - $ycut2);
    glEnable GL_BLEND;
-   glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
+   glBlendFuncSeparate GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA,
+                       GL_ONE, 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;
    $self->SUPER::button_down ($ev, $x, $y);
    $self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
-   $self->mouse_motion ($ev, $x, $y);
+   $self->mouse_motion ($ev, $x, $y)
 }
 sub mouse_motion {
    my ($self, $ev, $x, $y) = @_;
       my (undef, $lo, $hi, $page) = @{$self->{range}};
       $x = ($x - $self->{click}[1]) / ($w * $self->{scale});
       $self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
+   } else {
+      return 0;
+   }
-   }
+   1
 }
 sub update {
    my ($self) = @_;
-   $CFClient::UI::ROOT->on_post_alloc ($self => sub {
+   delete $self->{knob_w};
+   $self->SUPER::update;
+}
+sub _draw {
+   my ($self) = @_;
+   unless ($self->{knob_w}) {
       $self->set_value ($self->{range}[0]);
       my ($value, $lo, $hi, $page) = @{$self->{range}};
       my $range = ($hi - $page - $lo) || 1e-100;
       $value = ($value - $lo) / $range;
       $value = $value * $self->{scale} + $self->{offset};
       $self->{knob_x} = $value - $knob_w * 0.5;
       $self->{knob_w} = $knob_w;
-   });
+   }
-   $self->SUPER::update;
-}
-sub _draw {
-   my ($self) = @_;
    $self->SUPER::_draw ();
    glScale $self->{w}, $self->{h};
          delete $self->{texture};
       }
       $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
-         glClearColor 0.5, 0.5, 0.5, 0;
+         glClearColor 0, 0, 0, 0;
          glClear GL_COLOR_BUFFER_BIT;
          my $top = int $self->{children}[1]{range}[0];
          my $y0 = $top;
 sub _draw {
    my ($self) = @_;
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-   glColor 1, 1, 1, 1;
+   glColor 0, 0, 0, 1;
-   $self->{texture}->draw_quad_alpha (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;
    $self->{children}[1]->draw;
 }
    my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
    if ($tex) {
       glEnable GL_TEXTURE_2D;
       glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-      glColor 1, 1, 1, 1;
+      glColor 0, 0, 0, 1;
       $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
       glDisable GL_TEXTURE_2D;
    }
 }
    $self->SUPER::DESTROY;
 }
 #############################################################################
-package CFClient::UI::Inventory;
+package CFClient::UI::Buttonbar;
-our @ISA = CFClient::UI::ScrolledWindow::;
+our @ISA = CFClient::UI::HBox::;
-sub new {
+# TODO: should actualyl wrap buttons and other goodies.
-   my $class = shift;
-   my $self = $class->SUPER::new (
-      scrolled => (new CFClient::UI::Table col_expand => [0, 1, 0]),
-      @_,
-   );
-   $self
-}
-sub set_items {
-   my ($self, $items) = @_;
-   $self->{scrolled}->clear;
-   return unless $items;
-   my @items = sort {
-      ($a->{type} <=> $b->{type})
-         or ($a->{name} cmp $b->{name})
-   } @$items;
-   $self->{real_items} = \@items;
-   my $row = 0;
-   for my $item (@items) {
-      CFClient::Item::update_widgets $item;
-      $self->{scrolled}->add (0, $row, $item->{face_widget});
-      $self->{scrolled}->add (1, $row, $item->{desc_widget});
-      $self->{scrolled}->add (2, $row, $item->{weight_widget});
-      $row++;
-   }
-}
 #############################################################################
 package CFClient::UI::Menu;
    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};
+   0
 }
 sub button_up {
    my ($self, $ev, $x, $y) = @_;
       undef $GRAB;
       $self->hide;
       $self->_emit ("popdown");
       $self->{hover}[1]->() if $self->{hover};
+   } else {
+      return 0
+   }
-   }
+   1
 }
 #############################################################################
-package CFClient::UI::Statusbox;
+package CFClient::UI::Multiplexer;
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFClient::UI::Container::;
 sub new {
    my $class = shift;
-   $class->SUPER::new (
+   my $self = $class->SUPER::new (
+      @_,
+   );
+   $self->{current} = $self->{children}[0]
+      if @{ $self->{children} };
+   $self
+}
+sub add {
+   my ($self, @widgets) = @_;
+   $self->SUPER::add (@widgets);
+   $self->{current} = $self->{children}[0]
+      if @{ $self->{children} };
+}
+sub set_current_page {
+   my ($self, $page_or_widget) = @_;
+   my $widget = ref $page_or_widget
+                   ? $page_or_widget
+                   : $self->{children}[$page_or_widget];
+   $self->{current} = $widget;
+   $self->{current}->configure (0, 0, $self->{w}, $self->{h});
+   $self->_emit (page_changed => $self->{current});
+   $self->realloc;
+}
+sub visible_children {
+   $_[0]{current}
+}
+sub size_request {
+   my ($self) = @_;
+   $self->{current}->size_request
+}
+sub size_allocate {
+   my ($self, $w, $h) = @_;
+   $self->{current}->configure (0, 0, $w, $h);
+}
+sub _draw {
+   my ($self) = @_;
+   $self->{current}->draw;
+}
+#############################################################################
+package CFClient::UI::Notebook;
+our @ISA = CFClient::UI::VBox::;
+sub new {
+   my $class = shift;
+   my $self = $class->SUPER::new (
+      buttonbar   => (new CFClient::UI::Buttonbar),
+      multiplexer => (new CFClient::UI::Multiplexer expand => 1),
+      # filter => # will be put between multiplexer and $self
+      @_,
+   );
+   $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
+   $self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
+   $self
+}
+sub add {
+   my ($self, $title, $widget, $tooltip) = @_;
+   Scalar::Util::weaken $self;
+   $self->{buttonbar}->add (new CFClient::UI::Button
+      markup      => $title,
+      tooltip     => $tooltip,
+      on_activate => sub { $self->set_current_page ($widget) },
+   );
+   $self->{multiplexer}->add ($widget);
+}
+sub set_current_page {
+   my ($self, $page) = @_;
+   $self->{multiplexer}->set_current_page ($page);
+   $self->_emit (page_changed => $self->{multiplexer}{current});
+}
+#############################################################################
+package CFClient::UI::Statusbox;
+our @ISA = CFClient::UI::VBox::;
+sub new {
+   my $class = shift;
+   my $self = $class->SUPER::new (
       fontsize => 0.8,
       @_,
-   )
+   );
+   Scalar::Util::weaken (my $this = $self);
+   $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
+   $self
 }
 sub reorder {
    my ($self) = @_;
-   my $NOW = time;
+   my $NOW = Time::HiRes::time;
+   # freeze display when hovering over any label
+   return if $CFClient::UI::TOOLTIP->{owner}
+             && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
+                   values %{ $self->{item} };
    while (my ($k, $v) = each %{ $self->{item} }) {
       delete $self->{item}{$k} if $v->{timeout} < $NOW;
    }
    my @items = sort {
                   $a->{pri} <=> $b->{pri}
                      or $b->{id} <=> $a->{id}
                } values %{ $self->{item} };
+   $self->{timer}->interval (1);
    my $count = 10 + 1;
    for my $item (@items) {
       last unless --$count;
-      push @widgets, $item->{label} ||= do {
+      my $label = $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};
             tooltip       => $item->{tooltip},
             tooltip_font  => $::FONT_PROP,
             tooltip_width => 0.67,
             fontsize      => $item->{fontsize} || $self->{fontsize},
             max_w         => $::WIDTH * 0.44,
-            fg            => $item->{fg},
+            fg            => [@{ $item->{fg} }],
             can_events    => 1,
             can_hover     => 1
       };
+      if ((my $diff = $item->{timeout} - $NOW) < 2) {
+         $label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
+         $label->update;
+         $label->set_max_size (undef, $label->{req_h} * $diff)
+            if $diff < 1;
+         $self->{timer}->interval (1/30);
+      } else {
+         $label->{fg}[3] = $item->{fg}[3] || 1;
+      }
+      push @widgets, $label;
    }
    $self->clear;
    $self->SUPER::add (reverse @widgets);
 }
    $text =~ s/^\s+//;
    $text =~ s/\s+$//;
    return unless $text;
-   my $timeout = time + ((delete $arg{timeout}) || 60);
+   my $timeout = (int 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) {
    $self->reorder;
    $self->SUPER::reconfigure;
 }
+sub DESTROY {
+   my ($self) = @_;
+   $self->{timer}->cancel;
+   $self->SUPER::DESTROY;
+}
 #############################################################################
+package CFClient::UI::Inventory;
+our @ISA = CFClient::UI::ScrolledWindow::;
+sub new {
+   my $class = shift;
+   my $self = $class->SUPER::new (
+      child => (new CFClient::UI::Table col_expand => [0, 1, 0]),
+      @_,
+   );
+   $self
+}
+sub set_items {
+   my ($self, $items) = @_;
+   $self->{child}->clear;
+   return unless $items;
+   my @items = sort {
+      ($a->{type} <=> $b->{type})
+         or ($a->{name} cmp $b->{name})
+   } @$items;
+   $self->{real_items} = \@items;
+   my $row = 0;
+   for my $item (@items) {
+      CFClient::Item::update_widgets $item;
+      $self->{child}->add (0, $row, $item->{face_widget});
+      $self->{child}->add (1, $row, $item->{desc_widget});
+      $self->{child}->add (2, $row, $item->{weight_widget});
+      $row++;
+   }
+}
+#############################################################################
+package CFClient::UI::BindEditor;
+our @ISA = CFClient::UI::FancyFrame::;
+sub new {
+   my $class = shift;
+   my $self = $class->SUPER::new (binding => [], commands => [], @_);
+   $self->add (my $vb = new CFClient::UI::VBox);
+   $vb->add ($self->{rec_btn} = new CFClient::UI::Button
+      text => "start recording",
+      tooltip => "Start/Stops recording of actions."
+                ."All subsequent actions after the recording started will be captured."
+                ."The actions are displayed after the record was stopped."
+                ."To bind the action you have to click on the 'Bind' button",
+      on_activate => sub {
+         unless ($self->{recording}) {
+            $self->start;
+         } else {
+            $self->stop;
+         }
+      });
+   $vb->add (new CFClient::UI::Label text => "Actions:");
+   $vb->add ($self->{cmdbox} = new CFClient::UI::VBox);
+   $vb->add (new CFClient::UI::Label text => "Bound to: ");
+   $vb->add (my $hb = new CFClient::UI::HBox);
+   $hb->add ($self->{keylbl} = new CFClient::UI::Label expand => 1);
+   $hb->add (new CFClient::UI::Button
+      text => "bind",
+      tooltip => "This opens a query where you have to press the key combination to bind the recorded actions",
+      on_activate => sub {
+         $self->ask_for_bind;
+      });
+   $vb->add (my $hb = new CFClient::UI::HBox);
+   $hb->add (new CFClient::UI::Button
+      text => "ok",
+      expand => 1,
+      tooltip => "This closes the binding editor and saves the binding",
+      on_activate => sub {
+         $self->hide;
+         $self->commit;
+      });
+   $hb->add (new CFClient::UI::Button
+      text => "cancel",
+      expand => 1,
+      tooltip => "This closes the binding editor without saving",
+      on_activate => sub {
+         $self->hide;
+         $self->{binding_cancel}->()
+            if $self->{binding_cancel};
+      });
+   $self->update_binding_widgets;
+   $self
+}
+sub commit {
+   my ($self) = @_;
+   my ($mod, $sym, $cmds) = $self->get_binding;
+   if ($sym != 0 && @$cmds > 0) {
+      $::STATUSBOX->add ("Bound actions to '".CFClient::Binder::keycombo_to_name ($mod, $sym)
+                        ."'. Don't forget 'Save Config'!");
+      $self->{binding_change}->($mod, $sym, $cmds)
+         if $self->{binding_change};
+   } else {
+      $::STATUSBOX->add ("No action bound, no key or action specified!");
+      $self->{binding_cancel}->()
+         if $self->{binding_cancel};
+   }
+}
+sub start {
+   my ($self) = @_;
+   $self->{rec_btn}->set_text ("stop recording");
+   $self->{recording} = 1;
+   $self->clear_command_list;
+   $::CONN->start_record if $::CONN;
+}
+sub stop {
+   my ($self) = @_;
+   $self->{rec_btn}->set_text ("start recording");
+   $self->{recording} = 0;
+   my $rec;
+   $rec = $::CONN->stop_record if $::CONN;
+   return unless ref $rec eq 'ARRAY';
+   $self->set_command_list ($rec);
+}
+sub ask_for_bind_and_commit {
+   my ($self) = @_;
+   $self->ask_for_bind (1);
+}
+sub ask_for_bind {
+   my ($self, $commit) = @_;
+   CFClient::Binder::open_binding_dialog (sub {
+      my ($mod, $sym) = @_;
+      $self->{binding} = [$mod, $sym];  # XXX: how to stop that memleak?
+      $self->update_binding_widgets;
+      $self->commit if $commit;
+   });
+}
+# $mod and $sym are the modifiers and key symbol
+# $cmds is a array ref of strings (the commands)
+# $cb is the callback that is executed on OK
+# $ccb is the callback that is executed on CANCEL and
+# when the binding was unsuccessful on OK
+sub set_binding {
+   my ($self, $mod, $sym, $cmds, $cb, $ccb) = @_;
+   $self->clear_command_list;
+   $self->{recording} = 0;
+   $self->{rec_btn}->set_text ("start recording");
+   $self->{binding} = [$mod, $sym];
+   $self->{commands} = $cmds;
+   $self->{binding_change} = $cb;
+   $self->{binding_cancel} = $ccb;
+   $self->update_binding_widgets;
+}
+# this is a shortcut method that asks for a binding
+# and then just binds it.
+sub do_quick_binding {
+   my ($self, $cmds) = @_;
+   $self->set_binding (undef, undef, $cmds, sub {
+      $::CFG->{bindings}->{$_[0]}->{$_[1]} = $_[2];
+   });
+   $self->ask_for_bind (1);
+}
+sub update_binding_widgets {
+   my ($self) = @_;
+   my ($mod, $sym, $cmds) = $self->get_binding;
+   $self->{keylbl}->set_text (CFClient::Binder::keycombo_to_name ($mod, $sym));
+   $self->set_command_list ($cmds);
+}
+sub get_binding {
+   my ($self) = @_;
+   return (
+      $self->{binding}->[0],
+      $self->{binding}->[1],
+      [ grep { defined $_ } @{$self->{commands}} ]
+   );
+}
+sub clear_command_list {
+   my ($self) = @_;
+   $self->{cmdbox}->clear ();
+}
+sub set_command_list {
+   my ($self, $cmds) = @_;
+   $self->{cmdbox}->clear ();
+   $self->{commands} = $cmds;
+   my $idx = 0;
+   for (@$cmds) {
+      $self->{cmdbox}->add (my $hb = new CFClient::UI::HBox);
+      my $i = $idx;
+      $hb->add (new CFClient::UI::Label text => $_);
+      $hb->add (new CFClient::UI::Button
+         text => "delete",
+         tooltip => "Deletes the action from the record",
+         on_activate => sub {
+            $self->{cmdbox}->remove ($hb);
+            $cmds->[$i] = undef;
+         });
+      $idx++
+   }
+}
+#############################################################################
+package CFClient::UI::SpellList;
+our @ISA = CFClient::UI::Table::;
+sub new {
+   my $class = shift;
+   my $self = $class->SUPER::new (
+      binding  => [],
+      commands => [],
+      @_,
+   )
+}
+my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
+   "<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.");
+my @TOOLTIP_SP  = (align => 1, can_events => 1, can_hover => 1, tooltip =>
+   "<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.");
+my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
+   "<b>Damage</b>. The amount of damage the spell deals when it hits.");
+sub rebuild_spell_list {
+   my ($self) = @_;
+   $CFClient::UI::ROOT->on_refresh ($self => sub {
+      $self->clear;
+      $self->add (1, 0, new CFClient::UI::Label text => "Spell Name");
+      $self->add (2, 0, new CFClient::UI::Label text => "Lvl"  , @TOOLTIP_LVL);
+      $self->add (3, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
+      $self->add (4, 0, new CFClient::UI::Label text => "Dmg"  , @TOOLTIP_DMG);
+      my $row = 0;
+      for (sort { $a cmp $b } keys %{ $self->{spell} }) {
+         my $spell = $self->{spell}{$_};
+         $row++;
+         $self->add (0, $row, new CFClient::UI::Face
+            face       => $spell->{face},
+            can_hover  => 1,
+            can_events => 1,
+            tooltip    => $spell->{message},
+         );
+         $self->add (1, $row, new CFClient::UI::Label
+            expand     => 1,
+            text       => $spell->{name},
+            can_hover  => 1,
+            can_events => 1,
+            tooltip    => $spell->{message},
+         );
+         $self->add (2, $row, new CFClient::UI::Label text => $spell->{level},                   @TOOLTIP_LVL);
+         $self->add (3, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
+         $self->add (4, $row, new CFClient::UI::Label text => $spell->{damage},                  @TOOLTIP_DMG);
+         # TODO: should be done via popup
+         $self->add (5, $row, new CFClient::UI::Button
+            text    => "bind",
+            tooltip => "bind spell readying (cast command) to key",
+            on_activate => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) },
+         );
+      }
+   });
+}
+sub add_spell {
+   my ($self, $spell) = @_;
+   $self->{spell}->{$spell->{name}} = $spell;
+   $self->rebuild_spell_list;
+}
+sub remove_spell {
+   my ($self, $spell) = @_;
+   delete $self->{spell}->{$spell->{name}};
+   $self->rebuild_spell_list;
+}
+#############################################################################
 package CFClient::UI::Root;
 our @ISA = CFClient::UI::Container::;
+use List::Util qw(min max);
 use CFClient::OpenGL;
 sub new {
    my $class = shift;
       $_->()
          for values %{delete $self->{refresh_hook}};
    }
    if ($self->{realloc}) {
+      my %queue;
       my @queue;
+      my $widget;
+      outer:
       while () {
-         if ($self->{realloc}) {
+         if (my $realloc = delete $self->{realloc}) {
-            #TODO use array-of-depth approach
+            for $widget (values %$realloc) {
+               $widget->{visible} or next; # do not resize invisible widgets
-            use sort 'stable';
+               $queue{$widget+0}++ and next; # duplicates are common
-            @queue = sort { $a->{visible} <=> $b->{visible} }
+               push @{ $queue[$widget->{visible}] }, $widget;
-                          @queue, values %{delete $self->{realloc}};
+            }
          }
+         while () {
+            @queue or last outer;
-         my $widget = pop @queue || last;
+            $widget = pop @{ $queue[-1] || [] }
+               and last;
+            pop @queue;
+         }
-         $widget->{visible} or last; # do not resize invisible widgets
+         delete $queue{$widget+0};
          my ($w, $h) = $widget->size_request;
-         $w = List::Util::max $widget->{min_w}, $w + $widget->{padding_x} * 2;
+         $w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;
-         $h = List::Util::max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+         $h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;
+         $w = min $widget->{max_w}, $w if exists $widget->{max_w};
+         $h = min $widget->{max_h}, $h if exists $widget->{max_h};
          $w = $widget->{force_w} if exists $widget->{force_w};
          $h = $widget->{force_h} if exists $widget->{force_h};
          if ($widget->{req_w} != $w || $widget->{req_h} != $h
             $widget->{req_h} = $h;
             $self->{size_alloc}{$widget+0} = $widget;
             if (my $parent = $widget->{parent}) {
-               $self->{realloc}{$parent+0} = $parent;
+               $self->{realloc}{$parent+0} = $parent
-               #unshift @queue, $parent;
+                  unless $queue{$parent+0};
                $parent->{force_size_alloc} = 1;
                $self->{size_alloc}{$parent+0} = $parent;
             }
          }
          $w = int $w + 0.5;
          $h = int $h + 0.5;
          if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
+            $widget->{old_w} = $widget->{w};
+            $widget->{old_h} = $widget->{h};
             $widget->{w} = $w;
             $widget->{h} = $h;
             $widget->emit (size_allocate => $w, $h);
          }
    glLoadIdentity;
    glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
    glMatrixMode GL_MODELVIEW;
    glLoadIdentity;
+   {
+      package CFClient::UI::Base;
+      ($draw_x, $draw_y, $draw_w, $draw_h) =
+         (0, 0, $self->{w}, $self->{h});
+   }
    $self->_draw;
 }
 #############################################################################

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.259 by root, Tue May 30 07:13:09 2006 UTC vs. Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.259 by root, Tue May 30 07:13:09 2006 UTC vs.
Revision 1.290 by root, Mon Jun 5 22:30:35 2006 UTC