… | |
… | |
14 | |
14 | |
15 | my $self = $class->SUPER::new ( |
15 | my $self = $class->SUPER::new ( |
16 | z => -1, |
16 | z => -1, |
17 | can_focus => 1, |
17 | can_focus => 1, |
18 | list => glGenList, |
18 | list => glGenList, |
|
|
19 | |
|
|
20 | smooth_matrix => [ |
|
|
21 | 0.05, 0.13, 0.05, |
|
|
22 | 0.13, 0.30, 0.13, |
|
|
23 | 0.05, 0.13, 0.05, |
|
|
24 | ], |
|
|
25 | |
19 | @_ |
26 | @_ |
20 | ); |
27 | ); |
21 | |
28 | |
22 | $self->{completer} = new CFClient::MapWidget::Command:: |
29 | $self->{completer} = new CFClient::MapWidget::Command:: |
23 | command => $self->{command}, |
30 | command => $self->{command}, |
… | |
… | |
39 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
46 | my ($self, $command, $tooltip, $widget, $cb) = @_; |
40 | |
47 | |
41 | (my $data = $command) =~ s/\\//g; |
48 | (my $data = $command) =~ s/\\//g; |
42 | |
49 | |
43 | $tooltip =~ s/^\s+//; |
50 | $tooltip =~ s/^\s+//; |
44 | |
|
|
45 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
51 | $tooltip = "<big>$data</big>\n\n$tooltip"; |
46 | |
|
|
47 | $tooltip =~ s/\s+$//; |
52 | $tooltip =~ s/\s+$//; |
48 | |
53 | |
49 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
54 | $self->{completer}{command}{$command} = [$data, $tooltip, $widget, $cb, ++$self->{command_id}]; |
50 | } |
55 | } |
51 | |
56 | |
… | |
… | |
56 | } |
61 | } |
57 | |
62 | |
58 | sub button_down { |
63 | sub button_down { |
59 | my ($self, $ev, $x, $y) = @_; |
64 | my ($self, $ev, $x, $y) = @_; |
60 | |
65 | |
|
|
66 | return unless $::CONN; |
|
|
67 | |
61 | $self->focus_in; |
68 | $self->focus_in; |
62 | |
69 | |
63 | if ($ev->{button} == 2) { |
70 | if ($ev->{button} == 1) { |
|
|
71 | my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
|
|
72 | my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
|
|
73 | |
|
|
74 | $x -= int 0.5 * $self->{sw}; |
|
|
75 | $y -= int 0.5 * $self->{sh}; |
|
|
76 | |
|
|
77 | $::CONN->lookat ($x, $y) |
|
|
78 | if $::CONN; |
|
|
79 | |
|
|
80 | } elsif ($ev->{button} == 2) { |
64 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
81 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
65 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
82 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
66 | |
83 | |
67 | $self->{motion} = sub { |
84 | $self->{motion} = sub { |
68 | my ($ev, $x, $y) = @_; |
85 | my ($ev, $x, $y) = @_; |
… | |
… | |
73 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
90 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
74 | |
91 | |
75 | $self->update; |
92 | $self->update; |
76 | }; |
93 | }; |
77 | } |
94 | } |
|
|
95 | |
|
|
96 | 1 |
78 | } |
97 | } |
79 | |
98 | |
80 | sub button_up { |
99 | sub button_up { |
81 | my ($self, $ev, $x, $y) = @_; |
100 | my ($self, $ev, $x, $y) = @_; |
82 | |
101 | |
83 | delete $self->{motion}; |
102 | delete $self->{motion}; |
|
|
103 | |
|
|
104 | 1 |
84 | } |
105 | } |
85 | |
106 | |
86 | sub mouse_motion { |
107 | sub mouse_motion { |
87 | my ($self, $ev, $x, $y) = @_; |
108 | my ($self, $ev, $x, $y) = @_; |
88 | |
109 | |
|
|
110 | if ($self->{motion}) { |
89 | $self->{motion}->($ev, $x, $y) if $self->{motion}; |
111 | $self->{motion}->($ev, $x, $y); |
|
|
112 | } else { |
|
|
113 | return 0; |
|
|
114 | } |
|
|
115 | |
|
|
116 | 1 |
90 | } |
117 | } |
91 | |
118 | |
92 | sub size_request { |
119 | sub size_request { |
93 | ( |
120 | ( |
94 | 1 + 32 * int $::WIDTH / 32, |
121 | 1 + 32 * int $::WIDTH / 32, |
… | |
… | |
120 | ); |
147 | ); |
121 | |
148 | |
122 | sub key_down { |
149 | sub key_down { |
123 | my ($self, $ev) = @_; |
150 | my ($self, $ev) = @_; |
124 | |
151 | |
125 | return unless $::CONN; |
152 | return 0 unless $::CONN; |
126 | |
153 | |
127 | my $mod = $ev->{mod}; |
154 | my $mod = $ev->{mod}; |
128 | my $sym = $ev->{sym}; |
155 | my $sym = $ev->{sym}; |
129 | my $uni = $ev->{unicode}; |
156 | my $uni = $ev->{unicode}; |
130 | |
157 | |
… | |
… | |
136 | $::CONN->user_send ("apply"); |
163 | $::CONN->user_send ("apply"); |
137 | } elsif ($uni == ord ".") { |
164 | } elsif ($uni == ord ".") { |
138 | $::CONN->user_send ($self->{completer}{last_command}) |
165 | $::CONN->user_send ($self->{completer}{last_command}) |
139 | if exists $self->{completer}{last_command}; |
166 | if exists $self->{completer}{last_command}; |
140 | } elsif ($uni == ord "\t") { |
167 | } elsif ($uni == ord "\t") { |
141 | # TODO: toggle inventory |
168 | $::INV_WINDOW->toggle_visibility; |
142 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
169 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
143 | $::CONN->user_send ("rotateshoottype +"); |
170 | $::CONN->user_send ("rotateshoottype +"); |
144 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
171 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
145 | $::CONN->user_send ("rotateshoottype -"); |
172 | $::CONN->user_send ("rotateshoottype -"); |
146 | } elsif ($uni == ord '"') { |
173 | } elsif ($uni == ord '"') { |
… | |
… | |
150 | $self->{completer}->set_prefix (""); |
177 | $self->{completer}->set_prefix (""); |
151 | $self->{completer}->show; |
178 | $self->{completer}->show; |
152 | } elsif (exists $DIR{$sym}) { |
179 | } elsif (exists $DIR{$sym}) { |
153 | if ($mod & CFClient::KMOD_SHIFT) { |
180 | if ($mod & CFClient::KMOD_SHIFT) { |
154 | $self->{shft}++; |
181 | $self->{shft}++; |
|
|
182 | if ($DIR{$sym}[0] != $self->{fire_dir}) { |
155 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
183 | $::CONN->user_send ("fire $DIR{$sym}[0]"); |
|
|
184 | } |
|
|
185 | $self->{fire_dir} = $DIR{$sym}[0]; |
156 | } elsif ($mod & CFClient::KMOD_CTRL) { |
186 | } elsif ($mod & CFClient::KMOD_CTRL) { |
157 | $self->{ctrl}++; |
187 | $self->{ctrl}++; |
158 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
188 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
159 | } else { |
189 | } else { |
160 | $::CONN->user_send ("$DIR{$sym}[1]"); |
190 | $::CONN->user_send ("$DIR{$sym}[1]"); |
161 | } |
191 | } |
162 | } elsif ($ev->{unicode}) { |
192 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
|
|
193 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
194 | sub { |
|
|
195 | my ($mod, $sym, $cmds) = @_; |
|
|
196 | $::CFG->{bindings}->{$mod}->{$sym} = $cmds; |
|
|
197 | }); |
|
|
198 | $::BIND_EDITOR->start; |
|
|
199 | $::BIND_EDITOR->show; |
|
|
200 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
|
|
201 | $::BIND_EDITOR->stop; |
|
|
202 | $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
203 | $::BIND_EDITOR->hide; |
|
|
204 | } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { |
|
|
205 | $::CONN->user_send ($_) for @$bind_cmd; |
|
|
206 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
163 | $self->{completer}->key_down ($ev); |
207 | $self->{completer}->key_down ($ev); |
164 | $self->{completer}->show; |
208 | $self->{completer}->show; |
|
|
209 | } else { |
|
|
210 | return 0; |
|
|
211 | } |
|
|
212 | |
165 | } |
213 | 1 |
166 | } |
214 | } |
167 | |
215 | |
168 | sub key_up { |
216 | sub key_up { |
169 | my ($self, $ev) = @_; |
217 | my ($self, $ev) = @_; |
170 | |
218 | |
|
|
219 | my $res = 0; |
171 | my $mod = $ev->{mod}; |
220 | my $mod = $ev->{mod}; |
172 | my $sym = $ev->{sym}; |
221 | my $sym = $ev->{sym}; |
173 | |
222 | |
|
|
223 | if ($::CFG->{shift_fire_stop}) { |
174 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
224 | if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { |
175 | $::CONN->user_send ("fire_stop"); |
225 | $::CONN->user_send ("fire_stop"); |
|
|
226 | delete $self->{fire_dir}; |
|
|
227 | $res = 1; |
|
|
228 | } |
|
|
229 | } else { |
|
|
230 | if (exists $DIR{$sym} && delete $self->{shft}) { |
|
|
231 | $::CONN->user_send ("fire_stop"); |
|
|
232 | delete $self->{fire_dir}; |
|
|
233 | $res = 1; |
|
|
234 | } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok? |
|
|
235 | $::CONN->user_send ("fire_stop"); |
|
|
236 | delete $self->{fire_dir}; |
|
|
237 | $res = 1; |
|
|
238 | } |
176 | } |
239 | } |
|
|
240 | |
177 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
241 | if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { |
178 | $::CONN->user_send ("run_stop"); |
242 | $::CONN->user_send ("run_stop"); |
|
|
243 | $res = 1; |
179 | } |
244 | } |
|
|
245 | |
|
|
246 | $res |
180 | } |
247 | } |
181 | |
248 | |
182 | sub draw { |
249 | sub draw { |
183 | my ($self) = @_; |
250 | my ($self) = @_; |
|
|
251 | |
|
|
252 | return unless $::MAP; |
184 | |
253 | |
185 | my $focused = $CFClient::UI::FOCUS == $self |
254 | my $focused = $CFClient::UI::FOCUS == $self |
186 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
255 | || $CFClient::UI::FOCUS == $self->{completer}{entry}; |
187 | |
256 | |
188 | return |
257 | return |
189 | unless $focused || !$::FAST; |
258 | unless $focused || !$::FAST; |
190 | |
259 | |
191 | if (delete $self->{need_update}) { |
260 | if (delete $self->{need_update}) { |
|
|
261 | my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale}; |
|
|
262 | |
|
|
263 | my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize; |
|
|
264 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
|
|
265 | |
|
|
266 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
|
|
267 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
|
|
268 | |
|
|
269 | my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize; |
|
|
270 | my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize; |
|
|
271 | |
|
|
272 | if ($::CFG->{fow_enable}) { |
|
|
273 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
|
|
274 | |
|
|
275 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
|
|
276 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
|
|
277 | glConvolutionFilter2D ( |
|
|
278 | GL_CONVOLUTION_2D, |
|
|
279 | GL_ALPHA, |
|
|
280 | 3, 3, |
|
|
281 | GL_ALPHA, GL_FLOAT, |
|
|
282 | (pack "f*", @{ $self->{smooth_matrix} }), |
|
|
283 | ); |
|
|
284 | glEnable GL_CONVOLUTION_2D; |
|
|
285 | } |
|
|
286 | |
|
|
287 | $self->{fow_texture} = new CFClient::Texture |
|
|
288 | w => $w, |
|
|
289 | h => $h, |
|
|
290 | data => $data, |
|
|
291 | internalformat => GL_ALPHA, |
|
|
292 | format => GL_ALPHA; |
|
|
293 | |
|
|
294 | glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; |
|
|
295 | } else { |
|
|
296 | delete $self->{fow_texture}; |
|
|
297 | } |
|
|
298 | |
192 | glNewList $self->{list}; |
299 | glNewList $self->{list}; |
193 | |
300 | |
194 | if ($::MAP) { |
|
|
195 | my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
196 | my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99; |
|
|
197 | |
|
|
198 | my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32; |
|
|
199 | my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32; |
|
|
200 | |
|
|
201 | glPushMatrix; |
301 | glPushMatrix; |
|
|
302 | glTranslate $sx0, $sy0; |
202 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
303 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
203 | |
304 | |
204 | glTranslate $sx0 - 32, $sy0 - 32, 0; |
305 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
205 | |
306 | |
206 | my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); |
307 | if (my $tex = $self->{fow_texture}) { |
207 | |
|
|
208 | if ($::CFG->{fow_enable}) { |
|
|
209 | if ($::CFG->{fow_smooth} && $CFClient::GL_VERSION >= 1.2) { # smooth fog of war |
|
|
210 | glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER); |
|
|
211 | glConvolutionFilter2D ( |
|
|
212 | GL_CONVOLUTION_2D, |
|
|
213 | GL_ALPHA, |
|
|
214 | 3, 3, |
|
|
215 | GL_ALPHA, GL_FLOAT, |
|
|
216 | pack "f*", |
|
|
217 | 0.05, 0.13, 0.05, |
|
|
218 | 0.13, 0.30, 0.13, |
|
|
219 | 0.05, 0.13, 0.05, |
|
|
220 | ); |
|
|
221 | glEnable GL_CONVOLUTION_2D; |
|
|
222 | } |
|
|
223 | |
|
|
224 | $self->{fow_texture_name} ||= glGenTexture; |
|
|
225 | # try to re-use the texture name: TODO improve texture class instead |
|
|
226 | |
|
|
227 | $self->{fow_texture} = new CFClient::Texture |
|
|
228 | w => $w, |
|
|
229 | h => $h, |
|
|
230 | data => $data, |
|
|
231 | name => $self->{fow_texture_name}, |
|
|
232 | internalformat => GL_ALPHA, |
|
|
233 | format => GL_ALPHA; |
|
|
234 | |
|
|
235 | glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth}; |
|
|
236 | |
|
|
237 | glEnable GL_TEXTURE_2D; |
308 | glEnable GL_TEXTURE_2D; |
238 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
309 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
239 | |
310 | |
|
|
311 | glScale 32, 32; |
240 | glColor +($::CFG->{fow_intensity}) x 3, 0.8; |
312 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
241 | $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); |
313 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
242 | |
314 | |
243 | glDisable GL_TEXTURE_2D; |
315 | glDisable GL_TEXTURE_2D; |
244 | } |
316 | } |
245 | |
317 | |
246 | glPopMatrix; |
318 | glPopMatrix; |
247 | } |
|
|
248 | |
319 | |
249 | glEndList; |
320 | glEndList; |
250 | } |
321 | } |
251 | |
322 | |
252 | glPushMatrix; |
323 | glPushMatrix; |
253 | glCallList $self->{list}; |
324 | glCallList $self->{list}; |
254 | glPopMatrix; |
325 | glPopMatrix; |
255 | |
326 | |
256 | # TNT2 emulates logops in software (or worse :) |
327 | # TNT2 emulates logops in software (or worse :) |
257 | if ($focused) { |
328 | unless ($focused) { |
258 | (delete $self->{out_of_focus})->destroy |
|
|
259 | if $self->{out_of_focus}; |
|
|
260 | } else { |
|
|
261 | glColor 0.4, 0.2, 0.2, 0.6; |
329 | glColor 0.4, 0.2, 0.2, 0.6; |
262 | glEnable GL_BLEND; |
330 | glEnable GL_BLEND; |
263 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
331 | glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; |
264 | glBegin GL_QUADS; |
332 | glBegin GL_QUADS; |
265 | glVertex 0, 0; |
333 | glVertex 0, 0; |
266 | glVertex 0, $::HEIGHT; |
334 | glVertex 0, $::HEIGHT; |
267 | glVertex $::WIDTH, $::HEIGHT; |
335 | glVertex $::WIDTH, $::HEIGHT; |
268 | glVertex $::WIDTH, 0; |
336 | glVertex $::WIDTH, 0; |
269 | glEnd; |
337 | glEnd; |
270 | glDisable GL_BLEND; |
338 | glDisable GL_BLEND; |
271 | |
|
|
272 | $self->{out_of_focus} ||= do { |
|
|
273 | my $label = new CFClient::UI::Label |
|
|
274 | x => 0, |
|
|
275 | y => 0, |
|
|
276 | z => 1, |
|
|
277 | ellipsise => 0, |
|
|
278 | text => "map out of focus (click map to play)"; |
|
|
279 | |
|
|
280 | $label->show; |
|
|
281 | $label->update; |
|
|
282 | |
|
|
283 | $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub { |
|
|
284 | $label->move ( |
|
|
285 | ($::WIDTH - $label->{w}) * 0.5, |
|
|
286 | ($::HEIGHT - $label->{h}) * 0.5, |
|
|
287 | ); |
|
|
288 | }); |
|
|
289 | |
|
|
290 | $label |
|
|
291 | }; |
|
|
292 | } |
339 | } |
293 | } |
340 | } |
294 | |
341 | |
295 | sub DESTROY { |
342 | sub DESTROY { |
296 | my $self = shift; |
343 | my $self = shift; |
… | |
… | |
406 | fontsize => $_, |
453 | fontsize => $_, |
407 | ), (0.8) x 16 |
454 | ), (0.8) x 16 |
408 | ]; |
455 | ]; |
409 | |
456 | |
410 | $self->{entry} = new CFClient::UI::Entry |
457 | $self->{entry} = new CFClient::UI::Entry |
411 | connect_changed => sub { |
458 | on_changed => sub { |
412 | $self->update_labels; |
459 | $self->update_labels; |
413 | }, |
460 | }, |
|
|
461 | on_button_down => sub { |
|
|
462 | my ($entry, $ev, $x, $y) = @_; |
|
|
463 | |
|
|
464 | if ($ev->{button} == 3) { |
|
|
465 | (new CFClient::UI::Menu |
|
|
466 | items => [ |
|
|
467 | ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] |
|
|
468 | ], |
|
|
469 | )->popup ($ev); |
|
|
470 | return 1; |
|
|
471 | } |
|
|
472 | 0 |
|
|
473 | }, |
414 | connect_key_down => sub { |
474 | on_key_down => sub { |
415 | my ($entry, $ev) = @_; |
475 | my ($entry, $ev) = @_; |
416 | |
476 | |
417 | my $self = $entry->{parent}{parent}; |
477 | my $self = $entry->{parent}{parent}; |
418 | |
478 | |
419 | if ($ev->{sym} == 13) { |
479 | if ($ev->{sym} == 13) { |
420 | if (exists $self->{select}) { |
480 | if (exists $self->{select}) { |
421 | $self->{last_command} = $self->{select}; |
481 | $self->{last_command} = $self->{select}; |
422 | $::CONN->user_send ($self->{select}); |
482 | $::CONN->user_send ($self->{select}); |
|
|
483 | |
|
|
484 | unshift @{$self->{history}}, $self->{select}; |
|
|
485 | $self->{hist_ptr} = 0; |
|
|
486 | |
423 | $self->hide; |
487 | $self->hide; |
424 | } |
488 | } |
425 | } elsif ($ev->{sym} == 27) { |
489 | } elsif ($ev->{sym} == 27) { |
|
|
490 | $self->{hist_ptr} = 0; |
426 | $self->hide; |
491 | $self->hide; |
427 | return; |
492 | return; |
428 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
493 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
|
|
494 | if ($self->{hist_ptr} > 1) { |
|
|
495 | $self->{hist_ptr}--; |
|
|
496 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
|
|
497 | } elsif ($self->{hist_ptr} > 0) { |
|
|
498 | $self->{hist_ptr}--; |
|
|
499 | $self->{entry}->set_text ($self->{hist_saveback}); |
|
|
500 | } else { |
429 | ++$self->{select_offset} |
501 | ++$self->{select_offset} |
430 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
502 | if $self->{select_offset} < $#{ $self->{last_match} || [] }; |
|
|
503 | } |
431 | $self->update_labels; |
504 | $self->update_labels; |
432 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
505 | } elsif ($ev->{sym} == CFClient::SDLK_UP) { |
|
|
506 | if ($self->{select_offset}) { |
433 | --$self->{select_offset} |
507 | --$self->{select_offset} |
|
|
508 | } else { |
|
|
509 | unless ($self->{hist_ptr}) { |
|
|
510 | $self->{hist_saveback} = $self->{entry}->get_text; |
|
|
511 | } |
|
|
512 | if ($self->{hist_ptr} <= $#{$self->{history}}) { |
434 | if $self->{select_offset}; |
513 | $self->{hist_ptr}++; |
|
|
514 | } |
|
|
515 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]) |
|
|
516 | if exists $self->{history}->[$self->{hist_ptr} - 1]; |
|
|
517 | } |
435 | $self->update_labels; |
518 | $self->update_labels; |
436 | } else { |
519 | } else { |
437 | return 0; |
520 | return 0; |
438 | } |
521 | } |
439 | |
522 | |
… | |
… | |
458 | |
541 | |
459 | sub size_allocate { |
542 | sub size_allocate { |
460 | my ($self, $w, $h) = @_; |
543 | my ($self, $w, $h) = @_; |
461 | |
544 | |
462 | $self->SUPER::size_allocate ($w, $h); |
545 | $self->SUPER::size_allocate ($w, $h); |
463 | $self->move (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
546 | $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
464 | } |
547 | } |
465 | |
548 | |
466 | sub show { |
549 | sub show { |
467 | my ($self) = @_; |
550 | my ($self) = @_; |
468 | |
551 | |
… | |
… | |
478 | } |
561 | } |
479 | |
562 | |
480 | sub key_down { |
563 | sub key_down { |
481 | my ($self, $ev) = @_; |
564 | my ($self, $ev) = @_; |
482 | |
565 | |
483 | $self->{entry}->key_down ($ev); |
566 | $self->{entry}->key_down ($ev) |
484 | } |
567 | } |
485 | |
568 | |
486 | sub update_labels { |
569 | sub update_labels { |
487 | my ($self) = @_; |
570 | my ($self) = @_; |
488 | |
571 | |
… | |
… | |
521 | |
604 | |
522 | @match = map $self->{command}{$_->[0]}, |
605 | @match = map $self->{command}{$_->[0]}, |
523 | sort { |
606 | sort { |
524 | $a->[1] <=> $b->[1] |
607 | $a->[1] <=> $b->[1] |
525 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
608 | or $self->{command}{$a->[0]}[4] <=> $self->{command}{$b->[0]}[4] |
526 | or (length $a->[0]) <=> (length $b->[0]) |
609 | or (length $b->[0]) <=> (length $a->[0]) |
527 | } @match; |
610 | } @match; |
528 | } |
611 | } |
529 | |
612 | |
530 | $self->{last_search} = $cmd; |
613 | $self->{last_search} = $text; |
531 | $self->{last_match} = \@match; |
614 | $self->{last_match} = \@match; |
532 | |
615 | |
533 | $self->{select_offset} = 0; |
616 | $self->{select_offset} = 0; |
534 | } |
617 | } |
535 | |
618 | |