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.77 by root, Sun Jul 23 02:44:05 2006 UTC vs.
Revision 1.167 by root, Tue Nov 20 14:32:12 2012 UTC

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

Diff Legend

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