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

Diff Legend

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