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.93 by root, Thu Nov 16 19:42:45 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;
9 11
10our @ISA = CFClient::UI::Base::; 12our @ISA = CFPlus::UI::Base::;
11 13
12my $magicmap_tex = 14my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", 15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA; 16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
15 17
16sub new { 18sub new {
17 my $class = shift; 19 my $class = shift;
18 20
… …
28 ], 30 ],
29 31
30 @_ 32 @_
31 ); 33 );
32 34
33 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
34 command => $self->{command}, 36 command => $self->{command},
35 can_focus => 1, 37 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 ; 38 ;
45 39
46 $self 40 $self
47} 41}
48 42
… …
60 54
61sub clr_commands { 55sub clr_commands {
62 my ($self) = @_; 56 my ($self) = @_;
63 57
64 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
59
60 $self->{completer}->hide
61 if $self->{completer};
62}
63
64sub server_login {
65 my ($server) = @_;
66
67 ::stop_game ();
68 local $::PROFILE->{host} = $server;
69 ::start_game ();
70}
71
72sub editor_invoke {
73 my $editsup = $::CONN && $::CONN->{editor_support}
74 or return;
75
76 CFPlus::background {
77 print "preparing editor startup...\n";
78
79 my $server = $editsup->{gameserver} || "default";
80 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
81
82 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
83 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
84
85 print "map directory is $mapdir\n";
86 print "lib directory is $libdir\n";
87
88 my $ua = CFPlus::lwp_useragent;
89
90 for my $file (qw(archetypes crossfire.0)) {
91 my $url = "$editsup->{lib_root}$file";
92 print "mirroring $url...\n";
93 CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file");
94 printf "%s size %d octets\n", $file, -s "$libdir/$file";
95 }
96
97 if (1) { # upload a map
98 my $mapname = $::CONN->{map_info}[0];
99
100 my $mappath = "$mapdir/$mapname";
101
102 -e $mappath and die "$mappath already exists\n";
103
104 print "getting map revision for $mapname...\n";
105
106 # try to get the most recent head revision, what a hack,
107 # this should have been returned while downloading *sigh*
108 my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
109
110 if ($log =~ /\?rev=(\d+\.\d+)"/) {
111 my $rev = $1;
112
113 print "downloading revision $rev...\n";
114
115 my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
116
117 my $meta = {
118 %$editsup,
119 path => $mapname,
120 revision => $rev,
121 cf_login => $::PROFILE->{user},
122 };
123
124 require File::Basename;
125 require File::Path;
126
127 File::Path::mkpath (File::Basename::dirname ($mappath));
128 open my $fh, ">:raw:perlio", "$mappath.meta"
129 or die "$mappath.meta: $!\n";
130 print $fh CFPlus::to_json $meta;
131 close $fh;
132 open my $fh, ">:raw:perlio:utf8", $mappath
133 or die "$mappath: $!\n";
134 print $fh $map;
135 close $fh;
136
137 print "saved as $mappath\n";
138
139 print "invoking editor...\n";
140 exec "/root/s2/gce $mappath";#d#
141
142 # now upload it
143# require HTTP::Request::Common;
144#
145# my $res = $ua->post (
146# $ENV{CFPLUS_UPLOAD},
147# Content_Type => 'multipart/form-data',
148# Content => [
149# path => $mapname,
150# mapdir => $ENV{CROSSFIRE_MAPDIR},
151# map => $map,
152# revision => $rev,
153# cf_login => $ENV{CFPLUS_LOGIN},
154# cf_password => $ENV{CFPLUS_PASSWORD},
155# comment => "",
156# ]
157# );
158#
159# if ($res->is_error) {
160# # fatal condition
161# warn $res->status_line;
162# } else {
163# # script replies are marked as {{..}}
164# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
165# warn map "$_\n", @msgs;
166# }
167 } else {
168 die "viewvc parse error, unable to detect revision\n";
169 }
170 }
171 }
65} 172}
66 173
67sub invoke_button_down { 174sub invoke_button_down {
68 my ($self, $ev, $x, $y) = @_; 175 my ($self, $ev, $x, $y) = @_;
69 176
70 return unless $::CONN;
71
72 $self->grab_focus;
73
74 if ($ev->{button} == 1) { 177 if ($ev->{button} == 1) {
178 $self->grab_focus;
179 return unless $::CONN;
180
75 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; 181 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}; 182 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
77 183
78 $x -= int 0.5 * $self->{sw}; 184 $x -= CFPlus::floor $::MAP->w * 0.5;
79 $y -= int 0.5 * $self->{sh}; 185 $y -= CFPlus::floor $::MAP->h * 0.5;
80 186
81 $::CONN->lookat ($x, $y) 187 $::CONN->lookat ($x, $y)
82 if $::CONN; 188 if $::CONN;
83 189
84 } elsif ($ev->{button} == 2) { 190 } elsif ($ev->{button} == 2) {
191 $self->grab_focus;
192 return unless $::CONN;
193
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 194 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 195 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 196
88 $self->{motion} = sub { 197 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 198 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 202 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 203 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 204
96 $self->update; 205 $self->update;
97 }; 206 };
207 } elsif ($ev->{button} == 3) {
208 my @items = (
209 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
210 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
211 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
212 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
213 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
214 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
215 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
216 [
217 $::PICKUP_ENABLE->{state}
218 ? "Disable automatic pickup"
219 : "Enable automatic pickup",
220 sub { $::PICKUP_ENABLE->toggle }
221 ],
222 );
223
224 if ($::CONN && $::CONN->{editor_support}) {
225 push @items, [
226 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
227 \&editor_invoke,
228 ];
229
230 for my $type (qw(test name)) {
231 $::CONN->{editor_support}{type} ne $type
232 or next;
233 my $server = $::CONN->{editor_support}{"${type}server"}
234 or next;
235
236 push @items, [
237 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
238 sub { server_login $server },
239 ];
240 }
241 }
242
243 push @items,
244 ["Quit",
245 sub {
246 if ($::CONN) {
247 &::open_quit_dialog;
248 } else {
249 exit;
250 }
251 }
252 ],
253 ;
254
255 (new CFPlus::UI::Menu
256 items => \@items,
257 )->popup ($ev);
98 } 258 }
99 259
100 1 260 1
101} 261}
102 262
… …
120 1 280 1
121} 281}
122 282
123sub size_request { 283sub size_request {
124 ( 284 (
125 32 * CFClient::ceil $::WIDTH / 32, 285 32 * CFPlus::ceil $::WIDTH / 32,
126 32 * CFClient::ceil $::HEIGHT / 32, 286 32 * CFPlus::ceil $::HEIGHT / 32,
127 ) 287 )
128} 288}
129 289
130sub update { 290sub update {
131 my ($self) = @_; 291 my ($self) = @_;
… …
133 $self->{need_update} = 1; 293 $self->{need_update} = 1;
134 $self->SUPER::update; 294 $self->SUPER::update;
135} 295}
136 296
137my %DIR = ( 297my %DIR = (
138 CFClient::SDLK_KP8, [1, "north"], 298 CFPlus::SDLK_KP8, [1, "north"],
139 CFClient::SDLK_KP9, [2, "northeast"], 299 CFPlus::SDLK_KP9, [2, "northeast"],
140 CFClient::SDLK_KP6, [3, "east"], 300 CFPlus::SDLK_KP6, [3, "east"],
141 CFClient::SDLK_KP3, [4, "southeast"], 301 CFPlus::SDLK_KP3, [4, "southeast"],
142 CFClient::SDLK_KP2, [5, "south"], 302 CFPlus::SDLK_KP2, [5, "south"],
143 CFClient::SDLK_KP1, [6, "southwest"], 303 CFPlus::SDLK_KP1, [6, "southwest"],
144 CFClient::SDLK_KP4, [7, "west"], 304 CFPlus::SDLK_KP4, [7, "west"],
145 CFClient::SDLK_KP7, [8, "northwest"], 305 CFPlus::SDLK_KP7, [8, "northwest"],
146 306
147 CFClient::SDLK_UP, [1, "north"], 307 CFPlus::SDLK_UP, [1, "north"],
148 CFClient::SDLK_RIGHT, [3, "east"], 308 CFPlus::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 309 CFPlus::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 310 CFPlus::SDLK_LEFT, [7, "west"],
151); 311);
152 312
153sub invoke_key_down { 313sub invoke_key_down {
154 my ($self, $ev) = @_; 314 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 315
158 my $mod = $ev->{mod}; 316 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 317 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 318 my $uni = $ev->{unicode};
161 319
162 if ($sym == CFClient::SDLK_KP5) { 320 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
321
322 if ($uni == ord "\t") {
323 $::PL_WINDOW->toggle_visibility;
324 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
325 $::HELP_WINDOW->toggle_visibility;
326 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
327 ::toggle_player_page ($::STATS_PAGE);
328 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
329 ::toggle_player_page ($::SKILL_PAGE);
330 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
331 ::toggle_player_page ($::SPELL_PAGE);
332 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
333 ::toggle_player_page ($::INVENTORY_PAGE);
334 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
335 $::SETUP_DIALOG->toggle_visibility;
336 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
337 $::BIND_EDITOR->set_binding (undef, undef, [],
338 sub {
339 my ($mod, $sym, $cmds) = @_;
340 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
341 });
342 $::BIND_EDITOR->start;
343 $::BIND_EDITOR->show;
344#TODO: elmex, what was this supposed to do? it currently crashes the client.
345# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
346# $::BIND_EDITOR->stop;
347# $::BIND_EDITOR->ask_for_bind_and_commit;
348# $::BIND_EDITOR->hide;
349 } elsif (!$::CONN) {
350 return 0; # bindings further down need a valid connection
351
352 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 353 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 354 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 355 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 356 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 357 $::CONN->user_send ("apply");
358 } elsif ($uni == 13) {
359 $::CONN->user_send ("examine");
168 } elsif ($uni == ord ".") { 360 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 361 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 362 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 363 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
172 $::PL_WINDOW->toggle_visibility; 364 $::CONN->user_send ($_) for @$bind_cmd;
173 $::PL_NOTEBOOK->set_current_page ("Inventory");
174 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 365 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
175 $::CONN->user_send ("rotateshoottype +"); 366 $::CONN->user_send ("rotateshoottype +");
176 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 367 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
177 $::CONN->user_send ("rotateshoottype -"); 368 $::CONN->user_send ("rotateshoottype -");
178 } elsif ($uni == ord '"') { 369 } elsif ($uni == ord '"') {
179 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 370 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
180 $self->{completer}->show; 371 $self->{completer}->show;
181 } elsif ($uni == ord "'") { 372 } elsif ($uni == ord "'") {
182 $self->{completer}->set_prefix (""); 373 $self->{completer}->set_prefix ("");
183 $self->{completer}->show; 374 $self->{completer}->show;
184 } elsif (exists $DIR{$sym}) { 375 } elsif (exists $DIR{$sym}) {
185 if ($mod & CFClient::KMOD_SHIFT) { 376 if ($mod & CFPlus::KMOD_SHIFT) {
186 $self->{shft}++; 377 $self->{shft}++;
187 if ($DIR{$sym}[0] != $self->{fire_dir}) { 378 if ($DIR{$sym}[0] != $self->{fire_dir}) {
188 $::CONN->user_send ("fire $DIR{$sym}[0]"); 379 $::CONN->user_send ("fire $DIR{$sym}[0]");
189 } 380 }
190 $self->{fire_dir} = $DIR{$sym}[0]; 381 $self->{fire_dir} = $DIR{$sym}[0];
191 } elsif ($mod & CFClient::KMOD_CTRL) { 382 } elsif ($mod & CFPlus::KMOD_CTRL) {
192 $self->{ctrl}++; 383 $self->{ctrl}++;
193 $::CONN->user_send ("run $DIR{$sym}[0]"); 384 $::CONN->user_send ("run $DIR{$sym}[0]");
194 } else { 385 } else {
195 $::CONN->user_send ("$DIR{$sym}[1]"); 386 $::CONN->user_send ("$DIR{$sym}[1]");
196 } 387 }
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')) { 388 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
212 $self->{completer}->invoke_key_down ($ev); 389 $self->{completer}->inject_key_down ($ev);
213 $self->{completer}->show; 390 $self->{completer}->show;
214 } else { 391 } else {
215 return 0; 392 return 0;
216 } 393 }
217 394
… …
224 my $res = 0; 401 my $res = 0;
225 my $mod = $ev->{mod}; 402 my $mod = $ev->{mod};
226 my $sym = $ev->{sym}; 403 my $sym = $ev->{sym};
227 404
228 if ($::CFG->{shift_fire_stop}) { 405 if ($::CFG->{shift_fire_stop}) {
229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 406 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
230 $::CONN->user_send ("fire_stop"); 407 $::CONN->user_send ("fire_stop");
231 delete $self->{fire_dir}; 408 delete $self->{fire_dir};
232 $res = 1; 409 $res = 1;
233 } 410 }
234 } else { 411 } else {
235 if (exists $DIR{$sym} && delete $self->{shft}) { 412 if (exists $DIR{$sym} && delete $self->{shft}) {
236 $::CONN->user_send ("fire_stop"); 413 $::CONN->user_send ("fire_stop");
237 delete $self->{fire_dir}; 414 delete $self->{fire_dir};
238 $res = 1; 415 $res = 1;
239 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 416 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
240 $::CONN->user_send ("fire_stop"); 417 $::CONN->user_send ("fire_stop");
241 delete $self->{fire_dir}; 418 delete $self->{fire_dir};
242 $res = 1; 419 $res = 1;
243 } 420 }
244 } 421 }
245 422
246 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 423 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
247 $::CONN->user_send ("run_stop"); 424 $::CONN->user_send ("run_stop");
248 $res = 1; 425 $res = 1;
249 } 426 }
250 427
251 $res 428 $res
252} 429}
253 430
254sub set_magicmap { 431sub set_magicmap {
255 my ($self, $w, $h, $x, $y, $data) = @_; 432 my ($self, $w, $h, $x, $y, $data) = @_;
256 433
257 $x -= $::MAP->ox + int 0.5 * $::MAP->w; 434 $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w;
258 $y -= $::MAP->oy + int 0.5 * $::MAP->h; 435 $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h;
259 436
260 $self->{magicmap} = [$x, $y, $w, $h, $data]; 437 $self->{magicmap} = [$x, $y, $w, $h, $data];
261 438
262 $self->update; 439 $self->update;
263} 440}
… …
265sub draw { 442sub draw {
266 my ($self) = @_; 443 my ($self) = @_;
267 444
268 return unless $::MAP; 445 return unless $::MAP;
269 446
270 my $focused = $CFClient::UI::FOCUS == $self 447 my $focused = $CFPlus::UI::FOCUS == $self
271 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 448 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
272 449
273 return 450 return
274 unless $focused || !$::FAST; 451 unless $focused || !$::FAST;
275 452
276 if (delete $self->{need_update}) { 453 if (delete $self->{need_update}) {
277 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; 454 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
278 455
456 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
457 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
458
279 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; 459 my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
280 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; 460 my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
281 461
282 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; 462 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
283 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; 463 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
284 464
285 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; 465 my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx;
286 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; 466 my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy;
287 467
288 if ($::CFG->{fow_enable}) { 468 if ($::CFG->{fow_enable}) {
289 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); 469 my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh);
290 470
291 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war 471 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); 472 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
293 glConvolutionFilter2D ( 473 glConvolutionFilter2D (
294 GL_CONVOLUTION_2D, 474 GL_CONVOLUTION_2D,
295 GL_ALPHA, 475 GL_ALPHA,
296 3, 3, 476 3, 3,
… …
298 (pack "f*", @{ $self->{smooth_matrix} }), 478 (pack "f*", @{ $self->{smooth_matrix} }),
299 ); 479 );
300 glEnable GL_CONVOLUTION_2D; 480 glEnable GL_CONVOLUTION_2D;
301 } 481 }
302 482
303 $self->{fow_texture} = new CFClient::Texture 483 $self->{fow_texture} = new CFPlus::Texture
304 w => $w, 484 w => $w,
305 h => $h, 485 h => $h,
306 data => $data, 486 data => $data,
307 internalformat => GL_ALPHA, 487 internalformat => GL_ALPHA,
308 format => GL_ALPHA; 488 format => GL_ALPHA;
… …
316 496
317 glPushMatrix; 497 glPushMatrix;
318 glTranslate $sx0, $sy0; 498 glTranslate $sx0, $sy0;
319 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 499 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
320 500
321 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); 501 $::MAP->draw ($dx, $dy, $sw, $sh);
322 502
323 glScale 32, 32; 503 glScale 32, 32;
324 504
325 if (my $tex = $self->{fow_texture}) { 505 if (my $tex = $self->{fow_texture}) {
326 glEnable GL_TEXTURE_2D; 506 glEnable GL_TEXTURE_2D;
… …
333 } 513 }
334 514
335 if ($self->{magicmap}) { 515 if ($self->{magicmap}) {
336 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; 516 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
337 517
338 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); 518 $x += $::MAP->ox + $self->{dx};
339 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); 519 $y += $::MAP->oy + $self->{dy};
340 520
341 glTranslate - $x - 1, - $y - 1; 521 glTranslate - $x - 1, - $y - 1;
342 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; 522 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
343 $::MAP->draw_magicmap ($x, $y, $w, $h, $data); 523 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
344 } 524 }
… …
370 glDeleteList $self->{list}; 550 glDeleteList $self->{list};
371 551
372 $self->SUPER::DESTROY; 552 $self->SUPER::DESTROY;
373} 553}
374 554
375package CFClient::MapWidget::MapMap; 555package CFPlus::MapWidget::MapMap;
376 556
377our @ISA = CFClient::UI::Base::; 557our @ISA = CFPlus::UI::Base::;
378 558
379use Time::HiRes qw(time); 559use Time::HiRes qw(time);
380use CFClient::OpenGL; 560use CFPlus::OpenGL;
381 561
382sub size_request { 562sub size_request {
383 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 563 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
384} 564}
385 565
… …
421 601
422 if ($self->{texture_atime} < time) { 602 if ($self->{texture_atime} < time) {
423 $self->{texture_atime} = time + 1/3; 603 $self->{texture_atime} = time + 1/3;
424 604
425 $self->{texture} = 605 $self->{texture} =
426 new CFClient::Texture 606 new CFPlus::Texture
427 w => $w, 607 w => $w,
428 h => $h, 608 h => $h,
429 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 609 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; 610 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
431 } 611 }
432 612
433 $self->{texture}->draw_quad (0, 0); 613 $self->{texture}->draw_quad (0, 0);
434 614
435 glDisable GL_TEXTURE_2D; 615 glDisable GL_TEXTURE_2D;
… …
450 glEnd; 630 glEnd;
451 631
452 glDisable GL_BLEND; 632 glDisable GL_BLEND;
453} 633}
454 634
455package CFClient::MapWidget::Command; 635package CFPlus::MapWidget::Command;
456 636
457use strict; 637use strict;
458 638
459use CFClient::OpenGL; 639use CFPlus::OpenGL;
460 640
461our @ISA = CFClient::UI::Frame::; 641our @ISA = CFPlus::UI::Frame::;
462 642
463sub new { 643sub new {
464 my $class = shift; 644 my $class = shift;
465 645
466 my $self = $class->SUPER::new ( 646 my $self = $class->SUPER::new (
467 bg => [0, 0, 0, 0.8], 647 bg => [0, 0, 0, 0.8],
468 @_, 648 @_,
469 ); 649 );
470 650
471 $self->add ($self->{vbox} = new CFClient::UI::VBox); 651 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
472 652
473 $self->{label} = [ 653 $self->{label} = [
474 map 654 map
475 CFClient::UI::Label->new ( 655 CFPlus::UI::Label->new (
476 can_hover => 1, 656 can_hover => 1,
477 can_events => 1, 657 can_events => 1,
478 tooltip_width => 0.33, 658 tooltip_width => 0.33,
479 fontsize => $_, 659 fontsize => $_,
480 ), (0.8) x 16 660 ), (0.8) x 16
481 ]; 661 ];
482 662
483 $self->{entry} = new CFClient::UI::Entry 663 $self->{entry} = new CFPlus::UI::Entry
484 on_changed => sub { 664 on_changed => sub {
485 $self->update_labels; 665 $self->update_labels;
486 0 666 0
487 }, 667 },
488 on_button_down => sub { 668 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 669 my ($entry, $ev, $x, $y) = @_;
490 670
491 if ($ev->{button} == 3) { 671 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 672 (new CFPlus::UI::Menu
493 items => [ 673 items => [
494 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key" 674 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
495 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] 675 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
496 ], 676 ],
497 )->popup ($ev); 677 )->popup ($ev);
498 return 1; 678 return 1;
499 } 679 }
… …
515 $self->hide; 695 $self->hide;
516 } 696 }
517 } elsif ($ev->{sym} == 27) { 697 } elsif ($ev->{sym} == 27) {
518 $self->{hist_ptr} = 0; 698 $self->{hist_ptr} = 0;
519 $self->hide; 699 $self->hide;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 700 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 701 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 702 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 703 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 704 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--; 705 $self->{hist_ptr}--;
… …
527 } else { 707 } else {
528 ++$self->{select_offset} 708 ++$self->{select_offset}
529 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 709 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 } 710 }
531 $self->update_labels; 711 $self->update_labels;
532 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 712 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533 if ($self->{select_offset}) { 713 if ($self->{select_offset}) {
534 --$self->{select_offset} 714 --$self->{select_offset}
535 } else { 715 } else {
536 unless ($self->{hist_ptr}) { 716 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text; 717 $self->{hist_saveback} = $self->{entry}->get_text;
… …
582} 762}
583 763
584sub hide { 764sub hide {
585 my ($self) = @_; 765 my ($self) = @_;
586 766
767 $self->{hist_ptr} = 0;
768
587 $self->SUPER::hide; 769 $self->SUPER::hide;
588 $self->{entry}->set_text (""); 770 $self->{entry}->set_text ("");
589} 771}
590 772
591sub invoke_key_down { 773sub inject_key_down {
592 my ($self, $ev) = @_; 774 my ($self, $ev) = @_;
593 775
776 $self->{entry}->grab_focus;
594 $self->{entry}->emit (key_down => $ev) 777 $self->{entry}->emit (key_down => $ev);
595} 778}
596 779
597sub update_labels { 780sub update_labels {
598 my ($self) = @_; 781 my ($self) = @_;
599 782
… …
692 875
693sub _draw { 876sub _draw {
694 my ($self) = @_; 877 my ($self) = @_;
695 878
696 # hack 879 # hack
697 local $CFClient::UI::FOCUS = $self->{entry}; 880 local $CFPlus::UI::FOCUS = $self->{entry};
698 881
699 $self->SUPER::_draw; 882 $self->SUPER::_draw;
700} 883}
701 884
7021 8851
886

Diff Legend

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