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

Diff Legend

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