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.135 by root, Sun Jul 20 02:51:40 2008 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 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
… …
27 ); 33 );
28 34
29 $self 35 $self
30} 36}
31 37
32sub add_command { 38sub add_command {#d# remove
33 my ($self, $command, $tooltip, $widget, $cb) = @_; 39 my ($self, $command, $tooltip, $widget, $cb) = @_;
34 40
35 (my $data = $command) =~ s/\\//g; 41 (my $data = $command) =~ s/\\//g;
36 42
37 $tooltip =~ s/^\s+//; 43 $tooltip =~ s/^\s+//;
38 $tooltip = "<big>$data</big>\n\n$tooltip"; 44 $tooltip = "<big>$data</big>\n\n$tooltip";
39 $tooltip =~ s/\s+$//; 45 $tooltip =~ s/\s+$//;
40 46
41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 47 $::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} 48}
52 49
53sub server_login { 50sub server_login {
54 my ($server) = @_; 51 my ($server) = @_;
55 52
… …
163sub invoke_button_down { 160sub invoke_button_down {
164 my ($self, $ev, $x, $y) = @_; 161 my ($self, $ev, $x, $y) = @_;
165 162
166 if ($ev->{button} == 1) { 163 if ($ev->{button} == 1) {
167 $self->grab_focus; 164 $self->grab_focus;
168 return unless $::CONN; 165 return unless $::CONN && $self->{ctilesize};
169 166
170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; 167 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}; 168 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
172 169
173 $x -= DC::floor $::MAP->w * 0.5; 170 $x -= DC::floor $::MAP->w * 0.5;
… …
201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 198 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 199 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 200 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 201 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 202# ["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 ); 203 );
213 204
214 if ($::CONN && $::CONN->{editor_support}) { 205 if ($::CONN && $::CONN->{editor_support}) {
215# push @items, [ 206# push @items, [
216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", 207# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
217# \&editor_invoke, 208# \&editor_invoke,
218# ]; 209# ];
219 210
220 for my $type (qw(test name)) { 211 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
221 $::CONN->{editor_support}{type} ne $type 212 $::CONN->{editor_support}{servertype} ne $type
222 or next; 213 or next;
223 my $server = $::CONN->{editor_support}{"${type}server"} 214 my $server = $::CONN->{editor_support}{"${type}server"}
224 or next; 215 or next;
225 216
226 push @items, [ 217 push @items, [
… …
285 $self->{need_update} = 1; 276 $self->{need_update} = 1;
286 $self->SUPER::update; 277 $self->SUPER::update;
287} 278}
288 279
289my %DIR = ( 280my %DIR = (
290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"], 281 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
291 ( "," . DC::SDLK_KP8 ), [1, "north"], 282 ( "," . DC::SDLK_KP8 ), [1, "north"],
292 ( "," . DC::SDLK_KP9 ), [2, "northeast"], 283 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
293 ( "," . DC::SDLK_KP6 ), [3, "east"], 284 ( "," . DC::SDLK_KP6 ), [3, "east"],
294 ( "," . DC::SDLK_KP3 ), [4, "southeast"], 285 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
295 ( "," . DC::SDLK_KP2 ), [5, "south"], 286 ( "," . DC::SDLK_KP2 ), [5, "south"],
296 ( "," . DC::SDLK_KP1 ), [6, "southwest"], 287 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
297 ( "," . DC::SDLK_KP4 ), [7, "west"], 288 ( "," . DC::SDLK_KP4 ), [7, "west"],
298 ( "," . DC::SDLK_KP7 ), [8, "northwest"], 289 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
299 290
291 ( "," . DC::SDLK_PAGEUP ), [2, "northeast"],
292 ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"],
293 ( "," . DC::SDLK_END ), [6, "southwest"],
294 ( "," . DC::SDLK_HOME ), [8, "northwest"],
295
300 ( "," . DC::SDLK_UP ), [1, "north"], 296 ( "," . DC::SDLK_UP ), [1, "north"],
301 ("1," . DC::SDLK_UP ), [2, "northeast"], 297 ("1," . DC::SDLK_UP ), [2, "northeast"],
302 ( "," . DC::SDLK_RIGHT), [3, "east"], 298 ( "," . DC::SDLK_RIGHT ), [3, "east"],
303 ("1," . DC::SDLK_RIGHT), [4, "southeast"], 299 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
304 ( "," . DC::SDLK_DOWN ), [5, "south"], 300 ( "," . DC::SDLK_DOWN ), [5, "south"],
305 ("1," . DC::SDLK_DOWN ), [6, "southwest"], 301 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
306 ( "," . DC::SDLK_LEFT ), [7, "west"], 302 ( "," . DC::SDLK_LEFT ), [7, "west"],
307 ("1," . DC::SDLK_LEFT ), [8, "northwest"], 303 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
308); 304);
309 305
310sub invoke_key_down { 306sub invoke_key_down {
311 my ($self, $ev) = @_; 307 my ($self, $ev) = @_;
312 308
313 my $mod = $ev->{mod}; 309 my $mod = $ev->{mod};
314 my $sym = $ev->{sym}; 310 my $sym = $ev->{sym};
315 my $uni = $ev->{unicode}; 311 my $uni = $ev->{unicode};
316 312
317 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; 313 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
318 314
319 # ignore repeated keypresses 315 # ignore repeated keypresses
320 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; 316 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
321 $self->{last_mod} = $mod; 317 $self->{last_mod} = $mod;
322 $self->{last_sym} = $sym; 318 $self->{last_sym} = $sym;
323 319
324 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { 320 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
321
322 if ($::CONN && $dir) {
325 if ($mod & DC::KMOD_SHIFT) { 323 if ($mod & DC::KMOD_SHIFT) {
326 $self->{shft}++; 324 $self->{shft}++;
327 if ($dir->[0] != $self->{fire_dir}) { 325 if ($dir->[0] != $self->{fire_dir}) {
328 $::CONN->user_send ("fire $dir->[0]"); 326 $::CONN->user_send ("fire $dir->[0]");
329 } 327 }
… …
356 $::CONN->user_send ("fire_stop"); 354 $::CONN->user_send ("fire_stop");
357 delete $self->{fire_dir}; 355 delete $self->{fire_dir};
358 $res = 1; 356 $res = 1;
359 } 357 }
360 } else { 358 } else {
361 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { 359 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
360
361 if ($dir && delete $self->{shft}) {
362 $::CONN->user_send ("fire_stop"); 362 $::CONN->user_send ("fire_stop");
363 delete $self->{fire_dir}; 363 delete $self->{fire_dir};
364 $res = 1; 364 $res = 1;
365 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) 365 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
366 && delete $self->{shft}) { # XXX: is RSHIFT ok? 366 && delete $self->{shft}) { # XXX: is RSHIFT ok?
… …
368 delete $self->{fire_dir}; 368 delete $self->{fire_dir};
369 $res = 1; 369 $res = 1;
370 } 370 }
371 } 371 }
372 372
373 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { 373 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
374 $::CONN->user_send ("run_stop"); 374 $::CONN->user_send ("run_stop");
375 $res = 1; 375 $res = 1;
376 } 376 }
377 377
378 $res 378 $res
… …
393} 393}
394 394
395sub scroll { 395sub scroll {
396 my ($self, $dx, $dy) = @_; 396 my ($self, $dx, $dy) = @_;
397 397
398 $::MAP->scroll ($dx, $dy);
399
400 $self->movement_update; 398 $self->movement_update;
401 399
402 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement 400 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
403 $self->{sdy} += $dy * $self->{tilesize}; 401 $self->{sdy} += $dy * $self->{tilesize};
402
403 # save old fow texture, if applicable
404 $self->{prev_fow_texture} = $::CFG->{smooth_transitions} && $self->{fow_texture};
405 $self->{lfdx} = $dx;
406 $self->{lfdy} = $dy;
407 $self->{lmdx} = $self->{dx};
408 $self->{lmdy} = $self->{dy};
409
410 $::MAP->scroll ($dx, $dy);
404} 411}
405 412
406sub set_magicmap { 413sub set_magicmap {
407 my ($self, $w, $h, $x, $y, $data) = @_; 414 my ($self, $w, $h, $x, $y, $data) = @_;
408 415
… …
417sub movement_update { 424sub movement_update {
418 my ($self) = @_; 425 my ($self) = @_;
419 426
420 if ($::CFG->{smooth_movement}) { 427 if ($::CFG->{smooth_movement}) {
421 if ($self->{sdx} || $self->{sdy}) { 428 if ($self->{sdx} || $self->{sdy}) {
422 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); 429 my $diff = AE::time - ($self->{last_update} || $::LAST_REFRESH);
423 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; 430 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
424 431
425 # the minimum time for a single tile movement 432 # the minimum time for a single tile movement
426 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK); 433 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1);
434
435 $spd *= $self->{tilesize};
427 436
428 # jump if "impossibly high" speed 437 # jump if "impossibly high" speed
429 if ( 438 if (
430 (max abs $self->{sdx}, abs $self->{sdy}) 439 (max abs $self->{sdx}, abs $self->{sdy})
431 > $spd * $self->{tilesize} * $mintime * 1.1 440 > $spd * $mintime * 2.1
432 ) { 441 ) {
433 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# 442 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d#
434 $self->{sdx} = $self->{sdy} = 0; 443 $self->{sdx} = $self->{sdy} = 0;
435 } else { 444 } else {
436 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction 445 $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
437 446
438 my $dx = $self->{sdx} < 0 ? -$spd : $spd; 447 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
439 my $dy = $self->{sdy} < 0 ? -$spd : $spd; 448 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
440 449
441 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } 450 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 } 451 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
443
444 $self->update;
445 } 452 }
453
454 $self->update;
446 } 455 }
447 } else { 456 } else {
448 $self->{sdx} = $self->{sdy} = 0; 457 $self->{sdx} = $self->{sdy} = 0;
449 } 458 }
450 459
451 $self->{last_update} = EV::time; 460 $self->{last_update} = AE::time;
452} 461}
453 462
454sub refresh_hook { 463sub refresh_hook {
455 my ($self) = @_; 464 my ($self) = @_;
456 465
… …
458 if (delete $self->{need_update}) { 467 if (delete $self->{need_update}) {
459 $self->movement_update; 468 $self->movement_update;
460 469
461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 470 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
462 471
472 my $sdx_t = DC::ceil $self->{sdx} / $tilesize;
473 my $sdy_t = DC::ceil $self->{sdy} / $tilesize;
474
463 # width/height of map, in tiles 475 # width/height of map, in tiles
464 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; 476 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
465 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; 477 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
466 478
467 # the map displacement, in tiles 479 # the map displacement, in tiles
468 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize}; 480 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
469 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize}; 481 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
470 482
471 # the upper left "visible" corner, in pixels 483 # the upper left "visible" corner, in pixels
472 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
473 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
474 486
475 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;
476 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;
477 489
478 if ($::CFG->{fow_enable}) { 490 if ($::CFG->{fow_enable}) {
491 # draw_fow_texture REQUIRES the fow texture to stay the same size.
479 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 492 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
480 493
481 $self->{fow_texture} = new DC::Texture 494 $self->{fow_texture} = new DC::Texture
482 w => $w, 495 w => $w,
483 h => $h, 496 h => $h,
… …
491 glNewList ($self->{list} ||= glGenList); 504 glNewList ($self->{list} ||= glGenList);
492 505
493 glPushMatrix; 506 glPushMatrix;
494 glTranslate $sx0, $sy0; 507 glTranslate $sx0, $sy0;
495 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 508 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
496 glTranslate $self->{sdx}, $self->{sdy}; 509 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
497 510
498 warn "mapdraw -$self->{sdx}\n";#d#
499 $::MAP->draw ($dx, $dy, $sw, $sh, 511 $::MAP->draw ($dx, $dy, $sw, $sh,
500 $self->{tilesize}, 512 ($self->{tilesize}) x 2,
501 $::CONN->{player}{tag}, 513 $::CONN->{player}{tag},
502 -$self->{sdx}, -$self->{sdy}); 514 -$self->{sdx}, -$self->{sdy});
503 515
504 glTranslate -$self->{sdx}, -$self->{sdy};
505 glScale $self->{tilesize}, $self->{tilesize}; 516 glScale $self->{tilesize}, $self->{tilesize};
506 517
507 if (my $tex = $self->{fow_texture}) { 518 if (my $tex = $self->{fow_texture}) {
508 glPushMatrix; 519 my @prev_fow_params;
509 glScale 1/3, 1/3;
510 glEnable GL_TEXTURE_2D;
511 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
512 520
521 if ($DC::OpenGL::GL_MULTITEX && $self->{prev_fow_texture}) {
522 my $d1 = DC::distance $self->{sdx}, $self->{sdy};
523 my $d2 = (DC::distance $self->{lfdx}, $self->{lfdy}) * $tilesize;
524
525 if ($d1 * $d2) {
526 @prev_fow_params = (
527 (min 1, $d1 / $d2),
528 $self->{lmdx} - $dx - $self->{lfdx},
529 $self->{lmdy} - $dy - $self->{lfdy},
530 @{$self->{prev_fow_texture}}{qw(name data)}
531 );
532 }
533 }
534
535 DC::Texture::draw_fow_texture
513 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 536 $::CFG->{fow_intensity},
514 $self->{fow_texture}->draw_quad_alpha (0, 0); 537 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
515 538 @{$self->{fow_texture}}{qw(name data s t w h)},
516 glDisable GL_TEXTURE_2D; 539 @prev_fow_params;
517 glPopMatrix;
518 } 540 }
519 541
520 if ($self->{magicmap}) { 542 if ($self->{magicmap}) {
521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 543 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
522 544
523 $x += $::MAP->ox + $self->{dx}; 545 $x += $::MAP->ox + $self->{dx};
524 $y += $::MAP->oy + $self->{dy}; 546 $y += $::MAP->oy + $self->{dy};
525 547
526 glTranslate - $x - 1, - $y - 1; 548 glTranslate - $x - 1, - $y - 1;
527 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 549 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
528 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 550 $::MAP->draw_magicmap ($w, $h, $data);
529 } 551 }
530 552
531 glPopMatrix; 553 glPopMatrix;
532 glEndList; 554 glEndList;
533 } 555 }
534 } else { 556 } else {
557 delete $self->{last_fow_texture};
558 delete $self->{fow_texture};
559
535 glDeleteList delete $self->{list} 560 glDeleteList delete $self->{list}
536 if $self->{list}; 561 if $self->{list};
537 } 562 }
538} 563}
539 564
… …
575 $self->SUPER::DESTROY; 600 $self->SUPER::DESTROY;
576} 601}
577 602
578package DC::MapWidget::MapMap; 603package DC::MapWidget::MapMap;
579 604
580use strict; 605use common::sense;
581use utf8;
582 606
583our @ISA = DC::UI::Base::; 607our @ISA = DC::UI::Base::;
584 608
585use Time::HiRes qw(time);
586use DC::OpenGL; 609use DC::OpenGL;
587 610
588sub size_request { 611sub size_request {
589 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 612 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
590} 613}
591 614
592sub refresh_hook { 615sub refresh_hook {
593 my ($self) = @_; 616 my ($self) = @_;
594 617
595 if ($::MAP && $self->{texture_atime} < time) { 618 if ($::MAP && $self->{texture_atime} < AE::now) {
596 my ($w, $h) = @$self{qw(w h)}; 619 my ($w, $h) = @$self{qw(w h)};
620
621 return unless $w && $h;
597 622
598 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 623 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
599 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 624 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
600 625
601 my $ox = 0.5 * ($w - $sw); 626 my $ox = 0.5 * ($w - $sw);
… …
613 $self->{sh} = $sh; 638 $self->{sh} = $sh;
614 639
615 $self->{x0} = $x0; 640 $self->{x0} = $x0;
616 $self->{y0} = $y0; 641 $self->{y0} = $y0;
617 642
618 $self->{texture_atime} = time + 1/3; 643 $self->{texture_atime} = AE::now + 1/2;
619 644
620 $self->{texture} = 645 $self->{texture} =
621 new DC::Texture 646 new DC::Texture
622 w => $w, 647 w => $w,
623 h => $h, 648 h => $h,
… …
678 glDisable GL_BLEND; 703 glDisable GL_BLEND;
679} 704}
680 705
681package DC::MapWidget::Command; 706package DC::MapWidget::Command;
682 707
683use strict; 708use common::sense;
684 709
685use DC::OpenGL; 710use DC::OpenGL;
686 711
687our @ISA = DC::UI::Frame::; 712our @ISA = DC::UI::Frame::;
688 713
… …
784 ); 809 );
785 810
786 $self 811 $self
787} 812}
788 813
814sub reset {
815 my ($self) = @_;
816
817 $self->hide;
818 delete $self->{command_list};
819}
820
789sub set_prefix { 821sub set_prefix {
790 my ($self, $prefix) = @_; 822 my ($self, $prefix) = @_;
791 823
792 $self->{entry}->set_text ($prefix); 824 $self->{entry}->set_text ($prefix);
793 $self->show; 825 $self->show;
… …
830 my $text = $self->{entry}->get_text; 862 my $text = $self->{entry}->get_text;
831 863
832 length $text 864 length $text
833 or return $self->hide; 865 or return $self->hide;
834 866
835 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; 867 return unless $::CONN;
868
869 # regenerate spell list if necessary
870 $self->{command_list}{spells} ||= [
871 map { ("cast $_->{name}", "invoke $_->{name}") }
872 values %{ $::CONN->{spell} }
873 ];
836 874
837 if ($text ne $self->{last_search}) { 875 if ($text ne $self->{last_search}) {
838 my @match; 876 my @match;
839 877
840 if ($text =~ /^(.*?)\s+$/) { 878 if ($text =~ /^(.*?)\s+$/) {
879 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
841 @match = [$cmd, "(appended whitespace suppresses completion)"]; 880 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
842 } else { 881 } else {
882 # @match is [command, penalty, command with arguments] until sort
883
884 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
885
886 my $first_char = substr $cmd, 0, 1;
887
843 my $regexp = do { 888 my $regexp_abbrev = do {
844 my ($beg, @chr) = split //, lc $cmd; 889 my ($beg, @chr) = split //, lc $cmd;
845 890
846 # the following regex is used to match our "completion entry" 891 # the following regex is used to match our "completion entry"
847 # to an actual command - the parentheses match kind of "overhead" 892 # to an actual command - the parentheses match kind of "overhead"
848 # - the more characters the parentheses match, the less attractive 893 # - the more characters the parentheses match, the less attractive
849 # is the match. 894 # is the match.
850 my $regexp = "^\Q$beg\E" 895 my $regexp = "^\Q$beg\E"
851 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 896 . join "", map "(?:.*?[ _\-]|(.*?))\Q$_\E", @chr;
852 qr<$regexp> 897 qr<$regexp>
853 }; 898 };
854 899
855 my @penalty; 900 my $regexp_partial = do {
901 my $regexp = "^\Q$text\E(.*)";
902 qr<$regexp>
903 };
856 904
857 for (keys %{$self->{command}}) { 905 for my $list (values %{ $self->{command_list} }) {
906 for (@$list) {
907 # we only match and score if the first character matches,
908 # so quickly rule out all others first.
909 next unless $first_char = substr $_, 0, 1;
910
911 my @scores;
912
913 # 1. Complete command [with args]
914 # command is a prefix of the text
915 # score is length of complete command matched
916 # e.g. "invoke summon pet monster bat"
917 # "invoke" "summon pet monster bat" = 6
918 # "invoke summon pet monster" "bat" = 25
919 if ((substr $text, 0, length $_) eq $_) {
920 push @scores, [$_, length $_, $text];
921 }
922
923 # 2. Partial command
924 # text is a prefix of the full command
925 # score is the length of the input text
926 # e.g. "invoke s"
927 # "invoke small fireball" = 8
928 # "invoke summon pet monster" = 8
929
930 if ($_ =~ $regexp_partial) {
931 push @scores, [$_, length $text, $_];
932 }
933
934 # 3. Abbreviation match
935 # attempts to use first word of text as an abbreviated command
936 # score is length of word + 1 - 3 per non-word-initial character
937
858 if (@penalty = $_ =~ $regexp) { 938 if (my @penalty = $_ =~ $regexp_abbrev) {
859 push @match, [$_, length join "", map "::$_", grep defined, @penalty]; 939 push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"];
940 }
941
942 # Pick the best option for this command
943 push @match, (sort {
944 $b->[1] <=> $a->[1]
945 } @scores)[0];
860 } 946 }
861 } 947 }
862 948
949 # @match is now [command object, command with arguments]
863 @match = map $self->{command}{$_->[0]}, 950 @match = map [$self->{command}{$_->[0]}, $_->[2]],
864 sort { 951 sort {
865 $a->[1] <=> $b->[1] 952 $b->[1] <=> $a->[1]
866 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 953 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
867 or (length $b->[0]) <=> (length $a->[0]) 954 or (length $b->[0]) <=> (length $a->[0])
868 } @match; 955 } @match;
869 } 956 }
870 957
… …
889 $label->{fg} = [1, 1, 1, 1]; 976 $label->{fg} = [1, 1, 1, 1];
890 $label->{bg} = [0, 0, 0, 0]; 977 $label->{bg} = [0, 0, 0, 0];
891 } 978 }
892 979
893 if (@matches) { 980 if (@matches) {
894 $self->{select} = "$matches[0][0]$arg"; 981 $self->{select} = "$matches[0][1]";
895 982
896 $labels[0]->{fg} = [0, 0, 0, 1]; 983 $labels[0]->{fg} = [0, 0, 0, 1];
897 $labels[0]->{bg} = [1, 1, 1, 0.8]; 984 $labels[0]->{bg} = [1, 1, 1, 0.8];
898 } else { 985 } else {
899 $self->{select} = "$cmd$arg"; 986 $self->{select} = "$text";
900 } 987 }
901 988
902 for my $match (@matches) { 989 for my $match (@matches) {
903 my $label = shift @labels; 990 my $label = shift @labels;
904 991
905 if (@labels) { 992 if (@labels) {
906 $label->set_text ("$match->[0]$arg"); 993 $label->set_text ("$match->[1]");
907 $label->set_tooltip ($match->[1]); 994 $label->set_tooltip ("$match->[0][1]");
908 } else { 995 } else {
909 $label->set_text ("..."); 996 $label->set_text ("...");
910 $label->set_tooltip ("Use Cursor-Down to view more matches"); 997 $label->set_tooltip ("Use Cursor-Down to view more matches");
911 last; 998 last;
912 } 999 }

Diff Legend

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