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.102 by root, Sun Apr 1 15:08:14 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() { 64 }
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 return unless $::CONN;
67
68 $self->focus_in;
69
70 if ($ev->{button} == 1) { 180 if ($ev->{button} == 1) {
71 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 181 $self->grab_focus;
72 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 182 return unless $::CONN;
183
184 my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize};
185 my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize};
186
187 $x -= CFPlus::floor $::MAP->w * 0.5;
188 $y -= CFPlus::floor $::MAP->h * 0.5;
189
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 }
197
198 } elsif ($ev->{button} == 2) {
199 $self->grab_focus;
200 return unless $::CONN;
73 201
74 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
75 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
76
77 $x -= int 0.5 * $::MAP->w;
78 $y -= int 0.5 * $::MAP->h;
79
80 $x += 1;
81 $y += 1;
82
83 $::CONN->lookat ($x, $y)
84 if $::CONN;
85
86 } elsif ($ev->{button} == 2) {
87 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 202 my ($ox, $oy) = ($ev->{x}, $ev->{y});
88 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 203 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
89 204
90 $self->{motion} = sub { 205 $self->{motion} = sub {
91 my ($ev, $x, $y) = @_; 206 my ($ev, $x, $y) = @_;
… …
95 $::CFG->{map_shift_x} = $bw + $x - $ox; 210 $::CFG->{map_shift_x} = $bw + $x - $ox;
96 $::CFG->{map_shift_y} = $bh + $y - $oy; 211 $::CFG->{map_shift_y} = $bh + $y - $oy;
97 212
98 $self->update; 213 $self->update;
99 }; 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);
100 } 266 }
101 267
102 1 268 1
103} 269}
104 270
105sub button_up { 271sub invoke_button_up {
106 my ($self, $ev, $x, $y) = @_; 272 my ($self, $ev, $x, $y) = @_;
107 273
108 delete $self->{motion}; 274 delete $self->{motion};
109 275
110 1 276 1
111} 277}
112 278
113sub mouse_motion { 279sub invoke_mouse_motion {
114 my ($self, $ev, $x, $y) = @_; 280 my ($self, $ev, $x, $y) = @_;
115 281
116 if ($self->{motion}) { 282 if ($self->{motion}) {
117 $self->{motion}->($ev, $x, $y); 283 $self->{motion}->($ev, $x, $y);
118 } else { 284 } else {
… …
122 1 288 1
123} 289}
124 290
125sub size_request { 291sub size_request {
126 ( 292 (
127 1 + 32 * int $::WIDTH / 32, 293 ::T * CFPlus::ceil $::WIDTH / ::T,
128 1 + 32 * int $::HEIGHT / 32, 294 ::T * CFPlus::ceil $::HEIGHT / ::T,
129 ) 295 )
130} 296}
131 297
132sub update { 298sub update {
133 my ($self) = @_; 299 my ($self) = @_;
… …
135 $self->{need_update} = 1; 301 $self->{need_update} = 1;
136 $self->SUPER::update; 302 $self->SUPER::update;
137} 303}
138 304
139my %DIR = ( 305my %DIR = (
140 CFClient::SDLK_KP8, [1, "north"], 306 CFPlus::SDLK_KP8, [1, "north"],
141 CFClient::SDLK_KP9, [2, "northeast"], 307 CFPlus::SDLK_KP9, [2, "northeast"],
142 CFClient::SDLK_KP6, [3, "east"], 308 CFPlus::SDLK_KP6, [3, "east"],
143 CFClient::SDLK_KP3, [4, "southeast"], 309 CFPlus::SDLK_KP3, [4, "southeast"],
144 CFClient::SDLK_KP2, [5, "south"], 310 CFPlus::SDLK_KP2, [5, "south"],
145 CFClient::SDLK_KP1, [6, "southwest"], 311 CFPlus::SDLK_KP1, [6, "southwest"],
146 CFClient::SDLK_KP4, [7, "west"], 312 CFPlus::SDLK_KP4, [7, "west"],
147 CFClient::SDLK_KP7, [8, "northwest"], 313 CFPlus::SDLK_KP7, [8, "northwest"],
148 314
149 CFClient::SDLK_UP, [1, "north"], 315 CFPlus::SDLK_UP, [1, "north"],
150 CFClient::SDLK_RIGHT, [3, "east"], 316 CFPlus::SDLK_RIGHT, [3, "east"],
151 CFClient::SDLK_DOWN, [5, "south"], 317 CFPlus::SDLK_DOWN, [5, "south"],
152 CFClient::SDLK_LEFT, [7, "west"], 318 CFPlus::SDLK_LEFT, [7, "west"],
153); 319);
154 320
155sub key_down { 321sub invoke_key_down {
156 my ($self, $ev) = @_; 322 my ($self, $ev) = @_;
157
158 return 0 unless $::CONN;
159 323
160 my $mod = $ev->{mod}; 324 my $mod = $ev->{mod};
161 my $sym = $ev->{sym}; 325 my $sym = $ev->{sym};
162 my $uni = $ev->{unicode}; 326 my $uni = $ev->{unicode};
163 327
164 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) {
165 $::CONN->user_send ("stay fire"); 348 $::CONN->user_send ("stay fire");
166 } elsif ($uni == ord ",") { 349 } elsif ($uni == ord ",") {
167 $::CONN->user_send ("take"); 350 $::CONN->user_send ("take");
168 } elsif ($uni == ord " ") { 351 } elsif ($uni == ord " ") {
169 $::CONN->user_send ("apply"); 352 $::CONN->user_send ("apply");
353 } elsif ($uni == 13) {
354 $::CONN->user_send ("examine");
170 } elsif ($uni == ord ".") { 355 } elsif ($uni == ord ".") {
171 $::CONN->user_send ($self->{completer}{last_command}) 356 $::CONN->user_send ($self->{completer}{last_command})
172 if exists $self->{completer}{last_command}; 357 if exists $self->{completer}{last_command};
173 } elsif ($uni == ord "\t") { 358 } elsif (my @macros = CFPlus::Macro::match_event $ev) {
174 $::INV_WINDOW->toggle_visibility; 359 $::CONN->macro_send ($_) for @macros;
175 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 360 } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
176 $::CONN->user_send ("rotateshoottype +"); 361 $::CONN->user_send ("rotateshoottype +");
177 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 362 } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
178 $::CONN->user_send ("rotateshoottype -"); 363 $::CONN->user_send ("rotateshoottype -");
364 } elsif ($uni == ord '!') {
365 $self->{completer}->set_prefix ("shout ");
366 $self->{completer}->show;
179 } elsif ($uni == ord '"') { 367 } elsif ($uni == ord '"') {
180 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 368 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
181 $self->{completer}->show; 369 $self->{completer}->show;
182 } elsif ($uni == ord "'") { 370 } elsif ($uni == ord "'") {
183 $self->{completer}->set_prefix (""); 371 $self->{completer}->set_prefix ("");
184 $self->{completer}->show; 372 $self->{completer}->show;
185 } elsif (exists $DIR{$sym}) { 373 } elsif (exists $DIR{$sym}) {
186 if ($mod & CFClient::KMOD_SHIFT) { 374 if ($mod & CFPlus::KMOD_SHIFT) {
187 $self->{shft}++; 375 $self->{shft}++;
188 if ($DIR{$sym}[0] != $self->{fire_dir}) { 376 if ($DIR{$sym}[0] != $self->{fire_dir}) {
189 $::CONN->user_send ("fire $DIR{$sym}[0]"); 377 $::CONN->user_send ("fire $DIR{$sym}[0]");
190 } 378 }
191 $self->{fire_dir} = $DIR{$sym}[0]; 379 $self->{fire_dir} = $DIR{$sym}[0];
192 } elsif ($mod & CFClient::KMOD_CTRL) { 380 } elsif ($mod & CFPlus::KMOD_CTRL) {
193 $self->{ctrl}++; 381 $self->{ctrl}++;
194 $::CONN->user_send ("run $DIR{$sym}[0]"); 382 $::CONN->user_send ("run $DIR{$sym}[0]");
195 } else { 383 } else {
196 $::CONN->user_send ("$DIR{$sym}[1]"); 384 $::CONN->user_send ("$DIR{$sym}[1]");
197 } 385 }
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')) { 386 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
213 $self->{completer}->key_down ($ev); 387 $self->{completer}->inject_key_down ($ev);
214 $self->{completer}->show; 388 $self->{completer}->show;
215 } else { 389 } else {
216 return 0; 390 return 0;
217 } 391 }
218 392
219 1 393 1
220} 394}
221 395
222sub key_up { 396sub invoke_key_up {
223 my ($self, $ev) = @_; 397 my ($self, $ev) = @_;
224 398
225 my $res = 0; 399 my $res = 0;
226 my $mod = $ev->{mod}; 400 my $mod = $ev->{mod};
227 my $sym = $ev->{sym}; 401 my $sym = $ev->{sym};
228 402
229 if ($::CFG->{shift_fire_stop}) { 403 if ($::CFG->{shift_fire_stop}) {
230 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 404 if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) {
231 $::CONN->user_send ("fire_stop"); 405 $::CONN->user_send ("fire_stop");
232 delete $self->{fire_dir}; 406 delete $self->{fire_dir};
233 $res = 1; 407 $res = 1;
234 } 408 }
235 } else { 409 } else {
236 if (exists $DIR{$sym} && delete $self->{shft}) { 410 if (exists $DIR{$sym} && delete $self->{shft}) {
237 $::CONN->user_send ("fire_stop"); 411 $::CONN->user_send ("fire_stop");
238 delete $self->{fire_dir}; 412 delete $self->{fire_dir};
239 $res = 1; 413 $res = 1;
240 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? 414 } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
241 $::CONN->user_send ("fire_stop"); 415 $::CONN->user_send ("fire_stop");
242 delete $self->{fire_dir}; 416 delete $self->{fire_dir};
243 $res = 1; 417 $res = 1;
244 } 418 }
245 } 419 }
246 420
247 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 421 if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) {
248 $::CONN->user_send ("run_stop"); 422 $::CONN->user_send ("run_stop");
249 $res = 1; 423 $res = 1;
250 } 424 }
251 425
252 $res 426 $res
253} 427}
254 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
255sub draw { 440sub draw {
256 my ($self) = @_; 441 my ($self) = @_;
257 442
443 return unless $::MAP;
444
258 my $focused = $CFClient::UI::FOCUS == $self 445 my $focused = $CFPlus::UI::FOCUS == $self
259 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 446 || $CFPlus::UI::FOCUS == $self->{completer}{entry};
260 447
261 return 448 return
262 unless $::CONN && ($focused || !$::FAST); 449 unless $focused || !$::FAST;
263 450
264 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
265 $self->{fow_texture} ||= glGenTexture; 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 }
266 492
267 glNewList $self->{list}; 493 glNewList $self->{list};
268 494
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; 495 glPushMatrix;
496 glTranslate $sx0, $sy0;
279 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 497 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
280 498
281 glTranslate $sx0, $sy0; 499 $::MAP->draw ($dx, $dy, $sw, $sh, ::T);
282 500
283 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 501 glScale ::T, ::T;
284 502
285 if ($::CFG->{fow_enable}) { 503 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; 504 glEnable GL_TEXTURE_2D;
312 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 505 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
313 506
314 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 507 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
315 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 508 $self->{fow_texture}->draw_quad_alpha (0, 0);
316 509
317 glDisable GL_TEXTURE_2D; 510 glDisable GL_TEXTURE_2D;
318 } 511 }
319 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
320 glPopMatrix; 524 glPopMatrix;
321 }
322
323 glEndList; 525 glEndList;
324 } 526 }
325 527
326 glPushMatrix;
327 glCallList $self->{list}; 528 glCallList $self->{list};
328 glPopMatrix;
329 529
330 # TNT2 emulates logops in software (or worse :) 530 # TNT2 emulates logops in software (or worse :)
331 if ($focused) { 531 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; 532 glColor 0.4, 0.2, 0.2, 0.6;
336 glEnable GL_BLEND; 533 glEnable GL_BLEND;
337 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 534 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
338 glBegin GL_QUADS; 535 glBegin GL_QUADS;
339 glVertex 0, 0; 536 glVertex 0, 0;
340 glVertex 0, $::HEIGHT; 537 glVertex 0, $::HEIGHT;
341 glVertex $::WIDTH, $::HEIGHT; 538 glVertex $::WIDTH, $::HEIGHT;
342 glVertex $::WIDTH, 0; 539 glVertex $::WIDTH, 0;
343 glEnd; 540 glEnd;
344 glDisable GL_BLEND; 541 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 } 542 }
367} 543}
368 544
369sub DESTROY { 545sub DESTROY {
370 my $self = shift; 546 my $self = shift;
… …
372 glDeleteList $self->{list}; 548 glDeleteList $self->{list};
373 549
374 $self->SUPER::DESTROY; 550 $self->SUPER::DESTROY;
375} 551}
376 552
377package CFClient::MapWidget::MapMap; 553package CFPlus::MapWidget::MapMap;
378 554
379our @ISA = CFClient::UI::Base::; 555our @ISA = CFPlus::UI::Base::;
380 556
381use Time::HiRes qw(time); 557use Time::HiRes qw(time);
382use CFClient::OpenGL; 558use CFPlus::OpenGL;
383 559
384sub size_request { 560sub size_request {
385 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 561 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
386} 562}
387 563
388sub size_allocate { 564sub invoke_size_allocate {
389 my ($self, $w, $h) = @_; 565 my ($self, $w, $h) = @_;
390 566
391 $self->SUPER::size_allocate ($w, $h);
392 $self->update; 567 $self->update;
568
569 1
393} 570}
394 571
395sub update { 572sub update {
396 my ($self) = @_; 573 my ($self) = @_;
397 574
… …
404 581
405 $::MAP or return; 582 $::MAP or return;
406 583
407 my ($w, $h) = @$self{qw(w h)}; 584 my ($w, $h) = @$self{qw(w h)};
408 585
409 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; 586 my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99;
410 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; 587 my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99;
411 588
412 my $sx = int $::CFG->{map_shift_x} / 32; 589 my $sx = int $::CFG->{map_shift_x} / ::T;
413 my $sy = int $::CFG->{map_shift_y} / 32; 590 my $sy = int $::CFG->{map_shift_y} / ::T;
414 591
415 my $ox = 0.5 * ($w - $sw); 592 my $ox = 0.5 * ($w - $sw);
416 my $oy = 0.5 * ($h - $sh); 593 my $oy = 0.5 * ($h - $sh);
417 594
418 glEnable GL_BLEND; 595 glEnable GL_BLEND;
… …
422 599
423 if ($self->{texture_atime} < time) { 600 if ($self->{texture_atime} < time) {
424 $self->{texture_atime} = time + 1/3; 601 $self->{texture_atime} = time + 1/3;
425 602
426 $self->{texture} = 603 $self->{texture} =
427 new CFClient::Texture 604 new CFPlus::Texture
428 w => $w, 605 w => $w,
429 h => $h, 606 h => $h,
430 data => $::MAP->mapmap (-$ox, -$oy, $w, $h), 607 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; 608 type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE;
432 } 609 }
433 610
434 $self->{texture}->draw_quad (0, 0); 611 $self->{texture}->draw_quad (0, 0);
435 612
436 glDisable GL_TEXTURE_2D; 613 glDisable GL_TEXTURE_2D;
… …
451 glEnd; 628 glEnd;
452 629
453 glDisable GL_BLEND; 630 glDisable GL_BLEND;
454} 631}
455 632
456package CFClient::MapWidget::Command; 633package CFPlus::MapWidget::Command;
457 634
458use strict; 635use strict;
459 636
460use CFClient::OpenGL; 637use CFPlus::OpenGL;
461 638
462our @ISA = CFClient::UI::Frame::; 639our @ISA = CFPlus::UI::Frame::;
463 640
464sub new { 641sub new {
465 my $class = shift; 642 my $class = shift;
466 643
467 my $self = $class->SUPER::new ( 644 my $self = $class->SUPER::new (
468 bg => [0, 0, 0, 0.8], 645 bg => [0, 0, 0, 0.8],
469 @_, 646 @_,
470 ); 647 );
471 648
472 $self->add ($self->{vbox} = new CFClient::UI::VBox); 649 $self->add ($self->{vbox} = new CFPlus::UI::VBox);
473 650
474 $self->{label} = [ 651 $self->{label} = [
475 map 652 map
476 CFClient::UI::Label->new ( 653 CFPlus::UI::Label->new (
477 can_hover => 1, 654 can_hover => 1,
478 can_events => 1, 655 can_events => 1,
479 tooltip_width => 0.33, 656 tooltip_width => 0.33,
480 fontsize => $_, 657 fontsize => $_,
481 ), (0.8) x 16 658 ), (0.8) x 16
482 ]; 659 ];
483 660
484 $self->{entry} = new CFClient::UI::Entry 661 $self->{entry} = new CFPlus::UI::Entry
485 on_changed => sub { 662 on_changed => sub {
486 $self->update_labels; 663 $self->update_labels;
664 0
487 }, 665 },
488 on_button_down => sub { 666 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_; 667 my ($entry, $ev, $x, $y) = @_;
490 668
491 if ($ev->{button} == 3) { 669 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu 670 (new CFPlus::UI::Menu
493 items => [ 671 items => [
494 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 672 ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key"
673 => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }]
495 ], 674 ],
496 )->popup ($ev); 675 )->popup ($ev);
497 return 1; 676 return 1;
498 } 677 }
499 0 678 0
… …
506 if ($ev->{sym} == 13) { 685 if ($ev->{sym} == 13) {
507 if (exists $self->{select}) { 686 if (exists $self->{select}) {
508 $self->{last_command} = $self->{select}; 687 $self->{last_command} = $self->{select};
509 $::CONN->user_send ($self->{select}); 688 $::CONN->user_send ($self->{select});
510 689
511 unshift @{$self->{history}}, $self->{select}; 690 unshift @{$self->{history}}, $self->{entry}->get_text;
512 $self->{hist_ptr} = 0; 691 $self->{hist_ptr} = 0;
513 692
514 $self->hide; 693 $self->hide;
515 } 694 }
516 } elsif ($ev->{sym} == 27) { 695 } elsif ($ev->{sym} == 27) {
517 $self->{hist_ptr} = 0; 696 $self->{hist_ptr} = 0;
518 $self->hide; 697 $self->hide;
519 return;
520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 698 } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) { 699 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--; 700 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 701 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) { 702 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--; 703 $self->{hist_ptr}--;
… …
527 } else { 705 } else {
528 ++$self->{select_offset} 706 ++$self->{select_offset}
529 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 707 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 } 708 }
531 $self->update_labels; 709 $self->update_labels;
532 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 710 } elsif ($ev->{sym} == CFPlus::SDLK_UP) {
533 if ($self->{select_offset}) { 711 if ($self->{select_offset}) {
534 --$self->{select_offset} 712 --$self->{select_offset}
535 } else { 713 } else {
536 unless ($self->{hist_ptr}) { 714 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text; 715 $self->{hist_saveback} = $self->{entry}->get_text;
… …
564 742
565 $self->{entry}->set_text ($prefix); 743 $self->{entry}->set_text ($prefix);
566 $self->show; 744 $self->show;
567} 745}
568 746
569sub size_allocate { 747sub invoke_size_allocate {
570 my ($self, $w, $h) = @_; 748 my ($self, $w, $h) = @_;
571 749
572 $self->SUPER::size_allocate ($w, $h);
573 $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)
574} 753}
575 754
576sub show { 755sub show {
577 my ($self) = @_; 756 my ($self) = @_;
578 757
579 $self->SUPER::show; 758 $self->SUPER::show;
580 $self->{entry}->focus_in; 759 $self->{entry}->grab_focus;
581} 760}
582 761
583sub hide { 762sub hide {
584 my ($self) = @_; 763 my ($self) = @_;
585 764
765 $self->{hist_ptr} = 0;
766
586 $self->SUPER::hide; 767 $self->SUPER::hide;
587 $self->{entry}->set_text (""); 768 $self->{entry}->set_text ("");
588} 769}
589 770
590sub key_down { 771sub inject_key_down {
591 my ($self, $ev) = @_; 772 my ($self, $ev) = @_;
592 773
774 $self->{entry}->grab_focus;
593 $self->{entry}->key_down ($ev) 775 $self->{entry}->emit (key_down => $ev);
594} 776}
595 777
596sub update_labels { 778sub update_labels {
597 my ($self) = @_; 779 my ($self) = @_;
598 780
… …
685 $label->set_text (""); 867 $label->set_text ("");
686 $label->set_tooltip (""); 868 $label->set_tooltip ("");
687 } 869 }
688 870
689 $self->update; 871 $self->update;
690 ###
691} 872}
692 873
693sub _draw { 874sub _draw {
694 my ($self) = @_; 875 my ($self) = @_;
695 876
696 # hack 877 # hack
697 local $CFClient::UI::FOCUS = $self->{entry}; 878 local $CFPlus::UI::FOCUS = $self->{entry};
698 879
699 $self->SUPER::_draw; 880 $self->SUPER::_draw;
700} 881}
701 882
7021 8831
884

Diff Legend

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