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.159 by root, Tue Dec 22 00:35:44 2009 UTC

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

Diff Legend

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