ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.76 by elmex, Sat Jul 22 12:36:17 2006 UTC vs.
Revision 1.79 by elmex, Mon Jul 24 12:25:09 2006 UTC

… …
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFClient;
8use CFClient::OpenGL; 9use CFClient::OpenGL;
10use CFClient::UI;
9 11
10our @ISA = CFClient::UI::Base::; 12our @ISA = CFClient::UI::Base::;
11 13
12my $magicmap_tex = 14my $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 "
… …
113 [ 114 [
114 $::PICKUP_ENABLE->{state} 115 $::PICKUP_ENABLE->{state}
115 ? "Disable automatic pickup" 116 ? "Disable automatic pickup"
116 : "Enable automatic pickup", 117 : "Enable automatic pickup",
117 sub { $::PICKUP_ENABLE->toggle } 118 sub { $::PICKUP_ENABLE->toggle }
119 ],
120 ["Quit",
121 sub {
122 if ($::CONN) {
123 &::open_quit_dialog;
124 } else {
125 exit;
126 }
127 }
118 ], 128 ],
119 ], 129 ],
120 )->popup ($ev); 130 )->popup ($ev);
121 } 131 }
122 132
… …
244 $::CONN->user_send ("run $DIR{$sym}[0]"); 254 $::CONN->user_send ("run $DIR{$sym}[0]");
245 } else { 255 } else {
246 $::CONN->user_send ("$DIR{$sym}[1]"); 256 $::CONN->user_send ("$DIR{$sym}[1]");
247 } 257 }
248 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 258 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
249 $self->{completer}->invoke_key_down ($ev); 259 $self->{completer}->inject_key_down ($ev);
250 $self->{completer}->show; 260 $self->{completer}->show;
251 } else { 261 } else {
252 return 0; 262 return 0;
253 } 263 }
254 264
… …
526 my ($entry, $ev, $x, $y) = @_; 536 my ($entry, $ev, $x, $y) = @_;
527 537
528 if ($ev->{button} == 3) { 538 if ($ev->{button} == 3) {
529 (new CFClient::UI::Menu 539 (new CFClient::UI::Menu
530 items => [ 540 items => [
531 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 541 ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key"
532 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 542 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
533 ], 543 ],
534 )->popup ($ev); 544 )->popup ($ev);
535 return 1; 545 return 1;
536 } 546 }
… …
625 635
626 $self->SUPER::hide; 636 $self->SUPER::hide;
627 $self->{entry}->set_text (""); 637 $self->{entry}->set_text ("");
628} 638}
629 639
630sub invoke_key_down { 640sub inject_key_down {
631 my ($self, $ev) = @_; 641 my ($self, $ev) = @_;
632 642
643 $self->{entry}->grab_focus;
633 $self->{entry}->emit (key_down => $ev) 644 $self->{entry}->emit (key_down => $ev);
634} 645}
635 646
636sub update_labels { 647sub update_labels {
637 my ($self) = @_; 648 my ($self) = @_;
638 649

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines