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

Diff Legend

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