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.101 by root, Sun Apr 1 01:19:18 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::;
14 13
15sub ::T() { 32 } 14our @TEX_HIDDEN = map {
15 new_from_resource DC::Texture # MUST be POT
16 "hidden-$_.png", mipmap => 1, wrap => 1
17 } 0, 1, 2;
16 18
17my $magicmap_tex = 19my $magicmap_tex =
18 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 20 new_from_resource DC::Texture "magicmap.png",
19 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 21 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
20 22
21sub new { 23sub new {
22 my $class = shift; 24 my $class = shift;
23 25
24 my $self = $class->SUPER::new ( 26 my $self = $class->SUPER::new (
25 z => -1, 27 z => -1,
26 can_focus => 1, 28 can_focus => 1,
27 list => glGenList, 29 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 @_ 30 @_
36 ); 31 );
37
38 $self->{completer} = new CFPlus::MapWidget::Command::
39 command => $self->{command},
40 tooltip => "#completer_help",
41 ;
42 32
43 $self 33 $self
44} 34}
45 35
46sub add_command { 36sub add_command {
… …
50 40
51 $tooltip =~ s/^\s+//; 41 $tooltip =~ s/^\s+//;
52 $tooltip = "<big>$data</big>\n\n$tooltip"; 42 $tooltip = "<big>$data</big>\n\n$tooltip";
53 $tooltip =~ s/\s+$//; 43 $tooltip =~ s/\s+$//;
54 44
55 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 45 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
56} 46}
57 47
58sub clr_commands { 48sub clr_commands {
59 my ($self) = @_; 49 my ($self) = @_;
60 50
61 %{$self->{completer}{command}} = (); 51 %{$::COMPLETER->{command}} = ();
62 52
63 $self->{completer}->hide 53 $::COMPLETER->hide
64 if $self->{completer}; 54 if $::COMPLETER;
65} 55}
66 56
67sub server_login { 57sub server_login {
68 my ($server) = @_; 58 my ($server) = @_;
69 59
… …
74 64
75sub editor_invoke { 65sub editor_invoke {
76 my $editsup = $::CONN && $::CONN->{editor_support} 66 my $editsup = $::CONN && $::CONN->{editor_support}
77 or return; 67 or return;
78 68
79 CFPlus::background { 69 DC::background {
80 print "preparing editor startup...\n"; 70 print "preparing editor startup...\n";
81 71
82 my $server = $editsup->{gameserver} || "default"; 72 my $server = $editsup->{gameserver} || "default";
83 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 73 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84 74
85 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;
86 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;
87 77
88 print "map directory is $mapdir\n"; 78 print "map directory is $mapdir\n";
89 print "lib directory is $libdir\n"; 79 print "lib directory is $libdir\n";
90 80
91 my $ua = CFPlus::lwp_useragent; 81 my $ua = DC::lwp_useragent;
92 82
93 for my $file (qw(archetypes crossfire.0)) { 83 for my $file (qw(archetypes crossfire.0)) {
94 my $url = "$editsup->{lib_root}$file"; 84 my $url = "$editsup->{lib_root}$file";
95 print "mirroring $url...\n"; 85 print "mirroring $url...\n";
96 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); 86 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
97 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 87 printf "%s size %d octets\n", $file, -s "$libdir/$file";
98 } 88 }
99 89
100 if (1) { # upload a map 90 if (1) { # upload a map
101 my $mapname = $::CONN->{map_info}[0]; 91 my $mapname = $::CONN->{map_info}[0];
… …
106 96
107 print "getting map revision for $mapname...\n"; 97 print "getting map revision for $mapname...\n";
108 98
109 # try to get the most recent head revision, what a hack, 99 # try to get the most recent head revision, what a hack,
110 # this should have been returned while downloading *sigh* 100 # 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; 101 my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
112 102
113 if ($log =~ /\?rev=(\d+\.\d+)"/) { 103 if ($log =~ /\?rev=(\d+\.\d+)"/) {
114 my $rev = $1; 104 my $rev = $1;
115 105
116 print "downloading revision $rev...\n"; 106 print "downloading revision $rev...\n";
117 107
118 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;
119 109
120 my $meta = { 110 my $meta = {
121 %$editsup, 111 %$editsup,
122 path => $mapname, 112 path => $mapname,
123 revision => $rev, 113 revision => $rev,
… …
128 require File::Path; 118 require File::Path;
129 119
130 File::Path::mkpath (File::Basename::dirname ($mappath)); 120 File::Path::mkpath (File::Basename::dirname ($mappath));
131 open my $fh, ">:raw:perlio", "$mappath.meta" 121 open my $fh, ">:raw:perlio", "$mappath.meta"
132 or die "$mappath.meta: $!\n"; 122 or die "$mappath.meta: $!\n";
133 print $fh CFPlus::to_json $meta; 123 print $fh DC::encode_json $meta;
134 close $fh; 124 close $fh;
135 open my $fh, ">:raw:perlio:utf8", $mappath 125 open my $fh, ">:raw:perlio:utf8", $mappath
136 or die "$mappath: $!\n"; 126 or die "$mappath: $!\n";
137 print $fh $map; 127 print $fh $map;
138 close $fh; 128 close $fh;
… …
177sub invoke_button_down { 167sub invoke_button_down {
178 my ($self, $ev, $x, $y) = @_; 168 my ($self, $ev, $x, $y) = @_;
179 169
180 if ($ev->{button} == 1) { 170 if ($ev->{button} == 1) {
181 $self->grab_focus; 171 $self->grab_focus;
182 return unless $::CONN; 172 return unless $::CONN && $self->{ctilesize};
183 173
184 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; 174 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}; 175 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
186 176
187 $x -= CFPlus::floor $::MAP->w * 0.5; 177 $x -= DC::floor $::MAP->w * 0.5;
188 $y -= CFPlus::floor $::MAP->h * 0.5; 178 $y -= DC::floor $::MAP->h * 0.5;
189 179
190 if ($::CONN) { 180 if ($::CONN) {
191 if ($::IN_BUILD_MODE) {
192 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
193 } else {
194 $::CONN->lookat ($x, $y) 181 $::CONN->lookat ($x, $y)
195 }
196 } 182 }
197 183
198 } elsif ($ev->{button} == 2) { 184 } elsif ($ev->{button} == 2) {
199 $self->grab_focus; 185 $self->grab_focus;
200 return unless $::CONN; 186 return unless $::CONN;
… …
218 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 204 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
219 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 205 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
220 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 206 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
221 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 207 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
222 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 208 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
223 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 209# ["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 ); 210 );
231 211
232 if ($::CONN && $::CONN->{editor_support}) { 212 if ($::CONN && $::CONN->{editor_support}) {
233 push @items, [ 213# push @items, [
234 "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>",
235 \&editor_invoke, 215# \&editor_invoke,
236 ]; 216# ];
237 217
238 for my $type (qw(test name)) { 218 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
239 $::CONN->{editor_support}{type} ne $type 219 $::CONN->{editor_support}{servertype} ne $type
240 or next; 220 or next;
241 my $server = $::CONN->{editor_support}{"${type}server"} 221 my $server = $::CONN->{editor_support}{"${type}server"}
242 or next; 222 or next;
243 223
244 push @items, [ 224 push @items, [
245 "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>",
246 sub { server_login $server }, 226 sub { server_login $server },
247 ]; 227 ];
248 } 228 }
249 } 229 }
250 230
… …
258 } 238 }
259 } 239 }
260 ], 240 ],
261 ; 241 ;
262 242
263 (new CFPlus::UI::Menu 243 (new DC::UI::Menu
264 items => \@items, 244 items => \@items,
265 )->popup ($ev); 245 )->popup ($ev);
266 } 246 }
267 247
268 1 248 1
… …
287 267
288 1 268 1
289} 269}
290 270
291sub size_request { 271sub size_request {
272 my ($self) = @_;
273
292 ( 274 (
293 ::T * CFPlus::ceil $::WIDTH / ::T, 275 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
294 ::T * CFPlus::ceil $::HEIGHT / ::T, 276 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
295 ) 277 )
296} 278}
297 279
298sub update { 280sub update {
299 my ($self) = @_; 281 my ($self) = @_;
… …
301 $self->{need_update} = 1; 283 $self->{need_update} = 1;
302 $self->SUPER::update; 284 $self->SUPER::update;
303} 285}
304 286
305my %DIR = ( 287my %DIR = (
306 CFPlus::SDLK_KP8, [1, "north"], 288 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
289 ( "," . DC::SDLK_KP8 ), [1, "north"],
307 CFPlus::SDLK_KP9, [2, "northeast"], 290 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
308 CFPlus::SDLK_KP6, [3, "east"], 291 ( "," . DC::SDLK_KP6 ), [3, "east"],
309 CFPlus::SDLK_KP3, [4, "southeast"], 292 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
310 CFPlus::SDLK_KP2, [5, "south"], 293 ( "," . DC::SDLK_KP2 ), [5, "south"],
311 CFPlus::SDLK_KP1, [6, "southwest"], 294 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
312 CFPlus::SDLK_KP4, [7, "west"], 295 ( "," . DC::SDLK_KP4 ), [7, "west"],
313 CFPlus::SDLK_KP7, [8, "northwest"], 296 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
314 297
315 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"],
316 CFPlus::SDLK_RIGHT, [3, "east"], 305 ( "," . DC::SDLK_RIGHT ), [3, "east"],
317 CFPlus::SDLK_DOWN, [5, "south"], 306 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
318 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"],
319); 311);
320 312
321sub invoke_key_down { 313sub invoke_key_down {
322 my ($self, $ev) = @_; 314 my ($self, $ev) = @_;
323 315
324 my $mod = $ev->{mod}; 316 my $mod = $ev->{mod};
325 my $sym = $ev->{sym}; 317 my $sym = $ev->{sym};
326 my $uni = $ev->{unicode}; 318 my $uni = $ev->{unicode};
327 319
328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 320 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
329 321
330 if ($sym == 9) { 322 # ignore repeated keypresses
331 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; 323 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 324 $self->{last_mod} = $mod;
333 $::HELP_WINDOW->toggle_visibility; 325 $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 326
347 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 327 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
348 $::CONN->user_send ("stay fire"); 328
349 } elsif ($uni == ord ",") { 329 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) { 330 if ($mod & DC::KMOD_SHIFT) {
375 $self->{shft}++; 331 $self->{shft}++;
376 if ($DIR{$sym}[0] != $self->{fire_dir}) { 332 if ($dir->[0] != $self->{fire_dir}) {
377 $::CONN->user_send ("fire $DIR{$sym}[0]"); 333 $::CONN->user_send ("fire $dir->[0]");
378 } 334 }
379 $self->{fire_dir} = $DIR{$sym}[0]; 335 $self->{fire_dir} = $dir->[0];
380 } elsif ($mod & CFPlus::KMOD_CTRL) { 336 } elsif ($mod & DC::KMOD_CTRL) {
381 $self->{ctrl}++; 337 $self->{ctrl}++;
382 $::CONN->user_send ("run $DIR{$sym}[0]"); 338 $::CONN->user_send ("run $dir->[0]");
383 } else { 339 } else {
384 $::CONN->user_send ("$DIR{$sym}[1]"); 340 $::CONN->user_send ("$dir->[1]");
385 } 341 }
386 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 342
387 $self->{completer}->inject_key_down ($ev);
388 $self->{completer}->show;
389 } else {
390 return 0; 343 return 1;
391 }
392
393 1 344 }
345
346 0
394} 347}
395 348
396sub invoke_key_up { 349sub invoke_key_up {
397 my ($self, $ev) = @_; 350 my ($self, $ev) = @_;
398 351
399 my $res = 0; 352 my $res = 0;
400 my $mod = $ev->{mod}; 353 my $mod = $ev->{mod};
401 my $sym = $ev->{sym}; 354 my $sym = $ev->{sym};
402 355
356 delete $self->{last_mod};
357 delete $self->{last_sym};
358
403 if ($::CFG->{shift_fire_stop}) { 359 if ($::CFG->{shift_fire_stop}) {
404 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 360 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
405 $::CONN->user_send ("fire_stop"); 361 $::CONN->user_send ("fire_stop");
406 delete $self->{fire_dir}; 362 delete $self->{fire_dir};
407 $res = 1; 363 $res = 1;
408 } 364 }
409 } else { 365 } else {
366 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
367
410 if (exists $DIR{$sym} && delete $self->{shft}) { 368 if ($dir && delete $self->{shft}) {
411 $::CONN->user_send ("fire_stop"); 369 $::CONN->user_send ("fire_stop");
412 delete $self->{fire_dir}; 370 delete $self->{fire_dir};
413 $res = 1; 371 $res = 1;
414 } 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?
415 $::CONN->user_send ("fire_stop"); 374 $::CONN->user_send ("fire_stop");
416 delete $self->{fire_dir}; 375 delete $self->{fire_dir};
417 $res = 1; 376 $res = 1;
418 } 377 }
419 } 378 }
420 379
421 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 380 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
422 $::CONN->user_send ("run_stop"); 381 $::CONN->user_send ("run_stop");
423 $res = 1; 382 $res = 1;
424 } 383 }
425 384
426 $res 385 $res
427} 386}
428 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
429sub set_magicmap { 420sub set_magicmap {
430 my ($self, $w, $h, $x, $y, $data) = @_; 421 my ($self, $w, $h, $x, $y, $data) = @_;
431 422
432 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 423 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
433 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 424 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
435 $self->{magicmap} = [$x, $y, $w, $h, $data]; 426 $self->{magicmap} = [$x, $y, $w, $h, $data];
436 427
437 $self->update; 428 $self->update;
438} 429}
439 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
440sub draw { 572sub draw {
441 my ($self) = @_; 573 my ($self) = @_;
442 574
443 return unless $::MAP; 575 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
444 576
577 return unless $self->{list};
578
445 my $focused = $CFPlus::UI::FOCUS == $self 579 my $focused = $DC::UI::FOCUS == $self
446 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 580 || $DC::UI::FOCUS == $::COMPLETER->{entry};
447 581
448 return 582 return
449 unless $focused || !$::FAST; 583 unless $focused || !$::FAST;
450 584
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}; 585 glCallList $self->{list};
529 586
530 # TNT2 emulates logops in software (or worse :) 587 # TNT2 emulates logops in software (or worse :)
531 unless ($focused) { 588 unless ($focused) {
532 glColor 0.4, 0.2, 0.2, 0.6; 589 glColor_premultiply 0, 0, 1, 0.25;
533 glEnable GL_BLEND; 590 glEnable GL_BLEND;
534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 591 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
535 glBegin GL_QUADS; 592 glBegin GL_QUADS;
536 glVertex 0, 0; 593 glVertex 0, 0;
537 glVertex 0, $::HEIGHT; 594 glVertex 0, $::HEIGHT;
538 glVertex $::WIDTH, $::HEIGHT; 595 glVertex $::WIDTH, $::HEIGHT;
539 glVertex $::WIDTH, 0; 596 glVertex $::WIDTH, 0;
… …
548 glDeleteList $self->{list}; 605 glDeleteList $self->{list};
549 606
550 $self->SUPER::DESTROY; 607 $self->SUPER::DESTROY;
551} 608}
552 609
553package CFPlus::MapWidget::MapMap; 610package DC::MapWidget::MapMap;
554 611
612use common::sense;
613
555our @ISA = CFPlus::UI::Base::; 614our @ISA = DC::UI::Base::;
556 615
557use Time::HiRes qw(time); 616use Time::HiRes qw(time);
558use CFPlus::OpenGL; 617use DC::OpenGL;
559 618
560sub size_request { 619sub size_request {
561 ($::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
562} 668}
563 669
564sub invoke_size_allocate { 670sub invoke_size_allocate {
565 my ($self, $w, $h) = @_; 671 my ($self, $w, $h) = @_;
566 672
… …
577} 683}
578 684
579sub _draw { 685sub _draw {
580 my ($self) = @_; 686 my ($self) = @_;
581 687
582 $::MAP or return; 688 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
583 689
584 my ($w, $h) = @$self{qw(w h)}; 690 $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 691
595 glEnable GL_BLEND; 692 glEnable GL_BLEND;
596 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 693 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
597 glEnable GL_TEXTURE_2D; 694 glEnable GL_TEXTURE_2D;
598 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 695 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
599 696
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); 697 $self->{texture}->draw_quad (0, 0);
612 698
613 glDisable GL_TEXTURE_2D; 699 glDisable GL_TEXTURE_2D;
614 700
615 glTranslate 0.375, 0.375; 701 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 702
622 glColor 1, 1, 0, 1; 703 glColor 1, 1, 0, 1;
623 glBegin GL_LINE_LOOP; 704 glBegin GL_LINE_LOOP;
624 glVertex $x0 , $y0 ; 705 glVertex $self->{x0} , $self->{y0} ;
625 glVertex $x0 , $y0 + $sh; 706 glVertex $self->{x0} , $self->{y0} + $self->{sh};
626 glVertex $x0 + $sw, $y0 + $sh; 707 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
627 glVertex $x0 + $sw, $y0 ; 708 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
628 glEnd; 709 glEnd;
629 710
630 glDisable GL_BLEND; 711 glDisable GL_BLEND;
631} 712}
632 713
633package CFPlus::MapWidget::Command; 714package DC::MapWidget::Command;
634 715
635use strict; 716use common::sense;
636 717
637use CFPlus::OpenGL; 718use DC::OpenGL;
638 719
639our @ISA = CFPlus::UI::Frame::; 720our @ISA = DC::UI::Frame::;
640 721
641sub new { 722sub new {
642 my $class = shift; 723 my $class = shift;
643 724
644 my $self = $class->SUPER::new ( 725 my $self = $class->SUPER::new (
645 bg => [0, 0, 0, 0.8], 726 bg => [0, 0, 0, 0.8],
646 @_, 727 @_,
647 ); 728 );
648 729
649 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 730 $self->add ($self->{vbox} = new DC::UI::VBox);
650 731
651 $self->{label} = [ 732 $self->{label} = [
652 map 733 map
653 CFPlus::UI::Label->new ( 734 DC::UI::Label->new (
735 align => 0,
654 can_hover => 1, 736 can_hover => 1,
655 can_events => 1, 737 can_events => 1,
656 tooltip_width => 0.33, 738 tooltip_width => 0.33,
657 fontsize => $_, 739 fontsize => $_,
658 ), (0.8) x 16 740 ), (0.8) x 16
659 ]; 741 ];
660 742
661 $self->{entry} = new CFPlus::UI::Entry 743 $self->{entry} = new DC::UI::Entry
662 on_changed => sub { 744 on_changed => sub {
663 $self->update_labels; 745 $self->update_labels;
664 0 746 0
665 }, 747 },
666 on_button_down => sub { 748 on_button_down => sub {
667 my ($entry, $ev, $x, $y) = @_; 749 my ($entry, $ev, $x, $y) = @_;
668 750
669 if ($ev->{button} == 3) { 751 if ($ev->{button} == 3) {
670 (new CFPlus::UI::Menu 752 (new DC::UI::Menu
671 items => [ 753 items => [
672 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 754 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
673 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] 755 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
674 ], 756 ],
675 )->popup ($ev); 757 )->popup ($ev);
676 return 1; 758 return 1;
677 } 759 }
678 0 760 0
… …
693 $self->hide; 775 $self->hide;
694 } 776 }
695 } elsif ($ev->{sym} == 27) { 777 } elsif ($ev->{sym} == 27) {
696 $self->{hist_ptr} = 0; 778 $self->{hist_ptr} = 0;
697 $self->hide; 779 $self->hide;
698 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 780 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
699 if ($self->{hist_ptr} > 1) { 781 if ($self->{hist_ptr} > 1) {
700 $self->{hist_ptr}--; 782 $self->{hist_ptr}--;
701 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 783 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
702 } elsif ($self->{hist_ptr} > 0) { 784 } elsif ($self->{hist_ptr} > 0) {
703 $self->{hist_ptr}--; 785 $self->{hist_ptr}--;
… …
705 } else { 787 } else {
706 ++$self->{select_offset} 788 ++$self->{select_offset}
707 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 789 if $self->{select_offset} < $#{ $self->{last_match} || [] };
708 } 790 }
709 $self->update_labels; 791 $self->update_labels;
710 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 792 } elsif ($ev->{sym} == DC::SDLK_UP) {
711 if ($self->{select_offset}) { 793 if ($self->{select_offset}) {
712 --$self->{select_offset} 794 --$self->{select_offset}
713 } else { 795 } else {
714 unless ($self->{hist_ptr}) { 796 unless ($self->{hist_ptr}) {
715 $self->{hist_saveback} = $self->{entry}->get_text; 797 $self->{hist_saveback} = $self->{entry}->get_text;
… …
781 my $text = $self->{entry}->get_text; 863 my $text = $self->{entry}->get_text;
782 864
783 length $text 865 length $text
784 or return $self->hide; 866 or return $self->hide;
785 867
786 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
787
788 if ($text ne $self->{last_search}) { 868 if ($text ne $self->{last_search}) {
789 my @match; 869 my @match;
790 870
791 if ($text =~ /^(.*?)\s+$/) { 871 if ($text =~ /^(.*?)\s+$/) {
872 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
792 @match = [$cmd, "(appended whitespace suppresses completion)"]; 873 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
793 } else { 874 } else {
875 # @match is [command, penalty, command with arguments] until sort
876
877 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
878
794 my $regexp = do { 879 my $regexp_abbrev = do {
795 my ($beg, @chr) = split //, lc $cmd; 880 my ($beg, @chr) = split //, lc $cmd;
796 881
797 # the following regex is used to match our "completion entry" 882 # the following regex is used to match our "completion entry"
798 # to an actual command - the parentheses match kind of "overhead" 883 # to an actual command - the parentheses match kind of "overhead"
799 # - the more characters the parentheses match, the less attractive 884 # - the more characters the parentheses match, the less attractive
… …
801 my $regexp = "^\Q$beg\E" 886 my $regexp = "^\Q$beg\E"
802 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 887 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
803 qr<$regexp> 888 qr<$regexp>
804 }; 889 };
805 890
806 my @penalty; 891 my $regexp_partial = do {
892 my $regexp = "^\Q$text\E(.*)";
893 qr<$regexp>
894 };
807 895
808 for (keys %{$self->{command}}) { 896 for (keys %{$self->{command}}) {
809 if (@penalty = $_ =~ $regexp) { 897 my @scores;
810 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];
811 } 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];
812 } 932 }
813 933
934 # @match is now [command object, command with arguments]
814 @match = map $self->{command}{$_->[0]}, 935 @match = map [$self->{command}{$_->[0]}, $_->[2]],
815 sort { 936 sort {
816 $a->[1] <=> $b->[1] 937 $b->[1] <=> $a->[1]
817 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 938 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
818 or (length $b->[0]) <=> (length $a->[0]) 939 or (length $b->[0]) <=> (length $a->[0])
819 } @match; 940 } @match;
820 } 941 }
821 942
… …
840 $label->{fg} = [1, 1, 1, 1]; 961 $label->{fg} = [1, 1, 1, 1];
841 $label->{bg} = [0, 0, 0, 0]; 962 $label->{bg} = [0, 0, 0, 0];
842 } 963 }
843 964
844 if (@matches) { 965 if (@matches) {
845 $self->{select} = "$matches[0][0]$arg"; 966 $self->{select} = "$matches[0][1]";
846 967
847 $labels[0]->{fg} = [0, 0, 0, 1]; 968 $labels[0]->{fg} = [0, 0, 0, 1];
848 $labels[0]->{bg} = [1, 1, 1, 0.8]; 969 $labels[0]->{bg} = [1, 1, 1, 0.8];
849 } else { 970 } else {
850 $self->{select} = "$cmd$arg"; 971 $self->{select} = "$text";
851 } 972 }
852 973
853 for my $match (@matches) { 974 for my $match (@matches) {
854 my $label = shift @labels; 975 my $label = shift @labels;
855 976
856 if (@labels) { 977 if (@labels) {
857 $label->set_text ("$match->[0]$arg"); 978 $label->set_text ("$match->[1]");
858 $label->set_tooltip ($match->[1]); 979 $label->set_tooltip ("$match->[0][1]");
859 } else { 980 } else {
860 $label->set_text ("..."); 981 $label->set_text ("...");
861 $label->set_tooltip ("Use Cursor-Down to view more matches"); 982 $label->set_tooltip ("Use Cursor-Down to view more matches");
862 last; 983 last;
863 } 984 }
… …
873 994
874sub _draw { 995sub _draw {
875 my ($self) = @_; 996 my ($self) = @_;
876 997
877 # hack 998 # hack
878 local $CFPlus::UI::FOCUS = $self->{entry}; 999 local $DC::UI::FOCUS = $self->{entry};
879 1000
880 $self->SUPER::_draw; 1001 $self->SUPER::_draw;
881} 1002}
882 1003
8831 10041

Diff Legend

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