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.141 by root, Wed Aug 27 20:19:52 2008 UTC vs.
Revision 1.142 by root, Sat Aug 30 08:04:01 2008 UTC

… …
285 $self->{need_update} = 1; 285 $self->{need_update} = 1;
286 $self->SUPER::update; 286 $self->SUPER::update;
287} 287}
288 288
289my %DIR = ( 289my %DIR = (
290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"], 290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
291 ( "," . DC::SDLK_KP8 ), [1, "north"], 291 ( "," . DC::SDLK_KP8 ), [1, "north"],
292 ( "," . DC::SDLK_KP9 ), [2, "northeast"], 292 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
293 ( "," . DC::SDLK_KP6 ), [3, "east"], 293 ( "," . DC::SDLK_KP6 ), [3, "east"],
294 ( "," . DC::SDLK_KP3 ), [4, "southeast"], 294 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
295 ( "," . DC::SDLK_KP2 ), [5, "south"], 295 ( "," . DC::SDLK_KP2 ), [5, "south"],
296 ( "," . DC::SDLK_KP1 ), [6, "southwest"], 296 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
297 ( "," . DC::SDLK_KP4 ), [7, "west"], 297 ( "," . DC::SDLK_KP4 ), [7, "west"],
298 ( "," . DC::SDLK_KP7 ), [8, "northwest"], 298 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
299 299
300 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
301 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
302 ( "," . DC::SDLK_END ), [6, "southwest"],
303 ( "," . DC::SDLK_HOME ), [8, "northwest"],
304
300 ( "," . DC::SDLK_UP ), [1, "north"], 305 ( "," . DC::SDLK_UP ), [1, "north"],
301 ("1," . DC::SDLK_UP ), [2, "northeast"], 306 ("1," . DC::SDLK_UP ), [2, "northeast"],
302 ( "," . DC::SDLK_RIGHT), [3, "east"], 307 ( "," . DC::SDLK_RIGHT ), [3, "east"],
303 ("1," . DC::SDLK_RIGHT), [4, "southeast"], 308 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
304 ( "," . DC::SDLK_DOWN ), [5, "south"], 309 ( "," . DC::SDLK_DOWN ), [5, "south"],
305 ("1," . DC::SDLK_DOWN ), [6, "southwest"], 310 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
306 ( "," . DC::SDLK_LEFT ), [7, "west"], 311 ( "," . DC::SDLK_LEFT ), [7, "west"],
307 ("1," . DC::SDLK_LEFT ), [8, "northwest"], 312 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
308); 313);
309 314
310sub invoke_key_down { 315sub invoke_key_down {
311 my ($self, $ev) = @_; 316 my ($self, $ev) = @_;
312 317
313 my $mod = $ev->{mod}; 318 my $mod = $ev->{mod};
314 my $sym = $ev->{sym}; 319 my $sym = $ev->{sym};
315 my $uni = $ev->{unicode}; 320 my $uni = $ev->{unicode};
316 321
317 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; 322 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
318 323
319 # ignore repeated keypresses 324 # ignore repeated keypresses
320 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; 325 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
321 $self->{last_mod} = $mod; 326 $self->{last_mod} = $mod;
322 $self->{last_sym} = $sym; 327 $self->{last_sym} = $sym;
323 328
324 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { 329 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
330
331 if ($::CONN && $dir) {
325 if ($mod & DC::KMOD_SHIFT) { 332 if ($mod & DC::KMOD_SHIFT) {
326 $self->{shft}++; 333 $self->{shft}++;
327 if ($dir->[0] != $self->{fire_dir}) { 334 if ($dir->[0] != $self->{fire_dir}) {
328 $::CONN->user_send ("fire $dir->[0]"); 335 $::CONN->user_send ("fire $dir->[0]");
329 } 336 }
… …
356 $::CONN->user_send ("fire_stop"); 363 $::CONN->user_send ("fire_stop");
357 delete $self->{fire_dir}; 364 delete $self->{fire_dir};
358 $res = 1; 365 $res = 1;
359 } 366 }
360 } else { 367 } else {
361 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { 368 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
369
370 if ($dir && delete $self->{shft}) {
362 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
363 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
364 $res = 1; 373 $res = 1;
365 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) 374 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
366 && delete $self->{shft}) { # XXX: is RSHIFT ok? 375 && delete $self->{shft}) { # XXX: is RSHIFT ok?
… …
368 delete $self->{fire_dir}; 377 delete $self->{fire_dir};
369 $res = 1; 378 $res = 1;
370 } 379 }
371 } 380 }
372 381
373 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { 382 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
374 $::CONN->user_send ("run_stop"); 383 $::CONN->user_send ("run_stop");
375 $res = 1; 384 $res = 1;
376 } 385 }
377 386
378 $res 387 $res

Diff Legend

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