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.70 by elmex, Sun Jul 2 19:32:55 2006 UTC vs.
Revision 1.101 by root, Sun Apr 1 01:19:18 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() { 32 }
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 can_focus => 1, 40 tooltip => "#completer_help",
36 tooltip => "<b>The Command Completer</b>\n\n"
37 . "This is your central interface to send text commands to the server. "
38 . "To enter a verbatim command to send to the server, just type the command, "
39 . "followed by a space, and press return. "
40 . "Typing the initial letters of words (or just any letters) displays guesses "
41 . "for commands you might want to use.\n"
42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
44 ; 41 ;
45 42
46 $self 43 $self
47} 44}
48 45
… …
60 57
61sub clr_commands { 58sub clr_commands {
62 my ($self) = @_; 59 my ($self) = @_;
63 60
64 %{$self->{completer}{command}} = (); 61 %{$self->{completer}{command}} = ();
62
63 $self->{completer}->hide
64 if $self->{completer};
65}
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 }
65} 175}
66 176
67sub invoke_button_down { 177sub invoke_button_down {
68 my ($self, $ev, $x, $y) = @_; 178 my ($self, $ev, $x, $y) = @_;
69 179
70 return unless $::CONN;
71
72 $self->grab_focus;
73
74 if ($ev->{button} == 1) { 180 if ($ev->{button} == 1) {
181 $self->grab_focus;
182 return unless $::CONN;
183
75 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};
76 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};
77 186
78 $x -= int 0.5 * $self->{sw}; 187 $x -= CFPlus::floor $::MAP->w * 0.5;
79 $y -= int 0.5 * $self->{sh}; 188 $y -= CFPlus::floor $::MAP->h * 0.5;
80 189
190 if ($::CONN) {
191 if ($::IN_BUILD_MODE) {
192 $::CONN->buildat ($::IN_BUILD_MODE, $x, $y);
193 } else {
81 $::CONN->lookat ($x, $y) 194 $::CONN->lookat ($x, $y)
82 if $::CONN; 195 }
196 }
83 197
84 } elsif ($ev->{button} == 2) { 198 } elsif ($ev->{button} == 2) {
199 $self->grab_focus;
200 return unless $::CONN;
201
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 202 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 203 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 204
88 $self->{motion} = sub { 205 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 206 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 210 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 211 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 212
96 $self->update; 213 $self->update;
97 }; 214 };
215 } elsif ($ev->{button} == 3) {
216 my @items = (
217 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
218 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
219 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
220 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
221 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
222 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
223 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
224 [
225 $::PICKUP_ENABLE->{state}
226 ? "Disable automatic pickup"
227 : "Enable automatic pickup",
228 sub { $::PICKUP_ENABLE->toggle }
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 }
260 ],
261 ;
262
263 (new CFPlus::UI::Menu
264 items => \@items,
265 )->popup ($ev);
98 } 266 }
99 267
100 1 268 1
101} 269}
102 270
… …
120 1 288 1
121} 289}
122 290
123sub size_request { 291sub size_request {
124 ( 292 (
125 32 * CFClient::ceil $::WIDTH / 32, 293 ::T * CFPlus::ceil $::WIDTH / ::T,
126 32 * CFClient::ceil $::HEIGHT / 32, 294 ::T * CFPlus::ceil $::HEIGHT / ::T,
127 ) 295 )
128} 296}
129 297
130sub update { 298sub update {
131 my ($self) = @_; 299 my ($self) = @_;
… …
133 $self->{need_update} = 1; 301 $self->{need_update} = 1;
134 $self->SUPER::update; 302 $self->SUPER::update;
135} 303}
136 304
137my %DIR = ( 305my %DIR = (
138 CFClient::SDLK_KP8, [1, "north"], 306 CFPlus::SDLK_KP8, [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"], 307 CFPlus::SDLK_KP9, [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"], 308 CFPlus::SDLK_KP6, [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"], 309 CFPlus::SDLK_KP3, [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"], 310 CFPlus::SDLK_KP2, [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"], 311 CFPlus::SDLK_KP1, [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"], 312 CFPlus::SDLK_KP4, [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"], 313 CFPlus::SDLK_KP7, [8, "northwest"],
146 314
147 CFClient::SDLK_UP, [1, "north"], 315 CFPlus::SDLK_UP, [1, "north"],
148 CFClient::SDLK_RIGHT, [3, "east"], 316 CFPlus::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 317 CFPlus::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 318 CFPlus::SDLK_LEFT, [7, "west"],
151); 319);
152 320
153sub invoke_key_down { 321sub invoke_key_down {
154 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 323
158 my $mod = $ev->{mod}; 324 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
161 327
162 if ($sym == CFClient::SDLK_KP5) { 328 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
329
330 if ($sym == 9) {
331 ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility;
332 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
333 $::HELP_WINDOW->toggle_visibility;
334 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
335 ::toggle_player_page ($::STATS_PAGE);
336 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
337 ::toggle_player_page ($::SKILL_PAGE);
338 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
339 ::toggle_player_page ($::SPELL_PAGE);
340 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
341 ::toggle_player_page ($::INVENTORY_PAGE);
342 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
343 $::SETUP_DIALOG->toggle_visibility;
344 } elsif (!$::CONN) {
345 return 0; # bindings further down need a valid connection
346
347 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 348 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 349 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 350 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 351 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 352 $::CONN->user_send ("apply");
353 } elsif ($uni == 13) {
354 $::CONN->user_send ("examine");
168 } elsif ($uni == ord ".") { 355 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 356 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 357 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
172 $::PL_WINDOW->toggle_visibility; 359 $::CONN->macro_send ($_) for @macros;
173 $::PL_NOTEBOOK->set_current_page ("Inventory");
174 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
175 $::CONN->user_send ("rotateshoottype +"); 361 $::CONN->user_send ("rotateshoottype +");
176 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
177 $::CONN->user_send ("rotateshoottype -"); 363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
178 } elsif ($uni == ord '"') { 367 } elsif ($uni == ord '"') {
179 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
180 $self->{completer}->show; 369 $self->{completer}->show;
181 } elsif ($uni == ord "'") { 370 } elsif ($uni == ord "'") {
182 $self->{completer}->set_prefix (""); 371 $self->{completer}->set_prefix ("");
183 $self->{completer}->show; 372 $self->{completer}->show;
184 } elsif (exists $DIR{$sym}) { 373 } elsif (exists $DIR{$sym}) {
185 if ($mod & CFClient::KMOD_SHIFT) { 374 if ($mod & CFPlus::KMOD_SHIFT) {
186 $self->{shft}++; 375 $self->{shft}++;
187 if ($DIR{$sym}[0] != $self->{fire_dir}) { 376 if ($DIR{$sym}[0] != $self->{fire_dir}) {
188 $::CONN->user_send ("fire $DIR{$sym}[0]"); 377 $::CONN->user_send ("fire $DIR{$sym}[0]");
189 } 378 }
190 $self->{fire_dir} = $DIR{$sym}[0]; 379 $self->{fire_dir} = $DIR{$sym}[0];
191 } elsif ($mod & CFClient::KMOD_CTRL) { 380 } elsif ($mod & CFPlus::KMOD_CTRL) {
192 $self->{ctrl}++; 381 $self->{ctrl}++;
193 $::CONN->user_send ("run $DIR{$sym}[0]"); 382 $::CONN->user_send ("run $DIR{$sym}[0]");
194 } else { 383 } else {
195 $::CONN->user_send ("$DIR{$sym}[1]"); 384 $::CONN->user_send ("$DIR{$sym}[1]");
196 } 385 }
197 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
198 $::BIND_EDITOR->set_binding (undef, undef, [],
199 sub {
200 my ($mod, $sym, $cmds) = @_;
201 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
202 });
203 $::BIND_EDITOR->start;
204 $::BIND_EDITOR->show;
205 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
206 $::BIND_EDITOR->stop;
207 $::BIND_EDITOR->ask_for_bind_and_commit;
208 $::BIND_EDITOR->hide;
209 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
210 $::CONN->user_send ($_) for @$bind_cmd;
211 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 386 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
212 $self->{completer}->invoke_key_down ($ev); 387 $self->{completer}->inject_key_down ($ev);
213 $self->{completer}->show; 388 $self->{completer}->show;
214 } else { 389 } else {
215 return 0; 390 return 0;
216 } 391 }
217 392
… …
224 my $res = 0; 399 my $res = 0;
225 my $mod = $ev->{mod}; 400 my $mod = $ev->{mod};
226 my $sym = $ev->{sym}; 401 my $sym = $ev->{sym};
227 402
228 if ($::CFG->{shift_fire_stop}) { 403 if ($::CFG->{shift_fire_stop}) {
229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 404 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
230 $::CONN->user_send ("fire_stop"); 405 $::CONN->user_send ("fire_stop");
231 delete $self->{fire_dir}; 406 delete $self->{fire_dir};
232 $res = 1; 407 $res = 1;
233 } 408 }
234 } else { 409 } else {
235 if (exists $DIR{$sym} && delete $self->{shft}) { 410 if (exists $DIR{$sym} && delete $self->{shft}) {
236 $::CONN->user_send ("fire_stop"); 411 $::CONN->user_send ("fire_stop");
237 delete $self->{fire_dir}; 412 delete $self->{fire_dir};
238 $res = 1; 413 $res = 1;
239 } 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?
240 $::CONN->user_send ("fire_stop"); 415 $::CONN->user_send ("fire_stop");
241 delete $self->{fire_dir}; 416 delete $self->{fire_dir};
242 $res = 1; 417 $res = 1;
243 } 418 }
244 } 419 }
245 420
246 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 421 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
247 $::CONN->user_send ("run_stop"); 422 $::CONN->user_send ("run_stop");
248 $res = 1; 423 $res = 1;
249 } 424 }
250 425
251 $res 426 $res
252} 427}
253 428
254sub set_magicmap { 429sub set_magicmap {
255 my ($self, $w, $h, $x, $y, $data) = @_; 430 my ($self, $w, $h, $x, $y, $data) = @_;
256 431
257 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 432 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
258 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 433 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
259 434
260 $self->{magicmap} = [$x, $y, $w, $h, $data]; 435 $self->{magicmap} = [$x, $y, $w, $h, $data];
261 436
262 $self->update; 437 $self->update;
263} 438}
… …
265sub draw { 440sub draw {
266 my ($self) = @_; 441 my ($self) = @_;
267 442
268 return unless $::MAP; 443 return unless $::MAP;
269 444
270 my $focused = $CFClient::UI::FOCUS == $self 445 my $focused = $CFPlus::UI::FOCUS == $self
271 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 446 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
272 447
273 return 448 return
274 unless $focused || !$::FAST; 449 unless $focused || !$::FAST;
275 450
276 if (delete $self->{need_update}) { 451 if (delete $self->{need_update}) {
277 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 452 my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale};
278 453
454 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
455 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
456
279 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 457 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
280 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 458 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
281 459
282 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 460 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
283 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 461 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
284 462
285 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 463 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
286 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 464 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
287 465
288 if ($::CFG->{fow_enable}) { 466 if ($::CFG->{fow_enable}) {
289 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);
290 468
291 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
292 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); 470 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
293 glConvolutionFilter2D ( 471 glConvolutionFilter2D (
294 GL_CONVOLUTION_2D, 472 GL_CONVOLUTION_2D,
295 GL_ALPHA, 473 GL_ALPHA,
296 3, 3, 474 3, 3,
… …
298 (pack "f*", @{ $self->{smooth_matrix} }), 476 (pack "f*", @{ $self->{smooth_matrix} }),
299 ); 477 );
300 glEnable GL_CONVOLUTION_2D; 478 glEnable GL_CONVOLUTION_2D;
301 } 479 }
302 480
303 $self->{fow_texture} = new CFClient::Texture 481 $self->{fow_texture} = new CFPlus::Texture
304 w => $w, 482 w => $w,
305 h => $h, 483 h => $h,
306 data => $data, 484 data => $data,
307 internalformat => GL_ALPHA, 485 internalformat => GL_ALPHA,
308 format => GL_ALPHA; 486 format => GL_ALPHA;
… …
316 494
317 glPushMatrix; 495 glPushMatrix;
318 glTranslate $sx0, $sy0; 496 glTranslate $sx0, $sy0;
319 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 497 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
320 498
321 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 499 $::MAP->draw ($dx, $dy, $sw, $sh, ::T);
322 500
323 glScale 32, 32; 501 glScale ::T, ::T;
324 502
325 if (my $tex = $self->{fow_texture}) { 503 if (my $tex = $self->{fow_texture}) {
326 glEnable GL_TEXTURE_2D; 504 glEnable GL_TEXTURE_2D;
327 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
328 506
… …
333 } 511 }
334 512
335 if ($self->{magicmap}) { 513 if ($self->{magicmap}) {
336 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 514 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
337 515
338 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 516 $x += $::MAP->ox + $self->{dx};
339 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 517 $y += $::MAP->oy + $self->{dy};
340 518
341 glTranslate - $x - 1, - $y - 1; 519 glTranslate - $x - 1, - $y - 1;
342 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 520 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
343 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 521 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
344 } 522 }
… …
370 glDeleteList $self->{list}; 548 glDeleteList $self->{list};
371 549
372 $self->SUPER::DESTROY; 550 $self->SUPER::DESTROY;
373} 551}
374 552
375package CFClient::MapWidget::MapMap; 553package CFPlus::MapWidget::MapMap;
376 554
377our @ISA = CFClient::UI::Base::; 555our @ISA = CFPlus::UI::Base::;
378 556
379use Time::HiRes qw(time); 557use Time::HiRes qw(time);
380use CFClient::OpenGL; 558use CFPlus::OpenGL;
381 559
382sub size_request { 560sub size_request {
383 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 561 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
384} 562}
385 563
… …
403 581
404 $::MAP or return; 582 $::MAP or return;
405 583
406 my ($w, $h) = @$self{qw(w h)}; 584 my ($w, $h) = @$self{qw(w h)};
407 585
408 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 586 my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99;
409 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 587 my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99;
410 588
411 my $sx = int $::CFG->{map_shift_x} / 32; 589 my $sx = int $::CFG->{map_shift_x} / ::T;
412 my $sy = int $::CFG->{map_shift_y} / 32; 590 my $sy = int $::CFG->{map_shift_y} / ::T;
413 591
414 my $ox = 0.5 * ($w - $sw); 592 my $ox = 0.5 * ($w - $sw);
415 my $oy = 0.5 * ($h - $sh); 593 my $oy = 0.5 * ($h - $sh);
416 594
417 glEnable GL_BLEND; 595 glEnable GL_BLEND;
… …
421 599
422 if ($self->{texture_atime} < time) { 600 if ($self->{texture_atime} < time) {
423 $self->{texture_atime} = time + 1/3; 601 $self->{texture_atime} = time + 1/3;
424 602
425 $self->{texture} = 603 $self->{texture} =
426 new CFClient::Texture 604 new CFPlus::Texture
427 w => $w, 605 w => $w,
428 h => $h, 606 h => $h,
429 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 607 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
430 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;
431 } 609 }
432 610
433 $self->{texture}->draw_quad (0, 0); 611 $self->{texture}->draw_quad (0, 0);
434 612
435 glDisable GL_TEXTURE_2D; 613 glDisable GL_TEXTURE_2D;
… …
450 glEnd; 628 glEnd;
451 629
452 glDisable GL_BLEND; 630 glDisable GL_BLEND;
453} 631}
454 632
455package CFClient::MapWidget::Command; 633package CFPlus::MapWidget::Command;
456 634
457use strict; 635use strict;
458 636
459use CFClient::OpenGL; 637use CFPlus::OpenGL;
460 638
461our @ISA = CFClient::UI::Frame::; 639our @ISA = CFPlus::UI::Frame::;
462 640
463sub new { 641sub new {
464 my $class = shift; 642 my $class = shift;
465 643
466 my $self = $class->SUPER::new ( 644 my $self = $class->SUPER::new (
467 bg => [0, 0, 0, 0.8], 645 bg => [0, 0, 0, 0.8],
468 @_, 646 @_,
469 ); 647 );
470 648
471 $self->add ($self->{vbox} = new CFClient::UI::VBox); 649 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
472 650
473 $self->{label} = [ 651 $self->{label} = [
474 map 652 map
475 CFClient::UI::Label->new ( 653 CFPlus::UI::Label->new (
476 can_hover => 1, 654 can_hover => 1,
477 can_events => 1, 655 can_events => 1,
478 tooltip_width => 0.33, 656 tooltip_width => 0.33,
479 fontsize => $_, 657 fontsize => $_,
480 ), (0.8) x 16 658 ), (0.8) x 16
481 ]; 659 ];
482 660
483 $self->{entry} = new CFClient::UI::Entry 661 $self->{entry} = new CFPlus::UI::Entry
484 on_changed => sub { 662 on_changed => sub {
485 $self->update_labels; 663 $self->update_labels;
486 0 664 0
487 }, 665 },
488 on_button_down => sub { 666 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 667 my ($entry, $ev, $x, $y) = @_;
490 668
491 if ($ev->{button} == 3) { 669 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 670 (new CFPlus::UI::Menu
493 items => [ 671 items => [
494 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 672 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
495 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 673 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
496 ], 674 ],
497 )->popup ($ev); 675 )->popup ($ev);
498 return 1; 676 return 1;
499 } 677 }
500 0 678 0
… …
515 $self->hide; 693 $self->hide;
516 } 694 }
517 } elsif ($ev->{sym} == 27) { 695 } elsif ($ev->{sym} == 27) {
518 $self->{hist_ptr} = 0; 696 $self->{hist_ptr} = 0;
519 $self->hide; 697 $self->hide;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 698 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 699 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 700 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 701 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 702 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--; 703 $self->{hist_ptr}--;
… …
527 } else { 705 } else {
528 ++$self->{select_offset} 706 ++$self->{select_offset}
529 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 707 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 } 708 }
531 $self->update_labels; 709 $self->update_labels;
532 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 710 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533 if ($self->{select_offset}) { 711 if ($self->{select_offset}) {
534 --$self->{select_offset} 712 --$self->{select_offset}
535 } else { 713 } else {
536 unless ($self->{hist_ptr}) { 714 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text; 715 $self->{hist_saveback} = $self->{entry}->get_text;
… …
582} 760}
583 761
584sub hide { 762sub hide {
585 my ($self) = @_; 763 my ($self) = @_;
586 764
765 $self->{hist_ptr} = 0;
766
587 $self->SUPER::hide; 767 $self->SUPER::hide;
588 $self->{entry}->set_text (""); 768 $self->{entry}->set_text ("");
589} 769}
590 770
591sub invoke_key_down { 771sub inject_key_down {
592 my ($self, $ev) = @_; 772 my ($self, $ev) = @_;
593 773
774 $self->{entry}->grab_focus;
594 $self->{entry}->emit (key_down => $ev) 775 $self->{entry}->emit (key_down => $ev);
595} 776}
596 777
597sub update_labels { 778sub update_labels {
598 my ($self) = @_; 779 my ($self) = @_;
599 780
… …
692 873
693sub _draw { 874sub _draw {
694 my ($self) = @_; 875 my ($self) = @_;
695 876
696 # hack 877 # hack
697 local $CFClient::UI::FOCUS = $self->{entry}; 878 local $CFPlus::UI::FOCUS = $self->{entry};
698 879
699 $self->SUPER::_draw; 880 $self->SUPER::_draw;
700} 881}
701 882
7021 8831
884

Diff Legend

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