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

Diff Legend

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