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 CFPlus::Macro; |
11 | use DC::Macro; |
12 | |
12 | |
13 | our @ISA = CFPlus::UI::Base::; |
13 | our @ISA = DC::UI::Base::; |
14 | |
14 | |
15 | my $magicmap_tex = |
15 | my $magicmap_tex = |
16 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | new_from_file DC::Texture DC::find_rcfile "magicmap.png", |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
18 | |
18 | |
19 | sub new { |
19 | sub new { |
20 | my $class = shift; |
20 | my $class = shift; |
21 | |
21 | |
… | |
… | |
24 | can_focus => 1, |
24 | can_focus => 1, |
25 | tilesize => 32, |
25 | tilesize => 32, |
26 | @_ |
26 | @_ |
27 | ); |
27 | ); |
28 | |
28 | |
29 | $self->{completer} = new CFPlus::MapWidget::Command:: |
|
|
30 | command => $self->{command}, |
|
|
31 | tooltip => "#completer_help", |
|
|
32 | ; |
|
|
33 | |
|
|
34 | $self |
29 | $self |
35 | } |
|
|
36 | |
|
|
37 | sub set_tilesize { |
|
|
38 | my ($self, $tilesize) = @_; |
|
|
39 | |
|
|
40 | $self->{tilesize} = $tilesize; |
|
|
41 | } |
30 | } |
42 | |
31 | |
43 | sub add_command { |
32 | sub add_command { |
44 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
33 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
45 | |
34 | |
… | |
… | |
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 | |
… | |
… | |
71 | |
60 | |
72 | sub editor_invoke { |
61 | sub editor_invoke { |
73 | my $editsup = $::CONN && $::CONN->{editor_support} |
62 | my $editsup = $::CONN && $::CONN->{editor_support} |
74 | or return; |
63 | or return; |
75 | |
64 | |
76 | CFPlus::background { |
65 | DC::background { |
77 | print "preparing editor startup...\n"; |
66 | print "preparing editor startup...\n"; |
78 | |
67 | |
79 | my $server = $editsup->{gameserver} || "default"; |
68 | my $server = $editsup->{gameserver} || "default"; |
80 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
69 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
81 | |
70 | |
82 | 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; |
83 | 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; |
84 | |
73 | |
85 | print "map directory is $mapdir\n"; |
74 | print "map directory is $mapdir\n"; |
86 | print "lib directory is $libdir\n"; |
75 | print "lib directory is $libdir\n"; |
87 | |
76 | |
88 | my $ua = CFPlus::lwp_useragent; |
77 | my $ua = DC::lwp_useragent; |
89 | |
78 | |
90 | for my $file (qw(archetypes crossfire.0)) { |
79 | for my $file (qw(archetypes crossfire.0)) { |
91 | my $url = "$editsup->{lib_root}$file"; |
80 | my $url = "$editsup->{lib_root}$file"; |
92 | print "mirroring $url...\n"; |
81 | print "mirroring $url...\n"; |
93 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
82 | DC::lwp_check $ua->mirror ($url, "$libdir/$file"); |
94 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
83 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
95 | } |
84 | } |
96 | |
85 | |
97 | if (1) { # upload a map |
86 | if (1) { # upload a map |
98 | my $mapname = $::CONN->{map_info}[0]; |
87 | my $mapname = $::CONN->{map_info}[0]; |
… | |
… | |
103 | |
92 | |
104 | print "getting map revision for $mapname...\n"; |
93 | print "getting map revision for $mapname...\n"; |
105 | |
94 | |
106 | # try to get the most recent head revision, what a hack, |
95 | # try to get the most recent head revision, what a hack, |
107 | # this should have been returned while downloading *sigh* |
96 | # this should have been returned while downloading *sigh* |
108 | my $log = (CFPlus::lwp_check $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; |
109 | |
98 | |
110 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
99 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
111 | my $rev = $1; |
100 | my $rev = $1; |
112 | |
101 | |
113 | print "downloading revision $rev...\n"; |
102 | print "downloading revision $rev...\n"; |
114 | |
103 | |
115 | my $map = (CFPlus::lwp_check $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; |
116 | |
105 | |
117 | my $meta = { |
106 | my $meta = { |
118 | %$editsup, |
107 | %$editsup, |
119 | path => $mapname, |
108 | path => $mapname, |
120 | revision => $rev, |
109 | revision => $rev, |
… | |
… | |
125 | require File::Path; |
114 | require File::Path; |
126 | |
115 | |
127 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
116 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
128 | open my $fh, ">:raw:perlio", "$mappath.meta" |
117 | open my $fh, ">:raw:perlio", "$mappath.meta" |
129 | or die "$mappath.meta: $!\n"; |
118 | or die "$mappath.meta: $!\n"; |
130 | print $fh CFPlus::to_json $meta; |
119 | print $fh DC::encode_json $meta; |
131 | close $fh; |
120 | close $fh; |
132 | open my $fh, ">:raw:perlio:utf8", $mappath |
121 | open my $fh, ">:raw:perlio:utf8", $mappath |
133 | or die "$mappath: $!\n"; |
122 | or die "$mappath: $!\n"; |
134 | print $fh $map; |
123 | print $fh $map; |
135 | close $fh; |
124 | close $fh; |
… | |
… | |
176 | |
165 | |
177 | if ($ev->{button} == 1) { |
166 | if ($ev->{button} == 1) { |
178 | $self->grab_focus; |
167 | $self->grab_focus; |
179 | return unless $::CONN; |
168 | return unless $::CONN; |
180 | |
169 | |
181 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
170 | my $x = $self->{dx} + DC::floor +($ev->{x} - $self->{sx0}) / $self->{ctilesize}; |
182 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
171 | my $y = $self->{dy} + DC::floor +($ev->{y} - $self->{sy0}) / $self->{ctilesize}; |
183 | |
172 | |
184 | $x -= CFPlus::floor $::MAP->w * 0.5; |
173 | $x -= DC::floor $::MAP->w * 0.5; |
185 | $y -= CFPlus::floor $::MAP->h * 0.5; |
174 | $y -= DC::floor $::MAP->h * 0.5; |
186 | |
175 | |
187 | if ($::CONN) { |
176 | if ($::CONN) { |
188 | if ($::IN_BUILD_MODE) { |
|
|
189 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
190 | } else { |
|
|
191 | $::CONN->lookat ($x, $y) |
177 | $::CONN->lookat ($x, $y) |
192 | } |
|
|
193 | } |
178 | } |
194 | |
179 | |
195 | } elsif ($ev->{button} == 2) { |
180 | } elsif ($ev->{button} == 2) { |
196 | $self->grab_focus; |
181 | $self->grab_focus; |
197 | return unless $::CONN; |
182 | return unless $::CONN; |
… | |
… | |
215 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
200 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
216 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
201 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
217 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
202 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
218 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
203 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
219 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
204 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
220 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
205 | # ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
221 | [ |
206 | [ |
222 | $::PICKUP_ENABLE->{state} |
207 | $::PICKUP_ENABLE->{state} |
223 | ? "Disable automatic pickup" |
208 | ? "Disable automatic pickup" |
224 | : "Enable automatic pickup", |
209 | : "Enable automatic pickup", |
225 | sub { $::PICKUP_ENABLE->toggle } |
210 | sub { $::PICKUP_ENABLE->toggle } |
226 | ], |
211 | ], |
227 | ); |
212 | ); |
228 | |
213 | |
229 | if ($::CONN && $::CONN->{editor_support}) { |
214 | if ($::CONN && $::CONN->{editor_support}) { |
230 | push @items, [ |
215 | # push @items, [ |
231 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
216 | # "Edit this map <span size='xx-small'>(" . (DC::asxml $::CONN->{map_info}[0]) . ")</span>", |
232 | \&editor_invoke, |
217 | # \&editor_invoke, |
233 | ]; |
218 | # ]; |
234 | |
219 | |
235 | for my $type (qw(test name)) { |
220 | for my $type (qw(test name)) { |
236 | $::CONN->{editor_support}{type} ne $type |
221 | $::CONN->{editor_support}{type} ne $type |
237 | or next; |
222 | or next; |
238 | my $server = $::CONN->{editor_support}{"${type}server"} |
223 | my $server = $::CONN->{editor_support}{"${type}server"} |
239 | or next; |
224 | or next; |
240 | |
225 | |
241 | push @items, [ |
226 | push @items, [ |
242 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
227 | "Login on $type server <span size='xx-small'>(" . (DC::asxml $server) . ")</span>", |
243 | sub { server_login $server }, |
228 | sub { server_login $server }, |
244 | ]; |
229 | ]; |
245 | } |
230 | } |
246 | } |
231 | } |
247 | |
232 | |
… | |
… | |
255 | } |
240 | } |
256 | } |
241 | } |
257 | ], |
242 | ], |
258 | ; |
243 | ; |
259 | |
244 | |
260 | (new CFPlus::UI::Menu |
245 | (new DC::UI::Menu |
261 | items => \@items, |
246 | items => \@items, |
262 | )->popup ($ev); |
247 | )->popup ($ev); |
263 | } |
248 | } |
264 | |
249 | |
265 | 1 |
250 | 1 |
… | |
… | |
287 | |
272 | |
288 | sub size_request { |
273 | sub size_request { |
289 | my ($self) = @_; |
274 | my ($self) = @_; |
290 | |
275 | |
291 | ( |
276 | ( |
292 | $self->{tilesize} * CFPlus::ceil $::WIDTH / $self->{tilesize}, |
277 | $self->{tilesize} * DC::ceil $::WIDTH / $self->{tilesize}, |
293 | $self->{tilesize} * CFPlus::ceil $::HEIGHT / $self->{tilesize}, |
278 | $self->{tilesize} * DC::ceil $::HEIGHT / $self->{tilesize}, |
294 | ) |
279 | ) |
295 | } |
280 | } |
296 | |
281 | |
297 | sub update { |
282 | sub update { |
298 | my ($self) = @_; |
283 | my ($self) = @_; |
… | |
… | |
300 | $self->{need_update} = 1; |
285 | $self->{need_update} = 1; |
301 | $self->SUPER::update; |
286 | $self->SUPER::update; |
302 | } |
287 | } |
303 | |
288 | |
304 | my %DIR = ( |
289 | my %DIR = ( |
305 | ( "," . CFPlus::SDLK_KP5 ), [0, "stay fire"], |
290 | ( "," . DC::SDLK_KP5 ), [0, "stay fire"], |
306 | ( "," . CFPlus::SDLK_KP8 ), [1, "north"], |
291 | ( "," . DC::SDLK_KP8 ), [1, "north"], |
307 | ( "," . CFPlus::SDLK_KP9 ), [2, "northeast"], |
292 | ( "," . DC::SDLK_KP9 ), [2, "northeast"], |
308 | ( "," . CFPlus::SDLK_KP6 ), [3, "east"], |
293 | ( "," . DC::SDLK_KP6 ), [3, "east"], |
309 | ( "," . CFPlus::SDLK_KP3 ), [4, "southeast"], |
294 | ( "," . DC::SDLK_KP3 ), [4, "southeast"], |
310 | ( "," . CFPlus::SDLK_KP2 ), [5, "south"], |
295 | ( "," . DC::SDLK_KP2 ), [5, "south"], |
311 | ( "," . CFPlus::SDLK_KP1 ), [6, "southwest"], |
296 | ( "," . DC::SDLK_KP1 ), [6, "southwest"], |
312 | ( "," . CFPlus::SDLK_KP4 ), [7, "west"], |
297 | ( "," . DC::SDLK_KP4 ), [7, "west"], |
313 | ( "," . CFPlus::SDLK_KP7 ), [8, "northwest"], |
298 | ( "," . DC::SDLK_KP7 ), [8, "northwest"], |
314 | |
299 | |
315 | ( "," . CFPlus::SDLK_UP ), [1, "north"], |
300 | ( "," . DC::SDLK_UP ), [1, "north"], |
316 | ("1," . CFPlus::SDLK_UP ), [2, "northeast"], |
301 | ("1," . DC::SDLK_UP ), [2, "northeast"], |
317 | ( "," . CFPlus::SDLK_RIGHT), [3, "east"], |
302 | ( "," . DC::SDLK_RIGHT), [3, "east"], |
318 | ("1," . CFPlus::SDLK_RIGHT), [4, "southeast"], |
303 | ("1," . DC::SDLK_RIGHT), [4, "southeast"], |
319 | ( "," . CFPlus::SDLK_DOWN ), [5, "south"], |
304 | ( "," . DC::SDLK_DOWN ), [5, "south"], |
320 | ("1," . CFPlus::SDLK_DOWN ), [6, "southwest"], |
305 | ("1," . DC::SDLK_DOWN ), [6, "southwest"], |
321 | ( "," . CFPlus::SDLK_LEFT ), [7, "west"], |
306 | ( "," . DC::SDLK_LEFT ), [7, "west"], |
322 | ("1," . CFPlus::SDLK_LEFT ), [8, "northwest"], |
307 | ("1," . DC::SDLK_LEFT ), [8, "northwest"], |
323 | ); |
308 | ); |
324 | |
309 | |
325 | sub invoke_key_down { |
310 | sub invoke_key_down { |
326 | my ($self, $ev) = @_; |
311 | my ($self, $ev) = @_; |
327 | |
312 | |
328 | my $mod = $ev->{mod}; |
313 | my $mod = $ev->{mod}; |
329 | my $sym = $ev->{sym}; |
314 | my $sym = $ev->{sym}; |
330 | my $uni = $ev->{unicode}; |
315 | my $uni = $ev->{unicode}; |
331 | |
316 | |
332 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
317 | $mod &= DC::KMOD_CTRL | DC::KMOD_ALT | DC::KMOD_SHIFT; |
333 | |
318 | |
334 | if ($sym == 9) { |
319 | # ignore repeated keypresses |
335 | ($mod & CFPlus::KMOD_SHIFT ? $::MESSAGE_WINDOW : $::PL_WINDOW)->toggle_visibility; |
320 | return if $self->{last_mod} == $mod && $self->{last_sym} == $sym; |
336 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
321 | $self->{last_mod} = $mod; |
337 | $::HELP_WINDOW->toggle_visibility; |
322 | $self->{last_sym} = $sym; |
338 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
|
|
339 | ::toggle_player_page ($::STATS_PAGE); |
|
|
340 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
|
|
341 | ::toggle_player_page ($::SKILL_PAGE); |
|
|
342 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
|
|
343 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
344 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
|
|
345 | ::toggle_player_page ($::INVENTORY_PAGE); |
|
|
346 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
|
|
347 | $::SETUP_DIALOG->toggle_visibility; |
|
|
348 | } elsif (!$::CONN) { |
|
|
349 | return 0; # bindings further down need a valid connection |
|
|
350 | |
323 | |
351 | } elsif ($uni == ord ",") { |
|
|
352 | $::CONN->user_send ("take"); |
|
|
353 | } elsif ($uni == ord " ") { |
|
|
354 | $::CONN->user_send ("apply"); |
|
|
355 | } elsif ($uni == 13) { |
|
|
356 | $::CONN->user_send ("examine"); |
|
|
357 | } elsif ($uni == ord ".") { |
|
|
358 | $::CONN->user_send ($self->{completer}{last_command}) |
|
|
359 | if exists $self->{completer}{last_command}; |
|
|
360 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
|
|
361 | $::CONN->macro_send ($_) for @macros; |
|
|
362 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
|
|
363 | $::CONN->user_send ("rotateshoottype +"); |
|
|
364 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
|
|
365 | $::CONN->user_send ("rotateshoottype -"); |
|
|
366 | } elsif ($uni == ord '!') { |
|
|
367 | $self->{completer}->set_prefix ("shout "); |
|
|
368 | $self->{completer}->show; |
|
|
369 | } elsif ($uni == ord '"') { |
|
|
370 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
|
|
371 | $self->{completer}->show; |
|
|
372 | } elsif ($uni == ord "'") { |
|
|
373 | $self->{completer}->set_prefix (""); |
|
|
374 | $self->{completer}->show; |
|
|
375 | } elsif (my $dir = $DIR{(!!($mod & CFPlus::KMOD_ALT)) . ",$sym"}) { |
324 | if ($::CONN && (my $dir = $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"})) { |
376 | if ($mod & CFPlus::KMOD_SHIFT) { |
325 | if ($mod & DC::KMOD_SHIFT) { |
377 | $self->{shft}++; |
326 | $self->{shft}++; |
378 | if ($dir->[0] != $self->{fire_dir}) { |
327 | if ($dir->[0] != $self->{fire_dir}) { |
379 | $::CONN->user_send ("fire $dir->[0]"); |
328 | $::CONN->user_send ("fire $dir->[0]"); |
380 | } |
329 | } |
381 | $self->{fire_dir} = $DIR{$sym}[0]; |
330 | $self->{fire_dir} = $dir->[0]; |
382 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
331 | } elsif ($mod & DC::KMOD_CTRL) { |
383 | $self->{ctrl}++; |
332 | $self->{ctrl}++; |
384 | $::CONN->user_send ("run $dir->[0]"); |
333 | $::CONN->user_send ("run $dir->[0]"); |
385 | } else { |
334 | } else { |
386 | $::CONN->user_send ("$dir->[1]"); |
335 | $::CONN->user_send ("$dir->[1]"); |
387 | } |
336 | } |
388 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
337 | |
389 | $self->{completer}->inject_key_down ($ev); |
|
|
390 | $self->{completer}->show; |
|
|
391 | } else { |
|
|
392 | return 0; |
338 | return 1; |
393 | } |
|
|
394 | |
|
|
395 | 1 |
339 | } |
|
|
340 | |
|
|
341 | 0 |
396 | } |
342 | } |
397 | |
343 | |
398 | sub invoke_key_up { |
344 | sub invoke_key_up { |
399 | my ($self, $ev) = @_; |
345 | my ($self, $ev) = @_; |
400 | |
346 | |
401 | my $res = 0; |
347 | my $res = 0; |
402 | my $mod = $ev->{mod}; |
348 | my $mod = $ev->{mod}; |
403 | my $sym = $ev->{sym}; |
349 | my $sym = $ev->{sym}; |
404 | |
350 | |
|
|
351 | delete $self->{last_mod}; |
|
|
352 | delete $self->{last_sym}; |
|
|
353 | |
405 | if ($::CFG->{shift_fire_stop}) { |
354 | if ($::CFG->{shift_fire_stop}) { |
406 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
355 | if (!($mod & DC::KMOD_SHIFT) && delete $self->{shft}) { |
407 | $::CONN->user_send ("fire_stop"); |
356 | $::CONN->user_send ("fire_stop"); |
408 | delete $self->{fire_dir}; |
357 | delete $self->{fire_dir}; |
409 | $res = 1; |
358 | $res = 1; |
410 | } |
359 | } |
411 | } else { |
360 | } else { |
412 | if (exists $DIR{$sym} && delete $self->{shft}) { |
361 | if (exists $DIR{(!!($mod & DC::KMOD_ALT)) . ",$sym"} && delete $self->{shft}) { |
413 | $::CONN->user_send ("fire_stop"); |
362 | $::CONN->user_send ("fire_stop"); |
414 | delete $self->{fire_dir}; |
363 | delete $self->{fire_dir}; |
415 | $res = 1; |
364 | $res = 1; |
416 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
365 | } elsif (($sym == DC::SDLK_LSHIFT || $sym == DC::SDLK_RSHIFT) |
|
|
366 | && delete $self->{shft}) { # XXX: is RSHIFT ok? |
417 | $::CONN->user_send ("fire_stop"); |
367 | $::CONN->user_send ("fire_stop"); |
418 | delete $self->{fire_dir}; |
368 | delete $self->{fire_dir}; |
419 | $res = 1; |
369 | $res = 1; |
420 | } |
370 | } |
421 | } |
371 | } |
422 | |
372 | |
423 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
373 | if (!($mod & DC::KMOD_CTRL ) && delete $self->{ctrl}) { |
424 | $::CONN->user_send ("run_stop"); |
374 | $::CONN->user_send ("run_stop"); |
425 | $res = 1; |
375 | $res = 1; |
426 | } |
376 | } |
427 | |
377 | |
428 | $res |
378 | $res |
… | |
… | |
434 | $self->refresh_hook; |
384 | $self->refresh_hook; |
435 | |
385 | |
436 | 0 |
386 | 0 |
437 | } |
387 | } |
438 | |
388 | |
|
|
389 | sub set_tilesize { |
|
|
390 | my ($self, $tilesize) = @_; |
|
|
391 | |
|
|
392 | $self->{tilesize} = $tilesize; |
|
|
393 | } |
|
|
394 | |
|
|
395 | sub scroll { |
|
|
396 | my ($self, $dx, $dy) = @_; |
|
|
397 | |
|
|
398 | $::MAP->scroll ($dx, $dy); |
|
|
399 | |
|
|
400 | $self->movement_update; |
|
|
401 | |
|
|
402 | $self->{sdx} += $dx * $self->{tilesize}; # smooth displacement |
|
|
403 | $self->{sdy} += $dy * $self->{tilesize}; |
|
|
404 | } |
|
|
405 | |
439 | sub set_magicmap { |
406 | sub set_magicmap { |
440 | my ($self, $w, $h, $x, $y, $data) = @_; |
407 | my ($self, $w, $h, $x, $y, $data) = @_; |
441 | |
408 | |
442 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
409 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
443 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
410 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
… | |
… | |
445 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
412 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
446 | |
413 | |
447 | $self->update; |
414 | $self->update; |
448 | } |
415 | } |
449 | |
416 | |
|
|
417 | sub movement_update { |
|
|
418 | my ($self) = @_; |
|
|
419 | |
|
|
420 | if ($::CFG->{smooth_movement}) { |
|
|
421 | if ($self->{sdx} || $self->{sdy}) { |
|
|
422 | my $diff = EV::time - ($self->{last_update} || $::LAST_REFRESH); |
|
|
423 | my $spd = $::CONN->{stat}{DC::Protocol::CS_STAT_SPEED}; |
|
|
424 | |
|
|
425 | # the minimum time for a single tile movement |
|
|
426 | my $mintime = DC::Protocol::TICK * DC::ceil 1 / ($spd * DC::Protocol::TICK); |
|
|
427 | |
|
|
428 | # jump if "impossibly high" speed |
|
|
429 | if ( |
|
|
430 | (max abs $self->{sdx}, abs $self->{sdy}) |
|
|
431 | > $spd * $self->{tilesize} * $mintime * 1.1 |
|
|
432 | ) { |
|
|
433 | #warn "jump ", (max abs $self->{sdx}, abs $self->{sdy}), " ", $spd * $mintime * 1.0;#d# |
|
|
434 | $self->{sdx} = $self->{sdy} = 0; |
|
|
435 | } else { |
|
|
436 | my $upd = 0; |
|
|
437 | |
|
|
438 | $spd *= $self->{tilesize} * $diff * 1.0001; |
|
|
439 | |
|
|
440 | my $dx = $self->{sdx} < 0 ? -$spd : $spd; |
|
|
441 | my $dy = $self->{sdy} < 0 ? -$spd : $spd; |
|
|
442 | |
|
|
443 | if ($self->{sdx} * ($self->{sdx} - $dx) <= 0) { $self->{sdx} = 0 } else { $self->{sdx} -= $dx; $upd = 1 } |
|
|
444 | if ($self->{sdy} * ($self->{sdy} - $dy) <= 0) { $self->{sdy} = 0 } else { $self->{sdy} -= $dy; $upd = 1 } |
|
|
445 | |
|
|
446 | $self->update if $upd; |
|
|
447 | } |
|
|
448 | } |
|
|
449 | } else { |
|
|
450 | $self->{sdx} = $self->{sdy} = 0; |
|
|
451 | } |
|
|
452 | |
|
|
453 | $self->{last_update} = EV::time; |
|
|
454 | } |
|
|
455 | |
450 | sub refresh_hook { |
456 | sub refresh_hook { |
451 | my ($self) = @_; |
457 | my ($self) = @_; |
452 | |
458 | |
453 | if ($::MAP) { |
459 | if ($::MAP && $::CONN) { |
454 | if (delete $self->{need_update}) { |
460 | if (delete $self->{need_update}) { |
|
|
461 | $self->movement_update; |
|
|
462 | |
455 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
463 | my $tilesize = $self->{ctilesize} = (int $self->{tilesize} * $::CFG->{map_scale}) || 1; |
456 | |
464 | |
|
|
465 | # width/height of map, in tiles |
457 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
466 | my $sw = $self->{sw} = 1 + DC::ceil $self->{w} / $tilesize; |
458 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
467 | my $sh = $self->{sh} = 1 + DC::ceil $self->{h} / $tilesize; |
459 | |
468 | |
460 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
469 | # the map displacement, in tiles |
461 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
470 | my $sx = DC::ceil $::CFG->{map_shift_x} / $tilesize + $self->{sdx} / $self->{tilesize}; |
|
|
471 | my $sy = DC::ceil $::CFG->{map_shift_y} / $tilesize + $self->{sdy} / $self->{tilesize}; |
462 | |
472 | |
|
|
473 | # the upper left "visible" corner, in pixels |
463 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
474 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
464 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
475 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
465 | |
476 | |
466 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
477 | my $dx = $self->{dx} = DC::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
467 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
478 | my $dy = $self->{dy} = DC::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
468 | |
479 | |
469 | if ($::CFG->{fow_enable}) { |
480 | if ($::CFG->{fow_enable}) { |
470 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
481 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
471 | |
482 | |
472 | $self->{fow_texture} = new CFPlus::Texture |
483 | $self->{fow_texture} = new DC::Texture |
473 | w => $w, |
484 | w => $w, |
474 | h => $h, |
485 | h => $h, |
475 | data => $data, |
486 | data => $data, |
476 | internalformat => GL_ALPHA, |
487 | internalformat => GL_ALPHA, |
477 | format => GL_ALPHA; |
488 | format => GL_ALPHA; |
… | |
… | |
480 | } |
491 | } |
481 | |
492 | |
482 | glNewList ($self->{list} ||= glGenList); |
493 | glNewList ($self->{list} ||= glGenList); |
483 | |
494 | |
484 | glPushMatrix; |
495 | glPushMatrix; |
485 | glTranslate $sx0, $sy0; |
496 | glTranslate $sx0 + $self->{sdx}, $sy0 + $self->{sdy}; |
486 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
497 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
487 | |
498 | |
488 | $::MAP->draw ($dx, $dy, $sw, $sh, $self->{tilesize}); |
499 | $::MAP->draw ($dx, $dy, $sw, $sh, |
|
|
500 | $self->{tilesize}, |
|
|
501 | $::CONN->{player}{tag}, |
|
|
502 | -$self->{sdx}, -$self->{sdy}); |
489 | |
503 | |
490 | glScale $self->{tilesize}, $self->{tilesize}; |
504 | glScale $self->{tilesize}, $self->{tilesize}; |
491 | |
505 | |
492 | if (my $tex = $self->{fow_texture}) { |
506 | if (my $tex = $self->{fow_texture}) { |
493 | glPushMatrix; |
507 | glPushMatrix; |
… | |
… | |
527 | |
541 | |
528 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
542 | $self->{root}->on_post_alloc (prepare => sub { $self->refresh_hook }); |
529 | |
543 | |
530 | return unless $self->{list}; |
544 | return unless $self->{list}; |
531 | |
545 | |
532 | my $focused = $CFPlus::UI::FOCUS == $self |
546 | my $focused = $DC::UI::FOCUS == $self |
533 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
547 | || $DC::UI::FOCUS == $::COMPLETER->{entry}; |
534 | |
548 | |
535 | return |
549 | return |
536 | unless $focused || !$::FAST; |
550 | unless $focused || !$::FAST; |
537 | |
551 | |
538 | glCallList $self->{list}; |
552 | glCallList $self->{list}; |
539 | |
553 | |
540 | # TNT2 emulates logops in software (or worse :) |
554 | # TNT2 emulates logops in software (or worse :) |
541 | unless ($focused) { |
555 | unless ($focused) { |
542 | glColor 0.4, 0.2, 0.2, 0.6; |
556 | glColor_premultiply 0, 0, 1, 0.25; |
543 | glEnable GL_BLEND; |
557 | glEnable GL_BLEND; |
544 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
558 | glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA; |
545 | glBegin GL_QUADS; |
559 | glBegin GL_QUADS; |
546 | glVertex 0, 0; |
560 | glVertex 0, 0; |
547 | glVertex 0, $::HEIGHT; |
561 | glVertex 0, $::HEIGHT; |
548 | glVertex $::WIDTH, $::HEIGHT; |
562 | glVertex $::WIDTH, $::HEIGHT; |
549 | glVertex $::WIDTH, 0; |
563 | glVertex $::WIDTH, 0; |
… | |
… | |
558 | glDeleteList $self->{list}; |
572 | glDeleteList $self->{list}; |
559 | |
573 | |
560 | $self->SUPER::DESTROY; |
574 | $self->SUPER::DESTROY; |
561 | } |
575 | } |
562 | |
576 | |
563 | package CFPlus::MapWidget::MapMap; |
577 | package DC::MapWidget::MapMap; |
564 | |
578 | |
565 | use strict; |
579 | use strict; |
566 | use utf8; |
580 | use utf8; |
567 | |
581 | |
568 | our @ISA = CFPlus::UI::Base::; |
582 | our @ISA = DC::UI::Base::; |
569 | |
583 | |
570 | use Time::HiRes qw(time); |
584 | use Time::HiRes qw(time); |
571 | use CFPlus::OpenGL; |
585 | use DC::OpenGL; |
572 | |
586 | |
573 | sub size_request { |
587 | sub size_request { |
574 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
588 | ($::HEIGHT * 0.2, $::HEIGHT * 0.2) |
575 | } |
589 | } |
576 | |
590 | |
… | |
… | |
601 | $self->{y0} = $y0; |
615 | $self->{y0} = $y0; |
602 | |
616 | |
603 | $self->{texture_atime} = time + 1/3; |
617 | $self->{texture_atime} = time + 1/3; |
604 | |
618 | |
605 | $self->{texture} = |
619 | $self->{texture} = |
606 | new CFPlus::Texture |
620 | new DC::Texture |
607 | w => $w, |
621 | w => $w, |
608 | h => $h, |
622 | h => $h, |
609 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
623 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
610 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
624 | type => $DC::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
611 | } |
625 | } |
612 | } |
626 | } |
613 | |
627 | |
614 | sub invoke_visibility_change { |
628 | sub invoke_visibility_change { |
615 | my ($self) = @_; |
629 | my ($self) = @_; |
… | |
… | |
661 | glEnd; |
675 | glEnd; |
662 | |
676 | |
663 | glDisable GL_BLEND; |
677 | glDisable GL_BLEND; |
664 | } |
678 | } |
665 | |
679 | |
666 | package CFPlus::MapWidget::Command; |
680 | package DC::MapWidget::Command; |
667 | |
681 | |
668 | use strict; |
682 | use strict; |
669 | |
683 | |
670 | use CFPlus::OpenGL; |
684 | use DC::OpenGL; |
671 | |
685 | |
672 | our @ISA = CFPlus::UI::Frame::; |
686 | our @ISA = DC::UI::Frame::; |
673 | |
687 | |
674 | sub new { |
688 | sub new { |
675 | my $class = shift; |
689 | my $class = shift; |
676 | |
690 | |
677 | my $self = $class->SUPER::new ( |
691 | my $self = $class->SUPER::new ( |
678 | bg => [0, 0, 0, 0.8], |
692 | bg => [0, 0, 0, 0.8], |
679 | @_, |
693 | @_, |
680 | ); |
694 | ); |
681 | |
695 | |
682 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
696 | $self->add ($self->{vbox} = new DC::UI::VBox); |
683 | |
697 | |
684 | $self->{label} = [ |
698 | $self->{label} = [ |
685 | map |
699 | map |
686 | CFPlus::UI::Label->new ( |
700 | DC::UI::Label->new ( |
|
|
701 | align => 0, |
687 | can_hover => 1, |
702 | can_hover => 1, |
688 | can_events => 1, |
703 | can_events => 1, |
689 | tooltip_width => 0.33, |
704 | tooltip_width => 0.33, |
690 | fontsize => $_, |
705 | fontsize => $_, |
691 | ), (0.8) x 16 |
706 | ), (0.8) x 16 |
692 | ]; |
707 | ]; |
693 | |
708 | |
694 | $self->{entry} = new CFPlus::UI::Entry |
709 | $self->{entry} = new DC::UI::Entry |
695 | on_changed => sub { |
710 | on_changed => sub { |
696 | $self->update_labels; |
711 | $self->update_labels; |
697 | 0 |
712 | 0 |
698 | }, |
713 | }, |
699 | on_button_down => sub { |
714 | on_button_down => sub { |
700 | my ($entry, $ev, $x, $y) = @_; |
715 | my ($entry, $ev, $x, $y) = @_; |
701 | |
716 | |
702 | if ($ev->{button} == 3) { |
717 | if ($ev->{button} == 3) { |
703 | (new CFPlus::UI::Menu |
718 | (new DC::UI::Menu |
704 | items => [ |
719 | items => [ |
705 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
720 | ["bind <i>" . (DC::asxml $self->{select}) . "</i> to a key" |
706 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
721 | => sub { DC::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
707 | ], |
722 | ], |
708 | )->popup ($ev); |
723 | )->popup ($ev); |
709 | return 1; |
724 | return 1; |
710 | } |
725 | } |
711 | 0 |
726 | 0 |
… | |
… | |
726 | $self->hide; |
741 | $self->hide; |
727 | } |
742 | } |
728 | } elsif ($ev->{sym} == 27) { |
743 | } elsif ($ev->{sym} == 27) { |
729 | $self->{hist_ptr} = 0; |
744 | $self->{hist_ptr} = 0; |
730 | $self->hide; |
745 | $self->hide; |
731 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
746 | } elsif ($ev->{sym} == DC::SDLK_DOWN) { |
732 | if ($self->{hist_ptr} > 1) { |
747 | if ($self->{hist_ptr} > 1) { |
733 | $self->{hist_ptr}--; |
748 | $self->{hist_ptr}--; |
734 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
749 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
735 | } elsif ($self->{hist_ptr} > 0) { |
750 | } elsif ($self->{hist_ptr} > 0) { |
736 | $self->{hist_ptr}--; |
751 | $self->{hist_ptr}--; |
… | |
… | |
738 | } else { |
753 | } else { |
739 | ++$self->{select_offset} |
754 | ++$self->{select_offset} |
740 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
755 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
741 | } |
756 | } |
742 | $self->update_labels; |
757 | $self->update_labels; |
743 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
758 | } elsif ($ev->{sym} == DC::SDLK_UP) { |
744 | if ($self->{select_offset}) { |
759 | if ($self->{select_offset}) { |
745 | --$self->{select_offset} |
760 | --$self->{select_offset} |
746 | } else { |
761 | } else { |
747 | unless ($self->{hist_ptr}) { |
762 | unless ($self->{hist_ptr}) { |
748 | $self->{hist_saveback} = $self->{entry}->get_text; |
763 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
906 | |
921 | |
907 | sub _draw { |
922 | sub _draw { |
908 | my ($self) = @_; |
923 | my ($self) = @_; |
909 | |
924 | |
910 | # hack |
925 | # hack |
911 | local $CFPlus::UI::FOCUS = $self->{entry}; |
926 | local $DC::UI::FOCUS = $self->{entry}; |
912 | |
927 | |
913 | $self->SUPER::_draw; |
928 | $self->SUPER::_draw; |
914 | } |
929 | } |
915 | |
930 | |
916 | 1 |
931 | 1 |