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.67 by elmex, Wed Jun 21 12:59:23 2006 UTC vs.
Revision 1.151 by root, Mon Nov 16 00:47:56 2009 UTC

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

Diff Legend

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