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 | |
11 | |
12 | our @ISA = CFClient::UI::Base::; |
12 | our @ISA = CFPlus::UI::Base::; |
13 | |
13 | |
14 | my $magicmap_tex = |
14 | my $magicmap_tex = |
15 | new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", |
15 | new_from_file CFPlus::Texture CFPlus::find_rcfile "magicmap.png", |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
17 | |
17 | |
18 | sub new { |
18 | sub new { |
19 | my $class = shift; |
19 | my $class = shift; |
20 | |
20 | |
… | |
… | |
30 | ], |
30 | ], |
31 | |
31 | |
32 | @_ |
32 | @_ |
33 | ); |
33 | ); |
34 | |
34 | |
35 | $self->{completer} = new CFClient::MapWidget::Command:: |
35 | $self->{completer} = new CFPlus::MapWidget::Command:: |
36 | command => $self->{command}, |
36 | command => $self->{command}, |
37 | tooltip => "<b>The Command Completer</b>\n\n" |
37 | 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 | ; |
38 | ; |
46 | |
39 | |
47 | $self |
40 | $self |
48 | } |
41 | } |
49 | |
42 | |
… | |
… | |
66 | |
59 | |
67 | $self->{completer}->hide |
60 | $self->{completer}->hide |
68 | if $self->{completer}; |
61 | if $self->{completer}; |
69 | } |
62 | } |
70 | |
63 | |
|
|
64 | sub test_server_login { |
|
|
65 | return unless |
|
|
66 | $::CONN && length $::CONN->{test_server}; |
|
|
67 | |
|
|
68 | my $server = $::CONN->{test_server}; |
|
|
69 | ::stop_game (); |
|
|
70 | local $::PROFILE->{host} = $server; |
|
|
71 | ::start_game (); |
|
|
72 | } |
|
|
73 | |
|
|
74 | sub editor_invoke { |
|
|
75 | return unless $::CONN; |
|
|
76 | |
|
|
77 | # putting the password into the env is somewhat tasteless |
|
|
78 | local $ENV{CFPLUS_LOGIN} = $::PROFILE->{user}; |
|
|
79 | local $ENV{CFPLUS_PASSWORD} = $::PROFILE->{password}; |
|
|
80 | local $ENV{CFPLUS_UPLOAD} = $::CONN->{upload}; |
|
|
81 | local $ENV{CROSSFIRE_MAPDIR} = $::CONN->{cvs_root}; |
|
|
82 | |
|
|
83 | CFPlus::set_proxy; |
|
|
84 | |
|
|
85 | my $map = "map:$::CONN->{map_info}[0]"; |
|
|
86 | |
|
|
87 | if (fork == 0) { |
|
|
88 | $SIG{__DIE__} = sub { |
|
|
89 | warn "@_"; |
|
|
90 | CFPlus::_exit 99; |
|
|
91 | }; |
|
|
92 | |
|
|
93 | # TODO: move into editor |
|
|
94 | require LWP::UserAgent; |
|
|
95 | |
|
|
96 | my $ua = LWP::UserAgent->new ( |
|
|
97 | agent => "cfplus $CFPlus::VERSION", |
|
|
98 | keep_alive => 1, |
|
|
99 | env_proxy => 1, |
|
|
100 | ); |
|
|
101 | |
|
|
102 | if ($map =~ /^map:(.*)/) { |
|
|
103 | my $mapname = $1; |
|
|
104 | # try to get the most recent head revision, what a hack |
|
|
105 | my $log = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?view=log&logsort=rev")->decoded_content; |
|
|
106 | |
|
|
107 | if ($log =~ /\?rev=(\d+\.\d+)"/) { |
|
|
108 | my $rev = $1; |
|
|
109 | my $map = $ua->get ("$ENV{CROSSFIRE_MAPDIR}/$mapname?rev=$rev")->decoded_content; |
|
|
110 | warn "revision is $rev " .(length $map)."\n";#d# |
|
|
111 | |
|
|
112 | # now upload it |
|
|
113 | my $comment = "some comment"; |
|
|
114 | |
|
|
115 | require HTTP::Request::Common; |
|
|
116 | |
|
|
117 | my $res = $ua->post ( |
|
|
118 | $ENV{CFPLUS_UPLOAD}, |
|
|
119 | Content_Type => 'multipart/form-data', |
|
|
120 | Content => [ |
|
|
121 | path => $mapname, |
|
|
122 | mapdir => $ENV{CROSSFIRE_MAPDIR}, |
|
|
123 | map => $map, |
|
|
124 | revision => $rev, |
|
|
125 | cf_login => $ENV{CFPLUS_LOGIN}, |
|
|
126 | cf_password => $ENV{CFPLUS_PASSWORD}, |
|
|
127 | comment => "", |
|
|
128 | ] |
|
|
129 | ); |
|
|
130 | |
|
|
131 | if ($res->is_error) { |
|
|
132 | # fatal condition |
|
|
133 | warn $res->status_line; |
|
|
134 | } else { |
|
|
135 | # script replies are marked as {{..}} |
|
|
136 | my @msgs = $res->decoded_content =~ m/\{\{(.*?)\}\}/g; |
|
|
137 | warn map "$_\n", @msgs; |
|
|
138 | } |
|
|
139 | } else { |
|
|
140 | # error, could not detect revision |
|
|
141 | } |
|
|
142 | } |
|
|
143 | |
|
|
144 | CFPlus::_exit; |
|
|
145 | } |
|
|
146 | } |
|
|
147 | |
71 | sub invoke_button_down { |
148 | sub invoke_button_down { |
72 | my ($self, $ev, $x, $y) = @_; |
149 | my ($self, $ev, $x, $y) = @_; |
73 | |
150 | |
74 | if ($ev->{button} == 1) { |
151 | if ($ev->{button} == 1) { |
75 | $self->grab_focus; |
152 | $self->grab_focus; |
76 | return unless $::CONN; |
153 | return unless $::CONN; |
77 | |
154 | |
78 | my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
155 | my $x = 1 + CFPlus::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
79 | my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
156 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
80 | |
157 | |
81 | $x -= int 0.5 * $self->{sw}; |
158 | $x -= int 0.5 * $self->{sw}; |
82 | $y -= int 0.5 * $self->{sh}; |
159 | $y -= int 0.5 * $self->{sh}; |
83 | |
160 | |
84 | $::CONN->lookat ($x, $y) |
161 | $::CONN->lookat ($x, $y) |
… | |
… | |
100 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
177 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
101 | |
178 | |
102 | $self->update; |
179 | $self->update; |
103 | }; |
180 | }; |
104 | } elsif ($ev->{button} == 3) { |
181 | } elsif ($ev->{button} == 3) { |
105 | (new CFClient::UI::Menu |
182 | (new CFPlus::UI::Menu |
106 | items => [ |
183 | items => [ |
107 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
184 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
108 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
185 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
109 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
186 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
110 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
187 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
… | |
… | |
115 | $::PICKUP_ENABLE->{state} |
192 | $::PICKUP_ENABLE->{state} |
116 | ? "Disable automatic pickup" |
193 | ? "Disable automatic pickup" |
117 | : "Enable automatic pickup", |
194 | : "Enable automatic pickup", |
118 | sub { $::PICKUP_ENABLE->toggle } |
195 | sub { $::PICKUP_ENABLE->toggle } |
119 | ], |
196 | ], |
|
|
197 | $::CONN && length $::CONN->{cvs_root} |
|
|
198 | ? ["Edit this map <span size='xx-small'>(" . (CFPlus::asxml $::CONN->{map_info}[0]) . ")</span>", |
|
|
199 | \&editor_invoke] |
|
|
200 | : (), |
|
|
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", |
|
|
206 | sub { |
|
|
207 | if ($::CONN) { |
|
|
208 | &::open_quit_dialog; |
|
|
209 | } else { |
|
|
210 | exit; |
|
|
211 | } |
|
|
212 | } |
|
|
213 | ], |
120 | ], |
214 | ], |
121 | )->popup ($ev); |
215 | )->popup ($ev); |
122 | } |
216 | } |
123 | |
217 | |
124 | 1 |
218 | 1 |
… | |
… | |
144 | 1 |
238 | 1 |
145 | } |
239 | } |
146 | |
240 | |
147 | sub size_request { |
241 | sub size_request { |
148 | ( |
242 | ( |
149 | 32 * CFClient::ceil $::WIDTH / 32, |
243 | 32 * CFPlus::ceil $::WIDTH / 32, |
150 | 32 * CFClient::ceil $::HEIGHT / 32, |
244 | 32 * CFPlus::ceil $::HEIGHT / 32, |
151 | ) |
245 | ) |
152 | } |
246 | } |
153 | |
247 | |
154 | sub update { |
248 | sub update { |
155 | my ($self) = @_; |
249 | my ($self) = @_; |
… | |
… | |
157 | $self->{need_update} = 1; |
251 | $self->{need_update} = 1; |
158 | $self->SUPER::update; |
252 | $self->SUPER::update; |
159 | } |
253 | } |
160 | |
254 | |
161 | my %DIR = ( |
255 | my %DIR = ( |
162 | CFClient::SDLK_KP8, [1, "north"], |
256 | CFPlus::SDLK_KP8, [1, "north"], |
163 | CFClient::SDLK_KP9, [2, "northeast"], |
257 | CFPlus::SDLK_KP9, [2, "northeast"], |
164 | CFClient::SDLK_KP6, [3, "east"], |
258 | CFPlus::SDLK_KP6, [3, "east"], |
165 | CFClient::SDLK_KP3, [4, "southeast"], |
259 | CFPlus::SDLK_KP3, [4, "southeast"], |
166 | CFClient::SDLK_KP2, [5, "south"], |
260 | CFPlus::SDLK_KP2, [5, "south"], |
167 | CFClient::SDLK_KP1, [6, "southwest"], |
261 | CFPlus::SDLK_KP1, [6, "southwest"], |
168 | CFClient::SDLK_KP4, [7, "west"], |
262 | CFPlus::SDLK_KP4, [7, "west"], |
169 | CFClient::SDLK_KP7, [8, "northwest"], |
263 | CFPlus::SDLK_KP7, [8, "northwest"], |
170 | |
264 | |
171 | CFClient::SDLK_UP, [1, "north"], |
265 | CFPlus::SDLK_UP, [1, "north"], |
172 | CFClient::SDLK_RIGHT, [3, "east"], |
266 | CFPlus::SDLK_RIGHT, [3, "east"], |
173 | CFClient::SDLK_DOWN, [5, "south"], |
267 | CFPlus::SDLK_DOWN, [5, "south"], |
174 | CFClient::SDLK_LEFT, [7, "west"], |
268 | CFPlus::SDLK_LEFT, [7, "west"], |
175 | ); |
269 | ); |
176 | |
270 | |
177 | sub invoke_key_down { |
271 | sub invoke_key_down { |
178 | my ($self, $ev) = @_; |
272 | my ($self, $ev) = @_; |
179 | |
273 | |
180 | my $mod = $ev->{mod}; |
274 | my $mod = $ev->{mod}; |
181 | my $sym = $ev->{sym}; |
275 | my $sym = $ev->{sym}; |
182 | my $uni = $ev->{unicode}; |
276 | my $uni = $ev->{unicode}; |
183 | |
277 | |
184 | $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; |
278 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
185 | |
279 | |
186 | if ($uni == ord "\t") { |
280 | if ($uni == ord "\t") { |
187 | $::PL_WINDOW->toggle_visibility; |
281 | $::PL_WINDOW->toggle_visibility; |
188 | } elsif ($sym == CFClient::SDLK_F1 && !$mod) { |
282 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
189 | $::HELP_WINDOW->toggle_visibility; |
283 | $::HELP_WINDOW->toggle_visibility; |
190 | } elsif ($sym == CFClient::SDLK_F2 && !$mod) { |
284 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
191 | ::toggle_player_page ($::STATS_PAGE); |
285 | ::toggle_player_page ($::STATS_PAGE); |
192 | } elsif ($sym == CFClient::SDLK_F3 && !$mod) { |
286 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
193 | ::toggle_player_page ($::SKILL_PAGE); |
287 | ::toggle_player_page ($::SKILL_PAGE); |
194 | } elsif ($sym == CFClient::SDLK_F4 && !$mod) { |
288 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
195 | ::toggle_player_page ($::SPELL_PAGE); |
289 | ::toggle_player_page ($::SPELL_PAGE); |
196 | } elsif ($sym == CFClient::SDLK_F5 && !$mod) { |
290 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
197 | ::toggle_player_page ($::INVENTORY_PAGE); |
291 | ::toggle_player_page ($::INVENTORY_PAGE); |
198 | } elsif ($sym == CFClient::SDLK_F9 && !$mod) { |
292 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
199 | $::SETUP_DIALOG->toggle_visibility; |
293 | $::SETUP_DIALOG->toggle_visibility; |
200 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
294 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
201 | $::BIND_EDITOR->set_binding (undef, undef, [], |
295 | $::BIND_EDITOR->set_binding (undef, undef, [], |
202 | sub { |
296 | sub { |
203 | my ($mod, $sym, $cmds) = @_; |
297 | my ($mod, $sym, $cmds) = @_; |
204 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
298 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
205 | }); |
299 | }); |
206 | $::BIND_EDITOR->start; |
300 | $::BIND_EDITOR->start; |
207 | $::BIND_EDITOR->show; |
301 | $::BIND_EDITOR->show; |
|
|
302 | #TODO: elmex, what was this supposed to do? it currently crashes the client. |
208 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
303 | # } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
209 | $::BIND_EDITOR->stop; |
304 | # $::BIND_EDITOR->stop; |
210 | $::BIND_EDITOR->ask_for_bind_and_commit; |
305 | # $::BIND_EDITOR->ask_for_bind_and_commit; |
211 | $::BIND_EDITOR->hide; |
306 | # $::BIND_EDITOR->hide; |
212 | } elsif (!$::CONN) { |
307 | } elsif (!$::CONN) { |
213 | return 0; # bindings further down need a valid connection |
308 | return 0; # bindings further down need a valid connection |
214 | |
309 | |
215 | } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { |
310 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
216 | $::CONN->user_send ("stay fire"); |
311 | $::CONN->user_send ("stay fire"); |
217 | } elsif ($uni == ord ",") { |
312 | } elsif ($uni == ord ",") { |
218 | $::CONN->user_send ("take"); |
313 | $::CONN->user_send ("take"); |
219 | } elsif ($uni == ord " ") { |
314 | } elsif ($uni == ord " ") { |
220 | $::CONN->user_send ("apply"); |
315 | $::CONN->user_send ("apply"); |
|
|
316 | } elsif ($uni == 13) { |
|
|
317 | $::CONN->user_send ("examine"); |
221 | } elsif ($uni == ord ".") { |
318 | } elsif ($uni == ord ".") { |
222 | $::CONN->user_send ($self->{completer}{last_command}) |
319 | $::CONN->user_send ($self->{completer}{last_command}) |
223 | if exists $self->{completer}{last_command}; |
320 | if exists $self->{completer}{last_command}; |
224 | } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { |
321 | } elsif (my $bind_cmd = $::PROFILE->{bindings}{$mod}{$sym}) { |
225 | $::CONN->user_send ($_) for @$bind_cmd; |
322 | $::CONN->user_send ($_) for @$bind_cmd; |
226 | } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
323 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
227 | $::CONN->user_send ("rotateshoottype +"); |
324 | $::CONN->user_send ("rotateshoottype +"); |
228 | } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
325 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
229 | $::CONN->user_send ("rotateshoottype -"); |
326 | $::CONN->user_send ("rotateshoottype -"); |
230 | } elsif ($uni == ord '"') { |
327 | } elsif ($uni == ord '"') { |
231 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
328 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
232 | $self->{completer}->show; |
329 | $self->{completer}->show; |
233 | } elsif ($uni == ord "'") { |
330 | } elsif ($uni == ord "'") { |
234 | $self->{completer}->set_prefix (""); |
331 | $self->{completer}->set_prefix (""); |
235 | $self->{completer}->show; |
332 | $self->{completer}->show; |
236 | } elsif (exists $DIR{$sym}) { |
333 | } elsif (exists $DIR{$sym}) { |
237 | if ($mod & CFClient::KMOD_SHIFT) { |
334 | if ($mod & CFPlus::KMOD_SHIFT) { |
238 | $self->{shft}++; |
335 | $self->{shft}++; |
239 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
336 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
240 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
337 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
241 | } |
338 | } |
242 | $self->{fire_dir} = $DIR{$sym}[0]; |
339 | $self->{fire_dir} = $DIR{$sym}[0]; |
243 | } elsif ($mod & CFClient::KMOD_CTRL) { |
340 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
244 | $self->{ctrl}++; |
341 | $self->{ctrl}++; |
245 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
342 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
246 | } else { |
343 | } else { |
247 | $::CONN->user_send ("$DIR{$sym}[1]"); |
344 | $::CONN->user_send ("$DIR{$sym}[1]"); |
248 | } |
345 | } |
… | |
… | |
262 | my $res = 0; |
359 | my $res = 0; |
263 | my $mod = $ev->{mod}; |
360 | my $mod = $ev->{mod}; |
264 | my $sym = $ev->{sym}; |
361 | my $sym = $ev->{sym}; |
265 | |
362 | |
266 | if ($::CFG->{shift_fire_stop}) { |
363 | if ($::CFG->{shift_fire_stop}) { |
267 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
364 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
268 | $::CONN->user_send ("fire_stop"); |
365 | $::CONN->user_send ("fire_stop"); |
269 | delete $self->{fire_dir}; |
366 | delete $self->{fire_dir}; |
270 | $res = 1; |
367 | $res = 1; |
271 | } |
368 | } |
272 | } else { |
369 | } else { |
273 | if (exists $DIR{$sym} && delete $self->{shft}) { |
370 | if (exists $DIR{$sym} && delete $self->{shft}) { |
274 | $::CONN->user_send ("fire_stop"); |
371 | $::CONN->user_send ("fire_stop"); |
275 | delete $self->{fire_dir}; |
372 | delete $self->{fire_dir}; |
276 | $res = 1; |
373 | $res = 1; |
277 | } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
374 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
278 | $::CONN->user_send ("fire_stop"); |
375 | $::CONN->user_send ("fire_stop"); |
279 | delete $self->{fire_dir}; |
376 | delete $self->{fire_dir}; |
280 | $res = 1; |
377 | $res = 1; |
281 | } |
378 | } |
282 | } |
379 | } |
283 | |
380 | |
284 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
381 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
285 | $::CONN->user_send ("run_stop"); |
382 | $::CONN->user_send ("run_stop"); |
286 | $res = 1; |
383 | $res = 1; |
287 | } |
384 | } |
288 | |
385 | |
289 | $res |
386 | $res |
… | |
… | |
303 | sub draw { |
400 | sub draw { |
304 | my ($self) = @_; |
401 | my ($self) = @_; |
305 | |
402 | |
306 | return unless $::MAP; |
403 | return unless $::MAP; |
307 | |
404 | |
308 | my $focused = $CFClient::UI::FOCUS == $self |
405 | my $focused = $CFPlus::UI::FOCUS == $self |
309 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
406 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
310 | |
407 | |
311 | return |
408 | return |
312 | unless $focused || !$::FAST; |
409 | unless $focused || !$::FAST; |
313 | |
410 | |
314 | if (delete $self->{need_update}) { |
411 | if (delete $self->{need_update}) { |
315 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
412 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
316 | |
413 | |
317 | my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; |
414 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
318 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
415 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
319 | |
416 | |
320 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
417 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
321 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
418 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
322 | |
419 | |
323 | my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; |
420 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
324 | my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; |
421 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
325 | |
422 | |
326 | if ($::CFG->{fow_enable}) { |
423 | if ($::CFG->{fow_enable}) { |
327 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
424 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
328 | |
425 | |
329 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
426 | 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); |
427 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
331 | glConvolutionFilter2D ( |
428 | glConvolutionFilter2D ( |
332 | GL_CONVOLUTION_2D, |
429 | GL_CONVOLUTION_2D, |
333 | GL_ALPHA, |
430 | GL_ALPHA, |
334 | 3, 3, |
431 | 3, 3, |
… | |
… | |
336 | (pack "f*", @{ $self->{smooth_matrix} }), |
433 | (pack "f*", @{ $self->{smooth_matrix} }), |
337 | ); |
434 | ); |
338 | glEnable GL_CONVOLUTION_2D; |
435 | glEnable GL_CONVOLUTION_2D; |
339 | } |
436 | } |
340 | |
437 | |
341 | $self->{fow_texture} = new CFClient::Texture |
438 | $self->{fow_texture} = new CFPlus::Texture |
342 | w => $w, |
439 | w => $w, |
343 | h => $h, |
440 | h => $h, |
344 | data => $data, |
441 | data => $data, |
345 | internalformat => GL_ALPHA, |
442 | internalformat => GL_ALPHA, |
346 | format => GL_ALPHA; |
443 | format => GL_ALPHA; |
… | |
… | |
408 | glDeleteList $self->{list}; |
505 | glDeleteList $self->{list}; |
409 | |
506 | |
410 | $self->SUPER::DESTROY; |
507 | $self->SUPER::DESTROY; |
411 | } |
508 | } |
412 | |
509 | |
413 | package CFClient::MapWidget::MapMap; |
510 | package CFPlus::MapWidget::MapMap; |
414 | |
511 | |
415 | our @ISA = CFClient::UI::Base::; |
512 | our @ISA = CFPlus::UI::Base::; |
416 | |
513 | |
417 | use Time::HiRes qw(time); |
514 | use Time::HiRes qw(time); |
418 | use CFClient::OpenGL; |
515 | use CFPlus::OpenGL; |
419 | |
516 | |
420 | sub size_request { |
517 | sub size_request { |
421 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
518 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
422 | } |
519 | } |
423 | |
520 | |
… | |
… | |
459 | |
556 | |
460 | if ($self->{texture_atime} < time) { |
557 | if ($self->{texture_atime} < time) { |
461 | $self->{texture_atime} = time + 1/3; |
558 | $self->{texture_atime} = time + 1/3; |
462 | |
559 | |
463 | $self->{texture} = |
560 | $self->{texture} = |
464 | new CFClient::Texture |
561 | new CFPlus::Texture |
465 | w => $w, |
562 | w => $w, |
466 | h => $h, |
563 | h => $h, |
467 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
564 | 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; |
565 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
469 | } |
566 | } |
470 | |
567 | |
471 | $self->{texture}->draw_quad (0, 0); |
568 | $self->{texture}->draw_quad (0, 0); |
472 | |
569 | |
473 | glDisable GL_TEXTURE_2D; |
570 | glDisable GL_TEXTURE_2D; |
… | |
… | |
488 | glEnd; |
585 | glEnd; |
489 | |
586 | |
490 | glDisable GL_BLEND; |
587 | glDisable GL_BLEND; |
491 | } |
588 | } |
492 | |
589 | |
493 | package CFClient::MapWidget::Command; |
590 | package CFPlus::MapWidget::Command; |
494 | |
591 | |
495 | use strict; |
592 | use strict; |
496 | |
593 | |
497 | use CFClient::OpenGL; |
594 | use CFPlus::OpenGL; |
498 | |
595 | |
499 | our @ISA = CFClient::UI::Frame::; |
596 | our @ISA = CFPlus::UI::Frame::; |
500 | |
597 | |
501 | sub new { |
598 | sub new { |
502 | my $class = shift; |
599 | my $class = shift; |
503 | |
600 | |
504 | my $self = $class->SUPER::new ( |
601 | my $self = $class->SUPER::new ( |
505 | bg => [0, 0, 0, 0.8], |
602 | bg => [0, 0, 0, 0.8], |
506 | @_, |
603 | @_, |
507 | ); |
604 | ); |
508 | |
605 | |
509 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
606 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
510 | |
607 | |
511 | $self->{label} = [ |
608 | $self->{label} = [ |
512 | map |
609 | map |
513 | CFClient::UI::Label->new ( |
610 | CFPlus::UI::Label->new ( |
514 | can_hover => 1, |
611 | can_hover => 1, |
515 | can_events => 1, |
612 | can_events => 1, |
516 | tooltip_width => 0.33, |
613 | tooltip_width => 0.33, |
517 | fontsize => $_, |
614 | fontsize => $_, |
518 | ), (0.8) x 16 |
615 | ), (0.8) x 16 |
519 | ]; |
616 | ]; |
520 | |
617 | |
521 | $self->{entry} = new CFClient::UI::Entry |
618 | $self->{entry} = new CFPlus::UI::Entry |
522 | on_changed => sub { |
619 | on_changed => sub { |
523 | $self->update_labels; |
620 | $self->update_labels; |
524 | 0 |
621 | 0 |
525 | }, |
622 | }, |
526 | on_button_down => sub { |
623 | on_button_down => sub { |
527 | my ($entry, $ev, $x, $y) = @_; |
624 | my ($entry, $ev, $x, $y) = @_; |
528 | |
625 | |
529 | if ($ev->{button} == 3) { |
626 | if ($ev->{button} == 3) { |
530 | (new CFClient::UI::Menu |
627 | (new CFPlus::UI::Menu |
531 | items => [ |
628 | items => [ |
532 | ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" |
629 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
533 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
630 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
534 | ], |
631 | ], |
535 | )->popup ($ev); |
632 | )->popup ($ev); |
536 | return 1; |
633 | return 1; |
537 | } |
634 | } |
… | |
… | |
553 | $self->hide; |
650 | $self->hide; |
554 | } |
651 | } |
555 | } elsif ($ev->{sym} == 27) { |
652 | } elsif ($ev->{sym} == 27) { |
556 | $self->{hist_ptr} = 0; |
653 | $self->{hist_ptr} = 0; |
557 | $self->hide; |
654 | $self->hide; |
558 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
655 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
559 | if ($self->{hist_ptr} > 1) { |
656 | if ($self->{hist_ptr} > 1) { |
560 | $self->{hist_ptr}--; |
657 | $self->{hist_ptr}--; |
561 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
658 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
562 | } elsif ($self->{hist_ptr} > 0) { |
659 | } elsif ($self->{hist_ptr} > 0) { |
563 | $self->{hist_ptr}--; |
660 | $self->{hist_ptr}--; |
… | |
… | |
565 | } else { |
662 | } else { |
566 | ++$self->{select_offset} |
663 | ++$self->{select_offset} |
567 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
664 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
568 | } |
665 | } |
569 | $self->update_labels; |
666 | $self->update_labels; |
570 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
667 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
571 | if ($self->{select_offset}) { |
668 | if ($self->{select_offset}) { |
572 | --$self->{select_offset} |
669 | --$self->{select_offset} |
573 | } else { |
670 | } else { |
574 | unless ($self->{hist_ptr}) { |
671 | unless ($self->{hist_ptr}) { |
575 | $self->{hist_saveback} = $self->{entry}->get_text; |
672 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
733 | |
830 | |
734 | sub _draw { |
831 | sub _draw { |
735 | my ($self) = @_; |
832 | my ($self) = @_; |
736 | |
833 | |
737 | # hack |
834 | # hack |
738 | local $CFClient::UI::FOCUS = $self->{entry}; |
835 | local $CFPlus::UI::FOCUS = $self->{entry}; |
739 | |
836 | |
740 | $self->SUPER::_draw; |
837 | $self->SUPER::_draw; |
741 | } |
838 | } |
742 | |
839 | |
743 | 1 |
840 | 1 |