--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/19 09:40:00	1.2
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/04/19 23:43:07	1.5
@@ -4,8 +4,7 @@
 
 use List::Util qw(min max);
 
-use SDL;
-use SDL::OpenGL;
+use CFClient::OpenGL;
 
 our @ISA = CFClient::UI::Base::;
 
@@ -15,11 +14,19 @@
    $class->SUPER::new (
       z         => -1,
       can_focus => 1,
-      list      => (glGenLists 1),
+      list      => glGenList,
       @_
    )
 }
 
+sub DESTROY {
+   my $self = shift;
+
+   glDeleteList $self->{list};
+
+   $self->SUPER::DESTROY;
+}
+
 sub key_down {
    print "MAPKEYDOWN\n";
 }
@@ -32,14 +39,14 @@
 
    $self->focus_in;
 
-   if ($ev->button == 2) {
-      my ($ox, $oy) = ($ev->button_x, $ev->button_y);
+   if ($ev->{button} == 2) {
+      my ($ox, $oy) = ($ev->{x}, $ev->{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);
+         ($x, $y) = ($ev->{x}, $ev->{y});
 
          $::CFG->{map_shift_x} = $bw + $x - $ox;
          $::CFG->{map_shift_y} = $bh + $y - $oy;
@@ -79,7 +86,7 @@
    my ($self) = @_;
 
    if (delete $self->{need_update}) {
-      glNewList $self->{list}, GL_COMPILE;
+      glNewList $self->{list};
 
       if ($::MAP) {
          my $sw = int $::WIDTH  / 32;
@@ -176,40 +183,40 @@
 }
 
 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"],
+   CFClient::SDLK_KP8, [1, "north"],
+   CFClient::SDLK_KP9, [2, "northeast"],
+   CFClient::SDLK_KP6, [3, "east"],
+   CFClient::SDLK_KP3, [4, "southeast"],
+   CFClient::SDLK_KP2, [5, "south"],
+   CFClient::SDLK_KP1, [6, "southwest"],
+   CFClient::SDLK_KP4, [7, "west"],
+   CFClient::SDLK_KP7, [8, "northwest"],
+
+   CFClient::SDLK_UP,    [1, "north"],
+   CFClient::SDLK_RIGHT, [3, "east"],
+   CFClient::SDLK_DOWN,  [5, "south"],
+   CFClient::SDLK_LEFT,  [7, "west"],
 );
 
 sub key_down {
    my ($self, $ev) = @_;
 
-   my $mod = $ev->key_mod;
-   my $sym = $ev->key_sym;
+   my $mod = $ev->{mod};
+   my $sym = $ev->{sym};
 
-   if ($sym == SDLK_KP5) {
+   if ($sym == CFClient::SDLK_KP5) {
       $::CONN->user_send ("stay fire");
-   } elsif ($sym == SDLK_a) {
+   } elsif ($sym == ord "a") {
       $::CONN->user_send ("apply");
-   } elsif ($sym == SDLK_QUOTE) {
+   } elsif ($sym == ord "'") {
       $self->emit ('activate_console');
-   } elsif ($sym == SDLK_SLASH) {
+   } elsif ($sym == ord "/") {
       $self->emit ('activate_console' => '/');
    } elsif (exists $DIR{$sym}) {
-      if ($mod & KMOD_SHIFT) {
+      if ($mod & CFClient::KMOD_SHIFT) {
          $self->{shft}++;
          $::CONN->user_send ("fire $DIR{$sym}[0]");
-      } elsif ($mod & KMOD_CTRL) {
+      } elsif ($mod & CFClient::KMOD_CTRL) {
          $self->{ctrl}++;
          $::CONN->user_send ("run $DIR{$sym}[0]");
       } else {
@@ -221,13 +228,13 @@
 sub key_up {
    my ($self, $ev) = @_;
 
-   my $mod = $ev->key_mod;
-   my $sym = $ev->key_sym;
+   my $mod = $ev->{mod};
+   my $sym = $ev->{sym};
 
-   if (!($mod & KMOD_SHIFT) && delete $self->{shft}) {
+   if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
       $::CONN->user_send ("fire_stop");
    }
-   if (!($mod & KMOD_CTRL ) && delete $self->{ctrl}) {
+   if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
       $::CONN->user_send ("run_stop");
    }
 }
@@ -235,7 +242,7 @@
 sub add_command {
    my ($self, $command, $widget, $cb) = @_;
 
-   (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]*/$1/g;
+   (my $abbrev = $command) =~ s/(\S)[^[:space:]_]*[[:space:]_]+/$1/g;
    warn "$command|$abbrev|$widget\n";#d#
 }