--- deliantra/Deliantra-Client/DC/MapWidget.pm	2006/06/08 01:51:32	1.51
+++ deliantra/Deliantra-Client/DC/MapWidget.pm	2006/06/14 16:20:22	1.59
@@ -63,16 +63,25 @@
 sub button_down {
    my ($self, $ev, $x, $y) = @_;
 
+   return unless $::CONN;
+
    $self->focus_in;
 
    if ($ev->{button} == 1) {
-      my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale}) + 0.99;
-      my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
+      my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale});
+      my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale});
+      
+      $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
+      $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
+
+      $x -= int 0.5 * $::MAP->w;
+      $y -= int 0.5 * $::MAP->h;
 
-      my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99;
-      my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99;
+      $x += 1;
+      $y += 1;
 
-      $::CONN->send (sprintf "lookat %d %d", $fx, $fy);
+      $::CONN->lookat ($x, $y)
+         if $::CONN;
 
    } elsif ($ev->{button} == 2) {
       my ($ox, $oy) = ($ev->{x}, $ev->{y});
@@ -176,7 +185,10 @@
    } elsif (exists $DIR{$sym}) {
       if ($mod & CFClient::KMOD_SHIFT) {
          $self->{shft}++;
-         $::CONN->user_send ("fire $DIR{$sym}[0]");
+         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) {
          $self->{ctrl}++;
          $::CONN->user_send ("run $DIR{$sym}[0]");
@@ -214,9 +226,22 @@
    my $mod = $ev->{mod};
    my $sym = $ev->{sym};
 
-   if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
-      $::CONN->user_send ("fire_stop");
-      $res = 1;
+   if ($::CFG->{shift_fire_stop}) {
+      if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
+         $::CONN->user_send ("fire_stop");
+         delete $self->{fire_dir};
+         $res = 1;
+      }
+   } else {
+      if (exists $DIR{$sym} && delete $self->{shft}) {
+         $::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?
+         $::CONN->user_send ("fire_stop");
+         delete $self->{fire_dir};
+         $res = 1;
+      }
    }
 
    if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
@@ -234,22 +259,26 @@
                  || $CFClient::UI::FOCUS == $self->{completer}{entry};
 
    return
-      unless $focused || !$::FAST;
+      unless $::CONN && ($focused || !$::FAST);
 
    if (delete $self->{need_update}) {
+      $self->{fow_texture} ||= glGenTexture;
+
       glNewList $self->{list};
 
       if ($::MAP) {
-         my $sw = int $::WIDTH  / (32 * $::CFG->{map_scale}) + 0.99;
-         my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
+         my $sw = $self->{sw} = int $::WIDTH  / (32 * $::CFG->{map_scale}) + 0.99;
+         my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
 
-         my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
-         my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
+         my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
+         my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
+         my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
+         my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
 
          glPushMatrix;
          glScale $::CFG->{map_scale}, $::CFG->{map_scale};
 
-         glTranslate $sx0 - 32, $sy0 - 32, 0;
+         glTranslate $sx0, $sy0;
 
          my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1);
 
@@ -456,6 +485,19 @@
       on_changed => sub {
          $self->update_labels;
       },
+      on_button_down => sub {
+         my ($entry, $ev, $x, $y) = @_;
+
+         if ($ev->{button} == 3) {
+            (new CFClient::UI::Menu
+               items => [
+                  ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }]
+               ],
+            )->popup ($ev);
+            return 1;
+         }
+         0
+      },
       on_key_down => sub {
          my ($entry, $ev) = @_;
 
@@ -465,18 +507,41 @@
             if (exists $self->{select}) {
                $self->{last_command} = $self->{select};
                $::CONN->user_send ($self->{select});
+
+               unshift @{$self->{history}}, $self->{select};
+               $self->{hist_ptr} = 0;
+
                $self->hide;
             }
          } elsif ($ev->{sym} == 27) {
+            $self->{hist_ptr} = 0;
             $self->hide;
             return;
          } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
-            ++$self->{select_offset}
-               if $self->{select_offset} < $#{ $self->{last_match} || [] };
+            if ($self->{hist_ptr} > 1) {
+               $self->{hist_ptr}--;
+               $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
+            } elsif ($self->{hist_ptr} > 0) {
+               $self->{hist_ptr}--;
+               $self->{entry}->set_text ($self->{hist_saveback});
+            } else {
+               ++$self->{select_offset}
+                  if $self->{select_offset} < $#{ $self->{last_match} || [] };
+            }
             $self->update_labels;
          } elsif ($ev->{sym} == CFClient::SDLK_UP) {
-            --$self->{select_offset}
-               if $self->{select_offset};
+            if ($self->{select_offset}) {
+               --$self->{select_offset}
+            } else {
+               unless ($self->{hist_ptr}) {
+                  $self->{hist_saveback} = $self->{entry}->get_text;
+               }
+               if ($self->{hist_ptr} <= $#{$self->{history}}) {
+                  $self->{hist_ptr}++;
+               }
+               $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
+                  if exists $self->{history}->[$self->{hist_ptr} - 1];
+            }
             $self->update_labels;
          } else {
             return 0;