ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra-Client/DC/MapWidget.pm
(Generate patch)

Comparing deliantra/Deliantra-Client/DC/MapWidget.pm (file contents):
Revision 1.58 by elmex, Tue Jun 13 14:35:17 2006 UTC vs.
Revision 1.77 by root, Sun Jul 23 02:44:05 2006 UTC

… …
6use List::Util qw(min max); 6use List::Util qw(min max);
7 7
8use CFClient::OpenGL; 8use CFClient::OpenGL;
9 9
10our @ISA = CFClient::UI::Base::; 10our @ISA = CFClient::UI::Base::;
11
12my $magicmap_tex =
13 new_from_file CFClient::Texture CFClient::find_rcfile "magicmap.png",
14 mipmap => 1, wrap => 0, internalformat => GL_ALPHA;
11 15
12sub new { 16sub new {
13 my $class = shift; 17 my $class = shift;
14 18
15 my $self = $class->SUPER::new ( 19 my $self = $class->SUPER::new (
… …
26 @_ 30 @_
27 ); 31 );
28 32
29 $self->{completer} = new CFClient::MapWidget::Command:: 33 $self->{completer} = new CFClient::MapWidget::Command::
30 command => $self->{command}, 34 command => $self->{command},
31 can_focus => 1,
32 tooltip => "<b>The Command Completer</b>\n\n" 35 tooltip => "<b>The Command Completer</b>\n\n"
33 . "This is your central interface to send text commands to the server. " 36 . "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, " 37 . "To enter a verbatim command to send to the server, just type the command, "
35 . "followed by a space, and press return. " 38 . "followed by a space, and press return. "
36 . "Typing the initial letters of words (or just any letters) displays guesses " 39 . "Typing the initial letters of words (or just any letters) displays guesses "
37 . "for commands you might want to use.\n" 40 . "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" 41 . "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.", 42 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
40 ; 43 ;
41 44
42 $self 45 $self
43} 46}
44 47
… …
56 59
57sub clr_commands { 60sub clr_commands {
58 my ($self) = @_; 61 my ($self) = @_;
59 62
60 %{$self->{completer}{command}} = (); 63 %{$self->{completer}{command}} = ();
61}
62 64
65 $self->{completer}->hide
66 if $self->{completer};
67}
68
63sub button_down { 69sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 70 my ($self, $ev, $x, $y) = @_;
65 71
66 $self->focus_in;
67
68 if ($ev->{button} == 1) { 72 if ($ev->{button} == 1) {
69 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 73 $self->grab_focus;
70 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 74 return unless $::CONN;
71
72 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
73 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
74 75
76 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
77 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
78
75 $x -= int 0.5 * $::MAP->w; 79 $x -= int 0.5 * $self->{sw};
76 $y -= int 0.5 * $::MAP->h; 80 $y -= int 0.5 * $self->{sh};
77
78 $x += 1;
79 $y += 1;
80 81
81 $::CONN->lookat ($x, $y) 82 $::CONN->lookat ($x, $y)
82 if $::CONN; 83 if $::CONN;
83 84
84 } elsif ($ev->{button} == 2) { 85 } elsif ($ev->{button} == 2) {
86 $self->grab_focus;
87 return unless $::CONN;
88
85 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 89 my ($ox, $oy) = ($ev->{x}, $ev->{y});
86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 90 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
87 91
88 $self->{motion} = sub { 92 $self->{motion} = sub {
89 my ($ev, $x, $y) = @_; 93 my ($ev, $x, $y) = @_;
… …
93 $::CFG->{map_shift_x} = $bw + $x - $ox; 97 $::CFG->{map_shift_x} = $bw + $x - $ox;
94 $::CFG->{map_shift_y} = $bh + $y - $oy; 98 $::CFG->{map_shift_y} = $bh + $y - $oy;
95 99
96 $self->update; 100 $self->update;
97 }; 101 };
102 } elsif ($ev->{button} == 3) {
103 (new CFClient::UI::Menu
104 items => [
105 ["Help Browser…\tF1", sub { $::HELP_WINDOW->toggle_visibility }],
106 ["Statistics\tF2", sub { ::toggle_player_page ($::STATS_PAGE) }],
107 ["Skills\tF3", sub { ::toggle_player_page ($::SKILL_PAGE) }],
108 ["Spells…\tF4", sub { ::toggle_player_page ($::SPELL_PAGE) }],
109 ["Inventory…\tF5", sub { ::toggle_player_page ($::INVENTORY_PAGE) }],
110 ["Setup… \tF9", sub { $::SETUP_DIALOG->toggle_visibility }],
111 ["Server Messages…", sub { $::MESSAGE_WINDOW->toggle_visibility }],
112 [
113 $::PICKUP_ENABLE->{state}
114 ? "Disable automatic pickup"
115 : "Enable automatic pickup",
116 sub { $::PICKUP_ENABLE->toggle }
117 ],
118 ],
119 )->popup ($ev);
98 } 120 }
99 121
100 1 122 1
101} 123}
102 124
103sub button_up { 125sub invoke_button_up {
104 my ($self, $ev, $x, $y) = @_; 126 my ($self, $ev, $x, $y) = @_;
105 127
106 delete $self->{motion}; 128 delete $self->{motion};
107 129
108 1 130 1
109} 131}
110 132
111sub mouse_motion { 133sub invoke_mouse_motion {
112 my ($self, $ev, $x, $y) = @_; 134 my ($self, $ev, $x, $y) = @_;
113 135
114 if ($self->{motion}) { 136 if ($self->{motion}) {
115 $self->{motion}->($ev, $x, $y); 137 $self->{motion}->($ev, $x, $y);
116 } else { 138 } else {
… …
120 1 142 1
121} 143}
122 144
123sub size_request { 145sub size_request {
124 ( 146 (
125 1 + 32 * int $::WIDTH / 32, 147 32 * CFClient::ceil $::WIDTH / 32,
126 1 + 32 * int $::HEIGHT / 32, 148 32 * CFClient::ceil $::HEIGHT / 32,
127 ) 149 )
128} 150}
129 151
130sub update { 152sub update {
131 my ($self) = @_; 153 my ($self) = @_;
… …
148 CFClient::SDLK_RIGHT, [3, "east"], 170 CFClient::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 171 CFClient::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 172 CFClient::SDLK_LEFT, [7, "west"],
151); 173);
152 174
153sub key_down { 175sub invoke_key_down {
154 my ($self, $ev) = @_; 176 my ($self, $ev) = @_;
155
156 return 0 unless $::CONN;
157 177
158 my $mod = $ev->{mod}; 178 my $mod = $ev->{mod};
159 my $sym = $ev->{sym}; 179 my $sym = $ev->{sym};
160 my $uni = $ev->{unicode}; 180 my $uni = $ev->{unicode};
161 181
182 $mod &= CFClient::KMOD_CTRL | CFClient::KMOD_ALT | CFClient::KMOD_SHIFT;
183
184 if ($uni == ord "\t") {
185 $::PL_WINDOW->toggle_visibility;
186 } elsif ($sym == CFClient::SDLK_F1 && !$mod) {
187 $::HELP_WINDOW->toggle_visibility;
188 } elsif ($sym == CFClient::SDLK_F2 && !$mod) {
189 ::toggle_player_page ($::STATS_PAGE);
190 } elsif ($sym == CFClient::SDLK_F3 && !$mod) {
191 ::toggle_player_page ($::SKILL_PAGE);
192 } elsif ($sym == CFClient::SDLK_F4 && !$mod) {
193 ::toggle_player_page ($::SPELL_PAGE);
194 } elsif ($sym == CFClient::SDLK_F5 && !$mod) {
195 ::toggle_player_page ($::INVENTORY_PAGE);
196 } elsif ($sym == CFClient::SDLK_F9 && !$mod) {
197 $::SETUP_DIALOG->toggle_visibility;
198 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
199 $::BIND_EDITOR->set_binding (undef, undef, [],
200 sub {
201 my ($mod, $sym, $cmds) = @_;
202 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
203 });
204 $::BIND_EDITOR->start;
205 $::BIND_EDITOR->show;
206 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
207 $::BIND_EDITOR->stop;
208 $::BIND_EDITOR->ask_for_bind_and_commit;
209 $::BIND_EDITOR->hide;
210 } elsif (!$::CONN) {
211 return 0; # bindings further down need a valid connection
212
162 if ($sym == CFClient::SDLK_KP5) { 213 } elsif ($sym == CFClient::SDLK_KP5 && !$mod) {
163 $::CONN->user_send ("stay fire"); 214 $::CONN->user_send ("stay fire");
164 } elsif ($uni == ord ",") { 215 } elsif ($uni == ord ",") {
165 $::CONN->user_send ("take"); 216 $::CONN->user_send ("take");
166 } elsif ($uni == ord " ") { 217 } elsif ($uni == ord " ") {
167 $::CONN->user_send ("apply"); 218 $::CONN->user_send ("apply");
168 } elsif ($uni == ord ".") { 219 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 220 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 221 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 222 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
172 $::INV_WINDOW->toggle_visibility; 223 $::CONN->user_send ($_) for @$bind_cmd;
173 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 224 } elsif (($sym == CFClient::SDLK_KP_PLUS && !$mod) || $uni == ord "+") {
174 $::CONN->user_send ("rotateshoottype +"); 225 $::CONN->user_send ("rotateshoottype +");
175 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 226 } elsif (($sym == CFClient::SDLK_KP_MINUS && !$mod) || $uni == ord "-") {
176 $::CONN->user_send ("rotateshoottype -"); 227 $::CONN->user_send ("rotateshoottype -");
177 } elsif ($uni == ord '"') { 228 } elsif ($uni == ord '"') {
178 $self->{completer}->set_prefix ("$::CFG->{say_command} "); 229 $self->{completer}->set_prefix ("$::CFG->{say_command} ");
179 $self->{completer}->show; 230 $self->{completer}->show;
180 } elsif ($uni == ord "'") { 231 } elsif ($uni == ord "'") {
… …
191 $self->{ctrl}++; 242 $self->{ctrl}++;
192 $::CONN->user_send ("run $DIR{$sym}[0]"); 243 $::CONN->user_send ("run $DIR{$sym}[0]");
193 } else { 244 } else {
194 $::CONN->user_send ("$DIR{$sym}[1]"); 245 $::CONN->user_send ("$DIR{$sym}[1]");
195 } 246 }
196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
197 $::BIND_EDITOR->set_binding (undef, undef, [],
198 sub {
199 my ($mod, $sym, $cmds) = @_;
200 $::CFG->{bindings}->{$mod}->{$sym} = $cmds;
201 });
202 $::BIND_EDITOR->start;
203 $::BIND_EDITOR->show;
204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
205 $::BIND_EDITOR->stop;
206 $::BIND_EDITOR->ask_for_bind_and_commit;
207 $::BIND_EDITOR->hide;
208 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) {
209 $::CONN->user_send ($_) for @$bind_cmd;
210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 247 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
211 $self->{completer}->key_down ($ev); 248 $self->{completer}->inject_key_down ($ev);
212 $self->{completer}->show; 249 $self->{completer}->show;
213 } else { 250 } else {
214 return 0; 251 return 0;
215 } 252 }
216 253
217 1 254 1
218} 255}
219 256
220sub key_up { 257sub invoke_key_up {
221 my ($self, $ev) = @_; 258 my ($self, $ev) = @_;
222 259
223 my $res = 0; 260 my $res = 0;
224 my $mod = $ev->{mod}; 261 my $mod = $ev->{mod};
225 my $sym = $ev->{sym}; 262 my $sym = $ev->{sym};
… …
248 } 285 }
249 286
250 $res 287 $res
251} 288}
252 289
290sub set_magicmap {
291 my ($self, $w, $h, $x, $y, $data) = @_;
292
293 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
294 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
295
296 $self->{magicmap} = [$x, $y, $w, $h, $data];
297
298 $self->update;
299}
300
253sub draw { 301sub draw {
254 my ($self) = @_; 302 my ($self) = @_;
303
304 return unless $::MAP;
255 305
256 my $focused = $CFClient::UI::FOCUS == $self 306 my $focused = $CFClient::UI::FOCUS == $self
257 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 307 || $CFClient::UI::FOCUS == $self->{completer}{entry};
258 308
259 return 309 return
260 unless $focused || !$::FAST; 310 unless $focused || !$::FAST;
261 311
262 if (delete $self->{need_update}) { 312 if (delete $self->{need_update}) {
313 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
314
315 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
316 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
317
318 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
319 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
320
321 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
322 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
323
324 if ($::CFG->{fow_enable}) {
325 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
326
327 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
328 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
329 glConvolutionFilter2D (
330 GL_CONVOLUTION_2D,
331 GL_ALPHA,
332 3, 3,
333 GL_ALPHA, GL_FLOAT,
334 (pack "f*", @{ $self->{smooth_matrix} }),
335 );
336 glEnable GL_CONVOLUTION_2D;
337 }
338
339 $self->{fow_texture} = new CFClient::Texture
340 w => $w,
341 h => $h,
342 data => $data,
343 internalformat => GL_ALPHA,
344 format => GL_ALPHA;
345
346 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
347 } else {
348 delete $self->{fow_texture};
349 }
350
263 glNewList $self->{list}; 351 glNewList $self->{list};
264 352
265 if ($::MAP) {
266 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
267 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
268
269 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
270 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
271 my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
272 my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
273
274 glPushMatrix; 353 glPushMatrix;
354 glTranslate $sx0, $sy0;
275 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 355 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
276 356
277 glTranslate $sx0, $sy0; 357 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
278 358
279 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 359 glScale 32, 32;
280 360
281 if ($::CFG->{fow_enable}) { 361 if (my $tex = $self->{fow_texture}) {
282 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
283 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
284 glConvolutionFilter2D (
285 GL_CONVOLUTION_2D,
286 GL_ALPHA,
287 3, 3,
288 GL_ALPHA, GL_FLOAT,
289 (pack "f*", @{ $self->{smooth_matrix} }),
290 );
291 glEnable GL_CONVOLUTION_2D;
292 }
293
294 $self->{fow_texture_name} ||= glGenTexture;
295 # try to re-use the texture name: TODO improve texture class instead
296
297 $self->{fow_texture} = new CFClient::Texture
298 w => $w,
299 h => $h,
300 data => $data,
301 name => $self->{fow_texture_name},
302 internalformat => GL_ALPHA,
303 format => GL_ALPHA;
304
305 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
306
307 glEnable GL_TEXTURE_2D; 362 glEnable GL_TEXTURE_2D;
308 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 363 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
309 364
310 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 365 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
311 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 366 $self->{fow_texture}->draw_quad_alpha (0, 0);
312 367
313 glDisable GL_TEXTURE_2D; 368 glDisable GL_TEXTURE_2D;
314 } 369 }
315 370
371 if ($self->{magicmap}) {
372 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
373
374 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
375 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
376
377 glTranslate - $x - 1, - $y - 1;
378 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
379 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
380 }
381
316 glPopMatrix; 382 glPopMatrix;
317 }
318
319 glEndList; 383 glEndList;
320 } 384 }
321 385
322 glPushMatrix;
323 glCallList $self->{list}; 386 glCallList $self->{list};
324 glPopMatrix;
325 387
326 # TNT2 emulates logops in software (or worse :) 388 # TNT2 emulates logops in software (or worse :)
327 if ($focused) { 389 unless ($focused) {
328 (delete $self->{out_of_focus})->destroy
329 if $self->{out_of_focus};
330 } else {
331 glColor 0.4, 0.2, 0.2, 0.6; 390 glColor 0.4, 0.2, 0.2, 0.6;
332 glEnable GL_BLEND; 391 glEnable GL_BLEND;
333 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 392 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
334 glBegin GL_QUADS; 393 glBegin GL_QUADS;
335 glVertex 0, 0; 394 glVertex 0, 0;
336 glVertex 0, $::HEIGHT; 395 glVertex 0, $::HEIGHT;
337 glVertex $::WIDTH, $::HEIGHT; 396 glVertex $::WIDTH, $::HEIGHT;
338 glVertex $::WIDTH, 0; 397 glVertex $::WIDTH, 0;
339 glEnd; 398 glEnd;
340 glDisable GL_BLEND; 399 glDisable GL_BLEND;
341
342# $self->{out_of_focus} ||= do {
343# my $label = new CFClient::UI::Label
344# x => 0,
345# y => 0,
346# z => 1,
347# ellipsise => 0,
348# text => "map out of focus (click map to play)";
349#
350# $label->show;
351# $label->update;
352#
353# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
354# $label->move_abs (
355# ($::WIDTH - $label->{w}) * 0.5,
356# ($::HEIGHT - $label->{h}) * 0.5,
357# );
358# });
359#
360# $label
361# };
362 } 400 }
363} 401}
364 402
365sub DESTROY { 403sub DESTROY {
366 my $self = shift; 404 my $self = shift;
… …
379 417
380sub size_request { 418sub size_request {
381 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 419 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
382} 420}
383 421
384sub size_allocate { 422sub invoke_size_allocate {
385 my ($self, $w, $h) = @_; 423 my ($self, $w, $h) = @_;
386 424
387 $self->SUPER::size_allocate ($w, $h);
388 $self->update; 425 $self->update;
426
427 1
389} 428}
390 429
391sub update { 430sub update {
392 my ($self) = @_; 431 my ($self) = @_;
393 432
… …
478 ]; 517 ];
479 518
480 $self->{entry} = new CFClient::UI::Entry 519 $self->{entry} = new CFClient::UI::Entry
481 on_changed => sub { 520 on_changed => sub {
482 $self->update_labels; 521 $self->update_labels;
522 0
483 }, 523 },
484 on_button_down => sub { 524 on_button_down => sub {
485 my ($entry, $ev, $x, $y) = @_; 525 my ($entry, $ev, $x, $y) = @_;
486 526
487 if ($ev->{button} == 3) { 527 if ($ev->{button} == 3) {
488 (new CFClient::UI::Menu 528 (new CFClient::UI::Menu
489 items => [ 529 items => [
530 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"
490 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->focus_in }) }] 531 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
491 ], 532 ],
492 )->popup ($ev); 533 )->popup ($ev);
493 return 1; 534 return 1;
494 } 535 }
495 0 536 0
… …
502 if ($ev->{sym} == 13) { 543 if ($ev->{sym} == 13) {
503 if (exists $self->{select}) { 544 if (exists $self->{select}) {
504 $self->{last_command} = $self->{select}; 545 $self->{last_command} = $self->{select};
505 $::CONN->user_send ($self->{select}); 546 $::CONN->user_send ($self->{select});
506 547
507 unshift @{$self->{history}}, $self->{select}; 548 unshift @{$self->{history}}, $self->{entry}->get_text;
508 $self->{hist_ptr} = 0; 549 $self->{hist_ptr} = 0;
509 550
510 $self->hide; 551 $self->hide;
511 } 552 }
512 } elsif ($ev->{sym} == 27) { 553 } elsif ($ev->{sym} == 27) {
513 $self->{hist_ptr} = 0; 554 $self->{hist_ptr} = 0;
514 $self->hide; 555 $self->hide;
515 return;
516 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 556 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
517 if ($self->{hist_ptr} > 1) { 557 if ($self->{hist_ptr} > 1) {
518 $self->{hist_ptr}--; 558 $self->{hist_ptr}--;
519 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 559 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
520 } elsif ($self->{hist_ptr} > 0) { 560 } elsif ($self->{hist_ptr} > 0) {
… …
560 600
561 $self->{entry}->set_text ($prefix); 601 $self->{entry}->set_text ($prefix);
562 $self->show; 602 $self->show;
563} 603}
564 604
565sub size_allocate { 605sub invoke_size_allocate {
566 my ($self, $w, $h) = @_; 606 my ($self, $w, $h) = @_;
567 607
568 $self->SUPER::size_allocate ($w, $h);
569 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 608 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
609
610 $self->SUPER::invoke_size_allocate ($w, $h)
570} 611}
571 612
572sub show { 613sub show {
573 my ($self) = @_; 614 my ($self) = @_;
574 615
575 $self->SUPER::show; 616 $self->SUPER::show;
576 $self->{entry}->focus_in; 617 $self->{entry}->grab_focus;
577} 618}
578 619
579sub hide { 620sub hide {
580 my ($self) = @_; 621 my ($self) = @_;
622
623 $self->{hist_ptr} = 0;
581 624
582 $self->SUPER::hide; 625 $self->SUPER::hide;
583 $self->{entry}->set_text (""); 626 $self->{entry}->set_text ("");
584} 627}
585 628
586sub key_down { 629sub inject_key_down {
587 my ($self, $ev) = @_; 630 my ($self, $ev) = @_;
588 631
632 $self->{entry}->grab_focus;
589 $self->{entry}->key_down ($ev) 633 $self->{entry}->emit (key_down => $ev);
590} 634}
591 635
592sub update_labels { 636sub update_labels {
593 my ($self) = @_; 637 my ($self) = @_;
594 638
… …
681 $label->set_text (""); 725 $label->set_text ("");
682 $label->set_tooltip (""); 726 $label->set_tooltip ("");
683 } 727 }
684 728
685 $self->update; 729 $self->update;
686 ###
687} 730}
688 731
689sub _draw { 732sub _draw {
690 my ($self) = @_; 733 my ($self) = @_;
691 734

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines