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.101 by root, Sun Apr 1 01:19:18 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::;
14
15sub ::T() { 32 }
13 16
14my $magicmap_tex = 17my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", 18 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 19 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 20
… …
59 62
60 $self->{completer}->hide 63 $self->{completer}->hide
61 if $self->{completer}; 64 if $self->{completer};
62} 65}
63 66
67sub server_login {
68 my ($server) = @_;
69
70 ::stop_game ();
71 local $::PROFILE->{host} = $server;
72 ::start_game ();
73}
74
75sub editor_invoke {
76 my $editsup = $::CONN && $::CONN->{editor_support}
77 or return;
78
79 CFPlus::background {
80 print "preparing editor startup...\n";
81
82 my $server = $editsup->{gameserver} || "default";
83 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
84
85 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
86 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
87
88 print "map directory is $mapdir\n";
89 print "lib directory is $libdir\n";
90
91 my $ua = CFPlus::lwp_useragent;
92
93 for my $file (qw(archetypes crossfire.0)) {
94 my $url = "$editsup->{lib_root}$file";
95 print "mirroring $url...\n";
96 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
97 printf "%s size %d octets\n", $file, -s "$libdir/$file";
98 }
99
100 if (1) { # upload a map
101 my $mapname = $::CONN->{map_info}[0];
102
103 my $mappath = "$mapdir/$mapname";
104
105 -e $mappath and die "$mappath already exists\n";
106
107 print "getting map revision for $mapname...\n";
108
109 # try to get the most recent head revision, what a hack,
110 # this should have been returned while downloading *sigh*
111 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
112
113 if ($log =~ /\?rev=(\d+\.\d+)"/) {
114 my $rev = $1;
115
116 print "downloading revision $rev...\n";
117
118 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
119
120 my $meta = {
121 %$editsup,
122 path => $mapname,
123 revision => $rev,
124 cf_login => $::PROFILE->{user},
125 };
126
127 require File::Basename;
128 require File::Path;
129
130 File::Path::mkpath (File::Basename::dirname ($mappath));
131 open my $fh, ">:raw:perlio", "$mappath.meta"
132 or die "$mappath.meta: $!\n";
133 print $fh CFPlus::to_json $meta;
134 close $fh;
135 open my $fh, ">:raw:perlio:utf8", $mappath
136 or die "$mappath: $!\n";
137 print $fh $map;
138 close $fh;
139
140 print "saved as $mappath\n";
141
142 print "invoking editor...\n";
143 exec "/root/s2/gce $mappath";#d#
144
145 # now upload it
146# require HTTP::Request::Common;
147#
148# my $res = $ua->post (
149# $ENV{CFPLUS_UPLOAD},
150# Content_Type => 'multipart/form-data',
151# Content => [
152# path => $mapname,
153# mapdir => $ENV{CROSSFIRE_MAPDIR},
154# map => $map,
155# revision => $rev,
156# cf_login => $ENV{CFPLUS_LOGIN},
157# cf_password => $ENV{CFPLUS_PASSWORD},
158# comment => "",
159# ]
160# );
161#
162# if ($res->is_error) {
163# # fatal condition
164# warn $res->status_line;
165# } else {
166# # script replies are marked as {{..}}
167# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
168# warn map "$_\n", @msgs;
169# }
170 } else {
171 die "viewvc parse error, unable to detect revision\n";
172 }
173 }
174 }
175}
176
64sub invoke_button_down { 177sub invoke_button_down {
65 my ($self, $ev, $x, $y) = @_; 178 my ($self, $ev, $x, $y) = @_;
66 179
67 if ($ev->{button} == 1) { 180 if ($ev->{button} == 1) {
68 $self->grab_focus; 181 $self->grab_focus;
69 return unless $::CONN; 182 return unless $::CONN;
70 183
71 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 184 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}; 185 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
73 186
74 $x -= int 0.5 * $self->{sw}; 187 $x -= CFPlus::floor $::MAP->w * 0.5;
75 $y -= int 0.5 * $self->{sh}; 188 $y -= CFPlus::floor $::MAP->h * 0.5;
76 189
190 if ($::CONN) {
191 if ($::IN_BUILD_MODE) {
192 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
193 } else {
77 $::CONN->lookat ($x, $y) 194 $::CONN->lookat ($x, $y)
78 if $::CONN; 195 }
196 }
79 197
80 } elsif ($ev->{button} == 2) { 198 } elsif ($ev->{button} == 2) {
81 $self->grab_focus; 199 $self->grab_focus;
82 return unless $::CONN; 200 return unless $::CONN;
83 201
… …
93 $::CFG->{map_shift_y} = $bh + $y - $oy; 211 $::CFG->{map_shift_y} = $bh + $y - $oy;
94 212
95 $self->update; 213 $self->update;
96 }; 214 };
97 } elsif ($ev->{button} == 3) { 215 } elsif ($ev->{button} == 3) {
98 (new CFPlus::UI::Menu 216 my @items = (
99 items => [
100 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 217 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
101 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 218 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
102 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 219 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
103 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 220 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
104 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 221 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
108 $::PICKUP_ENABLE->{state} 225 $::PICKUP_ENABLE->{state}
109 ? "Disable automatic pickup" 226 ? "Disable automatic pickup"
110 : "Enable automatic pickup", 227 : "Enable automatic pickup",
111 sub { $::PICKUP_ENABLE->toggle } 228 sub { $::PICKUP_ENABLE->toggle }
112 ], 229 ],
230 );
231
232 if ($::CONN && $::CONN->{editor_support}) {
233 push @items, [
234 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
235 \&editor_invoke,
236 ];
237
238 for my $type (qw(test name)) {
239 $::CONN->{editor_support}{type} ne $type
240 or next;
241 my $server = $::CONN->{editor_support}{"${type}server"}
242 or next;
243
244 push @items, [
245 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
246 sub { server_login $server },
247 ];
248 }
249 }
250
251 push @items,
113 ["Quit", 252 ["Quit",
114 sub { 253 sub {
115 if ($::CONN) { 254 if ($::CONN) {
116 &::open_quit_dialog; 255 &::open_quit_dialog;
117 } else { 256 } else {
118 exit; 257 exit;
119 }
120 } 258 }
121 ], 259 }
122 ], 260 ],
261 ;
262
263 (new CFPlus::UI::Menu
264 items => \@items,
123 )->popup ($ev); 265 )->popup ($ev);
124 } 266 }
125 267
126 1 268 1
127} 269}
… …
146 1 288 1
147} 289}
148 290
149sub size_request { 291sub size_request {
150 ( 292 (
151 32 * CFPlus::ceil $::WIDTH / 32, 293 ::T * CFPlus::ceil $::WIDTH / ::T,
152 32 * CFPlus::ceil $::HEIGHT / 32, 294 ::T * CFPlus::ceil $::HEIGHT / ::T,
153 ) 295 )
154} 296}
155 297
156sub update { 298sub update {
157 my ($self) = @_; 299 my ($self) = @_;
… …
183 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
184 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
185 327
186 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
187 329
188 if ($uni == ord "\t") { 330 if ($sym == 9) {
189 $::PL_WINDOW->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
190 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
191 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
192 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
193 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
194 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
… …
197 ::toggle_player_page ($::SPELL_PAGE); 339 ::toggle_player_page ($::SPELL_PAGE);
198 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
199 ::toggle_player_page ($::INVENTORY_PAGE); 341 ::toggle_player_page ($::INVENTORY_PAGE);
200 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
201 $::SETUP_DIALOG->toggle_visibility; 343 $::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) { 344 } elsif (!$::CONN) {
216 return 0; # bindings further down need a valid connection 345 return 0; # bindings further down need a valid connection
217 346
218 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
219 $::CONN->user_send ("stay fire"); 348 $::CONN->user_send ("stay fire");
… …
224 } elsif ($uni == 13) { 353 } elsif ($uni == 13) {
225 $::CONN->user_send ("examine"); 354 $::CONN->user_send ("examine");
226 } elsif ($uni == ord ".") { 355 } elsif ($uni == ord ".") {
227 $::CONN->user_send ($self->{completer}{last_command}) 356 $::CONN->user_send ($self->{completer}{last_command})
228 if exists $self->{completer}{last_command}; 357 if exists $self->{completer}{last_command};
229 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
230 $::CONN->user_send ($_) for @$bind_cmd; 359 $::CONN->macro_send ($_) for @macros;
231 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
232 $::CONN->user_send ("rotateshoottype +"); 361 $::CONN->user_send ("rotateshoottype +");
233 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
234 $::CONN->user_send ("rotateshoottype -"); 363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
235 } elsif ($uni == ord '"') { 367 } elsif ($uni == ord '"') {
236 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
237 $self->{completer}->show; 369 $self->{completer}->show;
238 } elsif ($uni == ord "'") { 370 } elsif ($uni == ord "'") {
239 $self->{completer}->set_prefix (""); 371 $self->{completer}->set_prefix ("");
… …
295} 427}
296 428
297sub set_magicmap { 429sub set_magicmap {
298 my ($self, $w, $h, $x, $y, $data) = @_; 430 my ($self, $w, $h, $x, $y, $data) = @_;
299 431
300 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 432 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
301 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 433 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
302 434
303 $self->{magicmap} = [$x, $y, $w, $h, $data]; 435 $self->{magicmap} = [$x, $y, $w, $h, $data];
304 436
305 $self->update; 437 $self->update;
306} 438}
… …
315 447
316 return 448 return
317 unless $focused || !$::FAST; 449 unless $focused || !$::FAST;
318 450
319 if (delete $self->{need_update}) { 451 if (delete $self->{need_update}) {
320 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 452 my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale};
321 453
454 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
455 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
456
322 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; 457 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
323 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; 458 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
324 459
325 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 460 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
326 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 461 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
327 462
328 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; 463 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
329 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; 464 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
330 465
331 if ($::CFG->{fow_enable}) { 466 if ($::CFG->{fow_enable}) {
332 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 467 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
333 468
334 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 469 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); 470 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
336 glConvolutionFilter2D ( 471 glConvolutionFilter2D (
337 GL_CONVOLUTION_2D, 472 GL_CONVOLUTION_2D,
… …
359 494
360 glPushMatrix; 495 glPushMatrix;
361 glTranslate $sx0, $sy0; 496 glTranslate $sx0, $sy0;
362 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 497 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
363 498
364 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 499 $::MAP->draw ($dx, $dy, $sw, $sh, ::T);
365 500
366 glScale 32, 32; 501 glScale ::T, ::T;
367 502
368 if (my $tex = $self->{fow_texture}) { 503 if (my $tex = $self->{fow_texture}) {
369 glEnable GL_TEXTURE_2D; 504 glEnable GL_TEXTURE_2D;
370 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
371 506
… …
376 } 511 }
377 512
378 if ($self->{magicmap}) { 513 if ($self->{magicmap}) {
379 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 514 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
380 515
381 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 516 $x += $::MAP->ox + $self->{dx};
382 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 517 $y += $::MAP->oy + $self->{dy};
383 518
384 glTranslate - $x - 1, - $y - 1; 519 glTranslate - $x - 1, - $y - 1;
385 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 520 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
386 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 521 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
387 } 522 }
… …
446 581
447 $::MAP or return; 582 $::MAP or return;
448 583
449 my ($w, $h) = @$self{qw(w h)}; 584 my ($w, $h) = @$self{qw(w h)};
450 585
451 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 586 my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99;
452 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 587 my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99;
453 588
454 my $sx = int $::CFG->{map_shift_x} / 32; 589 my $sx = int $::CFG->{map_shift_x} / ::T;
455 my $sy = int $::CFG->{map_shift_y} / 32; 590 my $sy = int $::CFG->{map_shift_y} / ::T;
456 591
457 my $ox = 0.5 * ($w - $sw); 592 my $ox = 0.5 * ($w - $sw);
458 my $oy = 0.5 * ($h - $sh); 593 my $oy = 0.5 * ($h - $sh);
459 594
460 glEnable GL_BLEND; 595 glEnable GL_BLEND;
… …
533 668
534 if ($ev->{button} == 3) { 669 if ($ev->{button} == 3) {
535 (new CFPlus::UI::Menu 670 (new CFPlus::UI::Menu
536 items => [ 671 items => [
537 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" 672 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
538 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 673 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
539 ], 674 ],
540 )->popup ($ev); 675 )->popup ($ev);
541 return 1; 676 return 1;
542 } 677 }
543 0 678 0
… …
744 879
745 $self->SUPER::_draw; 880 $self->SUPER::_draw;
746} 881}
747 882
7481 8831
884

Diff Legend

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