… | |
… | |
3 | use strict; |
3 | use strict; |
4 | use utf8; |
4 | use utf8; |
5 | |
5 | |
6 | use List::Util qw(min max); |
6 | use List::Util qw(min max); |
7 | |
7 | |
|
|
8 | use CFClient; |
8 | use CFClient::OpenGL; |
9 | use CFClient::OpenGL; |
|
|
10 | use CFClient::UI; |
9 | |
11 | |
10 | our @ISA = CFClient::UI::Base::; |
12 | our @ISA = CFClient::UI::Base::; |
11 | |
13 | |
12 | my $magicmap_tex = |
14 | my $magicmap_tex = |
13 | new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", |
15 | new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", |
… | |
… | |
30 | @_ |
32 | @_ |
31 | ); |
33 | ); |
32 | |
34 | |
33 | $self->{completer} = new CFClient::MapWidget::Command:: |
35 | $self->{completer} = new CFClient::MapWidget::Command:: |
34 | command => $self->{command}, |
36 | command => $self->{command}, |
35 | can_focus => 1, |
|
|
36 | tooltip => "<b>The Command Completer</b>\n\n" |
37 | tooltip => "<b>The Command Completer</b>\n\n" |
37 | . "This is your central interface to send text commands to the server. " |
38 | . "This is your central interface to send text commands to the server. " |
38 | . "To enter a verbatim command to send to the server, just type the command, " |
39 | . "To enter a verbatim command to send to the server, just type the command, " |
39 | . "followed by a space, and press return. " |
40 | . "followed by a space, and press return. " |
40 | . "Typing the initial letters of words (or just any letters) displays guesses " |
41 | . "Typing the initial letters of words (or just any letters) displays guesses " |
… | |
… | |
244 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
245 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
245 | } else { |
246 | } else { |
246 | $::CONN->user_send ("$DIR{$sym}[1]"); |
247 | $::CONN->user_send ("$DIR{$sym}[1]"); |
247 | } |
248 | } |
248 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
249 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
249 | $self->{completer}->invoke_key_down ($ev); |
250 | $self->{completer}->inject_key_down ($ev); |
250 | $self->{completer}->show; |
251 | $self->{completer}->show; |
251 | } else { |
252 | } else { |
252 | return 0; |
253 | return 0; |
253 | } |
254 | } |
254 | |
255 | |
… | |
… | |
526 | my ($entry, $ev, $x, $y) = @_; |
527 | my ($entry, $ev, $x, $y) = @_; |
527 | |
528 | |
528 | if ($ev->{button} == 3) { |
529 | if ($ev->{button} == 3) { |
529 | (new CFClient::UI::Menu |
530 | (new CFClient::UI::Menu |
530 | items => [ |
531 | items => [ |
531 | ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" |
532 | ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" |
532 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
533 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
533 | ], |
534 | ], |
534 | )->popup ($ev); |
535 | )->popup ($ev); |
535 | return 1; |
536 | return 1; |
536 | } |
537 | } |
… | |
… | |
625 | |
626 | |
626 | $self->SUPER::hide; |
627 | $self->SUPER::hide; |
627 | $self->{entry}->set_text (""); |
628 | $self->{entry}->set_text (""); |
628 | } |
629 | } |
629 | |
630 | |
630 | sub invoke_key_down { |
631 | sub inject_key_down { |
631 | my ($self, $ev) = @_; |
632 | my ($self, $ev) = @_; |
632 | |
633 | |
|
|
634 | $self->{entry}->grab_focus; |
633 | $self->{entry}->emit (key_down => $ev) |
635 | $self->{entry}->emit (key_down => $ev); |
634 | } |
636 | } |
635 | |
637 | |
636 | sub update_labels { |
638 | sub update_labels { |
637 | my ($self) = @_; |
639 | my ($self) = @_; |
638 | |
640 | |