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.48 by elmex, Sat Jun 3 21:59:55 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 (
16 z => -1, 22 z => -1,
17 can_focus => 1, 23 can_focus => 1,
18 list => glGenList, 24 list => glGenList,
25
26 smooth_matrix => [
27 0.05, 0.13, 0.05,
28 0.13, 0.30, 0.13,
29 0.05, 0.13, 0.05,
30 ],
31
19 @_ 32 @_
20 ); 33 );
21 34
22 $self->{completer} = new CFClient::MapWidget::Command:: 35 $self->{completer} = new CFPlus::MapWidget::Command::
23 command => $self->{command}, 36 command => $self->{command},
24 can_focus => 1, 37 tooltip => "#completer_help",
25 tooltip => "<b>The Command Completer</b>\n\n"
26 . "This is your central interface to send text commands to the server. "
27 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "for commands you might want to use.\n"
31 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.",
33 ; 38 ;
34 39
35 $self 40 $self
36} 41}
37 42
… …
49 54
50sub clr_commands { 55sub clr_commands {
51 my ($self) = @_; 56 my ($self) = @_;
52 57
53 %{$self->{completer}{command}} = (); 58 %{$self->{completer}{command}} = ();
54}
55 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
56sub button_down { 199sub invoke_button_down {
57 my ($self, $ev, $x, $y) = @_; 200 my ($self, $ev, $x, $y) = @_;
58 201
59 $self->focus_in;
60
61 if ($ev->{button} == 2) { 202 if ($ev->{button} == 1) {
203 $self->grab_focus;
204 return unless $::CONN;
205
206 my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
207 my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
208
209 $x -= int 0.5 * $self->{sw};
210 $y -= int 0.5 * $self->{sh};
211
212 $::CONN->lookat ($x, $y)
213 if $::CONN;
214
215 } elsif ($ev->{button} == 2) {
216 $self->grab_focus;
217 return unless $::CONN;
218
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 219 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 220 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
64 221
65 $self->{motion} = sub { 222 $self->{motion} = sub {
66 my ($ev, $x, $y) = @_; 223 my ($ev, $x, $y) = @_;
… …
70 $::CFG->{map_shift_x} = $bw + $x - $ox; 227 $::CFG->{map_shift_x} = $bw + $x - $ox;
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 228 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 229
73 $self->update; 230 $self->update;
74 }; 231 };
75 } elsif ($ev->{button} == 1) { 232 } elsif ($ev->{button} == 3) {
76 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 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 );
77 248
78 my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99); 249 if ($::CONN && $::CONN->{editor_support}) {
79 my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99); 250 push @items, [
80 $fx += $::MAP->x; 251 "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>",
81 $fy += $::MAP->y; 252 \&editor_invoke,
253 ];
82 254
83 $::CONN->send (sprintf "lookat %d %d", $fx, $fy); 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;
84 260
85 warn "FOOX: $fx (".$::MAP->ox.")\n"; 261 push @items, [
86 warn "FOOY: $fy (".$::MAP->oy.")\n"; 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);
87 } 283 }
88 284
89 1 285 1
90} 286}
91 287
92sub button_up { 288sub invoke_button_up {
93 my ($self, $ev, $x, $y) = @_; 289 my ($self, $ev, $x, $y) = @_;
94 290
95 delete $self->{motion}; 291 delete $self->{motion};
96 292
97 1 293 1
98} 294}
99 295
100sub mouse_motion { 296sub invoke_mouse_motion {
101 my ($self, $ev, $x, $y) = @_; 297 my ($self, $ev, $x, $y) = @_;
102 298
103 if ($self->{motion}) { 299 if ($self->{motion}) {
104 $self->{motion}->($ev, $x, $y); 300 $self->{motion}->($ev, $x, $y);
105 } else { 301 } else {
… …
109 1 305 1
110} 306}
111 307
112sub size_request { 308sub size_request {
113 ( 309 (
114 1 + 32 * int $::WIDTH / 32, 310 32 * CFPlus::ceil $::WIDTH / 32,
115 1 + 32 * int $::HEIGHT / 32, 311 32 * CFPlus::ceil $::HEIGHT / 32,
116 ) 312 )
117} 313}
118 314
119sub update { 315sub update {
120 my ($self) = @_; 316 my ($self) = @_;
… …
122 $self->{need_update} = 1; 318 $self->{need_update} = 1;
123 $self->SUPER::update; 319 $self->SUPER::update;
124} 320}
125 321
126my %DIR = ( 322my %DIR = (
127 CFClient::SDLK_KP8, [1, "north"], 323 CFPlus::SDLK_KP8, [1, "north"],
128 CFClient::SDLK_KP9, [2, "northeast"], 324 CFPlus::SDLK_KP9, [2, "northeast"],
129 CFClient::SDLK_KP6, [3, "east"], 325 CFPlus::SDLK_KP6, [3, "east"],
130 CFClient::SDLK_KP3, [4, "southeast"], 326 CFPlus::SDLK_KP3, [4, "southeast"],
131 CFClient::SDLK_KP2, [5, "south"], 327 CFPlus::SDLK_KP2, [5, "south"],
132 CFClient::SDLK_KP1, [6, "southwest"], 328 CFPlus::SDLK_KP1, [6, "southwest"],
133 CFClient::SDLK_KP4, [7, "west"], 329 CFPlus::SDLK_KP4, [7, "west"],
134 CFClient::SDLK_KP7, [8, "northwest"], 330 CFPlus::SDLK_KP7, [8, "northwest"],
135 331
136 CFClient::SDLK_UP, [1, "north"], 332 CFPlus::SDLK_UP, [1, "north"],
137 CFClient::SDLK_RIGHT, [3, "east"], 333 CFPlus::SDLK_RIGHT, [3, "east"],
138 CFClient::SDLK_DOWN, [5, "south"], 334 CFPlus::SDLK_DOWN, [5, "south"],
139 CFClient::SDLK_LEFT, [7, "west"], 335 CFPlus::SDLK_LEFT, [7, "west"],
140); 336);
141 337
142sub key_down { 338sub invoke_key_down {
143 my ($self, $ev) = @_; 339 my ($self, $ev) = @_;
144
145 return 0 unless $::CONN;
146 340
147 my $mod = $ev->{mod}; 341 my $mod = $ev->{mod};
148 my $sym = $ev->{sym}; 342 my $sym = $ev->{sym};
149 my $uni = $ev->{unicode}; 343 my $uni = $ev->{unicode};
150 344
151 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) {
152 $::CONN->user_send ("stay fire"); 378 $::CONN->user_send ("stay fire");
153 } elsif ($uni == ord ",") { 379 } elsif ($uni == ord ",") {
154 $::CONN->user_send ("take"); 380 $::CONN->user_send ("take");
155 } elsif ($uni == ord " ") { 381 } elsif ($uni == ord " ") {
156 $::CONN->user_send ("apply"); 382 $::CONN->user_send ("apply");
383 } elsif ($uni == 13) {
384 $::CONN->user_send ("examine");
157 } elsif ($uni == ord ".") { 385 } elsif ($uni == ord ".") {
158 $::CONN->user_send ($self->{completer}{last_command}) 386 $::CONN->user_send ($self->{completer}{last_command})
159 if exists $self->{completer}{last_command}; 387 if exists $self->{completer}{last_command};
160 } elsif ($uni == ord "\t") { 388 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
161 $::INV_WINDOW->toggle_visibility; 389 $::CONN->user_send ($_) for @$bind_cmd;
162 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 390 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
163 $::CONN->user_send ("rotateshoottype +"); 391 $::CONN->user_send ("rotateshoottype +");
164 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 392 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
165 $::CONN->user_send ("rotateshoottype -"); 393 $::CONN->user_send ("rotateshoottype -");
166 } elsif ($uni == ord '"') { 394 } elsif ($uni == ord '"') {
167 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 395 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
168 $self->{completer}->show; 396 $self->{completer}->show;
169 } elsif ($uni == ord "'") { 397 } elsif ($uni == ord "'") {
170 $self->{completer}->set_prefix (""); 398 $self->{completer}->set_prefix ("");
171 $self->{completer}->show; 399 $self->{completer}->show;
172 } elsif (exists $DIR{$sym}) { 400 } elsif (exists $DIR{$sym}) {
173 if ($mod & CFClient::KMOD_SHIFT) { 401 if ($mod & CFPlus::KMOD_SHIFT) {
174 $self->{shft}++; 402 $self->{shft}++;
403 if ($DIR{$sym}[0] != $self->{fire_dir}) {
175 $::CONN->user_send ("fire $DIR{$sym}[0]"); 404 $::CONN->user_send ("fire $DIR{$sym}[0]");
405 }
406 $self->{fire_dir} = $DIR{$sym}[0];
176 } elsif ($mod & CFClient::KMOD_CTRL) { 407 } elsif ($mod & CFPlus::KMOD_CTRL) {
177 $self->{ctrl}++; 408 $self->{ctrl}++;
178 $::CONN->user_send ("run $DIR{$sym}[0]"); 409 $::CONN->user_send ("run $DIR{$sym}[0]");
179 } else { 410 } else {
180 $::CONN->user_send ("$DIR{$sym}[1]"); 411 $::CONN->user_send ("$DIR{$sym}[1]");
181 } 412 }
182 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
183 $::BIND_EDITOR->set_binding (undef, undef, [],
184 sub {
185 my ($mod, $sym, $cmds) = @_;
186 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
187 });
188 $::BIND_EDITOR->start;
189 $::BIND_EDITOR->show;
190 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
191 $::BIND_EDITOR->stop;
192 $::BIND_EDITOR->ask_for_bind_and_commit;
193 $::BIND_EDITOR->hide;
194 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
195 $::CONN->user_send ($_) for @$bind_cmd;
196 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 413 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
197 $self->{completer}->key_down ($ev); 414 $self->{completer}->inject_key_down ($ev);
198 $self->{completer}->show; 415 $self->{completer}->show;
199 } else { 416 } else {
200 return 0; 417 return 0;
201 } 418 }
202 419
203 1 420 1
204} 421}
205 422
206sub key_up { 423sub invoke_key_up {
207 my ($self, $ev) = @_; 424 my ($self, $ev) = @_;
208 425
209 my $res = 0; 426 my $res = 0;
210 my $mod = $ev->{mod}; 427 my $mod = $ev->{mod};
211 my $sym = $ev->{sym}; 428 my $sym = $ev->{sym};
212 429
430 if ($::CFG->{shift_fire_stop}) {
213 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 431 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
214 $::CONN->user_send ("fire_stop"); 432 $::CONN->user_send ("fire_stop");
433 delete $self->{fire_dir};
215 $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 }
216 } 446 }
217 447
218 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 448 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
219 $::CONN->user_send ("run_stop"); 449 $::CONN->user_send ("run_stop");
220 $res = 1; 450 $res = 1;
221 } 451 }
222 452
223 $res 453 $res
224} 454}
225 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
226sub draw { 467sub draw {
227 my ($self) = @_; 468 my ($self) = @_;
228 469
470 return unless $::MAP;
471
229 my $focused = $CFClient::UI::FOCUS == $self 472 my $focused = $CFPlus::UI::FOCUS == $self
230 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 473 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
231 474
232 return 475 return
233 unless $focused || !$::FAST; 476 unless $focused || !$::FAST;
234 477
235 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
236 glNewList $self->{list}; 517 glNewList $self->{list};
237 518
238 if ($::MAP) {
239 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
240 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
241
242 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
243 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
244
245 glPushMatrix; 519 glPushMatrix;
520 glTranslate $sx0, $sy0;
246 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 521 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
247 522
248 glTranslate $sx0 - 32, $sy0 - 32, 0; 523 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
249 524
250 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 525 glScale 32, 32;
251 526
252 if ($::CFG->{fow_enable}) { 527 if (my $tex = $self->{fow_texture}) {
253 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
254 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
255 glConvolutionFilter2D (
256 GL_CONVOLUTION_2D,
257 GL_ALPHA,
258 3, 3,
259 GL_ALPHA, GL_FLOAT,
260 pack "f*",
261 0.05, 0.13, 0.05,
262 0.13, 0.30, 0.13,
263 0.05, 0.13, 0.05,
264 );
265 glEnable GL_CONVOLUTION_2D;
266 }
267
268 $self->{fow_texture_name} ||= glGenTexture;
269 # try to re-use the texture name: TODO improve texture class instead
270
271 $self->{fow_texture} = new CFClient::Texture
272 w => $w,
273 h => $h,
274 data => $data,
275 name => $self->{fow_texture_name},
276 internalformat => GL_ALPHA,
277 format => GL_ALPHA;
278
279 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
280
281 glEnable GL_TEXTURE_2D; 528 glEnable GL_TEXTURE_2D;
282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 529 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
283 530
284 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 531 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
285 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 532 $self->{fow_texture}->draw_quad_alpha (0, 0);
286 533
287 glDisable GL_TEXTURE_2D; 534 glDisable GL_TEXTURE_2D;
288 } 535 }
289 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
290 glPopMatrix; 548 glPopMatrix;
291 }
292
293 glEndList; 549 glEndList;
294 } 550 }
295 551
296 glPushMatrix;
297 glCallList $self->{list}; 552 glCallList $self->{list};
298 glPopMatrix;
299 553
300 # TNT2 emulates logops in software (or worse :) 554 # TNT2 emulates logops in software (or worse :)
301 if ($focused) { 555 unless ($focused) {
302 (delete $self->{out_of_focus})->destroy
303 if $self->{out_of_focus};
304 } else {
305 glColor 0.4, 0.2, 0.2, 0.6; 556 glColor 0.4, 0.2, 0.2, 0.6;
306 glEnable GL_BLEND; 557 glEnable GL_BLEND;
307 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 558 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
308 glBegin GL_QUADS; 559 glBegin GL_QUADS;
309 glVertex 0, 0; 560 glVertex 0, 0;
310 glVertex 0, $::HEIGHT; 561 glVertex 0, $::HEIGHT;
311 glVertex $::WIDTH, $::HEIGHT; 562 glVertex $::WIDTH, $::HEIGHT;
312 glVertex $::WIDTH, 0; 563 glVertex $::WIDTH, 0;
313 glEnd; 564 glEnd;
314 glDisable GL_BLEND; 565 glDisable GL_BLEND;
315
316# $self->{out_of_focus} ||= do {
317# my $label = new CFClient::UI::Label
318# x => 0,
319# y => 0,
320# z => 1,
321# ellipsise => 0,
322# text => "map out of focus (click map to play)";
323#
324# $label->show;
325# $label->update;
326#
327# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
328# $label->move_abs (
329# ($::WIDTH - $label->{w}) * 0.5,
330# ($::HEIGHT - $label->{h}) * 0.5,
331# );
332# });
333#
334# $label
335# };
336 } 566 }
337} 567}
338 568
339sub DESTROY { 569sub DESTROY {
340 my $self = shift; 570 my $self = shift;
… …
342 glDeleteList $self->{list}; 572 glDeleteList $self->{list};
343 573
344 $self->SUPER::DESTROY; 574 $self->SUPER::DESTROY;
345} 575}
346 576
347package CFClient::MapWidget::MapMap; 577package CFPlus::MapWidget::MapMap;
348 578
349our @ISA = CFClient::UI::Base::; 579our @ISA = CFPlus::UI::Base::;
350 580
351use Time::HiRes qw(time); 581use Time::HiRes qw(time);
352use CFClient::OpenGL; 582use CFPlus::OpenGL;
353 583
354sub size_request { 584sub size_request {
355 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 585 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
356} 586}
357 587
358sub size_allocate { 588sub invoke_size_allocate {
359 my ($self, $w, $h) = @_; 589 my ($self, $w, $h) = @_;
360 590
361 $self->SUPER::size_allocate ($w, $h);
362 $self->update; 591 $self->update;
592
593 1
363} 594}
364 595
365sub update { 596sub update {
366 my ($self) = @_; 597 my ($self) = @_;
367 598
… …
392 623
393 if ($self->{texture_atime} < time) { 624 if ($self->{texture_atime} < time) {
394 $self->{texture_atime} = time + 1/3; 625 $self->{texture_atime} = time + 1/3;
395 626
396 $self->{texture} = 627 $self->{texture} =
397 new CFClient::Texture 628 new CFPlus::Texture
398 w => $w, 629 w => $w,
399 h => $h, 630 h => $h,
400 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 631 data => $::MAP->mapmap (-$ox, -$oy, $w, $h),
401 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;
402 } 633 }
403 634
404 $self->{texture}->draw_quad (0, 0); 635 $self->{texture}->draw_quad (0, 0);
405 636
406 glDisable GL_TEXTURE_2D; 637 glDisable GL_TEXTURE_2D;
… …
421 glEnd; 652 glEnd;
422 653
423 glDisable GL_BLEND; 654 glDisable GL_BLEND;
424} 655}
425 656
426package CFClient::MapWidget::Command; 657package CFPlus::MapWidget::Command;
427 658
428use strict; 659use strict;
429 660
430use CFClient::OpenGL; 661use CFPlus::OpenGL;
431 662
432our @ISA = CFClient::UI::Frame::; 663our @ISA = CFPlus::UI::Frame::;
433 664
434sub new { 665sub new {
435 my $class = shift; 666 my $class = shift;
436 667
437 my $self = $class->SUPER::new ( 668 my $self = $class->SUPER::new (
438 bg => [0, 0, 0, 0.8], 669 bg => [0, 0, 0, 0.8],
439 @_, 670 @_,
440 ); 671 );
441 672
442 $self->add ($self->{vbox} = new CFClient::UI::VBox); 673 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
443 674
444 $self->{label} = [ 675 $self->{label} = [
445 map 676 map
446 CFClient::UI::Label->new ( 677 CFPlus::UI::Label->new (
447 can_hover => 1, 678 can_hover => 1,
448 can_events => 1, 679 can_events => 1,
449 tooltip_width => 0.33, 680 tooltip_width => 0.33,
450 fontsize => $_, 681 fontsize => $_,
451 ), (0.8) x 16 682 ), (0.8) x 16
452 ]; 683 ];
453 684
454 $self->{entry} = new CFClient::UI::Entry 685 $self->{entry} = new CFPlus::UI::Entry
455 on_changed => sub { 686 on_changed => sub {
456 $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
457 }, 703 },
458 on_key_down => sub { 704 on_key_down => sub {
459 my ($entry, $ev) = @_; 705 my ($entry, $ev) = @_;
460 706
461 my $self = $entry->{parent}{parent}; 707 my $self = $entry->{parent}{parent};
462 708
463 if ($ev->{sym} == 13) { 709 if ($ev->{sym} == 13) {
464 if (exists $self->{select}) { 710 if (exists $self->{select}) {
465 $self->{last_command} = $self->{select}; 711 $self->{last_command} = $self->{select};
466 $::CONN->user_send ($self->{select}); 712 $::CONN->user_send ($self->{select});
713
714 unshift @{$self->{history}}, $self->{entry}->get_text;
715 $self->{hist_ptr} = 0;
716
467 $self->hide; 717 $self->hide;
468 } 718 }
469 } elsif ($ev->{sym} == 27) { 719 } elsif ($ev->{sym} == 27) {
720 $self->{hist_ptr} = 0;
470 $self->hide; 721 $self->hide;
471 return;
472 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 722 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
723 if ($self->{hist_ptr} > 1) {
724 $self->{hist_ptr}--;
725 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
726 } elsif ($self->{hist_ptr} > 0) {
727 $self->{hist_ptr}--;
728 $self->{entry}->set_text ($self->{hist_saveback});
729 } else {
473 ++$self->{select_offset} 730 ++$self->{select_offset}
474 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 731 if $self->{select_offset} < $#{ $self->{last_match} || [] };
732 }
475 $self->update_labels; 733 $self->update_labels;
476 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 734 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
735 if ($self->{select_offset}) {
477 --$self->{select_offset} 736 --$self->{select_offset}
737 } else {
738 unless ($self->{hist_ptr}) {
739 $self->{hist_saveback} = $self->{entry}->get_text;
740 }
741 if ($self->{hist_ptr} <= $#{$self->{history}}) {
478 if $self->{select_offset}; 742 $self->{hist_ptr}++;
743 }
744 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
745 if exists $self->{history}->[$self->{hist_ptr} - 1];
746 }
479 $self->update_labels; 747 $self->update_labels;
480 } else { 748 } else {
481 return 0; 749 return 0;
482 } 750 }
483 751
… …
498 766
499 $self->{entry}->set_text ($prefix); 767 $self->{entry}->set_text ($prefix);
500 $self->show; 768 $self->show;
501} 769}
502 770
503sub size_allocate { 771sub invoke_size_allocate {
504 my ($self, $w, $h) = @_; 772 my ($self, $w, $h) = @_;
505 773
506 $self->SUPER::size_allocate ($w, $h);
507 $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)
508} 777}
509 778
510sub show { 779sub show {
511 my ($self) = @_; 780 my ($self) = @_;
512 781
513 $self->SUPER::show; 782 $self->SUPER::show;
514 $self->{entry}->focus_in; 783 $self->{entry}->grab_focus;
515} 784}
516 785
517sub hide { 786sub hide {
518 my ($self) = @_; 787 my ($self) = @_;
519 788
789 $self->{hist_ptr} = 0;
790
520 $self->SUPER::hide; 791 $self->SUPER::hide;
521 $self->{entry}->set_text (""); 792 $self->{entry}->set_text ("");
522} 793}
523 794
524sub key_down { 795sub inject_key_down {
525 my ($self, $ev) = @_; 796 my ($self, $ev) = @_;
526 797
798 $self->{entry}->grab_focus;
527 $self->{entry}->key_down ($ev) 799 $self->{entry}->emit (key_down => $ev);
528} 800}
529 801
530sub update_labels { 802sub update_labels {
531 my ($self) = @_; 803 my ($self) = @_;
532 804
… …
619 $label->set_text (""); 891 $label->set_text ("");
620 $label->set_tooltip (""); 892 $label->set_tooltip ("");
621 } 893 }
622 894
623 $self->update; 895 $self->update;
624 ###
625} 896}
626 897
627sub _draw { 898sub _draw {
628 my ($self) = @_; 899 my ($self) = @_;
629 900
630 # hack 901 # hack
631 local $CFClient::UI::FOCUS = $self->{entry}; 902 local $CFPlus::UI::FOCUS = $self->{entry};
632 903
633 $self->SUPER::_draw; 904 $self->SUPER::_draw;
634} 905}
635 906
6361 9071
908

Diff Legend

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