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

Diff Legend

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