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.97 by root, Sat Dec 9 22:28:11 2006 UTC vs.
Revision 1.155 by root, Thu Dec 17 02:49:38 2009 UTC

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

Diff Legend

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