--- deliantra/Deliantra-Client/DC/MapWidget.pm	2007/07/17 17:39:07	1.109
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2007/07/19 13:45:18	1.110
@@ -432,6 +432,14 @@
    $res
 }
 
+sub invoke_visibility_change {
+   my ($self) = @_;
+
+   $self->refresh_hook;
+
+   0
+}
+
 sub set_magicmap {
    my ($self, $w, $h, $x, $y, $data) = @_;
 
@@ -443,17 +451,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;
 
@@ -524,6 +526,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 :)
@@ -563,6 +580,51 @@
    ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
 }
 
+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 {
    my ($self, $w, $h) = @_;
 
@@ -581,52 +643,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;