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

Diff Legend

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