--- deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/02 09:02:49 1.46 +++ deliantra/Deliantra-Client/DC/MapWidget.pm 2006/06/08 01:51:32 1.51 @@ -16,6 +16,13 @@ z => -1, can_focus => 1, list => glGenList, + + smooth_matrix => [ + 0.05, 0.13, 0.05, + 0.13, 0.30, 0.13, + 0.05, 0.13, 0.05, + ], + @_ ); @@ -58,7 +65,16 @@ $self->focus_in; - if ($ev->{button} == 2) { + 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 $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; + + $::CONN->send (sprintf "lookat %d %d", $fx, $fy); + + } elsif ($ev->{button} == 2) { my ($ox, $oy) = ($ev->{x}, $ev->{y}); my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); @@ -73,18 +89,28 @@ $self->update; }; } + + 1 } sub button_up { my ($self, $ev, $x, $y) = @_; delete $self->{motion}; + + 1 } sub mouse_motion { my ($self, $ev, $x, $y) = @_; - $self->{motion}->($ev, $x, $y) if $self->{motion}; + if ($self->{motion}) { + $self->{motion}->($ev, $x, $y); + } else { + return 0; + } + + 1 } sub size_request { @@ -120,7 +146,7 @@ sub key_down { my ($self, $ev) = @_; - return unless $::CONN; + return 0 unless $::CONN; my $mod = $ev->{mod}; my $sym = $ev->{sym}; @@ -174,21 +200,31 @@ } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { $self->{completer}->key_down ($ev); $self->{completer}->show; + } else { + return 0; } + + 1 } sub key_up { my ($self, $ev) = @_; + my $res = 0; my $mod = $ev->{mod}; my $sym = $ev->{sym}; if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { $::CONN->user_send ("fire_stop"); + $res = 1; } + if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { $::CONN->user_send ("run_stop"); + $res = 1; } + + $res } sub draw { @@ -225,10 +261,7 @@ GL_ALPHA, 3, 3, GL_ALPHA, GL_FLOAT, - pack "f*", - 0.05, 0.13, 0.05, - 0.13, 0.30, 0.13, - 0.05, 0.13, 0.05, + (pack "f*", @{ $self->{smooth_matrix} }), ); glEnable GL_CONVOLUTION_2D; } @@ -492,7 +525,7 @@ sub key_down { my ($self, $ev) = @_; - $self->{entry}->key_down ($ev); + $self->{entry}->key_down ($ev) } sub update_labels {