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