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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC

       @_
    );
    $self->{completer} = new CFPlus::MapWidget::Command::
       command   => $self->{command},
-      tooltip   => "<b>The Command Completer</b>\n\n"
+      tooltip   => "#completer_help",
-                 . "This is your central interface to send text commands to the server. "
-                 . "To enter a verbatim command to send to the server, just type the command, "
-                 . "followed by a space, and press return. "
-                 . "Typing the initial letters of words (or just any letters) displays guesses "
-                 . "for commands you might want to use.\n"
-                 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
-                 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
    ;
    $self
 }
    $self->{completer}->hide
       if $self->{completer};
 }
+sub server_login {
+   my ($server) = @_;
+   ::stop_game ();
+   local $::PROFILE->{host} = $server;
+   ::start_game ();
+}
+sub editor_invoke {
+   my $editsup = $::CONN && $::CONN->{editor_support}
+      or return;
+   CFPlus::background {
+      print "preparing editor startup...\n";
+      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";
+      my $ua = CFPlus::lwp_useragent;
+      for my $file (qw(archetypes crossfire.0)) {
+         my $url = "$editsup->{lib_root}$file";
+         print "mirroring $url...\n";
+         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 = (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 = (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 (
+#              $ENV{CFPLUS_UPLOAD},
+#              Content_Type => 'multipart/form-data',
+#              Content      => [
+#                 path        => $mapname,
+#                 mapdir      => $ENV{CROSSFIRE_MAPDIR},
+#                 map         => $map,
+#                 revision    => $rev,
+#                 cf_login    => $ENV{CFPLUS_LOGIN},
+#                 cf_password => $ENV{CFPLUS_PASSWORD},
+#                 comment     => "",
+#              ]
+#           );
+#
+#           if ($res->is_error) {
+#              # fatal condition
+#              warn $res->status_line;
+#           } else {
+#              # script replies are marked as {{..}}
+#              my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
+#              warn map "$_\n", @msgs;
+#           }
+         } else {
+            die "viewvc parse error, unable to detect revision\n";
+         }
+      }
+   }
+}
 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;
       $::CONN->lookat ($x, $y)
          if $::CONN;
    } elsif ($ev->{button} == 2) {
          $::CFG->{map_shift_y} = $bh + $y - $oy;
          $self->update;
       };
    } elsif ($ev->{button} == 3) {
-      (new CFPlus::UI::Menu
+      my @items = (
-         items => [
             ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
             ["Statistics\tF2",    sub { ::toggle_player_page ($::STATS_PAGE) }],
             ["Skills\tF3",        sub { ::toggle_player_page ($::SKILL_PAGE) }],
             ["Spells…\tF4",       sub { ::toggle_player_page ($::SPELL_PAGE) }],
             ["Inventory…\tF5",    sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
                $::PICKUP_ENABLE->{state}
                   ? "Disable automatic pickup"
                   : "Enable automatic pickup",
                sub { $::PICKUP_ENABLE->toggle }
             ],
+      );
+      if ($::CONN && $::CONN->{editor_support}) {
+         push @items, [
+            "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
+            \&editor_invoke,
+         ];
+         for my $type (qw(test name)) {
+            $::CONN->{editor_support}{type} ne $type
+               or next;
+            my $server = $::CONN->{editor_support}{"${type}server"}
+               or next;
+            push @items, [
+               "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
+               sub { server_login $server },
+            ];
+         }
+      }
+      push @items,
-            ["Quit",
+         ["Quit",
-               sub {
+            sub {
-                  if ($::CONN) {
+               if ($::CONN) {
-                     &::open_quit_dialog;
+                  &::open_quit_dialog;
-                  } else {
+               } else {
-                     exit;
+                  exit;
-                  }
                }
-            ],
+            }
          ],
+      ;
+      (new CFPlus::UI::Menu
+         items => \@items,
       )->popup ($ev);
    }
    1
 }
             my ($mod, $sym, $cmds) = @_;
             $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
          });
       $::BIND_EDITOR->start;
       $::BIND_EDITOR->show;
+#TODO: elmex, what was this supposed to do? it currently crashes the client.
-   } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
+#   } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
-      $::BIND_EDITOR->stop;
+#      $::BIND_EDITOR->stop;
-      $::BIND_EDITOR->ask_for_bind_and_commit;
+#      $::BIND_EDITOR->ask_for_bind_and_commit;
-      $::BIND_EDITOR->hide;
+#      $::BIND_EDITOR->hide;
    } 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 " ") {
       $::CONN->user_send ("apply");
+   } elsif ($uni == 13) {
+      $::CONN->user_send ("examine");
    } elsif ($uni == ord ".") {
       $::CONN->user_send ($self->{completer}{last_command})
          if exists $self->{completer}{last_command};
-   } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
+   } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
       $::CONN->user_send ($_) for @$bind_cmd;
    } elsif (($sym == CFPlus::SDLK_KP_PLUS  && !$mod) || $uni == ord "+") {
       $::CONN->user_send ("rotateshoottype +");
    } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
       $::CONN->user_send ("rotateshoottype -");
 }
 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);
       }
    $self->SUPER::_draw;
 }
 1

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents): Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs. Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.80 by root, Sun Jul 30 13:16:44 2006 UTC vs.
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC