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

Diff Legend

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