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.79 by elmex, Mon Jul 24 12:25:09 2006 UTC vs.
Revision 1.97 by root, Sat Dec 9 22:28:11 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 CFClient; 8use CFPlus;
9use CFClient::OpenGL; 9use CFPlus::OpenGL;
10use CFClient::UI; 10use CFPlus::UI;
11use CFPlus::Macro;
11 12
12our @ISA = CFClient::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
13 14
14my $magicmap_tex = 15my $magicmap_tex =
15 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", 16 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 17 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
17 18
18sub new { 19sub new {
19 my $class = shift; 20 my $class = shift;
20 21
… …
30 ], 31 ],
31 32
32 @_ 33 @_
33 ); 34 );
34 35
35 $self->{completer} = new CFClient::MapWidget::Command:: 36 $self->{completer} = new CFPlus::MapWidget::Command::
36 command => $self->{command}, 37 command => $self->{command},
37 tooltip => "<b>The Command Completer</b>\n\n" 38 tooltip => "#completer_help",
38 . "This is your central interface to send text commands to the server. "
39 . "To enter a verbatim command to send to the server, just type the command, "
40 . "followed by a space, and press return. "
41 . "Typing the initial letters of words (or just any letters) displays guesses "
42 . "for commands you might want to use.\n"
43 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
44 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
45 ; 39 ;
46 40
47 $self 41 $self
48} 42}
49 43
… …
66 60
67 $self->{completer}->hide 61 $self->{completer}->hide
68 if $self->{completer}; 62 if $self->{completer};
69} 63}
70 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
71sub invoke_button_down { 175sub invoke_button_down {
72 my ($self, $ev, $x, $y) = @_; 176 my ($self, $ev, $x, $y) = @_;
73 177
74 if ($ev->{button} == 1) { 178 if ($ev->{button} == 1) {
75 $self->grab_focus; 179 $self->grab_focus;
76 return unless $::CONN; 180 return unless $::CONN;
77 181
78 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 182 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
79 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; 183 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
80 184
81 $x -= int 0.5 * $self->{sw}; 185 $x -= CFPlus::floor $::MAP->w * 0.5;
82 $y -= int 0.5 * $self->{sh}; 186 $y -= CFPlus::floor $::MAP->h * 0.5;
83 187
188 if ($::CONN) {
189 if ($::IN_BUILD_MODE) {
190 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
191 } else {
84 $::CONN->lookat ($x, $y) 192 $::CONN->lookat ($x, $y)
85 if $::CONN; 193 }
194 }
86 195
87 } elsif ($ev->{button} == 2) { 196 } elsif ($ev->{button} == 2) {
88 $self->grab_focus; 197 $self->grab_focus;
89 return unless $::CONN; 198 return unless $::CONN;
90 199
… …
100 $::CFG->{map_shift_y} = $bh + $y - $oy; 209 $::CFG->{map_shift_y} = $bh + $y - $oy;
101 210
102 $self->update; 211 $self->update;
103 }; 212 };
104 } elsif ($ev->{button} == 3) { 213 } elsif ($ev->{button} == 3) {
105 (new CFClient::UI::Menu 214 my @items = (
106 items => [
107 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 215 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
108 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 216 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
109 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 217 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
110 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 218 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
111 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 219 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
115 $::PICKUP_ENABLE->{state} 223 $::PICKUP_ENABLE->{state}
116 ? "Disable automatic pickup" 224 ? "Disable automatic pickup"
117 : "Enable automatic pickup", 225 : "Enable automatic pickup",
118 sub { $::PICKUP_ENABLE->toggle } 226 sub { $::PICKUP_ENABLE->toggle }
119 ], 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,
120 ["Quit", 250 ["Quit",
121 sub { 251 sub {
122 if ($::CONN) { 252 if ($::CONN) {
123 &::open_quit_dialog; 253 &::open_quit_dialog;
124 } else { 254 } else {
125 exit; 255 exit;
126 }
127 } 256 }
128 ], 257 }
129 ], 258 ],
259 ;
260
261 (new CFPlus::UI::Menu
262 items => \@items,
130 )->popup ($ev); 263 )->popup ($ev);
131 } 264 }
132 265
133 1 266 1
134} 267}
… …
153 1 286 1
154} 287}
155 288
156sub size_request { 289sub size_request {
157 ( 290 (
158 32 * CFClient::ceil $::WIDTH / 32, 291 32 * CFPlus::ceil $::WIDTH / 32,
159 32 * CFClient::ceil $::HEIGHT / 32, 292 32 * CFPlus::ceil $::HEIGHT / 32,
160 ) 293 )
161} 294}
162 295
163sub update { 296sub update {
164 my ($self) = @_; 297 my ($self) = @_;
… …
166 $self->{need_update} = 1; 299 $self->{need_update} = 1;
167 $self->SUPER::update; 300 $self->SUPER::update;
168} 301}
169 302
170my %DIR = ( 303my %DIR = (
171 CFClient::SDLK_KP8, [1, "north"], 304 CFPlus::SDLK_KP8, [1, "north"],
172 CFClient::SDLK_KP9, [2, "northeast"], 305 CFPlus::SDLK_KP9, [2, "northeast"],
173 CFClient::SDLK_KP6, [3, "east"], 306 CFPlus::SDLK_KP6, [3, "east"],
174 CFClient::SDLK_KP3, [4, "southeast"], 307 CFPlus::SDLK_KP3, [4, "southeast"],
175 CFClient::SDLK_KP2, [5, "south"], 308 CFPlus::SDLK_KP2, [5, "south"],
176 CFClient::SDLK_KP1, [6, "southwest"], 309 CFPlus::SDLK_KP1, [6, "southwest"],
177 CFClient::SDLK_KP4, [7, "west"], 310 CFPlus::SDLK_KP4, [7, "west"],
178 CFClient::SDLK_KP7, [8, "northwest"], 311 CFPlus::SDLK_KP7, [8, "northwest"],
179 312
180 CFClient::SDLK_UP, [1, "north"], 313 CFPlus::SDLK_UP, [1, "north"],
181 CFClient::SDLK_RIGHT, [3, "east"], 314 CFPlus::SDLK_RIGHT, [3, "east"],
182 CFClient::SDLK_DOWN, [5, "south"], 315 CFPlus::SDLK_DOWN, [5, "south"],
183 CFClient::SDLK_LEFT, [7, "west"], 316 CFPlus::SDLK_LEFT, [7, "west"],
184); 317);
185 318
186sub invoke_key_down { 319sub invoke_key_down {
187 my ($self, $ev) = @_; 320 my ($self, $ev) = @_;
188 321
189 my $mod = $ev->{mod}; 322 my $mod = $ev->{mod};
190 my $sym = $ev->{sym}; 323 my $sym = $ev->{sym};
191 my $uni = $ev->{unicode}; 324 my $uni = $ev->{unicode};
192 325
193 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 326 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
194 327
195 if ($uni == ord "\t") { 328 if ($uni == ord "\t") {
196 $::PL_WINDOW->toggle_visibility; 329 $::PL_WINDOW->toggle_visibility;
197 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 330 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
198 $::HELP_WINDOW->toggle_visibility; 331 $::HELP_WINDOW->toggle_visibility;
199 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
200 ::toggle_player_page ($::STATS_PAGE); 333 ::toggle_player_page ($::STATS_PAGE);
201 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
202 ::toggle_player_page ($::SKILL_PAGE); 335 ::toggle_player_page ($::SKILL_PAGE);
203 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
204 ::toggle_player_page ($::SPELL_PAGE); 337 ::toggle_player_page ($::SPELL_PAGE);
205 } elsif ($sym == CFClient::SDLK_F5 && !$mod) { 338 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
206 ::toggle_player_page ($::INVENTORY_PAGE); 339 ::toggle_player_page ($::INVENTORY_PAGE);
207 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
208 $::SETUP_DIALOG->toggle_visibility; 341 $::SETUP_DIALOG->toggle_visibility;
209 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
210 $::BIND_EDITOR->set_binding (undef, undef, [],
211 sub {
212 my ($mod, $sym, $cmds) = @_;
213 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
214 });
215 $::BIND_EDITOR->start;
216 $::BIND_EDITOR->show;
217 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
218 $::BIND_EDITOR->stop;
219 $::BIND_EDITOR->ask_for_bind_and_commit;
220 $::BIND_EDITOR->hide;
221 } elsif (!$::CONN) { 342 } elsif (!$::CONN) {
222 return 0; # bindings further down need a valid connection 343 return 0; # bindings further down need a valid connection
223 344
224 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
225 $::CONN->user_send ("stay fire"); 346 $::CONN->user_send ("stay fire");
226 } elsif ($uni == ord ",") { 347 } elsif ($uni == ord ",") {
227 $::CONN->user_send ("take"); 348 $::CONN->user_send ("take");
228 } elsif ($uni == ord " ") { 349 } elsif ($uni == ord " ") {
229 $::CONN->user_send ("apply"); 350 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) {
352 $::CONN->user_send ("examine");
230 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
231 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
232 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
233 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
357 warn "<@macros>\n";#d#
234 $::CONN->user_send ($_) for @$bind_cmd; 358 $::CONN->macro_send ($_) for @macros;
235 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 359 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
236 $::CONN->user_send ("rotateshoottype +"); 360 $::CONN->user_send ("rotateshoottype +");
237 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 361 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
238 $::CONN->user_send ("rotateshoottype -"); 362 $::CONN->user_send ("rotateshoottype -");
239 } elsif ($uni == ord '"') { 363 } elsif ($uni == ord '"') {
240 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 364 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
241 $self->{completer}->show; 365 $self->{completer}->show;
242 } elsif ($uni == ord "'") { 366 } elsif ($uni == ord "'") {
243 $self->{completer}->set_prefix (""); 367 $self->{completer}->set_prefix ("");
244 $self->{completer}->show; 368 $self->{completer}->show;
245 } elsif (exists $DIR{$sym}) { 369 } elsif (exists $DIR{$sym}) {
246 if ($mod & CFClient::KMOD_SHIFT) { 370 if ($mod & CFPlus::KMOD_SHIFT) {
247 $self->{shft}++; 371 $self->{shft}++;
248 if ($DIR{$sym}[0] != $self->{fire_dir}) { 372 if ($DIR{$sym}[0] != $self->{fire_dir}) {
249 $::CONN->user_send ("fire $DIR{$sym}[0]"); 373 $::CONN->user_send ("fire $DIR{$sym}[0]");
250 } 374 }
251 $self->{fire_dir} = $DIR{$sym}[0]; 375 $self->{fire_dir} = $DIR{$sym}[0];
252 } elsif ($mod & CFClient::KMOD_CTRL) { 376 } elsif ($mod & CFPlus::KMOD_CTRL) {
253 $self->{ctrl}++; 377 $self->{ctrl}++;
254 $::CONN->user_send ("run $DIR{$sym}[0]"); 378 $::CONN->user_send ("run $DIR{$sym}[0]");
255 } else { 379 } else {
256 $::CONN->user_send ("$DIR{$sym}[1]"); 380 $::CONN->user_send ("$DIR{$sym}[1]");
257 } 381 }
… …
271 my $res = 0; 395 my $res = 0;
272 my $mod = $ev->{mod}; 396 my $mod = $ev->{mod};
273 my $sym = $ev->{sym}; 397 my $sym = $ev->{sym};
274 398
275 if ($::CFG->{shift_fire_stop}) { 399 if ($::CFG->{shift_fire_stop}) {
276 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 400 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
277 $::CONN->user_send ("fire_stop"); 401 $::CONN->user_send ("fire_stop");
278 delete $self->{fire_dir}; 402 delete $self->{fire_dir};
279 $res = 1; 403 $res = 1;
280 } 404 }
281 } else { 405 } else {
282 if (exists $DIR{$sym} && delete $self->{shft}) { 406 if (exists $DIR{$sym} && delete $self->{shft}) {
283 $::CONN->user_send ("fire_stop"); 407 $::CONN->user_send ("fire_stop");
284 delete $self->{fire_dir}; 408 delete $self->{fire_dir};
285 $res = 1; 409 $res = 1;
286 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 410 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
287 $::CONN->user_send ("fire_stop"); 411 $::CONN->user_send ("fire_stop");
288 delete $self->{fire_dir}; 412 delete $self->{fire_dir};
289 $res = 1; 413 $res = 1;
290 } 414 }
291 } 415 }
292 416
293 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 417 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
294 $::CONN->user_send ("run_stop"); 418 $::CONN->user_send ("run_stop");
295 $res = 1; 419 $res = 1;
296 } 420 }
297 421
298 $res 422 $res
299} 423}
300 424
301sub set_magicmap { 425sub set_magicmap {
302 my ($self, $w, $h, $x, $y, $data) = @_; 426 my ($self, $w, $h, $x, $y, $data) = @_;
303 427
304 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 428 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
305 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 429 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
306 430
307 $self->{magicmap} = [$x, $y, $w, $h, $data]; 431 $self->{magicmap} = [$x, $y, $w, $h, $data];
308 432
309 $self->update; 433 $self->update;
310} 434}
… …
312sub draw { 436sub draw {
313 my ($self) = @_; 437 my ($self) = @_;
314 438
315 return unless $::MAP; 439 return unless $::MAP;
316 440
317 my $focused = $CFClient::UI::FOCUS == $self 441 my $focused = $CFPlus::UI::FOCUS == $self
318 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 442 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
319 443
320 return 444 return
321 unless $focused || !$::FAST; 445 unless $focused || !$::FAST;
322 446
323 if (delete $self->{need_update}) { 447 if (delete $self->{need_update}) {
324 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 448 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
325 449
450 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
451 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
452
326 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 453 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
327 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 454 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
328 455
329 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 456 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
330 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 457 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
331 458
332 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 459 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
333 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 460 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
334 461
335 if ($::CFG->{fow_enable}) { 462 if ($::CFG->{fow_enable}) {
336 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);
337 464
338 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 465 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
339 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 466 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
340 glConvolutionFilter2D ( 467 glConvolutionFilter2D (
341 GL_CONVOLUTION_2D, 468 GL_CONVOLUTION_2D,
342 GL_ALPHA, 469 GL_ALPHA,
343 3, 3, 470 3, 3,
… …
345 (pack "f*", @{ $self->{smooth_matrix} }), 472 (pack "f*", @{ $self->{smooth_matrix} }),
346 ); 473 );
347 glEnable GL_CONVOLUTION_2D; 474 glEnable GL_CONVOLUTION_2D;
348 } 475 }
349 476
350 $self->{fow_texture} = new CFClient::Texture 477 $self->{fow_texture} = new CFPlus::Texture
351 w => $w, 478 w => $w,
352 h => $h, 479 h => $h,
353 data => $data, 480 data => $data,
354 internalformat => GL_ALPHA, 481 internalformat => GL_ALPHA,
355 format => GL_ALPHA; 482 format => GL_ALPHA;
… …
363 490
364 glPushMatrix; 491 glPushMatrix;
365 glTranslate $sx0, $sy0; 492 glTranslate $sx0, $sy0;
366 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 493 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
367 494
368 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 495 $::MAP->draw ($dx, $dy, $sw, $sh);
369 496
370 glScale 32, 32; 497 glScale 32, 32;
371 498
372 if (my $tex = $self->{fow_texture}) { 499 if (my $tex = $self->{fow_texture}) {
373 glEnable GL_TEXTURE_2D; 500 glEnable GL_TEXTURE_2D;
… …
380 } 507 }
381 508
382 if ($self->{magicmap}) { 509 if ($self->{magicmap}) {
383 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 510 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
384 511
385 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 512 $x += $::MAP->ox + $self->{dx};
386 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 513 $y += $::MAP->oy + $self->{dy};
387 514
388 glTranslate - $x - 1, - $y - 1; 515 glTranslate - $x - 1, - $y - 1;
389 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 516 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
390 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 517 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
391 } 518 }
… …
417 glDeleteList $self->{list}; 544 glDeleteList $self->{list};
418 545
419 $self->SUPER::DESTROY; 546 $self->SUPER::DESTROY;
420} 547}
421 548
422package CFClient::MapWidget::MapMap; 549package CFPlus::MapWidget::MapMap;
423 550
424our @ISA = CFClient::UI::Base::; 551our @ISA = CFPlus::UI::Base::;
425 552
426use Time::HiRes qw(time); 553use Time::HiRes qw(time);
427use CFClient::OpenGL; 554use CFPlus::OpenGL;
428 555
429sub size_request { 556sub size_request {
430 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 557 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
431} 558}
432 559
… …
468 595
469 if ($self->{texture_atime} < time) { 596 if ($self->{texture_atime} < time) {
470 $self->{texture_atime} = time + 1/3; 597 $self->{texture_atime} = time + 1/3;
471 598
472 $self->{texture} = 599 $self->{texture} =
473 new CFClient::Texture 600 new CFPlus::Texture
474 w => $w, 601 w => $w,
475 h => $h, 602 h => $h,
476 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 603 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
477 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 604 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
478 } 605 }
479 606
480 $self->{texture}->draw_quad (0, 0); 607 $self->{texture}->draw_quad (0, 0);
481 608
482 glDisable GL_TEXTURE_2D; 609 glDisable GL_TEXTURE_2D;
… …
497 glEnd; 624 glEnd;
498 625
499 glDisable GL_BLEND; 626 glDisable GL_BLEND;
500} 627}
501 628
502package CFClient::MapWidget::Command; 629package CFPlus::MapWidget::Command;
503 630
504use strict; 631use strict;
505 632
506use CFClient::OpenGL; 633use CFPlus::OpenGL;
507 634
508our @ISA = CFClient::UI::Frame::; 635our @ISA = CFPlus::UI::Frame::;
509 636
510sub new { 637sub new {
511 my $class = shift; 638 my $class = shift;
512 639
513 my $self = $class->SUPER::new ( 640 my $self = $class->SUPER::new (
514 bg => [0, 0, 0, 0.8], 641 bg => [0, 0, 0, 0.8],
515 @_, 642 @_,
516 ); 643 );
517 644
518 $self->add ($self->{vbox} = new CFClient::UI::VBox); 645 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
519 646
520 $self->{label} = [ 647 $self->{label} = [
521 map 648 map
522 CFClient::UI::Label->new ( 649 CFPlus::UI::Label->new (
523 can_hover => 1, 650 can_hover => 1,
524 can_events => 1, 651 can_events => 1,
525 tooltip_width => 0.33, 652 tooltip_width => 0.33,
526 fontsize => $_, 653 fontsize => $_,
527 ), (0.8) x 16 654 ), (0.8) x 16
528 ]; 655 ];
529 656
530 $self->{entry} = new CFClient::UI::Entry 657 $self->{entry} = new CFPlus::UI::Entry
531 on_changed => sub { 658 on_changed => sub {
532 $self->update_labels; 659 $self->update_labels;
533 0 660 0
534 }, 661 },
535 on_button_down => sub { 662 on_button_down => sub {
536 my ($entry, $ev, $x, $y) = @_; 663 my ($entry, $ev, $x, $y) = @_;
537 664
538 if ($ev->{button} == 3) { 665 if ($ev->{button} == 3) {
539 (new CFClient::UI::Menu 666 (new CFPlus::UI::Menu
540 items => [ 667 items => [
541 ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" 668 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
542 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 669 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
543 ], 670 ],
544 )->popup ($ev); 671 )->popup ($ev);
545 return 1; 672 return 1;
546 } 673 }
547 0 674 0
… …
562 $self->hide; 689 $self->hide;
563 } 690 }
564 } elsif ($ev->{sym} == 27) { 691 } elsif ($ev->{sym} == 27) {
565 $self->{hist_ptr} = 0; 692 $self->{hist_ptr} = 0;
566 $self->hide; 693 $self->hide;
567 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 694 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
568 if ($self->{hist_ptr} > 1) { 695 if ($self->{hist_ptr} > 1) {
569 $self->{hist_ptr}--; 696 $self->{hist_ptr}--;
570 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 697 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
571 } elsif ($self->{hist_ptr} > 0) { 698 } elsif ($self->{hist_ptr} > 0) {
572 $self->{hist_ptr}--; 699 $self->{hist_ptr}--;
… …
574 } else { 701 } else {
575 ++$self->{select_offset} 702 ++$self->{select_offset}
576 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 703 if $self->{select_offset} < $#{ $self->{last_match} || [] };
577 } 704 }
578 $self->update_labels; 705 $self->update_labels;
579 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 706 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
580 if ($self->{select_offset}) { 707 if ($self->{select_offset}) {
581 --$self->{select_offset} 708 --$self->{select_offset}
582 } else { 709 } else {
583 unless ($self->{hist_ptr}) { 710 unless ($self->{hist_ptr}) {
584 $self->{hist_saveback} = $self->{entry}->get_text; 711 $self->{hist_saveback} = $self->{entry}->get_text;
… …
742 869
743sub _draw { 870sub _draw {
744 my ($self) = @_; 871 my ($self) = @_;
745 872
746 # hack 873 # hack
747 local $CFClient::UI::FOCUS = $self->{entry}; 874 local $CFPlus::UI::FOCUS = $self->{entry};
748 875
749 $self->SUPER::_draw; 876 $self->SUPER::_draw;
750} 877}
751 878
7521 8791
880

Diff Legend

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