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

Diff Legend

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