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.102 by root, Sun Apr 1 15:08:14 2007 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;
11use CFPlus::Macro;
9 12
10our @ISA = CFClient::UI::Base::; 13our @ISA = CFPlus::UI::Base::;
14
15sub ::T() { 64 }
11 16
12my $magicmap_tex = 17my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", 18 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 19 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15 20
16sub new { 21sub new {
17 my $class = shift; 22 my $class = shift;
18 23
… …
28 ], 33 ],
29 34
30 @_ 35 @_
31 ); 36 );
32 37
33 $self->{completer} = new CFClient::MapWidget::Command:: 38 $self->{completer} = new CFPlus::MapWidget::Command::
34 command => $self->{command}, 39 command => $self->{command},
35 tooltip => "<b>The Command Completer</b>\n\n" 40 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 ; 41 ;
44 42
45 $self 43 $self
46} 44}
47 45
… …
64 62
65 $self->{completer}->hide 63 $self->{completer}->hide
66 if $self->{completer}; 64 if $self->{completer};
67} 65}
68 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
69sub invoke_button_down { 177sub invoke_button_down {
70 my ($self, $ev, $x, $y) = @_; 178 my ($self, $ev, $x, $y) = @_;
71 179
72 if ($ev->{button} == 1) { 180 if ($ev->{button} == 1) {
73 $self->grab_focus; 181 $self->grab_focus;
74 return unless $::CONN; 182 return unless $::CONN;
75 183
76 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 184 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}; 185 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
78 186
79 $x -= int 0.5 * $self->{sw}; 187 $x -= CFPlus::floor $::MAP->w * 0.5;
80 $y -= int 0.5 * $self->{sh}; 188 $y -= CFPlus::floor $::MAP->h * 0.5;
81 189
190 if ($::CONN) {
191 if ($::IN_BUILD_MODE) {
192 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
193 } else {
82 $::CONN->lookat ($x, $y) 194 $::CONN->lookat ($x, $y)
83 if $::CONN; 195 }
196 }
84 197
85 } elsif ($ev->{button} == 2) { 198 } elsif ($ev->{button} == 2) {
86 $self->grab_focus; 199 $self->grab_focus;
87 return unless $::CONN; 200 return unless $::CONN;
88 201
… …
98 $::CFG->{map_shift_y} = $bh + $y - $oy; 211 $::CFG->{map_shift_y} = $bh + $y - $oy;
99 212
100 $self->update; 213 $self->update;
101 }; 214 };
102 } elsif ($ev->{button} == 3) { 215 } elsif ($ev->{button} == 3) {
103 (new CFClient::UI::Menu 216 my @items = (
104 items => [
105 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], 217 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
106 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], 218 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
107 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], 219 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
108 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], 220 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
109 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], 221 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
… …
113 $::PICKUP_ENABLE->{state} 225 $::PICKUP_ENABLE->{state}
114 ? "Disable automatic pickup" 226 ? "Disable automatic pickup"
115 : "Enable automatic pickup", 227 : "Enable automatic pickup",
116 sub { $::PICKUP_ENABLE->toggle } 228 sub { $::PICKUP_ENABLE->toggle }
117 ], 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,
252 ["Quit",
253 sub {
254 if ($::CONN) {
255 &::open_quit_dialog;
256 } else {
257 exit;
258 }
259 }
118 ], 260 ],
261 ;
262
263 (new CFPlus::UI::Menu
264 items => \@items,
119 )->popup ($ev); 265 )->popup ($ev);
120 } 266 }
121 267
122 1 268 1
123} 269}
… …
142 1 288 1
143} 289}
144 290
145sub size_request { 291sub size_request {
146 ( 292 (
147 32 * CFClient::ceil $::WIDTH / 32, 293 ::T * CFPlus::ceil $::WIDTH / ::T,
148 32 * CFClient::ceil $::HEIGHT / 32, 294 ::T * CFPlus::ceil $::HEIGHT / ::T,
149 ) 295 )
150} 296}
151 297
152sub update { 298sub update {
153 my ($self) = @_; 299 my ($self) = @_;
… …
155 $self->{need_update} = 1; 301 $self->{need_update} = 1;
156 $self->SUPER::update; 302 $self->SUPER::update;
157} 303}
158 304
159my %DIR = ( 305my %DIR = (
160 CFClient::SDLK_KP8, [1, "north"], 306 CFPlus::SDLK_KP8, [1, "north"],
161 CFClient::SDLK_KP9, [2, "northeast"], 307 CFPlus::SDLK_KP9, [2, "northeast"],
162 CFClient::SDLK_KP6, [3, "east"], 308 CFPlus::SDLK_KP6, [3, "east"],
163 CFClient::SDLK_KP3, [4, "southeast"], 309 CFPlus::SDLK_KP3, [4, "southeast"],
164 CFClient::SDLK_KP2, [5, "south"], 310 CFPlus::SDLK_KP2, [5, "south"],
165 CFClient::SDLK_KP1, [6, "southwest"], 311 CFPlus::SDLK_KP1, [6, "southwest"],
166 CFClient::SDLK_KP4, [7, "west"], 312 CFPlus::SDLK_KP4, [7, "west"],
167 CFClient::SDLK_KP7, [8, "northwest"], 313 CFPlus::SDLK_KP7, [8, "northwest"],
168 314
169 CFClient::SDLK_UP, [1, "north"], 315 CFPlus::SDLK_UP, [1, "north"],
170 CFClient::SDLK_RIGHT, [3, "east"], 316 CFPlus::SDLK_RIGHT, [3, "east"],
171 CFClient::SDLK_DOWN, [5, "south"], 317 CFPlus::SDLK_DOWN, [5, "south"],
172 CFClient::SDLK_LEFT, [7, "west"], 318 CFPlus::SDLK_LEFT, [7, "west"],
173); 319);
174 320
175sub invoke_key_down { 321sub invoke_key_down {
176 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
177 323
178 my $mod = $ev->{mod}; 324 my $mod = $ev->{mod};
179 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
180 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
181 327
182 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
183 329
184 if ($uni == ord "\t") { 330 if ($sym == 9) {
185 $::PL_WINDOW->toggle_visibility; 331 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
186 } elsif ($sym == CFClient::SDLK_F1 && !$mod) { 332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
187 $::HELP_WINDOW->toggle_visibility; 333 $::HELP_WINDOW->toggle_visibility;
188 } elsif ($sym == CFClient::SDLK_F2 && !$mod) { 334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
189 ::toggle_player_page ($::STATS_PAGE); 335 ::toggle_player_page ($::STATS_PAGE);
190 } elsif ($sym == CFClient::SDLK_F3 && !$mod) { 336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
191 ::toggle_player_page ($::SKILL_PAGE); 337 ::toggle_player_page ($::SKILL_PAGE);
192 } elsif ($sym == CFClient::SDLK_F4 && !$mod) { 338 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
193 ::toggle_player_page ($::SPELL_PAGE); 339 ::toggle_player_page ($::SPELL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F5 && !$mod) { 340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
195 ::toggle_player_page ($::INVENTORY_PAGE); 341 ::toggle_player_page ($::INVENTORY_PAGE);
196 } elsif ($sym == CFClient::SDLK_F9 && !$mod) { 342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
197 $::SETUP_DIALOG->toggle_visibility; 343 $::SETUP_DIALOG->toggle_visibility;
198 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
199 $::BIND_EDITOR->set_binding (undef, undef, [],
200 sub {
201 my ($mod, $sym, $cmds) = @_;
202 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
203 });
204 $::BIND_EDITOR->start;
205 $::BIND_EDITOR->show;
206 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
207 $::BIND_EDITOR->stop;
208 $::BIND_EDITOR->ask_for_bind_and_commit;
209 $::BIND_EDITOR->hide;
210 } elsif (!$::CONN) { 344 } elsif (!$::CONN) {
211 return 0; # bindings further down need a valid connection 345 return 0; # bindings further down need a valid connection
212 346
213 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { 347 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
214 $::CONN->user_send ("stay fire"); 348 $::CONN->user_send ("stay fire");
215 } elsif ($uni == ord ",") { 349 } elsif ($uni == ord ",") {
216 $::CONN->user_send ("take"); 350 $::CONN->user_send ("take");
217 } elsif ($uni == ord " ") { 351 } elsif ($uni == ord " ") {
218 $::CONN->user_send ("apply"); 352 $::CONN->user_send ("apply");
353 } elsif ($uni == 13) {
354 $::CONN->user_send ("examine");
219 } elsif ($uni == ord ".") { 355 } elsif ($uni == ord ".") {
220 $::CONN->user_send ($self->{completer}{last_command}) 356 $::CONN->user_send ($self->{completer}{last_command})
221 if exists $self->{completer}{last_command}; 357 if exists $self->{completer}{last_command};
222 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { 358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
223 $::CONN->user_send ($_) for @$bind_cmd; 359 $::CONN->macro_send ($_) for @macros;
224 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { 360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
225 $::CONN->user_send ("rotateshoottype +"); 361 $::CONN->user_send ("rotateshoottype +");
226 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { 362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
227 $::CONN->user_send ("rotateshoottype -"); 363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
228 } elsif ($uni == ord '"') { 367 } elsif ($uni == ord '"') {
229 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
230 $self->{completer}->show; 369 $self->{completer}->show;
231 } elsif ($uni == ord "'") { 370 } elsif ($uni == ord "'") {
232 $self->{completer}->set_prefix (""); 371 $self->{completer}->set_prefix ("");
233 $self->{completer}->show; 372 $self->{completer}->show;
234 } elsif (exists $DIR{$sym}) { 373 } elsif (exists $DIR{$sym}) {
235 if ($mod & CFClient::KMOD_SHIFT) { 374 if ($mod & CFPlus::KMOD_SHIFT) {
236 $self->{shft}++; 375 $self->{shft}++;
237 if ($DIR{$sym}[0] != $self->{fire_dir}) { 376 if ($DIR{$sym}[0] != $self->{fire_dir}) {
238 $::CONN->user_send ("fire $DIR{$sym}[0]"); 377 $::CONN->user_send ("fire $DIR{$sym}[0]");
239 } 378 }
240 $self->{fire_dir} = $DIR{$sym}[0]; 379 $self->{fire_dir} = $DIR{$sym}[0];
241 } elsif ($mod & CFClient::KMOD_CTRL) { 380 } elsif ($mod & CFPlus::KMOD_CTRL) {
242 $self->{ctrl}++; 381 $self->{ctrl}++;
243 $::CONN->user_send ("run $DIR{$sym}[0]"); 382 $::CONN->user_send ("run $DIR{$sym}[0]");
244 } else { 383 } else {
245 $::CONN->user_send ("$DIR{$sym}[1]"); 384 $::CONN->user_send ("$DIR{$sym}[1]");
246 } 385 }
… …
260 my $res = 0; 399 my $res = 0;
261 my $mod = $ev->{mod}; 400 my $mod = $ev->{mod};
262 my $sym = $ev->{sym}; 401 my $sym = $ev->{sym};
263 402
264 if ($::CFG->{shift_fire_stop}) { 403 if ($::CFG->{shift_fire_stop}) {
265 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 404 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
266 $::CONN->user_send ("fire_stop"); 405 $::CONN->user_send ("fire_stop");
267 delete $self->{fire_dir}; 406 delete $self->{fire_dir};
268 $res = 1; 407 $res = 1;
269 } 408 }
270 } else { 409 } else {
271 if (exists $DIR{$sym} && delete $self->{shft}) { 410 if (exists $DIR{$sym} && delete $self->{shft}) {
272 $::CONN->user_send ("fire_stop"); 411 $::CONN->user_send ("fire_stop");
273 delete $self->{fire_dir}; 412 delete $self->{fire_dir};
274 $res = 1; 413 $res = 1;
275 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 414 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
276 $::CONN->user_send ("fire_stop"); 415 $::CONN->user_send ("fire_stop");
277 delete $self->{fire_dir}; 416 delete $self->{fire_dir};
278 $res = 1; 417 $res = 1;
279 } 418 }
280 } 419 }
281 420
282 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 421 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
283 $::CONN->user_send ("run_stop"); 422 $::CONN->user_send ("run_stop");
284 $res = 1; 423 $res = 1;
285 } 424 }
286 425
287 $res 426 $res
288} 427}
289 428
290sub set_magicmap { 429sub set_magicmap {
291 my ($self, $w, $h, $x, $y, $data) = @_; 430 my ($self, $w, $h, $x, $y, $data) = @_;
292 431
293 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 432 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
294 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 433 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
295 434
296 $self->{magicmap} = [$x, $y, $w, $h, $data]; 435 $self->{magicmap} = [$x, $y, $w, $h, $data];
297 436
298 $self->update; 437 $self->update;
299} 438}
… …
301sub draw { 440sub draw {
302 my ($self) = @_; 441 my ($self) = @_;
303 442
304 return unless $::MAP; 443 return unless $::MAP;
305 444
306 my $focused = $CFClient::UI::FOCUS == $self 445 my $focused = $CFPlus::UI::FOCUS == $self
307 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 446 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
308 447
309 return 448 return
310 unless $focused || !$::FAST; 449 unless $focused || !$::FAST;
311 450
312 if (delete $self->{need_update}) { 451 if (delete $self->{need_update}) {
313 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 452 my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale};
314 453
454 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
455 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
456
315 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 457 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
316 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 458 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
317 459
318 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 460 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
319 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 461 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
320 462
321 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 463 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
322 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 464 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
323 465
324 if ($::CFG->{fow_enable}) { 466 if ($::CFG->{fow_enable}) {
325 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);
326 468
327 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 469 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); 470 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
329 glConvolutionFilter2D ( 471 glConvolutionFilter2D (
330 GL_CONVOLUTION_2D, 472 GL_CONVOLUTION_2D,
331 GL_ALPHA, 473 GL_ALPHA,
332 3, 3, 474 3, 3,
… …
334 (pack "f*", @{ $self->{smooth_matrix} }), 476 (pack "f*", @{ $self->{smooth_matrix} }),
335 ); 477 );
336 glEnable GL_CONVOLUTION_2D; 478 glEnable GL_CONVOLUTION_2D;
337 } 479 }
338 480
339 $self->{fow_texture} = new CFClient::Texture 481 $self->{fow_texture} = new CFPlus::Texture
340 w => $w, 482 w => $w,
341 h => $h, 483 h => $h,
342 data => $data, 484 data => $data,
343 internalformat => GL_ALPHA, 485 internalformat => GL_ALPHA,
344 format => GL_ALPHA; 486 format => GL_ALPHA;
… …
352 494
353 glPushMatrix; 495 glPushMatrix;
354 glTranslate $sx0, $sy0; 496 glTranslate $sx0, $sy0;
355 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 497 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
356 498
357 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 499 $::MAP->draw ($dx, $dy, $sw, $sh, ::T);
358 500
359 glScale 32, 32; 501 glScale ::T, ::T;
360 502
361 if (my $tex = $self->{fow_texture}) { 503 if (my $tex = $self->{fow_texture}) {
362 glEnable GL_TEXTURE_2D; 504 glEnable GL_TEXTURE_2D;
363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
364 506
… …
369 } 511 }
370 512
371 if ($self->{magicmap}) { 513 if ($self->{magicmap}) {
372 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 514 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
373 515
374 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 516 $x += $::MAP->ox + $self->{dx};
375 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 517 $y += $::MAP->oy + $self->{dy};
376 518
377 glTranslate - $x - 1, - $y - 1; 519 glTranslate - $x - 1, - $y - 1;
378 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 520 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
379 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 521 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
380 } 522 }
… …
406 glDeleteList $self->{list}; 548 glDeleteList $self->{list};
407 549
408 $self->SUPER::DESTROY; 550 $self->SUPER::DESTROY;
409} 551}
410 552
411package CFClient::MapWidget::MapMap; 553package CFPlus::MapWidget::MapMap;
412 554
413our @ISA = CFClient::UI::Base::; 555our @ISA = CFPlus::UI::Base::;
414 556
415use Time::HiRes qw(time); 557use Time::HiRes qw(time);
416use CFClient::OpenGL; 558use CFPlus::OpenGL;
417 559
418sub size_request { 560sub size_request {
419 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 561 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
420} 562}
421 563
… …
439 581
440 $::MAP or return; 582 $::MAP or return;
441 583
442 my ($w, $h) = @$self{qw(w h)}; 584 my ($w, $h) = @$self{qw(w h)};
443 585
444 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 586 my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99;
445 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 587 my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99;
446 588
447 my $sx = int $::CFG->{map_shift_x} / 32; 589 my $sx = int $::CFG->{map_shift_x} / ::T;
448 my $sy = int $::CFG->{map_shift_y} / 32; 590 my $sy = int $::CFG->{map_shift_y} / ::T;
449 591
450 my $ox = 0.5 * ($w - $sw); 592 my $ox = 0.5 * ($w - $sw);
451 my $oy = 0.5 * ($h - $sh); 593 my $oy = 0.5 * ($h - $sh);
452 594
453 glEnable GL_BLEND; 595 glEnable GL_BLEND;
… …
457 599
458 if ($self->{texture_atime} < time) { 600 if ($self->{texture_atime} < time) {
459 $self->{texture_atime} = time + 1/3; 601 $self->{texture_atime} = time + 1/3;
460 602
461 $self->{texture} = 603 $self->{texture} =
462 new CFClient::Texture 604 new CFPlus::Texture
463 w => $w, 605 w => $w,
464 h => $h, 606 h => $h,
465 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 607 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; 608 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
467 } 609 }
468 610
469 $self->{texture}->draw_quad (0, 0); 611 $self->{texture}->draw_quad (0, 0);
470 612
471 glDisable GL_TEXTURE_2D; 613 glDisable GL_TEXTURE_2D;
… …
486 glEnd; 628 glEnd;
487 629
488 glDisable GL_BLEND; 630 glDisable GL_BLEND;
489} 631}
490 632
491package CFClient::MapWidget::Command; 633package CFPlus::MapWidget::Command;
492 634
493use strict; 635use strict;
494 636
495use CFClient::OpenGL; 637use CFPlus::OpenGL;
496 638
497our @ISA = CFClient::UI::Frame::; 639our @ISA = CFPlus::UI::Frame::;
498 640
499sub new { 641sub new {
500 my $class = shift; 642 my $class = shift;
501 643
502 my $self = $class->SUPER::new ( 644 my $self = $class->SUPER::new (
503 bg => [0, 0, 0, 0.8], 645 bg => [0, 0, 0, 0.8],
504 @_, 646 @_,
505 ); 647 );
506 648
507 $self->add ($self->{vbox} = new CFClient::UI::VBox); 649 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
508 650
509 $self->{label} = [ 651 $self->{label} = [
510 map 652 map
511 CFClient::UI::Label->new ( 653 CFPlus::UI::Label->new (
512 can_hover => 1, 654 can_hover => 1,
513 can_events => 1, 655 can_events => 1,
514 tooltip_width => 0.33, 656 tooltip_width => 0.33,
515 fontsize => $_, 657 fontsize => $_,
516 ), (0.8) x 16 658 ), (0.8) x 16
517 ]; 659 ];
518 660
519 $self->{entry} = new CFClient::UI::Entry 661 $self->{entry} = new CFPlus::UI::Entry
520 on_changed => sub { 662 on_changed => sub {
521 $self->update_labels; 663 $self->update_labels;
522 0 664 0
523 }, 665 },
524 on_button_down => sub { 666 on_button_down => sub {
525 my ($entry, $ev, $x, $y) = @_; 667 my ($entry, $ev, $x, $y) = @_;
526 668
527 if ($ev->{button} == 3) { 669 if ($ev->{button} == 3) {
528 (new CFClient::UI::Menu 670 (new CFPlus::UI::Menu
529 items => [ 671 items => [
530 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 672 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
531 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 673 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
532 ], 674 ],
533 )->popup ($ev); 675 )->popup ($ev);
534 return 1; 676 return 1;
535 } 677 }
536 0 678 0
… …
551 $self->hide; 693 $self->hide;
552 } 694 }
553 } elsif ($ev->{sym} == 27) { 695 } elsif ($ev->{sym} == 27) {
554 $self->{hist_ptr} = 0; 696 $self->{hist_ptr} = 0;
555 $self->hide; 697 $self->hide;
556 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 698 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
557 if ($self->{hist_ptr} > 1) { 699 if ($self->{hist_ptr} > 1) {
558 $self->{hist_ptr}--; 700 $self->{hist_ptr}--;
559 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 701 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
560 } elsif ($self->{hist_ptr} > 0) { 702 } elsif ($self->{hist_ptr} > 0) {
561 $self->{hist_ptr}--; 703 $self->{hist_ptr}--;
… …
563 } else { 705 } else {
564 ++$self->{select_offset} 706 ++$self->{select_offset}
565 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 707 if $self->{select_offset} < $#{ $self->{last_match} || [] };
566 } 708 }
567 $self->update_labels; 709 $self->update_labels;
568 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 710 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
569 if ($self->{select_offset}) { 711 if ($self->{select_offset}) {
570 --$self->{select_offset} 712 --$self->{select_offset}
571 } else { 713 } else {
572 unless ($self->{hist_ptr}) { 714 unless ($self->{hist_ptr}) {
573 $self->{hist_saveback} = $self->{entry}->get_text; 715 $self->{hist_saveback} = $self->{entry}->get_text;
… …
731 873
732sub _draw { 874sub _draw {
733 my ($self) = @_; 875 my ($self) = @_;
734 876
735 # hack 877 # hack
736 local $CFClient::UI::FOCUS = $self->{entry}; 878 local $CFPlus::UI::FOCUS = $self->{entry};
737 879
738 $self->SUPER::_draw; 880 $self->SUPER::_draw;
739} 881}
740 882
7411 8831
884

Diff Legend

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