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

Diff Legend

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