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.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 (
… …
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 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
63sub button_down { 191sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 192 my ($self, $ev, $x, $y) = @_;
65 193
66 return unless $::CONN;
67
68 $self->focus_in;
69
70 if ($ev->{button} == 1) { 194 if ($ev->{button} == 1) {
71 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 195 $self->grab_focus;
72 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 196 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 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
77 $x -= int 0.5 * $::MAP->w; 201 $x -= int 0.5 * $self->{sw};
78 $y -= int 0.5 * $::MAP->h; 202 $y -= int 0.5 * $self->{sh};
79
80 $x += 1;
81 $y += 1;
82 203
83 $::CONN->lookat ($x, $y) 204 $::CONN->lookat ($x, $y)
84 if $::CONN; 205 if $::CONN;
85 206
86 } elsif ($ev->{button} == 2) { 207 } elsif ($ev->{button} == 2) {
208 $self->grab_focus;
209 return unless $::CONN;
210
87 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 211 my ($ox, $oy) = ($ev->{x}, $ev->{y});
88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 212 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
89 213
90 $self->{motion} = sub { 214 $self->{motion} = sub {
91 my ($ev, $x, $y) = @_; 215 my ($ev, $x, $y) = @_;
… …
95 $::CFG->{map_shift_x} = $bw + $x - $ox; 219 $::CFG->{map_shift_x} = $bw + $x - $ox;
96 $::CFG->{map_shift_y} = $bh + $y - $oy; 220 $::CFG->{map_shift_y} = $bh + $y - $oy;
97 221
98 $self->update; 222 $self->update;
99 }; 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);
100 } 275 }
101 276
102 1 277 1
103} 278}
104 279
105sub button_up { 280sub invoke_button_up {
106 my ($self, $ev, $x, $y) = @_; 281 my ($self, $ev, $x, $y) = @_;
107 282
108 delete $self->{motion}; 283 delete $self->{motion};
109 284
110 1 285 1
111} 286}
112 287
113sub mouse_motion { 288sub invoke_mouse_motion {
114 my ($self, $ev, $x, $y) = @_; 289 my ($self, $ev, $x, $y) = @_;
115 290
116 if ($self->{motion}) { 291 if ($self->{motion}) {
117 $self->{motion}->($ev, $x, $y); 292 $self->{motion}->($ev, $x, $y);
118 } else { 293 } else {
… …
122 1 297 1
123} 298}
124 299
125sub size_request { 300sub size_request {
126 ( 301 (
127 1 + 32 * int $::WIDTH / 32, 302 32 * CFPlus::ceil $::WIDTH / 32,
128 1 + 32 * int $::HEIGHT / 32, 303 32 * CFPlus::ceil $::HEIGHT / 32,
129 ) 304 )
130} 305}
131 306
132sub update { 307sub update {
133 my ($self) = @_; 308 my ($self) = @_;
… …
135 $self->{need_update} = 1; 310 $self->{need_update} = 1;
136 $self->SUPER::update; 311 $self->SUPER::update;
137} 312}
138 313
139my %DIR = ( 314my %DIR = (
140 CFClient::SDLK_KP8, [1, "north"], 315 CFPlus::SDLK_KP8, [1, "north"],
141 CFClient::SDLK_KP9, [2, "northeast"], 316 CFPlus::SDLK_KP9, [2, "northeast"],
142 CFClient::SDLK_KP6, [3, "east"], 317 CFPlus::SDLK_KP6, [3, "east"],
143 CFClient::SDLK_KP3, [4, "southeast"], 318 CFPlus::SDLK_KP3, [4, "southeast"],
144 CFClient::SDLK_KP2, [5, "south"], 319 CFPlus::SDLK_KP2, [5, "south"],
145 CFClient::SDLK_KP1, [6, "southwest"], 320 CFPlus::SDLK_KP1, [6, "southwest"],
146 CFClient::SDLK_KP4, [7, "west"], 321 CFPlus::SDLK_KP4, [7, "west"],
147 CFClient::SDLK_KP7, [8, "northwest"], 322 CFPlus::SDLK_KP7, [8, "northwest"],
148 323
149 CFClient::SDLK_UP, [1, "north"], 324 CFPlus::SDLK_UP, [1, "north"],
150 CFClient::SDLK_RIGHT, [3, "east"], 325 CFPlus::SDLK_RIGHT, [3, "east"],
151 CFClient::SDLK_DOWN, [5, "south"], 326 CFPlus::SDLK_DOWN, [5, "south"],
152 CFClient::SDLK_LEFT, [7, "west"], 327 CFPlus::SDLK_LEFT, [7, "west"],
153); 328);
154 329
155sub key_down { 330sub invoke_key_down {
156 my ($self, $ev) = @_; 331 my ($self, $ev) = @_;
157
158 return 0 unless $::CONN;
159 332
160 my $mod = $ev->{mod}; 333 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 334 my $sym = $ev->{sym};
162 my $uni = $ev->{unicode}; 335 my $uni = $ev->{unicode};
163 336
164 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) {
165 $::CONN->user_send ("stay fire"); 370 $::CONN->user_send ("stay fire");
166 } elsif ($uni == ord ",") { 371 } elsif ($uni == ord ",") {
167 $::CONN->user_send ("take"); 372 $::CONN->user_send ("take");
168 } elsif ($uni == ord " ") { 373 } elsif ($uni == ord " ") {
169 $::CONN->user_send ("apply"); 374 $::CONN->user_send ("apply");
375 } elsif ($uni == 13) {
376 $::CONN->user_send ("examine");
170 } elsif ($uni == ord ".") { 377 } elsif ($uni == ord ".") {
171 $::CONN->user_send ($self->{completer}{last_command}) 378 $::CONN->user_send ($self->{completer}{last_command})
172 if exists $self->{completer}{last_command}; 379 if exists $self->{completer}{last_command};
173 } elsif ($uni == ord "\t") { 380 } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) {
174 $::INV_WINDOW->toggle_visibility; 381 $::CONN->user_send ($_) for @$bind_cmd;
175 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 382 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
176 $::CONN->user_send ("rotateshoottype +"); 383 $::CONN->user_send ("rotateshoottype +");
177 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 384 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
178 $::CONN->user_send ("rotateshoottype -"); 385 $::CONN->user_send ("rotateshoottype -");
179 } elsif ($uni == ord '"') { 386 } elsif ($uni == ord '"') {
180 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 387 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
181 $self->{completer}->show; 388 $self->{completer}->show;
182 } elsif ($uni == ord "'") { 389 } elsif ($uni == ord "'") {
183 $self->{completer}->set_prefix (""); 390 $self->{completer}->set_prefix ("");
184 $self->{completer}->show; 391 $self->{completer}->show;
185 } elsif (exists $DIR{$sym}) { 392 } elsif (exists $DIR{$sym}) {
186 if ($mod & CFClient::KMOD_SHIFT) { 393 if ($mod & CFPlus::KMOD_SHIFT) {
187 $self->{shft}++; 394 $self->{shft}++;
188 if ($DIR{$sym}[0] != $self->{fire_dir}) { 395 if ($DIR{$sym}[0] != $self->{fire_dir}) {
189 $::CONN->user_send ("fire $DIR{$sym}[0]"); 396 $::CONN->user_send ("fire $DIR{$sym}[0]");
190 } 397 }
191 $self->{fire_dir} = $DIR{$sym}[0]; 398 $self->{fire_dir} = $DIR{$sym}[0];
192 } elsif ($mod & CFClient::KMOD_CTRL) { 399 } elsif ($mod & CFPlus::KMOD_CTRL) {
193 $self->{ctrl}++; 400 $self->{ctrl}++;
194 $::CONN->user_send ("run $DIR{$sym}[0]"); 401 $::CONN->user_send ("run $DIR{$sym}[0]");
195 } else { 402 } else {
196 $::CONN->user_send ("$DIR{$sym}[1]"); 403 $::CONN->user_send ("$DIR{$sym}[1]");
197 } 404 }
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')) { 405 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
213 $self->{completer}->key_down ($ev); 406 $self->{completer}->inject_key_down ($ev);
214 $self->{completer}->show; 407 $self->{completer}->show;
215 } else { 408 } else {
216 return 0; 409 return 0;
217 } 410 }
218 411
219 1 412 1
220} 413}
221 414
222sub key_up { 415sub invoke_key_up {
223 my ($self, $ev) = @_; 416 my ($self, $ev) = @_;
224 417
225 my $res = 0; 418 my $res = 0;
226 my $mod = $ev->{mod}; 419 my $mod = $ev->{mod};
227 my $sym = $ev->{sym}; 420 my $sym = $ev->{sym};
228 421
229 if ($::CFG->{shift_fire_stop}) { 422 if ($::CFG->{shift_fire_stop}) {
230 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 423 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
231 $::CONN->user_send ("fire_stop"); 424 $::CONN->user_send ("fire_stop");
232 delete $self->{fire_dir}; 425 delete $self->{fire_dir};
233 $res = 1; 426 $res = 1;
234 } 427 }
235 } else { 428 } else {
236 if (exists $DIR{$sym} && delete $self->{shft}) { 429 if (exists $DIR{$sym} && delete $self->{shft}) {
237 $::CONN->user_send ("fire_stop"); 430 $::CONN->user_send ("fire_stop");
238 delete $self->{fire_dir}; 431 delete $self->{fire_dir};
239 $res = 1; 432 $res = 1;
240 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 433 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
241 $::CONN->user_send ("fire_stop"); 434 $::CONN->user_send ("fire_stop");
242 delete $self->{fire_dir}; 435 delete $self->{fire_dir};
243 $res = 1; 436 $res = 1;
244 } 437 }
245 } 438 }
246 439
247 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 440 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
248 $::CONN->user_send ("run_stop"); 441 $::CONN->user_send ("run_stop");
249 $res = 1; 442 $res = 1;
250 } 443 }
251 444
252 $res 445 $res
253} 446}
254 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;
457}
458
255sub draw { 459sub draw {
256 my ($self) = @_; 460 my ($self) = @_;
257 461
462 return unless $::MAP;
463
258 my $focused = $CFClient::UI::FOCUS == $self 464 my $focused = $CFPlus::UI::FOCUS == $self
259 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 465 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
260 466
261 return 467 return
262 unless $::CONN && ($focused || !$::FAST); 468 unless $focused || !$::FAST;
263 469
264 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
265 $self->{fow_texture} ||= glGenTexture; 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 }
266 508
267 glNewList $self->{list}; 509 glNewList $self->{list};
268 510
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; 511 glPushMatrix;
512 glTranslate $sx0, $sy0;
279 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 513 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
280 514
281 glTranslate $sx0, $sy0; 515 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
282 516
283 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 517 glScale 32, 32;
284 518
285 if ($::CFG->{fow_enable}) { 519 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; 520 glEnable GL_TEXTURE_2D;
312 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 521 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
313 522
314 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 523 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
315 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 524 $self->{fow_texture}->draw_quad_alpha (0, 0);
316 525
317 glDisable GL_TEXTURE_2D; 526 glDisable GL_TEXTURE_2D;
318 } 527 }
319 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
320 glPopMatrix; 540 glPopMatrix;
321 }
322
323 glEndList; 541 glEndList;
324 } 542 }
325 543
326 glPushMatrix;
327 glCallList $self->{list}; 544 glCallList $self->{list};
328 glPopMatrix;
329 545
330 # TNT2 emulates logops in software (or worse :) 546 # TNT2 emulates logops in software (or worse :)
331 if ($focused) { 547 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; 548 glColor 0.4, 0.2, 0.2, 0.6;
336 glEnable GL_BLEND; 549 glEnable GL_BLEND;
337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 550 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
338 glBegin GL_QUADS; 551 glBegin GL_QUADS;
339 glVertex 0, 0; 552 glVertex 0, 0;
340 glVertex 0, $::HEIGHT; 553 glVertex 0, $::HEIGHT;
341 glVertex $::WIDTH, $::HEIGHT; 554 glVertex $::WIDTH, $::HEIGHT;
342 glVertex $::WIDTH, 0; 555 glVertex $::WIDTH, 0;
343 glEnd; 556 glEnd;
344 glDisable GL_BLEND; 557 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 } 558 }
367} 559}
368 560
369sub DESTROY { 561sub DESTROY {
370 my $self = shift; 562 my $self = shift;
… …
372 glDeleteList $self->{list}; 564 glDeleteList $self->{list};
373 565
374 $self->SUPER::DESTROY; 566 $self->SUPER::DESTROY;
375} 567}
376 568
377package CFClient::MapWidget::MapMap; 569package CFPlus::MapWidget::MapMap;
378 570
379our @ISA = CFClient::UI::Base::; 571our @ISA = CFPlus::UI::Base::;
380 572
381use Time::HiRes qw(time); 573use Time::HiRes qw(time);
382use CFClient::OpenGL; 574use CFPlus::OpenGL;
383 575
384sub size_request { 576sub size_request {
385 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 577 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
386} 578}
387 579
388sub size_allocate { 580sub invoke_size_allocate {
389 my ($self, $w, $h) = @_; 581 my ($self, $w, $h) = @_;
390 582
391 $self->SUPER::size_allocate ($w, $h);
392 $self->update; 583 $self->update;
584
585 1
393} 586}
394 587
395sub update { 588sub update {
396 my ($self) = @_; 589 my ($self) = @_;
397 590
… …
422 615
423 if ($self->{texture_atime} < time) { 616 if ($self->{texture_atime} < time) {
424 $self->{texture_atime} = time + 1/3; 617 $self->{texture_atime} = time + 1/3;
425 618
426 $self->{texture} = 619 $self->{texture} =
427 new CFClient::Texture 620 new CFPlus::Texture
428 w => $w, 621 w => $w,
429 h => $h, 622 h => $h,
430 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 623 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; 624 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
432 } 625 }
433 626
434 $self->{texture}->draw_quad (0, 0); 627 $self->{texture}->draw_quad (0, 0);
435 628
436 glDisable GL_TEXTURE_2D; 629 glDisable GL_TEXTURE_2D;
… …
451 glEnd; 644 glEnd;
452 645
453 glDisable GL_BLEND; 646 glDisable GL_BLEND;
454} 647}
455 648
456package CFClient::MapWidget::Command; 649package CFPlus::MapWidget::Command;
457 650
458use strict; 651use strict;
459 652
460use CFClient::OpenGL; 653use CFPlus::OpenGL;
461 654
462our @ISA = CFClient::UI::Frame::; 655our @ISA = CFPlus::UI::Frame::;
463 656
464sub new { 657sub new {
465 my $class = shift; 658 my $class = shift;
466 659
467 my $self = $class->SUPER::new ( 660 my $self = $class->SUPER::new (
468 bg => [0, 0, 0, 0.8], 661 bg => [0, 0, 0, 0.8],
469 @_, 662 @_,
470 ); 663 );
471 664
472 $self->add ($self->{vbox} = new CFClient::UI::VBox); 665 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
473 666
474 $self->{label} = [ 667 $self->{label} = [
475 map 668 map
476 CFClient::UI::Label->new ( 669 CFPlus::UI::Label->new (
477 can_hover => 1, 670 can_hover => 1,
478 can_events => 1, 671 can_events => 1,
479 tooltip_width => 0.33, 672 tooltip_width => 0.33,
480 fontsize => $_, 673 fontsize => $_,
481 ), (0.8) x 16 674 ), (0.8) x 16
482 ]; 675 ];
483 676
484 $self->{entry} = new CFClient::UI::Entry 677 $self->{entry} = new CFPlus::UI::Entry
485 on_changed => sub { 678 on_changed => sub {
486 $self->update_labels; 679 $self->update_labels;
680 0
487 }, 681 },
488 on_button_down => sub { 682 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 683 my ($entry, $ev, $x, $y) = @_;
490 684
491 if ($ev->{button} == 3) { 685 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 686 (new CFPlus::UI::Menu
493 items => [ 687 items => [
688 ["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 }) }] 689 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
495 ], 690 ],
496 )->popup ($ev); 691 )->popup ($ev);
497 return 1; 692 return 1;
498 } 693 }
499 0 694 0
… …
506 if ($ev->{sym} == 13) { 701 if ($ev->{sym} == 13) {
507 if (exists $self->{select}) { 702 if (exists $self->{select}) {
508 $self->{last_command} = $self->{select}; 703 $self->{last_command} = $self->{select};
509 $::CONN->user_send ($self->{select}); 704 $::CONN->user_send ($self->{select});
510 705
511 unshift @{$self->{history}}, $self->{select}; 706 unshift @{$self->{history}}, $self->{entry}->get_text;
512 $self->{hist_ptr} = 0; 707 $self->{hist_ptr} = 0;
513 708
514 $self->hide; 709 $self->hide;
515 } 710 }
516 } elsif ($ev->{sym} == 27) { 711 } elsif ($ev->{sym} == 27) {
517 $self->{hist_ptr} = 0; 712 $self->{hist_ptr} = 0;
518 $self->hide; 713 $self->hide;
519 return;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 714 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 715 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 716 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 717 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 718 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--; 719 $self->{hist_ptr}--;
… …
527 } else { 721 } else {
528 ++$self->{select_offset} 722 ++$self->{select_offset}
529 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 723 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 } 724 }
531 $self->update_labels; 725 $self->update_labels;
532 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 726 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533 if ($self->{select_offset}) { 727 if ($self->{select_offset}) {
534 --$self->{select_offset} 728 --$self->{select_offset}
535 } else { 729 } else {
536 unless ($self->{hist_ptr}) { 730 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text; 731 $self->{hist_saveback} = $self->{entry}->get_text;
… …
564 758
565 $self->{entry}->set_text ($prefix); 759 $self->{entry}->set_text ($prefix);
566 $self->show; 760 $self->show;
567} 761}
568 762
569sub size_allocate { 763sub invoke_size_allocate {
570 my ($self, $w, $h) = @_; 764 my ($self, $w, $h) = @_;
571 765
572 $self->SUPER::size_allocate ($w, $h);
573 $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)
574} 769}
575 770
576sub show { 771sub show {
577 my ($self) = @_; 772 my ($self) = @_;
578 773
579 $self->SUPER::show; 774 $self->SUPER::show;
580 $self->{entry}->focus_in; 775 $self->{entry}->grab_focus;
581} 776}
582 777
583sub hide { 778sub hide {
584 my ($self) = @_; 779 my ($self) = @_;
585 780
781 $self->{hist_ptr} = 0;
782
586 $self->SUPER::hide; 783 $self->SUPER::hide;
587 $self->{entry}->set_text (""); 784 $self->{entry}->set_text ("");
588} 785}
589 786
590sub key_down { 787sub inject_key_down {
591 my ($self, $ev) = @_; 788 my ($self, $ev) = @_;
592 789
790 $self->{entry}->grab_focus;
593 $self->{entry}->key_down ($ev) 791 $self->{entry}->emit (key_down => $ev);
594} 792}
595 793
596sub update_labels { 794sub update_labels {
597 my ($self) = @_; 795 my ($self) = @_;
598 796
… …
685 $label->set_text (""); 883 $label->set_text ("");
686 $label->set_tooltip (""); 884 $label->set_tooltip ("");
687 } 885 }
688 886
689 $self->update; 887 $self->update;
690 ###
691} 888}
692 889
693sub _draw { 890sub _draw {
694 my ($self) = @_; 891 my ($self) = @_;
695 892
696 # hack 893 # hack
697 local $CFClient::UI::FOCUS = $self->{entry}; 894 local $CFPlus::UI::FOCUS = $self->{entry};
698 895
699 $self->SUPER::_draw; 896 $self->SUPER::_draw;
700} 897}
701 898
7021 8991
900

Diff Legend

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