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

Diff Legend

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