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.131 by root, Thu May 8 19:00:37 2008 UTC vs.
Revision 1.154 by root, Fri Dec 4 15:04:56 2009 UTC

… …
11use DC::Macro; 11use DC::Macro;
12 12
13our @ISA = DC::UI::Base::; 13our @ISA = DC::UI::Base::;
14 14
15my $magicmap_tex = 15my $magicmap_tex =
16 new_from_file DC::Texture DC::find_rcfile "magicmap.png", 16 new_from_resource DC::Texture "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18 18
19sub new { 19sub new {
20 my $class = shift; 20 my $class = shift;
21 21
… …
25 tilesize => 32, 25 tilesize => 32,
26 @_ 26 @_
27 ); 27 );
28 28
29 $self 29 $self
30}
31
32sub set_tilesize {
33 my ($self, $tilesize) = @_;
34
35 $self->{tilesize} = $tilesize;
36} 30}
37 31
38sub add_command { 32sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 33 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 34
… …
169sub invoke_button_down { 163sub invoke_button_down {
170 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
171 165
172 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
173 $self->grab_focus; 167 $self->grab_focus;
174 return unless $::CONN; 168 return unless $::CONN && $self->{ctilesize};
175 169
176 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
177 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
178 172
179 $x -= DC::floor $::MAP->w * 0.5; 173 $x -= DC::floor $::MAP->w * 0.5;
… …
207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
211# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
212 [
213 $::PICKUP_ENABLE->{state}
214 ? "Disable automatic pickup"
215 : "Enable automatic pickup",
216 sub { $::PICKUP_ENABLE->toggle }
217 ],
218 ); 206 );
219 207
220 if ($::CONN && $::CONN->{editor_support}) { 208 if ($::CONN && $::CONN->{editor_support}) {
221# push @items, [ 209# push @items, [
222# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 210# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
… …
291 $self->{need_update} = 1; 279 $self->{need_update} = 1;
292 $self->SUPER::update; 280 $self->SUPER::update;
293} 281}
294 282
295my %DIR = ( 283my %DIR = (
296 ( "," . DC::SDLK_KP5 ), [0, "stay fire"], 284 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
297 ( "," . DC::SDLK_KP8 ), [1, "north"], 285 ( "," . DC::SDLK_KP8 ), [1, "north"],
298 ( "," . DC::SDLK_KP9 ), [2, "northeast"], 286 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
299 ( "," . DC::SDLK_KP6 ), [3, "east"], 287 ( "," . DC::SDLK_KP6 ), [3, "east"],
300 ( "," . DC::SDLK_KP3 ), [4, "southeast"], 288 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
301 ( "," . DC::SDLK_KP2 ), [5, "south"], 289 ( "," . DC::SDLK_KP2 ), [5, "south"],
302 ( "," . DC::SDLK_KP1 ), [6, "southwest"], 290 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
303 ( "," . DC::SDLK_KP4 ), [7, "west"], 291 ( "," . DC::SDLK_KP4 ), [7, "west"],
304 ( "," . DC::SDLK_KP7 ), [8, "northwest"], 292 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
305 293
294 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
295 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
296 ( "," . DC::SDLK_END ), [6, "southwest"],
297 ( "," . DC::SDLK_HOME ), [8, "northwest"],
298
306 ( "," . DC::SDLK_UP ), [1, "north"], 299 ( "," . DC::SDLK_UP ), [1, "north"],
307 ("1," . DC::SDLK_UP ), [2, "northeast"], 300 ("1," . DC::SDLK_UP ), [2, "northeast"],
308 ( "," . DC::SDLK_RIGHT), [3, "east"], 301 ( "," . DC::SDLK_RIGHT ), [3, "east"],
309 ("1," . DC::SDLK_RIGHT), [4, "southeast"], 302 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
310 ( "," . DC::SDLK_DOWN ), [5, "south"], 303 ( "," . DC::SDLK_DOWN ), [5, "south"],
311 ("1," . DC::SDLK_DOWN ), [6, "southwest"], 304 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
312 ( "," . DC::SDLK_LEFT ), [7, "west"], 305 ( "," . DC::SDLK_LEFT ), [7, "west"],
313 ("1," . DC::SDLK_LEFT ), [8, "northwest"], 306 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
314); 307);
315 308
316sub invoke_key_down { 309sub invoke_key_down {
317 my ($self, $ev) = @_; 310 my ($self, $ev) = @_;
318 311
319 my $mod = $ev->{mod}; 312 my $mod = $ev->{mod};
320 my $sym = $ev->{sym}; 313 my $sym = $ev->{sym};
321 my $uni = $ev->{unicode}; 314 my $uni = $ev->{unicode};
322 315
323 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; 316 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
324 317
325 # ignore repeated keypresses 318 # ignore repeated keypresses
326 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; 319 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
327 $self->{last_mod} = $mod; 320 $self->{last_mod} = $mod;
328 $self->{last_sym} = $sym; 321 $self->{last_sym} = $sym;
329 322
330 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { 323 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
324
325 if ($::CONN && $dir) {
331 if ($mod & DC::KMOD_SHIFT) { 326 if ($mod & DC::KMOD_SHIFT) {
332 $self->{shft}++; 327 $self->{shft}++;
333 if ($dir->[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
334 $::CONN->user_send ("fire $dir->[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
335 } 330 }
… …
362 $::CONN->user_send ("fire_stop"); 357 $::CONN->user_send ("fire_stop");
363 delete $self->{fire_dir}; 358 delete $self->{fire_dir};
364 $res = 1; 359 $res = 1;
365 } 360 }
366 } else { 361 } else {
367 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { 362 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
363
364 if ($dir && delete $self->{shft}) {
368 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
369 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
370 $res = 1; 367 $res = 1;
371 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) 368 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
372 && delete $self->{shft}) { # XXX: is RSHIFT ok? 369 && delete $self->{shft}) { # XXX: is RSHIFT ok?
… …
374 delete $self->{fire_dir}; 371 delete $self->{fire_dir};
375 $res = 1; 372 $res = 1;
376 } 373 }
377 } 374 }
378 375
379 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { 376 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
380 $::CONN->user_send ("run_stop"); 377 $::CONN->user_send ("run_stop");
381 $res = 1; 378 $res = 1;
382 } 379 }
383 380
384 $res 381 $res
… …
390 $self->refresh_hook; 387 $self->refresh_hook;
391 388
392 0 389 0
393} 390}
394 391
392sub set_tilesize {
393 my ($self, $tilesize) = @_;
394
395 $self->{tilesize} = $tilesize;
396}
397
398sub scroll {
399 my ($self, $dx, $dy) = @_;
400
401 $::MAP->scroll ($dx, $dy);
402
403 $self->{last_fow_texture} = $self->{fow_texture};
404 $self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement
405 $self->{ldy} = $self->{sdy} + $dy * $self->{tilesize};
406
407 $self->movement_update;
408
409 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
410 $self->{sdy} += $dy * $self->{tilesize};
411}
412
395sub set_magicmap { 413sub set_magicmap {
396 my ($self, $w, $h, $x, $y, $data) = @_; 414 my ($self, $w, $h, $x, $y, $data) = @_;
397 415
398 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 416 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
399 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 417 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
401 $self->{magicmap} = [$x, $y, $w, $h, $data]; 419 $self->{magicmap} = [$x, $y, $w, $h, $data];
402 420
403 $self->update; 421 $self->update;
404} 422}
405 423
424sub movement_update {
425 my ($self) = @_;
426
427 if ($::CFG->{smooth_movement}) {
428 if ($self->{sdx} || $self->{sdy}) {
429 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
430 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
431
432 # the minimum time for a single tile movement
433 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
434
435 $spd *= $self->{tilesize};
436
437 # jump if "impossibly high" speed
438 if (
439 (max abs $self->{sdx}, abs $self->{sdy})
440 > $spd * $mintime * 2.1
441 ) {
442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
443 $self->{sdx} = $self->{sdy} = 0;
444 } else {
445 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
446
447 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
448 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
449
450 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
452 }
453
454 $self->update;
455 }
456 } else {
457 $self->{sdx} = $self->{sdy} = 0;
458 }
459
460 $self->{last_update} = EV::time;
461}
462
406sub refresh_hook { 463sub refresh_hook {
407 my ($self) = @_; 464 my ($self) = @_;
408 465
409 if ($::MAP && $::CONN) { 466 if ($::MAP && $::CONN) {
410 if (delete $self->{need_update}) { 467 if (delete $self->{need_update}) {
468 $self->movement_update;
469
411 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 470 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
412 471
472 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
473 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
474
475 # width/height of map, in tiles
413 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 476 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
414 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 477 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
415 478
479 # the map displacement, in tiles
416 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize; 480 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
417 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize; 481 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
418 482
483 # the upper left "visible" corner, in pixels
419 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
420 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
421 486
422 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 487 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
423 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 488 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
424 489
425 if ($::CFG->{fow_enable}) { 490 if ($::CFG->{fow_enable}) {
491 my ($sdx_t, $sdy_t);#d# do not anchor at player
492
426 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 493 my ($w, $h, $data) = $::MAP->fow_texture (
494 $dx + (min 0, $sdx_t),
495 $dy + (min 0, $sdy_t),
496 $sw + abs $sdx_t,
497 $sh + abs $sdy_t
498 );
427 499
428 $self->{fow_texture} = new DC::Texture 500 $self->{fow_texture} = new DC::Texture
429 w => $w, 501 w => $w,
430 h => $h, 502 h => $h,
431 data => $data, 503 data => $data,
… …
438 glNewList ($self->{list} ||= glGenList); 510 glNewList ($self->{list} ||= glGenList);
439 511
440 glPushMatrix; 512 glPushMatrix;
441 glTranslate $sx0, $sy0; 513 glTranslate $sx0, $sy0;
442 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 514 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
515 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
443 516
444 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 517 $::MAP->draw ($dx, $dy, $sw, $sh,
518 $self->{tilesize},
519 $::CONN->{player}{tag},
520 -$self->{sdx}, -$self->{sdy});
445 521
522 #d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player
446 glScale $self->{tilesize}, $self->{tilesize}; 523 glScale $self->{tilesize}, $self->{tilesize};
447 524
448 if (my $tex = $self->{fow_texture}) { 525 if (my $tex = $self->{fow_texture}) {
526 glEnable GL_TEXTURE_2D;
527 glEnable GL_BLEND;
528 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
529 glBlendFunc GL_ONE, GL_ZERO;
530
531 my $a1 = 0.9;
532
533 if (0 && $self->{last_fow_texture}) {
534 my $d1 = ($self->{sdx} ** 2 + $self->{sdy} ** 2) ** 0.5;
535 my $d2 = ($self->{ldx} ** 2 + $self->{ldy} ** 2) ** 0.5;
536
537 if ($d1 * $d2) {
538 my $a2 = $d1 / $d2;
539
540 $a1 = 1 - $a2;
541
542 #$a1 *= 0.9;
543 #$a2 *= 0.9;
544
545 printf "%4g %4g %4g %4g\n", $d1, $d2, $a1, $a2;#d#
546
547 #$a1 = 1 - (1-$a1) * 0.707;
548 #$a2 = 1 - (1-$a2) * 0.707;
549
550 glColor 1,0,0,1;
551 glBegin GL_QUADS;
552 glVertex 10 + $sdx_t, 10;
553 glVertex 11 + $sdx_t, 10;
554 glVertex 11 + $sdx_t, 11;
555 glVertex 10 + $sdx_t, 11;
556 glEnd;
557
558 glColor +($::CFG->{fow_intensity}) x 3, $a2;
559 glPushMatrix;
560 glTranslate $sdx_t, $sdy_t; # anchor at player
561 glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize;
562 glScale 1/3, 1/3;
563 $self->{last_fow_texture}->draw_quad_alpha (0, 0);
564 glPopMatrix;
565 } else {
566 delete $self->{last_fow_texture};
567 }
568 }
569
570 glColor +($::CFG->{fow_intensity}) x 3, $a1;
449 glPushMatrix; 571 glPushMatrix;
572 #d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player
450 glScale 1/3, 1/3; 573 glScale 1/3, 1/3;
451 glEnable GL_TEXTURE_2D;
452 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
453
454 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
455 $self->{fow_texture}->draw_quad_alpha (0, 0); 574 $self->{fow_texture}->draw_quad_alpha (0, 0);
575 glPopMatrix;
456 576
457 glDisable GL_TEXTURE_2D; 577 glDisable GL_TEXTURE_2D;
458 glPopMatrix; 578 glDisable GL_BLEND;
459 } 579 }
460 580
461 if ($self->{magicmap}) { 581 if ($self->{magicmap}) {
462 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 582 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
463 583
… …
533sub refresh_hook { 653sub refresh_hook {
534 my ($self) = @_; 654 my ($self) = @_;
535 655
536 if ($::MAP && $self->{texture_atime} < time) { 656 if ($::MAP && $self->{texture_atime} < time) {
537 my ($w, $h) = @$self{qw(w h)}; 657 my ($w, $h) = @$self{qw(w h)};
658
659 return unless $w && $h;
538 660
539 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 661 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
540 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 662 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
541 663
542 my $ox = 0.5 * ($w - $sw); 664 my $ox = 0.5 * ($w - $sw);
… …
771 my $text = $self->{entry}->get_text; 893 my $text = $self->{entry}->get_text;
772 894
773 length $text 895 length $text
774 or return $self->hide; 896 or return $self->hide;
775 897
776 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
777
778 if ($text ne $self->{last_search}) { 898 if ($text ne $self->{last_search}) {
779 my @match; 899 my @match;
780 900
781 if ($text =~ /^(.*?)\s+$/) { 901 if ($text =~ /^(.*?)\s+$/) {
902 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
782 @match = [$cmd, "(appended whitespace suppresses completion)"]; 903 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
783 } else { 904 } else {
905 # @match is [command, penalty, command with arguments] until sort
906
907 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
908
784 my $regexp = do { 909 my $regexp_abbrev = do {
785 my ($beg, @chr) = split //, lc $cmd; 910 my ($beg, @chr) = split //, lc $cmd;
786 911
787 # the following regex is used to match our "completion entry" 912 # the following regex is used to match our "completion entry"
788 # to an actual command - the parentheses match kind of "overhead" 913 # to an actual command - the parentheses match kind of "overhead"
789 # - the more characters the parentheses match, the less attractive 914 # - the more characters the parentheses match, the less attractive
… …
791 my $regexp = "^\Q$beg\E" 916 my $regexp = "^\Q$beg\E"
792 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 917 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
793 qr<$regexp> 918 qr<$regexp>
794 }; 919 };
795 920
796 my @penalty; 921 my $regexp_partial = do {
922 my $regexp = "^\Q$text\E(.*)";
923 qr<$regexp>
924 };
797 925
798 for (keys %{$self->{command}}) { 926 for (keys %{$self->{command}}) {
799 if (@penalty = $_ =~ $regexp) { 927 my @scores;
800 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 928
929 # 1. Complete command [with args]
930 # command is a prefix of the text
931 # score is length of complete command matched
932 # e.g. "invoke summon pet monster bat"
933 # "invoke" "summon pet monster bat" = 6
934 # "invoke summon pet monster" "bat" = 25
935 if ($text =~ /^\Q$_\E(.*)/) {
936 push @scores, [$_, length $_, $text];
801 } 937 }
938
939 # 2. Partial command
940 # text is a prefix of the full command
941 # score is the length of the input text
942 # e.g. "invoke s"
943 # "invoke small fireball" = 8
944 # "invoke summon pet monster" = 8
945
946 if ($_ =~ $regexp_partial) {
947 push @scores, [$_, length $text, $_];
948 }
949
950 # 3. Abbreviation match
951 # attempts to use first word of text as an abbreviated command
952 # score is length of word + 1 - 3 per non-word-initial character
953
954 if (my @penalty = $_ =~ $regexp_abbrev) {
955 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
956 }
957
958 # Pick the best option for this command
959 push @match, (sort {
960 $b->[1] <=> $a->[1]
961 } @scores)[0];
802 } 962 }
803 963
964 # @match is now [command object, command with arguments]
804 @match = map $self->{command}{$_->[0]}, 965 @match = map [$self->{command}{$_->[0]}, $_->[2]],
805 sort { 966 sort {
806 $a->[1] <=> $b->[1] 967 $b->[1] <=> $a->[1]
807 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 968 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
808 or (length $b->[0]) <=> (length $a->[0]) 969 or (length $b->[0]) <=> (length $a->[0])
809 } @match; 970 } @match;
810 } 971 }
811 972
… …
830 $label->{fg} = [1, 1, 1, 1]; 991 $label->{fg} = [1, 1, 1, 1];
831 $label->{bg} = [0, 0, 0, 0]; 992 $label->{bg} = [0, 0, 0, 0];
832 } 993 }
833 994
834 if (@matches) { 995 if (@matches) {
835 $self->{select} = "$matches[0][0]$arg"; 996 $self->{select} = "$matches[0][1]";
836 997
837 $labels[0]->{fg} = [0, 0, 0, 1]; 998 $labels[0]->{fg} = [0, 0, 0, 1];
838 $labels[0]->{bg} = [1, 1, 1, 0.8]; 999 $labels[0]->{bg} = [1, 1, 1, 0.8];
839 } else { 1000 } else {
840 $self->{select} = "$cmd$arg"; 1001 $self->{select} = "$text";
841 } 1002 }
842 1003
843 for my $match (@matches) { 1004 for my $match (@matches) {
844 my $label = shift @labels; 1005 my $label = shift @labels;
845 1006
846 if (@labels) { 1007 if (@labels) {
847 $label->set_text ("$match->[0]$arg"); 1008 $label->set_text ("$match->[1]");
848 $label->set_tooltip ($match->[1]); 1009 $label->set_tooltip ("$match->[0][1]");
849 } else { 1010 } else {
850 $label->set_text ("..."); 1011 $label->set_text ("...");
851 $label->set_tooltip ("Use Cursor-Down to view more matches"); 1012 $label->set_tooltip ("Use Cursor-Down to view more matches");
852 last; 1013 last;
853 } 1014 }

Diff Legend

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