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.107 by root, Sat Apr 14 06:51:45 2007 UTC vs.
Revision 1.162 by root, Sat Apr 3 02:58:25 2010 UTC

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

Diff Legend

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