--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/12/09 21:44:43	1.96
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2007/04/04 02:54:02	1.105
@@ -23,6 +23,7 @@
       z         => -1,
       can_focus => 1,
       list      => glGenList,
+      tilesize  => 32,
 
       smooth_matrix => [
          0.05, 0.13, 0.05,
@@ -41,6 +42,12 @@
    $self
 }
 
+sub set_tilesize {
+   my ($self, $tilesize) = @_;
+
+   $self->{tilesize} = $tilesize;
+}
+
 sub add_command {
    my ($self, $command, $tooltip, $widget, $cb) = @_;
 
@@ -287,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},
    )
 }
 
@@ -325,8 +334,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) {
@@ -353,12 +362,15 @@
    } elsif ($uni == ord ".") {
       $::CONN->user_send ($self->{completer}{last_command})
          if exists $self->{completer}{last_command};
-   } elsif (my $macro = CFPlus::Macro::match_event $ev) {
-      $::CONN->macro_send ($macro);
+   } 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;
@@ -444,7 +456,7 @@
       unless $focused || !$::FAST;
 
    if (delete $self->{need_update}) {
-      my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
+      my $tilesize = $self->{tilesize} = (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;
@@ -491,9 +503,9 @@
       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}) {
          glEnable GL_TEXTURE_2D;
@@ -547,6 +559,9 @@
 
 package CFPlus::MapWidget::MapMap;
 
+use strict;
+use utf8;
+
 our @ISA = CFPlus::UI::Base::;
 
 use Time::HiRes qw(time);
@@ -578,11 +593,11 @@
 
    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 $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} / 32;
-   my $sy = int $::CFG->{map_shift_y} / 32;
+   my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
+   my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
 
    my $ox = 0.5 * ($w - $sw);
    my $oy = 0.5 * ($h - $sh);