… | |
… | |
6 | use List::Util qw(min max); |
6 | use List::Util qw(min max); |
7 | |
7 | |
8 | use CFPlus; |
8 | use CFPlus; |
9 | use CFPlus::OpenGL; |
9 | use CFPlus::OpenGL; |
10 | use CFPlus::UI; |
10 | use CFPlus::UI; |
|
|
11 | use CFPlus::Macro; |
11 | |
12 | |
12 | our @ISA = CFPlus::UI::Base::; |
13 | our @ISA = CFPlus::UI::Base::; |
13 | |
14 | |
14 | my $magicmap_tex = |
15 | my $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 | |
72 | sub check_lwp($) { |
|
|
73 | my ($res) = @_; |
|
|
74 | |
|
|
75 | $res->is_error |
|
|
76 | and die $res->status_line; |
|
|
77 | |
|
|
78 | $res |
|
|
79 | } |
|
|
80 | |
|
|
81 | sub editor_invoke { |
73 | sub 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 | 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"; |
78 | print "preparing editor startup...\n"; |
101 | CFPlus::set_proxy; |
|
|
102 | |
79 | |
103 | my $server = $editsup->{gameserver} || "default"; |
80 | my $server = $editsup->{gameserver} || "default"; |
104 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
81 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
105 | |
82 | |
106 | 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; |
107 | 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; |
108 | |
85 | |
109 | print "map directory is $mapdir\n"; |
86 | print "map directory is $mapdir\n"; |
110 | print "lib directory is $libdir\n"; |
87 | print "lib directory is $libdir\n"; |
111 | |
88 | |
112 | require LWP::UserAgent; |
89 | 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 | |
90 | |
121 | for my $file (qw(archetypes crossfire.0)) { |
91 | for my $file (qw(archetypes crossfire.0)) { |
122 | my $url = "$editsup->{lib_root}$file"; |
92 | my $url = "$editsup->{lib_root}$file"; |
123 | print "mirroring $url...\n"; |
93 | print "mirroring $url...\n"; |
124 | check_lwp $ua->mirror ($url, "$libdir/$file"); |
94 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
125 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
95 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
126 | } |
96 | } |
127 | |
97 | |
128 | if (1) { # upload a map |
98 | if (1) { # upload a map |
129 | my $mapname = $::CONN->{map_info}[0]; |
99 | my $mapname = $::CONN->{map_info}[0]; |
… | |
… | |
134 | |
104 | |
135 | print "getting map revision for $mapname...\n"; |
105 | print "getting map revision for $mapname...\n"; |
136 | |
106 | |
137 | # try to get the most recent head revision, what a hack, |
107 | # try to get the most recent head revision, what a hack, |
138 | # this should have been returned while downloading *sigh* |
108 | # 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; |
109 | my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
140 | |
110 | |
141 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
111 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
142 | my $rev = $1; |
112 | my $rev = $1; |
143 | |
113 | |
144 | print "downloading revision $rev...\n"; |
114 | print "downloading revision $rev...\n"; |
145 | |
115 | |
146 | 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; |
147 | |
117 | |
148 | my $meta = { |
118 | my $meta = { |
149 | %$editsup, |
119 | %$editsup, |
150 | path => $mapname, |
120 | path => $mapname, |
151 | revision => $rev, |
121 | revision => $rev, |
… | |
… | |
197 | # } |
167 | # } |
198 | } else { |
168 | } else { |
199 | die "viewvc parse error, unable to detect revision\n"; |
169 | die "viewvc parse error, unable to detect revision\n"; |
200 | } |
170 | } |
201 | } |
171 | } |
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 | }); |
172 | } |
220 | } |
173 | } |
221 | |
174 | |
222 | sub invoke_button_down { |
175 | sub invoke_button_down { |
223 | my ($self, $ev, $x, $y) = @_; |
176 | my ($self, $ev, $x, $y) = @_; |
224 | |
177 | |
225 | if ($ev->{button} == 1) { |
178 | if ($ev->{button} == 1) { |
226 | $self->grab_focus; |
179 | $self->grab_focus; |
227 | return unless $::CONN; |
180 | return unless $::CONN; |
228 | |
181 | |
229 | 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}; |
230 | 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}; |
231 | |
184 | |
232 | $x -= int 0.5 * $self->{sw}; |
185 | $x -= CFPlus::floor $::MAP->w * 0.5; |
233 | $y -= int 0.5 * $self->{sh}; |
186 | $y -= CFPlus::floor $::MAP->h * 0.5; |
234 | |
187 | |
|
|
188 | if ($::CONN) { |
|
|
189 | if ($::IN_BUILD_MODE) { |
|
|
190 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
191 | } else { |
235 | $::CONN->lookat ($x, $y) |
192 | $::CONN->lookat ($x, $y) |
236 | if $::CONN; |
193 | } |
|
|
194 | } |
237 | |
195 | |
238 | } elsif ($ev->{button} == 2) { |
196 | } elsif ($ev->{button} == 2) { |
239 | $self->grab_focus; |
197 | $self->grab_focus; |
240 | return unless $::CONN; |
198 | return unless $::CONN; |
241 | |
199 | |
… | |
… | |
379 | ::toggle_player_page ($::SPELL_PAGE); |
337 | ::toggle_player_page ($::SPELL_PAGE); |
380 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
338 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
381 | ::toggle_player_page ($::INVENTORY_PAGE); |
339 | ::toggle_player_page ($::INVENTORY_PAGE); |
382 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
340 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
383 | $::SETUP_DIALOG->toggle_visibility; |
341 | $::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) { |
342 | } elsif (!$::CONN) { |
398 | return 0; # bindings further down need a valid connection |
343 | return 0; # bindings further down need a valid connection |
399 | |
344 | |
400 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
345 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
401 | $::CONN->user_send ("stay fire"); |
346 | $::CONN->user_send ("stay fire"); |
… | |
… | |
406 | } elsif ($uni == 13) { |
351 | } elsif ($uni == 13) { |
407 | $::CONN->user_send ("examine"); |
352 | $::CONN->user_send ("examine"); |
408 | } elsif ($uni == ord ".") { |
353 | } elsif ($uni == ord ".") { |
409 | $::CONN->user_send ($self->{completer}{last_command}) |
354 | $::CONN->user_send ($self->{completer}{last_command}) |
410 | if exists $self->{completer}{last_command}; |
355 | if exists $self->{completer}{last_command}; |
411 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
356 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
|
|
357 | warn "<@macros>\n";#d# |
412 | $::CONN->user_send ($_) for @$bind_cmd; |
358 | $::CONN->macro_send ($_) for @macros; |
413 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
359 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
414 | $::CONN->user_send ("rotateshoottype +"); |
360 | $::CONN->user_send ("rotateshoottype +"); |
415 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
361 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
416 | $::CONN->user_send ("rotateshoottype -"); |
362 | $::CONN->user_send ("rotateshoottype -"); |
417 | } elsif ($uni == ord '"') { |
363 | } elsif ($uni == ord '"') { |
… | |
… | |
477 | } |
423 | } |
478 | |
424 | |
479 | sub set_magicmap { |
425 | sub set_magicmap { |
480 | my ($self, $w, $h, $x, $y, $data) = @_; |
426 | my ($self, $w, $h, $x, $y, $data) = @_; |
481 | |
427 | |
482 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
428 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
483 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
429 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
484 | |
430 | |
485 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
431 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
486 | |
432 | |
487 | $self->update; |
433 | $self->update; |
488 | } |
434 | } |
… | |
… | |
499 | unless $focused || !$::FAST; |
445 | unless $focused || !$::FAST; |
500 | |
446 | |
501 | if (delete $self->{need_update}) { |
447 | if (delete $self->{need_update}) { |
502 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
448 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
503 | |
449 | |
|
|
450 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
451 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
452 | |
504 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
453 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
505 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
454 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
506 | |
455 | |
507 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
456 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
508 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
457 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
509 | |
458 | |
510 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
459 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
511 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
460 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
512 | |
461 | |
513 | if ($::CFG->{fow_enable}) { |
462 | if ($::CFG->{fow_enable}) { |
514 | 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); |
515 | |
464 | |
516 | 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 |
517 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
466 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
518 | glConvolutionFilter2D ( |
467 | glConvolutionFilter2D ( |
519 | GL_CONVOLUTION_2D, |
468 | GL_CONVOLUTION_2D, |
… | |
… | |
541 | |
490 | |
542 | glPushMatrix; |
491 | glPushMatrix; |
543 | glTranslate $sx0, $sy0; |
492 | glTranslate $sx0, $sy0; |
544 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
493 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
545 | |
494 | |
546 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
495 | $::MAP->draw ($dx, $dy, $sw, $sh); |
547 | |
496 | |
548 | glScale 32, 32; |
497 | glScale 32, 32; |
549 | |
498 | |
550 | if (my $tex = $self->{fow_texture}) { |
499 | if (my $tex = $self->{fow_texture}) { |
551 | glEnable GL_TEXTURE_2D; |
500 | glEnable GL_TEXTURE_2D; |
… | |
… | |
558 | } |
507 | } |
559 | |
508 | |
560 | if ($self->{magicmap}) { |
509 | if ($self->{magicmap}) { |
561 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
510 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
562 | |
511 | |
563 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
512 | $x += $::MAP->ox + $self->{dx}; |
564 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
513 | $y += $::MAP->oy + $self->{dy}; |
565 | |
514 | |
566 | glTranslate - $x - 1, - $y - 1; |
515 | glTranslate - $x - 1, - $y - 1; |
567 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
516 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
568 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
517 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
569 | } |
518 | } |
… | |
… | |
715 | |
664 | |
716 | if ($ev->{button} == 3) { |
665 | if ($ev->{button} == 3) { |
717 | (new CFPlus::UI::Menu |
666 | (new CFPlus::UI::Menu |
718 | items => [ |
667 | items => [ |
719 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
668 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
720 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
669 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
721 | ], |
670 | ], |
722 | )->popup ($ev); |
671 | )->popup ($ev); |
723 | return 1; |
672 | return 1; |
724 | } |
673 | } |
725 | 0 |
674 | 0 |