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.62 by root, Thu Jun 15 16:44:20 2006 UTC vs.
Revision 1.74 by root, Sun Jul 16 23:30:08 2006 UTC

… …
38 . "To enter a verbatim command to send to the server, just type the command, " 38 . "To enter a verbatim command to send to the server, just type the command, "
39 . "followed by a space, and press return. " 39 . "followed by a space, and press return. "
40 . "Typing the initial letters of words (or just any letters) displays guesses " 40 . "Typing the initial letters of words (or just any letters) displays guesses "
41 . "for commands you might want to use.\n" 41 . "for commands you might want to use.\n"
42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" 42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.", 43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44 ; 44 ;
45 45
46 $self 46 $self
47} 47}
48 48
… …
62 my ($self) = @_; 62 my ($self) = @_;
63 63
64 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
65} 65}
66 66
67sub button_down { 67sub invoke_button_down {
68 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
69 69
70 return unless $::CONN;
71
72 $self->focus_in;
73
74 if ($ev->{button} == 1) { 70 if ($ev->{button} == 1) {
71 $self->grab_focus;
72 return unless $::CONN;
73
75 my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 74 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
76 my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 75 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
77 76
78 $x -= int 0.5 * $self->{sw}; 77 $x -= int 0.5 * $self->{sw};
79 $y -= int 0.5 * $self->{sh}; 78 $y -= int 0.5 * $self->{sh};
80 79
81 $::CONN->lookat ($x, $y) 80 $::CONN->lookat ($x, $y)
82 if $::CONN; 81 if $::CONN;
83 82
84 } elsif ($ev->{button} == 2) { 83 } elsif ($ev->{button} == 2) {
84 $self->grab_focus;
85 return unless $::CONN;
86
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 87 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 89
88 $self->{motion} = sub { 90 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 91 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 95 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 96 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 97
96 $self->update; 98 $self->update;
97 }; 99 };
100 } elsif ($ev->{button} == 3) {
101 (new CFClient::UI::Menu
102 items => [
103 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
104 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
105 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
106 ["Inventory…\tF4", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
107 ["Spells…\tF5", sub { ::toggle_player_page ($::SPELL_PAGE) }],
108 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
109 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
110 [
111 $::PICKUP_ENABLE->{state}
112 ? "Disable automatic pickup"
113 : "Enable automatic pickup",
114 sub { $::PICKUP_ENABLE->toggle }
115 ],
116 ],
117 )->popup ($ev);
98 } 118 }
99 119
100 1 120 1
101} 121}
102 122
103sub button_up { 123sub invoke_button_up {
104 my ($self, $ev, $x, $y) = @_; 124 my ($self, $ev, $x, $y) = @_;
105 125
106 delete $self->{motion}; 126 delete $self->{motion};
107 127
108 1 128 1
109} 129}
110 130
111sub mouse_motion { 131sub invoke_mouse_motion {
112 my ($self, $ev, $x, $y) = @_; 132 my ($self, $ev, $x, $y) = @_;
113 133
114 if ($self->{motion}) { 134 if ($self->{motion}) {
115 $self->{motion}->($ev, $x, $y); 135 $self->{motion}->($ev, $x, $y);
116 } else { 136 } else {
… …
120 1 140 1
121} 141}
122 142
123sub size_request { 143sub size_request {
124 ( 144 (
125 1 + 32 * int $::WIDTH / 32, 145 32 * CFClient::ceil $::WIDTH / 32,
126 1 + 32 * int $::HEIGHT / 32, 146 32 * CFClient::ceil $::HEIGHT / 32,
127 ) 147 )
128} 148}
129 149
130sub update { 150sub update {
131 my ($self) = @_; 151 my ($self) = @_;
… …
148 CFClient::SDLK_RIGHT, [3, "east"], 168 CFClient::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 169 CFClient::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 170 CFClient::SDLK_LEFT, [7, "west"],
151); 171);
152 172
153sub key_down { 173sub invoke_key_down {
154 my ($self, $ev) = @_; 174 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 175
158 my $mod = $ev->{mod}; 176 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 177 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 178 my $uni = $ev->{unicode};
161 179
180 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
181
182 if ($uni == ord "\t") {
183 $::PL_WINDOW->toggle_visibility;
184 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
185 $::HELP_WINDOW->toggle_visibility;
186 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
187 ::toggle_player_page ($::STATS_PAGE);
188 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
189 ::toggle_player_page ($::SKILL_PAGE);
190 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
191 ::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) {
195 $::SETUP_DIALOG->toggle_visibility;
196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
197 $::BIND_EDITOR->set_binding (undef, undef, [],
198 sub {
199 my ($mod, $sym, $cmds) = @_;
200 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
201 });
202 $::BIND_EDITOR->start;
203 $::BIND_EDITOR->show;
204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
205 $::BIND_EDITOR->stop;
206 $::BIND_EDITOR->ask_for_bind_and_commit;
207 $::BIND_EDITOR->hide;
208 } elsif (!$::CONN) {
209 return 0; # bindings further down need a valid connection
210
162 if ($sym == CFClient::SDLK_KP5) { 211 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 212 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 213 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 214 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 215 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 216 $::CONN->user_send ("apply");
168 } elsif ($uni == ord ".") { 217 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 218 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 219 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 220 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
172 $::INV_WINDOW->toggle_visibility; 221 $::CONN->user_send ($_) for @$bind_cmd;
173 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 222 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
174 $::CONN->user_send ("rotateshoottype +"); 223 $::CONN->user_send ("rotateshoottype +");
175 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 224 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
176 $::CONN->user_send ("rotateshoottype -"); 225 $::CONN->user_send ("rotateshoottype -");
177 } elsif ($uni == ord '"') { 226 } elsif ($uni == ord '"') {
178 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 227 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
179 $self->{completer}->show; 228 $self->{completer}->show;
180 } elsif ($uni == ord "'") { 229 } elsif ($uni == ord "'") {
… …
191 $self->{ctrl}++; 240 $self->{ctrl}++;
192 $::CONN->user_send ("run $DIR{$sym}[0]"); 241 $::CONN->user_send ("run $DIR{$sym}[0]");
193 } else { 242 } else {
194 $::CONN->user_send ("$DIR{$sym}[1]"); 243 $::CONN->user_send ("$DIR{$sym}[1]");
195 } 244 }
196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
197 $::BIND_EDITOR->set_binding (undef, undef, [],
198 sub {
199 my ($mod, $sym, $cmds) = @_;
200 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
201 });
202 $::BIND_EDITOR->start;
203 $::BIND_EDITOR->show;
204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
205 $::BIND_EDITOR->stop;
206 $::BIND_EDITOR->ask_for_bind_and_commit;
207 $::BIND_EDITOR->hide;
208 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
209 $::CONN->user_send ($_) for @$bind_cmd;
210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 245 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
211 $self->{completer}->key_down ($ev); 246 $self->{completer}->invoke_key_down ($ev);
212 $self->{completer}->show; 247 $self->{completer}->show;
213 } else { 248 } else {
214 return 0; 249 return 0;
215 } 250 }
216 251
217 1 252 1
218} 253}
219 254
220sub key_up { 255sub invoke_key_up {
221 my ($self, $ev) = @_; 256 my ($self, $ev) = @_;
222 257
223 my $res = 0; 258 my $res = 0;
224 my $mod = $ev->{mod}; 259 my $mod = $ev->{mod};
225 my $sym = $ev->{sym}; 260 my $sym = $ev->{sym};
… …
380 415
381sub size_request { 416sub size_request {
382 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 417 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
383} 418}
384 419
385sub size_allocate { 420sub invoke_size_allocate {
386 my ($self, $w, $h) = @_; 421 my ($self, $w, $h) = @_;
387 422
388 $self->SUPER::size_allocate ($w, $h);
389 $self->update; 423 $self->update;
424
425 1
390} 426}
391 427
392sub update { 428sub update {
393 my ($self) = @_; 429 my ($self) = @_;
394 430
… …
479 ]; 515 ];
480 516
481 $self->{entry} = new CFClient::UI::Entry 517 $self->{entry} = new CFClient::UI::Entry
482 on_changed => sub { 518 on_changed => sub {
483 $self->update_labels; 519 $self->update_labels;
520 0
484 }, 521 },
485 on_button_down => sub { 522 on_button_down => sub {
486 my ($entry, $ev, $x, $y) = @_; 523 my ($entry, $ev, $x, $y) = @_;
487 524
488 if ($ev->{button} == 3) { 525 if ($ev->{button} == 3) {
489 (new CFClient::UI::Menu 526 (new CFClient::UI::Menu
490 items => [ 527 items => [
528 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"
491 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 529 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
492 ], 530 ],
493 )->popup ($ev); 531 )->popup ($ev);
494 return 1; 532 return 1;
495 } 533 }
496 0 534 0
… …
503 if ($ev->{sym} == 13) { 541 if ($ev->{sym} == 13) {
504 if (exists $self->{select}) { 542 if (exists $self->{select}) {
505 $self->{last_command} = $self->{select}; 543 $self->{last_command} = $self->{select};
506 $::CONN->user_send ($self->{select}); 544 $::CONN->user_send ($self->{select});
507 545
508 unshift @{$self->{history}}, $self->{select}; 546 unshift @{$self->{history}}, $self->{entry}->get_text;
509 $self->{hist_ptr} = 0; 547 $self->{hist_ptr} = 0;
510 548
511 $self->hide; 549 $self->hide;
512 } 550 }
513 } elsif ($ev->{sym} == 27) { 551 } elsif ($ev->{sym} == 27) {
514 $self->{hist_ptr} = 0; 552 $self->{hist_ptr} = 0;
515 $self->hide; 553 $self->hide;
516 return;
517 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 554 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
518 if ($self->{hist_ptr} > 1) { 555 if ($self->{hist_ptr} > 1) {
519 $self->{hist_ptr}--; 556 $self->{hist_ptr}--;
520 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 557 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
521 } elsif ($self->{hist_ptr} > 0) { 558 } elsif ($self->{hist_ptr} > 0) {
… …
561 598
562 $self->{entry}->set_text ($prefix); 599 $self->{entry}->set_text ($prefix);
563 $self->show; 600 $self->show;
564} 601}
565 602
566sub size_allocate { 603sub invoke_size_allocate {
567 my ($self, $w, $h) = @_; 604 my ($self, $w, $h) = @_;
568 605
569 $self->SUPER::size_allocate ($w, $h);
570 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 606 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
607
608 $self->SUPER::invoke_size_allocate ($w, $h)
571} 609}
572 610
573sub show { 611sub show {
574 my ($self) = @_; 612 my ($self) = @_;
575 613
576 $self->SUPER::show; 614 $self->SUPER::show;
577 $self->{entry}->focus_in; 615 $self->{entry}->grab_focus;
578} 616}
579 617
580sub hide { 618sub hide {
581 my ($self) = @_; 619 my ($self) = @_;
582 620
583 $self->SUPER::hide; 621 $self->SUPER::hide;
584 $self->{entry}->set_text (""); 622 $self->{entry}->set_text ("");
585} 623}
586 624
587sub key_down { 625sub invoke_key_down {
588 my ($self, $ev) = @_; 626 my ($self, $ev) = @_;
589 627
590 $self->{entry}->key_down ($ev) 628 $self->{entry}->emit (key_down => $ev)
591} 629}
592 630
593sub update_labels { 631sub update_labels {
594 my ($self) = @_; 632 my ($self) = @_;
595 633
… …
682 $label->set_text (""); 720 $label->set_text ("");
683 $label->set_tooltip (""); 721 $label->set_tooltip ("");
684 } 722 }
685 723
686 $self->update; 724 $self->update;
687 ###
688} 725}
689 726
690sub _draw { 727sub _draw {
691 my ($self) = @_; 728 my ($self) = @_;
692 729

Diff Legend

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