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

Diff Legend

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