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

Diff Legend

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