--- deliantra/Deliantra-Client/DC/MapWidget.pm	2007/07/21 20:30:41	1.113
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2007/08/14 13:25:25	1.118
@@ -22,7 +22,6 @@
    my $self = $class->SUPER::new (
       z         => -1,
       can_focus => 1,
-      list      => glGenList,
       tilesize  => 32,
       @_
    );
@@ -186,11 +185,7 @@
       $y -= CFPlus::floor $::MAP->h * 0.5;
 
       if ($::CONN) {
-         if ($::IN_BUILD_MODE) {
-            $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
-         } else {
-            $::CONN->lookat ($x, $y)
-         }
+         $::CONN->lookat ($x, $y)
       }
 
    } elsif ($ev->{button} == 2) {
@@ -346,6 +341,8 @@
       ::toggle_player_page ($::INVENTORY_PAGE);
    } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
       $::SETUP_DIALOG->toggle_visibility;
+   } elsif ($uni >= ord "0" && $uni <= ord "9" && $mod & CFPlus::KMOD_ALT) {
+      $::MESSAGE_WINDOW->user_switch_to_page (chr $uni);
    } elsif (!$::CONN) {
       return 0; # bindings further down need a valid connection
 
@@ -354,7 +351,7 @@
    } elsif ($uni == ord " ") {
       $::CONN->user_send ("apply");
    } elsif ($uni == 13) {
-      $::CONN->user_send ("examine");
+      $::MESSAGE_WINDOW->activate_current;
    } elsif ($uni == ord ".") {
       $::CONN->user_send ($self->{completer}{last_command})
          if exists $self->{completer}{last_command};
@@ -451,74 +448,76 @@
 sub refresh_hook {
    my ($self) = @_;
 
-   return unless $::MAP;
-
-   if (delete $self->{need_update}) {
-      my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
-
-      my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
-      my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
-
-      my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
-      my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
+   if ($::MAP && $::CONN) {
+      if (delete $self->{need_update}) {
+         my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
+
+         my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
+         my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
+
+         my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
+         my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
+
+         my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
+         my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
+
+         my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
+         my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
+
+         if ($::CFG->{fow_enable}) {
+            my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
+
+            $self->{fow_texture} = new CFPlus::Texture
+               w              => $w,
+               h              => $h,
+               data           => $data,
+               internalformat => GL_ALPHA,
+               format         => GL_ALPHA;
+         } else {
+            delete $self->{fow_texture};
+         }
 
-      my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
-      my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
+         glNewList ($self->{list} ||= glGenList);
 
-      my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
-      my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
+         glPushMatrix;
+         glTranslate $sx0, $sy0;
+         glScale $::CFG->{map_scale}, $::CFG->{map_scale};
 
-      if ($::CFG->{fow_enable}) {
-         my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
+         $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
 
-         $self->{fow_texture} = new CFPlus::Texture
-            w              => $w,
-            h              => $h,
-            data           => $data,
-            internalformat => GL_ALPHA,
-            format         => GL_ALPHA;
-      } else {
-         delete $self->{fow_texture};
-      }
+         glScale $self->{tilesize}, $self->{tilesize};
 
-      glNewList $self->{list};
+         if (my $tex = $self->{fow_texture}) {
+            glPushMatrix;
+            glScale 1/3, 1/3;
+            glEnable GL_TEXTURE_2D;
+            glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
-      glPushMatrix;
-      glTranslate $sx0, $sy0;
-      glScale $::CFG->{map_scale}, $::CFG->{map_scale};
+            glColor +($::CFG->{fow_intensity}) x 3, 0.9;
+            $self->{fow_texture}->draw_quad_alpha (0, 0);
 
-      $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
+            glDisable GL_TEXTURE_2D;
+            glPopMatrix;
+         }
 
-      glScale $self->{tilesize}, $self->{tilesize};
+         if ($self->{magicmap}) {
+            my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
 
-      if (my $tex = $self->{fow_texture}) {
-         glPushMatrix;
-         glScale 1/3, 1/3;
-         glEnable GL_TEXTURE_2D;
-         glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
+            $x += $::MAP->ox + $self->{dx};
+            $y += $::MAP->oy + $self->{dy};
 
-         glColor +($::CFG->{fow_intensity}) x 3, 0.9;
-         $self->{fow_texture}->draw_quad_alpha (0, 0);
+            glTranslate - $x - 1, - $y - 1;
+            glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
+            $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
+         }
 
-         glDisable GL_TEXTURE_2D;
          glPopMatrix;
+         glEndList;
       }
-
-      if ($self->{magicmap}) {
-         my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
-
-         $x += $::MAP->ox + $self->{dx};
-         $y += $::MAP->oy + $self->{dy};
-
-         glTranslate - $x - 1, - $y - 1;
-         glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
-         $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
-      }
-
-      glPopMatrix;
-      glEndList;
+   } else {
+      glDeleteList delete $self->{list}
+         if $self->{list};
    }
-
 }
 
 sub draw {