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.130 by root, Thu May 8 18:58:55 2008 UTC vs.
Revision 1.168 by root, Wed Nov 21 13:23:10 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 set_tilesize {
33 my ($self, $tilesize) = @_;
34
35 $self->{tilesize} = $tilesize;
36}
37
38sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_;
40
41 (my $data = $command) =~ s/\\//g;
42
43 $tooltip =~ s/^\s+//;
44 $tooltip = "<big>$data</big>\n\n$tooltip";
45 $tooltip =~ s/\s+$//;
46
47 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
48}
49
50sub clr_commands {
51 my ($self) = @_;
52
53 %{$::COMPLETER->{command}} = ();
54
55 $::COMPLETER->hide
56 if $::COMPLETER;
57} 36}
58 37
59sub server_login { 38sub server_login {
60 my ($server) = @_; 39 my ($server) = @_;
61 40
… …
169sub invoke_button_down { 148sub invoke_button_down {
170 my ($self, $ev, $x, $y) = @_; 149 my ($self, $ev, $x, $y) = @_;
171 150
172 if ($ev->{button} == 1) { 151 if ($ev->{button} == 1) {
173 $self->grab_focus; 152 $self->grab_focus;
174 return unless $::CONN; 153 return unless $::CONN && $self->{ctilesize};
175 154
176 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};
177 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};
178 157
179 $x -= DC::floor $::MAP->w * 0.5; 158 $x -= DC::floor $::MAP->w * 0.5;
… …
207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 189 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
211# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 190# ["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 ); 191 );
219 192
220 if ($::CONN && $::CONN->{editor_support}) { 193 if ($::CONN && $::CONN->{editor_support}) {
221# push @items, [ 194# push @items, [
222# "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>",
223# \&editor_invoke, 196# \&editor_invoke,
224# ]; 197# ];
225 198
226 for my $type (qw(test name)) { 199 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
227 $::CONN->{editor_support}{type} ne $type 200 $::CONN->{editor_support}{servertype} ne $type
228 or next; 201 or next;
229 my $server = $::CONN->{editor_support}{"${type}server"} 202 my $server = $::CONN->{editor_support}{"${type}server"}
230 or next; 203 or next;
231 204
232 push @items, [ 205 push @items, [
… …
291 $self->{need_update} = 1; 264 $self->{need_update} = 1;
292 $self->SUPER::update; 265 $self->SUPER::update;
293} 266}
294 267
295my %DIR = ( 268my %DIR = (
296 ( "," . DC::SDLK_KP5 ), [0, "stay fire"], 269 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
297 ( "," . DC::SDLK_KP8 ), [1, "north"], 270 ( "," . DC::SDLK_KP8 ), [1, "north"],
298 ( "," . DC::SDLK_KP9 ), [2, "northeast"], 271 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
299 ( "," . DC::SDLK_KP6 ), [3, "east"], 272 ( "," . DC::SDLK_KP6 ), [3, "east"],
300 ( "," . DC::SDLK_KP3 ), [4, "southeast"], 273 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
301 ( "," . DC::SDLK_KP2 ), [5, "south"], 274 ( "," . DC::SDLK_KP2 ), [5, "south"],
302 ( "," . DC::SDLK_KP1 ), [6, "southwest"], 275 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
303 ( "," . DC::SDLK_KP4 ), [7, "west"], 276 ( "," . DC::SDLK_KP4 ), [7, "west"],
304 ( "," . DC::SDLK_KP7 ), [8, "northwest"], 277 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
305 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
306 ( "," . DC::SDLK_UP ), [1, "north"], 284 ( "," . DC::SDLK_UP ), [1, "north"],
307 ("1," . DC::SDLK_UP ), [2, "northeast"], 285 ("1," . DC::SDLK_UP ), [2, "northeast"],
308 ( "," . DC::SDLK_RIGHT), [3, "east"], 286 ( "," . DC::SDLK_RIGHT ), [3, "east"],
309 ("1," . DC::SDLK_RIGHT), [4, "southeast"], 287 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
310 ( "," . DC::SDLK_DOWN ), [5, "south"], 288 ( "," . DC::SDLK_DOWN ), [5, "south"],
311 ("1," . DC::SDLK_DOWN ), [6, "southwest"], 289 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
312 ( "," . DC::SDLK_LEFT ), [7, "west"], 290 ( "," . DC::SDLK_LEFT ), [7, "west"],
313 ("1," . DC::SDLK_LEFT ), [8, "northwest"], 291 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
314); 292);
315 293
316sub invoke_key_down { 294sub invoke_key_down {
317 my ($self, $ev) = @_; 295 my ($self, $ev) = @_;
318 296
319 my $mod = $ev->{mod}; 297 my $mod = $ev->{mod};
320 my $sym = $ev->{sym}; 298 my $sym = $ev->{sym};
321 my $uni = $ev->{unicode}; 299 my $uni = $ev->{unicode};
322 300
323 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; 301 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
324 302
325 # ignore repeated keypresses 303 # ignore repeated keypresses
326 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; 304 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
327 $self->{last_mod} = $mod; 305 $self->{last_mod} = $mod;
328 $self->{last_sym} = $sym; 306 $self->{last_sym} = $sym;
329 307
330 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) {
331 if ($mod & DC::KMOD_SHIFT) { 311 if ($mod & DC::KMOD_SHIFT) {
332 $self->{shft}++; 312 $self->{shft}++;
333 if ($dir->[0] != $self->{fire_dir}) { 313 if ($dir->[0] != $self->{fire_dir}) {
334 $::CONN->user_send ("fire $dir->[0]"); 314 $::CONN->user_send ("fire $dir->[0]");
335 } 315 }
… …
352 332
353 my $res = 0; 333 my $res = 0;
354 my $mod = $ev->{mod}; 334 my $mod = $ev->{mod};
355 my $sym = $ev->{sym}; 335 my $sym = $ev->{sym};
356 336
337 delete $self->{last_mod};
338 delete $self->{last_sym};
339
357 if ($::CFG->{shift_fire_stop}) { 340 if ($::CFG->{shift_fire_stop}) {
358 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { 341 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
359 $::CONN->user_send ("fire_stop"); 342 $::CONN->user_send ("fire_stop");
360 delete $self->{fire_dir}; 343 delete $self->{fire_dir};
361 $res = 1; 344 $res = 1;
362 } 345 }
363 } else { 346 } else {
364 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}) {
365 $::CONN->user_send ("fire_stop"); 350 $::CONN->user_send ("fire_stop");
366 delete $self->{fire_dir}; 351 delete $self->{fire_dir};
367 $res = 1; 352 $res = 1;
368 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) 353 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
369 && delete $self->{shft}) { # XXX: is RSHIFT ok? 354 && delete $self->{shft}) { # XXX: is RSHIFT ok?
… …
371 delete $self->{fire_dir}; 356 delete $self->{fire_dir};
372 $res = 1; 357 $res = 1;
373 } 358 }
374 } 359 }
375 360
376 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { 361 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
377 $::CONN->user_send ("run_stop"); 362 $::CONN->user_send ("run_stop");
378 $res = 1; 363 $res = 1;
379 } 364 }
380 365
381 $res 366 $res
… …
387 $self->refresh_hook; 372 $self->refresh_hook;
388 373
389 0 374 0
390} 375}
391 376
377sub set_tilesize {
378 my ($self, $tilesize) = @_;
379
380 $self->{tilesize} = $tilesize;
381}
382
383sub scroll {
384 my ($self, $dx, $dy) = @_;
385
386 $self->movement_update;
387
388 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
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);
399}
400
392sub set_magicmap { 401sub set_magicmap {
393 my ($self, $w, $h, $x, $y, $data) = @_; 402 my ($self, $w, $h, $x, $y, $data) = @_;
394 403
395 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 404 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
396 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 405 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
398 $self->{magicmap} = [$x, $y, $w, $h, $data]; 407 $self->{magicmap} = [$x, $y, $w, $h, $data];
399 408
400 $self->update; 409 $self->update;
401} 410}
402 411
412sub movement_update {
413 my ($self) = @_;
414
415 if ($::CFG->{smooth_movement}) {
416 if ($self->{sdx} || $self->{sdy}) {
417 my $diff = AE::time - ($self->{last_update} || $::LAST_REFRESH);
418 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
419
420 # the minimum time for a single tile movement
421 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
422
423 $spd *= $self->{tilesize};
424
425 # jump if "impossibly high" speed
426 if (
427 (max abs $self->{sdx}, abs $self->{sdy})
428 > $spd * $mintime * 2.1
429 ) {
430 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
431 $self->{sdx} = $self->{sdy} = 0;
432 } else {
433 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
434
435 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
436 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
437
438 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
439 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
440 }
441
442 $self->update;
443 }
444 } else {
445 $self->{sdx} = $self->{sdy} = 0;
446 }
447
448 $self->{last_update} = AE::time;
449}
450
403sub refresh_hook { 451sub refresh_hook {
404 my ($self) = @_; 452 my ($self) = @_;
405 453
406 if ($::MAP && $::CONN) { 454 if ($::MAP && $::CONN) {
407 if (delete $self->{need_update}) { 455 if (delete $self->{need_update}) {
456 $self->movement_update;
457
408 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 458 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
409 459
460 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
461 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
462
463 # width/height of map, in tiles
410 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 464 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
411 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 465 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
412 466
467 # the map displacement, in tiles
413 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize; 468 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
414 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize; 469 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
415 470
471 # the upper left "visible" corner, in pixels
416 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 472 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
417 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 473 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
418 474
419 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;
420 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;
421 477
422 if ($::CFG->{fow_enable}) { 478 if ($::CFG->{fow_enable}) {
479 # draw_fow_texture REQUIRES the fow texture to stay the same size.
423 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 480 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
424 481
425 $self->{fow_texture} = new DC::Texture 482 $self->{fow_texture} = new DC::Texture
426 w => $w, 483 w => $w,
427 h => $h, 484 h => $h,
… …
435 glNewList ($self->{list} ||= glGenList); 492 glNewList ($self->{list} ||= glGenList);
436 493
437 glPushMatrix; 494 glPushMatrix;
438 glTranslate $sx0, $sy0; 495 glTranslate $sx0, $sy0;
439 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 496 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
497 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
440 498
441 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 499 $::MAP->draw ($dx, $dy, $sw, $sh,
500 ($self->{tilesize}) x 2,
501 $::CONN->{player}{tag},
502 -$self->{sdx}, -$self->{sdy});
442 503
443 glScale $self->{tilesize}, $self->{tilesize}; 504 glScale $self->{tilesize}, $self->{tilesize};
444 505
445 if (my $tex = $self->{fow_texture}) { 506 if (my $tex = $self->{fow_texture}) {
446 glPushMatrix; 507 my @prev_fow_params;
447 glScale 1/3, 1/3;
448 glEnable GL_TEXTURE_2D;
449 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
450 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
451 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 524 $::CFG->{fow_intensity},
452 $self->{fow_texture}->draw_quad_alpha (0, 0); 525 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
453 526 @{$self->{fow_texture}}{qw(name data s t w h)},
454 glDisable GL_TEXTURE_2D; 527 @prev_fow_params;
455 glPopMatrix;
456 } 528 }
457 529
458 if ($self->{magicmap}) { 530 if ($self->{magicmap}) {
459 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 531 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
460 532
461 $x += $::MAP->ox + $self->{dx}; 533 $x += $::MAP->ox + $self->{dx};
462 $y += $::MAP->oy + $self->{dy}; 534 $y += $::MAP->oy + $self->{dy};
463 535
464 glTranslate - $x - 1, - $y - 1; 536 glTranslate - $x - 1, - $y - 1;
465 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 537 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
466 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 538 $::MAP->draw_magicmap ($w, $h, $data);
467 } 539 }
468 540
469 glPopMatrix; 541 glPopMatrix;
470 glEndList; 542 glEndList;
471 } 543 }
472 } else { 544 } else {
545 delete $self->{last_fow_texture};
546 delete $self->{fow_texture};
547
473 glDeleteList delete $self->{list} 548 glDeleteList delete $self->{list}
474 if $self->{list}; 549 if $self->{list};
475 } 550 }
476} 551}
477 552
… …
513 $self->SUPER::DESTROY; 588 $self->SUPER::DESTROY;
514} 589}
515 590
516package DC::MapWidget::MapMap; 591package DC::MapWidget::MapMap;
517 592
518use strict; 593use common::sense;
519use utf8;
520 594
521our @ISA = DC::UI::Base::; 595our @ISA = DC::UI::Base::;
522 596
523use Time::HiRes qw(time);
524use DC::OpenGL; 597use DC::OpenGL;
525 598
526sub size_request { 599sub size_request {
527 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 600 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
528} 601}
529 602
530sub refresh_hook { 603sub refresh_hook {
531 my ($self) = @_; 604 my ($self) = @_;
532 605
533 if ($::MAP && $self->{texture_atime} < time) { 606 if ($::MAP && $self->{texture_atime} < AE::now) {
534 my ($w, $h) = @$self{qw(w h)}; 607 my ($w, $h) = @$self{qw(w h)};
608
609 return unless $w && $h;
535 610
536 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 611 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
537 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 612 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
538 613
539 my $ox = 0.5 * ($w - $sw); 614 my $ox = 0.5 * ($w - $sw);
… …
551 $self->{sh} = $sh; 626 $self->{sh} = $sh;
552 627
553 $self->{x0} = $x0; 628 $self->{x0} = $x0;
554 $self->{y0} = $y0; 629 $self->{y0} = $y0;
555 630
556 $self->{texture_atime} = time + 1/3; 631 $self->{texture_atime} = AE::now + 1/2;
557 632
558 $self->{texture} = 633 $self->{texture} =
559 new DC::Texture 634 new DC::Texture
560 w => $w, 635 w => $w,
561 h => $h, 636 h => $h,
… …
616 glDisable GL_BLEND; 691 glDisable GL_BLEND;
617} 692}
618 693
619package DC::MapWidget::Command; 694package DC::MapWidget::Command;
620 695
621use strict; 696use common::sense;
622 697
623use DC::OpenGL; 698use DC::OpenGL;
624 699
625our @ISA = DC::UI::Frame::; 700our @ISA = DC::UI::Frame::;
626 701
… …
722 ); 797 );
723 798
724 $self 799 $self
725} 800}
726 801
802sub reset {
803 my ($self) = @_;
804
805 $self->hide;
806 delete $self->{command_list};
807}
808
727sub set_prefix { 809sub set_prefix {
728 my ($self, $prefix) = @_; 810 my ($self, $prefix) = @_;
729 811
730 $self->{entry}->set_text ($prefix); 812 $self->{entry}->set_text ($prefix);
731 $self->show; 813 $self->show;
… …
768 my $text = $self->{entry}->get_text; 850 my $text = $self->{entry}->get_text;
769 851
770 length $text 852 length $text
771 or return $self->hide; 853 or return $self->hide;
772 854
773 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 855 return unless $::CONN;
856
857 # regenerate spell list if necessary
858 $self->{command_list}{spells} ||= [
859 map { ("cast $_->{name}", "invoke $_->{name}") }
860 values %{ $::CONN->{spell} }
861 ];
774 862
775 if ($text ne $self->{last_search}) { 863 if ($text ne $self->{last_search}) {
776 my @match; 864 my @match;
777 865
778 if ($text =~ /^(.*?)\s+$/) { 866 if ($text =~ /^(.*?)\s+$/) {
867 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
779 @match = [$cmd, "(appended whitespace suppresses completion)"]; 868 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
780 } else { 869 } else {
870 # @match is [command, penalty, command with arguments] until sort
871
872 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
873
874 my $first_char = substr $cmd, 0, 1;
875
781 my $regexp = do { 876 my $regexp_abbrev = do {
782 my ($beg, @chr) = split //, lc $cmd; 877 my ($beg, @chr) = split //, lc $cmd;
783 878
784 # the following regex is used to match our "completion entry" 879 # the following regex is used to match our "completion entry"
785 # to an actual command - the parentheses match kind of "overhead" 880 # to an actual command - the parentheses match kind of "overhead"
786 # - the more characters the parentheses match, the less attractive 881 # - the more characters the parentheses match, the less attractive
787 # is the match. 882 # is the match.
788 my $regexp = "^\Q$beg\E" 883 my $regexp = "^\Q$beg\E"
789 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 884 . join "", map "(?:.*?[ _\-]|(.*?))\Q$_\E", @chr;
790 qr<$regexp> 885 qr<$regexp>
791 }; 886 };
792 887
793 my @penalty; 888 my $regexp_partial = do {
889 my $regexp = "^\Q$text\E(.*)";
890 qr<$regexp>
891 };
794 892
795 for (keys %{$self->{command}}) { 893 for my $list (values %{ $self->{command_list} }) {
894 for (@$list) {
895 # we only match and score if the first character matches,
896 # so quickly rule out all others first.
897 next unless $first_char = substr $_, 0, 1;
898
899 my @scores;
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 ((substr $text, 0, length $_) eq $_) {
908 push @scores, [$_, length $_, $text];
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
796 if (@penalty = $_ =~ $regexp) { 926 if (my @penalty = $_ =~ $regexp_abbrev) {
797 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 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];
798 } 934 }
799 } 935 }
800 936
937 # @match is now [command object, command with arguments]
801 @match = map $self->{command}{$_->[0]}, 938 @match = map [$self->{command}{$_->[0]}, $_->[2]],
802 sort { 939 sort {
803 $a->[1] <=> $b->[1] 940 $b->[1] <=> $a->[1]
804 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 941 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
805 or (length $b->[0]) <=> (length $a->[0]) 942 or (length $b->[0]) <=> (length $a->[0])
806 } @match; 943 } @match;
807 } 944 }
808 945
… …
827 $label->{fg} = [1, 1, 1, 1]; 964 $label->{fg} = [1, 1, 1, 1];
828 $label->{bg} = [0, 0, 0, 0]; 965 $label->{bg} = [0, 0, 0, 0];
829 } 966 }
830 967
831 if (@matches) { 968 if (@matches) {
832 $self->{select} = "$matches[0][0]$arg"; 969 $self->{select} = "$matches[0][1]";
833 970
834 $labels[0]->{fg} = [0, 0, 0, 1]; 971 $labels[0]->{fg} = [0, 0, 0, 1];
835 $labels[0]->{bg} = [1, 1, 1, 0.8]; 972 $labels[0]->{bg} = [1, 1, 1, 0.8];
836 } else { 973 } else {
837 $self->{select} = "$cmd$arg"; 974 $self->{select} = "$text";
838 } 975 }
839 976
840 for my $match (@matches) { 977 for my $match (@matches) {
841 my $label = shift @labels; 978 my $label = shift @labels;
842 979
843 if (@labels) { 980 if (@labels) {
844 $label->set_text ("$match->[0]$arg"); 981 $label->set_text ("$match->[1]");
845 $label->set_tooltip ($match->[1]); 982 $label->set_tooltip ("$match->[0][1]");
846 } else { 983 } else {
847 $label->set_text ("..."); 984 $label->set_text ("...");
848 $label->set_tooltip ("Use Cursor-Down to view more matches"); 985 $label->set_tooltip ("Use Cursor-Down to view more matches");
849 last; 986 last;
850 } 987 }

Diff Legend

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