--- deliantra/Deliantra-Client/DC/UI.pm	2007/11/12 23:25:37	1.443
+++ deliantra/Deliantra-Client/DC/UI.pm	2007/12/28 15:05:33	1.458
@@ -1,13 +1,13 @@
-package CFPlus::UI;
+package DC::UI;
 
 use utf8;
 use strict;
 
 use List::Util ();
 
-use CFPlus;
-use CFPlus::Pod;
-use CFPlus::Texture;
+use DC;
+use DC::Pod;
+use DC::Texture;
 
 our ($FOCUS, $HOVER, $GRAB); # various widgets
 
@@ -18,7 +18,7 @@
 
 our %WIDGET; # all widgets, weak-referenced
 
-our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
+our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
    $_[0]->stop;
 
    if (!$GRAB) {
@@ -106,14 +106,14 @@
       $GRAB = $widget;
       $GRAB->update if $GRAB;
 
-      $TOOLTIP_WATCHER->trigger;
+      $TOOLTIP_WATCHER->invoke;
    }
 
    if ($GRAB) {
       if ($ev->{button} == 4 || $ev->{button} == 5) {
          # mousewheel
          my $delta = $ev->{button} * 2 - 9;
-         my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
+         my $shift = $ev->{mod} & DC::KMOD_SHIFT;
 
          $ev->{dx} = $shift ? $delta : 0;
          $ev->{dy} = $shift ? 0 : $delta;
@@ -141,7 +141,7 @@
       $GRAB->update if $GRAB;
 
       check_hover $widget;
-      $TOOLTIP_WATCHER->trigger;
+      $TOOLTIP_WATCHER->invoke;
    }
 }
 
@@ -213,7 +213,7 @@
 
 #############################################################################
 
-package CFPlus::UI::Event;
+package DC::UI::Event;
 
 sub xy {
    $_[1]->coord2local ($_[0]{x}, $_[0]{y})
@@ -221,11 +221,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Base;
+package DC::UI::Base;
 
 use strict;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -240,7 +240,7 @@
       @_
    }, $class;
 
-   CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
+   DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
 
    for (keys %$self) {
       if (/^on_(.*)$/) {
@@ -248,11 +248,11 @@
       }
    }
 
-   if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
-      $self->{x}       = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
-      $self->{y}       = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
-      $self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
-      $self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
+   if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
+      $self->{x}       = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
+      $self->{y}       = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
+      $self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
+      $self->{force_h} = $layout->{h} * $DC::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};
@@ -280,7 +280,7 @@
 
    return if $self->{parent};
 
-   $CFPlus::UI::ROOT->add ($self);
+   $DC::UI::ROOT->add ($self);
 }
 
 sub set_visible {
@@ -311,7 +311,7 @@
    undef $GRAB  if $GRAB  == $self;
    undef $HOVER if $HOVER == $self;
 
-   $CFPlus::UI::TOOLTIP_WATCHER->trigger
+   $DC::UI::TOOLTIP_WATCHER->invoke
       if $TOOLTIP->{owner} == $self;
 
    $self->emit ("focus_out");
@@ -340,8 +340,11 @@
 
    $self->set_invisible;
 
-   $self->{parent}->remove ($self)
-      if $self->{parent};
+   # extra $parent copy for 5.8.8+ bug workaround
+   # (otherwise $_[0] in remove gets freed
+   if (my $parent = $self->{parent}) {
+      $parent->remove ($self);
+   }
 }
 
 sub move_abs {
@@ -388,8 +391,8 @@
    if ($self->{aspect}) {
       my ($ow, $oh) = ($w, $h);
 
-      $w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
-      $h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
+      $w = List::Util::min $w, DC::ceil $h * $self->{aspect};
+      $h = List::Util::min $h, DC::ceil $w / $self->{aspect};
 
       # use alignment to adjust x, y
 
@@ -440,9 +443,9 @@
 
    $self->{tooltip} = $tooltip;
 
-   if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
-      delete $CFPlus::UI::TOOLTIP->{owner};
-      $CFPlus::UI::TOOLTIP_WATCHER->trigger;
+   if ($DC::UI::TOOLTIP->{owner} == $self) {
+      delete $DC::UI::TOOLTIP->{owner};
+      $DC::UI::TOOLTIP_WATCHER->invoke;
    }
 }
 
@@ -450,7 +453,7 @@
 sub coord2local {
    my ($self, $x, $y) = @_;
 
-   Carp::confess unless $self->{parent};#d#
+   return (undef, undef) unless $self->{parent};
 
    $self->{parent}->coord2local ($x  - $self->{x}, $y - $self->{y})
 }
@@ -459,7 +462,7 @@
 sub coord2global {
    my ($self, $x, $y) = @_;
 
-   Carp::confess unless $self->{parent};#d#
+   return (undef, undef) unless $self->{parent};
 
    $self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
 }
@@ -518,7 +521,7 @@
 
    push @{ $self->{signal_cb}{$signal} }, $cb;
 
-   defined wantarray and CFPlus::guard {
+   defined wantarray and DC::guard {
       @{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
          @{ $self->{signal_cb}{$signal} };
    }
@@ -566,7 +569,7 @@
 sub set_parent {
    my ($self, $parent) = @_;
 
-   CFPlus::weaken ($self->{parent} = $parent);
+   DC::weaken ($self->{parent} = $parent);
    $self->set_visible if $parent->{visible};
 }
 
@@ -614,7 +617,7 @@
 sub DESTROY {
    my ($self) = @_;
 
-   return if CFPlus::in_destruct;
+   return if DC::in_destruct;
 
    local $@;
    eval { $self->destroy };
@@ -625,12 +628,12 @@
 
 #############################################################################
 
-package CFPlus::UI::DrawBG;
+package DC::UI::DrawBG;
 
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
 
 use strict;
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -662,9 +665,9 @@
 
 #############################################################################
 
-package CFPlus::UI::Empty;
+package DC::UI::Empty;
 
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -681,9 +684,9 @@
 
 #############################################################################
 
-package CFPlus::UI::Container;
+package DC::UI::Container;
 
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -787,14 +790,14 @@
 
 #############################################################################
 
-package CFPlus::UI::Bin;
+package DC::UI::Bin;
 
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
 
 sub new {
    my ($class, %arg) = @_;
 
-   my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
+   my $child = (delete $arg{child}) || new DC::UI::Empty::;
 
    $class->SUPER::new (children => [$child], %arg)
 }
@@ -811,7 +814,7 @@
 
    $self->SUPER::remove ($widget);
 
-   $self->{children} = [new CFPlus::UI::Empty]
+   $self->{children} = [new DC::UI::Empty]
       unless @{$self->{children}};
 }
 
@@ -832,11 +835,11 @@
 #############################################################################
 # back-buffered drawing area
 
-package CFPlus::UI::Window;
+package DC::UI::Window;
 
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my ($class, %arg) = @_;
@@ -868,12 +871,12 @@
 sub render_child {
    my ($self) = @_;
 
-   $self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
+   $self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
       glClearColor 0, 0, 0, 0;
       glClear GL_COLOR_BUFFER_BIT;
 
       {
-         package CFPlus::UI::Base;
+         package DC::UI::Base;
 
          local ($draw_x, $draw_y, $draw_w, $draw_h) =
             (0, 0, $self->{w}, $self->{h});
@@ -900,11 +903,11 @@
 
 #############################################################################
 
-package CFPlus::UI::ViewPort;
+package DC::UI::ViewPort;
 
 use List::Util qw(min max);
 
-our @ISA = CFPlus::UI::Window::;
+our @ISA = DC::UI::Window::;
 
 sub new {
    my $class = shift;
@@ -998,26 +1001,26 @@
    ) {
       $self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
    } else {
-      $self->CFPlus::UI::Base::find_widget ($x, $y)
+      $self->DC::UI::Base::find_widget ($x, $y)
    }
 }
 
 sub _render {
    my ($self) = @_;
 
-   local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
-   local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
+   local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
+   local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
 
-   CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
+   DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
 
    $self->SUPER::_render;
 }
 
 #############################################################################
 
-package CFPlus::UI::ScrolledWindow;
+package DC::UI::ScrolledWindow;
 
-our @ISA = CFPlus::UI::Table::;
+our @ISA = DC::UI::Table::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -1026,7 +1029,7 @@
 
    my $self;
 
-   my $hslider = new CFPlus::UI::Slider
+   my $hslider = new DC::UI::Slider
       c_col      => 0,
       c_row      => 1,
       vertical   => 0,
@@ -1037,7 +1040,7 @@
       },
    ;
 
-   my $vslider = new CFPlus::UI::Slider
+   my $vslider = new DC::UI::Slider
       c_col      => 1,
       c_row      => 0,
       vertical   => 1,
@@ -1059,7 +1062,7 @@
       %arg,
    );
 
-   $self->{vp} = new CFPlus::UI::ViewPort
+   $self->{vp} = new DC::UI::ViewPort
       c_col      => 0,
       c_row      => 0,
       expand     => 1,
@@ -1195,11 +1198,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Frame;
+package DC::UI::Frame;
 
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -1228,17 +1231,17 @@
 
 #############################################################################
 
-package CFPlus::UI::FancyFrame;
+package DC::UI::FancyFrame;
 
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my ($class, %arg) = @_;
 
    if ((exists $arg{label}) && !ref $arg{label}) {
-      $arg{label} = new CFPlus::UI::Label
+      $arg{label} = new DC::UI::Label
          align    => 1,
          valign   => 0,
          text     => $arg{label},
@@ -1260,7 +1263,7 @@
    my ($self, @widgets) = @_;
 
    $self->SUPER::add (@widgets);
-   $self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
+   $self->DC::UI::Container::add ($self->{label}) if $self->{label};
 }
 
 sub border {
@@ -1328,22 +1331,22 @@
 
 #############################################################################
 
-package CFPlus::UI::Toplevel;
+package DC::UI::Toplevel;
 
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 my $bg = 
-      new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
+      new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
          mipmap => 1, wrap => 1;
 
 my @border = 
-      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
          qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
 
 my @icon =
-      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
          qw(x1_move.png x1_resize.png);
 
 sub new {
@@ -1359,7 +1362,7 @@
       %arg,
    );
 
-   $self->{title_widget} = new CFPlus::UI::Label
+   $self->{title_widget} = new DC::UI::Label
       align    => 0,
       valign   => 1,
       text     => $self->{title},
@@ -1368,11 +1371,11 @@
 
    if ($self->{has_close_button}) {
       $self->{close_button} =
-         new CFPlus::UI::ImageButton
+         new DC::UI::ImageButton
             path        => 'x1_close.png',
             on_activate => sub { $self->emit ("delete") };
 
-      $self->CFPlus::UI::Container::add ($self->{close_button});
+      $self->DC::UI::Container::add ($self->{close_button});
    }
 
    $self
@@ -1382,8 +1385,8 @@
    my ($self, @widgets) = @_;
 
    $self->SUPER::add (@widgets);
-   $self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
-   $self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
+   $self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
+   $self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
 }
 
 sub border {
@@ -1578,13 +1581,13 @@
 
 #############################################################################
 
-package CFPlus::UI::Table;
+package DC::UI::Table;
 
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
 
 use List::Util qw(max sum);
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -1638,7 +1641,7 @@
       my $sw = sum @w[$c .. $c + $cs - 1];
 
       if ($w > $sw) {
-         $_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
+         $_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
       }
    }
 
@@ -1649,7 +1652,7 @@
       my $sh = sum @h[$r .. $r + $rs - 1];
 
       if ($h > $sh) {
-         $_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
+         $_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
       }
    }
 
@@ -1682,7 +1685,7 @@
 
    $ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
 
-   CFPlus::UI::harmonize $ws;
+   DC::UI::harmonize $ws;
 
    my @row_expand = @{$self->{row_expand}};
    @row_expand = (1) x @$ws unless @row_expand;
@@ -1690,7 +1693,7 @@
 
    $hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
 
-   CFPlus::UI::harmonize $hs;
+   DC::UI::harmonize $hs;
 
    my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
    my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
@@ -1709,11 +1712,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Fixed;
+package DC::UI::Fixed;
 
 use List::Util qw(min max);
 
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
 
 sub _scale($$$) {
    my ($rel, $val, $max) = @_;
@@ -1775,9 +1778,9 @@
 
 #############################################################################
 
-package CFPlus::UI::Box;
+package DC::UI::Box;
 
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
 
 sub size_request {
    my ($self) = @_;
@@ -1822,7 +1825,7 @@
       }
    }
 
-   CFPlus::UI::harmonize \@req;
+   DC::UI::harmonize \@req;
 
    my $pos = 0;
    for (0 .. $#children) {
@@ -1837,9 +1840,9 @@
 
 #############################################################################
 
-package CFPlus::UI::HBox;
+package DC::UI::HBox;
 
-our @ISA = CFPlus::UI::Box::;
+our @ISA = DC::UI::Box::;
 
 sub new {
    my $class = shift;
@@ -1852,9 +1855,9 @@
 
 #############################################################################
 
-package CFPlus::UI::VBox;
+package DC::UI::VBox;
 
-our @ISA = CFPlus::UI::Box::;
+our @ISA = DC::UI::Box::;
 
 sub new {
    my $class = shift;
@@ -1867,11 +1870,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Label;
+package DC::UI::Label;
 
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my ($class, %arg) = @_;
@@ -1886,7 +1889,7 @@
       #max_w     => maximum pixel width
       #style     => 0, # render flags
       ellipsise  => 3, # end
-      layout     => (new CFPlus::Layout),
+      layout     => (new DC::Layout),
       fontsize   => 1,
       align      => -1,
       valign     => -1,
@@ -1897,7 +1900,7 @@
    );
 
    if (exists $self->{template}) {
-      my $layout = new CFPlus::Layout;
+      my $layout = new DC::Layout;
       $layout->set_text (delete $self->{template});
       $self->{template} = $layout;
    }
@@ -2053,13 +2056,13 @@
    };
 
 #   unless ($self->{list}) {
-#      $self->{list} = CFPlus::OpenGL::glGenList;
-#      CFPlus::OpenGL::glNewList $self->{list};
+#      $self->{list} = DC::OpenGL::glGenList;
+#      DC::OpenGL::glNewList $self->{list};
 #      $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
-#      CFPlus::OpenGL::glEndList;
+#      DC::OpenGL::glEndList;
 #   }
 #   
-#   CFPlus::OpenGL::glCallList $self->{list};
+#   DC::OpenGL::glCallList $self->{list};
 
    $self->{layout}->draw;
 }
@@ -2067,18 +2070,18 @@
 #sub destroy {
 #   my ($self) = @_;
 #
-#   CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
+#   DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
 #
 #   $self->SUPER::destroy;
 #}
 
 #############################################################################
 
-package CFPlus::UI::EntryBase;
+package DC::UI::EntryBase;
 
-our @ISA = CFPlus::UI::Label::;
+our @ISA = DC::UI::Label::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -2095,6 +2098,8 @@
       valign     => 0,
       can_events => 1,
       ellipsise  => 0,
+      padding_x  => 4,
+      padding_y  => 2,
       #text      => ...
       #hidden    => "*",
       @_
@@ -2155,17 +2160,17 @@
       substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
    } elsif ($uni == 127) {
       substr $text, $self->{cursor}, 1, "";
-   } elsif ($sym == CFPlus::SDLK_LEFT) {
+   } elsif ($sym == DC::SDLK_LEFT) {
       --$self->{cursor} if $self->{cursor};
-   } elsif ($sym == CFPlus::SDLK_RIGHT) {
+   } elsif ($sym == DC::SDLK_RIGHT) {
       ++$self->{cursor} if $self->{cursor} < length $self->{text};
-   } elsif ($sym == CFPlus::SDLK_HOME) {
+   } elsif ($sym == DC::SDLK_HOME) {
       # what a hack
       $self->{cursor} =
          (substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
             ? length $1
             : 0;
-   } elsif ($sym == CFPlus::SDLK_END) {
+   } elsif ($sym == DC::SDLK_END) {
       # uh, again
       $self->{cursor} =
          (substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
@@ -2278,11 +2283,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Entry;
+package DC::UI::Entry;
 
-our @ISA = CFPlus::UI::EntryBase::;
+our @ISA = DC::UI::EntryBase::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub invoke_key_down {
    my ($self, $ev) = @_;
@@ -2298,7 +2303,7 @@
       $self->emit (activate => $txt);
       $self->update;
 
-   } elsif ($sym == CFPlus::SDLK_UP) {
+   } elsif ($sym == DC::SDLK_UP) {
       if ($self->{history_pointer} < 0) {
          $self->{history_saveback} = $self->get_text;
       }
@@ -2310,7 +2315,7 @@
          $self->set_text ($self->{history}->[$self->{history_pointer}]);
       }
 
-   } elsif ($sym == CFPlus::SDLK_DOWN) {
+   } elsif ($sym == DC::SDLK_DOWN) {
       $self->{history_pointer}--;
       $self->{history_pointer} = -1 if $self->{history_pointer} < 0;
 
@@ -2329,20 +2334,30 @@
 
 #############################################################################
 
-package CFPlus::UI::TextEdit;
+package DC::UI::TextEdit;
+
+our @ISA = DC::UI::EntryBase::;
+
+use DC::OpenGL;
+
+sub new {
+   my $class = shift;
 
-our @ISA = CFPlus::UI::EntryBase::;
+   $class->SUPER::new (
+      padding_y  => 4,
 
-use CFPlus::OpenGL;
+      @_
+   )
+}
 
 sub move_cursor_ver {
    my ($self, $dy) = @_;
 
-   my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
+   my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
 
-   $y += $dy;
+   $line += $dy;
 
-   if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
+   if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
       $self->{cursor} = $index;
       delete $self->{cur_h};
       $self->update;
@@ -2355,9 +2370,9 @@
 
    my $sym = $ev->{sym};
 
-   if ($sym == CFPlus::SDLK_UP) {
+   if ($sym == DC::SDLK_UP) {
       $self->move_cursor_ver (-1);
-   } elsif ($sym == CFPlus::SDLK_DOWN) {
+   } elsif ($sym == DC::SDLK_DOWN) {
       $self->move_cursor_ver (+1);
    } else {
       return $self->SUPER::invoke_key_down ($ev)
@@ -2368,14 +2383,14 @@
 
 #############################################################################
 
-package CFPlus::UI::ButtonBin;
+package DC::UI::ButtonBin;
 
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 my @tex =
-      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
          qw(b1_button_inactive.png b1_button_active.png);
 
 sub new {
@@ -2417,21 +2432,21 @@
 
 #############################################################################
 
-package CFPlus::UI::Button;
+package DC::UI::Button;
 
-our @ISA = CFPlus::UI::Label::;
+our @ISA = DC::UI::Label::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 my @tex =
-      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
          qw(b1_button_inactive.png b1_button_active.png);
 
 sub new {
    my $class = shift;
 
    $class->SUPER::new (
-      padding_x  => 4,
+      padding_x  => 8,
       padding_y  => 4,
       fg         => [1.0, 1.0, 1.0],
       active_fg  => [0.8, 0.8, 0.8],
@@ -2472,15 +2487,15 @@
 
 #############################################################################
 
-package CFPlus::UI::CheckBox;
+package DC::UI::CheckBox;
 
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
 
 my @tex =
-      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
          qw(c1_checkbox_bg.png c1_checkbox_active.png);
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -2547,11 +2562,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Image;
+package DC::UI::Image;
 
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 our %texture_cache;
 
@@ -2568,9 +2583,9 @@
       or Carp::croak "'path' or 'tex' attributes required";
 
    $self->{tex} ||= $texture_cache{$self->{path}} ||=
-      new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
+      new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
 
-   CFPlus::weaken $texture_cache{$self->{path}};
+   DC::weaken $texture_cache{$self->{path}};
 
    $self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
 
@@ -2581,7 +2596,7 @@
    my ($self, $cloning) = @_;
 
    $self->{path}
-      or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
+      or die "cannot serialise DC::UI::Image on non-loadable images\n";
 
    $self->{path}
 }
@@ -2622,11 +2637,11 @@
 
 #############################################################################
 
-package CFPlus::UI::ImageButton;
+package DC::UI::ImageButton;
 
-our @ISA = CFPlus::UI::Image::;
+our @ISA = DC::UI::Image::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 my %textures;
 
@@ -2664,29 +2679,29 @@
 
 #############################################################################
 
-package CFPlus::UI::VGauge;
+package DC::UI::VGauge;
 
-our @ISA = CFPlus::UI::Base::;
+our @ISA = DC::UI::Base::;
 
 use List::Util qw(min max);
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 my %tex = (
    food => [
-      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
          qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
    ],
    grace => [
-      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+      map { new_from_file DC::Texture DC::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 CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
          qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
    ],
    mana => [
-      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
+      map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
          qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
    ],
 );
@@ -2799,11 +2814,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Progress;
+package DC::UI::Progress;
 
-our @ISA = CFPlus::UI::Label::;
+our @ISA = DC::UI::Label::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my ($class, %arg) = @_;
@@ -2833,7 +2848,7 @@
    return if $self->{label} eq $label;
    $self->{label} = $label;
 
-   $self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
+   $self->DC::UI::Progress::set_value (0 + delete $self->{value});
 }
 
 sub set_value {
@@ -2880,9 +2895,9 @@
 
 #############################################################################
 
-package CFPlus::UI::ExperienceProgress;
+package DC::UI::ExperienceProgress;
 
-our @ISA = CFPlus::UI::Progress::;
+our @ISA = DC::UI::Progress::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -2937,9 +2952,9 @@
 
 #############################################################################
 
-package CFPlus::UI::Gauge;
+package DC::UI::Gauge;
 
-our @ISA = CFPlus::UI::VBox::;
+our @ISA = DC::UI::VBox::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -2951,9 +2966,9 @@
       %arg,
    );
 
-   $self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
-   $self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
-   $self->add ($self->{max}   = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
+   $self->add ($self->{value} = new DC::UI::Label valign => +1, align => 0, template => "999");
+   $self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
+   $self->add ($self->{max}   = new DC::UI::Label valign => -1, align => 0, template => "999");
 
    $self
 }
@@ -2984,16 +2999,16 @@
 
 #############################################################################
 
-package CFPlus::UI::Slider;
+package DC::UI::Slider;
 
 use strict;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
 
 my @tex =
-      map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
+      map { new_from_file DC::Texture DC::find_rcfile $_ }
          qw(s1_slider.png s1_slider_bg.png);
 
 sub new {
@@ -3099,7 +3114,7 @@
 
    my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
 
-   my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
+   my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
 
    $self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
 
@@ -3162,9 +3177,9 @@
 
 #############################################################################
 
-package CFPlus::UI::ValSlider;
+package DC::UI::ValSlider;
 
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = DC::UI::HBox::;
 
 sub new {
    my ($class, %arg) = @_;
@@ -3172,8 +3187,8 @@
    my $range = delete $arg{range};
 
    my $self = $class->SUPER::new (
-      slider     => (new CFPlus::UI::Slider expand => 1, range => $range),
-      entry      => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
+      slider     => (new DC::UI::Slider expand => 1, range => $range),
+      entry      => (new DC::UI::Label text => "", template => delete $arg{template}),
       to_value   => sub { shift },
       from_value => sub { shift },
       %arg,
@@ -3203,11 +3218,11 @@
 
 #############################################################################
 
-package CFPlus::UI::TextScroller;
+package DC::UI::TextScroller;
 
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = DC::UI::HBox::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -3219,13 +3234,13 @@
       #font      => default_font
       @_,
                  
-      layout     => (new CFPlus::Layout),
+      layout     => (new DC::Layout),
       par        => [],
       max_par    => 0,
       height     => 0,
       children   => [
-         (new CFPlus::UI::Empty expand => 1),
-         (new CFPlus::UI::Slider vertical => 1),
+         (new DC::UI::Empty expand => 1),
+         (new DC::UI::Slider vertical => 1),
       ],
    );
 
@@ -3418,11 +3433,11 @@
 
       my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
 
-      $self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
+      $self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
          glClearColor 0, 0, 0, 0;
          glClear GL_COLOR_BUFFER_BIT;
 
-         package CFPlus::UI::Base;
+         package DC::UI::Base;
          local ($draw_x, $draw_y, $draw_w, $draw_h) =
             (0, 0, $self->{w}, $self->{h});
 
@@ -3491,11 +3506,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Animator;
+package DC::UI::Animator;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
 
 sub moveto {
    my ($self, $x, $y) = @_;
@@ -3533,9 +3548,9 @@
 
 #############################################################################
 
-package CFPlus::UI::Flopper;
+package DC::UI::Flopper;
 
-our @ISA = CFPlus::UI::Button::;
+our @ISA = DC::UI::Button::;
 
 sub new {
    my $class = shift;
@@ -3557,11 +3572,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Tooltip;
+package DC::UI::Tooltip;
 
-our @ISA = CFPlus::UI::Bin::;
+our @ISA = DC::UI::Bin::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -3578,7 +3593,7 @@
    my $tip = $widget->{tooltip};
    $tip = $tip->($widget) if "CODE" eq ref $tip;
                
-   $tip = CFPlus::Pod::section_label tooltip => $1
+   $tip = DC::Pod::section_label tooltip => $1
       if $tip =~ /^#(.*)$/;
 
    if ($ENV{CFPLUS_DEBUG} & 2) {
@@ -3591,7 +3606,7 @@
    $tip =~ s/^\n+//;
    $tip =~ s/\n+$//;
 
-   $self->add (new CFPlus::UI::Label
+   $self->add (new DC::UI::Label
       markup    => $tip,
       max_w     => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
       fontsize  => 0.8,
@@ -3655,11 +3670,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Face;
+package DC::UI::Face;
 
-our @ISA = CFPlus::UI::DrawBG::;
+our @ISA = DC::UI::DrawBG::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -3673,11 +3688,10 @@
    );
 
    if ($self->{anim} && $self->{animspeed}) {
-      CFPlus::weaken (my $widget = $self);
+      DC::weaken (my $widget = $self);
 
-      $widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
-      $widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
-      $self->{timer} = EV::timer_ns 0, 0, sub {
+      $self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
+      $self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
          return unless $::CONN;
 
          my $w = $widget
@@ -3704,11 +3718,6 @@
    return unless $self->{timer};
 
    if ($self->{visible}) {
-      $self->{timer}->set (
-         $self->{anim_start}
-         + $self->{animspeed}
-           * int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
-      );
       $self->{timer}->start;
    } else {
       $self->{timer}->stop;
@@ -3795,19 +3804,19 @@
 
 #############################################################################
 
-package CFPlus::UI::Buttonbar;
+package DC::UI::Buttonbar;
 
-our @ISA = CFPlus::UI::HBox::;
+our @ISA = DC::UI::HBox::;
 
 # TODO: should actually wrap buttons and other goodies.
 
 #############################################################################
 
-package CFPlus::UI::Menu;
+package DC::UI::Menu;
 
-our @ISA = CFPlus::UI::Toplevel::;
+our @ISA = DC::UI::Toplevel::;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -3818,7 +3827,7 @@
       @_,
    );
 
-   $self->add ($self->{vbox} = new CFPlus::UI::VBox);
+   $self->add ($self->{vbox} = new DC::UI::VBox);
 
    for my $item (@{ $self->{items} }) {
       my ($widget, $cb, $tooltip) = @$item;
@@ -3828,18 +3837,18 @@
          if ($widget =~ /\t/) {
             my ($left, $right) = split /\t/, $widget, 2;
 
-            $widget = new CFPlus::UI::HBox
+            $widget = new DC::UI::HBox
                can_hover  => 1,
                can_events => 1,
                tooltip    => $tooltip,
                children   => [
-                  (new CFPlus::UI::Label markup => $left, expand => 1),
-                  (new CFPlus::UI::Label markup => $right, align => +1),
+                  (new DC::UI::Label markup => $left, expand => 1),
+                  (new DC::UI::Label markup => $right, align => +1),
                ],
             ;
 
          } else {
-            $widget = new CFPlus::UI::Label
+            $widget = new DC::UI::Label
                can_hover  => 1,
                can_events => 1,
                markup     => $widget,
@@ -3897,9 +3906,9 @@
 
 #############################################################################
 
-package CFPlus::UI::Multiplexer;
+package DC::UI::Multiplexer;
 
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
 
 sub new {
    my $class = shift;
@@ -3970,18 +3979,18 @@
 
 #############################################################################
 
-package CFPlus::UI::Notebook;
+package DC::UI::Notebook;
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
-our @ISA = CFPlus::UI::VBox::;
+our @ISA = DC::UI::VBox::;
 
 sub new {
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      buttonbar      => (new CFPlus::UI::Buttonbar),
-      multiplexer    => (new CFPlus::UI::Multiplexer expand => 1),
+      buttonbar      => (new DC::UI::Buttonbar),
+      multiplexer    => (new DC::UI::Multiplexer expand => 1),
       active_outline => [.7, .7, 0.2],
       # filter => # will be put between multiplexer and $self
       @_,
@@ -4000,9 +4009,9 @@
             Scalar::Util::weaken $child;
             $child->{c_tab_} ||= do {
                my $tab =
-                  (UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
+                  (UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
                      ? $child->{c_tab}
-                     : new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
+                     : new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
 
                $tab->connect (activate => sub {
                   $wself->set_current_page ($child);
@@ -4088,11 +4097,11 @@
 
 #############################################################################
 
-package CFPlus::UI::Selector;
+package DC::UI::Selector;
 
 use utf8;
 
-our @ISA = CFPlus::UI::Button::;
+our @ISA = DC::UI::Button::;
 
 sub new {
    my $class = shift;
@@ -4119,7 +4128,7 @@
       push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
    }
 
-   CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
+   DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
 }
 
 sub _set_value {
@@ -4152,9 +4161,9 @@
 
 #############################################################################
 
-package CFPlus::UI::Statusbox;
+package DC::UI::Statusbox;
 
-our @ISA = CFPlus::UI::VBox::;
+our @ISA = DC::UI::VBox::;
 
 sub new {
    my $class = shift;
@@ -4164,7 +4173,7 @@
       @_,
    );
 
-   CFPlus::weaken (my $this = $self);
+   DC::weaken (my $this = $self);
 
    $self->{timer} = EV::timer 1, 1, sub { $this->reorder };
 
@@ -4176,8 +4185,8 @@
    my $NOW = Time::HiRes::time;
 
    # freeze display when hovering over any label
-   return if $CFPlus::UI::TOOLTIP->{owner}
-             && grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
+   return if $DC::UI::TOOLTIP->{owner}
+             && grep $DC::UI::TOOLTIP->{owner} == $_->{label},
                    values %{ $self->{item} };
 
    while (my ($k, $v) = each %{ $self->{item} }) {
@@ -4208,7 +4217,7 @@
             s/\s+/ /g;
          }
 
-         new CFPlus::UI::Label
+         new DC::UI::Label
             markup        => $short,
             tooltip       => $item->{tooltip},
             tooltip_font  => $::FONT_PROP,
@@ -4297,13 +4306,13 @@
 
 #############################################################################
 
-package CFPlus::UI::Root;
+package DC::UI::Root;
 
-our @ISA = CFPlus::UI::Container::;
+our @ISA = DC::UI::Container::;
 
 use List::Util qw(min max);
 
-use CFPlus::OpenGL;
+use DC::OpenGL;
 
 sub new {
    my $class = shift;
@@ -4313,7 +4322,7 @@
       @_,
    );
 
-   CFPlus::weaken ($self->{root} = $self);
+   DC::weaken ($self->{root} = $self);
 
    $self
 }
@@ -4371,7 +4380,7 @@
 sub update {
    my ($self) = @_;
 
-   $::WANT_REFRESH->start;
+   $::WANT_REFRESH = 1;
 }
 
 sub add {
@@ -4526,7 +4535,7 @@
    glLoadIdentity;
 
    {
-      package CFPlus::UI::Base;
+      package DC::UI::Base;
 
       local ($draw_x, $draw_y, $draw_w, $draw_h) =
          (0, 0, $self->{w}, $self->{h});
@@ -4537,10 +4546,10 @@
 
 #############################################################################
 
-package CFPlus::UI;
+package DC::UI;
 
-$ROOT = new CFPlus::UI::Root;
-$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
+$ROOT = new DC::UI::Root;
+$TOOLTIP = new DC::UI::Tooltip z => 900;
 
 1