… | |
… | |
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 CFClient::OpenGL; |
9 | use CFClient::OpenGL; |
|
|
10 | use CFClient::UI; |
9 | |
11 | |
10 | our @ISA = CFClient::UI::Base::; |
12 | our @ISA = CFClient::UI::Base::; |
|
|
13 | |
|
|
14 | my $magicmap_tex = |
|
|
15 | new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png", |
|
|
16 | mipmap => 1, wrap => 0, internalformat => GL_ALPHA; |
11 | |
17 | |
12 | sub new { |
18 | sub new { |
13 | my $class = shift; |
19 | my $class = shift; |
14 | |
20 | |
15 | my $self = $class->SUPER::new ( |
21 | my $self = $class->SUPER::new ( |
… | |
… | |
26 | @_ |
32 | @_ |
27 | ); |
33 | ); |
28 | |
34 | |
29 | $self->{completer} = new CFClient::MapWidget::Command:: |
35 | $self->{completer} = new CFClient::MapWidget::Command:: |
30 | command => $self->{command}, |
36 | command => $self->{command}, |
31 | can_focus => 1, |
|
|
32 | tooltip => "<b>The Command Completer</b>\n\n" |
37 | tooltip => "<b>The Command Completer</b>\n\n" |
33 | . "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. " |
34 | . "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, " |
35 | . "followed by a space, and press return. " |
40 | . "followed by a space, and press return. " |
36 | . "Typing the initial letters of words (or just any letters) displays guesses " |
41 | . "Typing the initial letters of words (or just any letters) displays guesses " |
37 | . "for commands you might want to use.\n" |
42 | . "for commands you might want to use.\n" |
38 | . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" |
43 | . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" |
39 | . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.", |
44 | . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.", |
40 | ; |
45 | ; |
41 | |
46 | |
42 | $self |
47 | $self |
43 | } |
48 | } |
44 | |
49 | |
… | |
… | |
56 | |
61 | |
57 | sub clr_commands { |
62 | sub clr_commands { |
58 | my ($self) = @_; |
63 | my ($self) = @_; |
59 | |
64 | |
60 | %{$self->{completer}{command}} = (); |
65 | %{$self->{completer}{command}} = (); |
61 | } |
|
|
62 | |
66 | |
|
|
67 | $self->{completer}->hide |
|
|
68 | if $self->{completer}; |
|
|
69 | } |
|
|
70 | |
63 | sub button_down { |
71 | sub invoke_button_down { |
64 | my ($self, $ev, $x, $y) = @_; |
72 | my ($self, $ev, $x, $y) = @_; |
65 | |
73 | |
66 | return unless $::CONN; |
|
|
67 | |
|
|
68 | $self->focus_in; |
|
|
69 | |
|
|
70 | if ($ev->{button} == 1) { |
74 | if ($ev->{button} == 1) { |
|
|
75 | $self->grab_focus; |
|
|
76 | return unless $::CONN; |
|
|
77 | |
71 | my $x = CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
78 | my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx}; |
72 | my $y = CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
79 | my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy}; |
73 | |
80 | |
74 | $x -= int 0.5 * $self->{sw}; |
81 | $x -= int 0.5 * $self->{sw}; |
75 | $y -= int 0.5 * $self->{sh}; |
82 | $y -= int 0.5 * $self->{sh}; |
76 | |
83 | |
77 | $::CONN->lookat ($x, $y) |
84 | $::CONN->lookat ($x, $y) |
78 | if $::CONN; |
85 | if $::CONN; |
79 | |
86 | |
80 | } elsif ($ev->{button} == 2) { |
87 | } elsif ($ev->{button} == 2) { |
|
|
88 | $self->grab_focus; |
|
|
89 | return unless $::CONN; |
|
|
90 | |
81 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
91 | my ($ox, $oy) = ($ev->{x}, $ev->{y}); |
82 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
92 | my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); |
83 | |
93 | |
84 | $self->{motion} = sub { |
94 | $self->{motion} = sub { |
85 | my ($ev, $x, $y) = @_; |
95 | my ($ev, $x, $y) = @_; |
… | |
… | |
89 | $::CFG->{map_shift_x} = $bw + $x - $ox; |
99 | $::CFG->{map_shift_x} = $bw + $x - $ox; |
90 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
100 | $::CFG->{map_shift_y} = $bh + $y - $oy; |
91 | |
101 | |
92 | $self->update; |
102 | $self->update; |
93 | }; |
103 | }; |
|
|
104 | } elsif ($ev->{button} == 3) { |
|
|
105 | (new CFClient::UI::Menu |
|
|
106 | items => [ |
|
|
107 | ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }], |
|
|
108 | ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }], |
|
|
109 | ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }], |
|
|
110 | ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }], |
|
|
111 | ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }], |
|
|
112 | ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }], |
|
|
113 | ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }], |
|
|
114 | [ |
|
|
115 | $::PICKUP_ENABLE->{state} |
|
|
116 | ? "Disable automatic pickup" |
|
|
117 | : "Enable automatic pickup", |
|
|
118 | sub { $::PICKUP_ENABLE->toggle } |
|
|
119 | ], |
|
|
120 | ], |
|
|
121 | )->popup ($ev); |
94 | } |
122 | } |
95 | |
123 | |
96 | 1 |
124 | 1 |
97 | } |
125 | } |
98 | |
126 | |
99 | sub button_up { |
127 | sub invoke_button_up { |
100 | my ($self, $ev, $x, $y) = @_; |
128 | my ($self, $ev, $x, $y) = @_; |
101 | |
129 | |
102 | delete $self->{motion}; |
130 | delete $self->{motion}; |
103 | |
131 | |
104 | 1 |
132 | 1 |
105 | } |
133 | } |
106 | |
134 | |
107 | sub mouse_motion { |
135 | sub invoke_mouse_motion { |
108 | my ($self, $ev, $x, $y) = @_; |
136 | my ($self, $ev, $x, $y) = @_; |
109 | |
137 | |
110 | if ($self->{motion}) { |
138 | if ($self->{motion}) { |
111 | $self->{motion}->($ev, $x, $y); |
139 | $self->{motion}->($ev, $x, $y); |
112 | } else { |
140 | } else { |
… | |
… | |
116 | 1 |
144 | 1 |
117 | } |
145 | } |
118 | |
146 | |
119 | sub size_request { |
147 | sub size_request { |
120 | ( |
148 | ( |
121 | 1 + 32 * int $::WIDTH / 32, |
149 | 32 * CFClient::ceil $::WIDTH / 32, |
122 | 1 + 32 * int $::HEIGHT / 32, |
150 | 32 * CFClient::ceil $::HEIGHT / 32, |
123 | ) |
151 | ) |
124 | } |
152 | } |
125 | |
153 | |
126 | sub update { |
154 | sub update { |
127 | my ($self) = @_; |
155 | my ($self) = @_; |
… | |
… | |
144 | CFClient::SDLK_RIGHT, [3, "east"], |
172 | CFClient::SDLK_RIGHT, [3, "east"], |
145 | CFClient::SDLK_DOWN, [5, "south"], |
173 | CFClient::SDLK_DOWN, [5, "south"], |
146 | CFClient::SDLK_LEFT, [7, "west"], |
174 | CFClient::SDLK_LEFT, [7, "west"], |
147 | ); |
175 | ); |
148 | |
176 | |
149 | sub key_down { |
177 | sub invoke_key_down { |
150 | my ($self, $ev) = @_; |
178 | my ($self, $ev) = @_; |
151 | |
|
|
152 | return 0 unless $::CONN; |
|
|
153 | |
179 | |
154 | my $mod = $ev->{mod}; |
180 | my $mod = $ev->{mod}; |
155 | my $sym = $ev->{sym}; |
181 | my $sym = $ev->{sym}; |
156 | my $uni = $ev->{unicode}; |
182 | my $uni = $ev->{unicode}; |
157 | |
183 | |
|
|
184 | $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT; |
|
|
185 | |
|
|
186 | if ($uni == ord "\t") { |
|
|
187 | $::PL_WINDOW->toggle_visibility; |
|
|
188 | } elsif ($sym == CFClient::SDLK_F1 && !$mod) { |
|
|
189 | $::HELP_WINDOW->toggle_visibility; |
|
|
190 | } elsif ($sym == CFClient::SDLK_F2 && !$mod) { |
|
|
191 | ::toggle_player_page ($::STATS_PAGE); |
|
|
192 | } elsif ($sym == CFClient::SDLK_F3 && !$mod) { |
|
|
193 | ::toggle_player_page ($::SKILL_PAGE); |
|
|
194 | } elsif ($sym == CFClient::SDLK_F4 && !$mod) { |
|
|
195 | ::toggle_player_page ($::SPELL_PAGE); |
|
|
196 | } elsif ($sym == CFClient::SDLK_F5 && !$mod) { |
|
|
197 | ::toggle_player_page ($::INVENTORY_PAGE); |
|
|
198 | } elsif ($sym == CFClient::SDLK_F9 && !$mod) { |
|
|
199 | $::SETUP_DIALOG->toggle_visibility; |
|
|
200 | } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { |
|
|
201 | $::BIND_EDITOR->set_binding (undef, undef, [], |
|
|
202 | sub { |
|
|
203 | my ($mod, $sym, $cmds) = @_; |
|
|
204 | $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds); |
|
|
205 | }); |
|
|
206 | $::BIND_EDITOR->start; |
|
|
207 | $::BIND_EDITOR->show; |
|
|
208 | } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { |
|
|
209 | $::BIND_EDITOR->stop; |
|
|
210 | $::BIND_EDITOR->ask_for_bind_and_commit; |
|
|
211 | $::BIND_EDITOR->hide; |
|
|
212 | } elsif (!$::CONN) { |
|
|
213 | return 0; # bindings further down need a valid connection |
|
|
214 | |
158 | if ($sym == CFClient::SDLK_KP5) { |
215 | } elsif ($sym == CFClient::SDLK_KP5 && !$mod) { |
159 | $::CONN->user_send ("stay fire"); |
216 | $::CONN->user_send ("stay fire"); |
160 | } elsif ($uni == ord ",") { |
217 | } elsif ($uni == ord ",") { |
161 | $::CONN->user_send ("take"); |
218 | $::CONN->user_send ("take"); |
162 | } elsif ($uni == ord " ") { |
219 | } elsif ($uni == ord " ") { |
163 | $::CONN->user_send ("apply"); |
220 | $::CONN->user_send ("apply"); |
164 | } elsif ($uni == ord ".") { |
221 | } elsif ($uni == ord ".") { |
165 | $::CONN->user_send ($self->{completer}{last_command}) |
222 | $::CONN->user_send ($self->{completer}{last_command}) |
166 | if exists $self->{completer}{last_command}; |
223 | if exists $self->{completer}{last_command}; |
167 | } elsif ($uni == ord "\t") { |
224 | } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) { |
168 | $::INV_WINDOW->toggle_visibility; |
225 | $::CONN->user_send ($_) for @$bind_cmd; |
169 | } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { |
226 | } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") { |
170 | $::CONN->user_send ("rotateshoottype +"); |
227 | $::CONN->user_send ("rotateshoottype +"); |
171 | } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { |
228 | } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") { |
172 | $::CONN->user_send ("rotateshoottype -"); |
229 | $::CONN->user_send ("rotateshoottype -"); |
173 | } elsif ($uni == ord '"') { |
230 | } elsif ($uni == ord '"') { |
174 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
231 | $self->{completer}->set_prefix ("$::CFG->{say_command} "); |
175 | $self->{completer}->show; |
232 | $self->{completer}->show; |
176 | } elsif ($uni == ord "'") { |
233 | } elsif ($uni == ord "'") { |
… | |
… | |
187 | $self->{ctrl}++; |
244 | $self->{ctrl}++; |
188 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
245 | $::CONN->user_send ("run $DIR{$sym}[0]"); |
189 | } else { |
246 | } else { |
190 | $::CONN->user_send ("$DIR{$sym}[1]"); |
247 | $::CONN->user_send ("$DIR{$sym}[1]"); |
191 | } |
248 | } |
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')) { |
249 | } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { |
207 | $self->{completer}->key_down ($ev); |
250 | $self->{completer}->inject_key_down ($ev); |
208 | $self->{completer}->show; |
251 | $self->{completer}->show; |
209 | } else { |
252 | } else { |
210 | return 0; |
253 | return 0; |
211 | } |
254 | } |
212 | |
255 | |
213 | 1 |
256 | 1 |
214 | } |
257 | } |
215 | |
258 | |
216 | sub key_up { |
259 | sub invoke_key_up { |
217 | my ($self, $ev) = @_; |
260 | my ($self, $ev) = @_; |
218 | |
261 | |
219 | my $res = 0; |
262 | my $res = 0; |
220 | my $mod = $ev->{mod}; |
263 | my $mod = $ev->{mod}; |
221 | my $sym = $ev->{sym}; |
264 | my $sym = $ev->{sym}; |
… | |
… | |
244 | } |
287 | } |
245 | |
288 | |
246 | $res |
289 | $res |
247 | } |
290 | } |
248 | |
291 | |
|
|
292 | sub set_magicmap { |
|
|
293 | my ($self, $w, $h, $x, $y, $data) = @_; |
|
|
294 | |
|
|
295 | $x -= $::MAP->ox + int 0.5 * $::MAP->w; |
|
|
296 | $y -= $::MAP->oy + int 0.5 * $::MAP->h; |
|
|
297 | |
|
|
298 | $self->{magicmap} = [$x, $y, $w, $h, $data]; |
|
|
299 | |
|
|
300 | $self->update; |
|
|
301 | } |
|
|
302 | |
249 | sub draw { |
303 | sub draw { |
250 | my ($self) = @_; |
304 | my ($self) = @_; |
251 | |
305 | |
252 | return unless $::MAP; |
306 | return unless $::MAP; |
253 | |
307 | |
… | |
… | |
264 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
318 | my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize; |
265 | |
319 | |
266 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
320 | my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize; |
267 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
321 | my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize; |
268 | |
322 | |
269 | my $sw = $self->{sw} = 1 + CFClient::ceil $::WIDTH / $tilesize; |
323 | my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize; |
270 | my $sh = $self->{sh} = 1 + CFClient::ceil $::HEIGHT / $tilesize; |
324 | my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize; |
271 | |
325 | |
272 | if ($::CFG->{fow_enable}) { |
326 | if ($::CFG->{fow_enable}) { |
273 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
327 | my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh); |
274 | |
328 | |
275 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
329 | if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war |
… | |
… | |
302 | glTranslate $sx0, $sy0; |
356 | glTranslate $sx0, $sy0; |
303 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
357 | glScale $::CFG->{map_scale}, $::CFG->{map_scale}; |
304 | |
358 | |
305 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
359 | $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh); |
306 | |
360 | |
|
|
361 | glScale 32, 32; |
|
|
362 | |
307 | if (my $tex = $self->{fow_texture}) { |
363 | if (my $tex = $self->{fow_texture}) { |
308 | glEnable GL_TEXTURE_2D; |
364 | glEnable GL_TEXTURE_2D; |
309 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
365 | glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; |
310 | |
366 | |
311 | glScale 32, 32; |
|
|
312 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
367 | glColor +($::CFG->{fow_intensity}) x 3, 0.9; |
313 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
368 | $self->{fow_texture}->draw_quad_alpha (0, 0); |
314 | |
369 | |
315 | glDisable GL_TEXTURE_2D; |
370 | glDisable GL_TEXTURE_2D; |
316 | } |
371 | } |
317 | |
372 | |
|
|
373 | if ($self->{magicmap}) { |
|
|
374 | my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} }; |
|
|
375 | |
|
|
376 | $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1); |
|
|
377 | $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1); |
|
|
378 | |
|
|
379 | glTranslate - $x - 1, - $y - 1; |
|
|
380 | glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name}; |
|
|
381 | $::MAP->draw_magicmap ($x, $y, $w, $h, $data); |
|
|
382 | } |
|
|
383 | |
318 | glPopMatrix; |
384 | glPopMatrix; |
319 | |
|
|
320 | glEndList; |
385 | glEndList; |
321 | } |
386 | } |
322 | |
387 | |
323 | glPushMatrix; |
|
|
324 | glCallList $self->{list}; |
388 | glCallList $self->{list}; |
325 | glPopMatrix; |
|
|
326 | |
389 | |
327 | # TNT2 emulates logops in software (or worse :) |
390 | # TNT2 emulates logops in software (or worse :) |
328 | unless ($focused) { |
391 | unless ($focused) { |
329 | glColor 0.4, 0.2, 0.2, 0.6; |
392 | glColor 0.4, 0.2, 0.2, 0.6; |
330 | glEnable GL_BLEND; |
393 | glEnable GL_BLEND; |
… | |
… | |
356 | |
419 | |
357 | sub size_request { |
420 | sub size_request { |
358 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
421 | ($::HEIGHT * 0.25, $::HEIGHT * 0.25) |
359 | } |
422 | } |
360 | |
423 | |
361 | sub size_allocate { |
424 | sub invoke_size_allocate { |
362 | my ($self, $w, $h) = @_; |
425 | my ($self, $w, $h) = @_; |
363 | |
426 | |
364 | $self->SUPER::size_allocate ($w, $h); |
|
|
365 | $self->update; |
427 | $self->update; |
|
|
428 | |
|
|
429 | 1 |
366 | } |
430 | } |
367 | |
431 | |
368 | sub update { |
432 | sub update { |
369 | my ($self) = @_; |
433 | my ($self) = @_; |
370 | |
434 | |
… | |
… | |
455 | ]; |
519 | ]; |
456 | |
520 | |
457 | $self->{entry} = new CFClient::UI::Entry |
521 | $self->{entry} = new CFClient::UI::Entry |
458 | on_changed => sub { |
522 | on_changed => sub { |
459 | $self->update_labels; |
523 | $self->update_labels; |
|
|
524 | 0 |
460 | }, |
525 | }, |
461 | on_button_down => sub { |
526 | on_button_down => sub { |
462 | my ($entry, $ev, $x, $y) = @_; |
527 | my ($entry, $ev, $x, $y) = @_; |
463 | |
528 | |
464 | if ($ev->{button} == 3) { |
529 | if ($ev->{button} == 3) { |
465 | (new CFClient::UI::Menu |
530 | (new CFClient::UI::Menu |
466 | items => [ |
531 | items => [ |
|
|
532 | ["bind <i>" . (CFClient::asxml $self->{select}) . "</i> to a key" |
467 | ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] |
533 | => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }] |
468 | ], |
534 | ], |
469 | )->popup ($ev); |
535 | )->popup ($ev); |
470 | return 1; |
536 | return 1; |
471 | } |
537 | } |
472 | 0 |
538 | 0 |
… | |
… | |
479 | if ($ev->{sym} == 13) { |
545 | if ($ev->{sym} == 13) { |
480 | if (exists $self->{select}) { |
546 | if (exists $self->{select}) { |
481 | $self->{last_command} = $self->{select}; |
547 | $self->{last_command} = $self->{select}; |
482 | $::CONN->user_send ($self->{select}); |
548 | $::CONN->user_send ($self->{select}); |
483 | |
549 | |
484 | unshift @{$self->{history}}, $self->{select}; |
550 | unshift @{$self->{history}}, $self->{entry}->get_text; |
485 | $self->{hist_ptr} = 0; |
551 | $self->{hist_ptr} = 0; |
486 | |
552 | |
487 | $self->hide; |
553 | $self->hide; |
488 | } |
554 | } |
489 | } elsif ($ev->{sym} == 27) { |
555 | } elsif ($ev->{sym} == 27) { |
490 | $self->{hist_ptr} = 0; |
556 | $self->{hist_ptr} = 0; |
491 | $self->hide; |
557 | $self->hide; |
492 | return; |
|
|
493 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
558 | } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { |
494 | if ($self->{hist_ptr} > 1) { |
559 | if ($self->{hist_ptr} > 1) { |
495 | $self->{hist_ptr}--; |
560 | $self->{hist_ptr}--; |
496 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
561 | $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); |
497 | } elsif ($self->{hist_ptr} > 0) { |
562 | } elsif ($self->{hist_ptr} > 0) { |
… | |
… | |
537 | |
602 | |
538 | $self->{entry}->set_text ($prefix); |
603 | $self->{entry}->set_text ($prefix); |
539 | $self->show; |
604 | $self->show; |
540 | } |
605 | } |
541 | |
606 | |
542 | sub size_allocate { |
607 | sub invoke_size_allocate { |
543 | my ($self, $w, $h) = @_; |
608 | my ($self, $w, $h) = @_; |
544 | |
609 | |
545 | $self->SUPER::size_allocate ($w, $h); |
|
|
546 | $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
610 | $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); |
|
|
611 | |
|
|
612 | $self->SUPER::invoke_size_allocate ($w, $h) |
547 | } |
613 | } |
548 | |
614 | |
549 | sub show { |
615 | sub show { |
550 | my ($self) = @_; |
616 | my ($self) = @_; |
551 | |
617 | |
552 | $self->SUPER::show; |
618 | $self->SUPER::show; |
553 | $self->{entry}->focus_in; |
619 | $self->{entry}->grab_focus; |
554 | } |
620 | } |
555 | |
621 | |
556 | sub hide { |
622 | sub hide { |
557 | my ($self) = @_; |
623 | my ($self) = @_; |
|
|
624 | |
|
|
625 | $self->{hist_ptr} = 0; |
558 | |
626 | |
559 | $self->SUPER::hide; |
627 | $self->SUPER::hide; |
560 | $self->{entry}->set_text (""); |
628 | $self->{entry}->set_text (""); |
561 | } |
629 | } |
562 | |
630 | |
563 | sub key_down { |
631 | sub inject_key_down { |
564 | my ($self, $ev) = @_; |
632 | my ($self, $ev) = @_; |
565 | |
633 | |
|
|
634 | $self->{entry}->grab_focus; |
566 | $self->{entry}->key_down ($ev) |
635 | $self->{entry}->emit (key_down => $ev); |
567 | } |
636 | } |
568 | |
637 | |
569 | sub update_labels { |
638 | sub update_labels { |
570 | my ($self) = @_; |
639 | my ($self) = @_; |
571 | |
640 | |
… | |
… | |
658 | $label->set_text (""); |
727 | $label->set_text (""); |
659 | $label->set_tooltip (""); |
728 | $label->set_tooltip (""); |
660 | } |
729 | } |
661 | |
730 | |
662 | $self->update; |
731 | $self->update; |
663 | ### |
|
|
664 | } |
732 | } |
665 | |
733 | |
666 | sub _draw { |
734 | sub _draw { |
667 | my ($self) = @_; |
735 | my ($self) = @_; |
668 | |
736 | |