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.95 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.100 by pippijn, Tue Jan 2 14:45:22 2007 UTC

… …
323 my $sym = $ev->{sym}; 323 my $sym = $ev->{sym};
324 my $uni = $ev->{unicode}; 324 my $uni = $ev->{unicode};
325 325
326 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 326 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
327 327
328 if ($uni == ord "\t") { 328 if ($sym == 9) {
329 $::PL_WINDOW->toggle_visibility; 329 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
330 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 330 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
331 $::HELP_WINDOW->toggle_visibility; 331 $::HELP_WINDOW->toggle_visibility;
332 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
333 ::toggle_player_page ($::STATS_PAGE); 333 ::toggle_player_page ($::STATS_PAGE);
334 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
337 ::toggle_player_page ($::SPELL_PAGE); 337 ::toggle_player_page ($::SPELL_PAGE);
338 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 338 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
339 ::toggle_player_page ($::INVENTORY_PAGE); 339 ::toggle_player_page ($::INVENTORY_PAGE);
340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
341 $::SETUP_DIALOG->toggle_visibility; 341 $::SETUP_DIALOG->toggle_visibility;
342 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
343 $::BIND_EDITOR->set_binding (undef, undef, [],
344 sub {
345 my ($mod, $sym, $cmds) = @_;
346 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
347 });
348 $::BIND_EDITOR->start;
349 $::BIND_EDITOR->show;
350#TODO: elmex, what was this supposed to do? it currently crashes the client.
351# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
352# $::BIND_EDITOR->stop;
353# $::BIND_EDITOR->ask_for_bind_and_commit;
354# $::BIND_EDITOR->hide;
355 } elsif (!$::CONN) { 342 } elsif (!$::CONN) {
356 return 0; # bindings further down need a valid connection 343 return 0; # bindings further down need a valid connection
357 344
358 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
359 $::CONN->user_send ("stay fire"); 346 $::CONN->user_send ("stay fire");
… …
364 } elsif ($uni == 13) { 351 } elsif ($uni == 13) {
365 $::CONN->user_send ("examine"); 352 $::CONN->user_send ("examine");
366 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
367 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
368 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
369 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
370 $::CONN->user_send ($_) for @$bind_cmd; 357 $::CONN->macro_send ($_) for @macros;
371 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
372 $::CONN->user_send ("rotateshoottype +"); 359 $::CONN->user_send ("rotateshoottype +");
373 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
374 $::CONN->user_send ("rotateshoottype -"); 361 $::CONN->user_send ("rotateshoottype -");
362 } elsif ($uni == ord '!') {
363 $self->{completer}->set_prefix ("shout ");
364 $self->{completer}->show;
375 } elsif ($uni == ord '"') { 365 } elsif ($uni == ord '"') {
376 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 366 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
377 $self->{completer}->show; 367 $self->{completer}->show;
378 } elsif ($uni == ord "'") { 368 } elsif ($uni == ord "'") {
379 $self->{completer}->set_prefix (""); 369 $self->{completer}->set_prefix ("");

Diff Legend

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