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.124 by root, Wed Dec 26 18:09:30 2007 UTC vs.
Revision 1.165 by root, Fri Nov 9 22:53:57 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
… …
27 ); 33 );
28 34
29 $self 35 $self
30} 36}
31 37
32sub set_tilesize {
33 my ($self, $tilesize) = @_;
34
35 $self->{tilesize} = $tilesize;
36}
37
38sub add_command { 38sub add_command {
39 my ($self, $command, $tooltip, $widget, $cb) = @_; 39 my ($self, $command, $tooltip, $widget, $cb) = @_;
40 40
41 (my $data = $command) =~ s/\\//g; 41 (my $data = $command) =~ s/\\//g;
42 42
… …
66 66
67sub editor_invoke { 67sub editor_invoke {
68 my $editsup = $::CONN && $::CONN->{editor_support} 68 my $editsup = $::CONN && $::CONN->{editor_support}
69 or return; 69 or return;
70 70
71 CFPlus::background { 71 DC::background {
72 print "preparing editor startup...\n"; 72 print "preparing editor startup...\n";
73 73
74 my $server = $editsup->{gameserver} || "default"; 74 my $server = $editsup->{gameserver} || "default";
75 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 75 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
76 76
… …
78 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir; 78 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir;
79 79
80 print "map directory is $mapdir\n"; 80 print "map directory is $mapdir\n";
81 print "lib directory is $libdir\n"; 81 print "lib directory is $libdir\n";
82 82
83 my $ua = CFPlus::lwp_useragent; 83 my $ua = DC::lwp_useragent;
84 84
85 for my $file (qw(archetypes crossfire.0)) { 85 for my $file (qw(archetypes crossfire.0)) {
86 my $url = "$editsup->{lib_root}$file"; 86 my $url = "$editsup->{lib_root}$file";
87 print "mirroring $url...\n"; 87 print "mirroring $url...\n";
88 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); 88 DC::lwp_check $ua->mirror ($url, "$libdir/$file");
89 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 89 printf "%s size %d octets\n", $file, -s "$libdir/$file";
90 } 90 }
91 91
92 if (1) { # upload a map 92 if (1) { # upload a map
93 my $mapname = $::CONN->{map_info}[0]; 93 my $mapname = $::CONN->{map_info}[0];
… …
98 98
99 print "getting map revision for $mapname...\n"; 99 print "getting map revision for $mapname...\n";
100 100
101 # try to get the most recent head revision, what a hack, 101 # try to get the most recent head revision, what a hack,
102 # this should have been returned while downloading *sigh* 102 # this should have been returned while downloading *sigh*
103 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;
104 104
105 if ($log =~ /\?rev=(\d+\.\d+)"/) { 105 if ($log =~ /\?rev=(\d+\.\d+)"/) {
106 my $rev = $1; 106 my $rev = $1;
107 107
108 print "downloading revision $rev...\n"; 108 print "downloading revision $rev...\n";
109 109
110 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;
111 111
112 my $meta = { 112 my $meta = {
113 %$editsup, 113 %$editsup,
114 path => $mapname, 114 path => $mapname,
115 revision => $rev, 115 revision => $rev,
… …
120 require File::Path; 120 require File::Path;
121 121
122 File::Path::mkpath (File::Basename::dirname ($mappath)); 122 File::Path::mkpath (File::Basename::dirname ($mappath));
123 open my $fh, ">:raw:perlio", "$mappath.meta" 123 open my $fh, ">:raw:perlio", "$mappath.meta"
124 or die "$mappath.meta: $!\n"; 124 or die "$mappath.meta: $!\n";
125 print $fh CFPlus::encode_json $meta; 125 print $fh DC::encode_json $meta;
126 close $fh; 126 close $fh;
127 open my $fh, ">:raw:perlio:utf8", $mappath 127 open my $fh, ">:raw:perlio:utf8", $mappath
128 or die "$mappath: $!\n"; 128 or die "$mappath: $!\n";
129 print $fh $map; 129 print $fh $map;
130 close $fh; 130 close $fh;
… …
169sub invoke_button_down { 169sub invoke_button_down {
170 my ($self, $ev, $x, $y) = @_; 170 my ($self, $ev, $x, $y) = @_;
171 171
172 if ($ev->{button} == 1) { 172 if ($ev->{button} == 1) {
173 $self->grab_focus; 173 $self->grab_focus;
174 return unless $::CONN; 174 return unless $::CONN && $self->{ctilesize};
175 175
176 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};
177 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};
178 178
179 $x -= CFPlus::floor $::MAP->w * 0.5; 179 $x -= DC::floor $::MAP->w * 0.5;
180 $y -= CFPlus::floor $::MAP->h * 0.5; 180 $y -= DC::floor $::MAP->h * 0.5;
181 181
182 if ($::CONN) { 182 if ($::CONN) {
183 $::CONN->lookat ($x, $y) 183 $::CONN->lookat ($x, $y)
184 } 184 }
185 185
… …
206 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 206 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 207 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 208 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 209 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], 210 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
211 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], 211# ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
212 [
213 $::PICKUP_ENABLE->{state}
214 ? "Disable automatic pickup"
215 : "Enable automatic pickup",
216 sub { $::PICKUP_ENABLE->toggle }
217 ],
218 ); 212 );
219 213
220 if ($::CONN && $::CONN->{editor_support}) { 214 if ($::CONN && $::CONN->{editor_support}) {
221 push @items, [ 215# push @items, [
222 "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>",
223 \&editor_invoke, 217# \&editor_invoke,
224 ]; 218# ];
225 219
226 for my $type (qw(test name)) { 220 for my $type (@{ $::CONN->{editor_support}{servertypes} }) {
227 $::CONN->{editor_support}{type} ne $type 221 $::CONN->{editor_support}{servertype} ne $type
228 or next; 222 or next;
229 my $server = $::CONN->{editor_support}{"${type}server"} 223 my $server = $::CONN->{editor_support}{"${type}server"}
230 or next; 224 or next;
231 225
232 push @items, [ 226 push @items, [
233 "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>",
234 sub { server_login $server }, 228 sub { server_login $server },
235 ]; 229 ];
236 } 230 }
237 } 231 }
238 232
… …
246 } 240 }
247 } 241 }
248 ], 242 ],
249 ; 243 ;
250 244
251 (new CFPlus::UI::Menu 245 (new DC::UI::Menu
252 items => \@items, 246 items => \@items,
253 )->popup ($ev); 247 )->popup ($ev);
254 } 248 }
255 249
256 1 250 1
… …
278 272
279sub size_request { 273sub size_request {
280 my ($self) = @_; 274 my ($self) = @_;
281 275
282 ( 276 (
283 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, 277 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
284 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, 278 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
285 ) 279 )
286} 280}
287 281
288sub update { 282sub update {
289 my ($self) = @_; 283 my ($self) = @_;
… …
291 $self->{need_update} = 1; 285 $self->{need_update} = 1;
292 $self->SUPER::update; 286 $self->SUPER::update;
293} 287}
294 288
295my %DIR = ( 289my %DIR = (
296 ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], 290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
297 ( "," . CFPlus::SDLK_KP8 ), [1, "north"], 291 ( "," . DC::SDLK_KP8 ), [1, "north"],
298 ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], 292 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
299 ( "," . CFPlus::SDLK_KP6 ), [3, "east"], 293 ( "," . DC::SDLK_KP6 ), [3, "east"],
300 ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], 294 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
301 ( "," . CFPlus::SDLK_KP2 ), [5, "south"], 295 ( "," . DC::SDLK_KP2 ), [5, "south"],
302 ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], 296 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
303 ( "," . CFPlus::SDLK_KP4 ), [7, "west"], 297 ( "," . DC::SDLK_KP4 ), [7, "west"],
304 ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], 298 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
305 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
306 ( "," . CFPlus::SDLK_UP ), [1, "north"], 305 ( "," . DC::SDLK_UP ), [1, "north"],
307 ("1," . CFPlus::SDLK_UP ), [2, "northeast"], 306 ("1," . DC::SDLK_UP ), [2, "northeast"],
308 ( "," . CFPlus::SDLK_RIGHT), [3, "east"], 307 ( "," . DC::SDLK_RIGHT ), [3, "east"],
309 ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], 308 ("1," . DC::SDLK_RIGHT ), [4, "southeast"],
310 ( "," . CFPlus::SDLK_DOWN ), [5, "south"], 309 ( "," . DC::SDLK_DOWN ), [5, "south"],
311 ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], 310 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
312 ( "," . CFPlus::SDLK_LEFT ), [7, "west"], 311 ( "," . DC::SDLK_LEFT ), [7, "west"],
313 ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], 312 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
314); 313);
315 314
316sub invoke_key_down { 315sub invoke_key_down {
317 my ($self, $ev) = @_; 316 my ($self, $ev) = @_;
318 317
319 my $mod = $ev->{mod}; 318 my $mod = $ev->{mod};
320 my $sym = $ev->{sym}; 319 my $sym = $ev->{sym};
321 my $uni = $ev->{unicode}; 320 my $uni = $ev->{unicode};
322 321
323 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 322 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT;
324 323
325 if ($::CONN && (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"})) { 324 # ignore repeated keypresses
325 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
326 $self->{last_mod} = $mod;
327 $self->{last_sym} = $sym;
328
329 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
330
331 if ($::CONN && $dir) {
326 if ($mod & CFPlus::KMOD_SHIFT) { 332 if ($mod & DC::KMOD_SHIFT) {
327 $self->{shft}++; 333 $self->{shft}++;
328 if ($dir->[0] != $self->{fire_dir}) { 334 if ($dir->[0] != $self->{fire_dir}) {
329 $::CONN->user_send ("fire $dir->[0]"); 335 $::CONN->user_send ("fire $dir->[0]");
330 } 336 }
331 $self->{fire_dir} = $dir->[0]; 337 $self->{fire_dir} = $dir->[0];
332 } elsif ($mod & CFPlus::KMOD_CTRL) { 338 } elsif ($mod & DC::KMOD_CTRL) {
333 $self->{ctrl}++; 339 $self->{ctrl}++;
334 $::CONN->user_send ("run $dir->[0]"); 340 $::CONN->user_send ("run $dir->[0]");
335 } else { 341 } else {
336 $::CONN->user_send ("$dir->[1]"); 342 $::CONN->user_send ("$dir->[1]");
337 } 343 }
… …
347 353
348 my $res = 0; 354 my $res = 0;
349 my $mod = $ev->{mod}; 355 my $mod = $ev->{mod};
350 my $sym = $ev->{sym}; 356 my $sym = $ev->{sym};
351 357
358 delete $self->{last_mod};
359 delete $self->{last_sym};
360
352 if ($::CFG->{shift_fire_stop}) { 361 if ($::CFG->{shift_fire_stop}) {
353 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { 362 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
354 $::CONN->user_send ("fire_stop"); 363 $::CONN->user_send ("fire_stop");
355 delete $self->{fire_dir}; 364 delete $self->{fire_dir};
356 $res = 1; 365 $res = 1;
357 } 366 }
358 } else { 367 } else {
359 if (exists $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { 368 my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" };
369
370 if ($dir && delete $self->{shft}) {
360 $::CONN->user_send ("fire_stop"); 371 $::CONN->user_send ("fire_stop");
361 delete $self->{fire_dir}; 372 delete $self->{fire_dir};
362 $res = 1; 373 $res = 1;
363 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) 374 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
364 && delete $self->{shft}) { # XXX: is RSHIFT ok? 375 && delete $self->{shft}) { # XXX: is RSHIFT ok?
365 $::CONN->user_send ("fire_stop"); 376 $::CONN->user_send ("fire_stop");
366 delete $self->{fire_dir}; 377 delete $self->{fire_dir};
367 $res = 1; 378 $res = 1;
368 } 379 }
369 } 380 }
370 381
371 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { 382 if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) {
372 $::CONN->user_send ("run_stop"); 383 $::CONN->user_send ("run_stop");
373 $res = 1; 384 $res = 1;
374 } 385 }
375 386
376 $res 387 $res
… …
382 $self->refresh_hook; 393 $self->refresh_hook;
383 394
384 0 395 0
385} 396}
386 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
387sub set_magicmap { 422sub set_magicmap {
388 my ($self, $w, $h, $x, $y, $data) = @_; 423 my ($self, $w, $h, $x, $y, $data) = @_;
389 424
390 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 425 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
391 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 426 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
393 $self->{magicmap} = [$x, $y, $w, $h, $data]; 428 $self->{magicmap} = [$x, $y, $w, $h, $data];
394 429
395 $self->update; 430 $self->update;
396} 431}
397 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
398sub refresh_hook { 472sub refresh_hook {
399 my ($self) = @_; 473 my ($self) = @_;
400 474
401 if ($::MAP && $::CONN) { 475 if ($::MAP && $::CONN) {
402 if (delete $self->{need_update}) { 476 if (delete $self->{need_update}) {
477 $self->movement_update;
478
403 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 479 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
404 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
405 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 485 my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize;
406 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 486 my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize;
407 487
488 # the map displacement, in tiles
408 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 489 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t;
409 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 490 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t;
410 491
492 # the upper left "visible" corner, in pixels
411 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 493 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
412 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 494 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
413 495
414 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;
415 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;
416 498
417 if ($::CFG->{fow_enable}) { 499 if ($::CFG->{fow_enable}) {
500 # draw_fow_texture REQUIRES the fow texture to stay the same size.
418 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 501 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
419 502
420 $self->{fow_texture} = new CFPlus::Texture 503 $self->{fow_texture} = new DC::Texture
421 w => $w, 504 w => $w,
422 h => $h, 505 h => $h,
423 data => $data, 506 data => $data,
424 internalformat => GL_ALPHA, 507 internalformat => GL_ALPHA,
425 format => GL_ALPHA; 508 format => GL_ALPHA;
… …
430 glNewList ($self->{list} ||= glGenList); 513 glNewList ($self->{list} ||= glGenList);
431 514
432 glPushMatrix; 515 glPushMatrix;
433 glTranslate $sx0, $sy0; 516 glTranslate $sx0, $sy0;
434 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};
435 519
436 $::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});
437 524
438 glScale $self->{tilesize}, $self->{tilesize}; 525 glScale $self->{tilesize}, $self->{tilesize};
439 526
440 if (my $tex = $self->{fow_texture}) { 527 if (my $tex = $self->{fow_texture}) {
441 glPushMatrix; 528 my @prev_fow_params;
442 glScale 1/3, 1/3;
443 glEnable GL_TEXTURE_2D;
444 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
445 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
446 glColor +($::CFG->{fow_intensity}) x 3, 0.9; 545 $::CFG->{fow_intensity},
447 $self->{fow_texture}->draw_quad_alpha (0, 0); 546 $TEX_HIDDEN[$::CFG->{fow_texture}]{name},
448 547 @{$self->{fow_texture}}{qw(name data s t w h)},
449 glDisable GL_TEXTURE_2D; 548 @prev_fow_params;
450 glPopMatrix;
451 } 549 }
452 550
453 if ($self->{magicmap}) { 551 if ($self->{magicmap}) {
454 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 552 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
455 553
456 $x += $::MAP->ox + $self->{dx}; 554 $x += $::MAP->ox + $self->{dx};
457 $y += $::MAP->oy + $self->{dy}; 555 $y += $::MAP->oy + $self->{dy};
458 556
459 glTranslate - $x - 1, - $y - 1; 557 glTranslate - $x - 1, - $y - 1;
460 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 558 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
461 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 559 $::MAP->draw_magicmap ($w, $h, $data);
462 } 560 }
463 561
464 glPopMatrix; 562 glPopMatrix;
465 glEndList; 563 glEndList;
466 } 564 }
467 } else { 565 } else {
566 delete $self->{last_fow_texture};
567 delete $self->{fow_texture};
568
468 glDeleteList delete $self->{list} 569 glDeleteList delete $self->{list}
469 if $self->{list}; 570 if $self->{list};
470 } 571 }
471} 572}
472 573
… …
475 576
476 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); 577 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
477 578
478 return unless $self->{list}; 579 return unless $self->{list};
479 580
480 my $focused = $CFPlus::UI::FOCUS == $self 581 my $focused = $DC::UI::FOCUS == $self
481 || $CFPlus::UI::FOCUS == $::COMPLETER->{entry}; 582 || $DC::UI::FOCUS == $::COMPLETER->{entry};
482 583
483 return 584 return
484 unless $focused || !$::FAST; 585 unless $focused || !$::FAST;
485 586
486 glCallList $self->{list}; 587 glCallList $self->{list};
… …
506 glDeleteList $self->{list}; 607 glDeleteList $self->{list};
507 608
508 $self->SUPER::DESTROY; 609 $self->SUPER::DESTROY;
509} 610}
510 611
511package CFPlus::MapWidget::MapMap; 612package DC::MapWidget::MapMap;
512 613
513use strict; 614use common::sense;
514use utf8;
515 615
516our @ISA = CFPlus::UI::Base::; 616our @ISA = DC::UI::Base::;
517 617
518use Time::HiRes qw(time);
519use CFPlus::OpenGL; 618use DC::OpenGL;
520 619
521sub size_request { 620sub size_request {
522 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 621 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
523} 622}
524 623
525sub refresh_hook { 624sub refresh_hook {
526 my ($self) = @_; 625 my ($self) = @_;
527 626
528 if ($::MAP && $self->{texture_atime} < time) { 627 if ($::MAP && $self->{texture_atime} < AE::now) {
529 my ($w, $h) = @$self{qw(w h)}; 628 my ($w, $h) = @$self{qw(w h)};
629
630 return unless $w && $h;
530 631
531 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 632 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
532 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; 633 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
533 634
534 my $ox = 0.5 * ($w - $sw); 635 my $ox = 0.5 * ($w - $sw);
… …
546 $self->{sh} = $sh; 647 $self->{sh} = $sh;
547 648
548 $self->{x0} = $x0; 649 $self->{x0} = $x0;
549 $self->{y0} = $y0; 650 $self->{y0} = $y0;
550 651
551 $self->{texture_atime} = time + 1/3; 652 $self->{texture_atime} = AE::now + 1/2;
552 653
553 $self->{texture} = 654 $self->{texture} =
554 new CFPlus::Texture 655 new DC::Texture
555 w => $w, 656 w => $w,
556 h => $h, 657 h => $h,
557 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 658 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
558 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;
559 } 660 }
560} 661}
561 662
562sub invoke_visibility_change { 663sub invoke_visibility_change {
563 my ($self) = @_; 664 my ($self) = @_;
… …
609 glEnd; 710 glEnd;
610 711
611 glDisable GL_BLEND; 712 glDisable GL_BLEND;
612} 713}
613 714
614package CFPlus::MapWidget::Command; 715package DC::MapWidget::Command;
615 716
616use strict; 717use common::sense;
617 718
618use CFPlus::OpenGL; 719use DC::OpenGL;
619 720
620our @ISA = CFPlus::UI::Frame::; 721our @ISA = DC::UI::Frame::;
621 722
622sub new { 723sub new {
623 my $class = shift; 724 my $class = shift;
624 725
625 my $self = $class->SUPER::new ( 726 my $self = $class->SUPER::new (
626 bg => [0, 0, 0, 0.8], 727 bg => [0, 0, 0, 0.8],
627 @_, 728 @_,
628 ); 729 );
629 730
630 $self->add ($self->{vbox} = new CFPlus::UI::VBox); 731 $self->add ($self->{vbox} = new DC::UI::VBox);
631 732
632 $self->{label} = [ 733 $self->{label} = [
633 map 734 map
634 CFPlus::UI::Label->new ( 735 DC::UI::Label->new (
736 align => 0,
635 can_hover => 1, 737 can_hover => 1,
636 can_events => 1, 738 can_events => 1,
637 tooltip_width => 0.33, 739 tooltip_width => 0.33,
638 fontsize => $_, 740 fontsize => $_,
639 ), (0.8) x 16 741 ), (0.8) x 16
640 ]; 742 ];
641 743
642 $self->{entry} = new CFPlus::UI::Entry 744 $self->{entry} = new DC::UI::Entry
643 on_changed => sub { 745 on_changed => sub {
644 $self->update_labels; 746 $self->update_labels;
645 0 747 0
646 }, 748 },
647 on_button_down => sub { 749 on_button_down => sub {
648 my ($entry, $ev, $x, $y) = @_; 750 my ($entry, $ev, $x, $y) = @_;
649 751
650 if ($ev->{button} == 3) { 752 if ($ev->{button} == 3) {
651 (new CFPlus::UI::Menu 753 (new DC::UI::Menu
652 items => [ 754 items => [
653 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 755 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
654 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] 756 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
655 ], 757 ],
656 )->popup ($ev); 758 )->popup ($ev);
657 return 1; 759 return 1;
658 } 760 }
659 0 761 0
… …
674 $self->hide; 776 $self->hide;
675 } 777 }
676 } elsif ($ev->{sym} == 27) { 778 } elsif ($ev->{sym} == 27) {
677 $self->{hist_ptr} = 0; 779 $self->{hist_ptr} = 0;
678 $self->hide; 780 $self->hide;
679 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { 781 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
680 if ($self->{hist_ptr} > 1) { 782 if ($self->{hist_ptr} > 1) {
681 $self->{hist_ptr}--; 783 $self->{hist_ptr}--;
682 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 784 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
683 } elsif ($self->{hist_ptr} > 0) { 785 } elsif ($self->{hist_ptr} > 0) {
684 $self->{hist_ptr}--; 786 $self->{hist_ptr}--;
… …
686 } else { 788 } else {
687 ++$self->{select_offset} 789 ++$self->{select_offset}
688 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 790 if $self->{select_offset} < $#{ $self->{last_match} || [] };
689 } 791 }
690 $self->update_labels; 792 $self->update_labels;
691 } elsif ($ev->{sym} == CFPlus::SDLK_UP) { 793 } elsif ($ev->{sym} == DC::SDLK_UP) {
692 if ($self->{select_offset}) { 794 if ($self->{select_offset}) {
693 --$self->{select_offset} 795 --$self->{select_offset}
694 } else { 796 } else {
695 unless ($self->{hist_ptr}) { 797 unless ($self->{hist_ptr}) {
696 $self->{hist_saveback} = $self->{entry}->get_text; 798 $self->{hist_saveback} = $self->{entry}->get_text;
… …
762 my $text = $self->{entry}->get_text; 864 my $text = $self->{entry}->get_text;
763 865
764 length $text 866 length $text
765 or return $self->hide; 867 or return $self->hide;
766 868
767 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
768
769 if ($text ne $self->{last_search}) { 869 if ($text ne $self->{last_search}) {
770 my @match; 870 my @match;
771 871
772 if ($text =~ /^(.*?)\s+$/) { 872 if ($text =~ /^(.*?)\s+$/) {
873 my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/;
773 @match = [$cmd, "(appended whitespace suppresses completion)"]; 874 @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]);
774 } 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
775 my $regexp = do { 882 my $regexp_abbrev = do {
776 my ($beg, @chr) = split //, lc $cmd; 883 my ($beg, @chr) = split //, lc $cmd;
777 884
778 # the following regex is used to match our "completion entry" 885 # the following regex is used to match our "completion entry"
779 # to an actual command - the parentheses match kind of "overhead" 886 # to an actual command - the parentheses match kind of "overhead"
780 # - the more characters the parentheses match, the less attractive 887 # - the more characters the parentheses match, the less attractive
781 # is the match. 888 # is the match.
782 my $regexp = "^\Q$beg\E" 889 my $regexp = "^\Q$beg\E"
783 . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; 890 . join "", map "(?:.*?[ \\\\]|(.*?))\Q$_\E", @chr;
784 qr<$regexp> 891 qr<$regexp>
785 }; 892 };
786 893
787 my @penalty; 894 my $regexp_partial = do {
895 my $regexp = "^\Q$text\E(.*)";
896 qr<$regexp>
897 };
788 898
789 for (keys %{$self->{command}}) { 899 for (keys %{$self->{command}}) {
790 if (@penalty = $_ =~ $regexp) { 900 # we only match and score if the first character matches,
791 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];
792 } 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];
793 } 939 }
794 940
941 # @match is now [command object, command with arguments]
795 @match = map $self->{command}{$_->[0]}, 942 @match = map [$self->{command}{$_->[0]}, $_->[2]],
796 sort { 943 sort {
797 $a->[1] <=> $b->[1] 944 $b->[1] <=> $a->[1]
798 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] 945 or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4]
799 or (length $b->[0]) <=> (length $a->[0]) 946 or (length $b->[0]) <=> (length $a->[0])
800 } @match; 947 } @match;
801 } 948 }
802 949
… …
821 $label->{fg} = [1, 1, 1, 1]; 968 $label->{fg} = [1, 1, 1, 1];
822 $label->{bg} = [0, 0, 0, 0]; 969 $label->{bg} = [0, 0, 0, 0];
823 } 970 }
824 971
825 if (@matches) { 972 if (@matches) {
826 $self->{select} = "$matches[0][0]$arg"; 973 $self->{select} = "$matches[0][1]";
827 974
828 $labels[0]->{fg} = [0, 0, 0, 1]; 975 $labels[0]->{fg} = [0, 0, 0, 1];
829 $labels[0]->{bg} = [1, 1, 1, 0.8]; 976 $labels[0]->{bg} = [1, 1, 1, 0.8];
830 } else { 977 } else {
831 $self->{select} = "$cmd$arg"; 978 $self->{select} = "$text";
832 } 979 }
833 980
834 for my $match (@matches) { 981 for my $match (@matches) {
835 my $label = shift @labels; 982 my $label = shift @labels;
836 983
837 if (@labels) { 984 if (@labels) {
838 $label->set_text ("$match->[0]$arg"); 985 $label->set_text ("$match->[1]");
839 $label->set_tooltip ($match->[1]); 986 $label->set_tooltip ("$match->[0][1]");
840 } else { 987 } else {
841 $label->set_text ("..."); 988 $label->set_text ("...");
842 $label->set_tooltip ("Use Cursor-Down to view more matches"); 989 $label->set_tooltip ("Use Cursor-Down to view more matches");
843 last; 990 last;
844 } 991 }
… …
854 1001
855sub _draw { 1002sub _draw {
856 my ($self) = @_; 1003 my ($self) = @_;
857 1004
858 # hack 1005 # hack
859 local $CFPlus::UI::FOCUS = $self->{entry}; 1006 local $DC::UI::FOCUS = $self->{entry};
860 1007
861 $self->SUPER::_draw; 1008 $self->SUPER::_draw;
862} 1009}
863 1010
8641 10111

Diff Legend

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