--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/11/07 22:41:27	1.91
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2007/07/19 13:45:18	1.110
@@ -8,6 +8,7 @@
 use CFPlus;
 use CFPlus::OpenGL;
 use CFPlus::UI;
+use CFPlus::Macro;
 
 our @ISA = CFPlus::UI::Base::;
 
@@ -22,11 +23,12 @@
       z         => -1,
       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,
+         0.30, 0.50, 0.30,
+         0.50, 0.50, 0.50,
+         0.30, 0.50, 0.30,
       ],
 
       @_
@@ -40,6 +42,12 @@
    $self
 }
 
+sub set_tilesize {
+   my ($self, $tilesize) = @_;
+
+   $self->{tilesize} = $tilesize;
+}
+
 sub add_command {
    my ($self, $command, $tooltip, $widget, $cb) = @_;
 
@@ -69,22 +77,12 @@
    ::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;
 
    CFPlus::background {
       print "preparing editor startup...\n";
-      CFPlus::set_proxy;
 
       my $server = $editsup->{gameserver} || "default";
       $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
@@ -95,19 +93,12 @@
       print "map directory is $mapdir\n";
       print "lib directory is $libdir\n";
 
-      require LWP::UserAgent;
-
-      my $ua = LWP::UserAgent->new (
-         agent      => "cfplus $CFPlus::VERSION",
-         keep_alive => 1,
-         env_proxy  => 1,
-         timeout    => 30,
-      );
+      my $ua = CFPlus::lwp_useragent;
 
       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";
       }
 
@@ -122,14 +113,14 @@
 
          # 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,
@@ -195,14 +186,19 @@
       $self->grab_focus;
       return unless $::CONN;
 
-      my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
-      my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
+      my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
+      my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
 
       $x -= CFPlus::floor $::MAP->w * 0.5;
       $y -= CFPlus::floor $::MAP->h * 0.5;
 
-      $::CONN->lookat ($x, $y)
-         if $::CONN;
+      if ($::CONN) {
+         if ($::IN_BUILD_MODE) {
+            $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
+         } else {
+            $::CONN->lookat ($x, $y)
+         }
+      }
 
    } elsif ($ev->{button} == 2) {
       $self->grab_focus;
@@ -298,9 +294,11 @@
 }
 
 sub size_request {
+   my ($self) = @_;
+
    (
-      32 * CFPlus::ceil $::WIDTH  / 32,
-      32 * CFPlus::ceil $::HEIGHT / 32,
+      $self->{tilesize} * CFPlus::ceil $::WIDTH  / $self->{tilesize},
+      $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
    )
 }
 
@@ -312,6 +310,7 @@
 }
 
 my %DIR = (
+   CFPlus::SDLK_KP5, [0, "stay fire"],
    CFPlus::SDLK_KP8, [1, "north"],
    CFPlus::SDLK_KP9, [2, "northeast"],
    CFPlus::SDLK_KP6, [3, "east"],
@@ -336,8 +335,8 @@
 
    $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
 
-   if ($uni == ord "\t") {
-      $::PL_WINDOW->toggle_visibility;
+   if ($sym == 9) {
+      ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
    } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
       $::HELP_WINDOW->toggle_visibility;
    } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
@@ -350,24 +349,9 @@
       ::toggle_player_page ($::INVENTORY_PAGE);
    } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
       $::SETUP_DIALOG->toggle_visibility;
-   } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
-      $::BIND_EDITOR->set_binding (undef, undef, [],
-         sub {
-            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)) {
-#      $::BIND_EDITOR->stop;
-#      $::BIND_EDITOR->ask_for_bind_and_commit;
-#      $::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 " ") {
@@ -377,12 +361,15 @@
    } elsif ($uni == ord ".") {
       $::CONN->user_send ($self->{completer}{last_command})
          if exists $self->{completer}{last_command};
-   } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
-      $::CONN->user_send ($_) for @$bind_cmd;
+   } elsif (my @macros = CFPlus::Macro::match_event $ev) {
+      $::CONN->macro_send ($_) for @macros;
    } 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 -");
+   } elsif ($uni == ord '!') {
+      $self->{completer}->set_prefix ("shout ");
+      $self->{completer}->show;
    } elsif ($uni == ord '"') {
       $self->{completer}->set_prefix ("$::CFG->{say_command} ");
       $self->{completer}->show;
@@ -445,30 +432,32 @@
    $res
 }
 
+sub invoke_visibility_change {
+   my ($self) = @_;
+
+   $self->refresh_hook;
+
+   0
+}
+
 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];
 
    $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->{tilesize} = int 32 * $::CFG->{map_scale};
+      my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
 
       my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
       my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
@@ -483,19 +472,11 @@
       my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
 
       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;
-         }
+         my ($w, $h, $data) = $::MAP->fow_texture (
+            $dx, $dy, $sw, $sh,
+            $::CFG->{fow_smooth},
+            pack "f*", @{ $self->{smooth_matrix} },
+         );
 
          $self->{fow_texture} = new CFPlus::Texture
             w              => $w,
@@ -503,8 +484,6 @@
             data           => $data,
             internalformat => GL_ALPHA,
             format         => GL_ALPHA;
-
-         glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
       } else {
          delete $self->{fow_texture};
       }
@@ -515,11 +494,13 @@
       glTranslate $sx0, $sy0;
       glScale $::CFG->{map_scale}, $::CFG->{map_scale};
 
-      $::MAP->draw ($dx, $dy, $sw, $sh);
+      $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
 
-      glScale 32, 32;
+      glScale $self->{tilesize}, $self->{tilesize};
 
       if (my $tex = $self->{fow_texture}) {
+         glPushMatrix;
+         #glScale 1/3, 1/3 if $::CFG->{fow_smooth};
          glEnable GL_TEXTURE_2D;
          glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
 
@@ -527,13 +508,14 @@
          $self->{fow_texture}->draw_quad_alpha (0, 0);
 
          glDisable GL_TEXTURE_2D;
+         glPopMatrix;
       }
 
       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};
@@ -544,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 :)
@@ -571,6 +568,9 @@
 
 package CFPlus::MapWidget::MapMap;
 
+use strict;
+use utf8;
+
 our @ISA = CFPlus::UI::Base::;
 
 use Time::HiRes qw(time);
@@ -580,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) = @_;
 
@@ -598,52 +643,27 @@
 sub _draw {
    my ($self) = @_;
 
-   $::MAP or return;
+   $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
 
-   my ($w, $h) = @$self{qw(w h)};
-
-   my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale}) + 0.99;
-   my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
-
-   my $sx = int $::CFG->{map_shift_x} / 32;
-   my $sy = int $::CFG->{map_shift_y} / 32;
-
-   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;
@@ -689,7 +709,7 @@
             (new CFPlus::UI::Menu
                items => [
                   ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
-                   => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
+                   => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
                ],
             )->popup ($ev);
             return 1;