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

Diff Legend

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