--- deliantra/Deliantra-Client/DC/UI.pm	2006/04/18 01:36:13	1.129
+++ deliantra/Deliantra-Client/DC/UI.pm	2006/04/19 23:37:49	1.138
@@ -23,7 +23,7 @@
 
 sub feed_sdl_button_down_event {
    my ($ev) = @_;
-   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+   my ($x, $y) = ($ev->{x}, $ev->{y});
 
    if (!$BUTTON_STATE) {
       my $widget = $ROOT->find_widget ($x, $y);
@@ -32,18 +32,18 @@
       $GRAB->update if $GRAB;
    }
 
-   $BUTTON_STATE |= 1 << ($ev->button - 1);
+   $BUTTON_STATE |= 1 << ($ev->{button} - 1);
 
    $GRAB->button_down ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
 }
 
 sub feed_sdl_button_up_event {
    my ($ev) = @_;
-   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+   my ($x, $y) = ($ev->{x}, $ev->{y});
 
    my $widget = $GRAB || $ROOT->find_widget ($x, $y);
 
-   $BUTTON_STATE &= ~(1 << ($ev->button - 1));
+   $BUTTON_STATE &= ~(1 << ($ev->{button} - 1));
 
    $GRAB->button_up ($ev, $GRAB->coord2local ($x, $y)) if $GRAB;
 
@@ -56,7 +56,7 @@
 
 sub feed_sdl_motion_event {
    my ($ev) = @_;
-   my ($x, $y) = ($ev->motion_x, $ev->motion_y);
+   my ($x, $y) = ($ev->{x}, $ev->{y});
 
    my $widget = $GRAB || $ROOT->find_widget ($x, $y);
 
@@ -89,7 +89,7 @@
 
 use strict;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
@@ -98,8 +98,6 @@
       x => 0,
       y => 0,
       z => 0,
-      w => -1,
-      h => -1,
       @_
    }, $class;
 
@@ -112,6 +110,22 @@
    $self
 }
 
+sub show {
+   my ($self) = @_;
+
+   return if $self->{parent};
+
+   $CFClient::UI::ROOT->add ($self);
+}
+
+sub hide {
+   my ($self) = @_;
+
+   return unless $self->{parent};
+
+   $self->{parent}->remove ($self);
+}
+
 sub move {
    my ($self, $x, $y, $z) = @_;
 
@@ -143,6 +157,7 @@
    $self->{h} = $h;
 
    $self->size_allocate ($w, $h);
+   $self->update;
 }
 
 sub size_allocate {
@@ -274,9 +289,6 @@
 
       $self->{parent}->check_size
          if $self->{parent};
-
-      $self->size_allocate ($w, $h);
-      $self->update;
    }
 }
 
@@ -290,14 +302,15 @@
 sub connect {
    my ($self, $signal, $cb) = @_;
 
-   push @{ $self->{cb}{$signal} }, $cb;
+   push @{ $self->{signal_cb}{$signal} }, $cb;
 }
 
 sub emit {
    my ($self, $signal, @args) = @_;
 
-   $_->($self, @args)
-      for @{$self->{cb}{$signal} || []};
+   for my $cb (@{$self->{signal_cb}{$signal} || []}) {
+      $cb->($self, @args);
+   }
 }
 
 sub DESTROY {
@@ -313,7 +326,7 @@
 our @ISA = CFClient::UI::Base::;
 
 use strict;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
@@ -387,15 +400,15 @@
          @{$self->{children}}, $child
    ];
 
-   $self->{w} = $self->{h} = -1;
-
    $child->check_size;
 }
 
 sub remove {
-   my ($self, $widget) = @_;
+   my ($self, $child) = @_;
 
-   $self->{children} = [ grep $_ != $widget, @{ $self->{children} } ];
+   delete $child->{parent};
+
+   $self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
 
    $self->check_size;
 }
@@ -437,11 +450,11 @@
 }
 
 sub add {
-   my ($self, $widget) = @_;
+   my ($self, $child) = @_;
 
    $self->{children} = [];
    
-   $self->SUPER::add ($widget);
+   $self->SUPER::add ($child);
 }
 
 sub remove {
@@ -471,7 +484,7 @@
 
 our @ISA = CFClient::UI::Bin::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my ($class, %arg) = @_;
@@ -554,7 +567,7 @@
 
 our @ISA = CFClient::UI::Bin::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub size_request {
    my ($self) = @_;
@@ -596,7 +609,7 @@
 
 our @ISA = CFClient::UI::Bin::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 my @tex = 
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
@@ -610,11 +623,15 @@
    $class->SUPER::new (
       bg        => [1, 1, 1, 1],
       border_bg => [1, 1, 1, 1],
-      border    => int $::FONTSIZE * 0.8,
+      border    => 0.8,
       @_
    )
 }
 
+sub border {
+   int $_[0]{border} * $::FONTSIZE
+}
+
 sub size_request {
    my ($self) = @_;
 
@@ -623,25 +640,27 @@
    my ($w, $h) = $self->SUPER::size_request;
 
    (
-      $w + $self->{border} * 2,
-      $h + $self->{border} * 2,
+      $w + $self->border * 2,
+      $h + $self->border * 2,
    )
 }
 
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
-   $h -= List::Util::max 0, $self->{border} * 2;
-   $w -= List::Util::max 0, $self->{border} * 2;
+   $h -= List::Util::max 0, $self->border * 2;
+   $w -= List::Util::max 0, $self->border * 2;
 
-   $self->child->configure ($self->{border}, $self->{border}, $w, $h);
+   $self->child->configure ($self->border, $self->border, $w, $h);
 }
 
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
 
-   if ($x < $self->{w} && $x >= $self->{w} - $self->{border}
-       && $y < $self->{h} && $y >= $self->{h} - $self->{border}) {
+   my $border = $self->border;
+
+   if ($x < $self->{w} && $x >= $self->{w} - $border
+       && $y < $self->{h} && $y >= $self->{h} - $border) {
 
       my ($ox, $oy) = ($ev->button_x, $ev->button_y);
       my ($bw, $bh) = ($self->{w}, $self->{h});
@@ -657,7 +676,7 @@
       };
 
    } elsif ($x >= 0 && $x < $self->{w}
-            && $y >= 0 && $y < $self->{border}) {
+            && $y >= 0 && $y < $border) {
 
       my ($ox, $oy) = ($ev->button_x, $ev->button_y);
       my ($bx, $by) = ($self->{x}, $self->{y});
@@ -696,11 +715,13 @@
    glEnable GL_TEXTURE_2D;
    glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
+   my $border = $self->border;
+
    glColor @{ $self->{border_bg} };
-   $tex[1]->draw_quad (0, 0, $w, $self->{border});
-   $tex[3]->draw_quad (0, $self->{border}, $self->{border}, $ch);
-   $tex[2]->draw_quad ($w - $self->{border}, $self->{border}, $self->{border}, $ch);
-   $tex[4]->draw_quad (0, $h - $self->{border}, $w, $self->{border});
+   $tex[1]->draw_quad (0, 0, $w, $border);
+   $tex[3]->draw_quad (0, $border, $border, $ch);
+   $tex[2]->draw_quad ($w - $border, $border, $border, $ch);
+   $tex[4]->draw_quad (0, $h - $border, $w, $border);
 
    my $bg = $tex[0];
 
@@ -713,7 +734,7 @@
    $bg->{s} = $rep_x;
    $bg->{t} = $rep_y;
    $bg->{wrap_mode} = 1;
-   $bg->draw_quad ($self->{border}, $self->{border}, $cw, $ch);
+   $bg->draw_quad ($border, $border, $cw, $ch);
 
    glDisable GL_TEXTURE_2D;
    glDisable GL_BLEND;
@@ -729,7 +750,7 @@
 
 use List::Util qw(max sum);
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
@@ -746,8 +767,6 @@
    $child->set_parent ($self);
    $self->{children}[$y][$x] = $child;
 
-   $self->{w} = $self->{h} = -1;
-
    $child->check_size;
 }
 
@@ -982,14 +1001,14 @@
 
 our @ISA = CFClient::UI::Base::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my ($class, %arg) = @_;
 
    my $self = $class->SUPER::new (
       fg       => [1, 1, 1],
-      fontsize => $::FONTSIZE,
+      fontsize => 1,
       text     => "",
       align    => -1,
       valign   => -1,
@@ -1038,7 +1057,7 @@
    my ($self) = @_;
 
    $self->{layout}->set_width;
-   $self->{layout}->set_height ($self->{fontsize});
+   $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
 
    my ($w, $h) = $self->{layout}->size;
 
@@ -1054,19 +1073,12 @@
    delete $self->{texture};
 }
 
-sub update {
-   my ($self) = @_;
-
-   delete $self->{texture};
-   $self->SUPER::update;
-}
-
 sub _draw {
    my ($self) = @_;
 
    my $tex = $self->{texture} ||= do {
       $self->{layout}->set_width ($self->{w});
-      $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize});
+      $self->{layout}->set_height (List::Util::min $self->{h}, $self->{fontsize} * $::FONTSIZE);
       new_from_layout CFClient::Texture $self->{layout}
    };
 
@@ -1101,8 +1113,7 @@
 
 our @ISA = CFClient::UI::Label::;
 
-use SDL;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
@@ -1126,6 +1137,8 @@
 
    return if $self->{text} eq $text;
 
+   delete $self->{texture};
+
    $self->{last_activity} = $::NOW;
    $self->{text} = $text;
 
@@ -1164,26 +1177,25 @@
 sub key_down {
    my ($self, $ev) = @_;
 
-   my $mod = $ev->key_mod;
-   my $sym = $ev->key_sym;
-
-   my $uni = $ev->key_unicode;
+   my $mod = $ev->{mod};
+   my $sym = $ev->{sym};
+   my $uni = $ev->{unicode};
 
    my $text = $self->get_text;
 
-   if ($sym == SDLK_BACKSPACE) {
+   if ($sym == 8) {
       substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
-   } elsif ($sym == SDLK_DELETE) {
+   } elsif ($sym == 127) {
       substr $text, $self->{cursor}, 1, "";
-   } elsif ($sym == SDLK_LEFT) {
+   } elsif ($sym == CFClient::SDLK_LEFT) {
       --$self->{cursor} if $self->{cursor};
-   } elsif ($sym == SDLK_RIGHT) {
+   } elsif ($sym == CFClient::SDLK_RIGHT) {
       ++$self->{cursor} if $self->{cursor} < length $self->{text};
-   } elsif ($sym == SDLK_HOME) {
+   } elsif ($sym == CFClient::SDLK_HOME) {
       $self->{cursor} = 0;
-   } elsif ($sym == SDLK_END) {
+   } elsif ($sym == CFClient::SDLK_END) {
       $self->{cursor} = length $text;
-   } elsif ($sym == SDLK_ESCAPE) {
+   } elsif ($sym == 27) {
       $self->emit ('escape');
    } elsif ($uni) {
       substr $text, $self->{cursor}++, 0, chr $uni;
@@ -1268,15 +1280,14 @@
 
 our @ISA = CFClient::UI::EntryBase::;
 
-use SDL;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub key_down {
    my ($self, $ev) = @_;
 
-   my $sym = $ev->key_sym;
+   my $sym = $ev->{sym};
 
-   if ($sym == SDLK_RETURN) {
+   if ($sym == 13) {
       $self->emit (activate => $self->get_text);
       $self->update;
 
@@ -1292,8 +1303,7 @@
 
 our @ISA = CFClient::UI::Label::;
 
-use SDL;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 my @tex =
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
@@ -1356,8 +1366,7 @@
       map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }
          qw(c1_checkbox_bg.png c1_checkbox_active.png);
 
-use SDL;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
@@ -1417,7 +1426,7 @@
 
 our @ISA = CFClient::UI::Base::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 my %tex = (
    food => [
@@ -1496,23 +1505,23 @@
 
    my $yp = 0;
 
-   glBindTexture (GL_TEXTURE_2D, $t1->{name});
-   glBegin (GL_QUADS);
-   glTexCoord (0, 0);           glVertex (0     , $yp);
-   glTexCoord (0, (1 - $ycut)); glVertex (0     , $yp + $h1);
-   glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp + $h1);
-   glTexCoord (1, 0);           glVertex (0 + $w, $yp);
-   glEnd ();
+   glBindTexture GL_TEXTURE_2D, $t1->{name};
+   glBegin GL_QUADS;
+   glTexCoord 0       , 0;                      glVertex 0     , $yp;
+   glTexCoord 0       , $t1->{t} * (1 - $ycut); glVertex 0     , $yp + $h1;
+   glTexCoord $t1->{s}, $t1->{t} * (1 - $ycut); glVertex 0 + $w, $yp + $h1;
+   glTexCoord $t1->{s}, 0;                      glVertex 0 + $w, $yp;
+   glEnd;
 
    $yp += $h1;
 
-   glBindTexture (GL_TEXTURE_2D, $t2->{name});
-   glBegin (GL_QUADS);
-   glTexCoord (0, (1 - $ycut)); glVertex (0     , $yp);
-   glTexCoord (0, 1);           glVertex (0     , $yp + $h2);
-   glTexCoord (1, 1);           glVertex (0 + $w, $yp + $h2);
-   glTexCoord (1, (1 - $ycut)); glVertex (0 + $w, $yp);
-   glEnd ();
+   glBindTexture GL_TEXTURE_2D, $t2->{name};
+   glBegin GL_QUADS;
+   glTexCoord 0       , $t2->{t} * (1 - $ycut); glVertex 0     , $yp;
+   glTexCoord 0       , $t2->{t};               glVertex 0     , $yp + $h2;
+   glTexCoord $t2->{s}, $t2->{t};               glVertex 0 + $w, $yp + $h2;
+   glTexCoord $t2->{s}, $t2->{t} * (1 - $ycut); glVertex 0 + $w, $yp;
+   glEnd;
 
    glDisable GL_BLEND;
    glDisable GL_TEXTURE_2D;
@@ -1524,7 +1533,7 @@
 
 use strict;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 our @ISA = CFClient::UI::DrawBG::;
 
@@ -1544,8 +1553,8 @@
       fg        => [1, 1, 1],
       active_fg => [0, 0, 0],
       range     => [0, 0, 100, 10],
-      req_w     => 40,
-      req_h     => 13,
+      req_w     => 20,
+      req_h     => 20,
       vertical  => 0,
       can_hover => 1,
       inner_pad => 5,
@@ -1659,15 +1668,13 @@
 
 our @ISA = CFClient::UI::HBox::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub new {
    my $class = shift;
 
    my $self = $class->SUPER::new (
-      req_w    => $::WIDTH / 6,
-      req_h    => $::HEIGHT / 6,
-      fontsize => $::FONTSIZE,
+      fontsize => 1,
       @_,
 
       layout   => (new CFClient::Layout),
@@ -1698,7 +1705,7 @@
 
    my $layout = $self->{layout};
 
-   $layout->set_height ($self->{fontsize});
+   $layout->set_height ($self->{fontsize} * $::FONTSIZE);
    $layout->set_width ($self->{w});
    $layout->set_text ($text);
    
@@ -1712,20 +1719,15 @@
    $self->update;
 }
 
-sub size_request {
-   my ($self) = @_;
-
-   ($self->{req_w}, $self->{req_h})
-}
-
 sub size_allocate {
    my ($self, $w, $h) = @_;
 
-   $self->{layout}->set_height ($self->{fontsize});
-   $self->{layout}->set_width ($self->{w});
+   $self->SUPER::size_allocate ($w, $h);
+
+   $self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
+   $self->{layout}->set_width ($self->{children}[0]{w});
 
    $self->reflow;
-   $self->update;
 }
 
 sub add_paragraph {
@@ -1820,245 +1822,9 @@
 
 #############################################################################
 
-package CFClient::UI::MapWidget;
-
-use strict;
-
-use List::Util qw(min max);
-
-use SDL;
-use SDL::OpenGL;
-
-our @ISA = CFClient::UI::Base::;
-
-sub new {
-   my $class = shift;
-
-   $class->SUPER::new (
-      z         => -1,
-      can_focus => 1,
-      list      => (glGenLists 1),
-      @_
-   )
-}
-
-sub key_down {
-   print "MAPKEYDOWN\n";
-}
-
-sub key_up {
-}
-
-sub button_down {
-   my ($self, $ev, $x, $y) = @_;
-
-   $self->focus_in;
-
-   if ($ev->button == 2) {
-      my ($ox, $oy) = ($ev->button_x, $ev->button_y);
-      my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
-
-      $self->{motion} = sub {
-         my ($ev, $x, $y) = @_;
-
-         ($x, $y) = ($ev->motion_x, $ev->motion_y);
-
-         $::CFG->{map_shift_x} = $bw + $x - $ox;
-         $::CFG->{map_shift_y} = $bh + $y - $oy;
-
-         $self->update;
-      };
-   }
-}
-
-sub button_up {
-   my ($self, $ev, $x, $y) = @_;
-
-   delete $self->{motion};
-}
-
-sub mouse_motion {
-   my ($self, $ev, $x, $y) = @_;
-
-   $self->{motion}->($ev, $x, $y) if $self->{motion};
-}
-
-sub size_request {
-   (
-      1 + 32 * int $::WIDTH  / 32,
-      1 + 32 * int $::HEIGHT / 32,
-   )
-}
-
-sub update {
-   my ($self) = @_;
-
-   $self->{need_update} = 1;
-   $self->SUPER::update;
-}
-
-sub draw {
-   my ($self) = @_;
-
-   if (delete $self->{need_update}) {
-      glNewList $self->{list}, GL_COMPILE;
-
-      if ($::MAP) {
-         my $sw = int $::WIDTH  / 32;
-         my $sh = int $::HEIGHT / 32;
-
-         my $sx = $::CFG->{map_shift_x}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
-         my $sy = $::CFG->{map_shift_y}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
-
-         glTranslate $sx0 - 32, $sy0 - 32, 0;
-
-         my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
-
-         if ($::CFG->{fow_enable}) {
-            if ($::CFG->{fow_smooth}) { # smooth fog of war
-               glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
-               glConvolutionFilter2D (
-                  GL_CONVOLUTION_2D,
-                  GL_ALPHA,
-                  3, 3,
-                  GL_ALPHA, GL_FLOAT,
-                  pack "f*",
-                     0.1, 0.1, 0.1,
-                     0.1, 0.2, 0.1,
-                     0.1, 0.1, 0.1,
-               );
-               glEnable GL_CONVOLUTION_2D;
-            }
-
-            $self->{fow_texture} = new CFClient::Texture
-               w              => $w,
-               h              => $h,
-               data           => $data,
-               internalformat => GL_ALPHA,
-               format         => GL_ALPHA;
-
-            glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
-
-            glEnable GL_BLEND;
-            glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-            glEnable GL_TEXTURE_2D;
-            glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
-
-            glColor +($::CFG->{fow_intensity}) x 3, 1;
-            $self->{fow_texture}->draw_quad (0, 0, $w * 32, $h * 32);
-
-            glDisable GL_TEXTURE_2D;
-            glDisable GL_BLEND;
-         }
-
-         # HACK BEGIN
-         {
-           glTranslate -($sx0 - 32), -($sy0 - 32), 0;#remove
-           my ($w, $h) = (250, 250);
-
-           glEnable GL_BLEND;
-           glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
-           glEnable GL_TEXTURE_2D;
-           glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
-
-           $self->{mapmap_texture} =
-              new CFClient::Texture
-                 w    => $w,
-                 h    => $h,
-                 data => $::MAP->mapmap ($w, $h),
-                 type => GL_UNSIGNED_INT_8_8_8_8_REV;
-
-           $self->{mapmap_texture}->draw_quad (100, 100);
-
-           glDisable GL_TEXTURE_2D;
-           glDisable GL_BLEND;
-         }
-         # HACK END
-      }
-
-      glEndList;
-   }
-
-   glPushMatrix;
-   glCallList $self->{list};
-   glPopMatrix;
-
-   if ($FOCUS != $self) {
-      glColor 64/255, 64/255, 64/255;
-      glLogicOp GL_AND;
-      glEnable GL_COLOR_LOGIC_OP;
-      glBegin GL_QUADS;
-      glVertex 0, 0;
-      glVertex 0, $::HEIGHT;
-      glVertex $::WIDTH, $::HEIGHT;
-      glVertex $::WIDTH, 0;
-      glEnd;
-      glDisable GL_COLOR_LOGIC_OP;
-   }
-}
-
-my %DIR = (
-   SDLK_KP8, [1, "north"],
-   SDLK_KP9, [2, "northeast"],
-   SDLK_KP6, [3, "east"],
-   SDLK_KP3, [4, "southeast"],
-   SDLK_KP2, [5, "south"],
-   SDLK_KP1, [6, "southwest"],
-   SDLK_KP4, [7, "west"],
-   SDLK_KP7, [8, "northwest"],
-
-   SDLK_UP,    [1, "north"],
-   SDLK_RIGHT, [3, "east"],
-   SDLK_DOWN,  [5, "south"],
-   SDLK_LEFT,  [7, "west"],
-);
-
-sub key_down {
-   my ($self, $ev) = @_;
-
-   my $mod = $ev->key_mod;
-   my $sym = $ev->key_sym;
-
-   if ($sym == SDLK_KP5) {
-      $::CONN->user_send ("stay fire");
-   } elsif ($sym == SDLK_a) {
-      $::CONN->user_send ("apply");
-   } elsif ($sym == SDLK_QUOTE) {
-      $self->emit ('activate_console');
-   } elsif ($sym == SDLK_SLASH) {
-      $self->emit ('activate_console' => '/');
-   } elsif (exists $DIR{$sym}) {
-      if ($mod & KMOD_SHIFT) {
-         $self->{shft}++;
-         $::CONN->user_send ("fire $DIR{$sym}[0]");
-      } elsif ($mod & KMOD_CTRL) {
-         $self->{ctrl}++;
-         $::CONN->user_send ("run $DIR{$sym}[0]");
-      } else {
-         $::CONN->user_send ("$DIR{$sym}[1]");
-      }
-   }
-}
-
-sub key_up {
-   my ($self, $ev) = @_;
-
-   my $mod = $ev->key_mod;
-   my $sym = $ev->key_sym;
-
-   if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
-      $::CONN->user_send ("fire_stop");
-   }
-   if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
-      $::CONN->user_send ("run_stop");
-   }
-}
-
-#############################################################################
-
 package CFClient::UI::Animator;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 our @ISA = CFClient::UI::Bin::;
 
@@ -2141,7 +1907,7 @@
 
 our @ISA = CFClient::UI::Container::;
 
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 sub check_size {
    my ($self) = @_;