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.77 by root, Sun Jul 23 02:44:05 2006 UTC vs.
Revision 1.93 by root, Thu Nov 16 19:42:45 2006 UTC

1package CFClient::MapWidget; 1package CFPlus::MapWidget;
2 2
3use strict; 3use strict;
4use utf8; 4use utf8;
5 5
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFPlus;
8use CFClient::OpenGL; 9use CFPlus::OpenGL;
10use CFPlus::UI;
9 11
10our @ISA = CFClient::UI::Base::; 12our @ISA = CFPlus::UI::Base::;
11 13
12my $magicmap_tex = 14my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", 15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15 17
16sub new { 18sub new {
17 my $class = shift; 19 my $class = shift;
18 20
… …
28 ], 30 ],
29 31
30 @_ 32 @_
31 ); 33 );
32 34
33 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
34 command => $self->{command}, 36 command => $self->{command},
35 tooltip => "<b>The Command Completer</b>\n\n" 37 tooltip => "#completer_help",
36 . "This is your central interface to send text commands to the server. "
37 . "To enter a verbatim command to send to the server, just type the command, "
38 . "followed by a space, and press return. "
39 . "Typing the initial letters of words (or just any letters) displays guesses "
40 . "for commands you might want to use.\n"
41 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
42 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
43 ; 38 ;
44 39
45 $self 40 $self
46} 41}
47 42
… …
64 59
65 $self->{completer}->hide 60 $self->{completer}->hide
66 if $self->{completer}; 61 if $self->{completer};
67} 62}
68 63
64sub server_login {
65 my ($server) = @_;
66
67 ::stop_game ();
68 local $::PROFILE->{host} = $server;
69 ::start_game ();
70}
71
72sub editor_invoke {
73 my $editsup = $::CONN && $::CONN->{editor_support}
74 or return;
75
76 CFPlus::background {
77 print "preparing editor startup...\n";
78
79 my $server = $editsup->{gameserver} || "default";
80 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
81
82 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
83 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
84
85 print "map directory is $mapdir\n";
86 print "lib directory is $libdir\n";
87
88 my $ua = CFPlus::lwp_useragent;
89
90 for my $file (qw(archetypes crossfire.0)) {
91 my $url = "$editsup->{lib_root}$file";
92 print "mirroring $url...\n";
93 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
94 printf "%s size %d octets\n", $file, -s "$libdir/$file";
95 }
96
97 if (1) { # upload a map
98 my $mapname = $::CONN->{map_info}[0];
99
100 my $mappath = "$mapdir/$mapname";
101
102 -e $mappath and die "$mappath already exists\n";
103
104 print "getting map revision for $mapname...\n";
105
106 # try to get the most recent head revision, what a hack,
107 # this should have been returned while downloading *sigh*
108 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
109
110 if ($log =~ /\?rev=(\d+\.\d+)"/) {
111 my $rev = $1;
112
113 print "downloading revision $rev...\n";
114
115 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
116
117 my $meta = {
118 %$editsup,
119 path => $mapname,
120 revision => $rev,
121 cf_login => $::PROFILE->{user},
122 };
123
124 require File::Basename;
125 require File::Path;
126
127 File::Path::mkpath (File::Basename::dirname ($mappath));
128 open my $fh, ">:raw:perlio", "$mappath.meta"
129 or die "$mappath.meta: $!\n";
130 print $fh CFPlus::to_json $meta;
131 close $fh;
132 open my $fh, ">:raw:perlio:utf8", $mappath
133 or die "$mappath: $!\n";
134 print $fh $map;
135 close $fh;
136
137 print "saved as $mappath\n";
138
139 print "invoking editor...\n";
140 exec "/root/s2/gce $mappath";#d#
141
142 # now upload it
143# require HTTP::Request::Common;
144#
145# my $res = $ua->post (
146# $ENV{CFPLUS_UPLOAD},
147# Content_Type => 'multipart/form-data',
148# Content => [
149# path => $mapname,
150# mapdir => $ENV{CROSSFIRE_MAPDIR},
151# map => $map,
152# revision => $rev,
153# cf_login => $ENV{CFPLUS_LOGIN},
154# cf_password => $ENV{CFPLUS_PASSWORD},
155# comment => "",
156# ]
157# );
158#
159# if ($res->is_error) {
160# # fatal condition
161# warn $res->status_line;
162# } else {
163# # script replies are marked as {{..}}
164# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
165# warn map "$_\n", @msgs;
166# }
167 } else {
168 die "viewvc parse error, unable to detect revision\n";
169 }
170 }
171 }
172}
173
69sub invoke_button_down { 174sub invoke_button_down {
70 my ($self, $ev, $x, $y) = @_; 175 my ($self, $ev, $x, $y) = @_;
71 176
72 if ($ev->{button} == 1) { 177 if ($ev->{button} == 1) {
73 $self->grab_focus; 178 $self->grab_focus;
74 return unless $::CONN; 179 return unless $::CONN;
75 180
76 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 181 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
77 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 182 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
78 183
79 $x -= int 0.5 * $self->{sw}; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
80 $y -= int 0.5 * $self->{sh}; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
81 186
82 $::CONN->lookat ($x, $y) 187 $::CONN->lookat ($x, $y)
83 if $::CONN; 188 if $::CONN;
84 189
85 } elsif ($ev->{button} == 2) { 190 } elsif ($ev->{button} == 2) {
… …
98 $::CFG->{map_shift_y} = $bh + $y - $oy; 203 $::CFG->{map_shift_y} = $bh + $y - $oy;
99 204
100 $self->update; 205 $self->update;
101 }; 206 };
102 } elsif ($ev->{button} == 3) { 207 } elsif ($ev->{button} == 3) {
103 (new CFClient::UI::Menu 208 my @items = (
104 items => [
105 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 209 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
106 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 210 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
107 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 211 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
108 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 212 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
109 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 213 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
113 $::PICKUP_ENABLE->{state} 217 $::PICKUP_ENABLE->{state}
114 ? "Disable automatic pickup" 218 ? "Disable automatic pickup"
115 : "Enable automatic pickup", 219 : "Enable automatic pickup",
116 sub { $::PICKUP_ENABLE->toggle } 220 sub { $::PICKUP_ENABLE->toggle }
117 ], 221 ],
222 );
223
224 if ($::CONN && $::CONN->{editor_support}) {
225 push @items, [
226 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
227 \&editor_invoke,
228 ];
229
230 for my $type (qw(test name)) {
231 $::CONN->{editor_support}{type} ne $type
232 or next;
233 my $server = $::CONN->{editor_support}{"${type}server"}
234 or next;
235
236 push @items, [
237 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
238 sub { server_login $server },
239 ];
240 }
241 }
242
243 push @items,
244 ["Quit",
245 sub {
246 if ($::CONN) {
247 &::open_quit_dialog;
248 } else {
249 exit;
250 }
251 }
118 ], 252 ],
253 ;
254
255 (new CFPlus::UI::Menu
256 items => \@items,
119 )->popup ($ev); 257 )->popup ($ev);
120 } 258 }
121 259
122 1 260 1
123} 261}
… …
142 1 280 1
143} 281}
144 282
145sub size_request { 283sub size_request {
146 ( 284 (
147 32 * CFClient::ceil $::WIDTH / 32, 285 32 * CFPlus::ceil $::WIDTH / 32,
148 32 * CFClient::ceil $::HEIGHT / 32, 286 32 * CFPlus::ceil $::HEIGHT / 32,
149 ) 287 )
150} 288}
151 289
152sub update { 290sub update {
153 my ($self) = @_; 291 my ($self) = @_;
… …
155 $self->{need_update} = 1; 293 $self->{need_update} = 1;
156 $self->SUPER::update; 294 $self->SUPER::update;
157} 295}
158 296
159my %DIR = ( 297my %DIR = (
160 CFClient::SDLK_KP8, [1, "north"], 298 CFPlus::SDLK_KP8, [1, "north"],
161 CFClient::SDLK_KP9, [2, "northeast"], 299 CFPlus::SDLK_KP9, [2, "northeast"],
162 CFClient::SDLK_KP6, [3, "east"], 300 CFPlus::SDLK_KP6, [3, "east"],
163 CFClient::SDLK_KP3, [4, "southeast"], 301 CFPlus::SDLK_KP3, [4, "southeast"],
164 CFClient::SDLK_KP2, [5, "south"], 302 CFPlus::SDLK_KP2, [5, "south"],
165 CFClient::SDLK_KP1, [6, "southwest"], 303 CFPlus::SDLK_KP1, [6, "southwest"],
166 CFClient::SDLK_KP4, [7, "west"], 304 CFPlus::SDLK_KP4, [7, "west"],
167 CFClient::SDLK_KP7, [8, "northwest"], 305 CFPlus::SDLK_KP7, [8, "northwest"],
168 306
169 CFClient::SDLK_UP, [1, "north"], 307 CFPlus::SDLK_UP, [1, "north"],
170 CFClient::SDLK_RIGHT, [3, "east"], 308 CFPlus::SDLK_RIGHT, [3, "east"],
171 CFClient::SDLK_DOWN, [5, "south"], 309 CFPlus::SDLK_DOWN, [5, "south"],
172 CFClient::SDLK_LEFT, [7, "west"], 310 CFPlus::SDLK_LEFT, [7, "west"],
173); 311);
174 312
175sub invoke_key_down { 313sub invoke_key_down {
176 my ($self, $ev) = @_; 314 my ($self, $ev) = @_;
177 315
178 my $mod = $ev->{mod}; 316 my $mod = $ev->{mod};
179 my $sym = $ev->{sym}; 317 my $sym = $ev->{sym};
180 my $uni = $ev->{unicode}; 318 my $uni = $ev->{unicode};
181 319
182 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 320 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
183 321
184 if ($uni == ord "\t") { 322 if ($uni == ord "\t") {
185 $::PL_WINDOW->toggle_visibility; 323 $::PL_WINDOW->toggle_visibility;
186 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 324 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
187 $::HELP_WINDOW->toggle_visibility; 325 $::HELP_WINDOW->toggle_visibility;
188 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 326 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
189 ::toggle_player_page ($::STATS_PAGE); 327 ::toggle_player_page ($::STATS_PAGE);
190 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 328 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
191 ::toggle_player_page ($::SKILL_PAGE); 329 ::toggle_player_page ($::SKILL_PAGE);
192 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 330 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
193 ::toggle_player_page ($::SPELL_PAGE); 331 ::toggle_player_page ($::SPELL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F5 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
195 ::toggle_player_page ($::INVENTORY_PAGE); 333 ::toggle_player_page ($::INVENTORY_PAGE);
196 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
197 $::SETUP_DIALOG->toggle_visibility; 335 $::SETUP_DIALOG->toggle_visibility;
198 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 336 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
199 $::BIND_EDITOR->set_binding (undef, undef, [], 337 $::BIND_EDITOR->set_binding (undef, undef, [],
200 sub { 338 sub {
201 my ($mod, $sym, $cmds) = @_; 339 my ($mod, $sym, $cmds) = @_;
202 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); 340 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
203 }); 341 });
204 $::BIND_EDITOR->start; 342 $::BIND_EDITOR->start;
205 $::BIND_EDITOR->show; 343 $::BIND_EDITOR->show;
344#TODO: elmex, what was this supposed to do? it currently crashes the client.
206 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 345# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
207 $::BIND_EDITOR->stop; 346# $::BIND_EDITOR->stop;
208 $::BIND_EDITOR->ask_for_bind_and_commit; 347# $::BIND_EDITOR->ask_for_bind_and_commit;
209 $::BIND_EDITOR->hide; 348# $::BIND_EDITOR->hide;
210 } elsif (!$::CONN) { 349 } elsif (!$::CONN) {
211 return 0; # bindings further down need a valid connection 350 return 0; # bindings further down need a valid connection
212 351
213 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 352 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
214 $::CONN->user_send ("stay fire"); 353 $::CONN->user_send ("stay fire");
215 } elsif ($uni == ord ",") { 354 } elsif ($uni == ord ",") {
216 $::CONN->user_send ("take"); 355 $::CONN->user_send ("take");
217 } elsif ($uni == ord " ") { 356 } elsif ($uni == ord " ") {
218 $::CONN->user_send ("apply"); 357 $::CONN->user_send ("apply");
358 } elsif ($uni == 13) {
359 $::CONN->user_send ("examine");
219 } elsif ($uni == ord ".") { 360 } elsif ($uni == ord ".") {
220 $::CONN->user_send ($self->{completer}{last_command}) 361 $::CONN->user_send ($self->{completer}{last_command})
221 if exists $self->{completer}{last_command}; 362 if exists $self->{completer}{last_command};
222 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 363 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
223 $::CONN->user_send ($_) for @$bind_cmd; 364 $::CONN->user_send ($_) for @$bind_cmd;
224 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 365 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
225 $::CONN->user_send ("rotateshoottype +"); 366 $::CONN->user_send ("rotateshoottype +");
226 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 367 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
227 $::CONN->user_send ("rotateshoottype -"); 368 $::CONN->user_send ("rotateshoottype -");
228 } elsif ($uni == ord '"') { 369 } elsif ($uni == ord '"') {
229 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 370 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
230 $self->{completer}->show; 371 $self->{completer}->show;
231 } elsif ($uni == ord "'") { 372 } elsif ($uni == ord "'") {
232 $self->{completer}->set_prefix (""); 373 $self->{completer}->set_prefix ("");
233 $self->{completer}->show; 374 $self->{completer}->show;
234 } elsif (exists $DIR{$sym}) { 375 } elsif (exists $DIR{$sym}) {
235 if ($mod & CFClient::KMOD_SHIFT) { 376 if ($mod & CFPlus::KMOD_SHIFT) {
236 $self->{shft}++; 377 $self->{shft}++;
237 if ($DIR{$sym}[0] != $self->{fire_dir}) { 378 if ($DIR{$sym}[0] != $self->{fire_dir}) {
238 $::CONN->user_send ("fire $DIR{$sym}[0]"); 379 $::CONN->user_send ("fire $DIR{$sym}[0]");
239 } 380 }
240 $self->{fire_dir} = $DIR{$sym}[0]; 381 $self->{fire_dir} = $DIR{$sym}[0];
241 } elsif ($mod & CFClient::KMOD_CTRL) { 382 } elsif ($mod & CFPlus::KMOD_CTRL) {
242 $self->{ctrl}++; 383 $self->{ctrl}++;
243 $::CONN->user_send ("run $DIR{$sym}[0]"); 384 $::CONN->user_send ("run $DIR{$sym}[0]");
244 } else { 385 } else {
245 $::CONN->user_send ("$DIR{$sym}[1]"); 386 $::CONN->user_send ("$DIR{$sym}[1]");
246 } 387 }
… …
260 my $res = 0; 401 my $res = 0;
261 my $mod = $ev->{mod}; 402 my $mod = $ev->{mod};
262 my $sym = $ev->{sym}; 403 my $sym = $ev->{sym};
263 404
264 if ($::CFG->{shift_fire_stop}) { 405 if ($::CFG->{shift_fire_stop}) {
265 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 406 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
266 $::CONN->user_send ("fire_stop"); 407 $::CONN->user_send ("fire_stop");
267 delete $self->{fire_dir}; 408 delete $self->{fire_dir};
268 $res = 1; 409 $res = 1;
269 } 410 }
270 } else { 411 } else {
271 if (exists $DIR{$sym} && delete $self->{shft}) { 412 if (exists $DIR{$sym} && delete $self->{shft}) {
272 $::CONN->user_send ("fire_stop"); 413 $::CONN->user_send ("fire_stop");
273 delete $self->{fire_dir}; 414 delete $self->{fire_dir};
274 $res = 1; 415 $res = 1;
275 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 416 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
276 $::CONN->user_send ("fire_stop"); 417 $::CONN->user_send ("fire_stop");
277 delete $self->{fire_dir}; 418 delete $self->{fire_dir};
278 $res = 1; 419 $res = 1;
279 } 420 }
280 } 421 }
281 422
282 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 423 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
283 $::CONN->user_send ("run_stop"); 424 $::CONN->user_send ("run_stop");
284 $res = 1; 425 $res = 1;
285 } 426 }
286 427
287 $res 428 $res
288} 429}
289 430
290sub set_magicmap { 431sub set_magicmap {
291 my ($self, $w, $h, $x, $y, $data) = @_; 432 my ($self, $w, $h, $x, $y, $data) = @_;
292 433
293 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 434 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
294 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 435 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
295 436
296 $self->{magicmap} = [$x, $y, $w, $h, $data]; 437 $self->{magicmap} = [$x, $y, $w, $h, $data];
297 438
298 $self->update; 439 $self->update;
299} 440}
… …
301sub draw { 442sub draw {
302 my ($self) = @_; 443 my ($self) = @_;
303 444
304 return unless $::MAP; 445 return unless $::MAP;
305 446
306 my $focused = $CFClient::UI::FOCUS == $self 447 my $focused = $CFPlus::UI::FOCUS == $self
307 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 448 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
308 449
309 return 450 return
310 unless $focused || !$::FAST; 451 unless $focused || !$::FAST;
311 452
312 if (delete $self->{need_update}) { 453 if (delete $self->{need_update}) {
313 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 454 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
314 455
456 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
457 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
458
315 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 459 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
316 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 460 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
317 461
318 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 462 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
319 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 463 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
320 464
321 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 465 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
322 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 466 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
323 467
324 if ($::CFG->{fow_enable}) { 468 if ($::CFG->{fow_enable}) {
325 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 469 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
326 470
327 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 471 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
328 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 472 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
329 glConvolutionFilter2D ( 473 glConvolutionFilter2D (
330 GL_CONVOLUTION_2D, 474 GL_CONVOLUTION_2D,
331 GL_ALPHA, 475 GL_ALPHA,
332 3, 3, 476 3, 3,
… …
334 (pack "f*", @{ $self->{smooth_matrix} }), 478 (pack "f*", @{ $self->{smooth_matrix} }),
335 ); 479 );
336 glEnable GL_CONVOLUTION_2D; 480 glEnable GL_CONVOLUTION_2D;
337 } 481 }
338 482
339 $self->{fow_texture} = new CFClient::Texture 483 $self->{fow_texture} = new CFPlus::Texture
340 w => $w, 484 w => $w,
341 h => $h, 485 h => $h,
342 data => $data, 486 data => $data,
343 internalformat => GL_ALPHA, 487 internalformat => GL_ALPHA,
344 format => GL_ALPHA; 488 format => GL_ALPHA;
… …
352 496
353 glPushMatrix; 497 glPushMatrix;
354 glTranslate $sx0, $sy0; 498 glTranslate $sx0, $sy0;
355 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 499 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
356 500
357 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 501 $::MAP->draw ($dx, $dy, $sw, $sh);
358 502
359 glScale 32, 32; 503 glScale 32, 32;
360 504
361 if (my $tex = $self->{fow_texture}) { 505 if (my $tex = $self->{fow_texture}) {
362 glEnable GL_TEXTURE_2D; 506 glEnable GL_TEXTURE_2D;
… …
369 } 513 }
370 514
371 if ($self->{magicmap}) { 515 if ($self->{magicmap}) {
372 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 516 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
373 517
374 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 518 $x += $::MAP->ox + $self->{dx};
375 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 519 $y += $::MAP->oy + $self->{dy};
376 520
377 glTranslate - $x - 1, - $y - 1; 521 glTranslate - $x - 1, - $y - 1;
378 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 522 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
379 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 523 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
380 } 524 }
… …
406 glDeleteList $self->{list}; 550 glDeleteList $self->{list};
407 551
408 $self->SUPER::DESTROY; 552 $self->SUPER::DESTROY;
409} 553}
410 554
411package CFClient::MapWidget::MapMap; 555package CFPlus::MapWidget::MapMap;
412 556
413our @ISA = CFClient::UI::Base::; 557our @ISA = CFPlus::UI::Base::;
414 558
415use Time::HiRes qw(time); 559use Time::HiRes qw(time);
416use CFClient::OpenGL; 560use CFPlus::OpenGL;
417 561
418sub size_request { 562sub size_request {
419 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 563 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
420} 564}
421 565
… …
457 601
458 if ($self->{texture_atime} < time) { 602 if ($self->{texture_atime} < time) {
459 $self->{texture_atime} = time + 1/3; 603 $self->{texture_atime} = time + 1/3;
460 604
461 $self->{texture} = 605 $self->{texture} =
462 new CFClient::Texture 606 new CFPlus::Texture
463 w => $w, 607 w => $w,
464 h => $h, 608 h => $h,
465 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 609 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
466 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 610 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
467 } 611 }
468 612
469 $self->{texture}->draw_quad (0, 0); 613 $self->{texture}->draw_quad (0, 0);
470 614
471 glDisable GL_TEXTURE_2D; 615 glDisable GL_TEXTURE_2D;
… …
486 glEnd; 630 glEnd;
487 631
488 glDisable GL_BLEND; 632 glDisable GL_BLEND;
489} 633}
490 634
491package CFClient::MapWidget::Command; 635package CFPlus::MapWidget::Command;
492 636
493use strict; 637use strict;
494 638
495use CFClient::OpenGL; 639use CFPlus::OpenGL;
496 640
497our @ISA = CFClient::UI::Frame::; 641our @ISA = CFPlus::UI::Frame::;
498 642
499sub new { 643sub new {
500 my $class = shift; 644 my $class = shift;
501 645
502 my $self = $class->SUPER::new ( 646 my $self = $class->SUPER::new (
503 bg => [0, 0, 0, 0.8], 647 bg => [0, 0, 0, 0.8],
504 @_, 648 @_,
505 ); 649 );
506 650
507 $self->add ($self->{vbox} = new CFClient::UI::VBox); 651 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
508 652
509 $self->{label} = [ 653 $self->{label} = [
510 map 654 map
511 CFClient::UI::Label->new ( 655 CFPlus::UI::Label->new (
512 can_hover => 1, 656 can_hover => 1,
513 can_events => 1, 657 can_events => 1,
514 tooltip_width => 0.33, 658 tooltip_width => 0.33,
515 fontsize => $_, 659 fontsize => $_,
516 ), (0.8) x 16 660 ), (0.8) x 16
517 ]; 661 ];
518 662
519 $self->{entry} = new CFClient::UI::Entry 663 $self->{entry} = new CFPlus::UI::Entry
520 on_changed => sub { 664 on_changed => sub {
521 $self->update_labels; 665 $self->update_labels;
522 0 666 0
523 }, 667 },
524 on_button_down => sub { 668 on_button_down => sub {
525 my ($entry, $ev, $x, $y) = @_; 669 my ($entry, $ev, $x, $y) = @_;
526 670
527 if ($ev->{button} == 3) { 671 if ($ev->{button} == 3) {
528 (new CFClient::UI::Menu 672 (new CFPlus::UI::Menu
529 items => [ 673 items => [
530 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 674 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
531 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 675 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
532 ], 676 ],
533 )->popup ($ev); 677 )->popup ($ev);
534 return 1; 678 return 1;
535 } 679 }
… …
551 $self->hide; 695 $self->hide;
552 } 696 }
553 } elsif ($ev->{sym} == 27) { 697 } elsif ($ev->{sym} == 27) {
554 $self->{hist_ptr} = 0; 698 $self->{hist_ptr} = 0;
555 $self->hide; 699 $self->hide;
556 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 700 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
557 if ($self->{hist_ptr} > 1) { 701 if ($self->{hist_ptr} > 1) {
558 $self->{hist_ptr}--; 702 $self->{hist_ptr}--;
559 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 703 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
560 } elsif ($self->{hist_ptr} > 0) { 704 } elsif ($self->{hist_ptr} > 0) {
561 $self->{hist_ptr}--; 705 $self->{hist_ptr}--;
… …
563 } else { 707 } else {
564 ++$self->{select_offset} 708 ++$self->{select_offset}
565 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 709 if $self->{select_offset} < $#{ $self->{last_match} || [] };
566 } 710 }
567 $self->update_labels; 711 $self->update_labels;
568 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 712 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
569 if ($self->{select_offset}) { 713 if ($self->{select_offset}) {
570 --$self->{select_offset} 714 --$self->{select_offset}
571 } else { 715 } else {
572 unless ($self->{hist_ptr}) { 716 unless ($self->{hist_ptr}) {
573 $self->{hist_saveback} = $self->{entry}->get_text; 717 $self->{hist_saveback} = $self->{entry}->get_text;
… …
731 875
732sub _draw { 876sub _draw {
733 my ($self) = @_; 877 my ($self) = @_;
734 878
735 # hack 879 # hack
736 local $CFClient::UI::FOCUS = $self->{entry}; 880 local $CFPlus::UI::FOCUS = $self->{entry};
737 881
738 $self->SUPER::_draw; 882 $self->SUPER::_draw;
739} 883}
740 884
7411 8851
886

Diff Legend

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