--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/10/08 21:54:20	1.86
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/11/08 01:22:00	1.92
@@ -82,19 +82,7 @@
    my $editsup = $::CONN && $::CONN->{editor_support}
       or return;
 
-   my ($pid, $fh);
-   unless ($pid = open $fh, "-|:utf8", "-") {
-      $SIG{__DIE__} = sub {
-         warn "FATAL: @_\n";
-         CFPlus::_exit 99;
-      };
-
-      open STDERR, ">&STDOUT";
-      binmode STDOUT, ":utf8";
-      binmode STDERR, ":utf8";
-      close $fh;
-
-      $| = 1;
+   CFPlus::background {
       print "preparing editor startup...\n";
       CFPlus::set_proxy;
 
@@ -126,6 +114,10 @@
       if (1) { # upload a map
          my $mapname = $::CONN->{map_info}[0];
 
+         my $mappath = "$mapdir/$mapname";
+
+         -e $mappath and die "$mappath already exists\n";
+
          print "getting map revision for $mapname...\n";
 
          # try to get the most recent head revision, what a hack,
@@ -146,18 +138,16 @@
                cf_login => $::PROFILE->{user},
             };
 
-            my $mappath = "$mapdir/$mapname";
-
             require File::Basename;
             require File::Path;
 
             File::Path::mkpath (File::Basename::dirname ($mappath));
             open my $fh, ">:raw:perlio", "$mappath.meta"
-               or die "$mappath.meta: $!";
+               or die "$mappath.meta: $!\n";
             print $fh CFPlus::to_json $meta;
             close $fh;
             open my $fh, ">:raw:perlio:utf8", $mappath
-               or die "$mappath: $!";
+               or die "$mappath: $!\n";
             print $fh $map;
             close $fh;
 
@@ -195,24 +185,7 @@
             die "viewvc parse error, unable to detect revision\n";
          }
       }
-
-      CFPlus::_exit;
    }
-
-   my $buffer;
-
-   Event->io (fd => $fh, poll => 'r', cb => sub {
-      unless (sysread $fh, $buffer, 4096, length $buffer) {
-         $_[0]->w->cancel;
-         $buffer .= "done\n";
-      }
-
-      while ($buffer =~ s/^(.*)\n//) {
-         ::message ({
-            markup => "editor($pid): " . CFPlus::asxml $1,
-         });
-      }
-   });
 }
 
 sub invoke_button_down {
@@ -222,11 +195,11 @@
       $self->grab_focus;
       return unless $::CONN;
 
-      my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
-      my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
+      my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
+      my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
 
-      $x -= int 0.5 * $self->{sw};
-      $y -= int 0.5 * $self->{sh};
+      $x -= CFPlus::floor $::MAP->w * 0.5;
+      $y -= CFPlus::floor $::MAP->h * 0.5;
 
       $::CONN->lookat ($x, $y)
          if $::CONN;
@@ -475,8 +448,8 @@
 sub set_magicmap {
    my ($self, $w, $h, $x, $y, $data) = @_;
 
-   $x -= $::MAP->ox + int 0.5 * $::MAP->w;
-   $y -= $::MAP->oy + int 0.5 * $::MAP->h;
+   $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
+   $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
 
    $self->{magicmap} = [$x, $y, $w, $h, $data];
 
@@ -497,17 +470,20 @@
    if (delete $self->{need_update}) {
       my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
 
-      my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
-      my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
+      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 $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
-      my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $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 ($sx, $sy, 0, 0, $sw, $sh);
+         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);
@@ -539,7 +515,7 @@
       glTranslate $sx0, $sy0;
       glScale $::CFG->{map_scale}, $::CFG->{map_scale};
 
-      $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
+      $::MAP->draw ($dx, $dy, $sw, $sh);
 
       glScale 32, 32;
 
@@ -556,8 +532,8 @@
       if ($self->{magicmap}) {
          my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
 
-         $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
-         $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
+         $x += $::MAP->ox + $self->{dx};
+         $y += $::MAP->oy + $self->{dy};
 
          glTranslate - $x - 1, - $y - 1;
          glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};