--- deliantra/Deliantra-Client/DC/MapWidget.pm	2007/04/25 01:12:31	1.108
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2007/07/19 14:54:50	1.111
@@ -24,13 +24,6 @@
       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,
-      ],
-
       @_
    );
 
@@ -432,6 +425,14 @@
    $res
 }
 
+sub invoke_visibility_change {
+   my ($self) = @_;
+
+   $self->refresh_hook;
+
+   0
+}
+
 sub set_magicmap {
    my ($self, $w, $h, $x, $y, $data) = @_;
 
@@ -443,17 +444,11 @@
    $self->update;
 }
 
-sub draw {
+sub refresh_hook {
    my ($self) = @_;
 
    return unless $::MAP;
 
-   my $focused = $CFPlus::UI::FOCUS == $self
-                 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
-
-   return
-      unless $focused || !$::FAST;
-
    if (delete $self->{need_update}) {
       my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
 
@@ -472,26 +467,12 @@
       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;
-         }
-
          $self->{fow_texture} = new CFPlus::Texture
             w              => $w,
             h              => $h,
             data           => $data,
             internalformat => GL_ALPHA,
             format         => GL_ALPHA;
-
-         glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
       } else {
          delete $self->{fow_texture};
       }
@@ -507,6 +488,8 @@
       glScale $self->{tilesize}, $self->{tilesize};
 
       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;
 
@@ -514,6 +497,7 @@
          $self->{fow_texture}->draw_quad_alpha (0, 0);
 
          glDisable GL_TEXTURE_2D;
+         glPopMatrix;
       }
 
       if ($self->{magicmap}) {
@@ -531,6 +515,21 @@
       glEndList;
    }
 
+}
+
+sub draw {
+   my ($self) = @_;
+
+   $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
+
+   return unless $self->{list};
+
+   my $focused = $CFPlus::UI::FOCUS == $self
+                 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
+
+   return
+      unless $focused || !$::FAST;
+
    glCallList $self->{list};
 
    # TNT2 emulates logops in software (or worse :)
@@ -567,7 +566,52 @@
 use CFPlus::OpenGL;
 
 sub size_request {
-   ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
+   ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
+}
+
+sub refresh_hook {
+   my ($self) = @_;
+
+   if ($::MAP && $self->{texture_atime} < time) {
+      my ($w, $h) = @$self{qw(w h)};
+
+      my $sw = int $::WIDTH  / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
+      my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
+
+      my $ox = 0.5 * ($w - $sw);
+      my $oy = 0.5 * ($h - $sh);
+
+      my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
+      my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
+
+      #TODO: map scale is completely borked
+
+      my $x0 = int $ox - $sx + 0.5;
+      my $y0 = int $oy - $sy + 0.5;
+
+      $self->{sw} = $sw;
+      $self->{sh} = $sh;
+
+      $self->{x0} = $x0;
+      $self->{y0} = $y0;
+
+      $self->{texture_atime} = time + 1/3;
+
+      $self->{texture} =
+         new CFPlus::Texture
+            w    => $w,
+            h    => $h,
+            data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
+            type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
+   }
+}
+
+sub invoke_visibility_change {
+   my ($self) = @_;
+
+   $self->refresh_hook;
+
+   0
 }
 
 sub invoke_size_allocate {
@@ -588,52 +632,27 @@
 sub _draw {
    my ($self) = @_;
 
-   $::MAP or return;
-
-   my ($w, $h) = @$self{qw(w h)};
-
-   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} / $::MAPWIDGET->{tilesize};
-   my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
+   $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
 
-   my $ox = 0.5 * ($w - $sw);
-   my $oy = 0.5 * ($h - $sh);
+   $self->{texture} or return;
 
    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;
 
-   if ($self->{texture_atime} < time) {
-      $self->{texture_atime} = time + 1/3;
-
-      $self->{texture} =
-         new CFPlus::Texture
-            w    => $w,
-            h    => $h,
-            data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
-            type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
-   }
-
    $self->{texture}->draw_quad (0, 0);
 
    glDisable GL_TEXTURE_2D;
 
    glTranslate 0.375, 0.375;
 
-   #TODO: map scale is completely borked
-
-   my $x0 = int $ox - $sx + 0.5;
-   my $y0 = int $oy - $sy + 0.5;
-
    glColor 1, 1, 0, 1;
    glBegin GL_LINE_LOOP;
-   glVertex $x0      , $y0      ;
-   glVertex $x0      , $y0 + $sh;
-   glVertex $x0 + $sw, $y0 + $sh;
-   glVertex $x0 + $sw, $y0      ;
+   glVertex $self->{x0}              , $self->{y0}              ;
+   glVertex $self->{x0}              , $self->{y0} + $self->{sh};
+   glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
+   glVertex $self->{x0} + $self->{sw}, $self->{y0}              ;
    glEnd;
    
    glDisable GL_BLEND;