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 => "<b>The Command Completer</b>\n\n" |
38 | . "This is your central interface to send text commands to the server. " |
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, " |
39 | . "To enter a verbatim command to send to the server, just type the command, " |
40 | . "followed by a space, and press return. " |
40 | . "followed by a space, and press return. " |
… | |
… | |
73 | |
73 | |
74 | if ($ev->{button} == 1) { |
74 | if ($ev->{button} == 1) { |
75 | $self->grab_focus; |
75 | $self->grab_focus; |
76 | return unless $::CONN; |
76 | return unless $::CONN; |
77 | |
77 | |
78 | my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
78 | 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}; |
79 | my $y = 1 + CFPlus::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
80 | |
80 | |
81 | $x -= int 0.5 * $self->{sw}; |
81 | $x -= int 0.5 * $self->{sw}; |
82 | $y -= int 0.5 * $self->{sh}; |
82 | $y -= int 0.5 * $self->{sh}; |
83 | |
83 | |
84 | $::CONN->lookat ($x, $y) |
84 | $::CONN->lookat ($x, $y) |
… | |
… | |
100 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
100 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
101 | |
101 | |
102 | $self->update; |
102 | $self->update; |
103 | }; |
103 | }; |
104 | } elsif ($ev->{button} == 3) { |
104 | } elsif ($ev->{button} == 3) { |
105 | (new CFClient::UI::Menu |
105 | (new CFPlus::UI::Menu |
106 | items => [ |
106 | items => [ |
107 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
107 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
108 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
108 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
109 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
109 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
110 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
110 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
… | |
… | |
115 | $::PICKUP_ENABLE->{state} |
115 | $::PICKUP_ENABLE->{state} |
116 | ? "Disable automatic pickup" |
116 | ? "Disable automatic pickup" |
117 | : "Enable automatic pickup", |
117 | : "Enable automatic pickup", |
118 | sub { $::PICKUP_ENABLE->toggle } |
118 | sub { $::PICKUP_ENABLE->toggle } |
119 | ], |
119 | ], |
|
|
120 | ["Quit", |
|
|
121 | sub { |
|
|
122 | if ($::CONN) { |
|
|
123 | &::open_quit_dialog; |
|
|
124 | } else { |
|
|
125 | exit; |
|
|
126 | } |
|
|
127 | } |
|
|
128 | ], |
120 | ], |
129 | ], |
121 | )->popup ($ev); |
130 | )->popup ($ev); |
122 | } |
131 | } |
123 | |
132 | |
124 | 1 |
133 | 1 |
… | |
… | |
144 | 1 |
153 | 1 |
145 | } |
154 | } |
146 | |
155 | |
147 | sub size_request { |
156 | sub size_request { |
148 | ( |
157 | ( |
149 | 32 * CFClient::ceil $::WIDTH / 32, |
158 | 32 * CFPlus::ceil $::WIDTH / 32, |
150 | 32 * CFClient::ceil $::HEIGHT / 32, |
159 | 32 * CFPlus::ceil $::HEIGHT / 32, |
151 | ) |
160 | ) |
152 | } |
161 | } |
153 | |
162 | |
154 | sub update { |
163 | sub update { |
155 | my ($self) = @_; |
164 | my ($self) = @_; |
… | |
… | |
157 | $self->{need_update} = 1; |
166 | $self->{need_update} = 1; |
158 | $self->SUPER::update; |
167 | $self->SUPER::update; |
159 | } |
168 | } |
160 | |
169 | |
161 | my %DIR = ( |
170 | my %DIR = ( |
162 | CFClient::SDLK_KP8, [1, "north"], |
171 | CFPlus::SDLK_KP8, [1, "north"], |
163 | CFClient::SDLK_KP9, [2, "northeast"], |
172 | CFPlus::SDLK_KP9, [2, "northeast"], |
164 | CFClient::SDLK_KP6, [3, "east"], |
173 | CFPlus::SDLK_KP6, [3, "east"], |
165 | CFClient::SDLK_KP3, [4, "southeast"], |
174 | CFPlus::SDLK_KP3, [4, "southeast"], |
166 | CFClient::SDLK_KP2, [5, "south"], |
175 | CFPlus::SDLK_KP2, [5, "south"], |
167 | CFClient::SDLK_KP1, [6, "southwest"], |
176 | CFPlus::SDLK_KP1, [6, "southwest"], |
168 | CFClient::SDLK_KP4, [7, "west"], |
177 | CFPlus::SDLK_KP4, [7, "west"], |
169 | CFClient::SDLK_KP7, [8, "northwest"], |
178 | CFPlus::SDLK_KP7, [8, "northwest"], |
170 | |
179 | |
171 | CFClient::SDLK_UP, [1, "north"], |
180 | CFPlus::SDLK_UP, [1, "north"], |
172 | CFClient::SDLK_RIGHT, [3, "east"], |
181 | CFPlus::SDLK_RIGHT, [3, "east"], |
173 | CFClient::SDLK_DOWN, [5, "south"], |
182 | CFPlus::SDLK_DOWN, [5, "south"], |
174 | CFClient::SDLK_LEFT, [7, "west"], |
183 | CFPlus::SDLK_LEFT, [7, "west"], |
175 | ); |
184 | ); |
176 | |
185 | |
177 | sub invoke_key_down { |
186 | sub invoke_key_down { |
178 | my ($self, $ev) = @_; |
187 | my ($self, $ev) = @_; |
179 | |
188 | |
180 | my $mod = $ev->{mod}; |
189 | my $mod = $ev->{mod}; |
181 | my $sym = $ev->{sym}; |
190 | my $sym = $ev->{sym}; |
182 | my $uni = $ev->{unicode}; |
191 | my $uni = $ev->{unicode}; |
183 | |
192 | |
184 | $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; |
193 | $mod &= CFPlus::KMOD_CTRL | CFPlus::KMOD_ALT | CFPlus::KMOD_SHIFT; |
185 | |
194 | |
186 | if ($uni == ord "\t") { |
195 | if ($uni == ord "\t") { |
187 | $::PL_WINDOW->toggle_visibility; |
196 | $::PL_WINDOW->toggle_visibility; |
188 | } elsif ($sym == CFClient::SDLK_F1 && !$mod) { |
197 | } elsif ($sym == CFPlus::SDLK_F1 && !$mod) { |
189 | $::HELP_WINDOW->toggle_visibility; |
198 | $::HELP_WINDOW->toggle_visibility; |
190 | } elsif ($sym == CFClient::SDLK_F2 && !$mod) { |
199 | } elsif ($sym == CFPlus::SDLK_F2 && !$mod) { |
191 | ::toggle_player_page ($::STATS_PAGE); |
200 | ::toggle_player_page ($::STATS_PAGE); |
192 | } elsif ($sym == CFClient::SDLK_F3 && !$mod) { |
201 | } elsif ($sym == CFPlus::SDLK_F3 && !$mod) { |
193 | ::toggle_player_page ($::SKILL_PAGE); |
202 | ::toggle_player_page ($::SKILL_PAGE); |
194 | } elsif ($sym == CFClient::SDLK_F4 && !$mod) { |
203 | } elsif ($sym == CFPlus::SDLK_F4 && !$mod) { |
195 | ::toggle_player_page ($::SPELL_PAGE); |
204 | ::toggle_player_page ($::SPELL_PAGE); |
196 | } elsif ($sym == CFClient::SDLK_F5 && !$mod) { |
205 | } elsif ($sym == CFPlus::SDLK_F5 && !$mod) { |
197 | ::toggle_player_page ($::INVENTORY_PAGE); |
206 | ::toggle_player_page ($::INVENTORY_PAGE); |
198 | } elsif ($sym == CFClient::SDLK_F9 && !$mod) { |
207 | } elsif ($sym == CFPlus::SDLK_F9 && !$mod) { |
199 | $::SETUP_DIALOG->toggle_visibility; |
208 | $::SETUP_DIALOG->toggle_visibility; |
200 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
209 | } elsif ($sym == CFPlus::SDLK_INSERT && $mod & CFPlus::KMOD_CTRL) { |
201 | $::BIND_EDITOR->set_binding (undef, undef, [], |
210 | $::BIND_EDITOR->set_binding (undef, undef, [], |
202 | sub { |
211 | sub { |
203 | my ($mod, $sym, $cmds) = @_; |
212 | my ($mod, $sym, $cmds) = @_; |
204 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
213 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
205 | }); |
214 | }); |
206 | $::BIND_EDITOR->start; |
215 | $::BIND_EDITOR->start; |
207 | $::BIND_EDITOR->show; |
216 | $::BIND_EDITOR->show; |
208 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
217 | } elsif ($sym == CFPlus::SDLK_INSERT && not ($mod & CFPlus::KMOD_CTRL)) { |
209 | $::BIND_EDITOR->stop; |
218 | $::BIND_EDITOR->stop; |
210 | $::BIND_EDITOR->ask_for_bind_and_commit; |
219 | $::BIND_EDITOR->ask_for_bind_and_commit; |
211 | $::BIND_EDITOR->hide; |
220 | $::BIND_EDITOR->hide; |
212 | } elsif (!$::CONN) { |
221 | } elsif (!$::CONN) { |
213 | return 0; # bindings further down need a valid connection |
222 | return 0; # bindings further down need a valid connection |
214 | |
223 | |
215 | } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { |
224 | } elsif ($sym == CFPlus::SDLK_KP5 && !$mod) { |
216 | $::CONN->user_send ("stay fire"); |
225 | $::CONN->user_send ("stay fire"); |
217 | } elsif ($uni == ord ",") { |
226 | } elsif ($uni == ord ",") { |
218 | $::CONN->user_send ("take"); |
227 | $::CONN->user_send ("take"); |
219 | } elsif ($uni == ord " ") { |
228 | } elsif ($uni == ord " ") { |
220 | $::CONN->user_send ("apply"); |
229 | $::CONN->user_send ("apply"); |
221 | } elsif ($uni == ord ".") { |
230 | } elsif ($uni == ord ".") { |
222 | $::CONN->user_send ($self->{completer}{last_command}) |
231 | $::CONN->user_send ($self->{completer}{last_command}) |
223 | if exists $self->{completer}{last_command}; |
232 | if exists $self->{completer}{last_command}; |
224 | } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { |
233 | } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { |
225 | $::CONN->user_send ($_) for @$bind_cmd; |
234 | $::CONN->user_send ($_) for @$bind_cmd; |
226 | } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
235 | } elsif (($sym == CFPlus::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
227 | $::CONN->user_send ("rotateshoottype +"); |
236 | $::CONN->user_send ("rotateshoottype +"); |
228 | } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
237 | } elsif (($sym == CFPlus::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
229 | $::CONN->user_send ("rotateshoottype -"); |
238 | $::CONN->user_send ("rotateshoottype -"); |
230 | } elsif ($uni == ord '"') { |
239 | } elsif ($uni == ord '"') { |
231 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
240 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
232 | $self->{completer}->show; |
241 | $self->{completer}->show; |
233 | } elsif ($uni == ord "'") { |
242 | } elsif ($uni == ord "'") { |
234 | $self->{completer}->set_prefix (""); |
243 | $self->{completer}->set_prefix (""); |
235 | $self->{completer}->show; |
244 | $self->{completer}->show; |
236 | } elsif (exists $DIR{$sym}) { |
245 | } elsif (exists $DIR{$sym}) { |
237 | if ($mod & CFClient::KMOD_SHIFT) { |
246 | if ($mod & CFPlus::KMOD_SHIFT) { |
238 | $self->{shft}++; |
247 | $self->{shft}++; |
239 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
248 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
240 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
249 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
241 | } |
250 | } |
242 | $self->{fire_dir} = $DIR{$sym}[0]; |
251 | $self->{fire_dir} = $DIR{$sym}[0]; |
243 | } elsif ($mod & CFClient::KMOD_CTRL) { |
252 | } elsif ($mod & CFPlus::KMOD_CTRL) { |
244 | $self->{ctrl}++; |
253 | $self->{ctrl}++; |
245 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
254 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
246 | } else { |
255 | } else { |
247 | $::CONN->user_send ("$DIR{$sym}[1]"); |
256 | $::CONN->user_send ("$DIR{$sym}[1]"); |
248 | } |
257 | } |
… | |
… | |
262 | my $res = 0; |
271 | my $res = 0; |
263 | my $mod = $ev->{mod}; |
272 | my $mod = $ev->{mod}; |
264 | my $sym = $ev->{sym}; |
273 | my $sym = $ev->{sym}; |
265 | |
274 | |
266 | if ($::CFG->{shift_fire_stop}) { |
275 | if ($::CFG->{shift_fire_stop}) { |
267 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
276 | if (!($mod & CFPlus::KMOD_SHIFT) && delete $self->{shft}) { |
268 | $::CONN->user_send ("fire_stop"); |
277 | $::CONN->user_send ("fire_stop"); |
269 | delete $self->{fire_dir}; |
278 | delete $self->{fire_dir}; |
270 | $res = 1; |
279 | $res = 1; |
271 | } |
280 | } |
272 | } else { |
281 | } else { |
273 | if (exists $DIR{$sym} && delete $self->{shft}) { |
282 | if (exists $DIR{$sym} && delete $self->{shft}) { |
274 | $::CONN->user_send ("fire_stop"); |
283 | $::CONN->user_send ("fire_stop"); |
275 | delete $self->{fire_dir}; |
284 | delete $self->{fire_dir}; |
276 | $res = 1; |
285 | $res = 1; |
277 | } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
286 | } elsif (($sym == CFPlus::SDLK_LSHIFT || $sym == CFPlus::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
278 | $::CONN->user_send ("fire_stop"); |
287 | $::CONN->user_send ("fire_stop"); |
279 | delete $self->{fire_dir}; |
288 | delete $self->{fire_dir}; |
280 | $res = 1; |
289 | $res = 1; |
281 | } |
290 | } |
282 | } |
291 | } |
283 | |
292 | |
284 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
293 | if (!($mod & CFPlus::KMOD_CTRL ) && delete $self->{ctrl}) { |
285 | $::CONN->user_send ("run_stop"); |
294 | $::CONN->user_send ("run_stop"); |
286 | $res = 1; |
295 | $res = 1; |
287 | } |
296 | } |
288 | |
297 | |
289 | $res |
298 | $res |
… | |
… | |
303 | sub draw { |
312 | sub draw { |
304 | my ($self) = @_; |
313 | my ($self) = @_; |
305 | |
314 | |
306 | return unless $::MAP; |
315 | return unless $::MAP; |
307 | |
316 | |
308 | my $focused = $CFClient::UI::FOCUS == $self |
317 | my $focused = $CFPlus::UI::FOCUS == $self |
309 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
318 | || $CFPlus::UI::FOCUS == $self->{completer}{entry}; |
310 | |
319 | |
311 | return |
320 | return |
312 | unless $focused || !$::FAST; |
321 | unless $focused || !$::FAST; |
313 | |
322 | |
314 | if (delete $self->{need_update}) { |
323 | if (delete $self->{need_update}) { |
315 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
324 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
316 | |
325 | |
317 | my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; |
326 | my $sx = $self->{sx} = CFPlus::ceil $::CFG->{map_shift_x} / $tilesize; |
318 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
327 | my $sy = $self->{sy} = CFPlus::ceil $::CFG->{map_shift_y} / $tilesize; |
319 | |
328 | |
320 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
329 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
321 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
330 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
322 | |
331 | |
323 | my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; |
332 | my $sw = $self->{sw} = 1 + CFPlus::ceil $self->{w} / $tilesize; |
324 | my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; |
333 | my $sh = $self->{sh} = 1 + CFPlus::ceil $self->{h} / $tilesize; |
325 | |
334 | |
326 | if ($::CFG->{fow_enable}) { |
335 | if ($::CFG->{fow_enable}) { |
327 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
336 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
328 | |
337 | |
329 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
338 | 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); |
339 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
331 | glConvolutionFilter2D ( |
340 | glConvolutionFilter2D ( |
332 | GL_CONVOLUTION_2D, |
341 | GL_CONVOLUTION_2D, |
333 | GL_ALPHA, |
342 | GL_ALPHA, |
334 | 3, 3, |
343 | 3, 3, |
… | |
… | |
336 | (pack "f*", @{ $self->{smooth_matrix} }), |
345 | (pack "f*", @{ $self->{smooth_matrix} }), |
337 | ); |
346 | ); |
338 | glEnable GL_CONVOLUTION_2D; |
347 | glEnable GL_CONVOLUTION_2D; |
339 | } |
348 | } |
340 | |
349 | |
341 | $self->{fow_texture} = new CFClient::Texture |
350 | $self->{fow_texture} = new CFPlus::Texture |
342 | w => $w, |
351 | w => $w, |
343 | h => $h, |
352 | h => $h, |
344 | data => $data, |
353 | data => $data, |
345 | internalformat => GL_ALPHA, |
354 | internalformat => GL_ALPHA, |
346 | format => GL_ALPHA; |
355 | format => GL_ALPHA; |
… | |
… | |
408 | glDeleteList $self->{list}; |
417 | glDeleteList $self->{list}; |
409 | |
418 | |
410 | $self->SUPER::DESTROY; |
419 | $self->SUPER::DESTROY; |
411 | } |
420 | } |
412 | |
421 | |
413 | package CFClient::MapWidget::MapMap; |
422 | package CFPlus::MapWidget::MapMap; |
414 | |
423 | |
415 | our @ISA = CFClient::UI::Base::; |
424 | our @ISA = CFPlus::UI::Base::; |
416 | |
425 | |
417 | use Time::HiRes qw(time); |
426 | use Time::HiRes qw(time); |
418 | use CFClient::OpenGL; |
427 | use CFPlus::OpenGL; |
419 | |
428 | |
420 | sub size_request { |
429 | sub size_request { |
421 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
430 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
422 | } |
431 | } |
423 | |
432 | |
… | |
… | |
459 | |
468 | |
460 | if ($self->{texture_atime} < time) { |
469 | if ($self->{texture_atime} < time) { |
461 | $self->{texture_atime} = time + 1/3; |
470 | $self->{texture_atime} = time + 1/3; |
462 | |
471 | |
463 | $self->{texture} = |
472 | $self->{texture} = |
464 | new CFClient::Texture |
473 | new CFPlus::Texture |
465 | w => $w, |
474 | w => $w, |
466 | h => $h, |
475 | h => $h, |
467 | data => $::MAP->mapmap (-$ox, -$oy, $w, $h), |
476 | 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; |
477 | type => $CFPlus::GL_VERSION >= 1.2 ? GL_UNSIGNED_INT_8_8_8_8_REV : GL_UNSIGNED_BYTE; |
469 | } |
478 | } |
470 | |
479 | |
471 | $self->{texture}->draw_quad (0, 0); |
480 | $self->{texture}->draw_quad (0, 0); |
472 | |
481 | |
473 | glDisable GL_TEXTURE_2D; |
482 | glDisable GL_TEXTURE_2D; |
… | |
… | |
488 | glEnd; |
497 | glEnd; |
489 | |
498 | |
490 | glDisable GL_BLEND; |
499 | glDisable GL_BLEND; |
491 | } |
500 | } |
492 | |
501 | |
493 | package CFClient::MapWidget::Command; |
502 | package CFPlus::MapWidget::Command; |
494 | |
503 | |
495 | use strict; |
504 | use strict; |
496 | |
505 | |
497 | use CFClient::OpenGL; |
506 | use CFPlus::OpenGL; |
498 | |
507 | |
499 | our @ISA = CFClient::UI::Frame::; |
508 | our @ISA = CFPlus::UI::Frame::; |
500 | |
509 | |
501 | sub new { |
510 | sub new { |
502 | my $class = shift; |
511 | my $class = shift; |
503 | |
512 | |
504 | my $self = $class->SUPER::new ( |
513 | my $self = $class->SUPER::new ( |
505 | bg => [0, 0, 0, 0.8], |
514 | bg => [0, 0, 0, 0.8], |
506 | @_, |
515 | @_, |
507 | ); |
516 | ); |
508 | |
517 | |
509 | $self->add ($self->{vbox} = new CFClient::UI::VBox); |
518 | $self->add ($self->{vbox} = new CFPlus::UI::VBox); |
510 | |
519 | |
511 | $self->{label} = [ |
520 | $self->{label} = [ |
512 | map |
521 | map |
513 | CFClient::UI::Label->new ( |
522 | CFPlus::UI::Label->new ( |
514 | can_hover => 1, |
523 | can_hover => 1, |
515 | can_events => 1, |
524 | can_events => 1, |
516 | tooltip_width => 0.33, |
525 | tooltip_width => 0.33, |
517 | fontsize => $_, |
526 | fontsize => $_, |
518 | ), (0.8) x 16 |
527 | ), (0.8) x 16 |
519 | ]; |
528 | ]; |
520 | |
529 | |
521 | $self->{entry} = new CFClient::UI::Entry |
530 | $self->{entry} = new CFPlus::UI::Entry |
522 | on_changed => sub { |
531 | on_changed => sub { |
523 | $self->update_labels; |
532 | $self->update_labels; |
524 | 0 |
533 | 0 |
525 | }, |
534 | }, |
526 | on_button_down => sub { |
535 | on_button_down => sub { |
527 | my ($entry, $ev, $x, $y) = @_; |
536 | my ($entry, $ev, $x, $y) = @_; |
528 | |
537 | |
529 | if ($ev->{button} == 3) { |
538 | if ($ev->{button} == 3) { |
530 | (new CFClient::UI::Menu |
539 | (new CFPlus::UI::Menu |
531 | items => [ |
540 | items => [ |
532 | ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" |
541 | ["bind <i>" . (CFPlus::asxml $self->{select}) . "</i> to a key" |
533 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
542 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
534 | ], |
543 | ], |
535 | )->popup ($ev); |
544 | )->popup ($ev); |
536 | return 1; |
545 | return 1; |
537 | } |
546 | } |
… | |
… | |
553 | $self->hide; |
562 | $self->hide; |
554 | } |
563 | } |
555 | } elsif ($ev->{sym} == 27) { |
564 | } elsif ($ev->{sym} == 27) { |
556 | $self->{hist_ptr} = 0; |
565 | $self->{hist_ptr} = 0; |
557 | $self->hide; |
566 | $self->hide; |
558 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
567 | } elsif ($ev->{sym} == CFPlus::SDLK_DOWN) { |
559 | if ($self->{hist_ptr} > 1) { |
568 | if ($self->{hist_ptr} > 1) { |
560 | $self->{hist_ptr}--; |
569 | $self->{hist_ptr}--; |
561 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
570 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
562 | } elsif ($self->{hist_ptr} > 0) { |
571 | } elsif ($self->{hist_ptr} > 0) { |
563 | $self->{hist_ptr}--; |
572 | $self->{hist_ptr}--; |
… | |
… | |
565 | } else { |
574 | } else { |
566 | ++$self->{select_offset} |
575 | ++$self->{select_offset} |
567 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
576 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
568 | } |
577 | } |
569 | $self->update_labels; |
578 | $self->update_labels; |
570 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
579 | } elsif ($ev->{sym} == CFPlus::SDLK_UP) { |
571 | if ($self->{select_offset}) { |
580 | if ($self->{select_offset}) { |
572 | --$self->{select_offset} |
581 | --$self->{select_offset} |
573 | } else { |
582 | } else { |
574 | unless ($self->{hist_ptr}) { |
583 | unless ($self->{hist_ptr}) { |
575 | $self->{hist_saveback} = $self->{entry}->get_text; |
584 | $self->{hist_saveback} = $self->{entry}->get_text; |
… | |
… | |
733 | |
742 | |
734 | sub _draw { |
743 | sub _draw { |
735 | my ($self) = @_; |
744 | my ($self) = @_; |
736 | |
745 | |
737 | # hack |
746 | # hack |
738 | local $CFClient::UI::FOCUS = $self->{entry}; |
747 | local $CFPlus::UI::FOCUS = $self->{entry}; |
739 | |
748 | |
740 | $self->SUPER::_draw; |
749 | $self->SUPER::_draw; |
741 | } |
750 | } |
742 | |
751 | |
743 | 1 |
752 | 1 |