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

Diff Legend

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