[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/MapWidget.pm

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC vs.
Revision 1.94 by elmex, Mon Dec 4 15:17:14 2006 UTC

    ::stop_game ();
    local $::PROFILE->{host} = $server;
    ::start_game ();
 }
-sub check_lwp($) {
-   my ($res) = @_;
-   $res->is_error
-      and die $res->status_line;
-   $res
-}
 sub editor_invoke {
    my $editsup = $::CONN && $::CONN->{editor_support}
       or return;
-   # putting the password into the env is somewhat tasteless
+   CFPlus::background {
-#   local $ENV{CFPLUS_LOGIN}     = $::PROFILE->{user};
-#   local $ENV{CFPLUS_PASSWORD}  = $::PROFILE->{password};
-#   local $ENV{CFPLUS_UPLOAD}    = $::CONN->{upload};
-   my ($pid, $fh);
-   unless ($pid = open $fh, "-|:utf8", "-") {
-      $SIG{__DIE__} = sub {
-         warn "@_\n";
-         CFPlus::_exit 99;
-      };
-      open STDERR, ">&STDOUT";
-      binmode STDOUT, ":utf8";
-      binmode STDERR, ":utf8";
-      close $fh;
-      $| = 1;
       print "preparing editor startup...\n";
-      CFPlus::set_proxy;
       my $server = $editsup->{gameserver} || "default";
       $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
       local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
       local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
       print "map directory is $mapdir\n";
       print "lib directory is $libdir\n";
-      require LWP::UserAgent;
+      my $ua = CFPlus::lwp_useragent;
-      my $ua = LWP::UserAgent->new (
-         agent      => "cfplus $CFPlus::VERSION",
-         keep_alive => 1,
-         env_proxy  => 1,
-         timeout    => 30,
-      );
       for my $file (qw(archetypes crossfire.0)) {
          my $url = "$editsup->{lib_root}$file";
          print "mirroring $url...\n";
-         check_lwp $ua->mirror ($url, "$libdir/$file");
+         CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
          printf "%s size %d octets\n", $file, -s "$libdir/$file";
       }
       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,
          # this should have been returned while downloading *sigh*
-         my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
+         my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
          if ($log =~ /\?rev=(\d+\.\d+)"/) {
             my $rev = $1;
             print "downloading revision $rev...\n";
-            my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
+            my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
+            my $meta = {
+               %$editsup,
+               path     => $mapname,
+               revision => $rev,
+               cf_login => $::PROFILE->{user},
+            };
+            require File::Basename;
+            require File::Path;
+            File::Path::mkpath (File::Basename::dirname ($mappath));
+            open my $fh, ">:raw:perlio", "$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: $!\n";
+            print $fh $map;
+            close $fh;
+            print "saved as $mappath\n";
+            print "invoking editor...\n";
+            exec "/root/s2/gce $mappath";#d#
             # now upload it
 #           require HTTP::Request::Common;
 #
 #           my $res = $ua->post (
 #           }
          } else {
             die "viewvc parse error, unable to detect revision\n";
          }
       }
-      print "invoking editor...\n";
-      exec "/root/s2/gce";#d#
-      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 {
    my ($self, $ev, $x, $y) = @_;
    if ($ev->{button} == 1) {
       $self->grab_focus;
       return unless $::CONN;
-      my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
+      my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
-      my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
+      my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
-      $x -= int 0.5 * $self->{sw};
+      $x -= CFPlus::floor $::MAP->w * 0.5;
-      $y -= int 0.5 * $self->{sh};
+      $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)
-         if $::CONN;
+         }
+      }
    } elsif ($ev->{button} == 2) {
       $self->grab_focus;
       return unless $::CONN;
 }
 sub set_magicmap {
    my ($self, $w, $h, $x, $y, $data) = @_;
-   $x -= $::MAP->ox + int 0.5 * $::MAP->w;
+   $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
-   $y -= $::MAP->oy + int 0.5 * $::MAP->h;
+   $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
    $self->{magicmap} = [$x, $y, $w, $h, $data];
    $self->update;
 }
       unless $focused || !$::FAST;
    if (delete $self->{need_update}) {
       my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
+      my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
+      my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
-      my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
+      my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
-      my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $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 $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
-      my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
+      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);
             glConvolutionFilter2D (
                GL_CONVOLUTION_2D,
       glPushMatrix;
       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;
       if (my $tex = $self->{fow_texture}) {
          glEnable GL_TEXTURE_2D;
       }
       if ($self->{magicmap}) {
          my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
-         $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
+         $x += $::MAP->ox + $self->{dx};
-         $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
+         $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);
       }

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC vs. Revision 1.94 by elmex, Mon Dec 4 15:17:14 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.85 by root, Sun Oct 8 21:22:30 2006 UTC vs.
Revision 1.94 by elmex, Mon Dec 4 15:17:14 2006 UTC