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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

-package CFClient::UI;
+package CFPlus::UI;
 use utf8;
 use strict;
-use Scalar::Util ();
 use List::Util ();
 use Event;
-use CFClient;
+use CFPlus;
+use CFPlus::Pod;
-use CFClient::Texture;
+use CFPlus::Texture;
 our ($FOCUS, $HOVER, $GRAB); # various widgets
 our $LAYOUT;
 our $ROOT;
 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->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
                $TOOLTIP->hide;
                $TOOLTIP->{owner} = $widget;
+               $TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
                return if $ENV{CFPLUS_DEBUG} & 8;
                my $tip = $widget->{tooltip};
          }
       }
    }
    $TOOLTIP->hide;
+   $TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
    delete $TOOLTIP->{owner};
 });
 sub get_layout {
    my $layout;
 sub feed_sdl_button_down_event {
    my ($ev) = @_;
    my ($x, $y) = ($ev->{x}, $ev->{y});
-   unless ($BUTTON_STATE) {
+   $BUTTON_STATE |= 1 << ($ev->{button} - 1);
+   unless ($GRAB) {
       my $widget = $ROOT->find_widget ($x, $y);
       $GRAB = $widget;
       $GRAB->update if $GRAB;
       $TOOLTIP_WATCHER->cb->();
    }
-   $BUTTON_STATE |= 1 << ($ev->{button} - 1);
    if ($GRAB) {
       if ($ev->{button} == 4 || $ev->{button} == 5) {
          # mousewheel
          $ev->{dx} = 0;
    reconfigure_widgets;
 }
 #############################################################################
-package CFClient::UI::Event;
+package CFPlus::UI::Event;
 sub xy {
    $_[1]->coord2local ($_[0]{x}, $_[0]{y})
 }
 #############################################################################
-package CFClient::UI::Base;
+package CFPlus::UI::Base;
 use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    my $self = bless {
       h          => undef,
       can_events => 1,
       @_
    }, $class;
-   Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);
+   CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
    for (keys %$self) {
       if (/^on_(.*)$/) {
          $self->connect ($1 => delete $self->{$_});
       }
    }
-   if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {
+   if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
-      $self->{x}       = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};
+      $self->{x}       = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
-      $self->{y}       = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};
+      $self->{y}       = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
-      $self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};
+      $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
-      $self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};
+      $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
       $self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
       $self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
       $self->show if $layout->{show};
 sub destroy {
    my ($self) = @_;
    $self->hide;
+   $self->emit ("destroy");
    %$self = ();
 }
+sub TO_JSON {
+   { __widget_ref__ => $_[0]{s_id} }
+}
 sub show {
    my ($self) = @_;
    return if $self->{parent};
-   $CFClient::UI::ROOT->add ($self);
+   $CFPlus::UI::ROOT->add ($self);
 }
 sub set_visible {
    my ($self) = @_;
    delete $self->{root};
    undef $GRAB  if $GRAB  == $self;
    undef $HOVER if $HOVER == $self;
-   $CFClient::UI::TOOLTIP_WATCHER->cb->()
+   $CFPlus::UI::TOOLTIP_WATCHER->cb->()
       if $TOOLTIP->{owner} == $self;
    $self->emit ("focus_out");
    $self->emit (visibility_change => 0);
 }
 sub set_visibility {
    my ($self, $visible) = @_;
    return if $self->{visible} == $visible;
-   $visible ? $self->hide
+   $visible ? $self->show
-            : $self->show;
+            : $self->hide;
 }
 sub toggle_visibility {
    my ($self) = @_;
    my ($self, $x, $y, $w, $h) = @_;
    if ($self->{aspect}) {
       my ($ow, $oh) = ($w, $h);
-      $w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};
+      $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
-      $h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};
+      $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
       # use alignment to adjust x, y
       $x += int 0.5 * ($ow - $w);
       $y += int 0.5 * ($oh - $h);
    return if $self->{tooltip} eq $tooltip;
    $self->{tooltip} = $tooltip;
-   if ($CFClient::UI::TOOLTIP->{owner} == $self) {
+   if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
-      delete $CFClient::UI::TOOLTIP->{owner};
+      delete $CFPlus::UI::TOOLTIP->{owner};
-      $CFClient::UI::TOOLTIP_WATCHER->cb->();
+      $CFPlus::UI::TOOLTIP_WATCHER->cb->();
    }
 }
 # translate global coordinates to local coordinate system
 sub coord2local {
 sub connect {
    my ($self, $signal, $cb) = @_;
    push @{ $self->{signal_cb}{$signal} }, $cb;
-   defined wantarray and CFClient::guard {
+   defined wantarray and CFPlus::guard {
       @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
          @{ $self->{signal_cb}{$signal} };
    }
+}
+sub disconnect_all {
+   my ($self, $signal) = @_;
+   delete $self->{signal_cb}{$signal};
 }
 my %has_coords = (
    button_down  => 1,
    button_up    => 1,
 );
 sub emit {
    my ($self, $signal, @args) = @_;
-   # I do not really like this solution, but I dislike duplication
+   # I do not really like this solution, but I do not like duplication
-   # and needlessly verbose code, too.
+   # and needlessly verbose code, either.
    my @append
       = $has_coords{$signal}
         ? $args[0]->xy ($self)
         : ();
    #warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
-   #d##TODO# stop propagating at first true, do not use sum
+   for my $cb (
-   (List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
+      @{$self->{signal_cb}{$signal} || []},		# before
-      || ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append)             # closure
+      ($self->can ("invoke_$signal") || sub { 1 }),	# closure
+   ) {
+      return $cb->($self, @args, @append) || next;
+   }
+   # parent
-      || ($self->{parent} && $self->{parent}->emit ($signal, @args))                       # parent
+   $self->{parent} && $self->{parent}->emit ($signal, @args)
 }
 sub find_widget {
    my ($self, $x, $y) = @_;
 }
 sub set_parent {
    my ($self, $parent) = @_;
-   Scalar::Util::weaken ($self->{parent} = $parent);
+   CFPlus::weaken ($self->{parent} = $parent);
    $self->set_visible if $parent->{visible};
 }
 sub realloc {
    my ($self) = @_;
       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;
+      #CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
    }
    $self->_draw;
    glPopMatrix;
 }
    my ($self) = @_;
    warn "no draw defined for $self\n";
 }
+my $cntx;#d#
 sub DESTROY {
    my ($self) = @_;
-   return if CFClient::in_destruct;
+   return if CFPlus::in_destruct;
-   delete $WIDGET{$self+0};
    eval { $self->destroy };
    warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
+   delete $WIDGET{$self+0};
 }
 #############################################################################
-package CFClient::UI::DrawBG;
+package CFPlus::UI::DrawBG;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    # range [value, low, high, page]
    }
 }
 #############################################################################
-package CFClient::UI::Empty;
+package CFPlus::UI::Empty;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 sub new {
    my ($class, %arg) = @_;
    $class->SUPER::new (can_events => 0, %arg);
 }
 sub draw { }
 #############################################################################
-package CFClient::UI::Container;
+package CFPlus::UI::Container;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 sub new {
    my ($class, %arg) = @_;
    my $children = delete $arg{children};
    $_->draw for @{$self->{children}};
 }
 #############################################################################
-package CFClient::UI::Bin;
+package CFPlus::UI::Bin;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
 sub new {
    my ($class, %arg) = @_;
-   my $child = (delete $arg{child}) || new CFClient::UI::Empty::;
+   my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
    $class->SUPER::new (children => [$child], %arg)
 }
 sub add {
 sub remove {
    my ($self, $widget) = @_;
    $self->SUPER::remove ($widget);
-   $self->{children} = [new CFClient::UI::Empty]
+   $self->{children} = [new CFPlus::UI::Empty]
       unless @{$self->{children}};
 }
 sub child { $_[0]->{children}[0] }
 #############################################################################
 # back-buffered drawing area
-package CFClient::UI::Window;
+package CFPlus::UI::Window;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my ($class, %arg) = @_;
    my $self = $class->SUPER::new (%arg);
 }
 sub render_child {
    my ($self) = @_;
-   $self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {
+   $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
       glClearColor 0, 0, 0, 0;
       glClear GL_COLOR_BUFFER_BIT;
       {
-         package CFClient::UI::Base;
+         package CFPlus::UI::Base;
-         ($draw_x, $draw_y, $draw_w, $draw_h) =
+         local ($draw_x, $draw_y, $draw_w, $draw_h) =
             (0, 0, $self->{w}, $self->{h});
+         $self->_render;
       }
-      $self->_render;
    };
 }
 sub _draw {
    my ($self) = @_;
-   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 0, 0, 0, 1;
-   $tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);
+   $tex->draw_quad_alpha_premultiplied (0, 0);
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################
-package CFClient::UI::ViewPort;
+package CFPlus::UI::ViewPort;
-our @ISA = CFClient::UI::Window::;
+our @ISA = CFPlus::UI::Window::;
 sub new {
    my $class = shift;
    $class->SUPER::new (
    if (   $x >= $self->{x} && $x < $self->{x} + $self->{w}
        && $y >= $self->{y} && $y < $self->{y} + $self->{h}
    ) {
        $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
    } else {
-      $self->CFClient::UI::Base::find_widget ($x, $y)
+      $self->CFPlus::UI::Base::find_widget ($x, $y)
    }
 }
 sub _render {
    my ($self) = @_;
-   local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};
+   local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
-   local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};
+   local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
-   CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+   CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
    $self->SUPER::_render;
 }
 #############################################################################
-package CFClient::UI::ScrolledWindow;
+package CFPlus::UI::ScrolledWindow;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::Table::;
 sub new {
    my ($class, %arg) = @_;
    my $child = delete $arg{child};
    my $self;
-   my $slider = new CFClient::UI::Slider
+   my $hslider = new CFPlus::UI::Slider
+      vertical   => 0,
+      range      => [0, 0, 1, 0.01], # HACK fix
+      on_changed => sub {
+         $self->{hpos} = $_[1];
+         $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
+      },
+   ;
+   my $vslider = new CFPlus::UI::Slider
       vertical   => 1,
       range      => [0, 0, 1, 0.01], # HACK fix
       on_changed => sub {
-         $self->{vp}->set_offset (0, $_[1]);
+         $self->{vpos} = $_[1];
+         $self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
       },
    ;
    $self = $class->SUPER::new (
-      vp         => (new CFClient::UI::ViewPort expand => 1),
+      scroll_x   => 0,
+      scroll_y   => 1,
       can_events => 1,
-      slider     => $slider,
+      hslider    => $hslider,
+      vslider    => $vslider,
+      col_expand => [1, 0],
+      row_expand => [1, 0],
       %arg,
    );
+   $self->{vp} = new CFPlus::UI::ViewPort
+      expand   => 1,
+      scroll_x => $self->{scroll_x},
+      scroll_y => $self->{scroll_y},
+   ;
+   $self->SUPER::add (0, 0, $self->{vp});
-   $self->SUPER::add ($self->{vp}, $self->{slider});
+   $self->SUPER::add (1, 0, $self->{vslider}) if $self->{scroll_y};
+   $self->SUPER::add (0, 1, $self->{hslider}) if $self->{scroll_x};
    $self->add ($child) if $child;
    $self
 }
 sub invoke_mouse_wheel {
    my ($self, $ev) = @_;
    return 0 unless $ev->{dy}; # only vertical movements
-   $self->{slider}->emit (mouse_wheel => $ev);
+   $self->{vslider}->emit (mouse_wheel => $ev);
    1
 }
 sub update_slider {
    my ($self) = @_;
+   my $child = ($self->{vp} or return)->child;
+   my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
-   $self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);
+   $self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
+   #$self->{hslider}->set_visibility ($w1 != $w2);
+   my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
+   $self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
+   #$self->{vslider}->set_visibility ($h1 != $h2);
 }
 sub update {
    my ($self) = @_;
    $self->SUPER::update;
    $self->update_slider;
 }
 sub invoke_size_allocate {
    my ($self, $w, $h) = @_;
    $self->update_slider;
    $self->SUPER::invoke_size_allocate ($w, $h)
 }
 #############################################################################
-package CFClient::UI::Frame;
+package CFPlus::UI::Frame;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    $class->SUPER::new (
    $self->SUPER::_draw;
 }
 #############################################################################
-package CFClient::UI::FancyFrame;
+package CFPlus::UI::FancyFrame;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
+sub new {
+   my ($class, %arg) = @_;
+   if ((exists $arg{label}) && !ref $arg{label}) {
+      $arg{label} = new CFPlus::UI::Label
+         align    => 1,
+         valign   => 0,
+         text     => $arg{label},
+         fontsize => ($arg{border} || 0.8) * 0.75;
+   }
+   my $self = $class->SUPER::new (
+      # label     => "",
+      fg          => [0.6, 0.3, 0.1],
+      border      => 0.8,
+      style       => 'single',
+      %arg,
+   );
+   $self
+}
+sub add {
+   my ($self, @widgets) = @_;
+   $self->SUPER::add (@widgets);
+   $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
+}
+sub border {
+   int $_[0]{border} * $::FONTSIZE
+}
+sub size_request {
+   my ($self) = @_;
+   ($self->{label_w}, undef) = $self->{label}->size_request
+      if $self->{label};
+   my ($w, $h) = $self->SUPER::size_request;
+   (
+      $w + $self->border * 2,
+      $h + $self->border * 2,
+   )
+}
+sub invoke_size_allocate {
+   my ($self, $w, $h) = @_;
+   my $border = $self->border;
+   $w -= List::Util::max 0, $border * 2;
+   $h -= List::Util::max 0, $border * 2;
+   if (my $label = $self->{label}) {
+      $label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
+      $label->{h} = List::Util::min $h, $border;
+      $label->invoke_size_allocate ($label->{w}, $label->{h});
+   }
+   $self->child->configure ($border, $border, $w, $h);
+   1
+}
+sub _draw {
+   my ($self) = @_;
+   my $child = $self->{children}[0];
+   my $border = $self->border;
+   my ($w, $h) = ($self->{w}, $self->{h});
+   $child->draw;
+   glColor @{$self->{fg}};
+   glBegin GL_LINE_STRIP;
+   glVertex $border * 1.5      , $border * 0.5 + 0.5;
+   glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
+   glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
+   glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
+   glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
+   glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
+   glEnd;
+   if ($self->{label}) {
+      glTranslate $border * 2, 0;
+      $self->{label}->_draw;
+   }
+}
+#############################################################################
+package CFPlus::UI::Toplevel;
+our @ISA = CFPlus::UI::Bin::;
+use CFPlus::OpenGL;
 my $bg =
-      new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",
+      new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
          mipmap => 1, wrap => 1;
 my @border =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      map { new_from_file CFPlus::Texture CFPlus::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, %arg) = @_;
       min_w       => 64,
       min_h       => 32,
       %arg,
    );
-   $self->{title_widget} = new CFClient::UI::Label
+   $self->{title_widget} = new CFPlus::UI::Label
       align    => 0,
       valign   => 1,
       text     => $self->{title},
       fontsize => $self->{border},
          if exists $self->{title};
    if ($self->{has_close_button}) {
       $self->{close_button} =
-         new CFClient::UI::ImageButton
+         new CFPlus::UI::ImageButton
             path        => 'x1_close.png',
             on_activate => sub { $self->emit ("delete") };
-      $self->CFClient::UI::Container::add ($self->{close_button});
+      $self->CFPlus::UI::Container::add ($self->{close_button});
    }
    $self
 }
 sub add {
    my ($self, @widgets) = @_;
    $self->SUPER::add (@widgets);
-   $self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};
+   $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
-   $self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
+   $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
 }
 sub border {
    int $_[0]{border} * $::FONTSIZE
 }
    $self->{motion}->($ev, $x, $y) if $self->{motion};
    ! ! $self->{motion}
 }
+sub invoke_visibility_change {
+   my ($self, $visible) = @_;
+   delete $self->{motion} unless $visible;
+   0
+}
 sub _draw {
    my ($self) = @_;
    my $child = $self->{children}[0];
       if $self->{close_button};
 }
 #############################################################################
-package CFClient::UI::Table;
+package CFPlus::UI::Table;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 use List::Util qw(max sum);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    $class->SUPER::new (
       col_expand => [],
+      row_expand => [],
       @_,
    )
 }
 sub children {
    my ($ws, $hs) = $self->get_wh;
    my $req_w = (sum @$ws) || 1;
    my $req_h = (sum @$hs) || 1;
-   # TODO: nicer code && do row_expand
+   # TODO: nicer code
    my @col_expand = @{$self->{col_expand}};
    @col_expand = (1) x @$ws unless @col_expand;
    my $col_expand = (sum @col_expand) || 1;
-   # linearly scale sizes
    $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
-   $hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
-   CFClient::UI::harmonize $ws;
+   CFPlus::UI::harmonize $ws;
+   my @row_expand = @{$self->{row_expand}};
+   @row_expand = (1) x @$ws unless @row_expand;
+   my $row_expand = (sum @row_expand) || 1;
+   $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
-   CFClient::UI::harmonize $hs;
+   CFPlus::UI::harmonize $hs;
    my $y;
    for my $r (0 .. $#{$self->{children}}) {
       my $row = $self->{children}[$r]
    }
 }
 #############################################################################
-package CFClient::UI::Box;
+package CFPlus::UI::Box;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
 sub size_request {
    my ($self) = @_;
    $self->{vertical}
          $req[$_] += $space * $children[$_]{expand}
             for 0 .. $#children;
       }
    }
-   CFClient::UI::harmonize \@req;
+   CFPlus::UI::harmonize \@req;
    my $pos = 0;
    for (0 .. $#children) {
       my $alloc = $req[$_];
       $children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
    1
 }
 #############################################################################
-package CFClient::UI::HBox;
+package CFPlus::UI::HBox;
-our @ISA = CFClient::UI::Box::;
+our @ISA = CFPlus::UI::Box::;
 sub new {
    my $class = shift;
    $class->SUPER::new (
    )
 }
 #############################################################################
-package CFClient::UI::VBox;
+package CFPlus::UI::VBox;
-our @ISA = CFClient::UI::Box::;
+our @ISA = CFPlus::UI::Box::;
 sub new {
    my $class = shift;
    $class->SUPER::new (
    )
 }
 #############################################################################
-package CFClient::UI::Label;
+package CFPlus::UI::Label;
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my ($class, %arg) = @_;
    my $self = $class->SUPER::new (
       #active_bg => none
       #font      => default_font
       #text      => initial text
       #markup    => initial narkup
       #max_w     => maximum pixel width
+      #style     => 0, # render flags
       ellipsise  => 3, # end
-      layout     => (new CFClient::Layout),
+      layout     => (new CFPlus::Layout),
       fontsize   => 1,
       align      => -1,
       valign     => -1,
       padding_x  => 2,
       padding_y  => 2,
       can_events => 0,
       %arg
    );
    if (exists $self->{template}) {
-      my $layout = new CFClient::Layout;
+      my $layout = new CFPlus::Layout;
       $layout->set_text (delete $self->{template});
       $self->{template} = $layout;
    }
    if (exists $self->{markup}) {
    };
    my $w = List::Util::min $self->{w} + 4, $size->[0];
    my $h = List::Util::min $self->{h} + 2, $size->[1];
-   $self->{layout}->render ($self->{ox}, $self->{oy});
+   $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
 }
 #############################################################################
-package CFClient::UI::EntryBase;
+package CFPlus::UI::EntryBase;
-our @ISA = CFClient::UI::Label::;
+our @ISA = CFPlus::UI::Label::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    $class->SUPER::new (
       active_fg  => [0, 0, 0],
       can_hover  => 1,
       can_focus  => 1,
       valign     => 0,
       can_events => 1,
+      ellipsise  => 0,
       #text      => ...
       #hidden    => "*",
       @_
    )
 }
    my $sym = $ev->{sym};
    my $uni = $ev->{unicode};
    my $text = $self->get_text;
+   $self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
    if ($uni == 8) {
       substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
    } elsif ($uni == 127) {
       substr $text, $self->{cursor}, 1, "";
-   } elsif ($sym == CFClient::SDLK_LEFT) {
+   } elsif ($sym == CFPlus::SDLK_LEFT) {
       --$self->{cursor} if $self->{cursor};
-   } elsif ($sym == CFClient::SDLK_RIGHT) {
+   } elsif ($sym == CFPlus::SDLK_RIGHT) {
       ++$self->{cursor} if $self->{cursor} < length $self->{text};
-   } elsif ($sym == CFClient::SDLK_HOME) {
+   } elsif ($sym == CFPlus::SDLK_HOME) {
+      # what a hack
+      $self->{cursor} =
+         (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
+            ? length $1
+            : 0;
+   } elsif ($sym == CFPlus::SDLK_END) {
+      # uh, again
+      $self->{cursor} =
+         (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
+            ? $self->{cursor} + length $1
+            : length $self->{text};
+   } elsif ($uni == 21) { # ctrl-u
+      $text = "";
       $self->{cursor} = 0;
-   } elsif ($sym == CFClient::SDLK_END) {
-      $self->{cursor} = length $text;
    } elsif ($uni == 27) {
       $self->emit ('escape');
-   } elsif ($uni) {
+   } elsif ($uni == 0x0d) {
+      substr $text, $self->{cursor}++, 0, "\012";
+   } elsif ($uni >= 0x20) {
       substr $text, $self->{cursor}++, 0, chr $uni;
    } else {
       return 0;
    }
    $self->_set_text ($text);
    $self->realloc;
+   $self->update;
    1
 }
 sub invoke_focus_in {
          utf8::encode $text;
          @$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
       }
-      glColor @{$self->{fg}};
       glBegin GL_LINES;
-      glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
+      glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
-      glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
+      glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
       glEnd;
    }
 }
+#############################################################################
-package CFClient::UI::Entry;
+package CFPlus::UI::Entry;
-our @ISA = CFClient::UI::EntryBase::;
+our @ISA = CFPlus::UI::EntryBase::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub invoke_key_down {
    my ($self, $ev) = @_;
    my $sym = $ev->{sym};
-   if ($sym == 13) {
+   if ($ev->{uni} == 0x0d || $sym == 13) {
       unshift @{$self->{history}},
          my $txt = $self->get_text;
       $self->{history_pointer} = -1;
       $self->{history_saveback} = '';
       $self->emit (activate => $txt);
       $self->update;
-   } elsif ($sym == CFClient::SDLK_UP) {
+   } elsif ($sym == CFPlus::SDLK_UP) {
       if ($self->{history_pointer} < 0) {
          $self->{history_saveback} = $self->get_text;
       }
       if (@{$self->{history} || []} > 0) {
          $self->{history_pointer}++;
             $self->{history_pointer} = @{$self->{history} || []} - 1;
          }
          $self->set_text ($self->{history}->[$self->{history_pointer}]);
       }
-   } elsif ($sym == CFClient::SDLK_DOWN) {
+   } elsif ($sym == CFPlus::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}]);
    1
 }
 #############################################################################
+package CFPlus::UI::TextEdit;
+our @ISA = CFPlus::UI::EntryBase::;
+use CFPlus::OpenGL;
+sub move_cursor_ver {
+   my ($self, $dy) = @_;
+   my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
+   $y += $dy;
+   if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
+      $self->{cursor} = $index;
+      delete $self->{cur_h};
+      $self->update;
+      return;
+   }
+}
+sub invoke_key_down {
+   my ($self, $ev) = @_;
+   my $sym = $ev->{sym};
+   if ($sym == CFPlus::SDLK_UP) {
+      $self->move_cursor_ver (-1);
+   } elsif ($sym == CFPlus::SDLK_DOWN) {
+      $self->move_cursor_ver (+1);
+   } else {
+      return $self->SUPER::invoke_key_down ($ev)
+   }
+   1
+}
+#############################################################################
-package CFClient::UI::Button;
+package CFPlus::UI::Button;
-our @ISA = CFClient::UI::Label::;
+our @ISA = CFPlus::UI::Label::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
          qw(b1_button_active.png);
 sub new {
    my $class = shift;
    $self->SUPER::_draw;
 }
 #############################################################################
-package CFClient::UI::CheckBox;
+package CFPlus::UI::CheckBox;
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
          qw(c1_checkbox_bg.png c1_checkbox_active.png);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    $class->SUPER::new (
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################
-package CFClient::UI::Image;
+package CFPlus::UI::Image;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 our %texture_cache;
 sub new {
    my $class = shift;
    $self->{path} || $self->{tex}
       or Carp::croak "'path' or 'tex' attributes required";
    $self->{tex} ||= $texture_cache{$self->{path}} ||=
-      new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
+      new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
-   Scalar::Util::weaken $texture_cache{$self->{path}};
+   CFPlus::weaken $texture_cache{$self->{path}};
    $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
    $self
 }
 sub STORABLE_freeze {
    my ($self, $cloning) = @_;
    $self->{path}
-      or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
+      or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
    $self->{path}
 }
 sub STORABLE_attach {
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################
-package CFClient::UI::ImageButton;
+package CFPlus::UI::ImageButton;
-our @ISA = CFClient::UI::Image::;
+our @ISA = CFPlus::UI::Image::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 my %textures;
 sub new {
    my $class = shift;
    1
 }
 #############################################################################
-package CFClient::UI::VGauge;
+package CFPlus::UI::VGauge;
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 use List::Util qw(min max);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 my %tex = (
    food => [
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
+      map { new_from_file CFPlus::Texture CFPlus::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 }
+      map { new_from_file CFPlus::Texture CFPlus::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 }
+      map { new_from_file CFPlus::Texture CFPlus::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 }
+      map { new_from_file CFPlus::Texture CFPlus::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
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################
-package CFClient::UI::Gauge;
+package CFPlus::UI::Gauge;
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
 sub new {
    my ($class, %arg) = @_;
    my $self = $class->SUPER::new (
       can_hover  => 1,
       can_events => 1,
       %arg,
    );
-   $self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");
+   $self->add ($self->{value} = new CFPlus::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->{gauge} = new CFPlus::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->add ($self->{max}   = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
    $self
 }
 sub set_fontsize {
    $self->{value}->set_text ($val);
 }
 #############################################################################
-package CFClient::UI::Slider;
+package CFPlus::UI::Slider;
 use strict;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
 my @tex =
-      map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
+      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
          qw(s1_slider.png s1_slider_bg.png);
 sub new {
    my $class = shift;
 sub invoke_mouse_wheel {
    my ($self, $ev) = @_;
    my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
+   my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
-   $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
+   $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
    ! ! $delta
 }
 sub update {
    glDisable GL_TEXTURE_2D;
 }
 #############################################################################
-package CFClient::UI::ValSlider;
+package CFPlus::UI::ValSlider;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
 sub new {
    my ($class, %arg) = @_;
    my $range = delete $arg{range};
    my $self = $class->SUPER::new (
-      slider     => (new CFClient::UI::Slider expand => 1, range => $range),
+      slider     => (new CFPlus::UI::Slider expand => 1, range => $range),
-      entry      => (new CFClient::UI::Label text => "", template => delete $arg{template}),
+      entry      => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
       to_value   => sub { shift },
       from_value => sub { shift },
       %arg,
    );
 sub set_range { shift->{slider}->set_range (@_) }
 sub set_value { shift->{slider}->set_value (@_) }
 #############################################################################
-package CFClient::UI::TextScroller;
+package CFPlus::UI::TextScroller;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
       can_events => 1,
       indent     => 0,
       #font      => default_font
       @_,
-      layout     => (new CFClient::Layout),
+      layout     => (new CFPlus::Layout),
       par        => [],
+      max_par    => 0,
       height     => 0,
       children   => [
-         (new CFClient::UI::Empty expand => 1),
+         (new CFPlus::UI::Empty expand => 1),
-         (new CFClient::UI::Slider vertical => 1),
+         (new CFPlus::UI::Slider vertical => 1),
       ],
    );
    $self->{children}[1]->connect (changed => sub { $self->update });
    # todo: base offset on lines or so, not on pixels
    $self->{children}[1]->set_value ($offset);
 }
+sub current_paragraph {
+   my ($self) = @_;
+   $self->{top_paragraph} - 1
+}
+sub scroll_to {
+   my ($self, $para) = @_;
+   $para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
+   $self->{scroll_to} = $para;
+   $self->update;
+}
 sub clear {
    my ($self) = @_;
    my (undef, undef, @other) = @{ $self->{children} };
    $self->remove ($_) for @other;
    $self->{height} = 0;
    $self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
 }
 sub add_paragraph {
-   my ($self, $color, $para, $indent) = @_;
+   my $self = shift;
-   my ($text, @w) = ref $para ? @$para : $para;
+   for my $para (@_) {
-   $para = {
+      $para = {
+         fg      => [1, 1, 1, 1],
+         indent  => 0,
+         markup  => "",
+         widget  => [],
+         ref $para ? %$para : (markup => $para),
-      w       => 1e10,
+         w       => 1e10,
-      wrapped => 1,
+         wrapped => 1,
-      fg      => $color,
-      indent  => $indent,
-      markup  => $text,
-      widget  => \@w,
-   };
+      };
-   $self->add (@w) if @w;
+      $self->add (@{ $para->{widget} }) if @{ $para->{widget} };
-   push @{$self->{par}}, $para;
+      push @{$self->{par}}, $para;
+   }
+   if (my $max = $self->{max_par}) {
+      shift @{$self->{par}} while @{$self->{par}} > $max;
+   }
    $self->{need_reflow}++;
    $self->update;
 }
 sub scroll_to_bottom {
    my ($self) = @_;
-   $self->{scroll_to_bottom} = 1;
+   $self->{scroll_to} = $#{$self->{par}};
    $self->update;
 }
+sub force_uptodate {
+   my ($self) = @_;
+   if (delete $self->{need_reflow}) {
+      my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
+      my $height = 0;
+      for my $para (@{$self->{par}}) {
+         if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
+            my $layout = $self->get_layout ($para);
+            my ($w, $h) = $layout->size;
+            $para->{w}       = $w + $para->{indent};
+            $para->{h}       = $h;
+            $para->{wrapped} = $layout->has_wrapped;
+         }
+         $para->{y} = $height;
+         $height += $para->{h};
+      }
+      $self->{height} = $height;
+      $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
+      delete $self->{texture};
+   }
+   if (my $paridx = delete $self->{scroll_to}) {
+      $self->{children}[1]->set_value ($self->{par}[$paridx]{y});
+   }
+}
 sub update {
    my ($self) = @_;
    $self->SUPER::update;
    return unless $self->{h} > 0;
    delete $self->{texture};
    $ROOT->on_post_alloc ($self => sub {
+      $self->force_uptodate;
       my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
-      if (delete $self->{need_reflow}) {
-         my $height = 0;
-         for my $para (@{$self->{par}}) {
-            if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
-               my $layout = $self->get_layout ($para);
-               my ($w, $h) = $layout->size;
-               $para->{w}       = $w + $para->{indent};
-               $para->{h}       = $h;
-               $para->{wrapped} = $layout->has_wrapped;
-            }
-            $height += $para->{h};
-         }
-         $self->{height} = $height;
-         $self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
-         delete $self->{texture};
-      }
-      if (delete $self->{scroll_to_bottom}) {
-         $self->{children}[1]->set_value (1e10);
-      }
-      $self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {
+      $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
          glClearColor 0, 0, 0, 0;
          glClear GL_COLOR_BUFFER_BIT;
+         package CFPlus::UI::Base;
+         local ($draw_x, $draw_y, $draw_w, $draw_h) =
+            (0, 0, $self->{w}, $self->{h});
+         my $top = int $self->{children}[1]{range}[0];
+         my $paridx = 0;
+         my $top_paragraph;
          my $top = int $self->{children}[1]{range}[0];
          my $y0 = $top;
          my $y1 = $top + $H;
-         my $y = 0;
          for my $para (@{$self->{par}}) {
             my $h = $para->{h};
+            my $y = $para->{y};
             if ($y0 < $y + $h && $y < $y1) {
                my $layout = $self->get_layout ($para);
                $layout->render ($para->{indent}, $y - $y0);
                if (my @w = @{ $para->{widget} }) {
                      $_->draw;
                   }
                }
             }
-            $y += $h;
+            $paridx++;
+            $top_paragraph ||= $paridx if $y >= $top;
          }
+         $self->{top_paragraph} = $top_paragraph;
       };
    });
 }
 sub reconfigure {
    $self->{children}[1]->draw;
 }
 #############################################################################
-package CFClient::UI::Animator;
+package CFPlus::UI::Animator;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
 sub moveto {
    my ($self, $x, $y) = @_;
    $self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
    glPopMatrix;
 }
 #############################################################################
-package CFClient::UI::Flopper;
+package CFPlus::UI::Flopper;
-our @ISA = CFClient::UI::Button::;
+our @ISA = CFPlus::UI::Button::;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
    $self->{other}->toggle_visibility;
 }
 #############################################################################
-package CFClient::UI::Tooltip;
+package CFPlus::UI::Tooltip;
-our @ISA = CFClient::UI::Bin::;
+our @ISA = CFPlus::UI::Bin::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    $class->SUPER::new (
    )
 }
 sub set_tooltip_from {
    my ($self, $widget) = @_;
+   $widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
+      if $widget->{tooltip} =~ /^#(.*)$/;
    my $tooltip = $widget->{tooltip};
    if ($ENV{CFPLUS_DEBUG} & 2) {
       $tooltip .= "\n\n" . (ref $widget) . "\n"
    }
    $tooltip =~ s/^\n+//;
    $tooltip =~ s/\n+$//;
-   $self->add (new CFClient::UI::Label
+   $self->add (new CFPlus::UI::Label
       markup    => $tooltip,
       max_w     => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
       fontsize  => 0.8,
-      fg        => [0, 0, 0, 1],
+      style     => 1, # FLAG_INVERSE
       ellipsise => 0,
       font      => ($widget->{tooltip_font} || $::FONT_PROP),
    );
 }
    $self->SUPER::_draw;
 }
 #############################################################################
-package CFClient::UI::Face;
+package CFPlus::UI::Face;
-our @ISA = CFClient::UI::DrawBG::;
+our @ISA = CFPlus::UI::DrawBG::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
       can_events => 0,
       @_,
    );
    if ($self->{anim} && $self->{animspeed}) {
-      Scalar::Util::weaken (my $widget = $self);
+      CFPlus::weaken (my $widget = $self);
       $self->{timer} = Event->timer (
          at       => $self->{animspeed} * int $::NOW / $self->{animspeed},
          hard     => 1,
          interval => $self->{animspeed},
          cb       => sub {
+            delete $self->{wait_face};
             ++$widget->{frame};
             $widget->update;
          },
       );
    }
       my $anim = $::CONN->{anim}[$self->{anim}];
       $face = $anim->[ $self->{frame} % @$anim ]
          if $anim && @$anim;
    }
+   my $faceid = $::CONN->{faceid}[$face || $self->{face}]
+      or return;
-   my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
+   my $tex = $::CONN->{texture}[$faceid];
    if ($tex) {
       glEnable GL_TEXTURE_2D;
       glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
       glColor 0, 0, 0, 1;
       $tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
       glDisable GL_TEXTURE_2D;
+   } else {
+      $self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
+         $self->update;
+      });
    }
 }
 sub destroy {
    my ($self) = @_;
    $self->SUPER::destroy;
 }
 #############################################################################
-package CFClient::UI::Buttonbar;
+package CFPlus::UI::Buttonbar;
-our @ISA = CFClient::UI::HBox::;
+our @ISA = CFPlus::UI::HBox::;
-# TODO: should actualyl wrap buttons and other goodies.
+# TODO: should actually wrap buttons and other goodies.
 #############################################################################
-package CFClient::UI::Menu;
+package CFPlus::UI::Menu;
-our @ISA = CFClient::UI::FancyFrame::;
+our @ISA = CFPlus::UI::Toplevel::;
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
       items => [],
       z     => 100,
       @_,
    );
-   $self->add ($self->{vbox} = new CFClient::UI::VBox);
+   $self->add ($self->{vbox} = new CFPlus::UI::VBox);
    for my $item (@{ $self->{items} }) {
       my ($widget, $cb, $tooltip) = @$item;
       # handle various types of items, only text for now
       if (!ref $widget) {
          if ($widget =~ /\t/) {
             my ($left, $right) = split /\t/, $widget, 2;
-            $widget = new CFClient::UI::HBox
+            $widget = new CFPlus::UI::HBox
                can_hover  => 1,
                can_events => 1,
                tooltip    => $tooltip,
                children   => [
-                  (new CFClient::UI::Label markup => $left, expand => 1),
+                  (new CFPlus::UI::Label markup => $left, expand => 1),
-                  (new CFClient::UI::Label markup => $right, align => +1),
+                  (new CFPlus::UI::Label markup => $right, align => +1),
                ],
             ;
          } else {
-            $widget = new CFClient::UI::Label
+            $widget = new CFPlus::UI::Label
                can_hover  => 1,
                can_events => 1,
                markup     => $widget,
                tooltip    => $tooltip;
          }
    1
 }
 #############################################################################
-package CFClient::UI::Multiplexer;
+package CFPlus::UI::Multiplexer;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
    $self->{current}->draw;
 }
 #############################################################################
-package CFClient::UI::Notebook;
+package CFPlus::UI::Notebook;
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
-      buttonbar   => (new CFClient::UI::Buttonbar),
+      buttonbar   => (new CFPlus::UI::Buttonbar),
-      multiplexer => (new CFClient::UI::Multiplexer expand => 1),
+      multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
       # filter => # will be put between multiplexer and $self
       @_,
    );
    $self->{filter}->add ($self->{multiplexer}) if $self->{filter};
 }
 sub add {
    my ($self, $title, $widget, $tooltip) = @_;
-   Scalar::Util::weaken $self;
+   CFPlus::weaken $self;
-   $self->{buttonbar}->add (new CFClient::UI::Button
+   $self->{buttonbar}->add (new CFPlus::UI::Button
       markup      => $title,
       tooltip     => $tooltip,
       on_activate => sub { $self->set_current_page ($widget) },
    );
    $self->emit (page_changed => $self->{multiplexer}{current});
 }
 #############################################################################
-package CFClient::UI::Selector;
+package CFPlus::UI::Selector;
 use utf8;
-our @ISA = CFClient::UI::Button::;
+our @ISA = CFPlus::UI::Button::;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
       my ($value, $title, $tooltip) = @$_;
       push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
    }
-   CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);
+   CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
 }
 sub _set_value {
    my ($self, $value) = @_;
    $self->emit (changed => $value);
 }
 #############################################################################
-package CFClient::UI::Statusbox;
+package CFPlus::UI::Statusbox;
-our @ISA = CFClient::UI::VBox::;
+our @ISA = CFPlus::UI::VBox::;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
       fontsize => 0.8,
       @_,
    );
-   Scalar::Util::weaken (my $this = $self);
+   CFPlus::weaken (my $this = $self);
    $self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
    $self
 }
 sub reorder {
    my ($self) = @_;
    my $NOW = Time::HiRes::time;
    # freeze display when hovering over any label
-   return if $CFClient::UI::TOOLTIP->{owner}
+   return if $CFPlus::UI::TOOLTIP->{owner}
-             && grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},
+             && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
                    values %{ $self->{item} };
    while (my ($k, $v) = each %{ $self->{item} }) {
       delete $self->{item}{$k} if $v->{timeout} < $NOW;
    }
          for ($short) {
             s/^\s+//;
             s/\s+/ /g;
          }
-         new CFClient::UI::Label
+         new CFPlus::UI::Label
             markup        => $short,
             tooltip       => $item->{tooltip},
             tooltip_font  => $::FONT_PROP,
             tooltip_width => 0.67,
             fontsize      => $item->{fontsize} || $self->{fontsize},
    $self->SUPER::destroy;
 }
 #############################################################################
-package CFClient::UI::Inventory;
-our @ISA = CFClient::UI::Table::;
-sub new {
-   my $class = shift;
-   my $self = $class->SUPER::new (
-      col_expand => [0, 1, 0],
-      items      => [],
-      @_,
-   );
-   $self->set_sort_order (undef);
-   $self
-}
-sub update_items {
-   my ($self) = @_;
-   $self->clear;
-   my @item = $self->{sort}->(@{ $self->{items} });
-   my @adds;
-   my $row = 0;
-   for my $item ($self->{sort}->(@{ $self->{items} })) {
-      CFClient::Item::update_widgets $item;
-      push @adds, 0, $row, $item->{face_widget};
-      push @adds, 1, $row, $item->{desc_widget};
-      push @adds, 2, $row, $item->{weight_widget};
-      $row++;
-   }
-   $self->add (@adds);
-}
-sub set_sort_order {
-   my ($self, $order) = @_;
-   $self->{sort} = $order ||= sub {
-      sort {
-         $a->{type} <=> $b->{type}
-            or $a->{name} cmp $b->{name}
-      } @_
-   };
-   $self->update_items;
-}
-sub set_items {
-   my ($self, $items) = @_;
-   $self->{items} = [$items ? values %$items : ()];
-   $self->update_items;
-}
-#############################################################################
-package CFClient::UI::SpellList;
-our @ISA = CFClient::UI::Table::;
-sub new {
-   my $class = shift;
-   my $self = $class->SUPER::new (
-      binding  => [],
-      commands => [],
-      @_,
-   )
-}
-my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
-my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
-   "<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
-my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
-   "<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
-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.$TOOLTIP_ALL");
-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.$TOOLTIP_ALL");
-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.$TOOLTIP_ALL");
-sub rebuild_spell_list {
-   my ($self) = @_;
-   $CFClient::UI::ROOT->on_refresh ($self => sub {
-      $self->clear;
-      return unless $::CONN;
-      $self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
-      $self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
-      $self->add (3, 0, new CFClient::UI::Label text => "Lvl"  , @TOOLTIP_LVL);
-      $self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
-      $self->add (5, 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++;
-         my $spell_cb = sub {
-            my ($widget, $ev) = @_;
-            if ($ev->{button} == 1) {
-               $::CONN->user_send ("cast $spell->{name}");
-            } elsif ($ev->{button} == 2) {
-               $::CONN->user_send ("invoke $spell->{name}");
-            } elsif ($ev->{button} == 3) {
-               (new CFClient::UI::Menu
-                  items => [
-                     ["bind <i>cast $spell->{name}</i> to a key"   => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
-                     ["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
-                  ],
-               )->popup ($ev);
-            } else {
-               return 0;
-            }
-            1
-         };
-         my $tooltip = "$spell->{message}$TOOLTIP_ALL";
-         #TODO: add path info to tooltip
-         #$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
-         $self->add (0, $row, new CFClient::UI::Face
-            face       => $spell->{face},
-            can_hover  => 1,
-            can_events => 1,
-            tooltip    => $tooltip,
-            on_button_down => $spell_cb,
-         );
-         $self->add (1, $row, new CFClient::UI::Label
-            expand     => 1,
-            text       => $spell->{name},
-            can_hover  => 1,
-            can_events => 1,
-            tooltip    => $tooltip,
-            on_button_down => $spell_cb,
-         );
-         $self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
-         $self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
-         $self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
-         $self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
-      }
-   });
-}
-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;
-}
-sub clear_spells {
-   my ($self) = @_;
-   $self->{spell} = {};
-   $self->rebuild_spell_list;
-}
-#############################################################################
-package CFClient::UI::Root;
+package CFPlus::UI::Root;
-our @ISA = CFClient::UI::Container::;
+our @ISA = CFPlus::UI::Container::;
 use List::Util qw(min max);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 sub new {
    my $class = shift;
    my $self = $class->SUPER::new (
       visible => 1,
       @_,
    );
-   Scalar::Util::weaken ($self->{root} = $self);
+   CFPlus::weaken ($self->{root} = $self);
    $self
 }
 sub size_request {
    glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
    glMatrixMode GL_MODELVIEW;
    glLoadIdentity;
    {
-      package CFClient::UI::Base;
+      package CFPlus::UI::Base;
-      ($draw_x, $draw_y, $draw_w, $draw_h) =
+      local ($draw_x, $draw_y, $draw_w, $draw_h) =
          (0, 0, $self->{w}, $self->{h});
-   }
-   $self->_draw;
+      $self->_draw;
+   }
 }
 #############################################################################
-package CFClient::UI;
+package CFPlus::UI;
-$ROOT = new CFClient::UI::Root;
+$ROOT = new CFPlus::UI::Root;
-$TOOLTIP = new CFClient::UI::Tooltip z => 900;
+$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
 1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.337 by root, Mon Jul 24 04:24:43 2006 UTC vs. Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.372 by root, Sun Jul 15 22:13:43 2007 UTC