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

Diff Legend

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