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.97 by root, Sat Dec 9 22:28:11 2006 UTC vs.
Revision 1.162 by root, Sat Apr 3 02:58:25 2010 UTC

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

Diff Legend

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