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.160 by root, Tue Dec 22 01:37:41 2009 UTC

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

Diff Legend

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