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

Diff Legend

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