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

Diff Legend

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