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

Diff Legend

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