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.105 by root, Wed Apr 4 02:54:02 2007 UTC vs.
Revision 1.157 by root, Mon Dec 21 03:30:23 2009 UTC

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

Diff Legend

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