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.53 by root, Sun Jun 11 17:30:53 2006 UTC vs.
Revision 1.85 by root, Sun Oct 8 21:22:30 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::;
13
14my $magicmap_tex =
15 new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png",
16 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 17
12sub new { 18sub new {
13 my $class = shift; 19 my $class = shift;
14 20
15 my $self = $class->SUPER::new ( 21 my $self = $class->SUPER::new (
… …
24 ], 30 ],
25 31
26 @_ 32 @_
27 ); 33 );
28 34
29 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
30 command => $self->{command}, 36 command => $self->{command},
31 can_focus => 1, 37 tooltip => "#completer_help",
32 tooltip => "<b>The Command Completer</b>\n\n"
33 . "This is your central interface to send text commands to the server. "
34 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n"
38 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
39 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
40 ; 38 ;
41 39
42 $self 40 $self
43} 41}
44 42
… …
56 54
57sub clr_commands { 55sub clr_commands {
58 my ($self) = @_; 56 my ($self) = @_;
59 57
60 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
61}
62 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 check_lwp($) {
73 my ($res) = @_;
74
75 $res->is_error
76 and die $res->status_line;
77
78 $res
79}
80
81sub editor_invoke {
82 my $editsup = $::CONN && $::CONN->{editor_support}
83 or return;
84
85 # putting the password into the env is somewhat tasteless
86# local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user};
87# local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password};
88# local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload};
89
90 my ($pid, $fh);
91 unless ($pid = open $fh, "-|:utf8", "-") {
92 $SIG{__DIE__} = sub {
93 warn "@_\n";
94 CFPlus::_exit 99;
95 };
96
97 open STDERR, ">&STDOUT";
98 binmode STDOUT, ":utf8";
99 binmode STDERR, ":utf8";
100 close $fh;
101
102 $| = 1;
103 print "preparing editor startup...\n";
104 CFPlus::set_proxy;
105
106 my $server = $editsup->{gameserver} || "default";
107 $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge;
108
109 local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir;
110 local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir;
111
112 print "map directory is $mapdir\n";
113 print "lib directory is $libdir\n";
114
115 require LWP::UserAgent;
116
117 my $ua = LWP::UserAgent->new (
118 agent => "cfplus $CFPlus::VERSION",
119 keep_alive => 1,
120 env_proxy => 1,
121 timeout => 30,
122 );
123
124 for my $file (qw(archetypes crossfire.0)) {
125 my $url = "$editsup->{lib_root}$file";
126 print "mirroring $url...\n";
127 check_lwp $ua->mirror ($url, "$libdir/$file");
128 printf "%s size %d octets\n", $file, -s "$libdir/$file";
129 }
130
131 if (1) { # upload a map
132 my $mapname = $::CONN->{map_info}[0];
133
134 print "getting map revision for $mapname...\n";
135
136 # try to get the most recent head revision, what a hack,
137 # this should have been returned while downloading *sigh*
138 my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content;
139
140 if ($log =~ /\?rev=(\d+\.\d+)"/) {
141 my $rev = $1;
142
143 print "downloading revision $rev...\n";
144
145 my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content;
146
147 # now upload it
148# require HTTP::Request::Common;
149#
150# my $res = $ua->post (
151# $ENV{CFPLUS_UPLOAD},
152# Content_Type => 'multipart/form-data',
153# Content => [
154# path => $mapname,
155# mapdir => $ENV{CROSSFIRE_MAPDIR},
156# map => $map,
157# revision => $rev,
158# cf_login => $ENV{CFPLUS_LOGIN},
159# cf_password => $ENV{CFPLUS_PASSWORD},
160# comment => "",
161# ]
162# );
163#
164# if ($res->is_error) {
165# # fatal condition
166# warn $res->status_line;
167# } else {
168# # script replies are marked as {{..}}
169# my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g;
170# warn map "$_\n", @msgs;
171# }
172 } else {
173 die "viewvc parse error, unable to detect revision\n";
174 }
175 }
176
177 print "invoking editor...\n";
178 exec "/root/s2/gce";#d#
179
180 CFPlus::_exit;
181 }
182
183 my $buffer;
184
185 Event->io (fd => $fh, poll => 'r', cb => sub {
186 unless (sysread $fh, $buffer, 4096, length $buffer) {
187 $_[0]->w->cancel;
188 $buffer .= "done\n";
189 }
190
191 while ($buffer =~ s/^(.*)\n//) {
192 ::message ({
193 markup => "editor($pid): " . CFPlus::asxml $1,
194 });
195 }
196 });
197}
198
63sub button_down { 199sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 200 my ($self, $ev, $x, $y) = @_;
65 201
66 $self->focus_in;
67
68 if ($ev->{button} == 1) { 202 if ($ev->{button} == 1) {
69 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 203 $self->grab_focus;
70 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 204 return unless $::CONN;
71 205
72 my $fx = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}) - 0.5 * $sw + 0.99; 206 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
73 my $fy = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}) - 0.5 * $sh + 0.99; 207 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
74 208
75 $::CONN->send (sprintf "lookat %d %d", $fx, $fy) 209 $x -= int 0.5 * $self->{sw};
210 $y -= int 0.5 * $self->{sh};
211
212 $::CONN->lookat ($x, $y)
76 if $::CONN; 213 if $::CONN;
77 214
78 } elsif ($ev->{button} == 2) { 215 } elsif ($ev->{button} == 2) {
216 $self->grab_focus;
217 return unless $::CONN;
218
79 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 219 my ($ox, $oy) = ($ev->{x}, $ev->{y});
80 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 220 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
81 221
82 $self->{motion} = sub { 222 $self->{motion} = sub {
83 my ($ev, $x, $y) = @_; 223 my ($ev, $x, $y) = @_;
… …
87 $::CFG->{map_shift_x} = $bw + $x - $ox; 227 $::CFG->{map_shift_x} = $bw + $x - $ox;
88 $::CFG->{map_shift_y} = $bh + $y - $oy; 228 $::CFG->{map_shift_y} = $bh + $y - $oy;
89 229
90 $self->update; 230 $self->update;
91 }; 231 };
232 } elsif ($ev->{button} == 3) {
233 my @items = (
234 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
235 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
236 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
237 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
238 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
239 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
240 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
241 [
242 $::PICKUP_ENABLE->{state}
243 ? "Disable automatic pickup"
244 : "Enable automatic pickup",
245 sub { $::PICKUP_ENABLE->toggle }
246 ],
247 );
248
249 if ($::CONN && $::CONN->{editor_support}) {
250 push @items, [
251 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
252 \&editor_invoke,
253 ];
254
255 for my $type (qw(test name)) {
256 $::CONN->{editor_support}{type} ne $type
257 or next;
258 my $server = $::CONN->{editor_support}{"${type}server"}
259 or next;
260
261 push @items, [
262 "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>",
263 sub { server_login $server },
264 ];
265 }
266 }
267
268 push @items,
269 ["Quit",
270 sub {
271 if ($::CONN) {
272 &::open_quit_dialog;
273 } else {
274 exit;
275 }
276 }
277 ],
278 ;
279
280 (new CFPlus::UI::Menu
281 items => \@items,
282 )->popup ($ev);
92 } 283 }
93 284
94 1 285 1
95} 286}
96 287
97sub button_up { 288sub invoke_button_up {
98 my ($self, $ev, $x, $y) = @_; 289 my ($self, $ev, $x, $y) = @_;
99 290
100 delete $self->{motion}; 291 delete $self->{motion};
101 292
102 1 293 1
103} 294}
104 295
105sub mouse_motion { 296sub invoke_mouse_motion {
106 my ($self, $ev, $x, $y) = @_; 297 my ($self, $ev, $x, $y) = @_;
107 298
108 if ($self->{motion}) { 299 if ($self->{motion}) {
109 $self->{motion}->($ev, $x, $y); 300 $self->{motion}->($ev, $x, $y);
110 } else { 301 } else {
… …
114 1 305 1
115} 306}
116 307
117sub size_request { 308sub size_request {
118 ( 309 (
119 1 + 32 * int $::WIDTH / 32, 310 32 * CFPlus::ceil $::WIDTH / 32,
120 1 + 32 * int $::HEIGHT / 32, 311 32 * CFPlus::ceil $::HEIGHT / 32,
121 ) 312 )
122} 313}
123 314
124sub update { 315sub update {
125 my ($self) = @_; 316 my ($self) = @_;
… …
127 $self->{need_update} = 1; 318 $self->{need_update} = 1;
128 $self->SUPER::update; 319 $self->SUPER::update;
129} 320}
130 321
131my %DIR = ( 322my %DIR = (
132 CFClient::SDLK_KP8, [1, "north"], 323 CFPlus::SDLK_KP8, [1, "north"],
133 CFClient::SDLK_KP9, [2, "northeast"], 324 CFPlus::SDLK_KP9, [2, "northeast"],
134 CFClient::SDLK_KP6, [3, "east"], 325 CFPlus::SDLK_KP6, [3, "east"],
135 CFClient::SDLK_KP3, [4, "southeast"], 326 CFPlus::SDLK_KP3, [4, "southeast"],
136 CFClient::SDLK_KP2, [5, "south"], 327 CFPlus::SDLK_KP2, [5, "south"],
137 CFClient::SDLK_KP1, [6, "southwest"], 328 CFPlus::SDLK_KP1, [6, "southwest"],
138 CFClient::SDLK_KP4, [7, "west"], 329 CFPlus::SDLK_KP4, [7, "west"],
139 CFClient::SDLK_KP7, [8, "northwest"], 330 CFPlus::SDLK_KP7, [8, "northwest"],
140 331
141 CFClient::SDLK_UP, [1, "north"], 332 CFPlus::SDLK_UP, [1, "north"],
142 CFClient::SDLK_RIGHT, [3, "east"], 333 CFPlus::SDLK_RIGHT, [3, "east"],
143 CFClient::SDLK_DOWN, [5, "south"], 334 CFPlus::SDLK_DOWN, [5, "south"],
144 CFClient::SDLK_LEFT, [7, "west"], 335 CFPlus::SDLK_LEFT, [7, "west"],
145); 336);
146 337
147sub key_down { 338sub invoke_key_down {
148 my ($self, $ev) = @_; 339 my ($self, $ev) = @_;
149
150 return 0 unless $::CONN;
151 340
152 my $mod = $ev->{mod}; 341 my $mod = $ev->{mod};
153 my $sym = $ev->{sym}; 342 my $sym = $ev->{sym};
154 my $uni = $ev->{unicode}; 343 my $uni = $ev->{unicode};
155 344
156 if ($sym == CFClient::SDLK_KP5) { 345 $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT;
346
347 if ($uni == ord "\t") {
348 $::PL_WINDOW->toggle_visibility;
349 } elsif ($sym == CFPlus::SDLK_F1 && !$mod) {
350 $::HELP_WINDOW->toggle_visibility;
351 } elsif ($sym == CFPlus::SDLK_F2 && !$mod) {
352 ::toggle_player_page ($::STATS_PAGE);
353 } elsif ($sym == CFPlus::SDLK_F3 && !$mod) {
354 ::toggle_player_page ($::SKILL_PAGE);
355 } elsif ($sym == CFPlus::SDLK_F4 && !$mod) {
356 ::toggle_player_page ($::SPELL_PAGE);
357 } elsif ($sym == CFPlus::SDLK_F5 && !$mod) {
358 ::toggle_player_page ($::INVENTORY_PAGE);
359 } elsif ($sym == CFPlus::SDLK_F9 && !$mod) {
360 $::SETUP_DIALOG->toggle_visibility;
361 } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) {
362 $::BIND_EDITOR->set_binding (undef, undef, [],
363 sub {
364 my ($mod, $sym, $cmds) = @_;
365 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
366 });
367 $::BIND_EDITOR->start;
368 $::BIND_EDITOR->show;
369#TODO: elmex, what was this supposed to do? it currently crashes the client.
370# } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) {
371# $::BIND_EDITOR->stop;
372# $::BIND_EDITOR->ask_for_bind_and_commit;
373# $::BIND_EDITOR->hide;
374 } elsif (!$::CONN) {
375 return 0; # bindings further down need a valid connection
376
377 } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) {
157 $::CONN->user_send ("stay fire"); 378 $::CONN->user_send ("stay fire");
158 } elsif ($uni == ord ",") { 379 } elsif ($uni == ord ",") {
159 $::CONN->user_send ("take"); 380 $::CONN->user_send ("take");
160 } elsif ($uni == ord " ") { 381 } elsif ($uni == ord " ") {
161 $::CONN->user_send ("apply"); 382 $::CONN->user_send ("apply");
383 } elsif ($uni == 13) {
384 $::CONN->user_send ("examine");
162 } elsif ($uni == ord ".") { 385 } elsif ($uni == ord ".") {
163 $::CONN->user_send ($self->{completer}{last_command}) 386 $::CONN->user_send ($self->{completer}{last_command})
164 if exists $self->{completer}{last_command}; 387 if exists $self->{completer}{last_command};
165 } elsif ($uni == ord "\t") { 388 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
166 $::INV_WINDOW->toggle_visibility; 389 $::CONN->user_send ($_) for @$bind_cmd;
167 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 390 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
168 $::CONN->user_send ("rotateshoottype +"); 391 $::CONN->user_send ("rotateshoottype +");
169 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 392 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
170 $::CONN->user_send ("rotateshoottype -"); 393 $::CONN->user_send ("rotateshoottype -");
171 } elsif ($uni == ord '"') { 394 } elsif ($uni == ord '"') {
172 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 395 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
173 $self->{completer}->show; 396 $self->{completer}->show;
174 } elsif ($uni == ord "'") { 397 } elsif ($uni == ord "'") {
175 $self->{completer}->set_prefix (""); 398 $self->{completer}->set_prefix ("");
176 $self->{completer}->show; 399 $self->{completer}->show;
177 } elsif (exists $DIR{$sym}) { 400 } elsif (exists $DIR{$sym}) {
178 if ($mod & CFClient::KMOD_SHIFT) { 401 if ($mod & CFPlus::KMOD_SHIFT) {
179 $self->{shft}++; 402 $self->{shft}++;
403 if ($DIR{$sym}[0] != $self->{fire_dir}) {
180 $::CONN->user_send ("fire $DIR{$sym}[0]"); 404 $::CONN->user_send ("fire $DIR{$sym}[0]");
405 }
406 $self->{fire_dir} = $DIR{$sym}[0];
181 } elsif ($mod & CFClient::KMOD_CTRL) { 407 } elsif ($mod & CFPlus::KMOD_CTRL) {
182 $self->{ctrl}++; 408 $self->{ctrl}++;
183 $::CONN->user_send ("run $DIR{$sym}[0]"); 409 $::CONN->user_send ("run $DIR{$sym}[0]");
184 } else { 410 } else {
185 $::CONN->user_send ("$DIR{$sym}[1]"); 411 $::CONN->user_send ("$DIR{$sym}[1]");
186 } 412 }
187 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
188 $::BIND_EDITOR->set_binding (undef, undef, [],
189 sub {
190 my ($mod, $sym, $cmds) = @_;
191 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
192 });
193 $::BIND_EDITOR->start;
194 $::BIND_EDITOR->show;
195 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
196 $::BIND_EDITOR->stop;
197 $::BIND_EDITOR->ask_for_bind_and_commit;
198 $::BIND_EDITOR->hide;
199 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
200 $::CONN->user_send ($_) for @$bind_cmd;
201 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 413 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
202 $self->{completer}->key_down ($ev); 414 $self->{completer}->inject_key_down ($ev);
203 $self->{completer}->show; 415 $self->{completer}->show;
204 } else { 416 } else {
205 return 0; 417 return 0;
206 } 418 }
207 419
208 1 420 1
209} 421}
210 422
211sub key_up { 423sub invoke_key_up {
212 my ($self, $ev) = @_; 424 my ($self, $ev) = @_;
213 425
214 my $res = 0; 426 my $res = 0;
215 my $mod = $ev->{mod}; 427 my $mod = $ev->{mod};
216 my $sym = $ev->{sym}; 428 my $sym = $ev->{sym};
217 429
430 if ($::CFG->{shift_fire_stop}) {
218 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 431 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
219 $::CONN->user_send ("fire_stop"); 432 $::CONN->user_send ("fire_stop");
433 delete $self->{fire_dir};
220 $res = 1; 434 $res = 1;
435 }
436 } else {
437 if (exists $DIR{$sym} && delete $self->{shft}) {
438 $::CONN->user_send ("fire_stop");
439 delete $self->{fire_dir};
440 $res = 1;
441 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
442 $::CONN->user_send ("fire_stop");
443 delete $self->{fire_dir};
444 $res = 1;
445 }
221 } 446 }
222 447
223 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 448 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
224 $::CONN->user_send ("run_stop"); 449 $::CONN->user_send ("run_stop");
225 $res = 1; 450 $res = 1;
226 } 451 }
227 452
228 $res 453 $res
229} 454}
230 455
456sub set_magicmap {
457 my ($self, $w, $h, $x, $y, $data) = @_;
458
459 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
460 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
461
462 $self->{magicmap} = [$x, $y, $w, $h, $data];
463
464 $self->update;
465}
466
231sub draw { 467sub draw {
232 my ($self) = @_; 468 my ($self) = @_;
233 469
470 return unless $::MAP;
471
234 my $focused = $CFClient::UI::FOCUS == $self 472 my $focused = $CFPlus::UI::FOCUS == $self
235 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 473 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
236 474
237 return 475 return
238 unless $focused || !$::FAST; 476 unless $focused || !$::FAST;
239 477
240 if (delete $self->{need_update}) { 478 if (delete $self->{need_update}) {
479 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
480
481 my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize;
482 my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize;
483
484 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
485 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
486
487 my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize;
488 my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize;
489
490 if ($::CFG->{fow_enable}) {
491 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
492
493 if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
494 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
495 glConvolutionFilter2D (
496 GL_CONVOLUTION_2D,
497 GL_ALPHA,
498 3, 3,
499 GL_ALPHA, GL_FLOAT,
500 (pack "f*", @{ $self->{smooth_matrix} }),
501 );
502 glEnable GL_CONVOLUTION_2D;
503 }
504
505 $self->{fow_texture} = new CFPlus::Texture
506 w => $w,
507 h => $h,
508 data => $data,
509 internalformat => GL_ALPHA,
510 format => GL_ALPHA;
511
512 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
513 } else {
514 delete $self->{fow_texture};
515 }
516
241 glNewList $self->{list}; 517 glNewList $self->{list};
242 518
243 if ($::MAP) {
244 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
245 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
246
247 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
248 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
249
250 glPushMatrix; 519 glPushMatrix;
520 glTranslate $sx0, $sy0;
251 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 521 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
252 522
253 glTranslate $sx0 - 32, $sy0 - 32, 0; 523 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
254 524
255 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 525 glScale 32, 32;
256 526
257 if ($::CFG->{fow_enable}) { 527 if (my $tex = $self->{fow_texture}) {
258 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
259 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
260 glConvolutionFilter2D (
261 GL_CONVOLUTION_2D,
262 GL_ALPHA,
263 3, 3,
264 GL_ALPHA, GL_FLOAT,
265 (pack "f*", @{ $self->{smooth_matrix} }),
266 );
267 glEnable GL_CONVOLUTION_2D;
268 }
269
270 $self->{fow_texture_name} ||= glGenTexture;
271 # try to re-use the texture name: TODO improve texture class instead
272
273 $self->{fow_texture} = new CFClient::Texture
274 w => $w,
275 h => $h,
276 data => $data,
277 name => $self->{fow_texture_name},
278 internalformat => GL_ALPHA,
279 format => GL_ALPHA;
280
281 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
282
283 glEnable GL_TEXTURE_2D; 528 glEnable GL_TEXTURE_2D;
284 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
285 530
286 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 531 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
287 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 532 $self->{fow_texture}->draw_quad_alpha (0, 0);
288 533
289 glDisable GL_TEXTURE_2D; 534 glDisable GL_TEXTURE_2D;
290 } 535 }
291 536
537 if ($self->{magicmap}) {
538 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
539
540 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
541 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
542
543 glTranslate - $x - 1, - $y - 1;
544 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
545 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
546 }
547
292 glPopMatrix; 548 glPopMatrix;
293 }
294
295 glEndList; 549 glEndList;
296 } 550 }
297 551
298 glPushMatrix;
299 glCallList $self->{list}; 552 glCallList $self->{list};
300 glPopMatrix;
301 553
302 # TNT2 emulates logops in software (or worse :) 554 # TNT2 emulates logops in software (or worse :)
303 if ($focused) { 555 unless ($focused) {
304 (delete $self->{out_of_focus})->destroy
305 if $self->{out_of_focus};
306 } else {
307 glColor 0.4, 0.2, 0.2, 0.6; 556 glColor 0.4, 0.2, 0.2, 0.6;
308 glEnable GL_BLEND; 557 glEnable GL_BLEND;
309 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
310 glBegin GL_QUADS; 559 glBegin GL_QUADS;
311 glVertex 0, 0; 560 glVertex 0, 0;
312 glVertex 0, $::HEIGHT; 561 glVertex 0, $::HEIGHT;
313 glVertex $::WIDTH, $::HEIGHT; 562 glVertex $::WIDTH, $::HEIGHT;
314 glVertex $::WIDTH, 0; 563 glVertex $::WIDTH, 0;
315 glEnd; 564 glEnd;
316 glDisable GL_BLEND; 565 glDisable GL_BLEND;
317
318# $self->{out_of_focus} ||= do {
319# my $label = new CFClient::UI::Label
320# x => 0,
321# y => 0,
322# z => 1,
323# ellipsise => 0,
324# text => "map out of focus (click map to play)";
325#
326# $label->show;
327# $label->update;
328#
329# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
330# $label->move_abs (
331# ($::WIDTH - $label->{w}) * 0.5,
332# ($::HEIGHT - $label->{h}) * 0.5,
333# );
334# });
335#
336# $label
337# };
338 } 566 }
339} 567}
340 568
341sub DESTROY { 569sub DESTROY {
342 my $self = shift; 570 my $self = shift;
… …
344 glDeleteList $self->{list}; 572 glDeleteList $self->{list};
345 573
346 $self->SUPER::DESTROY; 574 $self->SUPER::DESTROY;
347} 575}
348 576
349package CFClient::MapWidget::MapMap; 577package CFPlus::MapWidget::MapMap;
350 578
351our @ISA = CFClient::UI::Base::; 579our @ISA = CFPlus::UI::Base::;
352 580
353use Time::HiRes qw(time); 581use Time::HiRes qw(time);
354use CFClient::OpenGL; 582use CFPlus::OpenGL;
355 583
356sub size_request { 584sub size_request {
357 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 585 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
358} 586}
359 587
360sub size_allocate { 588sub invoke_size_allocate {
361 my ($self, $w, $h) = @_; 589 my ($self, $w, $h) = @_;
362 590
363 $self->SUPER::size_allocate ($w, $h);
364 $self->update; 591 $self->update;
592
593 1
365} 594}
366 595
367sub update { 596sub update {
368 my ($self) = @_; 597 my ($self) = @_;
369 598
… …
394 623
395 if ($self->{texture_atime} < time) { 624 if ($self->{texture_atime} < time) {
396 $self->{texture_atime} = time + 1/3; 625 $self->{texture_atime} = time + 1/3;
397 626
398 $self->{texture} = 627 $self->{texture} =
399 new CFClient::Texture 628 new CFPlus::Texture
400 w => $w, 629 w => $w,
401 h => $h, 630 h => $h,
402 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 631 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
403 type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; 632 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
404 } 633 }
405 634
406 $self->{texture}->draw_quad (0, 0); 635 $self->{texture}->draw_quad (0, 0);
407 636
408 glDisable GL_TEXTURE_2D; 637 glDisable GL_TEXTURE_2D;
… …
423 glEnd; 652 glEnd;
424 653
425 glDisable GL_BLEND; 654 glDisable GL_BLEND;
426} 655}
427 656
428package CFClient::MapWidget::Command; 657package CFPlus::MapWidget::Command;
429 658
430use strict; 659use strict;
431 660
432use CFClient::OpenGL; 661use CFPlus::OpenGL;
433 662
434our @ISA = CFClient::UI::Frame::; 663our @ISA = CFPlus::UI::Frame::;
435 664
436sub new { 665sub new {
437 my $class = shift; 666 my $class = shift;
438 667
439 my $self = $class->SUPER::new ( 668 my $self = $class->SUPER::new (
440 bg => [0, 0, 0, 0.8], 669 bg => [0, 0, 0, 0.8],
441 @_, 670 @_,
442 ); 671 );
443 672
444 $self->add ($self->{vbox} = new CFClient::UI::VBox); 673 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
445 674
446 $self->{label} = [ 675 $self->{label} = [
447 map 676 map
448 CFClient::UI::Label->new ( 677 CFPlus::UI::Label->new (
449 can_hover => 1, 678 can_hover => 1,
450 can_events => 1, 679 can_events => 1,
451 tooltip_width => 0.33, 680 tooltip_width => 0.33,
452 fontsize => $_, 681 fontsize => $_,
453 ), (0.8) x 16 682 ), (0.8) x 16
454 ]; 683 ];
455 684
456 $self->{entry} = new CFClient::UI::Entry 685 $self->{entry} = new CFPlus::UI::Entry
457 on_changed => sub { 686 on_changed => sub {
458 $self->update_labels; 687 $self->update_labels;
688 0
689 },
690 on_button_down => sub {
691 my ($entry, $ev, $x, $y) = @_;
692
693 if ($ev->{button} == 3) {
694 (new CFPlus::UI::Menu
695 items => [
696 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
697 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
698 ],
699 )->popup ($ev);
700 return 1;
701 }
702 0
459 }, 703 },
460 on_key_down => sub { 704 on_key_down => sub {
461 my ($entry, $ev) = @_; 705 my ($entry, $ev) = @_;
462 706
463 my $self = $entry->{parent}{parent}; 707 my $self = $entry->{parent}{parent};
… …
465 if ($ev->{sym} == 13) { 709 if ($ev->{sym} == 13) {
466 if (exists $self->{select}) { 710 if (exists $self->{select}) {
467 $self->{last_command} = $self->{select}; 711 $self->{last_command} = $self->{select};
468 $::CONN->user_send ($self->{select}); 712 $::CONN->user_send ($self->{select});
469 713
470 unshift @{$self->{history}}, $self->{select}; 714 unshift @{$self->{history}}, $self->{entry}->get_text;
471 $self->{hist_ptr} = 0; 715 $self->{hist_ptr} = 0;
472 716
473 $self->hide; 717 $self->hide;
474 } 718 }
475 } elsif ($ev->{sym} == 27) { 719 } elsif ($ev->{sym} == 27) {
476 $self->{hist_ptr} = 0; 720 $self->{hist_ptr} = 0;
477 $self->hide; 721 $self->hide;
478 return;
479 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 722 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
480 if ($self->{hist_ptr} > 1) { 723 if ($self->{hist_ptr} > 1) {
481 $self->{hist_ptr}--; 724 $self->{hist_ptr}--;
482 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 725 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
483 } elsif ($self->{hist_ptr} > 0) { 726 } elsif ($self->{hist_ptr} > 0) {
484 $self->{hist_ptr}--; 727 $self->{hist_ptr}--;
… …
486 } else { 729 } else {
487 ++$self->{select_offset} 730 ++$self->{select_offset}
488 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 731 if $self->{select_offset} < $#{ $self->{last_match} || [] };
489 } 732 }
490 $self->update_labels; 733 $self->update_labels;
491 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 734 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
492 if ($self->{select_offset}) { 735 if ($self->{select_offset}) {
493 --$self->{select_offset} 736 --$self->{select_offset}
494 } else { 737 } else {
495 unless ($self->{hist_ptr}) { 738 unless ($self->{hist_ptr}) {
496 $self->{hist_saveback} = $self->{entry}->get_text; 739 $self->{hist_saveback} = $self->{entry}->get_text;
… …
523 766
524 $self->{entry}->set_text ($prefix); 767 $self->{entry}->set_text ($prefix);
525 $self->show; 768 $self->show;
526} 769}
527 770
528sub size_allocate { 771sub invoke_size_allocate {
529 my ($self, $w, $h) = @_; 772 my ($self, $w, $h) = @_;
530 773
531 $self->SUPER::size_allocate ($w, $h);
532 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 774 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
775
776 $self->SUPER::invoke_size_allocate ($w, $h)
533} 777}
534 778
535sub show { 779sub show {
536 my ($self) = @_; 780 my ($self) = @_;
537 781
538 $self->SUPER::show; 782 $self->SUPER::show;
539 $self->{entry}->focus_in; 783 $self->{entry}->grab_focus;
540} 784}
541 785
542sub hide { 786sub hide {
543 my ($self) = @_; 787 my ($self) = @_;
544 788
789 $self->{hist_ptr} = 0;
790
545 $self->SUPER::hide; 791 $self->SUPER::hide;
546 $self->{entry}->set_text (""); 792 $self->{entry}->set_text ("");
547} 793}
548 794
549sub key_down { 795sub inject_key_down {
550 my ($self, $ev) = @_; 796 my ($self, $ev) = @_;
551 797
798 $self->{entry}->grab_focus;
552 $self->{entry}->key_down ($ev) 799 $self->{entry}->emit (key_down => $ev);
553} 800}
554 801
555sub update_labels { 802sub update_labels {
556 my ($self) = @_; 803 my ($self) = @_;
557 804
… …
644 $label->set_text (""); 891 $label->set_text ("");
645 $label->set_tooltip (""); 892 $label->set_tooltip ("");
646 } 893 }
647 894
648 $self->update; 895 $self->update;
649 ###
650} 896}
651 897
652sub _draw { 898sub _draw {
653 my ($self) = @_; 899 my ($self) = @_;
654 900
655 # hack 901 # hack
656 local $CFClient::UI::FOCUS = $self->{entry}; 902 local $CFPlus::UI::FOCUS = $self->{entry};
657 903
658 $self->SUPER::_draw; 904 $self->SUPER::_draw;
659} 905}
660 906
6611 9071
908

Diff Legend

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