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.82 by root, Fri Sep 29 00:56:06 2006 UTC vs.
Revision 1.98 by root, Sun Dec 10 01:30:54 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",
… …
59 60
60 $self->{completer}->hide 61 $self->{completer}->hide
61 if $self->{completer}; 62 if $self->{completer};
62} 63}
63 64
65sub server_login {
66 my ($server) = @_;
67
68 ::stop_game ();
69 local $::PROFILE->{host} = $server;
70 ::start_game ();
71}
72
73sub editor_invoke {
74 my $editsup = $::CONN && $::CONN->{editor_support}
75 or return;
76
77 CFPlus::background {
78 print "preparing editor startup...\n";
79
80 my $server = $editsup->{gameserver} || "default";
81 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
82
83 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
84 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
85
86 print "map directory is $mapdir\n";
87 print "lib directory is $libdir\n";
88
89 my $ua = CFPlus::lwp_useragent;
90
91 for my $file (qw(archetypes crossfire.0)) {
92 my $url = "$editsup->{lib_root}$file";
93 print "mirroring $url...\n";
94 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
95 printf "%s size %d octets\n", $file, -s "$libdir/$file";
96 }
97
98 if (1) { # upload a map
99 my $mapname = $::CONN->{map_info}[0];
100
101 my $mappath = "$mapdir/$mapname";
102
103 -e $mappath and die "$mappath already exists\n";
104
105 print "getting map revision for $mapname...\n";
106
107 # try to get the most recent head revision, what a hack,
108 # this should have been returned while downloading *sigh*
109 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
110
111 if ($log =~ /\?rev=(\d+\.\d+)"/) {
112 my $rev = $1;
113
114 print "downloading revision $rev...\n";
115
116 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
117
118 my $meta = {
119 %$editsup,
120 path => $mapname,
121 revision => $rev,
122 cf_login => $::PROFILE->{user},
123 };
124
125 require File::Basename;
126 require File::Path;
127
128 File::Path::mkpath (File::Basename::dirname ($mappath));
129 open my $fh, ">:raw:perlio", "$mappath.meta"
130 or die "$mappath.meta: $!\n";
131 print $fh CFPlus::to_json $meta;
132 close $fh;
133 open my $fh, ">:raw:perlio:utf8", $mappath
134 or die "$mappath: $!\n";
135 print $fh $map;
136 close $fh;
137
138 print "saved as $mappath\n";
139
140 print "invoking editor...\n";
141 exec "/root/s2/gce $mappath";#d#
142
143 # now upload it
144# require HTTP::Request::Common;
145#
146# my $res = $ua->post (
147# $ENV{CFPLUS_UPLOAD},
148# Content_Type => 'multipart/form-data',
149# Content => [
150# path => $mapname,
151# mapdir => $ENV{CROSSFIRE_MAPDIR},
152# map => $map,
153# revision => $rev,
154# cf_login => $ENV{CFPLUS_LOGIN},
155# cf_password => $ENV{CFPLUS_PASSWORD},
156# comment => "",
157# ]
158# );
159#
160# if ($res->is_error) {
161# # fatal condition
162# warn $res->status_line;
163# } else {
164# # script replies are marked as {{..}}
165# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
166# warn map "$_\n", @msgs;
167# }
168 } else {
169 die "viewvc parse error, unable to detect revision\n";
170 }
171 }
172 }
173}
174
64sub invoke_button_down { 175sub invoke_button_down {
65 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
66 177
67 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
68 $self->grab_focus; 179 $self->grab_focus;
69 return unless $::CONN; 180 return unless $::CONN;
70 181
71 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};
72 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};
73 184
74 $x -= int 0.5 * $self->{sw}; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
75 $y -= int 0.5 * $self->{sh}; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
76 187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
77 $::CONN->lookat ($x, $y) 192 $::CONN->lookat ($x, $y)
78 if $::CONN; 193 }
194 }
79 195
80 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
81 $self->grab_focus; 197 $self->grab_focus;
82 return unless $::CONN; 198 return unless $::CONN;
83 199
… …
93 $::CFG->{map_shift_y} = $bh + $y - $oy; 209 $::CFG->{map_shift_y} = $bh + $y - $oy;
94 210
95 $self->update; 211 $self->update;
96 }; 212 };
97 } elsif ($ev->{button} == 3) { 213 } elsif ($ev->{button} == 3) {
98 (new CFPlus::UI::Menu 214 my @items = (
99 items => [
100 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 215 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
101 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 216 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
102 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 217 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
103 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 218 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
104 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 219 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
108 $::PICKUP_ENABLE->{state} 223 $::PICKUP_ENABLE->{state}
109 ? "Disable automatic pickup" 224 ? "Disable automatic pickup"
110 : "Enable automatic pickup", 225 : "Enable automatic pickup",
111 sub { $::PICKUP_ENABLE->toggle } 226 sub { $::PICKUP_ENABLE->toggle }
112 ], 227 ],
228 );
229
230 if ($::CONN && $::CONN->{editor_support}) {
231 push @items, [
232 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
233 \&editor_invoke,
234 ];
235
236 for my $type (qw(test name)) {
237 $::CONN->{editor_support}{type} ne $type
238 or next;
239 my $server = $::CONN->{editor_support}{"${type}server"}
240 or next;
241
242 push @items, [
243 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
244 sub { server_login $server },
245 ];
246 }
247 }
248
249 push @items,
113 ["Quit", 250 ["Quit",
114 sub { 251 sub {
115 if ($::CONN) { 252 if ($::CONN) {
116 &::open_quit_dialog; 253 &::open_quit_dialog;
117 } else { 254 } else {
118 exit; 255 exit;
119 }
120 } 256 }
121 ], 257 }
122 ], 258 ],
259 ;
260
261 (new CFPlus::UI::Menu
262 items => \@items,
123 )->popup ($ev); 263 )->popup ($ev);
124 } 264 }
125 265
126 1 266 1
127} 267}
… …
197 ::toggle_player_page ($::SPELL_PAGE); 337 ::toggle_player_page ($::SPELL_PAGE);
198 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 338 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
199 ::toggle_player_page ($::INVENTORY_PAGE); 339 ::toggle_player_page ($::INVENTORY_PAGE);
200 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
201 $::SETUP_DIALOG->toggle_visibility; 341 $::SETUP_DIALOG->toggle_visibility;
202 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
203 $::BIND_EDITOR->set_binding (undef, undef, [],
204 sub {
205 my ($mod, $sym, $cmds) = @_;
206 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
207 });
208 $::BIND_EDITOR->start;
209 $::BIND_EDITOR->show;
210#TODO: elmex, what was this supposed to do? it currently crashes the client.
211# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
212# $::BIND_EDITOR->stop;
213# $::BIND_EDITOR->ask_for_bind_and_commit;
214# $::BIND_EDITOR->hide;
215 } elsif (!$::CONN) { 342 } elsif (!$::CONN) {
216 return 0; # bindings further down need a valid connection 343 return 0; # bindings further down need a valid connection
217 344
218 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
219 $::CONN->user_send ("stay fire"); 346 $::CONN->user_send ("stay fire");
… …
224 } elsif ($uni == 13) { 351 } elsif ($uni == 13) {
225 $::CONN->user_send ("examine"); 352 $::CONN->user_send ("examine");
226 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
227 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
228 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
229 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
230 $::CONN->user_send ($_) for @$bind_cmd; 357 $::CONN->macro_send ($_) for @macros;
231 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 358 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
232 $::CONN->user_send ("rotateshoottype +"); 359 $::CONN->user_send ("rotateshoottype +");
233 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 360 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
234 $::CONN->user_send ("rotateshoottype -"); 361 $::CONN->user_send ("rotateshoottype -");
235 } elsif ($uni == ord '"') { 362 } elsif ($uni == ord '"') {
… …
295} 422}
296 423
297sub set_magicmap { 424sub set_magicmap {
298 my ($self, $w, $h, $x, $y, $data) = @_; 425 my ($self, $w, $h, $x, $y, $data) = @_;
299 426
300 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 427 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
301 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 428 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
302 429
303 $self->{magicmap} = [$x, $y, $w, $h, $data]; 430 $self->{magicmap} = [$x, $y, $w, $h, $data];
304 431
305 $self->update; 432 $self->update;
306} 433}
… …
317 unless $focused || !$::FAST; 444 unless $focused || !$::FAST;
318 445
319 if (delete $self->{need_update}) { 446 if (delete $self->{need_update}) {
320 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 447 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
321 448
449 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
450 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
451
322 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 452 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
323 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 453 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
324 454
325 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 455 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
326 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 456 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
327 457
328 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 458 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
329 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 459 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
330 460
331 if ($::CFG->{fow_enable}) { 461 if ($::CFG->{fow_enable}) {
332 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 462 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
333 463
334 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 464 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
335 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 465 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
336 glConvolutionFilter2D ( 466 glConvolutionFilter2D (
337 GL_CONVOLUTION_2D, 467 GL_CONVOLUTION_2D,
… …
359 489
360 glPushMatrix; 490 glPushMatrix;
361 glTranslate $sx0, $sy0; 491 glTranslate $sx0, $sy0;
362 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 492 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
363 493
364 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 494 $::MAP->draw ($dx, $dy, $sw, $sh);
365 495
366 glScale 32, 32; 496 glScale 32, 32;
367 497
368 if (my $tex = $self->{fow_texture}) { 498 if (my $tex = $self->{fow_texture}) {
369 glEnable GL_TEXTURE_2D; 499 glEnable GL_TEXTURE_2D;
… …
376 } 506 }
377 507
378 if ($self->{magicmap}) { 508 if ($self->{magicmap}) {
379 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 509 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
380 510
381 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 511 $x += $::MAP->ox + $self->{dx};
382 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 512 $y += $::MAP->oy + $self->{dy};
383 513
384 glTranslate - $x - 1, - $y - 1; 514 glTranslate - $x - 1, - $y - 1;
385 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 515 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
386 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 516 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
387 } 517 }
… …
533 663
534 if ($ev->{button} == 3) { 664 if ($ev->{button} == 3) {
535 (new CFPlus::UI::Menu 665 (new CFPlus::UI::Menu
536 items => [ 666 items => [
537 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 667 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
538 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 668 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
539 ], 669 ],
540 )->popup ($ev); 670 )->popup ($ev);
541 return 1; 671 return 1;
542 } 672 }
543 0 673 0
… …
744 874
745 $self->SUPER::_draw; 875 $self->SUPER::_draw;
746} 876}
747 877
7481 8781
879

Diff Legend

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