| … | |
… | |
| 37 | sub button_down { |
37 | sub button_down { |
| 38 | my ($self, $ev, $x, $y) = @_; |
38 | my ($self, $ev, $x, $y) = @_; |
| 39 | |
39 | |
| 40 | $self->focus_in; |
40 | $self->focus_in; |
| 41 | |
41 | |
| 42 | if ($ev->button == 2) { |
42 | if ($ev->{button} == 2) { |
| 43 | my ($ox, $oy) = ($ev->button_x, $ev->button_y); |
43 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
| 44 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
44 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
| 45 | |
45 | |
| 46 | $self->{motion} = sub { |
46 | $self->{motion} = sub { |
| 47 | my ($ev, $x, $y) = @_; |
47 | my ($ev, $x, $y) = @_; |
| 48 | |
48 | |
| 49 | ($x, $y) = ($ev->motion_x, $ev->motion_y); |
49 | ($x, $y) = ($ev->{x}, $ev->{y}); |
| 50 | |
50 | |
| 51 | $::CFG->{map_shift_x} = $bw + $x - $ox; |
51 | $::CFG->{map_shift_x} = $bw + $x - $ox; |
| 52 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
52 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
| 53 | |
53 | |
| 54 | $self->update; |
54 | $self->update; |
| … | |
… | |
| 199 | ); |
199 | ); |
| 200 | |
200 | |
| 201 | sub key_down { |
201 | sub key_down { |
| 202 | my ($self, $ev) = @_; |
202 | my ($self, $ev) = @_; |
| 203 | |
203 | |
| 204 | my $mod = $ev->key_mod; |
204 | my $mod = $ev->{mod}; |
| 205 | my $sym = $ev->key_sym; |
205 | my $sym = $ev->{sym}; |
| 206 | |
206 | |
| 207 | if ($sym == CFClient::SDLK_KP5) { |
207 | if ($sym == CFClient::SDLK_KP5) { |
| 208 | $::CONN->user_send ("stay fire"); |
208 | $::CONN->user_send ("stay fire"); |
| 209 | } elsif ($sym == ord "a") { |
209 | } elsif ($sym == ord "a") { |
| 210 | $::CONN->user_send ("apply"); |
210 | $::CONN->user_send ("apply"); |
| … | |
… | |
| 226 | } |
226 | } |
| 227 | |
227 | |
| 228 | sub key_up { |
228 | sub key_up { |
| 229 | my ($self, $ev) = @_; |
229 | my ($self, $ev) = @_; |
| 230 | |
230 | |
| 231 | my $mod = $ev->key_mod; |
231 | my $mod = $ev->{mod}; |
| 232 | my $sym = $ev->key_sym; |
232 | my $sym = $ev->{sym}; |
| 233 | |
233 | |
| 234 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
234 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
| 235 | $::CONN->user_send ("fire_stop"); |
235 | $::CONN->user_send ("fire_stop"); |
| 236 | } |
236 | } |
| 237 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
237 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
