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.56 by root, Mon Jun 12 13:26:14 2006 UTC vs.
Revision 1.70 by elmex, Sun Jul 2 19:32:55 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 (
… …
34 . "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, "
35 . "followed by a space, and press return. " 39 . "followed by a space, and press return. "
36 . "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 "
37 . "for commands you might want to use.\n" 41 . "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" 42 . "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.", 43 . "<b>Right-Click</b> opens a menu where you cna select further options, sich as redefining key bindings.",
40 ; 44 ;
41 45
42 $self 46 $self
43} 47}
44 48
… …
58 my ($self) = @_; 62 my ($self) = @_;
59 63
60 %{$self->{completer}{command}} = (); 64 %{$self->{completer}{command}} = ();
61} 65}
62 66
63sub button_down { 67sub invoke_button_down {
64 my ($self, $ev, $x, $y) = @_; 68 my ($self, $ev, $x, $y) = @_;
65 69
70 return unless $::CONN;
71
66 $self->focus_in; 72 $self->grab_focus;
67 73
68 if ($ev->{button} == 1) { 74 if ($ev->{button} == 1) {
69 my $x = int +($ev->{x} - $::CFG->{map_shift_x}) / (32 * $::CFG->{map_scale}); 75 my $x = 1 + CFClient::floor +($ev->{x} - $self->{sx0}) / $self->{tilesize} - $self->{sx};
70 my $y = int +($ev->{y} - $::CFG->{map_shift_y}) / (32 * $::CFG->{map_scale}); 76 my $y = 1 + CFClient::floor +($ev->{y} - $self->{sy0}) / $self->{tilesize} - $self->{sy};
71
72 $x += int 0.5 * ($::MAP->w - $self->{sw} - 1);
73 $y += int 0.5 * ($::MAP->h - $self->{sh} - 1);
74 77
75 $x -= int 0.5 * $::MAP->w; 78 $x -= int 0.5 * $self->{sw};
76 $y -= int 0.5 * $::MAP->h; 79 $y -= int 0.5 * $self->{sh};
77
78 $x += 1;
79 $y += 1;
80 80
81 $::CONN->lookat ($x, $y) 81 $::CONN->lookat ($x, $y)
82 if $::CONN; 82 if $::CONN;
83 83
84 } elsif ($ev->{button} == 2) { 84 } elsif ($ev->{button} == 2) {
… …
98 } 98 }
99 99
100 1 100 1
101} 101}
102 102
103sub button_up { 103sub invoke_button_up {
104 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
105 105
106 delete $self->{motion}; 106 delete $self->{motion};
107 107
108 1 108 1
109} 109}
110 110
111sub mouse_motion { 111sub invoke_mouse_motion {
112 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
113 113
114 if ($self->{motion}) { 114 if ($self->{motion}) {
115 $self->{motion}->($ev, $x, $y); 115 $self->{motion}->($ev, $x, $y);
116 } else { 116 } else {
… …
120 1 120 1
121} 121}
122 122
123sub size_request { 123sub size_request {
124 ( 124 (
125 1 + 32 * int $::WIDTH / 32, 125 32 * CFClient::ceil $::WIDTH / 32,
126 1 + 32 * int $::HEIGHT / 32, 126 32 * CFClient::ceil $::HEIGHT / 32,
127 ) 127 )
128} 128}
129 129
130sub update { 130sub update {
131 my ($self) = @_; 131 my ($self) = @_;
… …
148 CFClient::SDLK_RIGHT, [3, "east"], 148 CFClient::SDLK_RIGHT, [3, "east"],
149 CFClient::SDLK_DOWN, [5, "south"], 149 CFClient::SDLK_DOWN, [5, "south"],
150 CFClient::SDLK_LEFT, [7, "west"], 150 CFClient::SDLK_LEFT, [7, "west"],
151); 151);
152 152
153sub key_down { 153sub invoke_key_down {
154 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
155 155
156 return 0 unless $::CONN; 156 return 0 unless $::CONN;
157 157
158 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
… …
167 $::CONN->user_send ("apply"); 167 $::CONN->user_send ("apply");
168 } elsif ($uni == ord ".") { 168 } elsif ($uni == ord ".") {
169 $::CONN->user_send ($self->{completer}{last_command}) 169 $::CONN->user_send ($self->{completer}{last_command})
170 if exists $self->{completer}{last_command}; 170 if exists $self->{completer}{last_command};
171 } elsif ($uni == ord "\t") { 171 } elsif ($uni == ord "\t") {
172 $::INV_WINDOW->toggle_visibility; 172 $::PL_WINDOW->toggle_visibility;
173 $::PL_NOTEBOOK->set_current_page ("Inventory");
173 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 174 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
174 $::CONN->user_send ("rotateshoottype +"); 175 $::CONN->user_send ("rotateshoottype +");
175 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 176 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
176 $::CONN->user_send ("rotateshoottype -"); 177 $::CONN->user_send ("rotateshoottype -");
177 } elsif ($uni == ord '"') { 178 } elsif ($uni == ord '"') {
… …
181 $self->{completer}->set_prefix (""); 182 $self->{completer}->set_prefix ("");
182 $self->{completer}->show; 183 $self->{completer}->show;
183 } elsif (exists $DIR{$sym}) { 184 } elsif (exists $DIR{$sym}) {
184 if ($mod & CFClient::KMOD_SHIFT) { 185 if ($mod & CFClient::KMOD_SHIFT) {
185 $self->{shft}++; 186 $self->{shft}++;
187 if ($DIR{$sym}[0] != $self->{fire_dir}) {
186 $::CONN->user_send ("fire $DIR{$sym}[0]"); 188 $::CONN->user_send ("fire $DIR{$sym}[0]");
189 }
190 $self->{fire_dir} = $DIR{$sym}[0];
187 } elsif ($mod & CFClient::KMOD_CTRL) { 191 } elsif ($mod & CFClient::KMOD_CTRL) {
188 $self->{ctrl}++; 192 $self->{ctrl}++;
189 $::CONN->user_send ("run $DIR{$sym}[0]"); 193 $::CONN->user_send ("run $DIR{$sym}[0]");
190 } else { 194 } else {
191 $::CONN->user_send ("$DIR{$sym}[1]"); 195 $::CONN->user_send ("$DIR{$sym}[1]");
192 } 196 }
193 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) { 197 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
194 $::BIND_EDITOR->set_binding (undef, undef, [], 198 $::BIND_EDITOR->set_binding (undef, undef, [],
195 sub { 199 sub {
196 my ($mod, $sym, $cmds) = @_; 200 my ($mod, $sym, $cmds) = @_;
197 $::CFG->{bindings}->{$mod}->{$sym} = $cmds; 201 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
198 }); 202 });
199 $::BIND_EDITOR->start; 203 $::BIND_EDITOR->start;
200 $::BIND_EDITOR->show; 204 $::BIND_EDITOR->show;
201 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) { 205 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
202 $::BIND_EDITOR->stop; 206 $::BIND_EDITOR->stop;
203 $::BIND_EDITOR->ask_for_bind_and_commit; 207 $::BIND_EDITOR->ask_for_bind_and_commit;
204 $::BIND_EDITOR->hide; 208 $::BIND_EDITOR->hide;
205 } elsif (my $bind_cmd = $::CFG->{bindings}->{$mod}->{$sym}) { 209 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
206 $::CONN->user_send ($_) for @$bind_cmd; 210 $::CONN->user_send ($_) for @$bind_cmd;
207 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 211 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
208 $self->{completer}->key_down ($ev); 212 $self->{completer}->invoke_key_down ($ev);
209 $self->{completer}->show; 213 $self->{completer}->show;
210 } else { 214 } else {
211 return 0; 215 return 0;
212 } 216 }
213 217
214 1 218 1
215} 219}
216 220
217sub key_up { 221sub invoke_key_up {
218 my ($self, $ev) = @_; 222 my ($self, $ev) = @_;
219 223
220 my $res = 0; 224 my $res = 0;
221 my $mod = $ev->{mod}; 225 my $mod = $ev->{mod};
222 my $sym = $ev->{sym}; 226 my $sym = $ev->{sym};
223 227
228 if ($::CFG->{shift_fire_stop}) {
224 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
225 $::CONN->user_send ("fire_stop"); 230 $::CONN->user_send ("fire_stop");
231 delete $self->{fire_dir};
226 $res = 1; 232 $res = 1;
233 }
234 } else {
235 if (exists $DIR{$sym} && delete $self->{shft}) {
236 $::CONN->user_send ("fire_stop");
237 delete $self->{fire_dir};
238 $res = 1;
239 } elsif (($sym == CFClient::SDLK_LSHIFT || $sym == CFClient::SDLK_RSHIFT) && delete $self->{shft}) { # XXX: is RSHIFT ok?
240 $::CONN->user_send ("fire_stop");
241 delete $self->{fire_dir};
242 $res = 1;
243 }
227 } 244 }
228 245
229 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 246 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
230 $::CONN->user_send ("run_stop"); 247 $::CONN->user_send ("run_stop");
231 $res = 1; 248 $res = 1;
232 } 249 }
233 250
234 $res 251 $res
235} 252}
236 253
254sub set_magicmap {
255 my ($self, $w, $h, $x, $y, $data) = @_;
256
257 $x -= $::MAP->ox + int 0.5 * $::MAP->w;
258 $y -= $::MAP->oy + int 0.5 * $::MAP->h;
259
260 $self->{magicmap} = [$x, $y, $w, $h, $data];
261
262 $self->update;
263}
264
237sub draw { 265sub draw {
238 my ($self) = @_; 266 my ($self) = @_;
267
268 return unless $::MAP;
239 269
240 my $focused = $CFClient::UI::FOCUS == $self 270 my $focused = $CFClient::UI::FOCUS == $self
241 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 271 || $CFClient::UI::FOCUS == $self->{completer}{entry};
242 272
243 return 273 return
244 unless $focused || !$::FAST; 274 unless $focused || !$::FAST;
245 275
246 if (delete $self->{need_update}) { 276 if (delete $self->{need_update}) {
277 my $tilesize = $self->{tilesize} = int 32 * $::CFG->{map_scale};
278
279 my $sx = $self->{sx} = CFClient::ceil $::CFG->{map_shift_x} / $tilesize;
280 my $sy = $self->{sy} = CFClient::ceil $::CFG->{map_shift_y} / $tilesize;
281
282 my $sx0 = $self->{sx0} = $::CFG->{map_shift_x} - $sx * $tilesize;
283 my $sy0 = $self->{sy0} = $::CFG->{map_shift_y} - $sy * $tilesize;
284
285 my $sw = $self->{sw} = 1 + CFClient::ceil $self->{w} / $tilesize;
286 my $sh = $self->{sh} = 1 + CFClient::ceil $self->{h} / $tilesize;
287
288 if ($::CFG->{fow_enable}) {
289 my ($w, $h, $data) = $::MAP->fow_texture ($sx, $sy, 0, 0, $sw, $sh);
290
291 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
292 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
293 glConvolutionFilter2D (
294 GL_CONVOLUTION_2D,
295 GL_ALPHA,
296 3, 3,
297 GL_ALPHA, GL_FLOAT,
298 (pack "f*", @{ $self->{smooth_matrix} }),
299 );
300 glEnable GL_CONVOLUTION_2D;
301 }
302
303 $self->{fow_texture} = new CFClient::Texture
304 w => $w,
305 h => $h,
306 data => $data,
307 internalformat => GL_ALPHA,
308 format => GL_ALPHA;
309
310 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
311 } else {
312 delete $self->{fow_texture};
313 }
314
247 glNewList $self->{list}; 315 glNewList $self->{list};
248 316
249 if ($::MAP) {
250 my $sw = $self->{sw} = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
251 my $sh = $self->{sh} = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
252
253 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale};
254 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale};
255 my $sx0 = $self->{sx0} = ($sx & 31) - 32; $sx = $self->{sx} = ($sx - $sx0) / 32;
256 my $sy0 = $self->{sy0} = ($sy & 31) - 32; $sy = $self->{sy} = ($sy - $sy0) / 32;
257
258 glPushMatrix; 317 glPushMatrix;
318 glTranslate $sx0, $sy0;
259 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 319 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
260 320
261 glTranslate $sx0, $sy0; 321 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
262 322
263 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 323 glScale 32, 32;
264 324
265 if ($::CFG->{fow_enable}) { 325 if (my $tex = $self->{fow_texture}) {
266 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
267 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
268 glConvolutionFilter2D (
269 GL_CONVOLUTION_2D,
270 GL_ALPHA,
271 3, 3,
272 GL_ALPHA, GL_FLOAT,
273 (pack "f*", @{ $self->{smooth_matrix} }),
274 );
275 glEnable GL_CONVOLUTION_2D;
276 }
277
278 $self->{fow_texture_name} ||= glGenTexture;
279 # try to re-use the texture name: TODO improve texture class instead
280
281 $self->{fow_texture} = new CFClient::Texture
282 w => $w,
283 h => $h,
284 data => $data,
285 name => $self->{fow_texture_name},
286 internalformat => GL_ALPHA,
287 format => GL_ALPHA;
288
289 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
290
291 glEnable GL_TEXTURE_2D; 326 glEnable GL_TEXTURE_2D;
292 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 327 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
293 328
294 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 329 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
295 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 330 $self->{fow_texture}->draw_quad_alpha (0, 0);
296 331
297 glDisable GL_TEXTURE_2D; 332 glDisable GL_TEXTURE_2D;
298 } 333 }
299 334
335 if ($self->{magicmap}) {
336 my ($x, $y, $w, $h, $data) = @{ $self->{magicmap} };
337
338 $x += $::MAP->ox - $sx + int 0.5 * ($::MAP->w - $sw + 1);
339 $y += $::MAP->oy - $sy + int 0.5 * ($::MAP->h - $sh + 1);
340
341 glTranslate - $x - 1, - $y - 1;
342 glBindTexture GL_TEXTURE_2D, $magicmap_tex->{name};
343 $::MAP->draw_magicmap ($x, $y, $w, $h, $data);
344 }
345
300 glPopMatrix; 346 glPopMatrix;
301 }
302
303 glEndList; 347 glEndList;
304 } 348 }
305 349
306 glPushMatrix;
307 glCallList $self->{list}; 350 glCallList $self->{list};
308 glPopMatrix;
309 351
310 # TNT2 emulates logops in software (or worse :) 352 # TNT2 emulates logops in software (or worse :)
311 if ($focused) { 353 unless ($focused) {
312 (delete $self->{out_of_focus})->destroy
313 if $self->{out_of_focus};
314 } else {
315 glColor 0.4, 0.2, 0.2, 0.6; 354 glColor 0.4, 0.2, 0.2, 0.6;
316 glEnable GL_BLEND; 355 glEnable GL_BLEND;
317 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
318 glBegin GL_QUADS; 357 glBegin GL_QUADS;
319 glVertex 0, 0; 358 glVertex 0, 0;
320 glVertex 0, $::HEIGHT; 359 glVertex 0, $::HEIGHT;
321 glVertex $::WIDTH, $::HEIGHT; 360 glVertex $::WIDTH, $::HEIGHT;
322 glVertex $::WIDTH, 0; 361 glVertex $::WIDTH, 0;
323 glEnd; 362 glEnd;
324 glDisable GL_BLEND; 363 glDisable GL_BLEND;
325
326# $self->{out_of_focus} ||= do {
327# my $label = new CFClient::UI::Label
328# x => 0,
329# y => 0,
330# z => 1,
331# ellipsise => 0,
332# text => "map out of focus (click map to play)";
333#
334# $label->show;
335# $label->update;
336#
337# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
338# $label->move_abs (
339# ($::WIDTH - $label->{w}) * 0.5,
340# ($::HEIGHT - $label->{h}) * 0.5,
341# );
342# });
343#
344# $label
345# };
346 } 364 }
347} 365}
348 366
349sub DESTROY { 367sub DESTROY {
350 my $self = shift; 368 my $self = shift;
… …
363 381
364sub size_request { 382sub size_request {
365 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 383 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
366} 384}
367 385
368sub size_allocate { 386sub invoke_size_allocate {
369 my ($self, $w, $h) = @_; 387 my ($self, $w, $h) = @_;
370 388
371 $self->SUPER::size_allocate ($w, $h);
372 $self->update; 389 $self->update;
390
391 1
373} 392}
374 393
375sub update { 394sub update {
376 my ($self) = @_; 395 my ($self) = @_;
377 396
… …
462 ]; 481 ];
463 482
464 $self->{entry} = new CFClient::UI::Entry 483 $self->{entry} = new CFClient::UI::Entry
465 on_changed => sub { 484 on_changed => sub {
466 $self->update_labels; 485 $self->update_labels;
486 0
487 },
488 on_button_down => sub {
489 my ($entry, $ev, $x, $y) = @_;
490
491 if ($ev->{button} == 3) {
492 (new CFClient::UI::Menu
493 items => [
494 ["bind <i>" . (CFClient::UI::Label::escape $self->{select}) . "</i> to a key"
495 => sub { $::BIND_EDITOR->do_quick_binding ([$self->{select}], sub { $entry->grab_focus }) }]
496 ],
497 )->popup ($ev);
498 return 1;
499 }
500 0
467 }, 501 },
468 on_key_down => sub { 502 on_key_down => sub {
469 my ($entry, $ev) = @_; 503 my ($entry, $ev) = @_;
470 504
471 my $self = $entry->{parent}{parent}; 505 my $self = $entry->{parent}{parent};
… …
473 if ($ev->{sym} == 13) { 507 if ($ev->{sym} == 13) {
474 if (exists $self->{select}) { 508 if (exists $self->{select}) {
475 $self->{last_command} = $self->{select}; 509 $self->{last_command} = $self->{select};
476 $::CONN->user_send ($self->{select}); 510 $::CONN->user_send ($self->{select});
477 511
478 unshift @{$self->{history}}, $self->{select}; 512 unshift @{$self->{history}}, $self->{entry}->get_text;
479 $self->{hist_ptr} = 0; 513 $self->{hist_ptr} = 0;
480 514
481 $self->hide; 515 $self->hide;
482 } 516 }
483 } elsif ($ev->{sym} == 27) { 517 } elsif ($ev->{sym} == 27) {
484 $self->{hist_ptr} = 0; 518 $self->{hist_ptr} = 0;
485 $self->hide; 519 $self->hide;
486 return;
487 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
488 if ($self->{hist_ptr} > 1) { 521 if ($self->{hist_ptr} > 1) {
489 $self->{hist_ptr}--; 522 $self->{hist_ptr}--;
490 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]); 523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
491 } elsif ($self->{hist_ptr} > 0) { 524 } elsif ($self->{hist_ptr} > 0) {
… …
531 564
532 $self->{entry}->set_text ($prefix); 565 $self->{entry}->set_text ($prefix);
533 $self->show; 566 $self->show;
534} 567}
535 568
536sub size_allocate { 569sub invoke_size_allocate {
537 my ($self, $w, $h) = @_; 570 my ($self, $w, $h) = @_;
538 571
539 $self->SUPER::size_allocate ($w, $h);
540 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10); 572 $self->move_abs (($::WIDTH - $w) * 0.5, ($::HEIGHT - $h) * 0.6, 10);
573
574 $self->SUPER::invoke_size_allocate ($w, $h)
541} 575}
542 576
543sub show { 577sub show {
544 my ($self) = @_; 578 my ($self) = @_;
545 579
546 $self->SUPER::show; 580 $self->SUPER::show;
547 $self->{entry}->focus_in; 581 $self->{entry}->grab_focus;
548} 582}
549 583
550sub hide { 584sub hide {
551 my ($self) = @_; 585 my ($self) = @_;
552 586
553 $self->SUPER::hide; 587 $self->SUPER::hide;
554 $self->{entry}->set_text (""); 588 $self->{entry}->set_text ("");
555} 589}
556 590
557sub key_down { 591sub invoke_key_down {
558 my ($self, $ev) = @_; 592 my ($self, $ev) = @_;
559 593
560 $self->{entry}->key_down ($ev) 594 $self->{entry}->emit (key_down => $ev)
561} 595}
562 596
563sub update_labels { 597sub update_labels {
564 my ($self) = @_; 598 my ($self) = @_;
565 599
… …
652 $label->set_text (""); 686 $label->set_text ("");
653 $label->set_tooltip (""); 687 $label->set_tooltip ("");
654 } 688 }
655 689
656 $self->update; 690 $self->update;
657 ###
658} 691}
659 692
660sub _draw { 693sub _draw {
661 my ($self) = @_; 694 my ($self) = @_;
662 695

Diff Legend

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