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.86 by root, Sun Oct 8 21:54:20 2006 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 DC::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = DC::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_resource DC::Texture "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 18
18sub new { 19sub new {
19 my $class = shift; 20 my $class = shift;
20 21
21 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
22 z => -1, 23 z => -1,
23 can_focus => 1, 24 can_focus => 1,
24 list => glGenList, 25 tilesize => 32,
25
26 smooth_matrix => [
27 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05,
30 ],
31
32 @_ 26 @_
33 ); 27 );
34
35 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command},
37 tooltip => "#completer_help",
38 ;
39 28
40 $self 29 $self
41} 30}
42 31
43sub add_command { 32sub add_command {
… …
47 36
48 $tooltip =~ s/^\s+//; 37 $tooltip =~ s/^\s+//;
49 $tooltip = "<big>$data</big>\n\n$tooltip"; 38 $tooltip = "<big>$data</big>\n\n$tooltip";
50 $tooltip =~ s/\s+$//; 39 $tooltip =~ s/\s+$//;
51 40
52 $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; 41 $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}];
53} 42}
54 43
55sub clr_commands { 44sub clr_commands {
56 my ($self) = @_; 45 my ($self) = @_;
57 46
58 %{$self->{completer}{command}} = (); 47 %{$::COMPLETER->{command}} = ();
59 48
60 $self->{completer}->hide 49 $::COMPLETER->hide
61 if $self->{completer}; 50 if $::COMPLETER;
62} 51}
63 52
64sub server_login { 53sub server_login {
65 my ($server) = @_; 54 my ($server) = @_;
66 55
67 ::stop_game (); 56 ::stop_game ();
68 local $::PROFILE->{host} = $server; 57 local $::PROFILE->{host} = $server;
69 ::start_game (); 58 ::start_game ();
70} 59}
71 60
72sub check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke { 61sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 62 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 63 or return;
84 64
85 my ($pid, $fh); 65 DC::background {
86 unless ($pid = open $fh, "-|:utf8", "-") {
87 $SIG{__DIE__} = sub {
88 warn "FATAL: @_\n";
89 CFPlus::_exit 99;
90 };
91
92 open STDERR, ">&STDOUT";
93 binmode STDOUT, ":utf8";
94 binmode STDERR, ":utf8";
95 close $fh;
96
97 $| = 1;
98 print "preparing editor startup...\n"; 66 print "preparing editor startup...\n";
99 CFPlus::set_proxy;
100 67
101 my $server = $editsup->{gameserver} || "default"; 68 my $server = $editsup->{gameserver} || "default";
102 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 69 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
103 70
104 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;
105 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;
106 73
107 print "map directory is $mapdir\n"; 74 print "map directory is $mapdir\n";
108 print "lib directory is $libdir\n"; 75 print "lib directory is $libdir\n";
109 76
110 require LWP::UserAgent; 77 my $ua = DC::lwp_useragent;
111
112 my $ua = LWP::UserAgent->new (
113 agent => "cfplus $CFPlus::VERSION",
114 keep_alive => 1,
115 env_proxy => 1,
116 timeout => 30,
117 );
118 78
119 for my $file (qw(archetypes crossfire.0)) { 79 for my $file (qw(archetypes crossfire.0)) {
120 my $url = "$editsup->{lib_root}$file"; 80 my $url = "$editsup->{lib_root}$file";
121 print "mirroring $url...\n"; 81 print "mirroring $url...\n";
122 check_lwp $ua->mirror ($url, "$libdir/$file"); 82 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
123 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 83 printf "%s size %d octets\n", $file, -s "$libdir/$file";
124 } 84 }
125 85
126 if (1) { # upload a map 86 if (1) { # upload a map
127 my $mapname = $::CONN->{map_info}[0]; 87 my $mapname = $::CONN->{map_info}[0];
128 88
89 my $mappath = "$mapdir/$mapname";
90
91 -e $mappath and die "$mappath already exists\n";
92
129 print "getting map revision for $mapname...\n"; 93 print "getting map revision for $mapname...\n";
130 94
131 # try to get the most recent head revision, what a hack, 95 # try to get the most recent head revision, what a hack,
132 # this should have been returned while downloading *sigh* 96 # this should have been returned while downloading *sigh*
133 my $log = (check_lwp $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;
134 98
135 if ($log =~ /\?rev=(\d+\.\d+)"/) { 99 if ($log =~ /\?rev=(\d+\.\d+)"/) {
136 my $rev = $1; 100 my $rev = $1;
137 101
138 print "downloading revision $rev...\n"; 102 print "downloading revision $rev...\n";
139 103
140 my $map = (check_lwp $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;
141 105
142 my $meta = { 106 my $meta = {
143 %$editsup, 107 %$editsup,
144 path => $mapname, 108 path => $mapname,
145 revision => $rev, 109 revision => $rev,
146 cf_login => $::PROFILE->{user}, 110 cf_login => $::PROFILE->{user},
147 }; 111 };
148 112
149 my $mappath = "$mapdir/$mapname";
150
151 require File::Basename; 113 require File::Basename;
152 require File::Path; 114 require File::Path;
153 115
154 File::Path::mkpath (File::Basename::dirname ($mappath)); 116 File::Path::mkpath (File::Basename::dirname ($mappath));
155 open my $fh, ">:raw:perlio", "$mappath.meta" 117 open my $fh, ">:raw:perlio", "$mappath.meta"
156 or die "$mappath.meta: $!"; 118 or die "$mappath.meta: $!\n";
157 print $fh CFPlus::to_json $meta; 119 print $fh DC::encode_json $meta;
158 close $fh; 120 close $fh;
159 open my $fh, ">:raw:perlio:utf8", $mappath 121 open my $fh, ">:raw:perlio:utf8", $mappath
160 or die "$mappath: $!"; 122 or die "$mappath: $!\n";
161 print $fh $map; 123 print $fh $map;
162 close $fh; 124 close $fh;
163 125
164 print "saved as $mappath\n"; 126 print "saved as $mappath\n";
165 127
… …
193# } 155# }
194 } else { 156 } else {
195 die "viewvc parse error, unable to detect revision\n"; 157 die "viewvc parse error, unable to detect revision\n";
196 } 158 }
197 } 159 }
198
199 CFPlus::_exit;
200 }
201
202 my $buffer;
203
204 Event->io (fd => $fh, poll => 'r', cb => sub {
205 unless (sysread $fh, $buffer, 4096, length $buffer) {
206 $_[0]->w->cancel;
207 $buffer .= "done\n";
208 }
209
210 while ($buffer =~ s/^(.*)\n//) {
211 ::message ({
212 markup => "editor($pid): " . CFPlus::asxml $1,
213 });
214 }
215 }); 160 }
216} 161}
217 162
218sub invoke_button_down { 163sub invoke_button_down {
219 my ($self, $ev, $x, $y) = @_; 164 my ($self, $ev, $x, $y) = @_;
220 165
221 if ($ev->{button} == 1) { 166 if ($ev->{button} == 1) {
222 $self->grab_focus; 167 $self->grab_focus;
223 return unless $::CONN; 168 return unless $::CONN && $self->{ctilesize};
224 169
225 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 170 my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
226 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
227 172
228 $x -= int 0.5 * $self->{sw}; 173 $x -= DC::floor $::MAP->w * 0.5;
229 $y -= int 0.5 * $self->{sh}; 174 $y -= DC::floor $::MAP->h * 0.5;
230 175
176 if ($::CONN) {
231 $::CONN->lookat ($x, $y) 177 $::CONN->lookat ($x, $y)
232 if $::CONN; 178 }
233 179
234 } elsif ($ev->{button} == 2) { 180 } elsif ($ev->{button} == 2) {
235 $self->grab_focus; 181 $self->grab_focus;
236 return unless $::CONN; 182 return unless $::CONN;
237 183
… …
254 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 200 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
255 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 201 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
256 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 202 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
257 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 203 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
258 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 204 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
259 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 205# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
260 [
261 $::PICKUP_ENABLE->{state}
262 ? "Disable automatic pickup"
263 : "Enable automatic pickup",
264 sub { $::PICKUP_ENABLE->toggle }
265 ],
266 ); 206 );
267 207
268 if ($::CONN && $::CONN->{editor_support}) { 208 if ($::CONN && $::CONN->{editor_support}) {
269 push @items, [ 209# push @items, [
270 "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>",
271 \&editor_invoke, 211# \&editor_invoke,
272 ]; 212# ];
273 213
274 for my $type (qw(test name)) { 214 for my $type (qw(test name)) {
275 $::CONN->{editor_support}{type} ne $type 215 $::CONN->{editor_support}{type} ne $type
276 or next; 216 or next;
277 my $server = $::CONN->{editor_support}{"${type}server"} 217 my $server = $::CONN->{editor_support}{"${type}server"}
278 or next; 218 or next;
279 219
280 push @items, [ 220 push @items, [
281 "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>",
282 sub { server_login $server }, 222 sub { server_login $server },
283 ]; 223 ];
284 } 224 }
285 } 225 }
286 226
… …
294 } 234 }
295 } 235 }
296 ], 236 ],
297 ; 237 ;
298 238
299 (new CFPlus::UI::Menu 239 (new DC::UI::Menu
300 items => \@items, 240 items => \@items,
301 )->popup ($ev); 241 )->popup ($ev);
302 } 242 }
303 243
304 1 244 1
… …
323 263
324 1 264 1
325} 265}
326 266
327sub size_request { 267sub size_request {
268 my ($self) = @_;
269
328 ( 270 (
329 32 * CFPlus::ceil $::WIDTH / 32, 271 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
330 32 * CFPlus::ceil $::HEIGHT / 32, 272 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
331 ) 273 )
332} 274}
333 275
334sub update { 276sub update {
335 my ($self) = @_; 277 my ($self) = @_;
… …
337 $self->{need_update} = 1; 279 $self->{need_update} = 1;
338 $self->SUPER::update; 280 $self->SUPER::update;
339} 281}
340 282
341my %DIR = ( 283my %DIR = (
342 CFPlus::SDLK_KP8, [1, "north"], 284 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
285 ( "," . DC::SDLK_KP8 ), [1, "north"],
343 CFPlus::SDLK_KP9, [2, "northeast"], 286 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
344 CFPlus::SDLK_KP6, [3, "east"], 287 ( "," . DC::SDLK_KP6 ), [3, "east"],
345 CFPlus::SDLK_KP3, [4, "southeast"], 288 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
346 CFPlus::SDLK_KP2, [5, "south"], 289 ( "," . DC::SDLK_KP2 ), [5, "south"],
347 CFPlus::SDLK_KP1, [6, "southwest"], 290 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
348 CFPlus::SDLK_KP4, [7, "west"], 291 ( "," . DC::SDLK_KP4 ), [7, "west"],
349 CFPlus::SDLK_KP7, [8, "northwest"], 292 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
350 293
351 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"],
352 CFPlus::SDLK_RIGHT, [3, "east"], 301 ( "," . DC::SDLK_RIGHT ), [3, "east"],
353 CFPlus::SDLK_DOWN, [5, "south"], 302 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
354 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"],
355); 307);
356 308
357sub invoke_key_down { 309sub invoke_key_down {
358 my ($self, $ev) = @_; 310 my ($self, $ev) = @_;
359 311
360 my $mod = $ev->{mod}; 312 my $mod = $ev->{mod};
361 my $sym = $ev->{sym}; 313 my $sym = $ev->{sym};
362 my $uni = $ev->{unicode}; 314 my $uni = $ev->{unicode};
363 315
364 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 316 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
365 317
366 if ($uni == ord "\t") { 318 # ignore repeated keypresses
367 $::PL_WINDOW->toggle_visibility; 319 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
368 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 320 $self->{last_mod} = $mod;
369 $::HELP_WINDOW->toggle_visibility; 321 $self->{last_sym} = $sym;
370 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
371 ::toggle_player_page ($::STATS_PAGE);
372 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
373 ::toggle_player_page ($::SKILL_PAGE);
374 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
375 ::toggle_player_page ($::SPELL_PAGE);
376 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
377 ::toggle_player_page ($::INVENTORY_PAGE);
378 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
379 $::SETUP_DIALOG->toggle_visibility;
380 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
381 $::BIND_EDITOR->set_binding (undef, undef, [],
382 sub {
383 my ($mod, $sym, $cmds) = @_;
384 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
385 });
386 $::BIND_EDITOR->start;
387 $::BIND_EDITOR->show;
388#TODO: elmex, what was this supposed to do? it currently crashes the client.
389# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
390# $::BIND_EDITOR->stop;
391# $::BIND_EDITOR->ask_for_bind_and_commit;
392# $::BIND_EDITOR->hide;
393 } elsif (!$::CONN) {
394 return 0; # bindings further down need a valid connection
395 322
396 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 323 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
397 $::CONN->user_send ("stay fire"); 324
398 } elsif ($uni == ord ",") { 325 if ($::CONN && $dir) {
399 $::CONN->user_send ("take");
400 } elsif ($uni == ord " ") {
401 $::CONN->user_send ("apply");
402 } elsif ($uni == 13) {
403 $::CONN->user_send ("examine");
404 } elsif ($uni == ord ".") {
405 $::CONN->user_send ($self->{completer}{last_command})
406 if exists $self->{completer}{last_command};
407 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
408 $::CONN->user_send ($_) for @$bind_cmd;
409 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
410 $::CONN->user_send ("rotateshoottype +");
411 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
412 $::CONN->user_send ("rotateshoottype -");
413 } elsif ($uni == ord '"') {
414 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
415 $self->{completer}->show;
416 } elsif ($uni == ord "'") {
417 $self->{completer}->set_prefix ("");
418 $self->{completer}->show;
419 } elsif (exists $DIR{$sym}) {
420 if ($mod & CFPlus::KMOD_SHIFT) { 326 if ($mod & DC::KMOD_SHIFT) {
421 $self->{shft}++; 327 $self->{shft}++;
422 if ($DIR{$sym}[0] != $self->{fire_dir}) { 328 if ($dir->[0] != $self->{fire_dir}) {
423 $::CONN->user_send ("fire $DIR{$sym}[0]"); 329 $::CONN->user_send ("fire $dir->[0]");
424 } 330 }
425 $self->{fire_dir} = $DIR{$sym}[0]; 331 $self->{fire_dir} = $dir->[0];
426 } elsif ($mod & CFPlus::KMOD_CTRL) { 332 } elsif ($mod & DC::KMOD_CTRL) {
427 $self->{ctrl}++; 333 $self->{ctrl}++;
428 $::CONN->user_send ("run $DIR{$sym}[0]"); 334 $::CONN->user_send ("run $dir->[0]");
429 } else { 335 } else {
430 $::CONN->user_send ("$DIR{$sym}[1]"); 336 $::CONN->user_send ("$dir->[1]");
431 } 337 }
432 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 338
433 $self->{completer}->inject_key_down ($ev);
434 $self->{completer}->show;
435 } else {
436 return 0; 339 return 1;
437 }
438
439 1 340 }
341
342 0
440} 343}
441 344
442sub invoke_key_up { 345sub invoke_key_up {
443 my ($self, $ev) = @_; 346 my ($self, $ev) = @_;
444 347
445 my $res = 0; 348 my $res = 0;
446 my $mod = $ev->{mod}; 349 my $mod = $ev->{mod};
447 my $sym = $ev->{sym}; 350 my $sym = $ev->{sym};
448 351
352 delete $self->{last_mod};
353 delete $self->{last_sym};
354
449 if ($::CFG->{shift_fire_stop}) { 355 if ($::CFG->{shift_fire_stop}) {
450 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 356 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
451 $::CONN->user_send ("fire_stop"); 357 $::CONN->user_send ("fire_stop");
452 delete $self->{fire_dir}; 358 delete $self->{fire_dir};
453 $res = 1; 359 $res = 1;
454 } 360 }
455 } else { 361 } else {
362 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
363
456 if (exists $DIR{$sym} && delete $self->{shft}) { 364 if ($dir && delete $self->{shft}) {
457 $::CONN->user_send ("fire_stop"); 365 $::CONN->user_send ("fire_stop");
458 delete $self->{fire_dir}; 366 delete $self->{fire_dir};
459 $res = 1; 367 $res = 1;
460 } 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?
461 $::CONN->user_send ("fire_stop"); 370 $::CONN->user_send ("fire_stop");
462 delete $self->{fire_dir}; 371 delete $self->{fire_dir};
463 $res = 1; 372 $res = 1;
464 } 373 }
465 } 374 }
466 375
467 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 376 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
468 $::CONN->user_send ("run_stop"); 377 $::CONN->user_send ("run_stop");
469 $res = 1; 378 $res = 1;
470 } 379 }
471 380
472 $res 381 $res
473} 382}
474 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
475sub set_magicmap { 417sub set_magicmap {
476 my ($self, $w, $h, $x, $y, $data) = @_; 418 my ($self, $w, $h, $x, $y, $data) = @_;
477 419
478 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 420 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
479 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 421 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
480 422
481 $self->{magicmap} = [$x, $y, $w, $h, $data]; 423 $self->{magicmap} = [$x, $y, $w, $h, $data];
482 424
483 $self->update; 425 $self->update;
484} 426}
485 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
486sub draw { 566sub draw {
487 my ($self) = @_; 567 my ($self) = @_;
488 568
489 return unless $::MAP; 569 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
490 570
571 return unless $self->{list};
572
491 my $focused = $CFPlus::UI::FOCUS == $self 573 my $focused = $DC::UI::FOCUS == $self
492 || $CFPlus::UI::FOCUS == $self->{completer}{entry}; 574 || $DC::UI::FOCUS == $::COMPLETER->{entry};
493 575
494 return 576 return
495 unless $focused || !$::FAST; 577 unless $focused || !$::FAST;
496 578
497 if (delete $self->{need_update}) {
498 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
499
500 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
501 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
502
503 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
504 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
505
506 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
507 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
508
509 if ($::CFG->{fow_enable}) {
510 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
511
512 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
513 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
514 glConvolutionFilter2D (
515 GL_CONVOLUTION_2D,
516 GL_ALPHA,
517 3, 3,
518 GL_ALPHA, GL_FLOAT,
519 (pack "f*", @{ $self->{smooth_matrix} }),
520 );
521 glEnable GL_CONVOLUTION_2D;
522 }
523
524 $self->{fow_texture} = new CFPlus::Texture
525 w => $w,
526 h => $h,
527 data => $data,
528 internalformat => GL_ALPHA,
529 format => GL_ALPHA;
530
531 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
532 } else {
533 delete $self->{fow_texture};
534 }
535
536 glNewList $self->{list};
537
538 glPushMatrix;
539 glTranslate $sx0, $sy0;
540 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
541
542 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
543
544 glScale 32, 32;
545
546 if (my $tex = $self->{fow_texture}) {
547 glEnable GL_TEXTURE_2D;
548 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
549
550 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
551 $self->{fow_texture}->draw_quad_alpha (0, 0);
552
553 glDisable GL_TEXTURE_2D;
554 }
555
556 if ($self->{magicmap}) {
557 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
558
559 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
560 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
561
562 glTranslate - $x - 1, - $y - 1;
563 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
564 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
565 }
566
567 glPopMatrix;
568 glEndList;
569 }
570
571 glCallList $self->{list}; 579 glCallList $self->{list};
572 580
573 # TNT2 emulates logops in software (or worse :) 581 # TNT2 emulates logops in software (or worse :)
574 unless ($focused) { 582 unless ($focused) {
575 glColor 0.4, 0.2, 0.2, 0.6; 583 glColor_premultiply 0, 0, 1, 0.25;
576 glEnable GL_BLEND; 584 glEnable GL_BLEND;
577 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 585 glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
578 glBegin GL_QUADS; 586 glBegin GL_QUADS;
579 glVertex 0, 0; 587 glVertex 0, 0;
580 glVertex 0, $::HEIGHT; 588 glVertex 0, $::HEIGHT;
581 glVertex $::WIDTH, $::HEIGHT; 589 glVertex $::WIDTH, $::HEIGHT;
582 glVertex $::WIDTH, 0; 590 glVertex $::WIDTH, 0;
… …
591 glDeleteList $self->{list}; 599 glDeleteList $self->{list};
592 600
593 $self->SUPER::DESTROY; 601 $self->SUPER::DESTROY;
594} 602}
595 603
596package CFPlus::MapWidget::MapMap; 604package DC::MapWidget::MapMap;
597 605
606use strict;
607use utf8;
608
598our @ISA = CFPlus::UI::Base::; 609our @ISA = DC::UI::Base::;
599 610
600use Time::HiRes qw(time); 611use Time::HiRes qw(time);
601use CFPlus::OpenGL; 612use DC::OpenGL;
602 613
603sub size_request { 614sub size_request {
604 ($::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
605} 663}
606 664
607sub invoke_size_allocate { 665sub invoke_size_allocate {
608 my ($self, $w, $h) = @_; 666 my ($self, $w, $h) = @_;
609 667
… …
620} 678}
621 679
622sub _draw { 680sub _draw {
623 my ($self) = @_; 681 my ($self) = @_;
624 682
625 $::MAP or return; 683 $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook });
626 684
627 my ($w, $h) = @$self{qw(w h)}; 685 $self->{texture} or return;
628
629 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
630 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
631
632 my $sx = int $::CFG->{map_shift_x} / 32;
633 my $sy = int $::CFG->{map_shift_y} / 32;
634
635 my $ox = 0.5 * ($w - $sw);
636 my $oy = 0.5 * ($h - $sh);
637 686
638 glEnable GL_BLEND; 687 glEnable GL_BLEND;
639 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 688 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
640 glEnable GL_TEXTURE_2D; 689 glEnable GL_TEXTURE_2D;
641 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; 690 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
642 691
643 if ($self->{texture_atime} < time) {
644 $self->{texture_atime} = time + 1/3;
645
646 $self->{texture} =
647 new CFPlus::Texture
648 w => $w,
649 h => $h,
650 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
651 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
652 }
653
654 $self->{texture}->draw_quad (0, 0); 692 $self->{texture}->draw_quad (0, 0);
655 693
656 glDisable GL_TEXTURE_2D; 694 glDisable GL_TEXTURE_2D;
657 695
658 glTranslate 0.375, 0.375; 696 glTranslate 0.375, 0.375;
659
660 #TODO: map scale is completely borked
661
662 my $x0 = int $ox - $sx + 0.5;
663 my $y0 = int $oy - $sy + 0.5;
664 697
665 glColor 1, 1, 0, 1; 698 glColor 1, 1, 0, 1;
666 glBegin GL_LINE_LOOP; 699 glBegin GL_LINE_LOOP;
667 glVertex $x0 , $y0 ; 700 glVertex $self->{x0} , $self->{y0} ;
668 glVertex $x0 , $y0 + $sh; 701 glVertex $self->{x0} , $self->{y0} + $self->{sh};
669 glVertex $x0 + $sw, $y0 + $sh; 702 glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh};
670 glVertex $x0 + $sw, $y0 ; 703 glVertex $self->{x0} + $self->{sw}, $self->{y0} ;
671 glEnd; 704 glEnd;
672 705
673 glDisable GL_BLEND; 706 glDisable GL_BLEND;
674} 707}
675 708
676package CFPlus::MapWidget::Command; 709package DC::MapWidget::Command;
677 710
678use strict; 711use strict;
679 712
680use CFPlus::OpenGL; 713use DC::OpenGL;
681 714
682our @ISA = CFPlus::UI::Frame::; 715our @ISA = DC::UI::Frame::;
683 716
684sub new { 717sub new {
685 my $class = shift; 718 my $class = shift;
686 719
687 my $self = $class->SUPER::new ( 720 my $self = $class->SUPER::new (
688 bg => [0, 0, 0, 0.8], 721 bg => [0, 0, 0, 0.8],
689 @_, 722 @_,
690 ); 723 );
691 724
692 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 725 $self->add ($self->{vbox} = new DC::UI::VBox);
693 726
694 $self->{label} = [ 727 $self->{label} = [
695 map 728 map
696 CFPlus::UI::Label->new ( 729 DC::UI::Label->new (
730 align => 0,
697 can_hover => 1, 731 can_hover => 1,
698 can_events => 1, 732 can_events => 1,
699 tooltip_width => 0.33, 733 tooltip_width => 0.33,
700 fontsize => $_, 734 fontsize => $_,
701 ), (0.8) x 16 735 ), (0.8) x 16
702 ]; 736 ];
703 737
704 $self->{entry} = new CFPlus::UI::Entry 738 $self->{entry} = new DC::UI::Entry
705 on_changed => sub { 739 on_changed => sub {
706 $self->update_labels; 740 $self->update_labels;
707 0 741 0
708 }, 742 },
709 on_button_down => sub { 743 on_button_down => sub {
710 my ($entry, $ev, $x, $y) = @_; 744 my ($entry, $ev, $x, $y) = @_;
711 745
712 if ($ev->{button} == 3) { 746 if ($ev->{button} == 3) {
713 (new CFPlus::UI::Menu 747 (new DC::UI::Menu
714 items => [ 748 items => [
715 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 749 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
716 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 750 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
717 ], 751 ],
718 )->popup ($ev); 752 )->popup ($ev);
719 return 1; 753 return 1;
720 } 754 }
721 0 755 0
… …
736 $self->hide; 770 $self->hide;
737 } 771 }
738 } elsif ($ev->{sym} == 27) { 772 } elsif ($ev->{sym} == 27) {
739 $self->{hist_ptr} = 0; 773 $self->{hist_ptr} = 0;
740 $self->hide; 774 $self->hide;
741 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 775 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
742 if ($self->{hist_ptr} > 1) { 776 if ($self->{hist_ptr} > 1) {
743 $self->{hist_ptr}--; 777 $self->{hist_ptr}--;
744 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 778 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
745 } elsif ($self->{hist_ptr} > 0) { 779 } elsif ($self->{hist_ptr} > 0) {
746 $self->{hist_ptr}--; 780 $self->{hist_ptr}--;
… …
748 } else { 782 } else {
749 ++$self->{select_offset} 783 ++$self->{select_offset}
750 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 784 if $self->{select_offset} < $#{ $self->{last_match} || [] };
751 } 785 }
752 $self->update_labels; 786 $self->update_labels;
753 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 787 } elsif ($ev->{sym} == DC::SDLK_UP) {
754 if ($self->{select_offset}) { 788 if ($self->{select_offset}) {
755 --$self->{select_offset} 789 --$self->{select_offset}
756 } else { 790 } else {
757 unless ($self->{hist_ptr}) { 791 unless ($self->{hist_ptr}) {
758 $self->{hist_saveback} = $self->{entry}->get_text; 792 $self->{hist_saveback} = $self->{entry}->get_text;
… …
824 my $text = $self->{entry}->get_text; 858 my $text = $self->{entry}->get_text;
825 859
826 length $text 860 length $text
827 or return $self->hide; 861 or return $self->hide;
828 862
829 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
830
831 if ($text ne $self->{last_search}) { 863 if ($text ne $self->{last_search}) {
832 my @match; 864 my @match;
833 865
834 if ($text =~ /^(.*?)\s+$/) { 866 if ($text =~ /^(.*?)\s+$/) {
867 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
835 @match = [$cmd, "(appended whitespace suppresses completion)"]; 868 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
836 } else { 869 } else {
870 # @match is [command, penalty, command with arguments] until sort
871
872 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
873
837 my $regexp = do { 874 my $regexp_abbrev = do {
838 my ($beg, @chr) = split //, lc $cmd; 875 my ($beg, @chr) = split //, lc $cmd;
839 876
840 # the following regex is used to match our "completion entry" 877 # the following regex is used to match our "completion entry"
841 # to an actual command - the parentheses match kind of "overhead" 878 # to an actual command - the parentheses match kind of "overhead"
842 # - the more characters the parentheses match, the less attractive 879 # - the more characters the parentheses match, the less attractive
… …
844 my $regexp = "^\Q$beg\E" 881 my $regexp = "^\Q$beg\E"
845 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 882 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr;
846 qr<$regexp> 883 qr<$regexp>
847 }; 884 };
848 885
849 my @penalty; 886 my $regexp_partial = do {
887 my $regexp = "^\Q$text\E(.*)";
888 qr<$regexp>
889 };
850 890
851 for (keys %{$self->{command}}) { 891 for (keys %{$self->{command}}) {
852 if (@penalty = $_ =~ $regexp) { 892 my @scores;
853 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];
854 } 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];
855 } 927 }
856 928
929 # @match is now [command object, command with arguments]
857 @match = map $self->{command}{$_->[0]}, 930 @match = map [$self->{command}{$_->[0]}, $_->[2]],
858 sort { 931 sort {
859 $a->[1] <=> $b->[1] 932 $b->[1] <=> $a->[1]
860 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 933 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
861 or (length $b->[0]) <=> (length $a->[0]) 934 or (length $b->[0]) <=> (length $a->[0])
862 } @match; 935 } @match;
863 } 936 }
864 937
… …
883 $label->{fg} = [1, 1, 1, 1]; 956 $label->{fg} = [1, 1, 1, 1];
884 $label->{bg} = [0, 0, 0, 0]; 957 $label->{bg} = [0, 0, 0, 0];
885 } 958 }
886 959
887 if (@matches) { 960 if (@matches) {
888 $self->{select} = "$matches[0][0]$arg"; 961 $self->{select} = "$matches[0][1]";
889 962
890 $labels[0]->{fg} = [0, 0, 0, 1]; 963 $labels[0]->{fg} = [0, 0, 0, 1];
891 $labels[0]->{bg} = [1, 1, 1, 0.8]; 964 $labels[0]->{bg} = [1, 1, 1, 0.8];
892 } else { 965 } else {
893 $self->{select} = "$cmd$arg"; 966 $self->{select} = "$text";
894 } 967 }
895 968
896 for my $match (@matches) { 969 for my $match (@matches) {
897 my $label = shift @labels; 970 my $label = shift @labels;
898 971
899 if (@labels) { 972 if (@labels) {
900 $label->set_text ("$match->[0]$arg"); 973 $label->set_text ("$match->[1]");
901 $label->set_tooltip ($match->[1]); 974 $label->set_tooltip ("$match->[0][1]");
902 } else { 975 } else {
903 $label->set_text ("..."); 976 $label->set_text ("...");
904 $label->set_tooltip ("Use Cursor-Down to view more matches"); 977 $label->set_tooltip ("Use Cursor-Down to view more matches");
905 last; 978 last;
906 } 979 }
… …
916 989
917sub _draw { 990sub _draw {
918 my ($self) = @_; 991 my ($self) = @_;
919 992
920 # hack 993 # hack
921 local $CFPlus::UI::FOCUS = $self->{entry}; 994 local $DC::UI::FOCUS = $self->{entry};
922 995
923 $self->SUPER::_draw; 996 $self->SUPER::_draw;
924} 997}
925 998
9261 9991

Diff Legend

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