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

Diff Legend

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