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.133 by root, Sat Jul 19 20:33:47 2008 UTC vs.
Revision 1.161 by root, Sat Mar 20 01:25:56 2010 UTC

… …
10use DC::UI; 10use DC::UI;
11use DC::Macro; 11use DC::Macro;
12 12
13our @ISA = DC::UI::Base::; 13our @ISA = DC::UI::Base::;
14 14
15our @TEX_HIDDEN = map {
16 new_from_resource DC::Texture # MUST be POT
17 "hidden-$_.png", mipmap => 1, wrap => 1
18 } 0, 1, 2;
19
15my $magicmap_tex = 20my $magicmap_tex =
16 new_from_file DC::Texture DC::find_rcfile "magicmap.png", 21 new_from_resource DC::Texture "magicmap.png",
17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 22 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
18 23
19sub new { 24sub new {
20 my $class = shift; 25 my $class = shift;
21 26
… …
163sub invoke_button_down { 168sub invoke_button_down {
164 my ($self, $ev, $x, $y) = @_; 169 my ($self, $ev, $x, $y) = @_;
165 170
166 if ($ev->{button} == 1) { 171 if ($ev->{button} == 1) {
167 $self->grab_focus; 172 $self->grab_focus;
168 return unless $::CONN; 173 return unless $::CONN && $self->{ctilesize};
169 174
170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 175 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}; 176 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
172 177
173 $x -= DC::floor $::MAP->w * 0.5; 178 $x -= DC::floor $::MAP->w * 0.5;
… …
201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 206 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 207 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 208 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 209 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 210# ["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 ); 211 );
213 212
214 if ($::CONN && $::CONN->{editor_support}) { 213 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [ 214# push @items, [
216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 215# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
217# \&editor_invoke, 216# \&editor_invoke,
218# ]; 217# ];
219 218
220 for my $type (qw(test name)) { 219 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
221 $::CONN->{editor_support}{type} ne $type 220 $::CONN->{editor_support}{servertype} ne $type
222 or next; 221 or next;
223 my $server = $::CONN->{editor_support}{"${type}server"} 222 my $server = $::CONN->{editor_support}{"${type}server"}
224 or next; 223 or next;
225 224
226 push @items, [ 225 push @items, [
… …
285 $self->{need_update} = 1; 284 $self->{need_update} = 1;
286 $self->SUPER::update; 285 $self->SUPER::update;
287} 286}
288 287
289my %DIR = ( 288my %DIR = (
290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"], 289 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
291 ( "," . DC::SDLK_KP8 ), [1, "north"], 290 ( "," . DC::SDLK_KP8 ), [1, "north"],
292 ( "," . DC::SDLK_KP9 ), [2, "northeast"], 291 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
293 ( "," . DC::SDLK_KP6 ), [3, "east"], 292 ( "," . DC::SDLK_KP6 ), [3, "east"],
294 ( "," . DC::SDLK_KP3 ), [4, "southeast"], 293 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
295 ( "," . DC::SDLK_KP2 ), [5, "south"], 294 ( "," . DC::SDLK_KP2 ), [5, "south"],
296 ( "," . DC::SDLK_KP1 ), [6, "southwest"], 295 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
297 ( "," . DC::SDLK_KP4 ), [7, "west"], 296 ( "," . DC::SDLK_KP4 ), [7, "west"],
298 ( "," . DC::SDLK_KP7 ), [8, "northwest"], 297 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
299 298
299 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
300 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
301 ( "," . DC::SDLK_END ), [6, "southwest"],
302 ( "," . DC::SDLK_HOME ), [8, "northwest"],
303
300 ( "," . DC::SDLK_UP ), [1, "north"], 304 ( "," . DC::SDLK_UP ), [1, "north"],
301 ("1," . DC::SDLK_UP ), [2, "northeast"], 305 ("1," . DC::SDLK_UP ), [2, "northeast"],
302 ( "," . DC::SDLK_RIGHT), [3, "east"], 306 ( "," . DC::SDLK_RIGHT ), [3, "east"],
303 ("1," . DC::SDLK_RIGHT), [4, "southeast"], 307 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
304 ( "," . DC::SDLK_DOWN ), [5, "south"], 308 ( "," . DC::SDLK_DOWN ), [5, "south"],
305 ("1," . DC::SDLK_DOWN ), [6, "southwest"], 309 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
306 ( "," . DC::SDLK_LEFT ), [7, "west"], 310 ( "," . DC::SDLK_LEFT ), [7, "west"],
307 ("1," . DC::SDLK_LEFT ), [8, "northwest"], 311 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
308); 312);
309 313
310sub invoke_key_down { 314sub invoke_key_down {
311 my ($self, $ev) = @_; 315 my ($self, $ev) = @_;
312 316
313 my $mod = $ev->{mod}; 317 my $mod = $ev->{mod};
314 my $sym = $ev->{sym}; 318 my $sym = $ev->{sym};
315 my $uni = $ev->{unicode}; 319 my $uni = $ev->{unicode};
316 320
317 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; 321 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
318 322
319 # ignore repeated keypresses 323 # ignore repeated keypresses
320 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; 324 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
321 $self->{last_mod} = $mod; 325 $self->{last_mod} = $mod;
322 $self->{last_sym} = $sym; 326 $self->{last_sym} = $sym;
323 327
324 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { 328 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
329
330 if ($::CONN && $dir) {
325 if ($mod & DC::KMOD_SHIFT) { 331 if ($mod & DC::KMOD_SHIFT) {
326 $self->{shft}++; 332 $self->{shft}++;
327 if ($dir->[0] != $self->{fire_dir}) { 333 if ($dir->[0] != $self->{fire_dir}) {
328 $::CONN->user_send ("fire $dir->[0]"); 334 $::CONN->user_send ("fire $dir->[0]");
329 } 335 }
… …
356 $::CONN->user_send ("fire_stop"); 362 $::CONN->user_send ("fire_stop");
357 delete $self->{fire_dir}; 363 delete $self->{fire_dir};
358 $res = 1; 364 $res = 1;
359 } 365 }
360 } else { 366 } else {
361 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { 367 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
368
369 if ($dir && delete $self->{shft}) {
362 $::CONN->user_send ("fire_stop"); 370 $::CONN->user_send ("fire_stop");
363 delete $self->{fire_dir}; 371 delete $self->{fire_dir};
364 $res = 1; 372 $res = 1;
365 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) 373 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
366 && delete $self->{shft}) { # XXX: is RSHIFT ok? 374 && delete $self->{shft}) { # XXX: is RSHIFT ok?
… …
368 delete $self->{fire_dir}; 376 delete $self->{fire_dir};
369 $res = 1; 377 $res = 1;
370 } 378 }
371 } 379 }
372 380
373 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { 381 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
374 $::CONN->user_send ("run_stop"); 382 $::CONN->user_send ("run_stop");
375 $res = 1; 383 $res = 1;
376 } 384 }
377 385
378 $res 386 $res
… …
393} 401}
394 402
395sub scroll { 403sub scroll {
396 my ($self, $dx, $dy) = @_; 404 my ($self, $dx, $dy) = @_;
397 405
398 $::MAP->scroll ($dx, $dy);
399
400 $self->movement_update; 406 $self->movement_update;
401 407
402 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement 408 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
403 $self->{sdy} += $dy * $self->{tilesize}; 409 $self->{sdy} += $dy * $self->{tilesize};
410
411 # save old fow texture, if applicable
412 $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
413 $self->{lfdx} = $dx;
414 $self->{lfdy} = $dy;
415 $self->{lmdx} = $self->{dx};
416 $self->{lmdy} = $self->{dy};
417
418 $::MAP->scroll ($dx, $dy);
404} 419}
405 420
406sub set_magicmap { 421sub set_magicmap {
407 my ($self, $w, $h, $x, $y, $data) = @_; 422 my ($self, $w, $h, $x, $y, $data) = @_;
408 423
… …
421 if ($self->{sdx} || $self->{sdy}) { 436 if ($self->{sdx} || $self->{sdy}) {
422 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); 437 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
423 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 438 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
424 439
425 # the minimum time for a single tile movement 440 # the minimum time for a single tile movement
426 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK); 441 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
442
443 $spd *= $self->{tilesize};
427 444
428 # jump if "impossibly high" speed 445 # jump if "impossibly high" speed
429 if ( 446 if (
430 (max abs $self->{sdx}, abs $self->{sdy}) 447 (max abs $self->{sdx}, abs $self->{sdy})
431 > $spd * $self->{tilesize} * $mintime * 1.1 448 > $spd * $mintime * 2.1
432 ) { 449 ) {
433 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# 450 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
434 $self->{sdx} = $self->{sdy} = 0; 451 $self->{sdx} = $self->{sdy} = 0;
435 } else { 452 } else {
436 my $upd = 0; 453 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
437
438 $spd *= $self->{tilesize} * $diff * 1.0001;
439 454
440 my $dx = $self->{sdx} < 0 ? -$spd : $spd; 455 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
441 my $dy = $self->{sdy} < 0 ? -$spd : $spd; 456 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
442 457
443 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx; $upd = 1 } 458 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
444 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy; $upd = 1 } 459 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
445
446 $self->update if $upd;
447 } 460 }
461
462 $self->update;
448 } 463 }
449 } else { 464 } else {
450 $self->{sdx} = $self->{sdy} = 0; 465 $self->{sdx} = $self->{sdy} = 0;
451 } 466 }
452 467
… …
460 if (delete $self->{need_update}) { 475 if (delete $self->{need_update}) {
461 $self->movement_update; 476 $self->movement_update;
462 477
463 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 478 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
464 479
480 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
481 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
482
465 # width/height of map, in tiles 483 # width/height of map, in tiles
466 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 484 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
467 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 485 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
468 486
469 # the map displacement, in tiles 487 # the map displacement, in tiles
470 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize}; 488 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
471 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize}; 489 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
472 490
473 # the upper left "visible" corner, in pixels 491 # the upper left "visible" corner, in pixels
474 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 492 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
475 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 493 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
476 494
477 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; 495 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
478 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; 496 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
479 497
480 if ($::CFG->{fow_enable}) { 498 if ($::CFG->{fow_enable}) {
499 # draw_fow_texture REQUIRES the fow texture to stay the same size.
481 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 500 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
482 501
483 $self->{fow_texture} = new DC::Texture 502 $self->{fow_texture} = new DC::Texture
484 w => $w, 503 w => $w,
485 h => $h, 504 h => $h,
… …
491 } 510 }
492 511
493 glNewList ($self->{list} ||= glGenList); 512 glNewList ($self->{list} ||= glGenList);
494 513
495 glPushMatrix; 514 glPushMatrix;
496 glTranslate $sx0 + $self->{sdx}, $sy0 + $self->{sdy}; 515 glTranslate $sx0, $sy0;
497 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 516 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
517 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
498 518
499 $::MAP->draw ($dx, $dy, $sw, $sh, 519 $::MAP->draw ($dx, $dy, $sw, $sh,
500 $self->{tilesize}, 520 $self->{tilesize},
501 $::CONN->{player}{tag}, 521 $::CONN->{player}{tag},
502 -$self->{sdx}, -$self->{sdy}); 522 -$self->{sdx}, -$self->{sdy});
503 523
504 glScale $self->{tilesize}, $self->{tilesize}; 524 glScale $self->{tilesize}, $self->{tilesize};
505 525
506 if (my $tex = $self->{fow_texture}) { 526 if (my $tex = $self->{fow_texture}) {
507 glPushMatrix; 527 my @prev_fow_params;
508 glScale 1/3, 1/3;
509 glEnable GL_TEXTURE_2D;
510 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
511 528
529 if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
530 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
531 my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
532
533 if ($d1 * $d2) {
534 @prev_fow_params = (
535 (min 1, $d1 / $d2),
536 $self->{lmdx} - $dx - $self->{lfdx},
537 $self->{lmdy} - $dy - $self->{lfdy},
538 @{$self->{prev_fow_texture}}{qw(name data)}
539 );
540 }
541 }
542
543 DC::Texture::draw_fow_texture
512 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 544 $::CFG->{fow_intensity},
513 $self->{fow_texture}->draw_quad_alpha (0, 0); 545 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
514 546 @{$self->{fow_texture}}{qw(name data s t w h)},
515 glDisable GL_TEXTURE_2D; 547 @prev_fow_params;
516 glPopMatrix;
517 } 548 }
518 549
519 if ($self->{magicmap}) { 550 if ($self->{magicmap}) {
520 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 551 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
521 552
522 $x += $::MAP->ox + $self->{dx}; 553 $x += $::MAP->ox + $self->{dx};
523 $y += $::MAP->oy + $self->{dy}; 554 $y += $::MAP->oy + $self->{dy};
524 555
525 glTranslate - $x - 1, - $y - 1; 556 glTranslate - $x - 1, - $y - 1;
526 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 557 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
527 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 558 $::MAP->draw_magicmap ($w, $h, $data);
528 } 559 }
529 560
530 glPopMatrix; 561 glPopMatrix;
531 glEndList; 562 glEndList;
532 } 563 }
533 } else { 564 } else {
565 delete $self->{last_fow_texture};
566 delete $self->{fow_texture};
567
534 glDeleteList delete $self->{list} 568 glDeleteList delete $self->{list}
535 if $self->{list}; 569 if $self->{list};
536 } 570 }
537} 571}
538 572
… …
591sub refresh_hook { 625sub refresh_hook {
592 my ($self) = @_; 626 my ($self) = @_;
593 627
594 if ($::MAP && $self->{texture_atime} < time) { 628 if ($::MAP && $self->{texture_atime} < time) {
595 my ($w, $h) = @$self{qw(w h)}; 629 my ($w, $h) = @$self{qw(w h)};
630
631 return unless $w && $h;
596 632
597 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 633 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
598 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 634 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
599 635
600 my $ox = 0.5 * ($w - $sw); 636 my $ox = 0.5 * ($w - $sw);
… …
829 my $text = $self->{entry}->get_text; 865 my $text = $self->{entry}->get_text;
830 866
831 length $text 867 length $text
832 or return $self->hide; 868 or return $self->hide;
833 869
834 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
835
836 if ($text ne $self->{last_search}) { 870 if ($text ne $self->{last_search}) {
837 my @match; 871 my @match;
838 872
839 if ($text =~ /^(.*?)\s+$/) { 873 if ($text =~ /^(.*?)\s+$/) {
874 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
840 @match = [$cmd, "(appended whitespace suppresses completion)"]; 875 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
841 } else { 876 } else {
877 # @match is [command, penalty, command with arguments] until sort
878
879 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
880
842 my $regexp = do { 881 my $regexp_abbrev = do {
843 my ($beg, @chr) = split //, lc $cmd; 882 my ($beg, @chr) = split //, lc $cmd;
844 883
845 # the following regex is used to match our "completion entry" 884 # the following regex is used to match our "completion entry"
846 # to an actual command - the parentheses match kind of "overhead" 885 # to an actual command - the parentheses match kind of "overhead"
847 # - the more characters the parentheses match, the less attractive 886 # - the more characters the parentheses match, the less attractive
… …
849 my $regexp = "^\Q$beg\E" 888 my $regexp = "^\Q$beg\E"
850 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 889 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
851 qr<$regexp> 890 qr<$regexp>
852 }; 891 };
853 892
854 my @penalty; 893 my $regexp_partial = do {
894 my $regexp = "^\Q$text\E(.*)";
895 qr<$regexp>
896 };
855 897
856 for (keys %{$self->{command}}) { 898 for (keys %{$self->{command}}) {
857 if (@penalty = $_ =~ $regexp) { 899 my @scores;
858 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 900
901 # 1. Complete command [with args]
902 # command is a prefix of the text
903 # score is length of complete command matched
904 # e.g. "invoke summon pet monster bat"
905 # "invoke" "summon pet monster bat" = 6
906 # "invoke summon pet monster" "bat" = 25
907 if ($text =~ /^\Q$_\E(.*)/) {
908 push @scores, [$_, length $_, $text];
859 } 909 }
910
911 # 2. Partial command
912 # text is a prefix of the full command
913 # score is the length of the input text
914 # e.g. "invoke s"
915 # "invoke small fireball" = 8
916 # "invoke summon pet monster" = 8
917
918 if ($_ =~ $regexp_partial) {
919 push @scores, [$_, length $text, $_];
920 }
921
922 # 3. Abbreviation match
923 # attempts to use first word of text as an abbreviated command
924 # score is length of word + 1 - 3 per non-word-initial character
925
926 if (my @penalty = $_ =~ $regexp_abbrev) {
927 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
928 }
929
930 # Pick the best option for this command
931 push @match, (sort {
932 $b->[1] <=> $a->[1]
933 } @scores)[0];
860 } 934 }
861 935
936 # @match is now [command object, command with arguments]
862 @match = map $self->{command}{$_->[0]}, 937 @match = map [$self->{command}{$_->[0]}, $_->[2]],
863 sort { 938 sort {
864 $a->[1] <=> $b->[1] 939 $b->[1] <=> $a->[1]
865 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 940 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
866 or (length $b->[0]) <=> (length $a->[0]) 941 or (length $b->[0]) <=> (length $a->[0])
867 } @match; 942 } @match;
868 } 943 }
869 944
… …
888 $label->{fg} = [1, 1, 1, 1]; 963 $label->{fg} = [1, 1, 1, 1];
889 $label->{bg} = [0, 0, 0, 0]; 964 $label->{bg} = [0, 0, 0, 0];
890 } 965 }
891 966
892 if (@matches) { 967 if (@matches) {
893 $self->{select} = "$matches[0][0]$arg"; 968 $self->{select} = "$matches[0][1]";
894 969
895 $labels[0]->{fg} = [0, 0, 0, 1]; 970 $labels[0]->{fg} = [0, 0, 0, 1];
896 $labels[0]->{bg} = [1, 1, 1, 0.8]; 971 $labels[0]->{bg} = [1, 1, 1, 0.8];
897 } else { 972 } else {
898 $self->{select} = "$cmd$arg"; 973 $self->{select} = "$text";
899 } 974 }
900 975
901 for my $match (@matches) { 976 for my $match (@matches) {
902 my $label = shift @labels; 977 my $label = shift @labels;
903 978
904 if (@labels) { 979 if (@labels) {
905 $label->set_text ("$match->[0]$arg"); 980 $label->set_text ("$match->[1]");
906 $label->set_tooltip ($match->[1]); 981 $label->set_tooltip ("$match->[0][1]");
907 } else { 982 } else {
908 $label->set_text ("..."); 983 $label->set_text ("...");
909 $label->set_tooltip ("Use Cursor-Down to view more matches"); 984 $label->set_tooltip ("Use Cursor-Down to view more matches");
910 last; 985 last;
911 } 986 }

Diff Legend

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