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.115 by elmex, Fri Jul 27 18:04:42 2007 UTC vs.
Revision 1.163 by root, Thu Oct 14 00:02:39 2010 UTC

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

Diff Legend

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