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.59 by root, Wed Jun 14 16:20:22 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 return unless $::CONN;
67
68 $self->focus_in;
69
70 if ($ev->{button} == 1) { 225 if ($ev->{button} == 1) {
71 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 226 $self->grab_focus;
72 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 227 return unless $::CONN;
73
74 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
75 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
76 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
77 $x -= int 0.5 * $::MAP->w; 232 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $::MAP->h; 233 $y -= int 0.5 * $self->{sh};
79
80 $x += 1;
81 $y += 1;
82 234
83 $::CONN->lookat ($x, $y) 235 $::CONN->lookat ($x, $y)
84 if $::CONN; 236 if $::CONN;
85 237
86 } elsif ($ev->{button} == 2) { 238 } elsif ($ev->{button} == 2) {
239 $self->grab_focus;
240 return unless $::CONN;
241
87 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 242 my ($ox, $oy) = ($ev->{x}, $ev->{y});
88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 243 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
89 244
90 $self->{motion} = sub { 245 $self->{motion} = sub {
91 my ($ev, $x, $y) = @_; 246 my ($ev, $x, $y) = @_;
… …
95 $::CFG->{map_shift_x} = $bw + $x - $ox; 250 $::CFG->{map_shift_x} = $bw + $x - $ox;
96 $::CFG->{map_shift_y} = $bh + $y - $oy; 251 $::CFG->{map_shift_y} = $bh + $y - $oy;
97 252
98 $self->update; 253 $self->update;
99 }; 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);
100 } 306 }
101 307
102 1 308 1
103} 309}
104 310
105sub button_up { 311sub invoke_button_up {
106 my ($self, $ev, $x, $y) = @_; 312 my ($self, $ev, $x, $y) = @_;
107 313
108 delete $self->{motion}; 314 delete $self->{motion};
109 315
110 1 316 1
111} 317}
112 318
113sub mouse_motion { 319sub invoke_mouse_motion {
114 my ($self, $ev, $x, $y) = @_; 320 my ($self, $ev, $x, $y) = @_;
115 321
116 if ($self->{motion}) { 322 if ($self->{motion}) {
117 $self->{motion}->($ev, $x, $y); 323 $self->{motion}->($ev, $x, $y);
118 } else { 324 } else {
… …
122 1 328 1
123} 329}
124 330
125sub size_request { 331sub size_request {
126 ( 332 (
127 1 + 32 * int $::WIDTH / 32, 333 32 * CFPlus::ceil $::WIDTH / 32,
128 1 + 32 * int $::HEIGHT / 32, 334 32 * CFPlus::ceil $::HEIGHT / 32,
129 ) 335 )
130} 336}
131 337
132sub update { 338sub update {
133 my ($self) = @_; 339 my ($self) = @_;
… …
135 $self->{need_update} = 1; 341 $self->{need_update} = 1;
136 $self->SUPER::update; 342 $self->SUPER::update;
137} 343}
138 344
139my %DIR = ( 345my %DIR = (
140 CFClient::SDLK_KP8, [1, "north"], 346 CFPlus::SDLK_KP8, [1, "north"],
141 CFClient::SDLK_KP9, [2, "northeast"], 347 CFPlus::SDLK_KP9, [2, "northeast"],
142 CFClient::SDLK_KP6, [3, "east"], 348 CFPlus::SDLK_KP6, [3, "east"],
143 CFClient::SDLK_KP3, [4, "southeast"], 349 CFPlus::SDLK_KP3, [4, "southeast"],
144 CFClient::SDLK_KP2, [5, "south"], 350 CFPlus::SDLK_KP2, [5, "south"],
145 CFClient::SDLK_KP1, [6, "southwest"], 351 CFPlus::SDLK_KP1, [6, "southwest"],
146 CFClient::SDLK_KP4, [7, "west"], 352 CFPlus::SDLK_KP4, [7, "west"],
147 CFClient::SDLK_KP7, [8, "northwest"], 353 CFPlus::SDLK_KP7, [8, "northwest"],
148 354
149 CFClient::SDLK_UP, [1, "north"], 355 CFPlus::SDLK_UP, [1, "north"],
150 CFClient::SDLK_RIGHT, [3, "east"], 356 CFPlus::SDLK_RIGHT, [3, "east"],
151 CFClient::SDLK_DOWN, [5, "south"], 357 CFPlus::SDLK_DOWN, [5, "south"],
152 CFClient::SDLK_LEFT, [7, "west"], 358 CFPlus::SDLK_LEFT, [7, "west"],
153); 359);
154 360
155sub key_down { 361sub invoke_key_down {
156 my ($self, $ev) = @_; 362 my ($self, $ev) = @_;
157
158 return 0 unless $::CONN;
159 363
160 my $mod = $ev->{mod}; 364 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 365 my $sym = $ev->{sym};
162 my $uni = $ev->{unicode}; 366 my $uni = $ev->{unicode};
163 367
164 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) {
165 $::CONN->user_send ("stay fire"); 401 $::CONN->user_send ("stay fire");
166 } elsif ($uni == ord ",") { 402 } elsif ($uni == ord ",") {
167 $::CONN->user_send ("take"); 403 $::CONN->user_send ("take");
168 } elsif ($uni == ord " ") { 404 } elsif ($uni == ord " ") {
169 $::CONN->user_send ("apply"); 405 $::CONN->user_send ("apply");
406 } elsif ($uni == 13) {
407 $::CONN->user_send ("examine");
170 } elsif ($uni == ord ".") { 408 } elsif ($uni == ord ".") {
171 $::CONN->user_send ($self->{completer}{last_command}) 409 $::CONN->user_send ($self->{completer}{last_command})
172 if exists $self->{completer}{last_command}; 410 if exists $self->{completer}{last_command};
173 } elsif ($uni == ord "\t") { 411 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
174 $::INV_WINDOW->toggle_visibility; 412 $::CONN->user_send ($_) for @$bind_cmd;
175 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 413 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
176 $::CONN->user_send ("rotateshoottype +"); 414 $::CONN->user_send ("rotateshoottype +");
177 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 415 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
178 $::CONN->user_send ("rotateshoottype -"); 416 $::CONN->user_send ("rotateshoottype -");
179 } elsif ($uni == ord '"') { 417 } elsif ($uni == ord '"') {
180 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 418 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
181 $self->{completer}->show; 419 $self->{completer}->show;
182 } elsif ($uni == ord "'") { 420 } elsif ($uni == ord "'") {
183 $self->{completer}->set_prefix (""); 421 $self->{completer}->set_prefix ("");
184 $self->{completer}->show; 422 $self->{completer}->show;
185 } elsif (exists $DIR{$sym}) { 423 } elsif (exists $DIR{$sym}) {
186 if ($mod & CFClient::KMOD_SHIFT) { 424 if ($mod & CFPlus::KMOD_SHIFT) {
187 $self->{shft}++; 425 $self->{shft}++;
188 if ($DIR{$sym}[0] != $self->{fire_dir}) { 426 if ($DIR{$sym}[0] != $self->{fire_dir}) {
189 $::CONN->user_send ("fire $DIR{$sym}[0]"); 427 $::CONN->user_send ("fire $DIR{$sym}[0]");
190 } 428 }
191 $self->{fire_dir} = $DIR{$sym}[0]; 429 $self->{fire_dir} = $DIR{$sym}[0];
192 } elsif ($mod & CFClient::KMOD_CTRL) { 430 } elsif ($mod & CFPlus::KMOD_CTRL) {
193 $self->{ctrl}++; 431 $self->{ctrl}++;
194 $::CONN->user_send ("run $DIR{$sym}[0]"); 432 $::CONN->user_send ("run $DIR{$sym}[0]");
195 } else { 433 } else {
196 $::CONN->user_send ("$DIR{$sym}[1]"); 434 $::CONN->user_send ("$DIR{$sym}[1]");
197 } 435 }
198 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
199 $::BIND_EDITOR->set_binding (undef, undef, [],
200 sub {
201 my ($mod, $sym, $cmds) = @_;
202 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
203 });
204 $::BIND_EDITOR->start;
205 $::BIND_EDITOR->show;
206 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
207 $::BIND_EDITOR->stop;
208 $::BIND_EDITOR->ask_for_bind_and_commit;
209 $::BIND_EDITOR->hide;
210 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
211 $::CONN->user_send ($_) for @$bind_cmd;
212 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 436 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
213 $self->{completer}->key_down ($ev); 437 $self->{completer}->inject_key_down ($ev);
214 $self->{completer}->show; 438 $self->{completer}->show;
215 } else { 439 } else {
216 return 0; 440 return 0;
217 } 441 }
218 442
219 1 443 1
220} 444}
221 445
222sub key_up { 446sub invoke_key_up {
223 my ($self, $ev) = @_; 447 my ($self, $ev) = @_;
224 448
225 my $res = 0; 449 my $res = 0;
226 my $mod = $ev->{mod}; 450 my $mod = $ev->{mod};
227 my $sym = $ev->{sym}; 451 my $sym = $ev->{sym};
228 452
229 if ($::CFG->{shift_fire_stop}) { 453 if ($::CFG->{shift_fire_stop}) {
230 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 454 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
231 $::CONN->user_send ("fire_stop"); 455 $::CONN->user_send ("fire_stop");
232 delete $self->{fire_dir}; 456 delete $self->{fire_dir};
233 $res = 1; 457 $res = 1;
234 } 458 }
235 } else { 459 } else {
236 if (exists $DIR{$sym} && delete $self->{shft}) { 460 if (exists $DIR{$sym} && delete $self->{shft}) {
237 $::CONN->user_send ("fire_stop"); 461 $::CONN->user_send ("fire_stop");
238 delete $self->{fire_dir}; 462 delete $self->{fire_dir};
239 $res = 1; 463 $res = 1;
240 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 464 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
241 $::CONN->user_send ("fire_stop"); 465 $::CONN->user_send ("fire_stop");
242 delete $self->{fire_dir}; 466 delete $self->{fire_dir};
243 $res = 1; 467 $res = 1;
244 } 468 }
245 } 469 }
246 470
247 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 471 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
248 $::CONN->user_send ("run_stop"); 472 $::CONN->user_send ("run_stop");
249 $res = 1; 473 $res = 1;
250 } 474 }
251 475
252 $res 476 $res
253} 477}
254 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
255sub draw { 490sub draw {
256 my ($self) = @_; 491 my ($self) = @_;
257 492
493 return unless $::MAP;
494
258 my $focused = $CFClient::UI::FOCUS == $self 495 my $focused = $CFPlus::UI::FOCUS == $self
259 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 496 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
260 497
261 return 498 return
262 unless $::CONN && ($focused || !$::FAST); 499 unless $focused || !$::FAST;
263 500
264 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
265 $self->{fow_texture} ||= glGenTexture; 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 }
266 539
267 glNewList $self->{list}; 540 glNewList $self->{list};
268 541
269 if ($::MAP) {
270 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
271 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
272
273 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
274 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
275 my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
276 my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
277
278 glPushMatrix; 542 glPushMatrix;
543 glTranslate $sx0, $sy0;
279 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 544 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
280 545
281 glTranslate $sx0, $sy0; 546 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
282 547
283 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 548 glScale 32, 32;
284 549
285 if ($::CFG->{fow_enable}) { 550 if (my $tex = $self->{fow_texture}) {
286 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
287 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
288 glConvolutionFilter2D (
289 GL_CONVOLUTION_2D,
290 GL_ALPHA,
291 3, 3,
292 GL_ALPHA, GL_FLOAT,
293 (pack "f*", @{ $self->{smooth_matrix} }),
294 );
295 glEnable GL_CONVOLUTION_2D;
296 }
297
298 $self->{fow_texture_name} ||= glGenTexture;
299 # try to re-use the texture name: TODO improve texture class instead
300
301 $self->{fow_texture} = new CFClient::Texture
302 w => $w,
303 h => $h,
304 data => $data,
305 name => $self->{fow_texture_name},
306 internalformat => GL_ALPHA,
307 format => GL_ALPHA;
308
309 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310
311 glEnable GL_TEXTURE_2D; 551 glEnable GL_TEXTURE_2D;
312 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 552 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
313 553
314 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 554 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
315 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 555 $self->{fow_texture}->draw_quad_alpha (0, 0);
316 556
317 glDisable GL_TEXTURE_2D; 557 glDisable GL_TEXTURE_2D;
318 } 558 }
319 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
320 glPopMatrix; 571 glPopMatrix;
321 }
322
323 glEndList; 572 glEndList;
324 } 573 }
325 574
326 glPushMatrix;
327 glCallList $self->{list}; 575 glCallList $self->{list};
328 glPopMatrix;
329 576
330 # TNT2 emulates logops in software (or worse :) 577 # TNT2 emulates logops in software (or worse :)
331 if ($focused) { 578 unless ($focused) {
332 (delete $self->{out_of_focus})->destroy
333 if $self->{out_of_focus};
334 } else {
335 glColor 0.4, 0.2, 0.2, 0.6; 579 glColor 0.4, 0.2, 0.2, 0.6;
336 glEnable GL_BLEND; 580 glEnable GL_BLEND;
337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 581 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
338 glBegin GL_QUADS; 582 glBegin GL_QUADS;
339 glVertex 0, 0; 583 glVertex 0, 0;
340 glVertex 0, $::HEIGHT; 584 glVertex 0, $::HEIGHT;
341 glVertex $::WIDTH, $::HEIGHT; 585 glVertex $::WIDTH, $::HEIGHT;
342 glVertex $::WIDTH, 0; 586 glVertex $::WIDTH, 0;
343 glEnd; 587 glEnd;
344 glDisable GL_BLEND; 588 glDisable GL_BLEND;
345
346# $self->{out_of_focus} ||= do {
347# my $label = new CFClient::UI::Label
348# x => 0,
349# y => 0,
350# z => 1,
351# ellipsise => 0,
352# text => "map out of focus (click map to play)";
353#
354# $label->show;
355# $label->update;
356#
357# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
358# $label->move_abs (
359# ($::WIDTH - $label->{w}) * 0.5,
360# ($::HEIGHT - $label->{h}) * 0.5,
361# );
362# });
363#
364# $label
365# };
366 } 589 }
367} 590}
368 591
369sub DESTROY { 592sub DESTROY {
370 my $self = shift; 593 my $self = shift;
… …
372 glDeleteList $self->{list}; 595 glDeleteList $self->{list};
373 596
374 $self->SUPER::DESTROY; 597 $self->SUPER::DESTROY;
375} 598}
376 599
377package CFClient::MapWidget::MapMap; 600package CFPlus::MapWidget::MapMap;
378 601
379our @ISA = CFClient::UI::Base::; 602our @ISA = CFPlus::UI::Base::;
380 603
381use Time::HiRes qw(time); 604use Time::HiRes qw(time);
382use CFClient::OpenGL; 605use CFPlus::OpenGL;
383 606
384sub size_request { 607sub size_request {
385 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 608 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
386} 609}
387 610
388sub size_allocate { 611sub invoke_size_allocate {
389 my ($self, $w, $h) = @_; 612 my ($self, $w, $h) = @_;
390 613
391 $self->SUPER::size_allocate ($w, $h);
392 $self->update; 614 $self->update;
615
616 1
393} 617}
394 618
395sub update { 619sub update {
396 my ($self) = @_; 620 my ($self) = @_;
397 621
… …
422 646
423 if ($self->{texture_atime} < time) { 647 if ($self->{texture_atime} < time) {
424 $self->{texture_atime} = time + 1/3; 648 $self->{texture_atime} = time + 1/3;
425 649
426 $self->{texture} = 650 $self->{texture} =
427 new CFClient::Texture 651 new CFPlus::Texture
428 w => $w, 652 w => $w,
429 h => $h, 653 h => $h,
430 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 654 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
431 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;
432 } 656 }
433 657
434 $self->{texture}->draw_quad (0, 0); 658 $self->{texture}->draw_quad (0, 0);
435 659
436 glDisable GL_TEXTURE_2D; 660 glDisable GL_TEXTURE_2D;
… …
451 glEnd; 675 glEnd;
452 676
453 glDisable GL_BLEND; 677 glDisable GL_BLEND;
454} 678}
455 679
456package CFClient::MapWidget::Command; 680package CFPlus::MapWidget::Command;
457 681
458use strict; 682use strict;
459 683
460use CFClient::OpenGL; 684use CFPlus::OpenGL;
461 685
462our @ISA = CFClient::UI::Frame::; 686our @ISA = CFPlus::UI::Frame::;
463 687
464sub new { 688sub new {
465 my $class = shift; 689 my $class = shift;
466 690
467 my $self = $class->SUPER::new ( 691 my $self = $class->SUPER::new (
468 bg => [0, 0, 0, 0.8], 692 bg => [0, 0, 0, 0.8],
469 @_, 693 @_,
470 ); 694 );
471 695
472 $self->add ($self->{vbox} = new CFClient::UI::VBox); 696 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
473 697
474 $self->{label} = [ 698 $self->{label} = [
475 map 699 map
476 CFClient::UI::Label->new ( 700 CFPlus::UI::Label->new (
477 can_hover => 1, 701 can_hover => 1,
478 can_events => 1, 702 can_events => 1,
479 tooltip_width => 0.33, 703 tooltip_width => 0.33,
480 fontsize => $_, 704 fontsize => $_,
481 ), (0.8) x 16 705 ), (0.8) x 16
482 ]; 706 ];
483 707
484 $self->{entry} = new CFClient::UI::Entry 708 $self->{entry} = new CFPlus::UI::Entry
485 on_changed => sub { 709 on_changed => sub {
486 $self->update_labels; 710 $self->update_labels;
711 0
487 }, 712 },
488 on_button_down => sub { 713 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 714 my ($entry, $ev, $x, $y) = @_;
490 715
491 if ($ev->{button} == 3) { 716 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 717 (new CFPlus::UI::Menu
493 items => [ 718 items => [
719 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
494 ["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 }) }]
495 ], 721 ],
496 )->popup ($ev); 722 )->popup ($ev);
497 return 1; 723 return 1;
498 } 724 }
499 0 725 0
… …
506 if ($ev->{sym} == 13) { 732 if ($ev->{sym} == 13) {
507 if (exists $self->{select}) { 733 if (exists $self->{select}) {
508 $self->{last_command} = $self->{select}; 734 $self->{last_command} = $self->{select};
509 $::CONN->user_send ($self->{select}); 735 $::CONN->user_send ($self->{select});
510 736
511 unshift @{$self->{history}}, $self->{select}; 737 unshift @{$self->{history}}, $self->{entry}->get_text;
512 $self->{hist_ptr} = 0; 738 $self->{hist_ptr} = 0;
513 739
514 $self->hide; 740 $self->hide;
515 } 741 }
516 } elsif ($ev->{sym} == 27) { 742 } elsif ($ev->{sym} == 27) {
517 $self->{hist_ptr} = 0; 743 $self->{hist_ptr} = 0;
518 $self->hide; 744 $self->hide;
519 return;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 745 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 746 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 747 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 748 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 749 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--; 750 $self->{hist_ptr}--;
… …
527 } else { 752 } else {
528 ++$self->{select_offset} 753 ++$self->{select_offset}
529 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 754 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 } 755 }
531 $self->update_labels; 756 $self->update_labels;
532 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 757 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533 if ($self->{select_offset}) { 758 if ($self->{select_offset}) {
534 --$self->{select_offset} 759 --$self->{select_offset}
535 } else { 760 } else {
536 unless ($self->{hist_ptr}) { 761 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text; 762 $self->{hist_saveback} = $self->{entry}->get_text;
… …
564 789
565 $self->{entry}->set_text ($prefix); 790 $self->{entry}->set_text ($prefix);
566 $self->show; 791 $self->show;
567} 792}
568 793
569sub size_allocate { 794sub invoke_size_allocate {
570 my ($self, $w, $h) = @_; 795 my ($self, $w, $h) = @_;
571 796
572 $self->SUPER::size_allocate ($w, $h);
573 $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)
574} 800}
575 801
576sub show { 802sub show {
577 my ($self) = @_; 803 my ($self) = @_;
578 804
579 $self->SUPER::show; 805 $self->SUPER::show;
580 $self->{entry}->focus_in; 806 $self->{entry}->grab_focus;
581} 807}
582 808
583sub hide { 809sub hide {
584 my ($self) = @_; 810 my ($self) = @_;
585 811
812 $self->{hist_ptr} = 0;
813
586 $self->SUPER::hide; 814 $self->SUPER::hide;
587 $self->{entry}->set_text (""); 815 $self->{entry}->set_text ("");
588} 816}
589 817
590sub key_down { 818sub inject_key_down {
591 my ($self, $ev) = @_; 819 my ($self, $ev) = @_;
592 820
821 $self->{entry}->grab_focus;
593 $self->{entry}->key_down ($ev) 822 $self->{entry}->emit (key_down => $ev);
594} 823}
595 824
596sub update_labels { 825sub update_labels {
597 my ($self) = @_; 826 my ($self) = @_;
598 827
… …
685 $label->set_text (""); 914 $label->set_text ("");
686 $label->set_tooltip (""); 915 $label->set_tooltip ("");
687 } 916 }
688 917
689 $self->update; 918 $self->update;
690 ###
691} 919}
692 920
693sub _draw { 921sub _draw {
694 my ($self) = @_; 922 my ($self) = @_;
695 923
696 # hack 924 # hack
697 local $CFClient::UI::FOCUS = $self->{entry}; 925 local $CFPlus::UI::FOCUS = $self->{entry};
698 926
699 $self->SUPER::_draw; 927 $self->SUPER::_draw;
700} 928}
701 929
7021 9301
931

Diff Legend

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