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

Diff Legend

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