1 | package CFClient::MapWidget; |
1 | package CFPlus::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 CFClient; |
8 | use CFPlus; |
9 | use CFClient::OpenGL; |
9 | use CFPlus::OpenGL; |
10 | use CFClient::UI; |
10 | use CFPlus::UI; |
|
|
11 | use CFPlus::Macro; |
11 | |
12 | |
12 | our @ISA = CFClient::UI::Base::; |
13 | our @ISA = CFPlus::UI::Base::; |
|
|
14 | |
|
|
15 | sub ::T() { 32 } |
13 | |
16 | |
14 | my $magicmap_tex = |
17 | my $magicmap_tex = |
15 | new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", |
18 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
19 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | |
20 | |
18 | sub new { |
21 | sub new { |
19 | my $class = shift; |
22 | my $class = shift; |
20 | |
23 | |
… | |
… | |
30 | ], |
33 | ], |
31 | |
34 | |
32 | @_ |
35 | @_ |
33 | ); |
36 | ); |
34 | |
37 | |
35 | $self->{completer} = new CFClient::MapWidget::Command:: |
38 | $self->{completer} = new CFPlus::MapWidget::Command:: |
36 | command => $self->{command}, |
39 | command => $self->{command}, |
37 | tooltip => "<b>The Command Completer</b>\n\n" |
40 | tooltip => "#completer_help", |
38 | . "This is your central interface to send text commands to the server. " |
|
|
39 | . "To enter a verbatim command to send to the server, just type the command, " |
|
|
40 | . "followed by a space, and press return. " |
|
|
41 | . "Typing the initial letters of words (or just any letters) displays guesses " |
|
|
42 | . "for commands you might want to use.\n" |
|
|
43 | . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" |
|
|
44 | . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.", |
|
|
45 | ; |
41 | ; |
46 | |
42 | |
47 | $self |
43 | $self |
48 | } |
44 | } |
49 | |
45 | |
… | |
… | |
66 | |
62 | |
67 | $self->{completer}->hide |
63 | $self->{completer}->hide |
68 | if $self->{completer}; |
64 | if $self->{completer}; |
69 | } |
65 | } |
70 | |
66 | |
|
|
67 | sub server_login { |
|
|
68 | my ($server) = @_; |
|
|
69 | |
|
|
70 | ::stop_game (); |
|
|
71 | local $::PROFILE->{host} = $server; |
|
|
72 | ::start_game (); |
|
|
73 | } |
|
|
74 | |
|
|
75 | sub editor_invoke { |
|
|
76 | my $editsup = $::CONN && $::CONN->{editor_support} |
|
|
77 | or return; |
|
|
78 | |
|
|
79 | CFPlus::background { |
|
|
80 | print "preparing editor startup...\n"; |
|
|
81 | |
|
|
82 | my $server = $editsup->{gameserver} || "default"; |
|
|
83 | $server =~ s/([^a-zA-Z0-9_\-])/sprintf "=%x=", ord $1/ge; |
|
|
84 | |
|
|
85 | local $ENV{CROSSFIRE_MAPDIR} = my $mapdir = "$Crossfire::VARDIR/map.$server"; mkdir $mapdir; |
|
|
86 | local $ENV{CROSSFIRE_LIBDIR} = my $libdir = "$Crossfire::VARDIR/lib.$server"; mkdir $libdir; |
|
|
87 | |
|
|
88 | print "map directory is $mapdir\n"; |
|
|
89 | print "lib directory is $libdir\n"; |
|
|
90 | |
|
|
91 | my $ua = CFPlus::lwp_useragent; |
|
|
92 | |
|
|
93 | for my $file (qw(archetypes crossfire.0)) { |
|
|
94 | my $url = "$editsup->{lib_root}$file"; |
|
|
95 | print "mirroring $url...\n"; |
|
|
96 | CFPlus::lwp_check $ua->mirror ($url, "$libdir/$file"); |
|
|
97 | printf "%s size %d octets\n", $file, -s "$libdir/$file"; |
|
|
98 | } |
|
|
99 | |
|
|
100 | if (1) { # upload a map |
|
|
101 | my $mapname = $::CONN->{map_info}[0]; |
|
|
102 | |
|
|
103 | my $mappath = "$mapdir/$mapname"; |
|
|
104 | |
|
|
105 | -e $mappath and die "$mappath already exists\n"; |
|
|
106 | |
|
|
107 | print "getting map revision for $mapname...\n"; |
|
|
108 | |
|
|
109 | # try to get the most recent head revision, what a hack, |
|
|
110 | # this should have been returned while downloading *sigh* |
|
|
111 | my $log = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?view=log&logsort=rev"))->decoded_content; |
|
|
112 | |
|
|
113 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
|
|
114 | my $rev = $1; |
|
|
115 | |
|
|
116 | print "downloading revision $rev...\n"; |
|
|
117 | |
|
|
118 | my $map = (CFPlus::lwp_check $ua->get ("$editsup->{cvs_root}/$mapname?rev=$rev"))->decoded_content; |
|
|
119 | |
|
|
120 | my $meta = { |
|
|
121 | %$editsup, |
|
|
122 | path => $mapname, |
|
|
123 | revision => $rev, |
|
|
124 | cf_login => $::PROFILE->{user}, |
|
|
125 | }; |
|
|
126 | |
|
|
127 | require File::Basename; |
|
|
128 | require File::Path; |
|
|
129 | |
|
|
130 | File::Path::mkpath (File::Basename::dirname ($mappath)); |
|
|
131 | open my $fh, ">:raw:perlio", "$mappath.meta" |
|
|
132 | or die "$mappath.meta: $!\n"; |
|
|
133 | print $fh CFPlus::to_json $meta; |
|
|
134 | close $fh; |
|
|
135 | open my $fh, ">:raw:perlio:utf8", $mappath |
|
|
136 | or die "$mappath: $!\n"; |
|
|
137 | print $fh $map; |
|
|
138 | close $fh; |
|
|
139 | |
|
|
140 | print "saved as $mappath\n"; |
|
|
141 | |
|
|
142 | print "invoking editor...\n"; |
|
|
143 | exec "/root/s2/gce $mappath";#d# |
|
|
144 | |
|
|
145 | # now upload it |
|
|
146 | # require HTTP::Request::Common; |
|
|
147 | # |
|
|
148 | # my $res = $ua->post ( |
|
|
149 | # $ENV{CFPLUS_UPLOAD}, |
|
|
150 | # Content_Type => 'multipart/form-data', |
|
|
151 | # Content => [ |
|
|
152 | # path => $mapname, |
|
|
153 | # mapdir => $ENV{CROSSFIRE_MAPDIR}, |
|
|
154 | # map => $map, |
|
|
155 | # revision => $rev, |
|
|
156 | # cf_login => $ENV{CFPLUS_LOGIN}, |
|
|
157 | # cf_password => $ENV{CFPLUS_PASSWORD}, |
|
|
158 | # comment => "", |
|
|
159 | # ] |
|
|
160 | # ); |
|
|
161 | # |
|
|
162 | # if ($res->is_error) { |
|
|
163 | # # fatal condition |
|
|
164 | # warn $res->status_line; |
|
|
165 | # } else { |
|
|
166 | # # script replies are marked as {{..}} |
|
|
167 | # my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
168 | # warn map "$_\n", @msgs; |
|
|
169 | # } |
|
|
170 | } else { |
|
|
171 | die "viewvc parse error, unable to detect revision\n"; |
|
|
172 | } |
|
|
173 | } |
|
|
174 | } |
|
|
175 | } |
|
|
176 | |
71 | sub invoke_button_down { |
177 | sub invoke_button_down { |
72 | my ($self, $ev, $x, $y) = @_; |
178 | my ($self, $ev, $x, $y) = @_; |
73 | |
179 | |
74 | if ($ev->{button} == 1) { |
180 | if ($ev->{button} == 1) { |
75 | $self->grab_focus; |
181 | $self->grab_focus; |
76 | return unless $::CONN; |
182 | return unless $::CONN; |
77 | |
183 | |
78 | my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
184 | my $x = $self->{dx} + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize}; |
79 | my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
185 | my $y = $self->{dy} + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize}; |
80 | |
186 | |
81 | $x -= int 0.5 * $self->{sw}; |
187 | $x -= CFPlus::floor $::MAP->w * 0.5; |
82 | $y -= int 0.5 * $self->{sh}; |
188 | $y -= CFPlus::floor $::MAP->h * 0.5; |
83 | |
189 | |
|
|
190 | if ($::CONN) { |
|
|
191 | if ($::IN_BUILD_MODE) { |
|
|
192 | $::CONN->buildat ($::IN_BUILD_MODE, $x, $y); |
|
|
193 | } else { |
84 | $::CONN->lookat ($x, $y) |
194 | $::CONN->lookat ($x, $y) |
85 | if $::CONN; |
195 | } |
|
|
196 | } |
86 | |
197 | |
87 | } elsif ($ev->{button} == 2) { |
198 | } elsif ($ev->{button} == 2) { |
88 | $self->grab_focus; |
199 | $self->grab_focus; |
89 | return unless $::CONN; |
200 | return unless $::CONN; |
90 | |
201 | |
… | |
… | |
100 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
211 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
101 | |
212 | |
102 | $self->update; |
213 | $self->update; |
103 | }; |
214 | }; |
104 | } elsif ($ev->{button} == 3) { |
215 | } elsif ($ev->{button} == 3) { |
105 | (new CFClient::UI::Menu |
216 | my @items = ( |
106 | items => [ |
|
|
107 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
217 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
108 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
218 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
109 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
219 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
110 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
220 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
111 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
221 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
… | |
… | |
115 | $::PICKUP_ENABLE->{state} |
225 | $::PICKUP_ENABLE->{state} |
116 | ? "Disable automatic pickup" |
226 | ? "Disable automatic pickup" |
117 | : "Enable automatic pickup", |
227 | : "Enable automatic pickup", |
118 | sub { $::PICKUP_ENABLE->toggle } |
228 | sub { $::PICKUP_ENABLE->toggle } |
119 | ], |
229 | ], |
|
|
230 | ); |
|
|
231 | |
|
|
232 | if ($::CONN && $::CONN->{editor_support}) { |
|
|
233 | push @items, [ |
|
|
234 | "Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
|
|
235 | \&editor_invoke, |
|
|
236 | ]; |
|
|
237 | |
|
|
238 | for my $type (qw(test name)) { |
|
|
239 | $::CONN->{editor_support}{type} ne $type |
|
|
240 | or next; |
|
|
241 | my $server = $::CONN->{editor_support}{"${type}server"} |
|
|
242 | or next; |
|
|
243 | |
|
|
244 | push @items, [ |
|
|
245 | "Login on $type server <span size='xx-small'>(" . (CFPlus::asxml $server) . ")</span>", |
|
|
246 | sub { server_login $server }, |
|
|
247 | ]; |
|
|
248 | } |
|
|
249 | } |
|
|
250 | |
|
|
251 | push @items, |
|
|
252 | ["Quit", |
|
|
253 | sub { |
|
|
254 | if ($::CONN) { |
|
|
255 | &::open_quit_dialog; |
|
|
256 | } else { |
|
|
257 | exit; |
|
|
258 | } |
|
|
259 | } |
120 | ], |
260 | ], |
|
|
261 | ; |
|
|
262 | |
|
|
263 | (new CFPlus::UI::Menu |
|
|
264 | items => \@items, |
121 | )->popup ($ev); |
265 | )->popup ($ev); |
122 | } |
266 | } |
123 | |
267 | |
124 | 1 |
268 | 1 |
125 | } |
269 | } |
… | |
… | |
144 | 1 |
288 | 1 |
145 | } |
289 | } |
146 | |
290 | |
147 | sub size_request { |
291 | sub size_request { |
148 | ( |
292 | ( |
149 | 32 * CFClient::ceil $::WIDTH / 32, |
293 | ::T * CFPlus::ceil $::WIDTH / ::T, |
150 | 32 * CFClient::ceil $::HEIGHT / 32, |
294 | ::T * CFPlus::ceil $::HEIGHT / ::T, |
151 | ) |
295 | ) |
152 | } |
296 | } |
153 | |
297 | |
154 | sub update { |
298 | sub update { |
155 | my ($self) = @_; |
299 | my ($self) = @_; |
… | |
… | |
157 | $self->{need_update} = 1; |
301 | $self->{need_update} = 1; |
158 | $self->SUPER::update; |
302 | $self->SUPER::update; |
159 | } |
303 | } |
160 | |
304 | |
161 | my %DIR = ( |
305 | my %DIR = ( |
162 | CFClient::SDLK_KP8, [1, "north"], |
306 | CFPlus::SDLK_KP8, [1, "north"], |
163 | CFClient::SDLK_KP9, [2, "northeast"], |
307 | CFPlus::SDLK_KP9, [2, "northeast"], |
164 | CFClient::SDLK_KP6, [3, "east"], |
308 | CFPlus::SDLK_KP6, [3, "east"], |
165 | CFClient::SDLK_KP3, [4, "southeast"], |
309 | CFPlus::SDLK_KP3, [4, "southeast"], |
166 | CFClient::SDLK_KP2, [5, "south"], |
310 | CFPlus::SDLK_KP2, [5, "south"], |
167 | CFClient::SDLK_KP1, [6, "southwest"], |
311 | CFPlus::SDLK_KP1, [6, "southwest"], |
168 | CFClient::SDLK_KP4, [7, "west"], |
312 | CFPlus::SDLK_KP4, [7, "west"], |
169 | CFClient::SDLK_KP7, [8, "northwest"], |
313 | CFPlus::SDLK_KP7, [8, "northwest"], |
170 | |
314 | |
171 | CFClient::SDLK_UP, [1, "north"], |
315 | CFPlus::SDLK_UP, [1, "north"], |
172 | CFClient::SDLK_RIGHT, [3, "east"], |
316 | CFPlus::SDLK_RIGHT, [3, "east"], |
173 | CFClient::SDLK_DOWN, [5, "south"], |
317 | CFPlus::SDLK_DOWN, [5, "south"], |
174 | CFClient::SDLK_LEFT, [7, "west"], |
318 | CFPlus::SDLK_LEFT, [7, "west"], |
175 | ); |
319 | ); |
176 | |
320 | |
177 | sub invoke_key_down { |
321 | sub invoke_key_down { |
178 | my ($self, $ev) = @_; |
322 | my ($self, $ev) = @_; |
179 | |
323 | |
180 | my $mod = $ev->{mod}; |
324 | my $mod = $ev->{mod}; |
181 | my $sym = $ev->{sym}; |
325 | my $sym = $ev->{sym}; |
182 | my $uni = $ev->{unicode}; |
326 | my $uni = $ev->{unicode}; |
183 | |
327 | |
184 | $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; |
328 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
185 | |
329 | |
186 | if ($uni == ord "\t") { |
330 | if ($sym == 9) { |
187 | $::PL_WINDOW->toggle_visibility; |
331 | ($mod & CFPlus::KMOD_SHIFT ? $::CONSOLE->{window} : $::PL_WINDOW)->toggle_visibility; |
188 | } elsif ($sym == CFClient::SDLK_F1 && !$mod) { |
332 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
189 | $::HELP_WINDOW->toggle_visibility; |
333 | $::HELP_WINDOW->toggle_visibility; |
190 | } elsif ($sym == CFClient::SDLK_F2 && !$mod) { |
334 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
191 | ::toggle_player_page ($::STATS_PAGE); |
335 | ::toggle_player_page ($::STATS_PAGE); |
192 | } elsif ($sym == CFClient::SDLK_F3 && !$mod) { |
336 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
193 | ::toggle_player_page ($::SKILL_PAGE); |
337 | ::toggle_player_page ($::SKILL_PAGE); |
194 | } elsif ($sym == CFClient::SDLK_F4 && !$mod) { |
338 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
195 | ::toggle_player_page ($::SPELL_PAGE); |
339 | ::toggle_player_page ($::SPELL_PAGE); |
196 | } elsif ($sym == CFClient::SDLK_F5 && !$mod) { |
340 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
197 | ::toggle_player_page ($::INVENTORY_PAGE); |
341 | ::toggle_player_page ($::INVENTORY_PAGE); |
198 | } elsif ($sym == CFClient::SDLK_F9 && !$mod) { |
342 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
199 | $::SETUP_DIALOG->toggle_visibility; |
343 | $::SETUP_DIALOG->toggle_visibility; |
200 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
|
|
201 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
202 | sub { |
|
|
203 | my ($mod, $sym, $cmds) = @_; |
|
|
204 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
|
|
205 | }); |
|
|
206 | $::BIND_EDITOR->start; |
|
|
207 | $::BIND_EDITOR->show; |
|
|
208 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
|
|
209 | $::BIND_EDITOR->stop; |
|
|
210 | $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
211 | $::BIND_EDITOR->hide; |
|
|
212 | } elsif (!$::CONN) { |
344 | } elsif (!$::CONN) { |
213 | return 0; # bindings further down need a valid connection |
345 | return 0; # bindings further down need a valid connection |
214 | |
346 | |
215 | } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { |
347 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
216 | $::CONN->user_send ("stay fire"); |
348 | $::CONN->user_send ("stay fire"); |
217 | } elsif ($uni == ord ",") { |
349 | } elsif ($uni == ord ",") { |
218 | $::CONN->user_send ("take"); |
350 | $::CONN->user_send ("take"); |
219 | } elsif ($uni == ord " ") { |
351 | } elsif ($uni == ord " ") { |
220 | $::CONN->user_send ("apply"); |
352 | $::CONN->user_send ("apply"); |
|
|
353 | } elsif ($uni == 13) { |
|
|
354 | $::CONN->user_send ("examine"); |
221 | } elsif ($uni == ord ".") { |
355 | } elsif ($uni == ord ".") { |
222 | $::CONN->user_send ($self->{completer}{last_command}) |
356 | $::CONN->user_send ($self->{completer}{last_command}) |
223 | if exists $self->{completer}{last_command}; |
357 | if exists $self->{completer}{last_command}; |
224 | } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { |
358 | } elsif (my @macros = CFPlus::Macro::match_event $ev) { |
225 | $::CONN->user_send ($_) for @$bind_cmd; |
359 | $::CONN->macro_send ($_) for @macros; |
226 | } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
360 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
227 | $::CONN->user_send ("rotateshoottype +"); |
361 | $::CONN->user_send ("rotateshoottype +"); |
228 | } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
362 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
229 | $::CONN->user_send ("rotateshoottype -"); |
363 | $::CONN->user_send ("rotateshoottype -"); |
|
|
364 | } elsif ($uni == ord '!') { |
|
|
365 | $self->{completer}->set_prefix ("shout "); |
|
|
366 | $self->{completer}->show; |
230 | } elsif ($uni == ord '"') { |
367 | } elsif ($uni == ord '"') { |
231 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
368 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
232 | $self->{completer}->show; |
369 | $self->{completer}->show; |
233 | } elsif ($uni == ord "'") { |
370 | } elsif ($uni == ord "'") { |
234 | $self->{completer}->set_prefix (""); |
371 | $self->{completer}->set_prefix (""); |
235 | $self->{completer}->show; |
372 | $self->{completer}->show; |
236 | } elsif (exists $DIR{$sym}) { |
373 | } elsif (exists $DIR{$sym}) { |
237 | if ($mod & CFClient::KMOD_SHIFT) { |
374 | if ($mod & CFPlus::KMOD_SHIFT) { |
238 | $self->{shft}++; |
375 | $self->{shft}++; |
239 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
376 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
240 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
377 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
241 | } |
378 | } |
242 | $self->{fire_dir} = $DIR{$sym}[0]; |
379 | $self->{fire_dir} = $DIR{$sym}[0]; |
243 | } elsif ($mod & CFClient::KMOD_CTRL) { |
380 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
244 | $self->{ctrl}++; |
381 | $self->{ctrl}++; |
245 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
382 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
246 | } else { |
383 | } else { |
247 | $::CONN->user_send ("$DIR{$sym}[1]"); |
384 | $::CONN->user_send ("$DIR{$sym}[1]"); |
248 | } |
385 | } |
… | |
… | |
262 | my $res = 0; |
399 | my $res = 0; |
263 | my $mod = $ev->{mod}; |
400 | my $mod = $ev->{mod}; |
264 | my $sym = $ev->{sym}; |
401 | my $sym = $ev->{sym}; |
265 | |
402 | |
266 | if ($::CFG->{shift_fire_stop}) { |
403 | if ($::CFG->{shift_fire_stop}) { |
267 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
404 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
268 | $::CONN->user_send ("fire_stop"); |
405 | $::CONN->user_send ("fire_stop"); |
269 | delete $self->{fire_dir}; |
406 | delete $self->{fire_dir}; |
270 | $res = 1; |
407 | $res = 1; |
271 | } |
408 | } |
272 | } else { |
409 | } else { |
273 | if (exists $DIR{$sym} && delete $self->{shft}) { |
410 | if (exists $DIR{$sym} && delete $self->{shft}) { |
274 | $::CONN->user_send ("fire_stop"); |
411 | $::CONN->user_send ("fire_stop"); |
275 | delete $self->{fire_dir}; |
412 | delete $self->{fire_dir}; |
276 | $res = 1; |
413 | $res = 1; |
277 | } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
414 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
278 | $::CONN->user_send ("fire_stop"); |
415 | $::CONN->user_send ("fire_stop"); |
279 | delete $self->{fire_dir}; |
416 | delete $self->{fire_dir}; |
280 | $res = 1; |
417 | $res = 1; |
281 | } |
418 | } |
282 | } |
419 | } |
283 | |
420 | |
284 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
421 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
285 | $::CONN->user_send ("run_stop"); |
422 | $::CONN->user_send ("run_stop"); |
286 | $res = 1; |
423 | $res = 1; |
287 | } |
424 | } |
288 | |
425 | |
289 | $res |
426 | $res |
290 | } |
427 | } |
291 | |
428 | |
292 | sub set_magicmap { |
429 | sub set_magicmap { |
293 | my ($self, $w, $h, $x, $y, $data) = @_; |
430 | my ($self, $w, $h, $x, $y, $data) = @_; |
294 | |
431 | |
295 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
432 | $x -= $::MAP->ox + 1 + int 0.5 * $::MAP->w; |
296 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
433 | $y -= $::MAP->oy + 1 + int 0.5 * $::MAP->h; |
297 | |
434 | |
298 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
435 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
299 | |
436 | |
300 | $self->update; |
437 | $self->update; |
301 | } |
438 | } |
… | |
… | |
303 | sub draw { |
440 | sub draw { |
304 | my ($self) = @_; |
441 | my ($self) = @_; |
305 | |
442 | |
306 | return unless $::MAP; |
443 | return unless $::MAP; |
307 | |
444 | |
308 | my $focused = $CFClient::UI::FOCUS == $self |
445 | my $focused = $CFPlus::UI::FOCUS == $self |
309 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
446 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
310 | |
447 | |
311 | return |
448 | return |
312 | unless $focused || !$::FAST; |
449 | unless $focused || !$::FAST; |
313 | |
450 | |
314 | if (delete $self->{need_update}) { |
451 | if (delete $self->{need_update}) { |
315 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
452 | my $tilesize = $self->{tilesize} = int ::T * $::CFG->{map_scale}; |
316 | |
453 | |
|
|
454 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
|
|
455 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
|
|
456 | |
317 | my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; |
457 | my $sx = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
318 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
458 | my $sy = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
319 | |
459 | |
320 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
460 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
321 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
461 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
322 | |
462 | |
323 | my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; |
463 | my $dx = $self->{dx} = CFPlus::ceil 0.5 * ($::MAP->w - $sw) - $sx; |
324 | my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; |
464 | my $dy = $self->{dy} = CFPlus::ceil 0.5 * ($::MAP->h - $sh) - $sy; |
325 | |
465 | |
326 | if ($::CFG->{fow_enable}) { |
466 | if ($::CFG->{fow_enable}) { |
327 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
467 | my ($w, $h, $data) = $::MAP->fow_texture ($dx, $dy, $sw, $sh); |
328 | |
468 | |
329 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
469 | if ($::CFG->{fow_smooth} && $CFPlus::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
330 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
470 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
331 | glConvolutionFilter2D ( |
471 | glConvolutionFilter2D ( |
332 | GL_CONVOLUTION_2D, |
472 | GL_CONVOLUTION_2D, |
333 | GL_ALPHA, |
473 | GL_ALPHA, |
334 | 3, 3, |
474 | 3, 3, |
… | |
… | |
336 | (pack "f*", @{ $self->{smooth_matrix} }), |
476 | (pack "f*", @{ $self->{smooth_matrix} }), |
337 | ); |
477 | ); |
338 | glEnable GL_CONVOLUTION_2D; |
478 | glEnable GL_CONVOLUTION_2D; |
339 | } |
479 | } |
340 | |
480 | |
341 | $self->{fow_texture} = new CFClient::Texture |
481 | $self->{fow_texture} = new CFPlus::Texture |
342 | w => $w, |
482 | w => $w, |
343 | h => $h, |
483 | h => $h, |
344 | data => $data, |
484 | data => $data, |
345 | internalformat => GL_ALPHA, |
485 | internalformat => GL_ALPHA, |
346 | format => GL_ALPHA; |
486 | format => GL_ALPHA; |
… | |
… | |
354 | |
494 | |
355 | glPushMatrix; |
495 | glPushMatrix; |
356 | glTranslate $sx0, $sy0; |
496 | glTranslate $sx0, $sy0; |
357 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
497 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
358 | |
498 | |
359 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
499 | $::MAP->draw ($dx, $dy, $sw, $sh, ::T); |
360 | |
500 | |
361 | glScale 32, 32; |
501 | glScale ::T, ::T; |
362 | |
502 | |
363 | if (my $tex = $self->{fow_texture}) { |
503 | if (my $tex = $self->{fow_texture}) { |
364 | glEnable GL_TEXTURE_2D; |
504 | glEnable GL_TEXTURE_2D; |
365 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
505 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
366 | |
506 | |
… | |
… | |
371 | } |
511 | } |
372 | |
512 | |
373 | if ($self->{magicmap}) { |
513 | if ($self->{magicmap}) { |
374 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
514 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
375 | |
515 | |
376 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
516 | $x += $::MAP->ox + $self->{dx}; |
377 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
517 | $y += $::MAP->oy + $self->{dy}; |
378 | |
518 | |
379 | glTranslate - $x - 1, - $y - 1; |
519 | glTranslate - $x - 1, - $y - 1; |
380 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
520 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
381 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
521 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
382 | } |
522 | } |
… | |
… | |
408 | glDeleteList $self->{list}; |
548 | glDeleteList $self->{list}; |
409 | |
549 | |
410 | $self->SUPER::DESTROY; |
550 | $self->SUPER::DESTROY; |
411 | } |
551 | } |
412 | |
552 | |
413 | package CFClient::MapWidget::MapMap; |
553 | package CFPlus::MapWidget::MapMap; |
414 | |
554 | |
415 | our @ISA = CFClient::UI::Base::; |
555 | our @ISA = CFPlus::UI::Base::; |
416 | |
556 | |
417 | use Time::HiRes qw(time); |
557 | use Time::HiRes qw(time); |
418 | use CFClient::OpenGL; |
558 | use CFPlus::OpenGL; |
419 | |
559 | |
420 | sub size_request { |
560 | sub size_request { |
421 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
561 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
422 | } |
562 | } |
423 | |
563 | |
… | |
… | |
441 | |
581 | |
442 | $::MAP or return; |
582 | $::MAP or return; |
443 | |
583 | |
444 | my ($w, $h) = @$self{qw(w h)}; |
584 | my ($w, $h) = @$self{qw(w h)}; |
445 | |
585 | |
446 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
586 | my $sw = int $::WIDTH / (::T * $::CFG->{map_scale}) + 0.99; |
447 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
587 | my $sh = int $::HEIGHT / (::T * $::CFG->{map_scale}) + 0.99; |
448 | |
588 | |
449 | my $sx = int $::CFG->{map_shift_x} / 32; |
589 | my $sx = int $::CFG->{map_shift_x} / ::T; |
450 | my $sy = int $::CFG->{map_shift_y} / 32; |
590 | my $sy = int $::CFG->{map_shift_y} / ::T; |
451 | |
591 | |
452 | my $ox = 0.5 * ($w - $sw); |
592 | my $ox = 0.5 * ($w - $sw); |
453 | my $oy = 0.5 * ($h - $sh); |
593 | my $oy = 0.5 * ($h - $sh); |
454 | |
594 | |
455 | glEnable GL_BLEND; |
595 | glEnable GL_BLEND; |
… | |
… | |
459 | |
599 | |
460 | if ($self->{texture_atime} < time) { |
600 | if ($self->{texture_atime} < time) { |
461 | $self->{texture_atime} = time + 1/3; |
601 | $self->{texture_atime} = time + 1/3; |
462 | |
602 | |
463 | $self->{texture} = |
603 | $self->{texture} = |
464 | new CFClient::Texture |
604 | new CFPlus::Texture |
465 | w => $w, |
605 | w => $w, |
466 | h => $h, |
606 | h => $h, |
467 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
607 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
468 | type => $CFClient::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
608 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
469 | } |
609 | } |
470 | |
610 | |
471 | $self->{texture}->draw_quad (0, 0); |
611 | $self->{texture}->draw_quad (0, 0); |
472 | |
612 | |
473 | glDisable GL_TEXTURE_2D; |
613 | glDisable GL_TEXTURE_2D; |
… | |
… | |
488 | glEnd; |
628 | glEnd; |
489 | |
629 | |
490 | glDisable GL_BLEND; |
630 | glDisable GL_BLEND; |
491 | } |
631 | } |
492 | |
632 | |
493 | package CFClient::MapWidget::Command; |
633 | package CFPlus::MapWidget::Command; |
494 | |
634 | |
495 | use strict; |
635 | use strict; |
496 | |
636 | |
497 | use CFClient::OpenGL; |
637 | use CFPlus::OpenGL; |
498 | |
638 | |
499 | our @ISA = CFClient::UI::Frame::; |
639 | our @ISA = CFPlus::UI::Frame::; |
500 | |
640 | |
501 | sub new { |
641 | sub new { |
502 | my $class = shift; |
642 | my $class = shift; |
503 | |
643 | |
504 | my $self = $class->SUPER::new ( |
644 | my $self = $class->SUPER::new ( |
505 | bg => [0, 0, 0, 0.8], |
645 | bg => [0, 0, 0, 0.8], |
506 | @_, |
646 | @_, |
507 | ); |
647 | ); |
508 | |
648 | |
509 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
649 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
510 | |
650 | |
511 | $self->{label} = [ |
651 | $self->{label} = [ |
512 | map |
652 | map |
513 | CFClient::UI::Label->new ( |
653 | CFPlus::UI::Label->new ( |
514 | can_hover => 1, |
654 | can_hover => 1, |
515 | can_events => 1, |
655 | can_events => 1, |
516 | tooltip_width => 0.33, |
656 | tooltip_width => 0.33, |
517 | fontsize => $_, |
657 | fontsize => $_, |
518 | ), (0.8) x 16 |
658 | ), (0.8) x 16 |
519 | ]; |
659 | ]; |
520 | |
660 | |
521 | $self->{entry} = new CFClient::UI::Entry |
661 | $self->{entry} = new CFPlus::UI::Entry |
522 | on_changed => sub { |
662 | on_changed => sub { |
523 | $self->update_labels; |
663 | $self->update_labels; |
524 | 0 |
664 | 0 |
525 | }, |
665 | }, |
526 | on_button_down => sub { |
666 | on_button_down => sub { |
527 | my ($entry, $ev, $x, $y) = @_; |
667 | my ($entry, $ev, $x, $y) = @_; |
528 | |
668 | |
529 | if ($ev->{button} == 3) { |
669 | if ($ev->{button} == 3) { |
530 | (new CFClient::UI::Menu |
670 | (new CFPlus::UI::Menu |
531 | items => [ |
671 | items => [ |
532 | ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" |
672 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
533 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
673 | => sub { CFPlus::Macro::quick_macro [$self->{select}], sub { $entry->grab_focus } }] |
534 | ], |
674 | ], |
535 | )->popup ($ev); |
675 | )->popup ($ev); |
536 | return 1; |
676 | return 1; |
537 | } |
677 | } |
538 | 0 |
678 | 0 |
… | |
… | |
553 | $self->hide; |
693 | $self->hide; |
554 | } |
694 | } |
555 | } elsif ($ev->{sym} == 27) { |
695 | } elsif ($ev->{sym} == 27) { |
556 | $self->{hist_ptr} = 0; |
696 | $self->{hist_ptr} = 0; |
557 | $self->hide; |
697 | $self->hide; |
558 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
698 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
559 | if ($self->{hist_ptr} > 1) { |
699 | if ($self->{hist_ptr} > 1) { |
560 | $self->{hist_ptr}--; |
700 | $self->{hist_ptr}--; |
561 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
701 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
562 | } elsif ($self->{hist_ptr} > 0) { |
702 | } elsif ($self->{hist_ptr} > 0) { |
563 | $self->{hist_ptr}--; |
703 | $self->{hist_ptr}--; |
… | |
… | |
565 | } else { |
705 | } else { |
566 | ++$self->{select_offset} |
706 | ++$self->{select_offset} |
567 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
707 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
568 | } |
708 | } |
569 | $self->update_labels; |
709 | $self->update_labels; |
570 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
710 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
571 | if ($self->{select_offset}) { |
711 | if ($self->{select_offset}) { |
572 | --$self->{select_offset} |
712 | --$self->{select_offset} |
573 | } else { |
713 | } else { |
574 | unless ($self->{hist_ptr}) { |
714 | unless ($self->{hist_ptr}) { |
575 | $self->{hist_saveback} = $self->{entry}->get_text; |
715 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
733 | |
873 | |
734 | sub _draw { |
874 | sub _draw { |
735 | my ($self) = @_; |
875 | my ($self) = @_; |
736 | |
876 | |
737 | # hack |
877 | # hack |
738 | local $CFClient::UI::FOCUS = $self->{entry}; |
878 | local $CFPlus::UI::FOCUS = $self->{entry}; |
739 | |
879 | |
740 | $self->SUPER::_draw; |
880 | $self->SUPER::_draw; |
741 | } |
881 | } |
742 | |
882 | |
743 | 1 |
883 | 1 |
|
|
884 | |