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.150 by elmex, Wed Aug 12 18:41:39 2009 UTC

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

Diff Legend

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