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.94 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.100 by pippijn, Tue Jan 2 14:45:22 2007 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
… …
322 my $sym = $ev->{sym}; 323 my $sym = $ev->{sym};
323 my $uni = $ev->{unicode}; 324 my $uni = $ev->{unicode};
324 325
325 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 326 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
326 327
327 if ($uni == ord "\t") { 328 if ($sym == 9) {
328 $::PL_WINDOW->toggle_visibility; 329 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
329 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 330 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
330 $::HELP_WINDOW->toggle_visibility; 331 $::HELP_WINDOW->toggle_visibility;
331 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
332 ::toggle_player_page ($::STATS_PAGE); 333 ::toggle_player_page ($::STATS_PAGE);
333 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
336 ::toggle_player_page ($::SPELL_PAGE); 337 ::toggle_player_page ($::SPELL_PAGE);
337 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 338 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
338 ::toggle_player_page ($::INVENTORY_PAGE); 339 ::toggle_player_page ($::INVENTORY_PAGE);
339 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
340 $::SETUP_DIALOG->toggle_visibility; 341 $::SETUP_DIALOG->toggle_visibility;
341 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
342 $::BIND_EDITOR->set_binding (undef, undef, [],
343 sub {
344 my ($mod, $sym, $cmds) = @_;
345 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
346 });
347 $::BIND_EDITOR->start;
348 $::BIND_EDITOR->show;
349#TODO: elmex, what was this supposed to do? it currently crashes the client.
350# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
351# $::BIND_EDITOR->stop;
352# $::BIND_EDITOR->ask_for_bind_and_commit;
353# $::BIND_EDITOR->hide;
354 } elsif (!$::CONN) { 342 } elsif (!$::CONN) {
355 return 0; # bindings further down need a valid connection 343 return 0; # bindings further down need a valid connection
356 344
357 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
358 $::CONN->user_send ("stay fire"); 346 $::CONN->user_send ("stay fire");
… …
363 } elsif ($uni == 13) { 351 } elsif ($uni == 13) {
364 $::CONN->user_send ("examine"); 352 $::CONN->user_send ("examine");
365 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
366 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
367 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
368 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
369 $::CONN->user_send ($_) for @$bind_cmd; 357 $::CONN->macro_send ($_) for @macros;
370 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
371 $::CONN->user_send ("rotateshoottype +"); 359 $::CONN->user_send ("rotateshoottype +");
372 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
373 $::CONN->user_send ("rotateshoottype -"); 361 $::CONN->user_send ("rotateshoottype -");
362 } elsif ($uni == ord '!') {
363 $self->{completer}->set_prefix ("shout ");
364 $self->{completer}->show;
374 } elsif ($uni == ord '"') { 365 } elsif ($uni == ord '"') {
375 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
376 $self->{completer}->show; 367 $self->{completer}->show;
377 } elsif ($uni == ord "'") { 368 } elsif ($uni == ord "'") {
378 $self->{completer}->set_prefix (""); 369 $self->{completer}->set_prefix ("");
… …
675 666
676 if ($ev->{button} == 3) { 667 if ($ev->{button} == 3) {
677 (new CFPlus::UI::Menu 668 (new CFPlus::UI::Menu
678 items => [ 669 items => [
679 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 670 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
680 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 671 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
681 ], 672 ],
682 )->popup ($ev); 673 )->popup ($ev);
683 return 1; 674 return 1;
684 } 675 }
685 0 676 0

Diff Legend

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