--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/12/09 02:21:25	1.95
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2007/01/02 14:45:22	1.100
@@ -325,8 +325,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) {
@@ -339,19 +339,6 @@
       ::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
 
@@ -366,12 +353,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;