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

Diff Legend

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