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.48 by elmex, Sat Jun 3 21:59:55 2006 UTC vs.
Revision 1.66 by root, Sun Jun 18 19:13:20 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 (
16 z => -1, 20 z => -1,
17 can_focus => 1, 21 can_focus => 1,
18 list => glGenList, 22 list => glGenList,
23
24 smooth_matrix => [
25 0.05, 0.13, 0.05,
26 0.13, 0.30, 0.13,
27 0.05, 0.13, 0.05,
28 ],
29
19 @_ 30 @_
20 ); 31 );
21 32
22 $self->{completer} = new CFClient::MapWidget::Command:: 33 $self->{completer} = new CFClient::MapWidget::Command::
23 command => $self->{command}, 34 command => $self->{command},
… …
27 . "To enter a verbatim command to send to the server, just type the command, " 38 . "To enter a verbatim command to send to the server, just type the command, "
28 . "followed by a space, and press return. " 39 . "followed by a space, and press return. "
29 . "Typing the initial letters of words (or just any letters) displays guesses " 40 . "Typing the initial letters of words (or just any letters) displays guesses "
30 . "for commands you might want to use.\n" 41 . "for commands you might want to use.\n"
31 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n" 42 . "You can use the cursor-up and cursor-down keys to select between those guesses.\n"
32 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining keybindings.", 43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
33 ; 44 ;
34 45
35 $self 46 $self
36} 47}
37 48
… …
51 my ($self) = @_; 62 my ($self) = @_;
52 63
53 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
54} 65}
55 66
56sub button_down { 67sub invoke_button_down {
57 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
58 69
70 return unless $::CONN;
71
59 $self->focus_in; 72 $self->grab_focus;
60 73
61 if ($ev->{button} == 2) { 74 if ($ev->{button} == 1) {
75 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
76 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
77
78 $x -= int 0.5 * $self->{sw};
79 $y -= int 0.5 * $self->{sh};
80
81 $::CONN->lookat ($x, $y)
82 if $::CONN;
83
84 } elsif ($ev->{button} == 2) {
62 my ($ox, $oy) = ($ev->{x}, $ev->{y}); 85 my ($ox, $oy) = ($ev->{x}, $ev->{y});
63 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y}); 86 my ($bw, $bh) = ($::CFG->{map_shift_x}, $::CFG->{map_shift_y});
64 87
65 $self->{motion} = sub { 88 $self->{motion} = sub {
66 my ($ev, $x, $y) = @_; 89 my ($ev, $x, $y) = @_;
… …
70 $::CFG->{map_shift_x} = $bw + $x - $ox; 93 $::CFG->{map_shift_x} = $bw + $x - $ox;
71 $::CFG->{map_shift_y} = $bh + $y - $oy; 94 $::CFG->{map_shift_y} = $bh + $y - $oy;
72 95
73 $self->update; 96 $self->update;
74 }; 97 };
75 } elsif ($ev->{button} == 1) {
76 my ($ox, $oy) = ($ev->{x}, $ev->{y});
77
78 my $fx = int ((($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale})) + 0.99);
79 my $fy = int ((($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale})) + 0.99);
80 $fx += $::MAP->x;
81 $fy += $::MAP->y;
82
83 $::CONN->send (sprintf "lookat %d %d", $fx, $fy);
84
85 warn "FOOX: $fx (".$::MAP->ox.")\n";
86 warn "FOOY: $fy (".$::MAP->oy.")\n";
87 } 98 }
88 99
89 1 100 1
90} 101}
91 102
92sub button_up { 103sub invoke_button_up {
93 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
94 105
95 delete $self->{motion}; 106 delete $self->{motion};
96 107
97 1 108 1
98} 109}
99 110
100sub mouse_motion { 111sub invoke_mouse_motion {
101 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
102 113
103 if ($self->{motion}) { 114 if ($self->{motion}) {
104 $self->{motion}->($ev, $x, $y); 115 $self->{motion}->($ev, $x, $y);
105 } else { 116 } else {
… …
109 1 120 1
110} 121}
111 122
112sub size_request { 123sub size_request {
113 ( 124 (
114 1 + 32 * int $::WIDTH / 32, 125 32 * CFClient::ceil $::WIDTH / 32,
115 1 + 32 * int $::HEIGHT / 32, 126 32 * CFClient::ceil $::HEIGHT / 32,
116 ) 127 )
117} 128}
118 129
119sub update { 130sub update {
120 my ($self) = @_; 131 my ($self) = @_;
… …
137 CFClient::SDLK_RIGHT, [3, "east"], 148 CFClient::SDLK_RIGHT, [3, "east"],
138 CFClient::SDLK_DOWN, [5, "south"], 149 CFClient::SDLK_DOWN, [5, "south"],
139 CFClient::SDLK_LEFT, [7, "west"], 150 CFClient::SDLK_LEFT, [7, "west"],
140); 151);
141 152
142sub key_down { 153sub invoke_key_down {
143 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
144 155
145 return 0 unless $::CONN; 156 return 0 unless $::CONN;
146 157
147 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
… …
170 $self->{completer}->set_prefix (""); 181 $self->{completer}->set_prefix ("");
171 $self->{completer}->show; 182 $self->{completer}->show;
172 } elsif (exists $DIR{$sym}) { 183 } elsif (exists $DIR{$sym}) {
173 if ($mod & CFClient::KMOD_SHIFT) { 184 if ($mod & CFClient::KMOD_SHIFT) {
174 $self->{shft}++; 185 $self->{shft}++;
186 if ($DIR{$sym}[0] != $self->{fire_dir}) {
175 $::CONN->user_send ("fire $DIR{$sym}[0]"); 187 $::CONN->user_send ("fire $DIR{$sym}[0]");
188 }
189 $self->{fire_dir} = $DIR{$sym}[0];
176 } elsif ($mod & CFClient::KMOD_CTRL) { 190 } elsif ($mod & CFClient::KMOD_CTRL) {
177 $self->{ctrl}++; 191 $self->{ctrl}++;
178 $::CONN->user_send ("run $DIR{$sym}[0]"); 192 $::CONN->user_send ("run $DIR{$sym}[0]");
179 } else { 193 } else {
180 $::CONN->user_send ("$DIR{$sym}[1]"); 194 $::CONN->user_send ("$DIR{$sym}[1]");
181 } 195 }
182 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 196 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
183 $::BIND_EDITOR->set_binding (undef, undef, [], 197 $::BIND_EDITOR->set_binding (undef, undef, [],
184 sub { 198 sub {
185 my ($mod, $sym, $cmds) = @_; 199 my ($mod, $sym, $cmds) = @_;
186 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 200 $::CFG->{profile}{default}{bindings}{$mod}{$sym} = $cmds;
187 }); 201 });
188 $::BIND_EDITOR->start; 202 $::BIND_EDITOR->start;
189 $::BIND_EDITOR->show; 203 $::BIND_EDITOR->show;
190 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 204 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
191 $::BIND_EDITOR->stop; 205 $::BIND_EDITOR->stop;
192 $::BIND_EDITOR->ask_for_bind_and_commit; 206 $::BIND_EDITOR->ask_for_bind_and_commit;
193 $::BIND_EDITOR->hide; 207 $::BIND_EDITOR->hide;
194 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 208 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
195 $::CONN->user_send ($_) for @$bind_cmd; 209 $::CONN->user_send ($_) for @$bind_cmd;
196 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 210 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
197 $self->{completer}->key_down ($ev); 211 $self->{completer}->invoke_key_down ($ev);
198 $self->{completer}->show; 212 $self->{completer}->show;
199 } else { 213 } else {
200 return 0; 214 return 0;
201 } 215 }
202 216
203 1 217 1
204} 218}
205 219
206sub key_up { 220sub invoke_key_up {
207 my ($self, $ev) = @_; 221 my ($self, $ev) = @_;
208 222
209 my $res = 0; 223 my $res = 0;
210 my $mod = $ev->{mod}; 224 my $mod = $ev->{mod};
211 my $sym = $ev->{sym}; 225 my $sym = $ev->{sym};
212 226
227 if ($::CFG->{shift_fire_stop}) {
213 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 228 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
214 $::CONN->user_send ("fire_stop"); 229 $::CONN->user_send ("fire_stop");
230 delete $self->{fire_dir};
215 $res = 1; 231 $res = 1;
232 }
233 } else {
234 if (exists $DIR{$sym} && delete $self->{shft}) {
235 $::CONN->user_send ("fire_stop");
236 delete $self->{fire_dir};
237 $res = 1;
238 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
239 $::CONN->user_send ("fire_stop");
240 delete $self->{fire_dir};
241 $res = 1;
242 }
216 } 243 }
217 244
218 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 245 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
219 $::CONN->user_send ("run_stop"); 246 $::CONN->user_send ("run_stop");
220 $res = 1; 247 $res = 1;
221 } 248 }
222 249
223 $res 250 $res
224} 251}
225 252
253sub set_magicmap {
254 my ($self, $w, $h, $x, $y, $data) = @_;
255
256 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
257 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
258
259 $self->{magicmap} = [$x, $y, $w, $h, $data];
260
261 $self->update;
262}
263
226sub draw { 264sub draw {
227 my ($self) = @_; 265 my ($self) = @_;
266
267 return unless $::MAP;
228 268
229 my $focused = $CFClient::UI::FOCUS == $self 269 my $focused = $CFClient::UI::FOCUS == $self
230 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 270 || $CFClient::UI::FOCUS == $self->{completer}{entry};
231 271
232 return 272 return
233 unless $focused || !$::FAST; 273 unless $focused || !$::FAST;
234 274
235 if (delete $self->{need_update}) { 275 if (delete $self->{need_update}) {
276 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
277
278 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
279 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
280
281 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
282 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
283
284 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
285 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
286
287 if ($::CFG->{fow_enable}) {
288 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
289
290 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
291 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
292 glConvolutionFilter2D (
293 GL_CONVOLUTION_2D,
294 GL_ALPHA,
295 3, 3,
296 GL_ALPHA, GL_FLOAT,
297 (pack "f*", @{ $self->{smooth_matrix} }),
298 );
299 glEnable GL_CONVOLUTION_2D;
300 }
301
302 $self->{fow_texture} = new CFClient::Texture
303 w => $w,
304 h => $h,
305 data => $data,
306 internalformat => GL_ALPHA,
307 format => GL_ALPHA;
308
309 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
310 } else {
311 delete $self->{fow_texture};
312 }
313
236 glNewList $self->{list}; 314 glNewList $self->{list};
237 315
238 if ($::MAP) {
239 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
240 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
241
242 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
243 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
244
245 glPushMatrix; 316 glPushMatrix;
317 glTranslate $sx0, $sy0;
246 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 318 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
247 319
248 glTranslate $sx0 - 32, $sy0 - 32, 0; 320 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
249 321
250 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 322 glScale 32, 32;
251 323
252 if ($::CFG->{fow_enable}) { 324 if (my $tex = $self->{fow_texture}) {
253 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
254 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
255 glConvolutionFilter2D (
256 GL_CONVOLUTION_2D,
257 GL_ALPHA,
258 3, 3,
259 GL_ALPHA, GL_FLOAT,
260 pack "f*",
261 0.05, 0.13, 0.05,
262 0.13, 0.30, 0.13,
263 0.05, 0.13, 0.05,
264 );
265 glEnable GL_CONVOLUTION_2D;
266 }
267
268 $self->{fow_texture_name} ||= glGenTexture;
269 # try to re-use the texture name: TODO improve texture class instead
270
271 $self->{fow_texture} = new CFClient::Texture
272 w => $w,
273 h => $h,
274 data => $data,
275 name => $self->{fow_texture_name},
276 internalformat => GL_ALPHA,
277 format => GL_ALPHA;
278
279 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
280
281 glEnable GL_TEXTURE_2D; 325 glEnable GL_TEXTURE_2D;
282 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 326 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
283 327
284 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 328 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
285 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 329 $self->{fow_texture}->draw_quad_alpha (0, 0);
286 330
287 glDisable GL_TEXTURE_2D; 331 glDisable GL_TEXTURE_2D;
288 } 332 }
289 333
334 if ($self->{magicmap}) {
335 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
336
337 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
338 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
339
340 glTranslate - $x - 1, - $y - 1;
341 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
342 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
343 }
344
290 glPopMatrix; 345 glPopMatrix;
291 }
292
293 glEndList; 346 glEndList;
294 } 347 }
295 348
296 glPushMatrix;
297 glCallList $self->{list}; 349 glCallList $self->{list};
298 glPopMatrix;
299 350
300 # TNT2 emulates logops in software (or worse :) 351 # TNT2 emulates logops in software (or worse :)
301 if ($focused) { 352 unless ($focused) {
302 (delete $self->{out_of_focus})->destroy
303 if $self->{out_of_focus};
304 } else {
305 glColor 0.4, 0.2, 0.2, 0.6; 353 glColor 0.4, 0.2, 0.2, 0.6;
306 glEnable GL_BLEND; 354 glEnable GL_BLEND;
307 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 355 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
308 glBegin GL_QUADS; 356 glBegin GL_QUADS;
309 glVertex 0, 0; 357 glVertex 0, 0;
310 glVertex 0, $::HEIGHT; 358 glVertex 0, $::HEIGHT;
311 glVertex $::WIDTH, $::HEIGHT; 359 glVertex $::WIDTH, $::HEIGHT;
312 glVertex $::WIDTH, 0; 360 glVertex $::WIDTH, 0;
313 glEnd; 361 glEnd;
314 glDisable GL_BLEND; 362 glDisable GL_BLEND;
315
316# $self->{out_of_focus} ||= do {
317# my $label = new CFClient::UI::Label
318# x => 0,
319# y => 0,
320# z => 1,
321# ellipsise => 0,
322# text => "map out of focus (click map to play)";
323#
324# $label->show;
325# $label->update;
326#
327# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
328# $label->move_abs (
329# ($::WIDTH - $label->{w}) * 0.5,
330# ($::HEIGHT - $label->{h}) * 0.5,
331# );
332# });
333#
334# $label
335# };
336 } 363 }
337} 364}
338 365
339sub DESTROY { 366sub DESTROY {
340 my $self = shift; 367 my $self = shift;
… …
353 380
354sub size_request { 381sub size_request {
355 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 382 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
356} 383}
357 384
358sub size_allocate { 385sub invoke_size_allocate {
359 my ($self, $w, $h) = @_; 386 my ($self, $w, $h) = @_;
360 387
361 $self->SUPER::size_allocate ($w, $h);
362 $self->update; 388 $self->update;
389
390 1
363} 391}
364 392
365sub update { 393sub update {
366 my ($self) = @_; 394 my ($self) = @_;
367 395
… …
452 ]; 480 ];
453 481
454 $self->{entry} = new CFClient::UI::Entry 482 $self->{entry} = new CFClient::UI::Entry
455 on_changed => sub { 483 on_changed => sub {
456 $self->update_labels; 484 $self->update_labels;
485 0
486 },
487 on_button_down => sub {
488 my ($entry, $ev, $x, $y) = @_;
489
490 if ($ev->{button} == 3) {
491 (new CFClient::UI::Menu
492 items => [
493 ["bind to a key" => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
494 ],
495 )->popup ($ev);
496 return 1;
497 }
498 0
457 }, 499 },
458 on_key_down => sub { 500 on_key_down => sub {
459 my ($entry, $ev) = @_; 501 my ($entry, $ev) = @_;
460 502
461 my $self = $entry->{parent}{parent}; 503 my $self = $entry->{parent}{parent};
462 504
463 if ($ev->{sym} == 13) { 505 if ($ev->{sym} == 13) {
464 if (exists $self->{select}) { 506 if (exists $self->{select}) {
465 $self->{last_command} = $self->{select}; 507 $self->{last_command} = $self->{select};
466 $::CONN->user_send ($self->{select}); 508 $::CONN->user_send ($self->{select});
509
510 unshift @{$self->{history}}, $self->{select};
511 $self->{hist_ptr} = 0;
512
467 $self->hide; 513 $self->hide;
468 } 514 }
469 } elsif ($ev->{sym} == 27) { 515 } elsif ($ev->{sym} == 27) {
516 $self->{hist_ptr} = 0;
470 $self->hide; 517 $self->hide;
471 return;
472 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 518 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
519 if ($self->{hist_ptr} > 1) {
520 $self->{hist_ptr}--;
521 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
522 } elsif ($self->{hist_ptr} > 0) {
523 $self->{hist_ptr}--;
524 $self->{entry}->set_text ($self->{hist_saveback});
525 } else {
473 ++$self->{select_offset} 526 ++$self->{select_offset}
474 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 527 if $self->{select_offset} < $#{ $self->{last_match} || [] };
528 }
475 $self->update_labels; 529 $self->update_labels;
476 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 530 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
531 if ($self->{select_offset}) {
477 --$self->{select_offset} 532 --$self->{select_offset}
533 } else {
534 unless ($self->{hist_ptr}) {
535 $self->{hist_saveback} = $self->{entry}->get_text;
536 }
537 if ($self->{hist_ptr} <= $#{$self->{history}}) {
478 if $self->{select_offset}; 538 $self->{hist_ptr}++;
539 }
540 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
541 if exists $self->{history}->[$self->{hist_ptr} - 1];
542 }
479 $self->update_labels; 543 $self->update_labels;
480 } else { 544 } else {
481 return 0; 545 return 0;
482 } 546 }
483 547
… …
498 562
499 $self->{entry}->set_text ($prefix); 563 $self->{entry}->set_text ($prefix);
500 $self->show; 564 $self->show;
501} 565}
502 566
503sub size_allocate { 567sub invoke_size_allocate {
504 my ($self, $w, $h) = @_; 568 my ($self, $w, $h) = @_;
505 569
506 $self->SUPER::size_allocate ($w, $h);
507 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 570 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
571
572 $self->SUPER::invoke_size_allocate ($w, $h)
508} 573}
509 574
510sub show { 575sub show {
511 my ($self) = @_; 576 my ($self) = @_;
512 577
513 $self->SUPER::show; 578 $self->SUPER::show;
514 $self->{entry}->focus_in; 579 $self->{entry}->grab_focus;
515} 580}
516 581
517sub hide { 582sub hide {
518 my ($self) = @_; 583 my ($self) = @_;
519 584
520 $self->SUPER::hide; 585 $self->SUPER::hide;
521 $self->{entry}->set_text (""); 586 $self->{entry}->set_text ("");
522} 587}
523 588
524sub key_down { 589sub invoke_key_down {
525 my ($self, $ev) = @_; 590 my ($self, $ev) = @_;
526 591
527 $self->{entry}->key_down ($ev) 592 $self->{entry}->emit (key_down => $ev)
528} 593}
529 594
530sub update_labels { 595sub update_labels {
531 my ($self) = @_; 596 my ($self) = @_;
532 597
… …
619 $label->set_text (""); 684 $label->set_text ("");
620 $label->set_tooltip (""); 685 $label->set_tooltip ("");
621 } 686 }
622 687
623 $self->update; 688 $self->update;
624 ###
625} 689}
626 690
627sub _draw { 691sub _draw {
628 my ($self) = @_; 692 my ($self) = @_;
629 693

Diff Legend

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