… | |
… | |
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 " |
… | |
… | |
60 | |
61 | |
61 | sub clr_commands { |
62 | sub clr_commands { |
62 | my ($self) = @_; |
63 | my ($self) = @_; |
63 | |
64 | |
64 | %{$self->{completer}{command}} = (); |
65 | %{$self->{completer}{command}} = (); |
|
|
66 | |
|
|
67 | $self->{completer}->hide |
|
|
68 | if $self->{completer}; |
65 | } |
69 | } |
66 | |
70 | |
67 | sub invoke_button_down { |
71 | sub invoke_button_down { |
68 | my ($self, $ev, $x, $y) = @_; |
72 | my ($self, $ev, $x, $y) = @_; |
69 | |
73 | |
… | |
… | |
101 | (new CFClient::UI::Menu |
105 | (new CFClient::UI::Menu |
102 | items => [ |
106 | items => [ |
103 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
107 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
104 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
108 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
105 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
109 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
|
|
110 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
106 | ["Inventory…\tF4", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
111 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
107 | ["Spells…\tF5", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
|
|
108 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
112 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
109 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
113 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
110 | [ |
114 | [ |
111 | $::PICKUP_ENABLE->{state} |
115 | $::PICKUP_ENABLE->{state} |
112 | ? "Disable automatic pickup" |
116 | ? "Disable automatic pickup" |
… | |
… | |
186 | } elsif ($sym == CFClient::SDLK_F2 && !$mod) { |
190 | } elsif ($sym == CFClient::SDLK_F2 && !$mod) { |
187 | ::toggle_player_page ($::STATS_PAGE); |
191 | ::toggle_player_page ($::STATS_PAGE); |
188 | } elsif ($sym == CFClient::SDLK_F3 && !$mod) { |
192 | } elsif ($sym == CFClient::SDLK_F3 && !$mod) { |
189 | ::toggle_player_page ($::SKILL_PAGE); |
193 | ::toggle_player_page ($::SKILL_PAGE); |
190 | } elsif ($sym == CFClient::SDLK_F4 && !$mod) { |
194 | } elsif ($sym == CFClient::SDLK_F4 && !$mod) { |
|
|
195 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
196 | } elsif ($sym == CFClient::SDLK_F5 && !$mod) { |
191 | ::toggle_player_page ($::INVENTORY_PAGE); |
197 | ::toggle_player_page ($::INVENTORY_PAGE); |
192 | } elsif ($sym == CFClient::SDLK_F5 && !$mod) { |
|
|
193 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
194 | } elsif ($sym == CFClient::SDLK_F9 && !$mod) { |
198 | } elsif ($sym == CFClient::SDLK_F9 && !$mod) { |
195 | $::SETUP_DIALOG->toggle_visibility; |
199 | $::SETUP_DIALOG->toggle_visibility; |
196 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
200 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
197 | $::BIND_EDITOR->set_binding (undef, undef, [], |
201 | $::BIND_EDITOR->set_binding (undef, undef, [], |
198 | sub { |
202 | sub { |
… | |
… | |
241 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
245 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
242 | } else { |
246 | } else { |
243 | $::CONN->user_send ("$DIR{$sym}[1]"); |
247 | $::CONN->user_send ("$DIR{$sym}[1]"); |
244 | } |
248 | } |
245 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
249 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
246 | $self->{completer}->invoke_key_down ($ev); |
250 | $self->{completer}->inject_key_down ($ev); |
247 | $self->{completer}->show; |
251 | $self->{completer}->show; |
248 | } else { |
252 | } else { |
249 | return 0; |
253 | return 0; |
250 | } |
254 | } |
251 | |
255 | |
… | |
… | |
523 | my ($entry, $ev, $x, $y) = @_; |
527 | my ($entry, $ev, $x, $y) = @_; |
524 | |
528 | |
525 | if ($ev->{button} == 3) { |
529 | if ($ev->{button} == 3) { |
526 | (new CFClient::UI::Menu |
530 | (new CFClient::UI::Menu |
527 | items => [ |
531 | items => [ |
528 | ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" |
532 | ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" |
529 | => 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 }) }] |
530 | ], |
534 | ], |
531 | )->popup ($ev); |
535 | )->popup ($ev); |
532 | return 1; |
536 | return 1; |
533 | } |
537 | } |
… | |
… | |
616 | } |
620 | } |
617 | |
621 | |
618 | sub hide { |
622 | sub hide { |
619 | my ($self) = @_; |
623 | my ($self) = @_; |
620 | |
624 | |
|
|
625 | $self->{hist_ptr} = 0; |
|
|
626 | |
621 | $self->SUPER::hide; |
627 | $self->SUPER::hide; |
622 | $self->{entry}->set_text (""); |
628 | $self->{entry}->set_text (""); |
623 | } |
629 | } |
624 | |
630 | |
625 | sub invoke_key_down { |
631 | sub inject_key_down { |
626 | my ($self, $ev) = @_; |
632 | my ($self, $ev) = @_; |
627 | |
633 | |
|
|
634 | $self->{entry}->grab_focus; |
628 | $self->{entry}->emit (key_down => $ev) |
635 | $self->{entry}->emit (key_down => $ev); |
629 | } |
636 | } |
630 | |
637 | |
631 | sub update_labels { |
638 | sub update_labels { |
632 | my ($self) = @_; |
639 | my ($self) = @_; |
633 | |
640 | |