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.78 by root, Sun Jul 23 16:11:12 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,
250 ["Quit",
251 sub {
252 if ($::CONN) {
253 &::open_quit_dialog;
254 } else {
255 exit;
256 }
257 }
120 ], 258 ],
259 ;
260
261 (new CFPlus::UI::Menu
262 items => \@items,
121 )->popup ($ev); 263 )->popup ($ev);
122 } 264 }
123 265
124 1 266 1
125} 267}
… …
144 1 286 1
145} 287}
146 288
147sub size_request { 289sub size_request {
148 ( 290 (
149 32 * CFClient::ceil $::WIDTH / 32, 291 32 * CFPlus::ceil $::WIDTH / 32,
150 32 * CFClient::ceil $::HEIGHT / 32, 292 32 * CFPlus::ceil $::HEIGHT / 32,
151 ) 293 )
152} 294}
153 295
154sub update { 296sub update {
155 my ($self) = @_; 297 my ($self) = @_;
… …
157 $self->{need_update} = 1; 299 $self->{need_update} = 1;
158 $self->SUPER::update; 300 $self->SUPER::update;
159} 301}
160 302
161my %DIR = ( 303my %DIR = (
162 CFClient::SDLK_KP8, [1, "north"], 304 CFPlus::SDLK_KP8, [1, "north"],
163 CFClient::SDLK_KP9, [2, "northeast"], 305 CFPlus::SDLK_KP9, [2, "northeast"],
164 CFClient::SDLK_KP6, [3, "east"], 306 CFPlus::SDLK_KP6, [3, "east"],
165 CFClient::SDLK_KP3, [4, "southeast"], 307 CFPlus::SDLK_KP3, [4, "southeast"],
166 CFClient::SDLK_KP2, [5, "south"], 308 CFPlus::SDLK_KP2, [5, "south"],
167 CFClient::SDLK_KP1, [6, "southwest"], 309 CFPlus::SDLK_KP1, [6, "southwest"],
168 CFClient::SDLK_KP4, [7, "west"], 310 CFPlus::SDLK_KP4, [7, "west"],
169 CFClient::SDLK_KP7, [8, "northwest"], 311 CFPlus::SDLK_KP7, [8, "northwest"],
170 312
171 CFClient::SDLK_UP, [1, "north"], 313 CFPlus::SDLK_UP, [1, "north"],
172 CFClient::SDLK_RIGHT, [3, "east"], 314 CFPlus::SDLK_RIGHT, [3, "east"],
173 CFClient::SDLK_DOWN, [5, "south"], 315 CFPlus::SDLK_DOWN, [5, "south"],
174 CFClient::SDLK_LEFT, [7, "west"], 316 CFPlus::SDLK_LEFT, [7, "west"],
175); 317);
176 318
177sub invoke_key_down { 319sub invoke_key_down {
178 my ($self, $ev) = @_; 320 my ($self, $ev) = @_;
179 321
180 my $mod = $ev->{mod}; 322 my $mod = $ev->{mod};
181 my $sym = $ev->{sym}; 323 my $sym = $ev->{sym};
182 my $uni = $ev->{unicode}; 324 my $uni = $ev->{unicode};
183 325
184 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 326 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
185 327
186 if ($uni == ord "\t") { 328 if ($uni == ord "\t") {
187 $::PL_WINDOW->toggle_visibility; 329 $::PL_WINDOW->toggle_visibility;
188 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 330 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
189 $::HELP_WINDOW->toggle_visibility; 331 $::HELP_WINDOW->toggle_visibility;
190 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
191 ::toggle_player_page ($::STATS_PAGE); 333 ::toggle_player_page ($::STATS_PAGE);
192 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
193 ::toggle_player_page ($::SKILL_PAGE); 335 ::toggle_player_page ($::SKILL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
195 ::toggle_player_page ($::SPELL_PAGE); 337 ::toggle_player_page ($::SPELL_PAGE);
196 } elsif ($sym == CFClient::SDLK_F5 && !$mod) { 338 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
197 ::toggle_player_page ($::INVENTORY_PAGE); 339 ::toggle_player_page ($::INVENTORY_PAGE);
198 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
199 $::SETUP_DIALOG->toggle_visibility; 341 $::SETUP_DIALOG->toggle_visibility;
200 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
201 $::BIND_EDITOR->set_binding (undef, undef, [],
202 sub {
203 my ($mod, $sym, $cmds) = @_;
204 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
205 });
206 $::BIND_EDITOR->start;
207 $::BIND_EDITOR->show;
208 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
209 $::BIND_EDITOR->stop;
210 $::BIND_EDITOR->ask_for_bind_and_commit;
211 $::BIND_EDITOR->hide;
212 } elsif (!$::CONN) { 342 } elsif (!$::CONN) {
213 return 0; # bindings further down need a valid connection 343 return 0; # bindings further down need a valid connection
214 344
215 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 345 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
216 $::CONN->user_send ("stay fire"); 346 $::CONN->user_send ("stay fire");
217 } elsif ($uni == ord ",") { 347 } elsif ($uni == ord ",") {
218 $::CONN->user_send ("take"); 348 $::CONN->user_send ("take");
219 } elsif ($uni == ord " ") { 349 } elsif ($uni == ord " ") {
220 $::CONN->user_send ("apply"); 350 $::CONN->user_send ("apply");
351 } elsif ($uni == 13) {
352 $::CONN->user_send ("examine");
221 } elsif ($uni == ord ".") { 353 } elsif ($uni == ord ".") {
222 $::CONN->user_send ($self->{completer}{last_command}) 354 $::CONN->user_send ($self->{completer}{last_command})
223 if exists $self->{completer}{last_command}; 355 if exists $self->{completer}{last_command};
224 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 356 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
357 warn "<@macros>\n";#d#
225 $::CONN->user_send ($_) for @$bind_cmd; 358 $::CONN->macro_send ($_) for @macros;
226 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 359 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
227 $::CONN->user_send ("rotateshoottype +"); 360 $::CONN->user_send ("rotateshoottype +");
228 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 361 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
229 $::CONN->user_send ("rotateshoottype -"); 362 $::CONN->user_send ("rotateshoottype -");
230 } elsif ($uni == ord '"') { 363 } elsif ($uni == ord '"') {
231 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 364 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
232 $self->{completer}->show; 365 $self->{completer}->show;
233 } elsif ($uni == ord "'") { 366 } elsif ($uni == ord "'") {
234 $self->{completer}->set_prefix (""); 367 $self->{completer}->set_prefix ("");
235 $self->{completer}->show; 368 $self->{completer}->show;
236 } elsif (exists $DIR{$sym}) { 369 } elsif (exists $DIR{$sym}) {
237 if ($mod & CFClient::KMOD_SHIFT) { 370 if ($mod & CFPlus::KMOD_SHIFT) {
238 $self->{shft}++; 371 $self->{shft}++;
239 if ($DIR{$sym}[0] != $self->{fire_dir}) { 372 if ($DIR{$sym}[0] != $self->{fire_dir}) {
240 $::CONN->user_send ("fire $DIR{$sym}[0]"); 373 $::CONN->user_send ("fire $DIR{$sym}[0]");
241 } 374 }
242 $self->{fire_dir} = $DIR{$sym}[0]; 375 $self->{fire_dir} = $DIR{$sym}[0];
243 } elsif ($mod & CFClient::KMOD_CTRL) { 376 } elsif ($mod & CFPlus::KMOD_CTRL) {
244 $self->{ctrl}++; 377 $self->{ctrl}++;
245 $::CONN->user_send ("run $DIR{$sym}[0]"); 378 $::CONN->user_send ("run $DIR{$sym}[0]");
246 } else { 379 } else {
247 $::CONN->user_send ("$DIR{$sym}[1]"); 380 $::CONN->user_send ("$DIR{$sym}[1]");
248 } 381 }
… …
262 my $res = 0; 395 my $res = 0;
263 my $mod = $ev->{mod}; 396 my $mod = $ev->{mod};
264 my $sym = $ev->{sym}; 397 my $sym = $ev->{sym};
265 398
266 if ($::CFG->{shift_fire_stop}) { 399 if ($::CFG->{shift_fire_stop}) {
267 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 400 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
268 $::CONN->user_send ("fire_stop"); 401 $::CONN->user_send ("fire_stop");
269 delete $self->{fire_dir}; 402 delete $self->{fire_dir};
270 $res = 1; 403 $res = 1;
271 } 404 }
272 } else { 405 } else {
273 if (exists $DIR{$sym} && delete $self->{shft}) { 406 if (exists $DIR{$sym} && delete $self->{shft}) {
274 $::CONN->user_send ("fire_stop"); 407 $::CONN->user_send ("fire_stop");
275 delete $self->{fire_dir}; 408 delete $self->{fire_dir};
276 $res = 1; 409 $res = 1;
277 } 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?
278 $::CONN->user_send ("fire_stop"); 411 $::CONN->user_send ("fire_stop");
279 delete $self->{fire_dir}; 412 delete $self->{fire_dir};
280 $res = 1; 413 $res = 1;
281 } 414 }
282 } 415 }
283 416
284 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 417 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
285 $::CONN->user_send ("run_stop"); 418 $::CONN->user_send ("run_stop");
286 $res = 1; 419 $res = 1;
287 } 420 }
288 421
289 $res 422 $res
290} 423}
291 424
292sub set_magicmap { 425sub set_magicmap {
293 my ($self, $w, $h, $x, $y, $data) = @_; 426 my ($self, $w, $h, $x, $y, $data) = @_;
294 427
295 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 428 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
296 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 429 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
297 430
298 $self->{magicmap} = [$x, $y, $w, $h, $data]; 431 $self->{magicmap} = [$x, $y, $w, $h, $data];
299 432
300 $self->update; 433 $self->update;
301} 434}
… …
303sub draw { 436sub draw {
304 my ($self) = @_; 437 my ($self) = @_;
305 438
306 return unless $::MAP; 439 return unless $::MAP;
307 440
308 my $focused = $CFClient::UI::FOCUS == $self 441 my $focused = $CFPlus::UI::FOCUS == $self
309 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 442 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
310 443
311 return 444 return
312 unless $focused || !$::FAST; 445 unless $focused || !$::FAST;
313 446
314 if (delete $self->{need_update}) { 447 if (delete $self->{need_update}) {
315 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 448 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
316 449
450 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
451 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
452
317 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 453 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
318 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 454 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
319 455
320 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 456 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
321 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 457 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
322 458
323 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 459 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
324 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 460 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
325 461
326 if ($::CFG->{fow_enable}) { 462 if ($::CFG->{fow_enable}) {
327 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);
328 464
329 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
330 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 466 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
331 glConvolutionFilter2D ( 467 glConvolutionFilter2D (
332 GL_CONVOLUTION_2D, 468 GL_CONVOLUTION_2D,
333 GL_ALPHA, 469 GL_ALPHA,
334 3, 3, 470 3, 3,
… …
336 (pack "f*", @{ $self->{smooth_matrix} }), 472 (pack "f*", @{ $self->{smooth_matrix} }),
337 ); 473 );
338 glEnable GL_CONVOLUTION_2D; 474 glEnable GL_CONVOLUTION_2D;
339 } 475 }
340 476
341 $self->{fow_texture} = new CFClient::Texture 477 $self->{fow_texture} = new CFPlus::Texture
342 w => $w, 478 w => $w,
343 h => $h, 479 h => $h,
344 data => $data, 480 data => $data,
345 internalformat => GL_ALPHA, 481 internalformat => GL_ALPHA,
346 format => GL_ALPHA; 482 format => GL_ALPHA;
… …
354 490
355 glPushMatrix; 491 glPushMatrix;
356 glTranslate $sx0, $sy0; 492 glTranslate $sx0, $sy0;
357 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 493 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
358 494
359 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 495 $::MAP->draw ($dx, $dy, $sw, $sh);
360 496
361 glScale 32, 32; 497 glScale 32, 32;
362 498
363 if (my $tex = $self->{fow_texture}) { 499 if (my $tex = $self->{fow_texture}) {
364 glEnable GL_TEXTURE_2D; 500 glEnable GL_TEXTURE_2D;
… …
371 } 507 }
372 508
373 if ($self->{magicmap}) { 509 if ($self->{magicmap}) {
374 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 510 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
375 511
376 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 512 $x += $::MAP->ox + $self->{dx};
377 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 513 $y += $::MAP->oy + $self->{dy};
378 514
379 glTranslate - $x - 1, - $y - 1; 515 glTranslate - $x - 1, - $y - 1;
380 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 516 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
381 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 517 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
382 } 518 }
… …
408 glDeleteList $self->{list}; 544 glDeleteList $self->{list};
409 545
410 $self->SUPER::DESTROY; 546 $self->SUPER::DESTROY;
411} 547}
412 548
413package CFClient::MapWidget::MapMap; 549package CFPlus::MapWidget::MapMap;
414 550
415our @ISA = CFClient::UI::Base::; 551our @ISA = CFPlus::UI::Base::;
416 552
417use Time::HiRes qw(time); 553use Time::HiRes qw(time);
418use CFClient::OpenGL; 554use CFPlus::OpenGL;
419 555
420sub size_request { 556sub size_request {
421 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 557 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
422} 558}
423 559
… …
459 595
460 if ($self->{texture_atime} < time) { 596 if ($self->{texture_atime} < time) {
461 $self->{texture_atime} = time + 1/3; 597 $self->{texture_atime} = time + 1/3;
462 598
463 $self->{texture} = 599 $self->{texture} =
464 new CFClient::Texture 600 new CFPlus::Texture
465 w => $w, 601 w => $w,
466 h => $h, 602 h => $h,
467 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 603 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
468 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;
469 } 605 }
470 606
471 $self->{texture}->draw_quad (0, 0); 607 $self->{texture}->draw_quad (0, 0);
472 608
473 glDisable GL_TEXTURE_2D; 609 glDisable GL_TEXTURE_2D;
… …
488 glEnd; 624 glEnd;
489 625
490 glDisable GL_BLEND; 626 glDisable GL_BLEND;
491} 627}
492 628
493package CFClient::MapWidget::Command; 629package CFPlus::MapWidget::Command;
494 630
495use strict; 631use strict;
496 632
497use CFClient::OpenGL; 633use CFPlus::OpenGL;
498 634
499our @ISA = CFClient::UI::Frame::; 635our @ISA = CFPlus::UI::Frame::;
500 636
501sub new { 637sub new {
502 my $class = shift; 638 my $class = shift;
503 639
504 my $self = $class->SUPER::new ( 640 my $self = $class->SUPER::new (
505 bg => [0, 0, 0, 0.8], 641 bg => [0, 0, 0, 0.8],
506 @_, 642 @_,
507 ); 643 );
508 644
509 $self->add ($self->{vbox} = new CFClient::UI::VBox); 645 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
510 646
511 $self->{label} = [ 647 $self->{label} = [
512 map 648 map
513 CFClient::UI::Label->new ( 649 CFPlus::UI::Label->new (
514 can_hover => 1, 650 can_hover => 1,
515 can_events => 1, 651 can_events => 1,
516 tooltip_width => 0.33, 652 tooltip_width => 0.33,
517 fontsize => $_, 653 fontsize => $_,
518 ), (0.8) x 16 654 ), (0.8) x 16
519 ]; 655 ];
520 656
521 $self->{entry} = new CFClient::UI::Entry 657 $self->{entry} = new CFPlus::UI::Entry
522 on_changed => sub { 658 on_changed => sub {
523 $self->update_labels; 659 $self->update_labels;
524 0 660 0
525 }, 661 },
526 on_button_down => sub { 662 on_button_down => sub {
527 my ($entry, $ev, $x, $y) = @_; 663 my ($entry, $ev, $x, $y) = @_;
528 664
529 if ($ev->{button} == 3) { 665 if ($ev->{button} == 3) {
530 (new CFClient::UI::Menu 666 (new CFPlus::UI::Menu
531 items => [ 667 items => [
532 ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" 668 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
533 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 669 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
534 ], 670 ],
535 )->popup ($ev); 671 )->popup ($ev);
536 return 1; 672 return 1;
537 } 673 }
538 0 674 0
… …
553 $self->hide; 689 $self->hide;
554 } 690 }
555 } elsif ($ev->{sym} == 27) { 691 } elsif ($ev->{sym} == 27) {
556 $self->{hist_ptr} = 0; 692 $self->{hist_ptr} = 0;
557 $self->hide; 693 $self->hide;
558 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 694 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
559 if ($self->{hist_ptr} > 1) { 695 if ($self->{hist_ptr} > 1) {
560 $self->{hist_ptr}--; 696 $self->{hist_ptr}--;
561 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 697 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
562 } elsif ($self->{hist_ptr} > 0) { 698 } elsif ($self->{hist_ptr} > 0) {
563 $self->{hist_ptr}--; 699 $self->{hist_ptr}--;
… …
565 } else { 701 } else {
566 ++$self->{select_offset} 702 ++$self->{select_offset}
567 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 703 if $self->{select_offset} < $#{ $self->{last_match} || [] };
568 } 704 }
569 $self->update_labels; 705 $self->update_labels;
570 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 706 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
571 if ($self->{select_offset}) { 707 if ($self->{select_offset}) {
572 --$self->{select_offset} 708 --$self->{select_offset}
573 } else { 709 } else {
574 unless ($self->{hist_ptr}) { 710 unless ($self->{hist_ptr}) {
575 $self->{hist_saveback} = $self->{entry}->get_text; 711 $self->{hist_saveback} = $self->{entry}->get_text;
… …
733 869
734sub _draw { 870sub _draw {
735 my ($self) = @_; 871 my ($self) = @_;
736 872
737 # hack 873 # hack
738 local $CFClient::UI::FOCUS = $self->{entry}; 874 local $CFPlus::UI::FOCUS = $self->{entry};
739 875
740 $self->SUPER::_draw; 876 $self->SUPER::_draw;
741} 877}
742 878
7431 8791
880

Diff Legend

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