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

Diff Legend

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