--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/12/10 01:30:54	1.98
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2007/07/17 17:39:07	1.109
@@ -23,11 +23,12 @@
       z         => -1,
       can_focus => 1,
       list      => glGenList,
+      tilesize  => 32,
 
       smooth_matrix => [
-         0.05, 0.13, 0.05,
-         0.13, 0.30, 0.13,
-         0.05, 0.13, 0.05,
+         0.30, 0.50, 0.30,
+         0.50, 0.50, 0.50,
+         0.30, 0.50, 0.30,
       ],
 
       @_
@@ -41,6 +42,12 @@
    $self
 }
 
+sub set_tilesize {
+   my ($self, $tilesize) = @_;
+
+   $self->{tilesize} = $tilesize;
+}
+
 sub add_command {
    my ($self, $command, $tooltip, $widget, $cb) = @_;
 
@@ -179,8 +186,8 @@
       $self->grab_focus;
       return unless $::CONN;
 
-      my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
-      my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
+      my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
+      my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
 
       $x -= CFPlus::floor $::MAP->w * 0.5;
       $y -= CFPlus::floor $::MAP->h * 0.5;
@@ -287,9 +294,11 @@
 }
 
 sub size_request {
+   my ($self) = @_;
+
    (
-      32 * CFPlus::ceil $::WIDTH  / 32,
-      32 * CFPlus::ceil $::HEIGHT / 32,
+      $self->{tilesize} * CFPlus::ceil $::WIDTH  / $self->{tilesize},
+      $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
    )
 }
 
@@ -301,6 +310,7 @@
 }
 
 my %DIR = (
+   CFPlus::SDLK_KP5, [0, "stay fire"],
    CFPlus::SDLK_KP8, [1, "north"],
    CFPlus::SDLK_KP9, [2, "northeast"],
    CFPlus::SDLK_KP6, [3, "east"],
@@ -325,8 +335,8 @@
 
    $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
 
-   if ($uni == ord "\t") {
-      $::PL_WINDOW->toggle_visibility;
+   if ($sym == 9) {
+      ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
    } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
       $::HELP_WINDOW->toggle_visibility;
    } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
@@ -342,8 +352,6 @@
    } elsif (!$::CONN) {
       return 0; # bindings further down need a valid connection
 
-   } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
-      $::CONN->user_send ("stay fire");
    } elsif ($uni == ord ",") {
       $::CONN->user_send ("take");
    } elsif ($uni == ord " ") {
@@ -359,6 +367,9 @@
       $::CONN->user_send ("rotateshoottype +");
    } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
       $::CONN->user_send ("rotateshoottype -");
+   } elsif ($uni == ord '!') {
+      $self->{completer}->set_prefix ("shout ");
+      $self->{completer}->show;
    } elsif ($uni == ord '"') {
       $self->{completer}->set_prefix ("$::CFG->{say_command} ");
       $self->{completer}->show;
@@ -444,7 +455,7 @@
       unless $focused || !$::FAST;
 
    if (delete $self->{need_update}) {
-      my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
+      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;
@@ -459,19 +470,11 @@
       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);
-
-         if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # 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*", @{ $self->{smooth_matrix} }),
-            );
-            glEnable GL_CONVOLUTION_2D;
-         }
+         my ($w, $h, $data) = $::MAP->fow_texture (
+            $dx, $dy, $sw, $sh,
+            $::CFG->{fow_smooth},
+            pack "f*", @{ $self->{smooth_matrix} },
+         );
 
          $self->{fow_texture} = new CFPlus::Texture
             w              => $w,
@@ -479,8 +482,6 @@
             data           => $data,
             internalformat => GL_ALPHA,
             format         => GL_ALPHA;
-
-         glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
       } else {
          delete $self->{fow_texture};
       }
@@ -491,11 +492,13 @@
       glTranslate $sx0, $sy0;
       glScale $::CFG->{map_scale}, $::CFG->{map_scale};
 
-      $::MAP->draw ($dx, $dy, $sw, $sh);
+      $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
 
-      glScale 32, 32;
+      glScale $self->{tilesize}, $self->{tilesize};
 
       if (my $tex = $self->{fow_texture}) {
+         glPushMatrix;
+         #glScale 1/3, 1/3 if $::CFG->{fow_smooth};
          glEnable GL_TEXTURE_2D;
          glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
@@ -503,6 +506,7 @@
          $self->{fow_texture}->draw_quad_alpha (0, 0);
 
          glDisable GL_TEXTURE_2D;
+         glPopMatrix;
       }
 
       if ($self->{magicmap}) {
@@ -547,6 +551,9 @@
 
 package CFPlus::MapWidget::MapMap;
 
+use strict;
+use utf8;
+
 our @ISA = CFPlus::UI::Base::;
 
 use Time::HiRes qw(time);
@@ -578,11 +585,11 @@
 
    my ($w, $h) = @$self{qw(w h)};
 
-   my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale}) + 0.99;
-   my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
+   my $sw = int $::WIDTH  / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
+   my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
 
-   my $sx = int $::CFG->{map_shift_x} / 32;
-   my $sy = int $::CFG->{map_shift_y} / 32;
+   my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
+   my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
 
    my $ox = 0.5 * ($w - $sw);
    my $oy = 0.5 * ($h - $sh);