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

Diff Legend

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