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.125 by root, Wed Dec 26 20:46:39 2007 UTC vs.
Revision 1.135 by root, Sun Jul 20 02:51:40 2008 UTC

1package dc::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 dc; 8use DC;
9use dc::OpenGL; 9use DC::OpenGL;
10use dc::UI; 10use DC::UI;
11use dc::Macro; 11use DC::Macro;
12 12
13our @ISA = dc::UI::Base::; 13our @ISA = DC::UI::Base::;
14 14
15my $magicmap_tex = 15my $magicmap_tex =
16 new_from_file dc::Texture dc::find_rcfile "magicmap.png", 16 new_from_file DC::Texture DC::find_rcfile "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 dc::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
… …
78 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::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 = dc::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 dc::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 = (dc::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 = (dc::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 dc::encode_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;
… …
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;
175 169
176 my $x = $self->{dx} + dc::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} + dc::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; 171 my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
178 172
179 $x -= dc::floor $::MAP->w * 0.5; 173 $x -= DC::floor $::MAP->w * 0.5;
180 $y -= dc::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 [ 206 [
213 $::PICKUP_ENABLE->{state} 207 $::PICKUP_ENABLE->{state}
214 ? "Disable automatic pickup" 208 ? "Disable automatic pickup"
215 : "Enable automatic pickup", 209 : "Enable automatic pickup",
216 sub { $::PICKUP_ENABLE->toggle } 210 sub { $::PICKUP_ENABLE->toggle }
217 ], 211 ],
218 ); 212 );
219 213
220 if ($::CONN && $::CONN->{editor_support}) { 214 if ($::CONN && $::CONN->{editor_support}) {
221 push @items, [ 215# push @items, [
222 "Edit this map <span size='xx-small'>(" . (dc::asxml $::CONN->{map_info}[0]) . ")</span>", 216# "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>",
223 \&editor_invoke, 217# \&editor_invoke,
224 ]; 218# ];
225 219
226 for my $type (qw(test name)) { 220 for my $type (qw(test name)) {
227 $::CONN->{editor_support}{type} ne $type 221 $::CONN->{editor_support}{type} ne $type
228 or next; 222 or next;
229 my $server = $::CONN->{editor_support}{"${type}server"} 223 my $server = $::CONN->{editor_support}{"${type}server"}
230 or next; 224 or next;
231 225
232 push @items, [ 226 push @items, [
233 "Login on $type server <span size='xx-small'>(" . (dc::asxml $server) . ")</span>", 227 "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>",
234 sub { server_login $server }, 228 sub { server_login $server },
235 ]; 229 ];
236 } 230 }
237 } 231 }
238 232
… …
246 } 240 }
247 } 241 }
248 ], 242 ],
249 ; 243 ;
250 244
251 (new dc::UI::Menu 245 (new DC::UI::Menu
252 items => \@items, 246 items => \@items,
253 )->popup ($ev); 247 )->popup ($ev);
254 } 248 }
255 249
256 1 250 1
… …
278 272
279sub size_request { 273sub size_request {
280 my ($self) = @_; 274 my ($self) = @_;
281 275
282 ( 276 (
283 $self->{tilesize} * dc::ceil $::WIDTH / $self->{tilesize}, 277 $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize},
284 $self->{tilesize} * dc::ceil $::HEIGHT / $self->{tilesize}, 278 $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize},
285 ) 279 )
286} 280}
287 281
288sub update { 282sub update {
289 my ($self) = @_; 283 my ($self) = @_;
… …
291 $self->{need_update} = 1; 285 $self->{need_update} = 1;
292 $self->SUPER::update; 286 $self->SUPER::update;
293} 287}
294 288
295my %DIR = ( 289my %DIR = (
296 ( "," . dc::SDLK_KP5 ), [0, "stay fire"], 290 ( "," . DC::SDLK_KP5 ), [0, "stay fire"],
297 ( "," . dc::SDLK_KP8 ), [1, "north"], 291 ( "," . DC::SDLK_KP8 ), [1, "north"],
298 ( "," . dc::SDLK_KP9 ), [2, "northeast"], 292 ( "," . DC::SDLK_KP9 ), [2, "northeast"],
299 ( "," . dc::SDLK_KP6 ), [3, "east"], 293 ( "," . DC::SDLK_KP6 ), [3, "east"],
300 ( "," . dc::SDLK_KP3 ), [4, "southeast"], 294 ( "," . DC::SDLK_KP3 ), [4, "southeast"],
301 ( "," . dc::SDLK_KP2 ), [5, "south"], 295 ( "," . DC::SDLK_KP2 ), [5, "south"],
302 ( "," . dc::SDLK_KP1 ), [6, "southwest"], 296 ( "," . DC::SDLK_KP1 ), [6, "southwest"],
303 ( "," . dc::SDLK_KP4 ), [7, "west"], 297 ( "," . DC::SDLK_KP4 ), [7, "west"],
304 ( "," . dc::SDLK_KP7 ), [8, "northwest"], 298 ( "," . DC::SDLK_KP7 ), [8, "northwest"],
305 299
306 ( "," . dc::SDLK_UP ), [1, "north"], 300 ( "," . DC::SDLK_UP ), [1, "north"],
307 ("1," . dc::SDLK_UP ), [2, "northeast"], 301 ("1," . DC::SDLK_UP ), [2, "northeast"],
308 ( "," . dc::SDLK_RIGHT), [3, "east"], 302 ( "," . DC::SDLK_RIGHT), [3, "east"],
309 ("1," . dc::SDLK_RIGHT), [4, "southeast"], 303 ("1," . DC::SDLK_RIGHT), [4, "southeast"],
310 ( "," . dc::SDLK_DOWN ), [5, "south"], 304 ( "," . DC::SDLK_DOWN ), [5, "south"],
311 ("1," . dc::SDLK_DOWN ), [6, "southwest"], 305 ("1," . DC::SDLK_DOWN ), [6, "southwest"],
312 ( "," . dc::SDLK_LEFT ), [7, "west"], 306 ( "," . DC::SDLK_LEFT ), [7, "west"],
313 ("1," . dc::SDLK_LEFT ), [8, "northwest"], 307 ("1," . DC::SDLK_LEFT ), [8, "northwest"],
314); 308);
315 309
316sub invoke_key_down { 310sub invoke_key_down {
317 my ($self, $ev) = @_; 311 my ($self, $ev) = @_;
318 312
319 my $mod = $ev->{mod}; 313 my $mod = $ev->{mod};
320 my $sym = $ev->{sym}; 314 my $sym = $ev->{sym};
321 my $uni = $ev->{unicode}; 315 my $uni = $ev->{unicode};
322 316
323 $mod &= dc::KMOD_CTRL | dc::KMOD_ALT | dc::KMOD_SHIFT; 317 $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT;
324 318
319 # ignore repeated keypresses
320 return if $self->{last_mod} == $mod && $self->{last_sym} == $sym;
321 $self->{last_mod} = $mod;
322 $self->{last_sym} = $sym;
323
325 if ($::CONN && (my $dir = $DIR{(!!($mod & dc::KMOD_ALT)) . ",$sym"})) { 324 if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) {
326 if ($mod & dc::KMOD_SHIFT) { 325 if ($mod & DC::KMOD_SHIFT) {
327 $self->{shft}++; 326 $self->{shft}++;
328 if ($dir->[0] != $self->{fire_dir}) { 327 if ($dir->[0] != $self->{fire_dir}) {
329 $::CONN->user_send ("fire $dir->[0]"); 328 $::CONN->user_send ("fire $dir->[0]");
330 } 329 }
331 $self->{fire_dir} = $dir->[0]; 330 $self->{fire_dir} = $dir->[0];
332 } elsif ($mod & dc::KMOD_CTRL) { 331 } elsif ($mod & DC::KMOD_CTRL) {
333 $self->{ctrl}++; 332 $self->{ctrl}++;
334 $::CONN->user_send ("run $dir->[0]"); 333 $::CONN->user_send ("run $dir->[0]");
335 } else { 334 } else {
336 $::CONN->user_send ("$dir->[1]"); 335 $::CONN->user_send ("$dir->[1]");
337 } 336 }
… …
347 346
348 my $res = 0; 347 my $res = 0;
349 my $mod = $ev->{mod}; 348 my $mod = $ev->{mod};
350 my $sym = $ev->{sym}; 349 my $sym = $ev->{sym};
351 350
351 delete $self->{last_mod};
352 delete $self->{last_sym};
353
352 if ($::CFG->{shift_fire_stop}) { 354 if ($::CFG->{shift_fire_stop}) {
353 if (!($mod & dc::KMOD_SHIFT) && delete $self->{shft}) { 355 if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) {
354 $::CONN->user_send ("fire_stop"); 356 $::CONN->user_send ("fire_stop");
355 delete $self->{fire_dir}; 357 delete $self->{fire_dir};
356 $res = 1; 358 $res = 1;
357 } 359 }
358 } else { 360 } else {
359 if (exists $DIR{(!!($mod & dc::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { 361 if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) {
360 $::CONN->user_send ("fire_stop"); 362 $::CONN->user_send ("fire_stop");
361 delete $self->{fire_dir}; 363 delete $self->{fire_dir};
362 $res = 1; 364 $res = 1;
363 } elsif (($sym == dc::SDLK_LSHIFT || $sym == dc::SDLK_RSHIFT) 365 } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT)
364 && delete $self->{shft}) { # XXX: is RSHIFT ok? 366 && delete $self->{shft}) { # XXX: is RSHIFT ok?
365 $::CONN->user_send ("fire_stop"); 367 $::CONN->user_send ("fire_stop");
366 delete $self->{fire_dir}; 368 delete $self->{fire_dir};
367 $res = 1; 369 $res = 1;
368 } 370 }
369 } 371 }
370 372
371 if (!($mod & dc::KMOD_CTRL ) && delete $self->{ctrl}) { 373 if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) {
372 $::CONN->user_send ("run_stop"); 374 $::CONN->user_send ("run_stop");
373 $res = 1; 375 $res = 1;
374 } 376 }
375 377
376 $res 378 $res
… …
382 $self->refresh_hook; 384 $self->refresh_hook;
383 385
384 0 386 0
385} 387}
386 388
389sub set_tilesize {
390 my ($self, $tilesize) = @_;
391
392 $self->{tilesize} = $tilesize;
393}
394
395sub scroll {
396 my ($self, $dx, $dy) = @_;
397
398 $::MAP->scroll ($dx, $dy);
399
400 $self->movement_update;
401
402 $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement
403 $self->{sdy} += $dy * $self->{tilesize};
404}
405
387sub set_magicmap { 406sub set_magicmap {
388 my ($self, $w, $h, $x, $y, $data) = @_; 407 my ($self, $w, $h, $x, $y, $data) = @_;
389 408
390 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; 409 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
391 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; 410 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
… …
393 $self->{magicmap} = [$x, $y, $w, $h, $data]; 412 $self->{magicmap} = [$x, $y, $w, $h, $data];
394 413
395 $self->update; 414 $self->update;
396} 415}
397 416
417sub movement_update {
418 my ($self) = @_;
419
420 if ($::CFG->{smooth_movement}) {
421 if ($self->{sdx} || $self->{sdy}) {
422 my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH);
423 my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED};
424
425 # the minimum time for a single tile movement
426 my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK);
427
428 # jump if "impossibly high" speed
429 if (
430 (max abs $self->{sdx}, abs $self->{sdy})
431 > $spd * $self->{tilesize} * $mintime * 1.1
432 ) {
433 #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d#
434 $self->{sdx} = $self->{sdy} = 0;
435 } else {
436 $spd *= $self->{tilesize} * $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction
437
438 my $dx = $self->{sdx} < 0 ? -$spd : $spd;
439 my $dy = $self->{sdy} < 0 ? -$spd : $spd;
440
441 if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx }
442 if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy }
443
444 $self->update;
445 }
446 }
447 } else {
448 $self->{sdx} = $self->{sdy} = 0;
449 }
450
451 $self->{last_update} = EV::time;
452}
453
398sub refresh_hook { 454sub refresh_hook {
399 my ($self) = @_; 455 my ($self) = @_;
400 456
401 if ($::MAP && $::CONN) { 457 if ($::MAP && $::CONN) {
402 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
459 $self->movement_update;
460
403 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; 461 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
404 462
463 # width/height of map, in tiles
405 my $sw = $self->{sw} = 1 + dc::ceil $self->{w} / $tilesize; 464 my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize;
406 my $sh = $self->{sh} = 1 + dc::ceil $self->{h} / $tilesize; 465 my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize;
407 466
467 # the map displacement, in tiles
408 my $sx = dc::ceil $::CFG->{map_shift_x} / $tilesize; 468 my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize};
409 my $sy = dc::ceil $::CFG->{map_shift_y} / $tilesize; 469 my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize};
410 470
471 # the upper left "visible" corner, in pixels
411 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 472 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
412 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 473 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
413 474
414 my $dx = $self->{dx} = dc::ceil 0.5 * ($::MAP->w - $sw) - $sx; 475 my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx;
415 my $dy = $self->{dy} = dc::ceil 0.5 * ($::MAP->h - $sh) - $sy; 476 my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy;
416 477
417 if ($::CFG->{fow_enable}) { 478 if ($::CFG->{fow_enable}) {
418 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); 479 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
419 480
420 $self->{fow_texture} = new dc::Texture 481 $self->{fow_texture} = new DC::Texture
421 w => $w, 482 w => $w,
422 h => $h, 483 h => $h,
423 data => $data, 484 data => $data,
424 internalformat => GL_ALPHA, 485 internalformat => GL_ALPHA,
425 format => GL_ALPHA; 486 format => GL_ALPHA;
… …
430 glNewList ($self->{list} ||= glGenList); 491 glNewList ($self->{list} ||= glGenList);
431 492
432 glPushMatrix; 493 glPushMatrix;
433 glTranslate $sx0, $sy0; 494 glTranslate $sx0, $sy0;
434 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 495 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
496 glTranslate $self->{sdx}, $self->{sdy};
435 497
498 warn "mapdraw -$self->{sdx}\n";#d#
436 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); 499 $::MAP->draw ($dx, $dy, $sw, $sh,
500 $self->{tilesize},
501 $::CONN->{player}{tag},
502 -$self->{sdx}, -$self->{sdy});
437 503
504 glTranslate -$self->{sdx}, -$self->{sdy};
438 glScale $self->{tilesize}, $self->{tilesize}; 505 glScale $self->{tilesize}, $self->{tilesize};
439 506
440 if (my $tex = $self->{fow_texture}) { 507 if (my $tex = $self->{fow_texture}) {
441 glPushMatrix; 508 glPushMatrix;
442 glScale 1/3, 1/3; 509 glScale 1/3, 1/3;
… …
475 542
476 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); 543 $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook });
477 544
478 return unless $self->{list}; 545 return unless $self->{list};
479 546
480 my $focused = $dc::UI::FOCUS == $self 547 my $focused = $DC::UI::FOCUS == $self
481 || $dc::UI::FOCUS == $::COMPLETER->{entry}; 548 || $DC::UI::FOCUS == $::COMPLETER->{entry};
482 549
483 return 550 return
484 unless $focused || !$::FAST; 551 unless $focused || !$::FAST;
485 552
486 glCallList $self->{list}; 553 glCallList $self->{list};
… …
506 glDeleteList $self->{list}; 573 glDeleteList $self->{list};
507 574
508 $self->SUPER::DESTROY; 575 $self->SUPER::DESTROY;
509} 576}
510 577
511package dc::MapWidget::MapMap; 578package DC::MapWidget::MapMap;
512 579
513use strict; 580use strict;
514use utf8; 581use utf8;
515 582
516our @ISA = dc::UI::Base::; 583our @ISA = DC::UI::Base::;
517 584
518use Time::HiRes qw(time); 585use Time::HiRes qw(time);
519use dc::OpenGL; 586use DC::OpenGL;
520 587
521sub size_request { 588sub size_request {
522 ($::HEIGHT * 0.2, $::HEIGHT * 0.2) 589 ($::HEIGHT * 0.2, $::HEIGHT * 0.2)
523} 590}
524 591
… …
549 $self->{y0} = $y0; 616 $self->{y0} = $y0;
550 617
551 $self->{texture_atime} = time + 1/3; 618 $self->{texture_atime} = time + 1/3;
552 619
553 $self->{texture} = 620 $self->{texture} =
554 new dc::Texture 621 new DC::Texture
555 w => $w, 622 w => $w,
556 h => $h, 623 h => $h,
557 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 624 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
558 type => $dc::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 625 type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
559 } 626 }
560} 627}
561 628
562sub invoke_visibility_change { 629sub invoke_visibility_change {
563 my ($self) = @_; 630 my ($self) = @_;
… …
609 glEnd; 676 glEnd;
610 677
611 glDisable GL_BLEND; 678 glDisable GL_BLEND;
612} 679}
613 680
614package dc::MapWidget::Command; 681package DC::MapWidget::Command;
615 682
616use strict; 683use strict;
617 684
618use dc::OpenGL; 685use DC::OpenGL;
619 686
620our @ISA = dc::UI::Frame::; 687our @ISA = DC::UI::Frame::;
621 688
622sub new { 689sub new {
623 my $class = shift; 690 my $class = shift;
624 691
625 my $self = $class->SUPER::new ( 692 my $self = $class->SUPER::new (
626 bg => [0, 0, 0, 0.8], 693 bg => [0, 0, 0, 0.8],
627 @_, 694 @_,
628 ); 695 );
629 696
630 $self->add ($self->{vbox} = new dc::UI::VBox); 697 $self->add ($self->{vbox} = new DC::UI::VBox);
631 698
632 $self->{label} = [ 699 $self->{label} = [
633 map 700 map
634 dc::UI::Label->new ( 701 DC::UI::Label->new (
702 align => 0,
635 can_hover => 1, 703 can_hover => 1,
636 can_events => 1, 704 can_events => 1,
637 tooltip_width => 0.33, 705 tooltip_width => 0.33,
638 fontsize => $_, 706 fontsize => $_,
639 ), (0.8) x 16 707 ), (0.8) x 16
640 ]; 708 ];
641 709
642 $self->{entry} = new dc::UI::Entry 710 $self->{entry} = new DC::UI::Entry
643 on_changed => sub { 711 on_changed => sub {
644 $self->update_labels; 712 $self->update_labels;
645 0 713 0
646 }, 714 },
647 on_button_down => sub { 715 on_button_down => sub {
648 my ($entry, $ev, $x, $y) = @_; 716 my ($entry, $ev, $x, $y) = @_;
649 717
650 if ($ev->{button} == 3) { 718 if ($ev->{button} == 3) {
651 (new dc::UI::Menu 719 (new DC::UI::Menu
652 items => [ 720 items => [
653 ["bind <i>" . (dc::asxml $self->{select}) . "</i> to a key" 721 ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key"
654 => sub { dc::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] 722 => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
655 ], 723 ],
656 )->popup ($ev); 724 )->popup ($ev);
657 return 1; 725 return 1;
658 } 726 }
659 0 727 0
… …
674 $self->hide; 742 $self->hide;
675 } 743 }
676 } elsif ($ev->{sym} == 27) { 744 } elsif ($ev->{sym} == 27) {
677 $self->{hist_ptr} = 0; 745 $self->{hist_ptr} = 0;
678 $self->hide; 746 $self->hide;
679 } elsif ($ev->{sym} == dc::SDLK_DOWN) { 747 } elsif ($ev->{sym} == DC::SDLK_DOWN) {
680 if ($self->{hist_ptr} > 1) { 748 if ($self->{hist_ptr} > 1) {
681 $self->{hist_ptr}--; 749 $self->{hist_ptr}--;
682 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 750 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
683 } elsif ($self->{hist_ptr} > 0) { 751 } elsif ($self->{hist_ptr} > 0) {
684 $self->{hist_ptr}--; 752 $self->{hist_ptr}--;
… …
686 } else { 754 } else {
687 ++$self->{select_offset} 755 ++$self->{select_offset}
688 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 756 if $self->{select_offset} < $#{ $self->{last_match} || [] };
689 } 757 }
690 $self->update_labels; 758 $self->update_labels;
691 } elsif ($ev->{sym} == dc::SDLK_UP) { 759 } elsif ($ev->{sym} == DC::SDLK_UP) {
692 if ($self->{select_offset}) { 760 if ($self->{select_offset}) {
693 --$self->{select_offset} 761 --$self->{select_offset}
694 } else { 762 } else {
695 unless ($self->{hist_ptr}) { 763 unless ($self->{hist_ptr}) {
696 $self->{hist_saveback} = $self->{entry}->get_text; 764 $self->{hist_saveback} = $self->{entry}->get_text;
… …
854 922
855sub _draw { 923sub _draw {
856 my ($self) = @_; 924 my ($self) = @_;
857 925
858 # hack 926 # hack
859 local $dc::UI::FOCUS = $self->{entry}; 927 local $DC::UI::FOCUS = $self->{entry};
860 928
861 $self->SUPER::_draw; 929 $self->SUPER::_draw;
862} 930}
863 931
8641 9321

Diff Legend

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