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

Diff Legend

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