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.86 by root, Sun Oct 8 21:54:20 2006 UTC vs.
Revision 1.97 by root, Sat Dec 9 22:28:11 2006 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",
… …
67 ::stop_game (); 68 ::stop_game ();
68 local $::PROFILE->{host} = $server; 69 local $::PROFILE->{host} = $server;
69 ::start_game (); 70 ::start_game ();
70} 71}
71 72
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 { 73sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support} 74 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return; 75 or return;
84 76
85 my ($pid, $fh); 77 CFPlus::background {
86 unless ($pid = open $fh, "-|:utf8", "-") {
87 $SIG{__DIE__} = sub {
88 warn "FATAL: @_\n";
89 CFPlus::_exit 99;
90 };
91
92 open STDERR, ">&STDOUT";
93 binmode STDOUT, ":utf8";
94 binmode STDERR, ":utf8";
95 close $fh;
96
97 $| = 1;
98 print "preparing editor startup...\n"; 78 print "preparing editor startup...\n";
99 CFPlus::set_proxy;
100 79
101 my $server = $editsup->{gameserver} || "default"; 80 my $server = $editsup->{gameserver} || "default";
102 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; 81 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
103 82
104 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; 83 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
105 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; 84 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
106 85
107 print "map directory is $mapdir\n"; 86 print "map directory is $mapdir\n";
108 print "lib directory is $libdir\n"; 87 print "lib directory is $libdir\n";
109 88
110 require LWP::UserAgent; 89 my $ua = CFPlus::lwp_useragent;
111
112 my $ua = LWP::UserAgent->new (
113 agent => "cfplus $CFPlus::VERSION",
114 keep_alive => 1,
115 env_proxy => 1,
116 timeout => 30,
117 );
118 90
119 for my $file (qw(archetypes crossfire.0)) { 91 for my $file (qw(archetypes crossfire.0)) {
120 my $url = "$editsup->{lib_root}$file"; 92 my $url = "$editsup->{lib_root}$file";
121 print "mirroring $url...\n"; 93 print "mirroring $url...\n";
122 check_lwp $ua->mirror ($url, "$libdir/$file"); 94 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
123 printf "%s size %d octets\n", $file, -s "$libdir/$file"; 95 printf "%s size %d octets\n", $file, -s "$libdir/$file";
124 } 96 }
125 97
126 if (1) { # upload a map 98 if (1) { # upload a map
127 my $mapname = $::CONN->{map_info}[0]; 99 my $mapname = $::CONN->{map_info}[0];
128 100
101 my $mappath = "$mapdir/$mapname";
102
103 -e $mappath and die "$mappath already exists\n";
104
129 print "getting map revision for $mapname...\n"; 105 print "getting map revision for $mapname...\n";
130 106
131 # try to get the most recent head revision, what a hack, 107 # try to get the most recent head revision, what a hack,
132 # this should have been returned while downloading *sigh* 108 # this should have been returned while downloading *sigh*
133 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; 109 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
134 110
135 if ($log =~ /\?rev=(\d+\.\d+)"/) { 111 if ($log =~ /\?rev=(\d+\.\d+)"/) {
136 my $rev = $1; 112 my $rev = $1;
137 113
138 print "downloading revision $rev...\n"; 114 print "downloading revision $rev...\n";
139 115
140 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; 116 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
141 117
142 my $meta = { 118 my $meta = {
143 %$editsup, 119 %$editsup,
144 path => $mapname, 120 path => $mapname,
145 revision => $rev, 121 revision => $rev,
146 cf_login => $::PROFILE->{user}, 122 cf_login => $::PROFILE->{user},
147 }; 123 };
148 124
149 my $mappath = "$mapdir/$mapname";
150
151 require File::Basename; 125 require File::Basename;
152 require File::Path; 126 require File::Path;
153 127
154 File::Path::mkpath (File::Basename::dirname ($mappath)); 128 File::Path::mkpath (File::Basename::dirname ($mappath));
155 open my $fh, ">:raw:perlio", "$mappath.meta" 129 open my $fh, ">:raw:perlio", "$mappath.meta"
156 or die "$mappath.meta: $!"; 130 or die "$mappath.meta: $!\n";
157 print $fh CFPlus::to_json $meta; 131 print $fh CFPlus::to_json $meta;
158 close $fh; 132 close $fh;
159 open my $fh, ">:raw:perlio:utf8", $mappath 133 open my $fh, ">:raw:perlio:utf8", $mappath
160 or die "$mappath: $!"; 134 or die "$mappath: $!\n";
161 print $fh $map; 135 print $fh $map;
162 close $fh; 136 close $fh;
163 137
164 print "saved as $mappath\n"; 138 print "saved as $mappath\n";
165 139
… …
193# } 167# }
194 } else { 168 } else {
195 die "viewvc parse error, unable to detect revision\n"; 169 die "viewvc parse error, unable to detect revision\n";
196 } 170 }
197 } 171 }
198
199 CFPlus::_exit;
200 }
201
202 my $buffer;
203
204 Event->io (fd => $fh, poll => 'r', cb => sub {
205 unless (sysread $fh, $buffer, 4096, length $buffer) {
206 $_[0]->w->cancel;
207 $buffer .= "done\n";
208 }
209
210 while ($buffer =~ s/^(.*)\n//) {
211 ::message ({
212 markup => "editor($pid): " . CFPlus::asxml $1,
213 });
214 }
215 }); 172 }
216} 173}
217 174
218sub invoke_button_down { 175sub invoke_button_down {
219 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
220 177
221 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
222 $self->grab_focus; 179 $self->grab_focus;
223 return unless $::CONN; 180 return unless $::CONN;
224 181
225 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
226 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
227 184
228 $x -= int 0.5 * $self->{sw}; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
229 $y -= int 0.5 * $self->{sh}; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
230 187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
231 $::CONN->lookat ($x, $y) 192 $::CONN->lookat ($x, $y)
232 if $::CONN; 193 }
194 }
233 195
234 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
235 $self->grab_focus; 197 $self->grab_focus;
236 return unless $::CONN; 198 return unless $::CONN;
237 199
… …
375 ::toggle_player_page ($::SPELL_PAGE); 337 ::toggle_player_page ($::SPELL_PAGE);
376 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 338 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
377 ::toggle_player_page ($::INVENTORY_PAGE); 339 ::toggle_player_page ($::INVENTORY_PAGE);
378 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
379 $::SETUP_DIALOG->toggle_visibility; 341 $::SETUP_DIALOG->toggle_visibility;
380 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
381 $::BIND_EDITOR->set_binding (undef, undef, [],
382 sub {
383 my ($mod, $sym, $cmds) = @_;
384 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
385 });
386 $::BIND_EDITOR->start;
387 $::BIND_EDITOR->show;
388#TODO: elmex, what was this supposed to do? it currently crashes the client.
389# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
390# $::BIND_EDITOR->stop;
391# $::BIND_EDITOR->ask_for_bind_and_commit;
392# $::BIND_EDITOR->hide;
393 } elsif (!$::CONN) { 342 } elsif (!$::CONN) {
394 return 0; # bindings further down need a valid connection 343 return 0; # bindings further down need a valid connection
395 344
396 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
397 $::CONN->user_send ("stay fire"); 346 $::CONN->user_send ("stay fire");
… …
402 } elsif ($uni == 13) { 351 } elsif ($uni == 13) {
403 $::CONN->user_send ("examine"); 352 $::CONN->user_send ("examine");
404 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
405 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
406 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
407 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
357 warn "<@macros>\n";#d#
408 $::CONN->user_send ($_) for @$bind_cmd; 358 $::CONN->macro_send ($_) for @macros;
409 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 359 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
410 $::CONN->user_send ("rotateshoottype +"); 360 $::CONN->user_send ("rotateshoottype +");
411 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 361 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
412 $::CONN->user_send ("rotateshoottype -"); 362 $::CONN->user_send ("rotateshoottype -");
413 } elsif ($uni == ord '"') { 363 } elsif ($uni == ord '"') {
… …
473} 423}
474 424
475sub set_magicmap { 425sub set_magicmap {
476 my ($self, $w, $h, $x, $y, $data) = @_; 426 my ($self, $w, $h, $x, $y, $data) = @_;
477 427
478 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 428 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
479 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 429 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
480 430
481 $self->{magicmap} = [$x, $y, $w, $h, $data]; 431 $self->{magicmap} = [$x, $y, $w, $h, $data];
482 432
483 $self->update; 433 $self->update;
484} 434}
… …
495 unless $focused || !$::FAST; 445 unless $focused || !$::FAST;
496 446
497 if (delete $self->{need_update}) { 447 if (delete $self->{need_update}) {
498 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 448 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
499 449
450 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
451 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
452
500 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 453 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
501 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 454 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
502 455
503 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 456 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
504 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 457 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
505 458
506 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 459 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
507 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 460 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
508 461
509 if ($::CFG->{fow_enable}) { 462 if ($::CFG->{fow_enable}) {
510 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 463 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
511 464
512 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 465 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
513 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 466 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
514 glConvolutionFilter2D ( 467 glConvolutionFilter2D (
515 GL_CONVOLUTION_2D, 468 GL_CONVOLUTION_2D,
… …
537 490
538 glPushMatrix; 491 glPushMatrix;
539 glTranslate $sx0, $sy0; 492 glTranslate $sx0, $sy0;
540 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 493 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
541 494
542 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 495 $::MAP->draw ($dx, $dy, $sw, $sh);
543 496
544 glScale 32, 32; 497 glScale 32, 32;
545 498
546 if (my $tex = $self->{fow_texture}) { 499 if (my $tex = $self->{fow_texture}) {
547 glEnable GL_TEXTURE_2D; 500 glEnable GL_TEXTURE_2D;
… …
554 } 507 }
555 508
556 if ($self->{magicmap}) { 509 if ($self->{magicmap}) {
557 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 510 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
558 511
559 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 512 $x += $::MAP->ox + $self->{dx};
560 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 513 $y += $::MAP->oy + $self->{dy};
561 514
562 glTranslate - $x - 1, - $y - 1; 515 glTranslate - $x - 1, - $y - 1;
563 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 516 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
564 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 517 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
565 } 518 }
… …
711 664
712 if ($ev->{button} == 3) { 665 if ($ev->{button} == 3) {
713 (new CFPlus::UI::Menu 666 (new CFPlus::UI::Menu
714 items => [ 667 items => [
715 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 668 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
716 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 669 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
717 ], 670 ],
718 )->popup ($ev); 671 )->popup ($ev);
719 return 1; 672 return 1;
720 } 673 }
721 0 674 0

Diff Legend

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