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

Diff Legend

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