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.42 by root, Mon May 29 18:33:23 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 (
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) = @_;
… …
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 } 98 }
76}
77 99
100 1
101}
102
78sub button_up { 103sub invoke_button_up {
79 my ($self, $ev, $x, $y) = @_; 104 my ($self, $ev, $x, $y) = @_;
80 105
81 delete $self->{motion}; 106 delete $self->{motion};
82}
83 107
108 1
109}
110
84sub mouse_motion { 111sub invoke_mouse_motion {
85 my ($self, $ev, $x, $y) = @_; 112 my ($self, $ev, $x, $y) = @_;
86 113
114 if ($self->{motion}) {
87 $self->{motion}->($ev, $x, $y) if $self->{motion}; 115 $self->{motion}->($ev, $x, $y);
116 } else {
117 return 0;
118 }
119
120 1
88} 121}
89 122
90sub size_request { 123sub size_request {
91 ( 124 (
92 1 + 32 * int $::WIDTH / 32, 125 32 * CFClient::ceil $::WIDTH / 32,
93 1 + 32 * int $::HEIGHT / 32, 126 32 * CFClient::ceil $::HEIGHT / 32,
94 ) 127 )
95} 128}
96 129
97sub update { 130sub update {
98 my ($self) = @_; 131 my ($self) = @_;
… …
115 CFClient::SDLK_RIGHT, [3, "east"], 148 CFClient::SDLK_RIGHT, [3, "east"],
116 CFClient::SDLK_DOWN, [5, "south"], 149 CFClient::SDLK_DOWN, [5, "south"],
117 CFClient::SDLK_LEFT, [7, "west"], 150 CFClient::SDLK_LEFT, [7, "west"],
118); 151);
119 152
120sub key_down { 153sub invoke_key_down {
121 my ($self, $ev) = @_; 154 my ($self, $ev) = @_;
122 155
123 return unless $::CONN; 156 return 0 unless $::CONN;
124 157
125 my $mod = $ev->{mod}; 158 my $mod = $ev->{mod};
126 my $sym = $ev->{sym}; 159 my $sym = $ev->{sym};
127 my $uni = $ev->{unicode}; 160 my $uni = $ev->{unicode};
128 161
… …
134 $::CONN->user_send ("apply"); 167 $::CONN->user_send ("apply");
135 } elsif ($uni == ord ".") { 168 } elsif ($uni == ord ".") {
136 $::CONN->user_send ($self->{completer}{last_command}) 169 $::CONN->user_send ($self->{completer}{last_command})
137 if exists $self->{completer}{last_command}; 170 if exists $self->{completer}{last_command};
138 } elsif ($uni == ord "\t") { 171 } elsif ($uni == ord "\t") {
139 $::INV_WINDOW->toggle_visibility; 172 $::PL_WINDOW->toggle_visibility;
173 $::PL_NOTEBOOK->set_current_page ("Inventory");
140 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") { 174 } elsif ($sym == CFClient::SDLK_KP_PLUS || $uni == ord "+") {
141 $::CONN->user_send ("rotateshoottype +"); 175 $::CONN->user_send ("rotateshoottype +");
142 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") { 176 } elsif ($sym == CFClient::SDLK_KP_MINUS || $uni == ord "-") {
143 $::CONN->user_send ("rotateshoottype -"); 177 $::CONN->user_send ("rotateshoottype -");
144 } elsif ($uni == ord '"') { 178 } elsif ($uni == ord '"') {
… …
148 $self->{completer}->set_prefix (""); 182 $self->{completer}->set_prefix ("");
149 $self->{completer}->show; 183 $self->{completer}->show;
150 } elsif (exists $DIR{$sym}) { 184 } elsif (exists $DIR{$sym}) {
151 if ($mod & CFClient::KMOD_SHIFT) { 185 if ($mod & CFClient::KMOD_SHIFT) {
152 $self->{shft}++; 186 $self->{shft}++;
187 if ($DIR{$sym}[0] != $self->{fire_dir}) {
153 $::CONN->user_send ("fire $DIR{$sym}[0]"); 188 $::CONN->user_send ("fire $DIR{$sym}[0]");
189 }
190 $self->{fire_dir} = $DIR{$sym}[0];
154 } elsif ($mod & CFClient::KMOD_CTRL) { 191 } elsif ($mod & CFClient::KMOD_CTRL) {
155 $self->{ctrl}++; 192 $self->{ctrl}++;
156 $::CONN->user_send ("run $DIR{$sym}[0]"); 193 $::CONN->user_send ("run $DIR{$sym}[0]");
157 } else { 194 } else {
158 $::CONN->user_send ("$DIR{$sym}[1]"); 195 $::CONN->user_send ("$DIR{$sym}[1]");
159 } 196 }
197 } elsif ($sym == CFClient::SDLK_INSERT && $mod & CFClient::KMOD_CTRL) {
198 $::BIND_EDITOR->set_binding (undef, undef, [],
199 sub {
200 my ($mod, $sym, $cmds) = @_;
201 $::BIND_EDITOR->cfg_bind ($mod, $sym, $cmds);
202 });
203 $::BIND_EDITOR->start;
204 $::BIND_EDITOR->show;
205 } elsif ($sym == CFClient::SDLK_INSERT && not ($mod & CFClient::KMOD_CTRL)) {
206 $::BIND_EDITOR->stop;
207 $::BIND_EDITOR->ask_for_bind_and_commit;
208 $::BIND_EDITOR->hide;
209 } elsif (my $bind_cmd = $::CFG->{profile}{default}{bindings}{$mod}{$sym}) {
210 $::CONN->user_send ($_) for @$bind_cmd;
160 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) { 211 } elsif ((ord 'a') <= $uni && $uni <= (ord 'z')) {
161 $self->{completer}->key_down ($ev); 212 $self->{completer}->invoke_key_down ($ev);
162 $self->{completer}->show; 213 $self->{completer}->show;
214 } else {
215 return 0;
216 }
217
163 } 218 1
164} 219}
165 220
166sub key_up { 221sub invoke_key_up {
167 my ($self, $ev) = @_; 222 my ($self, $ev) = @_;
168 223
224 my $res = 0;
169 my $mod = $ev->{mod}; 225 my $mod = $ev->{mod};
170 my $sym = $ev->{sym}; 226 my $sym = $ev->{sym};
171 227
228 if ($::CFG->{shift_fire_stop}) {
172 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) { 229 if (!($mod & CFClient::KMOD_SHIFT) && delete $self->{shft}) {
173 $::CONN->user_send ("fire_stop"); 230 $::CONN->user_send ("fire_stop");
231 delete $self->{fire_dir};
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 }
174 } 244 }
245
175 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) { 246 if (!($mod & CFClient::KMOD_CTRL ) && delete $self->{ctrl}) {
176 $::CONN->user_send ("run_stop"); 247 $::CONN->user_send ("run_stop");
248 $res = 1;
177 } 249 }
250
251 $res
252}
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;
178} 263}
179 264
180sub draw { 265sub draw {
181 my ($self) = @_; 266 my ($self) = @_;
267
268 return unless $::MAP;
182 269
183 my $focused = $CFClient::UI::FOCUS == $self 270 my $focused = $CFClient::UI::FOCUS == $self
184 || $CFClient::UI::FOCUS == $self->{completer}{entry}; 271 || $CFClient::UI::FOCUS == $self->{completer}{entry};
185 272
186 return 273 return
187 unless $focused || !$::FAST; 274 unless $focused || !$::FAST;
188 275
189 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
190 glNewList $self->{list}; 315 glNewList $self->{list};
191 316
192 if ($::MAP) {
193 my $sw = int $::WIDTH / (32 * $::CFG->{map_scale}) + 0.99;
194 my $sh = int $::HEIGHT / (32 * $::CFG->{map_scale}) + 0.99;
195
196 my $sx = $::CFG->{map_shift_x} / $::CFG->{map_scale}; my $sx0 = $sx & 31; $sx = ($sx - $sx0) / 32;
197 my $sy = $::CFG->{map_shift_y} / $::CFG->{map_scale}; my $sy0 = $sy & 31; $sy = ($sy - $sy0) / 32;
198
199 glPushMatrix; 317 glPushMatrix;
318 glTranslate $sx0, $sy0;
200 glScale $::CFG->{map_scale}, $::CFG->{map_scale}; 319 glScale $::CFG->{map_scale}, $::CFG->{map_scale};
201 320
202 glTranslate $sx0 - 32, $sy0 - 32, 0; 321 $::MAP->draw ($sx, $sy, 0, 0, $sw, $sh);
203 322
204 my ($w, $h, $data) = $::MAP->draw ($sx, $sy, 0, 0, $sw + 1, $sh + 1); 323 glScale 32, 32;
205 324
206 if ($::CFG->{fow_enable}) { 325 if (my $tex = $self->{fow_texture}) {
207 if ($::CFG->{fow_smooth} && $CFClient::OpenGL::GL_VERSION >= 1.2) { # smooth fog of war
208 glConvolutionParameter (GL_CONVOLUTION_2D, GL_CONVOLUTION_BORDER_MODE, GL_CONSTANT_BORDER);
209 glConvolutionFilter2D (
210 GL_CONVOLUTION_2D,
211 GL_ALPHA,
212 3, 3,
213 GL_ALPHA, GL_FLOAT,
214 pack "f*",
215 0.05, 0.13, 0.05,
216 0.13, 0.30, 0.13,
217 0.05, 0.13, 0.05,
218 );
219 glEnable GL_CONVOLUTION_2D;
220 }
221
222 $self->{fow_texture_name} ||= glGenTexture;
223 # try to re-use the texture name: TODO improve texture class instead
224
225 $self->{fow_texture} = new CFClient::Texture
226 w => $w,
227 h => $h,
228 data => $data,
229 name => $self->{fow_texture_name},
230 internalformat => GL_ALPHA,
231 format => GL_ALPHA;
232
233 glDisable GL_CONVOLUTION_2D if $::CFG->{fow_smooth};
234
235 glEnable GL_TEXTURE_2D; 326 glEnable GL_TEXTURE_2D;
236 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE; 327 glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
237 328
238 glColor +($::CFG->{fow_intensity}) x 3, 0.8; 329 glColor +($::CFG->{fow_intensity}) x 3, 0.9;
239 $self->{fow_texture}->draw_quad_alpha (0, 0, $w * 32, $h * 32); 330 $self->{fow_texture}->draw_quad_alpha (0, 0);
240 331
241 glDisable GL_TEXTURE_2D; 332 glDisable GL_TEXTURE_2D;
242 } 333 }
243 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
244 glPopMatrix; 346 glPopMatrix;
245 }
246
247 glEndList; 347 glEndList;
248 } 348 }
249 349
250 glPushMatrix;
251 glCallList $self->{list}; 350 glCallList $self->{list};
252 glPopMatrix;
253 351
254 # TNT2 emulates logops in software (or worse :) 352 # TNT2 emulates logops in software (or worse :)
255 if ($focused) { 353 unless ($focused) {
256 (delete $self->{out_of_focus})->destroy
257 if $self->{out_of_focus};
258 } else {
259 glColor 0.4, 0.2, 0.2, 0.6; 354 glColor 0.4, 0.2, 0.2, 0.6;
260 glEnable GL_BLEND; 355 glEnable GL_BLEND;
261 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA; 356 glBlendFunc GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA;
262 glBegin GL_QUADS; 357 glBegin GL_QUADS;
263 glVertex 0, 0; 358 glVertex 0, 0;
264 glVertex 0, $::HEIGHT; 359 glVertex 0, $::HEIGHT;
265 glVertex $::WIDTH, $::HEIGHT; 360 glVertex $::WIDTH, $::HEIGHT;
266 glVertex $::WIDTH, 0; 361 glVertex $::WIDTH, 0;
267 glEnd; 362 glEnd;
268 glDisable GL_BLEND; 363 glDisable GL_BLEND;
269
270# $self->{out_of_focus} ||= do {
271# my $label = new CFClient::UI::Label
272# x => 0,
273# y => 0,
274# z => 1,
275# ellipsise => 0,
276# text => "map out of focus (click map to play)";
277#
278# $label->show;
279# $label->update;
280#
281# $CFClient::UI::ROOT->on_post_alloc ("$self$label" => sub {
282# $label->move (
283# ($::WIDTH - $label->{w}) * 0.5,
284# ($::HEIGHT - $label->{h}) * 0.5,
285# );
286# });
287#
288# $label
289# };
290 } 364 }
291} 365}
292 366
293sub DESTROY { 367sub DESTROY {
294 my $self = shift; 368 my $self = shift;
… …
307 381
308sub size_request { 382sub size_request {
309 ($::HEIGHT * 0.25, $::HEIGHT * 0.25) 383 ($::HEIGHT * 0.25, $::HEIGHT * 0.25)
310} 384}
311 385
312sub size_allocate { 386sub invoke_size_allocate {
313 my ($self, $w, $h) = @_; 387 my ($self, $w, $h) = @_;
314 388
315 $self->SUPER::size_allocate ($w, $h);
316 $self->update; 389 $self->update;
390
391 1
317} 392}
318 393
319sub update { 394sub update {
320 my ($self) = @_; 395 my ($self) = @_;
321 396
… …
406 ]; 481 ];
407 482
408 $self->{entry} = new CFClient::UI::Entry 483 $self->{entry} = new CFClient::UI::Entry
409 on_changed => sub { 484 on_changed => sub {
410 $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
411 }, 501 },
412 on_key_down => sub { 502 on_key_down => sub {
413 my ($entry, $ev) = @_; 503 my ($entry, $ev) = @_;
414 504
415 my $self = $entry->{parent}{parent}; 505 my $self = $entry->{parent}{parent};
416 506
417 if ($ev->{sym} == 13) { 507 if ($ev->{sym} == 13) {
418 if (exists $self->{select}) { 508 if (exists $self->{select}) {
419 $self->{last_command} = $self->{select}; 509 $self->{last_command} = $self->{select};
420 $::CONN->user_send ($self->{select}); 510 $::CONN->user_send ($self->{select});
511
512 unshift @{$self->{history}}, $self->{entry}->get_text;
513 $self->{hist_ptr} = 0;
514
421 $self->hide; 515 $self->hide;
422 } 516 }
423 } elsif ($ev->{sym} == 27) { 517 } elsif ($ev->{sym} == 27) {
518 $self->{hist_ptr} = 0;
424 $self->hide; 519 $self->hide;
425 return;
426 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) { 520 } elsif ($ev->{sym} == CFClient::SDLK_DOWN) {
521 if ($self->{hist_ptr} > 1) {
522 $self->{hist_ptr}--;
523 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1]);
524 } elsif ($self->{hist_ptr} > 0) {
525 $self->{hist_ptr}--;
526 $self->{entry}->set_text ($self->{hist_saveback});
527 } else {
427 ++$self->{select_offset} 528 ++$self->{select_offset}
428 if $self->{select_offset} < $#{ $self->{last_match} || [] }; 529 if $self->{select_offset} < $#{ $self->{last_match} || [] };
530 }
429 $self->update_labels; 531 $self->update_labels;
430 } elsif ($ev->{sym} == CFClient::SDLK_UP) { 532 } elsif ($ev->{sym} == CFClient::SDLK_UP) {
533 if ($self->{select_offset}) {
431 --$self->{select_offset} 534 --$self->{select_offset}
535 } else {
536 unless ($self->{hist_ptr}) {
537 $self->{hist_saveback} = $self->{entry}->get_text;
538 }
539 if ($self->{hist_ptr} <= $#{$self->{history}}) {
432 if $self->{select_offset}; 540 $self->{hist_ptr}++;
541 }
542 $self->{entry}->set_text ($self->{history}->[$self->{hist_ptr} - 1])
543 if exists $self->{history}->[$self->{hist_ptr} - 1];
544 }
433 $self->update_labels; 545 $self->update_labels;
434 } else { 546 } else {
435 return 0; 547 return 0;
436 } 548 }
437 549
… …
452 564
453 $self->{entry}->set_text ($prefix); 565 $self->{entry}->set_text ($prefix);
454 $self->show; 566 $self->show;
455} 567}
456 568
457sub size_allocate { 569sub invoke_size_allocate {
458 my ($self, $w, $h) = @_; 570 my ($self, $w, $h) = @_;
459 571
460 $self->SUPER::size_allocate ($w, $h);
461 $self->move (($::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)
462} 575}
463 576
464sub show { 577sub show {
465 my ($self) = @_; 578 my ($self) = @_;
466 579
467 $self->SUPER::show; 580 $self->SUPER::show;
468 $self->{entry}->focus_in; 581 $self->{entry}->grab_focus;
469} 582}
470 583
471sub hide { 584sub hide {
472 my ($self) = @_; 585 my ($self) = @_;
473 586
474 $self->SUPER::hide; 587 $self->SUPER::hide;
475 $self->{entry}->set_text (""); 588 $self->{entry}->set_text ("");
476} 589}
477 590
478sub key_down { 591sub invoke_key_down {
479 my ($self, $ev) = @_; 592 my ($self, $ev) = @_;
480 593
481 $self->{entry}->key_down ($ev); 594 $self->{entry}->emit (key_down => $ev)
482} 595}
483 596
484sub update_labels { 597sub update_labels {
485 my ($self) = @_; 598 my ($self) = @_;
486 599
… …
573 $label->set_text (""); 686 $label->set_text ("");
574 $label->set_tooltip (""); 687 $label->set_tooltip ("");
575 } 688 }
576 689
577 $self->update; 690 $self->update;
578 ###
579} 691}
580 692
581sub _draw { 693sub _draw {
582 my ($self) = @_; 694 my ($self) = @_;
583 695

Diff Legend

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