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