… | |
… | |
14 | |
14 | |
15 | my $self = $class->SUPER::new ( |
15 | my $self = $class->SUPER::new ( |
16 | z => -1, |
16 | z => -1, |
17 | can_focus => 1, |
17 | can_focus => 1, |
18 | list => glGenList, |
18 | list => glGenList, |
|
|
19 | |
|
|
20 | smooth_matrix => [ |
|
|
21 | 0.05, 0.13, 0.05, |
|
|
22 | 0.13, 0.30, 0.13, |
|
|
23 | 0.05, 0.13, 0.05, |
|
|
24 | ], |
|
|
25 | |
19 | @_ |
26 | @_ |
20 | ); |
27 | ); |
21 | |
28 | |
22 | $self->{completer} = new CFClient::MapWidget::Command:: |
29 | $self->{completer} = new CFClient::MapWidget::Command:: |
23 | command => $self->{command}, |
30 | command => $self->{command}, |
… | |
… | |
56 | sub button_down { |
63 | sub button_down { |
57 | my ($self, $ev, $x, $y) = @_; |
64 | my ($self, $ev, $x, $y) = @_; |
58 | |
65 | |
59 | $self->focus_in; |
66 | $self->focus_in; |
60 | |
67 | |
61 | if ($ev->{button} == 2) { |
68 | if ($ev->{button} == 1) { |
|
|
69 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
70 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
71 | |
|
|
72 | my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; |
|
|
73 | my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; |
|
|
74 | |
|
|
75 | $::CONN->send (sprintf "lookat %d %d", $fx, $fy); |
|
|
76 | |
|
|
77 | } elsif ($ev->{button} == 2) { |
62 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
78 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
63 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
79 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
64 | |
80 | |
65 | $self->{motion} = sub { |
81 | $self->{motion} = sub { |
66 | my ($ev, $x, $y) = @_; |
82 | my ($ev, $x, $y) = @_; |
… | |
… | |
243 | glConvolutionFilter2D ( |
259 | glConvolutionFilter2D ( |
244 | GL_CONVOLUTION_2D, |
260 | GL_CONVOLUTION_2D, |
245 | GL_ALPHA, |
261 | GL_ALPHA, |
246 | 3, 3, |
262 | 3, 3, |
247 | GL_ALPHA, GL_FLOAT, |
263 | GL_ALPHA, GL_FLOAT, |
248 | pack "f*", |
264 | (pack "f*", @{ $self->{smooth_matrix} }), |
249 | 0.05, 0.13, 0.05, |
|
|
250 | 0.13, 0.30, 0.13, |
|
|
251 | 0.05, 0.13, 0.05, |
|
|
252 | ); |
265 | ); |
253 | glEnable GL_CONVOLUTION_2D; |
266 | glEnable GL_CONVOLUTION_2D; |
254 | } |
267 | } |
255 | |
268 | |
256 | $self->{fow_texture_name} ||= glGenTexture; |
269 | $self->{fow_texture_name} ||= glGenTexture; |
… | |
… | |
450 | |
463 | |
451 | if ($ev->{sym} == 13) { |
464 | if ($ev->{sym} == 13) { |
452 | if (exists $self->{select}) { |
465 | if (exists $self->{select}) { |
453 | $self->{last_command} = $self->{select}; |
466 | $self->{last_command} = $self->{select}; |
454 | $::CONN->user_send ($self->{select}); |
467 | $::CONN->user_send ($self->{select}); |
|
|
468 | |
|
|
469 | unshift @{$self->{history}}, $self->{select}; |
|
|
470 | $self->{hist_ptr} = 0; |
|
|
471 | |
455 | $self->hide; |
472 | $self->hide; |
456 | } |
473 | } |
457 | } elsif ($ev->{sym} == 27) { |
474 | } elsif ($ev->{sym} == 27) { |
|
|
475 | $self->{hist_ptr} = 0; |
458 | $self->hide; |
476 | $self->hide; |
459 | return; |
477 | return; |
460 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
478 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
|
|
479 | if ($self->{hist_ptr} > 1) { |
|
|
480 | $self->{hist_ptr}--; |
|
|
481 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
|
|
482 | } elsif ($self->{hist_ptr} > 0) { |
|
|
483 | $self->{hist_ptr}--; |
|
|
484 | $self->{entry}->set_text ($self->{hist_saveback}); |
|
|
485 | } else { |
461 | ++$self->{select_offset} |
486 | ++$self->{select_offset} |
462 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
487 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
|
|
488 | } |
463 | $self->update_labels; |
489 | $self->update_labels; |
464 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
490 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
|
|
491 | if ($self->{select_offset}) { |
465 | --$self->{select_offset} |
492 | --$self->{select_offset} |
|
|
493 | } else { |
|
|
494 | unless ($self->{hist_ptr}) { |
|
|
495 | $self->{hist_saveback} = $self->{entry}->get_text; |
|
|
496 | } |
|
|
497 | if ($self->{hist_ptr} <= $#{$self->{history}}) { |
466 | if $self->{select_offset}; |
498 | $self->{hist_ptr}++; |
|
|
499 | } |
|
|
500 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]) |
|
|
501 | if exists $self->{history}->[$self->{hist_ptr} - 1]; |
|
|
502 | } |
467 | $self->update_labels; |
503 | $self->update_labels; |
468 | } else { |
504 | } else { |
469 | return 0; |
505 | return 0; |
470 | } |
506 | } |
471 | |
507 | |