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