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