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.87 by root, Sun Oct 8 21:57:54 2006 UTC vs.
Revision 1.107 by root, Sat Apr 14 06:51:45 2007 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus; 8use CFPlus;
9use CFPlus::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFPlus::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
… …
20 21
21 my $self = $class->SUPER::new ( 22 my $self = $class->SUPER::new (
22 z => -1, 23 z => -1,
23 can_focus => 1, 24 can_focus => 1,
24 list => glGenList, 25 list => glGenList,
26 tilesize => 32,
25 27
26 smooth_matrix => [ 28 smooth_matrix => [
27 0.05, 0.13, 0.05, 29 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13, 30 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05, 31 0.05, 0.13, 0.05,
… …
38 ; 40 ;
39 41
40 $self 42 $self
41} 43}
42 44
45sub set_tilesize {
46 my ($self, $tilesize) = @_;
47
48 $self->{tilesize} = $tilesize;
49}
50
43sub add_command { 51sub add_command {
44 my ($self, $command, $tooltip, $widget, $cb) = @_; 52 my ($self, $command, $tooltip, $widget, $cb) = @_;
45 53
46 (my $data = $command) =~ s/\\//g; 54 (my $data = $command) =~ s/\\//g;
47 55
… …
67 ::stop_game (); 75 ::stop_game ();
68 local $::PROFILE->{host} = $server; 76 local $::PROFILE->{host} = $server;
69 ::start_game (); 77 ::start_game ();
70} 78}
71 79
72sub check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke { 80sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 81 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 82 or return;
84 83
85 my ($pid, $fh); 84 CFPlus::background {
86 unless ($pid = open $fh, "-|:utf8", "-") {
87 $SIG{__DIE__} = sub {
88 my $msg = $_[0];
89 $msg =~ s/\n+/\n/;
90 warn "FATAL: $msg";
91 CFPlus::_exit 99;
92 };
93
94 open STDERR, ">&STDOUT";
95 binmode STDOUT, ":utf8";
96 binmode STDERR, ":utf8";
97 close $fh;
98
99 $| = 1;
100 print "preparing editor startup...\n"; 85 print "preparing editor startup...\n";
101 CFPlus::set_proxy;
102 86
103 my $server = $editsup->{gameserver} || "default"; 87 my $server = $editsup->{gameserver} || "default";
104 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 88 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
105 89
106 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 90 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
107 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 91 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
108 92
109 print "map directory is $mapdir\n"; 93 print "map directory is $mapdir\n";
110 print "lib directory is $libdir\n"; 94 print "lib directory is $libdir\n";
111 95
112 require LWP::UserAgent; 96 my $ua = CFPlus::lwp_useragent;
113
114 my $ua = LWP::UserAgent->new (
115 agent => "cfplus $CFPlus::VERSION",
116 keep_alive => 1,
117 env_proxy => 1,
118 timeout => 30,
119 );
120 97
121 for my $file (qw(archetypes crossfire.0)) { 98 for my $file (qw(archetypes crossfire.0)) {
122 my $url = "$editsup->{lib_root}$file"; 99 my $url = "$editsup->{lib_root}$file";
123 print "mirroring $url...\n"; 100 print "mirroring $url...\n";
124 check_lwp $ua->mirror ($url, "$libdir/$file"); 101 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
125 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 102 printf "%s size %d octets\n", $file, -s "$libdir/$file";
126 } 103 }
127 104
128 if (1) { # upload a map 105 if (1) { # upload a map
129 my $mapname = $::CONN->{map_info}[0]; 106 my $mapname = $::CONN->{map_info}[0];
… …
134 111
135 print "getting map revision for $mapname...\n"; 112 print "getting map revision for $mapname...\n";
136 113
137 # try to get the most recent head revision, what a hack, 114 # try to get the most recent head revision, what a hack,
138 # this should have been returned while downloading *sigh* 115 # this should have been returned while downloading *sigh*
139 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 116 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
140 117
141 if ($log =~ /\?rev=(\d+\.\d+)"/) { 118 if ($log =~ /\?rev=(\d+\.\d+)"/) {
142 my $rev = $1; 119 my $rev = $1;
143 120
144 print "downloading revision $rev...\n"; 121 print "downloading revision $rev...\n";
145 122
146 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 123 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
147 124
148 my $meta = { 125 my $meta = {
149 %$editsup, 126 %$editsup,
150 path => $mapname, 127 path => $mapname,
151 revision => $rev, 128 revision => $rev,
… …
197# } 174# }
198 } else { 175 } else {
199 die "viewvc parse error, unable to detect revision\n"; 176 die "viewvc parse error, unable to detect revision\n";
200 } 177 }
201 } 178 }
202
203 CFPlus::_exit;
204 }
205
206 my $buffer;
207
208 Event->io (fd => $fh, poll => 'r', cb => sub {
209 unless (sysread $fh, $buffer, 4096, length $buffer) {
210 $_[0]->w->cancel;
211 $buffer .= "done\n";
212 }
213
214 while ($buffer =~ s/^(.*)\n//) {
215 ::message ({
216 markup => "editor($pid): " . CFPlus::asxml $1,
217 });
218 }
219 }); 179 }
220} 180}
221 181
222sub invoke_button_down { 182sub invoke_button_down {
223 my ($self, $ev, $x, $y) = @_; 183 my ($self, $ev, $x, $y) = @_;
224 184
225 if ($ev->{button} == 1) { 185 if ($ev->{button} == 1) {
226 $self->grab_focus; 186 $self->grab_focus;
227 return unless $::CONN; 187 return unless $::CONN;
228 188
229 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 189 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize};
230 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 190 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize};
231 191
232 $x -= int 0.5 * $self->{sw}; 192 $x -= CFPlus::floor $::MAP->w * 0.5;
233 $y -= int 0.5 * $self->{sh}; 193 $y -= CFPlus::floor $::MAP->h * 0.5;
234 194
195 if ($::CONN) {
196 if ($::IN_BUILD_MODE) {
197 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
198 } else {
235 $::CONN->lookat ($x, $y) 199 $::CONN->lookat ($x, $y)
236 if $::CONN; 200 }
201 }
237 202
238 } elsif ($ev->{button} == 2) { 203 } elsif ($ev->{button} == 2) {
239 $self->grab_focus; 204 $self->grab_focus;
240 return unless $::CONN; 205 return unless $::CONN;
241 206
… …
327 292
328 1 293 1
329} 294}
330 295
331sub size_request { 296sub size_request {
297 my ($self) = @_;
298
332 ( 299 (
333 32 * CFPlus::ceil $::WIDTH / 32, 300 $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize},
334 32 * CFPlus::ceil $::HEIGHT / 32, 301 $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize},
335 ) 302 )
336} 303}
337 304
338sub update { 305sub update {
339 my ($self) = @_; 306 my ($self) = @_;
… …
365 my $sym = $ev->{sym}; 332 my $sym = $ev->{sym};
366 my $uni = $ev->{unicode}; 333 my $uni = $ev->{unicode};
367 334
368 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 335 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
369 336
370 if ($uni == ord "\t") { 337 if ($sym == 9) {
371 $::PL_WINDOW->toggle_visibility; 338 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
372 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 339 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
373 $::HELP_WINDOW->toggle_visibility; 340 $::HELP_WINDOW->toggle_visibility;
374 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 341 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
375 ::toggle_player_page ($::STATS_PAGE); 342 ::toggle_player_page ($::STATS_PAGE);
376 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 343 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
379 ::toggle_player_page ($::SPELL_PAGE); 346 ::toggle_player_page ($::SPELL_PAGE);
380 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
381 ::toggle_player_page ($::INVENTORY_PAGE); 348 ::toggle_player_page ($::INVENTORY_PAGE);
382 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 349 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
383 $::SETUP_DIALOG->toggle_visibility; 350 $::SETUP_DIALOG->toggle_visibility;
384 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
385 $::BIND_EDITOR->set_binding (undef, undef, [],
386 sub {
387 my ($mod, $sym, $cmds) = @_;
388 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
389 });
390 $::BIND_EDITOR->start;
391 $::BIND_EDITOR->show;
392#TODO: elmex, what was this supposed to do? it currently crashes the client.
393# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
394# $::BIND_EDITOR->stop;
395# $::BIND_EDITOR->ask_for_bind_and_commit;
396# $::BIND_EDITOR->hide;
397 } elsif (!$::CONN) { 351 } elsif (!$::CONN) {
398 return 0; # bindings further down need a valid connection 352 return 0; # bindings further down need a valid connection
399 353
400 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 354 } elsif ($sym == CFPlus::SDLK_KP5 && !($mod & ~CFPlus::KMOD_SHIFT)) {
401 $::CONN->user_send ("stay fire"); 355 $::CONN->user_send ("stay fire");
402 } elsif ($uni == ord ",") { 356 } elsif ($uni == ord ",") {
403 $::CONN->user_send ("take"); 357 $::CONN->user_send ("take");
404 } elsif ($uni == ord " ") { 358 } elsif ($uni == ord " ") {
405 $::CONN->user_send ("apply"); 359 $::CONN->user_send ("apply");
406 } elsif ($uni == 13) { 360 } elsif ($uni == 13) {
407 $::CONN->user_send ("examine"); 361 $::CONN->user_send ("examine");
408 } elsif ($uni == ord ".") { 362 } elsif ($uni == ord ".") {
409 $::CONN->user_send ($self->{completer}{last_command}) 363 $::CONN->user_send ($self->{completer}{last_command})
410 if exists $self->{completer}{last_command}; 364 if exists $self->{completer}{last_command};
411 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 365 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
412 $::CONN->user_send ($_) for @$bind_cmd; 366 $::CONN->macro_send ($_) for @macros;
413 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 367 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
414 $::CONN->user_send ("rotateshoottype +"); 368 $::CONN->user_send ("rotateshoottype +");
415 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 369 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
416 $::CONN->user_send ("rotateshoottype -"); 370 $::CONN->user_send ("rotateshoottype -");
371 } elsif ($uni == ord '!') {
372 $self->{completer}->set_prefix ("shout ");
373 $self->{completer}->show;
417 } elsif ($uni == ord '"') { 374 } elsif ($uni == ord '"') {
418 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 375 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
419 $self->{completer}->show; 376 $self->{completer}->show;
420 } elsif ($uni == ord "'") { 377 } elsif ($uni == ord "'") {
421 $self->{completer}->set_prefix (""); 378 $self->{completer}->set_prefix ("");
… …
477} 434}
478 435
479sub set_magicmap { 436sub set_magicmap {
480 my ($self, $w, $h, $x, $y, $data) = @_; 437 my ($self, $w, $h, $x, $y, $data) = @_;
481 438
482 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 439 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
483 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 440 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
484 441
485 $self->{magicmap} = [$x, $y, $w, $h, $data]; 442 $self->{magicmap} = [$x, $y, $w, $h, $data];
486 443
487 $self->update; 444 $self->update;
488} 445}
… …
497 454
498 return 455 return
499 unless $focused || !$::FAST; 456 unless $focused || !$::FAST;
500 457
501 if (delete $self->{need_update}) { 458 if (delete $self->{need_update}) {
502 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 459 my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1;
503 460
461 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
462 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
463
504 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 464 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
505 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 465 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
506 466
507 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 467 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
508 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 468 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
509 469
510 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 470 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
511 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 471 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
512 472
513 if ($::CFG->{fow_enable}) { 473 if ($::CFG->{fow_enable}) {
514 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 474 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
515 475
516 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 476 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
517 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 477 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
518 glConvolutionFilter2D ( 478 glConvolutionFilter2D (
519 GL_CONVOLUTION_2D, 479 GL_CONVOLUTION_2D,
… …
541 501
542 glPushMatrix; 502 glPushMatrix;
543 glTranslate $sx0, $sy0; 503 glTranslate $sx0, $sy0;
544 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 504 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
545 505
546 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 506 $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize});
547 507
548 glScale 32, 32; 508 glScale $self->{tilesize}, $self->{tilesize};
549 509
550 if (my $tex = $self->{fow_texture}) { 510 if (my $tex = $self->{fow_texture}) {
551 glEnable GL_TEXTURE_2D; 511 glEnable GL_TEXTURE_2D;
552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 512 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
553 513
… …
558 } 518 }
559 519
560 if ($self->{magicmap}) { 520 if ($self->{magicmap}) {
561 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 521 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
562 522
563 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 523 $x += $::MAP->ox + $self->{dx};
564 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 524 $y += $::MAP->oy + $self->{dy};
565 525
566 glTranslate - $x - 1, - $y - 1; 526 glTranslate - $x - 1, - $y - 1;
567 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 527 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
568 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 528 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
569 } 529 }
… …
597 $self->SUPER::DESTROY; 557 $self->SUPER::DESTROY;
598} 558}
599 559
600package CFPlus::MapWidget::MapMap; 560package CFPlus::MapWidget::MapMap;
601 561
562use strict;
563use utf8;
564
602our @ISA = CFPlus::UI::Base::; 565our @ISA = CFPlus::UI::Base::;
603 566
604use Time::HiRes qw(time); 567use Time::HiRes qw(time);
605use CFPlus::OpenGL; 568use CFPlus::OpenGL;
606 569
… …
628 591
629 $::MAP or return; 592 $::MAP or return;
630 593
631 my ($w, $h) = @$self{qw(w h)}; 594 my ($w, $h) = @$self{qw(w h)};
632 595
633 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 596 my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
634 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 597 my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99;
635 598
636 my $sx = int $::CFG->{map_shift_x} / 32; 599 my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize};
637 my $sy = int $::CFG->{map_shift_y} / 32; 600 my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize};
638 601
639 my $ox = 0.5 * ($w - $sw); 602 my $ox = 0.5 * ($w - $sw);
640 my $oy = 0.5 * ($h - $sh); 603 my $oy = 0.5 * ($h - $sh);
641 604
642 glEnable GL_BLEND; 605 glEnable GL_BLEND;
… …
715 678
716 if ($ev->{button} == 3) { 679 if ($ev->{button} == 3) {
717 (new CFPlus::UI::Menu 680 (new CFPlus::UI::Menu
718 items => [ 681 items => [
719 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 682 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
720 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 683 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
721 ], 684 ],
722 )->popup ($ev); 685 )->popup ($ev);
723 return 1; 686 return 1;
724 } 687 }
725 0 688 0

Diff Legend

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