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.137 by root, Sun Jul 20 03:46:02 2008 UTC vs.
Revision 1.169 by root, Sun Nov 25 14:37:18 2012 UTC

1package DC::MapWidget; 1package DC::MapWidget;
2 2
3use strict; 3use common::sense;
4use utf8;
5 4
6use List::Util qw(min max); 5use List::Util qw(min max);
6
7use AnyEvent ();
7 8
8use DC; 9use DC;
9use DC::OpenGL; 10use DC::OpenGL;
10use DC::UI; 11use DC::UI;
11use DC::Macro; 12use DC::Macro;
12 13
13our @ISA = DC::UI::Base::; 14our @ISA = DC::UI::Base::;
14 15
16our @TEX_HIDDEN = map {
17 new_from_resource DC::Texture # MUST be POT
18 "hidden-$_.png", mipmap => 1, wrap => 1
19 } 0, 1, 2;
20
15my $magicmap_tex = 21my $magicmap_tex =
16 new_from_file DC::Texture DC::find_rcfile "magicmap.png", 22 new_from_resource DC::Texture "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 23 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18 24
19sub new { 25sub new {
20 my $class = shift; 26 my $class = shift;
21 27
… …
25 tilesize => 32, 31 tilesize => 32,
26 @_ 32 @_
27 ); 33 );
28 34
29 $self 35 $self
30}
31
32sub add_command {
33 my ($self, $command, $tooltip, $widget, $cb) = @_;
34
35 (my $data = $command) =~ s/\\//g;
36
37 $tooltip =~ s/^\s+//;
38 $tooltip = "<big>$data</big>\n\n$tooltip";
39 $tooltip =~ s/\s+$//;
40
41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
42}
43
44sub clr_commands {
45 my ($self) = @_;
46
47 %{$::COMPLETER->{command}} = ();
48
49 $::COMPLETER->hide
50 if $::COMPLETER;
51} 36}
52 37
53sub server_login { 38sub server_login {
54 my ($server) = @_; 39 my ($server) = @_;
55 40
… …
163sub invoke_button_down { 148sub invoke_button_down {
164 my ($self, $ev, $x, $y) = @_; 149 my ($self, $ev, $x, $y) = @_;
165 150
166 if ($ev->{button} == 1) { 151 if ($ev->{button} == 1) {
167 $self->grab_focus; 152 $self->grab_focus;
168 return unless $::CONN; 153 return unless $::CONN && $self->{ctilesize};
169 154
170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 155 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; 156 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
172 157
173 $x -= DC::floor $::MAP->w * 0.5; 158 $x -= DC::floor $::MAP->w * 0.5;
… …
201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 189 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 190# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
206 [
207 $::PICKUP_ENABLE->{state}
208 ? "Disable automatic pickup"
209 : "Enable automatic pickup",
210 sub { $::PICKUP_ENABLE->toggle }
211 ],
212 ); 191 );
213 192
214 if ($::CONN && $::CONN->{editor_support}) { 193 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [ 194# push @items, [
216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 195# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
217# \&editor_invoke, 196# \&editor_invoke,
218# ]; 197# ];
219 198
220 for my $type (qw(test name)) { 199 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
221 $::CONN->{editor_support}{type} ne $type 200 $::CONN->{editor_support}{servertype} ne $type
222 or next; 201 or next;
223 my $server = $::CONN->{editor_support}{"${type}server"} 202 my $server = $::CONN->{editor_support}{"${type}server"}
224 or next; 203 or next;
225 204
226 push @items, [ 205 push @items, [
… …
285 $self->{need_update} = 1; 264 $self->{need_update} = 1;
286 $self->SUPER::update; 265 $self->SUPER::update;
287} 266}
288 267
289my %DIR = ( 268my %DIR = (
290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"], 269 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
291 ( "," . DC::SDLK_KP8 ), [1, "north"], 270 ( "," . DC::SDLK_KP8 ), [1, "north"],
292 ( "," . DC::SDLK_KP9 ), [2, "northeast"], 271 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
293 ( "," . DC::SDLK_KP6 ), [3, "east"], 272 ( "," . DC::SDLK_KP6 ), [3, "east"],
294 ( "," . DC::SDLK_KP3 ), [4, "southeast"], 273 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
295 ( "," . DC::SDLK_KP2 ), [5, "south"], 274 ( "," . DC::SDLK_KP2 ), [5, "south"],
296 ( "," . DC::SDLK_KP1 ), [6, "southwest"], 275 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
297 ( "," . DC::SDLK_KP4 ), [7, "west"], 276 ( "," . DC::SDLK_KP4 ), [7, "west"],
298 ( "," . DC::SDLK_KP7 ), [8, "northwest"], 277 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
299 278
279 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
280 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
281 ( "," . DC::SDLK_END ), [6, "southwest"],
282 ( "," . DC::SDLK_HOME ), [8, "northwest"],
283
300 ( "," . DC::SDLK_UP ), [1, "north"], 284 ( "," . DC::SDLK_UP ), [1, "north"],
301 ("1," . DC::SDLK_UP ), [2, "northeast"], 285 ("1," . DC::SDLK_UP ), [2, "northeast"],
302 ( "," . DC::SDLK_RIGHT), [3, "east"], 286 ( "," . DC::SDLK_RIGHT ), [3, "east"],
303 ("1," . DC::SDLK_RIGHT), [4, "southeast"], 287 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
304 ( "," . DC::SDLK_DOWN ), [5, "south"], 288 ( "," . DC::SDLK_DOWN ), [5, "south"],
305 ("1," . DC::SDLK_DOWN ), [6, "southwest"], 289 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
306 ( "," . DC::SDLK_LEFT ), [7, "west"], 290 ( "," . DC::SDLK_LEFT ), [7, "west"],
307 ("1," . DC::SDLK_LEFT ), [8, "northwest"], 291 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
308); 292);
309 293
310sub invoke_key_down { 294sub invoke_key_down {
311 my ($self, $ev) = @_; 295 my ($self, $ev) = @_;
312 296
313 my $mod = $ev->{mod}; 297 my $mod = $ev->{mod};
314 my $sym = $ev->{sym}; 298 my $sym = $ev->{sym};
315 my $uni = $ev->{unicode}; 299 my $uni = $ev->{unicode};
316 300
317 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; 301 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
318 302
319 # ignore repeated keypresses 303 # ignore repeated keypresses
320 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; 304 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
321 $self->{last_mod} = $mod; 305 $self->{last_mod} = $mod;
322 $self->{last_sym} = $sym; 306 $self->{last_sym} = $sym;
323 307
324 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { 308 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
309
310 if ($::CONN && $dir) {
325 if ($mod & DC::KMOD_SHIFT) { 311 if ($mod & DC::KMOD_SHIFT) {
326 $self->{shft}++; 312 $self->{shft}++;
327 if ($dir->[0] != $self->{fire_dir}) { 313 if ($dir->[0] != $self->{fire_dir}) {
328 $::CONN->user_send ("fire $dir->[0]"); 314 $::CONN->user_send ("fire $dir->[0]");
329 } 315 }
… …
356 $::CONN->user_send ("fire_stop"); 342 $::CONN->user_send ("fire_stop");
357 delete $self->{fire_dir}; 343 delete $self->{fire_dir};
358 $res = 1; 344 $res = 1;
359 } 345 }
360 } else { 346 } else {
361 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { 347 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
348
349 if ($dir && delete $self->{shft}) {
362 $::CONN->user_send ("fire_stop"); 350 $::CONN->user_send ("fire_stop");
363 delete $self->{fire_dir}; 351 delete $self->{fire_dir};
364 $res = 1; 352 $res = 1;
365 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) 353 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
366 && delete $self->{shft}) { # XXX: is RSHIFT ok? 354 && delete $self->{shft}) { # XXX: is RSHIFT ok?
… …
368 delete $self->{fire_dir}; 356 delete $self->{fire_dir};
369 $res = 1; 357 $res = 1;
370 } 358 }
371 } 359 }
372 360
373 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { 361 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
374 $::CONN->user_send ("run_stop"); 362 $::CONN->user_send ("run_stop");
375 $res = 1; 363 $res = 1;
376 } 364 }
377 365
378 $res 366 $res
… …
393} 381}
394 382
395sub scroll { 383sub scroll {
396 my ($self, $dx, $dy) = @_; 384 my ($self, $dx, $dy) = @_;
397 385
398 $::MAP->scroll ($dx, $dy);
399
400 $self->movement_update; 386 $self->movement_update;
401 387
402 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement 388 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
403 $self->{sdy} += $dy * $self->{tilesize}; 389 $self->{sdy} += $dy * $self->{tilesize};
390
391 # save old fow texture, if applicable
392 $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
393 $self->{lfdx} = $dx;
394 $self->{lfdy} = $dy;
395 $self->{lmdx} = $self->{dx};
396 $self->{lmdy} = $self->{dy};
397
398 $::MAP->scroll ($dx, $dy);
404} 399}
405 400
406sub set_magicmap { 401sub set_magicmap {
407 my ($self, $w, $h, $x, $y, $data) = @_; 402 my ($self, $w, $h, $x, $y, $data) = @_;
408 403
… …
417sub movement_update { 412sub movement_update {
418 my ($self) = @_; 413 my ($self) = @_;
419 414
420 if ($::CFG->{smooth_movement}) { 415 if ($::CFG->{smooth_movement}) {
421 if ($self->{sdx} || $self->{sdy}) { 416 if ($self->{sdx} || $self->{sdy}) {
422 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); 417 my $diff = AE::time - ($self->{last_update} || $::LAST_REFRESH);
423 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 418 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
424 419
425 # the minimum time for a single tile movement 420 # the minimum time for a single tile movement
426 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK); 421 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
422
423 $spd *= $self->{tilesize};
427 424
428 # jump if "impossibly high" speed 425 # jump if "impossibly high" speed
429 if ( 426 if (
430 (max abs $self->{sdx}, abs $self->{sdy}) 427 (max abs $self->{sdx}, abs $self->{sdy})
431 > $spd * $self->{tilesize} * $mintime * 1.1 428 > $spd * $mintime * 2.1
432 ) { 429 ) {
433 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# 430 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
434 $self->{sdx} = $self->{sdy} = 0; 431 $self->{sdx} = $self->{sdy} = 0;
435 } else { 432 } else {
436 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction 433 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
437 434
438 my $dx = $self->{sdx} < 0 ? -$spd : $spd; 435 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
439 my $dy = $self->{sdy} < 0 ? -$spd : $spd; 436 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
440 437
441 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } 438 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
442 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } 439 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
443
444 $self->update;
445 } 440 }
441
442 $self->update;
446 } 443 }
447 } else { 444 } else {
448 $self->{sdx} = $self->{sdy} = 0; 445 $self->{sdx} = $self->{sdy} = 0;
449 } 446 }
450 447
451 $self->{last_update} = EV::time; 448 $self->{last_update} = AE::time;
452} 449}
453 450
454sub refresh_hook { 451sub refresh_hook {
455 my ($self) = @_; 452 my ($self) = @_;
456 453
… …
462 459
463 my $sdx_t = DC::ceil $self->{sdx} / $tilesize; 460 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
464 my $sdy_t = DC::ceil $self->{sdy} / $tilesize; 461 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
465 462
466 # width/height of map, in tiles 463 # width/height of map, in tiles
467 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 464 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
468 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 465 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
469 466
470 # the map displacement, in tiles 467 # the map displacement, in tiles
471 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t; 468 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
472 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t; 469 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
473 470
… …
477 474
478 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 475 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
479 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 476 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
480 477
481 if ($::CFG->{fow_enable}) { 478 if ($::CFG->{fow_enable}) {
479 # draw_fow_texture REQUIRES the fow texture to stay the same size.
482 my ($w, $h, $data) = $::MAP->fow_texture ( 480 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
483 $dx + (min 0, $sdx_t),
484 $dy + (min 0, $sdy_t),
485 $sw + abs $sdx_t,
486 $sh + abs $sdy_t
487 );
488 481
489 $self->{fow_texture} = new DC::Texture 482 $self->{fow_texture} = new DC::Texture
490 w => $w, 483 w => $w,
491 h => $h, 484 h => $h,
492 data => $data, 485 data => $data,
… …
499 glNewList ($self->{list} ||= glGenList); 492 glNewList ($self->{list} ||= glGenList);
500 493
501 glPushMatrix; 494 glPushMatrix;
502 glTranslate $sx0, $sy0; 495 glTranslate $sx0, $sy0;
503 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 496 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
504 glTranslate $self->{sdx}, $self->{sdy}; 497 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
505 498
506 $::MAP->draw ($dx, $dy, $sw, $sh, 499 $::MAP->draw ($dx, $dy, $sw, $sh,
507 $self->{tilesize}, 500 ($self->{tilesize}) x 2,
508 $::CONN->{player}{tag}, 501 $::CONN->{player}{tag},
509 -$self->{sdx}, -$self->{sdy}); 502 -$self->{sdx}, -$self->{sdy});
510 503
511 glTranslate -$self->{sdx}, -$self->{sdy};
512 glScale $self->{tilesize}, $self->{tilesize}; 504 glScale $self->{tilesize}, $self->{tilesize};
513 505
514 if (my $tex = $self->{fow_texture}) { 506 if (my $tex = $self->{fow_texture}) {
515 glPushMatrix; 507 my @prev_fow_params;
516 glTranslate +(min 0, $sdx_t), (min 0, $sdy_t);
517 glScale 1/3, 1/3;
518 glEnable GL_TEXTURE_2D;
519 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
520 508
509 if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
510 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
511 my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
512
513 if ($d1 * $d2) {
514 @prev_fow_params = (
515 (min 1, $d1 / $d2),
516 $self->{lmdx} - $dx - $self->{lfdx},
517 $self->{lmdy} - $dy - $self->{lfdy},
518 @{$self->{prev_fow_texture}}{qw(name data)}
519 );
520 }
521 }
522
523 DC::Texture::draw_fow_texture
521 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 524 $::CFG->{fow_intensity},
522 $self->{fow_texture}->draw_quad_alpha (0, 0); 525 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
523 526 @{$self->{fow_texture}}{qw(name data s t w h)},
524 glDisable GL_TEXTURE_2D; 527 @prev_fow_params;
525 glPopMatrix;
526 } 528 }
527 529
528 if ($self->{magicmap}) { 530 if ($self->{magicmap}) {
529 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 531 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
530 532
531 $x += $::MAP->ox + $self->{dx}; 533 $x += $::MAP->ox + $self->{dx};
532 $y += $::MAP->oy + $self->{dy}; 534 $y += $::MAP->oy + $self->{dy};
533 535
534 glTranslate - $x - 1, - $y - 1; 536 glTranslate - $x - 1, - $y - 1;
535 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 537 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
536 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 538 $::MAP->draw_magicmap ($w, $h, $data);
537 } 539 }
538 540
539 glPopMatrix; 541 glPopMatrix;
540 glEndList; 542 glEndList;
541 } 543 }
542 } else { 544 } else {
545 delete $self->{last_fow_texture};
546 delete $self->{fow_texture};
547
543 glDeleteList delete $self->{list} 548 glDeleteList delete $self->{list}
544 if $self->{list}; 549 if $self->{list};
545 } 550 }
546} 551}
547 552
… …
583 $self->SUPER::DESTROY; 588 $self->SUPER::DESTROY;
584} 589}
585 590
586package DC::MapWidget::MapMap; 591package DC::MapWidget::MapMap;
587 592
588use strict; 593use common::sense;
589use utf8;
590 594
591our @ISA = DC::UI::Base::; 595our @ISA = DC::UI::Base::;
592 596
593use Time::HiRes qw(time);
594use DC::OpenGL; 597use DC::OpenGL;
595 598
596sub size_request { 599sub size_request {
597 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 600 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
598} 601}
599 602
600sub refresh_hook { 603sub refresh_hook {
601 my ($self) = @_; 604 my ($self) = @_;
602 605
603 if ($::MAP && $self->{texture_atime} < time) { 606 if ($::MAP && $self->{texture_atime} < AE::now) {
604 my ($w, $h) = @$self{qw(w h)}; 607 my ($w, $h) = @$self{qw(w h)};
608
609 return unless $w && $h;
605 610
606 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 611 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
607 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 612 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
608 613
609 my $ox = 0.5 * ($w - $sw); 614 my $ox = 0.5 * ($w - $sw);
… …
621 $self->{sh} = $sh; 626 $self->{sh} = $sh;
622 627
623 $self->{x0} = $x0; 628 $self->{x0} = $x0;
624 $self->{y0} = $y0; 629 $self->{y0} = $y0;
625 630
626 $self->{texture_atime} = time + 1/3; 631 $self->{texture_atime} = AE::now + 1/2;
627 632
628 $self->{texture} = 633 $self->{texture} =
629 new DC::Texture 634 new DC::Texture
630 w => $w, 635 w => $w,
631 h => $h, 636 h => $h,
… …
686 glDisable GL_BLEND; 691 glDisable GL_BLEND;
687} 692}
688 693
689package DC::MapWidget::Command; 694package DC::MapWidget::Command;
690 695
691use strict; 696use common::sense;
692 697
693use DC::OpenGL; 698use DC::OpenGL;
694 699
695our @ISA = DC::UI::Frame::; 700our @ISA = DC::UI::Frame::;
696 701
697sub new { 702sub new {
698 my $class = shift; 703 my $class = shift;
699 704
700 my $self = $class->SUPER::new ( 705 my $self = $class->SUPER::new (
706 min_w => $::WIDTH * 0.25, # workaround for layout problems #d#
701 bg => [0, 0, 0, 0.8], 707 bg => [0, 0, 0, 0.8],
702 @_, 708 @_,
703 ); 709 );
704 710
705 $self->add ($self->{vbox} = new DC::UI::VBox); 711 $self->add ($self->{vbox} = new DC::UI::VBox);
… …
792 ); 798 );
793 799
794 $self 800 $self
795} 801}
796 802
803sub reset {
804 my ($self) = @_;
805
806 $self->hide;
807 delete $self->{command_list};
808}
809
797sub set_prefix { 810sub set_prefix {
798 my ($self, $prefix) = @_; 811 my ($self, $prefix) = @_;
799 812
800 $self->{entry}->set_text ($prefix); 813 $self->{entry}->set_text ($prefix);
801 $self->show; 814 $self->show;
… …
838 my $text = $self->{entry}->get_text; 851 my $text = $self->{entry}->get_text;
839 852
840 length $text 853 length $text
841 or return $self->hide; 854 or return $self->hide;
842 855
843 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 856 return unless $::CONN;
857
858 # regenerate spell list if necessary
859 $self->{command_list}{spells} ||= [
860 map { ("cast $_->{name}", "invoke $_->{name}") }
861 values %{ $::CONN->{spell} }
862 ];
844 863
845 if ($text ne $self->{last_search}) { 864 if ($text ne $self->{last_search}) {
846 my @match; 865 my @match;
847 866
848 if ($text =~ /^(.*?)\s+$/) { 867 if ($text =~ /^(.*?)\s+$/) {
868 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
849 @match = [$cmd, "(appended whitespace suppresses completion)"]; 869 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
850 } else { 870 } else {
871 # @match is [command, penalty, command with arguments] until sort
872
873 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
874
875 my $first_char = substr $cmd, 0, 1;
876
851 my $regexp = do { 877 my $regexp_abbrev = do {
852 my ($beg, @chr) = split //, lc $cmd; 878 my ($beg, @chr) = split //, lc $cmd;
853 879
854 # the following regex is used to match our "completion entry" 880 # the following regex is used to match our "completion entry"
855 # to an actual command - the parentheses match kind of "overhead" 881 # to an actual command - the parentheses match kind of "overhead"
856 # - the more characters the parentheses match, the less attractive 882 # - the more characters the parentheses match, the less attractive
857 # is the match. 883 # is the match.
858 my $regexp = "^\Q$beg\E" 884 my $regexp = "^\Q$beg\E"
859 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 885 . join "", map "(?:.*?[ _\-]|(.*?))\Q$_\E", @chr;
860 qr<$regexp> 886 qr<$regexp>
861 }; 887 };
862 888
863 my @penalty; 889 my $regexp_partial = do {
890 my $regexp = "^\Q$text\E(.*)";
891 qr<$regexp>
892 };
864 893
865 for (keys %{$self->{command}}) { 894 for my $list (values %{ $self->{command_list} }) {
895 for (@$list) {
896 # we only match and score if the first character matches,
897 # so quickly rule out all others first.
898 next unless $first_char = substr $_, 0, 1;
899
900 my @scores;
901
902 # 1. Complete command [with args]
903 # command is a prefix of the text
904 # score is length of complete command matched
905 # e.g. "invoke summon pet monster bat"
906 # "invoke" "summon pet monster bat" = 6
907 # "invoke summon pet monster" "bat" = 25
908 if ((substr $text, 0, length $_) eq $_) {
909 push @scores, [$_, length $_, $text];
910 }
911
912 # 2. Partial command
913 # text is a prefix of the full command
914 # score is the length of the input text
915 # e.g. "invoke s"
916 # "invoke small fireball" = 8
917 # "invoke summon pet monster" = 8
918
919 if ($_ =~ $regexp_partial) {
920 push @scores, [$_, length $text, $_];
921 }
922
923 # 3. Abbreviation match
924 # attempts to use first word of text as an abbreviated command
925 # score is length of word + 1 - 3 per non-word-initial character
926
866 if (@penalty = $_ =~ $regexp) { 927 if (my @penalty = $_ =~ $regexp_abbrev) {
867 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 928 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
929 }
930
931 # Pick the best option for this command
932 push @match, (sort {
933 $b->[1] <=> $a->[1]
934 } @scores)[0];
868 } 935 }
869 } 936 }
870 937
938 # @match is now [command object, command with arguments]
871 @match = map $self->{command}{$_->[0]}, 939 @match = map [$self->{command}{$_->[0]}, $_->[2]],
872 sort { 940 sort {
873 $a->[1] <=> $b->[1] 941 $b->[1] <=> $a->[1]
874 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 942 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
875 or (length $b->[0]) <=> (length $a->[0]) 943 or (length $b->[0]) <=> (length $a->[0])
876 } @match; 944 } @match;
877 } 945 }
878 946
… …
897 $label->{fg} = [1, 1, 1, 1]; 965 $label->{fg} = [1, 1, 1, 1];
898 $label->{bg} = [0, 0, 0, 0]; 966 $label->{bg} = [0, 0, 0, 0];
899 } 967 }
900 968
901 if (@matches) { 969 if (@matches) {
902 $self->{select} = "$matches[0][0]$arg"; 970 $self->{select} = "$matches[0][1]";
903 971
904 $labels[0]->{fg} = [0, 0, 0, 1]; 972 $labels[0]->{fg} = [0, 0, 0, 1];
905 $labels[0]->{bg} = [1, 1, 1, 0.8]; 973 $labels[0]->{bg} = [1, 1, 1, 0.8];
906 } else { 974 } else {
907 $self->{select} = "$cmd$arg"; 975 $self->{select} = "$text";
908 } 976 }
909 977
910 for my $match (@matches) { 978 for my $match (@matches) {
911 my $label = shift @labels; 979 my $label = shift @labels;
912 980
913 if (@labels) { 981 if (@labels) {
914 $label->set_text ("$match->[0]$arg"); 982 $label->set_text ("$match->[1]");
915 $label->set_tooltip ($match->[1]); 983 $label->set_tooltip ("$match->[0][1]");
916 } else { 984 } else {
917 $label->set_text ("..."); 985 $label->set_text ("...");
918 $label->set_tooltip ("Use Cursor-Down to view more matches"); 986 $label->set_tooltip ("Use Cursor-Down to view more matches");
919 last; 987 last;
920 } 988 }

Diff Legend

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