--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/06/18 17:23:35	1.64
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/09/29 00:56:06	1.82
@@ -1,16 +1,18 @@
-package CFClient::MapWidget;
+package CFPlus::MapWidget;
 
 use strict;
 use utf8;
 
 use List::Util qw(min max);
 
-use CFClient::OpenGL;
+use CFPlus;
+use CFPlus::OpenGL;
+use CFPlus::UI;
 
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 
 my $magicmap_tex =
-      new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
+      new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
          mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
 
 sub new {
@@ -30,17 +32,9 @@
       @_
    );
 
-   $self->{completer} = new CFClient::MapWidget::Command::
+   $self->{completer} = new CFPlus::MapWidget::Command::
       command   => $self->{command},
-      can_focus => 1,
-      tooltip   => "<b>The Command Completer</b>\n\n"
-                 . "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.",
+      tooltip   => "#completer_help",
    ;
 
    $self
@@ -62,18 +56,20 @@
    my ($self) = @_;
 
    %{$self->{completer}{command}} = ();
+
+   $self->{completer}->hide
+      if $self->{completer};
 }
 
 sub invoke_button_down {
    my ($self, $ev, $x, $y) = @_;
 
-   return unless $::CONN;
-
-   $self->grab_focus;
-
    if ($ev->{button} == 1) {
-      my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
-      my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
+      $self->grab_focus;
+      return unless $::CONN;
+
+      my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
+      my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
 
       $x -= int 0.5 * $self->{sw};
       $y -= int 0.5 * $self->{sh};
@@ -82,6 +78,9 @@
          if $::CONN;
 
    } elsif ($ev->{button} == 2) {
+      $self->grab_focus;
+      return unless $::CONN;
+      
       my ($ox, $oy) = ($ev->{x}, $ev->{y});
       my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
 
@@ -95,6 +94,33 @@
 
          $self->update;
       };
+   } elsif ($ev->{button} == 3) {
+      (new CFPlus::UI::Menu
+         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) }],
+            ["Setup… \tF9",       sub { $::SETUP_DIALOG->toggle_visibility }],
+            ["Server Messages…",  sub { $::MESSAGE_WINDOW->toggle_visibility }],
+            [
+               $::PICKUP_ENABLE->{state}
+                  ? "Disable automatic pickup"
+                  : "Enable automatic pickup",
+               sub { $::PICKUP_ENABLE->toggle }
+            ],
+            ["Quit",
+               sub {
+                  if ($::CONN) {
+                     &::open_quit_dialog;
+                  } else {
+                     exit;
+                  }
+               }
+            ],
+         ],
+      )->popup ($ev);
    }
 
    1
@@ -122,8 +148,8 @@
 
 sub size_request {
    (
-      1 + 32 * int $::WIDTH  / 32,
-      1 + 32 * int $::HEIGHT / 32,
+      32 * CFPlus::ceil $::WIDTH  / 32,
+      32 * CFPlus::ceil $::HEIGHT / 32,
    )
 }
 
@@ -135,44 +161,76 @@
 }
 
 my %DIR = (
-   CFClient::SDLK_KP8, [1, "north"],
-   CFClient::SDLK_KP9, [2, "northeast"],
-   CFClient::SDLK_KP6, [3, "east"],
-   CFClient::SDLK_KP3, [4, "southeast"],
-   CFClient::SDLK_KP2, [5, "south"],
-   CFClient::SDLK_KP1, [6, "southwest"],
-   CFClient::SDLK_KP4, [7, "west"],
-   CFClient::SDLK_KP7, [8, "northwest"],
-
-   CFClient::SDLK_UP,    [1, "north"],
-   CFClient::SDLK_RIGHT, [3, "east"],
-   CFClient::SDLK_DOWN,  [5, "south"],
-   CFClient::SDLK_LEFT,  [7, "west"],
+   CFPlus::SDLK_KP8, [1, "north"],
+   CFPlus::SDLK_KP9, [2, "northeast"],
+   CFPlus::SDLK_KP6, [3, "east"],
+   CFPlus::SDLK_KP3, [4, "southeast"],
+   CFPlus::SDLK_KP2, [5, "south"],
+   CFPlus::SDLK_KP1, [6, "southwest"],
+   CFPlus::SDLK_KP4, [7, "west"],
+   CFPlus::SDLK_KP7, [8, "northwest"],
+
+   CFPlus::SDLK_UP,    [1, "north"],
+   CFPlus::SDLK_RIGHT, [3, "east"],
+   CFPlus::SDLK_DOWN,  [5, "south"],
+   CFPlus::SDLK_LEFT,  [7, "west"],
 );
 
 sub invoke_key_down {
    my ($self, $ev) = @_;
 
-   return 0 unless $::CONN;
-
    my $mod = $ev->{mod};
    my $sym = $ev->{sym};
    my $uni = $ev->{unicode};
 
-   if ($sym == CFClient::SDLK_KP5) {
+   $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
+
+   if ($uni == ord "\t") {
+      $::PL_WINDOW->toggle_visibility;
+   } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
+      $::HELP_WINDOW->toggle_visibility;
+   } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
+      ::toggle_player_page ($::STATS_PAGE);
+   } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
+      ::toggle_player_page ($::SKILL_PAGE);
+   } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
+      ::toggle_player_page ($::SPELL_PAGE);
+   } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
+      ::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 " ") {
       $::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 ($uni == ord "\t") {
-      $::INV_WINDOW->toggle_visibility;
-   } elsif ($sym == CFClient::SDLK_KP_PLUS  || $uni == ord "+") {
+   } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
+      $::CONN->user_send ($_) for @$bind_cmd;
+   } elsif (($sym == CFPlus::SDLK_KP_PLUS  && !$mod) || $uni == ord "+") {
       $::CONN->user_send ("rotateshoottype +");
-   } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
+   } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
       $::CONN->user_send ("rotateshoottype -");
    } elsif ($uni == ord '"') {
       $self->{completer}->set_prefix ("$::CFG->{say_command} ");
@@ -181,34 +239,20 @@
       $self->{completer}->set_prefix ("");
       $self->{completer}->show;
    } elsif (exists $DIR{$sym}) {
-      if ($mod & CFClient::KMOD_SHIFT) {
+      if ($mod & CFPlus::KMOD_SHIFT) {
          $self->{shft}++;
          if ($DIR{$sym}[0] != $self->{fire_dir}) {
             $::CONN->user_send ("fire $DIR{$sym}[0]");
          }
          $self->{fire_dir} = $DIR{$sym}[0];
-      } elsif ($mod & CFClient::KMOD_CTRL) {
+      } elsif ($mod & CFPlus::KMOD_CTRL) {
          $self->{ctrl}++;
          $::CONN->user_send ("run $DIR{$sym}[0]");
       } else {
          $::CONN->user_send ("$DIR{$sym}[1]");
       }
-   } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
-      $::BIND_EDITOR->set_binding (undef, undef, [],
-         sub {
-            my ($mod, $sym, $cmds) = @_;
-            $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
-         });
-      $::BIND_EDITOR->start;
-      $::BIND_EDITOR->show;
-   } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
-      $::BIND_EDITOR->stop;
-      $::BIND_EDITOR->ask_for_bind_and_commit;
-      $::BIND_EDITOR->hide;
-   } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
-      $::CONN->user_send ($_) for @$bind_cmd;
    } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
-      $self->{completer}->key_down ($ev);
+      $self->{completer}->inject_key_down ($ev);
       $self->{completer}->show;
    } else {
       return 0;
@@ -225,7 +269,7 @@
    my $sym = $ev->{sym};
 
    if ($::CFG->{shift_fire_stop}) {
-      if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
+      if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
          $::CONN->user_send ("fire_stop");
          delete $self->{fire_dir};
          $res = 1;
@@ -235,14 +279,14 @@
          $::CONN->user_send ("fire_stop");
          delete $self->{fire_dir};
          $res = 1;
-      } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
+      } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
          $::CONN->user_send ("fire_stop");
          delete $self->{fire_dir};
          $res = 1;
       }
    }
 
-   if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
+   if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
       $::CONN->user_send ("run_stop");
       $res = 1;
    }
@@ -266,8 +310,8 @@
 
    return unless $::MAP;
 
-   my $focused = $CFClient::UI::FOCUS == $self
-                 || $CFClient::UI::FOCUS == $self->{completer}{entry};
+   my $focused = $CFPlus::UI::FOCUS == $self
+                 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
 
    return
       unless $focused || !$::FAST;
@@ -275,19 +319,19 @@
    if (delete $self->{need_update}) {
       my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
 
-      my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
-      my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
+      my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
+      my $sy = $self->{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 + CFClient::ceil $self->{w} / $tilesize;
-      my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
+      my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
+      my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
 
       if ($::CFG->{fow_enable}) {
          my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
 
-         if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
+         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,
@@ -299,7 +343,7 @@
             glEnable GL_CONVOLUTION_2D;
          }
 
-         $self->{fow_texture} = new CFClient::Texture
+         $self->{fow_texture} = new CFPlus::Texture
             w              => $w,
             h              => $h,
             data           => $data,
@@ -371,12 +415,12 @@
    $self->SUPER::DESTROY;
 }
 
-package CFClient::MapWidget::MapMap;
+package CFPlus::MapWidget::MapMap;
 
-our @ISA = CFClient::UI::Base::;
+our @ISA = CFPlus::UI::Base::;
 
 use Time::HiRes qw(time);
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
 sub size_request {
    ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
@@ -422,11 +466,11 @@
       $self->{texture_atime} = time + 1/3;
 
       $self->{texture} =
-         new CFClient::Texture
+         new CFPlus::Texture
             w    => $w,
             h    => $h,
             data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
-            type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
+            type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
    }
 
    $self->{texture}->draw_quad (0, 0);
@@ -451,13 +495,13 @@
    glDisable GL_BLEND;
 }
 
-package CFClient::MapWidget::Command;
+package CFPlus::MapWidget::Command;
 
 use strict;
 
-use CFClient::OpenGL;
+use CFPlus::OpenGL;
 
-our @ISA = CFClient::UI::Frame::;
+our @ISA = CFPlus::UI::Frame::;
 
 sub new {
    my $class = shift;
@@ -467,11 +511,11 @@
       @_,
    );
 
-   $self->add ($self->{vbox} = new CFClient::UI::VBox);
+   $self->add ($self->{vbox} = new CFPlus::UI::VBox);
 
    $self->{label} = [
       map
-         CFClient::UI::Label->new (
+         CFPlus::UI::Label->new (
             can_hover     => 1,
             can_events    => 1,
             tooltip_width => 0.33,
@@ -479,7 +523,7 @@
          ), (0.8) x 16
    ];
 
-   $self->{entry} = new CFClient::UI::Entry
+   $self->{entry} = new CFPlus::UI::Entry
       on_changed => sub {
          $self->update_labels;
          0
@@ -488,9 +532,10 @@
          my ($entry, $ev, $x, $y) = @_;
 
          if ($ev->{button} == 3) {
-            (new CFClient::UI::Menu
+            (new CFPlus::UI::Menu
                items => [
-                  ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
+                  ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
+                   => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
                ],
             )->popup ($ev);
             return 1;
@@ -507,7 +552,7 @@
                $self->{last_command} = $self->{select};
                $::CONN->user_send ($self->{select});
 
-               unshift @{$self->{history}}, $self->{select};
+               unshift @{$self->{history}}, $self->{entry}->get_text;
                $self->{hist_ptr} = 0;
 
                $self->hide;
@@ -515,8 +560,7 @@
          } elsif ($ev->{sym} == 27) {
             $self->{hist_ptr} = 0;
             $self->hide;
-            return;
-         } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
+         } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
             if ($self->{hist_ptr} > 1) {
                $self->{hist_ptr}--;
                $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
@@ -528,7 +572,7 @@
                   if $self->{select_offset} < $#{ $self->{last_match} || [] };
             }
             $self->update_labels;
-         } elsif ($ev->{sym} == CFClient::SDLK_UP) {
+         } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
             if ($self->{select_offset}) {
                --$self->{select_offset}
             } else {
@@ -583,14 +627,17 @@
 sub hide {
    my ($self) = @_;
 
+   $self->{hist_ptr} = 0;
+
    $self->SUPER::hide;
    $self->{entry}->set_text ("");
 }
 
-sub invoke_key_down {
+sub inject_key_down {
    my ($self, $ev) = @_;
 
-   $self->{entry}->key_down ($ev)
+   $self->{entry}->grab_focus;
+   $self->{entry}->emit (key_down => $ev);
 }
 
 sub update_labels {
@@ -687,14 +734,13 @@
    }
 
    $self->update;
-   ###
 }
 
 sub _draw {
    my ($self) = @_;
 
    # hack
-   local $CFClient::UI::FOCUS = $self->{entry};
+   local $CFPlus::UI::FOCUS = $self->{entry};
 
    $self->SUPER::_draw;
 }