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

Diff Legend

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