1 | package CFPlus::MapWidget; |
1 | package DC::MapWidget; |
2 | |
2 | |
3 | use strict; |
3 | use strict; |
4 | use utf8; |
4 | use utf8; |
5 | |
5 | |
6 | use List::Util qw(min max); |
6 | use List::Util qw(min max); |
7 | |
7 | |
8 | use CFPlus; |
8 | use DC; |
9 | use CFPlus::OpenGL; |
9 | use DC::OpenGL; |
10 | use CFPlus::UI; |
10 | use DC::UI; |
|
|
11 | use DC::Macro; |
11 | |
12 | |
12 | our @ISA = CFPlus::UI::Base::; |
13 | our @ISA = DC::UI::Base::; |
13 | |
14 | |
14 | my $magicmap_tex = |
15 | my $magicmap_tex = |
15 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | new_from_resource DC::Texture "magicmap.png", |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | |
18 | |
18 | sub new { |
19 | sub new { |
19 | my $class = shift; |
20 | my $class = shift; |
20 | |
21 | |
21 | my $self = $class->SUPER::new ( |
22 | my $self = $class->SUPER::new ( |
22 | z => -1, |
23 | z => -1, |
23 | can_focus => 1, |
24 | can_focus => 1, |
24 | list => glGenList, |
25 | tilesize => 32, |
25 | |
|
|
26 | smooth_matrix => [ |
|
|
27 | 0.05, 0.13, 0.05, |
|
|
28 | 0.13, 0.30, 0.13, |
|
|
29 | 0.05, 0.13, 0.05, |
|
|
30 | ], |
|
|
31 | |
|
|
32 | @_ |
26 | @_ |
33 | ); |
27 | ); |
34 | |
|
|
35 | $self->{completer} = new CFPlus::MapWidget::Command:: |
|
|
36 | command => $self->{command}, |
|
|
37 | tooltip => "#completer_help", |
|
|
38 | ; |
|
|
39 | |
28 | |
40 | $self |
29 | $self |
41 | } |
30 | } |
42 | |
31 | |
43 | sub add_command { |
32 | sub add_command { |
… | |
… | |
47 | |
36 | |
48 | $tooltip =~ s/^\s+//; |
37 | $tooltip =~ s/^\s+//; |
49 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
38 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
50 | $tooltip =~ s/\s+$//; |
39 | $tooltip =~ s/\s+$//; |
51 | |
40 | |
52 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
41 | $::COMPLETER->{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
53 | } |
42 | } |
54 | |
43 | |
55 | sub clr_commands { |
44 | sub clr_commands { |
56 | my ($self) = @_; |
45 | my ($self) = @_; |
57 | |
46 | |
58 | %{$self->{completer}{command}} = (); |
47 | %{$::COMPLETER->{command}} = (); |
59 | |
48 | |
60 | $self->{completer}->hide |
49 | $::COMPLETER->hide |
61 | if $self->{completer}; |
50 | if $::COMPLETER; |
62 | } |
51 | } |
63 | |
52 | |
64 | sub server_login { |
53 | sub server_login { |
65 | my ($server) = @_; |
54 | my ($server) = @_; |
66 | |
55 | |
67 | ::stop_game (); |
56 | ::stop_game (); |
68 | local $::PROFILE->{host} = $server; |
57 | local $::PROFILE->{host} = $server; |
69 | ::start_game (); |
58 | ::start_game (); |
70 | } |
59 | } |
71 | |
60 | |
72 | sub check_lwp($) { |
|
|
73 | my ($res) = @_; |
|
|
74 | |
|
|
75 | $res->is_error |
|
|
76 | and die $res->status_line; |
|
|
77 | |
|
|
78 | $res |
|
|
79 | } |
|
|
80 | |
|
|
81 | sub editor_invoke { |
61 | sub editor_invoke { |
82 | my $editsup = $::CONN && $::CONN->{editor_support} |
62 | my $editsup = $::CONN && $::CONN->{editor_support} |
83 | or return; |
63 | or return; |
84 | |
64 | |
85 | CFPlus::background { |
65 | DC::background { |
86 | print "preparing editor startup...\n"; |
66 | print "preparing editor startup...\n"; |
87 | CFPlus::set_proxy; |
|
|
88 | |
67 | |
89 | my $server = $editsup->{gameserver} || "default"; |
68 | my $server = $editsup->{gameserver} || "default"; |
90 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
69 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
91 | |
70 | |
92 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
71 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Deliantra::VARDIR/map.$server"; mkdir $mapdir; |
93 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
72 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Deliantra::VARDIR/lib.$server"; mkdir $libdir; |
94 | |
73 | |
95 | print "map directory is $mapdir\n"; |
74 | print "map directory is $mapdir\n"; |
96 | print "lib directory is $libdir\n"; |
75 | print "lib directory is $libdir\n"; |
97 | |
76 | |
98 | require LWP::UserAgent; |
77 | my $ua = DC::lwp_useragent; |
99 | |
|
|
100 | my $ua = LWP::UserAgent->new ( |
|
|
101 | agent => "cfplus $CFPlus::VERSION", |
|
|
102 | keep_alive => 1, |
|
|
103 | env_proxy => 1, |
|
|
104 | timeout => 30, |
|
|
105 | ); |
|
|
106 | |
78 | |
107 | for my $file (qw(archetypes crossfire.0)) { |
79 | for my $file (qw(archetypes crossfire.0)) { |
108 | my $url = "$editsup->{lib_root}$file"; |
80 | my $url = "$editsup->{lib_root}$file"; |
109 | print "mirroring $url...\n"; |
81 | print "mirroring $url...\n"; |
110 | check_lwp $ua->mirror ($url, "$libdir/$file"); |
82 | DC::lwp_check $ua->mirror ($url, "$libdir/$file"); |
111 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
83 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
112 | } |
84 | } |
113 | |
85 | |
114 | if (1) { # upload a map |
86 | if (1) { # upload a map |
115 | my $mapname = $::CONN->{map_info}[0]; |
87 | my $mapname = $::CONN->{map_info}[0]; |
… | |
… | |
120 | |
92 | |
121 | print "getting map revision for $mapname...\n"; |
93 | print "getting map revision for $mapname...\n"; |
122 | |
94 | |
123 | # try to get the most recent head revision, what a hack, |
95 | # try to get the most recent head revision, what a hack, |
124 | # this should have been returned while downloading *sigh* |
96 | # this should have been returned while downloading *sigh* |
125 | my $log = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
97 | my $log = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
126 | |
98 | |
127 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
99 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
128 | my $rev = $1; |
100 | my $rev = $1; |
129 | |
101 | |
130 | print "downloading revision $rev...\n"; |
102 | print "downloading revision $rev...\n"; |
131 | |
103 | |
132 | my $map = (check_lwp $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
104 | my $map = (DC::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
133 | |
105 | |
134 | my $meta = { |
106 | my $meta = { |
135 | %$editsup, |
107 | %$editsup, |
136 | path => $mapname, |
108 | path => $mapname, |
137 | revision => $rev, |
109 | revision => $rev, |
… | |
… | |
142 | require File::Path; |
114 | require File::Path; |
143 | |
115 | |
144 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
116 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
145 | open my $fh, ">:raw:perlio", "$mappath.meta" |
117 | open my $fh, ">:raw:perlio", "$mappath.meta" |
146 | or die "$mappath.meta: $!\n"; |
118 | or die "$mappath.meta: $!\n"; |
147 | print $fh CFPlus::to_json $meta; |
119 | print $fh DC::encode_json $meta; |
148 | close $fh; |
120 | close $fh; |
149 | open my $fh, ">:raw:perlio:utf8", $mappath |
121 | open my $fh, ">:raw:perlio:utf8", $mappath |
150 | or die "$mappath: $!\n"; |
122 | or die "$mappath: $!\n"; |
151 | print $fh $map; |
123 | print $fh $map; |
152 | close $fh; |
124 | close $fh; |
… | |
… | |
191 | sub invoke_button_down { |
163 | sub invoke_button_down { |
192 | my ($self, $ev, $x, $y) = @_; |
164 | my ($self, $ev, $x, $y) = @_; |
193 | |
165 | |
194 | if ($ev->{button} == 1) { |
166 | if ($ev->{button} == 1) { |
195 | $self->grab_focus; |
167 | $self->grab_focus; |
196 | return unless $::CONN; |
168 | return unless $::CONN && $self->{ctilesize}; |
197 | |
169 | |
198 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
170 | my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
199 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
171 | my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
200 | |
172 | |
201 | $x -= int 0.5 * $self->{sw}; |
173 | $x -= DC::floor $::MAP->w * 0.5; |
202 | $y -= int 0.5 * $self->{sh}; |
174 | $y -= DC::floor $::MAP->h * 0.5; |
203 | |
175 | |
|
|
176 | if ($::CONN) { |
204 | $::CONN->lookat ($x, $y) |
177 | $::CONN->lookat ($x, $y) |
205 | if $::CONN; |
178 | } |
206 | |
179 | |
207 | } elsif ($ev->{button} == 2) { |
180 | } elsif ($ev->{button} == 2) { |
208 | $self->grab_focus; |
181 | $self->grab_focus; |
209 | return unless $::CONN; |
182 | return unless $::CONN; |
210 | |
183 | |
… | |
… | |
227 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
200 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
228 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
201 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
229 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
202 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
230 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
203 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
231 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
204 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
232 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
205 | # ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
233 | [ |
|
|
234 | $::PICKUP_ENABLE->{state} |
|
|
235 | ? "Disable automatic pickup" |
|
|
236 | : "Enable automatic pickup", |
|
|
237 | sub { $::PICKUP_ENABLE->toggle } |
|
|
238 | ], |
|
|
239 | ); |
206 | ); |
240 | |
207 | |
241 | if ($::CONN && $::CONN->{editor_support} && 0) { |
208 | if ($::CONN && $::CONN->{editor_support}) { |
242 | push @items, [ |
209 | # push @items, [ |
243 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
210 | # "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", |
244 | \&editor_invoke, |
211 | # \&editor_invoke, |
245 | ]; |
212 | # ]; |
246 | |
213 | |
247 | for my $type (qw(test name)) { |
214 | for my $type (qw(test name)) { |
248 | $::CONN->{editor_support}{type} ne $type |
215 | $::CONN->{editor_support}{type} ne $type |
249 | or next; |
216 | or next; |
250 | my $server = $::CONN->{editor_support}{"${type}server"} |
217 | my $server = $::CONN->{editor_support}{"${type}server"} |
251 | or next; |
218 | or next; |
252 | |
219 | |
253 | push @items, [ |
220 | push @items, [ |
254 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
221 | "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>", |
255 | sub { server_login $server }, |
222 | sub { server_login $server }, |
256 | ]; |
223 | ]; |
257 | } |
224 | } |
258 | } |
225 | } |
259 | |
226 | |
… | |
… | |
267 | } |
234 | } |
268 | } |
235 | } |
269 | ], |
236 | ], |
270 | ; |
237 | ; |
271 | |
238 | |
272 | (new CFPlus::UI::Menu |
239 | (new DC::UI::Menu |
273 | items => \@items, |
240 | items => \@items, |
274 | )->popup ($ev); |
241 | )->popup ($ev); |
275 | } |
242 | } |
276 | |
243 | |
277 | 1 |
244 | 1 |
… | |
… | |
296 | |
263 | |
297 | 1 |
264 | 1 |
298 | } |
265 | } |
299 | |
266 | |
300 | sub size_request { |
267 | sub size_request { |
|
|
268 | my ($self) = @_; |
|
|
269 | |
301 | ( |
270 | ( |
302 | 32 * CFPlus::ceil $::WIDTH / 32, |
271 | $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize}, |
303 | 32 * CFPlus::ceil $::HEIGHT / 32, |
272 | $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize}, |
304 | ) |
273 | ) |
305 | } |
274 | } |
306 | |
275 | |
307 | sub update { |
276 | sub update { |
308 | my ($self) = @_; |
277 | my ($self) = @_; |
… | |
… | |
310 | $self->{need_update} = 1; |
279 | $self->{need_update} = 1; |
311 | $self->SUPER::update; |
280 | $self->SUPER::update; |
312 | } |
281 | } |
313 | |
282 | |
314 | my %DIR = ( |
283 | my %DIR = ( |
315 | CFPlus::SDLK_KP8, [1, "north"], |
284 | ( "," . DC::SDLK_KP5 ), [0, "stay fire"], |
|
|
285 | ( "," . DC::SDLK_KP8 ), [1, "north"], |
316 | CFPlus::SDLK_KP9, [2, "northeast"], |
286 | ( "," . DC::SDLK_KP9 ), [2, "northeast"], |
317 | CFPlus::SDLK_KP6, [3, "east"], |
287 | ( "," . DC::SDLK_KP6 ), [3, "east"], |
318 | CFPlus::SDLK_KP3, [4, "southeast"], |
288 | ( "," . DC::SDLK_KP3 ), [4, "southeast"], |
319 | CFPlus::SDLK_KP2, [5, "south"], |
289 | ( "," . DC::SDLK_KP2 ), [5, "south"], |
320 | CFPlus::SDLK_KP1, [6, "southwest"], |
290 | ( "," . DC::SDLK_KP1 ), [6, "southwest"], |
321 | CFPlus::SDLK_KP4, [7, "west"], |
291 | ( "," . DC::SDLK_KP4 ), [7, "west"], |
322 | CFPlus::SDLK_KP7, [8, "northwest"], |
292 | ( "," . DC::SDLK_KP7 ), [8, "northwest"], |
323 | |
293 | |
324 | CFPlus::SDLK_UP, [1, "north"], |
294 | ( "," . DC::SDLK_PAGEUP ), [2, "northeast"], |
|
|
295 | ( "," . DC::SDLK_PAGEDOWN ), [4, "southeast"], |
|
|
296 | ( "," . DC::SDLK_END ), [6, "southwest"], |
|
|
297 | ( "," . DC::SDLK_HOME ), [8, "northwest"], |
|
|
298 | |
|
|
299 | ( "," . DC::SDLK_UP ), [1, "north"], |
|
|
300 | ("1," . DC::SDLK_UP ), [2, "northeast"], |
325 | CFPlus::SDLK_RIGHT, [3, "east"], |
301 | ( "," . DC::SDLK_RIGHT ), [3, "east"], |
326 | CFPlus::SDLK_DOWN, [5, "south"], |
302 | ("1," . DC::SDLK_RIGHT ), [4, "southeast"], |
327 | CFPlus::SDLK_LEFT, [7, "west"], |
303 | ( "," . DC::SDLK_DOWN ), [5, "south"], |
|
|
304 | ("1," . DC::SDLK_DOWN ), [6, "southwest"], |
|
|
305 | ( "," . DC::SDLK_LEFT ), [7, "west"], |
|
|
306 | ("1," . DC::SDLK_LEFT ), [8, "northwest"], |
328 | ); |
307 | ); |
329 | |
308 | |
330 | sub invoke_key_down { |
309 | sub invoke_key_down { |
331 | my ($self, $ev) = @_; |
310 | my ($self, $ev) = @_; |
332 | |
311 | |
333 | my $mod = $ev->{mod}; |
312 | my $mod = $ev->{mod}; |
334 | my $sym = $ev->{sym}; |
313 | my $sym = $ev->{sym}; |
335 | my $uni = $ev->{unicode}; |
314 | my $uni = $ev->{unicode}; |
336 | |
315 | |
337 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
316 | $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_META | DC::KMOD_SHIFT; |
338 | |
317 | |
339 | if ($uni == ord "\t") { |
318 | # ignore repeated keypresses |
340 | $::PL_WINDOW->toggle_visibility; |
319 | return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; |
341 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
320 | $self->{last_mod} = $mod; |
342 | $::HELP_WINDOW->toggle_visibility; |
321 | $self->{last_sym} = $sym; |
343 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
|
|
344 | ::toggle_player_page ($::STATS_PAGE); |
|
|
345 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
|
|
346 | ::toggle_player_page ($::SKILL_PAGE); |
|
|
347 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
|
|
348 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
349 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
|
|
350 | ::toggle_player_page ($::INVENTORY_PAGE); |
|
|
351 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
|
|
352 | $::SETUP_DIALOG->toggle_visibility; |
|
|
353 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
|
|
354 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
355 | sub { |
|
|
356 | my ($mod, $sym, $cmds) = @_; |
|
|
357 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
|
|
358 | }); |
|
|
359 | $::BIND_EDITOR->start; |
|
|
360 | $::BIND_EDITOR->show; |
|
|
361 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
|
|
362 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
|
|
363 | # $::BIND_EDITOR->stop; |
|
|
364 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
365 | # $::BIND_EDITOR->hide; |
|
|
366 | } elsif (!$::CONN) { |
|
|
367 | return 0; # bindings further down need a valid connection |
|
|
368 | |
322 | |
369 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
323 | my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" }; |
370 | $::CONN->user_send ("stay fire"); |
324 | |
371 | } elsif ($uni == ord ",") { |
325 | if ($::CONN && $dir) { |
372 | $::CONN->user_send ("take"); |
|
|
373 | } elsif ($uni == ord " ") { |
|
|
374 | $::CONN->user_send ("apply"); |
|
|
375 | } elsif ($uni == 13) { |
|
|
376 | $::CONN->user_send ("examine"); |
|
|
377 | } elsif ($uni == ord ".") { |
|
|
378 | $::CONN->user_send ($self->{completer}{last_command}) |
|
|
379 | if exists $self->{completer}{last_command}; |
|
|
380 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
|
|
381 | $::CONN->user_send ($_) for @$bind_cmd; |
|
|
382 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
|
|
383 | $::CONN->user_send ("rotateshoottype +"); |
|
|
384 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
|
|
385 | $::CONN->user_send ("rotateshoottype -"); |
|
|
386 | } elsif ($uni == ord '"') { |
|
|
387 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
|
|
388 | $self->{completer}->show; |
|
|
389 | } elsif ($uni == ord "'") { |
|
|
390 | $self->{completer}->set_prefix (""); |
|
|
391 | $self->{completer}->show; |
|
|
392 | } elsif (exists $DIR{$sym}) { |
|
|
393 | if ($mod & CFPlus::KMOD_SHIFT) { |
326 | if ($mod & DC::KMOD_SHIFT) { |
394 | $self->{shft}++; |
327 | $self->{shft}++; |
395 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
328 | if ($dir->[0] != $self->{fire_dir}) { |
396 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
329 | $::CONN->user_send ("fire $dir->[0]"); |
397 | } |
330 | } |
398 | $self->{fire_dir} = $DIR{$sym}[0]; |
331 | $self->{fire_dir} = $dir->[0]; |
399 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
332 | } elsif ($mod & DC::KMOD_CTRL) { |
400 | $self->{ctrl}++; |
333 | $self->{ctrl}++; |
401 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
334 | $::CONN->user_send ("run $dir->[0]"); |
402 | } else { |
335 | } else { |
403 | $::CONN->user_send ("$DIR{$sym}[1]"); |
336 | $::CONN->user_send ("$dir->[1]"); |
404 | } |
337 | } |
405 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
338 | |
406 | $self->{completer}->inject_key_down ($ev); |
|
|
407 | $self->{completer}->show; |
|
|
408 | } else { |
|
|
409 | return 0; |
339 | return 1; |
410 | } |
|
|
411 | |
|
|
412 | 1 |
340 | } |
|
|
341 | |
|
|
342 | 0 |
413 | } |
343 | } |
414 | |
344 | |
415 | sub invoke_key_up { |
345 | sub invoke_key_up { |
416 | my ($self, $ev) = @_; |
346 | my ($self, $ev) = @_; |
417 | |
347 | |
418 | my $res = 0; |
348 | my $res = 0; |
419 | my $mod = $ev->{mod}; |
349 | my $mod = $ev->{mod}; |
420 | my $sym = $ev->{sym}; |
350 | my $sym = $ev->{sym}; |
421 | |
351 | |
|
|
352 | delete $self->{last_mod}; |
|
|
353 | delete $self->{last_sym}; |
|
|
354 | |
422 | if ($::CFG->{shift_fire_stop}) { |
355 | if ($::CFG->{shift_fire_stop}) { |
423 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
356 | if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { |
424 | $::CONN->user_send ("fire_stop"); |
357 | $::CONN->user_send ("fire_stop"); |
425 | delete $self->{fire_dir}; |
358 | delete $self->{fire_dir}; |
426 | $res = 1; |
359 | $res = 1; |
427 | } |
360 | } |
428 | } else { |
361 | } else { |
|
|
362 | my $dir = $DIR{ (!!($mod & (DC::KMOD_ALT | DC::KMOD_META))) . ",$sym" }; |
|
|
363 | |
429 | if (exists $DIR{$sym} && delete $self->{shft}) { |
364 | if ($dir && delete $self->{shft}) { |
430 | $::CONN->user_send ("fire_stop"); |
365 | $::CONN->user_send ("fire_stop"); |
431 | delete $self->{fire_dir}; |
366 | delete $self->{fire_dir}; |
432 | $res = 1; |
367 | $res = 1; |
433 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
368 | } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) |
|
|
369 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
434 | $::CONN->user_send ("fire_stop"); |
370 | $::CONN->user_send ("fire_stop"); |
435 | delete $self->{fire_dir}; |
371 | delete $self->{fire_dir}; |
436 | $res = 1; |
372 | $res = 1; |
437 | } |
373 | } |
438 | } |
374 | } |
439 | |
375 | |
440 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
376 | if (!($mod & DC::KMOD_CTRL) && delete $self->{ctrl}) { |
441 | $::CONN->user_send ("run_stop"); |
377 | $::CONN->user_send ("run_stop"); |
442 | $res = 1; |
378 | $res = 1; |
443 | } |
379 | } |
444 | |
380 | |
445 | $res |
381 | $res |
446 | } |
382 | } |
447 | |
383 | |
|
|
384 | sub invoke_visibility_change { |
|
|
385 | my ($self) = @_; |
|
|
386 | |
|
|
387 | $self->refresh_hook; |
|
|
388 | |
|
|
389 | 0 |
|
|
390 | } |
|
|
391 | |
|
|
392 | sub set_tilesize { |
|
|
393 | my ($self, $tilesize) = @_; |
|
|
394 | |
|
|
395 | $self->{tilesize} = $tilesize; |
|
|
396 | } |
|
|
397 | |
|
|
398 | sub scroll { |
|
|
399 | my ($self, $dx, $dy) = @_; |
|
|
400 | |
|
|
401 | $::MAP->scroll ($dx, $dy); |
|
|
402 | |
|
|
403 | $self->{last_fow_texture} = $self->{fow_texture}; |
|
|
404 | $self->{ldx} = $self->{sdx} + $dx * $self->{tilesize}; # smooth displacement |
|
|
405 | $self->{ldy} = $self->{sdy} + $dy * $self->{tilesize}; |
|
|
406 | |
|
|
407 | $self->movement_update; |
|
|
408 | |
|
|
409 | $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement |
|
|
410 | $self->{sdy} += $dy * $self->{tilesize}; |
|
|
411 | } |
|
|
412 | |
448 | sub set_magicmap { |
413 | sub set_magicmap { |
449 | my ($self, $w, $h, $x, $y, $data) = @_; |
414 | my ($self, $w, $h, $x, $y, $data) = @_; |
450 | |
415 | |
451 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
416 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
452 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
417 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
453 | |
418 | |
454 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
419 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
455 | |
420 | |
456 | $self->update; |
421 | $self->update; |
457 | } |
422 | } |
458 | |
423 | |
|
|
424 | sub movement_update { |
|
|
425 | my ($self) = @_; |
|
|
426 | |
|
|
427 | if ($::CFG->{smooth_movement}) { |
|
|
428 | if ($self->{sdx} || $self->{sdy}) { |
|
|
429 | my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); |
|
|
430 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
|
|
431 | |
|
|
432 | # the minimum time for a single tile movement |
|
|
433 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK || 1); |
|
|
434 | |
|
|
435 | $spd *= $self->{tilesize}; |
|
|
436 | |
|
|
437 | # jump if "impossibly high" speed |
|
|
438 | if ( |
|
|
439 | (max abs $self->{sdx}, abs $self->{sdy}) |
|
|
440 | > $spd * $mintime * 2.1 |
|
|
441 | ) { |
|
|
442 | #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 2.1;#d# |
|
|
443 | $self->{sdx} = $self->{sdy} = 0; |
|
|
444 | } else { |
|
|
445 | $spd *= $diff * 1.0001; # 1.0001 so that we don't accumulate rounding errors the wrong direction |
|
|
446 | |
|
|
447 | my $dx = $self->{sdx} < 0 ? -$spd : $spd; |
|
|
448 | my $dy = $self->{sdy} < 0 ? -$spd : $spd; |
|
|
449 | |
|
|
450 | if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx } |
|
|
451 | if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy } |
|
|
452 | } |
|
|
453 | |
|
|
454 | $self->update; |
|
|
455 | } |
|
|
456 | } else { |
|
|
457 | $self->{sdx} = $self->{sdy} = 0; |
|
|
458 | } |
|
|
459 | |
|
|
460 | $self->{last_update} = EV::time; |
|
|
461 | } |
|
|
462 | |
|
|
463 | sub refresh_hook { |
|
|
464 | my ($self) = @_; |
|
|
465 | |
|
|
466 | if ($::MAP && $::CONN) { |
|
|
467 | if (delete $self->{need_update}) { |
|
|
468 | $self->movement_update; |
|
|
469 | |
|
|
470 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
|
|
471 | |
|
|
472 | my $sdx_t = DC::ceil $self->{sdx} / $tilesize; |
|
|
473 | my $sdy_t = DC::ceil $self->{sdy} / $tilesize; |
|
|
474 | |
|
|
475 | # width/height of map, in tiles |
|
|
476 | my $sw = $self->{sw} = 2 + DC::ceil $self->{w} / $tilesize; |
|
|
477 | my $sh = $self->{sh} = 2 + DC::ceil $self->{h} / $tilesize; |
|
|
478 | |
|
|
479 | # the map displacement, in tiles |
|
|
480 | my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $sdx_t; |
|
|
481 | my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $sdy_t; |
|
|
482 | |
|
|
483 | # the upper left "visible" corner, in pixels |
|
|
484 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
485 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
486 | |
|
|
487 | my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
|
|
488 | my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
|
|
489 | |
|
|
490 | if ($::CFG->{fow_enable}) { |
|
|
491 | my ($sdx_t, $sdy_t);#d# do not anchor at player |
|
|
492 | |
|
|
493 | my ($w, $h, $data) = $::MAP->fow_texture ( |
|
|
494 | $dx + (min 0, $sdx_t), |
|
|
495 | $dy + (min 0, $sdy_t), |
|
|
496 | $sw + abs $sdx_t, |
|
|
497 | $sh + abs $sdy_t |
|
|
498 | ); |
|
|
499 | |
|
|
500 | $self->{fow_texture} = new DC::Texture |
|
|
501 | w => $w, |
|
|
502 | h => $h, |
|
|
503 | data => $data, |
|
|
504 | internalformat => GL_ALPHA, |
|
|
505 | format => GL_ALPHA; |
|
|
506 | } else { |
|
|
507 | delete $self->{fow_texture}; |
|
|
508 | } |
|
|
509 | |
|
|
510 | glNewList ($self->{list} ||= glGenList); |
|
|
511 | |
|
|
512 | glPushMatrix; |
|
|
513 | glTranslate $sx0, $sy0; |
|
|
514 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
515 | glTranslate DC::ceil $self->{sdx}, DC::ceil $self->{sdy}; |
|
|
516 | |
|
|
517 | $::MAP->draw ($dx, $dy, $sw, $sh, |
|
|
518 | $self->{tilesize}, |
|
|
519 | $::CONN->{player}{tag}, |
|
|
520 | -$self->{sdx}, -$self->{sdy}); |
|
|
521 | |
|
|
522 | #d#glTranslate -$self->{sdx}, -$self->{sdy}; # anchor fow at player |
|
|
523 | glScale $self->{tilesize}, $self->{tilesize}; |
|
|
524 | |
|
|
525 | if (my $tex = $self->{fow_texture}) { |
|
|
526 | glEnable GL_TEXTURE_2D; |
|
|
527 | glEnable GL_BLEND; |
|
|
528 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
529 | glBlendEquation GL_FUNC_REVERSE_SUBTRACT; |
|
|
530 | glBlendFunc GL_ONE, GL_ZERO; |
|
|
531 | |
|
|
532 | my $a1 = 0.9; |
|
|
533 | |
|
|
534 | if (0 && $self->{last_fow_texture}) { |
|
|
535 | my $d1 = ($self->{sdx} ** 2 + $self->{sdy} ** 2) ** 0.5; |
|
|
536 | my $d2 = ($self->{ldx} ** 2 + $self->{ldy} ** 2) ** 0.5; |
|
|
537 | |
|
|
538 | if ($d1 * $d2) { |
|
|
539 | my $a2 = $d1 / $d2; |
|
|
540 | |
|
|
541 | $a1 = 1 - $a2; |
|
|
542 | |
|
|
543 | #$a1 *= 0.9; |
|
|
544 | #$a2 *= 0.9; |
|
|
545 | |
|
|
546 | printf "%4g %4g %4g %4g\n", $d1, $d2, $a1, $a2;#d# |
|
|
547 | |
|
|
548 | #$a1 = 1 - (1-$a1) * 0.707; |
|
|
549 | #$a2 = 1 - (1-$a2) * 0.707; |
|
|
550 | |
|
|
551 | glColor 1,0,0,1; |
|
|
552 | glBegin GL_QUADS; |
|
|
553 | glVertex 10 + $sdx_t, 10; |
|
|
554 | glVertex 11 + $sdx_t, 10; |
|
|
555 | glVertex 11 + $sdx_t, 11; |
|
|
556 | glVertex 10 + $sdx_t, 11; |
|
|
557 | glEnd; |
|
|
558 | |
|
|
559 | glColor +($::CFG->{fow_intensity}) x 3, $a2; |
|
|
560 | glPushMatrix; |
|
|
561 | glTranslate $sdx_t, $sdy_t; # anchor at player |
|
|
562 | glTranslate $self->{ldx} / -$tilesize, $self->{ldy} / -$tilesize; |
|
|
563 | glScale 1/3, 1/3; |
|
|
564 | $self->{last_fow_texture}->draw_quad_alpha (0, 0); |
|
|
565 | glPopMatrix; |
|
|
566 | } else { |
|
|
567 | delete $self->{last_fow_texture}; |
|
|
568 | } |
|
|
569 | } |
|
|
570 | |
|
|
571 | glColor +($::CFG->{fow_intensity}) x 3, $a1; |
|
|
572 | glPushMatrix; |
|
|
573 | #d#glTranslate +(min 0, $sdx_t), (min 0, $sdy_t); # anchor at player |
|
|
574 | glScale 1/3, 1/3; |
|
|
575 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
|
|
576 | glPopMatrix; |
|
|
577 | |
|
|
578 | glBlendEquation GL_FUNC_ADD; |
|
|
579 | glDisable GL_TEXTURE_2D; |
|
|
580 | glDisable GL_BLEND; |
|
|
581 | } |
|
|
582 | |
|
|
583 | if ($self->{magicmap}) { |
|
|
584 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
585 | |
|
|
586 | $x += $::MAP->ox + $self->{dx}; |
|
|
587 | $y += $::MAP->oy + $self->{dy}; |
|
|
588 | |
|
|
589 | glTranslate - $x - 1, - $y - 1; |
|
|
590 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
591 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
592 | } |
|
|
593 | |
|
|
594 | glPopMatrix; |
|
|
595 | glEndList; |
|
|
596 | } |
|
|
597 | } else { |
|
|
598 | glDeleteList delete $self->{list} |
|
|
599 | if $self->{list}; |
|
|
600 | } |
|
|
601 | } |
|
|
602 | |
459 | sub draw { |
603 | sub draw { |
460 | my ($self) = @_; |
604 | my ($self) = @_; |
461 | |
605 | |
462 | return unless $::MAP; |
606 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
463 | |
607 | |
|
|
608 | return unless $self->{list}; |
|
|
609 | |
464 | my $focused = $CFPlus::UI::FOCUS == $self |
610 | my $focused = $DC::UI::FOCUS == $self |
465 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
611 | || $DC::UI::FOCUS == $::COMPLETER->{entry}; |
466 | |
612 | |
467 | return |
613 | return |
468 | unless $focused || !$::FAST; |
614 | unless $focused || !$::FAST; |
469 | |
615 | |
470 | if (delete $self->{need_update}) { |
|
|
471 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
|
|
472 | |
|
|
473 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
|
|
474 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
|
|
475 | |
|
|
476 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
477 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
478 | |
|
|
479 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
480 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
481 | |
|
|
482 | if ($::CFG->{fow_enable}) { |
|
|
483 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
|
|
484 | |
|
|
485 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
|
|
486 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
|
|
487 | glConvolutionFilter2D ( |
|
|
488 | GL_CONVOLUTION_2D, |
|
|
489 | GL_ALPHA, |
|
|
490 | 3, 3, |
|
|
491 | GL_ALPHA, GL_FLOAT, |
|
|
492 | (pack "f*", @{ $self->{smooth_matrix} }), |
|
|
493 | ); |
|
|
494 | glEnable GL_CONVOLUTION_2D; |
|
|
495 | } |
|
|
496 | |
|
|
497 | $self->{fow_texture} = new CFPlus::Texture |
|
|
498 | w => $w, |
|
|
499 | h => $h, |
|
|
500 | data => $data, |
|
|
501 | internalformat => GL_ALPHA, |
|
|
502 | format => GL_ALPHA; |
|
|
503 | |
|
|
504 | glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; |
|
|
505 | } else { |
|
|
506 | delete $self->{fow_texture}; |
|
|
507 | } |
|
|
508 | |
|
|
509 | glNewList $self->{list}; |
|
|
510 | |
|
|
511 | glPushMatrix; |
|
|
512 | glTranslate $sx0, $sy0; |
|
|
513 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
|
|
514 | |
|
|
515 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
|
|
516 | |
|
|
517 | glScale 32, 32; |
|
|
518 | |
|
|
519 | if (my $tex = $self->{fow_texture}) { |
|
|
520 | glEnable GL_TEXTURE_2D; |
|
|
521 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
|
|
522 | |
|
|
523 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
|
|
524 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
|
|
525 | |
|
|
526 | glDisable GL_TEXTURE_2D; |
|
|
527 | } |
|
|
528 | |
|
|
529 | if ($self->{magicmap}) { |
|
|
530 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
531 | |
|
|
532 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
|
|
533 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
|
|
534 | |
|
|
535 | glTranslate - $x - 1, - $y - 1; |
|
|
536 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
537 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
538 | } |
|
|
539 | |
|
|
540 | glPopMatrix; |
|
|
541 | glEndList; |
|
|
542 | } |
|
|
543 | |
|
|
544 | glCallList $self->{list}; |
616 | glCallList $self->{list}; |
545 | |
617 | |
546 | # TNT2 emulates logops in software (or worse :) |
618 | # TNT2 emulates logops in software (or worse :) |
547 | unless ($focused) { |
619 | unless ($focused) { |
548 | glColor 0.4, 0.2, 0.2, 0.6; |
620 | glColor_premultiply 0, 0, 1, 0.25; |
549 | glEnable GL_BLEND; |
621 | glEnable GL_BLEND; |
550 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
622 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
551 | glBegin GL_QUADS; |
623 | glBegin GL_QUADS; |
552 | glVertex 0, 0; |
624 | glVertex 0, 0; |
553 | glVertex 0, $::HEIGHT; |
625 | glVertex 0, $::HEIGHT; |
554 | glVertex $::WIDTH, $::HEIGHT; |
626 | glVertex $::WIDTH, $::HEIGHT; |
555 | glVertex $::WIDTH, 0; |
627 | glVertex $::WIDTH, 0; |
… | |
… | |
564 | glDeleteList $self->{list}; |
636 | glDeleteList $self->{list}; |
565 | |
637 | |
566 | $self->SUPER::DESTROY; |
638 | $self->SUPER::DESTROY; |
567 | } |
639 | } |
568 | |
640 | |
569 | package CFPlus::MapWidget::MapMap; |
641 | package DC::MapWidget::MapMap; |
570 | |
642 | |
|
|
643 | use strict; |
|
|
644 | use utf8; |
|
|
645 | |
571 | our @ISA = CFPlus::UI::Base::; |
646 | our @ISA = DC::UI::Base::; |
572 | |
647 | |
573 | use Time::HiRes qw(time); |
648 | use Time::HiRes qw(time); |
574 | use CFPlus::OpenGL; |
649 | use DC::OpenGL; |
575 | |
650 | |
576 | sub size_request { |
651 | sub size_request { |
577 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
652 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
|
|
653 | } |
|
|
654 | |
|
|
655 | sub refresh_hook { |
|
|
656 | my ($self) = @_; |
|
|
657 | |
|
|
658 | if ($::MAP && $self->{texture_atime} < time) { |
|
|
659 | my ($w, $h) = @$self{qw(w h)}; |
|
|
660 | |
|
|
661 | return unless $w && $h; |
|
|
662 | |
|
|
663 | my $sw = int $::WIDTH / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
|
|
664 | my $sh = int $::HEIGHT / ($::MAPWIDGET->{tilesize} * $::CFG->{map_scale}) + 0.99; |
|
|
665 | |
|
|
666 | my $ox = 0.5 * ($w - $sw); |
|
|
667 | my $oy = 0.5 * ($h - $sh); |
|
|
668 | |
|
|
669 | my $sx = int $::CFG->{map_shift_x} / $::MAPWIDGET->{tilesize}; |
|
|
670 | my $sy = int $::CFG->{map_shift_y} / $::MAPWIDGET->{tilesize}; |
|
|
671 | |
|
|
672 | #TODO: map scale is completely borked |
|
|
673 | |
|
|
674 | my $x0 = int $ox - $sx + 0.5; |
|
|
675 | my $y0 = int $oy - $sy + 0.5; |
|
|
676 | |
|
|
677 | $self->{sw} = $sw; |
|
|
678 | $self->{sh} = $sh; |
|
|
679 | |
|
|
680 | $self->{x0} = $x0; |
|
|
681 | $self->{y0} = $y0; |
|
|
682 | |
|
|
683 | $self->{texture_atime} = time + 1/3; |
|
|
684 | |
|
|
685 | $self->{texture} = |
|
|
686 | new DC::Texture |
|
|
687 | w => $w, |
|
|
688 | h => $h, |
|
|
689 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
|
|
690 | type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
|
|
691 | } |
|
|
692 | } |
|
|
693 | |
|
|
694 | sub invoke_visibility_change { |
|
|
695 | my ($self) = @_; |
|
|
696 | |
|
|
697 | $self->refresh_hook; |
|
|
698 | |
|
|
699 | 0 |
578 | } |
700 | } |
579 | |
701 | |
580 | sub invoke_size_allocate { |
702 | sub invoke_size_allocate { |
581 | my ($self, $w, $h) = @_; |
703 | my ($self, $w, $h) = @_; |
582 | |
704 | |
… | |
… | |
593 | } |
715 | } |
594 | |
716 | |
595 | sub _draw { |
717 | sub _draw { |
596 | my ($self) = @_; |
718 | my ($self) = @_; |
597 | |
719 | |
598 | $::MAP or return; |
720 | $self->{root}->on_post_alloc (texture => sub { $self->refresh_hook }); |
599 | |
721 | |
600 | my ($w, $h) = @$self{qw(w h)}; |
722 | $self->{texture} or return; |
601 | |
|
|
602 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
603 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
604 | |
|
|
605 | my $sx = int $::CFG->{map_shift_x} / 32; |
|
|
606 | my $sy = int $::CFG->{map_shift_y} / 32; |
|
|
607 | |
|
|
608 | my $ox = 0.5 * ($w - $sw); |
|
|
609 | my $oy = 0.5 * ($h - $sh); |
|
|
610 | |
723 | |
611 | glEnable GL_BLEND; |
724 | glEnable GL_BLEND; |
612 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
725 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
613 | glEnable GL_TEXTURE_2D; |
726 | glEnable GL_TEXTURE_2D; |
614 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
727 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE; |
615 | |
728 | |
616 | if ($self->{texture_atime} < time) { |
|
|
617 | $self->{texture_atime} = time + 1/3; |
|
|
618 | |
|
|
619 | $self->{texture} = |
|
|
620 | new CFPlus::Texture |
|
|
621 | w => $w, |
|
|
622 | h => $h, |
|
|
623 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
|
|
624 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
|
|
625 | } |
|
|
626 | |
|
|
627 | $self->{texture}->draw_quad (0, 0); |
729 | $self->{texture}->draw_quad (0, 0); |
628 | |
730 | |
629 | glDisable GL_TEXTURE_2D; |
731 | glDisable GL_TEXTURE_2D; |
630 | |
732 | |
631 | glTranslate 0.375, 0.375; |
733 | glTranslate 0.375, 0.375; |
632 | |
|
|
633 | #TODO: map scale is completely borked |
|
|
634 | |
|
|
635 | my $x0 = int $ox - $sx + 0.5; |
|
|
636 | my $y0 = int $oy - $sy + 0.5; |
|
|
637 | |
734 | |
638 | glColor 1, 1, 0, 1; |
735 | glColor 1, 1, 0, 1; |
639 | glBegin GL_LINE_LOOP; |
736 | glBegin GL_LINE_LOOP; |
640 | glVertex $x0 , $y0 ; |
737 | glVertex $self->{x0} , $self->{y0} ; |
641 | glVertex $x0 , $y0 + $sh; |
738 | glVertex $self->{x0} , $self->{y0} + $self->{sh}; |
642 | glVertex $x0 + $sw, $y0 + $sh; |
739 | glVertex $self->{x0} + $self->{sw}, $self->{y0} + $self->{sh}; |
643 | glVertex $x0 + $sw, $y0 ; |
740 | glVertex $self->{x0} + $self->{sw}, $self->{y0} ; |
644 | glEnd; |
741 | glEnd; |
645 | |
742 | |
646 | glDisable GL_BLEND; |
743 | glDisable GL_BLEND; |
647 | } |
744 | } |
648 | |
745 | |
649 | package CFPlus::MapWidget::Command; |
746 | package DC::MapWidget::Command; |
650 | |
747 | |
651 | use strict; |
748 | use strict; |
652 | |
749 | |
653 | use CFPlus::OpenGL; |
750 | use DC::OpenGL; |
654 | |
751 | |
655 | our @ISA = CFPlus::UI::Frame::; |
752 | our @ISA = DC::UI::Frame::; |
656 | |
753 | |
657 | sub new { |
754 | sub new { |
658 | my $class = shift; |
755 | my $class = shift; |
659 | |
756 | |
660 | my $self = $class->SUPER::new ( |
757 | my $self = $class->SUPER::new ( |
661 | bg => [0, 0, 0, 0.8], |
758 | bg => [0, 0, 0, 0.8], |
662 | @_, |
759 | @_, |
663 | ); |
760 | ); |
664 | |
761 | |
665 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
762 | $self->add ($self->{vbox} = new DC::UI::VBox); |
666 | |
763 | |
667 | $self->{label} = [ |
764 | $self->{label} = [ |
668 | map |
765 | map |
669 | CFPlus::UI::Label->new ( |
766 | DC::UI::Label->new ( |
|
|
767 | align => 0, |
670 | can_hover => 1, |
768 | can_hover => 1, |
671 | can_events => 1, |
769 | can_events => 1, |
672 | tooltip_width => 0.33, |
770 | tooltip_width => 0.33, |
673 | fontsize => $_, |
771 | fontsize => $_, |
674 | ), (0.8) x 16 |
772 | ), (0.8) x 16 |
675 | ]; |
773 | ]; |
676 | |
774 | |
677 | $self->{entry} = new CFPlus::UI::Entry |
775 | $self->{entry} = new DC::UI::Entry |
678 | on_changed => sub { |
776 | on_changed => sub { |
679 | $self->update_labels; |
777 | $self->update_labels; |
680 | 0 |
778 | 0 |
681 | }, |
779 | }, |
682 | on_button_down => sub { |
780 | on_button_down => sub { |
683 | my ($entry, $ev, $x, $y) = @_; |
781 | my ($entry, $ev, $x, $y) = @_; |
684 | |
782 | |
685 | if ($ev->{button} == 3) { |
783 | if ($ev->{button} == 3) { |
686 | (new CFPlus::UI::Menu |
784 | (new DC::UI::Menu |
687 | items => [ |
785 | items => [ |
688 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
786 | ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key" |
689 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
787 | => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
690 | ], |
788 | ], |
691 | )->popup ($ev); |
789 | )->popup ($ev); |
692 | return 1; |
790 | return 1; |
693 | } |
791 | } |
694 | 0 |
792 | 0 |
… | |
… | |
709 | $self->hide; |
807 | $self->hide; |
710 | } |
808 | } |
711 | } elsif ($ev->{sym} == 27) { |
809 | } elsif ($ev->{sym} == 27) { |
712 | $self->{hist_ptr} = 0; |
810 | $self->{hist_ptr} = 0; |
713 | $self->hide; |
811 | $self->hide; |
714 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
812 | } elsif ($ev->{sym} == DC::SDLK_DOWN) { |
715 | if ($self->{hist_ptr} > 1) { |
813 | if ($self->{hist_ptr} > 1) { |
716 | $self->{hist_ptr}--; |
814 | $self->{hist_ptr}--; |
717 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
815 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
718 | } elsif ($self->{hist_ptr} > 0) { |
816 | } elsif ($self->{hist_ptr} > 0) { |
719 | $self->{hist_ptr}--; |
817 | $self->{hist_ptr}--; |
… | |
… | |
721 | } else { |
819 | } else { |
722 | ++$self->{select_offset} |
820 | ++$self->{select_offset} |
723 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
821 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
724 | } |
822 | } |
725 | $self->update_labels; |
823 | $self->update_labels; |
726 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
824 | } elsif ($ev->{sym} == DC::SDLK_UP) { |
727 | if ($self->{select_offset}) { |
825 | if ($self->{select_offset}) { |
728 | --$self->{select_offset} |
826 | --$self->{select_offset} |
729 | } else { |
827 | } else { |
730 | unless ($self->{hist_ptr}) { |
828 | unless ($self->{hist_ptr}) { |
731 | $self->{hist_saveback} = $self->{entry}->get_text; |
829 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
797 | my $text = $self->{entry}->get_text; |
895 | my $text = $self->{entry}->get_text; |
798 | |
896 | |
799 | length $text |
897 | length $text |
800 | or return $self->hide; |
898 | or return $self->hide; |
801 | |
899 | |
802 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
|
|
803 | |
|
|
804 | if ($text ne $self->{last_search}) { |
900 | if ($text ne $self->{last_search}) { |
805 | my @match; |
901 | my @match; |
806 | |
902 | |
807 | if ($text =~ /^(.*?)\s+$/) { |
903 | if ($text =~ /^(.*?)\s+$/) { |
|
|
904 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
808 | @match = [$cmd, "(appended whitespace suppresses completion)"]; |
905 | @match = ([[$cmd,'(appended whitespace suppresses completion)'],$text]); |
809 | } else { |
906 | } else { |
|
|
907 | # @match is [command, penalty, command with arguments] until sort |
|
|
908 | |
|
|
909 | my ($cmd, $arg) = $text =~ /^\s*([^[:space:]]*)(.*)$/; |
|
|
910 | |
810 | my $regexp = do { |
911 | my $regexp_abbrev = do { |
811 | my ($beg, @chr) = split //, lc $cmd; |
912 | my ($beg, @chr) = split //, lc $cmd; |
812 | |
913 | |
813 | # the following regex is used to match our "completion entry" |
914 | # the following regex is used to match our "completion entry" |
814 | # to an actual command - the parentheses match kind of "overhead" |
915 | # to an actual command - the parentheses match kind of "overhead" |
815 | # - the more characters the parentheses match, the less attractive |
916 | # - the more characters the parentheses match, the less attractive |
… | |
… | |
817 | my $regexp = "^\Q$beg\E" |
918 | my $regexp = "^\Q$beg\E" |
818 | . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; |
919 | . join "", map "(?:.*?[ \\\\]\Q$_\E|(.*?)\Q$_\E)", @chr; |
819 | qr<$regexp> |
920 | qr<$regexp> |
820 | }; |
921 | }; |
821 | |
922 | |
822 | my @penalty; |
923 | my $regexp_partial = do { |
|
|
924 | my $regexp = "^\Q$text\E(.*)"; |
|
|
925 | qr<$regexp> |
|
|
926 | }; |
823 | |
927 | |
824 | for (keys %{$self->{command}}) { |
928 | for (keys %{$self->{command}}) { |
825 | if (@penalty = $_ =~ $regexp) { |
929 | my @scores; |
826 | push @match, [$_, length join "", map "::$_", grep defined, @penalty]; |
930 | |
|
|
931 | # 1. Complete command [with args] |
|
|
932 | # command is a prefix of the text |
|
|
933 | # score is length of complete command matched |
|
|
934 | # e.g. "invoke summon pet monster bat" |
|
|
935 | # "invoke" "summon pet monster bat" = 6 |
|
|
936 | # "invoke summon pet monster" "bat" = 25 |
|
|
937 | if ($text =~ /^\Q$_\E(.*)/) { |
|
|
938 | push @scores, [$_, length $_, $text]; |
827 | } |
939 | } |
|
|
940 | |
|
|
941 | # 2. Partial command |
|
|
942 | # text is a prefix of the full command |
|
|
943 | # score is the length of the input text |
|
|
944 | # e.g. "invoke s" |
|
|
945 | # "invoke small fireball" = 8 |
|
|
946 | # "invoke summon pet monster" = 8 |
|
|
947 | |
|
|
948 | if ($_ =~ $regexp_partial) { |
|
|
949 | push @scores, [$_, length $text, $_]; |
|
|
950 | } |
|
|
951 | |
|
|
952 | # 3. Abbreviation match |
|
|
953 | # attempts to use first word of text as an abbreviated command |
|
|
954 | # score is length of word + 1 - 3 per non-word-initial character |
|
|
955 | |
|
|
956 | if (my @penalty = $_ =~ $regexp_abbrev) { |
|
|
957 | push @scores, [$_, (length $cmd) + 1 - (length join "", map "::$_", grep defined, @penalty), "$_$arg"]; |
|
|
958 | } |
|
|
959 | |
|
|
960 | # Pick the best option for this command |
|
|
961 | push @match, (sort { |
|
|
962 | $b->[1] <=> $a->[1] |
|
|
963 | } @scores)[0]; |
828 | } |
964 | } |
829 | |
965 | |
|
|
966 | # @match is now [command object, command with arguments] |
830 | @match = map $self->{command}{$_->[0]}, |
967 | @match = map [$self->{command}{$_->[0]}, $_->[2]], |
831 | sort { |
968 | sort { |
832 | $a->[1] <=> $b->[1] |
969 | $b->[1] <=> $a->[1] |
833 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
970 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
834 | or (length $b->[0]) <=> (length $a->[0]) |
971 | or (length $b->[0]) <=> (length $a->[0]) |
835 | } @match; |
972 | } @match; |
836 | } |
973 | } |
837 | |
974 | |
… | |
… | |
856 | $label->{fg} = [1, 1, 1, 1]; |
993 | $label->{fg} = [1, 1, 1, 1]; |
857 | $label->{bg} = [0, 0, 0, 0]; |
994 | $label->{bg} = [0, 0, 0, 0]; |
858 | } |
995 | } |
859 | |
996 | |
860 | if (@matches) { |
997 | if (@matches) { |
861 | $self->{select} = "$matches[0][0]$arg"; |
998 | $self->{select} = "$matches[0][1]"; |
862 | |
999 | |
863 | $labels[0]->{fg} = [0, 0, 0, 1]; |
1000 | $labels[0]->{fg} = [0, 0, 0, 1]; |
864 | $labels[0]->{bg} = [1, 1, 1, 0.8]; |
1001 | $labels[0]->{bg} = [1, 1, 1, 0.8]; |
865 | } else { |
1002 | } else { |
866 | $self->{select} = "$cmd$arg"; |
1003 | $self->{select} = "$text"; |
867 | } |
1004 | } |
868 | |
1005 | |
869 | for my $match (@matches) { |
1006 | for my $match (@matches) { |
870 | my $label = shift @labels; |
1007 | my $label = shift @labels; |
871 | |
1008 | |
872 | if (@labels) { |
1009 | if (@labels) { |
873 | $label->set_text ("$match->[0]$arg"); |
1010 | $label->set_text ("$match->[1]"); |
874 | $label->set_tooltip ($match->[1]); |
1011 | $label->set_tooltip ("$match->[0][1]"); |
875 | } else { |
1012 | } else { |
876 | $label->set_text ("..."); |
1013 | $label->set_text ("..."); |
877 | $label->set_tooltip ("Use Cursor-Down to view more matches"); |
1014 | $label->set_tooltip ("Use Cursor-Down to view more matches"); |
878 | last; |
1015 | last; |
879 | } |
1016 | } |
… | |
… | |
889 | |
1026 | |
890 | sub _draw { |
1027 | sub _draw { |
891 | my ($self) = @_; |
1028 | my ($self) = @_; |
892 | |
1029 | |
893 | # hack |
1030 | # hack |
894 | local $CFPlus::UI::FOCUS = $self->{entry}; |
1031 | local $DC::UI::FOCUS = $self->{entry}; |
895 | |
1032 | |
896 | $self->SUPER::_draw; |
1033 | $self->SUPER::_draw; |
897 | } |
1034 | } |
898 | |
1035 | |
899 | 1 |
1036 | 1 |