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.94 by elmex, Mon Dec 4 15:17:14 2006 UTC vs.
Revision 1.169 by root, Sun Nov 25 14:37:18 2012 UTC

1package CFPlus::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);
7 6
8use CFPlus; 7use AnyEvent ();
8
9use DC;
9use CFPlus::OpenGL; 10use DC::OpenGL;
10use CFPlus::UI; 11use DC::UI;
12use DC::Macro;
11 13
12our @ISA = CFPlus::UI::Base::; 14our @ISA = DC::UI::Base::;
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;
13 20
14my $magicmap_tex = 21my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 22 new_from_resource DC::Texture "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 23 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 24
18sub new { 25sub new {
19 my $class = shift; 26 my $class = shift;
20 27
21 my $self = $class->SUPER::new ( 28 my $self = $class->SUPER::new (
22 z => -1, 29 z => -1,
23 can_focus => 1, 30 can_focus => 1,
24 list => glGenList, 31 tilesize => 32,
25
26 smooth_matrix => [
27 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05,
30 ],
31
32 @_ 32 @_
33 ); 33 );
34 34
35 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command},
37 tooltip => "#completer_help",
38 ;
39
40 $self 35 $self
41}
42
43sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_;
45
46 (my $data = $command) =~ s/\\//g;
47
48 $tooltip =~ s/^\s+//;
49 $tooltip = "<big>$data</big>\n\n$tooltip";
50 $tooltip =~ s/\s+$//;
51
52 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53}
54
55sub clr_commands {
56 my ($self) = @_;
57
58 %{$self->{completer}{command}} = ();
59
60 $self->{completer}->hide
61 if $self->{completer};
62} 36}
63 37
64sub server_login { 38sub server_login {
65 my ($server) = @_; 39 my ($server) = @_;
66 40
… …
71 45
72sub editor_invoke { 46sub editor_invoke {
73 my $editsup = $::CONN && $::CONN->{editor_support} 47 my $editsup = $::CONN && $::CONN->{editor_support}
74 or return; 48 or return;
75 49
76 CFPlus::background { 50 DC::background {
77 print "preparing editor startup...\n"; 51 print "preparing editor startup...\n";
78 52
79 my $server = $editsup->{gameserver} || "default"; 53 my $server = $editsup->{gameserver} || "default";
80 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 54 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
81 55
82 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 56 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir;
83 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 57 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
84 58
85 print "map directory is $mapdir\n"; 59 print "map directory is $mapdir\n";
86 print "lib directory is $libdir\n"; 60 print "lib directory is $libdir\n";
87 61
88 my $ua = CFPlus::lwp_useragent; 62 my $ua = DC::lwp_useragent;
89 63
90 for my $file (qw(archetypes crossfire.0)) { 64 for my $file (qw(archetypes crossfire.0)) {
91 my $url = "$editsup->{lib_root}$file"; 65 my $url = "$editsup->{lib_root}$file";
92 print "mirroring $url...\n"; 66 print "mirroring $url...\n";
93 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); 67 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
94 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 68 printf "%s size %d octets\n", $file, -s "$libdir/$file";
95 } 69 }
96 70
97 if (1) { # upload a map 71 if (1) { # upload a map
98 my $mapname = $::CONN->{map_info}[0]; 72 my $mapname = $::CONN->{map_info}[0];
… …
103 77
104 print "getting map revision for $mapname...\n"; 78 print "getting map revision for $mapname...\n";
105 79
106 # try to get the most recent head revision, what a hack, 80 # try to get the most recent head revision, what a hack,
107 # this should have been returned while downloading *sigh* 81 # this should have been returned while downloading *sigh*
108 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 82 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
109 83
110 if ($log =~ /\?rev=(\d+\.\d+)"/) { 84 if ($log =~ /\?rev=(\d+\.\d+)"/) {
111 my $rev = $1; 85 my $rev = $1;
112 86
113 print "downloading revision $rev...\n"; 87 print "downloading revision $rev...\n";
114 88
115 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 89 my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
116 90
117 my $meta = { 91 my $meta = {
118 %$editsup, 92 %$editsup,
119 path => $mapname, 93 path => $mapname,
120 revision => $rev, 94 revision => $rev,
… …
125 require File::Path; 99 require File::Path;
126 100
127 File::Path::mkpath (File::Basename::dirname ($mappath)); 101 File::Path::mkpath (File::Basename::dirname ($mappath));
128 open my $fh, ">:raw:perlio", "$mappath.meta" 102 open my $fh, ">:raw:perlio", "$mappath.meta"
129 or die "$mappath.meta: $!\n"; 103 or die "$mappath.meta: $!\n";
130 print $fh CFPlus::to_json $meta; 104 print $fh DC::encode_json $meta;
131 close $fh; 105 close $fh;
132 open my $fh, ">:raw:perlio:utf8", $mappath 106 open my $fh, ">:raw:perlio:utf8", $mappath
133 or die "$mappath: $!\n"; 107 or die "$mappath: $!\n";
134 print $fh $map; 108 print $fh $map;
135 close $fh; 109 close $fh;
… …
174sub invoke_button_down { 148sub invoke_button_down {
175 my ($self, $ev, $x, $y) = @_; 149 my ($self, $ev, $x, $y) = @_;
176 150
177 if ($ev->{button} == 1) { 151 if ($ev->{button} == 1) {
178 $self->grab_focus; 152 $self->grab_focus;
179 return unless $::CONN; 153 return unless $::CONN && $self->{ctilesize};
180 154
181 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; 155 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
182 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; 156 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
183 157
184 $x -= CFPlus::floor $::MAP->w * 0.5; 158 $x -= DC::floor $::MAP->w * 0.5;
185 $y -= CFPlus::floor $::MAP->h * 0.5; 159 $y -= DC::floor $::MAP->h * 0.5;
186 160
187 if ($::CONN) { 161 if ($::CONN) {
188 if ($::IN_BUILD_MODE) {
189 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
190 } else {
191 $::CONN->lookat ($x, $y) 162 $::CONN->lookat ($x, $y)
192 }
193 } 163 }
194 164
195 } elsif ($ev->{button} == 2) { 165 } elsif ($ev->{button} == 2) {
196 $self->grab_focus; 166 $self->grab_focus;
197 return unless $::CONN; 167 return unless $::CONN;
… …
215 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 185 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
216 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 186 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
217 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 187 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
218 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 188 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
219 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 189 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
220 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 190# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
221 [
222 $::PICKUP_ENABLE->{state}
223 ? "Disable automatic pickup"
224 : "Enable automatic pickup",
225 sub { $::PICKUP_ENABLE->toggle }
226 ],
227 ); 191 );
228 192
229 if ($::CONN && $::CONN->{editor_support}) { 193 if ($::CONN && $::CONN->{editor_support}) {
230 push @items, [ 194# push @items, [
231 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", 195# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
232 \&editor_invoke, 196# \&editor_invoke,
233 ]; 197# ];
234 198
235 for my $type (qw(test name)) { 199 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
236 $::CONN->{editor_support}{type} ne $type 200 $::CONN->{editor_support}{servertype} ne $type
237 or next; 201 or next;
238 my $server = $::CONN->{editor_support}{"${type}server"} 202 my $server = $::CONN->{editor_support}{"${type}server"}
239 or next; 203 or next;
240 204
241 push @items, [ 205 push @items, [
242 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", 206 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
243 sub { server_login $server }, 207 sub { server_login $server },
244 ]; 208 ];
245 } 209 }
246 } 210 }
247 211
… …
255 } 219 }
256 } 220 }
257 ], 221 ],
258 ; 222 ;
259 223
260 (new CFPlus::UI::Menu 224 (new DC::UI::Menu
261 items => \@items, 225 items => \@items,
262 )->popup ($ev); 226 )->popup ($ev);
263 } 227 }
264 228
265 1 229 1
… …
284 248
285 1 249 1
286} 250}
287 251
288sub size_request { 252sub size_request {
253 my ($self) = @_;
254
289 ( 255 (
290 32 * CFPlus::ceil $::WIDTH / 32, 256 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
291 32 * CFPlus::ceil $::HEIGHT / 32, 257 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
292 ) 258 )
293} 259}
294 260
295sub update { 261sub update {
296 my ($self) = @_; 262 my ($self) = @_;
… …
298 $self->{need_update} = 1; 264 $self->{need_update} = 1;
299 $self->SUPER::update; 265 $self->SUPER::update;
300} 266}
301 267
302my %DIR = ( 268my %DIR = (
303 CFPlus::SDLK_KP8, [1, "north"], 269 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
270 ( "," . DC::SDLK_KP8 ), [1, "north"],
304 CFPlus::SDLK_KP9, [2, "northeast"], 271 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
305 CFPlus::SDLK_KP6, [3, "east"], 272 ( "," . DC::SDLK_KP6 ), [3, "east"],
306 CFPlus::SDLK_KP3, [4, "southeast"], 273 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
307 CFPlus::SDLK_KP2, [5, "south"], 274 ( "," . DC::SDLK_KP2 ), [5, "south"],
308 CFPlus::SDLK_KP1, [6, "southwest"], 275 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
309 CFPlus::SDLK_KP4, [7, "west"], 276 ( "," . DC::SDLK_KP4 ), [7, "west"],
310 CFPlus::SDLK_KP7, [8, "northwest"], 277 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
311 278
312 CFPlus::SDLK_UP, [1, "north"], 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
284 ( "," . DC::SDLK_UP ), [1, "north"],
285 ("1," . DC::SDLK_UP ), [2, "northeast"],
313 CFPlus::SDLK_RIGHT, [3, "east"], 286 ( "," . DC::SDLK_RIGHT ), [3, "east"],
314 CFPlus::SDLK_DOWN, [5, "south"], 287 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
315 CFPlus::SDLK_LEFT, [7, "west"], 288 ( "," . DC::SDLK_DOWN ), [5, "south"],
289 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
290 ( "," . DC::SDLK_LEFT ), [7, "west"],
291 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
316); 292);
317 293
318sub invoke_key_down { 294sub invoke_key_down {
319 my ($self, $ev) = @_; 295 my ($self, $ev) = @_;
320 296
321 my $mod = $ev->{mod}; 297 my $mod = $ev->{mod};
322 my $sym = $ev->{sym}; 298 my $sym = $ev->{sym};
323 my $uni = $ev->{unicode}; 299 my $uni = $ev->{unicode};
324 300
325 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 301 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
326 302
327 if ($uni == ord "\t") { 303 # ignore repeated keypresses
328 $::PL_WINDOW->toggle_visibility; 304 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
329 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 305 $self->{last_mod} = $mod;
330 $::HELP_WINDOW->toggle_visibility; 306 $self->{last_sym} = $sym;
331 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
332 ::toggle_player_page ($::STATS_PAGE);
333 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
334 ::toggle_player_page ($::SKILL_PAGE);
335 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
336 ::toggle_player_page ($::SPELL_PAGE);
337 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
338 ::toggle_player_page ($::INVENTORY_PAGE);
339 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
340 $::SETUP_DIALOG->toggle_visibility;
341 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
342 $::BIND_EDITOR->set_binding (undef, undef, [],
343 sub {
344 my ($mod, $sym, $cmds) = @_;
345 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
346 });
347 $::BIND_EDITOR->start;
348 $::BIND_EDITOR->show;
349#TODO: elmex, what was this supposed to do? it currently crashes the client.
350# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
351# $::BIND_EDITOR->stop;
352# $::BIND_EDITOR->ask_for_bind_and_commit;
353# $::BIND_EDITOR->hide;
354 } elsif (!$::CONN) {
355 return 0; # bindings further down need a valid connection
356 307
357 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 308 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
358 $::CONN->user_send ("stay fire"); 309
359 } elsif ($uni == ord ",") { 310 if ($::CONN && $dir) {
360 $::CONN->user_send ("take");
361 } elsif ($uni == ord " ") {
362 $::CONN->user_send ("apply");
363 } elsif ($uni == 13) {
364 $::CONN->user_send ("examine");
365 } elsif ($uni == ord ".") {
366 $::CONN->user_send ($self->{completer}{last_command})
367 if exists $self->{completer}{last_command};
368 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
369 $::CONN->user_send ($_) for @$bind_cmd;
370 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
371 $::CONN->user_send ("rotateshoottype +");
372 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
373 $::CONN->user_send ("rotateshoottype -");
374 } elsif ($uni == ord '"') {
375 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
376 $self->{completer}->show;
377 } elsif ($uni == ord "'") {
378 $self->{completer}->set_prefix ("");
379 $self->{completer}->show;
380 } elsif (exists $DIR{$sym}) {
381 if ($mod & CFPlus::KMOD_SHIFT) { 311 if ($mod & DC::KMOD_SHIFT) {
382 $self->{shft}++; 312 $self->{shft}++;
383 if ($DIR{$sym}[0] != $self->{fire_dir}) { 313 if ($dir->[0] != $self->{fire_dir}) {
384 $::CONN->user_send ("fire $DIR{$sym}[0]"); 314 $::CONN->user_send ("fire $dir->[0]");
385 } 315 }
386 $self->{fire_dir} = $DIR{$sym}[0]; 316 $self->{fire_dir} = $dir->[0];
387 } elsif ($mod & CFPlus::KMOD_CTRL) { 317 } elsif ($mod & DC::KMOD_CTRL) {
388 $self->{ctrl}++; 318 $self->{ctrl}++;
389 $::CONN->user_send ("run $DIR{$sym}[0]"); 319 $::CONN->user_send ("run $dir->[0]");
390 } else { 320 } else {
391 $::CONN->user_send ("$DIR{$sym}[1]"); 321 $::CONN->user_send ("$dir->[1]");
392 } 322 }
393 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 323
394 $self->{completer}->inject_key_down ($ev);
395 $self->{completer}->show;
396 } else {
397 return 0; 324 return 1;
398 }
399
400 1 325 }
326
327 0
401} 328}
402 329
403sub invoke_key_up { 330sub invoke_key_up {
404 my ($self, $ev) = @_; 331 my ($self, $ev) = @_;
405 332
406 my $res = 0; 333 my $res = 0;
407 my $mod = $ev->{mod}; 334 my $mod = $ev->{mod};
408 my $sym = $ev->{sym}; 335 my $sym = $ev->{sym};
409 336
337 delete $self->{last_mod};
338 delete $self->{last_sym};
339
410 if ($::CFG->{shift_fire_stop}) { 340 if ($::CFG->{shift_fire_stop}) {
411 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 341 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
412 $::CONN->user_send ("fire_stop"); 342 $::CONN->user_send ("fire_stop");
413 delete $self->{fire_dir}; 343 delete $self->{fire_dir};
414 $res = 1; 344 $res = 1;
415 } 345 }
416 } else { 346 } else {
347 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
348
417 if (exists $DIR{$sym} && delete $self->{shft}) { 349 if ($dir && delete $self->{shft}) {
418 $::CONN->user_send ("fire_stop"); 350 $::CONN->user_send ("fire_stop");
419 delete $self->{fire_dir}; 351 delete $self->{fire_dir};
420 $res = 1; 352 $res = 1;
421 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 353 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
354 && delete $self->{shft}) { # XXX: is RSHIFT ok?
422 $::CONN->user_send ("fire_stop"); 355 $::CONN->user_send ("fire_stop");
423 delete $self->{fire_dir}; 356 delete $self->{fire_dir};
424 $res = 1; 357 $res = 1;
425 } 358 }
426 } 359 }
427 360
428 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 361 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
429 $::CONN->user_send ("run_stop"); 362 $::CONN->user_send ("run_stop");
430 $res = 1; 363 $res = 1;
431 } 364 }
432 365
433 $res 366 $res
434} 367}
435 368
369sub invoke_visibility_change {
370 my ($self) = @_;
371
372 $self->refresh_hook;
373
374 0
375}
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
436sub set_magicmap { 401sub set_magicmap {
437 my ($self, $w, $h, $x, $y, $data) = @_; 402 my ($self, $w, $h, $x, $y, $data) = @_;
438 403
439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 404 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 405 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
442 $self->{magicmap} = [$x, $y, $w, $h, $data]; 407 $self->{magicmap} = [$x, $y, $w, $h, $data];
443 408
444 $self->update; 409 $self->update;
445} 410}
446 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
451sub refresh_hook {
452 my ($self) = @_;
453
454 if ($::MAP && $::CONN) {
455 if (delete $self->{need_update}) {
456 $self->movement_update;
457
458 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
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
464 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
465 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
466
467 # the map displacement, in tiles
468 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
469 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
470
471 # the upper left "visible" corner, in pixels
472 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
473 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
474
475 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;
477
478 if ($::CFG->{fow_enable}) {
479 # draw_fow_texture REQUIRES the fow texture to stay the same size.
480 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
481
482 $self->{fow_texture} = new DC::Texture
483 w => $w,
484 h => $h,
485 data => $data,
486 internalformat => GL_ALPHA,
487 format => GL_ALPHA;
488 } else {
489 delete $self->{fow_texture};
490 }
491
492 glNewList ($self->{list} ||= glGenList);
493
494 glPushMatrix;
495 glTranslate $sx0, $sy0;
496 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
497 glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy};
498
499 $::MAP->draw ($dx, $dy, $sw, $sh,
500 ($self->{tilesize}) x 2,
501 $::CONN->{player}{tag},
502 -$self->{sdx}, -$self->{sdy});
503
504 glScale $self->{tilesize}, $self->{tilesize};
505
506 if (my $tex = $self->{fow_texture}) {
507 my @prev_fow_params;
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
524 $::CFG->{fow_intensity},
525 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
526 @{$self->{fow_texture}}{qw(name data s t w h)},
527 @prev_fow_params;
528 }
529
530 if ($self->{magicmap}) {
531 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
532
533 $x += $::MAP->ox + $self->{dx};
534 $y += $::MAP->oy + $self->{dy};
535
536 glTranslate - $x - 1, - $y - 1;
537 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
538 $::MAP->draw_magicmap ($w, $h, $data);
539 }
540
541 glPopMatrix;
542 glEndList;
543 }
544 } else {
545 delete $self->{last_fow_texture};
546 delete $self->{fow_texture};
547
548 glDeleteList delete $self->{list}
549 if $self->{list};
550 }
551}
552
447sub draw { 553sub draw {
448 my ($self) = @_; 554 my ($self) = @_;
449 555
450 return unless $::MAP; 556 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
451 557
558 return unless $self->{list};
559
452 my $focused = $CFPlus::UI::FOCUS == $self 560 my $focused = $DC::UI::FOCUS == $self
453 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 561 || $DC::UI::FOCUS == $::COMPLETER->{entry};
454 562
455 return 563 return
456 unless $focused || !$::FAST; 564 unless $focused || !$::FAST;
457 565
458 if (delete $self->{need_update}) {
459 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
460
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463
464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
465 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
466
467 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
468 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
469
470 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
471 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
472
473 if ($::CFG->{fow_enable}) {
474 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
475
476 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
477 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
478 glConvolutionFilter2D (
479 GL_CONVOLUTION_2D,
480 GL_ALPHA,
481 3, 3,
482 GL_ALPHA, GL_FLOAT,
483 (pack "f*", @{ $self->{smooth_matrix} }),
484 );
485 glEnable GL_CONVOLUTION_2D;
486 }
487
488 $self->{fow_texture} = new CFPlus::Texture
489 w => $w,
490 h => $h,
491 data => $data,
492 internalformat => GL_ALPHA,
493 format => GL_ALPHA;
494
495 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
496 } else {
497 delete $self->{fow_texture};
498 }
499
500 glNewList $self->{list};
501
502 glPushMatrix;
503 glTranslate $sx0, $sy0;
504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
505
506 $::MAP->draw ($dx, $dy, $sw, $sh);
507
508 glScale 32, 32;
509
510 if (my $tex = $self->{fow_texture}) {
511 glEnable GL_TEXTURE_2D;
512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
513
514 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
515 $self->{fow_texture}->draw_quad_alpha (0, 0);
516
517 glDisable GL_TEXTURE_2D;
518 }
519
520 if ($self->{magicmap}) {
521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
522
523 $x += $::MAP->ox + $self->{dx};
524 $y += $::MAP->oy + $self->{dy};
525
526 glTranslate - $x - 1, - $y - 1;
527 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
528 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
529 }
530
531 glPopMatrix;
532 glEndList;
533 }
534
535 glCallList $self->{list}; 566 glCallList $self->{list};
536 567
537 # TNT2 emulates logops in software (or worse :) 568 # TNT2 emulates logops in software (or worse :)
538 unless ($focused) { 569 unless ($focused) {
539 glColor 0.4, 0.2, 0.2, 0.6; 570 glColor_premultiply 0, 0, 1, 0.25;
540 glEnable GL_BLEND; 571 glEnable GL_BLEND;
541 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 572 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
542 glBegin GL_QUADS; 573 glBegin GL_QUADS;
543 glVertex 0, 0; 574 glVertex 0, 0;
544 glVertex 0, $::HEIGHT; 575 glVertex 0, $::HEIGHT;
545 glVertex $::WIDTH, $::HEIGHT; 576 glVertex $::WIDTH, $::HEIGHT;
546 glVertex $::WIDTH, 0; 577 glVertex $::WIDTH, 0;
… …
555 glDeleteList $self->{list}; 586 glDeleteList $self->{list};
556 587
557 $self->SUPER::DESTROY; 588 $self->SUPER::DESTROY;
558} 589}
559 590
560package CFPlus::MapWidget::MapMap; 591package DC::MapWidget::MapMap;
561 592
593use common::sense;
594
562our @ISA = CFPlus::UI::Base::; 595our @ISA = DC::UI::Base::;
563 596
564use Time::HiRes qw(time);
565use CFPlus::OpenGL; 597use DC::OpenGL;
566 598
567sub size_request { 599sub size_request {
568 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 600 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
601}
602
603sub refresh_hook {
604 my ($self) = @_;
605
606 if ($::MAP && $self->{texture_atime} < AE::now) {
607 my ($w, $h) = @$self{qw(w h)};
608
609 return unless $w && $h;
610
611 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
612 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
613
614 my $ox = 0.5 * ($w - $sw);
615 my $oy = 0.5 * ($h - $sh);
616
617 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
618 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
619
620 #TODO: map scale is completely borked
621
622 my $x0 = int $ox - $sx + 0.5;
623 my $y0 = int $oy - $sy + 0.5;
624
625 $self->{sw} = $sw;
626 $self->{sh} = $sh;
627
628 $self->{x0} = $x0;
629 $self->{y0} = $y0;
630
631 $self->{texture_atime} = AE::now + 1/2;
632
633 $self->{texture} =
634 new DC::Texture
635 w => $w,
636 h => $h,
637 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
638 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
639 }
640}
641
642sub invoke_visibility_change {
643 my ($self) = @_;
644
645 $self->refresh_hook;
646
647 0
569} 648}
570 649
571sub invoke_size_allocate { 650sub invoke_size_allocate {
572 my ($self, $w, $h) = @_; 651 my ($self, $w, $h) = @_;
573 652
… …
584} 663}
585 664
586sub _draw { 665sub _draw {
587 my ($self) = @_; 666 my ($self) = @_;
588 667
589 $::MAP or return; 668 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
590 669
591 my ($w, $h) = @$self{qw(w h)}; 670 $self->{texture} or return;
592
593 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
594 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
595
596 my $sx = int $::CFG->{map_shift_x} / 32;
597 my $sy = int $::CFG->{map_shift_y} / 32;
598
599 my $ox = 0.5 * ($w - $sw);
600 my $oy = 0.5 * ($h - $sh);
601 671
602 glEnable GL_BLEND; 672 glEnable GL_BLEND;
603 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 673 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
604 glEnable GL_TEXTURE_2D; 674 glEnable GL_TEXTURE_2D;
605 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 675 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
606 676
607 if ($self->{texture_atime} < time) {
608 $self->{texture_atime} = time + 1/3;
609
610 $self->{texture} =
611 new CFPlus::Texture
612 w => $w,
613 h => $h,
614 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
615 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
616 }
617
618 $self->{texture}->draw_quad (0, 0); 677 $self->{texture}->draw_quad (0, 0);
619 678
620 glDisable GL_TEXTURE_2D; 679 glDisable GL_TEXTURE_2D;
621 680
622 glTranslate 0.375, 0.375; 681 glTranslate 0.375, 0.375;
623
624 #TODO: map scale is completely borked
625
626 my $x0 = int $ox - $sx + 0.5;
627 my $y0 = int $oy - $sy + 0.5;
628 682
629 glColor 1, 1, 0, 1; 683 glColor 1, 1, 0, 1;
630 glBegin GL_LINE_LOOP; 684 glBegin GL_LINE_LOOP;
631 glVertex $x0 , $y0 ; 685 glVertex $self->{x0} , $self->{y0} ;
632 glVertex $x0 , $y0 + $sh; 686 glVertex $self->{x0} , $self->{y0} + $self->{sh};
633 glVertex $x0 + $sw, $y0 + $sh; 687 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
634 glVertex $x0 + $sw, $y0 ; 688 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
635 glEnd; 689 glEnd;
636 690
637 glDisable GL_BLEND; 691 glDisable GL_BLEND;
638} 692}
639 693
640package CFPlus::MapWidget::Command; 694package DC::MapWidget::Command;
641 695
642use strict; 696use common::sense;
643 697
644use CFPlus::OpenGL; 698use DC::OpenGL;
645 699
646our @ISA = CFPlus::UI::Frame::; 700our @ISA = DC::UI::Frame::;
647 701
648sub new { 702sub new {
649 my $class = shift; 703 my $class = shift;
650 704
651 my $self = $class->SUPER::new ( 705 my $self = $class->SUPER::new (
706 min_w => $::WIDTH * 0.25, # workaround for layout problems #d#
652 bg => [0, 0, 0, 0.8], 707 bg => [0, 0, 0, 0.8],
653 @_, 708 @_,
654 ); 709 );
655 710
656 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 711 $self->add ($self->{vbox} = new DC::UI::VBox);
657 712
658 $self->{label} = [ 713 $self->{label} = [
659 map 714 map
660 CFPlus::UI::Label->new ( 715 DC::UI::Label->new (
716 align => 0,
661 can_hover => 1, 717 can_hover => 1,
662 can_events => 1, 718 can_events => 1,
663 tooltip_width => 0.33, 719 tooltip_width => 0.33,
664 fontsize => $_, 720 fontsize => $_,
665 ), (0.8) x 16 721 ), (0.8) x 16
666 ]; 722 ];
667 723
668 $self->{entry} = new CFPlus::UI::Entry 724 $self->{entry} = new DC::UI::Entry
669 on_changed => sub { 725 on_changed => sub {
670 $self->update_labels; 726 $self->update_labels;
671 0 727 0
672 }, 728 },
673 on_button_down => sub { 729 on_button_down => sub {
674 my ($entry, $ev, $x, $y) = @_; 730 my ($entry, $ev, $x, $y) = @_;
675 731
676 if ($ev->{button} == 3) { 732 if ($ev->{button} == 3) {
677 (new CFPlus::UI::Menu 733 (new DC::UI::Menu
678 items => [ 734 items => [
679 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 735 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
680 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 736 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
681 ], 737 ],
682 )->popup ($ev); 738 )->popup ($ev);
683 return 1; 739 return 1;
684 } 740 }
685 0 741 0
… …
700 $self->hide; 756 $self->hide;
701 } 757 }
702 } elsif ($ev->{sym} == 27) { 758 } elsif ($ev->{sym} == 27) {
703 $self->{hist_ptr} = 0; 759 $self->{hist_ptr} = 0;
704 $self->hide; 760 $self->hide;
705 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 761 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
706 if ($self->{hist_ptr} > 1) { 762 if ($self->{hist_ptr} > 1) {
707 $self->{hist_ptr}--; 763 $self->{hist_ptr}--;
708 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 764 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
709 } elsif ($self->{hist_ptr} > 0) { 765 } elsif ($self->{hist_ptr} > 0) {
710 $self->{hist_ptr}--; 766 $self->{hist_ptr}--;
… …
712 } else { 768 } else {
713 ++$self->{select_offset} 769 ++$self->{select_offset}
714 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 770 if $self->{select_offset} < $#{ $self->{last_match} || [] };
715 } 771 }
716 $self->update_labels; 772 $self->update_labels;
717 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 773 } elsif ($ev->{sym} == DC::SDLK_UP) {
718 if ($self->{select_offset}) { 774 if ($self->{select_offset}) {
719 --$self->{select_offset} 775 --$self->{select_offset}
720 } else { 776 } else {
721 unless ($self->{hist_ptr}) { 777 unless ($self->{hist_ptr}) {
722 $self->{hist_saveback} = $self->{entry}->get_text; 778 $self->{hist_saveback} = $self->{entry}->get_text;
… …
742 ); 798 );
743 799
744 $self 800 $self
745} 801}
746 802
803sub reset {
804 my ($self) = @_;
805
806 $self->hide;
807 delete $self->{command_list};
808}
809
747sub set_prefix { 810sub set_prefix {
748 my ($self, $prefix) = @_; 811 my ($self, $prefix) = @_;
749 812
750 $self->{entry}->set_text ($prefix); 813 $self->{entry}->set_text ($prefix);
751 $self->show; 814 $self->show;
… …
788 my $text = $self->{entry}->get_text; 851 my $text = $self->{entry}->get_text;
789 852
790 length $text 853 length $text
791 or return $self->hide; 854 or return $self->hide;
792 855
793 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 ];
794 863
795 if ($text ne $self->{last_search}) { 864 if ($text ne $self->{last_search}) {
796 my @match; 865 my @match;
797 866
798 if ($text =~ /^(.*?)\s+$/) { 867 if ($text =~ /^(.*?)\s+$/) {
868 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
799 @match = [$cmd, "(appended whitespace suppresses completion)"]; 869 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
800 } 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
801 my $regexp = do { 877 my $regexp_abbrev = do {
802 my ($beg, @chr) = split //, lc $cmd; 878 my ($beg, @chr) = split //, lc $cmd;
803 879
804 # the following regex is used to match our "completion entry" 880 # the following regex is used to match our "completion entry"
805 # to an actual command - the parentheses match kind of "overhead" 881 # to an actual command - the parentheses match kind of "overhead"
806 # - the more characters the parentheses match, the less attractive 882 # - the more characters the parentheses match, the less attractive
807 # is the match. 883 # is the match.
808 my $regexp = "^\Q$beg\E" 884 my $regexp = "^\Q$beg\E"
809 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 885 . join "", map "(?:.*?[ _\-]|(.*?))\Q$_\E", @chr;
810 qr<$regexp> 886 qr<$regexp>
811 }; 887 };
812 888
813 my @penalty; 889 my $regexp_partial = do {
890 my $regexp = "^\Q$text\E(.*)";
891 qr<$regexp>
892 };
814 893
815 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
816 if (@penalty = $_ =~ $regexp) { 927 if (my @penalty = $_ =~ $regexp_abbrev) {
817 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];
818 } 935 }
819 } 936 }
820 937
938 # @match is now [command object, command with arguments]
821 @match = map $self->{command}{$_->[0]}, 939 @match = map [$self->{command}{$_->[0]}, $_->[2]],
822 sort { 940 sort {
823 $a->[1] <=> $b->[1] 941 $b->[1] <=> $a->[1]
824 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 942 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
825 or (length $b->[0]) <=> (length $a->[0]) 943 or (length $b->[0]) <=> (length $a->[0])
826 } @match; 944 } @match;
827 } 945 }
828 946
… …
847 $label->{fg} = [1, 1, 1, 1]; 965 $label->{fg} = [1, 1, 1, 1];
848 $label->{bg} = [0, 0, 0, 0]; 966 $label->{bg} = [0, 0, 0, 0];
849 } 967 }
850 968
851 if (@matches) { 969 if (@matches) {
852 $self->{select} = "$matches[0][0]$arg"; 970 $self->{select} = "$matches[0][1]";
853 971
854 $labels[0]->{fg} = [0, 0, 0, 1]; 972 $labels[0]->{fg} = [0, 0, 0, 1];
855 $labels[0]->{bg} = [1, 1, 1, 0.8]; 973 $labels[0]->{bg} = [1, 1, 1, 0.8];
856 } else { 974 } else {
857 $self->{select} = "$cmd$arg"; 975 $self->{select} = "$text";
858 } 976 }
859 977
860 for my $match (@matches) { 978 for my $match (@matches) {
861 my $label = shift @labels; 979 my $label = shift @labels;
862 980
863 if (@labels) { 981 if (@labels) {
864 $label->set_text ("$match->[0]$arg"); 982 $label->set_text ("$match->[1]");
865 $label->set_tooltip ($match->[1]); 983 $label->set_tooltip ("$match->[0][1]");
866 } else { 984 } else {
867 $label->set_text ("..."); 985 $label->set_text ("...");
868 $label->set_tooltip ("Use Cursor-Down to view more matches"); 986 $label->set_tooltip ("Use Cursor-Down to view more matches");
869 last; 987 last;
870 } 988 }
… …
880 998
881sub _draw { 999sub _draw {
882 my ($self) = @_; 1000 my ($self) = @_;
883 1001
884 # hack 1002 # hack
885 local $CFPlus::UI::FOCUS = $self->{entry}; 1003 local $DC::UI::FOCUS = $self->{entry};
886 1004
887 $self->SUPER::_draw; 1005 $self->SUPER::_draw;
888} 1006}
889 1007
8901 10081

Diff Legend

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